Changeset 461

Timestamp:

Feb 6, 2014 11:31:21 PM (10 years ago)

Author:

anonymous

Message:

Empty strings are better than zero for default select options. Updated functionality of Nav::currentPage().

Location:

trunk

Files:

• bin/module_maker/list_template.cli.php (modified) (1 diff)
• bin/module_maker/skel/adm_list.ihtml (modified) (1 diff)
• lib/Navigation.inc.php (modified) (10 diffs)

trunk/bin/module_maker/list_template.cli.php

@@ -148 +148 @@
     <input type="text" class="sc-small" size="20" name="search_query" value="<\x3fphp echo getFormData('search_query'); \x3f>" title="<\x3fphp echo oTxt(_("Fields searched: __///__.")); \x3f>" />
     <select name="filter___///__">
-        <\x3fphp // printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', city, '&mdash;', title)", '__///___id', getFormData('filter___///__'), array('Any __///__'), 'ORDER BY __///__ ASC'); \x3f>
+        <\x3fphp // printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', city, '&mdash;', title)", '__///___id', getFormData('filter___///__'), array('' => 'Any __///__'), 'ORDER BY __///__ ASC'); \x3f>
     </select>
     <input type="submit" name="list" value="<\x3fphp echo _("Search"); \x3f>" />

trunk/bin/module_maker/skel/adm_list.ihtml

@@ -8 +8 @@
         <input type="text" class="sc-small" size="20" name="search_query" value="<?php echo getFormData('search_query'); ?>" title="<?php echo oTxt(_("Fields searched: __///__ %SEARCH_FIELDS%.")); ?>" />
         <select name="filter___///__" class="sc-small">
-            <?php // printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', city, '&mdash;', title)", '__///___id', getFormData('filter___///__'), array('Any __///__'), 'ORDER BY __///__ ASC'); ?>
+            <?php // printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', city, '&mdash;', title)", '__///___id', getFormData('filter___///__'), array('' => 'Any __///__'), 'ORDER BY __///__ ASC'); ?>
         </select>
         <input type="submit" value="<?php echo _("Filter"); ?>" />

trunk/lib/Navigation.inc.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -28 +28 @@
  * and titles, as well as setting page params such as hiding the page title on
  * some pages but not others, and storing vars like the page title itself.
- * 
+ *
  * Note: this class was renamed from "Nav" because of the change in API and to be more descriptive.
  *
@@ -37 +37 @@
 
     // Configuration parameters for this object.
-    var $_params = array(        
+    var $_params = array(
         'head_title' => true,
         'body_title' => true,
@@ -68 +68 @@
      * current page added last. Vars can be specified for any page, but only vars
      * from the "current" page will be accessed with Nav::get.
-     * 
+     *
      * @access  public
      * @param   string  $title      The title of the page.
@@ -94 +94 @@
     {
         $app =& App::getInstance();
-    
+
         if (isset($params) && is_array($params)) {
             // Merge new parameters with old overriding only those passed.
@@ -113 +113 @@
     {
         $app =& App::getInstance();
-    
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
@@ -142 +142 @@
     {
         // Set params of current page.
-        $curr_page =& $this->pages[sizeof($this->pages) - 1];        
+        $curr_page =& $this->pages[sizeof($this->pages) - 1];
         $curr_page[$key] = $val;
     }
@@ -157 +157 @@
     {
         $curr_page =& $this->pages[sizeof($this->pages) - 1];
-        
+
         switch ($key) {
         case 'title' :
@@ -279 +279 @@
      * @return  mixed   The value set for $return, TRUE by default.
      */
-    function currentPage($page_uri, $return=true)
-    {
-        if (preg_match('/^' . preg_quote(urldecode($page_uri), '/') . '/i', $_SERVER['PHP_SELF'])) {
-            return $return;
-        }
+    function currentPage($test_uri, $true_return=true, $false_return=false, $include_query=true)
+    {
+        $actual_uri = $include_query ? $_SERVER['REQUEST_URI'] : strtok($_SERVER['REQUEST_URI'], '?');
+        if (preg_match('/^' . preg_quote(urldecode($test_uri), '/') . '$/i', $actual_uri)) {
+            return $true_return;
+        }
+        return $false_return;
     }