Changeset 113 for trunk

Timestamp:

12/12/2005 02:45:59 AM (6 years ago)

Author:

paravoid

Message:

Rename page quick_search -> search, parameter quick_search to q and replace input image with image+javascript.

Location:

trunk

Files:

• includes/main_center.php (modified) (1 diff)
• includes/main_menu.php (modified) (1 diff)
• includes/pages/quick_search (deleted)
• includes/pages/search (added)
• includes/pages/search/search.php (copied) (copied from trunk/includes/pages/quick_search/quick_search.php) (2 diffs)
• templates/basic/includes/main_menu.tpl (modified) (1 diff)

trunk/includes/main_center.php

@@ -64 +64 @@
                         case 'pickup':
                         case 'gmap':
-                        case 'quick_search':
+                        case 'search':
                                 return TRUE;
                                 break;

trunk/includes/main_menu.php

@@ -80 +80 @@
                 $this->tpl['link_register'] = makelink(array("page" => "users", "user" => "add"));
                 $this->tpl['link_logout'] = makelink(array("page" => "users", "action" => "logout"));
-                parse_str(substr(makelink(array("page" => "quick_search"), FALSE, TRUE, FALSE), 1), &$this->tpl['query_string']);
+                parse_str(substr(makelink(array("page" => "search"), FALSE, TRUE, FALSE), 1), &$this->tpl['query_string']);
                 $this->tpl['stats_nodes_active'] =
                                 $db->cnt('',

trunk/includes/pages/search/search.php

@@ -20 +20 @@
  */
 
-class quick_search {
+class search {
 
         var $tpl;
         
-        function quick_search() {
+        function search() {
                 
         }
@@ -30 +30 @@
         function output() {
                 global $db, $vars;
-                $quick_search = get('quick_search');
-                if (is_numeric($quick_search) && strpos($quick_search, ".") === FALSE) {
-                        $page = array("page" => "nodes", "node" => $quick_search);
-                } elseif ($db->cnt('', 'nodes', "name = '".$quick_search."'") == 1) {
-                        $node = $db->get('id', 'nodes', "name = '".$quick_search."'");
+                $q = get('q');
+                if (is_numeric($q) && strpos($q, ".") === FALSE) {
+                        $page = array("page" => "nodes", "node" => $q);
+                } elseif ($db->cnt('', 'nodes', "name = '".$q."'") == 1) {
+                        $node = $db->get('id', 'nodes', "name = '".$q."'");
                         $page = array("page" => "nodes", "node" => $node[0]['id']);
-                } elseif (is_ip($quick_search, FALSE)) {
+                } elseif (is_ip($q, FALSE)) {
                         $page = array("page" => "ranges",
                                                   "subpage" => "search",
-                                                  "form_search_ranges_search" => serialize(array("ip" => $quick_search))
+                                                  "form_search_ranges_search" => serialize(array("ip" => $q))
                                                   );
-                } elseif (substr($quick_search, -strlen(".".$vars['dns']['root_zone'])) == ".".$vars['dns']['root_zone']) {
+                } elseif (substr($q, -strlen(".".$vars['dns']['root_zone'])) == ".".$vars['dns']['root_zone']) {
                         $page = array("page" => "dnszones",
-                                                  "form_search_dns_search" => serialize(array("dns_zones__name" => $quick_search))
+                                                  "form_search_dns_search" => serialize(array("dns_zones__name" => $q))
                                                   );
                 } else {
                         $page = array("page" => "nodes",
-                                                  "form_search_nodes_search" => serialize(array("nodes__name" => $quick_search))
+                                                  "form_search_nodes_search" => serialize(array("nodes__name" => $q))
                                                   );
                 }

trunk/templates/basic/includes/main_menu.tpl

@@ -72 +72 @@
                                                 <td><img src="templates/basic/images/search.gif" width="32" height="32" alt="{$lang.quick_search}" /></td>
                                                 <td style="font-size: 12px;">
-                                                        <form name="form_quick_search" method="get" action="?">
+                                                        <form name="search" method="get" action="?">
                                                         {include file="generic/qs.tpl" qs=$query_string}
                                                         <table width="100%"  border="0" cellpadding="0" cellspacing="0" class="table-main">
                                                         <tr>
-                                                        <td style="font-size: 12px;" width="100%">&nbsp;{$lang.quick_search} <input type="image" src="templates/basic/images/submit1.png" /></td>
+                                                        <td style="font-size: 12px;" width="100%">&nbsp;{$lang.quick_search} <a href="javascript:document.search.submit()"><img src="templates/basic/images/submit1.png" alt="{$lang.submit}" /></a></td>
                                                         </tr><tr>
                                                         <td>
-                                                        <input type="text" name="quick_search" />
+                                                        <input type="text" name="q" />
                                                         </td>
                                                         </tr>