Changeset 254 for trunk/services

Timestamp:

May 5, 2007 8:56:36 AM (17 years ago)

Author:

quinn

Message:

Various bug fixes to make compatible with Trendease 2.0.

• Minor CSS admin tweaks.
• PHP Notice warnings.
• Minor bugs fixed.

Location:

trunk/services

Files:

• logs.php (modified) (4 diffs)
• templates/versions_view.ihtml (modified) (1 diff)

trunk/services/logs.php

@@ -43 +43 @@
     'log_file' => $app->getParam('log_filename')
 ));
-$tmp_prefs->set('log_file', getFormData('log'));
+if (getFormData('log', false)) {
+    $tmp_prefs->set('log_file', getFormData('log'));    
+}
 
 // Titles and navigation header.
@@ -230 +232 @@
     $app =& App::getInstance();
 
+    $log = array();
+
     if (!is_file($app->getParam('log_directory') . '/' . $log_file)) {
         $app->raiseMsg(sprintf(_("Log file %s not found."), $log_file), MSG_WARNING, __FILE__, __LINE__);
         $app->logMsg(sprintf('Log file %s not found.', $app->getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
-        return false;
+        return $log;
     }
     $log = file($app->getParam('log_directory') . '/' . $log_file);
@@ -244 +248 @@
         }
     }
-    return array_values($log);
+    $log = array_values($log);
+    return $log;
 }
 
@@ -266 +271 @@
     if (is_array($list) && !empty($list)) {
         sort($list);
-        return $list;
-    } else {
-        return false;
-    }
+    }
+    return $list;
 }
 

trunk/services/templates/versions_view.ihtml

@@ -1 +1 @@
 <div id="commandbox">
+<span class="sc-nowrap commandtext"><a href="<?php echo $app->ohref(oTxt($_SERVER['PHP_SELF'])); ?>"><?php echo _("Back to the Versions List"); ?></a></span>
 <?php if (!getFormData('current', false)) { ?>
     <span class="sc-nowrap commandtext"><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=restore', array('version_id', 'version_title')); ?>"><?php echo _("Restore this saved version"); ?></a></span>
-<?php } else { ?>
-    <span class="sc-nowrap commandtext">&nbsp;</span>
 <?php } ?>
 </div>