Changeset 439 for branches/eli_branch/lib/Auth_SQL.inc.php

Timestamp:

Nov 30, 2013 7:30:44 PM (11 years ago)

Author:

anonymous

Message:

added public and private keywords to all properties and methods, changed old classname constructor function to construct, removed more ?> closing tags

File:

• branches/eli_branch/lib/Auth_SQL.inc.php (modified) (24 diffs)

branches/eli_branch/lib/Auth_SQL.inc.php

@@ -41 +41 @@
         
     // Namespace of this auth object.
-    var $_ns;
+    private $_ns;
     
     // Static var for test.
-    var $_authentication_tested;
+    private $_authentication_tested;
 
     // Parameters to be configured by setParam.
-    var $_params = array();
-    var $_default_params = array(
+    private $_params = array();
+    private $_default_params = array(
 
         // Automatically create table and verify columns. Better set to false after site launch.
@@ -127 +127 @@
      * @param optional array $params  A hash containing parameters.
      */
-    function Auth_SQL($namespace='')
+    public function __construct($namespace='')
     {
         $app =& App::getInstance();
@@ -153 +153 @@
      * @since   26 Aug 2005 17:09:36
      */
-    function initDB($recreate_db=false)
+    public function initDB($recreate_db=false)
     {
         $app =& App::getInstance();
@@ -253 +253 @@
      * @return bool true on success, false on failure
      */
-    function setParam($params)
+    public function setParam($params)
     {
         if (isset($params['match_remote_ip_exempt_usernames'])) {
@@ -274 +274 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
         $app =& App::getInstance();
@@ -291 +291 @@
      * @access public
      */
-    function clear()
+    public function clear()
     {
         $db =& DB::getInstance();
@@ -326 +326 @@
      * @param mixed $val      Value to set variable to.
      */
-    function set($key, $val)
+    public function set($key, $val)
     {
         if (!isset($_SESSION['_auth_sql'][$this->_ns]['user_data'])) {
@@ -342 +342 @@
      * @return mixed          Value stored in session.
      */
-    function get($key, $default='')
+    public function get($key, $default='')
     {
         if (isset($_SESSION['_auth_sql'][$this->_ns][$key])) {
@@ -361 +361 @@
      * @return mixed  False if credentials not found in DB, or returns DB row matching credentials.
      */
-    function authenticate($username, $password)
+    public function authenticate($username, $password)
     {
         $app =& App::getInstance();
@@ -412 +412 @@
      * @return boolean  Whether or not the credentials are valid.
      */
-    function login($username, $password)
+    public function login($username, $password)
     {
         $app =& App::getInstance();
@@ -534 +534 @@
      * @access public
      */
-    function isLoggedIn($user_id=null)
+    public function isLoggedIn($user_id=null)
     {
         $app =& App::getInstance();
@@ -668 +668 @@
      * @access public
      */
-    function requireLogin($message='', $type=MSG_NOTICE, $file=null, $line=null)
+    public function requireLogin($message='', $type=MSG_NOTICE, $file=null, $line=null)
     {
         $app =& App::getInstance();
@@ -690 +690 @@
      * @param  string   $reason      The reason for blocking the account.
      */
-    function blockAccount($user_id=null, $reason='')
+    public function blockAccount($user_id=null, $reason='')
     {
         $app =& App::getInstance();
@@ -720 +720 @@
      * @return boolean              True if the user is blocked, false otherwise.
      */
-    function isBlocked($user_id=null)
+    public function isBlocked($user_id=null)
     {
         $db =& DB::getInstance();
@@ -742 +742 @@
      * Unblocks a user in the db_table, and clears any blocked_reason.
      */
-    function unblockAccount($user_id=null)
+    public function unblockAccount($user_id=null)
     {
         $db =& DB::getInstance();
@@ -766 +766 @@
      * @return bool                 True if username exists.
      */
-    function usernameExists($username)
+    public function usernameExists($username)
     {
         $db =& DB::getInstance();
@@ -786 +786 @@
      * @return string               Username, or false if none found.
      */
-    function getUsername($user_id)
+    public function getUsername($user_id)
     {
         $db =& DB::getInstance();
@@ -820 +820 @@
      * @return string           a password
      */
-    function generatePassword($pattern='CvcdCvc')
+    public function generatePassword($pattern='CvcdCvc')
     {
         $app =& App::getInstance();
@@ -843 +843 @@
      *
      */
-    function encryptPassword($password, $salt=null)
+    public function encryptPassword($password, $salt=null)
     {
         $app =& App::getInstance();
@@ -898 +898 @@
      *
      */
-    function setPassword($user_id=null, $password)
+    public function setPassword($user_id=null, $password)
     {
         $app =& App::getInstance();
@@ -948 +948 @@
      * @return string            The user's new password.
      */
-    function resetPassword($user_id=null, $reason='')
+    public function resetPassword($user_id=null, $reason='')
     {
         $app =& App::getInstance();
@@ -1013 +1013 @@
      * @return bool     true if user is a member of security zone, false otherwise
      */
-    function inClearanceZone($security_zone, $user_type='')
+    public function inClearanceZone($security_zone, $user_type='')
     {
         // return true; /// WTF?
@@ -1036 +1036 @@
      * @param  constant $security_zone   string of comma delimited privileges for the zone
      */
-    function requireAccessClearance($security_zone, $message='')
+    public function requireAccessClearance($security_zone, $message='')
     {
         $app =& App::getInstance();
@@ -1094 +1094 @@
 // 128.0.0.0        10000000.00000000.00000000.00000000  /1
 // 0.0.0.0          00000000.00000000.00000000.00000000  /0   IP space
-?>