tagging froxlor-0.9

TODO

@@ -0,0 +1,126 @@
+FIXED	 	 	0001282 		Homedirs von Dovecot identisch
+FIXED	 	 	0001283 		SysCP creating broken lighttpd config files
+FIXED	 	 	0001213 		APS class_apsinstaller.php on line 510 - error installing different apps
+FIXED	 	 	0001272 		Default Config for libnss incomplete (debian/lenny)
+FIXED	 	 	0001281 		Wrong open_basedir directive
+FIXED	 	 	0001279 		incorrect usage of escapeshellcmd
+FIXED	 	 	0001269 		AWStats RewriteRule is wrong
+FIXED	 	 	0001277 		Apache Redirect => permanent 301
+FIXED	 	 	0001276 		Bind Zones Not Updated on Nameserver Change
+FIXED	 	 	0001275 		Setting up Traffic limit is limited to 999 GB
+FIXED	 	 	0001273 		APS-Installer
+FIXED	 	 	0001271 		cant install the package magento
+FIXED	 	 	0001270 		xinet reltime update mistake
+FIXED	 	 	0001268 		SysCP Funktion: aktualisierung in Real-Time
+FIXED	 	 	0001267 		Domain-Aliases also create a HOST-entry
+FIXED	 	 	0001266 		Lighttpd has a internal limit of regex-hits which limits max amount of domain-aliases
+FIXED	 	 	0001263 		Cosmettic Change
+FIXED	 	 	0001255 		Wrong path to usage statistics under domain settings
+FIXED	 	 	0001236 		the cron doesnt delete user directories
+FIXED	 	 	0001254 		Installation no next button
+FIXED	 	 	0001253 		admin_customers.php line 803 / 804 contain the same
+FIXED	 	 	0001250 		Apache redirect to Umlautdomains does not work
+FIXED	 	 	0001249 		SysCP SVN(!) settings loader doesn't load some settings
+FIXED 	 	 	0001247 		tab order problems at email forward mask
+FIXED	 	 	0001246 		wrong variable assigned in /templates/admin/customers/customers_add.tpl
+FIXED	 	 	0001239 		awstats configs get cluttered up after domain deletion
+FIXED	 	 	0001228 		Domain deletion fails
+FIXED 	 	 	0001233 		Display errors when amount of FTP or Mail Traffic is larger than HTTP traffic
+FIXED	 	 	0001122 		Field members of table ftp_groups not updated correctly when customer deletes ftp user
+FIXED	 	 	0001215 		php.ini: open_basedir error
+FIXED	 	 	0001223 		Postfix proposed SQL-query in mysql-virtual_alias_maps.cf: use TRIM()
+FIXED	 	 	0001221 		syscp xinet.d - no need to edit /etc/services
+FIXED	 	 	0001217 		SysCP Realtime Support
+FIXED	 	 	0001209 	 	APS crashs when installing magento
+FIXED	 	 	0001210 		Add start- and endtime to autoresponder
+FIXED	 	 	0001185 		Autoreponder - send mails via sendmail to set correct Return-Path header
+FIXED	 	 	0001201 		Virtualusers conflict with local users when using libnss-mysql
+FIXED	 	 	0001203 		Add check for PHP version and required PHP modules in install script
+FIXED	 	 	0001013 		lighttpd - every customer should have his own php.ini
+FIXED	 	 	0001113 		realtime functionality broken
+FIXED	 	 	0001080 		host of third level gets overridden by second-level when wwwserveralias is not set on lighttpd
+FIXED	 	 	0001159 		serveral errors for lighttpd
+FIXED	 	 	0001181 		lighttpd cronjob config for subdomains is empty
+FIXED	 	 	0001176 		libnss-mysql and conflicting usernames/groups
+FIXED	 	 	0001154 		Wrong configuration set with AWstats an fcgi
+FIXED	 	 	0001149 		Create a Configuration-Option for SPF Records in Zonefiles
+FIXED	 	 	0001095 		lighttpd - redirection - "/" slash is added to end of url
+FIXED	 	 	0001148 		Show info for inactive modifications
+FIXED	 	 	0001051 		include_shell issue in lighttpd 1.4.20
+--------------------------------------------------------------------------------------------------------------
+WONFIX	 	 	0001278 		Customer and domain directories are not created
+WONTFIX 	 	0001056 	 	Need extra payment methods
+WONTFIX 	 	0001262 		Currency type modification.
+WONTFIX 	 	0001257 		Fee is recalculated with current contract data although interval is over
+WONTFIX 	 	0001260 		2x F5 causes bigger fonts
+WONTFIX  	 	0001259 		contract-changes optional with cron to the end of the interval
+WONTFIX  	 	0001258 		Make invoices immediately
+WONTFIX 	 	0001252 		Backup Cronjob for Customers
+WONTFIX 	 	0001248 		blog.syscp.org
+WONTFIX  	 	0001243 		Wrong uid and gid for php-fcgi-starter
+WONTIFX 	 	0001241 		Patch for facilate customizing syscp
+WONTFIX 	 	0001227 		Error on fixing invoices with credit notes
+WONTFIX 	 	0001039 		Additional text field for infos in customers "Contact Data"
+WONTFIX 	 	0001187 		additional Invoices
+WONTFIX 	 	0001059 		Billing - Create contract - Filename should contain customername
+WONTFIX 	 	0001112 		customers should be able to create custom cronjobs
+WONTFIX 	 	0001136 		Configuration of "dead" mail adresses
+WONTFIX 	 	0001134 		Allow selection of a default apache page / provide access to syscp
+WONTFIX 	 	0001104 		Listen Configuration should contain a warning for debian
+WONTFIX 	 	0001098 		Possibillity to dissable "Catchall" for mails
+WONTFIX 	 	0001033 		Cron-Tasks: creating of php.ini
+--------------------------------------------------------------------------------------------------------------
+ 	 	 	0001274 		Option to mark a Domain as Subdomain possible or not
+ 	 	 	0001280 		deb packet 1.4.2.1-2 fu*ked
+ 	 	 	0001041 		Customer should have access to his webserver logs.
+ 	 	 	0001261 		No e-mail on 90% traffic
+ 	 	 	0001120 		Missing function to calculate the mail traffic
+ 	 	 	0001244 		customer view too wide for 1024x768 resolutions
+ 	 	 	0001229 		subdomains and Own vHost-Settings
+ 	 	 	0001251 		possibility to manage WebDAV config in SysCP
+ 	 	 	0001042 		Webalizer dir should not be deletable
+ 	 	 	0001245 		Password Protect /awstats/ when using awstats and fcgid
+ 	 	 	0001156 		Repairing use of awstats and awstats-icons with fcgi
+ 	 	 	0001242 		When email qouta is enabled, you cannot add more resources to a client.
+ 	 	 	0001240 		Wrong php.ini for subdomains with fastCGI
+ 	 	 	0001224 		APS installer not installing the aps applications properly, such as WordPress and WebCalender
+ 	 	 	0001017 		Proftpd - Quota should be added
+ 	 	 	0001016 		Pureftpd - quota should be added
+ 	 	 	0001206 		crontabs not terminating
+ 	 	 	0001212 		retain form input
+ 	 	 	0001211 		Generated MySQL username too long
+ 	 	 	0001208 		HTML Tags in Support Tickets
+ 	 	 	0001207 		FTP Passw<73>rter mit Umlauten
+ 	 	 	0001204 		php5-suhosin
+ 	 	 	0001198 		More online help wanted
+ 	 	 	0001189 		Autoresponder: support for multiline "From:" headers
+ 	 	 	0001186 		subdomains and php configuration
+ 	 	 	0001079 		Protected dir only works only after a force-reload on lighttpd
+ 	 	 	0001034 		Cron-Tasks: apache-logfiles directory
+ 	 	 	0001150 		Wrong configuration of awstats
+ 	 	 	0001083 		awstats.model.conf.syscp should include awstats.conf
+ 	 	 	0001152 		apache certificate is not generated
+ 	 	 	0001151 		When cronjob generates new dkim files a mail is sent to root
+ 	 	 	0001005 		Force user to add POP3 Account before he can add e-mail adresses
+ 	 	 	0001142 		Default index.html should be placed in a sub-directory of a domain.
+ 	 	 	0001140 		Replace variables in defaut_vhost config
+ 	 	 	0001138 		old db-data is lost when mysqldump is not within open_basedir
+ 	 	 	0001135 		dkim refers to non-existing domainkey entry in DNS zone file.
+ 	 	 	0001133 		Default Configuration doesn't allow Exim4 to forward Mails to the outside world
+ 	 	 	0001128 		More targets for "Write a message" tool
+ 	 	 	0001131 		Add FreeBSD configuration files to the base tarball.
+ 	 	 	0001130 		Wrong number format in e.g. traffic display.
+ 	 	 	0001129 		Allow selection of automatic creation of a webmail.<domain>.<tld>, phpmyadmin. ..., webftp. ...
+ 	 	 	0001127 		Versioning of configuration templates.
+ 	 	 	0001116 		Please add tooltips to adminCP
+ 	 	 	0001114 		Password query for Awstats statistics
+ 	 	 	0001111 		add login for e-mail and ftp users to let them change their own settings
+ 	 	 	0001109 		no mail traffic is shown and calculated without third party module
+ 	 	 	0001101 		Default mail qouta - possibillity to set new accounts to amount of webspace
+ 	 	 	0001084 		Add select box to change special logfile setting on domain edit
+ 	 	 	0001058 		Add id/class attributs in <img> tag (left navigation)
+ 	 	 	0001043 		When creating customer it should also be possible to add domains (merge customer & domain menu)
+ 	 	 	0001035 		PHP-Error-Log | Adminpanel & CronTask
+ 	 	 	0001010 		Send info mail to customer if webspace is exceeded
+ 	 	 	0001004 		Ressources / Domains - Standard subdomains should be separrated from normal Domains
+ 	 	 	9999999 		Write a complete statement about what froxlor is and why we do this (atari)	

