diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index a222ed3..11cccb7 100755 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -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; } diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index e8c3202..09a9f5f 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -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() { diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 13f4890..cc01f40 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -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]); diff --git a/install/poche.sqlite b/install/poche.sqlite index 4c0f813..f2b79b6 100644 Binary files a/install/poche.sqlite and b/install/poche.sqlite differ diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index b819d80..3942d3b 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -40,17 +40,16 @@ {% for entry in entries %}

{{ entry.title|raw }}

-
{{ entry.date }}
- {% if entry.reading_time > 0 %} -
{% trans "estimated reading time :" %} {{ entry.reading_time }} min
+ {% if entry.content| getReadingTime > 0 %} +
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
{% else %} -
{% trans "estimated reading time :" %} < 1 min
+
{% trans "estimated reading time :" %} < 1 min
{% endif %}

{{ entry.content|striptags|slice(0, 300) }}...

diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 1244b74..af97407 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -2,12 +2,12 @@ {% block menu %} {% include '_menu.twig' %} {% endblock %} -{% block title %}{{ entry.title|raw }} ({{ entry.domain_name }}){% endblock %} +{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} {% block content %}