moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-30 04:42:19 -05:00
Code Issues Releases Wiki Activity

postgres

Browse Source
This commit is contained in:
Nicolas Lœuillet 2013-08-07 14:24:07 +02:00
parent 8d3275bee4
commit bc1ee8524e
9 changed files with 203 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/3rdparty/paginator.php vendored
View File

@ -100,7 +100,11 @@ class Paginator{
* @return string * @return string
*/ */
public function get_limit(){ public function get_limit(){
return "LIMIT ".$this->get_start().",$this->_perPage"; if (STORAGE == 'postgres') {
return "LIMIT ".$this->_perPage." OFFSET ".$this->get_start();
} else {
return "LIMIT ".$this->get_start().",".$this->_perPage;
}
} }
/** /**

38
inc/store/sqlite.class.php → inc/poche/Database.class.php
View File

@ -8,15 +8,25 @@
* @license http://www.wtfpl.net/ see COPYING file * @license http://www.wtfpl.net/ see COPYING file
*/ */
class Sqlite extends Store { class Database {
#postgresql
public static $db_path = 'pgsql:host=localhost;dbname=poche';
public static $user = 'postgres';
public static $password = 'postgres';
#sqlite
// public static $db_path = 'sqlite:./db/poche.sqlite';
// public static $user = '';
// public static $password = '';
#mysql
// public static $db_path = 'mysql:host=localhost;dbname=poche';
// public static $user = 'root';
// public static $password = 'root';
public static $db_path = 'sqlite:./db/poche.sqlite';
var $handle; var $handle;
function __construct() { function __construct() {
parent::__construct(); $this->handle = new PDO(self::$db_path, self::$user, self::$password);
$this->handle = new PDO(self::$db_path);
$this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
} }
@ -91,6 +101,7 @@ class Sqlite extends Store {
catch (Exception $e) catch (Exception $e)
{ {
Tools::logm('execute query error : '.$e->getMessage()); Tools::logm('execute query error : '.$e->getMessage());
return FALSE;
} }
} }
@ -103,8 +114,6 @@ class Sqlite extends Store {
} }
public function retrieveOneById($id, $user_id) { public function retrieveOneById($id, $user_id) {
parent::__construct();
$entry = NULL; $entry = NULL;
$sql = "SELECT * FROM entries WHERE id=? AND user_id=?"; $sql = "SELECT * FROM entries WHERE id=? AND user_id=?";
$params = array(intval($id), $user_id); $params = array(intval($id), $user_id);
@ -115,8 +124,6 @@ class Sqlite extends Store {
} }
public function getEntriesByView($view, $user_id, $limit = '') { public function getEntriesByView($view, $user_id, $limit = '') {
parent::__construct();
switch ($_SESSION['sort']) switch ($_SESSION['sort'])
{ {
case 'ia': case 'ia':
@ -140,11 +147,11 @@ class Sqlite extends Store {
{ {
case 'archive': case 'archive':
$sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? " . $order; $sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? " . $order;
$params = array($user_id, -1); $params = array($user_id, 1);
break; break;
case 'fav' : case 'fav' :
$sql = "SELECT * FROM entries WHERE user_id=? AND is_fav=? " . $order; $sql = "SELECT * FROM entries WHERE user_id=? AND is_fav=? " . $order;
$params = array($user_id, -1); $params = array($user_id, 1);
break; break;
default: default:
$sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? " . $order; $sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? " . $order;
@ -161,7 +168,6 @@ class Sqlite extends Store {
} }
public function add($url, $title, $content, $user_id) { public function add($url, $title, $content, $user_id) {
parent::__construct();
$sql_action = 'INSERT INTO entries ( url, title, content, user_id ) VALUES (?, ?, ?, ?)'; $sql_action = 'INSERT INTO entries ( url, title, content, user_id ) VALUES (?, ?, ?, ?)';
$params_action = array($url, $title, $content, $user_id); $params_action = array($url, $title, $content, $user_id);
$query = $this->executeQuery($sql_action, $params_action); $query = $this->executeQuery($sql_action, $params_action);
@ -169,7 +175,6 @@ class Sqlite extends Store {
} }
public function deleteById($id, $user_id) { public function deleteById($id, $user_id) {
parent::__construct();
$sql_action = "DELETE FROM entries WHERE id=? AND user_id=?"; $sql_action = "DELETE FROM entries WHERE id=? AND user_id=?";
$params_action = array($id, $user_id); $params_action = array($id, $user_id);
$query = $this->executeQuery($sql_action, $params_action); $query = $this->executeQuery($sql_action, $params_action);
@ -177,21 +182,18 @@ class Sqlite extends Store {
} }
public function favoriteById($id, $user_id) { public function favoriteById($id, $user_id) {
parent::__construct(); $sql_action = "UPDATE entries SET is_fav=NOT is_fav WHERE id=? AND user_id=?";
$sql_action = "UPDATE entries SET is_fav=~is_fav WHERE id=? AND user_id=?";
$params_action = array($id, $user_id); $params_action = array($id, $user_id);
$query = $this->executeQuery($sql_action, $params_action); $query = $this->executeQuery($sql_action, $params_action);
} }
public function archiveById($id, $user_id) { public function archiveById($id, $user_id) {
parent::__construct(); $sql_action = "UPDATE entries SET is_read=NOT is_read WHERE id=? AND user_id=?";
$sql_action = "UPDATE entries SET is_read=~is_read WHERE id=? AND user_id=?";
$params_action = array($id, $user_id); $params_action = array($id, $user_id);
$query = $this->executeQuery($sql_action, $params_action); $query = $this->executeQuery($sql_action, $params_action);
} }
public function getLastId() { public function getLastId() {
parent::__construct();
return $this->getHandle()->lastInsertId(); return $this->getHandle()->lastInsertId();
} }
} }

23
inc/poche/Poche.class.php
View File

@ -16,9 +16,9 @@ class Poche
public $messages; public $messages;
public $pagination; public $pagination;
function __construct($storage_type) function __construct()
{ {
$this->store = new $storage_type(); $this->store = new Database();
$this->init(); $this->init();
$this->messages = new Messages(); $this->messages = new Messages();
@ -52,9 +52,13 @@ class Poche
# template engine # template engine
$loader = new Twig_Loader_Filesystem(TPL); $loader = new Twig_Loader_Filesystem(TPL);
$this->tpl = new Twig_Environment($loader, array( if (DEBUG_POCHE) {
'cache' => CACHE, $twig_params = array();
)); }
else {
$twig_params = array('cache' => CACHE);
}
$this->tpl = new Twig_Environment($loader, $twig_params);
$this->tpl->addExtension(new Twig_Extensions_Extension_I18n()); $this->tpl->addExtension(new Twig_Extensions_Extension_I18n());
# filter to display domain name of an url # filter to display domain name of an url
$filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain'); $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
@ -124,18 +128,19 @@ class Poche
Tools::redirect(); Tools::redirect();
break; break;
case 'delete': case 'delete':
$msg = 'delete link #' . $id;
if ($this->store->deleteById($id, $this->user->getId())) { if ($this->store->deleteById($id, $this->user->getId())) {
if (DOWNLOAD_PICTURES) { if (DOWNLOAD_PICTURES) {
remove_directory(ABS_PATH . $id); remove_directory(ABS_PATH . $id);
} }
$this->messages->add('s', _('the link has been deleted successfully')); $this->messages->add('s', _('the link has been deleted successfully'));
Tools::logm('delete link #' . $id);
} }
else { else {
$this->messages->add('e', _('the link wasn\'t deleted')); $this->messages->add('e', _('the link wasn\'t deleted'));
Tools::logm('error : can\'t delete link #' . $id); $msg = 'error : can\'t delete link #' . $id;
} }
Tools::redirect(); Tools::logm($msg);
Tools::redirect('?');
break; break;
case 'toggle_fav' : case 'toggle_fav' :
$this->store->favoriteById($id, $this->user->getId()); $this->store->favoriteById($id, $this->user->getId());
@ -385,7 +390,7 @@ class Poche
if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) { if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
$version = file_get_contents($cache_file); $version = file_get_contents($cache_file);
} else { } else {
$version = file_get_contents('http://www.inthepoche.com/' . $which); $version = file_get_contents('http://static.inthepoche.com/versions/' . $which);
file_put_contents($cache_file, $version, LOCK_EX); file_put_contents($cache_file, $version, LOCK_EX);
} }
return $version; return $version;

2
inc/poche/Tools.class.php
View File

@ -77,6 +77,7 @@ class Tools
$url = $ref; $url = $ref;
} }
} }
self::logm('redirect to ' . $url);
header('Location: '.$url); header('Location: '.$url);
exit(); exit();
} }
@ -198,6 +199,7 @@ class Tools
if (DEBUG_POCHE) { if (DEBUG_POCHE) {
$t = strval(date('Y/m/d_H:i:s')) . ' - ' . $_SERVER["REMOTE_ADDR"] . ' - ' . strval($message) . "\n"; $t = strval(date('Y/m/d_H:i:s')) . ' - ' . $_SERVER["REMOTE_ADDR"] . ' - ' . strval($message) . "\n";
file_put_contents(CACHE . '/log.txt', $t, FILE_APPEND); file_put_contents(CACHE . '/log.txt', $t, FILE_APPEND);
error_log('DEBUG POCHE : ' . $message);
} }
} }