admin_aps.php

@@ -21,6 +21,7 @@
 
 define('AREA', 'admin');
 require ("./lib/init.php");
+require ("./lib/class_apsparser.php");
 $Id = 0;
 
 if(isset($_GET['id']))$Id = (int)$_GET['id'];

admin_domains.php

@@ -570,6 +570,8 @@ if($page == 'domains'
 					$ssl_ipsandports.= makeoption($row_ssl_ipandport['ip'] . ':' . $row_ssl_ipandport['port'], $row_ssl_ipandport['id'], $settings['system']['defaultip']);
 				}
 
+				$ssl = makeyesno('ssl', '1', '0', $result['ssl']);
+				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
 				$standardsubdomains = array();
 				$result_standardsubdomains = $db->query('SELECT `id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`, `' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`id`=`c`.`standardsubdomain`');
 
@@ -613,8 +615,6 @@ if($page == 'domains'
 				$openbasedir = makeyesno('openbasedir', '1', '0', '1');
 				$safemode = makeyesno('safemode', '1', '0', '1');
 				$speciallogfile = makeyesno('speciallogfile', '1', '0', '0');
-				$ssl = makeyesno('ssl', '1', '0', '0');
-				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', '0');				
 				$add_date = date('Y-m-d');
 
 				eval("echo \"" . getTemplate("domains/domains_add") . "\";");

admin_message.php

@@ -47,7 +47,7 @@ if($page == 'message')
 			   && $userinfo['customers_see_all'] == '1')
 			{
 				$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to admins");
-				$result = $db->query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
+				$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
 			}
 			elseif($_POST['receipient'] == 1)
 			{
@@ -78,9 +78,9 @@ if($page == 'message')
 
 				while($row = $db->fetch_array($result))
 				{
-					$mail->AddAddress($row['email'], (isset($row['firstname']) ? $row['firstname'] . ' ' : '') . $row['name']);
+					$mail->AddAddress($row['email'], $row['firstname'] . ' ' . $row['name']);
 					$mail->From = $userinfo['email'];
-					$mail->FromName = (isset($userinfo['firstname']) ? $userinfo['firstname'] . ' ' : '') . $userinfo['name'];
+					$mail->FromName = $userinfo['firstname'] . ' ' . $userinfo['name'];
 
 					if(!$mail->Send())
 					{

admin_tickets.php

@@ -742,7 +742,6 @@ elseif($page == 'archive'
 		$ticket_replies = '';
 		$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
 		$lastchange = date("d.m.Y H:i\h", $mainticket->Get('lastchange'));
-		$dt = date("d.m.Y H:i\h", $mainticket->Get('dt'));
 		$status = ticket::getStatusText($lng, $mainticket->Get('status'));
 		$isclosed = 1;
 

customer_aps.php

@@ -21,6 +21,7 @@
 
 define('AREA', 'customer');
 require ("./lib/init.php");
+require ("./lib/class_apsparser.php");
 $Id = 0;
 
 if(isset($_GET['id']))$Id = (int)$_GET['id'];

customer_mysql.php

@@ -23,7 +23,6 @@ define('AREA', 'customer');
  * Include our init.php, which manages Sessions, Language etc.
  */
 
-$need_db_sql_data = true;
 $need_root_db_sql_data = true;
 require ("./lib/init.php");
 

customer_traffic.php

@@ -75,8 +75,7 @@ if(!is_null($month)
 	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
 	                     AND `month` = '" . $month . "'
 	                     AND `year` = '" . $year . "'");
-	$row = mysql_fetch_row($result);
+	rsort($row = mysql_fetch_row($result));
-	rsort($row);
 	$traf['max'] = ($row[0] > $row[1] ? ($row[0] > $row[2] ? $row[0] : $row[2]) : ($row[1] > $row[2] ? $row[1] : $row[2]));;
 	$result = $db->query("SELECT
                                 SUM(`http`) as 'http', SUM(`ftp_up`) AS 'ftp_up', SUM(`ftp_down`) as 'ftp_down', SUM(`mail`) as 'mail',

install/froxlor.sql

@@ -451,7 +451,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.1');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');
@@ -526,7 +526,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (95, 'autoresponder', 'last_autoresponder_run', '0');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (96, 'admin', 'show_version_login', '0');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (97, 'admin', 'show_version_footer', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (98, 'admin', 'froxlor_graphic', 'images/header.gif');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (98, 'admin', 'froxlor_graphic', 'images/header.png');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (99, 'system', 'mod_fcgid_wrapper', '0');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (100, 'system', 'mod_fcgid_starter', '0');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (101, 'system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php5/');

install/lng/german.lng.php

@@ -47,9 +47,6 @@ $lng['install']['next'] = 'Fortfahren';
 
 $lng['install']['testing_mysql'] = 'Teste, ob die MySQL-Root-Benutzerdaten richtig sind...';
 $lng['install']['erasing_old_db'] = 'Entferne alte Datenbank...';
-$lng['install']['backup_old_db'] = 'Sichere bisherige Datenbank...';
-$lng['install']['backing_up'] = 'Sicherung läft';
-$lng['install']['backing_up_binary_missing'] = '/usr/bin/mysqldump nicht vorhanden';
 $lng['install']['create_mysqluser_and_db'] = 'Erstelle Datenbank und Benutzer...';
 $lng['install']['testing_new_db'] = 'Teste, ob die Datenbank und Passwort korrekt angelegt wurden...';
 $lng['install']['importing_data'] = 'Importiere Daten in die MySQL-Datenbank...';

install/updates/froxlor/0.9/update_0.9.inc.php

@@ -276,15 +276,4 @@ if(isFroxlorVersion('0.9-r4'))
 	updateToVersion('0.9');
 }
 
-if(isFroxlorVersion('0.9'))
-{
-	showUpdateStep("Updating from 0.9 to 0.9.1", false);
-	
-	showUpdateStep("Updating settings values");
-	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = 'images/header.gif' WHERE `varname` = 'froxlor_graphic' AND `value` = 'images/header.png'");
-	
-	lastStepStatus(0);
-	updateToVersion('0.9.1');
-}
-
 ?>

lib/classes/aps/class.ApsParser.php

@@ -1710,14 +1710,7 @@ class ApsParser
 			return;
 		}
 
-		if(isset($this->userinfo['customerid']))
+		$CustomerId = $this->userinfo['customerid'];
-		{		
-			$CustomerId = $this->userinfo['customerid'];
-		}
-		else
-		{
-			$CustomerId = -1;
-		}
 		$AdminId = $this->userinfo['adminid'];
 		$PackagesPerSite = $this->settings['aps']['items_per_page'];
 

lib/classes/database/class.db.php

@@ -134,11 +134,8 @@ class db
 				$this->showerror('Trying to use database ' . $this->database . ' failed, exiting');
 			}
 		}
-		/*
+		mysql_query("SET NAMES utf8", $this->link_id);
-		 * this is not for 0.9.x 
+		mysql_query("SET CHARACTER SET utf8", $this->link_id);
-		 */
-		//mysql_query("SET NAMES utf8", $this->link_id);
-		//mysql_query("SET CHARACTER SET utf8", $this->link_id);
 	}
 
 	/**

lib/classes/idna/class.idna_convert_wrapper.php

@@ -29,13 +29,13 @@ class idna_convert_wrapper
 	 * @var object
 	 */
 
-	private $idna_converter;
+	var $idna_converter;
 
 	/**
 	 * Class constructor. Creates a new idna converter
 	 */
 
-	public function __construct()
+	function idna_convert_wrapper()
 	{
 		$this->idna_converter = new idna_convert();
 	}
@@ -50,7 +50,7 @@ class idna_convert_wrapper
 	 * both seperated by the same string as the input.
 	 */
 
-	public function encode($to_encode)
+	function encode($to_encode)
 	{
 		return $this->_do_action('encode', $to_encode);
 	}
@@ -65,7 +65,7 @@ class idna_convert_wrapper
 	 * both seperated by the same string as the input.
 	 */
 
-	public function decode($to_decode)
+	function decode($to_decode)
 	{
 		return $this->_do_action('decode', $to_decode);
 	}
@@ -80,7 +80,7 @@ class idna_convert_wrapper
 	 * @return string The input string after being processed.
 	 */
 
-	private function _do_action($action, $string)
+	function _do_action($action, $string)
 	{
 		$string = trim($string);
 

lib/classes/ticket/class.ticket.php

@@ -301,12 +301,12 @@ class ticket
 		}
 		else
 		{
-			$admin = $this->db->query_first("SELECT `name`, email` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid`='" . (int)$this->userinfo['adminid'] . "'");
+			$admin = $this->db->query_first("SELECT `email` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid`='" . (int)$this->userinfo['adminid'] . "'");
 			$mail->From = $this->settings['ticket']['noreply_email'];
 			$mail->FromName = $this->settings['ticket']['noreply_name'];
 			$mail->Subject = $mail_subject;
 			$mail->Body = $mail_body;
-			$mail->AddAddress($admin['email'], $admin['name']);
+			$mail->AddAddress($admin['email'], $admin['firstname'] . ' ' . $admin['name']);
 
 			if(!$mail->Send())
 			{

lib/configfiles/etch.inc.php

@@ -93,7 +93,7 @@ return Array(
 					'postfix' => Array(
 						'label' => 'Postfix',
 						'commands' => Array(
-							'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql',
+							'apt-get install postfix postfix-mysql libsasl2 libsasl2-modules libsasl2-modules-sql',
 							'mkdir -p /etc/postfix/sasl',
 							'mkdir -p /var/spool/postfix/etc/pam.d',
 							'mkdir -p /var/spool/postfix/var/run/mysqld',

lib/configfiles/lenny.inc.php

@@ -93,7 +93,7 @@ return Array(
 					'postfix' => Array(
 						'label' => 'Postfix',
 						'commands' => Array(
-							'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql',
+							'apt-get install postfix postfix-mysql libsasl2 libsasl2-modules libsasl2-modules-sql',
 							'mkdir -p /etc/postfix/sasl',
 							'mkdir -p /var/spool/postfix/etc/pam.d',
 							'mkdir -p /var/spool/postfix/var/run/mysqld',

lib/init.php

@@ -21,7 +21,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"))
@@ -49,8 +49,7 @@ $filename = basename($_SERVER['PHP_SELF']);
 
 if(!file_exists('./lib/userdata.inc.php'))
 {
-	$config_hint = file_get_contents('./templates/misc/configurehint.tpl');
+	die('You have to <a href="./install/install.php">configure</a> Froxlor first!');
-	die($config_hint);
 }
 
 if(!is_readable('./lib/userdata.inc.php'))

lib/tables.inc.php

@@ -68,7 +68,7 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.1';
+$version = '0.9';
 $dbversion = '2';
 
 ?>

lng/english.lng.php

@@ -1290,10 +1290,4 @@ $lng['tasks']['noneoutstanding'] = 'There are currently no outstanding tasks for
 $lng['ticket']['nonexistingcustomer'] = '(deleted customer)';
 $lng['admin']['ticket_nocustomeraddingavailable'] = 'It\'s not possible to open a new support-ticket currently. You first need to add at least one customer.';
 
-// ADDED IN FROXLOR 0.9.1
-
-$lng['admin']['accountdata'] = 'Account Data';
-$lng['admin']['contactdata'] = 'Contact Data';
-$lng['admin']['servicedata'] = 'Service Data';
-
 ?>

lng/german.lng.php

@@ -1270,10 +1270,4 @@ $lng['tasks']['noneoutstanding'] = 'Zur Zeit gibt es keine ausstehenden Aufgaben
 $lng['ticket']['nonexistingcustomer'] = '(gelöschter Kunde)';
 $lng['admin']['ticket_nocustomeraddingavailable'] = 'Es können derzeit keine neuen Support-Tickets eröffnet werden. Sie müssen zuerst einen Kunden anlegen';
 
-// ADDED IN FROXLOR 0.9.1
-
-$lng['admin']['accountdata'] = 'Benutzerdaten';
-$lng['admin']['contactdata'] = 'Kontaktdaten';
-$lng['admin']['servicedata'] = 'Dienstleistungsdaten';
-
 ?>

templates/admin/admins/admins_admin.tpl

@@ -1,5 +1,5 @@
 <tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left"><if $row['adminid'] != $userinfo['userid']><a href="$filename?s=$s&amp;page=$page&amp;action=su&amp;id={$row['adminid']}" target="_blank">{$row['loginname']}</a></if><if $row['adminid'] == $userinfo['userid']>{$row['loginname']}</if></td>
+	<td class="field_name_border_left<if $highlight_row>_red</if>"><if $row['adminid'] != $userinfo['userid']><a href="$filename?s=$s&amp;page=$page&amp;action=su&amp;id={$row['adminid']}" target="_blank">{$row['loginname']}</a></if><if $row['adminid'] == $userinfo['userid']>{$row['loginname']}</if></td>
 	<td class="field_name">{$row['name']}</td>
 	<td class="field_name"><b><font color="green">{$row['customers_used']}</font></b>/<b><font color="#FD6204">{$row['customers']}</font></b><br /><b><font color="green">{$row['domains_used']}</font></b>/<b><font color="#FD6204">{$row['domains']}</font></b></td>
 	<td class="field_name"><b><font color="green">{$row['diskspace_used']}</font></b>/<b><font color="#FD6204">{$row['diskspace']}</font></b> (MB)<br /><b><font color="green">{$row['traffic_used']}</font></b>/<b><font color="#FD6204">{$row['traffic']}</font></b> (GB)</td>

templates/admin/domains/domains_domain.tpl

@@ -1,5 +1,5 @@
 <tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left"><font size="-1">{$row['domain']}<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> ({$lng['admin']['stdsubdomain']})</if></font></td>
+	<td class="field_name_border_left<if $highlight_row>_red</if>"><font size="-1">{$row['domain']}<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> ({$lng['admin']['stdsubdomain']})</if></font></td>
 	<td class="field_name"><font size="-1">{$row['ipandport']}</font></td>
 	<td class="field_name"><font size="-1">{$row['customername']} (<a href="admin_customers.php?s=$s&amp;page=customers&amp;action=su&amp;id={$row['customerid']}" target="_blank">{$row['loginname']}</a>)</font></td>
 	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}">{$lng['panel']['edit']}</a></td>

templates/admin/ticket/archivesearch.tpl

@@ -5,23 +5,23 @@ $header
 		<input type="hidden" name="send" value="send" />
 		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
 			<tr>
-				<td class="maintitle_search_left" colspan="5"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['ticket']['archivesearch']}</b></td>
+				<td class="maintitle_search_left"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['ticket']['archivesearch']}</b></td>
 				<td class="maintitle_search_right">&nbsp;</td>
 			</tr>
-      		<if 0 < $tickets_count >
+      			<if 0 < $tickets_count >
-				<tr>
+			<tr>
-					<td class="field_display_border_left">{$lng['ticket']['archivedtime']}</td>
+				<td class="field_display_border_left">{$lng['ticket']['archivedtime']}</td>
-					<td class="field_display">{$lng['ticket']['ticket_answers']}</td>
+				<td class="field_display">{$lng['ticket']['ticket_answers']}</td>
-					<td class="field_display">{$lng['ticket']['subject']}</td>
+				<td class="field_display">{$lng['ticket']['subject']}</td>
-					<td class="field_display">{$lng['ticket']['lastreplier']}</td>
+				<td class="field_display">{$lng['ticket']['lastreplier']}</td>
-					<td class="field_display">{$lng['ticket']['priority']}</td>
+				<td class="field_display">{$lng['ticket']['priority']}</td>
-	        		<td class="field_display_search">&nbsp;</td>
+        			<td class="field_display_search">&nbsp;</td>
-				</tr>
+			</tr>
-				$tickets
+			$tickets
-      		</if>
+      			</if>
-      		<if $tickets_count < 1 >
+      			<if $tickets_count < 1 >
         		<tr>
-				<td class="field_display_border_left" colspan="5">{$lng['ticket']['noresults']}</td>
+				<td class="field_display_border_left" colspan="2">{$lng['ticket']['noresults']}</td>
 				</tr>
 			</if>
 		</table>

templates/admin/ticket/categories.tpl

@@ -15,7 +15,7 @@ $header
 			</if>
 			<tr>
 				<td class="field_display_border_left">{$lng['ticket']['category']}&nbsp;&nbsp;{$arrowcode['name']}</td>
-				<td class="field_display">{$lng['ticket']['ticketcount']}&nbsp;&nbsp;<if $categories_count < 0 >{$arrowcode['ticketcount']}</if></td>
+				<td class="field_display">{$lng['ticket']['ticketcount']}&nbsp;&nbsp;{$arrowcode['ticketcount']}</td>
 				<td class="field_display_search" colspan="2">{$sortcode}</td>
 			</tr>
 			$ticketcategories

templates/admin/update/update_end.tpl

@@ -2,7 +2,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td class="field_name_center"><a href="{$redirect_url}">{$lng['success']['clickheretocontinue']}</a></td>
+			<td class="field_name"><a href="{$redirect_url}">{$lng['success']['clickheretocontinue']}</a></td>
 		</tr>		
 	</table>
 	<br />

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 http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<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" />