Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 1058)
+++ trunk/CHANGELOG	(revision 1059)
@@ -11,6 +11,9 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.0 -------------------------------------
+13-July 2009 Dietrich Roland Pehlke
+!	Change inside "date_formats.php" and "time_formats.php" mktime() within time()
+	to avoid warnings and strict messages. See #741. Minor cosmetic changes.
 13-July-2009 Ruud Eisinga
 #	admin / media / browse reported an error in E_STRICT mode.
 13-July 2009 Dietrich Roland Pehlke
Index: trunk/wb/admin/interface/time_formats.php
===================================================================
--- trunk/wb/admin/interface/time_formats.php	(revision 1058)
+++ trunk/wb/admin/interface/time_formats.php	(revision 1059)
@@ -32,7 +32,7 @@
 */
 
 if(!defined('WB_URL')) {
-	header('Location: ../index.php');
+	header('Location: ../../../index.php');
 	exit(0);
 }
 
@@ -45,24 +45,20 @@
 $TIME_FORMATS = array();
 
 // Get the current time (in the users timezone if required)
-if(isset($user_time) AND $user_time == true) {
-	$mktime = mktime()+TIMEZONE;
-} else {
-	$mktime = mktime()+DEFAULT_TIMEZONE;
-}
+$actual_time = time()+ ((isset($user_time) AND $user_time == true) ? TIMEZONE : DEFAULT_TIMEZONE);
 
 // Add values to list
-$TIME_FORMATS['g:i|A'] = gmdate('g:i A', $mktime);
-$TIME_FORMATS['g:i|a'] = gmdate('g:i a', $mktime);
-$TIME_FORMATS['H:i:s'] = gmdate('H:i:s', $mktime);
-$TIME_FORMATS['H:i'] = gmdate('H:i', $mktime);
+$TIME_FORMATS['g:i|A'] = gmdate('g:i A', $actual_time);
+$TIME_FORMATS['g:i|a'] = gmdate('g:i a', $actual_time);
+$TIME_FORMATS['H:i:s'] = gmdate('H:i:s', $actual_time);
+$TIME_FORMATS['H:i'] = gmdate('H:i', $actual_time);
 
 // Add "System Default" to list (if we need to)
 if(isset($user_time) AND $user_time == true) {
 	if(isset($TEXT['SYSTEM_DEFAULT'])) {
-		$TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $mktime).' ('.$TEXT['SYSTEM_DEFAULT'].')';
+		$TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $actual_time).' ('.$TEXT['SYSTEM_DEFAULT'].')';
 	} else {
-		$TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $mktime).' (System Default)';
+		$TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $actual_time).' (System Default)';
 	}
 }
 
Index: trunk/wb/admin/interface/date_formats.php
===================================================================
--- trunk/wb/admin/interface/date_formats.php	(revision 1058)
+++ trunk/wb/admin/interface/date_formats.php	(revision 1059)
@@ -32,7 +32,7 @@
 */
 
 if(!defined('WB_URL')) {
-	header('Location: ../index.php');
+	header('Location: ../../../index.php');
 	exit(0);
 }
 
@@ -45,31 +45,27 @@
 $DATE_FORMATS = array();
 
 // Get the current time (in the users timezone if required)
-if(isset($user_time) AND $user_time == true) {
-	$mktime = mktime()+TIMEZONE;
-} else {
-	$mktime = mktime()+DEFAULT_TIMEZONE;
-}
+$actual_time = time()+ ((isset($user_time) AND $user_time == true) ? TIMEZONE : DEFAULT_TIMEZONE);
 
 // Add values to list
-$DATE_FORMATS['l,|jS|F,|Y'] = gmdate('l, jS F, Y', $mktime);
-$DATE_FORMATS['jS|F,|Y'] = gmdate('jS F, Y', $mktime);
-$DATE_FORMATS['d|M|Y'] = gmdate('d M Y', $mktime);
-$DATE_FORMATS['M|d|Y'] = gmdate('M d Y', $mktime);
-$DATE_FORMATS['D|M|d,|Y'] = gmdate('D M d, Y', $mktime);
-$DATE_FORMATS['d-m-Y'] = gmdate('d-m-Y', $mktime).' (D-M-Y)';
-$DATE_FORMATS['m-d-Y'] = gmdate('m-d-Y', $mktime).' (M-D-Y)';
-$DATE_FORMATS['d.m.Y'] = gmdate('d.m.Y', $mktime).' (D.M.Y)';
-$DATE_FORMATS['m.d.Y'] = gmdate('m.d.Y', $mktime).' (M.D.Y)';
-$DATE_FORMATS['d/m/Y'] = gmdate('d/m/Y', $mktime).' (D/M/Y)';
-$DATE_FORMATS['m/d/Y'] = gmdate('m/d/Y', $mktime).' (M/D/Y)';
+$DATE_FORMATS['l,|jS|F,|Y'] = gmdate('l, jS F, Y', $actual_time);
+$DATE_FORMATS['jS|F,|Y'] = gmdate('jS F, Y', $actual_time);
+$DATE_FORMATS['d|M|Y'] = gmdate('d M Y', $actual_time);
+$DATE_FORMATS['M|d|Y'] = gmdate('M d Y', $actual_time);
+$DATE_FORMATS['D|M|d,|Y'] = gmdate('D M d, Y', $actual_time);
+$DATE_FORMATS['d-m-Y'] = gmdate('d-m-Y', $actual_time).' (D-M-Y)';
+$DATE_FORMATS['m-d-Y'] = gmdate('m-d-Y', $actual_time).' (M-D-Y)';
+$DATE_FORMATS['d.m.Y'] = gmdate('d.m.Y', $actual_time).' (D.M.Y)';
+$DATE_FORMATS['m.d.Y'] = gmdate('m.d.Y', $actual_time).' (M.D.Y)';
+$DATE_FORMATS['d/m/Y'] = gmdate('d/m/Y', $actual_time).' (D/M/Y)';
+$DATE_FORMATS['m/d/Y'] = gmdate('m/d/Y', $actual_time).' (M/D/Y)';
 
 // Add "System Default" to list (if we need to)
 if(isset($user_time) AND $user_time == true) {
 	if(isset($TEXT['SYSTEM_DEFAULT'])) {
-		$DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $mktime).' ('.$TEXT['SYSTEM_DEFAULT'].')';
+		$DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $actual_time).' ('.$TEXT['SYSTEM_DEFAULT'].')';
 	} else {
-		$DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $mktime).' (System Default)';
+		$DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $actual_time).' (System Default)';
 	}
 }