Changeset 246

Timestamp:

04/11/06 11:46:19 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added DATETIME_FORMAT

web/addons/job_monarch/libtoga.php:

• added makeDate()

web/addons/job_monarch/search.php,
web/addons/job_monarch/overview.php:

• disable local makeDate, use from libtoga

web/addons/job_monarch/search.php

Location:

trunk/web/addons/job_monarch

Files:

• conf.php (modified) (1 diff)
• libtoga.php (modified) (2 diffs)
• overview.php (modified) (1 diff)
• search.php (modified) (1 diff)

trunk/web/addons/job_monarch/conf.php

@@ -15 +15 @@
 //
 $GANGLIA_PATH = "/var/www/ganglia";
+
+// Format of how to display a date and time in human readable format
+//
+$DATETIME_FORMAT = "%a %d %b %Y %H:%M:%S";
 
 // Max size of small clusterimage

trunk/web/addons/job_monarch/libtoga.php

@@ -25 +25 @@
 
 
-// If php is compiled without globals
-//
-//if ( !empty( $_GET ) ) {
-//        extract( $_GET );
-//}
-
 class HTTPVariables {
 
@@ -115 +109 @@
 //
 global $metrics, $hosts_up;
+
+global $DATETIME_FORMAT;
+
+function makeDate( $time ) {
+        global $DATETIME_FORMAT;
+        return strftime( $DATETIME_FORMAT, $time );
+}
 
 class TarchDbase {

trunk/web/addons/job_monarch/overview.php

@@ -168 +168 @@
 }
 
-function makeDate( $time ) {
-        return strftime( "%a %d %b %Y %H:%M:%S", $time );
-}
+//function makeDate( $time ) {
+//      return strftime( "%a %d %b %Y %H:%M:%S", $time );
+//}
 
 function colorRed( $color ) {

trunk/web/addons/job_monarch/search.php

@@ -154 +154 @@
 }
 
-function makeDate( $time ) {
-        return strftime( "%a %d %b %Y %H:%M:%S", $time );
-}
+//function makeDate( $time ) {
+//        return strftime( "%a %d %b %Y %H:%M:%S", $time );
+//}
 
 function datetimeToEpoch( $datetime ) {