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)	

actions/admin/settings/100.panel.php

@@ -77,24 +77,6 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
-				'panel_adminmail_defname' => array(
-					'label' => $lng['serversettings']['adminmail_defname'],
-					'settinggroup' => 'panel',
-					'varname' => 'adminmail_defname',
-					'type' => 'string',
-					'default' => 'Froxlor Administrator',
-					'save_method' => 'storeSettingField',
-					),
-				'panel_adminmail_return' => array(
-					'label' => $lng['serversettings']['adminmail_return'],
-					'settinggroup' => 'panel',
-					'varname' => 'adminmail_return',
-					'type' => 'string',
-					'string_type' => 'mail',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
 				'panel_decimal_places' => array(
 					'label' => $lng['serversettings']['decimal_places'],
 					'settinggroup' => 'panel',

actions/admin/settings/110.accounts.php

@@ -54,14 +54,6 @@ return array(
 					'default' => 900,
 					'save_method' => 'storeSettingField',
 					),
-				'panel_password_min_length' => array(
-					'label' => $lng['serversettings']['panel_password_min_length'],
-					'settinggroup' => 'panel',
-					'varname' => 'password_min_length',
-					'type' => 'int',
-					'default' => 0,
-					'save_method' => 'storeSettingField',
-					),
 				'customer_accountprefix' => array(
 					'label' => $lng['serversettings']['accountprefix'],
 					'settinggroup' => 'customer',
@@ -103,14 +95,6 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'dependency' => array(
-							'fieldname' => 'panel_allow_preset_admin',
-							'fielddata' => array(
-								'settinggroup' => 'panel',
-								'varname' => 'allow_preset_admin',
-							),
-							'onlyif' => 0
-						)
 					),
 				'panel_allow_preset_admin' => array(
 					'label' => $lng['serversettings']['allow_password_reset_admin'],
@@ -119,14 +103,6 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'dependency' => array(
-							'fieldname' => 'panel_allow_preset',
-							'fielddata' => array(
-								'settinggroup' => 'panel',
-								'varname' => 'allow_preset',
-							),
-							'onlyif' => 1
-						)
 					),
 				),
 			),

actions/admin/settings/120.system.php

@@ -58,14 +58,6 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingHostname',
 					),
-				'system_stdsubdomain' => array(
-					'label' => $lng['serversettings']['stdsubdomainhost'],
-					'settinggroup' => 'system',
-					'varname' => 'stdsubdomain',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingHostname',
-					),
 				'system_mysql_access_host' => array(
 					'label' => $lng['serversettings']['mysql_access_host'],
 					'settinggroup' => 'system',
@@ -79,7 +71,7 @@ return array(
 					'label' => $lng['serversettings']['system_realtime_port'],
 					'settinggroup' => 'system',
 					'varname' => 'realtime_port',
-					'type' => (function_exists('socket_create') ? 'int' : 'hidden'),
+					'type' => 'int',
 					'int_max' => 65535,
 					'default' => 0,
 					'save_method' => 'storeSettingField',
@@ -93,14 +85,6 @@ return array(
 					'default' => 'html',
 					'save_method' => 'storeSettingField',
 					),
-				'system_store_index_file_subs' => array(
-					'label' => $lng['serversettings']['system_store_index_file_subs'],
-					'settinggroup' => 'system',
-					'varname' => 'store_index_file_subs',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
 				'system_httpuser' => array(
 					'settinggroup' => 'system',
 					'varname' => 'httpuser',

actions/admin/settings/130.webserver.php

@@ -31,7 +31,6 @@ return array(
 					'option_mode' => 'one',
 					'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd'),
 					'save_method' => 'storeSettingField',
-					'overview_option' => true
 					),
 				'system_apacheconf_vhost' => array(
 					'label' => $lng['serversettings']['apacheconf_vhost'],
@@ -112,64 +111,6 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
-				'defaultwebsrverrhandler_enabled' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'defaultwebsrverrhandler_err401' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'err401',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'defaultwebsrverrhandler_err403' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'err403',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'defaultwebsrverrhandler_err404' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'err404',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'defaultwebsrverrhandler_err500' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err500'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'err500',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'customredirect_enabled' => array(
-					'label' => $lng['serversettings']['customredirect_enabled'],
-					'settinggroup' => 'customredirect',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'customredirect_default' => array(
-					'label' => $lng['serversettings']['customredirect_default'],
-					'settinggroup' => 'customredirect',
-					'varname' => 'default',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options_method' => 'getRedirectCodes',
-					'save_method' => 'storeSettingField',
-					),					
 				),
 			),
 		'ssl' => array(

actions/admin/settings/140.statistics.php

@@ -40,27 +40,45 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
+				'system_awstats_domain_file' => array(
+					'label' => $lng['serversettings']['awstats_domain_file'],
+					'settinggroup' => 'system',
+					'varname' => 'awstats_domain_file',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/etc/awstats/',
+					'save_method' => 'storeSettingField',
+					),
+				'system_awstats_model_file' => array(
+					'label' => $lng['serversettings']['awstats_model_file'],
+					'settinggroup' => 'system',
+					'varname' => 'awstats_model_file',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/etc/awstats/awstats.model.conf.syscp',
+					'save_method' => 'storeSettingField',
+					),
 				'system_awstats_path' => array(
 					'label' => $lng['serversettings']['awstats_path'],
 					'settinggroup' => 'system',
 					'varname' => 'awstats_path',
 					'type' => 'string',
 					'string_type' => 'dir',
-					'default' => '/usr/bin/',
+					'default' => '/usr/share/awstats/VERSION/webroot/cgi-bin/',
 					'save_method' => 'storeSettingField',
 					),
-				'system_awstats_conf' => array(
+				'system_awstats_updateall_command' => array(
-					'label' => $lng['serversettings']['awstats_conf'],
+					'label' => $lng['serversettings']['awstats_updateall_command'],
 					'settinggroup' => 'system',
-					'varname' => 'awstats_conf',
+					'varname' => 'awstats_updateall_command',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'file',
-					'default' => '/etc/awstats/',
+					'default' => '/usr/bin/awstats_updateall.pl',
 					'save_method' => 'storeSettingField',
-					)
+					),
-				)
+				),
-			)
+			),
-		)
+		),
 	);
 
 ?>

actions/admin/settings/150.mail.php

@@ -75,7 +75,7 @@ return array(
 					'default' => 100,
 					'save_method' => 'storeSettingField',
 					),