7
inc/poche/config.inc.php
View File

@ -24,7 +24,7 @@ define ('CACHE', './cache');
define ('LANG', 'en_EN.UTF8'); define ('LANG', 'en_EN.UTF8');
define ('PAGINATION', '10'); define ('PAGINATION', '10');
define ('THEME', 'light'); define ('THEME', 'light');
$storage_type = 'sqlite'; # sqlite, mysql, (file, not yet) define ('STORAGE','postgres'); # postgres, mysql, sqlite
# /!\ Be careful if you change the lines below /!\ # /!\ Be careful if you change the lines below /!\
require_once './inc/poche/User.class.php'; require_once './inc/poche/User.class.php';
@ -34,8 +34,7 @@ require_once './inc/3rdparty/class.messages.php';
require_once './inc/poche/Poche.class.php'; require_once './inc/poche/Poche.class.php';
require_once './inc/3rdparty/Readability.php'; require_once './inc/3rdparty/Readability.php';
require_once './inc/3rdparty/Encoding.php'; require_once './inc/3rdparty/Encoding.php';
require_once './inc/store/store.class.php'; require_once './inc/poche/Database.class.php';
require_once './inc/store/' . $storage_type . '.class.php';
require_once './vendor/autoload.php'; require_once './vendor/autoload.php';
require_once './inc/3rdparty/simple_html_dom.php'; require_once './inc/3rdparty/simple_html_dom.php';
require_once './inc/3rdparty/paginator.php'; require_once './inc/3rdparty/paginator.php';
@ -45,7 +44,7 @@ if (DOWNLOAD_PICTURES) {
require_once './inc/poche/pochePictures.php'; require_once './inc/poche/pochePictures.php';
} }
$poche = new Poche($storage_type); $poche = new Poche();
#XSRF protection with token #XSRF protection with token
// if (!empty($_POST)) { // if (!empty($_POST)) {

