Changeset 202 for trunk/services

Timestamp:

Jul 13, 2006 11:24:01 PM (18 years ago)

Author:

scdev

Message:

Q - updated usage of $nav.

Location:

trunk/services

Files:

• admins.php (modified) (5 diffs)
• lock.php (modified) (1 diff)
• login.php (modified) (1 diff)
• logs.php (modified) (1 diff)
• password.php (modified) (1 diff)
• versions.php (modified) (4 diffs)

trunk/services/admins.php

@@ -25 +25 @@
 
 // Titles and navigation header.
-$nav->addPage(_("Administrators"), $_SERVER['PHP_SELF']);
+$nav->add(_("Administrators"), null);
 
 // The object to validate form input.
@@ -86 +86 @@
     // Initialize variables for the form template.
     $frm =& addRecordForm();
-    $nav->addPage(_("Add Admin"));
+    $nav->add(_("Add Admin"));
     $main_template = 'admin_form.ihtml';
     break;
@@ -93 +93 @@
     // Initialize variables for the form template.
     $frm =& editRecordForm(getFormData('admin_id'));
-    $nav->addPage(_("Edit Admin"));
+    $nav->add(_("Edit Admin"));
     $main_template = 'admin_form.ihtml';
     break;
@@ -120 +120 @@
         $frm =& addRecordForm();
         $frm = array_merge($frm, getFormData());
-        $nav->addPage(_("Add Admin"));
+        $nav->add(_("Add Admin"));
         $main_template = 'admin_form.ihtml';
     } else {
@@ -156 +156 @@
         $frm =& editRecordForm(getFormData('admin_id'));
         $frm = array_merge($frm, getFormData());
-        $nav->addPage(_("Edit Admin"));
+        $nav->add(_("Edit Admin"));
         $main_template = 'admin_form.ihtml';
     } else {

trunk/services/lock.php

@@ -42 +42 @@
 
 // Titles and navigation header.
-$nav->addPage(sprintf(_("Locked record: <em>%s</em>"), $lock->getTitle()));
+$nav->add(sprintf(_("Locked record: <em>%s</em>"), $lock->getTitle()));
 
 // Templates.

trunk/services/login.php

@@ -21 +21 @@
         $app->raiseMsg(_("You are now logged in."), MSG_SUCCESS, __FILE__, __LINE__);
         $app->dieBoomerangURL('login');
-        $app->logMsg(sprintf('%s %s successfully logged-in.', $auth->get('auth_name'), $frm['username']), LOG_INFO, __FILE__, __LINE__);
+        $app->logMsg(sprintf('User %s successfully logged-in.', $frm['username']), LOG_INFO, __FILE__, __LINE__);
     } else {
         $app->raiseMsg(_("Login failed, please try again."), MSG_NOTICE, __FILE__, __LINE__);
-        $app->logMsg(sprintf('%s %s failed login using (MD5ed) password: %s', ucfirst($auth->get('auth_name')), $frm['username'], md5($frm['password'])), LOG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf('User %s failed login using (MD5ed) password: %s', $frm['username'], md5($frm['password'])), LOG_NOTICE, __FILE__, __LINE__);
     }
 }
 
 // Titles and navigation header.
-$nav->addPage(_("Login"));
+$nav->add(_("Login"));
 
 // Templates.

trunk/services/logs.php

@@ -46 +46 @@
 
 // Titles and navigation header.
-$nav->addPage(sprintf(_("Viewing log: <em>%s</em>"), $tmp_prefs->get('log_file')), '/admin/logs.php');
+$nav->add(sprintf(_("Viewing log: <em>%s</em>"), $tmp_prefs->get('log_file')), '/admin/logs.php');
 
 /********************************************************************

trunk/services/password.php

@@ -16 +16 @@
 
 // Titles and navigation header.
-$nav->addPage(_("Change password"));
+$nav->add(_("Change password"));
 
 // The object to validate form input from the user.

trunk/services/versions.php

@@ -26 +26 @@
 
 // Titles and navigation header.
-$nav->addPage(_("Versions"), $_SERVER['PHP_SELF']);
+$nav->add(_("Versions"), null);
 
 /********************************************************************
@@ -59 +59 @@
     $data = $version->getData($version_id);
     $versionrecord = $version->getVerson($version_id);
-    $nav->addPage(sprintf(_("View <em>%s</em> version %s (%s)"), $versionrecord['version_title'], $version_id, $versionrecord['version_datetime']));
+    $nav->add(sprintf(_("View <em>%s</em> version %s (%s)"), $versionrecord['version_title'], $version_id, $versionrecord['version_datetime']));
     $main_template = 'versions_view.ihtml';
     break;
@@ -70 +70 @@
         $app->raiseMsg(sprintf(_("Version <em>%s</em> is identical to the current record"), $version_id), MSG_NOTICE, __FILE__, __LINE__);
     }
-    $nav->addPage(sprintf(_("Difference between version %s (%s) and current record."), $version_id, $versionrecord['version_datetime']));
+    $nav->add(sprintf(_("Difference between version %s (%s) and current record."), $version_id, $versionrecord['version_datetime']));
     $main_template = 'versions_diff.ihtml';
     break;
@@ -98 +98 @@
     $_POST['version_title'] = $versions[0]['version_title'];
     if (is_array($versions) && !empty($versions)) {
-        $nav->addPage(sprintf(_("%s versions of record <em>%s</em>"), sizeof($versions), $versions[0]['version_title']));
+        $nav->add(sprintf(_("%s versions of record <em>%s</em>"), sizeof($versions), $versions[0]['version_title']));
         $main_template = 'versions_list.ihtml';
     } else {