Changeset 1714 in ExiteCMS

Timestamp:

08/28/08 18:20:38 (3 years ago)

Author:

hverton

Message:

Merged trunk revisions 1706:1713 into the PLi-Fusion branch

Location:

branches/PLi-Fusion

Files:

• administration/modules.php (modified) (2 diffs)
• administration/search.php (modified) (3 diffs)
• administration/tools/language_pack_English.php (modified) (3 diffs)
• administration/tools/language_pack_Nederlands.php (modified) (2 diffs)
• administration/upgrade/rev01710.php (copied) (copied from trunk/administration/upgrade/rev01710.php)
• administration/upgrade/rev01711.php (copied) (copied from trunk/administration/upgrade/rev01711.php)
• files/locales/en.main.global.php (modified) (1 diff)
• files/locales/nl.main.global.php (modified) (1 diff)
• includes/core_functions.php (modified) (1 diff)
• includes/reports/report.usercountries.php (copied) (copied from trunk/includes/reports/report.usercountries.php)
• includes/reports/report.usersjoined.php (copied) (copied from trunk/includes/reports/report.usersjoined.php)
• includes/reports/templates/report.usercountries.tpl (copied) (copied from trunk/includes/reports/templates/report.usercountries.tpl)
• includes/reports/templates/report.usersjoined.tpl (copied) (copied from trunk/includes/reports/templates/report.usersjoined.tpl)
• includes/search/search.articles.php (modified) (1 diff)
• includes/search/search.downloads.php (modified) (1 diff)
• includes/search/search.forumattachments.php (modified) (1 diff)
• includes/search/search.forumposts.php (modified) (1 diff)
• includes/search/search.members.php (modified) (1 diff)
• includes/search/search.news.php (modified) (1 diff)
• includes/search/templates/search.articles.tpl (modified) (1 diff)
• includes/search/templates/search.downloads.tpl (modified) (1 diff)
• includes/search/templates/search.forumattachments.tpl (modified) (1 diff)
• includes/search/templates/search.forumposts.tpl (modified) (1 diff)
• includes/search/templates/search.members.tpl (modified) (1 diff)
• includes/search/templates/search.news.tpl (modified) (1 diff)
• includes/templates/admin.search.tpl (modified) (4 diffs)
• includes/templates/main.reports.tpl (modified) (1 diff)
• includes/templates/main.search.tpl (modified) (1 diff)
• reports.php (modified) (1 diff)
• search.php (modified) (1 diff)

branches/PLi-Fusion/administration/modules.php

@@ -211 +211 @@
                     $mod_search['title'] = isset($mod_search['title']) ? $mod_search['title'] : ("Search: ".$mod_search['name']);
                     $mod_search['version'] = isset($mod_search['version']) ? $mod_search['version'] : $mod_version;
+                    // get the max searchorder
+                    $result = dbquery("SELECT max(search_order) as max FROM ".$db_prefix."search");
+                    if ($result) {
+                        $data = dbarray($result);
+                        $max = $data['max'] + 1;
+                    } else {
+                        $max = 1;
+                    }
                     // add it to the search table
-                    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_id, search_name, search_title, search_version, search_fulltext, search_visibility) 
-                        VALUES ('".$id."', '".$mod_search['name']."', '".$mod_search['title']."', '".$mod_search['version']."',  '".$mod_search['fulltext']."', '".$mod_search['visibility']."')");
+                    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_id, search_name, search_title, search_version, search_fulltext, search_visibility, search_order) 
+                        VALUES ('".$id."', '".$mod_search['name']."', '".$mod_search['title']."', '".$mod_search['version']."',  '".$mod_search['fulltext']."', '".$mod_search['visibility']."', ".$max.")");
                 }
             }
@@ -543 +551 @@
                     $mod_search['title'] = isset($mod_search['title']) ? $mod_search['title'] : ("Search: ".$mod_search['name']);
                     $mod_search['version'] = isset($mod_search['version']) ? $mod_search['version'] : $mod_version;
+                    // get the max searchorder
+                    $result = dbquery("SELECT max(search_order) as max FROM ".$db_prefix."search");
+                    if ($result) {
+                        $data = dbarray($result);
+                        $max = $data['max'] + 1;
+                    } else {
+                        $max = 1;
+                    }
                     // add it to the search table
