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

trunk/lib/PageSequence.inc.php

@@ -35 +35 @@
 class PageSequence
 {
-    var $current_step_id = 0;
-    var $start_url;
-    var $sequence_title = '';
-    var $seq = '_sequence_';
-    var $idle_timeout;
+    public $current_step_id = 0;
+    public $start_url;
+    public $sequence_title = '';
+    public $seq = '_sequence_';
+    public $idle_timeout;
 
     /**
@@ -47 +47 @@
      * @access public
      */
-    function PageSequence($params)
+    public function __construct($params)
     {
         if (isset($params['sequence_title'])) {
@@ -84 +84 @@
      * @access public
      */
-    function addStep($step_id, $params)
+    public function addStep($step_id, $params)
     {
         // Keys for the steps array cannot be numeric.
@@ -114 +114 @@
      * @return bool true on success, false on failure
      */
-    function setFeature($step_id=null, $features)
+    public function setFeature($step_id=null, $features)
     {
         $pos = isset($step_id) ? $this->getPosition($step_id) : $this->getPosition();
@@ -134 +134 @@
      * @return mixed          Value stored in session.
      */
-    function getFeature($step_id, $key, $default='')
+    public function getFeature($step_id, $key, $default='')
     {
         $pos = isset($step_id) ? $this->getPosition($step_id) : $this->getPosition();
@@ -151 +151 @@
      * @access public
      */
-    function setCurrent($step_id)
+    public function setCurrent($step_id)
     {
         $app =& App::getInstance();
@@ -171 +171 @@
      * @access public
      */
-    function getID($pos=null)
+    public function getID($pos=null)
     {
         if (isset($pos)) {
@@ -188 +188 @@
      * @access public
      */
-    function getPosition($step_id=null)
+    public function getPosition($step_id=null)
     {
         // Get current step id if step not provided.
@@ -217 +217 @@
      * @access public
      */
-    function getRequiredID($curr_step_id)
+    public function getRequiredID($curr_step_id)
     {
         if ('' === $curr_step_id) {
@@ -242 +242 @@
      * @access public
      */
-    function getNextID()
+    public function getNextID()
     {
         // Loop through all steps.
@@ -263 +263 @@
      * @access public
      */
-    function complete($step_id=null)
+    public function complete($step_id=null)
     {
         $pos = isset($step_id) ? $this->getPosition($step_id) : $this->getPosition();
@@ -277 +277 @@
      * @access public
      */
-    function printEditLink($step_id=null)
+    public function printEditLink($step_id=null)
     {
         $app =& App::getInstance();
@@ -296 +296 @@
      * @access public
      */
-    function setDataDefault($data_key, $data_val)
+    public function setDataDefault($data_key, $data_val)
     {
         if (!isset($_SESSION[$this->seq]['data'][$data_key])) {
@@ -310 +310 @@
      * @access public
      */
-    function getData($data_key=null)
+    public function getData($data_key=null)
     {
         if (!isset($data_key)) {
@@ -328 +328 @@
      * @access public
      */
-    function clearData($data_key=null)
+    public function clearData($data_key=null)
     {
         if (isset($data_key)) {
@@ -342 +342 @@
      * Deletes all data that are older than auto_timeout. Set current time if not not expired or not set.
      */
-    function _auto_timeout()
+    private function _auto_timeout()
     {
         $app =& App::getInstance();
@@ -363 +363 @@
      * @access public
      */
-    function registerData($step_data)
+    public function registerData($step_data)
     {
         $_SESSION[$this->seq]['data'] = array_merge($_SESSION[$this->seq]['data'], $step_data);
@@ -372 +372 @@
      *
      */
-    function startOver()
+    public function startOver()
     {
         $this->current_step_id = 0;
@@ -383 +383 @@
 } // END CLASS
 
-?>