-				'system_autoresponder_enabled' => array(
+				'systen_autoresponder_enabled' => array(
 					'label' => $lng['serversettings']['autoresponder_active'],
 					'settinggroup' => 'autoresponder',
 					'varname' => 'autoresponder_active',
@@ -84,7 +84,7 @@ return array(
 					'cronmodule' => 'froxlor/autoresponder',
 					'save_method' => 'storeSettingField',
 					),
-				'system_last_autoresponder_run' => array(
+				'systen_last_autoresponder_run' => array(
 					'settinggroup' => 'autoresponder',
 					'varname' => 'last_autoresponder_run',
 					'type' => 'hidden',

actions/admin/settings/155.ftpserver.php

@@ -1,40 +0,0 @@
-<?php
-
-/**
- * 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.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @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    Settings
- * @version    $Id: 220.ftpserver.php 1 2010-04-07 10:00:00Z monotek $
- */
-
-return array(
-	'groups' => array(
-	'ftpserver' => array(
-			'title' => $lng['admin']['ftpserversettings'],
-			'fields' => array(
-				'ftpserver' => array(
-					'label' => $lng['admin']['ftpserver'],
-					'settinggroup' => 'system',
-					'varname' => 'ftpserver',
-					'type' => 'option',
-					'default' => 'proftpd',
-					'option_mode' => 'one',
-					'option_options' => array('proftpd' => 'Proftpd', 'pureftpd' => 'Pureftpd'),
-					'save_method' => 'storeSettingField',
-				),
-			),
-		),
-	)
-);
-
-?>

actions/admin/settings/160.nameserver.php

@@ -59,24 +59,6 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
-				'system_dns_createmailentry' => array(
-					'label' => $lng['serversettings']['mail_also_with_mxservers'],
-					'settinggroup' => 'system',
-					'varname' => 'dns_createmailentry',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-					),
-				'system_defaultttl' => array(
-					'label' => $lng['serversettings']['defaultttl'],
-					'settinggroup' => 'system',
-					'varname' => 'defaultttl',
-					'type' => 'int',
-					'default' => 604800, /* 1 week */
-					'int_min' => 3600, /* 1 hour */
-					'int_max' => 2147483647, /* integer max */
-					'save_method' => 'storeSettingField',
-					),
 				),
 			),
 		),

actions/admin/settings/170.logger.php

@@ -29,7 +29,6 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'overview_option' => true
 					),
 				'logger_severity' => array(
 					'label' => $lng['serversettings']['logger']['severity'],

actions/admin/settings/180.dkim.php

@@ -28,8 +28,7 @@ return array(
 					'varname' => 'use_dkim',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingFieldInsertBindTask',
+					'save_method' => 'storeSettingField',
-					'overview_option' => true
 					),
 				'dkim_prefix' => array(
 					'label' => $lng['dkim']['dkim_prefix'],
@@ -57,63 +56,6 @@ return array(
 					'default' => 'dkim-keys.conf',
 					'save_method' => 'storeSettingField',
 					),
-				'dkim_algorithm' => array(
-					'label' => $lng['dkim']['dkim_algorithm'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_algorithm',
-					'type' => 'option',
-					'default' => 'all',
-					'option_mode' => 'multiple',
-					'option_options' => array('all' => 'All', 'sha1' => 'SHA1', 'sha256' => 'SHA256'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_servicetype' => array(
-					'label' => $lng['dkim']['dkim_servicetype'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_servicetype',
-					'type' => 'option',
-					'default' => '0',
-					'option_mode' => 'one',
-					'option_options' => array('0' => 'All', '1' => 'E-Mail'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_keylength' => array(
-					'label' => $lng['dkim']['dkim_keylength'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_keylength',
-					'type' => 'option',
-					'default' => '1024',
-					'option_mode' => 'one',
-					'option_options' => array('1024' => '1024 Bit', '2048' => '2048 Bit'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_notes' => array(
-					'label' => $lng['dkim']['dkim_notes'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_notes',
-					'type' => 'string',
-					'string_regexp' => '/^[a-z0-9\._]+$/i',
-					'default' => '',
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_add_adsp' => array(
-					'label' => $lng['dkim']['dkim_add_adsp'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_add_adsp',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_add_adsppolicy' => array(
-					'label' => $lng['dkim']['dkim_add_adsppolicy'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_add_adsppolicy',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options' => array('0' => 'Unknown', '1' => 'All', '2' => 'Discardable'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
 				'dkimrestart_command' => array(
 					'label' => $lng['dkim']['dkimrestart_command'],
 					'settinggroup' => 'dkim',

actions/admin/settings/185.spf.php

@@ -26,8 +26,7 @@ return array(
 					'varname' => 'use_spf',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
-					'overview_option' => true
 					),
 				'spf_entry' => array(
 					'label' => $lng['spf']['spf_entry'],

actions/admin/settings/190.ticket.php

@@ -30,7 +30,6 @@ return array(
 					'default' => false,
 					'cronmodule' => 'froxlor/ticket',
 					'save_method' => 'storeSettingField',
-					'overview_option' => true
 					),
 				'ticket_noreply_email' => array(
 					'label' => $lng['serversettings']['ticket']['noreply_email'],
@@ -125,16 +124,6 @@ return array(
 					'type' => 'hidden',
 					'default' => '',
 					),
-				'ticket_default_priority' => array(
-					'label' => $lng['serversettings']['ticket']['default_priority'],
-					'settinggroup' => 'ticket',
-					'varname' => 'default_priority',
-					'type' => 'option',
-					'default' => 2,
-					'option_mode' => 'one',
-					'option_options' => array(1 => $lng['ticket']['unf_high'], 2 => $lng['ticket']['unf_normal'], 3 => $lng['ticket']['unf_low']),
-					'save_method' => 'storeSettingField', 
-					),
 				),
 			),
 		)

actions/admin/settings/200.aps.php

@@ -30,7 +30,6 @@ return array(
 					'default' => false,
 					'cronmodule' => 'froxlor/aps',
 					'save_method' => 'storeSettingField',
-					'overview_option' => true
 					),
 				'aps_items_per_page' => array(
 					'label' => $lng['aps']['packages_per_page'],
@@ -59,7 +58,7 @@ return array(
 					'type' => 'option',
 					'default' => '',
 					'option_mode' => 'multiple',
-					'option_options' => array('gd' => 'GD Library', 'pcre' => 'PCRE', 'ioncube' => 'ionCube', 'ioncube loader' => 'ionCube Loader', 'curl' => 'curl', 'mcrypt' => 'mcrypt', 'imap' => 'imap', 'json' => 'json', 'ldap' => 'LDAP', 'hash' => 'hash', 'mbstring' => 'mbstring'),
+					'option_options' => array('gd' => 'GD Library', 'pcre' => 'PCRE', 'ioncube' => 'ionCube', 'ioncube loader' => 'ionCube Loader', 'curl' => 'curl', 'mcrypt' => 'mcrypt', 'imap' => 'imap'),
 					'save_method' => 'storeSettingApsPhpExtensions',
 					),
 				'aps_php-function' => array(

actions/admin/settings/210.security.php

@@ -100,16 +100,6 @@ return array(
 					'default' => 250,
 					'save_method' => 'storeSettingField',
 					),
-				'system_mod_fcgid_defaultini' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_defaultini',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField',
-					),
 				),
 			),
 		),

admin_admins.php

@@ -93,7 +93,6 @@ if($page == 'admins'
 			$i++;
 		}
 
-		$admincount = $db->num_rows($result);
 		eval("echo \"" . getTemplate("admins/admins") . "\";");
 	}
 	elseif($action == 'su')
@@ -155,7 +154,6 @@ if($page == 'admins'
 
 			$loginname = validate($_POST['loginname'], 'loginname');
 			$password = validate($_POST['admin_password'], 'password');
-			$password = validatePassword($password);
 			$def_language = validate($_POST['def_language'], 'default language');
 			$customers = intval_ressource($_POST['customers']);
 
@@ -562,7 +560,6 @@ if($page == 'admins'
 				{
 					if($password != '')
 					{
-						$password = validatePassword($password);
 						$password = md5($password);
 					}
 					else

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_configfiles.php

@@ -95,9 +95,9 @@ if($userinfo['change_serversettings'] == '1')
 			'<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'],
 			'<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'],
 			'<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'],
+			'<AWSTATS_PATH>' => $settings['system']['awstats_path'],
 			'<SSLPROTOCOLS>' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '',
-			'<REALTIME_PORT>' => $settings['system']['realtime_port'],
+			'<REALTIME_PORT>' => $settings['system']['realtime_port']
-			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/'
 		);
 		$files = '';
 		$configpage = '';
@@ -110,7 +110,6 @@ if($userinfo['change_serversettings'] == '1')
 				if(is_array($value))
 				{
 					$commands = implode("\n", $value);
-					$commands = str_replace("\n\n", "\n", $commands);
 
 					if($commands != '')
 					{

admin_cronjobs.php

@@ -75,6 +75,12 @@ if($page == 'cronjobs'
 				
 				$description = $lng['crondesc'][$row['desc_lng_key']];
 				
+				/*
+				 * don't allow deletion of 'froxlor' cronjobs
+				 */
+				$vendor_a = explode('/', $row['module']);
+				$vendor = $vendor_a[0];
+				
 				eval("\$crons.=\"" . getTemplate("cronjobs/cronjobs_cronjob") . "\";");
 				$count++;
 			}
@@ -88,68 +94,21 @@ if($page == 'cronjobs'
 	elseif($action == 'new')
 	{
 		/*
-		 * @TODO later
+		 * @TODO Finish me
 		 */
 	}
 	elseif($action == 'edit'
 	&& $id != 0)
 	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `id`='" . (int)$id . "'");
+		/*
-		
+		 * @TODO Finish me
-		if ($result['cronfile'] != '')
+		 */
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$isactive = intval($_POST['isactive']);
-				$interval_value = validate($_POST['interval_value'], 'interval_value', '/^([0-9]+)$/Di', 'stringisempty');
-				$interval_interval = validate($_POST['interval_interval'], 'interval_interval');
-				
-				if($isactive != 1)
-				{
-					$isactive = 0;
-				}
-				
-				$interval = $interval_value.' '.strtoupper($interval_interval);
-				
-				$db->query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` 
-							SET `isactive` = '".(int)$isactive."',
-							`interval` = '".$interval."'
-							WHERE `id` = '" . (int)$id . "'");
-
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
-				$isactive = makeyesno('isactive', '1', '0', $result['isactive']);
-				// interval
-				$interval_nfo = explode(' ', $result['interval']);
-				$interval_value = $interval_nfo[0];
-
-				$interval_interval = '';
-				$interval_interval.= makeoption($lng['cronmgmt']['seconds'], 'SECOND', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['months'], 'MONTH', $interval_nfo[1]);
-				// end of interval
-				
-				$change_cronfile = false;
-				if (substr($result['module'], 0, strpos($result['module'], '/')) != 'froxlor')
-				{
-					$change_cronfile = true;
-				}
-				
-				eval("echo \"" . getTemplate("cronjobs/cronjob_edit") . "\";");
-			}
-		}
 	}
 	elseif($action == 'delete'
 	&& $id != 0)
 	{
 		/*
-		 * @TODO later
+		 * @TODO Finish me
 		 */
 	}
 }

admin_customers.php

@@ -66,7 +66,6 @@ if($page == 'customers'
 			'c.email_quota' => $lng['customer']['email_quota'],
 			'c.email_quota_used' => $lng['customer']['email_quota'] . ' (' . $lng['panel']['used'] . ')',
 			'c.deactivated' => $lng['admin']['deactivated'],
-			'c.lastlogin_succ' => $lng['admin']['lastlogin_succ'],
 			'c.phpenabled' => $lng['admin']['phpenabled']
 		);
 
@@ -97,15 +96,6 @@ if($page == 'customers'
 				$row['traffic'] = round($row['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
 				$row['diskspace_used'] = round($row['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
 				$row['diskspace'] = round($row['diskspace'] / 1024, $settings['panel']['decimal_places']);
-				$last_login = ((int)$row['lastlogin_succ'] == 0) ? $lng['panel']['neverloggedin'] : date('d.m.Y', $row['lastlogin_succ']);
-
-				$column_style = '';
-				if($row['loginfail_count'] >= $settings['login']['maxloginattempts']
-					&& $row['lastlogin_fail'] > (time() - $settings['login']['deactivatetime'])
-				) {
-					$column_style = ' style="background-color: #f99122;"';
-				}
-
 				$row = str_replace_array('-1', 'UL', $row, 'diskspace traffic mysqls emails email_accounts email_forwarders ftps tickets subdomains');
 				$row = htmlentities_array($row);
 				eval("\$customers.=\"" . getTemplate("customers/customers_customer") . "\";");
@@ -115,7 +105,6 @@ if($page == 'customers'
 			$i++;
 		}
 
-		$customercount = $db->num_rows($result);
 		eval("echo \"" . getTemplate("customers/customers") . "\";");
 	}
 	elseif($action == 'su'
@@ -185,30 +174,9 @@ if($page == 'customers'
 				$db->query("DELETE FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE `customerid`='" . (int)$id . "'");
 				$db->query("DELETE FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid`='" . (int)$id . "'");
 				$db->query("DELETE FROM `" . TABLE_MAIL_VIRTUAL . "` WHERE `customerid`='" . (int)$id . "'");
-				$result2 = $db->query("SELECT `username` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$id . "'");
-				while($row = $db->fetch_array($result2))
-				{
-					$db->query("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name`='" . $row['username'] . "'");
-				}
 				$db->query("DELETE FROM `" . TABLE_FTP_GROUPS . "` WHERE `customerid`='" . (int)$id . "'");
 				$db->query("DELETE FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$id . "'");
 				$db->query("DELETE FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid`='" . (int)$id . "'");
-
-				// remove everything APS-related, #216
-				$apsresult = $db->query("SELECT `ID` FROM `".TABLE_APS_INSTANCES."` WHERE `CustomerID`='".(int)$id."'");
-				while($apsrow = $db->fetch_array($apsresult))
-				{
-					// remove all package related settings
-					$db->query("DELETE FROM `".TABLE_APS_SETTINGS."` WHERE `InstanceID` = '".(int)$apsrow['ID']."'");
-					// maybe some leftovers in the tasks
-					$db->query("DELETE FROM `".TABLE_APS_TASKS."` WHERE `InstanceID` = '".(int)$apsrow['ID']."'"); 
-				}
-				// now remove all user instances
-				$db->query("DELETE FROM `".TABLE_APS_INSTANCES."` WHERE `CustomerID`='".(int)$id."'");
-				// eventually some temp-setting-leftovers
-				$db->query("DELETE FROM `".TABLE_APS_TEMP_SETTINGS."` WHERE `CustomerID`='".(int)$id."'");
-				// eof APS-related removings, #216
-
 				$admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` - 1 ";
 				$admin_update_query.= ", `domains_used` = `domains_used` - 0" . (int)($domains_deleted - $result['subdomains_used']);
 
@@ -252,11 +220,6 @@ if($page == 'customers'
 					$admin_update_query.= ", `tickets_used` = `tickets_used` - 0" . (int)$result['tickets'];
 				}
 
-				if($result['aps_packages'] != '-1')
-				{
-					$admin_update_query.= ", `aps_packages` = `aps_packages` - 0" . (int)$result['aps_packages'];
-				}
-
 				if(($result['diskspace'] / 1024) != '-1')
 				{
 					$admin_update_query.= ", `diskspace_used` = `diskspace_used` - 0" . (int)$result['diskspace'];
@@ -415,8 +378,7 @@ if($page == 'customers'
 				}
 
 				$createstdsubdomain = intval($_POST['createstdsubdomain']);
-				$password = validate($_POST['new_customer_password'], 'password');
+				$password = validate($_POST['customer_password'], 'password');
-				$password = validatePassword($password);
 				$sendpassword = intval($_POST['sendpassword']);
 				$phpenabled = intval($_POST['phpenabled']);
 				$diskspace = $diskspace * 1024;
@@ -469,11 +431,11 @@ if($page == 'customers'
 				}
 				else
 				{
-					if(isset($_POST['new_loginname'])
+					if(isset($_POST['loginname'])
-					   && $_POST['new_loginname'] != '')
+					   && $_POST['loginname'] != '')
 					{
 						$accountnumber = intval($settings['system']['lastaccountnumber']);
-						$loginname = validate($_POST['new_loginname'], 'loginname', '/^[a-z0-9\-_]+$/i');
+						$loginname = validate($_POST['loginname'], 'loginname', '/^[a-z0-9\-_]+$/i');
 
 						// Accounts which match systemaccounts are not allowed, filtering them
 
@@ -605,37 +567,24 @@ if($page == 'customers'
 						$htpasswdPassword = crypt($password);
 					}
 
+					$db->query("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` " . "(`customerid`, `username`, `password`, `path`) " . "VALUES ('" . (int)$customerid . "', '" . $db->escape($loginname) . "', '" . $db->escape($htpasswdPassword) . "', '" . $db->escape(makeCorrectDir($documentroot . '/webalizer/')) . "')");
+					$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added webalizer htpasswd for user '" . $loginname . "'");
+
 					if($settings['system']['awstats_enabled'] == '1')
 					{
 						$db->query("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` " . "(`customerid`, `username`, `password`, `path`) " . "VALUES ('" . (int)$customerid . "', '" . $db->escape($loginname) . "', '" . $db->escape($htpasswdPassword) . "', '" . $db->escape(makeCorrectDir($documentroot . '/awstats/')) . "')");
 						$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added awstats htpasswd for user '" . $loginname . "'");
 					}
-					else
-					{
-						$db->query("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` " . "(`customerid`, `username`, `password`, `path`) " . "VALUES ('" . (int)$customerid . "', '" . $db->escape($loginname) . "', '" . $db->escape($htpasswdPassword) . "', '" . $db->escape(makeCorrectDir($documentroot . '/webalizer/')) . "')");
-						$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added webalizer htpasswd for user '" . $loginname . "'");
-					}
 
 					inserttask('1');
 					$result = $db->query("INSERT INTO `" . TABLE_FTP_USERS . "` " . "(`customerid`, `username`, `password`, `homedir`, `login_enabled`, `uid`, `gid`) " . "VALUES ('" . (int)$customerid . "', '" . $db->escape($loginname) . "', ENCRYPT('" . $db->escape($password) . "'), '" . $db->escape($documentroot) . "', 'y', '" . (int)$guid . "', '" . (int)$guid . "')");
 					$result = $db->query("INSERT INTO `" . TABLE_FTP_GROUPS . "` " . "(`customerid`, `groupname`, `gid`, `members`) " . "VALUES ('" . (int)$customerid . "', '" . $db->escape($loginname) . "', '" . $db->escape($guid) . "', '" . $db->escape($loginname) . "')");
-					$result = $db->query("INSERT INTO `" . TABLE_FTP_QUOTATALLIES . "` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $db->escape($loginname) . "', 'user', '0', '0', '0', '0', '0', '0')");
 					$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added ftp-account for user '" . $loginname . "'");
 
 					if($createstdsubdomain == '1')
 					{
-						if (isset($settings['system']['stdsubdomain'])
-							&& $settings['system']['stdsubdomain'] != ''
-						) {
-							$_stdsubdomain = $loginname . '.' . $settings['system']['stdsubdomain'];
-						}
-						else
-						{
-							$_stdsubdomain = $loginname . '.' . $settings['system']['hostname'];
-						}
-
 						$db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` SET " . 
-							"`domain` = '". $db->escape($_stdsubdomain) . "', " .
+							"`domain` = '". $db->escape($loginname . '.' . $settings['system']['hostname']) . "', " .
 							"`customerid` = '" . (int)$customerid . "', " .
 							"`adminid` = '" . (int)$userinfo['adminid'] . "', " . 
 							"`parentdomainid` = '-1', " .
@@ -673,22 +622,23 @@ if($page == 'customers'
 						$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'createcustomer_mailbody\'');
 						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['createcustomer']['mailbody']), $replace_arr));
 
-						$_mailerror = false;
+						$mail->From = $userinfo['email'];
-						try {
+						$mail->FromName = $userinfo['name'];
-							$mail->Subject = $mail_subject;
+						$mail->Subject = $mail_subject;
-							$mail->AltBody = $mail_body;
+						$mail->Body = $mail_body;
-							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
+						$mail->AddAddress($email, getCorrectUserSalutation(array('firstname' => $firstname, 'name' => $name, 'company' => $company)));
-							$mail->AddAddress($email, getCorrectUserSalutation(array('firstname' => $firstname, 'name' => $name, 'company' => $company)));
+
-							$mail->Send();
+						if(!$mail->Send())
-						} catch(phpmailerException $e) {
+						{
-							$mailerr_msg = $e->errorMessage();
+							if($mail->ErrorInfo != '')
-							$_mailerror = true;
+							{
-						} catch (Exception $e) {
+								$mailerr_msg = $mail->ErrorInfo;
-							$mailerr_msg = $e->getMessage();
+							}
-							$_mailerror = true;
+							else
-						}
+							{
+								$mailerr_msg = $email;
+							}
 
-						if ($_mailerror) {
 							$log->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 							standard_error('errorsendingmail', $email);
 						}
@@ -750,7 +700,7 @@ if($page == 'customers'
 				$email = $idna_convert->encode(validate($_POST['email'], 'email'));
 				$customernumber = validate($_POST['customernumber'], 'customer number', '/^[A-Za-z0-9 \-]*$/Di');
 				$def_language = validate($_POST['def_language'], 'default language');
-				$password = validate($_POST['new_customer_password'], 'new password');
+				$password = validate($_POST['customer_password'], 'new password');
 				$diskspace = intval_ressource($_POST['diskspace']);
 
 				if(isset($_POST['diskspace_ul']))
@@ -831,18 +781,11 @@ if($page == 'customers'
 					$mysqls = - 1;
 				}
 
-				if($settings['aps']['aps_active'] == '1')
+				$number_of_aps_packages = intval_ressource($_POST['number_of_aps_packages']);
-				{				
-					$number_of_aps_packages = intval_ressource($_POST['number_of_aps_packages']);
 
-					if(isset($_POST['number_of_aps_packages_ul']))
+				if(isset($_POST['number_of_aps_packages_ul']))
-					{
-						$number_of_aps_packages = - 1;
-					}
-				}
-				else
 				{
-					$number_of_aps_packages = 0;
+					$number_of_aps_packages = - 1;
 				}
 
 				$createstdsubdomain = intval($_POST['createstdsubdomain']);
@@ -900,7 +843,6 @@ if($page == 'customers'
 				{
 					if($password != '')
 					{
-						$password = validatePassword($password);
 						$password = md5($password);
 					}
 					else
@@ -916,17 +858,7 @@ if($page == 'customers'
 					if($createstdsubdomain == '1'
 					   && $result['standardsubdomain'] == '0')
 					{
-						if (isset($settings['system']['stdsubdomain'])
+						$db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` " . "(`domain`, `customerid`, `adminid`, `parentdomainid`, `ipandport`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . "VALUES ('" . $db->escape($result['loginname'] . '.' . $settings['system']['hostname']) . "', '" . (int)$result['customerid'] . "', '" . (int)$userinfo['adminid'] . "', '-1', '" . $db->escape($settings['system']['defaultip']) . "', '" . $db->escape($result['documentroot']) . "', '', '0', '0', '1', '1', '0', '')");
-							&& $settings['system']['stdsubdomain'] != ''
-						) {
-							$_stdsubdomain = $result['loginname'] . '.' . $settings['system']['stdsubdomain'];
-						}
-						else
-						{
-							$_stdsubdomain = $result['loginname'] . '.' . $settings['system']['hostname'];
-						}
-
-						$db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` " . "(`domain`, `customerid`, `adminid`, `parentdomainid`, `ipandport`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . "VALUES ('" . $db->escape($_stdsubdomain) . "', '" . (int)$result['customerid'] . "', '" . (int)$userinfo['adminid'] . "', '-1', '" . $db->escape($settings['system']['defaultip']) . "', '" . $db->escape($result['documentroot']) . "', '', '0', '0', '1', '1', '0', '')");
 						$domainid = $db->insert_id();
 						$db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `standardsubdomain`=\'' . (int)$domainid . '\' WHERE `customerid`=\'' . (int)$result['customerid'] . '\'');
 						$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added standardsubdomain for user '" . $result['loginname'] . "'");

admin_domains.php

@@ -130,8 +130,6 @@ if($page == 'domains'
 			$i++;
 		}
 
-		$domainscount = $db->num_rows($result);
-
 		// Display the list
 
 		eval("echo \"" . getTemplate("domains/domains") . "\";");
@@ -149,14 +147,6 @@ if($page == 'domains'
 			if(isset($_POST['send'])
 			   && $_POST['send'] == 'send')
 			{
-				/*
-				 * check for APS packages used with this domain, #110
-				 */
-				if(domainHasApsInstances($id))
-				{
-					standard_error('domains_cantdeletedomainwithapsinstances');
-				}
-
 				$query = 'SELECT `id` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE (`id`="' . (int)$id . '" OR `parentdomainid`="' . (int)$id . '")  AND  `isemaildomain`="1"';
 				$subResult = $db->query($query);
 				$idString = array();
@@ -308,7 +298,7 @@ if($page == 'domains'
 					}
 					else
 					{
-						$phpsettingid = $settings['system']['mod_fcgid_defaultini'];
+						$phpsettingid = '1';
 						$mod_fcgid_starter = '-1';
 						$mod_fcgid_maxrequests = '-1';
 					}
@@ -317,7 +307,7 @@ if($page == 'domains'
 				{
 					$openbasedir = '1';
 					$safemode = '1';
-					$phpsettingid = $settings['system']['mod_fcgid_defaultini'];
+					$phpsettingid = '1';
 					$mod_fcgid_starter = '-1';
 					$mod_fcgid_maxrequests = '-1';
 				}
@@ -369,14 +359,7 @@ if($page == 'domains'
 
 				if(!preg_match('/^https?\:\/\//', $documentroot))
 				{
-					if(strstr($documentroot, ":") !== FALSE)
+					$documentroot = makeCorrectDir($documentroot);
-					{
-						standard_error('pathmaynotcontaincolon');
-					}
-					else
-					{
-						$documentroot = makeCorrectDir($documentroot);
-					}
 				}
 
 				$domain_check = $db->query_first("SELECT `id`, `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain` = '" . $db->escape(strtolower($domain)) . "'");
@@ -386,8 +369,7 @@ if($page == 'domains'
 
 				if($aliasdomain != 0)
 				{
-					// also check ip/port combination to be the same, #176
+					$aliasdomain_check = $db->query_first('SELECT `id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`,`' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`customerid`=\'' . (int)$customerid . '\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\'' . (int)$customerid . '\' AND `d`.`id`=\'' . (int)$aliasdomain . '\'');
-					$aliasdomain_check = $db->query_first('SELECT `d`.`id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`,`' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`customerid`=\'' . (int)$customerid . '\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\'' . (int)$customerid . '\' AND `d`.`id`=\'' . (int)$aliasdomain . '\' AND `d`.`ipandport` = \''.(int)$ipandport.'\'');
 				}
 
 				if($openbasedir != '1')
@@ -573,7 +555,7 @@ if($page == 'domains'
 						$row_ipandport['ip'] = '[' . $row_ipandport['ip'] . ']';
 					}
 
-					$ipsandports.= makeoption($row_ipandport['ip'] . ':' . $row_ipandport['port'], $row_ipandport['id'], $settings['system']['defaultip']);
+					$ipsandports.= makeoption($row_ipandport['ip'] . ':' . $row_ipandport['port'], $row_ipandport['id']);
 				}
 
 				$ssl_ipsandports = '';
@@ -588,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`');
 
@@ -618,7 +602,7 @@ if($page == 'domains'
 
 				while($row = $db->fetch_array($configs))
 				{
-					$phpconfigs.= makeoption($row['description'], $row['id'], $settings['system']['mod_fcgid_defaultini'], true, true);
+					$phpconfigs.= makeoption($row['description'], $row['id'], '1', true, true);
 				}
 
 				$isbinddomain = makeyesno('isbinddomain', '1', '0', '1');
@@ -631,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") . "\";");
@@ -642,11 +624,7 @@ if($page == 'domains'
 	elseif($action == 'edit'
 	       && $id != 0)
 	{
-		$result = $db->query_first("SELECT `d`.*, `c`.`customerid` FROM `" . TABLE_PANEL_DOMAINS . "` `d` 
+		$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'] . "' "));
-									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'] != '')
 		{
@@ -751,12 +729,6 @@ if($page == 'domains'
 					{
 						$documentroot = $customer['documentroot'];
 					}
-
-					if(!preg_match('/^https?\:\/\//', $documentroot)
-						&& strstr($documentroot, ":") !== FALSE
-					) {
-						standard_error('pathmaynotcontaincolon');
-					}
 				}
 				else
 				{
@@ -906,8 +878,7 @@ if($page == 'domains'
 
 				if($aliasdomain != 0)
 				{
-					// also check ip/port combination to be the same, #176
+					$aliasdomain_check = $db->query_first('SELECT `id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`,`' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`customerid`=\'' . (int)$result['customerid'] . '\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\'' . (int)$result['customerid'] . '\' AND `d`.`id`=\'' . (int)$aliasdomain . '\'');
-					$aliasdomain_check = $db->query_first('SELECT `d`.`id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`,`' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`customerid`=\'' . (int)$result['customerid'] . '\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\'' . (int)$result['customerid'] . '\' AND `d`.`id`=\'' . (int)$aliasdomain . '\' AND `d`.`ipandport` = \''.(int)$ipandport.'\'');
 				}
 
 				if($aliasdomain_check['id'] != $aliasdomain)

admin_index.php

@@ -84,38 +84,26 @@ if($page == 'overview')
 	$webserverinterface = strtoupper(@php_sapi_name());
 
 	if((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
-	|| (isset($lookfornewversion) && $lookfornewversion == 'yes'))
+	   || (isset($lookfornewversion) && $lookfornewversion == 'yes'))
 	{
 		$update_check_uri = 'http://version.froxlor.org/Froxlor/legacy/' . $version;
 		
-		if(ini_get('allow_url_fopen'))
+		if(strtolower(ini_get('allow_url_fopen')) == 'on')
 		{
 			$latestversion = @file($update_check_uri);
 	
-			if (isset($latestversion[0]))
+			$latestversion = explode(':', $latestversion);
+	
+			if(is_array($latestversion)
+			   && count($latestversion) >= 2)
 			{
-				$latestversion = explode('|', $latestversion[0]);
+				$lookfornewversion_lable = $latestversion[0];
+				$lookfornewversion_link = $latestversion[1];
+				$lookfornewversion_addinfo = '';
 	
-				if(is_array($latestversion)
+				if(count($latestversion) >= 3)
-				&& count($latestversion) >= 1)
 				{
-					$_version = $latestversion[0];
+					$lookfornewversion_addinfo = $latestversion[2];
-					$_message = isset($latestversion[1]) ? $latestversion[1] : '';
-					$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
-
-					$lookfornewversion_lable = $_version;
-					$lookfornewversion_link = $_link;
-					$lookfornewversion_addinfo = $_message;
-					
-					if (version_compare($version, $_version) == -1) {
-						$isnewerversion = 1;
-					} else {
-						$isnewerversion = 0;
-					}
-				}
-				else
-				{
-					redirectTo($update_check_uri.'/pretty', NULL);
 				}
 			}
 			else
@@ -133,7 +121,6 @@ if($page == 'overview')
 		$lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere'];
 		$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
 		$lookfornewversion_addinfo = '';
-		$isnewerversion = 0;
 	}
 
 	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']);
@@ -190,8 +177,8 @@ if($page == 'overview')
 	$uptime_array = explode(" ", @file_get_contents("/proc/uptime"));
 
 	if(is_array($uptime_array)
-	&& isset($uptime_array[0])
+	   && isset($uptime_array[0])
-	&& is_numeric($uptime_array[0]))
+	   && is_numeric($uptime_array[0]))
 	{
 		// Some calculatioon to get a nicly formatted display
 
@@ -220,7 +207,7 @@ if($page == 'overview')
 elseif($page == 'change_password')
 {
 	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
+	   && $_POST['send'] == 'send')
 	{
 		$old_password = validate($_POST['old_password'], 'old password');
 
@@ -264,7 +251,7 @@ elseif($page == 'change_password')
 elseif($page == 'change_language')
 {
 	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
+	   && $_POST['send'] == 'send')
 	{
 		$def_language = validate($_POST['def_language'], 'default language');
 

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_phpsettings.php

@@ -97,7 +97,7 @@ if($page == 'overview')
 
 				$db->query("INSERT INTO `" . TABLE_PANEL_PHPCONFIGS . "` SET `description` = '" . $db->escape($description) . "', `binary` = '" . $db->escape($binary) . "', `file_extensions` = '" . $db->escape($file_extensions) . "', `mod_fcgid_starter` = '" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests` = '" . $db->escape($mod_fcgid_maxrequests) . "', `phpsettings` = '" . $db->escape($phpsettings) . "'");
 				inserttask('1');
-				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $description . "' has been created by '" . $userinfo['loginname'] . "'");
+				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $value . "' has been created by '" . $userinfo['loginname'] . "'");
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
 			else

admin_settings.php

@@ -31,78 +31,20 @@ if(($page == 'settings' || $page == 'overview')
    && $userinfo['change_serversettings'] == '1')
 {
 	$settings_data = loadConfigArrayDir('./actions/admin/settings/');
-	$settings = loadSettings($settings_data, $db);
+	$settings = loadSettings(&$settings_data, &$db);
 	
 	if(isset($_POST['send'])
 	   && $_POST['send'] == 'send')
 	{
-		$_part = isset($_GET['part']) ? $_GET['part'] : '';
+		if(processForm(&$settings_data, &$_POST, array('filename' => $filename, 'action' => $action, 'page' => $page)))
-
-		if($_part == '')
 		{
-			$_part = isset($_POST['part']) ? $_POST['part'] : '';
-		}
-
-		if($_part != '')
-		{
-			if($_part == 'all')
-			{
-				$settings_all = true;
-				$settings_part = false;
-			}
-			else
-			{
-				$settings_all = false;
-				$settings_part = true;
-			}
-
-			$only_enabledisable = false;
-		}
-		else
-		{
-			$settings_all = false;
-			$settings_part = false;
-			$only_enabledisable = true;
-		}
-		
-		if(processFormEx(
-			$settings_data, 
-			$_POST, 
-			array('filename' => $filename, 'action' => $action, 'page' => $page),
-			$_part,
-			$settings_all,
-			$settings_part,
-			$only_enabledisable
-			)
-		) {
 			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
 		}
 	}
 	else
 	{
-		$_part = isset($_GET['part']) ? $_GET['part'] : '';
+		$fields = buildForm(&$settings_data);
-		
+		eval("echo \"" . getTemplate("settings/settings") . "\";");
-		if($_part == '')
-		{
-			$_part = isset($_POST['part']) ? $_POST['part'] : '';
-		}
-
-		$fields = buildFormEx($settings_data, $_part);
-		
-		$settings_page = '';
-		if($_part == '')
-		{
-			eval("\$settings_page .= \"" . getTemplate("settings/settings_overview") . "\";");
-		} 
-		else
-		{
-			eval("\$settings_page .= \"" . getTemplate("settings/settings") . "\";");
-		}
-		
-		eval("echo \"" . getTemplate("settings/settings_form_begin") . "\";");
-		eval("echo \$settings_page;");
-		eval("echo \"" . getTemplate("settings/settings_form_end") . "\";");
-
 	}
 }
 elseif($page == 'rebuildconfigs'

admin_tickets.php

@@ -102,12 +102,11 @@ if($page == 'tickets'
 					if($_cid != $row['customerid'])
 					{
 						$cid = $row['customerid'];
-						$usr = $db->query_first('SELECT `firstname`, `name`, `company`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
+						$usr = $db->query_first('SELECT `firstname`, `name`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
                                      WHERE `customerid` = "' . (int)$cid . '"');
 						
 						if(isset($usr['loginname'])) {
-							$customer = getCorrectFullUserDetails($usr) . ' (' . $usr['loginname'] . ')';
+							$customer = $usr['firstname'] . " " . $usr['name'] . " (" . $usr['loginname'] . ")";
-							//$customer = $usr['firstname'] . " " . $usr['name'] . " (" . $usr['loginname'] . ")";
 						} else {
 							$customer = $lng['ticket']['nonexistingcustomer'];
 						}
@@ -198,12 +197,12 @@ if($page == 'tickets'
 			else
 			{
 				$categories = '';
-				$result = $db->query_first('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `adminid` = "' . $userinfo['adminid'] . '" ORDER BY `logicalorder`, `name` ASC');
+				$result = $db->query_first('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `adminid` = "' . $userinfo['adminid'] . '" ORDER BY `name` ASC');
 
 				if(isset($result['name'])
 				   && $result['name'] != '')
 				{
-					$result2 = $db->query('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `adminid` = "' . $userinfo['adminid'] . '" ORDER BY `logicalorder`, `name` ASC');
+					$result2 = $db->query('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `adminid` = "' . $userinfo['adminid'] . '" ORDER BY `name` ASC');
 
 					while($row = $db->fetch_array($result2))
 					{
@@ -220,12 +219,27 @@ if($page == 'tickets'
 
 				while($row_customer = $db->fetch_array($result_customers))
 				{
-					$customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
+					if($row_customer['company'] == '')
+					{
+						$customers.= makeoption($row_customer['name'] . ', ' . $row_customer['firstname'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
+					}
+					else
+					{
+						if($row_customer['name'] != ''
+						   && $row_customer['firstname'] != '')
+						{
+							$customers.= makeoption($row_customer['name'] . ', ' . $row_customer['firstname'] . ' | ' . $row_customer['company'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
+						}
+						else
+						{
+							$customers.= makeoption($row_customer['company'] . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
+						}
+					}
 				}
 
-				$priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']);
+				$priorities = makeoption($lng['ticket']['unf_high'], '1');
-				$priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']);
+				$priorities.= makeoption($lng['ticket']['unf_normal'], '2');
-				$priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']);
+				$priorities.= makeoption($lng['ticket']['unf_low'], '3');
 				eval("echo \"" . getTemplate("ticket/tickets_new") . "\";");
 			}
 		}
@@ -421,11 +435,10 @@ elseif($page == 'categories'
 	{
 		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_tickets::categories");
 		$fields = array(
-			'name' => $lng['ticket']['category'],
+			'name' => $lng['ticket']['category']
-			'logicalorder' => $lng['ticket']['logicalorder']
 		);
 		$paging = new paging($userinfo, $db, TABLE_PANEL_TICKET_CATS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT `main`.`id`, `main`.`name`, `main`.`logicalorder`, (
+		$result = $db->query("SELECT `main`.`id`, `main`.`name`, (
                               SELECT COUNT(`sub`.`id`) FROM `" . TABLE_PANEL_TICKETS . "` `sub`
                               WHERE `sub`.`category` = `main`.`id`
                               AND `sub`.`answerto` = '0' AND `sub`.`adminid` = '" . $userinfo['adminid'] . "')
@@ -468,12 +481,6 @@ elseif($page == 'categories'
 		   && $_POST['send'] == 'send')
 		{
 			$category = validate($_POST['category'], 'category');
-			$order = validate($_POST['logicalorder'], 'logicalorder');
-			
-			if($order < 1 || $order >= 1000)
-			{
-				$order = 1;
-			}
 
 			if($category == '')
 			{
@@ -481,7 +488,7 @@ elseif($page == 'categories'
 			}
 			else
 			{
-				ticket::addCategory($db, $category, $userinfo['adminid'], $order);
+				ticket::addCategory($db, $category, $userinfo['adminid']);
 				$log->logAction(ADM_ACTION, LOG_INFO, "added ticket-category '" . $category . "'");
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
@@ -498,12 +505,6 @@ elseif($page == 'categories'
 		   && $_POST['send'] == 'send')
 		{
 			$category = validate($_POST['category'], 'category');
-			$order = validate($_POST['logicalorder'], 'logicalorder');
-
-			if($order < 1 || $order >= 1000)
-			{
-				$order = 1;
-			}
 
 			if($category == '')
 			{
@@ -511,7 +512,7 @@ elseif($page == 'categories'
 			}
 			else
 			{
-				ticket::editCategory($db, $category, $id, $order);
+				ticket::editCategory($db, $category, $id);
 				$log->logAction(ADM_ACTION, LOG_INFO, "edited ticket-category '" . $category . "'");
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
@@ -633,15 +634,14 @@ elseif($page == 'archive'
 						if($_cid != $ticket['customerid'])
 						{
 							$cid = $ticket['customerid'];
-							$usr = $db->query_first('SELECT `firstname`, `name`, `company`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
+							$usr = $db->query_first('SELECT `firstname`, `name`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
                                        WHERE `customerid` = "' . (int)$cid . '"');
 							
 							if(isset($usr['loginname'])) {
-								$customer = getCorrectFullUserDetails($usr) . ' (' . $usr['loginname'] . ')';
+								$customer = $usr['firstname'] . " " . $usr['name'] . " (" . $usr['loginname'] . ")";
 							} else {
 								$customer = $lng['ticket']['nonexistingcustomer'];
 							}
-							
 							eval("\$tickets.=\"" . getTemplate("ticket/tickets_customer") . "\";");
 						}
 
@@ -718,11 +718,18 @@ elseif($page == 'archive'
 			}
 
 			$customers = makeoption($lng['ticket']['nocustomer'], '-1', '-1');
-			$result_customers = $db->query("SELECT `customerid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_CUSTOMERS . "` " . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' ") . " ORDER BY `name` ASC");
+			$result = $db->query_first('SELECT `customerid` FROM `' . TABLE_PANEL_CUSTOMERS . '` ' . ($userinfo['customers_see_all'] ? '' : ' WHERE `adminid` = "' . (int)$userinfo['adminid'] . '" ') . 'ORDER BY `name` ASC');
 
-			while($row_customer = $db->fetch_array($result_customers))
+			if(isset($result['customerid'])
+			   && $result['customerid'] != '')
 			{
-				$customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
+				$result2 = $db->query('SELECT `customerid`, `loginname`, `firstname`, `name`
+  									          FROM `' . TABLE_PANEL_CUSTOMERS . '` ' . ($userinfo['customers_see_all'] ? '' : ' WHERE `adminid` = "' . (int)$userinfo['adminid'] . '" ') . ' ORDER BY `name` ASC');
+
+				while($row = $db->fetch_array($result2))
+				{
+					$customers.= makeoption($row['name'] . ', ' . $row['firstname'] . ' (' . $row['loginname'] . ')', $row['customerid']);
+				}
 			}
 
 			eval("echo \"" . getTemplate("ticket/archive") . "\";");
@@ -735,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;
 

admin_updates.php

@@ -22,90 +22,33 @@ if($page == 'overview')
 {
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
 	
-	/**
-	 * this is a dirty hack but syscp 1.4.2.1 does not
-	 * has any version/dbversion in the database (don't know why)
-	 * so we have to set them both to run a correct upgrade
-	 */
-	if (!isFroxlor()) {
-		if (!isset($settings['panel']['version'])
-		|| $settings['panel']['version'] == ''
-		) {
-			$settings['panel']['version'] = '1.4.2.1';
-			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel','version','".$settings['panel']['version']."')");
-		}
-		if (!isset($settings['system']['dbversion'])
-		|| $settings['system']['dbversion'] == ''
-		) {
-			/**
-			 * for syscp-stable (1.4.2.1) this value has to be 0
-			 * so the required table-fields are added correctly
-			 * and the svn-version has its value in the database
-			 * -> bug #54
-			 */
-			
-			$result = $db->query_first("SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'");
-			
-			if(isset($result['value']))
-			{
-				$settings['system']['dbversion'] = (int)$result['value'];
-			} else {
-				$settings['system']['dbversion'] = 0;
-			}
-		}
-	}
-
 	if(hasUpdates($version))
 	{
-		$successful_update = false;
-		$message = '';
-
 		if(isset($_POST['send'])
 		&& $_POST['send'] == 'send')
 		{
-			if((isset($_POST['update_preconfig'])
-				&& isset($_POST['update_changesagreed'])
-				&& intval($_POST['update_changesagreed']) != 0)
-				|| !isset($_POST['update_preconfig'])
-			) {
-				eval("echo \"" . getTemplate("update/update_start") . "\";");
 	
-				include_once './install/updatesql.php';
+			eval("echo \"" . getTemplate("update/update_start") . "\";");
 			
-				$redirect_url = 'admin_index.php?s=' . $s;
+			include_once('./install/updatesql.php');
-				eval("echo \"" . getTemplate("update/update_end") . "\";");
 			
-				updateCounters();
+			$redirect_url = 'admin_index.php';
-				inserttask('1');
+			eval("echo \"" . getTemplate("update/update_end") . "\";");
-				@chmod('./lib/userdata.inc.php', 0440);
 	
-				$successful_update = true;
+			updateCounters();
-			}
+			inserttask('1');
-			else
+			@chmod('./lib/userdata.inc.php', 0440);
-			{
-				$message = '<br /><strong style="color:#ff0000;">You have to agree that you have read the update notifications.</strong>';
-			}
 		}
-
+		else
-		if(!$successful_update)
 		{
 			$current_version = $settings['panel']['version'];
 			$new_version = $version;
 			
-			$ui_text = $lng['update']['update_information']['part_a'];
+			$ui_text = $lng['update']['update_information'];
 			$ui_text = str_replace('%curversion', $current_version, $ui_text);
 			$ui_text = str_replace('%newversion', $new_version, $ui_text);
 			$update_information = $ui_text;
 			
-			include_once './install/updates/preconfig.php';
-			$preconfig = getPreConfig($current_version);
-			if($preconfig != '')
-			{
-				$update_information .= '<br />'.$preconfig.$message;
-			}
-			
-			$update_information .= $lng['update']['update_information']['part_b'];
-
 			eval("echo \"" . getTemplate("update/index") . "\";");
 		}
 	}
@@ -116,7 +59,7 @@ if($page == 'overview')
 		 */
 
 		$success_message = $lng['update']['noupdatesavail'];
-		$redirect_url = 'admin_index.php?s=' . $s;
+		$redirect_url = 'admin_index.php';
 		eval("echo \"" . getTemplate("update/noupdatesavail") . "\";");
 	}
 }

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_autoresponder.php

@@ -107,7 +107,7 @@ if($action == "add")
 	}
 	
 	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
-	$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
+	$date_until_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
 
 	eval("echo \"" . getTemplate("email/autoresponder_add") . "\";");
 }
@@ -229,7 +229,7 @@ if($action == "edit")
 		$deactivated = '0';
 		$date_until = date('d-m-Y', $date_until);
 	}
-	$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
+	$date_from_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
 
 	$checked = '';
 

customer_domains.php

@@ -68,13 +68,13 @@ elseif($page == 'domains')
 			$row['domainalias'] = $idna_convert->decode($row['domainalias']);
 
 			if($row['parentdomainid'] == '0'
+			   && $row['iswildcarddomain'] != '1'
 			   && $row['caneditdomain'] == '1')
 			{
 				$parentdomains_count++;
 			}
 
 			$domains_count++;
-/*
 			$domainparts = explode('.', $row['domain']);
 			$domainparts = array_reverse($domainparts);
 			$sortkey = '';
@@ -82,9 +82,8 @@ elseif($page == 'domains')
 			{
 				$sortkey.= $part . '.';
 			}
+
 			$domain_array[$sortkey] = $row;
-*/
-			$domain_array[$row['domain']] = $row;
 		}
 
 		ksort($domain_array);
@@ -126,11 +125,6 @@ elseif($page == 'domains')
 			if($paging->checkDisplay($i))
 			{
 				$row = htmlentities_array($domain_array[$sortkey]);
-				if($settings['system']['awstats_enabled'] == '1') {
-					$statsapp = 'awstats';
-				} else {
-					$statsapp = 'webalizer';
-				}
 				eval("\$domains.=\"" . getTemplate("domains/domains_delimiter") . "\";");
 
 				if($paging->sortfield == 'd.domain'
@@ -184,14 +178,6 @@ elseif($page == 'domains')
 					}
 				}
 
-				/*
-				 * check for APS packages used with this domain, #110
-				 */
-				if(domainHasApsInstances($id))
-				{
-					standard_error('domains_cantdeletedomainwithapsinstances');
-				}
-
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted subdomain '" . $idna_convert->decode($result['domain']) . "'");
 				$result = $db->query("DELETE FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 				$result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `subdomains_used`=`subdomains_used`-1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
@@ -219,19 +205,17 @@ elseif($page == 'domains')
 			{
 				$subdomain = $idna_convert->encode(preg_replace(Array('/\:(\d)+$/', '/^https?\:\/\//'), '', validate($_POST['subdomain'], 'subdomain', '', 'subdomainiswrong')));
 				$domain = $idna_convert->encode($_POST['domain']);
-				$domain_check = $db->query_first("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain`='" . $db->escape($domain) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `email_only`='0' AND `caneditdomain`='1' ");
+				$domain_check = $db->query_first("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain`='" . $db->escape($domain) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `email_only`='0' AND `iswildcarddomain`='0' AND `caneditdomain`='1' ");
 				$completedomain = $subdomain . '.' . $domain;
 				$completedomain_check = $db->query_first("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain`='" . $db->escape($completedomain) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "' AND `email_only`='0' AND `caneditdomain` = '1'");
 				$aliasdomain = intval($_POST['alias']);
 				$aliasdomain_check = array(
 					'id' => 0
 				);
-				$_doredirect = false;
 
 				if($aliasdomain != 0)
 				{
-					// also check ip/port combination to be the same, #176
+					$aliasdomain_check = $db->query_first('SELECT `id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`,`' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`customerid`=\'' . (int)$userinfo['customerid'] . '\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\'' . (int)$userinfo['customerid'] . '\' AND `d`.`id`=\'' . (int)$aliasdomain . '\'');
-					$aliasdomain_check = $db->query_first('SELECT `id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`,`' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`customerid`=\'' . (int)$userinfo['customerid'] . '\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\'' . (int)$userinfo['customerid'] . '\' AND `d`.`id`=\'' . (int)$aliasdomain . '\' AND `d`.`ipandport` = \''.(int)$domain_check['ipandport'].'\'');
 				}
 
 				if(isset($_POST['url'])
@@ -239,7 +223,6 @@ elseif($page == 'domains')
 				   && validateUrl($idna_convert->encode($_POST['url'])))
 				{
 					$path = $_POST['url'];
-					$_doredirect = true;
 				}
 				else
 				{
@@ -251,14 +234,6 @@ elseif($page == 'domains')
 				{
 					$path = $userinfo['documentroot'] . '/' . $path;
 					$path = makeCorrectDir($path);
-					if (strstr($path, ":") !== FALSE)
-					{
-						standard_error('pathmaynotcontaincolon');
-					}
-				}
-				else
-				{
-					$_doredirect = true;
 				}
 
 				if(isset($_POST['openbasedir_path'])
@@ -311,38 +286,7 @@ elseif($page == 'domains')
 				}
 				else
 				{
-					// get the phpsettingid from parentdomain, #107
+					$result = $db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` (`customerid`, `domain`, `documentroot`, `ipandport`, `aliasdomain`, `parentdomainid`, `isemaildomain`, `openbasedir`, `openbasedir_path`, `safemode`, `speciallogfile`, `specialsettings`, `ssl_redirect`) VALUES ('" . (int)$userinfo['customerid'] . "', '" . $db->escape($completedomain) . "', '" . $db->escape($path) . "', '" . $db->escape($domain_check['ipandport']) . "', " . (($aliasdomain != 0) ? "'" . $db->escape($aliasdomain) . "'" : "NULL") . ", '" . (int)$domain_check['id'] . "', '" . ($domain_check['subcanemaildomain'] == '3' ? '1' : '0') . "', '" . $db->escape($domain_check['openbasedir']) . "', '" . $db->escape($openbasedir_path) . "', '" . $db->escape($domain_check['safemode']) . "', '" . $db->escape($domain_check['speciallogfile']) . "', '" . $db->escape($domain_check['specialsettings']) . "', '" . $ssl_redirect . "')");
-					$phpsid_result = $db->query_first("SELECT `phpsettingid` FROM `".TABLE_PANEL_DOMAINS."` WHERE `id` = '".(int)$domain_check['id']."'");
-					if(!isset($phpsid_result['phpsettingid'])
-						|| (int)$phpsid_result['phpsettingid'] <= 0
-					) {
-						// assign default config
-						$phpsid_result['phpsettingid'] = 1;
-					}
-
-					$result = $db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` SET 
-								`customerid` = '" . (int)$userinfo['customerid'] . "',
-								`domain` = '" . $db->escape($completedomain) . "', 
-								`documentroot` = '" . $db->escape($path) . "', 
-								`ipandport` = '" . $db->escape($domain_check['ipandport']) . "', 
-								`aliasdomain` = ".(($aliasdomain != 0) ? "'" . $db->escape($aliasdomain) . "'" : "NULL") .", 
-								`parentdomainid` = '" . (int)$domain_check['id'] . "', 
-								`isemaildomain` = '" . ($domain_check['subcanemaildomain'] == '3' ? '1' : '0') . "', 
-								`openbasedir` = '" . $db->escape($domain_check['openbasedir']) . "', 
-								`openbasedir_path` = '" . $db->escape($openbasedir_path) . "', 
-								`safemode` = '" . $db->escape($domain_check['safemode']) . "', 
-								`speciallogfile` = '" . $db->escape($domain_check['speciallogfile']) . "', 
-								`specialsettings` = '" . $db->escape($domain_check['specialsettings']) . "', 
-								`ssl_redirect` = '" . $ssl_redirect . "', 
-								`phpsettingid` = '" . $phpsid_result['phpsettingid'] . "'");
-
-					if($_doredirect)
-					{
-						$did = $db->insert_id();
-						$redirect = isset($_POST['redirectcode']) ? (int)$_POST['redirectcode'] : $settings['customredirect']['default'];
-						addRedirectToDomain($did, $redirect);
-					}
-
 					$result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `subdomains_used`=`subdomains_used`+1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 					$log->logAction(USR_ACTION, LOG_INFO, "added subdomain '" . $completedomain . "'");
 					inserttask('1');
@@ -352,7 +296,7 @@ elseif($page == 'domains')
 			}
 			else
 			{
-				$result = $db->query("SELECT `id`, `domain`, `documentroot`, `ssl_redirect`,`isemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `email_only`='0' AND `caneditdomain`='1' ORDER BY `domain` ASC");
+				$result = $db->query("SELECT `id`, `domain`, `documentroot`, `ssl_redirect`,`isemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `email_only`='0' AND `iswildcarddomain`='0' AND `caneditdomain`='1' ORDER BY `domain` ASC");
 				$domains = '';
 
 				while($row = $db->fetch_array($result))
@@ -368,16 +312,6 @@ elseif($page == 'domains')
 					$aliasdomains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id']);
 				}
 
-				if($settings['customredirect']['enabled'] == '1')
-				{
-					$redirectcode = '';
-					$codes = getRedirectCodesArray();
-					foreach($codes as $rc)
-					{
-						$redirectcode .= makeoption($rc['code'], $rc['id'], $settings['customredirect']['default']);
-					}
-				}
-
 				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
 				$openbasedir = makeoption($lng['domain']['docroot'], 0, NULL, true) . makeoption($lng['domain']['homedir'], 1, NULL, true);
 				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
@@ -388,10 +322,9 @@ elseif($page == 'domains')
 	elseif($action == 'edit'
 	       && $id != 0)
 	{
-		$result = $db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`ssl_redirect`, `d`.`aliasdomain`, `d`.`openbasedir_path`, `d`.`ipandport`, `pd`.`subcanemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_DOMAINS . "` `pd` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`id`='" . (int)$id . "' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'");
+		$result = $db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`ssl_redirect`, `d`.`aliasdomain`, `d`.`openbasedir_path` ,`pd`.`subcanemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_DOMAINS . "` `pd` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`id`='" . (int)$id . "' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'");
 		$alias_check = $db->query_first('SELECT COUNT(`id`) AS count FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . (int)$result['id'] . '\'');
 		$alias_check = $alias_check['count'];
-		$_doredirect = false;
 
 		if(isset($result['customerid'])
 		   && $result['customerid'] == $userinfo['customerid'])
@@ -404,7 +337,6 @@ elseif($page == 'domains')
 				   && validateUrl($idna_convert->encode($_POST['url'])))
 				{
 					$path = $_POST['url'];
-					$_doredirect = true;
 				}
 				else
 				{
@@ -416,14 +348,6 @@ elseif($page == 'domains')
 				{
 					$path = $userinfo['documentroot'] . '/' . $path;
 					$path = makeCorrectDir($path);
-					if (strstr($path, ":") !== FALSE)
-					{
-						standard_error('pathmaynotcontaincolon');
-					}
-				}
-				else
-				{
-					$_doredirect = true;
 				}
 
 				$aliasdomain = intval($_POST['alias']);
@@ -431,7 +355,16 @@ elseif($page == 'domains')
 				if(isset($_POST['iswildcarddomain'])
 				   && $_POST['iswildcarddomain'] == '1'
 				   && $result['parentdomainid'] == '0'
-				){
+				   && $userinfo['subdomains'] != '0')
+				{
+					$wildcarddomaincheck = $db->query("SELECT `id` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `parentdomainid` = '" . (int)$result['id'] . "'");
+
+					if($db->num_rows($wildcarddomaincheck) != '0')
+					{
+						standard_error('firstdeleteallsubdomains');
+						exit;
+					}
+
 					$iswildcarddomain = '1';
 				}
 				else
@@ -498,12 +431,6 @@ elseif($page == 'domains')
 						$log->logAction(USR_ACTION, LOG_NOTICE, "automatically deleted mail-table entries for '" . $idna_convert->decode($result['domain']) . "'");
 					}
 
-					if($_doredirect)
-					{
-						$redirect = isset($_POST['redirectcode']) ? (int)$_POST['redirectcode'] : false;
-						updateRedirectOfDomain($id, $redirect);
-					}
-
 					if($path != $result['documentroot']
 					   || $isemaildomain != $result['isemaildomain']
 					   || $iswildcarddomain != $result['iswildcarddomain']
@@ -512,9 +439,9 @@ elseif($page == 'domains')
 					   || $ssl_redirect != $result['ssl_redirect'])
 					{
 						$log->logAction(USR_ACTION, LOG_INFO, "edited domain '" . $idna_convert->decode($result['domain']) . "'");
-						$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `documentroot`='" . $db->escape($path) . "', `isemaildomain`='" . (int)$isemaildomain . "', `iswildcarddomain`='" . (int)$iswildcarddomain . "', `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ",`openbasedir_path`='" . $db->escape($openbasedir_path) . "', `ssl_redirect`='" . $ssl_redirect . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 						inserttask('1');
 						inserttask('4');
+						$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `documentroot`='" . $db->escape($path) . "', `isemaildomain`='" . (int)$isemaildomain . "', `iswildcarddomain`='" . (int)$iswildcarddomain . "', `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ",`openbasedir_path`='" . $db->escape($openbasedir_path) . "', `ssl_redirect`='" . $ssl_redirect . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 					}
 
 					redirectTo($filename, Array('page' => $page, 's' => $s));
@@ -524,8 +451,7 @@ elseif($page == 'domains')
 			{
 				$result['domain'] = $idna_convert->decode($result['domain']);
 				$domains = makeoption($lng['domains']['noaliasdomain'], 0, $result['aliasdomain'], true);
-				// also check ip/port combination to be the same, #176
+				$result_domains = $db->query("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `d`.`aliasdomain` IS NULL AND `d`.`id`<>'" . (int)$result['id'] . "' AND `c`.`standardsubdomain`<>`d`.`id` AND `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `c`.`customerid`=`d`.`customerid` ORDER BY `d`.`domain` ASC");
-				$result_domains = $db->query("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `d`.`aliasdomain` IS NULL AND `d`.`id`<>'" . (int)$result['id'] . "' AND `c`.`standardsubdomain`<>`d`.`id` AND `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `c`.`customerid`=`d`.`customerid` AND `d`.`ipandport` = '".(int)$result['ipandport']."' ORDER BY `d`.`domain` ASC");
 
 				while($row_domain = $db->fetch_array($result_domains))
 				{
@@ -545,30 +471,16 @@ elseif($page == 'domains')
 					$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $result['documentroot']);
 				}
 
-				if($settings['customredirect']['enabled'] == '1')
-				{
-					$def_code = getDomainRedirectId($id);
-					$redirectcode = '';
-					$codes = getRedirectCodesArray();
-					foreach($codes as $rc)
-					{
-						$redirectcode .= makeoption($rc['code'], $rc['id'], $def_code);
-					}
-				}
-
 				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
 				$iswildcarddomain = makeyesno('iswildcarddomain', '1', '0', $result['iswildcarddomain']);
 				$isemaildomain = makeyesno('isemaildomain', '1', '0', $result['isemaildomain']);
 				$openbasedir = makeoption($lng['domain']['docroot'], 0, $result['openbasedir_path'], true) . makeoption($lng['domain']['homedir'], 1, $result['openbasedir_path'], true);
-
-				$result_ipandport = $db->query_first("SELECT `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` WHERE `id`='".(int)$result['ipandport']."'");
-				if(filter_var($result_ipandport['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
-				{
-					$result_ipandport['ip'] = '[' . $result_ipandport['ip'] . ']';
-				}
-				$domainip = $result_ipandport['ip'];
 				$result = htmlentities_array($result);
 
+				if($settings['system']['use_ssl'] == "1")
+				{
+				}
+
 				eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
 			}
 		}

customer_email.php

@@ -139,10 +139,8 @@ elseif($page == 'emails')
 			}
 		}
 
-		$emaildomains_count = $db->query_first("SELECT COUNT(`id`) AS `count` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `isemaildomain`='1' ORDER BY `domain` ASC");
+		$emaildomains_count = $db->query_first("SELECT COUNT(`id`) AS `count` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . $userinfo['customerid'] . "' AND `isemaildomain`='1' ORDER BY `domain` ASC");
 		$emaildomains_count = $emaildomains_count['count'];
-
-		$emailscount = $db->num_rows($result);
 		eval("echo \"" . getTemplate("email/emails") . "\";");
 	}
 	elseif($action == 'delete'
@@ -184,12 +182,6 @@ elseif($page == 'emails')
 					$number_forwarders = 0;
 				}
 
-				if(isset($_POST['delete_userfiles'])
-				  && (int)$_POST['delete_userfiles'] == 1)
-				{
-					inserttask('7', $result['loginname'], $result['email']);
-				}
-
 				$db->query("DELETE FROM `" . TABLE_MAIL_VIRTUAL . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 				$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `emails_used`=`emails_used` - 1 , `email_forwarders_used` = `email_forwarders_used` - " . (int)$number_forwarders . " $update_users_query_addon WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted email address '" . $result['email'] . "'");
@@ -197,7 +189,7 @@ elseif($page == 'emails')
 			}
 			else
 			{
-				ask_yesno_withcheckbox('email_reallydelete', 'admin_customer_alsoremovemail', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $idna_convert->decode($result['email_full']));
+				ask_yesno('email_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $idna_convert->decode($result['email_full']));
 			}
 		}
 	}
@@ -380,7 +372,6 @@ elseif($page == 'accounts')
 					$email_full = $result['email_full'];
 					$username = $idna_convert->decode($email_full);
 					$password = validate($_POST['email_password'], 'password');
-					$password = validatePassword($password);
 
 					if($settings['panel']['sendalternativemail'] == 1)
 					{
@@ -436,26 +427,25 @@ elseif($page == 'accounts')
 						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['pop_success']['subject']), $replace_arr));
 						$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($userinfo['def_language']) . '\' AND `templategroup`=\'mails\' AND `varname`=\'pop_success_mailbody\'');
 						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['pop_success']['mailbody']), $replace_arr));
+						$mail->From = $admin['email'];
+						$mail->FromName = getCorrectUserSalutation($admin);
+						$mail->Subject = $mail_subject;
+						$mail->Body = $mail_body;
+						$mail->AddAddress($email_full, getCorrectUserSalutation($userinfo));
 
-						$_mailerror = false;
+						if(!$mail->Send())
-						try {
+						{
-							$mail->SetFrom($admin['email'], getCorrectUserSalutation($admin));
+							if($mail->ErrorInfo != '')
-							$mail->Subject = $mail_subject;
+							{
-							$mail->AltBody = $mail_body;
+								$mailerr_msg = $mail->ErrorInfo;
-							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
+							}
-							$mail->AddAddress($email_full, getCorrectUserSalutation($userinfo));
+							else
-							$mail->Send();
+							{
-						} catch(phpmailerException $e) {
+								$mailerr_msg = $email;
-							$mailerr_msg = $e->errorMessage();
+							}
-							$_mailerror = true;
-						} catch (Exception $e) {
-							$mailerr_msg = $e->getMessage();
-							$_mailerror = true;
-						}
 
-						if ($_mailerror) {	
 							$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-							standard_error('errorsendingmail', $email_full);
+							standard_error('errorsendingmail', $email);
 						}
 
 						$mail->ClearAddresses();
@@ -467,24 +457,23 @@ elseif($page == 'accounts')
 							$mail_subject = replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['pop_success_alternative']['subject']), $replace_arr);
 							$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($userinfo['def_language']) . '\' AND `templategroup`=\'mails\' AND `varname`=\'pop_success_alternative_mailbody\'');
 							$mail_body = replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['pop_success_alternative']['mailbody']), $replace_arr);
+							$mail->From = $admin['email'];
+							$mail->FromName = getCorrectUserSalutation($admin);
+							$mail->Subject = $mail_subject;
+							$mail->Body = $mail_body;
+							$mail->AddAddress($idna_convert->encode($alternative_email), getCorrectUserSalutation($userinfo));
 
-							$_mailerror = false;
+							if(!$mail->Send())
-							try {
+							{
-								$mail->SetFrom($admin['email'], getCorrectUserSalutation($admin));
+								if($mail->ErrorInfo != '')
-								$mail->Subject = $mail_subject;
+								{
-								$mail->AltBody = $mail_body;
+									$mailerr_msg = $mail->ErrorInfo;
-								$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
+								}
-								$mail->AddAddress($idna_convert->encode($alternative_email), getCorrectUserSalutation($userinfo));
+								else
-								$mail->Send();
+								{
-							} catch(phpmailerException $e) {
+									$mailerr_msg = $alternative_email;
-								$mailerr_msg = $e->errorMessage();
+								}
-								$_mailerror = true;
-							} catch (Exception $e) {
-								$mailerr_msg = $e->getMessage();
-								$_mailerror = true;
-							}
 
-							if ($_mailerror) {	
 								$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 								standard_error(array('errorsendingmail', $alternative_email));
 							}
@@ -527,12 +516,12 @@ elseif($page == 'accounts')
 					standard_error(array('stringisempty', 'mypassword'));
 					exit;
 				}
-				
+				else
-				$password = validatePassword($password);
+				{
-				
+					$log->logAction(USR_ACTION, LOG_NOTICE, "changed email password for '" . $result['email_full'] . "'");
-				$log->logAction(USR_ACTION, LOG_NOTICE, "changed email password for '" . $result['email_full'] . "'");
+					$result = $db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET " . ($settings['system']['mailpwcleartext'] == '1' ? "`password` = '" . $db->escape($password) . "', " : '') . " `password_enc`=ENCRYPT('" . $db->escape($password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$result['popaccountid'] . "'");
-				$result = $db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET " . ($settings['system']['mailpwcleartext'] == '1' ? "`password` = '" . $db->escape($password) . "', " : '') . " `password_enc`=ENCRYPT('" . $db->escape($password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$result['popaccountid'] . "'");
+					redirectTo($filename, Array('page' => 'emails', 'action' => 'edit', 'id' => $id, 's' => $s));
-				redirectTo($filename, Array('page' => 'emails', 'action' => 'edit', 'id' => $id, 's' => $s));
+				}
 			}
 			else
 			{

customer_ftp.php

@@ -97,11 +97,6 @@ elseif($page == 'accounts')
 			   && $_POST['send'] == 'send')
 			{
 				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `up_count`=`up_count`+'" . (int)$result['up_count'] . "', `up_bytes`=`up_bytes`+'" . (int)$result['up_bytes'] . "', `down_count`=`down_count`+'" . (int)$result['down_count'] . "', `down_bytes`=`down_bytes`+'" . (int)$result['down_bytes'] . "' WHERE `username`='" . $db->escape($userinfo['loginname']) . "'");
-				$result = $db->query("SELECT `username` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-				while($row = $db->fetch_array($result))
-				{
-					$db->query("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $db->escape($row['username']) . "'");
-				}
 				$db->query("DELETE FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted ftp-account '" . $result['username'] . "'");
 				$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=REPLACE(`members`,'," . $db->escape($result['username']) . "','') WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
@@ -140,13 +135,6 @@ elseif($page == 'accounts')
 			{
 				$path = validate($_POST['path'], 'path');
 				$password = validate($_POST['ftp_password'], 'password');
-				$password = validatePassword($password);
-
-				$sendinfomail = intval($_POST['sendinfomail']);
-				if($sendinfomail != 1)
-				{
-					$sendinfomail = 0;
-				}
 
 				if($settings['customer']['ftpatdomain'] == '1')
 				{
@@ -184,54 +172,20 @@ elseif($page == 'accounts')
 				}
 				else
 				{
+					$userpath = makeCorrectDir($path);
 					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
 					
 					$db->query("INSERT INTO `" . TABLE_FTP_USERS . "` (`customerid`, `username`, `password`, `homedir`, `login_enabled`, `uid`, `gid`) VALUES ('" . (int)$userinfo['customerid'] . "', '" . $db->escape($username) . "', ENCRYPT('" . $db->escape($password) . "'), '" . $db->escape($path) . "', 'y', '" . (int)$userinfo['guid'] . "', '" . (int)$userinfo['guid'] . "')");
-					$result = $db->query("SELECT `bytes_in_used` FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $userinfo['loginname'] . "'");
-					while($row = $db->fetch_array($result))
-					{
-						$db->query("INSERT INTO `" . TABLE_FTP_QUOTATALLIES . "` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $db->escape($username) . "', 'user', '" . $db->escape($row[bytes_in_used]) . "', '0', '0', '0', '0', '0')");
-					}
 					$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=CONCAT_WS(',',`members`,'" . $db->escape($username) . "') WHERE `customerid`='" . $userinfo['customerid'] . "' AND `gid`='" . (int)$userinfo['guid'] . "'");
+
+					//						$db->query("INSERT INTO `".TABLE_FTP_GROUPS."` (`customerid`, `groupname`, `gid`, `members`) VALUES ('".$userinfo['customerid']."', '$username', '$uid', '$username')");
+
 					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `ftps_used`=`ftps_used`+1, `ftp_lastaccountnumber`=`ftp_lastaccountnumber`+1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 
+					//						$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value`='$uid' WHERE settinggroup='ftp' AND varname='lastguid'");
+
 					$log->logAction(USR_ACTION, LOG_INFO, "added ftp-account '" . $username . " (" . $path . ")'");
 					inserttask(5);
-
-					if($sendinfomail == 1)
-					{
-						$replace_arr = array(
-							'CUST_NAME' => getCorrectUserSalutation($userinfo),
-							'USR_NAME' => $username,
-							'USR_PASS' => $password,
-							'USR_PATH' => makeCorrectDir(substr($path, strlen($userinfo['documentroot'])))
-						);
-						
-						$mail_body = replace_variables($lng['customer']['ftp_add']['infomail_body']['main'], $replace_arr);
-						
-						$_mailerror = false;
-						try {
-							$mail->Subject = $lng['customer']['ftp_add']['infomail_subject'];
-							$mail->AltBody = $mail_body;
-							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-							$mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));
-							$mail->Send();
-						} catch(phpmailerException $e) {
-							$mailerr_msg = $e->errorMessage();
-							$_mailerror = true;
-						} catch (Exception $e) {
-							$mailerr_msg = $e->getMessage();
-							$_mailerror = true;
-						}
-
-						if ($_mailerror) {
-							$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-							standard_error('errorsendingmail', $userinfo['email']);
-						}
-
-						$mail->ClearAddresses();
-					}
-
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
 			}
@@ -251,8 +205,6 @@ elseif($page == 'accounts')
 					}
 				}
 
-				$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
-
 				eval("echo \"" . getTemplate("ftp/accounts_add") . "\";");
 			}
 		}
@@ -260,7 +212,7 @@ elseif($page == 'accounts')
 	elseif($action == 'edit'
 	       && $id != 0)
 	{
-		$result = $db->query_first("SELECT `id`, `username`, `homedir`, `uid`, `gid` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+		$result = $db->query_first("SELECT `id`, `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 
 		if(isset($result['username'])
 		   && $result['username'] != '')
@@ -268,74 +220,22 @@ elseif($page == 'accounts')
 			if(isset($_POST['send'])
 			   && $_POST['send'] == 'send')
 			{
-				$path = validate($_POST['path'], 'path');
+				$password = validate($_POST['ftp_password'], 'password');
 
-				$_setnewpass = false;
+				if($password == '')
-				if(isset($_POST['ftp_password']) && $_POST['ftp_password'] != '')
 				{
-					$password = validate($_POST['ftp_password'], 'password');
+					standard_error(array('stringisempty', 'mypassword'));
-					$password = validatePassword($password);
+					exit;
-					$_setnewpass = true;
-				}
-
-				if($_setnewpass)
-				{
-					if($password == '')
-					{
-						standard_error(array('stringisempty', 'mypassword'));
-						exit;
-					}
-					else
-					{
-						$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account password for '" . $result['username'] . "'");
-						$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`=ENCRYPT('" . $db->escape($password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-					}
-				}
-				
-				if($path != '')
-				{
-					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-					
-					if($path != $result['homedir'])
-					{
-						if(!file_exists($path))
-						{
-							mkDirWithCorrectOwnership($userinfo['documentroot'], $path, $result['uid'], $result['gid']);
-						}
-
-						$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account homdir for '" . $result['username'] . "'");
-						$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `homedir`= '" . $db->escape($path) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");						
-					}
-				}
-
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
-				if(strpos($result['homedir'], $userinfo['documentroot']) === 0)
-				{
-					$homedir = substr($result['homedir'], strlen($userinfo['documentroot']));
 				}
 				else
 				{
-					$homedir = $result['homedir'];
+					$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`=ENCRYPT('" . $db->escape($password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+					$log->logAction(USR_ACTION, LOG_INFO, "edited ftp-account '" . $result['username'] . "'");
+					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
-				$homedir = makeCorrectDir($homedir);
+			}
-
+			else
-				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $homedir);
+			{
-
-				if($settings['customer']['ftpatdomain'] == '1')
-				{
-					$domains = '';
-
-					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-
-					while($row_domain = $db->fetch_array($result_domains))
-					{
-						$domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
-					}
-				}
-				
 				eval("echo \"" . getTemplate("ftp/accounts_edit") . "\";");
 			}
 		}

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");
 
@@ -139,13 +138,6 @@ elseif($page == 'mysqls')
 			   && $_POST['send'] == 'send')
 			{
 				$password = validate($_POST['mysql_password'], 'password');
-				$password = validatePassword($password);
-
-				$sendinfomail = intval($_POST['sendinfomail']);
-				if($sendinfomail != 1)
-				{
-					$sendinfomail = 0;
-				}
 
 				if($password == '')
 				{
@@ -191,50 +183,6 @@ elseif($page == 'mysqls')
 					$databasedescription = validate($_POST['description'], 'description');
 					$result = $db->query('INSERT INTO `' . TABLE_PANEL_DATABASES . '` (`customerid`, `databasename`, `description`, `dbserver`) VALUES ("' . (int)$userinfo['customerid'] . '", "' . $db->escape($username) . '", "' . $db->escape($databasedescription) . '", "' . $db->escape($dbserver) . '")');
 					$result = $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1, `mysql_lastaccountnumber`=`mysql_lastaccountnumber`+1 WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');
-
-					if($sendinfomail == 1)
-					{
-						$pma = '';
-						if($settings['panel']['phpmyadmin_url'] != '')
-						{
-							$r_arr = array('URI' => $settings['panel']['phpmyadmin_url']);
-							$pma = replace_variables($lng['customer']['mysql_add']['infomail_body']['pma'], $r_arr);
-						}
-
-						$replace_arr = array(
-							'CUST_NAME' => getCorrectUserSalutation($userinfo),
-							'DB_NAME' => $username,
-							'DB_PASS' => $password,
-							'DB_DESC' => $databasedescription,
-							'DB_SRV' => $sql_root[$dbserver]['host'],
-							'PMA_URI' => $pma 
-						);
-						
-						$mail_body = replace_variables($lng['customer']['mysql_add']['infomail_body']['main'], $replace_arr);
-						
-						$_mailerror = false;
-						try {
-							$mail->Subject = $lng['customer']['mysql_add']['infomail_subject'];
-							$mail->AltBody = $mail_body;
-							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-							$mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));
-							$mail->Send();
-						} catch(phpmailerException $e) {
-							$mailerr_msg = $e->errorMessage();
-							$_mailerror = true;
-						} catch (Exception $e) {
-							$mailerr_msg = $e->getMessage();
-							$_mailerror = true;
-						}
-
-						if ($_mailerror) {
-							$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-							standard_error('errorsendingmail', $userinfo['email']);
-						}
-
-						$mail->ClearAddresses();
-					}
-
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
 			}
@@ -247,8 +195,6 @@ elseif($page == 'mysqls')
 					$mysql_servers .= makeoption($mysql_server_details['caption'], $mysql_server);
 				}
 
-				$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
-
 				eval("echo \"" . getTemplate("mysql/mysqls_add") . "\";");
 			}
 		}
@@ -272,7 +218,6 @@ elseif($page == 'mysqls')
 				// Only change Password if it is set, do nothing if it is empty! -- PH 2004-11-29
 
 				$password = validate($_POST['mysql_password'], 'password');
-				$password = validatePassword($password);
 
 				if($password != '')
 				{

customer_tickets.php

@@ -209,12 +209,12 @@ elseif($page == 'tickets')
 			else
 			{
 				$categories = '';
-				$result = $db->query_first('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `logicalorder`, `name` ASC');
+				$result = $db->query_first('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `name` ASC');
 
 				if(isset($result['name'])
 				   && $result['name'] != '')
 				{
-					$result2 = $db->query('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `logicalorder`, `name` ASC');
+					$result2 = $db->query('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `name` ASC');
 
 					while($row = $db->fetch_array($result2))
 					{
@@ -226,9 +226,9 @@ elseif($page == 'tickets')
 					$categories = makeoption($lng['ticket']['no_cat'], '0');
 				}
 
-				$priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']);
+				$priorities = makeoption($lng['ticket']['unf_high'], '1');
-				$priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']);
+				$priorities.= makeoption($lng['ticket']['unf_normal'], '2');
-				$priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']);
+				$priorities.= makeoption($lng['ticket']['unf_low'], '3');
 				$ticketsopen = 0;
 				$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
                                            WHERE `customerid` = "' . $userinfo['customerid'] . '"

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',
@@ -174,22 +173,17 @@ if(!is_null($month)
 }
 else
 {
-	$result = $db->query("SELECT MAX(`http`), MAX(`ftp_up`+`ftp_down`), MAX(`mail`)
+	$result = $db->query("(SELECT SUM(`http`) as sum FROM `" . TABLE_PANEL_TRAFFIC . "`
-	                     FROM `" . TABLE_PANEL_TRAFFIC . "`
+	                      WHERE `customerid` = '" . $userinfo['customerid'] . "'
-	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
+	                      GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12)   UNION
-	                     GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12");
+	                      (SELECT SUM(`ftp_up`+`ftp_down`) FROM `" . TABLE_PANEL_TRAFFIC . "`
-	
+	                      WHERE `customerid` = '" . $userinfo['customerid'] . "'
-	$nums = mysql_num_rows($result);
+	                      GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12) UNION
-	if($nums > 0)
+	                      (SELECT SUM(`mail`) FROM `" . TABLE_PANEL_TRAFFIC . "`
-	{
+	                      WHERE `customerid` = '" . $userinfo['customerid'] . "'
-		$row = mysql_fetch_row($result);
+	                      GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12) ORDER BY sum DESC LIMIT 1");
-		rsort($row);
+	$row = $db->fetch_array($result);
-		$traf['max'] = ($row[0] > $row[1] ? ($row[0] > $row[2] ? $row[0] : $row[2]) : ($row[1] > $row[2] ? $row[1] : $row[2]));
+	$traf['max'] = ($row[0] > $row[1] ? ($row[0] > $row[2] ? $row[0] : $row[2]) : ($row[1] > $row[2] ? $row[1] : $row[2]));;
-	} else {
-		// no records yet
-		$traf['max'] = 0;
-	}
-	
 	$result = $db->query("SELECT `month`, `year`, SUM(`http`) AS http, SUM(`ftp_up`) AS ftp_up, SUM(`ftp_down`) AS ftp_down, SUM(`mail`) AS mail
 	                     FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE `customerid` = '" . $userinfo['customerid'] . "'
 	                     GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12");

index.php

@@ -213,12 +213,10 @@ if($action == 'login')
 
 if($action == 'forgotpwd')
 {
-	$adminchecked = false;
-	$message = '';
-
 	if(isset($_POST['send'])
 	&& $_POST['send'] == 'send')
 	{
+		$adminchecked = false;
 		$loginname = validate($_POST['loginname'], 'loginname');
 		$email = validateEmail($_POST['loginemail'], 'email');
 		$sql = "SELECT `customerid`, `firstname`, `name`, `email`, `loginname` FROM `" . TABLE_PANEL_CUSTOMERS . "`
@@ -228,113 +226,87 @@ if($action == 'forgotpwd')
 
 		if($db->num_rows() == 0)
 		{
-			$sql = "SELECT `adminid`, `name`, `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "`
+			$sql = "SELECT `adminid`, `firstname`, `name`, `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "`
 				WHERE `loginname`='" . $db->escape($loginname) . "'
 				AND `email`='" . $db->escape($email) . "'";
 			$result = $db->query($sql);
-				
+			$adminchecked = true;
-			if($db->num_rows() > 0)
-			{
-				$adminchecked = true;
-			}
-			else
-			{
-				$result = null;
-			}
 		}
 
-		if($result !== null)
+		$user = $db->fetch_array($result);
+
+		if(($adminchecked && $settings['panel']['allow_preset_admin'] == '1')
+		|| $adminchecked == false)
 		{
-			$user = $db->fetch_array($result);
+			if($user !== false)
-
-			if(($adminchecked && $settings['panel']['allow_preset_admin'] == '1')
-			|| $adminchecked == false)
 			{
-				if($user !== false)
+				$password = substr(md5(uniqid(microtime(), 1)), 12, 6);
+
+				if($adminchecked)
 				{
-					if ($settings['panel']['password_min_length'] <= 6) {
+					$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `password`='" . md5($password) . "'
-						$password = substr(md5(uniqid(microtime(), 1)), 12, 6);
+							WHERE `loginname`='" . $user['loginname'] . "'
-					} else {
+							AND `email`='" . $user['email'] . "'");
-						// make it two times larger than password_min_length
-						$rnd = '';
-						$minlength = $settings['panel']['password_min_length'];
-						while (strlen($rnd) < ($minlength * 2))
-						{
-							$rnd .= md5(uniqid(microtime(), 1));
-						}
-						$password = substr($rnd, (int)($minlength / 2), $minlength);
-					}
-
-					if($adminchecked)
-					{
-						$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `password`='" . md5($password) . "'
-								WHERE `loginname`='" . $user['loginname'] . "'
-								AND `email`='" . $user['email'] . "'");
-					}
-					else
-					{
-						$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `password`='" . md5($password) . "'
-								WHERE `loginname`='" . $user['loginname'] . "'
-								AND `email`='" . $user['email'] . "'");
-					}
-
-					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
-					$rstlog->logAction(USR_ACTION, LOG_WARNING, "Password for user '" . $user['loginname'] . "' has been reset!");
-					$body = strtr($lng['pwdreminder']['body'], array('%s' => $user['firstname'] . ' ' . $user['name'], '%p' => $password));
-						
-					$_mailerror = false;
-					try {
-						$mail->Subject = $lng['pwdreminder']['subject'];
-						$mail->AltBody = $body;
-						$mail->MsgHTML(str_replace("\\n", "<br />", $body));
-						$mail->AddAddress($user['email'], $user['firstname'] . ' ' . $user['name']);
-						$mail->Send();
-					} catch(phpmailerException $e) {
-						$mailerr_msg = $e->errorMessage();
-						$_mailerror = true;
-					} catch (Exception $e) {
-						$mailerr_msg = $e->getMessage();
-						$_mailerror = true;
-					}
-
-					if ($_mailerror) {
-						$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
-						$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-						redirectTo('index.php', Array('showmessage' => '4'), true);
-						exit;
-					}
-
-					$mail->ClearAddresses();
-					redirectTo('index.php', Array('showmessage' => '1'), true);
-					exit;
 				}
 				else
 				{
-					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
+					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `password`='" . md5($password) . "'
-					$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to reset pwd but wasn't found in database!");
+							WHERE `loginname`='" . $user['loginname'] . "'
-					$message = $lng['login']['usernotfound'];
+							AND `email`='" . $user['email'] . "'");
 				}
 
-				unset($user);
+				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
+				$rstlog->logAction(USR_ACTION, LOG_WARNING, "Password for user '" . $user['loginname'] . "' has been reset!");
+				$body = strtr($lng['pwdreminder']['body'], array('%s' => $user['firstname'] . ' ' . $user['name'], '%p' => $password));
+				$mail->From = $settings['panel']['adminmail'];
+				$mail->FromName = 'Froxlor';
+				$mail->Subject = $lng['pwdreminder']['subject'];
+				$mail->Body = $body;
+				$mail->AddAddress($user['email'], $user['firstname'] . ' ' . $user['name']);
+
+				if(!$mail->Send())
+				{
+					if($mail->ErrorInfo != '')
+					{
+						$mailerr_msg = $mail->ErrorInfo;
+					}
+					else
+					{
+						$mailerr_msg = $email;
+					}
+
+					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
+					$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+					redirectTo('index.php', Array('showmessage' => '4'), true);
+					exit;
+				}
+
+				$mail->ClearAddresses();
+				redirectTo('index.php', Array('showmessage' => '1'), true);
+				exit;
 			}
+			else
+			{
+				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
+				$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to reset pwd but wasn't found in database!");
+				$message = $lng['login']['usernotfound'];
+			}
+
+			unset($user, $adminchecked);
 		}
-	}
+		else
-
-
-	if($adminchecked)
-	{
-		if($settings['panel']['allow_preset_admin'] != '1')
 		{
-			$message = $lng['pwdreminder']['notallowed'];
+			$message = '';
-			unset ($adminchecked);
 		}
 	}
 	else
 	{
-		if($settings['panel']['allow_preset'] != '1')
+		$message = '';
-		{
+	}
-			$message = $lng['pwdreminder']['notallowed'];
+
-		}
+	if($settings['panel']['allow_preset'] != '1')
+	{
+		$message = $lng['pwdreminder']['notallowed'];
 	}
 
 	eval("echo \"" . getTemplate("fpwd") . "\";");

install/froxlor.sql

@@ -274,7 +274,7 @@ CREATE TABLE `panel_domains` (
   `isbinddomain` tinyint(1) NOT NULL default '0',
   `isemaildomain` tinyint(1) NOT NULL default '0',
   `email_only` tinyint(1) NOT NULL default '0',
-  `iswildcarddomain` tinyint(1) NOT NULL default '1',
+  `iswildcarddomain` tinyint(1) NOT NULL default '0',
   `subcanemaildomain` tinyint(1) NOT NULL default '0',
   `caneditdomain` tinyint(1) NOT NULL default '1',
   `zonefile` varchar(255) NOT NULL default '',
@@ -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.9');
+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');
@@ -508,70 +508,48 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (77, 'dkim', 'use_dkim', '0');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (78, 'system', 'webalizer_enabled', '1');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (79, 'system', 'awstats_enabled', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (80, 'dkim', 'dkim_prefix', '/etc/postfix/dkim/');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (80, 'system', 'awstats_domain_file', '/etc/awstats/');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (81, 'dkim', 'dkim_domains', 'domains');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (81, 'system', 'awstats_model_file', '/etc/awstats/awstats.model.conf.froxlor');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (82, 'dkim', 'dkim_dkimkeys', 'dkim-keys.conf');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (82, 'dkim', 'dkim_prefix', '/etc/postfix/dkim/');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (83, 'dkim', 'dkimrestart_command', '/etc/init.d/dkim-filter restart');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (83, 'dkim', 'dkim_domains', 'domains');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (84, 'panel', 'unix_names', '1');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (84, 'dkim', 'dkim_dkimkeys', 'dkim-keys.conf');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (85, 'panel', 'allow_preset', '1');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (85, 'dkim', 'dkimrestart_command', '/etc/init.d/dkim-filter restart');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (86, 'panel', 'allow_preset_admin', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (86, 'panel', 'unix_names', '1');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (87, 'system', 'httpuser', 'www-data');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (87, 'panel', 'allow_preset', '1');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (88, 'system', 'httpgroup', 'www-data');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (88, 'system', 'awstats_path', '/usr/share/awstats/VERSION/webroot/cgi-bin/');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (89, 'system', 'webserver', 'apache2');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (89, 'system', 'awstats_updateall_command', '/usr/bin/awstats_updateall.pl');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (90, 'autoresponder', 'autoresponder_active', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (90, 'panel', 'allow_preset_admin', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (91, 'autoresponder', 'last_autoresponder_run', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (91, 'system', 'httpuser', 'www-data');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (92, 'admin', 'show_version_login', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (92, 'system', 'httpgroup', 'www-data');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (93, 'admin', 'show_version_footer', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (93, 'system', 'webserver', 'apache2');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (94, 'admin', 'froxlor_graphic', 'images/header.gif');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (94, 'autoresponder', 'autoresponder_active', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (95, 'system', 'mod_fcgid_wrapper', '0');
+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, 'system', 'mod_fcgid_starter', '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, 'system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php5/');
+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, 'system', 'index_file_extension', 'html');
+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, 'aps', 'items_per_page', '20');
+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, 'aps', 'upload_fields', '5');
+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, 'aps', 'aps_active', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (101, 'system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php5/');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (102, 'aps', 'php-extension', '');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (102, 'system', 'index_file_extension', 'html');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (103, 'aps', 'php-configuration', '');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (103, 'aps', 'items_per_page', '20');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (104, 'aps', 'webserver-htaccess', '');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (104, 'aps', 'upload_fields', '5');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (105, 'aps', 'php-function', '');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (105, 'aps', 'aps_active', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (106, 'aps', 'webserver-module', '');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (1069, 'aps', 'php-extension', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (107, 'system', 'realtime_port', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (107, 'aps', 'php-configuration', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (108, 'session', 'allow_multiple_login', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (108, 'aps', 'webserver-htaccess', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (109, 'panel', 'allow_domain_change_admin', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (109, 'aps', 'php-function', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (110, 'panel', 'allow_domain_change_customer', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (110, 'aps', 'webserver-module', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (111, 'system', 'mod_fcgid_maxrequests', '250');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (111, 'system', 'realtime_port', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (112, 'system','ssl_key_file','/etc/apache2/apache2.key');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (112, 'session', 'allow_multiple_login', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (113, 'system','ssl_ca_file','');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (113, 'panel', 'allow_domain_change_admin', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (114, 'panel', 'frontend', 'froxlor');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (114, 'panel', 'allow_domain_change_customer', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (115, 'spf', 'use_spf', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (115, 'system', 'mod_fcgid_maxrequests', '250');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (116, 'spf', 'spf_entry', '@	IN	TXT	"v=spf1 a mx -all"');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (116, 'system','ssl_key_file','/etc/apache2/apache2.key');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (117, 'system', 'debug_cron', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (117, 'system','ssl_ca_file','');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (118, 'panel', 'password_min_length', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (118, 'panel', 'frontend', 'froxlor');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (119, 'system', 'store_index_file_subs', '1');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (119, 'spf', 'use_spf', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (120, 'panel', 'adminmail_defname', 'Froxlor Administrator');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (120, 'spf', 'spf_entry', '@	IN	TXT	"v=spf1 a mx -all"');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (121, 'panel', 'adminmail_return', '');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (121, 'system', 'debug_cron', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (122, 'dkim', 'dkim_algorithm', 'all');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (123, 'dkim', 'dkim_add_adsp', '1');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (124, 'dkim', 'dkim_keylength', '1024');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (125, 'dkim', 'dkim_servicetype', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (126, 'dkim', 'dkim_add_adsppolicy', '1');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (127, 'dkim', 'dkim_notes', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (128, 'system', 'stdsubdomain', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (129, 'system', 'awstats_path', '/usr/bin/');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (130, 'system', 'awstats_conf', '/etc/awstats/');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (131, 'system', 'defaultttl', '604800');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (132, 'defaultwebsrverrhandler', 'enabled', '0');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (133, 'defaultwebsrverrhandler', 'err401', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (134, 'defaultwebsrverrhandler', 'err403', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (135, 'defaultwebsrverrhandler', 'err404', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (136, 'defaultwebsrverrhandler', 'err500', '');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (137, 'ticket', 'default_priority', '2');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (138, 'system', 'mod_fcgid_defaultini', '1');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (139, 'system', 'ftpserver', 'proftpd');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (140, 'customredirect', 'enabled', '1');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (141, 'customredirect', 'default', '1');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (142, 'system', 'dns_createmailentry', '0');
-
 
 # --------------------------------------------------------
 
@@ -753,7 +731,6 @@ INSERT INTO `panel_languages` VALUES (13, 'Dutch', 'lng/dutch.lng.php');
 INSERT INTO `panel_languages` VALUES (14, 'Hungarian', 'lng/hungarian.lng.php');
 INSERT INTO `panel_languages` VALUES (15, 'Swedish', 'lng/swedish.lng.php');
 INSERT INTO `panel_languages` VALUES (16, 'Czech', 'lng/czech.lng.php');
-INSERT INTO `panel_languages` VALUES (17, 'Polski', 'lng/polish.lng.php');
 
 # --------------------------------------------------------
 
@@ -794,7 +771,6 @@ CREATE TABLE `panel_ticket_categories` (
   `id` smallint(5) unsigned NOT NULL auto_increment,
   `name` varchar(60) NOT NULL,
   `adminid` int(11) NOT NULL,
-  `logicalorder` int(3) NOT NULL default '1',
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM;
 
@@ -831,7 +807,6 @@ CREATE TABLE IF NOT EXISTS `panel_syslog` (
 # Table structure for table `mail_autoresponder`
 #
 
-DROP TABLE IF EXISTS `mail_autoresponder`;
 CREATE TABLE `mail_autoresponder` (
   `email` varchar(255) NOT NULL default '',
   `message` text NOT NULL,
@@ -856,7 +831,6 @@ CREATE TABLE `mail_autoresponder` (
 # Table structure for table `panel_phpconfigs`
 #
 
-DROP TABLE IF EXISTS `panel_phpconfigs`;
 CREATE TABLE `panel_phpconfigs` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `description` varchar(50) NOT NULL,
@@ -880,7 +854,6 @@ INSERT INTO `panel_phpconfigs` (`id`, `description`, `binary`, `file_extensions`
 # Tabellenstruktur fuer Tabelle `aps_instances`
 #
 
-DROP TABLE IF EXISTS `aps_instances`;
 CREATE TABLE IF NOT EXISTS `aps_instances` (
   `ID` int(4) NOT NULL auto_increment,
   `CustomerID` int(4) NOT NULL,
@@ -895,7 +868,6 @@ CREATE TABLE IF NOT EXISTS `aps_instances` (
 # Tabellenstruktur fuer Tabelle `aps_packages`
 #
 
-DROP TABLE IF EXISTS `aps_packages`;
 CREATE TABLE IF NOT EXISTS `aps_packages` (
   `ID` int(4) NOT NULL auto_increment,
   `Path` varchar(500) NOT NULL,
@@ -912,7 +884,6 @@ CREATE TABLE IF NOT EXISTS `aps_packages` (
 # Tabellenstruktur fuer Tabelle `aps_settings`
 #
 
-DROP TABLE IF EXISTS `aps_settings`;
 CREATE TABLE IF NOT EXISTS `aps_settings` (
   `ID` int(4) NOT NULL auto_increment,
   `InstanceID` int(4) NOT NULL,
@@ -927,7 +898,6 @@ CREATE TABLE IF NOT EXISTS `aps_settings` (
 # Tabellenstruktur fuer Tabelle `aps_tasks`
 #
 
-DROP TABLE IF EXISTS `aps_tasks`;
 CREATE TABLE IF NOT EXISTS `aps_tasks` (
   `ID` int(4) NOT NULL auto_increment,
   `InstanceID` int(4) NOT NULL,
@@ -941,7 +911,6 @@ CREATE TABLE IF NOT EXISTS `aps_tasks` (
 # Tabellenstruktur fuer Tabelle `aps_temp_settings`
 #
 
-DROP TABLE IF EXISTS `aps_temp_settings`;
 CREATE TABLE IF NOT EXISTS `aps_temp_settings` (
   `ID` int(4) NOT NULL auto_increment,
   `PackageID` int(4) NOT NULL,
@@ -957,7 +926,6 @@ CREATE TABLE IF NOT EXISTS `aps_temp_settings` (
 # Tabellenstruktur fuer Tabelle `cronjobs_run`
 #
 
-DROP TABLE IF EXISTS `cronjobs_run`;
 CREATE TABLE IF NOT EXISTS `cronjobs_run` (
   `id` bigint(20) NOT NULL auto_increment,
   `module` varchar(250) NOT NULL,  
@@ -981,85 +949,3 @@ INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`,
 INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (6, 'froxlor/core', 'cron_traffic.php', '1 DAY', '1', 'cron_traffic');
 INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (7, 'froxlor/ticket', 'cron_used_tickets_reset.php', '1 MONTH', '1', 'cron_ticketsreset');
 INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (8, 'froxlor/ticket', 'cron_ticketarchive.php', '1 MONTH', '1', 'cron_ticketarchive');
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur fuer Tabelle `ftp_quotalimits`
-#
-
-DROP TABLE IF EXISTS `ftp_quotalimits`;
-CREATE TABLE IF NOT EXISTS `ftp_quotalimits` (
-  `name` varchar(30) default NULL,
-  `quota_type` enum('user','group','class','all') NOT NULL default 'user',
-  `per_session` enum('false','true') NOT NULL default 'false',
-  `limit_type` enum('soft','hard') NOT NULL default 'hard',
-  `bytes_in_avail` float NOT NULL,
-  `bytes_out_avail` float NOT NULL,
-  `bytes_xfer_avail` float NOT NULL,
-  `files_in_avail` int(10) unsigned NOT NULL,
-  `files_out_avail` int(10) unsigned NOT NULL,
-  `files_xfer_avail` int(10) unsigned NOT NULL
-) ENGINE=MyISAM;
-
-#
-# Dumping data for table `ftp_quotalimits`
-#
-
-INSERT INTO `ftp_quotalimits` (`name`, `quota_type`, `per_session`, `limit_type`, `bytes_in_avail`, `bytes_out_avail`, `bytes_xfer_avail`, `files_in_avail`, `files_out_avail`, `files_xfer_avail`) VALUES ('froxlor', 'user', 'false', 'hard', 0, 0, 0, 0, 0, 0);
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur fuer Tabelle `ftp_quotatallies`
-#
-
-DROP TABLE IF EXISTS `ftp_quotatallies`;
-CREATE TABLE IF NOT EXISTS `ftp_quotatallies` (
-  `name` varchar(30) NOT NULL,
-  `quota_type` enum('user','group','class','all') NOT NULL,
-  `bytes_in_used` float NOT NULL,
-  `bytes_out_used` float NOT NULL,
-  `bytes_xfer_used` float NOT NULL,
-  `files_in_used` int(10) unsigned NOT NULL,
-  `files_out_used` int(10) unsigned NOT NULL,
-  `files_xfer_used` int(10) unsigned NOT NULL
-) ENGINE=MyISAM;
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur fuer Tabelle `redirect_codes`
-#
-
-DROP TABLE IF EXISTS `redirect_codes`;
-CREATE TABLE IF NOT EXISTS `redirect_codes` (
-  `id` int(5) NOT NULL auto_increment,
-  `code` varchar(3) NOT NULL,
-  `desc` varchar(200) NOT NULL,
-  `enabled` tinyint(1) DEFAULT '1',
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM;
-
-#
-# Dumping data for table `redirect_codes`
-#
-
-INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (1, '---', 'rc_default', 1);
-INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (2, '301', 'rc_movedperm', 1);
-INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (3, '302', 'rc_found', 1);
-INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (4, '303', 'rc_seeother', 1);
-INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (5, '307', 'rc_tempred', 1);
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur fuer Tabelle `domain_redirect_codes`
-#
-
-DROP TABLE IF EXISTS `domain_redirect_codes`;
-CREATE TABLE IF NOT EXISTS `domain_redirect_codes` (
-  `rid` int(5) NOT NULL,
-  `did` int(11) unsigned NOT NULL,
-  UNIQUE KEY `rc` (`rid`, `did`)
-) ENGINE=MyISAM;

install/install.php

@@ -156,121 +156,6 @@ function status_message($case, $text)
 	}
 }
 
-function requirement_checks()
-{
-	global $lng;
-	page_header();
-
-?>
-	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle"><b><img src="../images/title.gif" alt="" />&nbsp;Froxlor Installation</b></td>
-		</tr>
-<?php
-	$_die = false;
-	
-	// check for correct php version
-	status_message('begin', $lng['install']['phpversion']);
-
-	if(version_compare("5.2.0", PHP_VERSION, ">="))
-	{
-		status_message('red', $lng['install']['notinstalled']);
-		$_die = true;
-	}
-	else
-	{
-		status_message('green', 'OK');
-	}
-
-
-	status_message('begin', $lng['install']['phpmysql']);
-
-	if(!extension_loaded('mysql'))
-	{
-		status_message('red', $lng['install']['notinstalled']);
-		$_die = true;
-	}
-	else
-	{
-		status_message('green', 'OK');
-	}
-
-	status_message('begin', $lng['install']['phpfilter']);
-
-	if(!extension_loaded('filter'))
-	{
-		status_message('red', $lng['install']['notinstalled']);
-		$_die = true;
-	}
-	else
-	{
-		status_message('green', 'OK');
-	}
-
-	status_message('begin', $lng['install']['phpposix']);	
-
-	if(!extension_loaded('posix'))
-	{
-		status_message('red', $lng['install']['notinstalled']);
-		$_die = true;
-	}
-	else
-	{
-		status_message('green', 'OK');
-	}
-	
-	status_message('begin', $lng['install']['phpbcmath']);
-
-	if(!extension_loaded('bcmath'))
-	{
-		status_message('orange', $lng['install']['notinstalled'] . '<br />' . $lng['install']['bcmathdescription']);
-	}
-	else
-	{
-		status_message('green', 'OK');
-	}
-
-	status_message('begin', $lng['install']['openbasedir']);
-	$php_ob = @ini_get("open_basedir");
-
-	if(!empty($php_ob)
-	   && $php_ob != '')
-	{
-		status_message('orange', $lng['install']['openbasedirenabled']);
-	}
-	else
-	{
-		status_message('green', 'OK');
-	}
-
-	if($_die)
-	{
-?>
-		<tr>
-			<td class="main_field_display" align="center">
-				<?php echo $lng['install']['diedbecauseofrequirements']; ?><br />
-				<a href="install.php"><?php echo $lng['install']['click_here_to_refresh']; ?></a>
-			</td>
-		</tr>
-<?php 
-	} else {
-?>
-		<tr>
-			<td class="main_field_display" align="center">
-				<?php echo $lng['install']['froxlor_succ_checks']; ?><br />
-				<a href="install.php?check=1"><?php echo $lng['install']['click_here_to_continue']; ?></a>
-			</td>
-		</tr>
-<?php
-	}
-?>
-	</table>
-	<br />
-	<br />
-<?php 
-	page_footer();
-}
-
 /**
  * END FUNCTIONS ---------------------------------------------------
  */
@@ -289,7 +174,7 @@ else
 {
 	if(!empty($_SERVER['SERVER_NAME']))
 	{
-		if(preg_match('/^[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$/', $_SERVER['SERVER_NAME']) == false)
+		if(validate_ip($_SERVER['SERVER_NAME'], true) == false)
 		{
 			$servername = $_SERVER['SERVER_NAME'];
 		}
@@ -422,12 +307,12 @@ if(!empty($_POST['webserver']))
 else
 {
 	if(strtoupper(@php_sapi_name()) == "APACHE2HANDLER"
-	   || stristr($_SERVER['SERVER_SOFTWARE'], "apache/2"))
+	   || stristr($_SERVER[SERVER_SOFTWARE], "apache/2"))
 	{
 		$webserver = 'apache2';
 	}
 	elseif(substr(strtoupper(@php_sapi_name()), 0, 8) == "LIGHTTPD"
-	       || stristr($_SERVER['SERVER_SOFTWARE'], "lighttpd"))
+	       || stristr($_SERVER[SERVER_SOFTWARE], "lighttpd"))
 	{
 		$webserver = 'lighttpd';
 	}
@@ -486,6 +371,89 @@ if(isset($_POST['installstep'])
 			<td class="maintitle"><b><img src="../images/title.gif" alt="" />&nbsp;Froxlor Installation</b></td>
 		</tr>
 <?php
+	$_die = false;
+	
+	// check for correct php version
+	status_message('begin', $lng['install']['phpversion']);
+
+	if(version_compare("5.2.0", PHP_VERSION, ">="))
+	{
+		status_message('red', $lng['install']['notinstalled']);
+		$_die = true;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+
+	status_message('begin', $lng['install']['phpmysql']);
+
+	if(!extension_loaded('mysql'))
+	{
+		status_message('red', $lng['install']['notinstalled']);
+		$_die = true;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+	status_message('begin', $lng['install']['phpfilter']);
+
+	if(!extension_loaded('filter'))
+	{
+		status_message('red', $lng['install']['notinstalled']);
+		$_die = true;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+	status_message('begin', $lng['install']['phpposix']);	
+
+	if(!extension_loaded('posix'))
+	{
+		status_message('red', $lng['install']['notinstalled']);
+		$_die = true;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+	
+	status_message('begin', $lng['install']['phpbcmath']);
+
+	if(!extension_loaded('bcmath'))
+	{
+		status_message('orange', $lng['install']['notinstalled'] . '<br />' . $lng['install']['bcmathdescription']);
+		$_die = false;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+	status_message('begin', $lng['install']['openbasedir']);
+	$php_ob = @ini_get("open_basedir");
+
+	if(!empty($php_ob)
+	   && $php_ob != '')
+	{
+		status_message('orange', $lng['install']['openbasedirenabled']);
+		$_die = false;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+	if($_die)
+	{
+		status_message('begin', $lng['install']['diedbecauseofrequirements']);
+		die();
+	}
 
 	//first test if we can access the database server with the given root user and password
 
@@ -503,27 +471,11 @@ if(isset($_POST['installstep'])
 
 	if($result)
 	{
-		$filename = "/tmp/froxlor_backup_" . date('YmdHi') . ".sql";
+		$filename = "/tmp/froxlor_backup_" . date(YmdHi) . ".sql";
 
 		if(is_file("/usr/bin/mysqldump"))
 		{
-			$do_backup = true;
+			$command = "/usr/bin/mysqldump " . $mysql_database . " -u " . $mysql_root_user . " --password='" . $mysql_root_pass . "' --result-file=" . $filename;
-			$mysql_dump = '/usr/bin/mysqldump';
-		}
-		elseif(is_file("/usr/local/bin/mysqldump"))
-		{
-			$do_backup = true;
-			$mysql_dump = '/usr/local/bin/mysqldump';
-		}
-		else
-		{
-			$do_backup = false;
-			status_message('red', $lng['install']['backing_up_binary_missing']);
-		}
-		
-		if($do_backup) {
-			
-			$command = $mysql_dump . " " . $mysql_database . " -u " . $mysql_root_user . " --password='" . $mysql_root_pass . "' --result-file=" . $filename;
 			$output = exec($command);
 
 			if(stristr($output, "error"))
@@ -534,7 +486,10 @@ if(isset($_POST['installstep'])
 			{
 				status_message('green', 'OK');
 			}
-
+		}
+		else
+		{
+			status_message('red', $lng['install']['backing_up_binary_missing']);
 		}
 	}
 
@@ -620,6 +575,8 @@ if(isset($_POST['installstep'])
 	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($webserver) . "' WHERE `settinggroup` = 'system' AND `varname` = 'webserver'");
 	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($webserver) . "' WHERE `settinggroup` = 'system' AND `varname` = 'webserver'");
 
+	//FIXME
+
 	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($httpuser) . "' WHERE `settinggroup` = 'system' AND `varname` = 'httpuser'");
 	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($httpgroup) . "' WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
 
@@ -637,7 +594,6 @@ if(isset($_POST['installstep'])
 		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/lighttpd/froxlor-htpasswd/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_htpasswddir'");
 		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/init.d/lighttpd reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
 		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/lighttpd/lighttpd.pem' WHERE `settinggroup` = 'system' AND `varname` = 'ssl_cert_file'");
-		$ssettings = '';
 	}
 
 	// insert the lastcronrun to be the installation date
@@ -646,21 +602,10 @@ if(isset($_POST['installstep'])
 	$query = sprintf($query, TABLE_PANEL_SETTINGS);
 	$db->query($query);
 
-	// set specific times for some crons (traffic only at night, etc.)
-	$ts = mktime(0, 0, 0, date('m', time()), date('d', time()), date('Y', time()));
-	$db->query("UPDATE `".TABLE_PANEL_CRONRUNS."` SET `lastrun` = '".$ts."' WHERE `cronfile` ='cron_traffic.php';");
-	$ts = mktime(1, 0, 0, date('m', time()), date('d', time()), date('Y', time()));
-	$db->query("UPDATE `".TABLE_PANEL_CRONRUNS."` SET `lastrun` = '".$ts."' WHERE `cronfile` ='cron_used_tickets_reset.php';");
-	$db->query("UPDATE `".TABLE_PANEL_CRONRUNS."` SET `lastrun` = '".$ts."' WHERE `cronfile` ='cron_ticketarchive.php';");
-
 	// and lets insert the default ip and port
 
-	$query = "INSERT INTO `".TABLE_PANEL_IPSANDPORTS."` 
+	$query = 'INSERT INTO `%s`  SET `ip`   = \'%s\',  `port` = \'80\' ';
-			 SET `ip`= '".$db->escape($serverip)."', 
+	$query = sprintf($query, TABLE_PANEL_IPSANDPORTS, $db->escape($serverip));
-			 `port` = '80',
-			 `namevirtualhost_statement` = '1',
-			 `vhostcontainer` = '1', 
-			 `vhostcontainer_servername_statement` = '1'";
 	$db->query($query);
 	$defaultip = $db->insert_id();
 
@@ -763,17 +708,10 @@ if(isset($_POST['installstep'])
 }
 else
 {
-	
-	if((isset($_GET['check'])
-		&& $_GET['check'] == '1')
-		|| (isset($_POST['installstep']) 
-		&& $_POST['installstep'] == '1')
-	) {
 	page_header();
 
 ?>
 	<form action="<?php echo htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="get">
-		<input type="hidden" name="check" value="1" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_40">
 			<tr>
 				<td class="maintitle" colspan="2"><b><img src="../images/title.gif" alt="" />&nbsp;<?php echo $lng['install']['welcome']; ?></b></td>
@@ -808,7 +746,6 @@ else
 	</form>
 	<br />
 	<form action="<?php echo htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="post">
-		<input type="hidden" name="check" value="1" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_40">
 			<tr>
 				<td class="maintitle" colspan="2"><b><img src="../images/title.gif" alt="" />&nbsp;<?php echo $lng['install']['database']; ?></b></td>
@@ -884,11 +821,6 @@ else
 	<br />
 <?php
 	page_footer();
-	}
-	else
-	{
-		requirement_checks();
-	}		
 }
 
 /**

install/lng/english.lng.php

@@ -84,11 +84,4 @@ $lng['install']['webserver'] = 'Webserver';
 $lng['install']['phpversion'] = 'Checking for PHP version >= 5.2';
 $lng['install']['phpposix'] = 'Testing if PHP posix-extension is installed...';
 
-/*
- * Added in Froxlor 0.9.4
- */
-$lng['install']['click_here_to_refresh'] = 'Re-check';
-$lng['install']['click_here_to_continue'] = 'Continue installation';
-$lng['install']['froxlor_succ_checks'] = 'All requirements are satisfied';
-
 ?>

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...';
@@ -84,11 +81,4 @@ $lng['install']['webserver'] = 'Webserver';
 $lng['install']['phpversion'] = 'Prüfe PHP Version >= 5.2';
 $lng['install']['phpposix'] = 'Teste, ob die PHP Posix-Erweiterung installiert ist...';
 
-/*
- * Added in Froxlor 0.9.4
- */
-$lng['install']['click_here_to_refresh'] = 'Erneut prüfen';
-$lng['install']['click_here_to_continue'] = 'Installation fortführen';
-$lng['install']['froxlor_succ_checks'] = 'Alle Vorraussetzungen sind erfüllt';
-
 ?>

install/scripts/language-check.php

@@ -21,7 +21,9 @@ $baseLanguage = 'english.lng.php';
 
 // Check if we're in the CLI
 
-if(@php_sapi_name() != 'cli')
+if(@php_sapi_name() != 'cli'
+   && @php_sapi_name() != 'cgi'
+   && @php_sapi_name() != 'cgi-fcgi')
 {
 	die('This script will only work in the shell.');
 }

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

@@ -20,13 +20,13 @@ if(isFroxlorVersion('0.9-r0'))
 	showUpdateStep("Updating from 0.9-r0 to 0.9-r1", false);
 	showUpdateStep("Performing database updates");
 	/*
-	 * add missing database-updates if necessary (old: update/update_database.php)
+	 * add missing database-updates if necessary (old: update/update_database.php
 	 */
-	if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 1)
+	if(!isset($settings['system']['dbversion']) || $settings['system']['dbversion'] < '1')
 	{
 		$db->query("ALTER TABLE `panel_databases` ADD `dbserver` INT( 11 ) UNSIGNED NOT NULL default '0';");
 	}
-	if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 2)
+	if(!isset($settings['system']['dbversion']) || $settings['system']['dbversion'] < '2')
 	{
 		$db->query("ALTER TABLE `panel_ipsandports` CHANGE `ssl_cert` `ssl_cert_file` VARCHAR( 255 ) NOT NULL,
 						ADD `ssl_key_file` VARCHAR( 255 ) NOT NULL, 
@@ -191,15 +191,7 @@ if(isFroxlorVersion('0.9-r1'))
 	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('spf', 'use_spf', '0');");
 	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('spf', 'spf_entry', '@	IN	TXT	\"v=spf1 a mx -all\"');");
 	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'froxlor_graphic' WHERE `varname` = 'syscp_graphic'");
-	if(isset($settings['admin']['syscp_graphic'])
+	$settings['admin']['froxlor_graphic'] = $settings['admin']['syscp_graphic'];
-		&& $settings['admin']['syscp_graphic'] != ''
-	){
-		$settings['admin']['froxlor_graphic'] = $settings['admin']['syscp_graphic'];
-	}
-	else
-	{
-		$settings['admin']['froxlor_graphic'] = 'images/header.gif';
-	}
 	
 	lastStepStatus(0);
 
@@ -280,519 +272,8 @@ if(isFroxlorVersion('0.9-r3'))
 
 if(isFroxlorVersion('0.9-r4'))
 {
-	showUpdateStep("Updating from 0.9-r4 to 0.9 final");
+	showUpdateStep("Updating from 0.9-r4 to 0.9 final", false);
-	lastStepStatus(0);
 	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');
-}
-
-if(isFroxlorVersion('0.9.1'))
-{
-	showUpdateStep("Updating from 0.9.1 to 0.9.2", false);
-
-	showUpdateStep("Checking whether last-system-guid is sane");
-
-	$result = $db->query_first("SELECT MAX(`guid`) as `latestguid` FROM `".TABLE_PANEL_CUSTOMERS."`");
-
-	if (isset($result['latestguid'])
-		&& (int)$result['latestguid'] > 0
-		&& $result['latestguid'] != $settings['system']['lastguid']
-	) {
-		checkLastGuid();
-		lastStepStatus(1, 'fixed');
-	} else {
-		lastStepStatus(0);
-	}
-	updateToVersion('0.9.2');
-}
-
-if(isFroxlorVersion('0.9.2'))
-{
-	showUpdateStep("Updating from 0.9.2 to 0.9.3");
-	lastStepStatus(0);
-	updateToVersion('0.9.3');
-}
-
-if(isFroxlorVersion('0.9.3'))
-{
-	showUpdateStep("Updating from 0.9.3 to 0.9.3-svn1", false);
-
-	showUpdateStep("Updating tables");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'password_min_length', '0');");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'store_index_file_subs', '1');");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.3-svn1');
-}
-
-if(isFroxlorVersion('0.9.3-svn1'))
-{
-	showUpdateStep("Updating from 0.9.3-svn1 to 0.9.3-svn2", false);
-
-	showUpdateStep("Updating tables");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'adminmail_defname', 'Froxlor Administrator');");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'adminmail_return', '');");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.3-svn2');
-}
-
-if(isFroxlorVersion('0.9.3-svn2'))
-{
-	showUpdateStep("Updating from 0.9.3-svn2 to 0.9.3-svn3", false);
-
-	showUpdateStep("Correcting cron start-times");
-	// set specific times for some crons (traffic only at night, etc.)
-	$ts = mktime(0, 0, 0, date('m', time()), date('d', time()), date('Y', time()));
-	$db->query("UPDATE `".TABLE_PANEL_CRONRUNS."` SET `lastrun` = '".$ts."' WHERE `cronfile` ='cron_traffic.php';");
-	$ts = mktime(1, 0, 0, date('m', time()), date('d', time()), date('Y', time()));
-	$db->query("UPDATE `".TABLE_PANEL_CRONRUNS."` SET `lastrun` = '".$ts."' WHERE `cronfile` ='cron_used_tickets_reset.php';");
-	$db->query("UPDATE `".TABLE_PANEL_CRONRUNS."` SET `lastrun` = '".$ts."' WHERE `cronfile` ='cron_ticketarchive.php';");
-	lastStepStatus(0);
-
-	showUpdateStep("Adding new language: Polish");
-	$db->query("INSERT INTO `".TABLE_PANEL_LANGUAGE."` SET `language` = 'Polski', `file` = 'lng/polish.lng.php'");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.3-svn3');
-}
-
-if(isFroxlorVersion('0.9.3-svn3'))
-{
-	showUpdateStep("Updating from 0.9.3-svn3 to 0.9.3-svn4", false);
-
-	showUpdateStep("Adding new DKIM settings");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkim_algorithm', 'all');");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkim_add_adsp', '1');");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkim_keylength', '1024');");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkim_servicetype', '0');");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkim_add_adsppolicy', '1');");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkim_notes', '');");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.3-svn4');
-}
-
-if(isFroxlorVersion('0.9.3-svn4'))
-{
-	showUpdateStep("Updating from 0.9.3-svn4 to 0.9.3-svn5", false);
-
-	showUpdateStep("Adding new settings");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'stdsubdomain', '');");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.3-svn5');
-}
-
-if(isFroxlorVersion('0.9.3-svn5'))
-{
-	showUpdateStep("Updating from 0.9.3-svn5 to 0.9.4 final");
-	lastStepStatus(0);
-	updateToVersion('0.9.4');
-}
-
-if(isFroxlorVersion('0.9.4'))
-{
-	showUpdateStep("Updating from 0.9.4 to 0.9.4-svn1", false);
-
-	/**
-	 * some users might still have the setting in their database
-	 * because we already had this back in older versions.
-	 * To not confuse Froxlor, we just update old settings.
-	 */
-	if(isset($settings['system']['awstats_path'])
-		&& $settings['system']['awstats_path'] != ''
-	) {
-		showUpdateStep("Updating awstats path setting");
-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/bin/' WHERE `settinggroup` = 'system' AND `varname` = 'awstats_path';");
-		lastStepStatus(0);
-	}
-	elseif(!isset($settings['system']['awstats_path']))
-	{
-		showUpdateStep("Adding new awstats path setting");
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_path', '/usr/bin/');");
-		lastStepStatus(0);
-	}
-
-	if(isset($settings['system']['awstats_domain_file'])
-		&& $settings['system']['awstats_domain_file'] != ''
-	) {
-		showUpdateStep("Updating awstats configuration path setting");
-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'awstats_conf' WHERE `varname` = 'awstats_domain_file';");
-	}
-	else
-	{
-		showUpdateStep("Adding awstats configuration path settings");
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_conf', '/etc/awstats/');");
-	}
-	lastStepStatus(0);
-
-	updateToVersion('0.9.4-svn1');
-}
-
-if(isFroxlorVersion('0.9.4-svn1'))
-{
-	showUpdateStep("Updating from 0.9.4-svn1 to 0.9.4-svn2", false);
-
-	$update_domains = isset($_POST['update_domainwildcardentry']) ? intval($_POST['update_domainwildcardentry']) : 0;
-
-	if($update_domains != 1)
-	{
-		$update_domains = 0;
-	}
-
-	if($update_domains == 1)
-	{
-		showUpdateStep("Updating domains with iswildcarddomain=yes");
-		$query = "SELECT `d`.`id` FROM `".TABLE_PANEL_DOMAINS."` `d`, `".TABLE_PANEL_CUSTOMERS."` `c` ";
-		$query.= "WHERE `parentdomainid`='0' AND `email_only` = '0' AND `d`.`customerid` = `c`.`customerid` AND `d`.`id` <> `c`.`standardsubdomain`";
-		$result = $db->query($query);
-		$updated_domains = 0;
-		while($domain = $db->fetch_array($result))
-		{
-			$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `iswildcarddomain` = '1' WHERE `id` ='".(int)$domain['id']."'");
-			$updated_domains++;
-		}
-		lastStepStatus(0, 'Updated '.$updated_domains.' domain(s)');
-	} else {
-		showUpdateStep("Won't update domains with iswildcarddomain=yes as requested");
-		lastStepStatus(1);
-	}
-
-	showUpdateStep("Updating database table definition for panel_domains");
-	$db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` MODIFY `iswildcarddomain` tinyint(1) NOT NULL default '1';");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.4-svn2');
-}
-
-if(isFroxlorVersion('0.9.4-svn2'))
-{
-	showUpdateStep("Updating from 0.9.4-svn2 to 0.9.5 final");
-	lastStepStatus(0);
-	updateToVersion('0.9.5');
-}
-
-if(isFroxlorVersion('0.9.5'))
-{
-	showUpdateStep("Updating from 0.9.5 to 0.9.6-svn1", false);
-
-	showUpdateStep("Adding time-to-live configuration setting");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'defaultttl', '604800');");
-	lastStepStatus(0);
-
-	showUpdateStep("Updating database table structure for panel_ticket_categories");
-	$db->query("ALTER TABLE `" . TABLE_PANEL_TICKET_CATS . "` ADD `logicalorder` int(3) NOT NULL default '1' AFTER `adminid`;");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.6-svn1');
-}
-
-if(isFroxlorVersion('0.9.6-svn1'))
-{
-	showUpdateStep("Updating from 0.9.6-svn1 to 0.9.6-svn2", false);
-
-	$update_adminmail = isset($_POST['update_adminmail']) ? validate($_POST['update_adminmail'], 'update_adminmail') : false;
-	$do_update = true;
-
-	if($update_adminmail !== false)
-	{
-		showUpdateStep("Checking newly entered admin-mail");
-		if(!PHPMailer::ValidateAddress($update_adminmail))
-		{
-			$do_update = false;
-			lastStepStatus(2, 'E-Mail still not valid, go back and try again');
-		}
-		else
-		{
-			$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '".$db->escape($update_adminmail)."' WHERE `settinggroup` = 'panel' AND `varname` = 'adminmail';");
-			lastStepStatus(0);
-		}
-	}
-
-	if($do_update)
-	{
-		updateToVersion('0.9.6-svn2');
-	}
-}
-
-if(isFroxlorVersion('0.9.6-svn2'))
-{
-	showUpdateStep("Updating from 0.9.6-svn2 to 0.9.6-svn3", false);
-
-	$update_deferr_enable = isset($_POST['update_deferr_enable']) ? true : false;
-
-	$err500 = false;
-	$err401 = false;
-	$err403 = false;
-	$err404 = false;
-
-	showUpdateStep("Adding new webserver configurations to database");
-	if($update_deferr_enable == true)
-	{
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'enabled', '1');");
-
-		if(isset($_POST['update_deferr_500'])
-			&& trim($_POST['update_deferr_500']) != ''
-		) {
-			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_500'])."');");
-			$err500 = true;
-		}
-
-		if(isset($_POST['update_deferr_401'])
-			&& trim($_POST['update_deferr_401']) != ''
-		) {
-			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err401', '".$db->escape($_POST['update_deferr_401'])."');");
-			$err401 = true;
-		}
-
-		if(isset($_POST['update_deferr_403'])
-			&& trim($_POST['update_deferr_403']) != ''
-		) {
-			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err403', '".$db->escape($_POST['update_deferr_403'])."');");
-			$err403 = true;
-		}
-
-		if(isset($_POST['update_deferr_404'])
-			&& trim($_POST['update_deferr_404']) != ''
-		) {
-			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err404', '".$db->escape($_POST['update_deferr_404'])."');");
-			$err404 = true;
-		}
-	}
-
-	if(!$update_deferr_enable) {
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'enabled', '0');");
-	}
-	if(!$err401) {
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err401', '');");
-	}
-	if(!$err403) {
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err403', '');");
-	}
-	if(!$err404) {
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err404', '');");
-	}
-	if(!$err500) {
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '');");
-	}
-
-	lastStepStatus(0);
-
-	updateToVersion('0.9.6-svn3');
-}
-
-if(isFroxlorVersion('0.9.6-svn3'))
-{
-	showUpdateStep("Updating from 0.9.6-svn3 to 0.9.6-svn4", false);
-
-	$update_deftic_priority = isset($_POST['update_deftic_priority']) ? intval($_POST['update_deftic_priority']) : 2;
-
-	showUpdateStep("Setting default support-ticket priority");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('ticket', 'default_priority', '".(int)$update_deftic_priority."');");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.6-svn4');
-}
-
-if(isFroxlorVersion('0.9.6-svn4'))
-{
-	showUpdateStep("Updating from 0.9.6-svn4 to 0.9.6-svn5", false);
-
-	$update_defsys_phpconfig = isset($_POST['update_defsys_phpconfig']) ? intval($_POST['update_defsys_phpconfig']) : 1;
-
-	if($update_defsys_phpconfig != 1) {
-		showUpdateStep("Setting default php-configuration to user defined config #".$update_defsys_phpconfig);
-	} else {
-		showUpdateStep("Adding default php-configuration setting to the database");
-	}
-
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'mod_fcgid_defaultini', '".(int)$update_defsys_phpconfig."');");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.6-svn5');
-}
-
-if(isFroxlorVersion('0.9.6-svn5'))
-{
-	showUpdateStep("Updating from 0.9.6-svn5 to 0.9.6-svn6", false);
-
-	showUpdateStep("Adding new FTP-quota settings");
-
-	$update_defsys_ftpserver = isset($_POST['update_defsys_ftpserver']) ? intval($_POST['update_defsys_ftpserver']) : 'proftpd';
-
-	// add ftp server setting
-	$db->query("INSERT INTO `panel_settings` SET `settinggroup` = 'system', `varname` = 'ftpserver', `value` = '".$db->escape($update_defsys_ftpserver)."';");
-
-	// add proftpd quota
-	$db->query("CREATE TABLE `ftp_quotalimits` (`name` varchar(30) default NULL, `quota_type` enum('user','group','class','all') NOT NULL default 'user', `per_session` enum('false','true') NOT NULL default 'false', `limit_type` enum('soft','hard') NOT NULL default 'hard', `bytes_in_avail` float NOT NULL, `bytes_out_avail` float NOT NULL, `bytes_xfer_avail` float NOT NULL, `files_in_avail` int(10) unsigned NOT NULL, `files_out_avail` int(10) unsigned NOT NULL, `files_xfer_avail` int(10) unsigned NOT NULL) ENGINE=MyISAM;");
-
-	$db->query("INSERT INTO `ftp_quotalimits` (`name`, `quota_type`, `per_session`, `limit_type`, `bytes_in_avail`, `bytes_out_avail`, `bytes_xfer_avail`, `files_in_avail`, `files_out_avail`, `files_xfer_avail`) VALUES ('froxlor', 'user', 'false', 'hard', 0, 0, 0, 0, 0, 0);");
-
-	$db->query("CREATE TABLE `ftp_quotatallies` (`name` varchar(30) NOT NULL, `quota_type` enum('user','group','class','all') NOT NULL, `bytes_in_used` float NOT NULL, `bytes_out_used` float NOT NULL, `bytes_xfer_used` float NOT NULL, `files_in_used` int(10) unsigned NOT NULL, `files_out_used` int(10) unsigned NOT NULL, `files_xfer_used` int(10) unsigned NOT NULL ) ENGINE=MyISAM;");
-
-	// fill quota tallies
-	$result_ftp_users = $db->query("SELECT username FROM `" . TABLE_FTP_USERS . "` WHERE 1;");
-
-	while($row_ftp_users = $db->fetch_array($result_ftp_users))
-	{
-		$result_ftp_quota = $db->query("SELECT diskspace_used FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE loginname = SUBSTRING_INDEX('" . $row_ftp_users['username'] . "', '" . $settings['customer']['ftpprefix'] . "', 1);");
-		$row_ftp_quota = mysql_fetch_row($result_ftp_quota);
-		$db->query("INSERT INTO `ftp_quotatallies` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $row_ftp_users['username'] . "', 'user', '" . $row_ftp_quota[0] . "'*1024, '0', '0', '0', '0', '0');");
-	}
-
-	lastStepStatus(0);
-
-	updateToVersion('0.9.6-svn6');
-}
-
-if(isFroxlorVersion('0.9.6-svn6'))
-{
-	showUpdateStep("Updating from 0.9.6-svn6 to 0.9.6 final");
-	lastStepStatus(0);
-	updateToVersion('0.9.6');
-}
-
-if(isFroxlorVersion('0.9.6'))
-{
-	showUpdateStep("Updating from 0.9.6 to 0.9.7-svn1", false);
-
-	$update_customredirect_enable = isset($_POST['update_customredirect_enable']) ? 1 : 0;
-	$update_customredirect_default = isset($_POST['update_customredirect_default']) ? (int)$_POST['update_customredirect_default'] : 1;
-
-	showUpdateStep("Adding new tables to database");
-	$db->query("CREATE TABLE IF NOT EXISTS `redirect_codes` (
-  `id` int(5) NOT NULL auto_increment,
-  `code` varchar(3) NOT NULL,
-  `enabled` tinyint(1) DEFAULT '1',
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM;");
-
-	$db->query("CREATE TABLE IF NOT EXISTS `domain_redirect_codes` (
-  `rid` int(5) NOT NULL,
-  `did` int(11) unsigned NOT NULL,
-  UNIQUE KEY `rc` (`rid`, `did`)
-) ENGINE=MyISAM;");
-	lastStepStatus(0);
-
-	showUpdateStep("Filling new tables with default data");
-	$db->query("INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (1, '---', 1);");
-	$db->query("INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (2, '301', 1);");
-	$db->query("INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (3, '302', 1);");
-	$db->query("INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (4, '303', 1);");
-	$db->query("INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (5, '307', 1);");
-	lastStepStatus(0);
-
-	showUpdateStep("Updating domains");
-	$res = $db->query("SELECT `id` FROM `".TABLE_PANEL_DOMAINS."` ORDER BY `id` ASC");
-	$updated_domains = 0;
-	while($d = $db->fetch_array($res))
-	{
-		$db->query("INSERT INTO `domain_redirect_codes` (`rid`, `did`) VALUES ('".(int)$update_customredirect_default."', '".(int)$d['id']."');");
-		$updated_domains++;
-	}
-	lastStepStatus(0, 'Updated '.$updated_domains.' domain(s)');
-
-	showUpdateStep("Adding new settings");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('customredirect', 'enabled', '".(int)$update_customredirect_enable."');");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('customredirect', 'default', '".(int)$update_customredirect_default."');");
-	lastStepStatus(0);
-
-	// need to fix default-error-copy-and-paste-shizzle
-	showUpdateStep("Checking if anything is ok with the default-error-handler");
-	if(!isset($settings['defaultwebsrverrhandler']['err404']))
-	{
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err404', '');");
-	}
-	if(!isset($settings['defaultwebsrverrhandler']['err403']))
-	{
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err403', '');");
-	}
-	if(!isset($settings['defaultwebsrverrhandler']['err401']))
-	{
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err401', '');");
-	}
-	lastStepStatus(0);
-
-	updateToVersion('0.9.7-svn1');
-}
-
-if(isFroxlorVersion('0.9.7-svn1'))
-{
-	showUpdateStep("Updating from 0.9.7-svn1 to 0.9.7-svn2", false);
-
-	showUpdateStep("Updating open_basedir due to security - issue");
-	$result = $db->query("SELECT `id` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `documentroot` LIKE '%:%' AND `documentroot` NOT LIKE 'http://%' AND `openbasedir_path` = '0' AND `openbasedir` = '1'");
-	while($row = $db->fetch_array($result))
-	{
-		$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `openbasedir_path` = '1' WHERE `id` = " . $row['id']);
-	}
-	lastStepStatus(0);
-
-	updateToVersion('0.9.7-svn2');
-}
-
-if(isFroxlorVersion('0.9.7-svn2'))
-{
-	showUpdateStep("Updating from 0.9.7-svn2 to 0.9.7-svn3", false);
-
-	showUpdateStep("Updating database tables");
-	$db->query("ALTER TABLE `redirect_codes` ADD `desc` varchar(200) NOT NULL AFTER `code`;");
-	lastStepStatus(0);
-	
-	showUpdateStep("Updating field-values");
-	$db->query("UPDATE `redirect_codes` SET `desc` = 'rc_default' WHERE `code` = '---';");
-	$db->query("UPDATE `redirect_codes` SET `desc` = 'rc_movedperm' WHERE `code` = '301';");
-	$db->query("UPDATE `redirect_codes` SET `desc` = 'rc_found' WHERE `code` = '302';");
-	$db->query("UPDATE `redirect_codes` SET `desc` = 'rc_seeother' WHERE `code` = '303';");
-	$db->query("UPDATE `redirect_codes` SET `desc` = 'rc_tempred' WHERE `code` = '307';");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.7-svn3');
-}
-
-if(isFroxlorVersion('0.9.7-svn3'))
-{
-	showUpdateStep("Updating from 0.9.7-svn3 to 0.9.7 final");
-	lastStepStatus(0);
-	updateToVersion('0.9.7');
-}
-
-if(isFroxlorVersion('0.9.7'))
-{
-	showUpdateStep("Updating from 0.9.7 to 0.9.8 final");
-	lastStepStatus(0);
-	updateToVersion('0.9.8');
-}
-
-if(isFroxlorVersion('0.9.8'))
-{
-	showUpdateStep("Updating from 0.9.8 to 0.9.9-svn1", false);
-
-	$update_defdns_mailentry = isset($_POST['update_defdns_mailentry']) ? '1' : '0';
-
-	showUpdateStep("Adding new settings");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'dns_createmailentry', '".(int)$update_defdns_mailentry."');");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.9-svn1');
-}
-
-if(isFroxlorVersion('0.9.9-svn1'))
-{
-	showUpdateStep("Updating from 0.9.9-svn1 to 0.9.9 final");
-	lastStepStatus(0);
-	updateToVersion('0.9.9');
-}
-
 ?>

install/updates/preconfig.php

@@ -1,62 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Language
- * @version    $Id$
- */
-
-/**
- * Function getPreConfig
- *
- * outputs various content before the update process
- * can be continued (askes for agreement whatever is being asked)
- *
- * @param string version
- *
- * @return string
- */
-function getPreConfig($current_version)
-{
-	$has_preconfig = false;
-	$return = '<div class="preconfig"><h3 style="color:#ff0000;">PLEASE NOTE - Important update notifications</h3>';
-
-	include_once makeCorrectFile(dirname(__FILE__).'/preconfig/0.9/preconfig_0.9.inc.php');
-	parseAndOutputPreconfig($has_preconfig, $return, $current_version);
-
-	$return .= '<br /><br />'.makecheckbox('update_changesagreed', '<strong>I have read the update notifications above and I am aware of the changes made to my system.</strong>', '1', true, '0', true);
-	$return .= '</div>';
-	$return .= '<input type="hidden" name="update_preconfig" value="1" />';
-
-	if($has_preconfig) {
-		return $return;
-	} else {
-		return '';
-	}
-}
-
-function versionInUpdate($current_version, $version_to_check)
-{
-	if (!isFroxlor()) {
-		return true;
-	}
-	$pos_a = strpos($current_version, '-svn');
-	$pos_b = strpos($version_to_check, '-svn');
-	// if we compare svn-versions, we have to add -svn0 to the version
-	// to compare it correctly	
-	if($pos_a === false && $pos_b !== false)
-	{
-		$current_version.= '-svn9999';
-	}
-	
-	return version_compare($current_version, $version_to_check, '<');
-}

install/updates/preconfig/0.9/preconfig_0.9.inc.php

@@ -1,161 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Language
- * @version    $Id$
- */
-
-/**
- * checks if the new-version has some updating to do
- *
- * @param boolean $has_preconfig   pointer to check if any preconfig has to be output
- * @param string  $return          pointer to output string
- * @param string  $current_version current froxlor version
- *
- * @return null
- */
-function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
-{
-	global $settings, $lng, $db;
-
-	if(versionInUpdate($current_version, '0.9.4-svn2'))
-	{
-		$has_preconfig = true;
-		$description = 'Froxlor now enables the usage of a domain-wildcard entry and subdomains for this domain at the same time (subdomains are parsed before the main-domain vhost container).';
-		$description.= 'This makes it possible to catch all non-existing subdomains with the main vhost but also have the ability to use subdomains for that domain.<br />';
-		$description.= 'If you would like Froxlor to do so with your domains, the update script can set the correct values for existing domains for you. Note: future domains will have wildcard-entries enabled by default no matter how you decide here.';
-		$question = '<strong>Do you want to use wildcard-entries for existing domains?:</strong>&nbsp;';
-		$question.= makeyesno('update_domainwildcardentry', '1', '0', '1');
-
-		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-	}
-
-	if(versionInUpdate($current_version, '0.9.6-svn2'))
-	{
-		if(!PHPMailer::ValidateAddress($settings['panel']['adminmail']))
-		{
-			$has_preconfig = true;
-			$description = 'Froxlor uses a newer version of the phpMailerClass and determined that your current admin-mail address is invalid.';
-			$question = '<strong>Please specify a new admin-email address:</strong>&nbsp;<input type="text" class="text" name="update_adminmail" value="'.$settings['panel']['adminmail'].'" />';
-			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-		}
-	}
-
-	if(versionInUpdate($current_version, '0.9.6-svn3'))
-	{
-		$has_preconfig = true;
-		$description = 'You now have the possibility to define default error-documents for your webserver which replace the default webserver error-messages.';
-		$question = '<strong>Do you want to enable default error-documents?:</strong>&nbsp;';
-		$question .= makeyesno('update_deferr_enable', '1', '0', '0').'<br /><br />';
-		if($settings['system']['webserver'] == 'apache2')
-		{
-			$question .= 'Path/URL for error 500:&nbsp;<input type="text" class="text" name="update_deferr_500" /><br /><br />';
-			$question .= 'Path/URL for error 401:&nbsp;<input type="text" class="text" name="update_deferr_401" /><br /><br />';
-			$question .= 'Path/URL for error 403:&nbsp;<input type="text" class="text" name="update_deferr_403" /><br /><br />';
-		}
-		$question .= 'Path/URL for error 404:&nbsp;<input type="text" class="text" name="update_deferr_404" />';
-		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-	}
-
-	if(versionInUpdate($current_version, '0.9.6-svn4'))
-	{
-		$has_preconfig = true;
-		$description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.';
-		$question = '<strong>Which should be the default ticket-priority?:</strong>&nbsp;';
-		$question .= '<select name="update_deftic_priority">';
-		$priorities = makeoption($lng['ticket']['unf_high'], '1', '2');
-		$priorities.= makeoption($lng['ticket']['unf_normal'], '2', '2');
-		$priorities.= makeoption($lng['ticket']['unf_low'], '3', '2');
-		$question .= $priorities.'</select>';
-		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-	}
-
-	if(versionInUpdate($current_version, '0.9.6-svn5'))
-	{
-		$has_preconfig = true;
-		$description = 'If you have more than one PHP configurations defined in Froxlor you can now set a default one which will be used for every domain.';
-		$question = '<strong>Select default PHP configuration:</strong>&nbsp;';
-		$question .= '<select name="update_defsys_phpconfig">';
-		$configs_array = getPhpConfigs();
-		$configs = '';
-		foreach($configs_array as $idx => $desc)
-		{
-			$configs .= makeoption($desc, $idx, '1');
-		}
-		$question .= $configs.'</select>';
-		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-	}
-
-	if(versionInUpdate($current_version, '0.9.6-svn6'))
-	{
-		$has_preconfig = true;
-		$description = 'For the new FTP-quota feature, you can now chose the currently used ftpd-software.';
-		$question = '<strong>Used FTPd-software:</strong>&nbsp;';
-		$question .= '<select name="update_defsys_ftpserver">';
-		$question .= makeoption('ProFTPd', 'proftpd', 'proftpd');
-		$question .= makeoption('PureFTPd', 'pureftpd', 'proftpd');
-		$question .= '</select>';
-		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-	}
-
-	if(versionInUpdate($current_version, '0.9.7-svn1'))
-	{
-		$has_preconfig = true;
-		$description = 'You can now choose whether customers can select the http-redirect code and which of them acts as default.';
-		$question = '<strong>Allow customer chosen redirects?:</strong>&nbsp;';
-		$question.= makeyesno('update_customredirect_enable', '1', '0', '1').'<br /><br />';
-		$question.= '<strong>Select default redirect code (default: empty):</strong>&nbsp;';
-		$question.= '<select name="update_customredirect_default">';
-		$redirects = makeoption('--- ('.$lng['redirect_desc']['rc_default'].')', 1, '1');
-		$redirects.= makeoption('301 ('.$lng['redirect_desc']['rc_movedperm'].')', 2, '1');
-		$redirects.= makeoption('302 ('.$lng['redirect_desc']['rc_found'].')', 3, '1');
-		$redirects.= makeoption('303 ('.$lng['redirect_desc']['rc_seeother'].')', 4, '1');
-		$redirects.= makeoption('307 ('.$lng['redirect_desc']['rc_tempred'].')', 5, '1');
-		$question .= $redirects.'</select>';
-		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-	}
-
-	if(versionInUpdate($current_version, '0.9.7-svn2'))
-	{
-		$result = $db->query("SELECT `domain` FROM " . TABLE_PANEL_DOMAINS . " WHERE `documentroot` LIKE '%:%' AND `documentroot` NOT LIKE 'http://%' AND `openbasedir_path` = '0' AND `openbasedir` = '1'");
-		$wrongOpenBasedirDomain = array();
-		while($row = $db->fetch_array($result))
-		{
-			$wrongOpenBasedirDomain[] = $row['domain'];
-		}
-
-		if(count($wrongOpenBasedirDomain) > 0)
-		{
-			$has_preconfig = true;
-			$description = 'Resetting the open_basedir to customer - root';
-			$question = '<strong>Due to a security - issue regarding open_basedir, Froxlor will set the open_basedir for the following domains to the customers root instead of the chosen documentroot:</strong><br />&nbsp;';
-			$question.= '<ul>';
-			$idna_convert = new idna_convert_wrapper();
-			foreach($wrongOpenBasedirDomain as $domain)
-			{
-				$question.= '<li>' . $idna_convert->decode($domain) . '</li>';
-			}
-			$question.= '</ul>';
-			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-		}
-	}
-
-	if(versionInUpdate($current_version, '0.9.9-svn1'))
-	{
-		$has_preconfig = true;
-		$description = 'When entering MX servers to Froxlor there was no mail-, imap-, pop3- and smtp-"A record" created. You can now chose whether this should be done or not.';
-		$question = '<strong>Do you want these A-records to be created even with MX servers given?:</strong>&nbsp;';
-		$question.= makeyesno('update_defdns_mailentry', '1', '0', '0');
-		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-	}
-}

install/updatesql.php

@@ -19,18 +19,6 @@
 
 $updatelog = FroxlorLogger::getInstanceOf(array('loginname' => 'updater'), $db, $settings);
 
-$updatelogfile = validateUpdateLogFile(makeCorrectFile(dirname(__FILE__).'/update.log'));
-$filelog = FileLogger::getInstanceOf(array('loginname' => 'updater'), $settings);
-$filelog->setLogFile($updatelogfile);
-
-// if first writing does not work we'll stop, tell the user to fix it
-// and then let him try again.
-try {
-	$filelog->logAction(ADM_ACTION, LOG_WARNING, '-------------- START LOG --------------');
-} catch(Exception $e) {
-	standard_error('exception', $e->getMessage());
-}
-
 /*
  * since froxlor, we have to check if there's still someone
  * out there using syscp and needs to upgrade
@@ -102,8 +90,6 @@ if(!isFroxlor())
 if(isFroxlor())
 {
 	include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/0.9/update_0.9.inc.php'));
-	$filelog->logAction(ADM_ACTION, LOG_WARNING, '--------------- END LOG ---------------');
-	unset($filelog);
 }
 
 ?>

lib/classes/aps/class.ApsInstaller.php

@@ -32,7 +32,6 @@ class ApsInstaller extends ApsParser
 	private $RealPath = '';
 	private $RootDir = '';
 	private $Hosts = '';
-	private $aps_version = '1.0';
 
 	/**
 	 * constructor of class. setup some basic variables
@@ -46,7 +45,7 @@ class ApsInstaller extends ApsParser
 	{
 		$this->db = $db;
 		$this->db_root = $db_root;
-		$this->RootDir = dirname(dirname(dirname(dirname(__FILE__)))) . '/';
+		$this->RootDir = dirname(dirname(__FILE__)) . '/';
 		$this->Hosts = $settings['system']['mysql_access_host'];
 	}
 
@@ -74,8 +73,6 @@ class ApsInstaller extends ApsParser
 			$XmlContent = file_get_contents($this->RootDir . 'packages/' . $Row['Path'] . '/APP-META.xml');
 			$Xml = new SimpleXMLElement($XmlContent);
 
-			$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';
-
 			//check for unparseable xml data
 
 			if($Xml == false)
@@ -138,27 +135,10 @@ class ApsInstaller extends ApsParser
 		{
 			//setup right path and run installation script
 
-			if(!is_dir($this->RealPath . $this->DomainPath . '/install_scripts/'))
-			{
-				echo 'Directory: '. $this->RealPath . $this->DomainPath . '/install_scripts/ does not exist';
-				return;
-			}
-
 			chdir($this->RealPath . $this->DomainPath . '/install_scripts/');
 			$Return = array();
 			$ReturnStatus = 0;
-
+			$Return = safe_exec('php ' . escapeshellarg($this->RealPath . $this->DomainPath . '/install_scripts/configure install'), $ReturnStatus);
-			// make configure-script executable
-			if($this->aps_version != '1.0')
-			{
-				$scriptname = (string)$Xml->service->provision->{'configuration-script'}['name'];
-			} else {
-				$scriptname = 'configure';
-			}
-
-			chmod($this->RealPath . $this->DomainPath . '/install_scripts/'.$scriptname, 0755);
-
-			$Return = safe_exec('php ' . escapeshellarg($this->RealPath . $this->DomainPath . '/install_scripts/'.$scriptname) . ' install', $ReturnStatus);
 
 			if($ReturnStatus != 0)
 			{
@@ -224,19 +204,7 @@ class ApsInstaller extends ApsParser
 			//remove permissions
 			//drop database
 
-			if ($this->aps_version == '1.0')
+			$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
-			{
-				// the good ole way
-				$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
-			} 
-			else 
-			{
-				// since 1.1
-				$Xml->registerXPathNamespace('db', 'http://apstandard.com/ns/1/db');
-	
-				$XmlDb = new DynamicProperties;
-				$XmlDb->db->id = getXPathValue($Xml, '//db:id');
-			}
 
 			if($XmlDb->db->id)
 			{
@@ -300,19 +268,6 @@ class ApsInstaller extends ApsParser
 
 	private function PrepareFiles($Xml, $Row, $Task)
 	{
-		if($this->aps_version != '1.0')
-		{
-			$mapping = $Xml->service->provision->{'url-mapping'}->mapping;
-			$mapping_path = $Xml->service->provision->{'url-mapping'}->mapping['path'];
-			$mapping_url = $Xml->service->provision->{'url-mapping'}->mapping['url'];
-		}
-		else 
-		{
-			$mapping = $Xml->mapping;
-			$mapping_path = $Xml->mapping['path'];
-			$mapping_url = $Xml->mapping['url'];
-		}
-		
 		if($Task == TASK_INSTALL)
 		{
 			//FIXME truncate customer directory
@@ -322,7 +277,7 @@ class ApsInstaller extends ApsParser
 
 			//extract all files and chown them to the customer guid
 
-			if(self::ExtractZip($this->RootDir . 'packages/' . $Row['Path'] . '/' . $Row['Path'], $mapping_path, $this->RealPath . $this->DomainPath . '/') == false
+			if(self::ExtractZip($this->RootDir . 'packages/' . $Row['Path'] . '/' . $Row['Path'], $Xml->mapping['path'], $this->RealPath . $this->DomainPath . '/') == false
 			|| self::ExtractZip($this->RootDir . 'packages/' . $Row['Path'] . '/' . $Row['Path'], 'scripts', $this->RealPath . $this->DomainPath . '/install_scripts/') == false)
 			{
 				$this->db->query('UPDATE `' . TABLE_APS_INSTANCES . '` SET `Status` = ' . INSTANCE_ERROR . ' WHERE `ID` = ' . $this->db->escape($Row['InstanceID']));
@@ -354,7 +309,7 @@ class ApsInstaller extends ApsParser
 
 		//recursive mappings
 
-		self::PrepareMappings($mapping, $mapping_url, $this->RealPath . $this->DomainPath . '/');
+		self::PrepareMappings($Xml->mapping, $Xml->mapping['url'], $this->RealPath . $this->DomainPath . '/');
 		return true;
 	}
 
@@ -371,37 +326,34 @@ class ApsInstaller extends ApsParser
 		//check for special PHP permissions
 		//must be done with xpath otherwise check not possible (XML parser problem with attributes)
 
-		if($ParentMapping && $ParentMapping !== null)
+		$ParentMapping->registerXPathNamespace('p', 'http://apstandard.com/ns/1/php');
+		$Result = $ParentMapping->xpath('p:permissions');
+
+		if($Result[0]['writable'] == 'true')
 		{
-			$ParentMapping->registerXPathNamespace('p', 'http://apstandard.com/ns/1/php');
+			//fixing file permissions to writeable
-			$Result = $ParentMapping->xpath('p:permissions');
 
-			if($Result[0]['writable'] == 'true')
+			if(is_dir($Path))
 			{
-				//fixing file permissions to writeable
+				chmod($Path, 0775);
-	
-				if(is_dir($Path))
-				{
-					chmod($Path, 0775);
-				}
-				else
-				{
-					chmod($Path, 0664);
-				}
 			}
-	
+			else
-			if($Result[0]['readable'] == 'false')
 			{
-				//fixing file permissions to non readable
+				chmod($Path, 0664);
+			}
+		}
 
-				if(is_dir($Path))
+		if($Result[0]['readable'] == 'false')
-				{
+		{
-					chmod($Path, 0333);
+			//fixing file permissions to non readable
-				}
+
-				else
+			if(is_dir($Path))
-				{
+			{
-					chmod($Path, 0222);
+				chmod($Path, 0333);
-				}
+			}
+			else
+			{
+				chmod($Path, 0222);
 			}
 		}
 
@@ -411,20 +363,18 @@ class ApsInstaller extends ApsParser
 		putenv('WEB_' . $EnvVariable . '_DIR=' . $Path);
 
 		//resolve deeper mappings
-		if($ParentMapping && $ParentMapping !== null)
-		{
-			foreach($ParentMapping->mapping as $Mapping)
-			{
-				//recursive check of other mappings
 
-				if($Url == '/')
+		foreach($ParentMapping->mapping as $Mapping)
-				{
+		{
-					self::PrepareMappings($Mapping, $Url . $Mapping['url'], $Path . $Mapping['url']);
+			//recursive check of other mappings
-				}
+
-				else
+			if($Url == '/')
-				{
+			{
-					self::PrepareMappings($Mapping, $Url . '/' . $Mapping['url'], $Path . '/' . $Mapping['url']);
+				self::PrepareMappings($Mapping, $Url . $Mapping['url'], $Path . $Mapping['url']);
-				}
+			}
+			else
+			{
+				self::PrepareMappings($Mapping, $Url . '/' . $Mapping['url'], $Path . '/' . $Mapping['url']);
 			}
 		}
 	}
@@ -474,23 +424,8 @@ class ApsInstaller extends ApsParser
 	private function PrepareDatabase($Xml, $Row, $Task)
 	{
 		global $db_root;
-
 		$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
 
-		if ($this->aps_version == '1.0')
-		{
-			// the good ole way
-			$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
-		} 
-		else
-		{
-			// since 1.1
-			$Xml->registerXPathNamespace('db', 'http://apstandard.com/ns/1/db');
-
-			$XmlDb = new DynamicProperties;
-			$XmlDb->db->id = getXPathValue($Xml, '//db:id');
-		}
-
 		if($XmlDb->db->id)
 		{
 			//database management

lib/classes/aps/class.ApsParser.php

@@ -37,8 +37,6 @@ class ApsParser
 	private $userinfo = array();
 	private $settings = array();
 	private $db = false;
-	private $RootDir = '';
-	private $aps_version = '1.0';
 
 	/**
 	 * Constructor of class, setup basic variables needed by the class
@@ -53,7 +51,6 @@ class ApsParser
 		$this->settings = $settings;
 		$this->userinfo = $userinfo;
 		$this->db = $db;
-		$this->RootDir = dirname(dirname(dirname(dirname(__FILE__)))) . '/';
 	}
 
 	/**
@@ -796,8 +793,7 @@ class ApsParser
 						}
 						else
 						{
-							$moveproblem = str_replace('{$path}', $this->RootDir, $lng['aps']['moveproblem']);
+							$Errors[] = $lng['aps']['moveproblem'];
-							$Errors[] = $moveproblem;
 						}
 					}
 
@@ -844,7 +840,7 @@ class ApsParser
 		{
 			//split all keywords
 
-			$Elements = preg_split('/[ ,;]/', trim($_GET['keyword']));
+			$Elements = split('[ ,;]', trim($_GET['keyword']));
 
 			if(count($Elements) == 1
 			   && strlen($Elements[0]) == 0)
@@ -989,26 +985,14 @@ class ApsParser
 			if($Xml == false)continue;
 			$Icon = './images/default.png';
 
-			$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';
-
 			//show data and status of package
 
-			if($this->aps_version != '1.0')
+			if($Xml->icon['path'])
 			{
-				$iconpath = $Xml->presentation->icon['path'];
+				$Icon = './packages/' . $Row2['Path'] . '/' . basename($Xml->icon['path']);
-				$Summary = htmlspecialchars($Xml->presentation->summary);
-			} 
-			else
-			{
-				$iconpath = $Xml->icon['path'];
-				$Summary = htmlspecialchars($Xml->summary);
-			}
-
-			if($iconpath)
-			{
-				$Icon = './packages/' . $Row2['Path'] . '/' . basename($iconpath);
 			}
 
+			$Summary = $Xml->summary;
 			$Fieldname = $lng['aps']['version'];
 			$Fieldvalue = $Xml->version . ' (Release ' . $Xml->release . ')';
 			eval("\$Data.=\"" . getTemplate("aps/data") . "\";");
@@ -1358,36 +1342,16 @@ class ApsParser
 		{
 			$Error = array();
 
-			$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';
-
 			//check alot of stuff if package is supported
 			//php modules
 
-			if ($this->aps_version == '1.0')
+			$XmlPhp = $Xml->requirements->children('http://apstandard.com/ns/1/php');
-			{
-				// the good ole way
-				$XmlPhp = $Xml->requirements->children('http://apstandard.com/ns/1/php');
-			} 
-			else 
-			{
-				// since 1.1
-				$Xml->registerXPathNamespace('php', 'http://apstandard.com/ns/1/php');
-
-				$XmlPhp = new DynamicProperties;
-				$XmlPhp->extension = getXPathValue($Xml, '//php:extension', false);
-				$XmlPhp->function = getXPathValue($Xml, '//php:function', false);
-			}
 
 			if($XmlPhp->extension)
 			{
 				$ExtensionsLoaded = get_loaded_extensions();
 				foreach($XmlPhp->extension as $Extension)
 				{
-					if(strtolower($Extension) == 'php')
-					{
-						continue;
-					}
-
 					if(!in_array($Extension, $ExtensionsLoaded)
 					   && !self::CheckException('php', 'extension', $Extension))
 					{
@@ -1422,11 +1386,6 @@ class ApsParser
 			);
 			foreach($PhpValues as $Value)
 			{
-				if ($this->aps_version != '1.0')
-				{
-					$XmlPhp->{$Value} = getXPathValue($Xml, '//php:'.$Value);
-				}
-
 				if($XmlPhp->{$Value})
 				{
 					if(self::TrueFalseIniGet($Value) != $XmlPhp->{$Value}
@@ -1437,11 +1396,6 @@ class ApsParser
 				}
 			}
 
-			if ($this->aps_version != '1.0')
-			{
-				$XmlPhp->{'post-max-size'} = getXPathValue($Xml, '//php:post-max-size');
-			}
-
 			if($XmlPhp->{'post-max-size'})
 			{
 				if(self::PhpMemorySizeToBytes(ini_get('post_max_size')) < intval($XmlPhp->{'post-max-size'})
@@ -1451,11 +1405,6 @@ class ApsParser
 				}
 			}
 
-			if ($this->aps_version != '1.0')
-			{
-				$XmlPhp->{'memory-limit'} = getXPathValue($Xml, '//php:memory-limit');
-			}
-
 			if($XmlPhp->{'memory-limit'})
 			{
 				if(self::PhpMemorySizeToBytes(ini_get('memory_limit')) < intval($XmlPhp->{'memory-limit'})
@@ -1465,11 +1414,6 @@ class ApsParser
 				}
 			}
 
-			if ($this->aps_version != '1.0')
-			{
-				$XmlPhp->{'max-execution-time'} = getXPathValue($Xml, '//php:max-execution-time');
-			}
-
 			if($XmlPhp->{'max-execution-time'})
 			{
 				if(ini_get('max_execution_time') < intval($XmlPhp->{'max-execution-time'})
@@ -1503,21 +1447,7 @@ class ApsParser
 
 			//database
 
-			if ($this->aps_version == '1.0')
+			$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
-			{
-				// the good ole way
-				$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
-			} 
-			else 
-			{
-				// since 1.1
-				$Xml->registerXPathNamespace('db', 'http://apstandard.com/ns/1/db');
-
-				$XmlDb = new DynamicProperties;
-				$XmlDb->db->id = getXPathValue($Xml, '//db:id');
-				$XmlDb->db->{'server-type'} = getXPathValue($Xml, '//db:server-type');
-				$XmlDb->db->{'server-min-version'} = getXPathValue($Xml, '//db:server-min-version');
-			}
 
 			if($XmlDb->db->id)
 			{
@@ -1534,21 +1464,7 @@ class ApsParser
 
 			//ASP.NET
 
-			if ($this->aps_version == '1.0')
+			$XmlAsp = $Xml->requirements->children('http://apstandard.com/ns/1/aspnet');
-			{
-				// the good ole way
-				$XmlAsp = $Xml->requirements->children('http://apstandard.com/ns/1/aspnet');
-			} 
-			else 
-			{
-				// since 1.1
-				$Xml->registerXPathNamespace('aspnet', 'http://apstandard.com/ns/1/aspnet');
-
-				$XmlAsp = new DynamicProperties;
-				$XmlAsp->handler = getXPathValue($Xml, '//aspnet:handler');
-				$XmlAsp->permissions = getXPathValue($Xml, '//aspnet:permissions');
-				$XmlAsp->version = getXPathValue($Xml, '//aspnet:version');
-			}
 
 			if($XmlAsp->handler
 			   || $XmlAsp->permissions
@@ -1559,19 +1475,7 @@ class ApsParser
 
 			//CGI
 
-			if ($this->aps_version == '1.0')
+			$XmlCgi = $Xml->requirements->children('http://apstandard.com/ns/1/cgi');
-			{
-				// the good ole way
-				$XmlCgi = $Xml->requirements->children('http://apstandard.com/ns/1/cgi');
-			} 
-			else 
-			{
-				// since 1.1
-				$Xml->registerXPathNamespace('cgi', 'http://apstandard.com/ns/1/cgi');
-
-				$XmlCgi = new DynamicProperties;
-				$XmlCgi->handler = getXPathValue($Xml, '//cgi:handler');
-			}
 
 			if($XmlCgi->handler)
 			{
@@ -1580,20 +1484,7 @@ class ApsParser
 
 			//webserver modules
 
-			if ($this->aps_version == '1.0')
+			$XmlWebserver = $Xml->requirements->children('http://apstandard.com/ns/1/apache');
-			{
-				// the good ole way
-				$XmlWebserver = $Xml->requirements->children('http://apstandard.com/ns/1/apache');
-			} 
-			else
-			{
-				// since 1.1
-				$Xml->registerXPathNamespace('apache', 'http://apstandard.com/ns/1/apache');
-
-				$XmlWebserver = new DynamicProperties;
-				$XmlWebserver->{'required-module'} = getXPathValue($Xml, '//apache:required-module');
-				$XmlWebserver->htaccess = getXPathValue($Xml, '//apache:htaccess');
-			}
 
 			if($XmlWebserver->{'required-module'})
 			{
@@ -1633,21 +1524,7 @@ class ApsParser
 
 			//validation against a charset not possible in current version
 
-			if ($this->aps_version == '1.0')
+			foreach($Xml->settings->group as $Group)
-			{
-				// the good ole way
-				$aps_settings_array = $Xml->settings->group;
-			} 
-			else
-			{
-				// since 1.1
-				$aps_settings_array = $Xml->{'global-settings'}->setting;
-				if(!is_array($aps_settings_array)) {
-					$aps_settings_array = $Xml->service->settings->group;
-				}
-			}
-			
-			foreach($aps_settings_array as $Group)
 			{
 				foreach($Group->setting as $Setting)
 				{
@@ -1664,16 +1541,13 @@ class ApsParser
 
 			//check different errors/features in submappings
 
-			if ($this->aps_version == '1.0')
+			$Return = self::CheckSubmappings($Xml->mapping, $Xml->mapping['url']);
-			{			
-				$Return = self::CheckSubmappings($Xml->mapping, $Xml->mapping['url']);
 
-				if(count($Return) != 0)
+			if(count($Return) != 0)
+			{
+				foreach($Return as $Value)
 				{
-					foreach($Return as $Value)
+					if(!in_array($Value, $Error))$Error[] = $Value;
-					{
-						if(!in_array($Value, $Error))$Error[] = $Value;
-					}
 				}
 			}
 
@@ -1740,19 +1614,9 @@ class ApsParser
 
 				//copy screenshots
 
-				if ($this->aps_version != '1.0')
+				if($Xml->screenshot)
 				{
-					$xml_screenshots = $Xml->presentation->screenshot;;
+					foreach($Xml->screenshot as $Screenshot)
-				}
-				else
-				{
-					$xml_screenshots = $Xml->screenshot;
-				}
-				
-
-				if($xml_screenshots)
-				{
-					foreach($xml_screenshots as $Screenshot)
 					{
 						self::GetContentFromZip($Filename, $Screenshot['path'], $Destination . basename($Screenshot['path']));
 					}
@@ -1760,36 +1624,17 @@ class ApsParser
 
 				//copy icon
 
-				if ($this->aps_version != '1.0')
+				if($Xml->icon['path'])
 				{
-					$xml_iconpath = $Xml->presentation->icon['path'];
+					self::GetContentFromZip($Filename, $Xml->icon['path'], $Destination . basename($Xml->icon['path']));
-				}
-				else
-				{
-					$xml_iconpath = $Xml->icon['path'];
-				}
-
-				if($xml_iconpath)
-				{
-					self::GetContentFromZip($Filename, $xml_iconpath, $Destination . basename($xml_iconpath));
 				}
 
 				//copy license
 
-				if ($this->aps_version != '1.0')
+				if($Xml->license
+				   && $Xml->license->text->file)
 				{
-					$xml_license = $Xml->service->license;
+					self::GetContentFromZip($Filename, $Xml->license->text->file, $Destination . 'license.txt');
-				}
-				else
-				{
-					$xml_license = $Xml->license;
-				}				
-				
-
-				if($xml_license
-				   && $xml_license->text->file)
-				{
-					self::GetContentFromZip($Filename, $xml_license->text->file, $Destination . 'license.txt');
 				}
 
 				//insert package to database
@@ -1843,11 +1688,10 @@ class ApsParser
 			$Error.= '<li>' . $lng['aps']['class_zip_missing'] . '</li>';
 		}
 
-		if(!is_writable($this->RootDir.'temp/')
+		if(!is_writable('./temp/')
-		   || !is_writable($this->RootDir.'packages/'))
+		   || !is_writable('./packages/'))
 		{
-			$dirpermission = str_replace('{$path}', $this->RootDir, $lng['aps']['dir_permissions']);
+			$Error.= '<li>' . $lng['aps']['dir_permissions'] . '</li>';
-			$Error.= '<li>' . $dirpermission . '</li>';
 		}
 
 		if($Error != '')
@@ -1866,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'];
 
@@ -2515,26 +2352,10 @@ class ApsParser
 
 		if($Xml == false)return false;
 
-		$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';		
-
 		//check all data fields of xml file against inut of customer
 
-		if ($this->aps_version == '1.0')
-		{
-			// the good ole way
-			$aps_settings_array = $Xml->settings->group;
-		} 
-		else
-		{
-			// since 1.1
-			$aps_settings_array = $Xml->{'global-settings'}->setting;
-			if(!is_array($aps_settings_array)) {
-				$aps_settings_array = $Xml->service->settings->group;
-			}			
-		}
-		
 		$Error = array();
-		foreach($aps_settings_array as $Group)
+		foreach($Xml->settings->group as $Group)
 		{
 			foreach($Group->setting as $Setting)
 			{
@@ -2583,8 +2404,7 @@ class ApsParser
 				{
 					if(isset($_POST[$FieldId]))
 					{
-						$email = strtolower($_POST[$FieldId]);
+						if(!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/", $_POST[$FieldId]))
-						if(filter_var($email, FILTER_VALIDATE_EMAIL) === false)
 						{
 							if(!in_array($FieldId, $Error))$Error[] = $FieldId;
 						}
@@ -2710,19 +2530,7 @@ class ApsParser
 
 		//database required?
 
-		if ($this->aps_version == '1.0')
+		$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
-		{
-			// the good ole way
-			$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
-		} 
-		else 
-		{
-			// since 1.1
-			$Xml->registerXPathNamespace('db', 'http://apstandard.com/ns/1/db');
-
-			$XmlDb = new DynamicProperties;
-			$XmlDb->db->id = getXPathValue($Xml, '//db:id');
-		}
 
 		if($XmlDb->db->id)
 		{
@@ -2844,19 +2652,10 @@ class ApsParser
 			self::SetInstallationValue($PackageId, $CustomerId, 'main_location', '');
 		}
 
-		if ($this->aps_version != '1.0')
+		if($Xml->license)
 		{
-			$xml_license = $Xml->service->license;
+			if($Xml->license['must-accept']
-		}
+			   && $Xml->license['must-accept'] == 'true')
-		else
-		{
-			$xml_license = $Xml->license;
-		}
-		
-		if($xml_license)
-		{
-			if($xml_license['must-accept']
-			   && $xml_license['must-accept'] == 'true')
 			{
 				if(isset($_POST['license'])
 				   && $_POST['license'] == 'true')
@@ -2901,8 +2700,6 @@ class ApsParser
 
 		if($Xml == false)return false;
 
-		$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';
-		
 		//show notifcation if customer has reached his installation limit
 
 		if($this->userinfo['aps_packages'] != '-1'
@@ -2916,18 +2713,9 @@ class ApsParser
 
 		$Icon = './images/default.png';
 
-		if($this->aps_version != '1.0')
+		if($Xml->icon['path'])
 		{
-			$iconpath = $Xml->presentation->icon['path'];		
+			$Icon = './packages/' . $Row['Path'] . '/' . basename($Xml->icon['path']);
-		} 
-		else
-		{
-			$iconpath = $Xml->icon['path'];
-		}
-
-		if($iconpath)
-		{
-			$Icon = './packages/' . $Row['Path'] . '/' . basename($iconpath);
 		}
 
 		//show error message if some input was wrong
@@ -2961,7 +2749,7 @@ class ApsParser
 			{
 				if($Value)
 				{
-					if($Row3['id'] == $Value)
+					if($Row3['ID'] == $Value)
 					{
 						$Temp.= '<option selected="selected" value="' . $Row3['id'] . '">' . $Row3['domain'] . '</option>';
 					}
@@ -3013,19 +2801,7 @@ class ApsParser
 
 		//database required?
 
-		if ($this->aps_version == '1.0')
+		$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
-		{
-			// the good ole way
-			$XmlDb = $Xml->requirements->children('http://apstandard.com/ns/1/db');
-		} 
-		else 
-		{
-			// since 1.1
-			$Xml->registerXPathNamespace('db', 'http://apstandard.com/ns/1/db');
-
-			$XmlDb = new DynamicProperties;
-			$XmlDb->db->id = getXPathValue($Xml, '//db:id');
-		}
 
 		if($XmlDb->db->id)
 		{
@@ -3044,21 +2820,7 @@ class ApsParser
 			eval("\$Data.=\"" . getTemplate("aps/data") . "\";");
 		}
 
-		if ($this->aps_version == '1.0')
+		foreach($Xml->settings->group as $Group)
-		{
-			// the good ole way
-			$aps_settings_array = $Xml->settings->group;
-		} 
-		else
-		{
-			// since 1.1
-			$aps_settings_array = $Xml->{'global-settings'}->setting;
-			if(!is_array($aps_settings_array)) {
-				$aps_settings_array = $Xml->service->settings->group;
-			}
-		}		
-
-		foreach($aps_settings_array as $Group)
 		{
 			$GroupPrinted = false;
 			foreach($Group->setting as $Setting)
@@ -3241,25 +3003,16 @@ class ApsParser
 			}
 		}
 
-		if ($this->aps_version != '1.0')
+		if($Xml->license)
-		{
-			$xml_license = $Xml->service->license;
-		}
-		else
-		{
-			$xml_license = $Xml->license;
-		}
-		
-		if($xml_license)
 		{
 			$Temp = '';
 
-			if($xml_license['must-accept']
+			if($Xml->license['must-accept']
-			   && $xml_license['must-accept'] == 'true')
+			   && $Xml->license['must-accept'] == 'true')
 			{
-				if($xml_license->text->name)$Temp.= $xml_license->text->name . '<br/>';
+				if($Xml->license->text->name)$Temp.= $Xml->license->text->name . '<br/>';
 
-				if($xml_license->text->file)
+				if($Xml->license->text->file)
 				{
 					$Temp.= '<textarea name="text" rows="10" cols="55">';
 					$FileContent = file_get_contents('./packages/' . $Row['Path'] . '/license.txt');
@@ -3272,7 +3025,7 @@ class ApsParser
 				}
 				else
 				{
-					$Temp.= '<a target="_blank" href="' . htmlspecialchars($xml_license->text->url) . '">' . $lng['aps']['error_license'] . '</a>';
+					$Temp.= '<a target="_blank" href="' . htmlspecialchars($Xml->license->text->url) . '">' . $lng['aps']['error_license'] . '</a>';
 					$Groupname = $lng['aps']['license'];
 					$Fieldname = $lng['aps']['license'];
 					$Fieldvalue = $Temp;
@@ -3323,37 +3076,14 @@ class ApsParser
 		if($Xml == false)return false;
 		$Icon = './images/default.png';
 
-		$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';
-
 		//show icon and basic data
-		if($this->aps_version != '1.0')
+
+		if($Xml->icon['path'])
 		{
-			$iconpath = $Xml->presentation->icon['path'];
+			$Icon = './packages/' . $Row['Path'] . '/' . basename($Xml->icon['path']);
-			$Summary = htmlspecialchars($Xml->presentation->summary);
-			$categories = $Xml->presentation->categories;
-			$languages =  $Xml->presentation->languages;
-			$description = $Xml->presentation->description;
-			$changelogs = $Xml->presentation->changelog;
-			$license = $Xml->service->license;
-			$screenshots = $Xml->presentation->screenshot;			
-		} 
-		else
-		{
-			$iconpath = $Xml->icon['path'];
-			$Summary = htmlspecialchars($Xml->summary);
-			$categories = $Xml->categories;
-			$languages =  $Xml->languages;
-			$description = $Xml->description;
-			$changelogs = $Xml->changelog;
-			$license = $Xml->license;
-			$screenshots = $Xml->screenshot;
-		}
-
-		if($iconpath)
-		{
-			$Icon = './packages/' . $Row['Path'] . '/' . basename($iconpath);
 		}
 
+		$Summary = htmlspecialchars($Xml->summary);
 		$Fieldname = $lng['aps']['version'];
 		$Fieldvalue = $Xml->version . ' (Release ' . $Xml->release . ')';
 		eval("\$Data.=\"" . getTemplate("aps/data") . "\";");
@@ -3378,12 +3108,12 @@ class ApsParser
 
 		//show categories
 
-		if($categories)
+		if($Xml->categories)
 		{
 			$Temp = '';
-			foreach($categories->category as $_categories)
+			foreach($Xml->categories->category as $Categories)
 			{
-				$Temp.= htmlspecialchars($_categories[0]) . '<br/>';
+				$Temp.= htmlspecialchars($Categories[0]) . '<br/>';
 			}
 
 			$Fieldname = $lng['aps']['categories'];
@@ -3393,12 +3123,12 @@ class ApsParser
 
 		//show available languages
 
-		if($languages)
+		if($Xml->languages)
 		{
 			$Temp = '';
-			foreach($languages->language as $_languages)
+			foreach($Xml->languages->language as $Languages)
 			{
-				$Temp.= $_languages[0] . ' ';
+				$Temp.= $Languages[0] . ' ';
 			}
 
 			$Fieldname = $lng['aps']['languages'];
@@ -3411,7 +3141,7 @@ class ApsParser
 		if($All == true)
 		{
 			$Fieldname = $lng['aps']['long_description'];
-			$Fieldvalue = htmlspecialchars($description);
+			$Fieldvalue = htmlspecialchars($Xml->description);
 			eval("\$Data.=\"" . getTemplate("aps/data") . "\";");
 
 			//show config script language
@@ -3426,7 +3156,7 @@ class ApsParser
 			//show changelog
 
 			$Temp = '<ul>';
-			foreach($changelogs->version as $Versions)
+			foreach($Xml->changelog->version as $Versions)
 			{
 				$Temp.= '<li><strong>' . $Versions['version'] . ' (Release ' . $Versions['release'] . ')</strong>';
 				$Temp.= '<ul>';
@@ -3445,13 +3175,13 @@ class ApsParser
 
 			//show license
 
-			if($license)
+			if($Xml->license)
 			{
-				if($license->text->file)
+				if($Xml->license->text->file)
 				{
 					$Temp = '';
 
-					if($license->text->name)$Temp = $license->text->name . '<br/>';
+					if($Xml->license->text->name)$Temp = $Xml->license->text->name . '<br/>';
 					$Temp.= '<form name="license" action="#"><textarea name="text" rows="10" cols="70">';
 					$FileContent = file_get_contents('./packages/' . $Row['Path'] . '/license.txt');
 					$Temp.= htmlentities($FileContent, ENT_QUOTES, 'ISO-8859-1');
@@ -3463,23 +3193,23 @@ class ApsParser
 				else
 				{
 					$Fieldname = $lng['aps']['license'];
-					$Fieldvalue = '<a target="_blank" href="' . htmlspecialchars($license->text->url) . '">' . $lng['aps']['linktolicense'] . '</a>';
+					$Fieldvalue = '<a target="_blank" href="' . htmlspecialchars($Xml->license->text->url) . '">' . $lng['aps']['linktolicense'] . '</a>';
 					eval("\$Data.=\"" . getTemplate("aps/data") . "\";");
 				}
 			}
 
 			//show screenshots
 
-			if($screenshots)
+			if($Xml->screenshot)
 			{
 				$Count = 0;
 				$Temp = '';
-				foreach($screenshots as $Screenshot)
+				foreach($Xml->screenshot as $Screenshot)
 				{
 					$Count+= 1;
 					$Temp.= '<img src="./packages/' . $Row['Path'] . '/' . basename($Screenshot['path']) . '" alt="' . $Screenshot->description . '"/><br/><em>' . $Screenshot->description . '</em><br/>';
 
-					if(count($screenshots) != $Count)$Temp.= '<br/>';
+					if(count($Xml->screenshot) != $Count)$Temp.= '<br/>';
 				}
 
 				$Fieldname = $lng['aps']['screenshots'];

lib/classes/aps/class.ApsUpdater.php

@@ -32,26 +32,18 @@ class ApsUpdater extends ApsParser
 	private $RootUrl = '';
 	private $RootDir = '';
 
-	/**
-	 * FroxlorLogger
-	 * @var FroxlorLogger
-	 */
-	private $_cronlog = null;
-
 	/**
 	 * constructor of class. setup some basic variables needed by class
 	 *
-	 * @param	db			instance of the database class
+	 * @param	db			instance of the database class from syscp
-	 * @param	cronlog		instance of the froxlor logger
 	 */
 
-	public function __construct($db, $cronlog)
+	public function __construct($db)
 	{
 		$this->db = $db;
 		$this->RequestDomain = 'apscatalog.com';
 		$this->RootUrl = '/1/';
-		$this->RootDir = dirname(dirname(dirname(dirname(__FILE__)))) . '/';
+		$this->RootDir = dirname(dirname(__FILE__)) . '/';
-		$this->_cronlog = $cronlog;
 	}
 
 	/**
@@ -60,15 +52,13 @@ class ApsUpdater extends ApsParser
 
 	public function UpdateHandler()
 	{
-		$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Changing directory to '" . $this->RootDir . "'");
 		chdir($this->RootDir);
 
 		//return if allow_url_fopen is disabled
 
-		if(!ini_get('allow_url_fopen'))
+		if(ini_get('allow_url_fopen') == '0')
 		{
-			$this->_cronlog->logAction(CRON_ACTION, LOG_ERROR, "The APS updater cronjob requires that allow_url_fopen is enabled for the PHP CLI binary!");
+			echo ("The APS updater cronjob requires that allow_url_fopen is enabled for the PHP CLI binary!\n");
-			echo "The APS updater cronjob requires that allow_url_fopen is enabled for the PHP CLI binary!\n";
 			return;
 		}
 
@@ -78,7 +68,6 @@ class ApsUpdater extends ApsParser
 
 		if($this->db->num_rows($Result) == 0)
 		{
-			$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "No tasks for ApsUpdater");
 			return;
 		}
 
@@ -88,99 +77,89 @@ class ApsUpdater extends ApsParser
 		$this->db->query('DELETE FROM `' . TABLE_APS_TASKS . '` WHERE `Task` = ' . $Task['Task']);
 
 		//fetch all vendors
-		$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Fetching all Vendors from '" . $this->RootUrl . "'");
+
 		$Vendors = self::FetchSubUrls($this->RootUrl);
-		if($Vendors !== false)
+		foreach($Vendors as $Vendor)
 		{
-			foreach($Vendors as $Vendor)
+			//fetch all applications from vendors
+
+			$Applications = self::FetchSubUrls($this->RootUrl . $Vendor);
+			foreach($Applications as $Application)
 			{
-				//fetch all applications from vendors
+				//get newest version of package which is already installed
-				$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Fetching all from Vendor '" . $Vendor. "'");
+
-				$Applications = self::FetchSubUrls($this->RootUrl . $Vendor);
+				$CurrentVersion = '';
-				if($Applications !== false)
+				$Result = $this->db->query('SELECT * FROM `' . TABLE_APS_PACKAGES . '` WHERE `Name` = "' . $this->db->escape(substr($Application, 0, -1)) . '"');
+
+				while($Row = $this->db->fetch_array($Result))
 				{
-					foreach($Applications as $Application)
+					if(version_compare($Row['Version'] . '-' . $Row['Release'], $CurrentVersion) == 1)
 					{
-						//get newest version of package which is already installed
+						$CurrentVersion = $Row['Version'] . '-' . $Row['Release'];
-						$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Checking application '" . substr($Application, 0, -1) . "'");
+					}
+				}
 
-						$CurrentVersion = '';
+				if($this->db->num_rows($Result) != 0)
-						$Result = $this->db->query('SELECT * FROM `' . TABLE_APS_PACKAGES . '` WHERE `Name` = "' . $this->db->escape(substr($Application, 0, -1)) . '"');
+				{
+					//package already installed in system, search for newer version
 
-						while($Row = $this->db->fetch_array($Result))
+					if($Task['Task'] != TASK_SYSTEM_UPDATE)continue;
+
+					//fetch different versions of application from distribution server
+
+					$NewerVersion = '';
+					$Versions = self::FetchSubUrls($this->RootUrl . $Vendor . $Application);
+					foreach($Versions as $Version)
+					{
+						$OnlineVersion = substr($Version, 0, -1);
+
+						//is package newer than current version?
+
+						if(version_compare($OnlineVersion, $CurrentVersion) == 1)
 						{
-							if(version_compare($Row['Version'] . '-' . $Row['Release'], $CurrentVersion) == 1)
+							//is new package newer than another one found before?
+
+							if(version_compare($OnlineVersion, $NewerVersion) == 1)
 							{
-								$CurrentVersion = $Row['Version'] . '-' . $Row['Release'];
+								$NewerVersion = $OnlineVersion;
 							}
 						}
+					}
 
-						if($this->db->num_rows($Result) != 0)
+					if($NewerVersion != '')
+					{
+						//download package as an update
+
+						self::DownloadPackage($this->RootUrl . $Vendor . $Application . $NewerVersion, substr($Application, 0, -1), $NewerVersion);
+						continue;
+					}
+				}
+				else
+				{
+					if($Task['Task'] != TASK_SYSTEM_DOWNLOAD)continue;
+
+					//new packages
+
+					$NewVersion = '';
+					$Versions = self::FetchSubUrls($this->RootUrl . $Vendor . $Application);
+					foreach($Versions as $Version)
+					{
+						$OnlineVersion = substr($Version, 0, -1);
+
+						//is package newer than another one found before?
+
+						if(version_compare($OnlineVersion, $NewVersion) == 1)
 						{
-							//package already installed in system, search for newer version
+							$NewVersion = $OnlineVersion;
-
-							if($Task['Task'] != TASK_SYSTEM_UPDATE)continue;
-
-							//fetch different versions of application from distribution server
-
-							$NewerVersion = '';
-							$Versions = self::FetchSubUrls($this->RootUrl . $Vendor . $Application);
-							if($Versions !== false)
-							{
-								foreach($Versions as $Version)
-								{
-									$OnlineVersion = substr($Version, 0, -1);
-
-									//is package newer than current version?
-
-									if(version_compare($OnlineVersion, $CurrentVersion) == 1)
-									{
-										//is new package newer than another one found before?
-
-										if(version_compare($OnlineVersion, $NewerVersion) == 1)
-										{
-											$NewerVersion = $OnlineVersion;
-										}
-									}
-								}
-
-								if($NewerVersion != '')
-								{
-									//download package as an update
-
-									self::DownloadPackage($this->RootUrl . $Vendor . $Application . $NewerVersion, substr($Application, 0, -1), $NewerVersion);
-									continue;
-								}
-							}
 						}
-						else
+					}
-						{
-							if($Task['Task'] != TASK_SYSTEM_DOWNLOAD)continue;
 
-							//new packages
+					if($NewVersion != '')
+					{
+						//download package as a new one
 
-							$NewVersion = '';
+						self::DownloadPackage($this->RootUrl . $Vendor . $Application . $NewVersion, substr($Application, 0, -1), $NewVersion);
-							$Versions = self::FetchSubUrls($this->RootUrl . $Vendor . $Application);
+						continue;
-							foreach($Versions as $Version)
-							{
-								$OnlineVersion = substr($Version, 0, -1);
-
-								//is package newer than another one found before?
-
-								if(version_compare($OnlineVersion, $NewVersion) == 1)
-								{
-									$NewVersion = $OnlineVersion;
-								}
-							}
-
-							if($NewVersion != '')
-							{
-								//download package as a new one
-
-								self::DownloadPackage($this->RootUrl . $Vendor . $Application . $NewVersion, substr($Application, 0, -1), $NewVersion);
-								continue;
-							}
-						}
 					}
 				}
 			}
@@ -202,13 +181,11 @@ class ApsUpdater extends ApsParser
 
 		//make url valid
 
-		$path = dirname($Url);
+		$Url = str_replace(' ', '%20', $Url);
-		$file = urlencode(basename($Url));
-		$file_url = 'http://' . $this->RequestDomain . $path . '/' . $file . '.aps' . $Downloads[0];
 
 		//get content from website url
-		$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Downloading '" . $file_url . "'");
+
-		$Content = @file_get_contents($file_url);
+		$Content = @file_get_contents('http://' . $this->RequestDomain . $Url . '.aps' . $Downloads[0]);
 
 		if($Content != false)
 		{
@@ -254,22 +231,21 @@ class ApsUpdater extends ApsParser
 		//make url valid
 
 		$Url = str_replace(' ', '%20', $Url);
-		$file_url = 'http://' . $this->RequestDomain . $Url;
 
 		//get content from website url
 
-		$Content = @file($file_url);
+		$Content = @file('http://' . $this->RequestDomain . $Url);
 
-		if($Content !== false)
+		if($Content != false)
 		{
 			foreach($Content as $Temp)
 			{
 				//skip empty lines
 
 				if($Temp != "\r\n"
-				&& $Temp != "\r"
+				   && $Temp != "\r"
-				&& $Temp != "\n"
+				   && $Temp != "\n"
-				&& $Temp != "")
+				   && $Temp != "")
 				{
 					//remove unwanted characters
 

lib/classes/aps/class.DynamicProperties.php

@@ -1,18 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    APS
- * @version    $Id$
- */
-
-class DynamicProperties { /* empty class for some magic */ }

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/logger/class.FileLogger.php

@@ -169,7 +169,7 @@ class FileLogger extends AbstractLogger
 		}
 	}
 
-	public function setLogFile($filename = null)
+	private function setLogFile($filename = null)
 	{
 		if($filename != null
 		   && $filename != ''

lib/classes/ticket/class.ticket.php

@@ -286,25 +286,14 @@ class ticket
 
 		if($customerid != - 1)
 		{
-			$_mailerror = false;
+			$mail->From = $this->settings['ticket']['noreply_email'];
-			try {
+			$mail->FromName = $this->settings['ticket']['noreply_name'];
-				$mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']);
+			$mail->Subject = $mail_subject;
-				$mail->Subject = $mail_subject;
+			$mail->Body = $mail_body;
-				$mail->AltBody = $mail_body;
+			$mail->AddAddress($usr['email'], $usr['firstname'] . ' ' . $usr['name']);
-				$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-				$mail->AddAddress($usr['email'], $usr['firstname'] . ' ' . $usr['name']);
-				$mail->Send();
-			} catch(phpmailerException $e) {
-				$mailerr_msg = $e->errorMessage();
-				$_mailerror = true;
-			} catch (Exception $e) {
-				$mailerr_msg = $e->getMessage();
-				$_mailerror = true;
-			}
 
-			if ($_mailerror) {
+			if(!$mail->Send())
-				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'ticket_class'), $this->db, $this->settings);
+			{
-				$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 				standard_error(array('errorsendingmail', $usr['email']));
 			}
 
@@ -312,27 +301,15 @@ 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['firstname'] . ' ' . $admin['name']);
 
-			$_mailerror = false;
+			if(!$mail->Send())
-			try {		
+			{
-				$mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']);
-				$mail->Subject = $mail_subject;
-				$mail->AltBody = $mail_body;
-				$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-				$mail->AddAddress($admin['email'], $admin['name']);
-				$mail->Send();
-			} catch(phpmailerException $e) {
-				$mailerr_msg = $e->errorMessage();
-				$_mailerror = true;
-			} catch (Exception $e) {
-				$mailerr_msg = $e->getMessage();
-				$_mailerror = true;
-			}
-	
-			if ($_mailerror) {
-				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'ticket_class'), $this->db, $this->settings);
-				$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 				standard_error(array('errorsendingmail', $admin['email']));
 			}
 
@@ -344,19 +321,12 @@ class ticket
 	 * Add a support-categories
 	 */
 
-	static public function addCategory($_db, $_category = null, $_admin = 1, $_order = 1)
+	static public function addCategory($_db, $_category = null, $_admin = 1)
 	{
 		if($_category != null
 		&& $_category != '')
 		{
-			if($_order < 1) {
+			$_db->query('INSERT INTO `' . TABLE_PANEL_TICKET_CATS . '` (`name`, `adminid`) VALUES ("' . $_db->escape($_category) . '", "' . (int)$_admin . '")');
-				$_order = 1;
-			}
-
-			$_db->query('INSERT INTO `' . TABLE_PANEL_TICKET_CATS . '` SET 
-						`name` = "' . $_db->escape($_category) . '", 
-						`adminid` = "' . (int)$_admin . '", 
-						`logicalorder` = "' . (int)$_order . '"');
 			return true;
 		}
 
@@ -367,19 +337,13 @@ class ticket
 	 * Edit a support-categories
 	 */
 
-	static public function editCategory($_db, $_category = null, $_id = 0, $_order = 1)
+	static public function editCategory($_db, $_category = null, $_id = 0)
 	{
 		if($_category != null
 		&& $_category != ''
 		&& $_id != 0)
 		{
-			if($_order < 1) {
+			$_db->query('UPDATE `' . TABLE_PANEL_TICKET_CATS . '` SET `name` = "' . $_db->escape($_category) . '"
-				$_order = 1;
-			}
-			
-			$_db->query('UPDATE `' . TABLE_PANEL_TICKET_CATS . '` SET 
-					`name` = "' . $_db->escape($_category) . '",
-					`logicalorder` = "' . (int)$_order . '"
                    WHERE `id` = "' . (int)$_id . '"');
 			return true;
 		}
@@ -673,7 +637,7 @@ class ticket
 	{
 		if($_cid != 0)
 		{	
-			$result = $_db->query('SELECT `id` FROM `' . TABLE_PANEL_TICKETS . '` WHERE `customerid` ="'.(int)$_cid.'"');
+			$result = $_db->query('SELECT `id` FROM `' . TABLE_PANEL_TICKETS . '` WHERE `customer` ="'.(int)$_cid.'"');
 
 			$tickets = array();
 			while($row = $_db->fetch_array($result))
@@ -704,11 +668,7 @@ class ticket
 			{
 				if(strtolower($_var) == 'message')
 				{
-					return str_replace('script>', 'pre>', htmlspecialchars_decode(nl2br($this->t_data[$_var])));
+					return htmlspecialchars_decode(nl2br($this->t_data[$_var]));
-				}
-				elseif(strtolower($_var) == 'subject')
-				{
-					return str_replace('script>', 'pre>', htmlspecialchars_decode(nl2br($this->t_data[$_var])));
 				}
 				else
 				{

lib/configfiles/etch.inc.php

@@ -29,7 +29,6 @@ return Array(
 						'commands' => Array(
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
 							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
 							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
 							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
 							'a2dismod userdir',
@@ -51,11 +50,8 @@ return Array(
 							$configcommand['diroptions'],
 							$configcommand['v_inclighty'],
 							$configcommand['d_inclighty'],
-							'lighty-disable-mod cgi',
-							'lighty-disable-mod fastcgi',
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
 							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							'mkdir -p ' . $settings['system']['deactivateddocroot'],
 							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
 							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
 						),
@@ -72,10 +68,8 @@ return Array(
 						'label' => 'Bind9',
 						'commands' => Array(
 							'apt-get install bind9',
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
-							'chown root:bind ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chmod 0644 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'              
 						),
 						'restart' => Array(
 							'/etc/init.d/bind9 restart'
@@ -99,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',
@@ -137,19 +131,6 @@ return Array(
 							'newaliases'
 						)
 					),
-					'postfix_mxaccess' => Array(
-						'label' => 'Postfix MX-Access (anti spam)',
-						'files' => Array(
-							'etc_postfix_mx_access' => '/etc/postfix/mx_access',
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf'
-						),
-						'commands_1' => Array(
-							'postmap /etc/postfix/mx_access'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart'
-						)
-					),
 					'exim4' => Array(
 						'label' => 'Exim4',
 						'commands_1' => Array(
@@ -210,9 +191,6 @@ return Array(
 				'daemons' => Array(
 					'proftpd' => Array(
 						'label' => 'ProFTPd',
-						'commands' => Array(
-							'apt-get install proftpd-basic proftpd-mod-mysql'
-						),
 						'files' => Array(
 							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
 							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
@@ -270,12 +248,17 @@ return Array(
 					),
 					'awstats' => Array(
 						'label' => 'Awstats',
-						'commands' => Array(
+						'files' => Array(
-							'apt-get install awstats',
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_awstats_awstats.model_log_sql.conf.froxlor' : 'etc_awstats_awstats.model.conf.froxlor') => '/etc/awstats/awstats.model.conf.froxlor',
-							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/',
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_cron.d_awstats_log_sql' : 'etc_cron.d_awstats') => '/etc/cron.d/awstats',
-							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							($settings['system']['webserver'] == 'lighttpd' ? 'etc_lighttpd_froxlor-awstats.conf' : 'etc_apache_vhosts_05_awstats.conf') => ($settings['system']['webserver'] == 'lighttpd' ? '/etc/lighttpd/froxlor-awstats.conf' : '/etc/apache2/sites-enabled/05_awstats.conf')
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						),
+						'commands' => Array(
+							($settings['system']['webserver'] == 'lighttpd' ? 'echo "include \"froxlor-awstats.conf\"" >> /etc/lighttpd/lighttpd.conf' : '')
+						),
+						'restart' => Array(
+							($settings['system']['webserver'] == 'lighttpd' ? '/etc/init.d/lighttpd restart' : '/etc/init.d/apache2 restart')
+						)
 					),
 					'libnss' => Array(
 						'label' => 'libnss (system login with mysql)',

lib/configfiles/freebsd.inc.php

@@ -1,235 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Configfiles
- * @version    $Id$
- */
-
-return Array(
-	'freebsd' => Array(
-		'label' => 'FreeBSD',
-		'services' => Array(
-			'http' => Array(
-				'label' => $lng['admin']['configfiles']['http'],
-				'daemons' => Array(
-					'apache2' => Array(
-						'label' => 'Apache2 Webserver',
-						'commands' => Array(
-							'cd /usr/ports/www/apache22',
-							'make config',
-							'make install',
-							'touch ' . $settings['system']['apacheconf_vhost'],
-							'chown root:0 ' . $settings['system']['apacheconf_vhost'],
-							'chmod 0600 ' . $settings['system']['apacheconf_vhost'],
-							'touch ' . $settings['system']['apacheconf_diroptions'],
-							'chown root:0 ' . $settings['system']['apacheconf_diroptions'],
-							'chmod 0600 ' . $settings['system']['apacheconf_diroptions'],
-							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
-							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
-							'echo "accf_http_load=\"YES\"" >> /boot/loader.conf',
-							'echo "accf_data_load=\"YES\"" >> /boot/loader.conf',
-							'echo "apache22_enable=\"YES\"" >> /etc/rc.conf',
-						),
-						'restart' => Array(
-							'sh /usr/local/etc/rc.d/apache22 restart'
-						)
-					)
-				)
-			),
-			'dns' => Array(
-				'label' => $lng['admin']['configfiles']['dns'],
-				'daemons' => Array(
-					'powerdns' => Array(
-						'label' => 'PowerDNS',
-						'commands_1' => Array(
-							'cd /usr/ports/dns/powerdns',
-							'make config',
-							'make install',
-							'echo "pdns_enable=\"YES\"" >> /etc/rc.conf',
-						),
-						'files' => Array(
-							'usr_local_etc_pdns_pdns.conf' => '/usr/local/etc/pdns/pdns.conf'
-						),
-						'commands' => Array(
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chown root:0 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chmod 0600 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
-						),
-						'restart' => Array(
-							'sh /usr/local/etc/rc.d/pdns restart'
-						)
-					),
-				)
-			),
-			'smtp' => Array(
-				'label' => $lng['admin']['configfiles']['smtp'],
-				'daemons' => Array(
-					'postfix' => Array(
-						'label' => 'Postfix',
-						'commands_1' => Array(
-							'cd /usr/ports/mail/postfix',
-							'make config',
-							'set Dovecot SASL authentication method',
-							'set Enable SSL and TLS support',
-							'set MySQL maps (choose version with WITH_MYSQL_VER)',
-							'make install'
-						),
-						'commands_2' => Array(
-							'pw groupadd vmail -g 5001 ',
-							'pw useradd vmail -u 5001 -g 5001 -s/sbin/nologin -d/dev/null',			
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
-							'chmod 0750 ' . $settings['system']['vmail_homedir']
-						),
-						'commands_3' => Array(
-							'echo "sendmail_enable=\"NO\"" >> /etc/rc.conf',
-							'echo "sendmail_submit_enable=\"NO\"" >> /etc/rc.conf',
-							'echo "sendmail_outbound_enable=\"NO\"" >> /etc/rc.conf',
-							'echo "sendmail_msp_queue_enable=\"NO\"" >> /etc/rc.conf',
-							'echo "postfix_enable=\"YES\"" >> /etc/rc.conf'
-						),
-						'files' => Array(
-							'etc_periodic.conf' => '/etc/periodic.conf',
-							'usr_local_etc_postfix_main.cf' => '/usr/local/etc/postfix/main.cf',
-							'usr_local_etc_postfix_mysql-virtual_alias_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_alias_maps.cf',
-							'usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_maps.cf'
-						),
-						'restart' => Array(
-							'sh /usr/local/etc/rc.d/postfix restart'
-						)
-					),
-					'postfix_mxaccess' => Array(
-						'label' => 'Postfix MX-Access (anti spam)',
-						'files' => Array(
-							'etc_postfix_mx_access' => '/usr/local/etc/postfix/mx_access',
-							'etc_postfix_main.cf' => '/usr/local/etc/postfix/main.cf'
-						),
-						'commands_1' => Array(
-							'postmap /etc/postfix/mx_access'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart'
-						)
-					),
-					'dkim' => Array(
-						'label' => 'DomainKey filter',
-						'commands' => Array(
-							'cd /usr/ports/mail/dkim-milter/',
-							'make install clean',
-							'touch /usr/local/etc/mail/dkim-filter.conf'
-						),
-						'files' => Array(
-							'dkim-filter.conf' => '/usr/local/etc/mail/dkim-filter.conf',
-							'postfix_dkim_addition.cf' => '/usr/local/etc/postfix/main.cf'
-						),
-						'restart' => Array(
-							'/usr/local/etc/rc.d/milter-dkim restart '
-						)
-					)
-				)
-			),
-			'mail' => Array(
-				'label' => $lng['admin']['configfiles']['mail'],
-				'daemons' => Array(
-					'dovecot' => Array(
-						'label' => 'Dovecot',
-						'commands_1' => Array(
-							'cd /usr/ports/mail/dovecot',
-							'make config',
-							'set kqueue(2) support ',
-							'set SSL support ',
-							'set ManageSieve support (optional)',
-							'set MySQL support ',
-							'make install',
-							'echo "dovecot_enable=\"YES\"" >> /etc/rc.conf'
-						),
-						'files' => Array(
-							'usr_local_etc_dovecot.conf' => '/usr/local/etc/dovecot.conf',
-							'usr_local_etc_dovecot-sql.conf' => '/usr/local/etc/dovecot-sql.conf'
-						),
-						'commands_2' => Array(
-							'echo "dovecot unix - n n - - pipe
-    flags=DRhu user=vmail:vmail argv=/usr/local/libexec/dovecot/deliver -f ${sender} -d ${recipient}" >> /usr/local/etc/postfix/master.cf'
-						),
-						'restart' => Array(
-							'sh /usr/local/etc/rc.d/dovecot restart'
-						)
-					)
-				)
-			),
-			'ftp' => Array(
-				'label' => $lng['admin']['configfiles']['ftp'],
-				'daemons' => Array(
-					'proftpd' => Array(
-						'label' => 'ProFTPd',
-						'files' => Array(
-							'etc_proftpd_proftpd.conf' => '/usr/local/etc/proftpd.conf'
-						),
-						'commands' => Array(
-							'touch /usr/local/etc/proftpd.conf',
-							'chown root:0 /usr/local/etc/proftpd.conf',
-							'chmod 0600 /usr/local/etc/proftpd.conf'
-						),
-						'restart' => Array(
-							'/usr/local/etc/rc.d/proftpd restart'
-						)
-					)
-				)
-			),
-			'etc' => Array(
-				'label' => $lng['admin']['configfiles']['etc'],
-				'daemons' => Array(
-					'awstats' => Array(
-						'label' => 'Awstats',
-						'commands' => Array(
-							'cd /usr/ports/www/awstats/',
-							'make install clean',
-							'cp /usr/local/www/awstats/cgi-bin/awstats.model.conf '.makeCorrectDir($settings['system']['awstats_conf']),
-							'sed -i.bak \'s/^LogFile/# LogFile/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
-							'sed -i.bak \'s/^LogType/# LogType/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
-							'sed -i.bak \'s/^LogFormat/# LogFormat/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
-							'sed -i.bak \'s/^LogSeparator/# LogSeparator/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
-							'sed -i.bak \'s/^SiteDomain/# SiteDomain/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf')
-						)
-					),
-					'libnss' => Array(
-						'label' => 'libnss (system login with mysql)',
-						'commands_1' => Array(
-							'cd /usr/ports/net/libnss-mysql',
-							'make install clean',
-							'echo "nscd_enable=\"YES\"" >> /etc/rc.conf'
-						),
-						'files' => Array(
-							'usr_local_etc_libnss-mysql.cfg' => '/usr/local/etc/libnss-mysql.cfg',
-							'usr_local_etc_libnss-mysql-root.cfg' => '/usr/local/etc/libnss-mysql-root.cfg',
-							'etc_nsswitch.conf' => '/etc/nsswitch.conf'
-						),
-						'commands_2' => Array(
-							'chmod 600 /usr/local/etc/libnss-mysql.cfg /usr/local/etc/libnss-mysql-root.cfg'
-						),
-						'restart' => Array(
-							'sh /etc/rc.d/nscd restart'
-						)
-					)
-				)
-			)
-		)
-	)
-);
-
-?>

lib/configfiles/gentoo.inc.php

@@ -34,10 +34,9 @@ return Array(
 							'chown root:0 ' . $settings['system']['apacheconf_diroptions'],
 							'chmod 0600 ' . $settings['system']['apacheconf_diroptions'],
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
 							'mkdir -p ' . $settings['system']['logfiles_directory'],
 							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
 						),
 						'restart' => Array(
 							'rc-update add apache2 default',
@@ -55,8 +54,7 @@ return Array(
 							$configcommand['v_inclighty'],
 							$configcommand['d_inclighty'],
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							'mkdir -p ' . $settings['system']['logfiles_directory']
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : ''
 						),
 						'restart' => Array(
 							'rc-update add lighttpd default',
@@ -74,10 +72,10 @@ return Array(
 							'etc_bind_default.zone' => '/etc/bind/default.zone'
 						),
 						'commands' => Array(
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf',
-							'chown named:0 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'chown root:0 ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf',
-							'chmod 0600 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
+							'chmod 0600 ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
 						),
 						'restart' => Array(
 							'rc-update add named default',
@@ -89,26 +87,27 @@ return Array(
 			'smtp' => Array(
 				'label' => $lng['admin']['configfiles']['smtp'],
 				'daemons' => Array(
-					'postfix_courier' => Array(
+					'postfix' => Array(
-						'label' => 'Postfix/Courier',
+						'label' => 'Postfix',
 						'commands_1' => Array(
-							'echo "mail-mta/postfix -dovecot-sasl sasl" >> /etc/portage/package.use',
-							'emerge -av postfix',            
 							'mkdir -p ' . $settings['system']['vmail_homedir'],
 							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
 							'chmod 0750 ' . $settings['system']['vmail_homedir'],
 							'mv /etc/postfix/main.cf /etc/postfix/main.cf.gentoo',
 							'touch /etc/postfix/main.cf',
+							'touch /etc/postfix/master.cf',
 							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
 							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
 							'touch /etc/sasl2/smtpd.conf',
 							'chown root:root /etc/postfix/main.cf',
+							'chown root:root /etc/postfix/master.cf',
 							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
 							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
 							'chown root:root /etc/sasl2/smtpd.conf',
 							'chmod 0644 /etc/postfix/main.cf',
+							'chmod 0644 /etc/postfix/master.cf',
 							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
 							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
@@ -116,6 +115,7 @@ return Array(
 						),
 						'files' => Array(
 							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
+							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
 							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
 							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
@@ -126,74 +126,22 @@ return Array(
 							'/etc/init.d/postfix restart'
 						)
 					),
-					'postfix_dovecot' => Array(
-						'label' => 'Postfix/Dovecot',
-						'commands_1' => Array(
-							'echo "mail-mta/postfix dovecot-sasl -sasl" >> /etc/portage/package.use',
-              'emerge -av postfix',
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
-							'chmod 0750 ' . $settings['system']['vmail_homedir'],
-							'mv /etc/postfix/main.cf /etc/postfix/main.cf.gentoo',
-							'touch /etc/postfix/main.cf',
-							'touch /etc/postfix/master.cf',
-							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chown root:root /etc/postfix/main.cf',
-							'chown root:root /etc/postfix/master.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chmod 0644 /etc/postfix/main.cf',
-							'chmod 0644 /etc/postfix/master.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
-						),
-						'files' => Array(
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
-							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
-							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
-							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf'
-						),
-						'restart' => Array(
-							'rc-update add postfix default',
-							'/etc/init.d/postfix restart'
-						)
-					),
-					'postfix_mxaccess' => Array(
-						'label' => 'Postfix MX-Access (anti spam)',
-						'files' => Array(
-							'etc_postfix_mx_access' => '/etc/postfix/mx_access',
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf'
-						),
-						'commands_1' => Array(
-							'postmap /etc/postfix/mx_access'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart'
-						)
-					),
 					'dkim' => Array(
 						'label' => 'DomainKey filter',
 						'commands_1' => Array(
-							'emerge dkim-milter',
-							'emerge --config mail-filter/dkim-milter',
 							'mkdir -p /etc/postfix/dkim'
 						),
 						'files' => Array(
-							'dkim-filter.conf' => '/etc/mail/dkim-filter/dkim-filter.conf'
+							'dkim-filter.conf' => '/etc/postfix/dkim/dkim-filter.conf'
 						),
 						'commands_2' => Array(
-							'echo "smtpd_milters = inet:localhost:8891
+							'chgrp postfix /etc/postfix/dkim/dkim-filter.conf',
-milter_macro_daemon_name = SIGNING
+							'echo "smtpd_milters = inet:localhost:8891\n
-milter_default_action = accept" >> /etc/postfix/main.cf'
+milter_macro_daemon_name = SIGNING\n
+milter_default_action = accept\n" >> /etc/postfix/main.cf'
 						),
 						'restart' => Array(
-							'rc-update add dkim-filter default',
+							'/etc/init.d/dkim-filter restart'
-							'/etc/init.d/postfix restart'
 						)
 					)
 				)
@@ -318,11 +266,17 @@ milter_default_action = accept" >> /etc/postfix/main.cf'
 					),
 					'awstats' => Array(
 						'label' => 'Awstats',
-						'commands' => Array(
+						'files' => Array(
-							'emerge awstats',
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_awstats_awstats.model_log_sql.conf.froxlor' : 'etc_awstats_awstats.model.conf.froxlor') => '/etc/awstats/awstats.model.conf.froxlor',
-							'awstats_configure.pl',
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_cron.d_awstats_log_sql' : 'etc_cron.d_awstats') => '/etc/cron.d/awstats',
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							($settings['system']['webserver'] == 'lighttpd' ? 'etc_lighttpd_froxlor-awstats.conf' : 'etc_apache_vhosts_05_awstats.conf') => ($settings['system']['webserver'] == 'lighttpd' ? '/etc/lighttpd/froxlor-awstats.conf' : '/etc/apache2/sites-enabled/05_awstats.conf')
 						),
+						'commands' => Array(
+							($settings['system']['webserver'] == 'lighttpd' ? 'echo "include \"froxlor-awstats.conf\"" >> /etc/lighttpd/lighttpd.conf' : '')
+						),
+						'restart' => Array(
+							($settings['system']['webserver'] == 'lighttpd' ? '/etc/init.d/lighttpd restart' : '/etc/init.d/apache2 restart')
+						)
 					),
 					'libnss' => Array(
 						'label' => 'libnss (system login with mysql)',

lib/configfiles/hardy.inc.php

@@ -29,10 +29,9 @@ return Array(
 						'commands' => Array(
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
 							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
 							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
 							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
-							'a2dismod userdir'
+							'a2dismod userdir',
 						),
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'
@@ -51,13 +50,10 @@ return Array(
 							$configcommand['diroptions'],
 							$configcommand['v_inclighty'],
 							$configcommand['d_inclighty'],
-							'lighty-disable-mod cgi',
-							'lighty-disable-mod fastcgi',
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
 							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
 							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
 						),
 						'restart' => Array(
 							'/etc/init.d/lighttpd restart'
@@ -71,10 +67,8 @@ return Array(
 					'bind' => Array(
 						'label' => 'Bind9',
 						'commands' => Array(
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
-							'chown root:bind ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chmod 0644 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
 						),
 						'restart' => Array(
 							'/etc/init.d/bind9 restart'
@@ -95,26 +89,30 @@ return Array(
 			'smtp' => Array(
 				'label' => $lng['admin']['configfiles']['smtp'],
 				'daemons' => Array(
-					'postfix_courier' => Array(
+					'postfix' => Array(
-						'label' => 'Postfix/Courier',
+						'label' => 'Postfix',
-						'commands' => Array(
+						'commands_1' => Array(
-							'apt-get install postfix postfix-mysql libsasl2-2 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',
 							'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail',
 							'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail',
 							'mkdir -p ' . $settings['system']['vmail_homedir'],
 							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
+							'mv /etc/postfix/main.cf /etc/postfix/main.cf.ubuntu',
+							'touch /etc/postfix/main.cf',
 							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
 							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
 							'touch /etc/postfix/sasl/smtpd.conf',
 							'chown root:root /etc/postfix/main.cf',
+							'chown root:root /etc/postfix/master.cf',
 							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
 							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
 							'chown root:root /etc/postfix/sasl/smtpd.conf',
 							'chmod 0644 /etc/postfix/main.cf',
+							'chmod 0644 /etc/postfix/master.cf',
 							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
 							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
@@ -122,6 +120,7 @@ return Array(
 						),
 						'files' => Array(
 							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
+							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
 							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
 							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
@@ -132,55 +131,6 @@ return Array(
 							'newaliases'
 						)
 					),
-					'postfix_dovecot' => Array(
-						'label' => 'Postfix/Dovecot',
-						'commands' => Array(
-							'apt-get install postfix postfix-mysql',
-							'mkdir -p /var/spool/postfix/etc/pam.d',
-							'mkdir -p /var/spool/postfix/var/run/mysqld',
-							'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail',
-							'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail',
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
-							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chown root:root /etc/postfix/main.cf',
-							'chown root:root /etc/postfix/master.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chmod 0644 /etc/postfix/main.cf',
-							'chmod 0644 /etc/postfix/master.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
-						),
-						'files' => Array(
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
-							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
-							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
-							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
-						)
-					),
-					'postfix_mxaccess' => Array(
-						'label' => 'Postfix MX-Access (anti spam)',
-						'files' => Array(
-							'etc_postfix_mx_access' => '/etc/postfix/mx_access',
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf'
-						),
-						'commands_1' => Array(
-							'postmap /etc/postfix/mx_access'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart'
-						)
-					),
 					'exim4' => Array(
 						'label' => 'Exim4',
 						'commands_1' => Array(
@@ -238,9 +188,6 @@ return Array(
 				'daemons' => Array(
 					'proftpd' => Array(
 						'label' => 'ProFTPd',
-						'commands' => Array(
-							'apt-get install proftpd-basic proftpd-mod-mysql'
-						),
 						'files' => Array(
 							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
 							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
@@ -295,12 +242,17 @@ return Array(
 					),
 					'awstats' => Array(
 						'label' => 'Awstats',
-						'commands' => Array(
+						'files' => Array(
-							'apt-get install awstats',
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_awstats_awstats.model_log_sql.conf.froxlor' : 'etc_awstats_awstats.model.conf.froxlor') => '/etc/awstats/awstats.model.conf.froxlor',
-							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/',
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_cron.d_awstats_log_sql' : 'etc_cron.d_awstats') => '/etc/cron.d/awstats',
-							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							($settings['system']['webserver'] == 'lighttpd' ? 'etc_lighttpd_froxlor-awstats.conf' : 'etc_apache_vhosts_05_awstats.conf') => ($settings['system']['webserver'] == 'lighttpd' ? '/etc/lighttpd/froxlor-awstats.conf' : '/etc/apache2/sites-enabled/05_awstats.conf')
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						),
+						'commands' => Array(
+							($settings['system']['webserver'] == 'lighttpd' ? 'echo "include \"froxlor-awstats.conf\"" >> /etc/lighttpd/lighttpd.conf' : '')
+						),
+						'restart' => Array(
+							($settings['system']['webserver'] == 'lighttpd' ? '/etc/init.d/lighttpd restart' : '/etc/init.d/apache2 restart')
+						)
 					),
 					'libnss' => Array(
 						'label' => 'libnss (system login with mysql)',

lib/configfiles/lenny.inc.php

@@ -29,10 +29,9 @@ return Array(
 						'commands' => Array(
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
 							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
 							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
 							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
-							'a2dismod userdir'
+							'a2dismod userdir',
 						),
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'
@@ -51,13 +50,10 @@ return Array(
 							$configcommand['diroptions'],
 							$configcommand['v_inclighty'],
 							$configcommand['d_inclighty'],
-							'lighty-disable-mod cgi',
-							'lighty-disable-mod fastcgi',
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
 							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
 							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
 						),
 						'restart' => Array(
 							'/etc/init.d/lighttpd restart'
@@ -72,10 +68,8 @@ return Array(
 						'label' => 'Bind9',
 						'commands' => Array(
 							'apt-get install bind9',
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
-							'chown root:bind ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chmod 0644 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
 						),
 						'restart' => Array(
 							'/etc/init.d/bind9 restart'
@@ -96,10 +90,11 @@ return Array(
 			'smtp' => Array(
 				'label' => $lng['admin']['configfiles']['smtp'],
 				'daemons' => Array(
-					'postfix_courier' => Array(
+					'postfix' => Array(
-						'label' => 'Postfix/Courier',
+						'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',
 							'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail',
@@ -111,11 +106,13 @@ return Array(
 							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
 							'touch /etc/postfix/sasl/smtpd.conf',
 							'chown root:root /etc/postfix/main.cf',
+							'chown root:root /etc/postfix/master.cf',
 							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
 							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
 							'chown root:root /etc/postfix/sasl/smtpd.conf',
 							'chmod 0644 /etc/postfix/main.cf',
+							'chmod 0644 /etc/postfix/master.cf',
 							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
 							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
@@ -123,6 +120,7 @@ return Array(
 						),
 						'files' => Array(
 							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
+							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
 							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
 							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
@@ -133,55 +131,6 @@ return Array(
 							'newaliases'
 						)
 					),
-					'postfix_dovecot' => Array(
-						'label' => 'Postfix/Dovecot',
-						'commands' => Array(
-							'apt-get install postfix postfix-mysql',
-							'mkdir -p /var/spool/postfix/etc/pam.d',
-							'mkdir -p /var/spool/postfix/var/run/mysqld',
-							'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail',
-							'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail',
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
-							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chown root:root /etc/postfix/main.cf',
-							'chown root:root /etc/postfix/master.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chmod 0644 /etc/postfix/main.cf',
-							'chmod 0644 /etc/postfix/master.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
-						),
-						'files' => Array(
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
-							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
-							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
-							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
-						)
-					),
-					'postfix_mxaccess' => Array(
-						'label' => 'Postfix MX-Access (anti spam)',
-						'files' => Array(
-							'etc_postfix_mx_access' => '/etc/postfix/mx_access',
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf'
-						),
-						'commands_1' => Array(
-							'postmap /etc/postfix/mx_access'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart'
-						)
-					),
 					'exim4' => Array(
 						'label' => 'Exim4',
 						'commands_1' => Array(
@@ -242,9 +191,6 @@ return Array(
 				'daemons' => Array(
 					'proftpd' => Array(
 						'label' => 'ProFTPd',
-						'commands' => Array(
-							'apt-get install proftpd-basic proftpd-mod-mysql'
-						),
 						'files' => Array(
 							'etc_proftpd_sql.conf' => '/etc/proftpd/sql.conf',
 							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
@@ -303,12 +249,17 @@ return Array(
 					),
 					'awstats' => Array(
 						'label' => 'Awstats',
-						'commands' => Array(
+						'files' => Array(
-							'apt-get install awstats',
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_awstats_awstats.model_log_sql.conf.froxlor' : 'etc_awstats_awstats.model.conf.froxlor') => '/etc/awstats/awstats.model.conf.froxlor',
-							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/',
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_cron.d_awstats_log_sql' : 'etc_cron.d_awstats') => '/etc/cron.d/awstats',
-							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							($settings['system']['webserver'] == 'lighttpd' ? 'etc_lighttpd_froxlor-awstats.conf' : 'etc_apache_vhosts_05_awstats.conf') => ($settings['system']['webserver'] == 'lighttpd' ? '/etc/lighttpd/froxlor-awstats.conf' : '/etc/apache2/sites-enabled/05_awstats.conf')
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						),
+						'commands' => Array(
+							($settings['system']['webserver'] == 'lighttpd' ? 'echo "include \"froxlor-awstats.conf\"" >> /etc/lighttpd/lighttpd.conf' : '')
+						),
+						'restart' => Array(
+							($settings['system']['webserver'] == 'lighttpd' ? '/etc/init.d/lighttpd restart' : '/etc/init.d/apache2 restart')
+						)
 					),
 					'libnss' => Array(
 						'label' => 'libnss (system login with mysql)',

lib/configfiles/lucid.inc.php

@@ -1,335 +0,0 @@
-<?php
-
-/**
- * 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.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @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    Configfiles
- * @version    $Id: lenny.inc.php 860 2010-04-30 16:38:02Z Dessa $
- */
-
-return Array(
-	'ubuntu_lucid' => Array(
-		'label' => 'Ubuntu 10.04 (Lucid)',
-		'services' => Array(
-			'http' => Array(
-				'label' => $lng['admin']['configfiles']['http'],
-				'daemons' => Array(
-					'apache2' => Array(
-						'label' => 'Apache 2',
-						'commands' => Array(
-							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
-							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
-							'a2dismod userdir'
-						),
-						'restart' => Array(
-							'/etc/init.d/apache2 restart'
-						),
-					),
-					'lighttpd' => Array(
-						'label' => 'Lighttpd Webserver',
-						'commands_1' => Array(
-							'apt-get install lighttpd',
-						),
-						'files' => Array(
-							'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf',
-						),
-						'commands_2' => Array(
-							$configcommand['vhost'],
-							$configcommand['diroptions'],
-							$configcommand['v_inclighty'],
-							$configcommand['d_inclighty'],
-							'lighty-disable-mod cgi',
-							'lighty-disable-mod fastcgi',
-							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
-							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
-						),
-						'restart' => Array(
-							'/etc/init.d/lighttpd restart'
-						)
-					)
-				)
-			),
-			'dns' => Array(
-				'label' => $lng['admin']['configfiles']['dns'],
-				'daemons' => Array(
-					'bind' => Array(
-						'label' => 'Bind9',
-						'commands' => Array(
-							'apt-get install bind9',
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chown root:bind ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chmod 0644 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/bind9 restart'
-						)
-					),
-					'powerdns' => Array(
-						'label' => 'PowerDNS',
-						'files' => Array(
-							'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf',
-							'etc_powerdns_pdns-froxlor.conf' => '/etc/powerdns/pdns_froxlor.conf',
-						),
-						'restart' => Array(
-							'/etc/init.d/pdns restart'
-						)
-					),
-				)
-			),
-			'smtp' => Array(
-				'label' => $lng['admin']['configfiles']['smtp'],
-				'daemons' => Array(
-					'postfix_courier' => Array(
-						'label' => 'Postfix/Courier',
-						'commands' => Array(
-							'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql',
-							'mkdir -p /var/spool/postfix/etc/pam.d',
-							'mkdir -p /var/spool/postfix/var/run/mysqld',
-							'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail',
-							'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail',
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
-							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'touch /etc/postfix/sasl/smtpd.conf',
-							'chown root:root /etc/postfix/main.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chown root:root /etc/postfix/sasl/smtpd.conf',
-							'chmod 0644 /etc/postfix/main.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chmod 0600 /etc/postfix/sasl/smtpd.conf',
-						),
-						'files' => Array(
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
-							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
-							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
-						)
-					),
-					'postfix_dovecot' => Array(
-						'label' => 'Postfix/Dovecot',
-						'commands' => Array(
-							'apt-get install postfix postfix-mysql',
-							'mkdir -p /var/spool/postfix/etc/pam.d',
-							'mkdir -p /var/spool/postfix/var/run/mysqld',
-							'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail',
-							'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail',
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
-							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chown root:root /etc/postfix/main.cf',
-							'chown root:root /etc/postfix/master.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chmod 0644 /etc/postfix/main.cf',
-							'chmod 0644 /etc/postfix/master.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
-						),
-						'files' => Array(
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
-							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
-							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
-							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
-						)
-					),
-					'postfix_mxaccess' => Array(
-						'label' => 'Postfix MX-Access (anti spam)',
-						'files' => Array(
-							'etc_postfix_mx_access' => '/etc/postfix/mx_access',
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf'
-						),
-						'commands_1' => Array(
-							'postmap /etc/postfix/mx_access'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart'
-						)
-					),
-					'exim4' => Array(
-						'label' => 'Exim4',
-						'commands_1' => Array(
-							'dpkg-reconfigure exim4-config',
-							'# choose "no configuration at this time" and "splitted configuration files" in the dialog'
-						),
-						'files' => Array(
-							'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul',
-							'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config',
-							'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options',
-							'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config',
-							'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config'
-						),
-						'commands_2' => Array(
-							'chmod o-rx /var/lib/exim4',
-							'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options'
-						),
-						'restart' => Array(
-							'/etc/init.d/exim4 restart'
-						)
-					)
-				)
-			),
-			'mail' => Array(
-				'label' => $lng['admin']['configfiles']['mail'],
-				'daemons' => Array(
-					'courier' => Array(
-						'label' => 'Courier',
-						'commands' => Array(
-							'apt-get install courier-pop courier-imap courier-authlib-mysql'
-						),
-						'files' => Array(
-							'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc',
-							'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc'
-						),
-						'restart' => Array(
-							'/etc/init.d/courier-authdaemon restart',
-							'/etc/init.d/courier-pop restart'
-						)
-					),
-					'dovecot' => Array(
-						'label' => 'Dovecot',
-						'commands' => Array(
-							'apt-get install dovecot-imapd dovecot-pop3d dovecot-postfix'
-						),
-						'files' => Array(
-							'etc_dovecot_auth.d_01-dovecot-postfix.auth' => '/etc/dovecot/auth.d/01-dovecot-postfix.auth',
-							'etc_dovecot_conf.d_01-dovecot-postfix.conf' => '/etc/dovecot/conf.d/01-dovecot-postfix.conf',
-							'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/dovecot restart'
-						)
-					)
-				)
-			),
-			'ftp' => Array(
-				'label' => $lng['admin']['configfiles']['ftp'],
-				'daemons' => Array(
-					'proftpd' => Array(
-						'label' => 'ProFTPd',
-						'commands' => Array(
-							'apt-get install proftpd-basic proftpd-mod-mysql'
-						),
-						'files' => Array(
-							'etc_proftpd_sql.conf' => '/etc/proftpd/sql.conf',
-							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
-							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/proftpd restart'
-						)
-					),
-					'pure-ftpd' => Array(
-						'label' => 'Pure FTPd',
-						'commands' => Array(
-							'apt-get install pure-ftpd-common pure-ftpd-mysql'
-						),
-						'files' => Array(
-							'etc_pure-ftpd_conf_MinUID' => '/etc/pure-ftpd/conf/MinUID',
-							'etc_pure-ftpd_conf_MySQLConfigFile' => '/etc/pure-ftpd/conf/MySQLConfigFile',
-							'etc_pure-ftpd_conf_NoAnonymous' => '/etc/pure-ftpd/conf/NoAnonymous',
-							'etc_pure-ftpd_conf_MaxIdleTime' => '/etc/pure-ftpd/conf/MaxIdleTime',
-							'etc_pure-ftpd_conf_ChrootEveryone' => '/etc/pure-ftpd/conf/ChrootEveryone',
-							'etc_pure-ftpd_conf_PAMAuthentication' => '/etc/pure-ftpd/conf/PAMAuthentication',
-							'etc_pure-ftpd_db_mysql.conf' => '/etc/pure-ftpd/db/mysql.conf',
-							'etc_pure-ftpd_conf_CustomerProof' => '/etc/pure-ftpd/conf/CustomerProof',
-							'etc_pure-ftpd_conf_Bind' => '/etc/pure-ftpd/conf/Bind',
-							'etc_default_pure-ftpd-common' => '/etc/default/pure-ftpd-common'
-						),
-						'restart' => Array(
-							'/etc/init.d/pure-ftpd-mysql restart'
-						)
-					),
-				)
-			),
-			'etc' => Array(
-				'label' => $lng['admin']['configfiles']['etc'],
-				'daemons' => Array(
-					'cron' => Array(
-						'label' => 'Crond (cronscript)',
-						'files' => Array(
-							'etc_cron.d_froxlor' => '/etc/cron.d/froxlor'
-						),
-						'restart' => Array(
-							'/etc/init.d/cron restart'
-						)
-					),
-					'xinetd' => Array(
-						'label' => 'xinet.d (froxlor updates in realtime)',
-						'commands' => Array(
-							'apt-get install xinetd'
-						),
-						'files' => Array(
-							'etc_xinet.d_froxlor' => '/etc/xinetd.d/froxlor'
-						),
-						'restart' => Array(
-							'/etc/init.d/xinetd restart'
-						)
-					),
-					'awstats' => Array(
-						'label' => 'Awstats',
-						'commands' => Array(
-							'apt-get install awstats',
-							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/',
-							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
-						),
-					),
-					'libnss' => Array(
-						'label' => 'libnss (system login with mysql)',
-						'commands' => Array(
-							'apt-get install libnss-mysql nscd',
-							'chmod 600 /etc/nss-mysql.conf /etc/nss-mysql-root.conf'
-						),
-						'files' => Array(
-							'etc_nss-mysql.conf' => '/etc/nss-mysql.conf',
-							'etc_nss-mysql-root.conf' => '/etc/nss-mysql-root.conf',
-							'etc_nsswitch.conf' => '/etc/nsswitch.conf',
-						),
-						'restart' => Array(
-							'/etc/init.d/nscd restart'
-						)
-					)
-				)
-			)
-		)
-	)
-);
-
-?>

lib/configfiles/suse10.inc.php

@@ -31,8 +31,7 @@ return Array(
 							$configcommand['diroptions'],
 							$configcommand['include'],
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							'mkdir -p ' . $settings['system']['logfiles_directory']
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : ''
 						),
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'
@@ -46,10 +45,8 @@ return Array(
 					'bind' => Array(
 						'label' => 'Bind9',
 						'commands' => Array(
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
-							'chown named:0 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chmod 0600 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
 						),
 						'restart' => Array(
 							'/etc/init.d/named restart'
@@ -91,19 +88,6 @@ return Array(
 						'restart' => Array(
 							'/etc/init.d/postfix restart'
 						)
-					),
-					'postfix_mxaccess' => Array(
-						'label' => 'Postfix MX-Access (anti spam)',
-						'files' => Array(
-							'etc_postfix_mx_access' => '/etc/postfix/mx_access',
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf'
-						),
-						'commands_1' => Array(
-							'postmap /etc/postfix/mx_access'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart'
-						)
 					)
 				)
 			),
@@ -152,10 +136,16 @@ return Array(
 					),
 					'awstats' => Array(
 						'label' => 'Awstats',
+						'files' => Array(
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_awstats_awstats.model_log_sql.conf.froxlor' : 'etc_awstats_awstats.model.conf.froxlor') => '/etc/awstats/awstats.model.conf.froxlor',
+							($settings['system']['mod_log_sql'] == 1 ? 'etc_cron.d_awstats_log_sql' : 'etc_cron.d_awstats') => '/etc/cron.d/awstats',
+							($settings['system']['webserver'] == 'lighttpd' ? 'etc_lighttpd_froxlor-awstats.conf' : 'etc_apache_vhosts_05_awstats.conf') => ($settings['system']['webserver'] == 'lighttpd' ? '/etc/lighttpd/froxlor-awstats.conf' : '/etc/apache2/sites-enabled/05_awstats.conf')
+						),
 						'commands' => Array(
-							'awstats_configure.pl',
+							($settings['system']['webserver'] == 'lighttpd' ? 'echo "include \"froxlor-awstats.conf\"" >> /etc/lighttpd/lighttpd.conf' : '')
-							makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+						),
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+						'restart' => Array(
+							($settings['system']['webserver'] == 'lighttpd' ? '/etc/init.d/lighttpd restart' : '/etc/init.d/apache2 restart')
 						)
 					)
 				)

lib/configfiles_index.inc.php

@@ -45,6 +45,6 @@ else
 
 $cfgPath = 'lib/configfiles/';
 $configfiles = Array();
-$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'etch.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php');
+$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'etch.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php');
 
 ?>

lib/cron_init.php

@@ -24,12 +24,6 @@ if(@php_sapi_name() != 'cli'
 	die('This script will only work in the shell.');
 }
 
-// ensure that default timezone is set
-if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
-{
-	@date_default_timezone_set(@date_default_timezone_get());
-}
-
 $lockdir = '/var/run/';
 $lockFilename = 'froxlor_' . basename($_SERVER['PHP_SELF'], '.php') . '.lock-';
 $lockfName = $lockFilename . getmypid();
@@ -75,7 +69,7 @@ while($fName = readdir($lockDirHandle))
 		// Check if cron is running or has died.
 
 		$check_pid = substr(strstr($fName, "-"), 1);
-		system("kill -CHLD " . (int)$check_pid . " 1> /dev/null 2> /dev/null", $check_pid_return);
+		system("kill -CHLD " . $check_pid . " 1> /dev/null 2> /dev/null", $check_pid_return);
 
 		if($check_pid_return == 1)
 		{

lib/functions/aps/function.domainHasApsInstances.php

@@ -1,45 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Language
- * @version    $Id$
- */
-
-/**
- * Function domainHasApsInstances
- *
- * Checks if a given domain id
- * is used for APS instances
- * (if APS enabled, else always false)
- *
- * @param int domain-id
- *
- * @return boolean
- */
-function domainHasApsInstances($domainid = 0)
-{
-	global $db, $settings;
-	
-	if($settings['aps']['aps_active'] == '1')
-	{
-		if($domainid > 0)
-		{
-			$instances = $db->query_first("SELECT COUNT(`ID`) AS `count` FROM `" . TABLE_APS_SETTINGS . "` WHERE `Name`='main_domain' AND `Value`='" . (int)$domainid . "'");
-			if((int)$instances['count'] != 0)
-			{
-				return true;
-			}
-		}
-	}
-	return false;
-}

lib/functions/aps/function.getXPathValue.php

@@ -1,30 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    APS
- * @version    $Id$
- */
-
-function getXPathValue($xmlobj = null, $path = null, $single = true)
-{
-	$result = null;
-	
-	$tmpxml = new DynamicProperties;
-	$tmpxml = ($xmlobj->xpath($path)) ? $xmlobj->xpath($path) : false;
-
-	if($result !== false)
-	{
-		$result = ($single == true) ? (string)$tmpxml[0] : $tmpxml;
-	}
-	return $result;
-}

lib/functions/filedir/function.isConfigDir.php

@@ -27,7 +27,7 @@
  * @author Florian Lippert <flo@syscp.org>
  */
 
-function isConfigDir($dir, $ifexists = false)
+function isConfigDir($dir)
 {
 	if(file_exists($dir))
 	{
@@ -42,16 +42,9 @@ function isConfigDir($dir, $ifexists = false)
 	}
 	else
 	{
-		if(!$ifexists)
+		if(substr($dir, -1) == '/')
 		{
-			if(substr($dir, -1) == '/')
+			$returnval = true;
-			{
-				$returnval = true;
-			}
-			else
-			{
-				$returnval = false;
-			}
 		}
 		else
 		{

lib/functions/filedir/function.makePathfield.php

@@ -20,12 +20,10 @@
 /**
  * Returns a valid html tag for the choosen $fieldType for pathes
  *
- * @param string  path      The path to start searching in
+ * @param  string   path       The path to start searching in
- * @param integer uid       The uid which must match the found directories
+ * @param  integer  uid        The uid which must match the found directories
- * @param integer gid       The gid which must match the found direcotries
+ * @param  integer  gid        The gid which must match the found direcotries
- * @param string  fieldType Either "Manual" or "Dropdown"
+ * @param  string   fieldType  Either "Manual" or "Dropdown"
- * @param string  value     the value for the input-field
- * 
  * @return string   The html tag for the choosen $fieldType
  *
  * @author Martin Burchert  <martin.burchert@syscp.de>
@@ -40,23 +38,17 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
 
 	if($fieldType == 'Manual')
 	{
-		$field = '<input type="text" name="path" value="' . htmlspecialchars($value) . '" />';
+		$field = '<input type="text" name="path" value="' . htmlspecialchars($value) . '" size="30" />';
 	}
 	elseif($fieldType == 'Dropdown')
 	{
-		// path is given without starting slash
-		// but dirList holds the paths with starting slash
-		// so we just add one here to get the correct
-		// default path selected, #225
-		$value = '/'.$value;
-
 		$dirList = findDirs($path, $uid, $gid);
 		
 		natcasesort($dirList);
 
 		if(sizeof($dirList) > 0)
 		{
-			if(sizeof($dirList) <= 100)
+			if(sizeof(dirList) <= 100)
 			{
 				$field = '<select name="path">';
 				foreach($dirList as $key => $dir)
@@ -72,11 +64,8 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
 			}
 			else
 			{
-				// remove starting slash we added
-				// for the Dropdown, #225
-				$value = substr($value, 1);
 				$field = $lng['panel']['toomanydirs'];
-				$field.= '<input type="text" name="path" value="' . htmlspecialchars($value) . '" />';
+				$field.= '<input type="text" name="path" value="' . htmlspecialchars($value) . '" size="30" />';
 			}
 		}
 		else

lib/functions/filedir/function.mkDirWithCorrectOwnership.php

@@ -26,16 +26,13 @@
  * @param  string The dir which should be created
  * @param  int    The uid of the user
  * @param  int    The gid of the user
- * @param  bool   Place standard-index.html into the new folder
- * @param  bool   Allow creating a directory out of the customers docroot
- * 
  * @return bool   true if everything went okay, false if something went wrong
  *
  * @author Florian Lippert <flo@syscp.org>
  * @author Martin Burchert <martin.burchert@syscp.org>
  */
 
-function mkDirWithCorrectOwnership($homeDir, $dirToCreate, $uid, $gid, $placeindex = false, $allow_notwithinhomedir = false)
+function mkDirWithCorrectOwnership($homeDir, $dirToCreate, $uid, $gid)
 {
 	$returncode = true;
 
@@ -48,33 +45,24 @@ function mkDirWithCorrectOwnership($homeDir, $dirToCreate, $uid, $gid, $placeind
 		if(substr($dirToCreate, 0, strlen($homeDir)) == $homeDir)
 		{
 			$subdir = substr($dirToCreate, strlen($homeDir));
-			$within_homedir = true;
 		}
 		else
 		{
 			$subdir = $dirToCreate;
-			$within_homedir = false;
 		}
 
 		$subdir = makeCorrectDir($subdir);
+		$subdirlen = strlen($subdir);
 		$subdirs = array();
+		array_push($subdirs, $dirToCreate);
+		$offset = 0;
 
-		if($within_homedir || !$allow_notwithinhomedir)
+		while($offset < $subdirlen)
 		{
-			$subdirlen = strlen($subdir);
+			$offset = strpos($subdir, '/', $offset);
-			$offset = 0;
+			$subdirelem = substr($subdir, 0, $offset);
-	
+			$offset++;
-			while($offset < $subdirlen)
+			array_push($subdirs, makeCorrectDir($homeDir . $subdirelem));
-			{
-				$offset = strpos($subdir, '/', $offset);
-				$subdirelem = substr($subdir, 0, $offset);
-				$offset++;
-				array_push($subdirs, makeCorrectDir($homeDir . $subdirelem));
-			}
-		}
-		else
-		{
-			array_push($subdirs, $dirToCreate);
 		}
 
 		$subdirs = array_unique($subdirs);
@@ -85,17 +73,6 @@ function mkDirWithCorrectOwnership($homeDir, $dirToCreate, $uid, $gid, $placeind
 			{
 				$sdir = makeCorrectDir($sdir);
 				safe_exec('mkdir -p ' . escapeshellarg($sdir));
-				
-				/**
-				 * #68
-				 */
-				if ($placeindex) {
-					$loginname = getLoginNameByUid($uid);
-					if ($loginname !== false) {
-						storeDefaultIndex($loginname, $sdir, null);
-					}
-				}
-
 				safe_exec('chown -R ' . (int)$uid . ':' . (int)$gid . ' ' . escapeshellarg($sdir));
 			}
 		}

lib/functions/filedir/function.safe_exec.php

@@ -51,12 +51,11 @@ function safe_exec($exec_string, &$return_value = false)
 		$settings['system']['apachereload_command'],
 		$settings['system']['bindreload_command'],
 		$settings['dkim']['dkimrestart_command'],
+		$settings['system']['awstats_updateall_command'],
 		'openssl',
 		'unzip',
 		'php',
-		'rm',
+		'rm'
-		'awstats_buildstaticpages.pl',
-		'ln'
 	);
 
 	//
@@ -76,8 +75,6 @@ function safe_exec($exec_string, &$return_value = false)
 		die('SECURITY CHECK FAILED!' . "\n" . 'The execute string "' . htmlspecialchars($exec_string) . '" is a possible security risk!' . "\n" . 'Please check your whole server for security problems by hand!' . "\n");
 	}
 
-	/*
-	 * This is not needed anymore, we allow all commands and just check for pipes and stuff
 	//
 	// check if command is allowed here
 	//
@@ -85,7 +82,7 @@ function safe_exec($exec_string, &$return_value = false)
 	$ok = false;
 	foreach($allowed_commands as $allowed_command)
 	{
-		if(strpos($exec_string, $allowed_command) === 0
+		if(strpos($exec_string, $allowed_command) == 0
 		   && (strlen($exec_string) === ($allowed_command_pos = strlen($allowed_command)) || substr($exec_string, $allowed_command_pos, 1) === ' '))
 		{
 			$ok = true;
@@ -96,7 +93,6 @@ function safe_exec($exec_string, &$return_value = false)
 	{
 		die('SECURITY CHECK FAILED!' . "\n" . 'Your command "' . htmlspecialchars($exec_string) . '" is not allowed!' . "\n" . 'Please check your whole server for security problems by hand!' . "\n");
 	}
-	*/
 
 	//
 	// execute the command and return output

lib/functions/filedir/function.storeDefaultIndex.php

@@ -1,50 +0,0 @@
-<?php
-
-/**
- * store the default index-file in a given destination folder
- * 
- * @param string  $loginname   customers loginname
- * @param string  $destination path where to create the file
- * @param object  $logger      FroxlorLogger object
- * @param boolean $force       force creation whatever the settings say (needed for task #2, create new user)
- * 
- * @return null
- */
-function storeDefaultIndex($loginname = null, $destination = null, $logger = null, $force = false)
-{
-	global $db, $settings, $pathtophpfiles;
-
-	if ($force
-		|| (int)$settings['system']['store_index_file_subs'] == 1
-	) {
-		$result = $db->query("SELECT `t`.`value`, `c`.`email` AS `customer_email`, `a`.`email` AS `admin_email`, `c`.`loginname` AS `customer_login`, `a`.`loginname` AS `admin_login` FROM `" . TABLE_PANEL_CUSTOMERS . "` AS `c` INNER JOIN `" . TABLE_PANEL_ADMINS . "` AS `a` ON `c`.`adminid` = `a`.`adminid` INNER JOIN `" . TABLE_PANEL_TEMPLATES . "` AS `t` ON `a`.`adminid` = `t`.`adminid` WHERE `varname` = 'index_html' AND `c`.`loginname` = '" . $db->escape($loginname) . "'");
-	
-		if($db->num_rows($result) > 0)
-		{
-			$template = $db->fetch_array($result);
-			$replace_arr = array(
-				'SERVERNAME' => $settings['system']['hostname'],
-				'CUSTOMER' => $template['customer_login'],
-				'ADMIN' => $template['admin_login'],
-				'CUSTOMER_EMAIL' => $template['customer_email'],
-				'ADMIN_EMAIL' => $template['admin_email']
-			);
-			$htmlcontent = replace_variables($template['value'], $replace_arr);
-			$indexhtmlpath = makeCorrectFile($destination . '/index.' . $settings['system']['index_file_extension']);
-			$index_html_handler = fopen($indexhtmlpath, 'w');
-			fwrite($index_html_handler, $htmlcontent);
-			fclose($index_html_handler);
-			if ($logger !== null) {
-				$logger->logAction(CRON_ACTION, LOG_NOTICE, 'Creating \'index.' . $settings['system']['index_file_extension'] . '\' for Customer \'' . $template['customer_login'] . '\' based on template in directory ' . escapeshellarg($indexhtmlpath));
-			}
-		}
-		else
-		{
-			if ($logger !== null) {
-				$logger->logAction(CRON_ACTION, LOG_NOTICE, 'Running: cp -a ' . $pathtophpfiles . '/templates/misc/standardcustomer/* ' . escapeshellarg($destination));
-			}
-			safe_exec('cp -a ' . $pathtophpfiles . '/templates/misc/standardcustomer/* ' . escapeshellarg($destination));
-		}
-	}
-	return;
-}

lib/functions/formfields/bool/function.getFormFieldDataBool.php

@@ -17,7 +17,7 @@
  * @version    $Id$
  */
 
-function getFormFieldDataBool($fieldname, $fielddata, &$input)
+function getFormFieldDataBool($fieldname, $fielddata, $input)
 {
 	if(isset($input[$fieldname]) && ($input[$fieldname] === '1' || $input[$fieldname] === 1 || $input[$fieldname] === true || strtolower($input[$fieldname]) === 'yes' || strtolower($input[$fieldname]) === 'ja'))
 	{

lib/functions/formfields/function.buildFormEx.php

@@ -1,62 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- * @version    $Id $
- */
-
-function buildFormEx($form, $part = '')
-{
-	$fields = '';
-
-	if(validateFormDefinition($form))
-	{
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			// show overview
-			if($part == '')
-			{
-				if(isset($groupdetails['title']) && $groupdetails['title'] != '')
-				{
-					$fields .= getFormOverviewGroupOutput($groupname, $groupdetails);
-				}
-			}
-			// only show one section
-			elseif($part != '' && ($groupname == $part || $part == 'all'))
-			{
-				if(isset($groupdetails['title']) && $groupdetails['title'] != '')
-				{
-					$fields .= getFormGroupOutput($groupname, $groupdetails);
-				}
-				
-				if(validateFieldDefinition($groupdetails))
-				{
-					// Prefetch form fields
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
-						$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
-					}
-	
-					// Collect form field output
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						$fields .= getFormFieldOutput($fieldname, $fielddetails);
-					}
-				}
-			}
-		}
-	}
-
-	return $fields;
-}

lib/functions/formfields/function.getFormFieldData.php

@@ -17,11 +17,11 @@
  * @version    $Id$
  */
 
-function getFormFieldData($fieldname, $fielddata, &$input)
+function getFormFieldData($fieldname, $fielddata, $input)
 {
 	if(is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('getFormFieldData' . ucfirst($fielddata['type'])))
 	{
-		$newfieldvalue = call_user_func('getFormFieldData' . ucfirst($fielddata['type']), $fieldname, $fielddata, $input);
+		$newfieldvalue = call_user_func('getFormFieldData' . ucfirst($fielddata['type']), $fieldname, $fielddata, &$input);
 	}
 	else
 	{

lib/functions/formfields/function.getFormGroupOutput.php

@@ -23,54 +23,3 @@ function getFormGroupOutput($groupname, $groupdetails)
 	eval("\$group = \"" . getTemplate("settings/settings_group") . "\";");
 	return $group;
 }
-
-function getFormOverviewGroupOutput($groupname, $groupdetails)
-{
-	global $lng, $settings, $filename, $s;
-	
-	$group = '';
-	$title = $groupdetails['title'];
-	$part = $groupname;
-
-	$activated = true;
-	$option = '';
-	if(isset($groupdetails['fields']))
-	{
-		foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-		{
-			if(isset($fielddetails['overview_option'])
-				&& $fielddetails['overview_option'] == true
-			) {
-				if($fielddetails['type'] != 'option'
-					&& $fielddetails['type'] != 'bool')
-				{
-					standard_error('overviewsettingoptionisnotavalidfield');
-				}
-
-				if($fielddetails['type'] == 'option')
-				{
-					$options_array = $fielddetails['option_options'];		
-					$options = '';
-					foreach($options_array as $value => $vtitle)
-					{
-						$options .= makeoption($vtitle, $value, $settings[$fielddetails['settinggroup']][$fielddetails['varname']]);
-					}
-					$option.= $fielddetails['label'].': ';
-					$option.= '<select class="dropdown_noborder" name="'.$fieldname.'">';
-					$option.= $options;
-					$option.= '</select>';
-					$activated = true;
-				}
-				else
-				{
-					$option.= $lng['admin']['activated'].':&nbsp;';
-					$option.= makeyesno($fieldname, '1', '0', $settings[$fielddetails['settinggroup']][$fielddetails['varname']]);
-					$activated = (int)$settings[$fielddetails['settinggroup']][$fielddetails['varname']];
-				}
-			}
-		}
-	}
-
-	eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";");
-	return $group;
-}

lib/functions/formfields/function.processForm.php

@@ -17,7 +17,7 @@
  * @version    $Id$
  */
 
-function processForm(&$form, &$input, $url_params = array())
+function processForm($form, $input, $url_params = array())
 {
 	if(validateFormDefinition($form))
 	{
@@ -45,7 +45,7 @@ function processForm(&$form, &$input, $url_params = array())
 				// Validate fields
 				foreach($groupdetails['fields'] as $fieldname => $fielddetails)
 				{
-					$newfieldvalue = getFormFieldData($fieldname, $fielddetails, $input);
+					$newfieldvalue = getFormFieldData($fieldname, $fielddetails, &$input);
 			
 					if($newfieldvalue != $fielddetails['value'])
 					{
@@ -143,166 +143,3 @@ function processForm(&$form, &$input, $url_params = array())
 		return saveForm($form, $saved_fields);
 	}
 }
-
-function processFormEx(&$form, &$input, $url_params = array(), $part, $settings_all, $settings_part, $only_enabledisable)
-{
-	if(validateFormDefinition($form))
-	{
-		$submitted_fields = array();
-		$changed_fields = array();
-		$saved_fields = array();
-
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(($settings_part && $part == $groupname)
-				|| $settings_all
-				|| $only_enabledisable
-			){
-				if(validateFieldDefinition($groupdetails))
-				{
-					// Prefetch form fields
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						if(!$only_enabledisable
-							|| ($only_enabledisable && isset($fielddetails['overview_option']))
-						) {
-							$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
-							$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
-						}
-					}
-				}
-			}
-		}
-		
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(($settings_part && $part == $groupname)
-				|| $settings_all
-				|| $only_enabledisable
-			){			
-				if(validateFieldDefinition($groupdetails))
-				{
-					// Validate fields
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						if(!$only_enabledisable
-							|| ($only_enabledisable && isset($fielddetails['overview_option']))
-						) {
-							$newfieldvalue = getFormFieldData($fieldname, $fielddetails, $input);
-					
-							if($newfieldvalue != $fielddetails['value'])
-							{
-								if(($error = validateFormField($fieldname, $fielddetails, $newfieldvalue)) !== true)
-								{
-									standard_error($error, $fieldname);
-								}
-								else
-								{
-									$changed_fields[$fieldname] = $newfieldvalue;
-								}
-							}
-		
-							$submitted_fields[$fieldname] = $newfieldvalue;
-						}
-					}
-				}
-			}
-		}
-
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(($settings_part && $part == $groupname)
-				|| $settings_all
-				|| $only_enabledisable
-			){
-				if(validateFieldDefinition($groupdetails))
-				{
-					// Check fields for plausibility
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						if(!$only_enabledisable
-							|| ($only_enabledisable && isset($fielddetails['overview_option']))
-						) {
-							if(($plausibility_check = checkPlausibilityFormField($fieldname, $fielddetails, $submitted_fields[$fieldname], $submitted_fields)) !== false)
-							{
-								if(is_array($plausibility_check) && isset($plausibility_check[0]))
-								{
-									if($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_OK)
-									{
-										// Nothing to do here, everything's okay
-									}
-									elseif($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_ERROR)
-									{
-										unset($plausibility_check[0]);
-										$error = $plausibility_check[1];
-										unset($plausibility_check[1]);
-										$targetname = implode(' ', $plausibility_check);
-										standard_error($error, $targetname);
-									}
-									elseif($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_QUESTION)
-									{
-										unset($plausibility_check[0]);
-										$question = $plausibility_check[1];
-										unset($plausibility_check[1]);
-										$targetname = implode(' ', $plausibility_check);
-										if(!isset($input[$question]))
-										{
-											if(is_array($url_params) && isset($url_params['filename']))
-											{
-												$filename = $url_params['filename'];
-												unset($url_params['filename']);
-											}
-											else
-											{
-												$filename = '';
-											}
-											ask_yesno($question, $filename, array_merge($url_params, $submitted_fields, array($question => $question)), $targetname);
-										}
-									}
-									else
-									{
-										standard_error('plausibilitychecknotunderstood');
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(($settings_part && $part == $groupname)
-				|| $settings_all
-				|| $only_enabledisable
-			){
-				if(validateFieldDefinition($groupdetails))
-				{
-					// Save fields
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						if(!$only_enabledisable
-							|| ($only_enabledisable && isset($fielddetails['overview_option']))
-						) {
-							if(isset($changed_fields[$fieldname]))
-							{
-								if(($saved_field = saveFormField($fieldname, $fielddetails, manipulateFormFieldData($fieldname, $fielddetails, $changed_fields[$fieldname]))) !== false)
-								{
-									$saved_fields = array_merge($saved_fields, $saved_field);
-								}
-								else
-								{
-									standard_error('errorwhensaving', $fieldname);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		// Save form
-		return saveForm($form, $saved_fields);
-	}
-}

lib/functions/formfields/hidden/function.validateFormFieldHidden.php

@@ -19,20 +19,13 @@
 
 function validateFormFieldHidden($fieldname, $fielddata, $newfieldvalue)
 {
-	/**
+	if($newfieldvalue === $fielddata['value'])
-	 * don't show error on cronjob-timestamps changing
+	{
-	 * because it might be possible that the cronjob ran
-	 * while settings have been edited (bug #52)
-	 */
-	if($newfieldvalue === $fielddata['value']
-		|| $fieldname == 'system_last_tasks_run'
-		|| $fieldname == 'system_last_traffic_run'
-		|| $fieldname == 'system_lastcronrun'
-	) {
 		return true;
 	}
 	else
 	{
-		return 'hiddenfieldvaluechanged';
+		// TODO: Throw some error that actually makes sense - false would just throw unknown error
+		return false;
 	}
 }

lib/functions/formfields/int/function.getFormFieldDataInt.php

@@ -17,7 +17,7 @@
  * @version    $Id$
  */
 
-function getFormFieldDataInt($fieldname, $fielddata, &$input)
+function getFormFieldDataInt($fieldname, $fielddata, $input)
 {
 	if(isset($input[$fieldname]))
 	{

lib/functions/formfields/option/function.getFormFieldDataOption.php

@@ -17,7 +17,7 @@
  * @version    $Id$
  */
 
-function getFormFieldDataOption($fieldname, $fielddata, &$input)
+function getFormFieldDataOption($fieldname, $fielddata, $input)
 {
 	if(isset($input[$fieldname]))
 	{

lib/functions/formfields/string/function.validateFormFieldString.php

@@ -27,10 +27,6 @@ function validateFormFieldString($fieldname, $fielddata, $newfieldvalue)
 		$returnvalue = true;
 		foreach($newfieldvalues as $single_newfieldvalue)
 		{
-			/**
-	 		 * don't use tabs in value-fields, #81
-	 		 */
-			$single_newfieldvalue = str_replace("\t", " ", $single_newfieldvalue);
 			$single_returnvalue = validateFormFieldString($fieldname, $fielddata, $single_newfieldvalue);
 			if($single_returnvalue !== true)
 			{
@@ -43,11 +39,6 @@ function validateFormFieldString($fieldname, $fielddata, $newfieldvalue)
 	{
 		$returnvalue = false;
 
-		/**
- 		 * don't use tabs in value-fields, #81
- 		 */
-		$newfieldvalue = str_replace("\t", " ", $newfieldvalue);
-
 		if(isset($fielddata['string_type']) && $fielddata['string_type'] == 'mail')
 		{
 			$returnvalue = (filter_var($newfieldvalue, FILTER_VALIDATE_EMAIL) == $newfieldvalue);

lib/functions/froxlor/function.CronjobFunctions.php

@@ -60,17 +60,16 @@ function getNextCronjobs()
 
 function includeCronjobs($debugHandler, $pathtophpfiles)
 {
-	global $settings;
-
 	$cronjobs = getNextCronjobs();
 	
 	$jobs_to_run = array();
-	$cron_path = makeCorrectDir($pathtophpfiles.'/scripts/jobs/');
 	
 	if($cronjobs !== false
 	&& is_array($cronjobs)
 	&& isset($cronjobs[0]))
 	{
+		$cron_path = makeCorrectDir($pathtophpfiles.'/scripts/jobs/');
+		
 		foreach($cronjobs as $cronjob)
 		{
 			$cron_file = makeCorrectFile($cron_path.$cronjob);
@@ -78,17 +77,6 @@ function includeCronjobs($debugHandler, $pathtophpfiles)
 		}
 	}
 	
-	/**
-	 * if we're on realtime and cron_tasks is not one
-	 * of the jobs to run, we add it so the changes are being applied
-	 */
-	if ($settings['system']['realtime_port'] !== 0) {
-		$cron_file = makeCorrectFile($cron_path.'/cron_tasks.php');
-		if (!in_array($cron_file, $jobs_to_run)) {
-			$jobs_to_run[] = $cron_file;
-		}
-	}
-	
 	return $jobs_to_run;
 }
 
@@ -229,59 +217,6 @@ function getOutstandingTasks()
 		}
 	}
 	
-	$query2 = "SELECT DISTINCT `Task` FROM `".TABLE_APS_TASKS."` ORDER BY `Task` ASC";
-	$result2 = $db->query($query2);
-	
-	while($row2 = $db->fetch_array($result2))
-	{
-		/*
-		 * install
-		 */
-		if($row2['Task'] == '1')
-		{
-			$task_desc = $lng['tasks']['aps_task_install'];
-		}
-		/*
-		 * remove
-		 */
-		elseif($row2['Task'] == '2')
-		{
-			$task_desc = $lng['tasks']['aps_task_remove'];
-		}
-		/*
-		 * reconfigure
-		 */
-		elseif($row2['Task'] == '3')
-		{
-			$task_desc = $lng['tasks']['aps_task_reconfigure'];
-		}
-		/*
-		 * upgrade
-		 */
-		elseif($row2['Task'] == '4')
-		{
-			$task_desc = $lng['tasks']['aps_task_upgrade'];
-		}
-		/*
-		 * system update
-		 */
-		elseif($row2['Task'] == '5')
-		{
-			$task_desc = $lng['tasks']['aps_task_sysupdate'];
-		}
-		/*
-		 * system download
-		 */
-		elseif($row2['Task'] == '6')
-		{
-			$task_desc = $lng['tasks']['aps_task_sysdownload'];
-		}
-		
-		if($task_desc != '') {
-			$tasks .= '<li>'.$task_desc.'</li>';
-		}
-	}
-
 	if(trim($tasks) == '') {
 		$outstanding_tasks .= '<li>'.$lng['tasks']['noneoutstanding'].'</li>';
 	} else {

lib/functions/froxlor/function.createAWStatsConf.php

@@ -24,61 +24,37 @@
  * @param logFile
  * @param siteDomain
  * @param hostAliases
- * @return null
+ * @return
+ * @author Michael Duergner
+ * @author Berend Dekens
  */
 
-function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot)
+function createAWStatsConf($logFile, $siteDomain, $hostAliases)
 {
-	global $pathtophpfiles, $settings;
+	global $pathtophpfiles;
 
 	// Generation header
 
-	$header = "## GENERATED BY FROXLOR\n";
+	$header = "## GENERATED BY SYSCP\n";
 	$header2 = "## Do not remove the line above! This tells Froxlor to update this configuration\n## If you wish to manually change this configuration file, remove the first line to make sure Froxlor won't rebuild this file\n## Generated for domain {SITE_DOMAIN} on " . date('l dS \of F Y h:i:s A') . "\n";
 
-	$awstats_dir = makeCorrectDir($customerDocroot.'/awstats/'.$siteDomain.'/');
-	if(!is_dir($awstats_dir))
-	{
-		safe_exec('mkdir -p '.escapeshellarg($awstats_dir));
-	}
-	
-	// weird but could happen...
-	if(!is_dir($settings['system']['awstats_conf']))
-	{
-		safe_exec('mkdir -p '.escapeshellarg($settings['system']['awstats_conf']));
-	}
-
 	// These are the variables we will replace
 
 	$regex = array(
 		'/\{LOG_FILE\}/',
 		'/\{SITE_DOMAIN\}/',
-		'/\{HOST_ALIASES\}/',
+		'/\{HOST_ALIASES\}/'
-		'/\{CUSTOMER_DOCROOT\}/',
-		'/\{AWSTATS_CONF\}/'
 	);
 	$replace = array(
-		makeCorrectFile($logFile),
+		$logFile,
 		$siteDomain,
-		$hostAliases,
+		$hostAliases
-		$awstats_dir,
-		makeCorrectDir($settings['system']['awstats_conf'])
 	);
 
 	// File names
 
-	$domain_file = makeCorrectFile($settings['system']['awstats_conf'].'/awstats.' . $siteDomain . '.conf');
+	$domain_file = '/etc/awstats/awstats.' . $siteDomain . '.conf';
-	$model_file = dirname(dirname(dirname(dirname(__FILE__))));
+	$model_file = '/etc/awstats/awstats.model.conf.froxlor';
-	$model_file.= '/templates/misc/awstatsmodel/';
-	
-	if($settings['system']['mod_log_sql'] == '1')
-	{
-		$model_file.= 'awstats.froxlor.model_log_sql.conf';
-	} else {
-		$model_file.= 'awstats.froxlor.model.conf';
-	}
-
-	$model_file = makeCorrectFile($model_file);
 
 	// Test if the file exists
 

lib/functions/froxlor/function.getCustomerIdByDomain.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * returns the customer-id of a customer by given domain
- * 
- * @param string $domain users domain
- * 
- * @return int customers id
- */
-function getCustomerIdByDomain($domain = null)
-{
-	global $db;
-	
-	$result = $db->query_first("SELECT `customerid` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain` = '".$domain."'");
-	if(is_array($result) 
-		&& isset($result['customerid'])
-	) {
-		return $result['customerid'];
-	}
-	return false;
-}

lib/functions/froxlor/function.getLoginNameByUid.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * returns the loginname of a customer by given uid
- * 
- * @param int $uid uid of customer
- * 
- * @return string customers loginname
- */
-function getLoginNameByUid($uid = null)
-{
-	global $db;
-	
-	$result = $db->query_first("SELECT `loginname` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `guid` = '".(int)$uid."'");
-	if(is_array($result) 
-		&& isset($result['loginname'])
-	) {
-		return $result['loginname'];
-	}
-	return false;
-}

lib/functions/froxlor/function.getPhpConfigs.php

@@ -1,41 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
- * @version    $Id$
- */
-
-/**
- * returns an array for the settings-array
- * 
- * @return array
- */
-function getPhpConfigs()
-{
-	global $db;
-	
-	$query = 'SELECT * FROM `' . TABLE_PANEL_PHPCONFIGS . '` ';
-	$result = $db->query($query);
-	$configs_array = array();
-
-	while($row = $db->fetch_array($result))
-	{
-		if(!isset($configs_array[$row['id']])
-		   && !in_array($row['id'], $configs_array))
-		{
-			$configs_array[$row['id']] = html_entity_decode($row['description']);
-		}
-	}
-
-	return $configs_array;
-}

lib/functions/froxlor/function.inserttask.php

@@ -62,36 +62,23 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '')
 		$db->query('INSERT INTO `' . TABLE_PANEL_TASKS . '` (`type`, `data`) VALUES ("6", "' . $db->escape($data) . '")');
 		$doupdate = true;
 	}
-	elseif($type == '7'
-			&& $param1 != ''
-			&& $param2 != '')
-	{
-		$data = Array();
-		$data['loginname'] = $param1;
-		$data['email'] = $param2;
-		$data = serialize($data);
-		$db->query('INSERT INTO `' . TABLE_PANEL_TASKS . '` (`type`, `data`) VALUES ("7", "' . $db->escape($data) . '")');
-		$doupdate = true;
-	}
 
 	if($doupdate === true
-	   && (int)$settings['system']['realtime_port'] !== 0
+	   && (int)$settings['system']['realtime_port'] !== 0)
-	   && function_exists('socket_create'))
 	{
 		$timeout = 15;
-		//$socket = @socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+		$socket = @socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-		$socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 
 		if($socket !== false)
 		{
 			// create the request packet
 			$packet = chr(0) . chr(1) . 'RUN' . chr(0);
 			// UDP is connectionless, so we just send on it.
-			//@socket_sendto($socket, $packet, strlen($packet), 0x100, '127.0.0.1', (int)$settings['system']['realtime_port']);			
+			@socket_sendto($socket, $packet, strlen($packet), 0x100, '127.0.0.1', (int)$settings['system']['realtime_port']);			
 
 			/*
 			 * this is for TCP-Connections
-			 */
+			 * 
 			$time = time();
 
 			while(!@socket_connect($socket, '127.0.0.1', (int)$settings['system']['realtime_port']))
@@ -110,9 +97,7 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '')
 					continue;
 				}
 			}
-			/**
+			*/
-			 * close socket
-			 */
 			@socket_close($socket);
 		}
 	}

lib/functions/froxlor/function.openRootDB.php

@@ -30,33 +30,26 @@ function openRootDB($debugHandler, $lockfile)
 {
 	global $db_root;
 
-	require dirname(dirname(dirname(__FILE__))).'/userdata.inc.php';
+	// If one cronscript needs root, it should say $needrootdb = true before the include
-	
+	if(isset($needrootdb)
-	// Legacy sql-root-information
+	&& $needrootdb === true)
-	if(isset($sql['root_user']) && isset($sql['root_password']) && (!isset($sql_root) || !is_array($sql_root)))
 	{
-		$sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'user' => $sql['root_user'], 'password' => $sql['root_password']));
+		$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
-		unset($sql['root_user']);
+
-		unset($sql['root_password']);
+		if($db_root->link_id == 0)
+		{
+			/**
+			 * Do not proceed further if no database connection could be established
+			 */
+
+			fclose($debugHandler);
+			unlink($lockfile);
+			die('root can\'t connect to mysqlserver. Please check userdata.inc.php! Exiting...');
+		}
+
+		unset($db_root->password);
+		fwrite($debugHandler, 'Database-rootconnection established' . "\n");
 	}
