diff --git a/CREDITS b/CREDITS index d6874a7..a6dedce 100644 --- a/CREDITS +++ b/CREDITS @@ -1,5 +1,5 @@ poche is based on : -* PHP Readability http://www.keyvan.net/2010/08/php-readability/ +* PHP Readability https://bitbucket.org/fivefilters/php-readability * Encoding https://github.com/neitanod/forceutf8 * logo by Brightmix http://www.iconfinder.com/icondetails/43256/128/jeans_monotone_pocket_icon * icons http://icomoon.io diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 38b4a98..0439f30 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -31,6 +31,11 @@ class Poche private function init() { + if (file_exists('./install') && !DEBUG_POCHE) { + Tools::logm('folder /install exists'); + die('the folder /install exists, you have to delete it before using poche.'); + } + Tools::initPhp(); Session::init(); diff --git a/index.php b/index.php index 40cadf8..353df87 100644 --- a/index.php +++ b/index.php @@ -10,6 +10,7 @@ include dirname(__FILE__).'/inc/poche/config.inc.php'; +# Parse GET & REFERER vars $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']; $view = Tools::checkVar('view', 'home'); $action = Tools::checkVar('action'); @@ -17,6 +18,7 @@ $id = Tools::checkVar('id'); $_SESSION['sort'] = Tools::checkVar('sort', 'id'); $url = new Url((isset ($_GET['url'])) ? $_GET['url'] : ''); +# poche actions if (isset($_GET['login'])) { # hello you $poche->login($referer); @@ -36,6 +38,7 @@ elseif (isset($_GET['export'])) { $poche->export(); } +# vars to send to templates $tpl_vars = array( 'referer' => $referer, 'view' => $view, @@ -50,6 +53,7 @@ if (Session::isLogged()) { $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id)); } else { + # login $tpl_file = 'login.twig'; } @@ -57,5 +61,5 @@ else { $messages = $poche->messages->display('all', FALSE); $tpl_vars = array_merge($tpl_vars, array('messages' => $messages)); -# Aaaaaaand action ! +# display poche echo $poche->tpl->render($tpl_file, $tpl_vars); \ No newline at end of file diff --git a/install/update_sqlite_from_0_to_1.php b/install/update_sqlite_from_0_to_1.php index c88af54..299abf4 100644 --- a/install/update_sqlite_from_0_to_1.php +++ b/install/update_sqlite_from_0_to_1.php @@ -1,5 +1,5 @@ setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);