Changeset 468 for trunk/lib/SortOrder.inc.php

Timestamp:

Feb 20, 2014 3:03:59 AM (10 years ago)

Author:

anonymous

Message:

Completed integrating ^{/branches/eli_branch into} /trunk. Changes include:

• Removed closing ?> from end of files
• Upgrade old-style contructor methods to use construct() instead.
• Class properties and methods defined as public, private, static or protected
• Ensure code runs under E_ALL with only mysql_* deprecated warnings
• Search for the '@' symbol anywhere it might be used to supress runtime errors, then replace with proper error recovery.
• Run the php cli -l option to check files for syntax errors.
• Bring tests up-to-date with latest version and methods of PHPUnit

Location:

trunk

Files:

• . (modified) (1 prop)
• lib/SortOrder.inc.php (modified) (9 diffs, 1 prop)

trunk/lib/SortOrder.inc.php

@@ -37 +37 @@
 class SortOrder {
 
-    var $_columns;
-    var $sort_by;
-    var $order;
-    var $asc_widget;
-    var $desc_widget;
-    var $default_sort;
-    var $default_order;
+    private $_columns;
+    public $sort_by;
+    public $order;
+    public $asc_widget;
+    public $desc_widget;
+    public $default_sort;
+    public $default_order;
 
     /**
@@ -53 +53 @@
      *                               current order.
      */
-    function SortOrder($default_sort = '', $default_order = '')
+    public function __construct($default_sort = '', $default_order = '')
     {
         $app =& App::getInstance();
@@ -81 +81 @@
      * @param string $desc_sql  The sort SQL if $this->order is descending.
      */
-    function setColumn($name, $asc_sql, $desc_sql)
+    public function setColumn($name, $asc_sql, $desc_sql)
     {
         $this->_columns[$name] = array(
@@ -99 +99 @@
      *                               current order.
      */
-    function setDefault($default_sort = '', $default_order = '')
+    public function setDefault($default_sort = '', $default_order = '')
     {
         // Which column to sort by?
@@ -139 +139 @@
      *                               for example, for an alphabetical sort)
      */
-    function set($sort=null, $order=null, $save_value=true)
+    public function set($sort=null, $order=null, $save_value=true)
     {
         // Set new sort value.
@@ -163 +163 @@
      * @return array    Array with keys: sort and order. These can be fed back into the SortOrder::set() method or defaults.
      */
-    function get()
+    public function get()
     {
         return array(
@@ -174 +174 @@
      * Returns the SQL code to sort by set column and set order.
      */
-    function getSortOrderSQL()
+    public function getSortOrderSQL()
     {
         $app =& App::getInstance();
@@ -205 +205 @@
      *                               for example, for an alphabetical sort)
      */
-    function printSortHeader($col, $col_name, $default_order='ASC')
+    public function printSortHeader($col, $col_name, $default_order='ASC')
     {
         $app =& App::getInstance();
@@ -226 +226 @@
 }
 
-?>