-
-	$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
-
-	if($db_root->link_id == 0)
-	{
-		/**
-		 * Do not proceed further if no database connection could be established
-		 */
-
-		fclose($debugHandler);
-		unlink($lockfile);
-		die('root can\'t connect to mysqlserver. Please check userdata.inc.php! Exiting...');
-	}
-
-	unset($db_root->password);
-	fwrite($debugHandler, 'Database-rootconnection established' . "\n");
-	
-	unset($sql);
 }
 
 function closeRootDB()

lib/functions/froxlor/function.updateFunctions.php

@@ -115,7 +115,7 @@ function hasUpdates($to_check = null)
  */
 function showUpdateStep($task = null, $needs_status = true)
 {
-	global $updatelog, $filelog;
+	global $updatelog;
 	
 	// output
 	echo $task;
@@ -126,7 +126,6 @@ function showUpdateStep($task = null, $needs_status = true)
 	}
 	
 	$updatelog->logAction(ADM_ACTION, LOG_WARNING, $task);
-	$filelog->logAction(ADM_ACTION, LOG_WARNING, $task);
 }
 
 /*
@@ -135,26 +134,26 @@ function showUpdateStep($task = null, $needs_status = true)
  * outputs [OK] (success), [??] (warning) or [!!] (failure)
  * of the last update-step
  * 
- * @param	int			status	(0 = success, 1 = warning, 2 = failure)
+ * @param	int			status	(0 = success, 1 = warning, -1 = failure)
  * 
  * @return	string		formatted output and log-entry
  */
