From 50913be7b7375411dfd454e9e6cf373493874b35 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Tue, 12 Oct 2010 12:38:13 +0000
Subject: [PATCH]     * PDO-SQLite patches by nth

---
 docs/NEWS                                         |  2 ++
 include/admin/category.inc.php                    |  2 +-
 include/db/db.inc.php                             |  1 +
 include/db/pdo-sqlite.inc.php                     | 15 +--------------
 include/functions_entries.inc.php                 |  8 ++++----
 include/functions_installer.inc.php               |  2 +-
 .../serendipity_plugin_statistics.php             |  2 +-
 7 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index eb77d983..d18ef819 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,8 @@
 Version 1.6 ()
 ------------------------------------------------------------------------
 
+    * PDO-SQLite patches by nth
+
     * Fix newline before <?xml tag, thanks to deedw
 
     * Only do '*' parameter expansion on the first page of search
diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php
index 5fb745b4..ed051323 100644
--- a/include/admin/category.inc.php
+++ b/include/admin/category.inc.php
@@ -73,7 +73,7 @@ if ($serendipity['GET']['adminAction'] == 'doDelete' && serendipity_checkFormTok
         $remaining_cat = (int)$serendipity['POST']['cat']['remaining_catid'];
         $category_ranges = serendipity_fetchCategoryRange((int)$serendipity['GET']['cid']);
         $category_range  = implode(' AND ', $category_ranges);
-        if ($serendipity['dbType'] == 'postgres' || $serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3') {
+        if ($serendipity['dbType'] == 'postgres' || $serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3' || $serendipity['dbType'] == 'pdo-sqlite') {
             $query = "UPDATE {$serendipity['dbPrefix']}entrycat
                         SET categoryid={$remaining_cat} WHERE entryid IN
                         (
diff --git a/include/db/db.inc.php b/include/db/db.inc.php
index d352d2c4..9fab298a 100644
--- a/include/db/db.inc.php
+++ b/include/db/db.inc.php
@@ -124,6 +124,7 @@ function serendipity_db_get_interval($val, $ival = 900) {
     switch($serendipity['dbType']) {
         case 'sqlite':
         case 'sqlite3':
+        case 'pdo-sqlite':
             $interval = $ival;
             $ts       = time();
             break;
diff --git a/include/db/pdo-sqlite.inc.php b/include/db/pdo-sqlite.inc.php
index 5e95ab40..8c59c642 100644
--- a/include/db/pdo-sqlite.inc.php
+++ b/include/db/pdo-sqlite.inc.php
@@ -39,20 +39,7 @@ function serendipity_db_sqlite_fetch_array($row, $type = PDO::FETCH_BOTH)
         $newrow[preg_replace('@^.+\.(.*)@', '\1', $i)] = str_replace($search, $replace, $v);
     }
 
-    if ($type == PDO::FETCH_NUM)
-        $frow = array();
-    else
-        $frow = $newrow;
-
-    if ($type != PDO::FETCH_ASSOC) {
-        $i = 0;
-        foreach($newrow AS $k => $v) {
-            $frow[$i] = $v;
-            $i++;
-        }
-    }
-
-    return $frow;
+    return $newrow;
 }
 
 /**
diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index 9de1d63d..425f7937 100644
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -770,7 +770,7 @@ function &serendipity_searchEntries($term, $limit = '', $searchresults = '') {
         } else {
             $cond['find_part'] = "(title ILIKE '%$term%' OR body ILIKE '%$term%' OR extended ILIKE '%$term%')";
         }
-    } elseif ($serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3') {
+    } elseif ($serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3' || $serendipity['dbType'] == 'pdo-sqlite') {
         // Very extensive SQLite search. There currently seems no other way to perform fulltext search in SQLite
         // But it's better than no search at all :-D
         $term = str_replace('*', '%', $term);
@@ -867,7 +867,7 @@ function &serendipity_searchEntries($term, $limit = '', $searchresults = '') {
 
     //if * wasn't already appended and if there are none or not enough
     //results, search again for entries containing the searchterm as a part  
-    if ($p == 1 && strpos($term, '*') === false && $serendipity['dbType'] != 'sqlite' && $serendipity['dbType'] != 'sqlite3') {
+    if ($p == 1 && strpos($term, '*') === false && $serendipity['dbType'] != 'sqlite' && $serendipity['dbType'] != 'sqlite3' && $serendipity['dbType'] != 'pdo-sqlite') {
         if (! is_array($search)) {
             return serendipity_searchEntries($term.'*', $orig_limit);
         }else if (count($search) < 4){
@@ -951,7 +951,7 @@ function serendipity_getTotalEntries() {
     global $serendipity;
 
     // The unique query condition was built previously in serendipity_fetchEntries()
-    if ($serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3') {
+    if ($serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3' || $serendipity['dbType'] == 'pdo-sqlite') {
         $querystring  = "SELECT count(e.id) {$serendipity['fullCountQuery']} GROUP BY e.id";
     } else {
         $querystring  = "SELECT count(distinct e.id) {$serendipity['fullCountQuery']}";
@@ -960,7 +960,7 @@ function serendipity_getTotalEntries() {
     $query =& serendipity_db_query($querystring);
 
     if (is_array($query) && isset($query[0])) {
-        if ($serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3') {
+        if ($serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3' || $serendipity['dbType'] == 'pdo-sqlite') {
             return count($query);
         } else {
             return $query[0][0];
diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index 11f2cad1..d9f21ad6 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -742,7 +742,7 @@ function serendipity_checkInstallation() {
         $errs[] = sprintf(CANT_EXECUTE_BINARY, 'convert imagemagick');
     }
 
-    if ($_POST['dbType'] == 'sqlite' || $_POST['dbType'] == 'sqlite3') {
+    if ($_POST['dbType'] == 'sqlite' || $_POST['dbType'] == 'sqlite3' || $_POST['dbType'] == 'pdo-sqlite') {
         // We don't want that our SQLite db file can be guessed from other applications on a server
         // and have access to our's. So we randomize the SQLite dbname.
         $_POST['sqlitedbName'] = $_POST['dbName'] . '_' . md5(time());
diff --git a/plugins/serendipity_event_statistics/serendipity_plugin_statistics.php b/plugins/serendipity_event_statistics/serendipity_plugin_statistics.php
index 424dadde..2141e65f 100644
--- a/plugins/serendipity_event_statistics/serendipity_plugin_statistics.php
+++ b/plugins/serendipity_event_statistics/serendipity_plugin_statistics.php
@@ -236,7 +236,7 @@ class serendipity_plugin_statistics extends serendipity_plugin
                 $max = time();
                 $min = $max - (15 * 60);
 
-                if ($serendipity['dbType'] == 'sqlite') {
+                if ($serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3' || $serendipity['dbType'] == 'pdo-sqlite') {
                     $max_ts = date('H:i', $max);
                     $min_ts = date('H:i', $min);
                     $q   = "SELECT count(counter_id) AS currentvisitors FROM {$serendipity['dbPrefix']}visitors WHERE day LIKE '" . date('Y-m-d') . "' AND (time BETWEEN '$min_ts' AND '$max_ts')";