From: Arthur <arthur@hoa.ro>
Date: Sat, 14 May 2016 09:09:03 +0000 (+0200)
Subject: Merge pull request #559 from ArthurHoaro/startsEndWithCase
X-Git-Tag: v0.7.0~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=765391cb376500a8372aedd426dd4bfbe04ee8ec;hp=-c;p=github%2Fshaarli%2FShaarli.git

Merge pull request #559 from ArthurHoaro/startsEndWithCase

Fix startsWith and endsWith case
---

765391cb376500a8372aedd426dd4bfbe04ee8ec
diff --combined index.php
index 93e89709,85064e2e..6b02942f
--- a/index.php
+++ b/index.php
@@@ -690,7 -690,7 +690,7 @@@ class pageBuilde
  // 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 +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();
@@@ -1199,6 -1199,12 +1199,6 @@@
              exit;
          }
  
 -		// Same case as above except that user tried to access ?do=addlink without being logged in
 -		// Note: passing empty parameters makes Shaarli generate default URLs and descriptions.
 -		if (isset($_GET['do']) && $_GET['do'] === 'addlink') {
 -			header('Location: ?do=login&post=');
 -			exit;
 -		}
          showLinkList($PAGE, $LINKSDB);
          if (isset($_GET['edit_link'])) {
              header('Location: ?do=login&edit_link='. escape($_GET['edit_link']));
@@@ -1630,7 -1636,7 +1630,7 @@@
      }
  
      // -------- 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))
@@@ -1733,7 -1739,7 +1733,7 @@@ function importFile($LINKSDB
          {
              $link = array('linkdate'=>'','title'=>'','url'=>'','description'=>'','tags'=>'','private'=>0);
              $d = explode('<DD>',$html);
-             if (startswith($d[0],'<A '))
+             if (startsWith($d[0], '<A '))
              {
                  $link['description'] = (isset($d[1]) ? html_entity_decode(trim($d[1]),ENT_QUOTES,'UTF-8') : '');  // Get description (optional)
                  preg_match('!<A .*?>(.*?)</A>!i',$d[0],$matches); $link['title'] = (isset($matches[1]) ? trim($matches[1]) : '');  // Get title
@@@ -2204,7 -2210,7 +2204,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';
@@@ -2381,8 -2387,8 +2381,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();
  ?>