Changeset 451 for branches

Timestamp:

Dec 25, 2013 12:39:28 AM (10 years ago)

Author:

anonymous

Message:

Added SortOrder::get() method; minor changes

Location:

branches/eli_branch

Files:

• bin/module_maker/skel/admin.php (modified) (1 diff)
• lib/SortOrder.inc.php (modified) (6 diffs)

branches/eli_branch/bin/module_maker/skel/admin.php

@@ -379 +379 @@
     if (getFormData('filter___///__', false)) {
         // Limit by filter.
-        $where_clause .= (empty($where_clause) ? 'WHERE' : 'AND') . " __///__ = '" . $db->escapeString(getFormData('filter___///__')) . "'";
+        $where_clause .= (empty($where_clause) ? 'WHERE' : ' AND') . " __///__ = '" . $db->escapeString(getFormData('filter___///__')) . "'";
     }
 

branches/eli_branch/lib/SortOrder.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/>.
@@ -56 +56 @@
     {
         $app =& App::getInstance();
-        
+
         // Setup the HTML for printing ASC/DESC paths.
         // This should be converted to CSS someday.
@@ -62 +62 @@
         $this->asc_widget = sprintf('<img src="%s/sort_ascending.gif" alt="%s" width="11" height="7" border="0" />', $images_path, _("Ascending"));
         $this->desc_widget = sprintf('<img src="%s/sort_descending.gif" alt="%s" width="11" height="7" border="0" />', $images_path, _("Ascending"));
-        
+
         // Setup prefs object.
         $this->prefs = new Prefs($_SERVER['PHP_SELF']);
@@ -154 +154 @@
     }
 
+    /**
+     * Get the current sort and order values.
+     *
+     * @return array    Array with keys: sort and order. These can be fed back into the SortOrder::set() method or defaults.
+     */
+    function get()
+    {
+        return array(
+            'sort' => $this->prefs->get('sort_by'),
+            'order' => $this->prefs->get('sort_order'),
+        );
+    }
 
     /**
@@ -202 +214 @@
             } else {
                 ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=' . $default_order); ?>" title="<?php echo sprintf(_("Sort by %s"), $col_name); ?>"><?php echo $col_name; ?></a><?php
-            }            
+            }
         } else {
             echo $col_name;