-                    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_id, search_name, search_title, search_version, search_fulltext, search_visibility) 
-                        VALUES ('".$id."', '".$mod_search['name']."', '".$mod_search['title']."', '".$mod_search['version']."',  '".$mod_search['fulltext']."', '".$mod_search['visibility']."')");
+                    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_id, search_name, search_title, search_version, search_fulltext, search_visibility, search_order) 
+                        VALUES ('".$id."', '".$mod_search['name']."', '".$mod_search['title']."', '".$mod_search['version']."',  '".$mod_search['fulltext']."', '".$mod_search['visibility']."', ".$max.")");
                 }
             }

branches/PLi-Fusion/administration/search.php

@@ -98 +98 @@
     $variables['usergroups'] = getusergroups(false);
 }
+
 // toggle the search status
 if ($action == "setstatus") {
@@ -108 +109 @@
 }
 
+// swap the order of two records
+if ($action == "swap") {
+    // check the parameters passed
+    $order1 = (isset($_GET['order1']) && isNum($_GET['order1'])) ? $_GET['order1'] : 0;
+    $order2 = (isset($_GET['order2']) && isNum($_GET['order2'])) ? $_GET['order2'] : 0;
+    if ($order1 != 0 && $order2 != 0 && $order1 != $order2) {
+        $result1 = dbquery("SELECT search_id FROM ".$db_prefix."search WHERE search_order = '".$order1."'");
+        $result2 = dbquery("SELECT search_id FROM ".$db_prefix."search WHERE search_order = '".$order2."'");
+        if ($result1 && $result2) {
+            // everything checks out, swap 'm!
+            $data = dbarray($result1);
+            $result = dbquery("UPDATE ".$db_prefix."search SET search_order = ".$order2." WHERE search_id = ".$data['search_id']);
+            $data = dbarray($result2);
+            $result = dbquery("UPDATE ".$db_prefix."search SET search_order = ".$order1." WHERE search_id = ".$data['search_id']);
+        }
+    }
+    // return to the overview screen
+    $action = "";
+}
+
 // no action specified: show the search overview
 if ($action == "") {
     // generate the searches overview
-    $searches = array();
-    $searchindex = array();
-    $result = dbquery("SELECT s.*, m.mod_folder FROM ".$db_prefix."search s LEFT JOIN ".$db_prefix."modules m ON s.search_mod_id = m.mod_id");
+    $variables['searches'] = array();
+    $result = dbquery("SELECT s.*, m.mod_folder FROM ".$db_prefix."search s LEFT JOIN ".$db_prefix."modules m ON s.search_mod_id = m.mod_id ORDER BY search_order");
     while ($data = dbarray($result)) {
         // get the title for this search
@@ -132 +152 @@
         $data['groupname'] = getgroupname($data['search_visibility']);
             // store the search record
-        $searches[$data['search_id']] = $data;
-        $searchindex[] = $data['search_title']."_>_".$data['search_id'];
-    }
-    //make sure the modules are properly sorted
-    sort($searchindex);
-    $variables['search'] = array();
-    foreach($searchindex as $index) {
-        $variables['searches'][] = $searches[substr(strstr($index,"_>_"),3)];
+        $variables['searches'][] = $data;
     }
     // reload the locale for this module
     locale_load("admin.search");
+}
+
+// add the previous and next id's
+foreach($variables['searches'] as $key => $value) {
+    $variables['searches'][$key]['order_down'] = isset($variables['searches'][$key+1]) ? $variables['searches'][$key+1]['search_order'] : 0;
+    $variables['searches'][$key]['order_up'] = isset($variables['searches'][$key-1]) ? $variables['searches'][$key-1]['search_order'] : 0;
 }
 

branches/PLi-Fusion/administration/tools/language_pack_English.php

