Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 1071)
+++ trunk/CHANGELOG	(revision 1072)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.0 -------------------------------------
+16-July 2009 Matthias Gallas
+!	replaced all remaining mktime() with time(), except from third party scripts
 15-July 2009 Matthias Gallas
 !	changed in modules/admin.php and admin/pages/add.php mktime() to time()
 !	changed in wrapper modul modify.html to modify.htt
Index: trunk/wb/admin/pages/save.php
===================================================================
--- trunk/wb/admin/pages/save.php	(revision 1071)
+++ trunk/wb/admin/pages/save.php	(revision 1072)
@@ -72,7 +72,7 @@
 $module = $results_array['module'];
 
 // Update the pages table
-$now = mktime();
+$now = time();
 $query = "UPDATE ".TABLE_PREFIX."pages SET modified_when = '$now', modified_by = '".$admin->get_user_id()."' WHERE page_id = '$page_id'";
 $database->query($query);
 
Index: trunk/wb/admin/login/forgot/index.php
===================================================================
--- trunk/wb/admin/login/forgot/index.php	(revision 1071)
+++ trunk/wb/admin/login/forgot/index.php	(revision 1072)
@@ -52,7 +52,7 @@
 		
 		// Check if the password has been reset in the last 2 hours
 		$last_reset = $results_array['last_reset'];
-		$time_diff = mktime()-$last_reset; // Time since last reset in seconds
+		$time_diff = time()-$last_reset; // Time since last reset in seconds
 		$time_diff = $time_diff/60/60; // Time since last reset in hours
 		if($time_diff < 2) {
 			
@@ -75,7 +75,7 @@
 				$i++;
 			}
 			
-			$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."', last_reset = '".mktime()."' WHERE user_id = '".$results_array['user_id']."'");
+			$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."', last_reset = '".time()."' WHERE user_id = '".$results_array['user_id']."'");
 			
 			if($database->is_error()) {
 				// Error updating database
Index: trunk/wb/account/forgot_form.php
===================================================================
--- trunk/wb/account/forgot_form.php	(revision 1071)
+++ trunk/wb/account/forgot_form.php	(revision 1072)
@@ -46,7 +46,7 @@
 		
 		// Check if the password has been reset in the last 2 hours
 		$last_reset = $results_array['last_reset'];
-		$time_diff = mktime()-$last_reset; // Time since last reset in seconds
+		$time_diff = time()-$last_reset; // Time since last reset in seconds
 		$time_diff = $time_diff/60/60; // Time since last reset in hours
 		if($time_diff < 2) {
 			
@@ -68,7 +68,7 @@
 				$new_pass = $new_pass . $tmp;
 				$i++;
 			}
-			$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."', last_reset = '".mktime()."' WHERE user_id = '".$results_array['user_id']."'");
+			$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."', last_reset = '".time()."' WHERE user_id = '".$results_array['user_id']."'");
 			
 			if($database->is_error()) {
 				// Error updating database
Index: trunk/wb/modules/droplets/install.php
===================================================================
--- trunk/wb/modules/droplets/install.php	(revision 1071)
+++ trunk/wb/modules/droplets/install.php	(revision 1072)
@@ -62,7 +62,7 @@
 		}
 		$droplet = implode ( "\n", $cArray );
 		$name = substr($dropfile,0,-4);
-		$modified_when = mktime();
+		$modified_when = time();
 		$modified_by = method_exists($admin, 'get_user_id') ? $admin->get_user_id() : 1;
 		$database->query("INSERT INTO `$table`  
 			(name, code, description, comments, active, modified_when, modified_by) 
Index: trunk/wb/modules/droplets/modify_droplet.php
===================================================================
--- trunk/wb/modules/droplets/modify_droplet.php	(revision 1071)
+++ trunk/wb/modules/droplets/modify_droplet.php	(revision 1072)
@@ -46,7 +46,7 @@
 echo registerEditArea ('contentedit','php',true,'both',true,true,600,450,'search, fullscreen, |, undo, redo, |, select_font,|, highlight, reset_highlight, |, help');
 		
 
-$modified_when = mktime();
+$modified_when = time();
 $modified_by = $admin->get_user_id();
 
 // Get header and footer
Index: trunk/wb/modules/droplets/add_droplet.php
===================================================================
--- trunk/wb/modules/droplets/add_droplet.php	(revision 1071)
+++ trunk/wb/modules/droplets/add_droplet.php	(revision 1072)
@@ -22,7 +22,7 @@
 	$module_edit_link = ADMIN_URL .'/admintools/tool.php?tool=droplets';
 	$admin = new admin('admintools', 'admintools');
 
-	$modified_when = mktime();
+	$modified_when = time();
 	$modified_by = $admin->get_user_id();
 
 	// Insert new row into database
Index: trunk/wb/modules/droplets/save_droplet.php
===================================================================
--- trunk/wb/modules/droplets/save_droplet.php	(revision 1071)
+++ trunk/wb/modules/droplets/save_droplet.php	(revision 1072)
@@ -48,7 +48,7 @@
 	$content = $admin->add_slashes(str_replace($tags, '', $_POST['savecontent']));
 	
 	$comments = $admin->add_slashes($admin->get_post('comments'));
-	$modified_when = mktime();
+	$modified_when = time();
 	$modified_by = $admin->get_user_id(); 
 }
 