-function lastStepStatus($status = -1, $message = '')
+function lastStepStatus($status = -1)
 {
-	global $updatelog, $filelog;
+	global $updatelog;
 	
 	switch($status)
 	{
 		case 0:
-			$status_sign = ($message != '') ? '['.$message.']' : '[OK]';
+			$status_sign = '[OK]';
 			$status_color = '1dcd00';
 			break;
 		case 1:
-			$status_sign = ($message != '') ? '['.$message.']' : '[??]';
+			$status_sign = '[??]';
 			$status_color = 'db7100';			
 			break;
 		case 2:
-			$status_sign = ($message != '') ? '['.$message.']' : '[!!]';
+			$status_sign = '[!!]';
 			$status_color = 'ff0000';			
 			break;
 		default:
@@ -165,35 +164,8 @@ function lastStepStatus($status = -1, $message = '')
 	// output
 	echo "<span style=\"margin-left: 5em; font-weight: bold; color: #".$status_color."\">".$status_sign."</span><br />";
 	
-	if($status == -1 || $status == 2)
+	if($status == -1)
 	{
 		$updatelog->logAction(ADM_ACTION, LOG_WARNING, 'Attention - last update task failed!!!');
-		$filelog->logAction(ADM_ACTION, LOG_WARNING, 'Attention - last update task failed!!!');
-	}
-	elseif($status == 0 || $status == 1)
-	{
-		$filelog->logAction(ADM_ACTION, LOG_WARNING, 'Success');
 	}
 }
-
-/**
- * validate if full path to update.log is sane
- * if not, the update.log is created in /tmp/
- *  
- * @param string $filename the file name to validate
- * 
- * @return string the full path with filename (can differ if not writeable => /tmp)
- */
-function validateUpdateLogFile($filename)
-{
-	if(!is_dir($filename))
-	{
-		$fh = @fopen($filename, 'a');
-		if($fh)
-		{
-			fclose($fh);
-			return $filename;
-		}
-	}
-	return '/tmp/froxlor_update.log';
-}

lib/functions/output/function.RedirectCode.php

@@ -1,163 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
- * @version    $$
- */
-
-/**
- * return an array of all enabled redirect-codes
- * 
- * @return array array of enabled redirect-codes
- */
-function getRedirectCodesArray()
-{
-	global $db;
-	
-	$sql = "SELECT * FROM `".TABLE_PANEL_REDIRECTCODES."` WHERE `enabled` = '1' ORDER BY `id` ASC";
-	$result = $db->query($sql);
-	
-	$codes = array();
-	while($rc = $db->fetch_array($result))
-	{
-		$codes[] = $rc;
-	}
-	
-	return $codes;
-}
-
-/**
- * return an array of all enabled redirect-codes
- * for the settings form
- * 
- * @return array array of enabled redirect-codes
- */
-function getRedirectCodes()
-{
-	global $db;
-	
-	$sql = "SELECT * FROM `".TABLE_PANEL_REDIRECTCODES."` WHERE `enabled` = '1' ORDER BY `id` ASC";
-	$result = $db->query($sql);
-	
-	$codes = array();
-	while($rc = $db->fetch_array($result))
-	{
-		$codes[$rc['id']] = $rc['code']. ' ('.$lng['redirect_desc'][$rc['desc']].')';
-	}
-	
-	return $codes;
-}
-
-/**
- * returns the redirect-code for a given 
- * domain-id
- * 
- * @param integer $domainid id of the domain
- * 
- * @return string redirect-code
- */
-function getDomainRedirectCode($domainid = 0)
-{
-	global $db;
-
-	$code = '';
-	if($domainid > 0)
-	{
-		$sql = "SELECT `r`.`code` as `redirect` 
-				FROM `".TABLE_PANEL_REDIRECTCODES."` `r`, `".TABLE_PANEL_DOMAINREDIRECTS."` `rc` 
-				WHERE `r`.`id` = `rc`.`rid` and `rc`.`did` = '".(int)$domainid."'";
-		
-		$result = $db->query_first($sql);
-		
-		if(is_array($result)
-			&& isset($result['redirect'])
-		) {
-			$code = ($result['redirect'] == '---') ? '' : $result['redirect'];
-		}
-	}
-	return $code;
-}
-
-/**
- * returns the redirect-id for a given 
- * domain-id
- * 
- * @param integer $domainid id of the domain
- * 
- * @return integer redirect-code-id
- */
-function getDomainRedirectId($domainid = 0)
-{
-	global $db;
-
-	$code = 1;
-	if($domainid > 0)
-	{
-		$sql = "SELECT `r`.`id` as `redirect` 
-				FROM `".TABLE_PANEL_REDIRECTCODES."` `r`, `".TABLE_PANEL_DOMAINREDIRECTS."` `rc` 
-				WHERE `r`.`id` = `rc`.`rid` and `rc`.`did` = '".(int)$domainid."'";
-		
-		$result = $db->query_first($sql);
-		
-		if(is_array($result)
-			&& isset($result['redirect'])
-		) {
-			$code = (int)$result['redirect'];
-		}
-	}
-	return $code;
-}
-
-/**
- * adds a redirectcode for a domain
- * 
- * @param integer $domainid id of the domain to add the code for
- * @param integer $redirect selected redirect-id 
- * 
- * @return null
- */
-function addRedirectToDomain($domainid = 0, $redirect = 1)
-{
-	global $db;
-	if($domainid > 0)
-	{
-		$db->query("INSERT INTO `".TABLE_PANEL_DOMAINREDIRECTS."` 
-					SET `rid` = '".(int)$redirect."', `did` = '".(int)$domainid."'");
-	}
-}
-
-/**
- * updates the redirectcode of a domain
- * if redirect-code is false, nothing happens
- * 
- * @param integer $domainid id of the domain to update
- * @param integer $redirect selected redirect-id or false
- * 
- * @return null
- */
-function updateRedirectOfDomain($domainid = 0, $redirect = false)
-{
-	global $db;
-
-	if($redirect == false)
-	{
-		return;
-	}
-	
-	if($domainid > 0)
-	{
-		$db->query("UPDATE `".TABLE_PANEL_DOMAINREDIRECTS."` 
-					SET `rid` = '".(int)$redirect."' 
-					WHERE `did` = '".(int)$domainid."'");
-	}
-}

lib/functions/settings/function.loadSettings.php

@@ -17,7 +17,7 @@
  * @version    $Id$
  */
 
-function loadSettings(&$settings_data, $db)
+function loadSettings($settings_data, $db)
 {
 	$settings = array();
 

lib/functions/settings/function.storeSettingField.php

@@ -31,17 +31,6 @@ function storeSettingField($fieldname, $fielddata, $newfieldvalue)
 				toggleCronStatus($fielddata['cronmodule'], $newfieldvalue);
 			}
 
-			/*
-			 * satisfy dependencies
-			 */
-			if(isset($fielddata['dependency']) && is_array($fielddata['dependency']))
-			{
-				if((int)$fielddata['dependency']['onlyif'] == (int)$newfieldvalue)
-				{
-					storeSettingField($fielddata['dependency']['fieldname'], $fielddata['dependency']['fielddata'], $newfieldvalue);
-				}
-			}
-
 			return array($fielddata['settinggroup'] . '.' . $fielddata['varname'] => $newfieldvalue);
 		}
 		else

lib/functions/system/function.checklastguid.php

@@ -11,7 +11,7 @@
  * @copyright  (c) the authors
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
+ * @package    Language
  * @version    $Id$
  */
 
@@ -29,25 +29,14 @@
  *
  * @return	null
  */
-function checkLastGuid()
+function checkLastGuid($froxlor_guid = 0)
 {
-	global $log, $cronlog, $db, $settings;
+	global $cronlog;
-	
-	$mylog = null;
-	if (isset($cronlog) && $cronlog instanceof FroxlorLogger) {
-		$mylog = $cronlog;
-	} else {
-		$mylog = $log;
-	}
 
 	$group_lines = array();
 	$group_guids = array();
 	$update_to_guid = 0;
 
-	$froxlor_guid = 0;
-	$result = $db->query_first("SELECT MAX(`guid`) as `fguid` FROM `".TABLE_PANEL_CUSTOMERS."`");
-	$froxlor_guid = $result['fguid'];
-
 	$g_file = '/etc/group';
 
 	if(file_exists($g_file))
@@ -65,44 +54,28 @@ function checkLastGuid()
 
 				foreach($group_guids as $idx => $group)
 				{
-					/**
+					$guid = $group[2];
-					 * nogroup | nobody have very high guids
-					 * ignore them
-					 */
-					if($group[0] == 'nogroup'
-						|| $group[0] == 'nobody'
-					) {
-						continue;
-					}
 
-					$guid = isset($group[2]) ? (int)$group[2] : 0;
+					if($guid > $froxlor_guid)
-
-					if($guid > $update_to_guid)
 					{
 						$update_to_guid = $guid;
 					}
 				}
 
-				if($update_to_guid < $froxlor_guid)
+				if($update_to_guid > $froxlor_guid)
 				{
-					$update_to_guid = $froxlor_guid;
+					$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'Updating froxlor last guid to '.$update_to_guid);
-					
+					saveSetting('system', 'lastguid', $update_to_guid);
-					if ($update_to_guid != $settings['system']['lastguid'])
-					{
-						$mylog->logAction(CRON_ACTION, LOG_NOTICE, 'Updating froxlor last guid to '.$update_to_guid);
-						saveSetting('system', 'lastguid', $update_to_guid);
-						$settings['system']['lastguid'] = $update_to_guid;
-					}
 				}
 			}
 			else
 			{
-				$mylog->logAction(CRON_ACTION, LOG_NOTICE, 'File /etc/group not readable; cannot check for latest guid');
+				$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'File /etc/group not readable; cannot check for latest guid');
 			}
 		}
 		else
 		{
-			$mylog->logAction(CRON_ACTION, LOG_NOTICE, 'File /etc/group not readable; cannot check for latest guid');
+			$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'File /etc/group not readable; cannot check for latest guid');
 		}
 	}
 	else

