oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

I removed my previous commit. We have to create a new branch for that.

Browse source
This commit is contained in:
Nicolas Lœuillet 2014-07-10 13:17:04 +02:00
parent c710f977b2
commit 6400371ff9
6 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
inc/poche/Database.class.php
View file

@ -398,21 +398,6 @@ class Database {
return $query;
}
private function _getDomain($url)
{
return parse_url($url, PHP_URL_HOST);
}
private function _getReadingTime($text) {
$word = str_word_count(strip_tags($text));
$minutes = floor($word / 200);
$seconds = floor($word % 200 / (200 / 60));
$time = array('minutes' => $minutes, 'seconds' => $seconds);
return $minutes;
}
/**
*
* @param string $url
@ -422,12 +407,9 @@ class Database {
* @return integer $id of inserted record
*/
public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0) {
$readingTime = $this->_getReadingTime($content);
$domainName = $this->_getDomain($url);
$date = date('Y-m-d H:i:s');
$sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read ) VALUES (?, ?, ?, ?, ?, ?)';
$params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead);
$sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read, date, reading_time, domain_name ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)';
$params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead, $date, $readingTime, $domainName);
if ( !$this->executeQuery($sql_action, $params_action) ) {
$id = null;
}

8
inc/poche/Poche.class.php
View file

@ -232,6 +232,14 @@ class Poche
$this->tpl = new Twig_Environment($loaderChain, $twigParams);
$this->tpl->addExtension(new Twig_Extensions_Extension_I18n());
# filter to display domain name of an url
$filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
$this->tpl->addFilter($filter);
# filter for reading time
$filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
$this->tpl->addFilter($filter);
}
public function createNewUser() {

14
inc/poche/Tools.class.php
View file

@ -214,6 +214,20 @@ class Tools
return ((isset ($_REQUEST["$var"])) ? htmlentities($_REQUEST["$var"]) : $default);
}
public static function getDomain($url)
{
return parse_url($url, PHP_URL_HOST);
}
public static function getReadingTime($text) {
$word = str_word_count(strip_tags($text));
$minutes = floor($word / 200);
$seconds = floor($word % 200 / (200 / 60));
$time = array('minutes' => $minutes, 'seconds' => $seconds);
return $minutes;
}
public static function getDocLanguage($userlanguage) {
$lang = explode('.', $userlanguage);
return str_replace('_', '-', $lang[0]);