From 5046bcb6ab324a6b52669b2b76a41665022f653a Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 10 May 2016 23:31:41 +0200 Subject: [PATCH] Fix startsWith and endsWith case --- application/HttpUtils.php | 2 +- application/Router.php | 26 +++++++++++++------------- application/Utils.php | 16 ++++++++++++++-- index.php | 14 +++++++------- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/application/HttpUtils.php b/application/HttpUtils.php index c84ba6f..2e0792f 100644 --- a/application/HttpUtils.php +++ b/application/HttpUtils.php @@ -193,7 +193,7 @@ function server_url($server) function index_url($server) { $scriptname = $server['SCRIPT_NAME']; - if (endswith($scriptname, 'index.php')) { + if (endsWith($scriptname, 'index.php')) { $scriptname = substr($scriptname, 0, -9); } return server_url($server) . $scriptname; diff --git a/application/Router.php b/application/Router.php index a1e594a..2c3934b 100644 --- a/application/Router.php +++ b/application/Router.php @@ -63,19 +63,19 @@ class Router return self::$PAGE_LINKLIST; } - if (startswith($query, 'do='. self::$PAGE_LOGIN) && $loggedIn === false) { + if (startsWith($query, 'do='. self::$PAGE_LOGIN) && $loggedIn === false) { return self::$PAGE_LOGIN; } - if (startswith($query, 'do='. self::$PAGE_PICWALL)) { + if (startsWith($query, 'do='. self::$PAGE_PICWALL)) { return self::$PAGE_PICWALL; } - if (startswith($query, 'do='. self::$PAGE_TAGCLOUD)) { + if (startsWith($query, 'do='. self::$PAGE_TAGCLOUD)) { return self::$PAGE_TAGCLOUD; } - if (startswith($query, 'do='. self::$PAGE_OPENSEARCH)) { + if (startsWith($query, 'do='. self::$PAGE_OPENSEARCH)) { return self::$PAGE_OPENSEARCH; } @@ -96,23 +96,23 @@ class Router return self::$PAGE_LINKLIST; } - if (startswith($query, 'do='. self::$PAGE_TOOLS)) { + if (startsWith($query, 'do='. self::$PAGE_TOOLS)) { return self::$PAGE_TOOLS; } - if (startswith($query, 'do='. self::$PAGE_CHANGEPASSWORD)) { + if (startsWith($query, 'do='. self::$PAGE_CHANGEPASSWORD)) { return self::$PAGE_CHANGEPASSWORD; } - if (startswith($query, 'do='. self::$PAGE_CONFIGURE)) { + if (startsWith($query, 'do='. self::$PAGE_CONFIGURE)) { return self::$PAGE_CONFIGURE; } - if (startswith($query, 'do='. self::$PAGE_CHANGETAG)) { + if (startsWith($query, 'do='. self::$PAGE_CHANGETAG)) { return self::$PAGE_CHANGETAG; } - if (startswith($query, 'do='. self::$PAGE_ADDLINK)) { + if (startsWith($query, 'do='. self::$PAGE_ADDLINK)) { return self::$PAGE_ADDLINK; } @@ -120,19 +120,19 @@ class Router return self::$PAGE_EDITLINK; } - if (startswith($query, 'do='. self::$PAGE_EXPORT)) { + if (startsWith($query, 'do='. self::$PAGE_EXPORT)) { return self::$PAGE_EXPORT; } - if (startswith($query, 'do='. self::$PAGE_IMPORT)) { + if (startsWith($query, 'do='. self::$PAGE_IMPORT)) { return self::$PAGE_IMPORT; } - if (startswith($query, 'do='. self::$PAGE_PLUGINSADMIN)) { + if (startsWith($query, 'do='. self::$PAGE_PLUGINSADMIN)) { return self::$PAGE_PLUGINSADMIN; } - if (startswith($query, 'do='. self::$PAGE_SAVE_PLUGINSADMIN)) { + if (startsWith($query, 'do='. self::$PAGE_SAVE_PLUGINSADMIN)) { return self::$PAGE_SAVE_PLUGINSADMIN; } diff --git a/application/Utils.php b/application/Utils.php index 5b8ca50..da521cc 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -41,8 +41,14 @@ function smallHash($text) /** * Tells if a string start with a substring + * + * @param string $haystack Given string. + * @param string $needle String to search at the beginning of $haystack. + * @param bool $case Case sensitive. + * + * @return bool True if $haystack starts with $needle. */ -function startsWith($haystack, $needle, $case=true) +function startsWith($haystack, $needle, $case = true) { if ($case) { return (strcmp(substr($haystack, 0, strlen($needle)), $needle) === 0); @@ -52,8 +58,14 @@ function startsWith($haystack, $needle, $case=true) /** * Tells if a string ends with a substring + * + * @param string $haystack Given string. + * @param string $needle String to search at the end of $haystack. + * @param bool $case Case sensitive. + * + * @return bool True if $haystack ends with $needle. */ -function endsWith($haystack, $needle, $case=true) +function endsWith($haystack, $needle, $case = true) { if ($case) { return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0); diff --git a/index.php b/index.php index 408aeae..85064e2 100644 --- a/index.php +++ b/index.php @@ -690,7 +690,7 @@ class pageBuilder // This RSS feed cannot be filtered. function showDailyRSS() { // Cache system - $query = $_SERVER["QUERY_STRING"]; + $query = $_SERVER['QUERY_STRING']; $cache = new CachedPage( $GLOBALS['config']['PAGECACHE'], page_url($_SERVER), @@ -948,7 +948,7 @@ function renderPage() exit; } // -------- User wants to logout. - if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=logout')) + if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=logout')) { invalidateCaches($GLOBALS['config']['PAGECACHE']); logout(); @@ -1636,7 +1636,7 @@ function renderPage() } // -------- User is uploading a file for import - if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=upload')) + if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=upload')) { // If file is too big, some form field may be missing. if (!isset($_POST['token']) || (!isset($_FILES)) || (isset($_FILES['filetoupload']['size']) && $_FILES['filetoupload']['size']==0)) @@ -1739,7 +1739,7 @@ function importFile($LINKSDB) { $link = array('linkdate'=>'','title'=>'','url'=>'','description'=>'','tags'=>'','private'=>0); $d = explode('
',$html); - if (startswith($d[0],'(.*?)!i',$d[0],$matches); $link['title'] = (isset($matches[1]) ? trim($matches[1]) : ''); // Get title @@ -2210,7 +2210,7 @@ function genThumbnail() // Is this a link to an image, or to a flickr page ? $imageurl=''; - if (endswith(parse_url($url,PHP_URL_PATH),'.jpg')) + if (endsWith(parse_url($url, PHP_URL_PATH), '.jpg')) { // This is a direct link to an image. e.g. http://farm1.staticflickr.com/5/5921913_ac83ed27bd_o.jpg preg_match('!(http://farm\d+\.staticflickr\.com/\d+/\d+_\w+_)\w.jpg!',$url,$matches); if (!empty($matches[1])) $imageurl=$matches[1].'m.jpg'; @@ -2387,8 +2387,8 @@ function resizeImage($filepath) return true; } -if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=genthumbnail')) { genThumbnail(); exit; } // Thumbnail generation/cache does not need the link database. -if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=dailyrss')) { showDailyRSS(); exit; } +if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=genthumbnail')) { genThumbnail(); exit; } // Thumbnail generation/cache does not need the link database. +if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=dailyrss')) { showDailyRSS(); exit; } if (!isset($_SESSION['LINKS_PER_PAGE'])) $_SESSION['LINKS_PER_PAGE']=$GLOBALS['config']['LINKS_PER_PAGE']; renderPage(); ?>