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

trunk/lib/Prefs.inc.php

@@ -55 +55 @@
 
     // Namespace of this instance of Prefs.
-    var $_ns;
+    private $_ns;
 
     // Configuration parameters for this object.
-    var $_params = array(
+    private $_params = array(
 
         // Enable database storage. If this is false, all prefs will live only as long as the session.
@@ -80 +80 @@
      * Prefs constructor.
      */
-    function Prefs($namespace='')
+    public function __construct($namespace='')
     {
         $app =& App::getInstance();
@@ -104 +104 @@
      * @since   04 Jun 2006 16:41:42
      */
-    function initDB($recreate_db=false)
+    public function initDB($recreate_db=false)
     {
         $app =& App::getInstance();
@@ -142 +142 @@
      * @param  array $params   Array of param keys and values to set.
      */
-    function setParam($params=null)
+    public function setParam($params=null)
     {
         if (isset($params) && is_array($params)) {
@@ -157 +157 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
         $app =& App::getInstance();
@@ -176 +176 @@
      * @param  array $defaults  Array of key-value pairs
      */
-    function setDefaults($defaults)
+    public function setDefaults($defaults)
     {
         if (isset($defaults) && is_array($defaults)) {
@@ -192 +192 @@
      * @param  bool   $persistent   Save this value forever? Set to false and value will exist as long as the session is in use.
      */
-    function set($key, $val)
+    public function set($key, $val)
     {
         $app =& App::getInstance();
@@ -223 +223 @@
      * @return string           The value of the preference.
      */
-    function get($key)
+    public function get($key)
     {
         $app =& App::getInstance();
@@ -244 +244 @@
      * @return boolean          True if the preference isset and not empty false otherwise.
      */
-    function exists($key)
+    public function exists($key)
     {
         return array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['saved']);
@@ -254 +254 @@
      * @param string $key       The name of the preference to delete.
      */
-    function delete($key)
+    public function delete($key)
     {
         unset($_SESSION['_prefs'][$this->_ns]['saved'][$key]);
@@ -263 +263 @@
      * as $auth->clear(), such as when logging out.
      */
-    function clear($focus='all')
+    public function clear($focus='all')
     {
         switch ($focus) {
@@ -295 +295 @@
     * @since    04 Jun 2006 16:56:53
     */
-    function load($force=false)
+    public function load($force=false)
     {
         $app =& App::getInstance();
@@ -352 +352 @@
     * @since    04 Jun 2006 17:12:44
     */
-    function _isLoaded()
+    private function _isLoaded()
     {
         if (isset($_SESSION['_prefs'][$this->_ns]['load_datetime'])
@@ -373 +373 @@
     * @since    04 Jun 2006 17:19:56
     */
-    function save()
+    public function save()
     {
         $app =& App::getInstance();
@@ -424 +424 @@
 }
 
-
-?>