fix charset-related bug, release 1.2.8-p1

diff --git a/backend.php b/backend.php
index 0437ce819fe696703406a889739c3a5bbf841b44..f65e95466be20007e59ae83a322004ce2906ce6a 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -108,7 +108,8 @@
        }
 
        if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'utf-8'");
+               pg_query("set client_encoding = 'UTF-8'");
+               pg_set_client_encoding("UNICODE");
        }
 
        if (!sanity_check($link)) { return; }

diff --git a/functions.php b/functions.php
index 7c6e1d4e2a9c500113af97ae9b1c492d19899994..5dea055618749808108ecf452e751fc6bf5b71d9 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -549,7 +549,7 @@
 
                                if (!$num_comments) $num_comments = 0;
 
-                               $dc_subject = $item['dc']['subject'];
+/*                             $dc_subject = $item['dc']['subject'];
 
                                $subject_tags = false;
 
@@ -557,7 +557,7 @@
                                        $subject_tags = $dc_subject;
                                } else if ($dc_subject) {
                                        $subject_tags = array($dc_subject);
-                               }
+                               } */
 
                                # sanitize content
                                
@@ -751,13 +751,13 @@
                                        }
                                }
 
-                               if ($subject_tags) {
+/*                             if ($subject_tags) {
                                        foreach ($subject_tags as $tag) {
                                                if (tag_is_valid($tag)) {
                                                        array_push($entry_tags, $tag);
                                                }
                                        }
-                               }
+                               } */
 
                                if (count($entry_tags) > 0) {
                                
@@ -775,11 +775,13 @@
                                                $entry_int_id = db_fetch_result($result, 0, "int_id");
                                                
                                                foreach ($entry_tags as $tag) {
-                                                       $tag = db_escape_string(mb_strtolower($tag));
+                                                       $tag = db_escape_string(mb_strtolower(strip_tags($tag)));
 
                                                        $tag = str_replace("+", " ", $tag);     
                                                        $tag = str_replace("technorati tag: ", "", $tag);
-       
+
+                                                       if (!tag_is_valid($tag)) continue;
+                                                       
                                                        $result = db_query($link, "SELECT id FROM ttrss_tags            
                                                                WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND 
                                                                owner_uid = '$owner_uid' LIMIT 1");
@@ -3161,7 +3163,13 @@
        }
 
        function tag_is_valid($tag) {
-               return ($tag !='' && !preg_match("/^[0-9]*$/", $tag));
+               if ($tag == '') return false;
+               if (preg_match("/^[0-9]*$/", $tag)) return false;
+
+               $tag = iconv("utf-8", "utf-8", $tag);
+               if (!$tag) return false;
+
+               return true;
        }
 
 ?>

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index b6823e2b7eddbd6f87909f65d65a728567caaf1c..212ff552e432869e0f02a17895cf68bf5a1391c0 100644 (file)
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -231,6 +231,10 @@
                                foreach ($tags as $tag) {
                                        $tag = trim($tag);
 
+                                       if (!tag_is_valid($tag)) {
+                                               continue;
+                                       }
+
                                        if (preg_match("/^[0-9]*$/", $tag)) {
                                                continue;
                                        }

diff --git a/opml.php b/opml.php
index be7c1816dffd48766583fbda209a1df37e09a8dd..9341c61d4d2ab43faaeabef2a4275a0764ec8360 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -11,6 +11,7 @@
 
        if (DB_TYPE == "pgsql") {
                pg_query($link, "set client_encoding = 'utf-8'");
+               pg_set_client_encoding("UNICODE");
        }
 
        login_sequence($link);

diff --git a/update_daemon.php b/update_daemon.php
index aae1c1ed6a6b2754e50072020e0663b59dfe7077..cf32668b15461adca702a41aaedbbc3c8f97944b 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -50,6 +50,7 @@
 
        if (DB_TYPE == "pgsql") {
                pg_query("set client_encoding = 'utf-8'");
+               pg_set_client_encoding("UNICODE");
        }
 
        $last_purge = 0;

diff --git a/update_feeds.php b/update_feeds.php
index 7027a05723f0785da4d2cca471517e11f78e8991..318a955ed0db62889206181e27a6a19f02de988a 100644 (file)
--- a/update_feeds.php
+++ b/update_feeds.php
@@ -25,6 +25,7 @@
 
        if (DB_TYPE == "pgsql") {
                pg_query("set client_encoding = 'utf-8'");
+               pg_set_client_encoding("UNICODE");
        }
 
        $result = db_query($link, "SELECT id FROM ttrss_users");

diff --git a/version.php b/version.php
index 67260d45e657db440b38cc6949d7f4b03757f615..c97a01d98492c197e34d58b98e171523592b3a2b 100644 (file)
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-       define('VERSION', "1.2.8");
+       define('VERSION', "1.2.8-p1");
 ?>

diff --git a/xml-rpc.php b/xml-rpc.php
index eaa55e566c3a15ac9d29faefdb2f5228079f2fc7..8c65123f82fd88fac696b0426559b227e2b12d00 100644 (file)
--- a/xml-rpc.php
+++ b/xml-rpc.php
@@ -21,6 +21,7 @@
 
        if (DB_TYPE == "pgsql") {
                pg_query("set client_encoding = 'utf-8'");
+               pg_set_client_encoding("UNICODE");
        }
 
        function getVirtualFeeds($msg) {