Merge pull request #752 from mariroz/dev

fix of issue #650, #619 and other similar, error in JSLikeHTMLElement: node no longer exists.

diff --git a/inc/3rdparty/site_config/standard/.about.com.txt b/inc/3rdparty/site_config/standard/.about.com.txt
new file mode 100644 (file)
index 0000000..e1ebaee
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/.about.com.txt
@@ -0,0 +1,14 @@
+body: //div[@id='articlebody']
+title: //h1
+author: //p[@id='by']//a
+
+next_page_link: //span[@class='next']/a
+# Not the same as below!
+
+prune: yes
+tidy: no
+
+# Annoying 'next' links plainly inside the article body
+strip: //*[text()[contains(.,'Next: ')]]
+
+test_url: http://psychology.about.com/od/theoriesofpersonality/ss/defensemech.htm

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index dddb2512fab6accb1c89e7669b11e951c5ca79f4..11cccb7238d9d6a6e16695386152a25fc6789fa8 100755 (executable)
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -409,6 +409,7 @@ class Database {
     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);
+
         if ( !$this->executeQuery($sql_action, $params_action) ) {
           $id = null;
         }

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 1ef875c91ba7c23c62c738ca3cc0bc7e488c9996..cc01f4030498ef8127574bad949408f6a24065c2 100755 (executable)
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -216,7 +216,7 @@ class Tools
 
     public static function getDomain($url)
     {
-      return parse_url($url, PHP_URL_HOST);
+        return parse_url($url, PHP_URL_HOST);
     }
 
     public static function getReadingTime($text) {

diff --git a/install/poche.sqlite b/install/poche.sqlite
old mode 100755 (executable)
new mode 100644 (file)