new fields in database, reading time / date and domain name are stored

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index dddb2512fab6accb1c89e7669b11e951c5ca79f4..a222ed39b76017fc8b758b2d486b429f5e645f92 100755 (executable)
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -398,6 +398,21 @@ 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
@@ -407,8 +422,12 @@ class Database {
      * @return integer $id of inserted record
      */
     public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0) {
-        $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);
+        $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, 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 09a9f5ff85276423a29b505312d2f1cec66ead8a..e8c320249c01925302c293a405ada1f2771b06fa 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -232,14 +232,6 @@ 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 1ef875c91ba7c23c62c738ca3cc0bc7e488c9996..13f48903cefdc80e6b9ab8eb8c5adc775e5320a0 100755 (executable)
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -214,20 +214,6 @@ 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
old mode 100755 (executable)
new mode 100644 (file)
index f2b79b6..4c0f813
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 3942d3bf8aef4396db5f0dc4ee1541ce60e48b0e..b819d801e608144441f6b0a789a97cdf5807a2dc 100755 (executable)
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -40,16 +40,17 @@
                     {% for entry in entries %}
                 <div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}>
                     <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
-                    {% if entry.content| getReadingTime > 0 %}
-                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
+                    <div>{{ entry.date }}</div>
+                    {% if entry.reading_time > 0 %}
+                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.reading_time }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.reading_time }} min</span></div>
                     {% else %}
-                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
+                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.reading_time }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
                     {% endif %}
                     <ul class="tools links">
                         <li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
                         <li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
                         <li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
-                        <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
+                        <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domain_name }}</span></a></li>
                     </ul>
                     <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
                 </div>