set version to 0.9.35 final for upcoming release

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

.gitignore

@@ -1,2 +1,11 @@
-packages/*
-temp/*
+templates/*
+logs/*
+install/update.log
+.buildpath
+.project
+.settings/
+*.diff
+*~
+.well-known
+.idea
+*.iml

COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,4 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-

README.md

@@ -0,0 +1,74 @@
+# Froxlor
+
+The server administration software for your needs.
+Developed by experienced server administrators, this panel simplifies the effort of managing your hosting platform.
+
+## Installation
+
+### Fast install
+1. Ensure that your webserver serves /var/www
+2. Extract froxlor into /var/www
+3. Point your browser to http://[ip-of-webserver]/froxlor
+4. Follow the installer
+5. Login as administrator
+6. Adjust "Server > Settings" according to your needs
+7. Choose your distribution under "Server > Configuration"
+8. Follow the steps for your services
+9. Have fun!
+
+### Detailed installation
+http://redmine.froxlor.org/projects/froxlor/wiki/Installationtarball
+
+## Help
+
+You may find help in the following places:
+
+### IRC
+
+froxlor may be found on freenode.net, channel #froxlor:
+irc://chat.freenode.net/froxlor
+
+### Forum
+
+The community is located on http://forum.froxlor.org
+
+### Wiki
+
+More documentation may be found in the froxlor - wiki:
+http://redmine.froxlor.org/projects/froxlor/wiki
+
+## License
+
+May be found in COPYING
+
+## Downloads
+
+### Tarball
+http://files.froxlor.org/releases/froxlor-latest.tar.gz [MD5](http://files.froxlor.org/releases/froxlor-latest.tar.gz.md5) [SHA1](http://files.froxlor.org/releases/froxlor-latest.tar.gz.sha1)
+
+### Debian repository
+
+[HowTo](http://redmine.froxlor.org/projects/froxlor/wiki/Installationdebian)
+
+/etc/apt/sources.list.d/froxlor.list
+> deb http://debian.froxlor.org {wheezy|jessie} main
+
+### Gentoo repository
+
+[HowTo](http://redmine.froxlor.org/projects/froxlor/wiki/Installationgentoo)
+
+http://files.froxlor.org/gentoo/repositories.xml
+
+## Let's Encrypt support
+
+This version of Froxlor contains a test implementation of support for [Let's Encrypt](https://letsencrypt.org). This is (as Let's Encrypt is in itself)
+still a beta version and may break your system. The way it currently works is by creating a (sub-)domain with the default system - certificate,
+after which the Let's Encrypt cronjob orders the certificate for this (sub-)domain and inserts the certificates in the database. With the next run
+of the default cronjob, the certificates will be updated on the disk and the webserver reloaded.
+
+This has 2 known side-effects at the moment:
+* The basic ip/port combinations don't work with the Froxlor - integration of Let's Encrypt, since it needs a certificate for the very first creation
+* After creating a domain, it will have the default certificate for a short time (by default 5 minutes until the cronjob runs the next time)
+
+It may be possible to fix these issues, but they are not a priority at the moment
+

actions/admin/settings/100.panel.php

@@ -33,15 +33,31 @@ return array(
 					'save_method' => 'storeSettingField',
 					),
 				'panel_default_theme' => array(
-					'label' => $lng['serversettings']['default_theme'],
+					'label' => array('title' => $lng['panel']['theme'], 'description' => $lng['serversettings']['default_theme']),
 					'settinggroup' => 'panel',
 					'varname' => 'default_theme',
 					'type' => 'option',
 					'default' => 'Froxlor',
 					'option_mode' => 'one',
 					'option_options_method' => 'getThemes',
+					'save_method' => 'storeSettingDefaultTheme',
+					),
+				'panel_allow_theme_change_customer' => array(
+					'label' => $lng['serversettings']['panel_allow_theme_change_customer'],
+					'settinggroup' => 'panel',
+					'varname' => 'allow_theme_change_customer',
+					'type' => 'bool',
+					'default' => true,
 					'save_method' => 'storeSettingField',
 					),
+				'panel_allow_theme_change_admin' => array(
+					'label' => $lng['serversettings']['panel_allow_theme_change_admin'],
+					'settinggroup' => 'panel',
+					'varname' => 'allow_theme_change_admin',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+					),
 				'panel_natsorting' => array(
 					'label' => $lng['serversettings']['natsorting'],
 					'settinggroup' => 'panel',
@@ -161,6 +177,32 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
+				'admin_show_news_feed' => array(
+					'label' => $lng['admin']['show_news_feed'],
+					'settinggroup' => 'admin',
+					'varname' => 'show_news_feed',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'customer_show_news_feed' => array(
+					'label' => $lng['admin']['customer_show_news_feed'],
+					'settinggroup' => 'customer',
+					'varname' => 'show_news_feed',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'customer_news_feed_url' => array(
+					'label' => $lng['admin']['customer_news_feed_url'],
+					'settinggroup' => 'customer',
+					'varname' => 'news_feed_url',
+					'type' => 'string',
+					'string_type' => 'url',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
 				'panel_allow_domain_change_admin' => array(
 					'label' => $lng['serversettings']['panel_allow_domain_change_admin'],
 					'settinggroup' => 'panel',
@@ -177,6 +219,14 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
+				'panel_phpconfigs_hidestdsubdomain' => array(
+					'label' => $lng['serversettings']['panel_phpconfigs_hidestdsubdomain'],
+					'settinggroup' => 'panel',
+					'varname' => 'phpconfigs_hidestdsubdomain',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
 				),
 			),
 		),

actions/admin/settings/110.accounts.php

@@ -70,6 +70,46 @@ return array(
 					'default' => 0,
 					'save_method' => 'storeSettingField',
 					),
+				'panel_password_alpha_lower' => array(
+					'label' => $lng['serversettings']['panel_password_alpha_lower'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_alpha_lower',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					),
+				'panel_password_alpha_upper' => array(
+					'label' => $lng['serversettings']['panel_password_alpha_upper'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_alpha_upper',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					),
+				'panel_password_numeric' => array(
+					'label' => $lng['serversettings']['panel_password_numeric'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_numeric',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'panel_password_special_char_required' => array(
+					'label' => $lng['serversettings']['panel_password_special_char_required'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_special_char_required',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'panel_password_special_char' => array(
+					'label' => $lng['serversettings']['panel_password_special_char'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_special_char',
+					'type' => 'string',
+					'default' => '!?<>§$%+#=@',
+					'save_method' => 'storeSettingField',
+					),
 				'panel_password_regex' => array(
 					'label' => $lng['serversettings']['panel_password_regex'],
 					'settinggroup' => 'panel',
@@ -150,4 +190,4 @@ return array(
 		),
 	);
 
-?>
+?>

actions/admin/settings/120.system.php

@@ -32,6 +32,14 @@ return array(
 					'save_method' => 'storeSettingField',
 					'plausibility_check_method' => 'checkPathConflicts'
 					),
+				'system_documentroot_use_default_value' => array(
+					'label' => $lng['serversettings']['documentroot_use_default_value'],
+					'settinggroup' => 'system',
+					'varname' => 'documentroot_use_default_value',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
 				'system_ipaddress' => array(
 					'label' => $lng['serversettings']['ipaddress'],
 					'settinggroup' => 'system',
@@ -47,7 +55,7 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'defaultip',
 					'type' => 'option',
-					'option_mode' => 'one',
+					'option_mode' => 'multiple',
 					'option_options_method' => 'getIpPortCombinations',
 					'default' => '',
 					'save_method' => 'storeSettingDefaultIp',
@@ -138,7 +146,7 @@ return array(
 					'varname' => 'report_webmax',
 					'type' => 'int',
 					'int_min' => 1,
-					'int_max' => 99,
+					'int_max' => 150,
 					'default' => 90,
 					'save_method' => 'storeSettingField',
 					),
@@ -148,21 +156,11 @@ return array(
 					'varname' => 'report_trafficmax',
 					'type' => 'int',
 					'int_min' => 1,
-					'int_max' => 99,
+					'int_max' => 150,
 					'default' => 90,
 					'save_method' => 'storeSettingField',
 					),
-				'system_debug_cron' => array(
-					'label' => $lng['serversettings']['cron']['debug'],
-					'settinggroup' => 'system',
-					'varname' => 'debug_cron',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),					
 				),
 			),
 		),
 	);
-
-?>

actions/admin/settings/125.cronjob.php

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2014 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
+ *
+ */
+
+return array(
+	'groups' => array(
+		'crond' => array(
+			'title' => $lng['admin']['cronsettings'],
+			'fields' => array(
+				'system_cronconfig' => array(
+					'label' => $lng['serversettings']['system_cronconfig'],
+					'settinggroup' => 'system',
+					'varname' => 'cronconfig',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/etc/cron.d/froxlor',
+					'save_method' => 'storeSettingField',
+					),
+				'system_croncmdline' => array(
+					'label' => $lng['serversettings']['system_croncmdline'],
+					'settinggroup' => 'system',
+					'varname' => 'croncmdline',
+					'type' => 'string',
+					'default' => '/usr/bin/nice -n 5 /usr/bin/php -q',
+					'save_method' => 'storeSettingField',
+					),
+				'system_crondreload' => array(
+					'label' => $lng['serversettings']['system_crondreload'],
+					'settinggroup' => 'system',
+					'varname' => 'crondreload',
+					'type' => 'string',
+					'default' => '/etc/init.d/cron reload',
+					'save_method' => 'storeSettingField',
+					),
+				'system_cron_allowautoupdate' => array(
+					'label' => $lng['serversettings']['system_cron_allowautoupdate'],
+					'settinggroup' => 'system',
+					'varname' => 'cron_allowautoupdate',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'system_debug_cron' => array(
+					'label' => $lng['serversettings']['cron']['debug'],
+					'settinggroup' => 'system',
+					'varname' => 'debug_cron',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					)
+			)
+		)
+	)
+);

actions/admin/settings/130.webserver.php

@@ -31,15 +31,35 @@ return array(
 					'option_mode' => 'one',
 					'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx'),
 					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'checkPhpInterfaceSetting',
 					'overview_option' => true
 					),
+				'system_apache_24' => array(
+					'label' => $lng['serversettings']['apache_24'],
+					'settinggroup' => 'system',
+					'varname' => 'apache24',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
+					),
+			    'system_apache_itksupport' => array(
+			        'label' => $lng['serversettings']['apache_itksupport'],
+			        'settinggroup' => 'system',
+			        'varname' => 'apacheitksupport',
+			        'type' => 'bool',
+			        'default' => false,
+			        'save_method' => 'storeSettingField',
+			        'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
+			        'websrv_avail' => array('apache2')
+			    ),
 				'system_httpuser' => array(
 					'label' => $lng['admin']['webserver_user'],
 					'settinggroup' => 'system',
 					'varname' => 'httpuser',
 					'type' => 'string',
 					'default' => 'www-data',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingWebserverFcgidFpmUser',
 					),
 				'system_httpgroup' => array(
 					'label' => $lng['admin']['webserver_group'],
@@ -72,7 +92,7 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'apacheconf_htpasswddir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/etc/apache2/htpasswd/',
 					'save_method' => 'storeSettingField',
 					),
@@ -85,6 +105,15 @@ return array(
 					'default' => '/var/customers/logs/',
 					'save_method' => 'storeSettingField',
 					),
+				'system_customersslpath' => array(
+					'label' => $lng['serversettings']['customerssl_directory'],
+					'settinggroup' => 'system',
+					'varname' => 'customer_ssl_path',
+					'type' => 'string',
+					'string_type' => 'confdir',
+					'default' => '/etc/ssl/froxlor-custom/',
+					'save_method' => 'storeSettingField',
+					),
 				'system_phpappendopenbasedir' => array(
 					'label' => $lng['serversettings']['phpappendopenbasedir'],
 					'settinggroup' => 'system',
@@ -124,7 +153,7 @@ return array(
 					'label' => $lng['serversettings']['phpreload_command'],
 					'settinggroup' => 'system',
 					'varname' => 'phpreload_command',
-					'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string',
+					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					'websrv_avail' => array('nginx')
@@ -133,19 +162,20 @@ return array(
 					'label' => $lng['serversettings']['nginx_php_backend'],
 					'settinggroup' => 'system',
 					'varname' => 'nginx_php_backend',
-					'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string',
+					'type' => 'string',
 					'default' => '127.0.0.1:8888',
 					'save_method' => 'storeSettingField',
 					'websrv_avail' => array('nginx')
 					),
-				'system_mod_log_sql' => array(
-					'label' => $lng['serversettings']['mod_log_sql'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_log_sql',
-					'type' => 'bool',
-					'default' => false,
+				'nginx_fastcgiparams' => array(
+					'label' => $lng['serversettings']['nginx_fastcgiparams'],
+					'settinggroup' => 'nginx',
+					'varname' => 'fastcgiparams',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/etc/nginx/fastcgi_params',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
+					'websrv_avail' => array('nginx')
 					),
 				'defaultwebsrverrhandler_enabled' => array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
@@ -209,72 +239,8 @@ return array(
 					'option_options_method' => 'getRedirectCodes',
 					'save_method' => 'storeSettingField',
 					'websrv_avail' => array('apache2', 'lighttpd')
-					),
-				),
-			),
-		'ssl' => array(
-			'title' => $lng['admin']['sslsettings'],
-			'fields' => array(
-				'system_ssl_enabled' => array(
-					'label' => $lng['serversettings']['ssl']['use_ssl'],
-					'settinggroup' => 'system',
-					'varname' => 'use_ssl',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-					),
-				'system_ssl_cert_file' => array(
-					'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
-					'settinggroup' => 'system',
-					'varname' => 'ssl_cert_file',
-					'type' => 'string',
-					'string_type' => 'file',
-					'string_emptyallowed' => true,
-					'default' => '/etc/apache2/apache2.pem',
-					'save_method' => 'storeSettingField',
-					),
-				'system_ssl_key_file' => array(
-					'label' => $lng['serversettings']['ssl']['ssl_key_file'],
-					'settinggroup' => 'system',
-					'varname' => 'ssl_key_file',
-					'type' => 'string',
-					'string_type' => 'file',
-					'string_emptyallowed' => true,
-					'default' => '/etc/apache2/apache2.key',
-					'save_method' => 'storeSettingField',
-					),
-				'system_ssl_ca_file' => array(
-					'label' => $lng['serversettings']['ssl']['ssl_ca_file'],
-					'settinggroup' => 'system',
-					'varname' => 'ssl_ca_file',
-					'type' => 'string',
-					'string_type' => 'file',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'system_ssl_cert_chainfile' => array(
-					'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'],
-					'settinggroup' => 'system',
-					'varname' => 'ssl_cert_chainfile',
-					'type' => 'string',
-					'string_type' => 'file',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'system_ssl_openssl_cnf' => array(
-					'label' => $lng['serversettings']['ssl']['openssl_cnf'],
-					'settinggroup' => 'system',
-					'varname' => 'openssl_cnf',
-					'type' => 'text',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				),
-			),
-		),
+					)
+				)
+			)
+		)
 	);
-
-?>

actions/admin/settings/131.ssl.php

@@ -0,0 +1,149 @@
+<?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
+ *
+ */
+
+return array(
+	'groups' => array(
+			'ssl' => array(
+					'title' => $lng['admin']['sslsettings'],
+					'fields' => array(
+							'system_ssl_enabled' => array(
+									'label' => $lng['serversettings']['ssl']['use_ssl'],
+									'settinggroup' => 'system',
+									'varname' => 'use_ssl',
+									'type' => 'bool',
+									'default' => false,
+									'save_method' => 'storeSettingField',
+									'overview_option' => true
+							),
+							'system_ssl_cipher_list' => array(
+									'label' => $lng['serversettings']['ssl']['ssl_cipher_list'],
+									'settinggroup' => 'system',
+									'varname' => 'ssl_cipher_list',
+									'type' => 'string',
+									'string_emptyallowed' => false,
+									'default' => 'ECDH+AESGCM:ECDH+AES256:!aNULL:!MD5:!DSS:!DH:!AES128',
+									'save_method' => 'storeSettingField',
+							),
+							'system_ssl_cert_file' => array(
+									'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
+									'settinggroup' => 'system',
+									'varname' => 'ssl_cert_file',
+									'type' => 'string',
+									'string_type' => 'file',
+									'string_emptyallowed' => true,
+									'default' => '/etc/apache2/apache2.pem',
+									'save_method' => 'storeSettingField',
+							),
+							'system_ssl_key_file' => array(
+									'label' => $lng['serversettings']['ssl']['ssl_key_file'],
+									'settinggroup' => 'system',
+									'varname' => 'ssl_key_file',
+									'type' => 'string',
+									'string_type' => 'file',
+									'string_emptyallowed' => true,
+									'default' => '/etc/apache2/apache2.key',
+									'save_method' => 'storeSettingField',
+							),
+							'system_ssl_cert_chainfile' => array(
+									'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'],
+									'settinggroup' => 'system',
+									'varname' => 'ssl_cert_chainfile',
+									'type' => 'string',
+									'string_type' => 'file',
+									'string_emptyallowed' => true,
+									'default' => '',
+									'save_method' => 'storeSettingField',
+							),
+							'system_ssl_ca_file' => array(
+									'label' => $lng['serversettings']['ssl']['ssl_ca_file'],
+									'settinggroup' => 'system',
+									'varname' => 'ssl_ca_file',
+									'type' => 'string',
+									'string_type' => 'file',
+									'string_emptyallowed' => true,
+									'default' => '',
+									'save_method' => 'storeSettingField',
+							),
+							'system_leenabled' => array(
+							        'label' => $lng['serversettings']['leenabled'],
+							        'settinggroup' => 'system',
+							        'varname' => 'leenabled',
+							        'type' => 'bool',
+							        'default' => false,
+							        'cronmodule' => 'froxlor/letsencrypt',
+							        'save_method' => 'storeSettingField'
+							),
+							'system_letsencryptca' => array(
+									'label' => $lng['serversettings']['letsencryptca'],
+									'settinggroup' => 'system',
+									'varname' => 'letsencryptca',
+									'type' => 'option',
+									'default' => 'testing',
+									'option_mode' => 'one',
+									'option_options' => array('testing' => 'https://acme-staging.api.letsencrypt.org (Test)', 'production' => 'https://acme-v01.api.letsencrypt.org (Live)'),
+									'save_method' => 'storeSettingField',
+							),
+							'system_letsencryptcountrycode' => array(
+									'label' => $lng['serversettings']['letsencryptcountrycode'],
+									'settinggroup' => 'system',
+									'varname' => 'letsencryptcountrycode',
+									'type' => 'string',
+									'string_emptyallowed' => false,
+									'default' => 'DE',
+									'save_method' => 'storeSettingField',
+							),
+							'system_letsencryptstate' => array(
+									'label' => $lng['serversettings']['letsencryptstate'],
+									'settinggroup' => 'system',
+									'varname' => 'letsencryptstate',
+									'type' => 'string',
+									'string_emptyallowed' => false,
+									'default' => 'Germany',
+									'save_method' => 'storeSettingField',
+							),
+							'system_letsencryptchallengepath' => array(
+									'label' => $lng['serversettings']['letsencryptchallengepath'],
+									'settinggroup' => 'system',
+									'varname' => 'letsencryptchallengepath',
+									'type' => 'string',
+									'string_emptyallowed' => false,
+									'default' => FROXLOR_INSTALL_DIR,
+									'save_method' => 'storeSettingField',
+							),
+							'system_letsencryptkeysize' => array(
+									'label' => $lng['serversettings']['letsencryptkeysize'],
+									'settinggroup' => 'system',
+									'varname' => 'letsencryptkeysize',
+									'type' => 'int',
+									'int_min' => 2048,
+									'default' => 4096,
+									'save_method' => 'storeSettingField',
+							),
+							'system_letsencryptreuseold' => array(
+									'label' => $lng['serversettings']['letsencryptreuseold'],
+									'settinggroup' => 'system',
+									'varname' => 'letsencryptreuseold',
+									'type' => 'bool',
+									'default' => false,
+									'save_method' => 'storeSettingField',
+							),
+					)
+			)
+		)
+	);

actions/admin/settings/135.fcgid.php

@@ -30,13 +30,13 @@ return array(
 					'save_method' => 'storeSettingField',
 					'plausibility_check_method' => 'checkFcgidPhpFpm',
 					'overview_option' => true
-					),					
+					),
 				'system_mod_fcgid_configdir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['configdir'],
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_configdir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/var/www/php-fcgi-scripts/',
 					'plausibility_check_method' => 'checkPathConflicts',
 					'save_method' => 'storeSettingField',
@@ -66,7 +66,7 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_wrapper',
 					'type' => 'option',
-					'option_options' => array(0 => 'ScriptAlias', 1=> 'FCGIWrapper'),
+					'option_options' => array(0 => 'ScriptAlias', 1=> 'FcgidWrapper'),
 					'default' => 1,
 					'save_method' => 'storeSettingField',
 					'websrv_avail' => array('apache2')
@@ -112,7 +112,7 @@ return array(
 					'varname' => 'mod_fcgid_httpuser',
 					'type' => 'string',
 					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingWebserverFcgidFpmUser',
 					'websrv_avail' => array('apache2')
 					),
 				'system_mod_fcgid_httpgroup' => array(
@@ -129,12 +129,20 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_defaultini_ownvhost',
 					'type' => 'option',
-					'default' => '1',
+					'default' => '2',
 					'option_mode' => 'one',
 					'option_options_method' => 'getPhpConfigs',
 					'save_method' => 'storeSettingField',
 					'websrv_avail' => array('apache2')
 					),
+				'system_mod_fcgid_idle_timeout' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['idle_timeout'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_idle_timeout',
+					'type' => 'int',
+					'default' => 30,
+					'save_method' => 'storeSettingField'
+					),
 				)
 			)
 		)

actions/admin/settings/136.phpfpm.php

@@ -44,7 +44,7 @@ return array(
 					'varname' => 'vhost_httpuser',
 					'type' => 'string',
 					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingWebserverFcgidFpmUser'
 					),
 				'system_phpfpm_httpgroup' => array(
 					'label' => $lng['phpfpm']['vhost_httpgroup'],
@@ -54,28 +54,43 @@ return array(
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingField'
 					),
-				/*
-				 * @TODO implement if phpfpm knows custom php.ini files
-				 * 
+				'system_phpfpm_defaultini' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'defaultini',
+					'type' => 'option',
+					'default' => '1',
+					'option_mode' => 'one',
+					'option_options_method' => 'getPhpConfigs',
+					'save_method' => 'storeSettingField'
+					),
 				'system_phpfpm_defaultini_ownvhost' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
 					'settinggroup' => 'phpfpm',
 					'varname' => 'vhost_defaultini',
 					'type' => 'option',
-					'default' => '1',
+					'default' => '2',
 					'option_mode' => 'one',
 					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
 					),
-				*/
 				'system_phpfpm_configdir' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['configdir'],
 					'settinggroup' => 'phpfpm',
 					'varname' => 'configdir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/etc/php-fpm.d/',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
+					),
+				'system_phpfpm_aliasconfigdir' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['aliasconfigdir'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'aliasconfigdir',
+					'type' => 'string',
+					'string_type' => 'confdir',
+					'default' => '/var/www/php-fpm/',
+					'save_method' => 'storeSettingField'
 					),
 				'system_phpfpm_tmpdir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
@@ -84,7 +99,7 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/var/customers/tmp/',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
 					),
 				'system_phpfpm_peardir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['peardir'],
@@ -93,7 +108,16 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/usr/share/php/:/usr/share/php5/',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
+					),
+				'system_phpfpm_fastcgi_ipcdir' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['ipcdir'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'fastcgi_ipcdir',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/var/lib/apache2/fastcgi/',
+					'save_method' => 'storeSettingField'
 					),
 				'system_phpfpm_reload' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['reload'],
@@ -101,7 +125,7 @@ return array(
 					'varname' => 'reload',
 					'type' => 'string',
 					'default' => '/etc/init.d/php-fpm restart',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
 					),
 				'system_phpfpm_pm' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['pm'],
@@ -110,8 +134,8 @@ return array(
 					'type' => 'option',
 					'default' => 'static',
 					'option_mode' => 'one',
-					'option_options' => array('static' => 'static', 'dynamic' => 'dynamic'),
-					'save_method' => 'storeSettingField',
+					'option_options' => array('static' => 'static', 'dynamic' => 'dynamic', 'ondemand' => 'ondemand'),
+					'save_method' => 'storeSettingField'
 					),
 				'system_phpfpm_max_children' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['max_children'],
@@ -119,7 +143,7 @@ return array(
 					'varname' => 'max_children',
 					'type' => 'int',
 					'default' => 1,
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
 					),
 				'system_phpfpm_start_servers' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['start_servers'],
@@ -127,7 +151,7 @@ return array(
 					'varname' => 'start_servers',
 					'type' => 'int',
 					'default' => 20,
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
 					),
 				'system_phpfpm_min_spare_servers' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers'],
@@ -135,7 +159,7 @@ return array(
 					'varname' => 'min_spare_servers',
 					'type' => 'int',
 					'default' => 5,
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
 					),
 				'system_phpfpm_max_spare_servers' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers'],
@@ -143,7 +167,7 @@ return array(
 					'varname' => 'max_spare_servers',
 					'type' => 'int',
 					'default' => 35,
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
 					),
 				'system_phpfpm_max_requests' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['max_requests'],
@@ -151,11 +175,26 @@ return array(
 					'varname' => 'max_requests',
 					'type' => 'int',
 					'default' => 0,
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
+					),
+				'system_phpfpm_idle_timeout' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'idle_timeout',
+					'type' => 'int',
+					'default' => 30,
+					'save_method' => 'storeSettingField'
+					),
+				'system_phpfpm_use_mod_proxy' => array(
+					'label' => $lng['phpfpm']['use_mod_proxy'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'use_mod_proxy',
+					'type' => 'bool',
+					'default' => false,
+					'visible' => Settings::Get('system.apache24'),
+					'save_method' => 'storeSettingField'
 					),
 				),
 			),
 		),
 	);
-
-?>

actions/admin/settings/150.mail.php

@@ -51,6 +51,16 @@ return array(
 					'default' => '/var/customers/mail/',
 					'save_method' => 'storeSettingField',
 					),
+				'system_vmail_maildirname' => array(
+					'label' => $lng['serversettings']['vmail_maildirname'],
+					'settinggroup' => 'system',
+					'varname' => 'vmail_maildirname',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => 'Maildir',
+					'string_emptyallowed' => true,
+					'save_method' => 'storeSettingField',
+					),
 				'panel_sendalternativemail' => array(
 					'label' => $lng['serversettings']['sendalternativemail'],
 					'settinggroup' => 'panel',
@@ -75,24 +85,65 @@ return array(
 					'default' => 100,
 					'save_method' => 'storeSettingField',
 					),
-				'system_autoresponder_enabled' => array(
-					'label' => $lng['serversettings']['autoresponder_active'],
-					'settinggroup' => 'autoresponder',
-					'varname' => 'autoresponder_active',
+				'system_catchall_enabled' => array(
+					'label' => $lng['serversettings']['catchall_enabled'],
+					'settinggroup' => 'catchall',
+					'varname' => 'catchall_enabled',
 					'type' => 'bool',
-					'default' => false,
-					'cronmodule' => 'froxlor/autoresponder',
+					'default' => true,
+					'save_method' => 'storeSettingResetCatchall',
+					),
+				'system_mailtraffic_enabled' => array(
+					'label' => $lng['serversettings']['mailtraffic_enabled'],
+					'settinggroup' => 'system',
+					'varname' => 'mailtraffic_enabled',
+					'type' => 'bool',
+					'default' => true,
 					'save_method' => 'storeSettingField',
 					),
-				'system_last_autoresponder_run' => array(
-					'settinggroup' => 'autoresponder',
-					'varname' => 'last_autoresponder_run',
-					'type' => 'hidden',
-					'default' => 0,
+				'system_mdaserver' => array(
+					'label' => $lng['serversettings']['mdaserver'],
+					'settinggroup' => 'system',
+					'varname' => 'mdaserver',
+					'type' => 'option',
+					'option_mode' => 'one',
+					'default' => 'dovecot',
+					'option_options' => array('courier' => 'Courier', 'dovecot' => 'Dovecot'),
+					'save_method' => 'storeSettingField',
+					),
+				'system_mdalog' => array(
+					'label' => $lng['serversettings']['mdalog'],
+					'settinggroup' => 'system',
+					'varname' => 'mdalog',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/var/log/mail.log',
+					'string_emptyallowed' => true,
+					'save_method' => 'storeSettingField',
+					),
+				'system_mtaserver' => array(
+					'label' => $lng['serversettings']['mtaserver'],
+					'settinggroup' => 'system',
+					'varname' => 'mtaserver',
+					'type' => 'option',
+					'option_mode' => 'one',
+					'default' => 'postfix',
+					'option_options' => array('exim4' => 'Exim4', 'postfix' => 'Postfix'),
+					'save_method' => 'storeSettingField',
+					),
+				'system_mtalog' => array(
+					'label' => $lng['serversettings']['mtalog'],
+					'settinggroup' => 'system',
+					'varname' => 'mtalog',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/var/log/mail.log',
+					'string_emptyallowed' => true,
+					'save_method' => 'storeSettingField',
 					),
 				),
 			),
 		),
 	);
 
-?>
+?>

actions/admin/settings/160.nameserver.php

@@ -22,6 +22,15 @@ return array(
 		'nameserver' => array(
 			'title' => $lng['admin']['nameserversettings'],
 			'fields' => array(
+				'nameserver_enable' => array(
+					'label' => $lng['serversettings']['bindenable'],
+					'settinggroup' => 'system',
+					'varname' => 'bind_enable',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'overview_option' => true
+					),
 				'system_bindconf_directory' => array(
 					'label' => $lng['serversettings']['bindconf_directory'],
 					'settinggroup' => 'system',
@@ -59,6 +68,25 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
+				'system_axfrservers' => array(
+					'label' => $lng['serversettings']['axfrservers'],
+					'settinggroup' => 'system',
+					'varname' => 'axfrservers',
+					'type' => 'string',
+					'string_type' => 'validate_ip_incl_private',
+					'string_delimiter' => ',',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField',
+				),
+				'system_dns_createhostnameentry' => array(
+					'label' => $lng['serversettings']['dns_createhostnameentry'],
+					'settinggroup' => 'system',
+					'varname' => 'dns_createhostnameentry',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
 				'system_dns_createmailentry' => array(
 					'label' => $lng['serversettings']['mail_also_with_mxservers'],
 					'settinggroup' => 'system',

actions/admin/settings/170.logger.php

@@ -65,8 +65,14 @@ return array(
 					'label' => $lng['serversettings']['logger']['logcron'],
 					'settinggroup' => 'logger',
 					'varname' => 'log_cron',
-					'type' => 'bool',
-					'default' => false,
+					'type' => 'option',
+					'default' => 0,
+					'option_mode' => 'one',
+					'option_options' => array(
+							0 => $lng['serversettings']['logger']['logcronoption']['never'],
+							1 => $lng['serversettings']['logger']['logcronoption']['once'],
+							2 => $lng['serversettings']['logger']['logcronoption']['always']
+						),
 					'save_method' => 'storeSettingField',
 					),
 				),
@@ -74,4 +80,4 @@ return array(
 		)
 	);
 
-?>
+?>

actions/admin/settings/180.dkim.php

@@ -79,7 +79,10 @@ return array(
 					'save_method' => 'storeSettingFieldInsertBindTask',
 					),
 				'dkim_keylength' => array(
-					'label' => $lng['dkim']['dkim_keylength'],
+					'label' => array(
+						'title' => $lng['dkim']['dkim_keylength']['title'],
+						'description' => sprintf($lng['dkim']['dkim_keylength']['description'], Settings::Get('dkim.dkim_prefix'))
+					),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_keylength',
 					'type' => 'option',
@@ -128,4 +131,4 @@ return array(
 		),
 	);
 
-?>
+?>

actions/admin/settings/200.aps.php

@@ -1,102 +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
- *
- */
-
-return array(
-	'groups' => array(
-		'aps' => array(
-			'title' => $lng['admin']['aps'],
-			'fields' => array(
-				'aps_enable' => array(
-					'label' => $lng['aps']['activate_aps'],
-					'settinggroup' => 'aps',
-					'varname' => 'aps_active',
-					'type' => 'bool',
-					'default' => false,
-					'cronmodule' => 'froxlor/aps',
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-					),
-				'aps_items_per_page' => array(
-					'label' => $lng['aps']['packages_per_page'],
-					'settinggroup' => 'aps',
-					'varname' => 'items_per_page',
-					'type' => 'int',
-					'default' => 20,
-					'save_method' => 'storeSettingField',
-					),
-				'aps_upload_fields' => array(
-					'label' => $lng['aps']['upload_fields'],
-					'settinggroup' => 'aps',
-					'varname' => 'upload_fields',
-					'type' => 'int',
-					'default' => 5,
-					'save_method' => 'storeSettingField',
-					),
-				'aps_exceptions' => array(
-					'label' => $lng['aps']['exceptions'],
-					'type' => 'label',
-					),
-				'aps_php-extension' => array(
-					'label' => $lng['aps']['settings_php_extensions'],
-					'settinggroup' => 'aps',
-					'varname' => 'php-extension',
-					'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'),
-					'save_method' => 'storeSettingApsPhpExtensions',
-					),
-				'aps_php-function' => array(
-					'settinggroup' => 'aps',
-					'varname' => 'php-function',
-					'type' => 'hidden',
-					'default' => '',
-					),
-				'aps_php-configuration' => array(
-					'label' => $lng['aps']['settings_php_configuration'],
-					'settinggroup' => 'aps',
-					'varname' => 'php-configuration',
-					'type' => 'option',
-					'default' => '',
-					'option_mode' => 'multiple',
-					'option_options' => array('short_open_tag' => 'short_open_tag', 'file_uploads' => 'file_uploads', 'magic_quotes_gpc' => 'magic_quotes_gpc', 'register_globals' => 'register_globals', 'allow_url_fopen' => 'allow_url_fopen', 'safe_mode' => 'safe_mode', 'post_max_size' => 'post_max_size', 'memory_limit' => 'memory_limit', 'max_execution_time' => 'max_execution_time'),
-					'save_method' => 'storeSettingField',
-					),
-				'aps_webserver-module' => array(
-					'label' => $lng['aps']['settings_webserver_modules'],
-					'settinggroup' => 'aps',
-					'varname' => 'webserver-module',
-					'type' => 'option',
-					'default' => '',
-					'option_mode' => 'multiple',
-					'option_options' => array('mod_perl' => 'mod_perl', 'mod_rewrite' => 'mod_rewrite', 'mod_access' => 'mod_access', 'fcgid-any' => 'FastCGI/mod_fcgid', 'htaccess' => '.htaccess'),
-					'save_method' => 'storeSettingApsWebserverModules',
-					),
-				'aps_webserver-htaccess' => array(
-					'settinggroup' => 'aps',
-					'varname' => 'webserver-htaccess',
-					'type' => 'hidden',
-					'default' => '',
-					),
-				),
-			),
-		),
-	);
-
-?>

actions/admin/settings/210.security.php

@@ -38,9 +38,33 @@ return array(
 					'default' => true,
 					'save_method' => 'storeSettingField',
 					),
-				),
-			),
-		),
+				'system_passwordcryptfunc' => array(
+					'label' => $lng['serversettings']['passwordcryptfunc'],
+					'settinggroup' => 'system',
+					'varname' => 'passwordcryptfunc',
+					'type' => 'option',
+					'default' => 0,
+					'option_mode' => 'one',
+					'option_options_method' => 'getAvailablePasswordHashes',
+					'save_method' => 'storeSettingField',
+					),
+				'system_allow_error_report_admin' => array(
+					'label' => $lng['serversettings']['allow_error_report_admin'],
+					'settinggroup' => 'system',
+					'varname' => 'allow_error_report_admin',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'system_allow_error_report_customer' => array(
+					'label' => $lng['serversettings']['allow_error_report_customer'],
+					'settinggroup' => 'system',
+					'varname' => 'allow_error_report_customer',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					)
+				)
+			)
+		)
 	);
-
-?>

actions/admin/settings/215.backup.php