47
inc/store/file.class.php
View File

@ -1,47 +0,0 @@
<?php
/**
* poche, a read it later open source system
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/
class File extends Store {
function __construct() {
}
public function add() {
}
public function retrieveOneById($id) {
}
public function retrieveOneByURL($url) {
}
public function deleteById($id) {
}
public function favoriteById($id) {
}
public function archiveById($id) {
}
public function getEntriesByView($view) {
}
public function getLastId() {
}
}

195
inc/store/mysql.class.php
View File

@ -1,195 +0,0 @@
<?php
/**
* poche, a read it later open source system
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/
class Mysql extends Store {
public static $db_path = 'mysql:host=localhost;dbname=poche';
public static $user = 'root';
public static $password = 'root';
var $handle;
function __construct() {
parent::__construct();
$this->handle = new PDO(self::$db_path, self::$user, self::$password);
$this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}
private function getHandle() {
return $this->handle;
}
public function isInstalled() {
// $sql = "SELECT name FROM sqlite_sequence WHERE name=?";
// $query = $this->executeQuery($sql, array('config'));
// $hasConfig = $query->fetchAll();
// if (count($hasConfig) == 0)
// return FALSE;
// if (!$this->getLogin() || !$this->getPassword())
// return FALSE;
return TRUE;
}
public function install($login, $password) {
$this->getHandle()->exec('CREATE TABLE IF NOT EXISTS "config" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE , "name" VARCHAR UNIQUE, "value" BLOB)');
$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)');
if (!$this->getLogin()) {
$sql_login = 'INSERT INTO config ( name, value ) VALUES (?, ?)';
$params_login = array('login', $login);
$query = $this->executeQuery($sql_login, $params_login);
}
if (!$this->getPassword()) {
$sql_pass = 'INSERT INTO config ( name, value ) VALUES (?, ?)';
$params_pass = array('password', $password);
$query = $this->executeQuery($sql_pass, $params_pass);
}
return TRUE;
}
public function getLogin() {
$sql = "SELECT value FROM config WHERE name=?";
$query = $this->executeQuery($sql, array('login'));
$login = $query->fetchAll();
return isset($login[0]['value']) ? $login[0]['value'] : FALSE;
}
public function getPassword() {
$sql = "SELECT value FROM config WHERE name=?";
$query = $this->executeQuery($sql, array('password'));
$pass = $query->fetchAll();
return isset($pass[0]['value']) ? $pass[0]['value'] : FALSE;
}
public function updatePassword($password)
{
$sql_update = "UPDATE config SET value=? WHERE name='password'";
$params_update = array($password);
$query = $this->executeQuery($sql_update, $params_update);
}
private function executeQuery($sql, $params) {
try
{
$query = $this->getHandle()->prepare($sql);
$query->execute($params);
return $query;
}
catch (Exception $e)
{
Tools::logm('execute query error : '.$e->getMessage());
}
}
public function retrieveAll() {
$sql = "SELECT * FROM entries ORDER BY id";
$query = $this->executeQuery($sql, array());
$entries = $query->fetchAll();
return $entries;
}
public function retrieveOneById($id) {
parent::__construct();
$entry = NULL;
$sql = "SELECT * FROM entries WHERE id=?";
$params = array(intval($id));
$query = $this->executeQuery($sql, $params);
$entry = $query->fetchAll();
return $entry[0];
}
public function getEntriesByView($view) {
parent::__construct();
switch ($_SESSION['sort'])
{
case 'ia':
$order = 'ORDER BY id';
break;
case 'id':
$order = 'ORDER BY id DESC';
break;
case 'ta':
$order = 'ORDER BY lower(title)';
break;
case 'td':
$order = 'ORDER BY lower(title) DESC';
break;
default:
$order = 'ORDER BY id';
break;
}
switch ($view)
{
case 'archive':
$sql = "SELECT * FROM entries WHERE is_read=? " . $order;
$params = array(1);
break;
case 'fav' :
$sql = "SELECT * FROM entries WHERE is_fav=? " . $order;
$params = array(1);
break;
default:
$sql = "SELECT * FROM entries WHERE is_read=? " . $order;
$params = array(0);
break;
}
$query = $this->executeQuery($sql, $params);
$entries = $query->fetchAll();
return $entries;
}
public function add($url, $title, $content) {
parent::__construct();
$sql_action = 'INSERT INTO entries ( url, title, content ) VALUES (?, ?, ?)';
$params_action = array($url, $title, $content);
$query = $this->executeQuery($sql_action, $params_action);
return $query;
}
public function deleteById($id) {
parent::__construct();
$sql_action = "DELETE FROM entries WHERE id=?";
$params_action = array($id);
$query = $this->executeQuery($sql_action, $params_action);
return $query;
}
public function favoriteById($id) {
parent::__construct();
$sql_action = "UPDATE entries SET is_fav = IF (is_fav, 0, 1)";
$query = $this->executeQuery($sql_action, array());
}
public function archiveById($id) {
parent::__construct();
$sql_action = "UPDATE entries SET is_read = IF (is_read, 0, 1)";
$query = $this->executeQuery($sql_action, array());
}
public function getLastId() {
parent::__construct();
return $this->getHandle()->lastInsertId();
}
}

55
inc/store/store.class.php
View File

@ -1,55 +0,0 @@
<?php
/**
* poche, a read it later open source system
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/
class Store {
function __construct() {
}
public function login() {
}
public function add() {
}
public function retrieveAll() {
}
public function retrieveOneById($id) {
}
public function retrieveOneByURL($url) {
}
public function deleteById($id) {
}
public function favoriteById($id) {
}
public function archiveById($id) {
}
public function getEntriesByView($view) {
}
public function getLastId() {
}
}

1
tpl/_footer.twig
View File

@ -1,3 +1,4 @@
<footer class="w600p center mt3 smaller txtright"> <footer class="w600p center mt3 smaller txtright">
<p>{% trans "powered by" %} <a href="http://inthepoche.com">poche</a></p> <p>{% trans "powered by" %} <a href="http://inthepoche.com">poche</a></p>
{% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your poche version:" %}{{constant('POCHE_VERSION')}}</strong></p>{% endif %}
</footer> </footer>