diff --git a/admin_admins.php b/admin_admins.php
index 32656018..61014ad6 100644
--- a/admin_admins.php
+++ b/admin_admins.php
@@ -78,7 +78,6 @@ if($page == 'admins'
 		{
 			if($paging->checkDisplay($i))
 			{
-				$highlight_row = ($row['service_active'] != '1' && $settings['billing']['activate_billing'] == '1' && $settings['billing']['highlight_inactive'] == '1');
 				$row['traffic_used'] = round($row['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
 				$row['traffic'] = round($row['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
 				$row['diskspace_used'] = round($row['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
diff --git a/admin_domains.php b/admin_domains.php
index e7dccde9..119e64ad 100644
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -524,7 +524,7 @@ if($page == 'domains'
 
 				if($userinfo['customers_see_all'] == '1')
 				{
-					$result_admins = $db->query("SELECT `adminid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `domains_used` < `domains` OR `domains` = '-1' ORDER BY `name` ASC");
+					$result_admins = $db->query("SELECT `adminid`, `loginname`, `name` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `domains_used` < `domains` OR `domains` = '-1' ORDER BY `name` ASC");
 
 					while($row_admin = $db->fetch_array($result_admins))
 					{
@@ -622,7 +622,7 @@ if($page == 'domains'
 	elseif($action == 'edit'
 	       && $id != 0)
 	{
-		$result = $db->query_first("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`adminid`, `d`.`email_only`, `d`.`documentroot`, `d`.`ssl`, `d`.`ssl_redirect`, `d`.`ssl_ipandport`,`d`.`ipandport`, `d`.`aliasdomain`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`subcanemaildomain`, `d`.`dkim`, `d`.`caneditdomain`, `d`.`zonefile`, `d`.`wwwserveralias`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `d`.`add_date`, `d`.`registration_date`, `d`.`interval_fee`, `d`.`interval_length`, `d`.`interval_type`, `d`.`interval_payment`, `d`.`setup_fee`, `d`.`taxclass`, `d`.`service_active`, `d`.`servicestart_date`, `d`.`serviceend_date`, `d`.`lastinvoiced_date`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `c`.`company`, `d`.`phpsettingid`, `d`.`mod_fcgid_starter`, `d`.`mod_fcgid_maxrequests` " . "FROM `" . TABLE_PANEL_DOMAINS . "` `d` " . "LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) " . "WHERE `d`.`parentdomainid`='0' AND `d`.`id`='" . (int)$id . "'" . ($userinfo['customers_see_all'] ? '' : " AND `d`.`adminid` = '" . (int)$userinfo['adminid'] . "' "));
+		$result = $db->query_first("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`adminid`, `d`.`email_only`, `d`.`documentroot`, `d`.`ssl`, `d`.`ssl_redirect`, `d`.`ssl_ipandport`,`d`.`ipandport`, `d`.`aliasdomain`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`subcanemaildomain`, `d`.`dkim`, `d`.`caneditdomain`, `d`.`zonefile`, `d`.`wwwserveralias`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `d`.`add_date`, `d`.`registration_date`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `c`.`company`, `d`.`phpsettingid`, `d`.`mod_fcgid_starter`, `d`.`mod_fcgid_maxrequests` " . "FROM `" . TABLE_PANEL_DOMAINS . "` `d` " . "LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) " . "WHERE `d`.`parentdomainid`='0' AND `d`.`id`='" . (int)$id . "'" . ($userinfo['customers_see_all'] ? '' : " AND `d`.`adminid` = '" . (int)$userinfo['adminid'] . "' "));
 
 		if($result['domain'] != '')
 		{
@@ -994,7 +994,7 @@ if($page == 'domains'
 					$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `domains_used` = `domains_used` - 1 WHERE `adminid` = '" . (int)$result['adminid'] . "' ");
 				}
 
-				$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `customerid` = '" . (int)$customerid . "', `adminid` = '" . (int)$adminid . "', `documentroot`='" . $db->escape($documentroot) . "', `ipandport`='" . $db->escape($ipandport) . "', `ssl`='" . (int)$ssl . "', `ssl_redirect`='" . (int)$ssl_redirect . "', `ssl_ipandport`='" . (int)$ssl_ipandport . "', `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ", `isbinddomain`='" . $db->escape($isbinddomain) . "', `isemaildomain`='" . $db->escape($isemaildomain) . "', `email_only`='" . $db->escape($email_only) . "', `subcanemaildomain`='" . $db->escape($subcanemaildomain) . "', `dkim`='" . $db->escape($dkim) . "', `caneditdomain`='" . $db->escape($caneditdomain) . "', `zonefile`='" . $db->escape($zonefile) . "', `wwwserveralias`='" . $db->escape($wwwserveralias) . "', `openbasedir`='" . $db->escape($openbasedir) . "', `safemode`='" . $db->escape($safemode) . "', `phpsettingid`='" . $db->escape($phpsettingid) . "', `mod_fcgid_starter`='" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests`='" . $db->escape($mod_fcgid_maxrequests) . "', `specialsettings`='" . $db->escape($specialsettings) . "', `registration_date`='" . $db->escape($registration_date) . "', `interval_fee`='" . $db->escape($interval_fee) . "', `interval_length`='" . $db->escape($interval_length) . "', `interval_type`='" . $db->escape($interval_type) . "', `interval_payment`='" . $db->escape($interval_payment) . "', `setup_fee`='" . $db->escape($setup_fee) . "', `taxclass`='" . $db->escape($taxclass) . "', `service_active`='" . $db->escape($service_active) . "', `servicestart_date`='" . $db->escape($servicestart_date) . "', `serviceend_date`='" . $db->escape($serviceend_date) . "' WHERE `id`='" . (int)$id . "'");
+				$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `customerid` = '" . (int)$customerid . "', `adminid` = '" . (int)$adminid . "', `documentroot`='" . $db->escape($documentroot) . "', `ipandport`='" . $db->escape($ipandport) . "', `ssl`='" . (int)$ssl . "', `ssl_redirect`='" . (int)$ssl_redirect . "', `ssl_ipandport`='" . (int)$ssl_ipandport . "', `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ", `isbinddomain`='" . $db->escape($isbinddomain) . "', `isemaildomain`='" . $db->escape($isemaildomain) . "', `email_only`='" . $db->escape($email_only) . "', `subcanemaildomain`='" . $db->escape($subcanemaildomain) . "', `dkim`='" . $db->escape($dkim) . "', `caneditdomain`='" . $db->escape($caneditdomain) . "', `zonefile`='" . $db->escape($zonefile) . "', `wwwserveralias`='" . $db->escape($wwwserveralias) . "', `openbasedir`='" . $db->escape($openbasedir) . "', `safemode`='" . $db->escape($safemode) . "', `phpsettingid`='" . $db->escape($phpsettingid) . "', `mod_fcgid_starter`='" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests`='" . $db->escape($mod_fcgid_maxrequests) . "', `specialsettings`='" . $db->escape($specialsettings) . "', `registration_date`='" . $db->escape($registration_date) . "' WHERE `id`='" . (int)$id . "'");
 				$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `customerid` = '" . (int)$customerid . "', `adminid` = '" . (int)$adminid . "', `ipandport`='" . $db->escape($ipandport) . "', `openbasedir`='" . $db->escape($openbasedir) . "', `safemode`='" . $db->escape($safemode) . "', `phpsettingid`='" . $db->escape($phpsettingid) . "', `mod_fcgid_starter`='" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests`='" . $db->escape($mod_fcgid_maxrequests) . "', `specialsettings`='" . $db->escape($specialsettings) . "'" . $updatechildren . " WHERE `parentdomainid`='" . (int)$id . "'");
 				$log->logAction(ADM_ACTION, LOG_INFO, "edited domain #" . $id);
 				$redirect_props = Array(
@@ -1027,7 +1027,7 @@ if($page == 'domains'
 					if($settings['panel']['allow_domain_change_admin'] == '1')
 					{
 						$admins = '';
-						$result_admins = $db->query("SELECT `adminid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_ADMINS . "` WHERE (`domains_used` < `domains` OR `domains` = '-1') OR `adminid` = '" . (int)$result['adminid'] . "' ORDER BY `name` ASC");
+						$result_admins = $db->query("SELECT `adminid`, `loginname`, `name` FROM `" . TABLE_PANEL_ADMINS . "` WHERE (`domains_used` < `domains` OR `domains` = '-1') OR `adminid` = '" . (int)$result['adminid'] . "' ORDER BY `name` ASC");
 
 						while($row_admin = $db->fetch_array($result_admins))
 						{
@@ -1036,7 +1036,7 @@ if($page == 'domains'
 					}
 					else
 					{
-						$admin = $db->query_first("SELECT `adminid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = '" . (int)$result['adminid'] . "'");
+						$admin = $db->query_first("SELECT `adminid`, `loginname`, `name` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = '" . (int)$result['adminid'] . "'");
 						$result['adminname'] = getCorrectFullUserDetails($admin) . ' (' . $admin['loginname'] . ')';
 					}
 				}
diff --git a/install/install.php b/install/install.php
index ce24a675..559d7d12 100644
--- a/install/install.php
+++ b/install/install.php
@@ -1,16 +1,18 @@
 <?php
 
 /**
- * This file is part of the SysCP project.
+ * This file is part of the Froxlor project.
  * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.syscp.org/misc/COPYING.txt
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
  *
  * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org>
- * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor Team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    System
  * @version    $Id: install.php 2724 2009-06-07 14:18:02Z flo $
  */
@@ -23,7 +25,7 @@
 if(file_exists('../lib/userdata.inc.php'))
 {
 	/**
-	 * Includes the Usersettings eg. MySQL-Username/Passwort etc. to test if SysCP is already installed
+	 * Includes the Usersettings eg. MySQL-Username/Passwort etc. to test if Froxlor is already installed
 	 */
 
 	require ('../lib/userdata.inc.php');
@@ -31,7 +33,7 @@ if(file_exists('../lib/userdata.inc.php'))
 	if(isset($sql)
 	   && is_array($sql))
 	{
-		die('Sorry, SysCP is already configured...');
+		die('Sorry, Froxlor is already configured...');
 	}
 }
 
@@ -95,7 +97,7 @@ function page_header()
 <head>
 	<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" />
 	<link rel="stylesheet" href="../templates/main.css" type="text/css" />
-	<title>SysCP</title>
+	<title>Froxlor</title>
 </head>
 	<body style="margin: 0; padding: 0;" onload="document.loginform.loginname.focus()">
 		<!--
@@ -366,7 +368,7 @@ if(isset($_POST['installstep'])
 ?>
 	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
 		<tr>
-			<td class="maintitle"><b><img src="../images/title.gif" alt="" />&nbsp;SysCP Installation</b></td>
+			<td class="maintitle"><b><img src="../images/title.gif" alt="" />&nbsp;Froxlor Installation</b></td>
 		</tr>
 <?php
 	$_die = false;
diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php
index d4071f52..7e5d9ec2 100644
--- a/install/lng/english.lng.php
+++ b/install/lng/english.lng.php
@@ -1,16 +1,18 @@
 <?php
 
 /**
- * This file is part of the SysCP project.
+ * This file is part of the Froxlor project.
  * Copyright (c) 2003-2007 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.syscp.org/misc/COPYING.txt
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
  *
  * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org>
- * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
+ * @author     Florian Lippert <flo@syscp.org> (2003-2007)
+ * @author     Froxlor Team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Language
  * @version    $Id: english.lng.php 2452 2008-11-30 13:12:36Z flo $
  */
@@ -20,8 +22,8 @@
  */
 
 $lng['install']['language'] = 'Installation - Language';
-$lng['install']['welcome'] = 'Welcome to SysCP Installation';
-$lng['install']['welcometext'] = 'Thank you for choosing SysCP. Please fill out the following fields with the required information to start the installation.<br /><b>Attention:</b> If the database you chose for SysCP already exists on your System, it will be erased with all containing data!';
+$lng['install']['welcome'] = 'Welcome to Froxlor Installation';
+$lng['install']['welcometext'] = 'Thank you for choosing Froxlor. Please fill out the following fields with the required information to start the installation.<br /><b>Attention:</b> If the database you chose for Froxlor already exists on your System, it will be erased with all containing data!';
 $lng['install']['database'] = 'Database';
 $lng['install']['mysql_hostname'] = 'MySQL-Hostname';
 $lng['install']['mysql_database'] = 'MySQL-Database';
@@ -59,16 +61,16 @@ $lng['install']['creating_configfile'] = 'Creating configfile...';
 $lng['install']['creating_configfile_succ'] = 'OK, userdata.inc.php was saved in lib/.';
 $lng['install']['creating_configfile_temp'] = 'File was saved in /tmp/userdata.inc.php, please move to lib/.';
 $lng['install']['creating_configfile_failed'] = 'Cannot create lib/userdata.inc.php, please create it manually with the following data:';
-$lng['install']['syscp_succ_installed'] = 'SysCP was installed successfully.';
+$lng['install']['froxlor_succ_installed'] = 'Froxlor was installed successfully.';
 $lng['install']['click_here_to_login'] = 'Click here to login.';
 $lng['install']['phpmysql'] = 'Testing if PHP MySQL-extension is installed...';
 $lng['install']['phpfilter'] = 'Testing if PHP filter-extension is installed...';
-$lng['install']['diedbecauseofrequirements'] = 'Cannot install SysCP without these requirements! Aborting...';
+$lng['install']['diedbecauseofrequirements'] = 'Cannot install Froxlor without these requirements! Aborting...';
 $lng['install']['notinstalled'] = 'not installed!';
 $lng['install']['phpbcmath'] = 'Testing if PHP bcmath-extension is installed...';
 $lng['install']['bcmathdescription'] = 'Traffic-calculation related functions will not work correctly!';
 $lng['install']['openbasedir'] = 'Testing if open_basedir is enabled...';
-$lng['install']['openbasedirenabled'] = 'enabled. SysCP will not work properly with open_basedir enabled. Please disable open_basedir for syscp';
+$lng['install']['openbasedirenabled'] = 'enabled. Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for syscp';
 
 /**
  * Renamed in 1.2.19-svn40
diff --git a/install/lng/french.lng.php b/install/lng/french.lng.php
index 0c122731..29421b1a 100644
--- a/install/lng/french.lng.php
+++ b/install/lng/french.lng.php
@@ -1,17 +1,19 @@
 <?php
 
 /**
- * This file is part of the SysCP project.
+ * This file is part of the Froxlor project.
  * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.syscp.org/misc/COPYING.txt
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
  *
  * @copyright  (c) the authors
  * @author     Tim Zielosko <mail@zielosko.net>
  * @author     Romain MARIADASSOU <roms2000@free.fr>
- * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
+ * @author     Froxlor Team <team@froxlor.org>
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Language
  * @version    $Id: french.lng.php 2692 2009-03-27 18:04:47Z flo $
  */
@@ -21,8 +23,8 @@
  */
 
 $lng['install']['language'] = 'Langue d\'installation';
-$lng['install']['welcome'] = 'Bienvenue à l\'installation de SysCP';
-$lng['install']['welcometext'] = 'Merci beaucoup d\'avoir choisi SysCP. Pour installer SysCP remplissez les cases ci-dessous avec les informations demandées.<br /><b>Attention :</b> Si vous entrez le nom d\'une base de données existante, celle-ci sera effacée !';
+$lng['install']['welcome'] = 'Bienvenue à l\'installation de Froxlor';
+$lng['install']['welcometext'] = 'Merci beaucoup d\'avoir choisi Froxlor. Pour installer Froxlor remplissez les cases ci-dessous avec les informations demandées.<br /><b>Attention :</b> Si vous entrez le nom d\'une base de données existante, celle-ci sera effacée !';
 $lng['install']['database'] = 'Base de données';
 $lng['install']['mysql_hostname'] = 'Nom d\'hôte du serveur MySQL';
 $lng['install']['mysql_database'] = 'Base de données MySQL';
@@ -52,10 +54,10 @@ $lng['install']['importing_data'] = 'Importation des informations dans la base d
 $lng['install']['changing_data'] = 'Modification des données importés ...';
 $lng['install']['adding_admin_user'] = 'Ajout de l\'utilisateur administrateur ...';
 $lng['install']['creating_configfile'] = 'Création du fichier de configuration ...';
-$lng['install']['creating_configfile_succ'] = 'OK, userdata.inc.php a été sauvegardé dans le dossier lib/ de SysCP.';
-$lng['install']['creating_configfile_temp'] = 'Le fichier a été sauvegardé dans /tmp/userdata.inc.php, veuillez le déplacer / copier dans le dossier lib/ de SysCP.';
+$lng['install']['creating_configfile_succ'] = 'OK, userdata.inc.php a été sauvegardé dans le dossier lib/ de Froxlor.';
+$lng['install']['creating_configfile_temp'] = 'Le fichier a été sauvegardé dans /tmp/userdata.inc.php, veuillez le déplacer / copier dans le dossier lib/ de Froxlor.';
 $lng['install']['creating_configfile_failed'] = 'Erreur en créant le fichier lib/userdata.inc.php, veuillez le créer avec le contenu ci-dessous :';
-$lng['install']['syscp_succ_installed'] = 'SysCP a été installé correctement.';
+$lng['install']['froxlor_succ_installed'] = 'Froxlor a été installé correctement.';
 $lng['install']['click_here_to_login'] = 'Cliquez ici pour vous rendre à l\'invite de connexion.';
 $lng['install']['httpuser'] = 'Nom du utilisateur du HTTP';
 $lng['install']['httpgroup'] = 'Nom du la group du HTTP';
diff --git a/install/lng/german.lng.php b/install/lng/german.lng.php
index 7b82f7db..7aaf472a 100644
--- a/install/lng/german.lng.php
+++ b/install/lng/german.lng.php
@@ -1,16 +1,18 @@
 <?php
 
 /**
- * This file is part of the SysCP project.
+ * This file is part of the Froxlor project.
  * Copyright (c) 2003-2007 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the
  * COPYING file online at http://files.syscp.org/misc/COPYING.txt
  *
  * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org>
- * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
+ * @author     Florian Lippert <flo@syscp.org> (2003-2007)
+ * @author     Froxlor Team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Language
  * @version    $Id: german.lng.php 2452 2008-11-30 13:12:36Z flo $
  */
@@ -20,8 +22,8 @@
  */
 
 $lng['install']['language'] = 'Installations - Sprache';
-$lng['install']['welcome'] = 'Willkommen zur SysCP Installation';
-$lng['install']['welcometext'] = 'Vielen Dank dass Sie sich f&uuml;r SysCP entschieden haben. Um Ihre Installation von SysCP zu starten, f&uuml;llen Sie bitte alle Felder unten mit den geforderten Angaben.<br /><b>Achtung:</b> Eine eventuell bereits existierende Datenbank, die den selben Namen hat wie den, den Sie unten eingeben werden, wird mit allen enthaltenen Daten gel&ouml;scht!';
+$lng['install']['welcome'] = 'Willkommen zur Froxlor Installation';
+$lng['install']['welcometext'] = 'Vielen Dank dass Sie sich f&uuml;r Froxlor entschieden haben. Um Ihre Installation von Froxlor zu starten, f&uuml;llen Sie bitte alle Felder unten mit den geforderten Angaben.<br /><b>Achtung:</b> Eine eventuell bereits existierende Datenbank, die den selben Namen hat wie den, den Sie unten eingeben werden, wird mit allen enthaltenen Daten gel&ouml;scht!';
 $lng['install']['database'] = 'Datenbank';
 $lng['install']['mysql_hostname'] = 'MySQL-Hostname';
 $lng['install']['mysql_database'] = 'MySQL-Datenbank';
@@ -54,16 +56,16 @@ $lng['install']['creating_configfile'] = 'Erstelle Konfigurationsdatei...';
 $lng['install']['creating_configfile_succ'] = 'OK, userdata.inc.php wurde in lib/ gespeichert.';
 $lng['install']['creating_configfile_temp'] = 'Datei wurde in /tmp/userdata.inc.php gespeichert, bitte nach lib/ verschieben.';
 $lng['install']['creating_configfile_failed'] = 'Konnte lib/userdata.inc.php nicht erstellen, bitte manuell mit folgendem Inhalt anlegen:';
-$lng['install']['syscp_succ_installed'] = 'SysCP wurde erfolgreich installiert.';
+$lng['install']['froxlor_succ_installed'] = 'Froxlor wurde erfolgreich installiert.';
 $lng['install']['click_here_to_login'] = 'Hier geht es weiter zum Login-Fenster.';
 $lng['install']['phpmysql'] = 'Teste, ob die PHP MySQL-Erweiterung installiert ist...';
 $lng['install']['phpfilter'] = 'Teste, ob die PHP Filter-Erweiterung installiert ist...';
-$lng['install']['diedbecauseofrequirements'] = 'Kann SysCP ohne diese Voraussetzungen nicht installieren! Breche ab...';
+$lng['install']['diedbecauseofrequirements'] = 'Kann Froxlor ohne diese Voraussetzungen nicht installieren! Breche ab...';
 $lng['install']['notinstalled'] = 'nicht installiert!';
 $lng['install']['phpbcmath'] = 'Teste, ob die PHP bcmath-Erweiterung installiert ist...';
 $lng['install']['bcmathdescription'] = 'Traffic-Berechnungs bezogene Funktionen stehen nicht vollst&auml;ndig zur Verf&uuml;gung!';
 $lng['install']['openbasedir'] = 'Teste, ob open_basedir genutzt wird...';
-$lng['install']['openbasedirenabled'] = 'aktiviert. SysCP wird mit aktiviertem open_basedir nicht vollst&auml;ndig funktionieren. Bitte deaktivieren Sie open_basedir f&uuml;r SysCP';
+$lng['install']['openbasedirenabled'] = 'aktiviert. Froxlor wird mit aktiviertem open_basedir nicht vollst&auml;ndig funktionieren. Bitte deaktivieren Sie open_basedir f&uuml;r Froxlor';
 $lng['install']['httpuser'] = 'HTTP Username';
 $lng['install']['httpgroup'] = 'HTTP Gruppenname';
 
diff --git a/install/updates/froxlor/upgrade_syscp.inc.php b/install/updates/froxlor/upgrade_syscp.inc.php
index fa164cf9..b38a32b9 100644
--- a/install/updates/froxlor/upgrade_syscp.inc.php
+++ b/install/updates/froxlor/upgrade_syscp.inc.php
@@ -199,7 +199,56 @@ if($settings['panel']['frontend'] == 'froxlor'
 		  MODIFY `traffic_used` BIGINT(30)");
 	
 	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (119, 'spf', 'use_spf', '0');");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (120, 'spf', 'spf_entry', '@	IN	TXT	\"v=spf1 a mx -all\"');");	
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (120, 'spf', 'spf_entry', '@	IN	TXT	\"v=spf1 a mx -all\"');");
+
+	// Convert all data to UTF-8 to have a sane standard across all data
+	$tables = $db->fetch_array("SHOW TABLES");
+	foreach ($tables as $table)
+	{
+		$db->query("ALTER TABLE " . $table[0] . " CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;");
+		$db->query("ALTER TABLE " . $table[0] . " DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci");
+
+		$columns = $db->fetch_array("SHOW COLUMNS FROM ".$table[0]);
+
+		$affected_columns = array();
+
+		$primarykey = "";
+		foreach ($columns as $column)
+		{
+			if (!(strpos($column['Type'], "char") === false) || !(strpos($column['Type'], "text") === false))
+			{
+				$affected_columns[] = $column['Field'];
+			}
+
+			if ($column['Key'] == 'PRI') {
+				$primarykey = $column['Field'];
+			}
+		}
+
+		$count_cols = count($affected_columns);
+		if ($count_cols > 0)
+		{
+			$load = "";
+			foreach($affected_columns as $col)
+			{
+				$load .= ", " . $col;
+			}
+
+			$rows = $db->fetch_array("SELECT $primarykey" . $load . " FROM " . $table[0]);
+
+			foreach($rows as $row)
+			{
+				$changes = "";
+				for ($i = 0; $i < $count_cols; $i++)
+				{
+					$base = $affected_columns[$i] . " = " . $db->escape(convertUtf8($row[$affected_columns[$i]])) ;
+					$changes .= ($i == ($count_cols-1)) ? $base : $base . ", ";
+				}
+
+				$db->query("UPDATE " . $table[0] . " SET " . $changes . " WHERE $primarykey = " . $db->escape($row['id']) . ";");
+			}
+		}
+	}
 }
 
 ?>
diff --git a/lib/classes/database/class.db.php b/lib/classes/database/class.db.php
index 8f1b28ff..c5e3cc68 100644
--- a/lib/classes/database/class.db.php
+++ b/lib/classes/database/class.db.php
@@ -132,6 +132,8 @@ class db
 				$this->showerror('Trying to use database ' . $this->database . ' failed, exiting');
 			}
 		}
+		mysql_query("SET NAMES utf8", $this->link_id);
+		mysql_query("SET CHARACTER SET utf8", $this->link_id);
 	}
 
 	/**
diff --git a/lib/functions/froxlor/function.convertUtf8.php b/lib/functions/froxlor/function.convertUtf8.php
new file mode 100644
index 00000000..ba5a3e27
--- /dev/null
+++ b/lib/functions/froxlor/function.convertUtf8.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Aders <eleras@froxlor.org>
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Functions
+ * @version    $Id$
+ */
+
+/**
+ * Convert a string to UTF-8 if needed
+ * @param string String to be converted
+ * @return string UTF-8 encoded string
+ *
+ * @author Florian Aders <eleras@froxlor.org>
+ */
+
+function convertUtf8 ($string) {
+	if (!isUtf8($string))
+	{
+		$string = utf8_encode($string);
+	}
+	return addslashes($string);
+}
\ No newline at end of file
diff --git a/lib/functions/syscp/function.createAWStatsConf.php b/lib/functions/froxlor/function.createAWStatsConf.php
similarity index 100%
rename from lib/functions/syscp/function.createAWStatsConf.php
rename to lib/functions/froxlor/function.createAWStatsConf.php
diff --git a/lib/functions/syscp/function.createAWStatsVhost.php b/lib/functions/froxlor/function.createAWStatsVhost.php
similarity index 100%
rename from lib/functions/syscp/function.createAWStatsVhost.php
rename to lib/functions/froxlor/function.createAWStatsVhost.php
diff --git a/lib/functions/syscp/function.getAdmins.php b/lib/functions/froxlor/function.getAdmins.php
similarity index 100%
rename from lib/functions/syscp/function.getAdmins.php
rename to lib/functions/froxlor/function.getAdmins.php
diff --git a/lib/functions/syscp/function.getCustomerDetail.php b/lib/functions/froxlor/function.getCustomerDetail.php
similarity index 100%
rename from lib/functions/syscp/function.getCustomerDetail.php
rename to lib/functions/froxlor/function.getCustomerDetail.php
diff --git a/lib/functions/syscp/function.getCustomers.php b/lib/functions/froxlor/function.getCustomers.php
similarity index 100%
rename from lib/functions/syscp/function.getCustomers.php
rename to lib/functions/froxlor/function.getCustomers.php
diff --git a/lib/functions/syscp/function.getIpAddresses.php b/lib/functions/froxlor/function.getIpAddresses.php
similarity index 100%
rename from lib/functions/syscp/function.getIpAddresses.php
rename to lib/functions/froxlor/function.getIpAddresses.php
diff --git a/lib/functions/syscp/function.getIpPortCombinations.php b/lib/functions/froxlor/function.getIpPortCombinations.php
similarity index 100%
rename from lib/functions/syscp/function.getIpPortCombinations.php
rename to lib/functions/froxlor/function.getIpPortCombinations.php
diff --git a/lib/functions/syscp/function.getLanguages.php b/lib/functions/froxlor/function.getLanguages.php
similarity index 100%
rename from lib/functions/syscp/function.getLanguages.php
rename to lib/functions/froxlor/function.getLanguages.php
diff --git a/lib/functions/syscp/function.getSessionUserDetail.php b/lib/functions/froxlor/function.getSessionUserDetail.php
similarity index 100%
rename from lib/functions/syscp/function.getSessionUserDetail.php
rename to lib/functions/froxlor/function.getSessionUserDetail.php
diff --git a/lib/functions/syscp/function.inserttask.php b/lib/functions/froxlor/function.inserttask.php
similarity index 100%
rename from lib/functions/syscp/function.inserttask.php
rename to lib/functions/froxlor/function.inserttask.php
diff --git a/lib/functions/froxlor/function.isUtf8.php b/lib/functions/froxlor/function.isUtf8.php
new file mode 100644
index 00000000..9a155cf4
--- /dev/null
+++ b/lib/functions/froxlor/function.isUtf8.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Aders <eleras@froxlor.org>
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Functions
+ * @version    $Id$
+ */
+
+/**
+ * Function which checks if a string is UTF8 encoded or not
+ * @param string String to be checked
+ * @return bool true if string is UTF8 encoded
+ *
+ * @author Florian Aders <eleras@froxlor.org>
+ */
+
+function isUtf8 ($string) {
+	// From http://w3.org/International/questions/qa-forms-utf-8.html
+	return preg_match('%^(?:
+		[\x09\x0A\x0D\x20-\x7E]            # ASCII
+		| [\xC2-\xDF][\x80-\xBF]            # non-overlong 2-byte
+		|  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+		| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+		|  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+		|  \xF0[\x90-\xBF][\x80-\xBF]{2}    # planes 1-3
+		| [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+		|  \xF4[\x80-\x8F][\x80-\xBF]{2}    # plane 16
+		)*$%xs', $string
+	);
+}
diff --git a/lib/functions/syscp/function.loadConfigArrayDir.php b/lib/functions/froxlor/function.loadConfigArrayDir.php
similarity index 100%
rename from lib/functions/syscp/function.loadConfigArrayDir.php
rename to lib/functions/froxlor/function.loadConfigArrayDir.php
diff --git a/lib/functions/syscp/function.updateCounters.php b/lib/functions/froxlor/function.updateCounters.php
similarity index 100%
rename from lib/functions/syscp/function.updateCounters.php
rename to lib/functions/froxlor/function.updateCounters.php
diff --git a/lib/init.php b/lib/init.php
index 92393579..0aab8fb8 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -19,7 +19,7 @@
 
 header("Cache-Control: no-cache, must-revalidate");
 header("Pragma: no-cache");
-header("Content-type: text/html; charset=ISO-8859-1");
+header("Content-type: text/html; charset=utf-8");
 
 // ensure that default timezone is set
 if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
@@ -373,4 +373,4 @@ if($page == '')
 $mail = new PHPMailer();
 $mail->From = $settings['panel']['adminmail'];
 
-?>
\ No newline at end of file
+?>
diff --git a/lng/english.lng.php b/lng/english.lng.php
index ad6781cc..ddb1093c 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -342,8 +342,8 @@ $lng['serversettings']['ipaddress']['title'] = 'IP-Address';
 $lng['serversettings']['ipaddress']['description'] = 'What\'s the IP-address of this server?';
 $lng['serversettings']['hostname']['title'] = 'Hostname';
 $lng['serversettings']['hostname']['description'] = 'What\'s the Hostname of this server?';
-$lng['serversettings']['apachereload_command']['title'] = 'Apache reload command';
-$lng['serversettings']['apachereload_command']['description'] = 'What\'s the apache command to reload apache configfiles?';
+$lng['serversettings']['apachereload_command']['title'] = 'Webserver reload command';
+$lng['serversettings']['apachereload_command']['description'] = 'What\'s the webserver command to reload configfiles?';
 $lng['serversettings']['bindconf_directory']['title'] = 'Bind config directory';
 $lng['serversettings']['bindconf_directory']['description'] = 'Where should bind configfiles be saved?';
 $lng['serversettings']['bindreload_command']['title'] = 'Bind reload command';
@@ -542,7 +542,7 @@ $lng['panel']['back'] = 'Back';
 $lng['serversettings']['mod_log_sql']['title'] = 'Temporary save logs in the database';
 $lng['serversettings']['mod_log_sql']['description'] = 'Use <a href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> to save webrequests temporarily<br /><b>This needs a special <a href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - documentation">apache-configuration</a>!</b>';
 $lng['serversettings']['mod_fcgid']['title'] = 'Include PHP via mod_fcgid/suexec';
-$lng['serversettings']['mod_fcgid']['description'] = 'Use mod_fcgid/suexec/libnss_mysql to run PHP with the corresponding useraccount.<br/><b>This needs a special Apache configuration. All following options are only valid if the module is enabled.</b>';
+$lng['serversettings']['mod_fcgid']['description'] = 'Use mod_fcgid/suexec/libnss_mysql to run PHP with the corresponding useraccount.<br/><b>This needs a special Webserver configuration. All following options are only valid if the module is enabled.</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Use alternative email-address';
 $lng['serversettings']['sendalternativemail']['description'] = 'Send the password-email to a different address during email-account-creation';
 $lng['emails']['alternative_emailaddress'] = 'Alternative e-mail-address';
@@ -557,11 +557,11 @@ $lng['error']['documentrootexists'] = 'The directory &quot;%s&quot; already exis
 
 // ADDED IN 1.2.16-svn14
 
-$lng['serversettings']['apacheconf_vhost']['title'] = 'Apache vhost configuration file/dirname';
+$lng['serversettings']['apacheconf_vhost']['title'] = 'Webserver vhost configuration file/dirname';
 $lng['serversettings']['apacheconf_vhost']['description'] = 'Where should the vhost configuration be stored? You could either specify a file (all vhosts in one file) or directory (each vhost in his own file) here.';
-$lng['serversettings']['apacheconf_diroptions']['title'] = 'Apache diroptions configuration file/dirname';
+$lng['serversettings']['apacheconf_diroptions']['title'] = 'Webserver diroptions configuration file/dirname';
 $lng['serversettings']['apacheconf_diroptions']['description'] = 'Where should the diroptions configuration be stored? You could either specify a file (all diroptions in one file) or directory (each diroption in his own file) here.';
-$lng['serversettings']['apacheconf_htpasswddir']['title'] = 'Apache htpasswd dirname';
+$lng['serversettings']['apacheconf_htpasswddir']['title'] = 'Webserver htpasswd dirname';
 $lng['serversettings']['apacheconf_htpasswddir']['description'] = 'Where should the htpasswd files for directory protection be stored?';
 
 // ADDED IN 1.2.16-svn15
@@ -793,7 +793,7 @@ $lng['admin']['sslsettings'] = 'SSL settings';
 $lng['cronjobs']['notyetrun'] = 'Not yet run';
 $lng['install']['servername_should_be_fqdn'] = 'The servername should be a FQDN and not an IP address';
 $lng['serversettings']['default_vhostconf']['title'] = 'Default vhost-settings';
-$lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into the domain vhost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, apache might ot start again!';
+$lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into the domain vhost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!';
 $lng['error']['invalidip'] = 'Invalid IP address: %s';
 $lng['serversettings']['decimal_places'] = 'Number of decimal places in traffic/webspace output';
 
diff --git a/lng/german.lng.php b/lng/german.lng.php
index b6243033..fe394a47 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -336,14 +336,14 @@ $lng['serversettings']['ftpprefix']['title'] = 'FTP-Prefix';
 $lng['serversettings']['ftpprefix']['description'] = 'Welchen Prefix sollen die FTP-Benutzerkonten haben?';
 $lng['serversettings']['documentroot_prefix']['title'] = 'Heimatverzeichnis';
 $lng['serversettings']['documentroot_prefix']['description'] = 'Wo sollen alle Heimatverzeichnisse der Kunden liegen?';
-$lng['serversettings']['logfiles_directory']['title'] = 'Apache-Logdateien-Verzeichnis';
-$lng['serversettings']['logfiles_directory']['description'] = 'Wo sollen alle Logdateien des Apache liegen?';
+$lng['serversettings']['logfiles_directory']['title'] = 'Webserver-Logdateien-Verzeichnis';
+$lng['serversettings']['logfiles_directory']['description'] = 'Wo sollen alle Logdateien des Webservers liegen?';
 $lng['serversettings']['ipaddress']['title'] = 'IP-Adresse';
 $lng['serversettings']['ipaddress']['description'] = 'Welche IP-Adresse hat der Server?';
 $lng['serversettings']['hostname']['title'] = 'Hostname';
 $lng['serversettings']['hostname']['description'] = 'Welchen Hostnamen hat der Server?';
-$lng['serversettings']['apachereload_command']['title'] = 'Apache-Reload-Command';
-$lng['serversettings']['apachereload_command']['description'] = 'Wie heisst das Skript zum Neuladen der Apache-Konfigurationsdateien?';
+$lng['serversettings']['apachereload_command']['title'] = 'Webserver-Reload-Command';
+$lng['serversettings']['apachereload_command']['description'] = 'Wie heisst das Skript zum Neuladen der Webserver-Konfigurationsdateien?';
 $lng['serversettings']['bindconf_directory']['title'] = 'Bind-Config-Directory';
 $lng['serversettings']['bindconf_directory']['description'] = 'Wo liegen die Bind-Konfigurationsdateien?';
 $lng['serversettings']['bindreload_command']['title'] = 'Bind-Reload-Command';
@@ -556,11 +556,11 @@ $lng['error']['documentrootexists'] = 'Es existiert noch ein Verzeichnis &quot;%
 
 // ADDED IN 1.2.16-svn14
 
-$lng['serversettings']['apacheconf_vhost']['title'] = 'Apache vHost-Konfigurations-Datei/Verzeichnis-Name';
+$lng['serversettings']['apacheconf_vhost']['title'] = 'Webserver vHost-Konfigurations-Datei/Verzeichnis-Name';
 $lng['serversettings']['apacheconf_vhost']['description'] = 'Wo soll die vHost-Konfigurationen abgelegt werden? Sie k&ouml;nnen entweder eine Datei (also mit allen vhosts) oder einen Ordner (mit einer Datei pro vhost) angeben.';
-$lng['serversettings']['apacheconf_diroptions']['title'] = 'Apache Verzeichnisoption-Konfigurations-Datei/Verzeichnis-Name';
+$lng['serversettings']['apacheconf_diroptions']['title'] = 'Webserver Verzeichnisoption-Konfigurations-Datei/Verzeichnis-Name';
 $lng['serversettings']['apacheconf_diroptions']['description'] = 'Wo soll die Verzeichnisoption-Konfigurationen abgelegt werden? Sie k&ouml;nnen entweder eine Datei (also mit allen vhosts) oder einen Ordner (mit einer Datei pro vhost) angeben.';
-$lng['serversettings']['apacheconf_htpasswddir']['title'] = 'Apache htpasswd Verzeichnisname';
+$lng['serversettings']['apacheconf_htpasswddir']['title'] = 'Webserver htpasswd Verzeichnisname';
 $lng['serversettings']['apacheconf_htpasswddir']['description'] = 'Wo sollen die htpasswd-Dateien f&uuml; den Verzeichnisschutz abgelegt werden?';
 
 // ADDED IN 1.2.16-svn15
@@ -572,7 +572,7 @@ $lng['serversettings']['mysql_access_host']['description'] = 'Eine durch Komma g
 // CHANGED IN 1.2.18
 
 $lng['serversettings']['mod_log_sql']['description'] = '<a href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> benutzen um die Webzugriffe tempor&auml;r zu speichern<br /><b>Dies ben&ouml;tigt eine spezielle <a href="http://files.syscp.org/docs/mod_log_sql/" title="mod_log_sql - Dokumentation">Apache-Konfiguration</a></b>';
-$lng['serversettings']['mod_fcgid']['description'] = 'mod_fcgid/suexec/libnss_mysql benutzen um PHP unter dem jeweiligen Useraccount laufen zu lassen<br /><b>Dies ben&ouml;tigt eine spezielle Apache-Konfiguration. Alle nachfolgenden Optionen sind nur g&uuml;ltig wenn das Modul aktiviert wird.</b>';
+$lng['serversettings']['mod_fcgid']['description'] = 'mod_fcgid/suexec/libnss_mysql benutzen um PHP unter dem jeweiligen Useraccount laufen zu lassen<br /><b>Dies ben&ouml;tigt eine spezielle Webserver-Konfiguration. Alle nachfolgenden Optionen sind nur g&uuml;ltig wenn das Modul aktiviert wird.</b>';
 
 // ADDED IN 1.2.18-svn1
 
@@ -797,7 +797,7 @@ $lng['admin']['sslsettings'] = 'SSL Einstellungen';
 $lng['cronjobs']['notyetrun'] = 'Bisher nicht gestartet';
 $lng['install']['servername_should_be_fqdn'] = 'Der Servername sollte eine FQDN sein und keine IP Adresse';
 $lng['serversettings']['default_vhostconf']['title'] = 'Standard Vhost-Einstellungen';
-$lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container &uuml;bernommen. Achtung: Der Code wird nicht auf Fehler gepr&uuml;ft. Etwaige Fehler werden also auch &uuml;bernommen. Apache k&ouml;nnte nicht mehr starten!';
+$lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container &uuml;bernommen. Achtung: Der Code wird nicht auf Fehler gepr&uuml;ft. Etwaige Fehler werden also auch &uuml;bernommen. Der Webserver k&ouml;nnte nicht mehr starten!';
 $lng['error']['invalidip'] = 'Ung&uuml;ltige IP Adresse: %s';
 $lng['serversettings']['decimal_places'] = 'Nachkommastellen bei der Ausgabe von Traffic/Webspace';
 
diff --git a/scripts/cron_tasks.inc.http.10.apache.php b/scripts/cron_tasks.inc.http.10.apache.php
index 645c649f..c9c5df1e 100644
--- a/scripts/cron_tasks.inc.http.10.apache.php
+++ b/scripts/cron_tasks.inc.http.10.apache.php
@@ -30,10 +30,10 @@ class apache
 	private $logger = false;
 	private $debugHandler = false;
 	private $idnaConvert = false;
-	private $settings = array();
 	
 	//	protected
 		
+	protected $settings = array();	
 	protected $known_vhostfilenames = array();
 	protected $known_diroptionsfilenames = array();
 	protected $known_htpasswdsfilenames = array();
@@ -49,10 +49,11 @@ class apache
 		$this->idnaConvert = $idnaConvert;
 		$this->settings = $settings;
 	}
-
-	/*
-	*	We compose the namevirtualhost entries
-	*/
+	
+	protected function getDB()
+	{
+		return $this->db;
+	}
 
 	public function reload()
 	{
diff --git a/scripts/cron_tasks.inc.http.15.apache_fcgid.php b/scripts/cron_tasks.inc.http.15.apache_fcgid.php
index 97691620..31876f25 100644
--- a/scripts/cron_tasks.inc.http.15.apache_fcgid.php
+++ b/scripts/cron_tasks.inc.http.15.apache_fcgid.php
@@ -242,7 +242,7 @@ class apache_fcgid extends apache
 
 		if(!isset($this->php_configs_cache[$php_config_id]))
 		{
-			$this->php_configs_cache[$php_config_id] = $this->db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$php_config_id);
+			$this->php_configs_cache[$php_config_id] = $this->getDB()->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$php_config_id);
 		}
 
 		return $this->php_configs_cache[$php_config_id];
@@ -254,7 +254,7 @@ class apache_fcgid extends apache
 
 		if(!isset($this->admin_cache[$adminid]))
 		{
-			$this->admin_cache[$adminid] = $this->db->query_first("SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = " . (int)$adminid);
+			$this->admin_cache[$adminid] = $this->getDB()->query_first("SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = " . (int)$adminid);
 		}
 
 		return $this->admin_cache[$adminid];
diff --git a/scripts/cron_tasks.inc.http.20.lighttpd.php b/scripts/cron_tasks.inc.http.20.lighttpd.php
index 971492ed..3da507e7 100644
--- a/scripts/cron_tasks.inc.http.20.lighttpd.php
+++ b/scripts/cron_tasks.inc.http.20.lighttpd.php
@@ -33,17 +33,18 @@ class lighttpd
 	private $logger = false;
 	private $debugHandler = false;
 	private $idnaConvert = false;
-	private $settings = array();
 
 	//	protected
 
-	public $needed_htpasswds = array();
-	public $auth_backend_loaded = false;
-	public $htpasswd_files = array();
-	public $mod_accesslog_loaded = "0";
+	protected $settings = array(); 
 	protected $lighttpd_data = array();
+	protected $needed_htpasswds = array();
+	protected $auth_backend_loaded = false;
+	protected $htpasswd_files = array();
+	protected $mod_accesslog_loaded = "0";
 
-	function __construct($db, $logger, $debugHandler, $idnaConvert, $settings)
+
+	public function __construct($db, $logger, $debugHandler, $idnaConvert, $settings)
 	{
 		$this->db = $db;
 		$this->logger = $logger;
@@ -52,6 +53,11 @@ class lighttpd
 		$this->settings = $settings;
 	}
 
+	protected function getDB()
+	{
+		return $this->db;
+	}
+
 	public function reload()
 	{
 		fwrite($this->debugHandler, '   lighttpd::reload: reloading lighttpd' . "\n");
@@ -80,6 +86,12 @@ class lighttpd
 			fwrite($this->debugHandler, '  lighttpd::createIpPort: creating ip/port settings for  ' . $ip . ":" . $port . "\n");
 			$this->logger->logAction(CRON_ACTION, LOG_INFO, 'creating ip/port settings for  ' . $ip . ":" . $port);
 			$vhost_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/10_froxlor_ipandport_' . trim(str_replace(':', '.', $row_ipsandports['ip']), '.') . '.' . $row_ipsandports['port'] . '.conf');
+
+			if(!isset($this->lighttpd_data[$vhosts_filename]))
+			{
+				$this->lighttpd_data[$vhosts_filename] = '';
+			}
+
 			$this->lighttpd_data[$vhost_filename].= '$SERVER["socket"] == "' . $ip . ':' . $port . '" {' . "\n";
 
 			if($row_ipsandports['listen_statement'] == '1')
@@ -87,7 +99,7 @@ class lighttpd
 				$this->lighttpd_data[$vhost_filename].= 'server.port = ' . $port . "\n";
 				$this->lighttpd_data[$vhost_filename].= 'server.bind = "' . $ip . '"' . "\n";
 			}
-
+				
 			if($row_ipsandports['ssl'] == '1')
 			{
 				$this->lighttpd_data[$vhost_filename].= 'ssl.engine = "enable"' . "\n";
@@ -153,11 +165,11 @@ class lighttpd
 		return $htaccess_text;
 	}
 
-	function createVirtualHosts()
+	public function createVirtualHosts()
 	{
 	}
 
-	function createFileDirOptions()
+	public function createFileDirOptions()
 	{
 	}
 
@@ -575,7 +587,7 @@ class lighttpd
 		}
 	}
 
-	private function wipeOutOldConfigs()
+	protected function wipeOutOldConfigs()
 	{
 		fwrite($this->debugHandler, '  lighttpd::wipeOutOldConfigs: cleaning ' . $this->settings['system']['apacheconf_vhost'] . "\n");
 		$this->logger->logAction(CRON_ACTION, LOG_INFO, "cleaning " . $this->settings['system']['apacheconf_vhost']);
diff --git a/scripts/cron_tasks.inc.http.25.lighttpd_fcgid.php b/scripts/cron_tasks.inc.http.25.lighttpd_fcgid.php
index 9ee73056..137f78cd 100644
--- a/scripts/cron_tasks.inc.http.25.lighttpd_fcgid.php
+++ b/scripts/cron_tasks.inc.http.25.lighttpd_fcgid.php
@@ -72,22 +72,22 @@ class lighttpd_fcgid extends lighttpd
 			{
 				$php_options_text.=	"\t".'".'.$f_extension.'" => ('."\n";
 				$php_options_text.=	"\t\t".'"localhost" => ('."\n";
-				$php_options_text.=	"\t\t".'"socket" => "/var/run/lighttpd/'.$domain['loginname'].'-php.socket",'."\n";
+				$php_options_text.=	"\t\t".'"socket" => "/var/run/lighttpd/'.$domain['loginname'].'-'.$domain['domain'].'-php.socket",'."\n";
 				$php_options_text.=	"\t\t".'"bin-path" => "'.$phpconfig['binary'].' -c '.$phpini_filename.'",'."\n";
 				$php_options_text.=	"\t\t".'"bin-environment" => ('."\n";
 				if((int)$domain['mod_fcgid_starter'] != - 1)
 				{
-					$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$domain['mod_fcgid_starter'] . '"'."\n";
+					$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$domain['mod_fcgid_starter'] . '",'."\n";
 				}
 				else
 				{
 					if((int)$phpconfig['mod_fcgid_starter'] != - 1)
 					{
-						$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$phpconfig['mod_fcgid_starter'] . '"'."\n";
+						$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$phpconfig['mod_fcgid_starter'] . '",'."\n";
 					}
 					else
 					{
-						$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$this->settings['system']['mod_fcgid_starter'] . '"'."\n";
+						$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$this->settings['system']['mod_fcgid_starter'] . '",'."\n";
 					}
 				}
 
@@ -264,7 +264,7 @@ class lighttpd_fcgid extends lighttpd
 
 		if(!isset($this->php_configs_cache[$php_config_id]))
 		{
-			$this->php_configs_cache[$php_config_id] = $this->db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$php_config_id);
+			$this->php_configs_cache[$php_config_id] = $this->getDB()->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$php_config_id);
 		}
 
 		return $this->php_configs_cache[$php_config_id];
@@ -276,7 +276,7 @@ class lighttpd_fcgid extends lighttpd
 
 		if(!isset($this->admin_cache[$adminid]))
 		{
-			$this->admin_cache[$adminid] = $this->db->query_first("SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = " . (int)$adminid);
+			$this->admin_cache[$adminid] = $this->getDB()->query_first("SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = " . (int)$adminid);
 		}
 
 		return $this->admin_cache[$adminid];
diff --git a/templates/header.tpl b/templates/header.tpl
index 175189e0..a2ef028d 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" />
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<if $settings['panel']['no_robots'] == '0'>
 	<meta name="robots" content="noindex, nofollow, noarchive" />
 	<meta name="GOOGLEBOT" content="nosnippet" />
diff --git a/templates/misc/configfiles/gentoo/lighttpd/etc_lighttpd.conf b/templates/misc/configfiles/gentoo/lighttpd/etc_lighttpd.conf
index e3bd91c0..f0224ac3 100644
--- a/templates/misc/configfiles/gentoo/lighttpd/etc_lighttpd.conf
+++ b/templates/misc/configfiles/gentoo/lighttpd/etc_lighttpd.conf
@@ -31,7 +31,6 @@ server.bind          = "<SERVERIP>"
 url.access-deny = ("~", ".inc")
 
 include "mime-types.conf"
-include "syscp-vhosts.conf"
 
 fastcgi.server = (
 ".php" => (
diff --git a/templates/misc/standardcustomer/index.html b/templates/misc/standardcustomer/index.html
index 4104b0fc..876047db 100644
--- a/templates/misc/standardcustomer/index.html
+++ b/templates/misc/standardcustomer/index.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <meta name="Publisher" content="SysCP" />
+    <meta name="Publisher" content="Froxlor" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="Content-Style-Type" content="text/css" />
-    <title>SysCP Defaultpage</title>
+    <title>Froxlor Defaultpage</title>
 	<style type="text/css">
 	body {
 		font-family: Verdana, Helvetica, sans-serif;
@@ -55,13 +55,13 @@
 
 	<div class="default">
 	 	<ul>
-	 		<li>This domain was created using <a href="http://www.syscp.org">SysCP</a>.</li>
+	 		<li>This domain was created using <a href="http://www.froxlor.org">Froxlor</a>.</li>
 			<li>There is no content on this domain yet.</li>
 		</ul>
 	</div>
 
 	<div class="footer">
-		<ul><li>&copy; 2003-2009 by <a href="http://www.syscp.org">the SysCP Team</a></li></ul>
+		<ul><li>&copy; 2009-2010 by <a href="http://www.froxlor.org">the Froxlor Team</a></li></ul>
 	</div>
 
 </body>