Changeset 248 for branch

Timestamp:

10/28/07 22:43:58 (13 years ago)

Author:

exi

Message:

Fix for 'Fatal error: Cannot re-assign $this...'
Added item search to the search page.

Location:

branch/rev3/common

Files:

• includes/class.db.php (modified) (1 diff)
• search.php (modified) (3 diffs)

branch/rev3/common/includes/class.db.php

@@ -32 +32 @@
 class DBQuery
 {
-    function DBQuery()
+    var $object;
+
+    function __construct()
     {
         if (DB_USE_QCACHE === true)
         {
-            $this = new DBCachedQuery();
+            $object = new DBCachedQuery();
         }
         else
         {
-            $this = new DBNormalQuery();
+            $object = new DBNormalQuery();
         }
+        $this->object = $object;
+    }
+
+    function __call($name, $args)
+    {
+        return call_user_func_array(array($this->object, $name), $args);
+    }
+
+    function __set($name, $value)
+    {
+        $this->object->$name = $value;
+    }
+
+    function __unset($name)
+    {
+        unset($this->object->$name);
+    }
+
+    function __isset($name)
+    {
+        return isset($this->object->$name);
+    }
+
+    function __get($name)
+    {
+        return $this->object->$name;
+    }
+
+    function DBQuery()
+    {
+        $object = &$this->getRef($this);
+        if (DB_USE_QCACHE === true)
+        {
+            $object = new DBCachedQuery();
+        }
+        else
+        {
+            $object = new DBNormalQuery();
+        }
+    }
+
+    function &getRef(&$var)
+    {
+        return $var;
     }
 }

branch/rev3/common/search.php

@@ -6 +6 @@
 $html .= "<td>Type:</td><td>Text: (3 letters minimum)</td>";
 $html .= "</tr><tr>";
-$html .= "<td><select id=searchtype name=searchtype><option value=pilot>Pilot</option><option value=corp>Corporation</option><option value=alliance>Alliance</option><option value=system>System</option></select></td>";
+$html .= "<td><select id=searchtype name=searchtype><option value=pilot>Pilot</option><option value=corp>Corporation</option><option value=alliance>Alliance</option><option value=system>System</option><option value=item>Items</option></select></td>";
 $html .= "<td><input id=searchphrase name=searchphrase type=text size=30/></td>";
 $html .= "<td><input type=submit name=submit value=Search></td>";
@@ -45 +45 @@
                  order by sys.sys_name";
             $header = "<td>System</td><td></td>";
+            break;
+        case "item":
+            $sql = "select typeID, typeName from kb3_invtypes where typeName like ('%".slashfix($_REQUEST['searchphrase'])."%')";
             break;
     }
@@ -87 +90 @@
                 $html .= "<td><a href=\"$link\">".$row['sys_name']."</a></td><td></td>";
                 break;
+            case 'item':
+                $link =  "?a=invtype&id=".$row['typeID'];
+                $html .= "<td><a href=\"$link\">".$row['typeName']."</a></td><td></td>";
+                break;
         }
         $html .= "</tr>";