aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rwxr-xr-xinc/poche/Poche.class.php25
-rwxr-xr-xinc/poche/config.inc.php.new4
-rwxr-xr-x[-rw-r--r--]inc/poche/global.inc.php1
3 files changed, 20 insertions, 10 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 811895dc..66710ecb 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -101,7 +101,7 @@ class Poche
101 101
102 public function configFileIsAvailable() { 102 public function configFileIsAvailable() {
103 if (! self::$configFileAvailable) { 103 if (! self::$configFileAvailable) {
104 $this->notInstalledMessage[] = 'You have to rename inc/poche/config.inc.php.new to inc/poche/config.inc.php.'; 104 $this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.';
105 105
106 return false; 106 return false;
107 } 107 }
@@ -434,12 +434,24 @@ class Poche
434 case 'toggle_fav' : 434 case 'toggle_fav' :
435 $this->store->favoriteById($id, $this->user->getId()); 435 $this->store->favoriteById($id, $this->user->getId());
436 Tools::logm('mark as favorite link #' . $id); 436 Tools::logm('mark as favorite link #' . $id);
437 Tools::redirect(); 437 if ( Tools::isAjaxRequest() ) {
438 echo 1;
439 exit;
440 }
441 else {
442 Tools::redirect();
443 }
438 break; 444 break;
439 case 'toggle_archive' : 445 case 'toggle_archive' :
440 $this->store->archiveById($id, $this->user->getId()); 446 $this->store->archiveById($id, $this->user->getId());
441 Tools::logm('archive link #' . $id); 447 Tools::logm('archive link #' . $id);
442 Tools::redirect(); 448 if ( Tools::isAjaxRequest() ) {
449 echo 1;
450 exit;
451 }
452 else {
453 Tools::redirect();
454 }
443 break; 455 break;
444 case 'archive_all' : 456 case 'archive_all' :
445 $this->store->archiveAll($this->user->getId()); 457 $this->store->archiveAll($this->user->getId());
@@ -822,13 +834,6 @@ class Poche
822 */ 834 */
823 public function import() { 835 public function import() {
824 836
825 if (!defined('IMPORT_LIMIT')) {
826 define('IMPORT_LIMIT', 5);
827 }
828 if (!defined('IMPORT_DELAY')) {
829 define('IMPORT_DELAY', 5);
830 }
831
832 if ( isset($_FILES['file']) ) { 837 if ( isset($_FILES['file']) ) {
833 Tools::logm('Import stated: parsing file'); 838 Tools::logm('Import stated: parsing file');
834 839
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 83b3c4c0..3b08c212 100755
--- a/inc/poche/config.inc.php.new
+++ b/inc/poche/config.inc.php.new
@@ -42,6 +42,10 @@ define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
42define ('NOT_FLATTRABLE', '0'); 42define ('NOT_FLATTRABLE', '0');
43define ('FLATTRABLE', '1'); 43define ('FLATTRABLE', '1');
44define ('FLATTRED', '2'); 44define ('FLATTRED', '2');
45// display or not print link in article view
46define ('SHOW_PRINTLINK', '1');
47// display or not percent of read in article view. Affects only default theme.
48define ('SHOW_READPERCENT', '1');
45define ('ABS_PATH', 'assets/'); 49define ('ABS_PATH', 'assets/');
46 50
47define ('DEFAULT_THEME', 'baggy'); 51define ('DEFAULT_THEME', 'baggy');
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 15091387..14e9dd93 100644..100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -43,6 +43,7 @@ if (! file_exists(INCLUDES . '/poche/config.inc.php')) {
43 Poche::$configFileAvailable = false; 43 Poche::$configFileAvailable = false;
44} else { 44} else {
45 require_once INCLUDES . '/poche/config.inc.php'; 45 require_once INCLUDES . '/poche/config.inc.php';
46 require_once INCLUDES . '/poche/config.inc.default.php';
46} 47}
47 48
48if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { 49if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) {