mirror of
https://github.com/moparisthebest/wallabag
synced 2024-11-27 03:12:21 -05:00
postgres
This commit is contained in:
parent
8d3275bee4
commit
bc1ee8524e
322
inc/3rdparty/paginator.php
vendored
322
inc/3rdparty/paginator.php
vendored
@ -9,99 +9,103 @@
|
|||||||
class Paginator{
|
class Paginator{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set the number of items per page.
|
* set the number of items per page.
|
||||||
*
|
*
|
||||||
* @var numeric
|
* @var numeric
|
||||||
*/
|
*/
|
||||||
private $_perPage;
|
private $_perPage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set get parameter for fetching the page number
|
* set get parameter for fetching the page number
|
||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
private $_instance;
|
private $_instance;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sets the page number.
|
* sets the page number.
|
||||||
*
|
*
|
||||||
* @var numeric
|
* @var numeric
|
||||||
*/
|
*/
|
||||||
private $_page;
|
private $_page;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set the limit for the data source
|
* set the limit for the data source
|
||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
private $_limit;
|
private $_limit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set the total number of records/items.
|
* set the total number of records/items.
|
||||||
*
|
*
|
||||||
* @var numeric
|
* @var numeric
|
||||||
*/
|
*/
|
||||||
private $_totalRows = 0;
|
private $_totalRows = 0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* __construct
|
* __construct
|
||||||
*
|
*
|
||||||
* pass values when class is istantiated
|
* pass values when class is istantiated
|
||||||
*
|
*
|
||||||
* @param numeric $_perPage sets the number of iteems per page
|
* @param numeric $_perPage sets the number of iteems per page
|
||||||
* @param numeric $_instance sets the instance for the GET parameter
|
* @param numeric $_instance sets the instance for the GET parameter
|
||||||
*/
|
*/
|
||||||
public function __construct($perPage,$instance){
|
public function __construct($perPage,$instance){
|
||||||
$this->_instance = $instance;
|
$this->_instance = $instance;
|
||||||
$this->_perPage = $perPage;
|
$this->_perPage = $perPage;
|
||||||
$this->set_instance();
|
$this->set_instance();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get_start
|
* get_start
|
||||||
*
|
*
|
||||||
* creates the starting point for limiting the dataset
|
* creates the starting point for limiting the dataset
|
||||||
* @return numeric
|
* @return numeric
|
||||||
*/
|
*/
|
||||||
private function get_start(){
|
private function get_start(){
|
||||||
return ($this->_page * $this->_perPage) - $this->_perPage;
|
return ($this->_page * $this->_perPage) - $this->_perPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set_instance
|
* set_instance
|
||||||
*
|
*
|
||||||
* sets the instance parameter, if numeric value is 0 then set to 1
|
* sets the instance parameter, if numeric value is 0 then set to 1
|
||||||
*
|
*
|
||||||
* @var numeric
|
* @var numeric
|
||||||
*/
|
*/
|
||||||
private function set_instance(){
|
private function set_instance(){
|
||||||
$this->_page = (int) (!isset($_GET[$this->_instance]) ? 1 : $_GET[$this->_instance]);
|
$this->_page = (int) (!isset($_GET[$this->_instance]) ? 1 : $_GET[$this->_instance]);
|
||||||
$this->_page = ($this->_page == 0 ? 1 : $this->_page);
|
$this->_page = ($this->_page == 0 ? 1 : $this->_page);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set_total
|
* set_total
|
||||||
*
|
*
|
||||||
* collect a numberic value and assigns it to the totalRows
|
* collect a numberic value and assigns it to the totalRows
|
||||||
*
|
*
|
||||||
* @var numeric
|
* @var numeric
|
||||||
*/
|
*/
|
||||||
public function set_total($_totalRows){
|
public function set_total($_totalRows){
|
||||||
$this->_totalRows = $_totalRows;
|
$this->_totalRows = $_totalRows;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get_limit
|
* get_limit
|
||||||
*
|
*
|
||||||
* returns the limit for the data source, calling the get_start method and passing in the number of items perp page
|
* returns the limit for the data source, calling the get_start method and passing in the number of items perp page
|
||||||
*
|
*
|
||||||
* @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;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* page_links
|
* page_links
|
||||||
@ -112,87 +116,87 @@ class Paginator{
|
|||||||
* @var sting $ext optionally pass in extra parameters to the GET
|
* @var sting $ext optionally pass in extra parameters to the GET
|
||||||
* @return string returns the html menu
|
* @return string returns the html menu
|
||||||
*/
|
*/
|
||||||
public function page_links($path='?',$ext=null)
|
public function page_links($path='?',$ext=null)
|
||||||
{
|
{
|
||||||
$adjacents = "2";
|
$adjacents = "2";
|
||||||
$prev = $this->_page - 1;
|
$prev = $this->_page - 1;
|
||||||
$next = $this->_page + 1;
|
$next = $this->_page + 1;
|
||||||
$lastpage = ceil($this->_totalRows/$this->_perPage);
|
$lastpage = ceil($this->_totalRows/$this->_perPage);
|
||||||
$lpm1 = $lastpage - 1;
|
$lpm1 = $lastpage - 1;
|
||||||
|
|
||||||
$pagination = "";
|
$pagination = "";
|
||||||
if($lastpage > 1)
|
if($lastpage > 1)
|
||||||
{
|
{
|
||||||
$pagination .= "<div class='pagination'>";
|
$pagination .= "<div class='pagination'>";
|
||||||
if ($this->_page > 1)
|
if ($this->_page > 1)
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$prev"."$ext'>« previous</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$prev"."$ext'>« previous</a>";
|
||||||
else
|
else
|
||||||
$pagination.= "<span class='disabled'>« previous</span>";
|
$pagination.= "<span class='disabled'>« previous</span>";
|
||||||
|
|
||||||
if ($lastpage < 7 + ($adjacents * 2))
|
if ($lastpage < 7 + ($adjacents * 2))
|
||||||
{
|
{
|
||||||
for ($counter = 1; $counter <= $lastpage; $counter++)
|
for ($counter = 1; $counter <= $lastpage; $counter++)
|
||||||
{
|
{
|
||||||
if ($counter == $this->_page)
|
if ($counter == $this->_page)
|
||||||
$pagination.= "<span class='current'>$counter</span>";
|
$pagination.= "<span class='current'>$counter</span>";
|
||||||
else
|
else
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elseif($lastpage > 5 + ($adjacents * 2))
|
elseif($lastpage > 5 + ($adjacents * 2))
|
||||||
{
|
{
|
||||||
if($this->_page < 1 + ($adjacents * 2))
|
if($this->_page < 1 + ($adjacents * 2))
|
||||||
{
|
{
|
||||||
for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++)
|
for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++)
|
||||||
{
|
{
|
||||||
if ($counter == $this->_page)
|
if ($counter == $this->_page)
|
||||||
$pagination.= "<span class='current'>$counter</span>";
|
$pagination.= "<span class='current'>$counter</span>";
|
||||||
else
|
else
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";
|
||||||
}
|
}
|
||||||
$pagination.= "...";
|
$pagination.= "...";
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a>";
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a>";
|
||||||
}
|
}
|
||||||
elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
|
elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
|
||||||
{
|
{
|
||||||
$pagination.= "<a href='".$path."$this->_instance=1"."$ext'>1</a>";
|
$pagination.= "<a href='".$path."$this->_instance=1"."$ext'>1</a>";
|
||||||
$pagination.= "<a href='".$path."$this->_instance=2"."$ext'>2</a>";
|
$pagination.= "<a href='".$path."$this->_instance=2"."$ext'>2</a>";
|
||||||
$pagination.= "...";
|
$pagination.= "...";
|
||||||
for ($counter = $this->_page - $adjacents; $counter <= $this->_page + $adjacents; $counter++)
|
for ($counter = $this->_page - $adjacents; $counter <= $this->_page + $adjacents; $counter++)
|
||||||
{
|
{
|
||||||
if ($counter == $this->_page)
|
if ($counter == $this->_page)
|
||||||
$pagination.= "<span class='current'>$counter</span>";
|
$pagination.= "<span class='current'>$counter</span>";
|
||||||
else
|
else
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";
|
||||||
}
|
}
|
||||||
$pagination.= "..";
|
$pagination.= "..";
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a>";
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a>";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$pagination.= "<a href='".$path."$this->_instance=1"."$ext'>1</a>";
|
$pagination.= "<a href='".$path."$this->_instance=1"."$ext'>1</a>";
|
||||||
$pagination.= "<a href='".$path."$this->_instance=2"."$ext'>2</a>";
|
$pagination.= "<a href='".$path."$this->_instance=2"."$ext'>2</a>";
|
||||||
$pagination.= "..";
|
$pagination.= "..";
|
||||||
for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++)
|
for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++)
|
||||||
{
|
{
|
||||||
if ($counter == $this->_page)
|
if ($counter == $this->_page)
|
||||||
$pagination.= "<span class='current'>$counter</span>";
|
$pagination.= "<span class='current'>$counter</span>";
|
||||||
else
|
else
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->_page < $counter - 1)
|
if ($this->_page < $counter - 1)
|
||||||
$pagination.= "<a href='".$path."$this->_instance=$next"."$ext'>next »</a>";
|
$pagination.= "<a href='".$path."$this->_instance=$next"."$ext'>next »</a>";
|
||||||
else
|
else
|
||||||
$pagination.= "<span class='disabled'>next »</span>";
|
$pagination.= "<span class='disabled'>next »</span>";
|
||||||
$pagination.= "</div>\n";
|
$pagination.= "</div>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return $pagination;
|
return $pagination;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -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;
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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)) {
|
||||||
|
@ -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() {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
@ -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();
|
|
||||||
}
|
|
||||||
}
|
|
@ -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,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>
|
Loading…
Reference in New Issue
Block a user