Changeset 432 for trunk/services/admins.php

Timestamp:

Nov 2, 2013 11:44:56 PM (11 years ago)

Author:

anonymous

Message:

Removed all usage of 'user_type' from admin management; minor update to module maker.

File:

• trunk/services/admins.php (modified) (10 diffs)

trunk/services/admins.php

@@ -66 +66 @@
 $so->setColumn('last_name', $auth->getParam('db_table') . '.last_name ASC', $auth->getParam('db_table') . '.last_name DESC');
 $so->setColumn('email', $auth->getParam('db_table') . '.email ASC', $auth->getParam('db_table') . '.email DESC');
-$so->setColumn('user_type', $auth->getParam('db_table') . '.user_type ASC', $auth->getParam('db_table') . '.user_type DESC');
 $so->setColumn('seconds_online', $auth->getParam('db_table') . '.seconds_online ASC', $auth->getParam('db_table') . '.seconds_online DESC');
 $so->setColumn('last_login_datetime', $auth->getParam('db_table') . '.last_login_datetime ASC', $auth->getParam('db_table') . '.last_login_datetime DESC');
@@ -230 +229 @@
     }
 
-    if (getFormData('user_type') == 'root' && 'root' != $auth->get('user_type')) {
-        $fv->addError('user_type', sprintf(_("You do not have clearance to create a user with root privileges."), null));
-    }
-
     $fv->numericRange('admin_id', -32768, 32767, _("<strong>Admin id</strong> must be a valid number between -32768 and 32767."));
 
@@ -249 +244 @@
     $fv->stringLength('email', 0, 255, _("<strong>Email</strong> must contain less than 256 characters."));
     $fv->validateEmail('email');
-
-    $fv->isEmpty('user_type', _("<strong>User type</strong> cannot be blank."));
-    $fv->stringLength('user_type', 0, 255, _("<strong>User type</strong> has an invalid selection."));
 }
 
@@ -265 +257 @@
         'last_name' => '',
         'email' => '',
-        'user_type' => '',
         'seconds_online' => '0',
         'last_login_datetime' => '0000-00-00 00:00:00',
@@ -322 +313 @@
         'last_name' => '',
         'email' => '',
-        'user_type' => '',
         'seconds_online' => '0',
         'last_login_datetime' => '0000-00-00 00:00:00',
@@ -362 +352 @@
     // Get the information for this object.
     $qid = $db->query("
-        SELECT " . $auth->getParam('db_username_column') . ", user_type from " . $auth->getParam('db_table') . "
+        SELECT " . $auth->getParam('db_username_column') . "
         WHERE " . $auth->getParam('db_primary_key') . " = '" . $db->escapeString($id) . "'
     ");
-    if (! list($name, $user_type) = mysql_fetch_row($qid)) {
+    if (! list($name) = mysql_fetch_row($qid)) {
         $app->logMsg('Could not find record with admin_id: ' . $id, LOG_WARNING, __FILE__, __LINE__);
         $app->raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
@@ -374 +364 @@
     $qid = $db->query("SELECT COUNT(*) from " . $auth->getParam('db_table') . "");
     list($num_admins) = mysql_fetch_row($qid);
-    if ('root' == $user_type && 'root' != $auth->get('user_type')) {
-        // Only root users can delete root users!
-        $app->raiseMsg(_("You do not have clearance to delete a root administrator."), MSG_NOTICE, __FILE__, __LINE__);
-    } else if ($num_admins <= 1) {
+    if ($num_admins <= 1) {
         // There must always be at least one admnistrator!
         $app->raiseMsg(_("You cannot delete the only administrator in the database. There must be at least one to log in and create other users."), MSG_NOTICE, __FILE__, __LINE__);
@@ -410 +397 @@
             last_name,
             email,
-            user_type,
             added_by_user_id,
             added_datetime
@@ -418 +404 @@
             '" . $db->escapeString($frm['last_name']) . "',
             '" . $db->escapeString($frm['email']) . "',
-            '" . $db->escapeString($frm['user_type']) . "',
             '" . $db->escapeString($auth->get('user_id')) . "',
             NOW()
@@ -466 +451 @@
             last_name = '" . $db->escapeString($frm['last_name']) . "',
             email = '" . $db->escapeString($frm['email']) . "',
-            user_type = '" . $db->escapeString($frm['user_type']) . "',
             modified_by_user_id = '" . $db->escapeString($auth->get('user_id')) . "',
             modified_datetime = NOW()