code cleanup, test for db_escape() crazyness in DB sanity check

diff --git a/backend.php b/backend.php
index fa116458c1bb33276176a2e4680ba7eb5855f74b..b298ec738a058d54a591b4e9c8b5743eece92580 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -46,15 +46,7 @@
                return;
        }
 
-       if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'UTF-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
+       init_connection($link);
 
        $op = $_REQUEST["op"];
 

diff --git a/errors.php b/errors.php
index dc47f38e40f888b88997909fb5d7436e1ddb46ba..bd7b53fe40d3a4149bd366c2f0a633ab9c93c765 100644 (file)
--- a/errors.php
+++ b/errors.php
@@ -28,4 +28,6 @@
                official site for more information.");
 
        $ERRORS[11] = "[This error is not returned by server]";
+
+       $ERRORS[12] = __("SQL escaping test failed, check your database and PHP configuration");
 ?>

diff --git a/functions.php b/functions.php
index e1f4a229fcce9f5a0e50fd605092b291fba8abb7..48d6e3a858adb4926c7d372781be8567c4dfce6e 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -1980,6 +1980,10 @@
                        }
                }
 
+               if (db_escape_string("testTEST") != "testTEST") {
+                       $error_code = 12;
+               }
+
                error_reporting (DEFAULT_ERROR_LEVEL);
 
                if ($error_code != 0) {
@@ -5843,4 +5847,16 @@
        function feed_has_icon($id) {
                return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
        }
+
+       function init_connection($link) {
+               if (DB_TYPE == "pgsql") {
+                       pg_query("set client_encoding = 'UTF-8'");
+                       pg_set_client_encoding("UNICODE");
+               } else {
+                       if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                               db_query($link, "SET NAMES " . MYSQL_CHARSET);
+       //                      db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+                       }
+               }
+       }
 ?>

diff --git a/mobile/tt-rss.php b/mobile/tt-rss.php
index 11316d4d3cfe4bace1f2fea1236111f253d3037f..a8bf6fb5f734f0cbb6edd8226798481afa69508d 100644 (file)
--- a/mobile/tt-rss.php
+++ b/mobile/tt-rss.php
@@ -13,15 +13,7 @@
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
 
-       if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'UTF-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
+       init_connection($link);
 
        login_sequence($link, true);
 

diff --git a/mysql_convert_unicode.php b/mysql_convert_unicode.php
index 6fe72994c2a234b46d870c1a892c2cce11967839..6d43c234c5fbd57ef8a237db1205c8714c699023 100644 (file)
--- a/mysql_convert_unicode.php
+++ b/mysql_convert_unicode.php
@@ -9,16 +9,8 @@
        require_once "db.php";
        
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
-       
-       if (DB_TYPE == "pgsql") {
-               pg_query($link, "set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
+
+       init_connection($link); 
 
        login_sequence($link);
        

diff --git a/opml.php b/opml.php
index 35d7a070c8ae1a17896df8e52cc66a652fd6cffc..44e94ee37e60bf76429650cd407d794a54f7bc98 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -10,16 +10,7 @@
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
 
-       if (DB_TYPE == "pgsql") {
-               pg_query($link, "set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
-
+       init_connection($link);
        login_sequence($link);
 
        $owner_uid = $_SESSION["uid"];

diff --git a/update.php b/update.php
index f59f9ef3e56c04397c6a2d7de718df1d7305f353..76e3088567128eb19375742248f1cc347515b354 100644 (file)
--- a/update.php
+++ b/update.php
@@ -9,17 +9,8 @@
        require_once "db.php";
        
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
-       
-       if (DB_TYPE == "pgsql") {
-               pg_query($link, "set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
 
+       init_connection($link); 
        login_sequence($link);
        
        $owner_uid = $_SESSION["uid"];

diff --git a/update_daemon.php b/update_daemon.php
index 67a8781dea697f6a64b0a72301233bd5a617e892..35177edd621639e7a4c078ac124bf9e9713fd29b 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -57,6 +57,8 @@
                        "Maybe another daemon is already running.\n");
        }
 
+       // Testing database connection.
+       // It is unnecessary to start the fork loop if database is not ok.
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
 
        if (!$link) {
@@ -67,16 +69,6 @@
                return;
        }
 
-       if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
-
        db_close($link);
 
        $last_purge = 0;

diff --git a/update_daemon2.php b/update_daemon2.php
index be652777e28b792bfb48957e6c9b2d2be553c8c6..08f5d74c3e292c4be6c0544d1120dfb4f4114c29 100644 (file)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -113,7 +113,6 @@
 
        db_close($link);
 
-
        while (true) {
 
                // Since sleep is interupted by SIGCHLD, we need another way to
@@ -155,15 +154,7 @@
                                                return;
                                        }
 
-                                       if (DB_TYPE == "pgsql") {
-                                               pg_query("set client_encoding = 'utf-8'");
-                                               pg_set_client_encoding("UNICODE");
-                                       } else {
-                                               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                                                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-                                                       // db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-                                               }
-                                       }
+                                       init_connection($link);
 
                                        // We disable stamp file, since it is of no use in a multiprocess update.
                                        // not really, tho for the time being -fox

diff --git a/update_daemon_loop.php b/update_daemon_loop.php
index 737194aee4fa5e6183013cdf4e5d9bb309bc1f1e..b1197ff3494801862920989f0e1c6e50a31ef0fb 100644 (file)
--- a/update_daemon_loop.php
+++ b/update_daemon_loop.php
@@ -54,15 +54,7 @@
                return;
        }
 
-       if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
+       init_connection($link);
 
        $last_purge = 0;
 

diff --git a/update_feeds.php b/update_feeds.php
index 139da699925cf575cdfddb432b960ca5c351ffa4..2bb91dc30182d47547e6beaf027de1794941da85 100644 (file)
--- a/update_feeds.php
+++ b/update_feeds.php
@@ -36,15 +36,7 @@
                return;
        }
 
-       if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
+       init_connection($link);
 
        // Purge all posts (random 30 feeds)
        global_purge_old_posts($link, true, 30);

diff --git a/xml-rpc.php b/xml-rpc.php
index 0117657d0339944aa9b4ff71ba0af57730efab76..2a23f57f677bcc175e4bc9cbf47c402c6407ccba 100644 (file)
--- a/xml-rpc.php
+++ b/xml-rpc.php
@@ -19,15 +19,7 @@
                return;
        }
 
-       if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
+       init_connection($link);
 
        function getVirtualFeeds($msg) {
                global $link;