lib/functions/validate/function.appendOpenbasedirPath.php

@@ -1,45 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
- * @version    $Id$
- */
-
-/**
- * checks give path for security issues
- * and returns a string that can be appended
- * to a line for a open_basedir directive
- * 
- * @param string  $path  the path to check and append
- * @param boolean $first if true, no ':' will be prefixed to the path
- * 
- * @return string
- */
-function appendOpenBasedirPath($path = '', $first = false)
-{
-	$path = makeCorrectDir($path);
-	if($path != ''
-		&& $path != '/'
-		&& !preg_match("#^/dev#i", $path)                                                       
-		&& !preg_match("#^/proc#i", $path)                                                                             
-		&& !preg_match("#^/etc#i", $path)                                                                                                       
-		&& !preg_match("#^/sys#i", $path)
-		&& !preg_match("#:#", $path)
-	) {
-		if($first)
-			return $path;
-
-		return ':' . $path;
-	}
-	return '';
-}

lib/functions/validate/function.checkMysqlAccessHost.php

@@ -25,7 +25,6 @@ function checkMysqlAccessHost($fieldname, $fielddata, $newfieldvalue, $allnewfie
 	{
 		if(validate_ip($host_entry, true) == false
 		   && validateDomain($host_entry) == false
-		   && validateLocalHostname($host_entry) == false
 		   && $host_entry != '%')
 		{
 			return array(FORMFIELDS_PLAUSIBILITY_CHECK_ERROR, 'invalidmysqlhost', $host_entry);

lib/functions/validate/function.validateDomain.php

@@ -37,25 +37,12 @@ function validateDomain($domainname)
 	// If FILTER_VALIDATE_URL is good, but FILTER_VALIDATE_URL with FILTER_FLAG_PATH_REQUIRED or FILTER_FLAG_QUERY_REQUIRED is also good, it isn't just a domain.
 	// This is a ugly hack, maybe a good regex would be better?
 
-	// there is a bug in php 5.2.13 - 5.3.2 which
+	if(filter_var($domainname_tmp, FILTER_VALIDATE_URL) !== false && filter_var($domainname_tmp, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED) === false && filter_var($domainname_tmp, FILTER_VALIDATE_URL, FILTER_FLAG_QUERY_REQUIRED) === false)
-	// lets filter_var fail if the domain has
-	// a dash (-) in it. As the PHP_VERSION constant
-	// gives also patch-brandings, e.g. '5.3.2-pl0-gentoo'
-	// we just always use our regex
-	$pattern = '/^http:\/\/([a-z0-9]([a-z0-9\-]{0,61}[a-z0-9])?\.)+[a-z]{2,6}$/i';
-	if(preg_match($pattern, $domainname_tmp))
 	{
 		return $domainname;
 	}
-	return false;
+	else
-}
-
-function validateLocalHostname($hostname)
-{
-	$pattern = '/^([a-zA-Z0-9\-])+$/i';
-	if(preg_match($pattern, $hostname))
 	{
-		return $hostname;
+		return false;
 	}
-	return false;
 }

lib/functions/validate/function.validatePassword.php

@@ -1,43 +0,0 @@
-<?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     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
- * @version    $Id$
- */
-
-/**
- * Function validatePassword
- *
- * if password-min-length is set in settings
- * we check against the length, if not matched
- * an error message will be output and 'exit' is called
- *
- * @param string $password the password to validate
- *
- * @return string either the password or an errormessage+exit
- */
-function validatePassword($password = null)
-{
-	global $settings;
-	
-	if ($settings['panel']['password_min_length'] > 0) {
-		$password = validate(
-			$password, 
-			$settings['panel']['password_min_length'], /* replacer needs to be password length, not the fieldname */
-			'/^.{'.(int)$settings['panel']['password_min_length'].',}$/D', 
-			'notrequiredpasswordlength'
-		);
-	}
-	
-	return $password;
-}

lib/functions/validate/function.validateUrl.php

@@ -28,51 +28,45 @@
 
 function validateUrl($url)
 {
-	global $idna_convert;
-
 	if(strtolower(substr($url, 0, 7)) != "http://"
-	&& strtolower(substr($url, 0, 8)) != "https://")
+	   && strtolower(substr($url, 0, 8)) != "https://")
 	{
 		$url = 'http://' . $url;
 	}
 
-	// needs converting
+	if(filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED) !== false)
-	$url = $idna_convert->encode($url);
-
-	$pattern = "/^https?:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(\/\S*)?$/i";
-	if(preg_match($pattern, $url))
 	{
 		return true;
 	}
-
+	else
-	// not an fqdn
-	if(strtolower(substr($url, 0, 7)) == "http://"
-		|| strtolower(substr($url, 0, 8)) == "https://")
 	{
-		if(strtolower(substr($url, 0, 7)) == "http://")
+		if(strtolower(substr($url, 0, 7)) == "http://"
+		   || strtolower(substr($url, 0, 8)) == "https://")
 		{
-			$ip = strtolower(substr($url, 7));
+			if(strtolower(substr($url, 0, 7)) == "http://")
-		}
+			{
+				$ip = strtolower(substr($url, 7));
+			}
 
-		if(strtolower(substr($url, 0, 8)) == "https://")
+			if(strtolower(substr($url, 0, 8)) == "https://")
-		{
+			{
-			$ip = strtolower(substr($url, 8));
+				$ip = strtolower(substr($url, 8));
-		}
+			}
 
-		$ip = substr($ip, 0, strpos($ip, '/'));
+			$ip = substr($ip, 0, strpos($ip, '/'));
 
-		if(validate_ip($ip, true) !== false)
+			if(validate_ip($ip, true) !== false)
-		{
+			{
-			return true;
+				return true;
+			}
+			else
+			{
+				return false;
+			}
 		}
 		else
 		{
 			return false;
 		}
 	}
-	else
-	{
-		return false;
-	}
 }