Index: trunk/wb/modules/form/view.php
===================================================================
--- trunk/wb/modules/form/view.php	(revision 1071)
+++ trunk/wb/modules/form/view.php	(revision 1072)
@@ -435,7 +435,7 @@
 						$submitted_by = 0;
 					}
 					$email_body = $wb->add_slashes($email_body);
-					$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_submissions (page_id,section_id,submitted_when,submitted_by,body) VALUES ('".PAGE_ID."','$section_id','".mktime()."','$submitted_by','$email_body')");
+					$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_submissions (page_id,section_id,submitted_when,submitted_by,body) VALUES ('".PAGE_ID."','$section_id','".time()."','$submitted_by','$email_body')");
 					// Make sure submissions table isn't too full
 					$query_submissions = $database->query("SELECT submission_id FROM ".TABLE_PREFIX."mod_form_submissions ORDER BY submitted_when");
 					$num_submissions = $query_submissions->numRows();
Index: trunk/wb/modules/backup/backup-sql.php
===================================================================
--- trunk/wb/modules/backup/backup-sql.php	(revision 1071)
+++ trunk/wb/modules/backup/backup-sql.php	(revision 1072)
@@ -24,7 +24,7 @@
 */
 
 // Filename to use
-$filename = $_SERVER['HTTP_HOST'].'-backup-'.gmdate('Y-m-d', mktime()+TIMEZONE).'.sql';
+$filename = $_SERVER['HTTP_HOST'].'-backup-'.gmdate('Y-m-d', time()+TIMEZONE).'.sql';
 
 // Check if user clicked on the backup button
 if(!isset($_POST['backup'])){ 
@@ -40,7 +40,7 @@
 "#\n".
 "# Website Baker ".WB_VERSION." Database Backup\n".
 "# ".WB_URL."\n".
-"# ".gmdate(DATE_FORMAT, mktime()+TIMEZONE).", ".gmdate(TIME_FORMAT, mktime()+TIMEZONE)."\n".
+"# ".gmdate(DATE_FORMAT, time()+TIMEZONE).", ".gmdate(TIME_FORMAT, time()+TIMEZONE)."\n".
 "#".
 "\n";
 
Index: trunk/wb/modules/news/save_post.php
===================================================================
--- trunk/wb/modules/news/save_post.php	(revision 1071)
+++ trunk/wb/modules/news/save_post.php	(revision 1072)
@@ -111,7 +111,7 @@
 	$publisheduntil=0;
 
 // Update row
-$database->query("UPDATE ".TABLE_PREFIX."mod_news_posts SET group_id = '$group_id', title = '$title', link = '$post_link', content_short = '$short', content_long = '$long', commenting = '$commenting', active = '$active', published_when = '$publishedwhen', published_until = '$publisheduntil', posted_when = '".mktime()."', posted_by = '".$admin->get_user_id()."' WHERE post_id = '$post_id'");
+$database->query("UPDATE ".TABLE_PREFIX."mod_news_posts SET group_id = '$group_id', title = '$title', link = '$post_link', content_short = '$short', content_long = '$long', commenting = '$commenting', active = '$active', published_when = '$publishedwhen', published_until = '$publisheduntil', posted_when = '".time()."', posted_by = '".$admin->get_user_id()."' WHERE post_id = '$post_id'");
 
 // Check if there is a db error, otherwise say successful
 if($database->is_error()) {
Index: trunk/wb/modules/news/submit_comment.php
===================================================================
--- trunk/wb/modules/news/submit_comment.php	(revision 1071)
+++ trunk/wb/modules/news/submit_comment.php	(revision 1072)
@@ -97,7 +97,7 @@
 	}
 
 	// Insert the comment into db
-	$commented_when = mktime();
+	$commented_when = time();
 	if($wb->is_authenticated() == true) {
 		$commented_by = $wb->get_user_id();
 	} else {