Changeset 457 for trunk/services

Timestamp:

Jan 20, 2014 9:42:13 PM (10 years ago)

Author:

anonymous

Message:

Removed use of requireAccessClearance(). Adjusted sequence of sslOn() and requireLogin(). Added ACL::requireAllow() method. Added arguments to SortOrder::set(). Changed behavior of Validator::validateStrDate(). Added use of Validator::validateStrDate() to module maker templates.

Location:

trunk/services

Files:

• admins.php (modified) (1 diff)
• lock.php (modified) (1 diff)
• logs.php (modified) (7 diffs)
• templates/admin_list.ihtml (modified) (2 diffs)
• templates/log_list.ihtml (modified) (1 diff)
• templates/versions_diff.ihtml (modified) (1 diff)
• templates/versions_view.ihtml (modified) (1 diff)
• versions.php (modified) (4 diffs)

trunk/services/admins.php

@@ -27 +27 @@
 // require_once dirname(__FILE__) . '/_config.inc.php';
 
+$app->sslOn();
 $auth->requireLogin();
-$app->sslOn();
 
 require_once 'codebase/lib/PageNumbers.inc.php';

trunk/services/lock.php

@@ -28 +28 @@
 require_once 'codebase/lib/Lock.inc.php';
 
+$app->sslOn();
 $auth->requireLogin();
-$app->sslOn();
 
 if (getFormData('boomerang', false)) {

trunk/services/logs.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -27 +27 @@
 // require_once dirname(__FILE__) . '/_config.inc.php';
 
+$app->sslOn();
 $auth->requireLogin();
-// $auth->requireAccessClearance(ZONE_ADMIN_APPLOG);
-$app->sslOn();
 
 require_once 'codebase/lib/PageNumbers.inc.php';
@@ -64 +63 @@
 ));
 if (getFormData('log', false)) {
-    $tmp_prefs->set('log_file', getFormData('log'));    
+    $tmp_prefs->set('log_file', getFormData('log'));
 }
 
@@ -80 +79 @@
 switch (getFormData('op')) {
 case 'delete' :
-//     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
     deleteLog($tmp_prefs->get('log_file'));
     $tmp_prefs->set('log_file', $app->getParam('log_filename'));
@@ -92 +90 @@
 
 case 'clear' :
-//     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
     clearLog($tmp_prefs->get('log_file'));
     if ($app->validBoomerangURL('app_log')) {
@@ -103 +100 @@
 
 case 'archive' :
-//     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
     if (archiveLog($tmp_prefs->get('log_file'))) {
         // Now flush current log.

trunk/services/templates/admin_list.ihtml

@@ -2 +2 @@
 <?php $fv->printErrorMessages(); ?>
 
-<div id="commandbox">
+<div class="commandbox">
     <span class="sc-nowrap commanditem"><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=add'); ?>"><?php echo _("Add Administrator"); ?></a></span>
     <form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get" class="sc-form">
@@ -38 +38 @@
         <td class="sc-nowrap"><?php echo oTxt($list[$i]['first_name'], true); ?> <?php echo oTxt($list[$i]['last_name'], true); ?> &nbsp;</td>
         <td class="sc-nowrap"><?php echo round($list[$i]['seconds_online'] / 60); ?> &nbsp;</td>
-        <td class="sc-nowrap"><?php 
+        <td class="sc-nowrap"><?php
             if ($auth->isLoggedIn($list[$i]['admin_id'])) {
                 ?><strong><?php echo date($app->getParam('date_format'), strtotime($list[$i]['last_login_datetime'])) ?></strong><?php
             } else {
-                echo '0000-00-00 00:00:00' == $list[$i]['last_login_datetime'] ? '' : date($app->getParam('date_format'), strtotime($list[$i]['last_login_datetime'])); 
+                echo Validator::validateStrDate($list[$i]['last_login_datetime']) ? date($app->getParam('date_format'), strtotime($list[$i]['last_login_datetime'])) : '';
             }
         ?> &nbsp;</td>
         <td class="sc-nowrap"><?php echo gethostbyaddr($list[$i]['last_login_ip']); ?> &nbsp;</td>
-        <td class="sc-nowrap"><?php echo '0000-00-00 00:00:00' == $list[$i]['added_datetime'] ? '' : date($app->getParam('date_format'), strtotime($list[$i]['added_datetime'])); ?> &nbsp;</td>
+        <td class="sc-nowrap"><?php echo Validator::validateStrDate($list[$i]['added_datetime']) ? date($app->getParam('date_format'), strtotime($list[$i]['added_datetime'])) : ''; ?> &nbsp;</td>
         <td class="sc-nowrap"><?php echo oTxt($list[$i]['added_admin_username'], true); ?> &nbsp;</td>
-        <td class="sc-nowrap"><?php echo '0000-00-00 00:00:00' == $list[$i]['modified_datetime'] ? '' : date($app->getParam('date_format'), strtotime($list[$i]['modified_datetime'])); ?> &nbsp;</td>
+        <td class="sc-nowrap"><?php echo Validator::validateStrDate($list[$i]['modified_datetime']) ? date($app->getParam('date_format'), strtotime($list[$i]['modified_datetime'])) : ''; ?> &nbsp;</td>
         <td class="sc-nowrap"><?php echo oTxt($list[$i]['modified_admin_username'], true); ?> &nbsp;</td>
         <td class="sc-padleft sc-nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['username'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . "?op=del&admin_id=" . $list[$i]['admin_id']); ?>" onclick="javascript:return confirm('<?php printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt($list[$i]['username'])) ?>')"><img src="/admin/i/trash.gif" alt="Delete" width="10" height="10" border="0" /></a> &nbsp;</td>

trunk/services/templates/log_list.ihtml

@@ -1 +1 @@
 <form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get" class="sc-form">
 <?php $app->printHiddenSession(false); ?>
-<div id="commandbox">
+<div class="commandbox">
 <?php if (is_array($logs) && !empty($logs)) { ?>
     <table>

trunk/services/templates/versions_diff.ihtml

@@ -1 @@
-<div id="commandbox">
+<div class="commandbox">
 <?php if (!getFormData('current', false)) { ?>
     <span class="sc-nowrap commanditem"><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=restore', array('version_id', 'version_title')); ?>"><?php echo _("Restore this saved version"); ?></a></span>

trunk/services/templates/versions_view.ihtml

@@ -1 @@
-<div id="commandbox">
+<div class="commandbox">
 <span class="sc-nowrap commanditem"><a href="<?php echo $app->ohref(oTxt($_SERVER['PHP_SELF'])); ?>"><?php echo _("Back to the Versions List"); ?></a></span>
 <?php if (!getFormData('current', false)) { ?>

trunk/services/versions.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -27 +27 @@
 // require_once dirname(__FILE__) . '/_config.inc.php';
 
+$app->sslOn();
 $auth->requireLogin();
-$app->sslOn();
 
 require_once 'codebase/lib/Version.inc.php';
@@ -38 +38 @@
 
 // Since we're using the singleton pattern we can instantiate a Version object earlier with custom parameters.
-$version =& Version::getInstance($auth);    
+$version =& Version::getInstance($auth);
 
 // Query arguments to retain their values between page requests.