mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 19:11:07 +00:00
test if /install exists
This commit is contained in:
parent
7aa8ccc47d
commit
ed06f04077
4 changed files with 12 additions and 3 deletions
2
CREDITS
2
CREDITS
|
@ -1,5 +1,5 @@
|
||||||
poche is based on :
|
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
|
* Encoding https://github.com/neitanod/forceutf8
|
||||||
* logo by Brightmix http://www.iconfinder.com/icondetails/43256/128/jeans_monotone_pocket_icon
|
* logo by Brightmix http://www.iconfinder.com/icondetails/43256/128/jeans_monotone_pocket_icon
|
||||||
* icons http://icomoon.io
|
* icons http://icomoon.io
|
||||||
|
|
|
@ -31,6 +31,11 @@ class Poche
|
||||||
|
|
||||||
private function init()
|
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();
|
Tools::initPhp();
|
||||||
Session::init();
|
Session::init();
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
include dirname(__FILE__).'/inc/poche/config.inc.php';
|
include dirname(__FILE__).'/inc/poche/config.inc.php';
|
||||||
|
|
||||||
|
# Parse GET & REFERER vars
|
||||||
$referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
|
$referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
|
||||||
$view = Tools::checkVar('view', 'home');
|
$view = Tools::checkVar('view', 'home');
|
||||||
$action = Tools::checkVar('action');
|
$action = Tools::checkVar('action');
|
||||||
|
@ -17,6 +18,7 @@ $id = Tools::checkVar('id');
|
||||||
$_SESSION['sort'] = Tools::checkVar('sort', 'id');
|
$_SESSION['sort'] = Tools::checkVar('sort', 'id');
|
||||||
$url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
|
$url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
|
||||||
|
|
||||||
|
# poche actions
|
||||||
if (isset($_GET['login'])) {
|
if (isset($_GET['login'])) {
|
||||||
# hello you
|
# hello you
|
||||||
$poche->login($referer);
|
$poche->login($referer);
|
||||||
|
@ -36,6 +38,7 @@ elseif (isset($_GET['export'])) {
|
||||||
$poche->export();
|
$poche->export();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# vars to send to templates
|
||||||
$tpl_vars = array(
|
$tpl_vars = array(
|
||||||
'referer' => $referer,
|
'referer' => $referer,
|
||||||
'view' => $view,
|
'view' => $view,
|
||||||
|
@ -50,6 +53,7 @@ if (Session::isLogged()) {
|
||||||
$tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id));
|
$tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
# login
|
||||||
$tpl_file = 'login.twig';
|
$tpl_file = 'login.twig';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,5 +61,5 @@ else {
|
||||||
$messages = $poche->messages->display('all', FALSE);
|
$messages = $poche->messages->display('all', FALSE);
|
||||||
$tpl_vars = array_merge($tpl_vars, array('messages' => $messages));
|
$tpl_vars = array_merge($tpl_vars, array('messages' => $messages));
|
||||||
|
|
||||||
# Aaaaaaand action !
|
# display poche
|
||||||
echo $poche->tpl->render($tpl_file, $tpl_vars);
|
echo $poche->tpl->render($tpl_file, $tpl_vars);
|
|
@ -1,5 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
|
# import script to upgrade from poche 0.3
|
||||||
$db_path = 'sqlite:../db/poche.sqlite';
|
$db_path = 'sqlite:../db/poche.sqlite';
|
||||||
$handle = new PDO($db_path);
|
$handle = new PDO($db_path);
|
||||||
$handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
$handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
||||||
|
|
Loading…
Reference in a new issue