-

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'))
@@ -150,23 +149,13 @@ if(get_magic_quotes_gpc())
  */
 
 $settings_data = loadConfigArrayDir('./actions/admin/settings/');
-$settings = loadSettings($settings_data, $db);
+$settings = loadSettings(&$settings_data, &$db);
 
 /*
  * when upgrading from syscp, the header-graphic gets lost
  */
-if(!isset($settings['admin']['froxlor_graphic'])
+if(!isset($settings['admin']['froxlor_graphic'])) {
-	|| $settings['admin']['froxlor_graphic'] == ''
+	$settings['admin']['froxlor_graphic'] = $settings['admin']['syscp_graphic'];
-) {
-	if(isset($settings['admin']['syscp_graphic']) 
-		&& $settings['admin']['syscp_graphic'] != ''
-	){
-		$settings['admin']['froxlor_graphic'] = $settings['admin']['syscp_graphic'];
-	}
-	else
-	{
-		$settings['admin']['froxlor_graphic'] = 'images/header.gif';
-	}
 }
 
 /**
@@ -422,14 +411,8 @@ if($page == '')
 /**
  * Initialize the mailingsystem
  */
+
 $mail = new PHPMailer();
-if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false)
+$mail->From = $settings['panel']['adminmail'];
-{	
-	// set return-to address and custom sender-name, see #76
-	$mail->SetFrom($settings['panel']['adminmail'], $settings['panel']['adminmail_defname']);
-	if ($settings['panel']['adminmail_return'] != '') {
-		$mail->AddReplyTo($settings['panel']['adminmail_return'], $settings['panel']['adminmail_defname']);
-	}
-}
 
 ?>

