diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2013-05-31 22:55:52 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2013-05-31 22:55:52 +0200 |
commit | aa8c9f2a32ea75278d52c86c6a3a39d34bce5cc7 (patch) | |
tree | 0f87b4812a968e85383eedb6803170e913cb6275 /inc | |
parent | baa8617364c3888fd28c3ffe83cfeb5345914356 (diff) | |
download | wallabag-aa8c9f2a32ea75278d52c86c6a3a39d34bce5cc7.tar.gz wallabag-aa8c9f2a32ea75278d52c86c6a3a39d34bce5cc7.tar.zst wallabag-aa8c9f2a32ea75278d52c86c6a3a39d34bce5cc7.zip |
Installation mode
Diffstat (limited to 'inc')
-rw-r--r-- | inc/Session.class.php | 2 | ||||
-rw-r--r-- | inc/config.php | 25 | ||||
-rw-r--r-- | inc/functions.php | 7 | ||||
-rw-r--r-- | inc/store/sqlite.class.php | 51 | ||||
-rw-r--r-- | inc/store/store.class.php | 8 |
5 files changed, 86 insertions, 7 deletions
diff --git a/inc/Session.class.php b/inc/Session.class.php index ee12b3d1..eff924cc 100644 --- a/inc/Session.class.php +++ b/inc/Session.class.php | |||
@@ -93,7 +93,7 @@ class Session | |||
93 | // Force logout | 93 | // Force logout |
94 | public static function logout() | 94 | public static function logout() |
95 | { | 95 | { |
96 | unset($_SESSION['uid'],$_SESSION['info'],$_SESSION['expires_on'],$_SESSION['tokens']); | 96 | unset($_SESSION['uid'],$_SESSION['info'],$_SESSION['expires_on'],$_SESSION['tokens'], $_SESSION['login'], $_SESSION['pass']); |
97 | } | 97 | } |
98 | 98 | ||
99 | // Make sure user is logged in. | 99 | // Make sure user is logged in. |
diff --git a/inc/config.php b/inc/config.php index 737f5215..2de725f4 100644 --- a/inc/config.php +++ b/inc/config.php | |||
@@ -18,6 +18,7 @@ define ('ABS_PATH', 'assets/'); | |||
18 | define ('CONVERT_LINKS_FOOTNOTES', TRUE); | 18 | define ('CONVERT_LINKS_FOOTNOTES', TRUE); |
19 | define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE); | 19 | define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE); |
20 | define ('DOWNLOAD_PICTURES', TRUE); | 20 | define ('DOWNLOAD_PICTURES', TRUE); |
21 | define ('SALT', '464v54gLLw928uz4zUBqkRJeiPY68zCX'); | ||
21 | $storage_type = 'sqlite'; # sqlite or file | 22 | $storage_type = 'sqlite'; # sqlite or file |
22 | 23 | ||
23 | include 'functions.php'; | 24 | include 'functions.php'; |
@@ -33,9 +34,7 @@ require_once 'class.messages.php'; | |||
33 | 34 | ||
34 | Session::init(); | 35 | Session::init(); |
35 | 36 | ||
36 | $store = new $storage_type(); | 37 | $store = new $storage_type(); |
37 | $msg = new Messages(); | ||
38 | |||
39 | # initialisation de RainTPL | 38 | # initialisation de RainTPL |
40 | raintpl::$tpl_dir = './tpl/'; | 39 | raintpl::$tpl_dir = './tpl/'; |
41 | raintpl::$cache_dir = './cache/'; | 40 | raintpl::$cache_dir = './cache/'; |
@@ -43,4 +42,24 @@ raintpl::$base_url = get_poche_url(); | |||
43 | raintpl::configure('path_replace', false); | 42 | raintpl::configure('path_replace', false); |
44 | raintpl::configure('debug', false); | 43 | raintpl::configure('debug', false); |
45 | $tpl = new raintpl(); | 44 | $tpl = new raintpl(); |
45 | |||
46 | if(!$store->isInstalled()) | ||
47 | { | ||
48 | logm('poche still not installed'); | ||
49 | $tpl->draw('install'); | ||
50 | if (isset($_GET['install'])) { | ||
51 | if (($_POST['password'] == $_POST['password_repeat']) | ||
52 | && $_POST['password'] != "" && $_POST['login'] != "") { | ||
53 | $store->install($_POST['login'], encode_string($_POST['password'] . $_POST['login'])); | ||
54 | Session::logout(); | ||
55 | MyTool::redirect(); | ||
56 | } | ||
57 | } | ||
58 | exit(); | ||
59 | } | ||
60 | |||
61 | $_SESSION['login'] = (isset ($_SESSION['login'])) ? $_SESSION['login'] : $store->getLogin(); | ||
62 | $_SESSION['pass'] = (isset ($_SESSION['pass'])) ? $_SESSION['pass'] : $store->getPassword(); | ||
63 | |||
64 | $msg = new Messages(); | ||
46 | $tpl->assign('msg', $msg); \ No newline at end of file | 65 | $tpl->assign('msg', $msg); \ No newline at end of file |
diff --git a/inc/functions.php b/inc/functions.php index c2a149c6..73e591c5 100644 --- a/inc/functions.php +++ b/inc/functions.php | |||
@@ -23,6 +23,11 @@ function get_poche_url() | |||
23 | return $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; | 23 | return $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
24 | } | 24 | } |
25 | 25 | ||
26 | function encode_string($string) | ||
27 | { | ||
28 | return sha1($string . SALT); | ||
29 | } | ||
30 | |||
26 | // function define to retrieve url content | 31 | // function define to retrieve url content |
27 | function get_external_file($url) | 32 | function get_external_file($url) |
28 | { | 33 | { |
@@ -375,12 +380,10 @@ function action_to_do($action, $url, $id = 0) | |||
375 | break; | 380 | break; |
376 | case 'toggle_fav' : | 381 | case 'toggle_fav' : |
377 | $store->favoriteById($id); | 382 | $store->favoriteById($id); |
378 | $msg->add('s', 'the favorite toggle has been done successfully'); | ||
379 | logm('mark as favorite link #' . $id); | 383 | logm('mark as favorite link #' . $id); |
380 | break; | 384 | break; |
381 | case 'toggle_archive' : | 385 | case 'toggle_archive' : |
382 | $store->archiveById($id); | 386 | $store->archiveById($id); |
383 | $msg->add('s', 'the archive toggle has been done successfully'); | ||
384 | logm('archive link #' . $id); | 387 | logm('archive link #' . $id); |
385 | break; | 388 | break; |
386 | default: | 389 | default: |
diff --git a/inc/store/sqlite.class.php b/inc/store/sqlite.class.php index cda412e6..4bfbb29e 100644 --- a/inc/store/sqlite.class.php +++ b/inc/store/sqlite.class.php | |||
@@ -17,7 +17,6 @@ class Sqlite extends Store { | |||
17 | parent::__construct(); | 17 | parent::__construct(); |
18 | 18 | ||
19 | $this->handle = new PDO(self::$db_path); | 19 | $this->handle = new PDO(self::$db_path); |
20 | $this->handle->exec('CREATE TABLE IF NOT EXISTS "entries" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE , "title" VARCHAR, "url" VARCHAR UNIQUE , "is_read" INTEGER DEFAULT 0, "is_fav" INTEGER DEFAULT 0, "content" BLOB)'); | ||
21 | $this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); | 20 | $this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
22 | } | 21 | } |
23 | 22 | ||
@@ -25,6 +24,56 @@ class Sqlite extends Store { | |||
25 | return $this->handle; | 24 | return $this->handle; |
26 | } | 25 | } |
27 | 26 | ||
27 | public function isInstalled() { | ||
28 | $sql = "SELECT name FROM sqlite_sequence WHERE name=?"; | ||
29 | $query = $this->executeQuery($sql, array('config')); | ||
30 | $hasConfig = $query->fetchAll(); | ||
31 | |||
32 | if (count($hasConfig) == 0) | ||
33 | return FALSE; | ||
34 | |||
35 | if (!$this->getLogin() || !$this->getPassword()) | ||
36 | return FALSE; | ||
37 | |||
38 | return TRUE; | ||
39 | } | ||
40 | |||
41 | public function install($login, $password) { | ||
42 | $this->getHandle()->exec('CREATE TABLE IF NOT EXISTS "config" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE , "name" VARCHAR UNIQUE, "value" BLOB)'); | ||
43 | |||
44 | $this->handle->exec('CREATE TABLE IF NOT EXISTS "entries" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE , "title" VARCHAR, "url" VARCHAR UNIQUE , "is_read" INTEGER DEFAULT 0, "is_fav" INTEGER DEFAULT 0, "content" BLOB)'); | ||
45 | |||
46 | if (!$this->getLogin()) { | ||
47 | $sql_login = 'INSERT INTO config ( name, value ) VALUES (?, ?)'; | ||
48 | $params_login = array('login', $login); | ||
49 | $query = $this->executeQuery($sql_login, $params_login); | ||
50 | } | ||
51 | |||
52 | if (!$this->getPassword()) { | ||
53 | $sql_pass = 'INSERT INTO config ( name, value ) VALUES (?, ?)'; | ||
54 | $params_pass = array('password', $password); | ||
55 | $query = $this->executeQuery($sql_pass, $params_pass); | ||
56 | } | ||
57 | |||
58 | return TRUE; | ||
59 | } | ||
60 | |||
61 | public function getLogin() { | ||
62 | $sql = "SELECT value FROM config WHERE name=?"; | ||
63 | $query = $this->executeQuery($sql, array('login')); | ||
64 | $login = $query->fetchAll(); | ||
65 | |||
66 | return isset($login[0]['value']) ? $login[0]['value'] : FALSE; | ||
67 | } | ||
68 | |||
69 | public function getPassword() { | ||
70 | $sql = "SELECT value FROM config WHERE name=?"; | ||
71 | $query = $this->executeQuery($sql, array('password')); | ||
72 | $pass = $query->fetchAll(); | ||
73 | |||
74 | return isset($pass[0]['value']) ? $pass[0]['value'] : FALSE; | ||
75 | } | ||
76 | |||
28 | private function executeQuery($sql, $params) { | 77 | private function executeQuery($sql, $params) { |
29 | try | 78 | try |
30 | { | 79 | { |
diff --git a/inc/store/store.class.php b/inc/store/store.class.php index 360ff7c2..dd7d4cfe 100644 --- a/inc/store/store.class.php +++ b/inc/store/store.class.php | |||
@@ -13,6 +13,14 @@ class Store { | |||
13 | 13 | ||
14 | } | 14 | } |
15 | 15 | ||
16 | public function getLogin() { | ||
17 | |||
18 | } | ||
19 | |||
20 | public function getPassword() { | ||
21 | |||
22 | } | ||
23 | |||
16 | public function add() { | 24 | public function add() { |
17 | 25 | ||
18 | } | 26 | } |