Changeset 505

Timestamp:

07/16/07 00:36:17 (16 months ago)

Author:

michiel

Message:

make the AJAX based search work again without the normal multi-blog common/hosts.php
Also some whitespace fixes, that's why the commit is so damn huge
Re #139 and #140

Location:

team/michiel/remove_multi_blog/common

Files:

• js/liveRequest.js (modified) (3 diffs)
• livesearch.php (modified) (2 diffs)
• mvblog_common.php (modified) (2 diffs)

team/michiel/remove_multi_blog/common/js/liveRequest.js

@@ -1 @@
-var inputId = 'search'; 
+var inputId = 'search';
                                         // This is the id on the input/textarea that you want to use as the query.
-                                                                        
+
 var outputId = 'searchresults';
                                         // use this to have the results populate your own ID'd tag.
                                         // leave it blank and a div tag will automatically be added
                                         // with an id="liveSearchResults"
-                                                                        
+
 var processURI    = 'common/livesearch.php';
                                         // this is the file that you request data from.
-                                                                        
+
 var emptyString   = '';
                                         // What to display in the results field when there's nothing
@@ -47 +47 @@
 
 function liveReqInit() {
-        
+
         inputElement  = document.getElementById(inputId);
         outputElement = document.getElementById(outputId);
-        
-        if( inputElement == null || outputElement == null ) 
+
+        if( inputElement == null || outputElement == null )
                 return;
-        
-        
+
+
         if (navigator.userAgent.indexOf("Safari") > 0) {
                 inputElement.addEventListener("keydown",liveReqStart,false);
-                
+
         } else if (navigator.product == "Gecko") {
                 inputElement.addEventListener("keypress",liveReqStart,false);
-                
+
         } else {
                 inputElement.attachEvent('onkeydown',liveReqStart);
                 isIE = true;
         }
-        
+
         if(emptyString == '') {
                 // set the result field to hidden, or to default string
@@ -93 +93 @@
                         liveReq = new ActiveXObject("Microsoft.XMLHTTP");
                 }
-                
+
                 liveReq.onreadystatechange = liveReqProcessReqChange;
+                var uri = processURI + "?s=" + encodeURI(inputElement.value);
                 liveReq.open("GET", processURI + "?s=" + encodeURI(inputElement.value));
                 liveReqLast = inputElement.value;

team/michiel/remove_multi_blog/common/livesearch.php

@@ -18 +18 @@
  * @copyright 2005-2007 Michiel van Baak
  */
-function db_init() {
-        session_start();
-        require("MDB2.php");
-        require("hosts.php");
+require("mvblog.php");
+$mvblog = new MvBlog();
+//get all the authors in an array
+$res =& $mvblog->db->query("SELECT * FROM authors");
 
-        $options = array(
-                "debug"       => 2,
-                "portability" => MDB2_PORTABILITY_ALL,
-        );
+if (PEAR::isError($res)) {
+        die($res->getMessage());
+}
 
-        $db =& MDB2::connect($dsn, $options);
-        if (PEAR::isError($db)) {
-                die($db->getMessage());
-        }
-        $_SESSION["filepath"] = $filepath;
-        return $db;
+while ($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) {
+        $authors[$row["id"]]["fullname"] = $row["fullname"];
+        $authors[$row["id"]]["email"]    = $row["email"];
 }
-ob_start();
-$db = db_init();
-
-
 
 $searchstring = urldecode($_REQUEST["s"]);
@@ -49 +41 @@
 $query .= " ORDER BY date DESC";
 
-$db->setLimit(5);
-$res =& $db->query($query);
+$mvblog->db->setLimit(5);
+$res =& $mvblog->db->query($query);
 $ret = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 $ret .= "<channel>\n";

team/michiel/remove_multi_blog/common/mvblog_common.php

@@ -258 +258 @@
         protected function _init_db($settings = "") {
                 require_once("MDB2.php");
-                if (!is_array($settings)) {
-                        require_once("hosts.php");
+                //sqlite has a different scheme, because it's filebased
+                if ($settings["type"] == "sqlite") {
+                        if (is_dir("db"))
+                                $dsn = sprintf("%s:///db/%s.db?mode=0666", $settings["type"], $settings["database"]);
+                        elseif (is_dir("../db"))
+                                $dsn = sprintf("%s:///../db/%s.db?mode=0666", $settings["type"], $settings["database"]);
                 } else {
-                        //sqlite has a different scheme, because it's filebased
-                        if ($settings["type"] == "sqlite") {
-                                if (is_dir("db"))
-                                        $dsn = sprintf("%s:///db/%s.db?mode=0666", $settings["type"], $settings["database"]);
-                                elseif (is_dir("../db"))
-                                        $dsn = sprintf("%s:///../db/%s.db?mode=0666", $settings["type"], $settings["database"]);
-                        } else {
-                                $dsn = $settings["type"]."://".$settings["username"].":".$settings["password"]."@tcp(".$settings["hostname"].")/".$settings["database"];
-                                $dsn = sprintf("%s://%s:%s@tcp(%s)/%s",
-                                        $settings["type"], $settings["username"], $settings["password"],
-                                        $settings["hostname"], $settings["database"]);
-                        }
+                        $dsn = $settings["type"]."://".$settings["username"].":".$settings["password"]."@tcp(".$settings["hostname"].")/".$settings["database"];
+                        $dsn = sprintf("%s://%s:%s@tcp(%s)/%s",
+                                $settings["type"], $settings["username"], $settings["password"],
+                                $settings["hostname"], $settings["database"]);
                 }
 
@@ -498 +494 @@
                 if (array_key_exists("style", $_REQUEST)) {
                         /* Overwrite the style set in the session from the request */
-                        $_SESSION["style"] = $this->_sanitize($_REQUEST["style"]); 
+                        $_SESSION["style"] = $this->_sanitize($_REQUEST["style"]);
                 }
                 if (!array_key_exists("style", $_SESSION)) {