Changeset 468 for trunk/lib/Navigation.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/Navigation.inc.php (modified) (12 diffs)

trunk/lib/Navigation.inc.php

@@ -37 +37 @@
 
     // Configuration parameters for this object.
-    var $_params = array(
+    private $_params = array(
         'head_title' => true,
         'body_title' => true,
@@ -48 +48 @@
         'last_crumb_format' => '%s',
     );
-    var $pages = array();
+    public $pages = array();
 
     /**
      * Navigation constructor.
      */
-    function Navigation($params=null)
+    public function __construct($params=null)
     {
         $app =& App::getInstance();
@@ -74 +74 @@
      * @param   array   $vars       Additional page variables.
      */
-    function add($title, $url=null, $vars=array())
+    public function add($title, $url=null, $vars=array())
     {
         $page = array(
@@ -91 +91 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
         $app =& App::getInstance();
@@ -110 +110 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
         $app =& App::getInstance();
@@ -127 +127 @@
      * @access  public
      */
-    function clear()
+    public function clear()
     {
         $this->pages = array();
@@ -139 +139 @@
      * @param mixed $val      Value to set variable to.
      */
-    function set($key, $val)
+    public function set($key, $val)
     {
         // Set params of current page.
@@ -154 +154 @@
      * @return mixed          Value stored in session.
      */
-    function get($key, $default='')
+    public function get($key, $default='')
     {
         $curr_page =& $this->pages[sizeof($this->pages) - 1];
@@ -205 +205 @@
      * @return  mixed           Path (string) or false if path param is not set.
      */
-    function getPath($key='title')
+    public function getPath($key='title')
     {
         if ($this->getParam('path')) {
@@ -227 +227 @@
      * @return  string   Breadcrumbs or empty string if breadcrumbs param not set.
      */
-    function getBreadcrumbs()
+    public function getBreadcrumbs()
     {
         $app =& App::getInstance();
@@ -279 +279 @@
      * @return  mixed   The value set for $return, TRUE by default.
      */
-    function currentPage($test_uri, $true_return=true, $false_return=false, $strip_query=false)
+    public function currentPage($test_uri, $true_return=true, $false_return=false, $strip_query=false)
     {
         $actual_uri = $strip_query ? strtok($_SERVER['REQUEST_URI'], '?') : $_SERVER['REQUEST_URI'];
@@ -291 +291 @@
 }
 // End of class.
-
-?>