aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche
diff options
context:
space:
mode:
Diffstat (limited to 'inc/poche')
-rw-r--r--inc/poche/Poche.class.php10
1 files changed, 3 insertions, 7 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 77361ef7..7e3cac82 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -228,10 +228,6 @@ class Poche
228 # filter for reading time 228 # filter for reading time
229 $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime'); 229 $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
230 $this->tpl->addFilter($filter); 230 $this->tpl->addFilter($filter);
231
232 # filter for simple filenames in config view
233 $filter = new Twig_SimpleFilter('getPrettyFilename', function($string) { return str_replace(ROOT, '', $string); });
234 $this->tpl->addFilter($filter);
235 } 231 }
236 232
237 private function install() 233 private function install()
@@ -480,8 +476,8 @@ class Poche
480 switch ($view) 476 switch ($view)
481 { 477 {
482 case 'config': 478 case 'config':
483 $dev = $this->getPocheVersion('dev'); 479 $dev = trim($this->getPocheVersion('dev'));
484 $prod = $this->getPocheVersion('prod'); 480 $prod = trim($this->getPocheVersion('prod'));
485 $compare_dev = version_compare(POCHE, $dev); 481 $compare_dev = version_compare(POCHE, $dev);
486 $compare_prod = version_compare(POCHE, $prod); 482 $compare_prod = version_compare(POCHE, $prod);
487 $themes = $this->getInstalledThemes(); 483 $themes = $this->getInstalledThemes();
@@ -745,7 +741,6 @@ class Poche
745 { 741 {
746 $this->user = array(); 742 $this->user = array();
747 Session::logout(); 743 Session::logout();
748 $this->messages->add('s', _('see you soon!'));
749 Tools::logm('logout'); 744 Tools::logm('logout');
750 Tools::redirect(); 745 Tools::redirect();
751 } 746 }
@@ -1009,6 +1004,7 @@ class Poche
1009 $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20); 1004 $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
1010 } 1005 }
1011 1006
1007 $token = str_replace('+', '', $token);
1012 $this->store->updateUserConfig($this->user->getId(), 'token', $token); 1008 $this->store->updateUserConfig($this->user->getId(), 'token', $token);
1013 $currentConfig = $_SESSION['poche_user']->config; 1009 $currentConfig = $_SESSION['poche_user']->config;
1014 $currentConfig['token'] = $token; 1010 $currentConfig['token'] = $token;