From 6400371ff93782d25cdbd50aa224c70145b3890a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 10 Jul 2014 13:17:04 +0200 Subject: [PATCH] I removed my previous commit. We have to create a new branch for that. --- inc/poche/Database.class.php | 22 ++-------------------- inc/poche/Poche.class.php | 8 ++++++++ inc/poche/Tools.class.php | 14 ++++++++++++++ install/poche.sqlite | Bin 393216 -> 393216 bytes themes/baggy/home.twig | 9 ++++----- themes/baggy/view.twig | 4 ++-- 6 files changed, 30 insertions(+), 27 deletions(-) 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 4c0f8139590fb16a67392e0e1f2ccba17baf912c..f2b79b68f2480a6fa0ec923f225b6a24c880ed54 100644 GIT binary patch literal 393216 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

{{ 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 %}