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

trunk/lib/ACL.inc.php

@@ -39 +39 @@
 class ACL {
 
+    // A place to keep an object instance for the singleton pattern.
+    private static $instance = null;
+
     // Configuration parameters for this object.
-    var $_params = array(
-
+    private $_params = array(
         // If false nothing will be cached or retrieved. Useful for testing realtime data requests.
         'enable_cache' => true,
@@ -52 +54 @@
      * Constructor.
      */
-    function ACL()
+    public function __construct()
     {
         $app =& App::getInstance();
@@ -73 +75 @@
      * @static
      */
-    static function &getInstance()
-    {
-        static $instance = null;
-
-        if ($instance === null) {
-            $instance = new ACL();
-        }
-
-        return $instance;
+    public static function &getInstance()
+    {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
     }
 
@@ -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();
@@ -129 +129 @@
      * @since   04 Jun 2006 16:41:42
      */
-    function initDB($recreate_db=false)
+    public function initDB($recreate_db=false)
     {
         $app =& App::getInstance();
@@ -224 +224 @@
     * @since    14 Jun 2006 22:39:29
     */
-    function add($name, $parent=null, $type)
+    public function add($name, $parent=null, $type)
     {
         $app =& App::getInstance();
@@ -287 +287 @@
 
     // Alias functions for the different object types.
-    function addRequestObject($name, $parent=null)
+    public function addRequestObject($name, $parent=null)
     {
         return $this->add($name, $parent, 'aro');
     }
-    function addControlObject($name, $parent=null)
+    public function addControlObject($name, $parent=null)
     {
         return $this->add($name, $parent, 'aco');
     }
-    function addXtraObject($name, $parent=null)
+    public function addXtraObject($name, $parent=null)
     {
         return $this->add($name, $parent, 'axo');
@@ -311 +311 @@
     * @since    14 Jun 2006 22:39:29
     */
-    function remove($name, $type)
+    public function remove($name, $type)
     {
         $app =& App::getInstance();
@@ -368 +368 @@
 
     // Alias functions for the different object types.
-    function removeRequestObject($name)
+    public function removeRequestObject($name)
     {
         return $this->remove($name, 'aro');
     }
-    function removeControlObject($name)
+    public function removeControlObject($name)
     {
         return $this->remove($name, 'aco');
     }
-    function removeXtraObject($name)
+    public function removeXtraObject($name)
     {
         return $this->remove($name, 'axo');
@@ -393 +393 @@
     * @since    14 Jun 2006 22:39:29
     */
-    function move($name, $new_parent, $type)
+    public function move($name, $new_parent, $type)
     {
         $app =& App::getInstance();
@@ -490 +490 @@
 
     // Alias functions for the different object types.
-    function moveRequestObject($name, $new_parent=null)
+    public function moveRequestObject($name, $new_parent=null)
     {
         return $this->move($name, $new_parent, 'aro');
     }
-    function moveControlObject($name, $new_parent=null)
+    public function moveControlObject($name, $new_parent=null)
     {
         return $this->move($name, $new_parent, 'aco');
     }
-    function moveXtraObject($name, $new_parent=null)
+    public function moveXtraObject($name, $new_parent=null)
     {
         return $this->move($name, $new_parent, 'axo');
@@ -516 +516 @@
     * @since    15 Jun 2006 01:58:48
     */
-    function grant($aro=null, $aco=null, $axo=null, $access='allow')
+    public function grant($aro=null, $aco=null, $axo=null, $access='allow')
     {
         $app =& App::getInstance();
@@ -573 +573 @@
     * @since    15 Jun 2006 04:35:54
     */
-    function revoke($aro=null, $aco=null, $axo=null)
+    public function revoke($aro=null, $aco=null, $axo=null)
     {
         return $this->grant($aro, $aco, $axo, 'deny');
@@ -591 +591 @@
     * @since    20 Jun 2006 20:16:12
     */
-    function delete($aro=null, $aco=null, $axo=null)
+    public function delete($aro=null, $aco=null, $axo=null)
     {
         $app =& App::getInstance();
@@ -650 +650 @@
     * @since    15 Jun 2006 03:58:23
     */
-    function check($aro, $aco=null, $axo=null)
+    public function check($aro, $aco=null, $axo=null)
     {
         $app =& App::getInstance();
@@ -713 +713 @@
     * @since    20 Jan 2014 12:09:03
     */
-    function requireAllow($aro, $aco=null, $axo=null, $message='', $type=MSG_NOTICE, $file=null, $line=null)
+    public function requireAllow($aro, $aco=null, $axo=null, $message='', $type=MSG_NOTICE, $file=null, $line=null)
     {
         $app =& App::getInstance();
@@ -725 +725 @@
 
 } // End class.
-
-
-?>