diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2014-05-04 13:02:58 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2014-05-04 13:02:58 +0200 |
| commit | 5cfc9d973d13aeec4e5ff1c1643eb758cf3a8064 (patch) | |
| tree | 6024434e2a55cba265f327f5dd04ea55771561a0 | |
| parent | 6f57911b449a361b56b8fdf784c355b3380a4b99 (diff) | |
| download | nextcloud-server-5cfc9d973d13aeec4e5ff1c1643eb758cf3a8064.tar.gz nextcloud-server-5cfc9d973d13aeec4e5ff1c1643eb758cf3a8064.zip | |
Fix PHP Doc and use readable variable name
| -rwxr-xr-x | lib/private/util.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index a394871eb45..e2005d31c38 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -748,7 +748,7 @@ class OC_Util { /** * @brief Register an get/post call. Important to prevent CSRF attacks. * @todo Write howto: CSRF protection guide - * @return $token Generated token. + * @return string Generated token. * @description * Creates a 'request token' (random) and stores it inside the session. * Ever subsequent (ajax) request must use such a valid token to succeed, @@ -781,7 +781,7 @@ class OC_Util { } /** - * @brief Check an ajax get/post call if the request token is valid. exit if not. + * @brief Check an ajax get/post call if the request token is valid. Exit if not. * @todo Write howto * @return void */ @@ -1100,7 +1100,7 @@ class OC_Util { curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false); $mr = $max_redirects; if ($mr > 0) { - $newurl = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL); + $newURL = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL); $rcurl = curl_copy_handle($curl); curl_setopt($rcurl, CURLOPT_HEADER, true); @@ -1108,7 +1108,7 @@ class OC_Util { curl_setopt($rcurl, CURLOPT_FORBID_REUSE, false); curl_setopt($rcurl, CURLOPT_RETURNTRANSFER, true); do { - curl_setopt($rcurl, CURLOPT_URL, $newurl); + curl_setopt($rcurl, CURLOPT_URL, $newURL); $header = curl_exec($rcurl); if (curl_errno($rcurl)) { $code = 0; @@ -1116,7 +1116,7 @@ class OC_Util { $code = curl_getinfo($rcurl, CURLINFO_HTTP_CODE); if ($code == 301 || $code == 302) { preg_match('/Location:(.*?)\n/', $header, $matches); - $newurl = trim(array_pop($matches)); + $newURL = trim(array_pop($matches)); } else { $code = 0; } @@ -1124,7 +1124,7 @@ class OC_Util { } while ($code && --$mr); curl_close($rcurl); if ($mr > 0) { - curl_setopt($curl, CURLOPT_URL, $newurl); + curl_setopt($curl, CURLOPT_URL, $newURL); } } |