X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FUtils.php;h=925e1a22c909011a342b3dc3ced3c9f0f5d9a3da;hb=1004742f09b55ff781c13745781b9a7e90986faa;hp=2f38a8de2a0f0fccff237619514cd32dd92682fb;hpb=d8acf8550480694d050091e270a06c01e7b313f0;p=github%2Fshaarli%2FShaarli.git diff --git a/application/Utils.php b/application/Utils.php index 2f38a8de..925e1a22 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -97,7 +97,7 @@ function escape($input) if (is_array($input)) { $out = array(); - foreach($input as $key => $value) { + foreach ($input as $key => $value) { $out[$key] = escape($value); } return $out; @@ -181,36 +181,6 @@ function generateLocation($referer, $host, $loopTerms = array()) return $finalReferer; } -/** - * Validate session ID to prevent Full Path Disclosure. - * - * See #298. - * The session ID's format depends on the hash algorithm set in PHP settings - * - * @param string $sessionId Session ID - * - * @return true if valid, false otherwise. - * - * @see http://php.net/manual/en/function.hash-algos.php - * @see http://php.net/manual/en/session.configuration.php - */ -function is_session_id_valid($sessionId) -{ - if (empty($sessionId)) { - return false; - } - - if (!$sessionId) { - return false; - } - - if (!preg_match('/^[a-zA-Z0-9,-]{2,128}$/', $sessionId)) { - return false; - } - - return true; -} - /** * Sniff browser language to set the locale automatically. * Note that is may not work on your server if the corresponding locale is not installed. @@ -385,10 +355,13 @@ function return_bytes($val) $val = trim($val); $last = strtolower($val[strlen($val)-1]); $val = intval(substr($val, 0, -1)); - switch($last) { - case 'g': $val *= 1024; - case 'm': $val *= 1024; - case 'k': $val *= 1024; + switch ($last) { + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; } return $val; } @@ -482,6 +455,7 @@ function alphabetical_sort(&$data, $reverse = false, $byKeys = false) * * @return string Text translated. */ -function t($text, $nText = '', $nb = 1, $domain = 'shaarli') { +function t($text, $nText = '', $nb = 1, $domain = 'shaarli') +{ return dn__($domain, $text, $nText, $nb); }