From: Sbgodin <Sbgodin@users.noreply.github.com>
Date: Tue, 19 Aug 2014 19:33:53 +0000 (+0200)
Subject: Merge pull request #20 from nodiscc/fix-typos
X-Git-Tag: v0.0.43beta~43
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=abc98ab39d582dbe9d029f91c57abea783bf6892

Merge pull request #20 from nodiscc/fix-typos

Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix typo in css
---

abc98ab39d582dbe9d029f91c57abea783bf6892
diff --cc index.php
index 3136193f,07f877de..b6d4d2d7
--- a/index.php
+++ b/index.php
@@@ -24,10 -24,8 +24,10 @@@ $GLOBALS['config']['HIDE_TIMESTAMPS'] 
  $GLOBALS['config']['ENABLE_THUMBNAILS'] = true; // Enable thumbnails in links.
  $GLOBALS['config']['CACHEDIR'] = 'cache'; // Cache directory for thumbnails for SLOW services (like flickr)
  $GLOBALS['config']['PAGECACHE'] = 'pagecache'; // Page cache directory.
- $GLOBALS['config']['ENABLE_LOCALCACHE'] = true; // Enable Shaarli to store thumbnail in a local cache. Disable to reduce webspace usage.
+ $GLOBALS['config']['ENABLE_LOCALCACHE'] = true; // Enable Shaarli to store thumbnail in a local cache. Disable to reduce web space usage.
  $GLOBALS['config']['PUBSUBHUB_URL'] = ''; // PubSubHubbub support. Put an empty string to disable, or put your hub url here to enable.
 +$GLOBALS['config']['RAINTPL_TMP'] = 'tmp' ; // Raintpl cache directory
 +$GLOBALS['config']['RAINTPL_TPL'] = 'tpl/' ; // Raintpl template directory (keep the trailling slash!)
  $GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; // For updates check of Shaarli.
  $GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency for Shaarli. 86400 seconds=24 hours
                                            // Note: You must have publisher.php in the same directory as Shaarli index.php
@@@ -86,8 -85,18 +86,8 @@@ header("Cache-Control: no-store, no-cac
  header("Cache-Control: post-check=0, pre-check=0", false);
  header("Pragma: no-cache");
  
- // Directories creations (Note that your web host may require differents rights than 705.)
+ // Directories creations (Note that your web host may require different rights than 705.)
  if (!is_writable(realpath(dirname(__FILE__)))) die('<pre>ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').</pre>');
 -if (!is_dir($GLOBALS['config']['DATADIR'])) { mkdir($GLOBALS['config']['DATADIR'],0705); chmod($GLOBALS['config']['DATADIR'],0705); }
 -if (!is_dir('tmp')) { mkdir('tmp',0705); chmod('tmp',0705); } // For RainTPL temporary files.
 -if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['DATADIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.
 -// Second check to see if Shaarli can write in its directory, because on some hosts is_writable() is not reliable.
 -if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) die('<pre>ERROR: Shaarli does not have the right to write in its data directory ('.realpath($GLOBALS['config']['DATADIR']).').</pre>');
 -if ($GLOBALS['config']['ENABLE_LOCALCACHE'])
 -{
 -    if (!is_dir($GLOBALS['config']['CACHEDIR'])) { mkdir($GLOBALS['config']['CACHEDIR'],0705); chmod($GLOBALS['config']['CACHEDIR'],0705); }
 -    if (!is_file($GLOBALS['config']['CACHEDIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['CACHEDIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.
 -}
  
  // Handling of old config file which do not have the new parameters.
  if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(indexUrl());