From 2868115988e9cc80417953bc7802c4d141336910 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 26 Aug 2014 10:35:17 +0200
Subject: [PATCH] corrections and adding format field

---
 inc/poche/Database.class.php |   6 +++---
 inc/poche/Poche.class.php    |  20 +++++---------------
 install/mysql.sql            |   5 +++--
 install/poche.sqlite         | Bin 393216 -> 425984 bytes
 install/postgres.sql         |   3 ++-
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index bdd64d2..bc18152 100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -422,10 +422,10 @@ class Database {
      * @param integer $user_id
      * @return integer $id of inserted record
      */
-    public function add($url, $title, $content, $dateorigin, $author, $language, $user_id, $isFavorite=0, $isRead=0)
+    public function add($url, $title, $content, $dateorigin, $author, $language, $format, $user_id, $isFavorite=0, $isRead=0)
     {
-        $sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read, dateorigin, author, language ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)';
-        $params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead, $dateorigin, $author, $language);
+        $sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read, dateorigin, author, language, format ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+        $params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead, $dateorigin, $author, $language, $format);
 
         if ( !$this->executeQuery($sql_action, $params_action) ) {
           $id = null;
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index e3ae8d0..3dd698e 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -148,21 +148,11 @@ class Poche
                 $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
                 $body = $content['rss']['channel']['item']['description'];
                 // TODO : convert date
-                if ($content['rss']['channel']['item']['updated'] == '') { // ATOM
-                    if ($content['rss']['channel']['item']['pubDate'] == '') { // RSS
-                        if($content['rss']['channel']['item']['dc:date'] == '') { // other
-                            $dateorigin = '';} 
-                        else {$dateorigin = $content['rss']['channel']['item']['dc:date'];}
-                    } 
-                    else {$dateorigin = $content['rss']['channel']['item']['pubDate'];}
-                }
-                else {
-                    $dateorigin = $content['rss']['channel']['item']['updated'];
-                }
+                $dateorigin = ($content['rss']['channel']['item']['dc:date'] != '') ? $content['rss']['channel']['item']['dc:date'] : '';
                 
-                $author = ($content['rss']['channel']['item']['author'] != '') ? $content['rss']['channel']['item']['author'] : _('Unknown author');
-                // TODO : convert language with Tools::code2ToName() function
-                $language = ($content['rss']['channel']['item']['language'] != '') ? $content['rss']['channel']['item']['language'] : '';
+                $author = ($content['rss']['channel']['item']['author'] != '') ? $content['rss']['channel']['item']['author'] : _('Unknown');
+                $language = ($content['rss']['channel']['item']['dc_language'] != '') ? Tools::code2ToName($content['rss']['channel']['item']['language']) : _('Unknown');
+                $format = ($content['rss']['channel']['item']['dc_format'] != '') ? $content['rss']['channel']['item']['dc_format'] : '';
 
                 // clean content from prevent xss attack
                 $purifier = $this->_getPurifier();
@@ -173,7 +163,7 @@ class Poche
                 $duplicate = NULL;
                 $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
 
-                $last_id = $this->store->add($url->getUrl(), $title, $body, $dateorigin, $author, $language, $this->user->getId());
+                $last_id = $this->store->add($url->getUrl(), $title, $body, $dateorigin, $author, $language, $format, $this->user->getId());
                 if ( $last_id ) {
                     Tools::logm('add link ' . $url->getUrl());
                     if (DOWNLOAD_PICTURES) {
diff --git a/install/mysql.sql b/install/mysql.sql
index 50c54ad..0949ef7 100644
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -14,8 +14,9 @@ CREATE TABLE IF NOT EXISTS `entries` (
   `content` blob NOT NULL,
   `user_id` int(11) NOT NULL,
   `dateorigin`  DATETIME,
-  `author`  TEXT,
-  `language`  TEXT,
+  `author` TEXT,
+  `language` TEXT,
+  `format` TEXT,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
diff --git a/install/poche.sqlite b/install/poche.sqlite
index 3b3f61f1c125c27267b39cd2407d3034c6c5e9fd..9ab8b0fedb65a3686405450f00ff3994c57224f2 100755
GIT binary patch
delta 437
zcmZo@kZ5R-njkHx&%nUI3&o5;T6Ut2v8q0U?lU&t>Jtpy6=@804{EdPbL$<d{j1K^
zY^b%XEUsH#kyb9eabj^9OZ5q+nu(4QAUa{<#9u&~F=^t&K&~b(A$D<TX~yR4$rCFS
zIh0cKN{TX5izm;nm8sWJD#<L#NmWt^ag7MkQ7SFUfiW|S<BL)gQ<N0^LVaC>Je?I>
zT-_W)eL@s8)D6@%6?Bw<3epnGaLXs>=am4hQc`g8@pl3mU7T7JpNTL}M=2$-#3D7n
zC^J1XPf5YWF~l{*)7Mo;DY3L9BfkjdjGV;0^wPw1m<tt@((;RP6H7MdR5~!T)TT4A
zG;gSB-%!K2eM1dXSTn~|hN@fTTAoukPHguSye-7c$B^C_&B4*QIhPX{pxf7YGPmmT
z=`!&!=!bG}^rnIZZOWM!G4m@k@-j3s+j4MD76yq<e_zflGyP;Wvq-yCH8T*iY?rEL
Peb%yZ;<xgR3%ED{I(mh`

delta 348
zcmZo@kZNd<m>?~v&A`CG1H>>OI#I`1S(`!k85?i)2?p+pc80nKwb}K#^$r#7)&5oI
zYBto`RTkGR-#9U?Y~zCYj9iVGT<qe~(u~cTlM5;o*;DgMiZWA+C-YTHWtC)><fJNu
zxJHEND3liEKv|i^@kObLDGGj}zOF%@&I&HBZjPZoAqoaM3P7o}#4>C$$@zIDK%*6$
zeEgk&h83q4#b?5e&{3FdP$?#<pp;lzl96Ae1hq&hCowO*G%-DOb55lL^TYs_<_$IN
z8)_K0Z>V7kYv!59P<6N5z;j;R-{cz`C-!*q-R5WJW=L<0=HO`DoXfd=nJ06rF1HpF
zCxd<{2S;xz=XT3-=0(hW3XEI~jm)+joRft)6BVYfuV&V3m#St4VwUYv)vV820BPNA
ANB{r;

diff --git a/install/postgres.sql b/install/postgres.sql
index 537597e..ba89d1f 100644
--- a/install/postgres.sql
+++ b/install/postgres.sql
@@ -14,7 +14,8 @@ CREATE TABLE IF NOT EXISTS entries (
     user_id integer NOT NULL,
     dateorigin DATETIME,
     author TEXT,
-    language TEXT
+    language TEXT,
+    format TEXT
 );
 
 CREATE TABLE IF NOT EXISTS users (