From 630becb95fe6e998d470c695c86b62a7d6915650 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 1 Mar 2013 14:59:24 +0100 Subject: Style fixes --- lib/util.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index 2e32ee2e3c2..f21a7a746b3 100755 --- a/lib/util.php +++ b/lib/util.php @@ -466,11 +466,11 @@ class OC_Util { public static function isCallRegistered() { if(isset($_GET['requesttoken'])) { $token=$_GET['requesttoken']; - }elseif(isset($_POST['requesttoken'])) { + } elseif(isset($_POST['requesttoken'])) { $token=$_POST['requesttoken']; - }elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])) { + } elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])) { $token=$_SERVER['HTTP_REQUESTTOKEN']; - }else{ + } else { //no token found. return false; } -- cgit v1.2.3 From 93f15215c644ecd2a25c084227a4af719cef2a05 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 1 Mar 2013 14:59:51 +0100 Subject: Check if requesttoken exists in session Ref #1999 --- lib/util.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index f21a7a746b3..81bd42a3397 100755 --- a/lib/util.php +++ b/lib/util.php @@ -464,6 +464,10 @@ class OC_Util { * @see OC_Util::callRegister() */ public static function isCallRegistered() { + if(!isset($_SESSION['requesttoken'])) { + return false; + } + if(isset($_GET['requesttoken'])) { $token=$_GET['requesttoken']; } elseif(isset($_POST['requesttoken'])) { -- cgit v1.2.3