moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-23 09:32:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #667 from mariroz/dev

Browse Source 
fix of putenv warning under safe mode, issue #646
This commit is contained in:
Nicolas Lœuillet 2014-04-25 13:03:09 +02:00
commit 21f29fe492
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/poche/Poche.class.php
View File

@ -72,7 +72,7 @@ class Poche
# l10n # l10n
$language = $this->user->getConfigValue('language'); $language = $this->user->getConfigValue('language');
putenv('LC_ALL=' . $language); @putenv('LC_ALL=' . $language);
setlocale(LC_ALL, $language); setlocale(LC_ALL, $language);
bindtextdomain($language, LOCALE); bindtextdomain($language, LOCALE);
textdomain($language); textdomain($language);
@ -241,12 +241,12 @@ class Poche
$filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime'); $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
$this->tpl->addFilter($filter); $this->tpl->addFilter($filter);
} }
public function createNewUser() { public function createNewUser() {
if (isset($_GET['newuser'])){ if (isset($_GET['newuser'])){
if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){ if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){
$newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING); $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))) { if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) {
Tools::logm('The new user '.$newusername.' has been installed'); 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)); $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(){ public function deleteUser(){
if (isset($_GET['deluser'])){ if (isset($_GET['deluser'])){
if ($this->store->listUsers() > 1) { if ($this->store->listUsers() > 1) {

70
inc/poche/config.inc.default.php
View File

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