Changeset 22 for trunk/services

Timestamp:

Nov 23, 2005 9:29:33 PM (18 years ago)

Author:

scdev

Message:

More bugs and shifting things about.

Location:

trunk/services

Files:

• admins.php (modified) (5 diffs)
• lock.php (modified) (2 diffs)
• logout.php (modified) (1 diff)
• logs.php (modified) (4 diffs)
• templates/admin_form.ihtml (modified) (7 diffs)
• templates/lock.ihtml (modified) (1 diff)
• templates/login_form.ihtml (modified) (1 diff)
• templates/password.ihtml (modified) (4 diffs)
• versions.php (modified) (1 diff)

trunk/services/admins.php

@@ -101 +101 @@
 case 'insert' :
     if (getFormdata('cancel', false)) {
+        if (App::validBoomerangURL('admins')) {
+            // Display boomerang page.
+            App::dieBoomerangURL('admins');
+        }
+        // Display default page.
         App::dieURL($_SERVER['PHP_SELF']);
     }
@@ -130 +135 @@
     if (getFormdata('cancel', false)) {
         // Remove lock
-        $lock =& RecordLock::getInstance($GLOBALS['auth']);
         $lock->select('admin_tbl', 'admin_id', getFormData('admin_id'));
         $lock->remove();
@@ -252 +256 @@
 function &editRecordForm($id)
 {
-    $lock =& RecordLock::getInstance($GLOBALS['auth']);
+    global $lock;
+
     $lock->select('admin_tbl', 'admin_id', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -305 +310 @@
 function deleteRecord($id)
 {
-    global $auth;
-    
-    $lock =& RecordLock::getInstance($GLOBALS['auth']);
+    global $auth, $lock;
+    
     $lock->select('admin_tbl', 'admin_id', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -392 +396 @@
 function updateRecord($frm)
 {
-    global $auth;
-    
-    $lock =& RecordLock::getInstance($GLOBALS['auth']);
+    global $auth, $lock;
+    
     $lock->select('admin_tbl', 'admin_id', $frm['admin_id']);
     if ($lock->isLocked() && !$lock->isMine()) {

trunk/services/lock.php

@@ -11 +11 @@
 App::sslOn();
 
-if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER'])) {
+if (getFormData('boomerang', false)) {
     // We remember which page we came from so we can go back there.
     $boom_url = strpos(getFormData('boomerang'), '/') !== false ? getFormData('boomerang') : $_SERVER['HTTP_REFERER'];
     App::setBoomerangURL($boom_url, 'lock');
+    App::setBoomerangURL($_SERVER['HTTP_REFERER'], 'cancel-lock');
 }
 
-$lock =& RecordLock::getInstance($GLOBALS['auth']);
+if (!isset($lock) || !is_a($lock, 'RecordLock')) {
+    $lock =& RecordLock::getInstance($auth);
+}
 $lock->select(getFormData('lock_id'));
 
@@ -31 +34 @@
     App::dieBoomerangURL('lock');
 } else if (getFormData('cancel', false)) {
-    App::dieBoomerangURL('lock');
+    // Since the boomerang URL will go back to the locked record, and the record was not unlocked, we must delete the boomerang URL otherwise we'll come back here.
+    App::deleteBoomerangURL('lock');
+    App::dieBoomerangURL('cancel-lock');
 }
 

trunk/services/logout.php

@@ -8 +8 @@
 
 // Delete this admin's record locks.
-$lock =& RecordLock::getInstance($GLOBALS['auth']);
+if (!isset($lock) || !is_a($lock, 'RecordLock')) {
+    $lock =& RecordLock::getInstance($auth);
+}
 $lock->removeAll($auth->getVal('user_id'));
 

trunk/services/logs.php

@@ -8 +8 @@
 
 $auth->requireLogin();
-$auth->requireAccessClearance(ZONE_ADMIN_APPLOG);
+// $auth->requireAccessClearance(ZONE_ADMIN_APPLOG);
 App::sslOn();
 
@@ -55 +55 @@
 switch (getFormData('op')) {
 case 'delete' :
-    $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
+//     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
     deleteLog(Prefs::getValue('log_file', 'logs_module'));
     Prefs::setValue('log_file', App::getParam('log_filename'), 'logs_module');
@@ -67 +67 @@
     
 case 'clear' :
-    $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
+//     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
     clearLog(Prefs::getValue('log_file', 'logs_module'));
     if (App::validBoomerangURL('app_log')) {
@@ -78 +78 @@
     
 case 'archive' :
-    $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
+//     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
     if (archiveLog(Prefs::getValue('log_file', 'logs_module'))) {
         // Now flush current log.

trunk/services/templates/admin_form.ihtml

@@ -10 +10 @@
     <tr>
         <td>&nbsp;</td>
-        <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
+        <td><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     </tr>
     <tr>
         <td class="right"><label for="username"<?php $fv->err('username', ' class="error"') ?>><?php echo _("Username"); ?></label></td>
-        <td valign="top">
+        <td>
             <input type="text" class="small" size="50" name="username" value="<?php echo oTxt($frm['username']); ?>" />
         </td>
@@ -20 +20 @@
     <tr>
         <td class="right"><label for="userpass"<?php $fv->err('userpass', ' class="error"') ?>><?php echo _("Password"); ?></label></td>
-        <td valign="top">
+        <td>
             <input type="password" class="small" size="50" name="userpass" value="<?php echo oTxt($frm['userpass']); ?>" />
         </td>
@@ -26 +26 @@
     <tr>
         <td class="right"><label for="first_name"<?php $fv->err('first_name', ' class="error"') ?>><?php echo _("First name"); ?></label></td>
-        <td valign="top">
+        <td>
             <input type="text" class="small" size="50" name="first_name" value="<?php echo oTxt($frm['first_name']); ?>" />
         </td>
@@ -32 +32 @@
     <tr>
         <td class="right"><label for="last_name"<?php $fv->err('last_name', ' class="error"') ?>><?php echo _("Last name"); ?></label></td>
-        <td valign="top">
+        <td>
             <input type="text" class="small" size="50" name="last_name" value="<?php echo oTxt($frm['last_name']); ?>" />
         </td>
@@ -38 +38 @@
     <tr>
         <td class="right"><label for="email"<?php $fv->err('email', ' class="error"') ?>><?php echo _("Email"); ?></label></td>
-        <td valign="top">
+        <td>
             <input type="text" class="medium" size="50" name="email" value="<?php echo oTxt($frm['email']); ?>" />
         </td>
@@ -44 +44 @@
     <tr>
         <td class="right"><label for="user_type"<?php $fv->err('user_type', ' class="error"') ?>><?php echo _("User type"); ?></label></td>
-        <td valign="top">
+        <td>
             <select name="user_type" class="small">
             <?php printSetSelectForm('admin_tbl', 'user_type', $frm['user_type'], true); ?>
@@ -52 +52 @@
     <tr>
         <td>&nbsp;</td>
-        <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
+        <td><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     </tr>
 </table>

trunk/services/templates/lock.ihtml

@@ -1 +1 @@
 <?php 
-if (!is_a($lock)) {
+if (!is_a($lock, 'RecordLock')) {
     return null;
 }

trunk/services/templates/login_form.ihtml

@@ -4 +4 @@
     <tr>
         <td class="right"><label for="username"><?php echo _("Username"); ?></label></td>
-        <td valign="top">
-            <input type="text" class="medium" size="20" name="username" value="<?php echo oTxt($frm['username']); ?>" />
+        <td>
+            <input type="text" class="small" size="20" name="username" value="<?php echo oTxt($frm['username']); ?>" />
         </td>
     </tr>
     <tr>
         <td class="right"><label for="password"><?php echo _("Password"); ?></label></td>
-        <td valign="top">
-            <input type="password" class="medium" size="20" name="password" value="<?php echo oTxt($frm['password']); ?>" />
+        <td>
+            <input type="password" class="small" size="20" name="password" value="<?php echo oTxt($frm['password']); ?>" />
         </td>
     </tr>
     <tr>
         <td>&nbsp;</td>
-        <td valign="top"><input type="submit" value="<?php echo _("Login"); ?>" /></td>
+        <td><input type="submit" value="<?php echo _("Login"); ?>" /></td>
     </tr>
 </table>

trunk/services/templates/password.ihtml

@@ -7 +7 @@
     <tr>
         <td class="right"><label for="oldpassword"<?php $fv->err('oldpassword', ' class="error"') ?>><?php echo _("Old password"); ?></label></td>
-        <td valign="top">
+        <td>
             <input type="text" class="medium" size="50" name="oldpassword" />
         </td>
@@ -13 +13 @@
     <tr>
         <td class="right"><label for="newpassword"<?php $fv->err('newpassword', ' class="error"') ?>><?php echo _("New password"); ?></label></td>
-        <td valign="top">
+        <td>
             <input type="password" class="medium" size="50" name="newpassword" />
         </td>
@@ -19 +19 @@
     <tr>
         <td class="right"><label for="newpassword2"<?php $fv->err('newpassword2', ' class="error"') ?>><?php echo _("New password again"); ?></label></td>
-        <td valign="top">
+        <td>
             <input type="password" class="medium" size="50" name="newpassword2" />
         </td>
@@ -25 +25 @@
     <tr>
         <td>&nbsp;</td>
-        <td valign="top"><input type="submit" value="<?php echo _("Change password"); ?>" /></td>
+        <td><input type="submit" value="<?php echo _("Change password"); ?>" /></td>
     </tr>
 </table>

trunk/services/versions.php

@@ -75 +75 @@
 
 case 'restore' :
-    $lock =& RecordLock::getInstance($GLOBALS['auth']);
+    if (!isset($lock) || !is_a($lock, 'RecordLock')) {
+        $lock =& RecordLock::getInstance($auth);
+    }
     $lock->select($record_table, $record_key, $record_val);
     if ($lock->isLocked() && !$lock->isMine()) {