lib/navigation/00.froxlor.main.php

@@ -200,11 +200,15 @@ return array (
 					'label' => $lng['admin']['ipsandports']['ipsandports'],
 					'required_resources' => 'change_serversettings',
 				),
+				/*
+				 * @TODO this is for Froxlor-1.0
+				 *
 				array (
 					'url' => 'admin_cronjobs.php?page=overview',
 					'label' => $lng['admin']['cron']['cronsettings'],
 					'required_resources' => 'change_serversettings',
 				),
+				*/
 				array (
 					'url' => 'admin_settings.php?page=rebuildconfigs',
 					'label' => $lng['admin']['rebuildconf'],

lib/tables.inc.php

@@ -19,8 +19,6 @@
 
 define('TABLE_FTP_GROUPS', 'ftp_groups');
 define('TABLE_FTP_USERS', 'ftp_users');
-define('TABLE_FTP_QUOTALIMITS', 'ftp_quotalimits');
-define('TABLE_FTP_QUOTATALLIES', 'ftp_quotatallies');
 define('TABLE_MAIL_USERS', 'mail_users');
 define('TABLE_MAIL_VIRTUAL', 'mail_virtual');
 define('TABLE_PANEL_ADMINS', 'panel_admins');
@@ -51,8 +49,6 @@ define('TABLE_APS_SETTINGS', 'aps_settings');
 define('TABLE_APS_TASKS', 'aps_tasks');
 define('TABLE_APS_TEMP_SETTINGS', 'aps_temp_settings');
 define('TABLE_PANEL_CRONRUNS', 'cronjobs_run');
-define('TABLE_PANEL_REDIRECTCODES', 'redirect_codes');
-define('TABLE_PANEL_DOMAINREDIRECTS', 'domain_redirect_codes');
 
 // APS constants
 
@@ -72,8 +68,7 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.9';
+$version = '0.9';
 $dbversion = '2';
-$branding = '';
 
 ?>