Changeset 497 for trunk/services/admins.php

Timestamp:

Sep 15, 2014 9:44:27 PM (10 years ago)

Author:

anonymous

Message:

Beginning the process of adapting codebase to foundation styles.

File:

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

trunk/services/admins.php

@@ -34 +34 @@
 require_once 'codebase/lib/FormValidator.inc.php';
 require_once 'codebase/lib/SortOrder.inc.php';
-require_once 'codebase/lib/TemplateGlue.inc.php';
+require_once 'codebase/lib/HTML.inc.php';
 require_once 'codebase/lib/Prefs.inc.php';
 require_once 'codebase/lib/Lock.inc.php';
@@ -229 +229 @@
     }
 
-    $fv->numericRange('admin_id', -32768, 32767, _("<strong>Admin id</strong> must be a valid number between -32768 and 32767."));
+    $fv->numericRange('admin_id', 0, 32767, _("<strong>Admin id</strong> must be a valid number between 0 and 32767."));
 
     $fv->isEmpty('username', _("<strong>Username</strong> cannot be blank."));
@@ -235 +235 @@
 
     $fv->isEmpty('userpass', _("<strong>Passwords</strong> cannot be blank."));
-    $fv->stringLength('userpass', 6, 36, _("<strong>Passwords</strong> must be between 6 and 36 characters long."));
+    $fv->stringLength('userpass', 8, 36, _("<strong>Passwords</strong> must be between 8 and 36 characters long."));
 
     $fv->stringLength('first_name', 0, 255, _("<strong>First name</strong> must contain less than 256 characters."));
@@ -242 +242 @@
 
     $fv->isEmpty('email', _("<strong>Email</strong> cannot be blank."));
-    $fv->stringLength('email', 0, 255, _("<strong>Email</strong> must contain less than 256 characters."));
     $fv->validateEmail('email');
 }
@@ -267 +266 @@
         'new_op' => 'insert',
         'submit_buttons' => array(
-            'submit' => _("Add Administrator"),
-            'repeat' => _("Add &amp; repeat"),
-            'cancel' => _("Cancel"),
+            array('name' => 'submit', 'value' => _("Add Administrator"), 'class' => 'small button', 'accesskey' => 's'),
+            array('name' => 'repeat', 'value' => _("Add &amp; repeat"), 'class' => 'small button secondary', 'accesskey' => 'r'),
+            array('name' => 'cancel', 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c'),
         ),
     );
@@ -280 +279 @@
     global $auth;
     global $lock;
+    global $locally_carried_queries;
     $app =& App::getInstance();
     $db =& DB::getInstance();
@@ -324 +324 @@
         'old_username' => $frm['username'],
         'submit_buttons' => array(
-            'submit' => _("Save changes"),
-            'repeat' => _("Save &amp; edit next"),
-            'reset' => _("Reset"),
-            'cancel' => _("Cancel"),
+            array('name' => 'submit', 'value' => _("Save changes"), 'class' => 'small button', 'accesskey' => 's'),
+            array('name' => 'repeat', 'value' => _("Save & edit next"), 'class' => 'small button secondary', 'accesskey' => 'e'),
+            array('name' => 'reset', 'value' => _("Reset"), 'class' => 'small button secondary', 'accesskey' => 'r'),
+            array('name' => 'cancel', 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c'),
         ),
-    ), $frm, array('userpass' => '****************'));
+    ), $frm, array('userpass' => '•••••••••••••••'));
 
     return $frm;
@@ -339 +339 @@
     global $lock;
     global $cache;
+    global $locally_carried_queries;
     $app =& App::getInstance();
     $db =& DB::getInstance();
@@ -367 +368 @@
     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__);
+        $app->raiseMsg(_("You cannot delete the only user in the database. There must be at least one to log in and create other users."), MSG_NOTICE, __FILE__, __LINE__);
     } else if ($auth->get('user_id') == $id) {
         // Do not delete yourself!
@@ -418 +419 @@
     $version->create($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $last_insert_id, $frm['username']);
 
-    $app->raiseMsg(sprintf(_("The Administrator <em>%s</em> has been added."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
+    $app->raiseMsg(sprintf(_("The user <em>%s</em> has been added."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
 
     return $last_insert_id;
@@ -461 +462 @@
     $version->create($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $frm['admin_id'], $frm['username']);
 
-    $app->raiseMsg(sprintf(_("The Administrator <em>%s</em> has been updated."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
+    $app->raiseMsg(sprintf(_("The user <em>%s</em> has been updated."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
 
     // Unlock record.