@@ -1,117 +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
- *
- */
-
-return array(
-	'groups' => array(
-		'backup' => array(
-			'title' => $lng['backup'],
-			'fields' => array(
-				'backup_enabled' => array(
-					'label' => $lng['serversettings']['backup_enabled'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-				),
-				'backup_dir' => array(
-					'label' => $lng['serversettings']['backupdir']['description'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_dir',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/var/customers/backups/',
-					'string_regexp' => '^/.*/$',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_mysqldump_path' => array(
-					'label' => $lng['serversettings']['mysqldump_path']['description'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_mysqldump_path',
-					'type' => 'string',
-					'default' => '/usr/bin/mysqldump',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_count' => array(
-					'label' => $lng['serversettings']['backup_count'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_count',
-					'type' => 'bool',
-					'default' => 'true',
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),				
-				'backup_bigfile' => array(
-					'label' => $lng['serversettings']['backup_bigfile'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_bigfile',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),
-				'backup_ftp_enabled_' => array(
-					'label' => $lng['serversettings']['backup_ftp_enabled'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),
-				'backup_server' => array(
-					'label' => $lng['serversettings']['backup_ftp_server'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_server',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_user' => array(
-					'label' => $lng['serversettings']['backup_ftp_user'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_user',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_pass' => array(
-					'label' => $lng['serversettings']['backup_ftp_pass'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_pass',
-					'type' => 'hiddenstring',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_passive_mode' => array(
-					'label' => $lng['serversettings']['backup_ftp_passive_mode'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_passive',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					'overview_option' => false,
-				),
-				),
-			),
-		),
-	);
-
-?>

actions/admin/settings/220.quota.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2011 the Froxlor Team (see authors).
+ * Copyright (c) 2011- 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

actions/admin/settings/225.logrotate.php

@@ -1,67 +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
- *
- */
-
-return array(
-'groups' => array(
-		'logrotate' => array(
-			'title' => $lng['logrotate'],
-			'fields' => array(
-				'logrotate_enabled' => array(
-					'label' => $lng['logrotate_enabled'],
-					'settinggroup' => 'system',
-					'varname' => 'logrotate_enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-				),
-				'logrotate_binary' => array(
-					'label' => $lng['logrotate_binary'],
-					'settinggroup' => 'system',
-					'varname' => 'logrotate_binary',
-					'type' => 'string',
-					'default' => '/usr/sbin/logrotate',
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),
-				'logrotate_interval' => array(
-					'label' => $lng['logrotate_interval'],
-					'settinggroup' => 'system',
-					'varname' => 'logrotate_interval',
-					'type' => 'option',
-					'default' => 'weekly',
-					'option_mode' => 'one',
-				        'option_options' => array('daily' => 'Daily', 'weekly' => 'Weekly', 'monthly' => 'Monthly'),
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),
-				'logrotate_keep' => array(
-					'label' => $lng['logrotate_keep'],
-					'settinggroup' => 'system',
-					'varname' => 'logrotate_keep',
-					'type' => 'string',
-					'default' => '4',
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),				
-				),
-			),
-		),
-	);
-
-?>

admin_apcuinfo.php

@@ -0,0 +1,415 @@
+<?php
+
+/*
+  +----------------------------------------------------------------------+
+  | APC                                                                  |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2006-2011 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt                                  |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Authors: Ralf Becker <beckerr@php.net>                               |
+  |          Rasmus Lerdorf <rasmus@php.net>                             |
+  |          Ilia Alshanetsky <ilia@prohost.org>                         |
+  +----------------------------------------------------------------------+
+
+   All other licensing and usage conditions are those of the PHP Group.
+
+   Based on https://github.com/krakjoe/apcu/blob/master/apc.php
+   Implemented into Froxlor: Janos Muzsi <muzsij@hypernics.hu>
+
+ */
+
+define('AREA', 'admin');
+require './lib/init.php';
+
+
+$horizontal_bar_size = 950; // 1280px window width
+
+if ($action == 'delete' &&
+        function_exists('apcu_clear_cache') &&
+        $userinfo['change_serversettings'] == '1'
+) {
+    apcu_clear_cache();
+    $log->logAction(ADM_ACTION, LOG_INFO, "cleared APCu cache");
+    header('Location: ' . $linker->getLink(array('section' => 'apcuinfo', 'page' => 'showinfo')));
+    exit();
+}
+
+if (!function_exists('apcu_cache_info') ||
+        !function_exists('apcu_sma_info')
+) {
+    standard_error($lng['error']['no_apcuinfo']);
+}
+
+if ($page == 'showinfo'
+) {
+    $cache = apcu_cache_info();
+    $mem = apcu_sma_info();
+    $time = time();
+    $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_apcuinfo");
+
+    $passtime = $time - $cache['start_time'] > 0 ? $time - $cache['start_time'] : 1; // zero division
+    $mem_size = $mem['num_seg'] * $mem['seg_size'];
+    $mem_avail = $mem['avail_mem'];
+    $mem_used = $mem_size - $mem_avail;
+    $seg_size = bsize($mem['seg_size']);
+    $sharedmem = sprintf($lng['apcuinfo']['sharedmemval'], $mem['num_seg'], $seg_size, $cache['memory_type']);
+    $req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'] + $cache['num_misses']) / $passtime) : 0);
+    $hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']) / $passtime) : 0);
+    $miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses']) / $passtime) : 0);
+    $insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts']) / $passtime) : 0);
+    $apcversion = phpversion('apcu');
+    $phpversion = phpversion();
+    $number_vars = $cache['num_entries'];
+    $starttime = date('Y-m-d H:i:s', $cache['start_time']);
+    $uptime_duration = duration($cache['start_time']);
+    $size_vars = bsize($cache['mem_size']);
+
+    // check for possible empty values that are used in the templates
+    if (!isset($cache['file_upload_progress'])) {
+        $cache['file_upload_progress'] = $lng['logger']['unknown'];
+    }
+
+    if (!isset($cache['num_expunges'])) {
+        $cache['num_expunges'] = $lng['logger']['unknown'];
+    }
+
+    $runtimelines = '';
+    foreach (ini_get_all('apcu') as $name => $v) {
+        $value = $v['local_value'];
+        eval("\$runtimelines.=\"" . getTemplate("settings/apcuinfo/runtime_line") . "\";");
+    }
+
+    $freemem = bsize($mem_avail) . sprintf(" (%.1f%%)", $mem_avail * 100 / $mem_size);
+    $usedmem = bsize($mem_used) . sprintf(" (%.1f%%)", $mem_used * 100 / $mem_size);
+    $hits = $cache['num_hits'] . @sprintf(" (%.1f%%)", $cache['num_hits'] * 100 / ($cache['num_hits'] + $cache['num_misses']));
+    $misses = $cache['num_misses'] . @sprintf(" (%.1f%%)", $cache['num_misses'] * 100 / ($cache['num_hits'] + $cache['num_misses']));
+
+    // Fragementation: (freeseg - 1) / total_seg
+    $nseg = $freeseg = $fragsize = $freetotal = 0;
+    for ($i = 0; $i < $mem['num_seg']; $i++) {
+        $ptr = 0;
+        foreach ($mem['block_lists'][$i] as $block) {
+            if ($block['offset'] != $ptr) {
+                ++$nseg;
+            }
+            $ptr = $block['offset'] + $block['size'];
+            /* Only consider blocks <5M for the fragmentation % */
+            if ($block['size'] < (5 * 1024 * 1024))
+                $fragsize+=$block['size'];
+            $freetotal+=$block['size'];
+        }
+        $freeseg += count($mem['block_lists'][$i]);
+    }
+
+    if ($freeseg > 1) {
+        $frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize / $freetotal) * 100, bsize($fragsize), bsize($freetotal), $freeseg);
+    } else {
+        $frag = "0%";
+    }
+
+    foreach (ini_get_all('apcu') as $name => $v) {
+        $value = $v['local_value'];
+    }
+
+    $img_src1 = '';
+    $img_src2 = '';
+    $img_src3 = '';
+    if (graphics_avail()) {
+        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img1', 'action' => mt_rand(0, 1000000)));
+        eval("\$img_src1=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
+        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img2', 'action' => mt_rand(0, 1000000)));
+        eval("\$img_src2=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
+        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img3', 'action' => mt_rand(0, 1000000)));
+        eval("\$img_src3=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
+    }
+
+    eval("echo \"" . getTemplate("settings/apcuinfo/showinfo") . "\";");
+    
+} elseif ($page == 'img1'
+) {
+
+    $mem = apcu_sma_info();
+
+    $size = 460;
+    $image = imagecreate($size + 5, $size + 5);
+
+    $col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+    $col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
+    $col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
+    $col_black = imagecolorallocate($image, 0, 0, 0);
+
+    imagecolortransparent($image, $col_white);
+
+    $s = $mem['num_seg'] * $mem['seg_size'];
+    $a = $mem['avail_mem'];
+    $x = $y = $size / 2;
+    $fuzz = 0.000001;
+
+    // This block of code creates the pie chart.  It is a lot more complex than you
+    // would expect because we try to visualize any memory fragmentation as well.
+    $angle_from = 0;
+    $string_placement = array();
+    for ($i = 0; $i < $mem['num_seg']; $i++) {
+        $ptr = 0;
+        $free = $mem['block_lists'][$i];
+        uasort($free, 'block_sort');
+        foreach ($free as $block) {
+            if ($block['offset'] != $ptr) {       // Used block
+                $angle_to = $angle_from + ($block['offset'] - $ptr) / $s;
+                if (($angle_to + $fuzz) > 1)
+                    $angle_to = 1;
+                if (($angle_to * 360) - ($angle_from * 360) >= 1) {
+                    fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
+                    if (($angle_to - $angle_from) > 0.05) {
+                        array_push($string_placement, array($angle_from, $angle_to));
+                    }
+                }
+                $angle_from = $angle_to;
+            }
+            $angle_to = $angle_from + ($block['size']) / $s;
+            if (($angle_to + $fuzz) > 1)
+                $angle_to = 1;
+            if (($angle_to * 360) - ($angle_from * 360) >= 1) {
+                fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_green);
+                if (($angle_to - $angle_from) > 0.05) {
+                    array_push($string_placement, array($angle_from, $angle_to));
+                }
+            }
+            $angle_from = $angle_to;
+            $ptr = $block['offset'] + $block['size'];
+        }
+        if ($ptr < $mem['seg_size']) { // memory at the end
+            $angle_to = $angle_from + ($mem['seg_size'] - $ptr) / $s;
+            if (($angle_to + $fuzz) > 1)
+                $angle_to = 1;
+            fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
+            if (($angle_to - $angle_from) > 0.05) {
+                array_push($string_placement, array($angle_from, $angle_to));
+            }
+        }
+    }
+    foreach ($string_placement as $angle) {
+        text_arc($image, $x, $y, $size, $angle[0] * 360, $angle[1] * 360, $col_black, bsize($s * ($angle[1] - $angle[0])));
+    }
+
+    header("Content-type: image/png");
+    imagepng($image);
+    exit;
+} elseif ($page == 'img2'
+) {
+
+    $cache = apcu_cache_info();
+
+    $size = $horizontal_bar_size;
+    $image = imagecreate($size + 5, 140);
+
+    $col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+    $col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
+    $col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
+    $col_black = imagecolorallocate($image, 0, 0, 0);
+
+    imagecolortransparent($image, $col_white);
+
+    $s = $cache['num_hits'] + $cache['num_misses'];
+    $a = $cache['num_hits'];
+
+    fill_box($image, 1, 10, $s ? ($a * ($size - 21) / $s) : $size, 50, $col_black, $col_green/* , sprintf("%.1f%%", $s ? $cache['num_hits'] * 100 / $s : 0) */);
+    fill_box($image, 1, 80, $s ? max(4, ($s - $a) * ($size - 21) / $s) : $size, 50, $col_black, $col_red/* , sprintf("%.1f%%", $s ? $cache['num_misses'] * 100 / $s : 0) */);
+
+    header("Content-type: image/png");
+    imagepng($image);
+    exit;
+} elseif ($page == 'img3'
+) {
+
+    $mem = apcu_sma_info();
+
+    $size = $horizontal_bar_size;
+    $image = imagecreate($size, 70);
+
+    $col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+    $col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
+    $col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
+    $col_black = imagecolorallocate($image, 0, 0, 0);
+
+    imagecolortransparent($image, $col_white);
+
+    $s = $mem['num_seg'] * $mem['seg_size'];
+    $a = $mem['avail_mem'];
+    $x = 10;
+    $y = 0;
+
+    // This block of code creates the bar chart.  It is a lot more complex than you
+    // would expect because we try to visualize any memory fragmentation as well.
+    for ($i = 0; $i < $mem['num_seg']; $i++) {
+        $ptr = 0;
+        $free = $mem['block_lists'][$i];
+        uasort($free, 'block_sort');
+        foreach ($free as $block) {
+            if ($block['offset'] != $ptr) {       // Used block
+                $h = ($size - 5) * ($block['offset'] - $ptr) / $s;
+                if ($h > 0) {
+                    fill_box($image, $y, $x, $h, 50, $col_black, $col_red);
+                }
+                $y+=$h;
+            }
+            $h = ($size - 5) * ($block['size']) / $s;
+            if ($h > 0) {
+                fill_box($image, $y, $x, $h, 50, $col_black, $col_green);
+            }
+            $y+=$h;
+            $ptr = $block['offset'] + $block['size'];
+        }
+        if ($ptr < $mem['seg_size']) { // memory at the end
+            $h = ($size - 5) * ($mem['seg_size'] - $ptr) / $s;
+            if ($h > 0) {
+                fill_box($image, $y, $x, $h, 50, $col_black, $col_red, bsize($mem['seg_size'] - $ptr), $j++);
+            }
+        }
+    }
+
+    header("Content-type: image/png");
+    imagepng($image);
+    exit;
+}
+
+function graphics_avail() {
+    return extension_loaded('gd');
+}
+
+// pretty printer for byte values
+//
+function bsize($s) {
+    foreach (array('', 'K', 'M', 'G') as $i => $k) {
+        if ($s < 1024)
+            break;
+        $s/=1024;
+    }
+    return sprintf("%5.1f %sBytes", $s, $k);
+}
+
+function duration($ts) {
+    global $time;
+    $years = (int) ((($time - $ts) / (7 * 86400)) / 52.177457);
+    $rem = (int) (($time - $ts) - ($years * 52.177457 * 7 * 86400));
+    $weeks = (int) (($rem) / (7 * 86400));
+    $days = (int) (($rem) / 86400) - $weeks * 7;
+    $hours = (int) (($rem) / 3600) - $days * 24 - $weeks * 7 * 24;
+    $mins = (int) (($rem) / 60) - $hours * 60 - $days * 24 * 60 - $weeks * 7 * 24 * 60;
+    $str = '';
+    if ($years == 1)
+        $str .= "$years year, ";
+    if ($years > 1)
+        $str .= "$years years, ";
+    if ($weeks == 1)
+        $str .= "$weeks week, ";
+    if ($weeks > 1)
+        $str .= "$weeks weeks, ";
+    if ($days == 1)
+        $str .= "$days day,";
+    if ($days > 1)
+        $str .= "$days days,";
+    if ($hours == 1)
+        $str .= " $hours hour and";
+    if ($hours > 1)
+        $str .= " $hours hours and";
+    if ($mins == 1)
+        $str .= " 1 minute";
+    else
+        $str .= " $mins minutes";
+    return $str;
+}
+
+function block_sort($array1, $array2) {
+    if ($array1['offset'] > $array2['offset']) {
+        return 1;
+    } else {
+        return -1;
+    }
+}
+
+function fill_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1, $color2, $text = '', $placeindex = 0) {
+    $r = $diameter / 2;
+    $w = deg2rad((360 + $start + ($end - $start) / 2) % 360);
+
+
+    if (function_exists("imagefilledarc")) {
+        // exists only if GD 2.0.1 is available
+        imagefilledarc($im, $centerX + 1, $centerY + 1, $diameter, $diameter, $start, $end, $color1, IMG_ARC_PIE);
+        imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2, IMG_ARC_PIE);
+        imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color1, IMG_ARC_NOFILL | IMG_ARC_EDGED);
+    } else {
+        imagearc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2);
+        imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
+        imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start + 1)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
+        imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end - 1)) * $r, $centerY + sin(deg2rad($end)) * $r, $color2);
+        imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end)) * $r, $centerY + sin(deg2rad($end)) * $r, $color2);
+        imagefill($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $color2);
+    }
+    if ($text) {
+        if ($placeindex > 0) {
+            imageline($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $diameter, $placeindex * 12, $color1);
+            imagestring($im, 4, $diameter, $placeindex * 12, $text, $color1);
+        } else {
+            imagestring($im, 4, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $text, $color1);
+        }
+    }
+}
+
+function text_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1, $text, $placeindex = 0) {
+    $r = $diameter / 2;
+    $w = deg2rad((360 + $start + ($end - $start) / 2) % 360);
+
+    if ($placeindex > 0) {
+        imageline($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $diameter, $placeindex * 12, $color1);
+        imagestring($im, 4, $diameter, $placeindex * 12, $text, $color1);
+    } else {
+        imagestring($im, 4, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $text, $color1);
+    }
+}
+
+function fill_box($im, $x, $y, $w, $h, $color1, $color2, $text = '', $placeindex = '') {
+    global $col_black;
+    $x1 = $x + $w - 1;
+    $y1 = $y + $h - 1;
+
+    imagerectangle($im, $x, $y1, $x1 + 1, $y + 1, $col_black);
+    if ($y1 > $y)
+        imagefilledrectangle($im, $x, $y, $x1, $y1, $color2);
+    else
+        imagefilledrectangle($im, $x, $y1, $x1, $y, $color2);
+    imagerectangle($im, $x, $y1, $x1, $y, $color1);
+    if ($text) {
+        if ($placeindex > 0) {
+
+            if ($placeindex < 16) {
+                $px = 5;
+                $py = $placeindex * 12 + 6;
+                imagefilledrectangle($im, $px + 90, $py + 3, $px + 90 - 4, $py - 3, $color2);
+                imageline($im, $x, $y + $h / 2, $px + 90, $py, $color2);
+                imagestring($im, 2, $px, $py - 6, $text, $color1);
+            } else {
+                if ($placeindex < 31) {
+                    $px = $x + 40 * 2;
+                    $py = ($placeindex - 15) * 12 + 6;
+                } else {
+                    $px = $x + 40 * 2 + 100 * intval(($placeindex - 15) / 15);
+                    $py = ($placeindex % 15) * 12 + 6;
+                }
+                imagefilledrectangle($im, $px, $py + 3, $px - 4, $py - 3, $color2);
+                imageline($im, $x + $w, $y + $h / 2, $px, $py, $color2);
+                imagestring($im, 2, $px + 2, $py - 6, $text, $color1);
+            }
+        } else {
+            imagestring($im, 4, $x + 5, $y1 - 16, $text, $color1);
+        }
+    }
+}

admin_aps.php

@@ -1,34 +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    Panel
- *
- */
-
-// Required code
-
-define('AREA', 'admin');
-require ("./lib/init.php");
-$Id = 0;
-
-if(isset($_GET['id']))$Id = (int)$_GET['id'];
-
-if(isset($_POST['id']))$Id = (int)$_POST['id'];
-eval("echo \"" . getTemplate("aps/header") . "\";");
-$Aps = new ApsParser($userinfo, $settings, $db);
-$Aps->MainHandler($action);
-eval("echo \"" . getTemplate("aps/footer") . "\";");
-
-?>

admin_autoupdate.php

@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2016 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     Michael Kaufmann <mkaufmann@nutime.de>
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Frontend
+ *
+ * @since      0.9.35
+ *
+ */
+
+define('AREA', 'admin');
+require './lib/init.php';
+
+// define update-uri
+define('UPDATE_URI', "https://version.froxlor.org/Froxlor/legacy/" . $version);
+define('RELEASE_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip");
+define('CHECKSUM_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip.sha256");
+
+// check for allow_url_fopen
+if (ini_get('allow_url_fopen') === false) {
+	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 1));
+}
+
+// check for archive-stuff
+if (function_exists('gzopen') === false) {
+	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 2));
+}
+
+// display initial version check
+if ($page == 'overview') {
+
+	// log our actions
+	$log->logAction(ADM_ACTION, LOG_NOTICE, "checking auto-update");
+
+	// check for new version
+	$latestversion = @file(UPDATE_URI);
+
+	if (isset($latestversion[0])) {
+		$latestversion = explode('|', $latestversion[0]);
+
+		if (is_array($latestversion)
+				&& count($latestversion) >= 1
+		) {
+			$_version = $latestversion[0];
+			$_message = isset($latestversion[1]) ? $latestversion[1] : '';
+			$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
+
+			// add the branding so debian guys are not gettings confused
+			// about their version-number
+			$version_label = $_version.$branding;
+			$version_link = $_link;
+			$message_addinfo = $_message;
+
+			// not numeric -> error-message
+			if (!preg_match('/^((\d+\\.)(\d+\\.)(\d+\\.)?(\d+)?(\-(svn|dev|rc)(\d+))?)$/', $_version)) {
+				// check for customized version to not output
+				// "There is a newer version of froxlor" besides the error-message
+				redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 3));
+			} elseif (version_compare2($version, $_version) == -1) {
+				// there is a newer version - yay
+				$isnewerversion = 1;
+			} else {
+				// nothing new
+				$isnewerversion = 0;
+			}
+
+			// anzeige über version-status mit ggfls. formular
+			// zum update schritt #1 -> download
+			if ($isnewerversion == 1) {
+				$text = 'There is a newer version available. Update to version <b>'.$_version.'</b> now?<br/>(Your current version is: '.$version.')';
+				$hiddenparams = '<input type="hidden" name="newversion" value="'.$_version.'" />';
+				$yesfile = $filename.'?s='.$s.'&amp;page=getdownload';
+				eval("echo \"" . getTemplate("misc/question_yesno", true) . "\";");
+				exit;
+			}
+			elseif ($isnewerversion == 0) {
+				// all good
+			    standard_success ('noupdatesavail');
+			} else {
+				standard_error ('customized_version');
+			}
+		}
+	}
+	// error (something weird came from version.froxlor.org)
+	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 5));
+}
+// download the new archive
+elseif ($page == 'getdownload') {
+
+	// retrieve the new version from the form
+	$newversion = isset($_POST['newversion']) ? $_POST['newversion'] : null;
+
+	// valid?
+	if ($newversion !== null) {
+
+		// define files to get
+		$toLoad = str_replace('{version}', $newversion, RELEASE_URI);
+		$toCheck = str_replace('{version}', $newversion, CHECKSUM_URI);
+
+		// get archive data
+		$newArchive = @file_get_contents($toLoad);
+
+		// check for local destination folder
+		if (!is_dir(FROXLOR_INSTALL_DIR.'/updates/')) {
+			mkdir(FROXLOR_INSTALL_DIR.'/updates/');
+		}
+
+		// name archive
+		$localArchive = FROXLOR_INSTALL_DIR.'/updates/'.basename($toLoad);
+
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "Downloading ".$toLoad." to ".$localArchive);
+
+		// remove old archive
+		if (file_exists($localArchive)) {
+		    @unlink($localArchive);
+		}
+
+		// store archive
+		$fh = fopen($localArchive, 'w');
+		if (!fwrite($fh, $newArchive)) {
+			redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 4));
+		}
+
+		// close file-handle
+		fclose($fh);
+
+		// validate the integrity of the downloaded file
+		$_shouldsum = @file_get_contents($toCheck);
+		if (!empty($_shouldsum)) {
+		    $_t = explode(" ", $_shouldsum);
+		    $shouldsum = $_t[0];
+		} else {
+		    $shouldsum = null;
+		}
+		$filesum = hash_file('sha256', $localArchive);
+
+		if ($filesum != $shouldsum) {
+		    redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 9));
+		}
+
+		// to the next step
+		redirectTo($filename, array('s' => $s, 'page' => 'extract', 'archive' => basename($localArchive)));
+	}
+	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 6));
+}
+// extract and install new version
+elseif ($page == 'extract') {
+
+	$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
+	$localArchive = FROXLOR_INSTALL_DIR.'/updates/'.$toExtract;
+
+	if (isset($_POST['send'])
+			&& $_POST['send'] == 'send'
+	) {
+		// decompress from zip
+		$zip = new ZipArchive;
+		$res = $zip->open($localArchive);
+		if ($res === true) {
+		    $log->logAction(ADM_ACTION, LOG_NOTICE, "Extracting ".$localArchive." to ".dirname(FROXLOR_INSTALL_DIR));
+			$zip->extractTo(dirname(FROXLOR_INSTALL_DIR));
+			$zip->close();
+			// success - remove unused archive
+			@unlink($localArchive);
+		} else {
+			// error
+			redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 8));
+		}
+
+		// redirect to update-page?
+		redirectTo('admin_updates.php', array('s' => $s));
+	}
+
+	if (!file_exists($localArchive)) {
+		redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 7));
+	}
+
+	$text = 'Extract downloaded archive "'.$toExtract.'"?';
+	$hiddenparams = '';
+	$yesfile = $filename.'?s='.$s.'&amp;page=extract&amp;archive='.$toExtract;
+	eval("echo \"" . getTemplate("misc/question_yesno", true) . "\";");
+}
+
+// display error
+elseif ($page == 'error') {
+
+	// retrieve error-number via url-parameter
+	$errno = isset($_GET['errno']) ? (int)$_GET['errno'] : 0;
+
+	// 1 = no allow_url_fopen
+	// 2 = no Zlib
+	// 3 = custom version detected
+	// 4 = could not store archive to local hdd
+	// 5 = some weird value came from version.froxlor.org
+	// 6 = download without valid version
+	// 7 = local archive does not exist
+	// 8 = could not extract archive
+	// 9 = checksum mismatch
+	standard_error ('autoupdate_'.$errno);
+}

admin_configfiles.php

@@ -2,7 +2,6 @@
 
 /**
  * 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
@@ -10,174 +9,209 @@
  * 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    Panel
  *
+ * @since 0.9.34
  */
-
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+if ($userinfo['change_serversettings'] == '1') {
+    
+    $replace_arr = Array(
+        '<SQL_UNPRIVILEGED_USER>' => $sql['user'],
+        '<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD',
+        '<SQL_DB>' => $sql['db'],
+        '<SQL_HOST>' => $sql['host'],
+        '<SQL_SOCKET>' => isset($sql['socket']) ? $sql['socket'] : null,
+        '<SERVERNAME>' => Settings::Get('system.hostname'),
+        '<SERVERIP>' => Settings::Get('system.ipaddress'),
+        '<NAMESERVERS>' => Settings::Get('system.nameservers'),
+        '<VIRTUAL_MAILBOX_BASE>' => Settings::Get('system.vmail_homedir'),
+        '<VIRTUAL_UID_MAPS>' => Settings::Get('system.vmail_uid'),
+        '<VIRTUAL_GID_MAPS>' => Settings::Get('system.vmail_gid'),
+        '<SSLPROTOCOLS>' => (Settings::Get('system.use_ssl') == '1') ? 'imaps pop3s' : '',
+        '<CUSTOMER_TMP>' => (Settings::Get('system.mod_fcgid_tmpdir') != '') ? makeCorrectDir(Settings::Get('system.mod_fcgid_tmpdir')) : '/tmp/',
+        '<BASE_PATH>' => makeCorrectDir(FROXLOR_INSTALL_DIR),
+        '<BIND_CONFIG_PATH>' => makeCorrectDir(Settings::Get('system.bindconf_directory')),
+        '<WEBSERVER_RELOAD_CMD>' => Settings::Get('system.apachereload_command'),
+        '<CUSTOMER_LOGS>' => makeCorrectDir(Settings::Get('system.logfiles_directory')),
+        '<FPM_IPCDIR>' => makeCorrectDir(Settings::Get('phpfpm.fastcgi_ipcdir')),
+        '<WEBSERVER_GROUP>' => Settings::Get('system.httpgroup')
+    );
+    
+    // get distro from URL param
+    $distribution = (isset($_GET['distribution']) && $_GET['distribution'] != 'choose') ? $_GET['distribution'] : "";
+    $service = (isset($_GET['service']) && $_GET['service'] != 'choose') ? $_GET['service'] : "";
+    $daemon = (isset($_GET['daemon']) && $_GET['daemon'] != 'choose') ? $_GET['daemon'] : "";
+    $distributions_select = "";
+    $services_select = "";
+    $daemons_select = "";
+    
+    $configfiles = "";
+    $services = "";
+    $daemons = "";
+    
+    $config_dir = makeCorrectDir(FROXLOR_INSTALL_DIR . '/lib/configfiles/');
+    
+    if ($distribution != "") {
+        // create configparser object
+        $configfiles = new ConfigParser($config_dir . '/' . $distribution . ".xml");
+        
+        // get distro-info
+        $dist_display = getCompleteDistroName($configfiles);
+        
+        // get all the services from the distro
+        $services = $configfiles->getServices();
+        
+        if ($service != "") {
+            
+            $daemons = $services[$service]->getDaemons();
+            
+            if ($daemon == "") {
+                foreach ($daemons as $di => $dd) {
+                    $title = $dd->title;
+                    if ($dd->default) {
+                        $title = $title." (".strtolower($lng['panel']['default']).")";
+                    }
+                    $daemons_select .= makeoption($title, $di);
+                }
+            }
+        } else {
+            foreach ($services as $si => $sd) {
+                $services_select .= makeoption($sd->title, $si);
+            }
+        }
+    } else {
+        
+        // show list of available distro's
+        $distros = glob($config_dir . '*.xml');
+        // tmp array
+        $distributions_select_data = array();
+        // read in all the distros
+        foreach ($distros as $_distribution) {
+            // get configparser object
+            $dist = new ConfigParser($_distribution);
+            // get distro-info
+            $dist_display = getCompleteDistroName($dist);
+            // store in tmp array
+            $distributions_select_data[$dist_display] = str_replace(".xml", "", strtolower(basename($_distribution)));
+        }
+        
+        // sort by distribution name
+        ksort($distributions_select_data);
+        
+        foreach ($distributions_select_data as $dist_display => $dist_index) {
+            // create select-box-option
+            $distributions_select .= makeoption($dist_display, $dist_index);
+        }
+    }
+    
+    if ($distribution != "" && $service != "" && $daemon != "") {
+        
+        $confarr = $daemons[$daemon]->getConfig();
+        
+        $configpage = '';
+        
+        $distro_editor = $configfiles->distributionEditor;
 
-$need_db_sql_data = true;
-require ("./lib/init.php");
-require ("./lib/configfiles_index.inc.php");
-$distribution = '';
-$distributions_select = '';
-$service = '';
-$services_select = '';
-$daemon = '';
-$daemons_select = '';
-
-if($userinfo['change_serversettings'] == '1')
-{
-	if(isset($_GET['distribution'])
-	   && $_GET['distribution'] != ''
-	   && isset($configfiles[$_GET['distribution']])
-	   && is_array($configfiles[$_GET['distribution']]))
-	{
-		$distribution = $_GET['distribution'];
-
-		if(isset($_GET['service'])
-		   && $_GET['service'] != ''
-		   && isset($configfiles[$distribution]['services'][$_GET['service']])
-		   && is_array($configfiles[$distribution]['services'][$_GET['service']]))
-		{
-			$service = $_GET['service'];
-
-			if(isset($_GET['daemon'])
-			   && $_GET['daemon'] != ''
-			   && isset($configfiles[$distribution]['services'][$service]['daemons'][$_GET['daemon']])
-			   && is_array($configfiles[$distribution]['services'][$service]['daemons'][$_GET['daemon']]))
-			{
-				$daemon = $_GET['daemon'];
-			}
-			else
-			{
-				foreach($configfiles[$distribution]['services'][$service]['daemons'] as $daemon_name => $daemon_details)
-				{
-					$daemons_select.= makeoption($daemon_details['label'], $daemon_name);
-				}
-			}
-		}
-		else
-		{
-			foreach($configfiles[$distribution]['services'] as $service_name => $service_details)
-			{
-				$services_select.= makeoption($service_details['label'], $service_name);
-			}
-		}
-	}
-	else
-	{
-		foreach($configfiles as $distribution_name => $distribution_details)
-		{
-			$distributions_select.= makeoption($distribution_details['label'], $distribution_name);
-		}
-	}
-
-	if($distribution != ''
-	   && $service != ''
-	   && $daemon != '')
-	{
-		$replace_arr = Array(
-			'<SQL_UNPRIVILEGED_USER>' => $sql['user'],
-			'<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD',
-			'<SQL_DB>' => $sql['db'],
-			'<SQL_HOST>' => $sql['host'],
-			'<SERVERNAME>' => $settings['system']['hostname'],
-			'<SERVERIP>' => $settings['system']['ipaddress'],
-			'<NAMESERVERS>' => $settings['system']['nameservers'],
-			'<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'],
-			'<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'],
-			'<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'],
-			'<SSLPROTOCOLS>' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '',
-			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/',
-			'<BASE_PATH>' => makeCorrectDir(dirname(__FILE__)),
-			'<BIND_CONFIG_PATH>' => makeCorrectDir($settings['system']['bindconf_directory'])
-		);
-		$files = '';
-		$configpage = '';
-		foreach($configfiles[$distribution]['services'][$service]['daemons'][$daemon] as $action => $value)
-		{
-			if(substr($action, 0, 8) == 'commands')
-			{
-				$commands = '';
-
-				if(is_array($value))
-				{
-					$commands = implode("\n", $value);
-					$commands = str_replace("\n\n", "\n", $commands);
-
-					if($commands != '')
-					{
-						eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
-					}
-				}
-			}
-			elseif(substr($action, 0, 5) == 'files')
-			{
-				$files = '';
-
-				if(is_array($value))
-				{
-					while(list($filename, $realname) = each($value))
-					{
-						$file_content = file_get_contents('./templates/misc/configfiles/' . $distribution . '/' . $daemon . '/' . $filename);
-						$file_content = strtr($file_content, $replace_arr);
-						$file_content = htmlspecialchars($file_content);
-						$numbrows = count(explode("\n", $file_content));
-						eval("\$files.=\"" . getTemplate("configfiles/configfiles_file") . "\";");
-					}
-
-					eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_files") . "\";");
-				}
-			}
-		}
-
-		if(isset($configfiles[$distribution]['services'][$service]['daemons'][$daemon]['restart'])
-		   && is_array($configfiles[$distribution]['services'][$service]['daemons'][$daemon]['restart']))
-		{
-			$restart = implode("\n", $configfiles[$distribution]['services'][$service]['daemons'][$daemon]['restart']);
-		}
-		else
-		{
-			$restart = '';
-		}
-
-		eval("echo \"" . getTemplate("configfiles/configfiles") . "\";");
-	}
-	elseif($page == 'overview')
-	{
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_configfiles");
-		$distributions = '';
-		foreach($configfiles as $distribution_name => $distribution_details)
-		{
-			$services = '';
-			foreach($distribution_details['services'] as $service_name => $service_details)
-			{
-				$daemons = '';
-				foreach($service_details['daemons'] as $daemon_name => $daemon_details)
-				{
-					eval("\$daemons.=\"" . getTemplate("configfiles/choose_daemon") . "\";");
-				}
-
-				eval("\$services.=\"" . getTemplate("configfiles/choose_service") . "\";");
-			}
-
-			eval("\$distributions.=\"" . getTemplate("configfiles/choose_distribution") . "\";");
-		}
-
-		eval("echo \"" . getTemplate("configfiles/choose") . "\";");
-	}
-	else
-	{
-		eval("echo \"" . getTemplate("configfiles/wizard") . "\";");
-	}
+        $commands_pre = "";
+        $commands_file = "";
+        $commands_post = "";
+        
+        $lasttype = '';
+        $commands = '';
+        foreach ($confarr as $idx => $action) {
+            if ($lasttype != '' && $lasttype != $action['type']) {
+                $commands = trim($commands);
+                $numbrows = count(explode("\n", $commands));
+                eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
+                $lasttype = '';
+                $commands = '';
+            }
+            switch ($action['type']) {
+                case "install":
+                    $commands .= $action['content'] . "\n";
+                    $lasttype = "install";
+                    break;
+                case "command":
+                    $commands .= $action['content'] . "\n";
+                    $lasttype = "command";
+                    break;
+                case "file":
+                    if (array_key_exists('content', $action)) {
+                        $commands_file = getFileContentContainer($action['content'], $replace_arr, $action['name'], $distro_editor);
+                    } elseif (array_key_exists('subcommands', $action)) {
+                        foreach ($action['subcommands'] as $fileaction) {
+                            if (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "pre") {
+                                $commands_pre .= $fileaction['content'] . "\n";
+                            } elseif (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "post") {
+                                $commands_post .= $fileaction['content'] . "\n";
+                            } elseif ($fileaction['type'] == 'file') {
+                                $commands_file = getFileContentContainer($fileaction['content'], $replace_arr, $action['name'], $distro_editor);
+                            }
+                        }
+                    }
+                    $realname = $action['name'];
+                    $commands = trim($commands_pre);
+                    if ($commands != "") {
+                        $numbrows = count(explode("\n", $commands));
+                        eval("\$commands_pre=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
+                    }
+                    $commands = trim($commands_post);
+                    if ($commands != "") {
+                        $numbrows = count(explode("\n", $commands));
+                        eval("\$commands_post=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
+                    }
+                    eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_subfileblock") . "\";");
+                    $commands = '';
+                    $commands_pre = '';
+                    $commands_post = '';
+                    break;
+            }
+        }
+        $commands = trim($commands);
+        if ($commands != '') {
+            $numbrows = count(explode("\n", $commands));
+            eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
+        }
+        eval("echo \"" . getTemplate("configfiles/configfiles") . "\";");
+    } else {
+        eval("echo \"" . getTemplate("configfiles/wizard") . "\";");
+    }
+} else {
+    die('not allowed to see this page');
+    // redirect or similar here
 }
 
-?>
+// helper functions
+function getFileContentContainer($file_content, &$replace_arr, $realname, $distro_editor)
+{
+    $files = "";
+    $file_content = trim($file_content);
+    if ($file_content != '') {
+        $file_content = strtr($file_content, $replace_arr);
+        $file_content = htmlspecialchars($file_content);
+        $numbrows = count(explode("\n", $file_content));
+        eval("\$files=\"" . getTemplate("configfiles/configfiles_file") . "\";");
+    }
+    return $files;
+}
+
+function getCompleteDistroName($cparser)
+{
+    // get distro-info
+    $dist_display = $cparser->distributionName;
+    if ($cparser->distributionCodename != '') {
+        $dist_display .= " ".$cparser->distributionCodename;
+    }
+    if ($cparser->distributionVersion != '') {
+        $dist_display .= " (" . $cparser->distributionVersion . ")";
+    }
+    if ($cparser->deprecated) {
+        $dist_display .= " [deprecated]";
+    }
+    return $dist_display;
+}

admin_cronjobs.php

