From e87b9d0aa0742a11bd4825dc88c35f4bd7962853 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Sun, 27 Nov 2005 12:17:25 +0000
Subject: [PATCH] Delete commented-out _fieldValues, and move _aFieldToSelect and _table to the top as per others.

---
 lib/users/User.inc | 65 +++++++++++++++++++++++------------------------------------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/lib/users/User.inc b/lib/users/User.inc
index a798856..3db86a5 100644
--- a/lib/users/User.inc
+++ b/lib/users/User.inc
@@ -56,6 +56,29 @@ class User extends KTEntity {
     /** authentication details so that the source knows who this user is */
     var $sAuthenticationDetails = null;
 
+    var $_aFieldToSelect = array(
+        'iId' => 'id',
+        'sUserName' => 'username',
+        'sName' => 'name',
+        'sPassword' => 'password',
+        'iQuotaMax' => 'quota_max',
+        'iQuotaCurrent' => 'quota_current',
+        'sEmail' => 'email',
+        'sMobile' => 'mobile',
+        'bEmailNotification' => 'email_notification',
+        'bSmsNotification' => 'sms_notification',
+        'sLdapDn' => 'ldap_dn',
+        'iMaxSessions' => 'max_sessions',
+        'iLanguageID' => 'language_id',
+        'iAuthenticationSourceId' => 'authentication_source_id',
+        'sAuthenticationDetails' => 'authentication_details',
+    );
+
+    function _table() {
+        global $default;
+        return $default->users_table;
+    }
+
     function User($sNewUserName = null, $sNewName = null, $sNewPassword = null, $iNewQuotaMax = null, $sNewEmail= null, $sNewMobile= null, $bNewEmailNotification= null, $bNewSmsNotification= null, $sNewLdapDn= null, $iNewMaxSessions= null, $iNewLanguageID= null) {
         //object not created in database yet
         $this->iId = -1;
@@ -133,48 +156,6 @@ class User extends KTEntity {
     function getAuthenticationDetails() { return $this->sAuthenticationDetails; }
     function setAuthenticationDetails($sNewValue) { $this->sAuthenticationDetails = $sNewValue; }
 
-    /*
-    function _fieldValues() {
-        return array(
-            'username' => $this->sUserName,
-            'name' => $this->sName,
-            'password' => md5($this->sPassword),
-            'quota_max' => $this->iQuotaMax,
-            'quota_current' => 0,
-            'email' => $this->sEmail,
-            'mobile' => $this->sMobile,
-            'email_notification' => KTUtil::anyToBool($this->bEmailNotification),
-            'sms_notification' => KTUtil::anyToBool($this->bSmsNotification),
-            'ldap_dn' => $this->sLdapDn,
-            'max_sessions' => $this->iMaxSessions,
-            'language_id' => $this->iLanguageID,
-        );
-    }
-    */
-
-    var $_aFieldToSelect = array(
-        'iId' => 'id',
-        'sUserName' => 'username',
-        'sName' => 'name',
-        'sPassword' => 'password',
-        'iQuotaMax' => 'quota_max',
-        'iQuotaCurrent' => 'quota_current',
-        'sEmail' => 'email',
-        'sMobile' => 'mobile',
-        'bEmailNotification' => 'email_notification',
-        'bSmsNotification' => 'sms_notification',
-        'sLdapDn' => 'ldap_dn',
-        'iMaxSessions' => 'max_sessions',
-        'iLanguageID' => 'language_id',
-        'iAuthenticationSourceId' => 'authentication_source_id',
-        'sAuthenticationDetails' => 'authentication_details',
-    );
-
-    function _table() {
-        global $default;
-        return $default->users_table;
-    }
-
 	/**
 	* Delete the current object from the database
 	*
--
libgit2 0.21.4