aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rwxr-xr-xinc/poche/Poche.class.php8
-rwxr-xr-xinc/poche/config.inc.default.php78
2 files changed, 43 insertions, 43 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 7e3e6afe..5aa6ea07 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -72,7 +72,7 @@ class Poche
72 72
73 # l10n 73 # l10n
74 $language = $this->user->getConfigValue('language'); 74 $language = $this->user->getConfigValue('language');
75 putenv('LC_ALL=' . $language); 75 @putenv('LC_ALL=' . $language);
76 setlocale(LC_ALL, $language); 76 setlocale(LC_ALL, $language);
77 bindtextdomain($language, LOCALE); 77 bindtextdomain($language, LOCALE);
78 textdomain($language); 78 textdomain($language);
@@ -241,12 +241,12 @@ class Poche
241 $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime'); 241 $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
242 $this->tpl->addFilter($filter); 242 $this->tpl->addFilter($filter);
243 } 243 }
244 244
245 public function createNewUser() { 245 public function createNewUser() {
246 if (isset($_GET['newuser'])){ 246 if (isset($_GET['newuser'])){
247 if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){ 247 if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){
248 $newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING); 248 $newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING);
249 if (!$this->store->userExists($newusername)){ 249 if (!$this->store->userExists($newusername)){
250 if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) { 250 if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) {
251 Tools::logm('The new user '.$newusername.' has been installed'); 251 Tools::logm('The new user '.$newusername.' has been installed');
252 $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'),$newusername)); 252 $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
265 } 265 }
266 } 266 }
267 } 267 }
268 268
269 public function deleteUser(){ 269 public function deleteUser(){
270 if (isset($_GET['deluser'])){ 270 if (isset($_GET['deluser'])){
271 if ($this->store->listUsers() > 1) { 271 if ($this->store->listUsers() > 1) {
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 3b08c212..edc42fc9 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -8,56 +8,56 @@
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
10 10
11define ('SALT', ''); # put a strong string here 11@define ('SALT', ''); # put a strong string here
12define ('LANG', 'en_EN.utf8'); 12@define ('LANG', 'en_EN.utf8');
13 13
14define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite 14@define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite
15 15
16define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located 16@define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located
17 17
18# only for postgres & mysql 18# only for postgres & mysql
19define ('STORAGE_SERVER', 'localhost'); 19@define ('STORAGE_SERVER', 'localhost');
20define ('STORAGE_DB', 'poche'); 20@define ('STORAGE_DB', 'poche');
21define ('STORAGE_USER', 'poche'); 21@define ('STORAGE_USER', 'poche');
22define ('STORAGE_PASSWORD', 'poche'); 22@define ('STORAGE_PASSWORD', 'poche');
23 23
24################################################################################# 24#################################################################################
25# Do not trespass unless you know what you are doing 25# Do not trespass unless you know what you are doing
26################################################################################# 26#################################################################################
27 27
28// Change this if not using the standart port for SSL - i.e you server is behind sslh 28// Change this if not using the standart port for SSL - i.e you server is behind sslh
29define ('SSL_PORT', 443); 29@define ('SSL_PORT', 443);
30 30
31define ('MODE_DEMO', FALSE); 31@define ('MODE_DEMO', FALSE);
32define ('DEBUG_POCHE', FALSE); 32@define ('DEBUG_POCHE', FALSE);
33define ('DOWNLOAD_PICTURES', FALSE); 33@define ('DOWNLOAD_PICTURES', FALSE);
34define ('CONVERT_LINKS_FOOTNOTES', FALSE); 34@define ('CONVERT_LINKS_FOOTNOTES', FALSE);
35define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE); 35@define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
36define ('SHARE_TWITTER', TRUE); 36@define ('SHARE_TWITTER', TRUE);
37define ('SHARE_MAIL', TRUE); 37@define ('SHARE_MAIL', TRUE);
38define ('SHARE_SHAARLI', FALSE); 38@define ('SHARE_SHAARLI', FALSE);
39define ('SHAARLI_URL', 'http://myshaarliurl.com'); 39@define ('SHAARLI_URL', 'http://myshaarliurl.com');
40define ('FLATTR', TRUE); 40@define ('FLATTR', TRUE);
41define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url='); 41@define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
42define ('NOT_FLATTRABLE', '0'); 42@define ('NOT_FLATTRABLE', '0');
43define ('FLATTRABLE', '1'); 43@define ('FLATTRABLE', '1');
44define ('FLATTRED', '2'); 44@define ('FLATTRED', '2');
45// display or not print link in article view 45// display or not print link in article view
46define ('SHOW_PRINTLINK', '1'); 46@define ('SHOW_PRINTLINK', '1');
47// display or not percent of read in article view. Affects only default theme. 47// display or not percent of read in article view. Affects only default theme.
48define ('SHOW_READPERCENT', '1'); 48@define ('SHOW_READPERCENT', '1');
49define ('ABS_PATH', 'assets/'); 49@define ('ABS_PATH', 'assets/');
50 50
51define ('DEFAULT_THEME', 'baggy'); 51@define ('DEFAULT_THEME', 'baggy');
52 52
53define ('THEME', ROOT . '/themes'); 53@define ('THEME', ROOT . '/themes');
54define ('LOCALE', ROOT . '/locale'); 54@define ('LOCALE', ROOT . '/locale');
55define ('CACHE', ROOT . '/cache'); 55@define ('CACHE', ROOT . '/cache');
56 56
57define ('PAGINATION', '10'); 57@define ('PAGINATION', '10');
58 58
59//limit for download of articles during import 59//limit for download of articles during import
60define ('IMPORT_LIMIT', 5); 60@define ('IMPORT_LIMIT', 5);
61//delay between downloads (in sec) 61//delay between downloads (in sec)
62define ('IMPORT_DELAY', 5); 62@define ('IMPORT_DELAY', 5);
63 63