Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

 install/update.php

@@ -129,7 +129,7 @@
if($do_backup == 'yes') {
   
   //* Create the backup directory
   $backup_path = '/var/backup/ispconfig_'.date('Y-m-d_H-i');
   $backup_path = '/var/backup/ispconfig_'.@date('Y-m-d_H-i');
   $conf['backup_path'] = $backup_path;
   exec("mkdir -p $backup_path");
   exec("chown root:root $backup_path");