@@ -23 +23 @@
         $localestrings['404page'] = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"5\" width=\"100%\" align=\"center\"> <tbody><tr><td width=\"10\"> </td><td><div align=\"center\"><font size=\"6\"><span class=\"shoutboxname\"><br />404 - Page Not Found</span><br /></font></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">We are sorry, but the document you requested cannot be found on this server.<br /></div><br /><div align=\"center\">Most likely, this is a result of yet another reorganization of this Website to reflect our constant evolution and ongoing development, coupled with a transition from an old server with lots of legacy files to a shiny new server.<br /></div><br /><div align=\"center\">But then again, it might just be a completely random event and the result of too many cosmic rays. Who knows?<br /></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">Your best bet for finding what you seek is to start at our home page (<a href=\"/\">click here to jump to the home page</a>), check out our menu, or use the search menu option.<br /></div><br /><div align=\"center\">If that doesn't work, and you think it's a document that should be here, please send a PM to the webmaster and let us know about it (registered users only).</div></td><td width=\"10\"> </td></tr></tbody></table><br />";
         load_localestrings($localestrings, LP_LOCALE, "404page", $step);
+
+        $localestrings = array();
+        $localestrings['mon001'] = "January";
+        $localestrings['mon002'] = "February";
+        $localestrings['mon003'] = "March";
+        $localestrings['mon004'] = "April";
+        $localestrings['mon005'] = "May";
+        $localestrings['mon006'] = "June";
+        $localestrings['mon007'] = "July";
+        $localestrings['mon008'] = "August";
+        $localestrings['mon009'] = "September";
+        $localestrings['mon010'] = "October";
+        $localestrings['mon011'] = "November";
+        $localestrings['mon012'] = "December";
+        load_localestrings($localestrings, LP_LOCALE, "months", $step);
 
         $localestrings = array();
@@ -938 +953 @@
         $localestrings['423'] = "Search accessable for:";
         $localestrings['424'] = "Save";
+        $localestrings['425'] = "Move up in priority";
+        $localestrings['426'] = "Move down in priority";
+        $localestrings['427'] = "Up";
+        $localestrings['428'] = "Down";
+        $localestrings['429'] = "Order";
+        $localestrings['430'] = "The order in which the searches are listed here determines the default search location";
         load_localestrings($localestrings, LP_LOCALE, "admin.search", $step);
 
@@ -3184 +3205 @@
         $localestrings['rpt404'] = "Result for the requested report";
         $localestrings['rpt405'] = "Report List";
+        $localestrings['rpt500'] = "Registered users per country";
+        $localestrings['rpt501'] = "Show me";
+        $localestrings['rpt502'] = "the top";
+        $localestrings['rpt503'] = "all";
+        $localestrings['rpt504'] = "results in the report, and sort it";
+        $localestrings['rpt505'] = "descending";
+        $localestrings['rpt506'] = "ascending";
+        $localestrings['rpt507'] = "Country";
+        $localestrings['rpt508'] = "User Count";
+        $localestrings['rpt509'] = "New users joined per month";
+        $localestrings['rpt510'] = "Period of registration";
+        $localestrings['rpt511'] = "Unknown";
+        $localestrings['rpt950'] = "The report could not be generated:";
+        $localestrings['rpt951'] = "The requested report does not contain any data";
         load_localestrings($localestrings, LP_LOCALE, "main.reports", $step);
 

branches/PLi-Fusion/administration/tools/language_pack_Nederlands.php

@@ -938 +938 @@
         $localestrings['423'] = "Zoekopdracht toegankelijk voor:";
         $localestrings['424'] = "Opslaan";
+        $localestrings['425'] = "Prioriteit verhogen";
+        $localestrings['426'] = "Prioriteit verlagen";
+        $localestrings['427'] = "Omhoog";
+        $localestrings['428'] = "Omlaag";
+        $localestrings['429'] = "Volgorde";
+        $localestrings['430'] = "De volgorde waarin de zoeklocaties zijn opgelijst bepaald de standaard geselecteerde zoek locatie";
         load_localestrings($localestrings, LP_LOCALE, "admin.search", $step);
 
@@ -3184 +3190 @@
         $localestrings['rpt404'] = "Resultaat voor het rapport";
         $localestrings['rpt405'] = "Rapportenlijst";
+        $localestrings['rpt500'] = "Geregistreerde gebruikers per land";
+        $localestrings['rpt501'] = "Toon mij";
+        $localestrings['rpt502'] = "de top";
+        $localestrings['rpt503'] = "alle";
+        $localestrings['rpt504'] = "resultaten in het rapport, en sorteer het";
+        $localestrings['rpt505'] = "aflopend";
+        $localestrings['rpt506'] = "oplopend";
+        $localestrings['rpt507'] = "Land";
+        $localestrings['rpt508'] = "Ledenaantal";
+        $localestrings['rpt509'] = "Aangemelde nieuwe leden per maand";
+        $localestrings['rpt510'] = "Registratie periode";
+        $localestrings['rpt511'] = "Onbekend";
+        $localestrings['rpt950'] = "Het rapport kon niet worden aangemaakt:";
+        $localestrings['rpt951'] = "Het gevraagde rapport bevat geen gegevens";
         load_localestrings($localestrings, LP_LOCALE, "main.reports", $step);
+
+        $localestrings = array();
+        $localestrings['mon001'] = "Januari";
+        $localestrings['mon002'] = "Februari";
+        $localestrings['mon003'] = "Maart";
+        $localestrings['mon004'] = "April";
+        $localestrings['mon005'] = "Mei";
+        $localestrings['mon006'] = "Juni";
+        $localestrings['mon007'] = "Juli";
+        $localestrings['mon008'] = "Augustus";
+        $localestrings['mon009'] = "September";
+        $localestrings['mon010'] = "Oktober";
+        $localestrings['mon011'] = "November";
+        $localestrings['mon012'] = "December";
+        load_localestrings($localestrings, LP_LOCALE, "months", $step);
 
         $localestrings = array();

branches/PLi-Fusion/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Wed Aug 27 2008, 22:45:12 CEST
+// generated on : Thu Aug 28 2008, 17:02:30 CEST
+// translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------
 $locale['001'] = "Navigation";

branches/PLi-Fusion/files/locales/nl.main.global.php

@@ -3 +3 @@
 // locale       : Nederlands
 // locale name  : main.global
-// generated on : Wed Aug 27 2008, 22:46:13 CEST
+// generated on : Thu Aug 28 2008, 14:10:34 CEST
+// translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------
 $locale['001'] = "Navigatie";

branches/PLi-Fusion/includes/core_functions.php

@@ -225 +225 @@
         if (!iSUPERADMIN) {
             // deny all non-webmasters access to the site
-            redirect('maintenance.php?reason='.$settings['maintenance']);
+            redirect(BASEDIR.'maintenance.php?reason='.$settings['maintenance']);
         } else {
             // force webmasters to the upgrade module

branches/PLi-Fusion/includes/search/search.articles.php

@@ -20 +20 @@
     if ($action == "") {
         
+        // add the possible  search filters ($data is defined in the calling script!)
+        $data['search_filters'] = "date,users";
+
         // get the list of all members
         if (!isset($content_filters['users'])) {

branches/PLi-Fusion/includes/search/search.downloads.php

@@ -20 +20 @@
     if ($action == "") {
         
-            // no pre-processing required for this search
+        // add the possible  search filters ($data is defined in the calling script!)
+        $data['search_filters' ] = "date";
 
     } else {

branches/PLi-Fusion/includes/search/search.forumattachments.php

@@ -20 +20 @@
     if ($action == "") {
     
+        // add the possible  search filters ($data is defined in the calling script!)
+        $data['search_filters' ] = "date,users,forums";
+
         // get the list of all members
         if (!isset($content_filters['forums'])) {

branches/PLi-Fusion/includes/search/search.forumposts.php

@@ -19 +19 @@
 
     if ($action == "") {
-        
+
+        // add the possible  search filters ($data is defined in the calling script!)
+        $data['search_filters' ] = "date,users,forums";
+
         // get the list of all members
         if (!isset($content_filters['forums'])) {

branches/PLi-Fusion/includes/search/search.members.php

@@ -20 +20 @@
     if ($action == "") {
         
-            // no pre-processing required for this search
+        // add the possible  search filters ($data is defined in the calling script!)
+        $data['search_filters' ] = "";
+
 
     } else {

branches/PLi-Fusion/includes/search/search.news.php

@@ -20 +20 @@
     if ($action == "") {
     
+        // add the possible  search filters ($data is defined in the calling script!)
+        $data['search_filters' ] = "date,users";
+
         // get the list of all members
         if (!isset($content_filters['users'])) {

branches/PLi-Fusion/includes/search/templates/search.articles.tpl

@@ -31 +31 @@
     {/section}
 {else}
-    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id}checked='checked'{/if} onclick='javascript:show_filter("date,users");' /> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
+    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
 {/if}
 {***************************************************************************}

branches/PLi-Fusion/includes/search/templates/search.downloads.tpl

@@ -33 +33 @@
     {/section}
 {else}
-    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id}checked='checked'{/if} onclick='javascript:show_filter("date");' /> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
+    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
 {/if}
 {***************************************************************************}

branches/PLi-Fusion/includes/search/templates/search.forumattachments.tpl

@@ -32 +32 @@
     {/section}
 {else}
-    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id}checked='checked'{/if} onclick='javascript:show_filter("date,users,forums");' /> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
+    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
 {/if}
 {***************************************************************************}

branches/PLi-Fusion/includes/search/templates/search.forumposts.tpl

@@ -31 +31 @@
     {/section}
 {else}
-    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id}checked='checked'{/if}  onclick='javascript:show_filter("date,users,forums");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
+    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
 {/if}
 {***************************************************************************}

branches/PLi-Fusion/includes/search/templates/search.members.tpl

@@ -31 +31 @@
     {/section}
 {else}
-    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id}checked='checked'{/if} onclick='javascript:show_filter("");' /> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
+    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
 {/if}
 {***************************************************************************}

branches/PLi-Fusion/includes/search/templates/search.news.tpl

@@ -31 +31 @@
     {/section}
 {else}
-    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id}checked='checked'{/if} onclick='javascript:show_filter("date,users");' /> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
+    <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />
 {/if}
 {***************************************************************************}

branches/PLi-Fusion/includes/templates/admin.search.tpl

@@ -86 +86 @@
                 <b>{$locale.402}</b>
             </td>
+            <td colspan='2' align='center' width='1%' class='tbl2' style='white-space:nowrap'>
+                <b>{$locale.429}</b>
+            </td>
             <td align='center' width='1%' class='tbl2' style='white-space:nowrap'>
                 <b>{$locale.403}</b>
@@ -100 +103 @@
             <td align='center' width='1%' class='tbl1' style='white-space:nowrap'>
                 {$searches[id].groupname}
+            </td>
+            <td align='center' width='1%' class='tbl1' style='white-space:nowrap'>
+                {$searches[id].search_order}
+            </td>
+            <td align='center' width='1%' class='tbl1' style='white-space:nowrap'>
+            {if $searches[id].order_up != 0}
+                {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;action=swap&amp;order1="|cat:$searches[id].search_order|cat:"&amp;order2="|cat:$searches[id].order_up image="up.gif" alt="$locale.425 title=$locale.427}
+            {/if}
+            {if $searches[id].order_down != 0}
+                {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;action=swap&amp;order1="|cat:$searches[id].search_order|cat:"&amp;order2="|cat:$searches[id].order_down image="down.gif" alt="$locale.426 title=$locale.428}
+            {/if}
             </td>
             <td align='left' width='1%' class='tbl1' style='white-space:nowrap'>
@@ -117 +131 @@
         {sectionelse}
         <tr>
-            <td align='center' colspan='3' class='tbl1'>
+            <td align='center' colspan='5' class='tbl1'>
                 {$locale.408}
                 <br /><br />
@@ -124 +138 @@
         {/section}
         <tr>
-            <td align='center' colspan='3' class='tbl1'>
+            <td align='center' colspan='5' class='tbl1'>
+                <span class='smallalt'>{$locale.430}</span>
+            </td>
+        </tr>
+{*      <tr>
+            <td align='center' colspan='5' class='tbl1'>
                 {buttonlink name=$locale.409 link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;action=add"}
             </td>
         </tr>
-    </table>
+*}  </table>
 {/if}
 {include file="_closetable.tpl"}

branches/PLi-Fusion/includes/templates/main.reports.tpl

@@ -49 +49 @@
         <tr>
             <td align='left'>
-                {$locale.rpt404}: <b>{$report_title}</b>
+                {$locale.rpt404}: <b>{$reports.0.report_title}</b>
             </td>
             <td align='right'>

branches/PLi-Fusion/includes/templates/main.search.tpl

@@ -151 +151 @@
         }
     }
+    {/literal}
+    show_filter("{$default_filter}");
     </script>
-    {/literal}
     {include file="_closetable.tpl"}
         {include file="_opentable.tpl" name=$_name title=$locale.src428 state=$_state style=$_style}

branches/PLi-Fusion/reports.php

@@ -3 +3 @@
 | ExiteCMS Content Management System                 |
 +----------------------------------------------------+
-| Copyright 2007 Harro "WanWizard" Verton, Exite BV  |
+| Copyright 2008 Harro "WanWizard" Verton, Exite BV  |
 | for support, please visit http://exitecms.exite.eu |
 +----------------------------------------------------+

branches/PLi-Fusion/search.php

@@ -103 +103 @@
 }
 
-// do we have a search location? if not, get the first search item
-if (!$search_id && count($variables['searches'])) {
-//  $search_id = $variables['searches'][0]['search_id'];
+// find the id of the default selection
+if ($action == "") {
+    $variables['default_location'] = 9999999999;
+    $variables['default_filter'] = "";
+    foreach($variables['searches'] as $key => $search) {
+        if ($search['search_order'] < $variables['default_location']) {
+            $variables['default_location'] = $search['search_order'];
+            $variables['default_filter'] = $search['search_filters'];
+            if (!isset($search['search_filters'])) _debug($search, true);
+        }
+    }
 }
+
 // store the selected search location
 $variables['search_id'] = $search_id;