Merge pull request #667 from mariroz/dev

fix of putenv warning under safe mode, issue #646

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 7e3e6afe6156ff8d245245759237b4a273228093..5aa6ea072f70b5d7b0b0ef6920c3400fbe345013 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -72,7 +72,7 @@ class Poche
 
         # l10n
         $language = $this->user->getConfigValue('language');
-        putenv('LC_ALL=' . $language);
+        @putenv('LC_ALL=' . $language);
         setlocale(LC_ALL, $language);
         bindtextdomain($language, LOCALE);
         textdomain($language);
@@ -241,12 +241,12 @@ class Poche
         $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
         $this->tpl->addFilter($filter);
     }
-    
+
     public function createNewUser() {
         if (isset($_GET['newuser'])){
             if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){
                 $newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING);
-                if (!$this->store->userExists($newusername)){  
+                if (!$this->store->userExists($newusername)){
                     if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) {
                         Tools::logm('The new user '.$newusername.' has been installed');
                         $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'),$newusername));
@@ -265,7 +265,7 @@ class Poche
             }
         }
     }
-   
+
     public function deleteUser(){
         if (isset($_GET['deluser'])){
             if ($this->store->listUsers() > 1) {

diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 3b08c212fffc0f50a1aeb934ec0ce39bac8dff11..edc42fc9f4e7115df34e68384903e756a8582513 100755 (executable)
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -8,56 +8,56 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('SALT', ''); # put a strong string here
-define ('LANG', 'en_EN.utf8');
+@define ('SALT', ''); # put a strong string here
+@define ('LANG', 'en_EN.utf8');
 
-define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite
+@define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite
 
-define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located
+@define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located
 
 # only for postgres & mysql
-define ('STORAGE_SERVER', 'localhost');
-define ('STORAGE_DB', 'poche');
-define ('STORAGE_USER', 'poche');
-define ('STORAGE_PASSWORD', 'poche');
+@define ('STORAGE_SERVER', 'localhost');
+@define ('STORAGE_DB', 'poche');
+@define ('STORAGE_USER', 'poche');
+@define ('STORAGE_PASSWORD', 'poche');
 
 #################################################################################
 # Do not trespass unless you know what you are doing
 #################################################################################
 
 // Change this if not using the standart port for SSL - i.e you server is behind sslh
-define ('SSL_PORT', 443); 
-
-define ('MODE_DEMO', FALSE);
-define ('DEBUG_POCHE', FALSE);
-define ('DOWNLOAD_PICTURES', FALSE);
-define ('CONVERT_LINKS_FOOTNOTES', FALSE);
-define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
-define ('SHARE_TWITTER', TRUE);
-define ('SHARE_MAIL', TRUE);
-define ('SHARE_SHAARLI', FALSE);
-define ('SHAARLI_URL', 'http://myshaarliurl.com');
-define ('FLATTR', TRUE);
-define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
-define ('NOT_FLATTRABLE', '0');
-define ('FLATTRABLE', '1');
-define ('FLATTRED', '2');
-// display or not print link in article view 
-define ('SHOW_PRINTLINK', '1');
-// display or not percent of read in article view. Affects only default theme. 
-define ('SHOW_READPERCENT', '1');
-define ('ABS_PATH', 'assets/');
-
-define ('DEFAULT_THEME', 'baggy');
-
-define ('THEME', ROOT . '/themes');
-define ('LOCALE', ROOT . '/locale');
-define ('CACHE', ROOT . '/cache');
-
-define ('PAGINATION', '10');
+@define ('SSL_PORT', 443);
+
+@define ('MODE_DEMO', FALSE);
+@define ('DEBUG_POCHE', FALSE);
+@define ('DOWNLOAD_PICTURES', FALSE);
+@define ('CONVERT_LINKS_FOOTNOTES', FALSE);
+@define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
+@define ('SHARE_TWITTER', TRUE);
+@define ('SHARE_MAIL', TRUE);
+@define ('SHARE_SHAARLI', FALSE);
+@define ('SHAARLI_URL', 'http://myshaarliurl.com');
+@define ('FLATTR', TRUE);
+@define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
+@define ('NOT_FLATTRABLE', '0');
+@define ('FLATTRABLE', '1');
+@define ('FLATTRED', '2');
+// display or not print link in article view
+@define ('SHOW_PRINTLINK', '1');
+// display or not percent of read in article view. Affects only default theme.
+@define ('SHOW_READPERCENT', '1');
+@define ('ABS_PATH', 'assets/');
+
+@define ('DEFAULT_THEME', 'baggy');
+
+@define ('THEME', ROOT . '/themes');
+@define ('LOCALE', ROOT . '/locale');
+@define ('CACHE', ROOT . '/cache');
+
+@define ('PAGINATION', '10');
 
 //limit for download of articles during import
-define ('IMPORT_LIMIT', 5);
+@define ('IMPORT_LIMIT', 5);
 //delay between downloads (in sec)
-define ('IMPORT_DELAY', 5);
+@define ('IMPORT_DELAY', 5);