mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix PHP Doc and use readable variable name

This commit is contained in:
Lukas Reschke 2014-05-04 13:02:58 +02:00
parent 6f57911b44
commit 5cfc9d973d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/util.php
View File

@ -748,7 +748,7 @@ class OC_Util {
/** /**
* @brief Register an get/post call. Important to prevent CSRF attacks. * @brief Register an get/post call. Important to prevent CSRF attacks.
* @todo Write howto: CSRF protection guide * @todo Write howto: CSRF protection guide
* @return $token Generated token. * @return string Generated token.
* @description * @description
* Creates a 'request token' (random) and stores it inside the session. * Creates a 'request token' (random) and stores it inside the session.
* Ever subsequent (ajax) request must use such a valid token to succeed, * 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 * @todo Write howto
* @return void * @return void
*/ */
@ -1100,7 +1100,7 @@ class OC_Util {
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
$mr = $max_redirects; $mr = $max_redirects;
if ($mr > 0) { if ($mr > 0) {
$newurl = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL); $newURL = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
$rcurl = curl_copy_handle($curl); $rcurl = curl_copy_handle($curl);
curl_setopt($rcurl, CURLOPT_HEADER, true); curl_setopt($rcurl, CURLOPT_HEADER, true);
@ -1108,7 +1108,7 @@ class OC_Util {
curl_setopt($rcurl, CURLOPT_FORBID_REUSE, false); curl_setopt($rcurl, CURLOPT_FORBID_REUSE, false);
curl_setopt($rcurl, CURLOPT_RETURNTRANSFER, true); curl_setopt($rcurl, CURLOPT_RETURNTRANSFER, true);
do { do {
curl_setopt($rcurl, CURLOPT_URL, $newurl); curl_setopt($rcurl, CURLOPT_URL, $newURL);
$header = curl_exec($rcurl); $header = curl_exec($rcurl);
if (curl_errno($rcurl)) { if (curl_errno($rcurl)) {
$code = 0; $code = 0;
@ -1116,7 +1116,7 @@ class OC_Util {
$code = curl_getinfo($rcurl, CURLINFO_HTTP_CODE); $code = curl_getinfo($rcurl, CURLINFO_HTTP_CODE);
if ($code == 301 || $code == 302) { if ($code == 301 || $code == 302) {
preg_match('/Location:(.*?)\n/', $header, $matches); preg_match('/Location:(.*?)\n/', $header, $matches);
$newurl = trim(array_pop($matches)); $newURL = trim(array_pop($matches));
} else { } else {
$code = 0; $code = 0;
} }
@ -1124,7 +1124,7 @@ class OC_Util {
} while ($code && --$mr); } while ($code && --$mr);
curl_close($rcurl); curl_close($rcurl);
if ($mr > 0) { if ($mr > 0) {
curl_setopt($curl, CURLOPT_URL, $newurl); curl_setopt($curl, CURLOPT_URL, $newURL);
} }
} }