Bugfix: Nun wird beim Installer auch das Feld Administrator-Benutzern…

…ame beachtet.

Bugfix: Das cronscript versucht jetzt nicht mehr .htaccess oder .htpasswd zu loeschen, wenn diese garnicht existieren.


git-svn-id: file:///var/svn/trunk@52 45fdb5c4-e40b-0410-b369-9aab4fe9a275

syscp/install/install.php

@@ -16,7 +16,7 @@
  *
  * @author Florian Lippert <flo@redenswert.de>
  * @copyright (C) 2003-2004 Florian Lippert
- * @package Panel
+ * @package System
  * @version $Id$
  */
 
@@ -464,7 +464,7 @@ function split_sql_file($sql, $delimiter)
 
 		//last but not least create the main admin
 		status_message('begin', $lng['install']['adding_admin_user']);
-		$db->query("INSERT INTO `".TABLE_PANEL_ADMINS."` (`loginname`, `password`, `name`, `email`, `customers`, `customers_used`, `customers_see_all`, `domains`, `domains_used`, `domains_see_all`, `change_serversettings`, `diskspace`, `diskspace_used`, `mysqls`, `mysqls_used`, `emails`, `emails_used`, `email_forwarders`, `email_forwarders_used`, `ftps`, `ftps_used`, `subdomains`, `subdomains_used`, `traffic`, `traffic_used`, `deactivated`) VALUES ('admin', '".md5($admin_pass1)."', 'Siteadmin', 'admin@$servername', -1, 0, 1, -1, 0, 1, 1, -1024, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1048576, 0, 0);");
+		$db->query("INSERT INTO `".TABLE_PANEL_ADMINS."` (`loginname`, `password`, `name`, `email`, `customers`, `customers_used`, `customers_see_all`, `domains`, `domains_used`, `domains_see_all`, `change_serversettings`, `diskspace`, `diskspace_used`, `mysqls`, `mysqls_used`, `emails`, `emails_used`, `email_forwarders`, `email_forwarders_used`, `ftps`, `ftps_used`, `subdomains`, `subdomains_used`, `traffic`, `traffic_used`, `deactivated`) VALUES ('".$admin_user."', '".md5($admin_pass1)."', 'Siteadmin', 'admin@$servername', -1, 0, 1, -1, 0, 1, 1, -1024, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1048576, 0, 0);");
 		status_message('green', 'OK');
 
 		//now we create the userdata.inc.php with the mysql-accounts

syscp/scripts/cronscript.php

@@ -251,11 +251,11 @@
 					fclose($htpasswd_file_handler);
 				}
 
-				if($htaccess_file == '' && file_exists($row['data']['path']).'.htaccess')
+				if($htaccess_file == '' && file_exists($row['data']['path'].'.htaccess') )
 				{
 					unlink($row['data']['path'].'.htaccess');
 				}
-				if($htpasswd_file == '' && file_exists($row['data']['path']).'.htpasswd')
+				if($htpasswd_file == '' && file_exists($row['data']['path'].'.htpasswd') )
 				{
 					unlink($row['data']['path'].'.htpasswd');
 				}