@@ -16,38 +16,29 @@
  */
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-require_once("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'cronjobs'
-  || $page == 'overview')
-{
-	if($action == '')
-	{
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_cronjobs");
+if ($page == 'cronjobs' || $page == 'overview') {
+	if ($action == '') {
+		$log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed admin_cronjobs');
 
 		$fields = array(
 			'c.lastrun' => $lng['cron']['lastrun'],
 			'c.interval' => $lng['cron']['interval'],
 			'c.isactive' => $lng['cron']['isactive']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_CRONRUNS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		$paging = new paging($userinfo, TABLE_PANEL_CRONRUNS, $fields);
 
-		/*
-		 * @TODO Fix sorting
-		 */
 		$crons = '';
-		$result = $db->query("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `cronfile` ASC");
-		$paging->setEntries($db->num_rows($result));
+		$result_stmt = Database::prepare("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `module` ASC, `cronfile` ASC");
+		Database::pexecute($result_stmt);
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -55,89 +46,79 @@ if($page == 'cronjobs'
 
 		$i = 0;
 		$count = 0;
+		$cmod = '';
 
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($cmod != $row['module']) {
+				$_mod = explode("/", $row['module']);
+				$module = ucfirst($_mod[1]);
+				eval("\$crons.=\"" . getTemplate('cronjobs/cronjobs_cronjobmodule') . "\";");
+				$cmod = $row['module'];
+			}
+			if ($paging->checkDisplay($i)) {
 				$row = htmlentities_array($row);
-				
+
 				$row['lastrun'] = date('d.m.Y H:i', $row['lastrun']);
-				
-				if((int)$row['isactive'] == 1)
-				{
-					$row['isactive'] = $lng['panel']['yes'];
-				}
-				else
-				{
-					$row['isactive'] = $lng['panel']['no'];
-				}
-				
+				$row['isactive'] = ((int)$row['isactive'] == 1) ? $lng['panel']['yes'] : $lng['panel']['no'];
+
 				$description = $lng['crondesc'][$row['desc_lng_key']];
-				
-				eval("\$crons.=\"" . getTemplate("cronjobs/cronjobs_cronjob") . "\";");
+
+				eval("\$crons.=\"" . getTemplate('cronjobs/cronjobs_cronjob') . "\";");
 				$count++;
 			}
 
 			$i++;
 		}
 
-		eval("echo \"" . getTemplate("cronjobs/cronjobs") . "\";");
+		eval("echo \"" . getTemplate('cronjobs/cronjobs') . "\";");
 
-	}
-	elseif($action == 'new')
-	{
+	} elseif ($action == 'new') {
 		/*
 		 * @TODO later
 		 */
-	}
-	elseif($action == 'edit'
-	&& $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `id`='" . (int)$id . "'");
-		
-		if ($result['cronfile'] != '')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$isactive = intval($_POST['isactive']);
+	} elseif ($action == 'edit' && $id != 0) {
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `id`= :id");
+		Database::pexecute($result_stmt, array('id' => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+		if ($result['cronfile'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				$isactive = isset($_POST['isactive']) ? 1 : 0;
 				$interval_value = validate($_POST['interval_value'], 'interval_value', '/^([0-9]+)$/Di', 'stringisempty');
 				$interval_interval = validate($_POST['interval_interval'], 'interval_interval');
-				
-				if($isactive != 1)
-				{
+
+				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_value . ' ' . strtoupper($interval_interval);
+
+				$upd = Database::prepare("
+					UPDATE `" . TABLE_PANEL_CRONRUNS . "`
+					SET `isactive` = :isactive, `interval` = :int
+					WHERE `id` = :id"
+				);
+				Database::pexecute($upd, array('isactive' => $isactive, 'int' => $interval, 'id' => $id));
+
+				// insert task to re-generate the cron.d-file
+				inserttask('99');
+
+				redirectTo($filename, array('page' => $page, 's' => $s));
+			} else {
+
 				// 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]);
+				$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')
-				{
+				if (substr($result['module'], 0, strpos($result['module'], '/')) != 'froxlor') {
 					$change_cronfile = true;
 				}
 
@@ -147,17 +128,13 @@ if($page == 'cronjobs'
 				$title = $cronjobs_edit_data['cronjobs_edit']['title'];
 				$image = $cronjobs_edit_data['cronjobs_edit']['image'];
 
-				eval("echo \"" . getTemplate("cronjobs/cronjob_edit") . "\";");
+				eval("echo \"" . getTemplate('cronjobs/cronjob_edit') . "\";");
 			}
 		}
 	}
-	elseif($action == 'delete'
-	&& $id != 0)
-	{
+	elseif ($action == 'delete' && $id != 0) {
 		/*
 		 * @TODO later
 		 */
 	}
 }
-
-?>

admin_index.php

@@ -18,184 +18,161 @@
  */
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+if ($action == 'logout')  {
 
-require ("./lib/init.php");
-
-if($action == 'logout')
-{
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "logged out");
 
-	if($settings['session']['allow_multiple_login'] == '1')
-	{
-		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1' AND `hash` = '" . $s . "'");
-	}
-	else
-	{
-		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1'");
+	$params = array('adminid' => (int)$userinfo['adminid']);
+
+	if (Settings::Get('session.allow_multiple_login') == '1') {
+		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+			WHERE `userid` = :adminid
+			AND `adminsession` = '1'
+			AND `hash` = :hash"
+		);
+		$params['hash'] = $s;
+	} else {
+		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+			WHERE `userid` = :adminid
+			AND `adminsession` = '1'"
+		);
 	}
+	Database::pexecute($stmt, $params);
 
 	redirectTo('index.php');
-	exit;
 }
 
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_index");
-	$overview = $db->query_first("SELECT COUNT(*) AS `number_customers`,
+	$overview_stmt = Database::prepare("SELECT COUNT(*) AS `number_customers`,
 				SUM(`diskspace_used`) AS `diskspace_used`,
 				SUM(`mysqls_used`) AS `mysqls_used`,
 				SUM(`emails_used`) AS `emails_used`,
 				SUM(`email_accounts_used`) AS `email_accounts_used`,
 				SUM(`email_forwarders_used`) AS `email_forwarders_used`,
 				SUM(`email_quota_used`) AS `email_quota_used`,
-				SUM(`email_autoresponder_used`) AS `email_autoresponder_used`,
 				SUM(`ftps_used`) AS `ftps_used`,
 				SUM(`tickets_used`) AS `tickets_used`,
 				SUM(`subdomains_used`) AS `subdomains_used`,
-				SUM(`traffic_used`) AS `traffic_used`,
-				SUM(`aps_packages_used`) AS `aps_packages_used`
-				FROM `" . TABLE_PANEL_CUSTOMERS . "`" . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' "));
-	$overview['traffic_used'] = round($overview['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$overview['diskspace_used'] = round($overview['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
-	$number_domains = $db->query_first("SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' "));
+				SUM(`traffic_used`) AS `traffic_used`
+				FROM `" . TABLE_PANEL_CUSTOMERS . "`" . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = :adminid "));
+	$overview = Database::pexecute_first($overview_stmt, array('adminid' => $userinfo['adminid']));
+
+	$dec_places = Settings::Get('panel.decimal_places');
+	$overview['traffic_used'] = round($overview['traffic_used'] / (1024 * 1024), $dec_places);
+	$overview['diskspace_used'] = round($overview['diskspace_used'] / 1024, $dec_places);
+
+	$number_domains_stmt = Database::prepare("
+		SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "`
+		WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid")
+	);
+	$number_domains = Database::pexecute_first($number_domains_stmt, array('adminid' => $userinfo['adminid']));
+
 	$overview['number_domains'] = $number_domains['number_domains'];
+
 	$phpversion = phpversion();
-	$phpmemorylimit = @ini_get("memory_limit");
-
-	if($phpmemorylimit == "")
-	{
-		$phpmemorylimit = $lng['admin']['memorylimitdisabled'];
-	}
-
-	$mysqlserverversion = mysql_get_server_info();
-	$mysqlclientversion = mysql_get_client_info();
+	$mysqlserverversion = Database::getAttribute(PDO::ATTR_SERVER_VERSION);
 	$webserverinterface = strtoupper(@php_sapi_name());
 
-	if((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
-	|| (isset($lookfornewversion) && $lookfornewversion == 'yes'))
-	{
+	if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
+		|| (isset($lookfornewversion) && $lookfornewversion == 'yes')
+	) {
 		$update_check_uri = 'http://version.froxlor.org/Froxlor/legacy/' . $version;
 
-		if(ini_get('allow_url_fopen'))
-		{
+		if (ini_get('allow_url_fopen')) {
 			$latestversion = @file($update_check_uri);
 
-			if (isset($latestversion[0]))
-			{
+			if (isset($latestversion[0])) {
 				$latestversion = explode('|', $latestversion[0]);
 
-				if(is_array($latestversion)
-				&& count($latestversion) >= 1)
-				{
+				if (is_array($latestversion)
+					&& count($latestversion) >= 1
+				) {
 					$_version = $latestversion[0];
 					$_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;
+					// add the branding so debian guys are not gettings confused
+					// about their version-number
+					$lookfornewversion_lable = $_version.$branding;
 					$lookfornewversion_link = $_link;
 					$lookfornewversion_addinfo = $_message;
 
-					if (version_compare($version, $_version) == -1) {
+					// not numeric -> error-message
+					if (!preg_match('/^((\d+\\.)(\d+\\.)(\d+\\.)?(\d+)?(\-(svn|dev|rc)(\d+))?)$/', $_version)) {
+						// check for customized version to not output
+						// "There is a newer version of froxlor" besides the error-message
+						$isnewerversion = 2;
+					} elseif (version_compare2($version, $_version) == -1) {
 						$isnewerversion = 1;
 					} else {
 						$isnewerversion = 0;
 					}
+				} else {
+					redirectTo($update_check_uri.'/pretty', NULL, false);
 				}
-				else
-				{
-					redirectTo($update_check_uri.'/pretty', NULL);
-				}
-			}
-			else
-			{
-				redirectTo($update_check_uri.'/pretty', NULL);
+			} else {
+				redirectTo($update_check_uri.'/pretty', NULL, false);
 			}
+		} else {
+			redirectTo($update_check_uri.'/pretty', NULL, false);
 		}
-		else
-		{
-			redirectTo($update_check_uri.'/pretty', NULL);
-		}
-	}
-	else
-	{
+	} else {
 		$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']);
-	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
-	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps tickets subdomains aps_packages');
+	$dec_places = Settings::Get('panel.decimal_places');
+	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $dec_places);
+	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $dec_places);
+	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $dec_places);
+	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $dec_places);
+	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
+
+	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
 
 	$cron_last_runs = getCronjobsLastRun();
 	$outstanding_tasks = getOutstandingTasks();
 
-	$opentickets = 0;
-	$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                   WHERE `answerto` = "0" AND (`status` = "0" OR `status` = "1")
-                                   AND `lastreplier`="0" AND `adminid` = "' . $userinfo['adminid'] . '"');
-	$awaitingtickets = $opentickets['count'];
-	$awaitingtickets_text = '';
-
-	if($opentickets > 0)
-	{
-		$awaitingtickets_text = strtr($lng['ticket']['awaitingticketreply'], array('%s' => '<a href="admin_tickets.php?page=tickets&amp;s=' . $s . '">' . $opentickets['count'] . '</a>'));
-	}
-
-	if(function_exists('sys_getloadavg'))
-	{
+	if (function_exists('sys_getloadavg')) {
 		$loadArray = sys_getloadavg();
 		$load = number_format($loadArray[0], 2, '.', '') . " / " . number_format($loadArray[1], 2, '.', '') . " / " . number_format($loadArray[2], 2, '.', '');
-	}
-	else
-	{
+	} else {
 		$load = @file_get_contents('/proc/loadavg');
 
-		if(!$load)
-		{
+		if (!$load) {
 			$load = $lng['admin']['noloadavailable'];
 		}
 	}
 
-	if(function_exists('posix_uname'))
-	{
+	if (function_exists('posix_uname')) {
 		$showkernel = 1;
 		$kernel_nfo = posix_uname();
 		$kernel = $kernel_nfo['release'] . ' (' . $kernel_nfo['machine'] . ')';
-	}
-	else
-	{
+	} else {
 		$showkernel = 0;
 		$kernel = '';
 	}
 
 	// Try to get the uptime
 	// First: With exec (let's hope it's enabled for the Froxlor - vHost)
-
 	$uptime_array = explode(" ", @file_get_contents("/proc/uptime"));
 
-	if(is_array($uptime_array)
-	&& isset($uptime_array[0])
-	&& is_numeric($uptime_array[0]))
-	{
+	if (is_array($uptime_array)
+		&& isset($uptime_array[0])
+		&& is_numeric($uptime_array[0])
+	) {
 		// Some calculatioon to get a nicly formatted display
-
 		$seconds = round($uptime_array[0], 0);
 		$minutes = $seconds / 60;
 		$hours = $minutes / 60;
@@ -206,123 +183,224 @@ if($page == 'overview')
 		$uptime = "{$days}d, {$hours}h, {$minutes}m, {$seconds}s";
 
 		// Just cleanup
-
 		unset($uptime_array, $seconds, $minutes, $hours, $days);
-	}
-	else
-	{
+	} else {
 		// Nothing of the above worked, show an error :/
-
 		$uptime = '';
 	}
 
 	eval("echo \"" . getTemplate("index/index") . "\";");
-}
-elseif($page == 'change_password')
-{
-	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
-	{
+
+} elseif($page == 'change_password') {
+
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
 		$old_password = validate($_POST['old_password'], 'old password');
 
-		if(md5($old_password) != $userinfo['password'])
-		{
+		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_ADMINS,'adminid')) {
 			standard_error('oldpasswordnotcorrect');
-			exit;
 		}
 
 		$new_password = validate($_POST['new_password'], 'new password');
 		$new_password_confirm = validate($_POST['new_password_confirm'], 'new password confirm');
 
-		if($old_password == '')
-		{
+		if ($old_password == '') {
 			standard_error(array('stringisempty', 'oldpassword'));
-		}
-		elseif($new_password == '')
-		{
+		} elseif($new_password == '') {
 			standard_error(array('stringisempty', 'newpassword'));
-		}
-		elseif($new_password_confirm == '')
-		{
+		} elseif($new_password_confirm == '') {
 			standard_error(array('stringisempty', 'newpasswordconfirm'));
-		}
-		elseif($new_password != $new_password_confirm)
-		{
+		} elseif($new_password != $new_password_confirm) {
 			standard_error('newpasswordconfirmerror');
-		}
-		else
-		{
-			$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `password`='" . md5($new_password) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `password`='" . md5($old_password) . "'");
+		} else {
+			$chgpwd_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_ADMINS . "`
+				SET `password`= :newpasswd
+				WHERE `adminid`= :adminid"
+			);
+			Database::pexecute($chgpwd_stmt, array(
+				'newpasswd' => makeCryptPassword($new_password),
+				'adminid' => (int)$userinfo['adminid']
+			));
 			$log->logAction(ADM_ACTION, LOG_NOTICE, 'changed password');
 			redirectTo($filename, Array('s' => $s));
 		}
-	}
-	else
-	{
+	} else {
 		eval("echo \"" . getTemplate("index/change_password") . "\";");
 	}
-}
-elseif($page == 'change_language')
-{
-	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
-	{
+
+} elseif($page == 'change_language') {
+
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
 		$def_language = validate($_POST['def_language'], 'default language');
 
-		if(isset($languages[$def_language]))
-		{
-			$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `def_language`='" . $db->escape($def_language) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "'");
-			$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `language`='" . $db->escape($def_language) . "' WHERE `hash`='" . $db->escape($s) . "'");
+		if (isset($languages[$def_language])) {
+			$lng_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_ADMINS . "`
+				SET `def_language`= :deflng
+				WHERE `adminid`= :adminid"
+			);
+			Database::pexecute($lng_stmt, array(
+				'deflng' => $def_language,
+				'adminid' => (int)$userinfo['adminid']
+			));
+
+			$lng_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_SESSIONS . "`
+				SET `language`= :lng
+				WHERE `hash`= :hash"
+			);
+			Database::pexecute($lng_stmt, array(
+				'lng' => $def_language,
+				'hash' => $s
+			));
 		}
 
 		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her default language to '" . $def_language . "'");
-		redirectTo($filename, Array('s' => $s));
-	}
-	else
-	{
+		redirectTo($filename, array('s' => $s));
+
+	} else {
+
 		$language_options = '';
 
-		$default_lang = $settings['panel']['standardlanguage'];
-		if($userinfo['def_language'] != '') {
+		$default_lang = Settings::Get('panel.standardlanguage');
+		if ($userinfo['def_language'] != '') {
 			$default_lang = $userinfo['def_language'];
 		}
 
-		while(list($language_file, $language_name) = each($languages))
-		{
+		while (list($language_file, $language_name) = each($languages)) {
 			$language_options.= makeoption($language_name, $language_file, $default_lang, true);
 		}
 
 		eval("echo \"" . getTemplate("index/change_language") . "\";");
 	}
-}
-elseif($page == 'change_theme')
-{
-	if(isset($_POST['send'])
+
+} elseif ($page == 'change_theme') {
+
+	if (isset($_POST['send'])
 		&& $_POST['send'] == 'send'
 	) {
 		$theme = validate($_POST['theme'], 'theme');
 
-		$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "'");
-		$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'");
+		$theme_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_ADMINS . "`
+				SET `theme`= :theme
+				WHERE `adminid`= :adminid"
+		);
+		Database::pexecute($theme_stmt, array(
+			'theme' => $theme,
+			'adminid' => (int)$userinfo['adminid']
+		));
+
+		$theme_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_SESSIONS . "`
+				SET `theme`= :theme
+				WHERE `hash`= :hash"
+		);
+		Database::pexecute($theme_stmt, array(
+			'theme' => $theme,
+			'hash' => $s
+		));
 
 		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
-		redirectTo($filename, Array('s' => $s));
-	}
-	else
-	{
+		redirectTo($filename, array('s' => $s));
+
+	} else {
+
 		$theme_options = '';
 
-		$default_theme = $settings['panel']['default_theme'];
-		if($userinfo['theme'] != '') {
+		$default_theme = Settings::Get('panel.default_theme');
+		if ($userinfo['theme'] != '') {
 			$default_theme = $userinfo['theme'];
 		}
 
 		$themes_avail = getThemes();
-		foreach($themes_avail as $t)
-		{
-			$theme_options.= makeoption($t, $t, $default_theme, true);
+		foreach ($themes_avail as $t => $d) {
+			$theme_options.= makeoption($d, $t, $default_theme, true);
 		}
 
 		eval("echo \"" . getTemplate("index/change_theme") . "\";");
 	}
+
+} elseif ($page == 'send_error_report'
+	&& Settings::Get('system.allow_error_report_admin') == '1'
+) {
+
+	// only show this if we really have an exception to report
+	if (isset($_GET['errorid'])
+		&& $_GET['errorid'] != ''
+	) {
+
+		$errid = $_GET['errorid'];
+		// read error file
+		$err_dir = makeCorrectDir(FROXLOR_INSTALL_DIR."/logs/");
+		$err_file = makeCorrectFile($err_dir."/".$errid."_sql-error.log");
+
+		if (file_exists($err_file)) {
+
+			$error_content = file_get_contents($err_file);
+			$error = explode("|", $error_content);
+
+			$_error = array(
+				'code' => str_replace("\n", "", substr($error[1], 5)),
+				'message' => str_replace("\n", "", substr($error[2], 4)),
+				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(FROXLOR_INSTALL_DIR))),
+				'line' => str_replace("\n", "", substr($error[4], 5)),
+				'trace' => str_replace(FROXLOR_INSTALL_DIR, "", substr($error[5], 6))
+			);
+
+			// build mail-content
+			$mail_body = "Dear froxlor-team,\n\n";
+			$mail_body .= "the following error has been reported by a user:\n\n";
+			$mail_body .= "-------------------------------------------------------------\n";
+			$mail_body .= $_error['code'].' '.$_error['message']."\n\n";
+			$mail_body .= "File: ".$_error['file'].':'.$_error['line']."\n\n";
+			$mail_body .= "Trace:\n".trim($_error['trace'])."\n\n";
+			$mail_body .= "-------------------------------------------------------------\n\n";
+			$mail_body .= "Froxlor-version: ".$version."\n\n";
+			$mail_body .= "End of report";
+			$mail_html = nl2br($mail_body);
+
+			// send actual report to dev-team
+			if (isset($_POST['send'])
+					&& $_POST['send'] == 'send'
+			) {
+				// send mail and say thanks
+				$_mailerror = false;
+				try {
+					$mail->Subject = '[Froxlor] Error report by user';
+					$mail->AltBody = $mail_body;
+					$mail->MsgHTML($mail_html);
+					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
+					$mail->Send();
+				} catch(phpmailerException $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
+				}
+
+				if ($_mailerror) {
+					// error when reporting an error...LOLFUQ
+					standard_error('send_report_error', $mailerr_msg);
+				}
+
+				// finally remove error from fs
+				@unlink($err_file);
+				redirectTo($filename, array('s' => $s));
+			}
+			// show a nice summary of the error-report
+			// before actually sending anything
+			eval("echo \"" . getTemplate("index/send_error_report") . "\";");
+
+		} else {
+			redirectTo($filename, array('s' => $s));
+		}
+	} else {
+		redirectTo($filename, array('s' => $s));
+	}
 }

admin_ipsandports.php

@@ -18,36 +18,34 @@
  */
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'ipsandports'
-   || $page == 'overview')
-{
-	if($action == '')
-	{
+if ($page == 'ipsandports'
+	|| $page == 'overview'
+) {
+	// Do not display attributes that are not used by the current webserver
+	$websrv = Settings::Get('system.webserver');
+	$is_nginx = ($websrv == 'nginx');
+	$is_apache = ($websrv == 'apache2');
+
+	if ($action == '') {
+
 		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports");
 		$fields = array(
 			'ip' => $lng['admin']['ipsandports']['ip'],
 			'port' => $lng['admin']['ipsandports']['port']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_IPSANDPORTS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		$paging = new paging($userinfo, TABLE_PANEL_IPSANDPORTS, $fields);
 		$ipsandports = '';
-		$result = $db->query("SELECT `id`, `ip`, `port`, `listen_statement`, `namevirtualhost_statement`, `vhostcontainer`, `vhostcontainer_servername_statement`, `specialsettings`, `ssl` FROM `" . TABLE_PANEL_IPSANDPORTS . "` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		Database::pexecute($result_stmt);
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -55,97 +53,111 @@ if($page == 'ipsandports'
 		$i = 0;
 		$count = 0;
 
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
-				$row = htmlentities_array($row);
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 
-				if(filter_var($row['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
-				{
+			if ($paging->checkDisplay($i)) {
+				$row = htmlentities_array($row);
+				if (filter_var($row['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 					$row['ip'] = '[' . $row['ip'] . ']';
 				}
-
 				eval("\$ipsandports.=\"" . getTemplate("ipsandports/ipsandports_ipandport") . "\";");
 				$count++;
 			}
-
 			$i++;
 		}
 
 		eval("echo \"" . getTemplate("ipsandports/ipsandports") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
 
-		if(isset($result['id'])
-		   && $result['id'] == $id)
-		{
-			$result_checkdomain = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `ipandport`='" . (int)$id . "'");
+	} elseif($action == 'delete'
+		&& $id != 0
+	) {
+		$result_stmt = Database::prepare("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id");
+		$result = Database::pexecute_first($result_stmt, array('id' => $id));
 
-			if($result_checkdomain['id'] == '')
-			{
-				if($result['id'] != $settings['system']['defaultip'])
-				{
-					$result_sameipotherport = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($result['ip']) . "' AND `id`!='" . (int)$id . "'");
+		if (isset($result['id'])
+			&& $result['id'] == $id
+		) {
+			$result_checkdomain_stmt = Database::prepare("
+				SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports` = :id"
+			);
+			$result_checkdomain = Database::pexecute_first($result_checkdomain_stmt, array('id' => $id));
 
-					if(($result['ip'] != $settings['system']['ipaddress'])
-					   || ($result['ip'] == $settings['system']['ipaddress'] && $result_sameipotherport['id'] != ''))
-					{
-						$result = $db->query_first("SELECT `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
+			if ($result_checkdomain['id'] == '') {
+				if (!in_array($result['id'], explode(',', Settings::Get('system.defaultip')))) {
+
+					$result_sameipotherport_stmt = Database::prepare("
+						SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+						WHERE `ip` = :ip AND `id` <> :id"
+					);
+					$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('id' => $id, 'ip' => $result['ip']));
+
+					if (($result['ip'] != Settings::Get('system.ipaddress'))
+						|| ($result['ip'] == Settings::Get('system.ipaddress')
+						&& $result_sameipotherport['id'] != '')
+					) {
+						$result_stmt = Database::prepare("
+							SELECT `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+							WHERE `id` = :id"
+						);
+						$result = Database::pexecute_first($result_stmt, array('id' => $id));
+
+						if ($result['ip'] != '') {
+
+							if (isset($_POST['send'])
+								&& $_POST['send'] == 'send'
+							) {
+								$del_stmt = Database::prepare("
+									DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+									WHERE `id` = :id"
+								);
+								Database::pexecute($del_stmt, array('id' => $id));
+
+								// also, remove connections to domains (multi-stack)
+								$del_stmt = Database::prepare("
+									DELETE FROM `".TABLE_DOMAINTOIP."` WHERE `id_ipandports` = :id"
+								);
+								Database::pexecute($del_stmt, array('id' => $id));
 
-						if($result['ip'] != '')
-						{
-							if(isset($_POST['send'])
-							   && $_POST['send'] == 'send')
-							{
-								$db->query("DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
 								$log->logAction(ADM_ACTION, LOG_WARNING, "deleted IP/port '" . $result['ip'] . ":" . $result['port'] . "'");
 								inserttask('1');
+								// Using nameserver, insert a task which rebuilds the server config
 								inserttask('4');
-								redirectTo($filename, Array('page' => $page, 's' => $s));
-							}
-							else
-							{
+
+								redirectTo($filename, array('page' => $page, 's' => $s));
+
+							} else {
 								ask_yesno('admin_ip_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['ip'] . ':' . $result['port']);
 							}
 						}
-					}
-					else
-					{
+					} else {
 						standard_error('cantdeletesystemip');
 					}
-				}
-				else
-				{
+				} else {
 					standard_error('cantdeletedefaultip');
 				}
-			}
-			else
-			{
+			} else {
 				standard_error('ipstillhasdomains');
 			}
 		}
-	}
-	elseif($action == 'add')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
+
+	} elseif($action == 'add') {
+
+		if (isset($_POST['send'])
+			&& $_POST['send'] == 'send'
+		) {
+
 			$ip = validate_ip($_POST['ip']);
 			$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
-			$listen_statement = intval($_POST['listen_statement']);
-			$namevirtualhost_statement = intval($_POST['namevirtualhost_statement']);
-			$vhostcontainer = intval($_POST['vhostcontainer']);
+			$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
+			$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
+			$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
 			$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
-			$vhostcontainer_servername_statement = intval($_POST['vhostcontainer_servername_statement']);
+			$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
 			$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
 			$docroot = validate($_POST['docroot'], 'docroot');
-			if((int)$settings['system']['use_ssl'] == 1)
-			{
-				$ssl = intval($_POST['ssl']);
+
+			if ((int)Settings::Get('system.use_ssl') == 1) {
+				$ssl = isset($_POST['ssl']) ? intval($_POST['ssl']) : 0;
 				$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
 				$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
 				$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
@@ -157,105 +169,99 @@ if($page == 'ipsandports'
 				$ssl_ca_file = '';
 				$ssl_cert_chainfile = '';
 			}
-			
-			if($listen_statement != '1')
-			{
+
+			if ($listen_statement != '1') {
 				$listen_statement = '0';
 			}
 
-			if($namevirtualhost_statement != '1')
-			{
+			if ($namevirtualhost_statement != '1') {
 				$namevirtualhost_statement = '0';
 			}
 
-			if($vhostcontainer != '1')
-			{
+			if ($vhostcontainer != '1') {
 				$vhostcontainer = '0';
 			}
 
-			if($vhostcontainer_servername_statement != '1')
-			{
+			if ($vhostcontainer_servername_statement != '1') {
 				$vhostcontainer_servername_statement = '0';
 			}
 
-			if($ssl != '1')
-			{
+			if ($ssl != '1') {
 				$ssl = '0';
 			}
-		
-			if($ssl_cert_file != '')
-			{
+
+			if ($ssl_cert_file != '') {
 				$ssl_cert_file = makeCorrectFile($ssl_cert_file);
 			}
 
-			if($ssl_key_file != '')
-			{
+			if ($ssl_key_file != '') {
 				$ssl_key_file = makeCorrectFile($ssl_key_file);
 			}
 
-			if($ssl_ca_file != '')
-			{
+			if ($ssl_ca_file != '') {
 				$ssl_ca_file = makeCorrectFile($ssl_ca_file);
 			}
 
-			if($ssl_cert_chainfile != '')
-			{
+			if ($ssl_cert_chainfile != '') {
 				$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
 			}
 
-			if(strlen(trim($docroot)) > 0)
-			{
+			if (strlen(trim($docroot)) > 0) {
 				$docroot = makeCorrectDir($docroot);
-			}
-			else
-			{
+			} else {
 				$docroot = '';
 			}
 
-			$result_checkfordouble = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($ip) . "' AND `port`='" . (int)$port . "'");
+			$result_checkfordouble_stmt = Database::prepare("
+				SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+				WHERE `ip` = :ip AND `port` = :port"
+			);
+			$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
 
-			if($result_checkfordouble['id'] != '')
-			{
+			if ($result_checkfordouble['id'] != '') {
 				standard_error('myipnotdouble');
-			}
-			else
-			{
-				$db->query("INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "`
-					SET 
-						`ip` = '" . $db->escape($ip) . "', 
-						`port` = '" . (int)$port . "', 
-						`listen_statement` = '" . (int)$listen_statement . "', 
-						`namevirtualhost_statement` = '" . (int)$namevirtualhost_statement . "', 
-						`vhostcontainer` = '" . (int)$vhostcontainer . "', 
-						`vhostcontainer_servername_statement` = '" . (int)$vhostcontainer_servername_statement . "', 
-						`specialsettings` = '" . $db->escape($specialsettings) . "', 
-						`ssl` = '" . (int)$ssl . "', 
-						`ssl_cert_file` = '" . $db->escape($ssl_cert_file) . "', 
-						`ssl_key_file` = '" . $db->escape($ssl_key_file) . "', 
-						`ssl_ca_file` = '" . $db->escape($ssl_ca_file) . "',
-						`ssl_cert_chainfile` = '" . $db->escape($ssl_cert_chainfile) . "', 
-						`default_vhostconf_domain` = '" . $db->escape($default_vhostconf_domain) . "',
-						`docroot` = '" . $db->escape($docroot) . "';
-					");
+			} else {
+				$ins_stmt = Database::prepare("
+					INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "`
+					SET
+						`ip` = :ip, `port` = :port, `listen_statement` = :ls,
+						`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
+						`vhostcontainer_servername_statement` = :vhcss,
+						`specialsettings` = :ss, `ssl` = :ssl,
+						`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
+						`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
+						`default_vhostconf_domain` = :dvhd, `docroot` = :docroot;
+				");
+				$ins_data = array(
+					'ip' => $ip,
+					'port' => $port,
+					'ls' => $listen_statement,
+					'nvhs' => $namevirtualhost_statement,
+					'vhc' => $vhostcontainer,
+					'vhcss' => $vhostcontainer_servername_statement,
+					'ss' => $specialsettings,
+					'ssl' => $ssl,
+					'ssl_cert' => $ssl_cert_file,
+					'ssl_key' => $ssl_key_file,
+					'ssl_ca' => $ssl_ca_file,
+					'ssl_chain' => $ssl_cert_chainfile,
+					'dvhd' => $default_vhostconf_domain,
+					'docroot' => $docroot
+				);
+				Database::pexecute($ins_stmt, $ins_data);
 
-				if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
-				{
+				if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 					$ip = '[' . $ip . ']';
 				}
 
 				$log->logAction(ADM_ACTION, LOG_WARNING, "added IP/port '" . $ip . ":" . $port . "'");
 				inserttask('1');
+				// Using nameserver, insert a task which rebuilds the server config
 				inserttask('4');
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
-		}
-		else
-		{
-			#$enable_ssl = makeyesno('ssl', '1', '0', '0');
-			#$listen_statement = makeyesno('listen_statement', '1', '0', '1');
-			#$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', '1');
-			#$vhostcontainer = makeyesno('vhostcontainer', '1', '0', '1');
-			#$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', '1');
+
+		} else {
 
 			$ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
 			$ipsandports_add_form = htmlform::genHTMLForm($ipsandports_add_data);
@@ -265,31 +271,48 @@ if($page == 'ipsandports'
 
 			eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";");
 		}
-	}
-	elseif($action == 'edit'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
 
-		if($result['ip'] != '')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+	} elseif($action == 'edit'
+		&& $id != 0
+	) {
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id"
+		);
+		$result = Database::pexecute_first($result_stmt, array('id' => $id));
+
+		if ($result['ip'] != '') {
+
+			if (isset($_POST['send'])
+				&& $_POST['send'] == 'send'
+			) {
+
 				$ip = validate_ip($_POST['ip']);
 				$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
-				$result_checkfordouble = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($ip) . "' AND `port`='" . (int)$port . "'");
-				$result_sameipotherport = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($result['ip']) . "' AND `id`!='" . (int)$id . "'");
-				$listen_statement = intval($_POST['listen_statement']);
-				$namevirtualhost_statement = intval($_POST['namevirtualhost_statement']);
-				$vhostcontainer = intval($_POST['vhostcontainer']);
+				$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
+				$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
+				$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
 				$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
-				$vhostcontainer_servername_statement = intval($_POST['vhostcontainer_servername_statement']);
+				$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
 				$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
 				$docroot =  validate($_POST['docroot'], 'docroot');
-				if((int)$settings['system']['use_ssl'] == 1)
-				{
-					$ssl = intval($_POST['ssl']);
+
+				$result_checkfordouble_stmt = Database::prepare("
+					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+					WHERE `ip` = :ip AND `port` = :port"
+				);
+				$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
+
+				$result_sameipotherport_stmt = Database::prepare("
+					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+					WHERE `ip` = :ip AND `id` <> :id"
+				);
+				$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('ip' => $ip, 'id' => $id));
+
+				if ((int)Settings::Get('system.use_ssl') == 1
+					&& isset($_POST['ssl'])
+					&& $_POST['ssl'] != 0
+				) {
+					$ssl = 1;
 					$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
 					$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
 					$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
@@ -301,112 +324,109 @@ if($page == 'ipsandports'
 					$ssl_ca_file = '';
 					$ssl_cert_chainfile = '';
 				}
-				
-				if($listen_statement != '1')
-				{
+
+				if ($listen_statement != '1') {
 					$listen_statement = '0';
 				}
 
-				if($namevirtualhost_statement != '1')
-				{
+				if ($namevirtualhost_statement != '1') {
 					$namevirtualhost_statement = '0';
 				}
 
-				if($vhostcontainer != '1')
-				{
+				if ($vhostcontainer != '1') {
 					$vhostcontainer = '0';
 				}
 
-				if($vhostcontainer_servername_statement != '1')
-				{
+				if ($vhostcontainer_servername_statement != '1') {
 					$vhostcontainer_servername_statement = '0';
 				}
 
-				if($ssl != '1')
-				{
+				if ($ssl != '1') {
 					$ssl = '0';
 				}
-				
-				if($ssl_cert_file != '')
-				{
+
+				if ($ssl_cert_file != '') {
 					$ssl_cert_file = makeCorrectFile($ssl_cert_file);
 				}
 
-				if($ssl_key_file != '')
-				{
+				if ($ssl_key_file != '') {
 					$ssl_key_file = makeCorrectFile($ssl_key_file);
 				}
 
-				if($ssl_ca_file != '')
-				{
+				if ($ssl_ca_file != '') {
 					$ssl_ca_file = makeCorrectFile($ssl_ca_file);
 				}
 
-				if($ssl_cert_chainfile != '')
-				{
+				if ($ssl_cert_chainfile != '') {
 					$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
 				}
 
-				if(strlen(trim($docroot)) > 0)
-				{
+				if (strlen(trim($docroot)) > 0) {
 					$docroot = makeCorrectDir($docroot);
-				}
-				else
-				{
+				} else {
 					$docroot = '';
 				}
 
-				if($result['ip'] != $ip
-				   && $result['ip'] == $settings['system']['ipaddress']
-				   && $result_sameipotherport['id'] == '')
-				{
+				if ($result['ip'] != $ip
+					&& $result['ip'] == Settings::Get('system.ipaddress')
+					&& $result_sameipotherport['id'] == ''
+				) {
 					standard_error('cantchangesystemip');
-				}
-				elseif($result_checkfordouble['id'] != ''
-				       && $result_checkfordouble['id'] != $id)
-				{
-					standard_error('myipnotdouble');
-				}
-				else
-				{
 
-					$db->query("UPDATE `" . TABLE_PANEL_IPSANDPORTS . "`
-					SET 
-						`ip` = '" . $db->escape($ip) . "', 
-						`port` = '" . (int)$port . "', 
-						`listen_statement` = '" . (int)$listen_statement . "', 
-						`namevirtualhost_statement` = '" . (int)$namevirtualhost_statement . "', 
-						`vhostcontainer` = '" . (int)$vhostcontainer . "', 
-						`vhostcontainer_servername_statement` = '" . (int)$vhostcontainer_servername_statement . "', 
-						`specialsettings` = '" . $db->escape($specialsettings) . "', 
-						`ssl` = '" . (int)$ssl . "', 
-						`ssl_cert_file` = '" . $db->escape($ssl_cert_file) . "', 
-						`ssl_key_file` = '" . $db->escape($ssl_key_file) . "', 
-						`ssl_ca_file` = '" . $db->escape($ssl_ca_file) . "',
-						`ssl_cert_chainfile` = '" . $db->escape($ssl_cert_chainfile) . "', 
-						`default_vhostconf_domain` = '" . $db->escape($default_vhostconf_domain) . "',
-						`docroot` = '" . $db->escape($docroot) . "' 
-					WHERE `id`='" . (int)$id . "'
+				} elseif($result_checkfordouble['id'] != ''
+					&& $result_checkfordouble['id'] != $id
+				) {
+					standard_error('myipnotdouble');
+
+				} else {
+
+					$upd_stmt = Database::prepare("
+						UPDATE `" . TABLE_PANEL_IPSANDPORTS . "`
+						SET
+							`ip` = :ip, `port` = :port, `listen_statement` = :ls,
+							`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
+							`vhostcontainer_servername_statement` = :vhcss,
+							`specialsettings` = :ss, `ssl` = :ssl,
+							`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
+							`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
+							`default_vhostconf_domain` = :dvhd, `docroot` = :docroot
+						WHERE `id` = :id;
 					");
+					$upd_data = array(
+						'ip' => $ip,
+						'port' => $port,
+						'ls' => $listen_statement,
+						'nvhs' => $namevirtualhost_statement,
+						'vhc' => $vhostcontainer,
+						'vhcss' => $vhostcontainer_servername_statement,
+						'ss' => $specialsettings,
+						'ssl' => $ssl,
+						'ssl_cert' => $ssl_cert_file,
+						'ssl_key' => $ssl_key_file,
+						'ssl_ca' => $ssl_ca_file,
+						'ssl_chain' => $ssl_cert_chainfile,
+						'dvhd' => $default_vhostconf_domain,
+						'docroot' => $docroot,
+						'id' => $id
+					);
+					Database::pexecute($upd_stmt, $upd_data);
 
 					$log->logAction(ADM_ACTION, LOG_WARNING, "changed IP/port from '" . $result['ip'] . ":" . $result['port'] . "' to '" . $ip . ":" . $port . "'");
 					inserttask('1');
+
+					// Using nameserver, insert a task which rebuilds the server config
 					inserttask('4');
+
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
-			}
-			else
-			{
-				#$enable_ssl = makeyesno('ssl', '1', '0', $result['ssl']);
+
+			} else {
+
 				$result = htmlentities_array($result);
-				#$listen_statement = makeyesno('listen_statement', '1', '0', $result['listen_statement']);
-				#$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', $result['namevirtualhost_statement']);
-				#$vhostcontainer = makeyesno('vhostcontainer', '1', '0', $result['vhostcontainer']);
-				#$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', $result['vhostcontainer_servername_statement']);
 
 				$ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
 				$ipsandports_edit_form = htmlform::genHTMLForm($ipsandports_edit_data);
-	
+
 				$title = $ipsandports_edit_data['ipsandports_edit']['title'];
 				$image = $ipsandports_edit_data['ipsandports_edit']['image'];
 
@@ -415,5 +435,3 @@ if($page == 'ipsandports'
 		}
 	}
 }
-
-?>

admin_logger.php

@@ -18,53 +18,45 @@
  */
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
-
-if($page == 'log'
-   && $userinfo['change_serversettings'] == '1')
-{
-	if($action == '')
-	{
+if ($page == 'log'
+   && $userinfo['change_serversettings'] == '1'
+) {
+	if ($action == '') {
 		$fields = array(
 			'date' => $lng['logger']['date'],
 			'type' => $lng['logger']['type'],
 			'user' => $lng['logger']['user'],
 			'text' => $lng['logger']['action']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_LOG, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$paging->sortfield = 'date';
-		$paging->sortorder = 'desc';
-		$result = $db->query('SELECT * FROM `' . TABLE_PANEL_LOG . '` ' . $paging->getSqlWhere(false) . ' ' . $paging->getSqlOrderBy() . ' ' . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		$paging = new paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc');
+		$result_stmt = Database::query('
+			SELECT * FROM `' . TABLE_PANEL_LOG . '` ' . $paging->getSqlWhere(false) . ' ' . $paging->getSqlOrderBy() . ' ' . $paging->getSqlLimit()
+		);
+		$logs_count = Database::num_rows();
+		$paging->setEntries($logs_count);
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
 		$clog = array();
 
-		while($row = $db->fetch_array($result))
-		{
-			if(!isset($clog[$row['action']])
-			   || !is_array($clog[$row['action']]))
-			{
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+
+			if (!isset($clog[$row['action']])
+				|| !is_array($clog[$row['action']])
+			) {
 				$clog[$row['action']] = array();
 			}
-
 			$clog[$row['action']][$row['logid']] = $row;
 		}
 
-		if($paging->sortfield == 'date'
-		   && $paging->sortorder == 'desc')
-		{
+		if ($paging->sortfield == 'date'
+			&& $paging->sortorder == 'desc'
+		) {
 			krsort($clog);
-		}
-		else
-		{
+		} else {
 			ksort($clog);
 		}
 
@@ -72,97 +64,68 @@ if($page == 'log'
 		$count = 0;
 		$log_count = 0;
 		$log = '';
-		foreach($clog as $action => $logrows)
-		{
+		foreach ($clog as $action => $logrows) {
 			$_action = 0;
-			foreach($logrows as $row)
-			{
-				if($paging->checkDisplay($i))
-				{
+			foreach ($logrows as $row) {
+				if ($paging->checkDisplay($i)) {
 					$row = htmlentities_array($row);
 					$row['date'] = date("d.m.y H:i:s", $row['date']);
 
-					if($_action != $action)
-					{
-						switch($action)
-						{
+					if ($_action != $action) {
+						switch ($action) {
 							case USR_ACTION:
 								$_action = $lng['admin']['customer'];
 								break;
 							case RES_ACTION:
-								$_action = 'Reseller';
+								$_action = $lng['logger']['reseller'];
 								break;
 							case ADM_ACTION:
-								$_action = 'Administrator';
+								$_action = $lng['logger']['admin'];
 								break;
 							case CRON_ACTION:
-								$_action = 'Cronjob';
+								$_action = $lng['logger']['cron'];
+								break;
+							case LOGIN_ACTION:
+								$_action = $lng['logger']['login'];
 								break;
 							case LOG_ERROR:
-								$_action = 'Internal';
+								$_action = $lng['logger']['intern'];
 								break;
 							default:
-								$_action = 'Unknown';
+								$_action = $lng['logger']['unknown'];
 								break;
 						}
 
 						$row['action'] = $_action;
-						eval("\$log.=\"" . getTemplate("logger/logger_action") . "\";");
+						eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
 					}
 
 					$log_count++;
-					$type = $row['type'];
-					$_type = 'unknown';
-
-					switch($type)
-					{
-						case LOG_INFO:
-							$_type = 'Information';
-							break;
-						case LOG_NOTICE:
-							$_type = 'Notice';
-							break;
-						case LOG_WARNING:
-							$_type = 'Warning';
-							break;
-						case LOG_ERR:
-							$_type = 'Error';
-							break;
-						case LOG_CRIT:
-							$_type = 'Critical';
-							break;
-						default:
-							$_type = 'Unknown';
-							break;
-					}
-
-					$row['type'] = $_type;
-					eval("\$log.=\"" . getTemplate("logger/logger_log") . "\";");
+					$row['type'] = getLogLevelDesc($row['type']);
+					eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
 					$count++;
 					$_action = $action;
 				}
+				$i++;
 			}
-
 			$i++;
 		}
 
-		eval("echo \"" . getTemplate("logger/logger") . "\";");
-	}
-	elseif($action == 'truncate')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			$yesterday = time() - (60 * 10);
+		eval("echo \"" . getTemplate('logger/logger') . "\";");
 
-			/* (60*60*24); */
+	} elseif ($action == 'truncate') {
 
-			$db->query("DELETE FROM `" . TABLE_PANEL_LOG . "` WHERE `date` < '" . $yesterday . "'");
-			$log->logAction(ADM_ACTION, LOG_WARNING, "truncated the system-log (mysql)");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
+		if (isset($_POST['send'])
+		   && $_POST['send'] == 'send'
+		) {
+			$truncatedate = time() - (60 * 10);
+			$trunc_stmt = Database::prepare("
+				DELETE FROM `" . TABLE_PANEL_LOG . "` WHERE `date` < :trunc"
+			);
+			Database::pexecute($trunc_stmt, array('trunc' => $truncatedate));
+			$log->logAction(ADM_ACTION, LOG_WARNING, 'truncated the system-log (mysql)');
+			redirectTo($filename, array('page' => $page, 's' => $s));
+		} else {
 			ask_yesno('logger_reallytruncate', $filename, array('page' => $page, 'action' => $action), TABLE_PANEL_LOG);
 		}
 	}

admin_message.php

@@ -18,131 +18,104 @@
  */
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'message')
-{
-	if($action == '')
-	{
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed panel_message");
+if ($page == 'message') {
+	if ($action == '') {
+		$log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
 
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			if($_POST['receipient'] == 0
-			   && $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 . "`");
-			}
-			elseif($_POST['receipient'] == 1)
-			{
-				if($userinfo['customers_see_all'] == "1")
-				{
-					$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to ALL customers");
-					$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`");
+		if (isset($_POST['send'])
+		   && $_POST['send'] == 'send'
+		) {
+			if ($_POST['receipient'] == 0
+			   && $userinfo['customers_see_all'] == '1'
+			) {
+				$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to admins');
+				$result = Database::query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
+			} elseif ($_POST['receipient'] == 1) {
+				if ($userinfo['customers_see_all'] == '1') {
+					$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to ALL customers');
+					$result = Database::query('SELECT `firstname`, `name`, `company`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`");
+				} else {
+					$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to customers');
+					$result = Database::prepare('
+						SELECT `firstname`, `name`, `company`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`
+						WHERE `adminid` = :adminid"
+					);
+					Database::pexecute($result, array('adminid' => $userinfo['adminid']));
 				}
-				else
-				{
-					$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to customers");
-					$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "` WHERE `adminid`='" . $userinfo['adminid'] . "'");
-				}
-			}
-			else
-			{
+			} else {
 				standard_error('noreceipientsgiven');
 			}
 
 			$subject = $_POST['subject'];
 			$message = wordwrap($_POST['message'], 70);
 
-			if(!empty($message))
-			{
+			if (!empty($message)) {
 				$mailcounter = 0;
 				$mail->Body = $message;
 				$mail->Subject = $subject;
 
-				while($row = $db->fetch_array($result))
-				{
-					$mail->AddAddress($row['email'], (isset($row['firstname']) ? $row['firstname'] . ' ' : '') . $row['name']);
+				while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+
+					$row['firstname'] = isset($row['firstname']) ? $row['firstname'] : '';
+					$row['company'] = isset($row['company']) ? $row['company'] : '';
+					$mail->AddAddress($row['email'], getCorrectUserSalutation(array('firstname' => $row['firstname'], 'name' => $row['name'], 'company' => $row['company'])));
 					$mail->From = $userinfo['email'];
 					$mail->FromName = (isset($userinfo['firstname']) ? $userinfo['firstname'] . ' ' : '') . $userinfo['name'];
 
-					if(!$mail->Send())
-					{
-						if($mail->ErrorInfo != '')
-						{
+					if (!$mail->Send()) {
+						if ($mail->ErrorInfo != '') {
 							$mailerr_msg = $mail->ErrorInfo;
-						}
-						else
-						{
-							$mailerr_msg = $row["email"];
+						} else {
+							$mailerr_msg = $row['email'];
 						}
 
-						$log->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-						standard_error('errorsendingmail', $row["email"]);
+						$log->logAction(ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
+						standard_error('errorsendingmail', $row['email']);
 					}
 
 					$mailcounter++;
 					$mail->ClearAddresses();
 				}
 
-				redirectTo($filename, Array('page' => $page, 's' => $s, 'action' => 'showsuccess', 'sentitems' => $mailcounter));
-			}
-			else
-			{
+				redirectTo($filename, array('page' => $page, 's' => $s, 'action' => 'showsuccess', 'sentitems' => $mailcounter));
+			} else {
 				standard_error('nomessagetosend');
 			}
 		}
 	}
 
-	if($action == 'showsuccess')
-	{
+	if ($action == 'showsuccess') {
+
 		$success = 1;
 		$sentitems = isset($_GET['sentitems']) ? (int)$_GET['sentitems'] : 0;
 
-		if($sentitems == 0)
-		{
+		if ($sentitems == 0) {
 			$successmessage = $lng['message']['noreceipients'];
-		}
-		else
-		{
+		} else {
 			$successmessage = str_replace('%s', $sentitems, $lng['message']['success']);
 		}
 
-		$action = '';
-	}
-	else
-	{
+	} else {
 		$success = 0;
 		$sentitems = 0;
 		$successmessage = '';
-		$action = '';
 	}
 
+	$action = '';
 	$receipients = '';
 
-	if($userinfo['customers_see_all'] == "1")
-	{
+	if ($userinfo['customers_see_all'] == '1') {
 		$receipients.= makeoption($lng['panel']['reseller'], 0);
 	}
 
-	$receipients.= makeoption($lng['panel']['customer'], 1);
-	eval("echo \"" . getTemplate("message/message") . "\";");
+	$receipients .= makeoption($lng['panel']['customer'], 1);
+	eval("echo \"" . getTemplate('message/message') . "\";");
 }
-
-?>

admin_opcacheinfo.php

@@ -0,0 +1,158 @@
+<?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     Janos Muzsi <muzsij@hypernics.hu> (2016)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Panel
+ *
+ * Based on https://github.com/amnuts/opcache-gui
+ *
+ */
+
+define('AREA', 'admin');
+require './lib/init.php';
+
+
+if ($action == 'reset' &&
+        function_exists('opcache_reset') &&
+        $userinfo['change_serversettings'] == '1'
+) {
+    opcache_reset();
+    $log->logAction(ADM_ACTION, LOG_INFO, "reseted OPcache");
+    header('Location: ' . $linker->getLink(array('section' => 'opcacheinfo', 'page' => 'showinfo')));
+    exit();
+}
+
+if (!function_exists('opcache_get_configuration')
+) {
+    standard_error($lng['error']['no_opcacheinfo']);
+}
+
+if ($page == 'showinfo'
+) {
+    
+    $opcache_info = opcache_get_configuration();
+    $opcache_status = opcache_get_status(false);
+    $time = time();
+    $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed OPcache info");
+    
+    $runtimelines = '';
+    if (isset($opcache_info['directives']) && is_array($opcache_info['directives'])) {
+        foreach ($opcache_info['directives'] as $name => $value) {
+            $linkname=  str_replace('_', '-', $name);
+            if ($name=='opcache.optimization_level' && is_integer($value)) {
+                $value='0x'.dechex($value);
+            }
+            if ($name=='opcache.memory_consumption' && is_integer($value) && $value%(1024*1024)==0) {
+                $value=$value/(1024*1024);
+            }
+            if ($value===null || $value==='') {
+                $value=$lng['opcacheinfo']['novalue'];
+            }
+            if ($value===true) {
+                $value=$lng['opcacheinfo']['true'];
+            }
+            if ($value===false) {
+                $value=$lng['opcacheinfo']['false'];
+            }
+            if (is_integer($value)) {
+                $value=number_format($value,0,'.',' ');
+            }
+            $name=str_replace('_', ' ', $name);
+            eval("\$runtimelines.=\"" . getTemplate("settings/opcacheinfo/runtime_line") . "\";");
+        }
+    }
+    
+    $cachehits=@$opcache_status['opcache_statistics']['hits'] ?: 0;
+    $cachemiss=@$opcache_status['opcache_statistics']['misses'] ?: 0;
+    $blacklistmiss=@$opcache_status['opcache_statistics']['blacklist_misses'] ?: 0;
+    $cachetotal=$cachehits+$cachemiss+$blacklistmiss;
+    
+    $general=array(
+        'version' => (isset($opcache_info['version']['opcache_product_name']) ? $opcache_info['version']['opcache_product_name'].' ' : '').$opcache_info['version']['version'],
+        'phpversion' => phpversion(),
+        'start_time'         => @$opcache_status['opcache_statistics']['start_time'] ? date('Y-m-d H:i:s',$opcache_status['opcache_statistics']['start_time']) : '',
+        'last_restart_time'  => @$opcache_status['opcache_statistics']['last_restart_time'] ? date('Y-m-d H:i:s',$opcache_status['opcache_statistics']['last_restart_time']) : $lng['opcacheinfo']['never'],
+        'oom_restarts' => number_format(@$opcache_status['opcache_statistics']['oom_restarts'] ?: 0,0,'.',' '),
+        'hash_restarts' => number_format(@$opcache_status['opcache_statistics']['hash_restarts'] ?: 0,0,'.',' '),
+        'manual_restarts' => number_format(@$opcache_status['opcache_statistics']['manual_restarts'] ?: 0,0,'.',' '),
+        'status' => (@$opcache_status['restart_in_progress'] ? $lng['opcacheinfo']['restartinprogress'] :
+            (@$opcache_status['restart_pending'] ? $lng['opcacheinfo']['restartpending'] :
+            (@$opcache_status['cache_full'] ? $lng['opcacheinfo']['cachefull'] :
+            (@$opcache_status['opcache_enabled'] ? $lng['opcacheinfo']['enabled'] : $lng['opcacheinfo']['novalue'])))),
+        'cachedscripts' => number_format(@$opcache_status['opcache_statistics']['num_cached_scripts'] ?: 0,0,'.',' '),
+        'cachehits' => number_format($cachehits,0,'.',' ') . ($cachetotal>0 ? sprintf(" (%.1f %%)", $cachehits/($cachetotal)*100) : ''),
+        'cachemiss' => number_format($cachemiss,0,'.',' ') . ($cachetotal>0 ? sprintf(" (%.1f %%)", $cachemiss/($cachetotal)*100) : ''),
+        'blacklistmiss' => number_format($blacklistmiss,0,'.',' ') . ($cachetotal>0 ? sprintf(" (%.1f %%)", $blacklistmiss/($cachetotal)*100) : ''),
+    );
+    
+    $usedmem=@$opcache_status['memory_usage']['used_memory'] ?: 0;
+    $usedmemstr=bsize($usedmem);
+    $freemem=@$opcache_status['memory_usage']['free_memory'] ?: 0;
+    $freememstr=bsize($freemem);
+    $totalmem=$usedmem+$freemem;
+    $wastedmem=@$opcache_status['memory_usage']['wasted_memory'] ?: 0;
+    $wastedmemstr=bsize($wastedmem);
+    if ($totalmem) {
+        $memory=array(
+            'total' => bsize($totalmem),
+            'used' => $usedmemstr . ($totalmem>0 ? sprintf(" (%.1f %%)", $usedmem/($totalmem)*100) : ''),
+            'free' => $freememstr . ($totalmem>0 ? sprintf(" (%.1f %%)", $freemem/($totalmem)*100) : ''),
+            'wasted' => $wastedmemstr . ($totalmem>0 ? sprintf(" (%.1f %%)", $wastedmem/($totalmem)*100) : ''),
+        );
+    }
+    
+    if (isset($opcache_status['interned_strings_usage'])) {
+        $usedstring=@$opcache_status['interned_strings_usage']['used_memory'] ?: 0;
+        $usedstringstr=bsize($usedstring);
+        $freestring=@$opcache_status['interned_strings_usage']['free_memory'] ?: 0;
+        $freestringstr=bsize($freestring);
+        $totalstring=$usedstring+$freestring;
+        $stringbuffer=array(
+            'total' => bsize($totalstring),
+            'used' => $usedstringstr . ($totalstring>0 ? sprintf(" (%.1f %%)", $usedstring/$totalstring*100) : ''),
+            'free' => $freestringstr . ($totalstring>0 ? sprintf(" (%.1f %%)", $freestring/$totalstring*100) : ''),
+            'strcount' => number_format(@$opcache_status['interned_strings_usage']['number_of_strings'] ?: 0,0,'.',' '),
+        );
+    }
+
+    $usedkey=@$opcache_status['opcache_statistics']['num_cached_keys'] ?: 0;
+    $usedkeystr=number_format($usedkey,0,'.',' ');
+    $totalkey=@$opcache_status['opcache_statistics']['max_cached_keys'] ?: 0;
+    $wastedkey=$usedkey - (@$opcache_status['opcache_statistics']['num_cached_scripts'] ?: 0);
+    if (isset($opcache_status['opcache_statistics'])) {
+        $keystat=array(
+            'total' => number_format($totalkey,0,'.',' '),
+            'used' => $usedkeystr . ($totalkey>0 ? sprintf(" (%.1f %%)", $usedkey/($totalkey)*100) : ''),
+            'wasted' => number_format($wastedkey,0,'.',' ') . ($totalkey>0 ? sprintf(" (%.1f %%)", $wastedkey/($totalkey)*100) : ''),
+        );
+    }
+    
+    $blacklistlines = '';
+    if (isset($opcache_info['blacklist']) && is_array($opcache_info['blacklist'])) {
+        foreach ($opcache_info['blacklist'] as $value) {
+            eval("\$blacklistlines.=\"" . getTemplate("settings/opcacheinfo/blacklist_line") . "\";");
+        }
+    }
+    
+    eval("echo \"" . getTemplate("settings/opcacheinfo/showinfo") . "\";");
+    
+}
+
+function bsize($s) {
+    foreach (array('', 'K', 'M', 'G') as $i => $k) {
+        if ($s < 1024)
+            break;
+        $s/=1024;
+    }
+    return sprintf("%5.1f %sBytes", $s, $k);
+}

admin_phpsettings.php

@@ -18,57 +18,80 @@
  */
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
-	if($action == '')
-	{
+if ($page == 'overview') {
+
+	if ($action == '') {
+
 		$tablecontent = '';
 		$count = 0;
-		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");
+		$result = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");
+
+		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
 
-		while($row = $db->fetch_array($result))
-		{
 			$domainresult = false;
+			$query_params = array('id' => $row['id']);
 
-			if((int)$userinfo['domains_see_all'] == 0)
-			{
-				$domainresult = $db->query("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `adminid` = " . (int)$userinfo['userid'] . " AND `phpsettingid` = " . (int)$row['id']);
+			$query = "SELECT * FROM `".TABLE_PANEL_DOMAINS."`
+					WHERE `phpsettingid` = :id
+					AND `parentdomainid` = '0'";
+
+			if ((int)$userinfo['domains_see_all'] == 0) {
+				$query .= " AND `adminid` = :adminid";
+				$query_params['adminid'] = $userinfo['adminid'];
 			}
-			else
-			{
-				$domainresult = $db->query("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `phpsettingid` = " . (int)$row['id']);
+
+			if ((int)Settings::Get('panel.phpconfigs_hidestdsubdomain') == 1) {
+				$ssdids_res = Database::query("
+					SELECT DISTINCT `standardsubdomain` FROM `".TABLE_PANEL_CUSTOMERS."`
+					WHERE `standardsubdomain` > 0 ORDER BY `standardsubdomain` ASC;"
+				);
+				$ssdids = array();
+				while ($ssd = $ssdids_res->fetch(PDO::FETCH_ASSOC)) {
+					$ssdids[] = $ssd['standardsubdomain'];
+				}
+				if (count($ssdids) > 0) {
+					$query .= " AND `id` NOT IN (".implode(', ', $ssdids).")";
+				}
 			}
 
+			$domainresult_stmt = Database::prepare($query);
+			Database::pexecute($domainresult_stmt, $query_params);
+
 			$domains = '';
-
-			if($db->num_rows($domainresult) > 0)
-			{
-				while($row2 = $db->fetch_array($domainresult))
-				{
+			if (Database::num_rows() > 0) {
+				while ($row2 = $domainresult_stmt->fetch(PDO::FETCH_ASSOC)) {
 					$domains.= $row2['domain'] . '<br/>';
 				}
 			}
-			else
-			{
+
+			// check whether we use that config as froxor-vhost config
+			if (Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $row['id']
+				|| Settings::Get('phpfpm.vhost_defaultini') == $row['id']
+			) {
+				$domains .= Settings::Get('system.hostname');
+			}
+
+			if ($domains == '') {
 				$domains = $lng['admin']['phpsettings']['notused'];
 			}
 
+			// check whether this is our default config
+			if ((Settings::Get('system.mod_fcgid') == '1'
+				&& Settings::Get('system.mod_fcgid_defaultini') == $row['id'])
+				|| (Settings::Get('phpfpm.enabled') == '1'
+				&& Settings::Get('phpfpm.defaultini') == $row['id'])
+			) {
+				$row['description'] = '<b>'.$row['description'].'</b>';
+			}
+
 			$count ++;
 			eval("\$tablecontent.=\"" . getTemplate("phpconfig/overview_overview") . "\";");
 		}
@@ -77,34 +100,80 @@ if($page == 'overview')
 		eval("echo \"" . getTemplate("phpconfig/overview") . "\";");
 	}
 
-	if($action == 'add')
-	{
-		if((int)$userinfo['change_serversettings'] == 1)
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$description = validate($_POST['description'], 'description');
-				$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
-				$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
-				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
-				$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
-				$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
+	if ($action == 'add') {
 
-				if(strlen($description) == 0
-				   || strlen($description) > 50)
-				{
+		if ((int)$userinfo['change_serversettings'] == 1) {
+
+			if (isset($_POST['send'])
+				&& $_POST['send'] == 'send'
+			) {
+				$description = validate($_POST['description'], 'description');
+				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
+
+				if (Settings::Get('system.mod_fcgid') == 1) {
+					$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
+					$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
+					$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
+					$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
+					$mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/');
+					// disable fpm stuff
+					$fpm_enableslowlog = 0;
+					$fpm_reqtermtimeout = 0;
+					$fpm_reqslowtimeout = 0;
+				}
+				elseif (Settings::Get('phpfpm.enabled') == 1) {
+					$fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0;
+					$fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/');
+					$fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/');
+					// disable fcgid stuff
+					$binary = '/usr/bin/php-cgi';
+					$file_extensions = 'php';
+					$mod_fcgid_starter = 0;
+					$mod_fcgid_maxrequests = 0;
+					$mod_fcgid_umask = "022";
+				}
+
+				if (strlen($description) == 0
+					|| strlen($description) > 50
+				) {
 					standard_error('descriptioninvalid');
 				}
 
-				$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) . "'");
+				$ins_stmt = Database::prepare("
+					INSERT INTO `" . TABLE_PANEL_PHPCONFIGS . "` SET
+						`description` = :desc,
+						`binary` = :binary,
+						`file_extensions` = :fext,
+						`mod_fcgid_starter` = :starter,
+						`mod_fcgid_maxrequests` = :mreq,
+						`mod_fcgid_umask` = :umask,
+						`fpm_slowlog` = :fpmslow,
+						`fpm_reqterm` = :fpmreqterm,
+						`fpm_reqslow` = :fpmreqslow,
+						`phpsettings` = :phpsettings"
+				);
+				$ins_data = array(
+					'desc' => $description,
+					'binary' => $binary,
+					'fext' => $file_extensions,
+					'starter' => $mod_fcgid_starter,
+					'mreq' => $mod_fcgid_maxrequests,
+					'umask' => $mod_fcgid_umask,
+					'fpmslow' => $fpm_enableslowlog,
+					'fpmreqterm' => $fpm_reqtermtimeout,
+					'fpmreqslow' => $fpm_reqslowtimeout,
+					'phpsettings' => $phpsettings
+				);
+				Database::pexecute($ins_stmt, $ins_data);
+
 				inserttask('1');
 				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $description . "' has been created by '" . $userinfo['loginname'] . "'");
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
-				$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1");
+				redirectTo($filename, array('page' => $page, 's' => $s));
+
+			} else {
+
+				$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1");
+				$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 				$phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
 				$phpconfig_add_form = htmlform::genHTMLForm($phpconfig_add_data);
@@ -114,73 +183,151 @@ if($page == 'overview')
 
 				eval("echo \"" . getTemplate("phpconfig/overview_add") . "\";");
 			}
-		}
-		else
-		{
+
+		} else {
 			standard_error('nopermissionsorinvalidid');
 		}
 	}
 
-	if($action == 'delete')
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$id);
+	if ($action == 'delete') {
+
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id"
+		);
+		$result = Database::pexecute_first($result_stmt, array('id' => $id));
+
+		if ((Settings::Get('system.mod_fcgid') == '1'
+			&& Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $id)
+			|| (Settings::Get('phpfpm.enabled') == '1'
+			&& Settings::Get('phpfpm.vhost_defaultini') == $id)
+		) {
+			standard_error('cannotdeletehostnamephpconfig');
+		}
+
+		if ((Settings::Get('system.mod_fcgid') == '1'
+			&& Settings::Get('system.mod_fcgid_defaultini') == $id)
+			|| (Settings::Get('phpfpm.enabled') == '1'
+			&& Settings::Get('phpfpm.defaultini') == $id)
+		) {
+			standard_error('cannotdeletedefaultphpconfig');
+		}
+
+		if ($result['id'] != 0
+			&& $result['id'] == $id
+			&& (int)$userinfo['change_serversettings'] == 1
+			&& $id != 1 // cannot delete the default php.config
+		) {
+
+			if (isset($_POST['send'])
+				&& $_POST['send'] == 'send'
+			) {
+				// set php-config to default for all domains using the
+				// config that is to be deleted
+				$upd_stmt = Database::prepare("
+					UPDATE `" . TABLE_PANEL_DOMAINS . "` SET
+					`phpsettingid` = '1' WHERE `phpsettingid` = :id"
+				);
+				Database::pexecute($upd_stmt, array('id' => $id));
+
+				$del_stmt = Database::prepare("
+					DELETE FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id"
+				);
+				Database::pexecute($del_stmt, array('id' => $id));
 
-		if($result['id'] != 0
-		   && $result['id'] == $id
-		   && (int)$userinfo['change_serversettings'] == 1
-		   && $id != 1)
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `phpsettingid` = 1 WHERE `phpsettingid` = " . (int)$id);
-				$db->query("DELETE FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$id);
 				inserttask('1');
 				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with id #" . (int)$id . " has been deleted by '" . $userinfo['loginname'] . "'");
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
+				redirectTo($filename, array('page' => $page, 's' => $s));
+
+			} else {
 				ask_yesno('phpsetting_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['description']);
 			}
-		}
-		else
-		{
+		} else {
 			standard_error('nopermissionsorinvalidid');
 		}
 	}
 
-	if($action == 'edit')
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$id);
+	if ($action == 'edit') {
 
-		if($result['id'] != 0
-		   && $result['id'] == $id
-		   && (int)$userinfo['change_serversettings'] == 1)
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id"
+		);
+		$result = Database::pexecute_first($result_stmt, array('id' => $id));
+
+		if ($result['id'] != 0
+			&& $result['id'] == $id
+			&& (int)$userinfo['change_serversettings'] == 1
+		) {
+
+			if (isset($_POST['send'])
+				&& $_POST['send'] == 'send'
+			) {
 				$description = validate($_POST['description'], 'description');
-				$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
-				$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
 				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
-				$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
-				$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
 
-				if(strlen($description) == 0
-				   || strlen($description) > 50)
-				{
+				if (Settings::Get('system.mod_fcgid') == 1) {
+					$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
+					$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
+					$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
+					$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
+					$mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/');
+					// disable fpm stuff
+					$fpm_enableslowlog = 0;
+					$fpm_reqtermtimeout = 0;
+					$fpm_reqslowtimeout = 0;
+				}
+				elseif (Settings::Get('phpfpm.enabled') == 1) {
+					$fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0;
+					$fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/');
+					$fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/');
+					// disable fcgid stuff
+					$binary = '/usr/bin/php-cgi';
+					$file_extensions = 'php';
+					$mod_fcgid_starter = 0;
+					$mod_fcgid_maxrequests = 0;
+					$mod_fcgid_umask = "022";
+				}
+
+				if (strlen($description) == 0
+					|| strlen($description) > 50
+				) {
 					standard_error('descriptioninvalid');
 				}
 
-				$db->query("UPDATE `" . 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) . "' WHERE `id` = " . (int)$id);
+				$upd_stmt = Database::prepare("
+					UPDATE `" . TABLE_PANEL_PHPCONFIGS . "` SET
+						`description` = :desc,
+						`binary` = :binary,
+						`file_extensions` = :fext,
+						`mod_fcgid_starter` = :starter,
+						`mod_fcgid_maxrequests` = :mreq,
+						`mod_fcgid_umask` = :umask,
+						`fpm_slowlog` = :fpmslow,
+						`fpm_reqterm` = :fpmreqterm,
+						`fpm_reqslow` = :fpmreqslow,
+						`phpsettings` = :phpsettings
+					WHERE `id` = :id"
+				);
+				$upd_data = array(
+						'desc' => $description,
+						'binary' => $binary,
+						'fext' => $file_extensions,
+						'starter' => $mod_fcgid_starter,
+						'mreq' => $mod_fcgid_maxrequests,
+						'umask' => $mod_fcgid_umask,
+						'fpmslow' => $fpm_enableslowlog,
+						'fpmreqterm' => $fpm_reqtermtimeout,
+						'fpmreqslow' => $fpm_reqslowtimeout,
+						'phpsettings' => $phpsettings,
+						'id' => $id
+				);
+				Database::pexecute($upd_stmt, $upd_data);
+
 				inserttask('1');
 				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $description . "' has been changed by '" . $userinfo['loginname'] . "'");
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
+				redirectTo($filename, array('page' => $page, 's' => $s));
+
+			} else {
+
 				$phpconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php';
 				$phpconfig_edit_form = htmlform::genHTMLForm($phpconfig_edit_data);
 
@@ -189,12 +336,9 @@ if($page == 'overview')
 
 				eval("echo \"" . getTemplate("phpconfig/overview_edit") . "\";");
 			}
-		}
-		else
-		{
+
+		} else {
 			standard_error('nopermissionsorinvalidid');
 		}
 	}
 }
-
-?>

admin_settings.php

@@ -18,59 +18,51 @@
  */
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+// get sql-root access data
+Database::needRoot(true);
+Database::needSqlData();
+$sql_root = Database::getSqlData();
+Database::needRoot(false);
 
-$need_db_sql_data = true;
-$need_root_db_sql_data = true;
-require ("./lib/init.php");
-
-if(($page == 'settings' || $page == 'overview')
-   && $userinfo['change_serversettings'] == '1')
-{
+if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 	$settings_data = loadConfigArrayDir('./actions/admin/settings/');
-	$settings = loadSettings($settings_data, $db);
+	$settings = loadSettings($settings_data);
+
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
 
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
 		$_part = isset($_GET['part']) ? $_GET['part'] : '';
-
-		if($_part == '')
-		{
+		if ($_part == '') {
 			$_part = isset($_POST['part']) ? $_POST['part'] : '';
 		}
 
-		if($_part != '')
-		{
-			if($_part == 'all')
-			{
+		if ($_part != '') {
+			if ($_part == 'all') {
 				$settings_all = true;
 				$settings_part = false;
-			}
-			else
-			{
+			} else {
 				$settings_all = false;
 				$settings_part = true;
 			}
-
 			$only_enabledisable = false;
-		}
-		else
-		{
+
+		} else {
 			$settings_all = false;
 			$settings_part = false;
 			$only_enabledisable = true;
 		}
 		
 		// check if the session timeout is too low #815
-		if (isset($_POST['session_sessiontimeout']) && $_POST['session_sessiontimeout'] <= 60) {
+		if (isset($_POST['session_sessiontimeout'])
+			&& $_POST['session_sessiontimeout'] < 60
+		) {
 			standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
 		}
 
-		if(processFormEx(
+		if (processFormEx(
 			$settings_data,
 			$_POST,
 			array('filename' => $filename, 'action' => $action, 'page' => $page),
@@ -82,30 +74,25 @@ if(($page == 'settings' || $page == 'overview')
 		) {
 			$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
 			inserttask('1');
+			// Using nameserver, insert a task which rebuilds the server config
 			inserttask('4');
-			inserttask('5');
-			inserttask('9');
+
 			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
 		}
-	}
-	else
-	{
-		$_part = isset($_GET['part']) ? $_GET['part'] : '';
 
-		if($_part == '')
-		{
+	} else {
+
+		$_part = isset($_GET['part']) ? $_GET['part'] : '';
+		if ($_part == '') {
 			$_part = isset($_POST['part']) ? $_POST['part'] : '';
 		}
 
 		$fields = buildFormEx($settings_data, $_part);
 
 		$settings_page = '';
-		if($_part == '')
-		{
+		if ($_part == '') {
 			eval("\$settings_page .= \"" . getTemplate("settings/settings_overview") . "\";");
-		}
-		else
-		{
+		} else {
 			eval("\$settings_page .= \"" . getTemplate("settings/settings") . "\";");
 		}
 
@@ -114,116 +101,190 @@ if(($page == 'settings' || $page == 'overview')
 		eval("echo \"" . getTemplate("settings/settings_form_end") . "\";");
 
 	}
-}
-elseif($page == 'rebuildconfigs'
-       && $userinfo['change_serversettings'] == '1')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+
+} elseif($page == 'phpinfo'
+	&& $userinfo['change_serversettings'] == '1'
+) {
+	ob_start();
+	phpinfo();
+	$phpinfo = array('phpinfo' => array());
+	if (preg_match_all(
+			'#(?:<h2>(?:<a name=".*?">)?(.*?)(?:</a>)?</h2>)|(?:<tr(?: class=".*?")?><t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>(?:<t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>(?:<t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>)?)?</tr>)#s',
+			ob_get_clean(), $matches, PREG_SET_ORDER
+		)
+	) {
+		foreach ($matches as $match) {
+			$end = array_keys($phpinfo);
+			$end = end($end);
+			if (strlen($match[1])) {
+				$phpinfo[$match[1]] = array();
+			} elseif (isset($match[3])) {
+				$phpinfo[$end][$match[2]] = isset($match[4]) ? array($match[3], $match[4]) : $match[3];
+			} else {
+				$phpinfo[$end][] = $match[2];
+			}
+		}
+		$phpinfohtml = '';
+		foreach ($phpinfo as $name => $section) {
+			$phpinfoentries = "";
+			foreach ($section as $key => $val) {
+				if (is_array($val)) {
+					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_3") . "\";");
+				} elseif (is_string($key)) {
+					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_2") . "\";");
+				} else {
+					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_1") . "\";");
+				}
+			}
+			// first header -> show actual php version
+			if (strtolower($name) == "phpinfo") {
+				$name = "PHP ".PHP_VERSION;
+			}
+			eval("\$phpinfohtml .= \"" . getTemplate("settings/phpinfo/phpinfo_table") . "\";");
+		}
+		$phpinfo = $phpinfohtml;
+	} else {
+		standard_error($lng['error']['no_phpinfo']);
+	}
+	eval("echo \"" . getTemplate("settings/phpinfo") . "\";");
+
+} elseif($page == 'rebuildconfigs'
+	&& $userinfo['change_serversettings'] == '1'
+) {
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+
 		$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles");
 		inserttask('1');
-		inserttask('4');
-		inserttask('5');
-		inserttask('9');
 		inserttask('10');
+		// Using nameserver, insert a task which rebuilds the server config
+		inserttask('4');
+
 		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
-	}
-	else
-	{
+
+	} else {
 		ask_yesno('admin_configs_reallyrebuild', $filename, array('page' => $page));
 	}
-}
-elseif($page == 'updatecounters'
-       && $userinfo['change_serversettings'] == '1')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+
+} elseif($page == 'updatecounters'
+	&& $userinfo['change_serversettings'] == '1'
+) {
+
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+
 		$log->logAction(ADM_ACTION, LOG_INFO, "updated resource-counters");
 		$updatecounters = updateCounters(true);
 		$customers = '';
-		foreach($updatecounters['customers'] as $customerid => $customer)
-		{
+		foreach ($updatecounters['customers'] as $customerid => $customer) {
 			eval("\$customers.=\"" . getTemplate("settings/updatecounters_row_customer") . "\";");
 		}
 
 		$admins = '';
-		foreach($updatecounters['admins'] as $adminid => $admin)
-		{
+		foreach ($updatecounters['admins'] as $adminid => $admin) {
 			eval("\$admins.=\"" . getTemplate("settings/updatecounters_row_admin") . "\";");
 		}
 
 		eval("echo \"" . getTemplate("settings/updatecounters") . "\";");
-	}
-	else
-	{
+
+	} else {
 		ask_yesno('admin_counters_reallyupdate', $filename, array('page' => $page));
 	}
-}
-elseif($page == 'wipecleartextmailpws'
-       && $userinfo['change_serversettings'] == '1')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+
+} elseif ($page == 'wipecleartextmailpws'
+	&& $userinfo['change_serversettings'] == '1'
+) {
+
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+
 		$log->logAction(ADM_ACTION, LOG_WARNING, "wiped all cleartext mail passwords");
-		$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `password`='' ");
-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='0' WHERE `settinggroup`='system' AND `varname`='mailpwcleartext'");
-		redirectTo('admin_settings.php', array('s' => $s));
-	}
-	else
-	{
+		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `password` = '';");
+		Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '0' WHERE `settinggroup` = 'system' AND `varname` = 'mailpwcleartext'");
+		redirectTo($filename, array('s' => $s));
+
+	} else {
 		ask_yesno('admin_cleartextmailpws_reallywipe', $filename, array('page' => $page));
 	}
-}
-elseif($page == 'wipequotas'
-       && $userinfo['change_serversettings'] == '1')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+
+} elseif($page == 'wipequotas'
+	&& $userinfo['change_serversettings'] == '1'
+) {
+
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+
 		$log->logAction(ADM_ACTION, LOG_WARNING, "wiped all mailquotas");
 
 		// Set the quota to 0 which means unlimited
+		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = '0';");
+		Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_quota_used` = '0'");
+		redirectTo($filename, array('s' => $s));
 
-		$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota`='0' ");
-		$db->query("UPDATE " . TABLE_PANEL_CUSTOMERS . " SET `email_quota_used` = 0");
-		redirectTo('admin_settings.php', array('s' => $s));
-	}
-	else
-	{
+	} else {
 		ask_yesno('admin_quotas_reallywipe', $filename, array('page' => $page));
 	}
-}
-elseif($page == 'enforcequotas'
-       && $userinfo['change_serversettings'] == '1')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+
+} elseif ($page == 'enforcequotas'
+	&& $userinfo['change_serversettings'] == '1'
+) {
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
 		// Fetch all accounts
+		$result_stmt = Database::query("SELECT `quota`, `customerid` FROM `" . TABLE_MAIL_USERS . "`");
 
-		$result = $db->query("SELECT `quota`, `customerid` FROM " . TABLE_MAIL_USERS);
+		if (Database::num_rows() > 0) {
 
-		while($array = $db->fetch_array($result))
-		{
-			$difference = $settings['system']['mail_quota'] - $array['quota'];
-			$db->query("UPDATE " . TABLE_PANEL_CUSTOMERS . " SET `email_quota_used` = `email_quota_used` + " . (int)$difference . " WHERE `customerid` = '" . $array['customerid'] . "'");
+			$upd_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
+				`email_quota_used` = `email_quota_used` + :diff
+				WHERE `customerid` = :customerid
+			");
+
+			while ($array = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+				$difference = Settings::Get('system.mail_quota') - $array['quota'];
+				Database::pexecute($upd_stmt, array('diff' => $difference, 'customerid' => $customerid));
+			}
 		}
 
 		// Set the new quota
-
-		$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota`='" . $settings['system']['mail_quota'] . "'");
+		$upd_stmt = Database::prepare("
+			UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = :quota
+		");
+		Database::pexecute($upd_stmt, array('quota' => Settings::Get('system.mail_quota')));
 
 		// Update the Customer, if the used quota is bigger than the allowed quota
+		Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_quota` = `email_quota_used` WHERE `email_quota` < `email_quota_used`");
+		$log->logAction(ADM_ACTION, LOG_WARNING, 'enforcing mailquota to all customers: ' . Settings::Get('system.mail_quota') . ' MB');
+		redirectTo($filename, array('s' => $s));
 
-		$db->query("UPDATE " . TABLE_PANEL_CUSTOMERS . " SET `email_quota` = `email_quota_used` WHERE `email_quota` < `email_quota_used`");
-		$log->logAction(ADM_ACTION, LOG_WARNING, 'enforcing mailquota to all customers: ' . $settings['system']['mail_quota'] . ' MB');
-		redirectTo('admin_settings.php', array('s' => $s));
-	}
-	else
-	{
+	} else {
 		ask_yesno('admin_quotas_reallyenforce', $filename, array('page' => $page));
 	}
+} elseif ($page == 'integritycheck'
+	&& $userinfo['change_serversettings'] == '1'
+) {
+	$integrity = new IntegrityCheck();
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		$integrity->fixAll();
+	} elseif(isset($_GET['action'])
+		 && $_GET['action'] == "fix") {
+		ask_yesno('admin_integritycheck_reallyfix', $filename, array('page' => $page));
+	}
+
+	$integritycheck = '';
+	foreach ($integrity->available as $id => $check) {
+		$displayid = $id + 1;
+		$result = $integrity->$check();
+		$checkdesc = $lng['integrity_check'][$check];
+		eval("\$integritycheck.=\"" . getTemplate("settings/integritycheck_row") . "\";");
+	}
+	eval("echo \"" . getTemplate("settings/integritycheck") . "\";");
 }

admin_templates.php

@@ -18,77 +18,79 @@
  */
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
-
-if(isset($_POST['subjectid']))
-{
+if (isset($_POST['subjectid'])) {
 	$subjectid = intval($_POST['subjectid']);
 	$mailbodyid = intval($_POST['mailbodyid']);
-}
-elseif(isset($_GET['subjectid']))
-{
+
+} elseif(isset($_GET['subjectid'])) {
 	$subjectid = intval($_GET['subjectid']);
 	$mailbodyid = intval($_GET['mailbodyid']);
 }
 
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
 $available_templates = array(
 	'createcustomer',
 	'pop_success',
-	'trafficmaxpercent',
-	'diskmaxpercent',
-	'new_ticket_by_customer',
-	'new_ticket_for_customer',
-	'new_ticket_by_staff',
-	'new_reply_ticket_by_customer',
-	'new_reply_ticket_by_staff',
 	'new_database_by_customer',
 	'new_ftpaccount_by_customer',
 	'password_reset'
 );
+
+// only show templates of features that are enabled #1191
+if ((int)Settings::Get('system.report_enable') == 1) {
+	array_push($available_templates,
+		'trafficmaxpercent',
+		'diskmaxpercent'
+	);
+}
+
+if ((int)Settings::Get('ticket.enabled') == 1) {
+	array_push($available_templates,
+		'new_ticket_by_customer',
+		'new_ticket_for_customer',
+		'new_ticket_by_staff',
+		'new_reply_ticket_by_customer',
+		'new_reply_ticket_by_staff'
+	);
+}
+
 $file_templates = array(
 	'index_html'
 );
 
-if($action == '')
-{
+if ($action == '') {
 	//email templates
-
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_templates");
 
-	if($settings['panel']['sendalternativemail'] == 1)
-	{
+	if (Settings::Get('panel.sendalternativemail') == 1) {
 		$available_templates[] = 'pop_success_alternative';
 	}
 
 	$templates_array = array();
-	$result = $db->query("SELECT `id`, `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `templategroup`='mails' ORDER BY `language`, `varname`");
+	$result_stmt = Database::prepare("
+		SELECT `id`, `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `templategroup`='mails'
+		ORDER BY `language`, `varname`"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
 
-	while($row = $db->fetch_array($result))
-	{
+	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$parts = array();
 		preg_match('/^([a-z]([a-z_]+[a-z])*)_(mailbody|subject)$/', $row['varname'], $parts);
 		$templates_array[$row['language']][$parts[1]][$parts[3]] = $row['id'];
 	}
 
 	$templates = '';
-	foreach($templates_array as $language => $template_defs)
-	{
-		foreach($template_defs as $action => $email)
-		{
+	foreach ($templates_array as $language => $template_defs) {
+		foreach ($template_defs as $action => $email) {
 			$subjectid = $email['subject'];
 			$mailbodyid = $email['mailbody'];
 			$template = $lng['admin']['templates'][$action];
@@ -97,117 +99,137 @@ if($action == '')
 	}
 
 	$add = false;
+	while (list($language_file, $language_name) = each($languages)) {
 
-	while(list($language_file, $language_name) = each($languages))
-	{
 		$templates_done = array();
-		$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language_name) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');
+		$result_stmt = Database::prepare("
+			SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+			WHERE `adminid` = :adminid AND `language`= :lang
+			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'"
+		);
+		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language_name));
 
-		while(($row = $db->fetch_array($result)) != false)
-		{
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 			$templates_done[] = str_replace('_subject', '', $row['varname']);
 		}
 
-		if(count(array_diff($available_templates, $templates_done)) > 0)
-		{
+		if (count(array_diff($available_templates, $templates_done)) > 0) {
 			$add = true;
 		}
 	}
 
 	//filetemplates
-
 	$filetemplates = '';
 	$filetemplateadd = false;
-	$result = $db->query("SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `templategroup`='files'");
+	$result_stmt = Database::prepare("
+		SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `templategroup`='files'"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
 
-	if($db->num_rows($result) != count($file_templates))$filetemplateadd = true;
-
-	while($row = $db->fetch_array($result))
-	{
-		eval("\$filetemplates.=\"" . getTemplate("templates/templates_filetemplate") . "\";");
+	if (Database::num_rows() != count($file_templates)) {
+		$filetemplateadd = true;
 	}
 
+	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+		eval("\$filetemplates.=\"" . getTemplate("templates/templates_filetemplate") . "\";");
+	}
 	eval("echo \"" . getTemplate("templates/templates") . "\";");
-}
-elseif($action == 'delete'
-       && $subjectid != 0
-       && $mailbodyid != 0)
-{
+
+} elseif($action == 'delete'
+	&& $subjectid != 0
+	&& $mailbodyid != 0
+) {
 	//email templates
+	$result_stmt = Database::prepare("
+		SELECT `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `id` = :id"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $subjectid));
+	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-	$result = $db->query_first("SELECT `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$subjectid . "'");
-
-	if($result['varname'] != '')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			$db->query("DELETE FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND (`id`='" . (int)$subjectid . "' OR `id`='" . (int)$mailbodyid . "')");
+	if ($result['varname'] != '') {
+		if (isset($_POST['send'])
+			&& $_POST['send'] == 'send'
+		) {
+			$del_stmt = Database::prepare("
+				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
+				WHERE `adminid` = :adminid
+				AND (`id` = :ida OR `id` = :idb)"
+			);
+			Database::pexecute($del_stmt, array(
+				'adminid' => $userinfo['adminid'],
+				'ida' => $subjectid,
+				'idb' => $mailbodyid
+			));
 			$log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])] . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
+			redirectTo($filename, array('page' => $page, 's' => $s));
+
+		} else {
 			ask_yesno('admin_template_reallydelete', $filename, array('subjectid' => $subjectid, 'mailbodyid' => $mailbodyid, 'page' => $page, 'action' => $action), $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])]);
 		}
 	}
-}
-elseif($action == 'deletef'
-       && $id != 0)
-{
+
+} elseif($action == 'deletef'
+	&& $id != 0
+) {
 	//file templates
+	$result_stmt = Database::prepare("
+		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `id` = :id"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
 
-	$result = $db->query("SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$id . "'");
+	if (Database::num_rows() > 0) {
 
-	if($db->num_rows($result) > 0)
-	{
-		$row = $db->fetch_array($result);
+		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			$db->query("DELETE FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`=" . (int)$userinfo['adminid'] . " AND `id`=" . (int)$id . "");
+		if (isset($_POST['send'])
+			&& $_POST['send'] == 'send'
+		) {
+			$del_stmt = Database::prepare("
+				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
+				WHERE `adminid` = :adminid AND `id` = :id"
+			);
+			Database::pexecute($del_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
 			$log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $lng['admin']['templates'][$row['varname']] . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
+			redirectTo($filename, array('page' => $page, 's' => $s));
+
+		} else {
 			ask_yesno('admin_template_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $lng['admin']['templates'][$row['varname']]);
 		}
-	}
-	else
-	{
+
+	} else {
 		standard_error('templatenotfound');
-		exit;
 	}
-}
-elseif($action == 'add')
-{
-	if($settings['panel']['sendalternativemail'] == 1)
-	{
+
+} elseif($action == 'add') {
+
+	if (Settings::Get('panel.sendalternativemail') == 1) {
 		$available_templates[] = 'pop_success_alternative';
 	}
 
-	if(isset($_POST['prepare'])
-	   && $_POST['prepare'] == 'prepare')
-	{
+	if (isset($_POST['prepare'])
+		&& $_POST['prepare'] == 'prepare'
+	) {
 		//email templates
+		$language = htmlentities(validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
+		$template = validate($_POST['template'], 'template');
 
-		$language = validate($_POST['language'], 'language');
-		$templates = array();
-		$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');
-
-		while(($row = $db->fetch_array($result)) != false)
-		{
-			$templates[] = str_replace('_subject', '', $row['varname']);
+		$lng_bak = $lng;
+		foreach ($langs['English'] as $key => $value) {
+			include_once makeSecurePath($value['file']);
+		}
+		if ($language != 'English') {
+			foreach ($langs[$language] as $key => $value) {
+				include makeSecurePath($value['file']);
+			}
 		}
 
-		$templates = array_diff($available_templates, $templates);
-		$template_options = '';
-		foreach($templates as $template)
-		{
-			$template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true);
-		}
+		$subject = $lng['mails'][$template]['subject'];
+		$body = str_replace('\n', "\n", $lng['mails'][$template]['mailbody']);
+
+		$lng = $lng_bak;
 
 		$template_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_add.php';
 		$template_add_form = htmlform::genHTMLForm($template_add_data);
@@ -216,105 +238,148 @@ elseif($action == 'add')
 		$image = $template_add_data['template_add']['image'];
 
 		eval("echo \"" . getTemplate("templates/templates_add_2") . "\";");
-	}
-	elseif(isset($_POST['send'])
-	       && $_POST['send'] == 'send')
-	{
-		//email templates
 
-		$language = validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect');
+	} elseif(isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		//email templates
+		$language = htmlentities(validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
 		$template = validate($_POST['template'], 'template');
 		$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
 		$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
 		$templates = array();
-		$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');
+		$result_stmt = Database::prepare("
+			SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+			WHERE `adminid` = :adminid AND `language` = :lang
+			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'"
+		);
+		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language));
 
-		while(($row = $db->fetch_array($result)) != false)
-		{
+		while($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 			$templates[] = str_replace('_subject', '', $row['varname']);
 		}
 
 		$templates = array_diff($available_templates, $templates);
-
-		if(array_search($template, $templates) === false)
-		{
+		if (array_search($template, $templates) === false) {
 			standard_error('templatenotfound');
-		}
-		else
-		{
-			$result = $db->query("INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` (`adminid`, `language`, `templategroup`, `varname`, `value`)
-									VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($language) . "', 'mails', '" . $db->escape($template) . "_subject','" . $db->escape($subject) . "')");
-			$result = $db->query("INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` (`adminid`, `language`, `templategroup`, `varname`, `value`)
-									VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($language) . "', 'mails', '" . $db->escape($template) . "_mailbody','" . $db->escape($mailbody) . "')");
-			$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-	}
-	elseif(isset($_POST['filesend'])
-	       && $_POST['filesend'] == 'filesend')
-	{
-		//file templates
 
+		} else {
+			$ins_stmt = Database::prepare("
+				INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
+					`adminid` = :adminid,
+					`language` = :lang,
+					`templategroup` = 'mails',
+					`varname` = :var,
+					`value` = :value"
+			);
+
+			// mail-subject
+			$ins_data = array(
+				'adminid' => $userinfo['adminid'],
+				'lang' => $language,
+				'var' =>  $template.'_subject',
+				'value' => $subject
+			);
+			Database::pexecute($ins_stmt, $ins_data);
+
+			// mail-body
+			$ins_data = array(
+				'adminid' => $userinfo['adminid'],
+				'lang' => $language,
+				'var' =>  $template.'_mailbody',
+				'value' => $mailbody
+			);
+			Database::pexecute($ins_stmt, $ins_data);
+
+			$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
+			redirectTo($filename, array('page' => $page, 's' => $s));
+		}
+
+	} elseif(isset($_POST['filesend'])
+		&& $_POST['filesend'] == 'filesend'
+	) {
+		//file templates
 		$template = validate($_POST['template'], 'template');
 		$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
-		$db->query("INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` (`adminid`, `language`, `templategroup`, `varname`, `value`)
-					VALUES ('" . (int)$userinfo['adminid'] . "', '', 'files', '" . $db->escape($template) . "','" . $db->escape($filecontent) . "')");
-		$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
-		redirectTo($filename, Array('page' => $page, 's' => $s));
-	}
-	elseif(!isset($_GET['files']))
-	{
-		//email templates
 
+		$ins_stmt = Database::prepare("
+			INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
+				`adminid` = :adminid,
+				`language` = '',
+				`templategroup` = 'files',
+				`varname` = :var,
+				`value` = :value"
+		);
+
+		$ins_data = array(
+			'adminid' => $userinfo['adminid'],
+			'var' => $template,
+			'value' => $filecontent
+		);
+		Database::pexecute($ins_stmt, $ins_data);
+
+		$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
+		redirectTo($filename, array('page' => $page, 's' => $s));
+
+	} elseif(!isset($_GET['files'])) {
+
+		//email templates
 		$add = false;
 		$language_options = '';
+		$template_options = '';
 
-		while(list($language_file, $language_name) = each($languages))
-		{
+		while (list($language_file, $language_name) = each($languages)) {
 			$templates = array();
-			$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language_name) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');
+			$result_stmt = Database::prepare("
+				SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+				WHERE `adminid` = :adminid AND `language` = :lang
+				AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'"
+			);
+			Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language_name));
 
-			while(($row = $db->fetch_array($result)) != false)
-			{
+			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 				$templates[] = str_replace('_subject', '', $row['varname']);
 			}
 
-			if(count(array_diff($available_templates, $templates)) > 0)
-			{
+			if (count(array_diff($available_templates, $templates)) > 0) {
 				$add = true;
-				$language_options.= makeoption($language_name, $language_file, $userinfo['language'], true);
+				$language_options.= makeoption($language_name, $language_file, $userinfo['language'], true, true);
+
+				$templates = array_diff($available_templates, $templates);
+
+				foreach ($templates as $template) {
+					$template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true, true, $language_file) . "\n";
+				}
 			}
 		}
 
-		if($add)
-		{
+		if ($add) {
 			eval("echo \"" . getTemplate("templates/templates_add_1") . "\";");
-		}
-		else
-		{
+		} else {
 			standard_error('alltemplatesdefined');
-			exit;
 		}
-	}
-	else
-	{
+
+	} else {
 		//filetemplates
+		$result_stmt = Database::prepare("
+			SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+			WHERE `adminid` = :adminid AND `templategroup`='files'"
+		);
+		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
 
-		$result = $db->query("SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `templategroup`='files'");
-
-		if($db->num_rows($result) == count($file_templates))
-		{
+		if (Database::num_rows() == count($file_templates)) {
 			standard_error('alltemplatesdefined');
-			exit;
-		}
-		else
-		{
+
+		} else {
+
 			$templatesdefined = array();
 			$free_templates = '';
 
-			while($row = $db->fetch_array($result))$templatesdefined[] = $row['varname'];
-			foreach(array_diff($file_templates, $templatesdefined) as $template)
-			{
+			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+				$templatesdefined[] = $row['varname'];
+			}
+
+			foreach (array_diff($file_templates, $templatesdefined) as $template) {
 				$free_templates.= makeoption($lng['admin']['templates'][$template], $template, '', true);
 			}
 
@@ -327,33 +392,65 @@ elseif($action == 'add')
 			eval("echo \"" . getTemplate("templates/filetemplates_add") . "\";");
 		}
 	}
-}
-elseif($action == 'edit'
-       && $subjectid != 0
-       && $mailbodyid != 0)
-{
+
+} elseif($action == 'edit'
+	&& $subjectid != 0
+	&& $mailbodyid != 0
+) {
 	//email templates
+	$result_stmt = Database::prepare("
+		SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `id` = :subjectid"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'subjectid' => $subjectid));
+	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-	$result = $db->query_first("SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$subjectid . "'");
+	if ($result['varname'] != '') {
 
-	if($result['varname'] != '')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
+		if (isset($_POST['send'])
+			&& $_POST['send'] == 'send'
+		) {
 			$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
 			$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
-			$db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `value`='" . $db->escape($subject) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$subjectid . "'");
-			$db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `value`='" . $db->escape($mailbody) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$mailbodyid . "'");
+
+			$upd_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
+					`value` = :value
+				WHERE `adminid` = :adminid AND `id` = :id"
+			);
+			// subject
+			Database::pexecute($upd_stmt, array(
+				'value' => $subject,
+				'adminid' => $userinfo['adminid'],
+				'id' => $subjectid
+			));
+			// same query but mailbody
+			Database::pexecute($upd_stmt, array(
+				'value' => $mailbody,
+				'adminid' => $userinfo['adminid'],
+				'id' => $mailbodyid
+			));
+
 			$log->logAction(ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
+			redirectTo($filename, array('page' => $page, 's' => $s));
+
+		} else {
+
 			$result = htmlentities_array($result);
 			$template = $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])];
 			$subject = $result['value'];
-			$result = $db->query_first("SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `id`='$mailbodyid'");
+			$result_stmt = Database::prepare("
+				SELECT `language`, `varname`, `value`
+				FROM `" . TABLE_PANEL_TEMPLATES . "`
+				WHERE `id` = :id"
+			);
+			Database::pexecute($result_stmt, array('id' => $mailbodyid));
+			$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+			
+			$template_name = str_replace('_mailbody', '', $result['varname']);
+
+			// don't escape the already escaped language-string so save up before htmlentities()
+			$language = $result['language'];
 			$result = htmlentities_array($result);
 			$mailbody = $result['value'];
 
@@ -366,30 +463,41 @@ elseif($action == 'edit'
 			eval("echo \"" . getTemplate("templates/templates_edit") . "\";");
 		}
 	}
-}
-elseif($action == 'editf'
-       && $id != 0)
-{
+
+} elseif($action == 'editf'
+	&& $id != 0
+) {
 	//file templates
+	$result_stmt = Database::prepare("
+		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `id` = :id"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
 
-	$result = $db->query("SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$id . "'");
+	if(Database::num_rows() > 0) {
 
-	if($db->num_rows($result) > 0)
-	{
-		$row = $db->fetch_array($result);
+		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		//filetemplates
-
-		if(isset($_POST['filesend'])
-		   && $_POST['filesend'] == 'filesend')
-		{
+		if (isset($_POST['filesend'])
+			&& $_POST['filesend'] == 'filesend'
+		) {
 			$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
-			$db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `value`='" . $db->escape($filecontent) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$id . "'");
+			$upd_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
+					`value` = :value
+				WHERE `adminid` = :adminid AND `id` = :id"
+			);
+			Database::pexecute($upd_stmt, array(
+				'value' => $filecontent,
+				'adminid' => $userinfo['adminid'],
+				'id' => $id
+			));
+
 			$log->logAction(ADM_ACTION, LOG_INFO, "edited template '" . $row['varname'] . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
+			redirectTo($filename, array('page' => $page, 's' => $s));
+
+		} else {
 			$row = htmlentities_array($row);
 
 			$filetemplate_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_edit.php';
@@ -400,10 +508,8 @@ elseif($action == 'editf'
 
 			eval("echo \"" . getTemplate("templates/filetemplates_edit") . "\";");
 		}
-	}
-	else
-	{
+
+	} else {
 		standard_error('templatenotfound');
-		exit;
 	}
 }

admin_traffic.php

@@ -17,26 +17,21 @@
  */
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
-
-if($action == 'logout')
-{
-	$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1'");
+if ($action == 'logout') {
+	$logout_stmt = Database::prepare("
+		DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+		WHERE `userid` = :adminid
+		AND `adminsession` = '1'"
+	);
+	Database::pexecute($logout_stmt, array('adminid' => $userinfo['adminid']));
 	redirectTo('index.php');
-	exit;
 }
 
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
@@ -56,59 +51,50 @@ $months = array(
 	'12' => 'dec',
 );
 
-if($page == 'overview' || $page == 'customers') 
-{
-	if($action == 'su' && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid`='" . (int)$id . "' " . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' "));
+if ($page == 'overview' || $page == 'customers') {
 
-		if($result['loginname'] != '')
-		{
-			$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid`='" . (int)$userinfo['userid'] . "'");
-			$s = md5(uniqid(microtime(), 1));
-			$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`) VALUES ('" . $db->escape($s) . "', '" . (int)$id . "', '" . $db->escape($result['ipaddress']) . "', '" . $db->escape($result['useragent']) . "', '" . time() . "', '" . $db->escape($result['language']) . "', '0')");
-			redirectTo('customer_traffic.php', Array(
-				's' => $s
-			));
-		}
-		else
-		{
-			redirectTo('index.php', Array(
-				'action' => 'login'
-			));
-		}
-	}
 	$customerview = 1;
 	$stats_tables = '';
-	$minyear = $db->query_first("SELECT `year` FROM `". TABLE_PANEL_TRAFFIC . "` ORDER BY `year` ASC LIMIT 1");
-	if (!isset($minyear['year']) || $minyear['year'] == 0)
-	{
+	$minyear_stmt = Database::query("SELECT `year` FROM `". TABLE_PANEL_TRAFFIC . "` ORDER BY `year` ASC LIMIT 1");
+	$minyear = $minyear_stmt->fetch(PDO::FETCH_ASSOC);
+
+	if (!isset($minyear['year']) || $minyear['year'] == 0) {
 		$maxyears = 0;
-	}
-	else
-	{
+	} else {
 		$maxyears = date("Y") - $minyear['year'];
 	}
-	for($years = 0; $years<=$maxyears; $years++) {
+
+	for ($years = 0; $years<=$maxyears; $years++) {
+
 		$overview['year'] = date("Y")-$years;
 		$overview['type'] = $lng['traffic']['customer'];
 		$domain_list = '';
-		$customer_name_list = $db->query("SELECT `customerid`,`company`,`name`,`firstname` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `deactivated`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' ") . " ORDER BY name");
 		$totals = array(
-			'jan' => 0,
-			'feb' => 0,
-			'mar' => 0,
-			'apr' => 0,
-			'may' => 0,
-			'jun' => 0,
-			'jul' => 0,
-			'aug' => 0,
-			'sep' => 0,
-			'oct' => 0,
-			'nov' => 0,
-			'dec' => 0,
+				'jan' => 0,
+				'feb' => 0,
+				'mar' => 0,
+				'apr' => 0,
+				'may' => 0,
+				'jun' => 0,
+				'jul' => 0,
+				'aug' => 0,
+				'sep' => 0,
+				'oct' => 0,
+				'nov' => 0,
+				'dec' => 0,
 		);
-		while($customer_name = $db->fetch_array($customer_name_list)) {
+
+		$customer_name_list_stmt = Database::prepare("
+			SELECT `customerid`,`company`,`name`,`firstname`
+			FROM `" . TABLE_PANEL_CUSTOMERS . "`
+			WHERE `deactivated`='0'" .
+			($userinfo['customers_see_all'] ? '' : " AND `adminid` = :id") . "
+			ORDER BY name"
+		);
+		Database::pexecute($customer_name_list_stmt, array('id' => $userinfo['adminid']));
+
+		while($customer_name = $customer_name_list_stmt->fetch(PDO::FETCH_ASSOC)) {
+
 			$virtual_host = array(
 				'name' => ($customer_name['company'] == '' ? $customer_name['name'] . ", " . $customer_name['firstname'] : $customer_name['company']),
 				'customerid' => $customer_name['customerid'],
@@ -125,10 +111,17 @@ if($page == 'overview' || $page == 'customers')
 				'nov' => '-',
 				'dec' => '-',
 			);
-			
-			$traffic_list = $db->query("SELECT month, SUM(http+ftp_up+ftp_down+mail)*1024 AS traffic FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE year = " . (date("Y")-$years) . " AND `customerid` = '" . $customer_name['customerid'] . "' GROUP BY month ORDER BY month");
-			while($traffic_month = $db->fetch_array($traffic_list)) {
-				$virtual_host[$months[(int)$traffic_month['month']]] = size_readable($traffic_month['traffic'], 'GiB', 'bi', '%01.3f %s');
+
+			$traffic_list_stmt = Database::prepare("
+				SELECT month, SUM(http+ftp_up+ftp_down+mail)*1024 AS traffic
+				FROM `" . TABLE_PANEL_TRAFFIC . "`
+				WHERE year = :year AND `customerid` = :id
+				GROUP BY month ORDER BY month"
+			);
+			Database::pexecute($traffic_list_stmt, array('year' => (date("Y")-$years), 'id' => $customer_name['customerid']));
+
+			while ($traffic_month = $traffic_list_stmt->fetch(PDO::FETCH_ASSOC)) {
+				$virtual_host[$months[(int)$traffic_month['month']]] = size_readable($traffic_month['traffic'], 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
 				$totals[$months[(int)$traffic_month['month']]] += $traffic_month['traffic'];
 			}
 			eval("\$domain_list .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
@@ -137,8 +130,8 @@ if($page == 'overview' || $page == 'customers')
 		$virtual_host = array(
 			'name' => $lng['traffic']['months']['total'],
 		);
-		foreach($totals as $month => $bytes) {
-			$virtual_host[$month] = ($bytes == 0 ? '-' : size_readable($bytes, 'GiB', 'bi', '%01.3f %s'));
+		foreach ($totals as $month => $bytes) {
+			$virtual_host[$month] = ($bytes == 0 ? '-' : size_readable($bytes, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s'));
 		}
 		$customerview = 0;
 		eval("\$total_list = sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");

admin_updates.php

@@ -16,26 +16,24 @@
  */
 
 define('AREA', 'admin');
-require ("./lib/init.php");
+require './lib/init.php';
 
-if($page == 'overview')
-{
+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)
+	 * have 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'] == ''
+		if (Settings::Get('panel.version') == null
+			|| Settings::Get('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']."')");
+			Settings::Set('panel.version', '1.4.2.1');
 		}
-		if (!isset($settings['system']['dbversion'])
-		|| $settings['system']['dbversion'] == ''
+		if (Settings::Get('system.dbversion') == null
+			|| Settings::Get('system.dbversion') == ''
 		) {
 			/**
 			 * for syscp-stable (1.4.2.1) this value has to be 0
@@ -43,82 +41,81 @@ if($page == 'overview')
 			 * 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'];
+			$result_stmt = Database::query("
+				SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'"
+			);
+			$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+
+			if (isset($result['value'])) {
+				Settings::Set('system.dbversion', (int)$result['value'], false);
 			} else {
-				$settings['system']['dbversion'] = 0;
+				Settings::Set('system.dbversion', 0, false);
 			}
 		}
 	}
 
-	if(hasUpdates($version))
-	{
+	if (hasDbUpdates($dbversion)) {
 		$successful_update = false;
 		$message = '';
 
-		if(isset($_POST['send'])
-		&& $_POST['send'] == 'send')
-		{
-			if((isset($_POST['update_preconfig'])
+		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") . "\";");
-	
+				eval("echo \"" . getTemplate('update/update_start') . "\";");
+
 				include_once './install/updatesql.php';
-	
+
 				$redirect_url = 'admin_index.php?s=' . $s;
-				eval("echo \"" . getTemplate("update/update_end") . "\";");
-	
+				eval("echo \"" . getTemplate('update/update_end') . "\";");
+
 				updateCounters();
 				inserttask('1');
 				@chmod('./lib/userdata.inc.php', 0440);
-				
+
 				$successful_update = true;
-			}
-			else
-			{
-				$message = '<br /><strong style="color:#ff0000;">You have to agree that you have read the update notifications.</strong>';
+			} else {
+				$message = '<br /><strong class="red">You have to agree that you have read the update notifications.</strong>';
 			}
 		}
 
-		if(!$successful_update)
-		{
-			$current_version = $settings['panel']['version'];
+		if (!$successful_update) {
+			$current_version = Settings::Get('panel.version');
+			$current_db_version = Settings::Get('panel.db_version');
+			if (empty($current_db_version)) {
+			    $current_db_version = "0";
+			}
 			$new_version = $version;
+			$new_db_version = $dbversion;
 
 			$ui_text = $lng['update']['update_information']['part_a'];
-			$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;
+			if ($version != $current_version) {
+			     $ui_text = str_replace('%curversion', $current_version, $ui_text);
+			     $ui_text = str_replace('%newversion', $new_version, $ui_text);
+			} else {
+			    // show db version
+			    $ui_text = str_replace('%curversion', $current_db_version, $ui_text);
+			    $ui_text = str_replace('%newversion', $new_db_version, $ui_text);
 			}
-			
+			$update_information = $ui_text;
+
+			include_once './install/updates/preconfig.php';
+			$preconfig = getPreConfig($current_version, $current_db_version);
+			if ($preconfig != '') {
+				$update_information .= '<br />' . $preconfig . $message;
+			}
+
 			$update_information .= $lng['update']['update_information']['part_b'];
 
-			eval("echo \"" . getTemplate("update/index") . "\";");
+			eval("echo \"" . getTemplate('update/index') . "\";");
 		}
-	}
-	else
-	{
-		/*
-		 * @TODO version-webcheck check here
-		 */
-
+	} else {
 		$success_message = $lng['update']['noupdatesavail'];
 		$redirect_url = 'admin_index.php?s=' . $s;
-		eval("echo \"" . getTemplate("update/noupdatesavail") . "\";");
+		eval("echo \"" . getTemplate('update/noupdatesavail') . "\";");
 	}
 }
-
-?>

cache/.gitignore

@@ -1 +0,0 @@
-*

customer_aps.php

@@ -1,34 +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    Panel
- *
- */
-
-// Required code
-
-define('AREA', 'customer');
-require ("./lib/init.php");
-$Id = 0;
-
-if(isset($_GET['id']))$Id = (int)$_GET['id'];
-
-if(isset($_POST['id']))$Id = (int)$_POST['id'];
-eval("echo \"" . getTemplate("aps/header") . "\";");
-$Aps = new ApsParser($userinfo, $settings, $db);
-$Aps->MainHandler($action);
-eval("echo \"" . getTemplate("aps/footer") . "\";");
-
-?>

customer_autoresponder.php

@@ -1,318 +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    Panel
- *
- */
-
-// Required code
-
-define('AREA', 'customer');
-require ("./lib/init.php");
-
-// Create new autoresponder
-
-if($action == "add")
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
-		$account = trim($_POST['account']);
-		$subject = trim($_POST['subject']);
-		$message = trim($_POST['message']);
-
-		$date_from_off = isset($_POST['date_from_off']) ? -1 : 0;
-		$date_until_off = isset($_POST['date_until_off']) ? -1 : 0;
-
-		/*
-		 * @TODO validate date (DD-MM-YYYY)
-		 */
-		$ts_from = -1;
-		$ts_until = -1;
-
-		if($date_from_off > -1)
-		{
-			$date_from = $_POST['date_from'];
-			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
-		}
-		if($date_until_off > -1)
-		{
-			$date_until = $_POST['date_until'];
-			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
-		}
-
-		if(empty($account)
-		   || empty($subject)
-		   || empty($message))
-		{
-			standard_error('missingfields');
-		}
-
-		// Does account exist?
-
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 0)
-		{
-			standard_error('accountnotexisting');
-		}
-
-		// Does autoresponder exist?
-
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 1)
-		{
-			standard_error('autoresponderalreadyexists');
-		}
-
-		$db->query("INSERT INTO `" . TABLE_MAIL_AUTORESPONDER . "`
-			SET `email` = '" . $db->escape($account) . "',
-			`message` = '" . $db->escape($message) . "',
-			`enabled` = '" . (int)$_POST['active'] . "',
-			`date_from` = '" . (int)$ts_from . "',
-			`date_until` = '" . (int)$ts_until . "',
-			`subject` = '" . $db->escape($subject) . "',
-			`customerid` = '" . $db->escape((int)$userinfo['customerid']) . "'
-			");
-		$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_autoresponder_used` = `email_autoresponder_used` + 1 WHERE `customerid` = '" . $db->escape((int)$userinfo['customerid']). "'");
-		redirectTo($filename, Array('s' => $s));
-	}
-
-	// Get accounts
-
-	$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` NOT IN (SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`) ORDER BY email ASC");
-
-	if($db->num_rows($result) == 0)
-	{
-		standard_error('noemailaccount');
-	}
-
-	$accounts = '';
-
-	while($row = $db->fetch_array($result))
-	{
-		$accounts.= "<option value=\"" . $row['email'] . "\">" . $row['email'] . "</option>";
-	}
-
-	$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);
-
-	#$isactive = makeyesno('active', '1', '0', '1');
-
-	$autoresponder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/autoresponder/formfield.autoresponder_add.php';
-	$autoresponder_add_form = htmlform::genHTMLForm($autoresponder_add_data);
-
-	$title = $autoresponder_add_data['autoresponder_add']['title'];
-	$image = $autoresponder_add_data['autoresponder_add']['image'];
-
-	eval("echo \"" . getTemplate("autoresponder/autoresponder_add") . "\";");
-}
-
-// Edit autoresponder
-
-else
-
-if($action == "edit")
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
-		$account = trim($_POST['account']);
-		$subject = trim($_POST['subject']);
-		$message = trim($_POST['message']);
-
-		$date_from_off = isset($_POST['date_from_off']) ? -1 : 0;
-		$date_until_off = isset($_POST['date_until_off']) ? -1 : 0;
-
-		/*
-		 * @TODO validate date (DD-MM-YYYY)
-		 */
-		$ts_from = -1;
-		$ts_until = -1;
-
-		if($date_from_off > -1)
-		{
-			$date_from = $_POST['date_from'];
-			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
-		}
-		if($date_until_off > -1)
-		{
-			$date_until = $_POST['date_until'];
-			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
-		}
-
-		if(empty($account)
-		   || empty($subject)
-		   || empty($message))
-		{
-			standard_error('missingfields');
-		}
-
-		// Does account exist?
-
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 0)
-		{
-			standard_error('accountnotexisting');
-		}
-
-		// Does autoresponder exist?
-
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 0)
-		{
-			standard_error('invalidautoresponder');
-		}
-
-		$ResponderActive = 0;
-
-		if(isset($_POST['active'])
-		   && $_POST['active'] == '1')
-		{
-			$ResponderActive = 1;
-		}
-
-		$db->query("UPDATE `" . TABLE_MAIL_AUTORESPONDER . "`
-			SET `message` = '" . $db->escape($message) . "',
-			`enabled` = '" . (int)$ResponderActive . "',
-			`date_from` = '" . (int)$ts_from . "',
-			`date_until` = '" . (int)$ts_until . "',
-			`subject` = '" . $db->escape($subject) . "'
-			WHERE `email` = '" . $db->escape($account) . "'
-			AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "'
-			");
-		redirectTo($filename, Array('s' => $s));
-	}
-
-	$email = trim(htmlspecialchars($_GET['email']));
-
-	// Get account data
-
-	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($email) . "' LIMIT 0,1");
-
-	if($db->num_rows($result) == 0)
-	{
-		standard_error('invalidautoresponder');
-	}
-
-	$row = $db->fetch_array($result);
-	$subject = htmlspecialchars($row['subject']);
-	$message = htmlspecialchars($row['message']);
-
-	$date_from = (int)$row['date_from'];
-	$date_until = (int)$row['date_until'];
-
-	if($date_from == -1)
-	{
-		$deactivated = '-1';
-		$date_from = '';
-	}
-	else
-	{
-		$deactivated = '0';
-		$date_from = date('d-m-Y', $date_from);
-	}
-	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
-
-	if($date_until == -1)
-	{
-		$deactivated = '-1';
-		$date_until = '';
-	}
-	else
-	{
-		$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);
-
-	#$isactive = makeyesno('active', '1', '0', $row['enabled']);
-
-	$autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/autoresponder/formfield.autoresponder_edit.php';
-	$autoresponder_edit_form = htmlform::genHTMLForm($autoresponder_edit_data);
-
-	$title = $autoresponder_edit_data['autoresponder_edit']['title'];
-	$image = $autoresponder_edit_data['autoresponder_edit']['image'];
-
-	eval("echo \"" . getTemplate("autoresponder/autoresponder_edit") . "\";");
-}
-
-// Delete autoresponder
-
-else
-
-if($action == "delete")
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
-		$account = trim($_POST['account']);
-
-		// Does autoresponder exist?
-
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 0)
-		{
-			standard_error('invalidautoresponder');
-		}
-
-		$db->query("DELETE FROM `" . TABLE_MAIL_AUTORESPONDER . "`
-			WHERE `email` = '" . $db->escape($account) . "'
-			AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "'
-			");
-		$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_autoresponder_used` = `email_autoresponder_used` - 1 WHERE `customerid` = '" . $db->escape((int)$userinfo['customerid']). "'");
-		redirectTo($filename, Array('s' => $s));
-	}
-
-	$email = trim(htmlspecialchars($_GET['email']));
-	ask_yesno('autoresponderdelete', $filename, array('action' => $action, 'account' => $email));
-}
-
-// List existing autoresponders
-
-else
-{
-	$autoresponder = '';
-	$count = 0;
-	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' ORDER BY email ASC");
-
-	while($row = $db->fetch_array($result))
-	{
-		if($row['date_from'] == -1 && $row['date_until'] == -1)
-		{
-			$activated_date = $lng['panel']['not_activated'];
-		}
-		elseif($row['date_from'] == -1 && $row['date_until'] != -1)
-		{
-			$activated_date = $lng['autoresponder']['date_until'].': '.date('d-m-Y', $row['date_until']);
-		}
-		elseif($row['date_from'] != -1 && $row['date_until'] == -1)
-		{
-			$activated_date = $lng['autoresponder']['date_from'].': '.date('d-m-Y', $row['date_from']);
-		}
-		else
-		{
-			$activated_date = date('d-m-Y', $row['date_from']) . ' - ' . date('d-m-Y', $row['date_until']);
-		}
-		eval("\$autoresponder.=\"" . getTemplate("autoresponder/autoresponder_autoresponder") . "\";");
-		$count++;
-	}
-
-	eval("echo \"" . getTemplate("autoresponder/autoresponder") . "\";");
-}

customer_extras.php

@@ -18,64 +18,30 @@
  */
 
 define('AREA', 'customer');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras");
 	eval("echo \"" . getTemplate("extras/extras") . "\";");
-}
-elseif($page == 'backup')
-{
-    $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras_backup");
-
-    $result = $db->query("SELECT `backup_enabled` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-    $row = $db->fetch_array($result);
-
-    $backup_enabled = makeyesno('backup_enabled', '1', '0', $row['backup_enabled']);
-
-    if(isset($_POST['send']) && $_POST['send'] == 'send'){
-	$backup_enabled = ($_POST['backup_enabled'] == '1' ? '1' : '0');
-	$backup_ftp_enabled = ($_POST['backup_ftp_enabled'] == '1' ? '1' : '0');
-	
-        $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `backup_enabled`='" . $backup_enabled . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-	redirectTo($filename, Array('page' => $page, 's' => $s));
-    }
-
-    $backup_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.backup.php';
-	$backup_form = htmlform::genHTMLForm($backup_data);
-
-	$title = $backup_data['backup']['title'];
-	$image = $backup_data['backup']['image'];
-    
-    eval("echo \"" . getTemplate("extras/backup") . "\";");
-}
-elseif($page == 'htpasswds')
-{
-	if($action == '')
-	{
+} elseif ($page == 'htpasswds') {
+	if ($action == '') {
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htpasswds");
 		$fields = array(
 			'username' => $lng['login']['username'],
 			'path' => $lng['panel']['path']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_HTPASSWDS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		$paging = new paging($userinfo, TABLE_PANEL_HTPASSWDS, $fields);
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
+			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -84,15 +50,12 @@ elseif($page == 'htpasswds')
 		$count = 0;
 		$htpasswds = '';
 
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
-				if(strpos($row['path'], $userinfo['documentroot']) === 0)
-				{
-					$row['path'] = substr($row['path'], strlen($userinfo['documentroot']));
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
+				if (strpos($row['path'], $userinfo['documentroot']) === 0) {
+					$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
 				}
-
+				$row['path'] = makeCorrectDir($row['path']);
 				$row = htmlentities_array($row);
 				eval("\$htpasswds.=\"" . getTemplate("extras/htpasswds_htpasswd") . "\";");
 				$count++;
@@ -102,90 +65,98 @@ elseif($page == 'htpasswds')
 		}
 
 		eval("echo \"" . getTemplate("extras/htpasswds") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+	} elseif ($action == 'delete' && $id != 0) {
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
+			WHERE `customerid`= :customerid
+			AND `id`= :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+
+		if (isset($result['username']) && $result['username'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_HTPASSWDS . "`
+					WHERE `customerid`= :customerid
+					AND `id`= :id"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
 
-		if(isset($result['username'])
-		   && $result['username'] != '')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$db->query("DELETE FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='$id'");
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted htpasswd for '" . $result['username'] . " (" . $result['path'] . ")'");
 				inserttask('1');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
-				if(strpos($result['path'], $userinfo['documentroot']) === 0)
-				{
-					$result['path'] = substr($result['path'], strlen($userinfo['documentroot']));
+				redirectTo($filename, array('page' => $page, 's' => $s));
+			} else {
+				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
+				    $result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
 
 				ask_yesno('extras_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username'] . ' (' . $result['path'] . ')');
 			}
 		}
-	}
-	elseif($action == 'add')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
+	} elseif ($action == 'add') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
 			$path = makeCorrectDir(validate($_POST['path'], 'path'));
 			$userpath = $path;
 			$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
 			$username = validate($_POST['username'], 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/');
 			$authname = validate($_POST['directory_authname'], 'directory_authname', '/^[a-zA-Z0-9][a-zA-Z0-9\-_ ]+\$?$/');
 			validate($_POST['directory_password'], 'password');
-			$username_path_check = $db->query_first("SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `username`='" . $db->escape($username) . "' AND `path`='" . $db->escape($path) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");
 
-			if(CRYPT_STD_DES == 1)
-			{
+			$username_path_check_stmt = Database::prepare("SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "`
+				WHERE `username`= :username
+				AND `path`= :path
+				AND `customerid`= :customerid"
+			);
+			$params = array(
+				"username" => $username,
+				"path" => $path,
+				"customerid" => $userinfo['customerid']
+			);
+			Database::pexecute($username_path_check_stmt, $params);
+			$username_path_check = $username_path_check_stmt->fetch(PDO::FETCH_ASSOC);
+
+			if (CRYPT_STD_DES == 1) {
 				$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
 				$password = crypt($_POST['directory_password'], $saltfordescrypt);
-			}
-			else
-			{
+			} else {
 				$password = crypt($_POST['directory_password']);
 			}
 
-			if(!$_POST['path'])
-			{
+			if (!$_POST['path']) {
 				standard_error('invalidpath');
 			}
 
-			if($username == '')
-			{
+			if ($username == '') {
 				standard_error(array('stringisempty', 'myloginname'));
-			}
-			elseif($username_path_check['username'] == $username
-			       && $username_path_check['path'] == $path)
-			{
+			} elseif ($username_path_check['username'] == $username && $username_path_check['path'] == $path) {
 				standard_error('userpathcombinationdupe');
-			}
-			elseif($_POST['directory_password'] == '')
-			{
+			} elseif ($_POST['directory_password'] == '') {
 				standard_error(array('stringisempty', 'mypassword'));
-			}
-			elseif($path == '')
-			{
+			} elseif ($path == '') {
 				standard_error('patherror');
-			}
-			else
-			{
-				$db->query("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` (`customerid`, `username`, `password`, `path`, `authname`) VALUES ('" . (int)$userinfo['customerid'] . "', '" . $db->escape($username) . "', '" . $db->escape($password) . "', '" . $db->escape($path) . "', '" . $db->escape($authname) . "')");
+			} elseif ($_POST['directory_password'] == $username) {
+				standard_error('passwordshouldnotbeusername');
+			} else {
+				$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` SET
+					`customerid` = :customerid,
+					`username` = :username,
+					`password` = :password,
+					`path` = :path,
+					`authname` = :authname"
+				);
+				$params = array(
+					"customerid" => $userinfo['customerid'],
+					"username" => $username,
+					"password" => $password,
+					"path" => $path,
+					"authname" => $authname
+				);
+				Database::pexecute($stmt, $params);
 				$log->logAction(USR_ACTION, LOG_INFO, "added htpasswd for '" . $username . " (" . $path . ")'");
 				inserttask('1');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
+				redirectTo($filename, array('page' => $page, 's' => $s));
 			}
-		}
-		else
-		{
-			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
+		} else {
+			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
 
 			$htpasswd_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_add.php';
 			$htpasswd_add_form = htmlform::genHTMLForm($htpasswd_add_data);
@@ -195,60 +166,65 @@ elseif($page == 'htpasswds')
 
 			eval("echo \"" . getTemplate("extras/htpasswds_add") . "\";");
 		}
-	}
-	elseif($action == 'edit'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+	} elseif ($action == 'edit' && $id != 0) {
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
+			WHERE `customerid`= :customerid
+			AND `id`= :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if(isset($result['username'])
-		   && $result['username'] != '')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+		if (isset($result['username']) && $result['username'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				validate($_POST['directory_password'], 'password');
 				$authname = validate($_POST['directory_authname'], 'directory_authname', '/^[a-zA-Z0-9][a-zA-Z0-9\-_ ]+\$?$/');
 
-				if(CRYPT_STD_DES == 1)
-				{
+				if (CRYPT_STD_DES == 1) {
 					$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
 					$password = crypt($_POST['directory_password'], $saltfordescrypt);
-				}
-				else
-				{
+				} else {
 					$password = crypt($_POST['directory_password']);
 				}
 
-				$pwd_sql = '';
-				if($_POST['directory_password'] != '')
-				{
-					$pwd_sql = "`password`='" . $db->escape($password) . "' ";
-				}
-				
-				$auth_sql = '';
-				if($authname != $result['authname'])
-				{
-					$auth_sql = "`authname`='" . $db->escape($authname) . "' ";
+				if ($_POST['directory_password'] == $result['username']) {
+					standard_error('passwordshouldnotbeusername');
 				}
 
-				if($pwd_sql != '' || $auth_sql != '')
-				{
-					if($pwd_sql !='' && $auth_sql != '') {
+				$params = array(
+					"customerid" => $userinfo['customerid'],
+					"id" => $id
+				);
+
+				$pwd_sql = '';
+				if ($_POST['directory_password'] != '') {
+					$pwd_sql = "`password`= :password ";
+					$params["password"] = $password;
+				}
+
+				$auth_sql = '';
+				if ($authname != $result['authname']) {
+					$auth_sql = "`authname`= :authname ";
+					$params["authname"] = $authname;
+				}
+
+				if ($pwd_sql != '' || $auth_sql != '') {
+					if ($pwd_sql !='' && $auth_sql != '') {
 						$pwd_sql.= ', ';
 					}
 
-					$db->query("UPDATE `" . TABLE_PANEL_HTPASSWDS . "` SET ".$pwd_sql.$auth_sql." WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
+						SET ".$pwd_sql.$auth_sql."
+						WHERE `customerid`= :customerid
+						AND `id`= :id"
+					);
+					Database::pexecute($stmt, $params);
 					$log->logAction(USR_ACTION, LOG_INFO, "edited htpasswd for '" . $result['username'] . " (" . $result['path'] . ")'");
 					inserttask('1');
-					redirectTo($filename, Array('page' => $page, 's' => $s));
+					redirectTo($filename, array('page' => $page, 's' => $s));
 				}
-			}
-			else
-			{
-				if(strpos($result['path'], $userinfo['documentroot']) === 0)
-				{
-					$result['path'] = substr($result['path'], strlen($userinfo['documentroot']));
+			} else {
+				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
+					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
 
 				$result = htmlentities_array($result);
@@ -263,11 +239,8 @@ elseif($page == 'htpasswds')
 			}
 		}
 	}
-}
-elseif($page == 'htaccess')
-{
-	if($action == '')
-	{
+} elseif ($page == 'htaccess') {
+	if ($action == '') {
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess");
 		$fields = array(
 			'path' => $lng['panel']['path'],
@@ -277,9 +250,12 @@ elseif($page == 'htaccess')
 			'error500path' => $lng['extras']['error500path'],
 			'options_cgi' => $lng['extras']['execute_perl']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_HTACCESS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		$paging = new paging($userinfo, TABLE_PANEL_HTACCESS, $fields);
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
+			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -290,17 +266,12 @@ elseif($page == 'htaccess')
 
 		$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
 
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
-				if(strpos($row['path'], $userinfo['documentroot']) === 0)
-				{
-					$row['path'] = substr($row['path'], strlen($userinfo['documentroot']));
-					// don't show nothing wehn it's the docroot, show slash
-					if ($row['path'] == '') { $row['path'] = '/'; }
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
+				if (strpos($row['path'], $userinfo['documentroot']) === 0) {
+					$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
 				}
-
+				$row['path'] = makeCorrectDir($row['path']);
 				$row['options_indexes'] = str_replace('1', $lng['panel']['yes'], $row['options_indexes']);
 				$row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']);
 				$row['options_cgi'] = str_replace('1', $lng['panel']['yes'], $row['options_cgi']);
@@ -314,88 +285,113 @@ elseif($page == 'htaccess')
 		}
 
 		eval("echo \"" . getTemplate("extras/htaccess") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+	} elseif ($action == 'delete' && $id != 0) {
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if(isset($result['customerid'])
-		   && $result['customerid'] != ''
-		   && $result['customerid'] == $userinfo['customerid'])
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$db->query("DELETE FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-				$log->logAction(USR_ACTION, LOG_INFO, "deleted htaccess for '" . str_replace($userinfo['documentroot'], '', $result['path']) . "'");
+		if (isset($result['customerid']) && $result['customerid'] != '' && $result['customerid'] == $userinfo['customerid']) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				// do we have to remove the symlink and folder in suexecpath?
+				if ((int)Settings::Get('perl.suexecworkaround') == 1) {
+					$loginname = getCustomerDetail($result['customerid'], 'loginname');
+					$suexecpath = makeCorrectDir(Settings::Get('perl.suexecpath').'/'.$loginname.'/'.md5($result['path']).'/');
+					$perlsymlink = makeCorrectFile($result['path'].'/cgi-bin');
+					// remove symlink
+					if (file_exists($perlsymlink)) {
+						safe_exec('rm -f '.escapeshellarg($perlsymlink));
+						$log->logAction(USR_ACTION, LOG_DEBUG, "deleted suexecworkaround symlink '" . $perlsymlink . "'");
+					}
+					// remove folder in suexec-path
+					if (file_exists($suexecpath)) {
+						safe_exec('rm -rf '.escapeshellarg($suexecpath));
+						$log->logAction(USR_ACTION, LOG_DEBUG, "deleted suexecworkaround path '" . $suexecpath . "'");
+					}
+				}
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_HTACCESS . "`
+					WHERE `customerid`= :customerid
+					AND `id`= :id"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+				$log->logAction(USR_ACTION, LOG_INFO, "deleted htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'");
 				inserttask('1');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
-				ask_yesno('extras_reallydelete_pathoptions', $filename, array('id' => $id, 'page' => $page, 'action' => $action), str_replace($userinfo['documentroot'], '', $result['path']));
+				redirectTo($filename, array('page' => $page, 's' => $s));
+			} else {
+				ask_yesno('extras_reallydelete_pathoptions', $filename, array('id' => $id, 'page' => $page, 'action' => $action), str_replace($userinfo['documentroot'], '/', $result['path']));
 			}
 		}
-	}
-	elseif($action == 'add')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
+	} elseif ($action == 'add') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
 			$path = makeCorrectDir(validate($_POST['path'], 'path'));
 			$userpath = $path;
 			$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-			$path_dupe_check = $db->query_first("SELECT `id`, `path` FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `path`='" . $db->escape($path) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");
+			$path_dupe_check_stmt = Database::prepare("SELECT `id`, `path` FROM `" . TABLE_PANEL_HTACCESS . "`
+				WHERE `path`= :path
+				AND `customerid`= :customerid"
+			);
+			Database::pexecute($path_dupe_check_stmt, array("path" => $path, "customerid" => $userinfo['customerid']));
+			$path_dupe_check = $path_dupe_check_stmt->fetch(PDO::FETCH_ASSOC);
 
-			if(!$_POST['path'])
-			{
+			if (!$_POST['path']) {
 				standard_error('invalidpath');
 			}
 
-			if(isset($_POST['options_cgi']))
-			{
-				$options_cgi = intval($_POST['options_cgi']);
-			}
-			else
-			{
+			if (isset($_POST['options_cgi']) && (int)$_POST['options_cgi'] != 0) {
+				$options_cgi = '1';
+			} else {
 				$options_cgi = '0';
-			} 
+			}
 
-			$error404path = correctErrorDocument($_POST['error404path']);
-			$error403path = correctErrorDocument($_POST['error403path']);
-			$error500path = correctErrorDocument($_POST['error500path']);
+			$error404path = '';
+			if (isset($_POST['error404path'])) {
+				$error404path = correctErrorDocument($_POST['error404path']);
+			}
 
-			if($path_dupe_check['path'] == $path)
-			{
+			$error403path = '';
+			if (isset($_POST['error403path'])) {
+				$error403path = correctErrorDocument($_POST['error403path']);
+			}
+
+			$error500path = '';
+			if (isset($_POST['error500path'])) {
+				$error500path = correctErrorDocument($_POST['error500path']);
+			}
+
+			if ($path_dupe_check['path'] == $path) {
 				standard_error('errordocpathdupe', $userpath);
-			}
-			elseif($path == '')
-			{
+			} elseif ($path == '') {
 				standard_error('patherror');
-			}
-			else
-			{
-				$db->query('INSERT INTO `' . TABLE_PANEL_HTACCESS . '` SET
-							`customerid` = "'.(int)$userinfo['customerid'].'",
-							`path` = "'.$db->escape($path).'",
-							`options_indexes` = "'.$db->escape($_POST['options_indexes'] == '1' ? '1' : '0').'",
-							`error404path` = "'.$db->escape($error404path).'",
-							`error403path` = "'.$db->escape($error403path).'",
-							`error500path` = "'.$db->escape($error500path).'",
-							`options_cgi` = "'.$db->escape($options_cgi).'"');
+			} else {
+				$stmt = Database::prepare('INSERT INTO `' . TABLE_PANEL_HTACCESS . '` SET
+					`customerid` = :customerid,
+					`path` = :path,
+					`options_indexes` = :options_indexes,
+					`error404path` = :error404path,
+					`error403path` = :error403path,
+					`error500path` = :error500path,
+					`options_cgi` = :options_cgi'
+				);
+				$params = array(
+					"customerid" => $userinfo['customerid'],
+					"path" => $path,
+					"options_indexes" => $_POST['options_indexes'] == '1' ? '1' : '0',
+					"error403path" => $error403path,
+					"error404path" => $error404path,
+					"error500path" => $error500path,
+					"options_cgi" => $options_cgi
+				);
+				Database::pexecute($stmt, $params);
 
 				$log->logAction(USR_ACTION, LOG_INFO, "added htaccess for '" . $path . "'");
 				inserttask('1');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
+				redirectTo($filename, array('page' => $page, 's' => $s));
 			}
-		}
-		else
-		{
-			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
-			#$options_indexes = makeyesno('options_indexes', '1', '0', '0');
+		} else {
+			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
 			$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
-			#$options_cgi = makeyesno('options_cgi', '1', '0', '0');
 
 			$htaccess_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_add.php';
 			$htaccess_add_form = htmlform::genHTMLForm($htaccess_add_data);
@@ -405,29 +401,24 @@ elseif($page == 'htaccess')
 
 			eval("echo \"" . getTemplate("extras/htaccess_add") . "\";");
 		}
-	}
-	elseif(($action == 'edit')
-	       && ($id != 0))
-	{
-		$result = $db->query_first('SELECT * FROM `' . TABLE_PANEL_HTACCESS . '` WHERE `customerid` = "' . (int)$userinfo['customerid'] . '"  AND `id`         = "' . (int)$id . '"');
+	} elseif (($action == 'edit') && ($id != 0)) {
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if((isset($result['customerid']))
-		   && ($result['customerid'] != '')
-		   && ($result['customerid'] == $userinfo['customerid']))
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+		if ((isset($result['customerid'])) && ($result['customerid'] != '') && ($result['customerid'] == $userinfo['customerid'])) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				$option_indexes = intval($_POST['options_indexes']);
 				$options_cgi = isset($_POST['options_cgi']) ? intval($_POST['options_cgi']) : 0;
 
-				if($option_indexes != '1')
-				{
+				if ($option_indexes != '1') {
 					$option_indexes = '0';
 				}
 
-				if($options_cgi != '1')
-				{
+				if ($options_cgi != '1') {
 					$options_cgi = '0';
 				}
 
@@ -435,39 +426,54 @@ elseif($page == 'htaccess')
 				$error403path = correctErrorDocument($_POST['error403path']);
 				$error500path = correctErrorDocument($_POST['error500path']);
 
-				if(($option_indexes != $result['options_indexes'])
-				   || ($error404path != $result['error404path'])
-				   || ($error403path != $result['error403path'])
-				   || ($error500path != $result['error500path'])
-				   || ($options_cgi != $result['options_cgi']))
-				{
+				if (($option_indexes != $result['options_indexes'])
+					|| ($error404path != $result['error404path'])
+					|| ($error403path != $result['error403path'])
+					|| ($error500path != $result['error500path'])
+					|| ($options_cgi != $result['options_cgi'])
+				) {
 					inserttask('1');
-					$db->query('UPDATE `' . TABLE_PANEL_HTACCESS . '` SET `options_indexes` = "' . $db->escape($option_indexes) . '", `error404path`    = "' . $db->escape($error404path) . '",  `error403path`    = "' . $db->escape($error403path) . '",  `error500path`    = "' . $db->escape($error500path) . '", `options_cgi` = "' . $db->escape($options_cgi) . '" WHERE `customerid` = "' . (int)$userinfo['customerid'] . '"  AND `id` = "' . (int)$id . '"');
-					$log->logAction(USR_ACTION, LOG_INFO, "edited htaccess for '" . str_replace($userinfo['documentroot'], '', $result['path']) . "'");
+					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTACCESS . "`
+						SET `options_indexes` = :options_indexes,
+						`error404path` = :error404path,
+						`error403path` = :error403path,
+						`error500path` = :error500path,
+						`options_cgi` = :options_cgi
+						WHERE `customerid` = :customerid
+						AND `id` = :id"
+					);
+					$params = array(
+						"customerid" => $userinfo['customerid'],
+						"options_indexes" => $_POST['options_indexes'] == '1' ? '1' : '0',
+						"error403path" => $error403path,
+						"error404path" => $error404path,
+						"error500path" => $error500path,
+						"options_cgi" => $options_cgi,
+						"id" => $id
+					);
+					Database::pexecute($stmt, $params);
+					$log->logAction(USR_ACTION, LOG_INFO, "edited htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'");
 				}
 
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
-				if(strpos($result['path'], $userinfo['documentroot']) === 0)
-				{
-					$result['path'] = substr($result['path'], strlen($userinfo['documentroot']));
-					// don't show nothing wehn it's the docroot, show slash
-					if ($result['path'] == '') { $result['path'] = '/'; }
+				redirectTo($filename, array('page' => $page, 's' => $s));
+			} else {
+				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
+					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
 
 				$result['error404path'] = $result['error404path'];
 				$result['error403path'] = $result['error403path'];
 				$result['error500path'] = $result['error500path'];
-				#$options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']);
 				$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
-				#$options_cgi = makeyesno('options_cgi', '1', '0', $result['options_cgi']);
+				/*
+				$options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']);
+				$options_cgi = makeyesno('options_cgi', '1', '0', $result['options_cgi']);
+				*/
 				$result = htmlentities_array($result);
 
 				$htaccess_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_edit.php';
 				$htaccess_edit_form = htmlform::genHTMLForm($htaccess_edit_data);
-	
+
 				$title = $htaccess_edit_data['htaccess_edit']['title'];
 				$image = $htaccess_edit_data['htaccess_edit']['image'];
 
@@ -476,5 +482,3 @@ elseif($page == 'htaccess')
 		}
 	}
 }
-
-?>

customer_ftp.php

@@ -18,39 +18,34 @@
  */
 
 define('AREA', 'customer');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+$id = 0;
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp");
-	eval("echo \"" . getTemplate("ftp/ftp") . "\";");
-}
-elseif($page == 'accounts')
-{
-	if($action == '')
-	{
+	eval("echo \"" . getTemplate('ftp/ftp') . "\";");
+} elseif ($page == 'accounts') {
+	if ($action == '') {
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts");
 		$fields = array(
 			'username' => $lng['login']['username'],
-			'homedir' => $lng['panel']['path']
+			'homedir' => $lng['panel']['path'],
+			'description' => $lng['panel']['ftpdesc']
 		);
-		$paging = new paging($userinfo, $db, TABLE_FTP_USERS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT `id`, `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . $userinfo['customerid'] . "'  AND `username` NOT LIKE '%_backup'" . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		$paging = new paging($userinfo, TABLE_FTP_USERS, $fields);
+
+		$result_stmt = Database::prepare("SELECT `id`, `username`, `description`, `homedir` FROM `" . TABLE_FTP_USERS . "`
+			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+		$ftps_count = Database::num_rows();
+		$paging->setEntries($ftps_count);
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -59,162 +54,231 @@ elseif($page == 'accounts')
 		$count = 0;
 		$accounts = '';
 
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
-				if(strpos($row['homedir'], $userinfo['documentroot']) === 0)
-				{
-					$row['documentroot'] = substr($row['homedir'], strlen($userinfo['documentroot']));
-				}
-				else
-				{
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
+				if (strpos($row['homedir'], $userinfo['documentroot']) === 0) {
+					$row['documentroot'] = str_replace($userinfo['documentroot'], "/", $row['homedir']);
+				} else {
 					$row['documentroot'] = $row['homedir'];
 				}
 
 				$row['documentroot'] = makeCorrectDir($row['documentroot']);
-				
+
 				$row = htmlentities_array($row);
-				eval("\$accounts.=\"" . getTemplate("ftp/accounts_account") . "\";");
+				eval("\$accounts.=\"" . getTemplate('ftp/accounts_account') . "\";");
 				$count++;
 			}
 
 			$i++;
 		}
 
-		$ftps_count = $db->num_rows($result);
-		eval("echo \"" . getTemplate("ftp/accounts") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT `id`, `username`, `homedir`, `up_count`, `up_bytes`, `down_count`, `down_bytes` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+		eval("echo \"" . getTemplate('ftp/accounts') . "\";");
+	} elseif ($action == 'delete' && $id != 0) {
+		$result_stmt = Database::prepare("SELECT `id`, `username`, `homedir`, `up_count`, `up_bytes`, `down_count`, `down_bytes` FROM `" . TABLE_FTP_USERS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+
+		if (isset($result['username']) && $result['username'] != $userinfo['loginname']) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+					SET `up_count` = `up_count` + :up_count,
+					`up_bytes` = `up_bytes` + :up_bytes,
+					`down_count` = `down_count` + :down_count,
+					`down_bytes` = `down_bytes` + :down_bytes
+					WHERE `username` = :username"
+				);
+				$params = array(
+					"up_count" => $result['up_count'],
+					"up_bytes" => $result['up_bytes'],
+					"down_count" => $result['down_count'],
+					"down_bytes" => $result['down_bytes'],
+					"username" => $userinfo['loginname']
+				);
+				Database::pexecute($stmt, $params);
+
+				$result_stmt = Database::prepare("SELECT `username`, `homedir` FROM `" . TABLE_FTP_USERS . "`
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+				$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = :name");
+				Database::pexecute($stmt, array("name" => $result['username']));
+
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_FTP_USERS . "`
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+
+				$stmt = Database::prepare("
+					UPDATE `" . TABLE_FTP_GROUPS . "` SET
+					`members` = REPLACE(`members`, :username,'')
+					WHERE `customerid` = :customerid
+				");
+				Database::pexecute($stmt, array("username" => ",".$result['username'], "customerid" => $userinfo['customerid']));
 
-		if(isset($result['username'])
-		   && $result['username'] != $userinfo['loginname'])
-		{
-			if(isset($_POST['send'])
-			   && $_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_first("SELECT `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-				$db->query("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $db->escape($result['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'] . "'");
 
-				if($userinfo['ftps_used'] == '1')
-				{
-					$resetaccnumber = " , `ftp_lastaccountnumber`='0'";
-				}
-				else
-				{
-					$resetaccnumber = '';
-				}
+				$resetaccnumber = ($userinfo['ftps_used'] == '1') ? " , `ftp_lastaccountnumber`='0'" : '';
 
 				// refs #293
-				if(isset($_POST['delete_userfiles'])
-				  && (int)$_POST['delete_userfiles'] == 1)
-				{
+				if (isset($_POST['delete_userfiles']) && (int)$_POST['delete_userfiles'] == 1) {
 					inserttask('8', $userinfo['loginname'], $result['homedir']);
 				}
 
-				$result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `ftps_used`=`ftps_used`-1 $resetaccnumber WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
+				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+					SET `ftps_used` = `ftps_used` - 1 $resetaccnumber
+					WHERE `customerid` = :customerid"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+
+				redirectTo($filename, array('page' => $page, 's' => $s));
+			} else {
 				ask_yesno_withcheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username']);
 			}
-		}
-		else
-		{
+		} else {
 			standard_error('ftp_cantdeletemainaccount');
 		}
-	}
-	elseif($action == 'add')
-	{
-		if($userinfo['ftps_used'] < $userinfo['ftps']
-		   || $userinfo['ftps'] == '-1')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+	} elseif ($action == 'add') {
+		if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') {
+			if (isset($_POST['send'])
+				&& $_POST['send'] == 'send') {
+				$description = validate($_POST['ftp_description'], 'description');
+				// @FIXME use a good path-validating regex here (refs #1231)
 				$path = validate($_POST['path'], 'path');
 				$password = validate($_POST['ftp_password'], 'password');
 				$password = validatePassword($password);
 
-				$sendinfomail = intval($_POST['sendinfomail']);
-				if($sendinfomail != 1)
-				{
+				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
+				if ($sendinfomail != 1) {
 					$sendinfomail = 0;
 				}
 
-				if($settings['customer']['ftpatdomain'] == '1')
-				{
+				if (Settings::Get('customer.ftpatdomain') == '1') {
 					$ftpusername = validate($_POST['ftp_username'], 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/');
-					if($ftpusername == '')
-					{
+					if ($ftpusername == '') {
 						standard_error(array('stringisempty', 'username'));
 					}
 					$ftpdomain = $idna_convert->encode(validate($_POST['ftp_domain'], 'domain'));
-					$ftpdomain_check = $db->query_first("SELECT `id`, `domain`, `customerid` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain`='" . $db->escape($ftpdomain) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");
-					if($ftpdomain_check['domain'] != $ftpdomain)
-					{
+					$ftpdomain_check_stmt = Database::prepare("SELECT `id`, `domain`, `customerid` FROM `" . TABLE_PANEL_DOMAINS . "`
+						WHERE `domain` = :domain
+						AND `customerid` = :customerid"
+					);
+					Database::pexecute($ftpdomain_check_stmt, array("domain" => $ftpdomain, "customerid" => $userinfo['customerid']));
+					$ftpdomain_check = $ftpdomain_check_stmt->fetch(PDO::FETCH_ASSOC);
+
+					if ($ftpdomain_check['domain'] != $ftpdomain) {
 						standard_error('maindomainnonexist', $domain);
 					}
 					$username = $ftpusername . "@" . $ftpdomain;
+				} else {
+					$username = $userinfo['loginname'] . Settings::Get('customer.ftpprefix') . (intval($userinfo['ftp_lastaccountnumber']) + 1);
 				}
-				else
-				{
-					$username = $userinfo['loginname'] . $settings['customer']['ftpprefix'] . (intval($userinfo['ftp_lastaccountnumber']) + 1);
-				}
-				
-				$username_check = $db->query_first('SELECT * FROM `' . TABLE_FTP_USERS .'` WHERE `username` = \'' . $db->escape($username) . '\'');
-				
-				if(!empty($username_check) && $username_check['username'] = $username)
-				{
+
+				$username_check_stmt = Database::prepare("SELECT * FROM `" . TABLE_FTP_USERS . "`
+					WHERE `username` = :username"
+				);
+				Database::pexecute($username_check_stmt, array("username" => $username));
+				$username_check = $username_check_stmt->fetch(PDO::FETCH_ASSOC);
+
+				if (!empty($username_check) && $username_check['username'] = $username) {
 					standard_error('usernamealreadyexists', $username);
-				}
-				elseif($password == '')
-				{
+				} elseif ($password == '') {
 					standard_error(array('stringisempty', 'mypassword'));
-				}
-				elseif($path == '')
-				{
+				} elseif ($path == '') {
 					standard_error('patherror');
-				}
-				else
-				{
+				} elseif ($username == $password) {
+					standard_error('passwordshouldnotbeusername');
+				} else {
 					$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')");
+
+					$cryptPassword = makeCryptPassword($password);
+
+					$stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_USERS . "`
+						(`customerid`, `username`, `description`, `password`, `homedir`, `login_enabled`, `uid`, `gid`)
+						VALUES (:customerid, :username, :description, :password, :homedir, 'y', :guid, :guid)"
+					);
+					$params = array(
+						"customerid" => $userinfo['customerid'],
+						"username" => $username,
+						"description" => $description,
+						"password" => $cryptPassword,
+						"homedir" => $path,
+						"guid" => $userinfo['guid']
+					);
+					Database::pexecute($stmt, $params);
+
+					$result_stmt = Database::prepare("SELECT `bytes_in_used` FROM `" . TABLE_FTP_QUOTATALLIES . "`
+						WHERE `name` = :name"
+					);
+					Database::pexecute($result_stmt, array("name" => $userinfo['loginname']));
+
+					while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+						$stmt = Database::prepare("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 (:name, 'user', :bytes_in_used, '0', '0', '0', '0', '0')"
+						);
+						Database::pexecute($stmt, array("name" => $username, "bytes_in_used" => $row['bytes_in_used']));
 					}
-					$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("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `ftps_used`=`ftps_used`+1, `ftp_lastaccountnumber`=`ftp_lastaccountnumber`+1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+
+					$stmt = Database::prepare("UPDATE `" . TABLE_FTP_GROUPS . "`
+						SET `members` = CONCAT_WS(',',`members`, :username)
+						WHERE `customerid`= :customerid
+						AND `gid`= :guid"
+					);
+					$params = array(
+						"username" => $username,
+						"customerid" => $userinfo['customerid'],
+						"guid" => $userinfo['guid']
+					);
+					Database::pexecute($stmt, $params);
+
+					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+						SET `ftps_used` = `ftps_used` + 1,
+						`ftp_lastaccountnumber` = `ftp_lastaccountnumber` + 1
+						WHERE `customerid` = :customerid"
+					);
+					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
 
 					$log->logAction(USR_ACTION, LOG_INFO, "added ftp-account '" . $username . " (" . $path . ")'");
 					inserttask(5);
 
-					if($sendinfomail == 1)
-					{
+					if ($sendinfomail == 1) {
 						$replace_arr = array(
-							'CUST_NAME' => getCorrectUserSalutation($userinfo),
+							'SALUTATION' => getCorrectUserSalutation($userinfo),
+							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
 							'USR_NAME' => $username,
 							'USR_PASS' => $password,
-							'USR_PATH' => makeCorrectDir(substr($path, strlen($userinfo['documentroot'])))
+							'USR_PATH' => makeCorrectDir(str_replace($userinfo['documentroot'], "/", $path))
 						);
-						
+
 						$def_language = $userinfo['def_language'];
-						$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`=\'new_ftpaccount_by_customer_subject\'');
-						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['ftp_add']['infomail_subject']), $replace_arr));
-						$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`=\'new_ftpaccount_by_customer_mailbody\'');
-						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['ftp_add']['infomail_body']['main']), $replace_arr));
-						
+						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+							WHERE `adminid` = :adminid
+							AND `language` = :lang
+							AND `templategroup`='mails'
+							AND `varname`='new_ftpaccount_by_customer_subject'"
+						);
+						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
+						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['subject']), $replace_arr));
+
+						$def_language = $userinfo['def_language'];
+						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+							WHERE `adminid` = :adminid
+							AND `language` = :lang
+							AND `templategroup`='mails'
+							AND `varname`='new_ftpaccount_by_customer_mailbody'"
+						);
+						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
+						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['mailbody']), $replace_arr));
+
 						$_mailerror = false;
 						try {
 							$mail->Subject = $mail_subject;
@@ -238,37 +302,34 @@ elseif($page == 'accounts')
 						$mail->ClearAddresses();
 					}
 
-					redirectTo($filename, Array('page' => $page, 's' => $s));
+					redirectTo($filename, array('page' => $page, 's' => $s));
 				}
-			}
-			else
-			{
-				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], '/');
+			} else {
+				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], '/');
 
-				if($settings['customer']['ftpatdomain'] == '1')
-				{
+				if (Settings::Get('customer.ftpatdomain') == '1') {
 					$domainlist = array();
 					$domains = '';
 
-					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+					$result_domains_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
+						WHERE `customerid`= :customerid"
+					);
+					Database::pexecute($result_domains_stmt, array("customerid" => $userinfo['customerid']));
 
-					while($row_domain = $db->fetch_array($result_domains))
-					{
+					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
 						$domainlist[] =  $row_domain['domain'];
 					}
 
 					sort($domainlist);
 
-					if(isset($domainlist[0]) && $domainlist[0] != '')
-					{
-						foreach($domainlist as $dom)
-						{
+					if (isset($domainlist[0]) && $domainlist[0] != '') {
+						foreach ($domainlist as $dom) {
 							$domains .= makeoption($idna_convert->decode($dom), $dom);
 						}
 					}
 				}
 
-				#$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
+				//$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
 
 				$ftp_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_add.php';
 				$ftp_add_form = htmlform::genHTMLForm($ftp_add_data);
@@ -276,92 +337,102 @@ elseif($page == 'accounts')
 				$title = $ftp_add_data['ftp_add']['title'];
 				$image = $ftp_add_data['ftp_add']['image'];
 
-				eval("echo \"" . getTemplate("ftp/accounts_add") . "\";");
+				eval("echo \"" . getTemplate('ftp/accounts_add') . "\";");
 			}
 		}
-	}
-	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 . "'");
+	} elseif ($action == 'edit' && $id != 0) {
+		$result_stmt = Database::prepare("SELECT `id`, `username`, `description`, `homedir`, `uid`, `gid` FROM `" . TABLE_FTP_USERS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if(isset($result['username'])
-		   && $result['username'] != '')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+		if (isset($result['username']) && $result['username'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				// @FIXME use a good path-validating regex here (refs #1231)
 				$path = validate($_POST['path'], 'path');
-				
+
 				$_setnewpass = false;
-				if(isset($_POST['ftp_password']) && $_POST['ftp_password'] != '')
-				{
+				if (isset($_POST['ftp_password']) && $_POST['ftp_password'] != '') {
 					$password = validate($_POST['ftp_password'], 'password');
 					$password = validatePassword($password);
 					$_setnewpass = true;
 				}
 
-				if($_setnewpass)
-				{
-					if($password == '')
-					{
+				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 . "'");
-						
-						// also update customers backup user password if password of main ftp user is changed
-						if(!preg_match('/' . $settings['customer']['ftpprefix'] . '/', $result['username'])){
-						    $db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`=ENCRYPT('" . $db->escape($password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $result['username'] . "_backup'");
-						}
+					} elseif ($result['username'] == $password) {
+						standard_error('passwordshouldnotbeusername');
 					}
+					$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account password for '" . $result['username'] . "'");
+					$cryptPassword = makeCryptPassword($password);
+
+					$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+						SET `password` = :password
+						WHERE `customerid` = :customerid
+						AND `id` = :id"
+					);
+					Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id, "password" => $cryptPassword));
 				}
-				
-				if($path != '')
-				{
+
+				if ($path != '') {
 					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-					
-					if($path != $result['homedir'])
-					{
-						if(!file_exists($path))
-						{
-							mkDirWithCorrectOwnership($userinfo['documentroot'], $path, $result['uid'], $result['gid']);
-							inserttask(5); /* Let the cronjob do the rest */
+
+					if ($path != $result['homedir']) {
+						if (!file_exists($path)) {
+							// it's the task for "new ftp" but that will
+							// create all directories and correct their permissions
+							inserttask(5);
 						}
 
 						$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 . "'");						
+
+						$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+							SET `homedir` = :homedir
+							WHERE `customerid` = :customerid
+							AND `id` = :id"
+						);
+						$params = array(
+							"homedir" => $path,
+							"customerid" => $userinfo['customerid'],
+							"id" => $id
+						);
+						Database::pexecute($stmt, $params);
 					}
 				}
 
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
-				if(strpos($result['homedir'], $userinfo['documentroot']) === 0)
-				{
-					$homedir = substr($result['homedir'], strlen($userinfo['documentroot']));
-				}
-				else
-				{
+				$log->logAction(USR_ACTION, LOG_INFO, "edited ftp-account '" . $result['username'] . "'");
+				$description = validate($_POST['ftp_description'], 'description');
+				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+					SET `description` = :desc
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($stmt, array("desc" => $description, "customerid" => $userinfo['customerid'], "id" => $id));
+
+				redirectTo($filename, array('page' => $page, 's' => $s));
+			} else {
+				if (strpos($result['homedir'], $userinfo['documentroot']) === 0) {
+					$homedir = str_replace($userinfo['documentroot'], "/", $result['homedir']);
+				} else {
 					$homedir = $result['homedir'];
 				}
 				$homedir = makeCorrectDir($homedir);
 
-				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $homedir);
+				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $homedir);
 
-				if($settings['customer']['ftpatdomain'] == '1')
-				{
+				if (Settings::Get('customer.ftpatdomain') == '1') {
 					$domains = '';
 
-					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+					$result_domains_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
+						WHERE `customerid` = :customerid"
+					);
+					Database::pexecute($result_domains_stmt, array("customerid" => $userinfo['customerid']));
 
-					while($row_domain = $db->fetch_array($result_domains))
-					{
-						$domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
+					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
+						$domains .= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
 					}
 				}
 
@@ -371,10 +442,8 @@ elseif($page == 'accounts')
 				$title = $ftp_edit_data['ftp_edit']['title'];
 				$image = $ftp_edit_data['ftp_edit']['image'];
 
-				eval("echo \"" . getTemplate("ftp/accounts_edit") . "\";");
+				eval("echo \"" . getTemplate('ftp/accounts_edit') . "\";");
 			}
 		}
 	}
 }
-
-?>

customer_index.php

@@ -18,200 +18,296 @@
  */
 
 define('AREA', 'customer');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+if ($action == 'logout') {
+	$log->logAction(USR_ACTION, LOG_NOTICE, 'logged out');
 
-require ("./lib/init.php");
-
-if($action == 'logout')
-{
-	$log->logAction(USR_ACTION, LOG_NOTICE, "logged out");
-
-	if($settings['session']['allow_multiple_login'] == '1')
-	{
-		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0' AND `hash` = '" . $s . "'");
-	}
-	else
-	{
-		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0'");
+	$params = array("customerid" => $userinfo['customerid']);
+	if (Settings::Get('session.allow_multiple_login') == '1') {
+		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+			WHERE `userid` = :customerid
+			AND `adminsession` = '0'
+			AND `hash` = :hash"
+		);
+		$params["hash"] = $s;
+	} else {
+		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+			WHERE `userid` = :customerid
+			AND `adminsession` = '0'"
+		);
 	}
+	Database::pexecute($stmt, $params);
 
 	redirectTo('index.php');
-	exit;
 }
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_index");
+
+	$domain_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
+		WHERE `customerid` = :customerid
+		AND `parentdomainid` = '0'
+		AND `id` <> :standardsubdomain
+	");
+	Database::pexecute($domain_stmt, array("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain']));
+
 	$domains = '';
-	$result = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `id` <> '" . (int)$userinfo['standardsubdomain'] . "' ");
 	$domainArray = array();
 
-	while($row = $db->fetch_array($result))
-	{
+	while ($row = $domain_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$domainArray[] = $idna_convert->decode($row['domain']);
 	}
 
 	natsort($domainArray);
-	$domains = implode(', ', $domainArray);
+	$domains = implode(',<br />', $domainArray);
+
+	// standard-subdomain
+	$stdsubdomain = '';
+	if ($userinfo['standardsubdomain'] != '0') {
+		$std_domain_stmt = Database::prepare("
+			SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :standardsubdomain
+		");
+		$std_domain = Database::pexecute_first($std_domain_stmt, array("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain']));
+		$stdsubdomain = $std_domain['domain'];
+	}
+
 	$userinfo['email'] = $idna_convert->decode($userinfo['email']);
 	$yesterday = time() - (60 * 60 * 24);
 	$month = date('M Y', $yesterday);
 
-	/*		$traffic=$db->query_first("SELECT SUM(http) AS http_sum, SUM(ftp_up) AS ftp_up_sum, SUM(ftp_down) AS ftp_down_sum, SUM(mail) AS mail_sum FROM ".TABLE_PANEL_TRAFFIC." WHERE year='".date('Y')."' AND month='".date('m')."' AND day<='".date('d')."' AND customerid='".$userinfo['customerid']."'");
-		$userinfo['traffic_used']=$traffic['http_sum']+$traffic['ftp_up_sum']+$traffic['ftp_down_sum']+$traffic['mail_sum'];*/
+	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
+	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
+	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
-	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']);
-	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
-	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps tickets subdomains aps_packages');
-	$opentickets = 0;
-	$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                   WHERE `customerid` = "' . $userinfo['customerid'] . '"
-                                   AND `answerto` = "0"
-                                   AND (`status` = "0" OR `status` = "2")
-                                   AND `lastreplier`="1"');
-	$awaitingtickets = $opentickets['count'];
-	$awaitingtickets_text = '';
+	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
 
-	if($opentickets > 0)
-	{
-		$awaitingtickets_text = strtr($lng['ticket']['awaitingticketreply'], array('%s' => '<a href="customer_tickets.php?page=tickets&amp;s=' . $s . '">' . $opentickets['count'] . '</a>'));
-	}
+	$services_enabled = "";
+	$se = array();
+	if ($userinfo['imap'] == '1') $se[] = "IMAP";
+	if ($userinfo['pop3'] == '1') $se[] = "POP3";
+	if ($userinfo['phpenabled'] == '1') $se[] = "PHP";
+	if ($userinfo['perlenabled'] == '1') $se[] = "Perl/CGI";
+	$services_enabled = implode(", ", $se);
 
-	eval("echo \"" . getTemplate("index/index") . "\";");
-}
-elseif($page == 'change_password')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+	eval("echo \"" . getTemplate('index/index') . "\";");
+} elseif ($page == 'change_password') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$old_password = validate($_POST['old_password'], 'old password');
-
-		if(md5($old_password) != $userinfo['password'])
-		{
+		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_CUSTOMERS,'customerid')) {
 			standard_error('oldpasswordnotcorrect');
-			exit;
 		}
 
-		$new_password = validate($_POST['new_password'], 'new password');
-		$new_password_confirm = validate($_POST['new_password_confirm'], 'new password confirm');
+		$new_password = validatePassword($_POST['new_password'], 'new password');
+		$new_password_confirm = validatePassword($_POST['new_password_confirm'], 'new password confirm');
 
-		if($old_password == '')
-		{
+		if ($old_password == '') {
 			standard_error(array('stringisempty', 'oldpassword'));
-		}
-		elseif($new_password == '')
-		{
+		} elseif ($new_password == '') {
 			standard_error(array('stringisempty', 'newpassword'));
-		}
-		elseif($new_password_confirm == '')
-		{
+		} elseif ($new_password_confirm == '') {
 			standard_error(array('stringisempty', 'newpasswordconfirm'));
-		}
-		elseif($new_password != $new_password_confirm)
-		{
+		} elseif ($new_password != $new_password_confirm) {
 			standard_error('newpasswordconfirmerror');
-		}
-		else
-		{
-			$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `password`='" . md5($new_password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `password`='" . md5($old_password) . "'");
+		} else {
+			// Update user password
+			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+				SET `password` = :newpassword
+				WHERE `customerid` = :customerid"
+			);
+			$params = array(
+				"newpassword" => makeCryptPassword($new_password),
+				"customerid" => $userinfo['customerid']
+			);
+			Database::pexecute($stmt, $params);
 			$log->logAction(USR_ACTION, LOG_NOTICE, 'changed password');
 
-			if(isset($_POST['change_main_ftp'])
-			   && $_POST['change_main_ftp'] == 'true')
-			{
-				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`=ENCRYPT('" . $db->escape($new_password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $db->escape($userinfo['loginname']) . "'");
+			// Update ftp password
+			if (isset($_POST['change_main_ftp']) && $_POST['change_main_ftp'] == 'true') {
+				$cryptPassword = makeCryptPassword($new_password);
+				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+					SET `password` = :password
+					WHERE `customerid` = :customerid
+					AND `username` = :username"
+				);
+				$params = array(
+					"password" => $cryptPassword,
+					"customerid" => $userinfo['customerid'],
+					"username" => $userinfo['loginname']
+				);
+				Database::pexecute($stmt, $params);
 				$log->logAction(USR_ACTION, LOG_NOTICE, 'changed main ftp password');
 			}
 
-			if(isset($_POST['change_webalizer'])
-			   && $_POST['change_webalizer'] == 'true')
-			{
-				if(CRYPT_STD_DES == 1)
-				{
+			// Update webalizer password
+			if (isset($_POST['change_webalizer']) && $_POST['change_webalizer'] == 'true') {
+				if (CRYPT_STD_DES == 1) {
 					$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
 					$new_webalizer_password = crypt($new_password, $saltfordescrypt);
-				}
-				else
-				{
+				} else {
 					$new_webalizer_password = crypt($new_password);
 				}
 
-				$db->query("UPDATE `" . TABLE_PANEL_HTPASSWDS . "` SET `password`='" . $db->escape($new_webalizer_password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $db->escape($userinfo['loginname']) . "'");
+				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
+					SET `password` = :password
+					WHERE `customerid` = :customerid
+					AND `username` = :username"
+				);
+				$params = array(
+					"password" => $new_webalizer_password,
+					"customerid" => $userinfo['customerid'],
+					"username" => $userinfo['loginname']
+				);
+				Database::pexecute($stmt, $params);
 			}
 
-			redirectTo($filename, Array('s' => $s));
+			redirectTo($filename, array('s' => $s));
 		}
+	} else {
+		eval("echo \"" . getTemplate('index/change_password') . "\";");
 	}
-	else
-	{
-		eval("echo \"" . getTemplate("index/change_password") . "\";");
-	}
-}
-elseif($page == 'change_language')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+} elseif ($page == 'change_language') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$def_language = validate($_POST['def_language'], 'default language');
+		if (isset($languages[$def_language])) {
+			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+				SET `def_language` = :lang
+				WHERE `customerid` = :customerid"
+			);
+			Database::pexecute($stmt, array("lang" => $def_language, "customerid" => $userinfo['customerid']));
+
+			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
+				SET `language` = :lang
+				WHERE `hash` = :hash"
+			);
+			Database::pexecute($stmt, array("lang" => $def_language, "hash" => $s));
 
-		if(isset($languages[$def_language]))
-		{
-			$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `def_language`='" . $db->escape($def_language) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-			$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `language`='" . $db->escape($def_language) . "' WHERE `hash`='" . $db->escape($s) . "'");
 			$log->logAction(USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
 		}
 
-		redirectTo($filename, Array('s' => $s));
-	}
-	else
-	{
-		$language_options = '';
-
-		$default_lang = $settings['panel']['standardlanguage'];
-		if($userinfo['def_language'] != '') { 
+		redirectTo($filename, array('s' => $s));
+	} else {
+		$default_lang = Settings::Get('panel.standardlanguage');
+		if ($userinfo['def_language'] != '') {
 			$default_lang = $userinfo['def_language'];
 		}
 
-		while(list($language_file, $language_name) = each($languages))
-		{
-			$language_options.= makeoption($language_name, $language_file, $default_lang, true);
+		$language_options = '';
+		while (list($language_file, $language_name) = each($languages)) {
+			$language_options .= makeoption($language_name, $language_file, $default_lang, true);
 		}
 
-		eval("echo \"" . getTemplate("index/change_language") . "\";");
+		eval("echo \"" . getTemplate('index/change_language') . "\";");
 	}
-}
-elseif($page == 'change_theme')
-{
-	if(isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
+} elseif ($page == 'change_theme') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$theme = validate($_POST['theme'], 'theme');
- 
-		$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-		$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'");
-		$log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
-		redirectTo($filename, Array('s' => $s));
-	}
-	else
-	{
-		$theme_options = '';
 
-		$default_theme = $settings['panel']['default_theme'];
-		if($userinfo['theme'] != '') {
+		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+			SET `theme` = :theme
+			WHERE `customerid` = :customerid"
+		);
+		Database::pexecute($stmt, array("theme" => $theme, "customerid" => $userinfo['customerid']));
+
+		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
+			SET `theme` = :theme
+			WHERE `hash` = :hash"
+		);
+		Database::pexecute($stmt, array("theme" => $theme, "hash" => $s));
+
+		$log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
+		redirectTo($filename, array('s' => $s));
+	} else {
+		$default_theme = Settings::Get('panel.default_theme');
+		if ($userinfo['theme'] != '') {
 			$default_theme = $userinfo['theme'];
 		}
 
+		$theme_options = '';
 		$themes_avail = getThemes();
-		foreach($themes_avail as $t)
-		{
-			$theme_options.= makeoption($t, $t, $default_theme, true);
+		foreach ($themes_avail as $t => $d) {
+			$theme_options.= makeoption($d, $t, $default_theme, true);
 		}
 
-		eval("echo \"" . getTemplate("index/change_theme") . "\";");
+		eval("echo \"" . getTemplate('index/change_theme') . "\";");
+	}
+
+} elseif ($page == 'send_error_report' && Settings::Get('system.allow_error_report_customer') == '1') {
+
+	// only show this if we really have an exception to report
+	if (isset($_GET['errorid']) && $_GET['errorid'] != '') {
+
+		$errid = $_GET['errorid'];
+		// read error file
+		$err_dir = makeCorrectDir(FROXLOR_INSTALL_DIR."/logs/");
+		$err_file = makeCorrectFile($err_dir."/".$errid."_sql-error.log");
+
+		if (file_exists($err_file)) {
+
+			$error_content = file_get_contents($err_file);
+			$error = explode("|", $error_content);
+
+			$_error = array(
+				'code' => str_replace("\n", "", substr($error[1], 5)),
+				'message' => str_replace("\n", "", substr($error[2], 4)),
+				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(FROXLOR_INSTALL_DIR))),
+				'line' => str_replace("\n", "", substr($error[4], 5)),
+				'trace' => str_replace(FROXLOR_INSTALL_DIR, "", substr($error[5], 6))
+			);
+
+			// build mail-content
+			$mail_body = "Dear froxlor-team,\n\n";
+			$mail_body .= "the following error has been reported by a user:\n\n";
+			$mail_body .= "-------------------------------------------------------------\n";
+			$mail_body .= $_error['code'].' '.$_error['message']."\n\n";
+			$mail_body .= "File: ".$_error['file'].':'.$_error['line']."\n\n";
+			$mail_body .= "Trace:\n".trim($_error['trace'])."\n\n";
+			$mail_body .= "-------------------------------------------------------------\n\n";
+			$mail_body .= "Froxlor-version: ".$version."\n\n";
+			$mail_body .= "End of report";
+			$mail_html = str_replace("\n", "<br />", $mail_body);
+
+			// send actual report to dev-team
+			if (isset($_POST['send'])
+				&& $_POST['send'] == 'send'
+			) {
+				// send mail and say thanks
+				$_mailerror = false;
+				try {
+					$mail->Subject = '[Froxlor] Error report by user';
+					$mail->AltBody = $mail_body;
+					$mail->MsgHTML($mail_html);
+					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
+					$mail->Send();
+				} catch(phpmailerException $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
+				}
+
+				if ($_mailerror) {
+					// error when reporting an error...LOLFUQ
+					standard_error('send_report_error', $mailerr_msg);
+				}
+
+				// finally remove error from fs
+				@unlink($err_file);
+				redirectTo($filename, array('s' => $s));
+			}
+			// show a nice summary of the error-report
+			// before actually sending anything
+			eval("echo \"" . getTemplate("index/send_error_report") . "\";");
+
+		} else {
+			redirectTo($filename, array('s' => $s));
+		}
+	} else {
+		redirectTo($filename, array('s' => $s));
 	}
 }

customer_logger.php

@@ -0,0 +1,117 @@
+<?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    Panel
+ *
+ */
+
+define('AREA', 'customer');
+require './lib/init.php';
+
+if ($page == 'log'
+) {
+	if ($action == '') {
+		$fields = array(
+			'date' => $lng['logger']['date'],
+			'type' => $lng['logger']['type'],
+			'user' => $lng['logger']['user'],
+			'text' => $lng['logger']['action']
+		);
+		$paging = new paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc');
+		$result_stmt = Database::prepare('
+			SELECT * FROM `' . TABLE_PANEL_LOG . '` WHERE `user` = :loginname ' . $paging->getSqlWhere(true) . ' ' . $paging->getSqlOrderBy() . ' ' . $paging->getSqlLimit()
+		);
+		Database::pexecute($result_stmt, array("loginname" => $userinfo['loginname']));
+		$logs_count = Database::num_rows();
+		$paging->setEntries($logs_count);
+		$sortcode = $paging->getHtmlSortCode($lng);
+		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
+		$searchcode = $paging->getHtmlSearchCode($lng);
+		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
+		$clog = array();
+
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+
+			if (!isset($clog[$row['action']])
+				|| !is_array($clog[$row['action']])
+			) {
+				$clog[$row['action']] = array();
+			}
+			$clog[$row['action']][$row['logid']] = $row;
+		}
+
+		if ($paging->sortfield == 'date'
+			&& $paging->sortorder == 'desc'
+		) {
+			krsort($clog);
+		} else {
+			ksort($clog);
+		}
+
+		$i = 0;
+		$count = 0;
+		$log_count = 0;
+		$log = '';
+		foreach ($clog as $action => $logrows) {
+			$_action = 0;
+			foreach ($logrows as $row) {
+				if ($paging->checkDisplay($i)) {
+					$row = htmlentities_array($row);
+					$row['date'] = date("d.m.y H:i:s", $row['date']);
+
+					if ($_action != $action) {
+						switch ($action) {
+							case USR_ACTION:
+								$_action = $lng['admin']['customer'];
+								break;
+							case RES_ACTION:
+								$_action = $lng['logger']['reseller'];
+								break;
+							case ADM_ACTION:
+								$_action = $lng['logger']['admin'];
+								break;
+							case CRON_ACTION:
+								$_action = $lng['logger']['cron'];
+								break;
+							case LOGIN_ACTION:
+								$_action = $lng['logger']['login'];
+								break;
+							case LOG_ERROR:
+								$_action = $lng['logger']['intern'];
+								break;
+							default:
+								$_action = $lng['logger']['unknown'];
+								break;
+						}
+
+						$row['action'] = $_action;
+						eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
+					}
+
+					$log_count++;
+					$row['type'] = getLogLevelDesc($row['type']);
+					eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
+					$count++;
+					$_action = $action;
+				}
+				$i++;
+			}
+			$i++;
+		}
+
+		eval("echo \"" . getTemplate('logger/logger') . "\";");
+
+	}
+}

customer_mysql.php

@@ -18,42 +18,41 @@
  */
 
 define('AREA', 'customer');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+// get sql-root access data
+Database::needRoot(true);
+Database::needSqlData();
+$sql_root = Database::getSqlData();
+Database::needRoot(false);
 
-$need_db_sql_data = true;
-$need_root_db_sql_data = true;
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql");
+	Database::needSqlData();
+	$sql = Database::getSqlData();
 	$lng['mysql']['description'] = str_replace('<SQL_HOST>', $sql['host'], $lng['mysql']['description']);
-	eval("echo \"" . getTemplate("mysql/mysql") . "\";");
-}
-elseif($page == 'mysqls')
-{
-	if($action == '')
-	{
+	eval("echo \"" . getTemplate('mysql/mysql') . "\";");
+} elseif ($page == 'mysqls') {
+	if ($action == '') {
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls");
 		$fields = array(
 			'databasename' => $lng['mysql']['databasename'],
 			'description' => $lng['mysql']['databasedescription']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_DATABASES, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_DATABASES . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		$paging = new paging($userinfo, TABLE_PANEL_DATABASES, $fields);
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DATABASES . "`
+			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+		$mysqls_count = Database::num_rows();
+		$paging->setEntries($mysqls_count);
+
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -62,169 +61,188 @@ elseif($page == 'mysqls')
 		$count = 0;
 		$mysqls = '';
 
+		$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
+		$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+		$count_mysqlservers = $dbserver['numservers'];
+
 		// Begin root-session
-		$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
-		unset($db_root->password);
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
+		Database::needRoot(true);
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
 				$row = htmlentities_array($row);
-				$mbdata = $db_root->query_first("SELECT SUM( data_length + index_length) / 1024 / 1024 'MB' FROM information_schema.TABLES WHERE table_schema = '" . $db_root->escape($row['databasename']) . "' GROUP BY table_schema ;");
-				$row['size'] = number_format($mbdata['MB'], 3, '.', '');
-				eval("\$mysqls.=\"" . getTemplate("mysql/mysqls_database") . "\";");
+				$mbdata_stmt = Database::prepare("SELECT SUM(data_length + index_length) as MB FROM information_schema.TABLES
+					WHERE table_schema = :table_schema
+					GROUP BY table_schema"
+				);
+				Database::pexecute($mbdata_stmt, array("table_schema" => $row['databasename']));
+				$mbdata = $mbdata_stmt->fetch(PDO::FETCH_ASSOC);
+				$row['size'] = size_readable($mbdata['MB'], 'GiB', 'bi', '%01.' . (int)Settings::Get('panel.decimal_places') . 'f %s');
+				eval("\$mysqls.=\"" . getTemplate('mysql/mysqls_database') . "\";");
 				$count++;
 			}
-
 			$i++;
 		}
-		$db_root->close();
+		Database::needRoot(false);
 		// End root-session
 
-		$mysqls_count = $db->num_rows($result);
-		eval("echo \"" . getTemplate("mysql/mysqls") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
-		$result = $db->query_first('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
+		eval("echo \"" . getTemplate('mysql/mysqls') . "\";");
 
-		if(isset($result['databasename'])
-		   && $result['databasename'] != '')
-		{
-			if(!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']]))
-			{
+	} elseif ($action == 'delete' && $id != 0) {
+		$result_stmt = Database::prepare('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '`
+			WHERE `customerid`="' . (int)$userinfo['customerid'] . '"
+			AND `id`="' . (int)$id . '"'
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+
+		if (isset($result['databasename']) && $result['databasename'] != '') {
+
+			Database::needRoot(true, $result['dbserver']);
+			Database::needSqlData();
+			$sql_root = Database::getSqlData();
+			Database::needRoot(false);
+
+			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
 				$result['dbserver'] = 0;
 			}
 
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				// Begin root-session
-
-				$db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], '');
-				unset($db_root->password);
-				foreach(array_map('trim', array_unique(explode(',', $settings['system']['mysql_access_host']))) as $mysql_access_host)
-				{
-					$db_root->query('REVOKE ALL PRIVILEGES ON * . * FROM `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '`');
-					$db_root->query('REVOKE ALL PRIVILEGES ON `' . str_replace('_', '\_', $db_root->escape($result['databasename'])) . '` . * FROM `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '`');
-					$db_root->query('DELETE FROM `mysql`.`user` WHERE `User` = "' . $db_root->escape($result['databasename']) . '" AND `Host` = "' . $db_root->escape($mysql_access_host) . '"');
-				}
-
-				$db_root->query('DROP DATABASE IF EXISTS `' . $db_root->escape($result['databasename']) . '`');
-				$db_root->query('FLUSH PRIVILEGES');
-				$db_root->close();
-
+				Database::needRoot(true, $result['dbserver']);
+				$dbm = new DbManager($log);
+				$dbm->getManager()->deleteDatabase($result['databasename']);
+				$log->logAction(USR_ACTION, LOG_INFO, "deleted database '" . $result['databasename'] . "'");
+				Database::needRoot(false);
 				// End root-session
 
-				$db->query('DELETE FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_DATABASES . "`
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
 
-				if($userinfo['mysqls_used'] == '1')
-				{
-					$resetaccnumber = " , `mysql_lastaccountnumber`='0' ";
-				}
-				else
-				{
-					$resetaccnumber = '';
-				}
+				$resetaccnumber = ($userinfo['mysqls_used'] == '1') ? " , `mysql_lastaccountnumber` = '0' " : '';
 
-				$result = $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`-1 ' . $resetaccnumber . 'WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
+				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+					SET `mysqls_used` = `mysqls_used` - 1 " . $resetaccnumber . "
+					WHERE `customerid` = :customerid"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+
+				redirectTo($filename, array('page' => $page, 's' => $s));
+			} else {
 				$dbnamedesc = $result['databasename'];
-				if(isset($result['description']) && $result['description'] != '') {
-					$dbnamedesc.= ' ('.$result['description'].')';
+				if (isset($result['description']) && $result['description'] != '') {
+					$dbnamedesc .= ' ('.$result['description'].')';
 				}
 				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $dbnamedesc);
 			}
 		}
-	}
-	elseif($action == 'add')
-	{
-		if($userinfo['mysqls_used'] < $userinfo['mysqls']
-		   || $userinfo['mysqls'] == '-1')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+	} elseif ($action == 'add') {
+		if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				$password = validate($_POST['mysql_password'], 'password');
 				$password = validatePassword($password);
 
-				$sendinfomail = intval($_POST['sendinfomail']);
-				if($sendinfomail != 1)
-				{
+				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
+				if ($sendinfomail != 1) {
 					$sendinfomail = 0;
 				}
 
-				if($password == '')
-				{
+				if ($password == '') {
 					standard_error(array('stringisempty', 'mypassword'));
-				}
-				else
-				{
-					$username = $userinfo['loginname'] . $settings['customer']['mysqlprefix'] . (intval($userinfo['mysql_lastaccountnumber']) + 1);
-
-					if(count($sql_root) > 1)
-					{
+				} else {
+					$dbserver = 0;
+					$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
+					$_dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+					$count_mysqlservers = $_dbserver['numservers'];
+					if ($count_mysqlservers > 1) {
 						$dbserver = validate($_POST['mysql_server'], html_entity_decode($lng['mysql']['mysql_server']), '', '', 0);
-
-						if(!isset($sql_root[$dbserver]) || !is_array($sql_root[$dbserver]))
-						{
+						Database::needRoot(true, $dbserver);
+						Database::needSqlData();
+						$sql_root = Database::getSqlData();
+						Database::needRoot(false);
+						if (!isset($sql_root) || !is_array($sql_root)) {
 							$dbserver = 0;
 						}
 					}
-					else
-					{
-						$dbserver = 0;
+
+					// validate description before actual adding the database, #1052
+					$databasedescription = validate(trim($_POST['description']), 'description');
+
+					// create database, user, set permissions, etc.pp.
+					$dbm = new DbManager($log);
+					$username = $dbm->createDatabase(
+						$userinfo['loginname'],
+						$password,
+						$userinfo['mysql_lastaccountnumber']
+					);
+
+					// we've checked against the password in dbm->createDatabase
+					if ($username == false) {
+						standard_error('passwordshouldnotbeusername');
 					}
 
-					// Begin root-session
+					// Statement modified for Database description -- PH 2004-11-29
+					$stmt = Database::prepare('INSERT INTO `' . TABLE_PANEL_DATABASES . '`
+						(`customerid`, `databasename`, `description`, `dbserver`)
+						VALUES (:customerid, :databasename, :description, :dbserver)'
+					);
+					$params = array(
+						"customerid" => $userinfo['customerid'],
+						"databasename" => $username,
+						"description" => $databasedescription,
+						"dbserver" => $dbserver
+					);
+					Database::pexecute($stmt, $params);
 
-					$db_root = new db($sql_root[$dbserver]['host'], $sql_root[$dbserver]['user'], $sql_root[$dbserver]['password'], '');
-					unset($db_root->password);
-					$db_root->query('CREATE DATABASE `' . $db_root->escape($username) . '`');
-					$log->logAction(USR_ACTION, LOG_INFO, "created database '" . $username . "'");
-					foreach(array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host)
-					{
-						$db_root->query('GRANT ALL PRIVILEGES ON `' . str_replace('_', '\_', $db_root->escape($username)) . '`.* TO `' . $db_root->escape($username) . '`@`' . $db_root->escape($mysql_access_host) . '` IDENTIFIED BY \'password\'');
-						$db_root->query('SET PASSWORD FOR `' . $db_root->escape($username) . '`@`' . $db_root->escape($mysql_access_host) . '` = PASSWORD(\'' . $db_root->escape($password) . '\')');
-						$log->logAction(USR_ACTION, LOG_NOTICE, "grant all privileges for '" . $username . "'@'" . $mysql_access_host . "'");
-					}
+					$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
+						SET `mysqls_used` = `mysqls_used` + 1, `mysql_lastaccountnumber` = `mysql_lastaccountnumber` + 1
+						WHERE `customerid` = :customerid'
+					);
+					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
 
-					$db_root->query('FLUSH PRIVILEGES');
-					$db_root->close();
-
-					// End root-session
-					// Statement modifyed for Database description -- PH 2004-11-29
-
-					$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)
-					{
+					if ($sendinfomail == 1) {
 						$pma = $lng['admin']['notgiven'];
-						if($settings['panel']['phpmyadmin_url'] != '')
-						{
-							$pma = $settings['panel']['phpmyadmin_url'];
+						if (Settings::Get('panel.phpmyadmin_url') != '') {
+							$pma = Settings::Get('panel.phpmyadmin_url');
 						}
 
+						Database::needRoot(true, $dbserver);
+						Database::needSqlData();
+						$sql_root = Database::getSqlData();
+						Database::needRoot(false);
+
 						$replace_arr = array(
-							'CUST_NAME' => getCorrectUserSalutation($userinfo),
+							'SALUTATION' => getCorrectUserSalutation($userinfo),
+							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
 							'DB_NAME' => $username,
 							'DB_PASS' => $password,
 							'DB_DESC' => $databasedescription,
-							'DB_SRV' => $sql_root[$dbserver]['host'],
-							'PMA_URI' => $pma 
+							'DB_SRV' => $sql_root['host'],
+							'PMA_URI' => $pma
 						);
-						
+
 						$def_language = $userinfo['def_language'];
-						$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`=\'new_database_by_customer_subject\'');
-						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['mysql_add']['infomail_subject']), $replace_arr));
-						$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`=\'new_database_by_customer_mailbody\'');
-						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['mysql_add']['infomail_body']['main']), $replace_arr));
+						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+							WHERE `adminid` = :adminid
+							AND `language` = :lang
+							AND `templategroup`='mails'
+							AND `varname`='new_database_by_customer_subject'"
+						);
+						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
+						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['subject']), $replace_arr));
+
+						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+							WHERE `adminid`= :adminid
+							AND `language`= :lang
+							AND `templategroup` = 'mails'
+							AND `varname` = 'new_database_by_customer_mailbody'"
+						);
+						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
+						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['mailbody']), $replace_arr));
 
 						$_mailerror = false;
 						try {
@@ -249,19 +267,21 @@ elseif($page == 'mysqls')
 						$mail->ClearAddresses();
 					}
 
-					redirectTo($filename, Array('page' => $page, 's' => $s));
+					redirectTo($filename, array('page' => $page, 's' => $s));
 				}
-			}
-			else
-			{
+			} else {
+
+				$dbservers_stmt = Database::query("SELECT DISTINCT `dbserver` FROM `".TABLE_PANEL_DATABASES."`");
 				$mysql_servers = '';
-
-				foreach($sql_root as $mysql_server => $mysql_server_details)
-				{
-					$mysql_servers .= makeoption($mysql_server_details['caption'], $mysql_server);
+				$count_mysqlservers = 0;
+				while ($dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC)) {
+					Database::needRoot(true, $dbserver['dbserver']);
+					Database::needSqlData();
+					$sql_root = Database::getSqlData();
+					$mysql_servers .= makeoption($sql_root['caption'], $dbserver['dbserver']);
+					$count_mysqlservers++;
 				}
-
-				#$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
+				Database::needRoot(false);
 
 				$mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_add.php';
 				$mysql_add_form = htmlform::genHTMLForm($mysql_add_data);
@@ -269,67 +289,80 @@ elseif($page == 'mysqls')
 				$title = $mysql_add_data['mysql_add']['title'];
 				$image = $mysql_add_data['mysql_add']['image'];
 
-				eval("echo \"" . getTemplate("mysql/mysqls_add") . "\";");
+				eval("echo \"" . getTemplate('mysql/mysqls_add') . "\";");
 			}
 		}
-	}
-	elseif($action == 'edit'
-	       && $id != 0)
-	{
-		$result = $db->query_first('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"');
+	} elseif ($action == 'edit' && $id != 0) {
+		$result_stmt = Database::prepare("SELECT `id`, `databasename`, `description`, `dbserver` FROM `" . TABLE_PANEL_DATABASES . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if(isset($result['databasename'])
-		   && $result['databasename'] != '')
-		{
-			if(!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']]))
-			{
+		if (isset($result['databasename']) && $result['databasename'] != '') {
+			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
 				$result['dbserver'] = 0;
 			}
 
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				// Only change Password if it is set, do nothing if it is empty! -- PH 2004-11-29
 				$password = validate($_POST['mysql_password'], 'password');
-
-				if($password != '')
-				{
+				if ($password != '') {
 					// validate password
 					$password = validatePassword($password);
 
-					// Begin root-session
-					$db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], '');
-					unset($db_root->password);
-					foreach(array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host)
-					{
-						$db_root->query('SET PASSWORD FOR `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '` = PASSWORD(\'' . $db_root->escape($password) . '\')');
+					if ($password == $result['databasename']) {
+						standard_error('passwordshouldnotbeusername');
 					}
 
-					$db_root->query('FLUSH PRIVILEGES');
-					$db_root->close();
+					// Begin root-session
+					Database::needRoot(true);
+					foreach (array_map('trim', explode(',', Settings::Get('system.mysql_access_host'))) as $mysql_access_host) {
+						$stmt = Database::prepare("SET PASSWORD FOR :dbname@:host = PASSWORD(:password)");
+						$params = array(
+							"dbname" => $result['databasename'],
+							"host" => $mysql_access_host,
+							"password" => $password
+						);
+						Database::pexecute($stmt, $params);
+					}
 
+					$stmt = Database::prepare("FLUSH PRIVILEGES");
+					Database::pexecute($stmt);
+					Database::needRoot(false);
 					// End root-session
 				}
 
 				// Update the Database description -- PH 2004-11-29
-
 				$log->logAction(USR_ACTION, LOG_INFO, "edited database '" . $result['databasename'] . "'");
 				$databasedescription = validate($_POST['description'], 'description');
-				$result = $db->query('UPDATE `' . TABLE_PANEL_DATABASES . '` SET `description`="' . $db->escape($databasedescription) . '" WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
+				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DATABASES . "`
+					SET `description` = :desc
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($stmt, array("desc" => $databasedescription, "customerid" => $userinfo['customerid'], "id" => $id));
+				redirectTo($filename, array('page' => $page, 's' => $s));
+			} else {
+
+				$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
+				$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+				$count_mysqlservers = $dbserver['numservers'];
+
+				Database::needRoot(true, $result['dbserver']);
+				Database::needSqlData();
+				$sql_root = Database::getSqlData();
+				Database::needRoot(false);
+
 				$mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php';
 				$mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data);
 
 				$title = $mysql_edit_data['mysql_edit']['title'];
 				$image = $mysql_edit_data['mysql_edit']['image'];
 
-				eval("echo \"" . getTemplate("mysql/mysqls_edit") . "\";");
+				eval("echo \"" . getTemplate('mysql/mysqls_edit') . "\";");
 			}
 		}
 	}
 }
-
-?>

customer_tickets.php

@@ -18,45 +18,47 @@
  */
 
 define('AREA', 'customer');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+if (isset($_POST['id'])) {
 
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+
+	//Check if the current user is allowed to see the current ticket.
+	$stmt = Database::prepare("SELECT `id` FROM `panel_tickets` WHERE `id` = :id AND `customerid` = :customerid");
+	$result = Database::pexecute_first($stmt, array("id" => $id, "customerid" => $userinfo['customerid']));
+
+	if ($result == null) {
+		// no rights to see the requested ticket
+		standard_error(array('ticketnotaccessible'));
+	}
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets");
 	eval("echo \"" . getTemplate("tickets/ticket") . "\";");
-}
-elseif($page == 'tickets')
-{
-	if($action == '')
-	{
+} elseif ($page == 'tickets') {
+	if ($action == '') {
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets::tickets");
 		$fields = array(
 			'status' => $lng['ticket']['status'],
-			'priority' => $lng['ticket']['priority'],
 			'lastchange' => $lng['ticket']['lastchange'],
-			'ticket_answers' => $lng['ticket']['ticket_answers'],
 			'subject' => $lng['ticket']['subject'],
 			'lastreplier' => $lng['ticket']['lastreplier']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$paging->sortfield = 'lastchange';
-		$paging->sortorder = 'desc';
-		$result = $db->query('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub` WHERE `sub`.`answerto` = `main`.`id`) as `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority` FROM `' . TABLE_PANEL_TICKETS . '` as `main` WHERE `main`.`answerto` = "0" AND `archived` = "0" AND `customerid`="' . (int)$userinfo['customerid'] . '" AND `adminid`="' . (int)$userinfo['adminid'] . '" ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		$paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields);
+		$stmt = Database::prepare('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub`
+			WHERE `sub`.`answerto` = `main`.`id`) AS `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority`
+			FROM `' . TABLE_PANEL_TICKETS . '` as `main`
+			WHERE `main`.`answerto` = "0"
+			AND `archived` = "0"
+			AND `customerid`= :customerid ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
+		);
+		Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -66,42 +68,34 @@ elseif($page == 'tickets')
 		$tickets = '';
 		$tickets_count = 0;
 
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
+		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
 				$tickets_count++;
 				$row = htmlentities_array($row);
 				$row['lastchange'] = date("d.m.y H:i", $row['lastchange']);
 
-				if($row['status'] >= 0
-				   && $row['status'] <= 2)
-				{
+				if ($row['status'] >= 0 && $row['status'] <= 2) {
 					$reopen = 0;
-				}
-				else
-				{
+				} else {
 					$reopen = 1;
 				}
 
 				$row['status'] = ticket::getStatusText($lng, $row['status']);
 				$row['priority'] = ticket::getPriorityText($lng, $row['priority']);
 
-				if($row['lastreplier'] == '1')
-				{
+				if ($row['lastreplier'] == '1') {
 					$row['lastreplier'] = $lng['ticket']['staff'];
 					$cananswer = 1;
-				}
-				else
-				{
+				} else {
 					$row['lastreplier'] = $lng['ticket']['customer'];
 					$cananswer = 0;
 				}
 
 				$row['subject'] = html_entity_decode($row['subject']);
-				if(strlen($row['subject']) > 20)
-				{
-					$row['subject'] = substr($row['subject'], 0, 17) . '...';
+				if (strlen($row['subject']) > 30) {
+					$ts = wordwrap($row['subject'], 30, "|");
+					$ts = explode("|", $ts);
+					$row['subject'] = $ts[0]. '...';
 				}
 
 				eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");
@@ -114,60 +108,46 @@ elseif($page == 'tickets')
 		$supportavailable = 0;
 		$time = date("Hi", time());
 		$day = date("w", time());
-		$start = substr($settings['ticket']['worktime_begin'], 0, 2) . substr($settings['ticket']['worktime_begin'], 3, 2);
-		$end = substr($settings['ticket']['worktime_end'], 0, 2) . substr($settings['ticket']['worktime_end'], 3, 2);
+		$start = substr(Settings::Get('ticket.worktime_begin'), 0, 2) . substr(Settings::Get('ticket.worktime_begin'), 3, 2);
+		$end = substr(Settings::Get('ticket.worktime_end'), 0, 2) . substr(Settings::Get('ticket.worktime_end'), 3, 2);
 
-		if($time >= $start
-		   && $time <= $end)
-		{
+		if ($time >= $start && $time <= $end) {
 			$supportavailable = 1;
 		}
 
-		if($settings['ticket']['worktime_sat'] == "0"
-		   && $day == "6")
-		{
+		if (Settings::Get('ticket.worktime_sat') == "0" && $day == "6") {
 			$supportavailable = 0;
 		}
 
-		if($settings['ticket']['worktime_sun'] == "0"
-		   && $day == "0")
-		{
+		if (Settings::Get('ticket.worktime_sun') == "0" && $day == "0") {
 			$supportavailable = 0;
 		}
 
-		if($settings['ticket']['worktime_all'] == "1")
-		{
+		if (Settings::Get('ticket.worktime_all') == "1") {
 			$supportavailable = 1;
 		}
 
 		$ticketsopen = 0;
-		$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                         WHERE `customerid` = "' . $userinfo['customerid'] . '"
-                                         AND `answerto` = "0"
-                                         AND (`status` = "0" OR `status` = "1" OR `status` = "2")');
+		$stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+			WHERE `customerid` = :customerid
+			AND `answerto` = "0"
+			AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
+		);
+		$opentickets = Database::pexecute_first($stmt, array("customerid" => $userinfo['customerid']));
 
-		if($settings['ticket']['concurrently_open'] != - 1
-		   && $settings['ticket']['concurrently_open'] != '')
-		{
-			$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => $settings['ticket']['concurrently_open']));
-		}
-		else
-		{
+		if (Settings::Get('ticket.concurrently_open') != - 1 && Settings::Get('ticket.concurrently_open') != '') {
+			$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => Settings::Get('ticket.concurrently_open')));
+		} else {
 			$notmorethanxopentickets = '';
 		}
 
 		$ticketsopen = (int)$opentickets['count'];
 		eval("echo \"" . getTemplate("tickets/tickets") . "\";");
-	}
-	elseif($action == 'new')
-	{
-		if($userinfo['tickets_used'] < $userinfo['tickets']
-		   || $userinfo['tickets'] == '-1')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$newticket = ticket::getInstanceOf($userinfo, $db, $settings, -1);
+
+	} elseif ($action == 'new') {
+		if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				$newticket = ticket::getInstanceOf($userinfo, -1);
 				$newticket->Set('subject', validate($_POST['subject'], 'subject'), true, false);
 				$newticket->Set('priority', validate($_POST['priority'], 'priority'), true, false);
 				$newticket->Set('category', validate($_POST['category'], 'category'), true, false);
@@ -175,16 +155,11 @@ elseif($page == 'tickets')
 				$newticket->Set('admin', (int)$userinfo['adminid'], true, false);
 				$newticket->Set('message', validate(str_replace("\r\n", "\n", $_POST['message']), 'message', '/^[^\0]*$/'), true, false);
 
-				if($newticket->Get('subject') == null)
-				{
+				if ($newticket->Get('subject') == null) {
 					standard_error(array('stringisempty', 'mysubject'));
-				}
-				elseif($newticket->Get('message') == null)
-				{
+				} elseif ($newticket->Get('message') == null) {
 					standard_error(array('stringisempty', 'mymessage'));
-				}
-				else
-				{
+				} else {
 					$now = time();
 					$newticket->Set('dt', $now, true, true);
 					$newticket->Set('lastchange', $now, true, true);
@@ -194,55 +169,56 @@ elseif($page == 'tickets')
 					$newticket->Set('by', '0', true, true);
 					$newticket->Insert();
 					$log->logAction(USR_ACTION, LOG_NOTICE, "opened support-ticket '" . $newticket->Get('subject') . "'");
-					$db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
-                          SET `tickets_used`=`tickets_used`+1 WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');
+
+					$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
+						SET `tickets_used`=`tickets_used` + 1
+						WHERE `customerid`= :customerid'
+					);
+					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
 
 					// Customer mail
-
 					$newticket->sendMail((int)$userinfo['customerid'], 'new_ticket_for_customer_subject', $lng['mails']['new_ticket_for_customer']['subject'], 'new_ticket_for_customer_mailbody', $lng['mails']['new_ticket_for_customer']['mailbody']);
 
 					// Admin mail
-
 					$newticket->sendMail(-1, 'new_ticket_by_customer_subject', $lng['mails']['new_ticket_by_customer']['subject'], 'new_ticket_by_customer_mailbody', $lng['mails']['new_ticket_by_customer']['mailbody']);
-					redirectTo($filename, Array('page' => $page, 's' => $s));
+					redirectTo($filename, array('page' => $page, 's' => $s));
 				}
-			}
-			else
-			{
+			} else {
 				$categories = '';
-				$result = $db->query_first('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `logicalorder`, `name` ASC');
+				$result_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
+					WHERE `adminid` = :adminid
+					ORDER BY `logicalorder`, `name` ASC'
+				);
+				$result = Database::pexecute_first($result_stmt, array("adminid" => $userinfo['adminid']));
 
-				if(isset($result['name'])
-				   && $result['name'] != '')
-				{
-					$result2 = $db->query('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `logicalorder`, `name` ASC');
+				if (isset($result['name']) && $result['name'] != '') {
+					$result2_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
+						WHERE `adminid` = :adminid
+						ORDER BY `logicalorder`, `name` ASC'
+					);
+					Database::pexecute($result2_stmt, array("adminid" => $userinfo['adminid']));
 
-					while($row = $db->fetch_array($result2))
-					{
+					while ($row = $result2_stmt->fetch(PDO::FETCH_ASSOC)) {
 						$categories.= makeoption($row['name'], $row['id']);
 					}
-				}
-				else
-				{
+				} else {
 					$categories = makeoption($lng['ticket']['no_cat'], '0');
 				}
 
-				$priorities = makeoption($lng['ticket']['high'], '1', $settings['ticket']['default_priority']);
-				$priorities.= makeoption($lng['ticket']['normal'], '2', $settings['ticket']['default_priority']);
-				$priorities.= makeoption($lng['ticket']['low'], '3', $settings['ticket']['default_priority']);
+				$priorities = makeoption($lng['ticket']['high'], '1');
+				$priorities.= makeoption($lng['ticket']['normal'], '2');
+				$priorities.= makeoption($lng['ticket']['low'], '3');
 				$ticketsopen = 0;
-				$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                           WHERE `customerid` = "' . $userinfo['customerid'] . '"
-                                           AND `answerto` = "0"
-                                           AND (`status` = "0" OR `status` = "1" OR `status` = "2")');
+				$opentickets_stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+					WHERE `customerid` = :customerid
+					AND `answerto` = "0"
+					AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
+				);
+				$opentickets = Database::pexecute_first($opentickets_stmt, array("customerid" => $userinfo['customerid']));
 
-				if($settings['ticket']['concurrently_open'] != - 1
-				   && $settings['ticket']['concurrently_open'] != '')
-				{
-					$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => $settings['ticket']['concurrently_open']));
-				}
-				else
-				{
+				if (Settings::Get('ticket.concurrently_open') != -1 && Settings::Get('ticket.concurrently_open') != '') {
+					$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => Settings::Get('ticket.concurrently_open')));
+				} else {
 					$notmorethanxopentickets = '';
 				}
 
@@ -256,31 +232,21 @@ elseif($page == 'tickets')
 
 				eval("echo \"" . getTemplate("tickets/tickets_new") . "\";");
 			}
-		}
-		else
-		{
+		} else {
 			standard_error('nomoreticketsavailable');
 		}
-	}
-	elseif($action == 'answer'
-	       && $id != 0)
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			$replyticket = ticket::getInstanceOf($userinfo, $db, $settings, -1);
+	} elseif ($action == 'answer' && $id != 0) {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			$replyticket = ticket::getInstanceOf($userinfo, -1);
 			$replyticket->Set('subject', validate($_POST['subject'], 'subject'), true, false);
 			$replyticket->Set('priority', validate($_POST['priority'], 'priority'), true, false);
 			$replyticket->Set('message', validate(str_replace("\r\n", "\n", $_POST['message']), 'message', '/^[^\0]*$/'), true, false);
 
-			if($replyticket->Get('message') == null)
-			{
+			if ($replyticket->Get('message') == null) {
 				standard_error(array('stringisempty', 'mymessage'));
-			}
-			else
-			{
+			} else {
 				$now = time();
-				$replyticket->Set('customerid', (int)$userinfo['customerid'], true, true);
+				$replyticket->Set('customer', (int)$userinfo['customerid'], true, true);
 				$replyticket->Set('lastchange', $now, true, true);
 				$replyticket->Set('ip', $_SERVER['REMOTE_ADDR'], true, true);
 				$replyticket->Set('status', '1', true, true);
@@ -289,11 +255,9 @@ elseif($page == 'tickets')
 				$replyticket->Insert();
 
 				// Update priority if changed
+				$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
 
-				$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
-
-				if($replyticket->Get('priority') != $mainticket->Get('priority'))
-				{
+				if ($replyticket->Get('priority') != $mainticket->Get('priority')) {
 					$mainticket->Set('priority', $replyticket->Get('priority'), true);
 				}
 
@@ -303,70 +267,78 @@ elseif($page == 'tickets')
 				$mainticket->Update();
 				$log->logAction(USR_ACTION, LOG_NOTICE, "answered support-ticket '" . $mainticket->Get('subject') . "'");
 				$mainticket->sendMail(-1, 'new_reply_ticket_by_customer_subject', $lng['mails']['new_reply_ticket_by_customer']['subject'], 'new_reply_ticket_by_customer_mailbody', $lng['mails']['new_reply_ticket_by_customer']['mailbody']);
-				redirectTo($filename, Array('page' => $page, 's' => $s));
+				redirectTo($filename, array('page' => $page, 's' => $s));
 			}
-		}
-		else
-		{
+		} else {
 			$ticket_replies = '';
-			$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
+			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
 			$dt = date("d.m.Y H:i\h", $mainticket->Get('dt'));
 			$status = ticket::getStatusText($lng, $mainticket->Get('status'));
 
-			if($mainticket->Get('status') >= 0
-			   && $mainticket->Get('status') <= 2)
-			{
+			if ($mainticket->Get('status') >= 0 && $mainticket->Get('status') <= 2) {
 				$isclosed = 0;
-			}
-			else
-			{
+			} else {
 				$isclosed = 1;
 			}
 
-			if($mainticket->Get('by') == '1')
-			{
+			if ($mainticket->Get('by') == '1') {
 				$by = $lng['ticket']['staff'];
-			}
-			else
-			{
-				$by = $lng['ticket']['customer'];
+			} else {
+				$cid = $mainticket->Get('customer');
+				$usr_stmt = Database::prepare('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
+					FROM `' . TABLE_PANEL_CUSTOMERS . '`
+					WHERE `customerid` = :customerid '
+				);
+				$usr = Database::pexecute_first($usr_stmt, array("customerid" => $cid));
+				$by = getCorrectFullUserDetails($usr);
 			}
 
 			$subject = $mainticket->Get('subject');
 			$message = $mainticket->Get('message');
 			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
-			$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-                                WHERE `id`="' . (int)$mainticket->Get('category') . '"');
-			$row = $db->fetch_array($result);
-			$andere = $db->query('SELECT * FROM `' . TABLE_PANEL_TICKETS . '` WHERE `answerto`="' . (int)$id . '" ORDER BY `lastchange` ASC');
+			$result_stmt = Database::prepare('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
+				WHERE `id`= :id '
+			);
+			$row = Database::pexecute_first($result_stmt, array("id" => $mainticket->Get('category')));
 
-			while($row2 = $db->fetch_array($andere))
-			{
-				$subticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$row2['id']);
+			$andere_stmt = Database::prepare('SELECT * FROM `' . TABLE_PANEL_TICKETS . '`
+				WHERE `answerto`= :answerto
+				ORDER BY `lastchange` ASC'
+			);
+			Database::pexecute($andere_stmt, array("answerto" => $id));
+			$numrows_andere = Database::num_rows();
+
+			while ($row2 = $andere_stmt->fetch(PDO::FETCH_ASSOC)) {
+				$subticket = ticket::getInstanceOf($userinfo, (int)$row2['id']);
 				$lastchange = date("d.m.Y H:i\h", $subticket->Get('lastchange'));
 
-				if($subticket->Get('by') == '1')
-				{
+				if ($subticket->Get('by') == '1') {
 					$by = $lng['ticket']['staff'];
-				}
-				else
-				{
-					$by = $lng['ticket']['customer'];
+				} else {
+					$cid = $subticket->Get('customer');
+					$usr_stmt = Database::prepare('
+						SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
+						FROM `' . TABLE_PANEL_CUSTOMERS . '`
+						WHERE `customerid` = :customerid '
+					);
+					$usr = Database::pexecute_first($usr_stmt, array("customerid" => $cid));
+					$by = getCorrectFullUserDetails($usr);
 				}
 
 				$subject = $subticket->Get('subject');
 				$message = $subticket->Get('message');
+				
+				$row2 = htmlentities_array($row2);
 				eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_list") . "\";");
 			}
 
 			$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
 			$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
 			$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
-			$subject = $mainticket->Get('subject');
-			$ticket_replies_count = $db->num_rows($andere) + 1;
+			$subject = htmlentities($mainticket->Get('subject'));
+			$ticket_replies_count = $numrows_andere + 1;
 
 			// don't forget the main-ticket!
-
 			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/formfield.ticket_reply.php';
 			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
 
@@ -375,54 +347,41 @@ elseif($page == 'tickets')
 
 			eval("echo \"" . getTemplate("tickets/tickets_reply") . "\";");
 		}
-	}
-	elseif($action == 'close'
-	       && $id != 0)
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
+	} elseif ($action == 'close' && $id != 0) {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
 			$now = time();
-			$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
+			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
 			$mainticket->Set('lastchange', $now, true, true);
 			$mainticket->Set('lastreplier', '0', true, true);
 			$mainticket->Set('status', '3', true, true);
 			$mainticket->Update();
 			$log->logAction(USR_ACTION, LOG_NOTICE, "closed support-ticket '" . $mainticket->Get('subject') . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
-			$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
+			redirectTo($filename, array('page' => $page, 's' => $s));
+		} else {
+			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
 			ask_yesno('ticket_reallyclose', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $mainticket->Get('subject'));
 		}
-	}
-	elseif($action == 'reopen'
-	       && $id != 0)
-	{
+	} elseif ($action == 'reopen' && $id != 0) {
 		$ticketsopen = 0;
-		$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                       WHERE `customerid` = "' . $userinfo['customerid'] . '"
-                                       AND `answerto` = "0"
-                                       AND (`status` = "0" OR `status` = "1" OR `status` = "2")');
+		$opentickets_stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+			WHERE `customerid` = :customerid
+			AND `answerto` = "0"
+			AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
+		);
+		$opentickets = Database::pexecute_first($opentickets_stmt, array("customerid" => $userinfo['customerid']));
 		$ticketsopen = (int)$opentickets['count'];
 
-		if($ticketsopen > $settings['ticket']['concurrently_open']
-		   && $settings['ticket']['concurrently_open'] != - 1
-		   && $settings['ticket']['concurrently_open'] != '')
-		{
-			standard_error('notmorethanxopentickets', $settings['ticket']['concurrently_open']);
+		if ($ticketsopen > Settings::Get('ticket.concurrently_open') && Settings::Get('ticket.concurrently_open') != - 1 && Settings::Get('ticket.concurrently_open') != '') {
+			standard_error('notmorethanxopentickets', Settings::Get('ticket.concurrently_open'));
 		}
 
 		$now = time();
-		$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
+		$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
 		$mainticket->Set('lastchange', $now, true, true);
 		$mainticket->Set('lastreplier', '0', true, true);
 		$mainticket->Set('status', '0', true, true);
 		$mainticket->Update();
 		$log->logAction(USR_ACTION, LOG_NOTICE, "reopened support-ticket '" . $mainticket->Get('subject') . "'");
-		redirectTo($filename, Array('page' => $page, 's' => $s));
+		redirectTo($filename, array('page' => $page, 's' => $s));
 	}
 }
-
-?>

customer_traffic.php

@@ -18,267 +18,143 @@
  */
 
 define('AREA', 'customer');
-
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
+$intrafficpage = 1;
+require './lib/init.php';
 $traffic = '';
 $month = null;
 $year = null;
 
-if(isset($_POST['month'])
-   && isset($_POST['year']))
-{
+if (isset($_POST['month']) && isset($_POST['year'])) {
 	$month = intval($_POST['month']);
 	$year = intval($_POST['year']);
-}
-elseif(isset($_GET['month'])
-       && isset($_GET['year']))
-{
+} elseif (isset($_GET['month']) && isset($_GET['year'])) {
 	$month = intval($_GET['month']);
 	$year = intval($_GET['year']);
 }
-
 //BAM! $_GET???
-
-elseif (isset($_GET['page'])
-       && $_GET['page'] == "current")
-{
-	if(date('d') != '01')
-	{
+elseif (isset($_GET['page']) && $_GET['page'] == 'current') {
+	if (date('d') != '01') {
 		$month = date('m');
 		$year = date('Y');
-	}
-	else
-	{
-		if(date('m') == '01')
-		{
+	} else {
+		if (date('m') == '01') {
 			$month = 12;
 			$year = date('Y') - 1;
-		}
-		else
-		{
+		} else {
 			$month = date('m') - 1;
 			$year = date('Y');
 		}
 	}
 }
 
-if(!is_null($month)
-   && !is_null($year))
-{
+if (!is_null($month) && !is_null($year)) {
 	$traf['byte'] = 0;
-	$result = $db->query("SELECT MAX(`http`), MAX(`ftp_up`+`ftp_down`), MAX(`mail`)
-	                     FROM `" . TABLE_PANEL_TRAFFIC . "`
-	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
-	                     AND `month` = '" . $month . "'
-	                     AND `year` = '" . $year . "'");
-	$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',
-                                `day`, `month`, `year`
-                             FROM `" . TABLE_PANEL_TRAFFIC . "`
-	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
-	                     AND `month` = '" . $month . "' AND `year` = '" . $year . "'
-	                     GROUP BY `day` ORDER BY `day` ASC");
+	$result_stmt = Database::prepare("SELECT SUM(`http`) as 'http', SUM(`ftp_up`) AS 'ftp_up', SUM(`ftp_down`) as 'ftp_down', SUM(`mail`) as 'mail', `day`, `month`, `year`
+		FROM `" . TABLE_PANEL_TRAFFIC . "`
+		WHERE `customerid`= :customerid
+		AND `month` = :month
+		AND `year` = :year
+		GROUP BY `day`
+		ORDER BY `day` DESC"
+	);
+	$params = array(
+		"customerid" => $userinfo['customerid'],
+		"month" => $month,
+		"year" => $year
+	);
+	Database::pexecute($result_stmt, $params);
 	$traffic_complete['http'] = 0;
 	$traffic_complete['ftp'] = 0;
 	$traffic_complete['mail'] = 0;
 	$show = '';
 
-	while($row = $db->fetch_array($result))
-	{
+	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$http = $row['http'];
 		$ftp = $row['ftp_up'] + $row['ftp_down'];
 		$mail = $row['mail'];
 		$traf['byte'] = $http + $ftp + $mail;
-		$traffic_complete['http']+= $http;
-		$traffic_complete['ftp']+= $ftp;
-		$traffic_complete['mail']+= $mail;
-		$traf['day'] = $row['day'];
+		$traffic_complete['http'] += $http;
+		$traffic_complete['ftp'] += $ftp;
+		$traffic_complete['mail'] += $mail;
+		$traf['day'] = $row['day'] . '.';
 
-		if(extension_loaded('bcmath'))
-		{
-			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, $settings['panel']['decimal_places']) . " MB up/ " . bcdiv($row['ftp_down'], 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
-		}
-		else
-		{
-			$traf['ftptext'] = round($row['ftp_up'] / 1024, $settings['panel']['decimal_places']) . " MB up/ " . round($row['ftp_down'] / 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
-			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
+		if (extension_loaded('bcmath')) {
+			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . bcdiv($row['ftp_down'], 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
+			$traf['httptext'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
+			$traf['mailtext'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
+			$traf['ftp'] = bcdiv($ftp, 1024, Settings::Get('panel.decimal_places'));
+			$traf['http'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places'));
+			$traf['mail'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places'));
+			$traf['byte'] = bcdiv($traf['byte'], 1024, Settings::Get('panel.decimal_places'));
+		} else {
+			$traf['ftptext'] = round($row['ftp_up'] / 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . round($row['ftp_down'] / 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
+			$traf['httptext'] = round($http / 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
+			$traf['mailtext'] = round($mail / 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
+			$traf['http'] = round($http, Settings::Get('panel.decimal_places'));
+			$traf['ftp'] = round($ftp, Settings::Get('panel.decimal_places'));
+			$traf['mail'] = round($mail, Settings::Get('panel.decimal_places'));
+			$traf['byte'] = round($traf['byte'] / 1024, Settings::Get('panel.decimal_places'));
 		}
 
-		if($traf['byte'] != 0
-		   && $traf['max'] != 0)
-		{
-			$proz = $traf['max'] / 100;
-			$traf['http'] = round($http / $proz, 0);
-			$traf['ftp'] = round($ftp / $proz, 0);
-			$traf['mail'] = round($mail / $proz, 0);
-
-			if($traf['http'] == 0)
-			{
-				$traf['http'] = 1;
-			}
-
-			if($traf['ftp'] == 0)
-			{
-				$traf['ftp'] = 1;
-			}
-
-			if($traf['mail'] == 0)
-			{
-				$traf['mail'] = 1;
-			}
-		}
-		else
-		{
-			$traf['http'] = 0;
-			$traf['ftp'] = 0;
-			$traf['mail'] = 0;
-		}
-
-		if(extension_loaded('bcmath'))
-		{
-			$traf['byte'] = bcdiv($traf['byte'], 1024, $settings['panel']['decimal_places']);
-		}
-		else
-		{
-			$traf['byte'] = round($traf['byte'] / 1024, $settings['panel']['decimal_places']);
-		}
-
-		eval("\$traffic.=\"" . getTemplate("traffic/traffic_month") . "\";");
-		$show = $lng['traffic']['months'][intval($row['month'])] . " " . $row['year'];
+		eval("\$traffic.=\"" . getTemplate('traffic/traffic_month') . "\";");
+		$show = $lng['traffic']['months'][intval($row['month'])] . ' ' . $row['year'];
 	}
 
-	if(extension_loaded('bcmath'))
-	{
-		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024, $settings['panel']['decimal_places']);
-	}
-	else
-	{
-		$traffic_complete['http'] = round($traffic_complete['http'] / 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = round($traffic_complete['mail'] / 1024, $settings['panel']['decimal_places']);
-	}
+	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
 
-	eval("echo \"" . getTemplate("traffic/traffic_details") . "\";");
-}
-else
-{
-	$result = $db->query("SELECT MAX(`http`), MAX(`ftp_up`+`ftp_down`), MAX(`mail`)
-	                     FROM `" . TABLE_PANEL_TRAFFIC . "`
-	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
-	                     GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12");
-	
-	$nums = mysql_num_rows($result);
-	if($nums > 0)
-	{
-		$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]));
-	} 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");
+	eval("echo \"" . getTemplate('traffic/traffic_details') . "\";");
+} else {
+	$result_stmt = Database::prepare("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` = :customerid
+		GROUP BY CONCAT(`year`,`month`)
+		ORDER BY CONCAT(`year`,`month`) DESC
+		LIMIT 12"
+	);
+	Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
 	$traffic_complete['http'] = 0;
 	$traffic_complete['ftp'] = 0;
 	$traffic_complete['mail'] = 0;
 
-	while($row = $db->fetch_array($result))
-	{
+	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$http = $row['http'];
 		$ftp_up = $row['ftp_up'];
 		$ftp_down = $row['ftp_down'];
 		$mail = $row['mail'];
-		$traffic_complete['http']+= $http;
-		$traffic_complete['ftp']+= $ftp_up + $ftp_down;
-		$traffic_complete['mail']+= $mail;
+		$traffic_complete['http'] += $http;
+		$traffic_complete['ftp'] += $ftp_up + $ftp_down;
+		$traffic_complete['mail'] += $mail;
 		$traf['month'] = $row['month'];
 		$traf['year'] = $row['year'];
 		$traf['monthname'] = $lng['traffic']['months'][intval($row['month'])] . " " . $row['year'];
 		$traf['byte'] = $http + $ftp_up + $ftp_down + $mail;
 
-		if(extension_loaded('bcmath'))
-		{
-			$traf['ftptext'] = bcdiv($ftp_up, 1024 * 1024, $settings['panel']['decimal_places']) . " GB up/ " . bcdiv($ftp_down, 1024 * 1024, $settings['panel']['decimal_places']) . " GB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024 * 1024, $settings['panel']['decimal_places']) . " GB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024 * 1024, $settings['panel']['decimal_places']) . " GB (Mail)";
-		}
-		else
-		{
-			$traf['ftptext'] = round($ftp_up / 1024 * 1024, $settings['panel']['decimal_places']) . " GB up/ " . round($ftp_down / 1024 * 1024, $settings['panel']['decimal_places']) . " GB down (FTP)";
-			$traf['httptext'] = round($http / 1024 * 1024, $settings['panel']['decimal_places']) . " GB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024 * 1024, $settings['panel']['decimal_places']) . " GB (Mail)";
+		if (extension_loaded('bcmath')) {
+			$traf['ftptext'] = bcdiv($ftp_up, 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . bcdiv($ftp_down, 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
+			$traf['httptext'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
+			$traf['mailtext'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
+			$traf['ftp'] = bcdiv(($ftp_up + $ftp_down), 1024, Settings::Get('panel.decimal_places'));
+			$traf['http'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places'));
+			$traf['mail'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places'));
+			$traf['byte'] = bcdiv($traf['byte'], 1024 * 1024, Settings::Get('panel.decimal_places'));
+		} else {
+			$traf['ftptext'] = round($ftp_up / 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . round($ftp_down / 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
+			$traf['httptext'] = round($http / 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
+			$traf['mailtext'] = round($mail / 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
+			$traf['ftp'] = round(($ftp_up + $ftp_down) / 1024, Settings::Get('panel.decimal_places'));
+			$traf['http'] = round($http / 1024, Settings::Get('panel.decimal_places'));
+			$traf['mail'] = round($mail / 1024, Settings::Get('panel.decimal_places'));
+			$traf['byte'] = round($traf['byte'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
 		}
 
-		if($traf['max'] != 0)
-		{
-			$proz = $traf['max'] / 100;
-			$traf['ftp'] = round(($ftp_up + $ftp_down) / $proz, 0);
-			$traf['http'] = round($http / $proz, 0);
-			$traf['mail'] = round($mail / $proz, 0);
-
-			if($traf['http'] == 0)
-			{
-				$traf['http'] = 1;
-			}
-
-			if($traf['ftp'] == 0)
-			{
-				$traf['ftp'] = 1;
-			}
-
-			if($traf['mail'] == 0)
-			{
-				$traf['mail'] = 1;
-			}
-		}
-		else
-		{
-			$traf['ftp'] = 0;
-			$traf['http'] = 0;
-			$traf['mail'] = 0;
-		}
-
-		if(extension_loaded('bcmath'))
-		{
-			$traf['byte'] = bcadd($traf['byte'] / (1024 * 1024), 0.0000, 4);
-		}
-		else
-		{
-			$traf['byte'] = round($traf['byte'] + (1024 * 1024), 4);
-		}
-
-		eval("\$traffic.=\"" . getTemplate("traffic/traffic_traffic") . "\";");
+		eval("\$traffic.=\"" . getTemplate('traffic/traffic_traffic') . "\";");
 	}
 
-	if(extension_loaded('bcmath'))
-	{
-		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024 * 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024 * 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024 * 1024, $settings['panel']['decimal_places']);
-	}
-	else
-	{
-		$traffic_complete['http'] = round($traffic_complete['http'] / 1024 * 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / 1024 * 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = round($traffic_complete['mail'] / 1024 * 1024, $settings['panel']['decimal_places']);
-	}
+	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
 
-	eval("echo \"" . getTemplate("traffic/traffic") . "\";");
+	eval("echo \"" . getTemplate('traffic/traffic') . "\";");
 }
-
-?>