- Update mastersites.

- Adjustments to configuration files for BIND9's default chroot.
- Minor adjustments to clean up Apache's configuration file hierarchy.

PR:		ports/118081
Submitted by:	Janky.Jay@FreeBSD.org, III <ek@purplehat.org> (maintainer)

5 files changed, 16 insertions, 2014 deletions

diff --git a/sysutils/syscp/Makefile b/sysutils/syscp/Makefile
index 3eda7f190e30..c119ee92250c 100644
--- a/sysutils/syscp/Makefile
+++ b/sysutils/syscp/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	syscp
 PORTVERSION=	1.2.16
 PORTREVISION=	1
 CATEGORIES=	sysutils www
-MASTER_SITES=	http://canada.syscp.org/releases/tgz/ \
-		http://france.syscp.org/releases/tgz/ \
-		http://nuernburg.files.syscp.org/releases/tgz/
+MASTER_SITES=	http://nuernburg.files.syscp.org/releases/tgz/ \
+		http://canada.files.syscp.org/releases/tgz/ \
+		http://france.files.syscp.org/releases/tgz/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 PATCH_DIST_STRIP=	-p0
diff --git a/sysutils/syscp/files/patch-syscp-1.2.16-FreeBSD-Dovecot b/sysutils/syscp/files/patch-syscp-1.2.16-FreeBSD-Dovecot
deleted file mode 100644
index 868338a73a79..000000000000
--- a/sysutils/syscp/files/patch-syscp-1.2.16-FreeBSD-Dovecot
+++ /dev/null
@@ -1,2004 +0,0 @@
-diff -Naur syscp.orig/admin_configfiles.php syscp/admin_configfiles.php
---- syscp.orig/admin_configfiles.php	Wed Jan 31 13:21:59 2007
-+++ syscp/admin_configfiles.php	Mon Apr  2 18:09:47 2007
-@@ -24,9 +24,9 @@
- 
- 	$configfiles = Array
- 	(
--		'debian_sarge' => Array
-+		'freebsd_release' => Array
- 		(
--			'label' => 'Debian 3.1 (Sarge)',
-+			'label' => 'FreeBSD 6.2 (RELEASE)',
- 			'daemons' => Array
- 			(
- 				'apache' => Array
-@@ -41,7 +41,7 @@
- 					),
- 					'restart' => Array
- 					(
--						'/etc/init.d/apache' . ( $settings['system']['apacheversion'] == 'apache2' ? '2' : '' ) . ' restart'
-+						'/usr/local/etc/rc.d/apache' . ( $settings['system']['apacheversion'] == 'apache2' ? '22' : '' ) . ' restart'
- 					)
- 				),
- 				'bind' => Array
-@@ -49,30 +49,29 @@
- 					'label' => 'Bind9 Nameserver (DNS)',
- 					'files' => Array
- 					(
--						'etc_bind_default.zone' => '/etc/bind/default.zone'
-+						'etc_bind_default.zone' => '/var/named/etc/namedb/default.zone'
- 					),
- 					'commands' => Array
- 					(
--						'echo "include \"'.$settings['system']['bindconf_directory'].'syscp_bind.conf\";" >> /etc/bind/named.conf',
-+						'echo "include \"/etc/namedb/syscp_bind.conf\";" >> /var/named/etc/namedb/named.conf',
- 						'touch '.$settings['system']['bindconf_directory'].'syscp_bind.conf'
- 					),
- 					'restart' => Array
- 					(
--						'/etc/init.d/bind9 restart'
-+						'/usr/sbin/rndc reload'
- 					)
- 				),
--				'courier' => Array
-+				'dovecot' => Array
- 				(
--					'label' => 'Courier (POP3/IMAP)',
-+					'label' => 'Dovecot (POP3/IMAP)',
- 					'files' => Array
- 					(
--						'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc',
--						'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc'
-+						'etc_dovecot_conf' => '/usr/local/etc/dovecot.conf',
-+						'etc_dovecot_sql' => '/usr/local/etc/dovecot-sql.conf'
- 					),
- 					'restart' => Array
- 					(
--						'/etc/init.d/courier-authdaemon restart',
--						'/etc/init.d/courier-pop restart'
-+						'/usr/local/etc/rc.d/dovecot restart',
- 					)
- 				),
- 				'postfix' => Array
-@@ -80,25 +79,19 @@
- 					'label' => 'Postfix (MTA)',
- 					'files' => Array
- 					(
--						'etc_postfix_main.cf' => '/etc/postfix/main.cf',
--						'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
--						'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
--						'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
--						'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf',
-+						'etc_postfix_main.cf' => '/usr/local/etc/postfix/main.cf',
-+						'etc_postfix_mysql-virtual_alias_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_alias_maps.cf',
-+						'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_domains.cf',
-+						'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_maps.cf',
- 					),
- 					'commands' => Array
- 					(
--						'mkdir -p /etc/postfix/sasl',
--						'mkdir -p /var/spool/postfix/etc/pam.d',
--						'mkdir -p /var/spool/postfix/var/run/mysqld',
--						'groupadd -g '.$settings['system']['vmail_gid'].' vmail',
--						'useradd -u '.$settings['system']['vmail_uid'].' -g vmail vmail',
- 						'mkdir -p '.$settings['system']['vmail_homedir'],
--						'chown -R vmail:vmail '.$settings['system']['vmail_homedir']
-+						'chown -R postfix:postfix '.$settings['system']['vmail_homedir']
- 					),
- 					'restart' => Array
- 					(
--						'/etc/init.d/postfix restart'
-+						'/usr/local/sbin/postfix reload'
- 					)
- 				),
- 				'proftpd' => Array
-@@ -106,232 +99,24 @@
- 					'label' => 'ProFTPd (FTP)',
- 					'files' => Array
- 					(
--						'etc_proftpd.conf' => '/etc/proftpd.conf'
-+						'etc_proftpd.conf' => '/usr/local/etc/proftpd.conf'
- 					),
- 					'restart' => Array
- 					(
--						'/etc/init.d/proftpd restart'
-+						'/usr/local/etc/rc.d/proftpd restart'
- 					)
- 				),
- 				'cron' => Array
- 				(
- 					'label' => 'Crond (cronscript)',
--					'files' => Array
--					(
--						'etc_php4_syscpcron_php.ini' => '/etc/php4/syscpcron/php.ini',
--						'etc_cron.d_syscp' => '/etc/cron.d/syscp'
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/cron restart'
--					)
--				)
--			)
--		),
--		'debian_etch' => Array
--		(
--			'label' => 'Debian 4.0 (Etch)',
--			'daemons' => Array
--			(
--				'apache' => Array
--				(
--					'label' => 'Apache Webserver (HTTP)',
--					'commands' => Array
--					(
--						'echo -e "\\nInclude '.$settings['system']['apacheconf_directory'].$settings['system']['apacheconf_filename'].'" >> '.$settings['system']['apacheconf_directory'].'httpd.conf',
--						'touch '.$settings['system']['apacheconf_directory'].$settings['system']['apacheconf_filename'],
--						'mkdir -p '.$settings['system']['documentroot_prefix'],
--						'mkdir -p '.$settings['system']['logfiles_directory']
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/apache' . ( $settings['system']['apacheversion'] == 'apache2' ? '2' : '' ) . ' restart'
--					)
--				),
--				'bind' => Array
--				(
--					'label' => 'Bind9 Nameserver (DNS)',
--					'files' => Array
--					(
--						'etc_bind_default.zone' => '/etc/bind/default.zone'
--					),
--					'commands' => Array
--					(
--						'echo "include \"'.$settings['system']['bindconf_directory'].'syscp_bind.conf\";" >> /etc/bind/named.conf',
--						'touch '.$settings['system']['bindconf_directory'].'syscp_bind.conf'
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/bind9 restart'
--					)
--				),
--				'courier' => Array
--				(
--					'label' => 'Courier (POP3/IMAP)',
--					'files' => Array
--					(
--						'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc',
--						'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc'
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/courier-authdaemon restart',
--						'/etc/init.d/courier-pop restart'
--					)
--				),
--				'postfix' => Array
--				(
--					'label' => 'Postfix (MTA)',
--					'files' => Array
--					(
--						'etc_postfix_main.cf' => '/etc/postfix/main.cf',
--						'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
--						'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
--						'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
--						'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf',
--					),
- 					'commands' => Array
- 					(
--						'mkdir -p /etc/postfix/sasl',
--						'mkdir -p /var/spool/postfix/etc/pam.d',
--						'mkdir -p /var/spool/postfix/var/run/mysqld',
--						'groupadd -g '.$settings['system']['vmail_gid'].' vmail',
--						'useradd -u '.$settings['system']['vmail_uid'].' -g vmail vmail',
--						'mkdir -p '.$settings['system']['vmail_homedir'],
--						'chown -R vmail:vmail '.$settings['system']['vmail_homedir']
-+					'mkdir /usr/local/etc/syscpcron',
-+					'cp -Rp /usr/local/etc/php.ini-recommended /usr/local/etc/syscpcron/php.ini'
- 					),
--					'restart' => Array
--					(
--						'/etc/init.d/postfix restart'
--					)
--				),
--				'proftpd' => Array
--				(
--					'label' => 'ProFTPd (FTP)',
--					'files' => Array
--					(
--						'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
--						'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/proftpd restart'
--					)
--				),
--				'cron' => Array
--				(
--					'label' => 'Crond (cronscript)',
- 					'files' => Array
- 					(
--						'etc_php4_syscpcron_php.ini' => '/etc/php4/syscpcron/php.ini',
--						'etc_cron.d_syscp' => '/etc/cron.d/syscp'
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/cron restart'
--					)
--				)
--			)
--		),
--		'suse_linux_10_0' => Array
--		(
--			'label' => 'SUSE Linux 10.0',
--			'daemons' => Array
--			(
--				'apache' => Array
--				(
--					'label' => 'Apache Webserver (HTTP)',
--					'commands' => Array
--					(
--						'echo -e "\\nInclude '.$settings['system']['apacheconf_directory'].$settings['system']['apacheconf_filename'].'" >> '.$settings['system']['apacheconf_directory'].'httpd.conf',
--						'touch '.$settings['system']['apacheconf_directory'].$settings['system']['apacheconf_filename'],
--						'mkdir -p '.$settings['system']['documentroot_prefix'],
--						'mkdir -p '.$settings['system']['logfiles_directory']
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/apache2 restart'
--					)
--				),
--				'bind' => Array
--				(
--					'label' => 'Bind Nameserver (DNS)',
--					'files' => Array
--					(
--						'etc_bind_default.zone' => '/etc/named.d/default.zone'
--					),
--					'commands' => Array
--					(
--						'echo "include \"'.$settings['system']['bindconf_directory'].'syscp_bind.conf\";" >> /etc/named.conf',
--						'touch '.$settings['system']['bindconf_directory'].'syscp_bind.conf'
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/named restart'
--					)
--				),
--				'courier' => Array
--				(
--					'label' => 'Courier (POP3/IMAP)',
--					'files' => Array
--					(
--						'etc_authlib_authdaemonrc' => '/etc/authlib/authdaemonrc',
--						'etc_authlib_authmysqlrc' => '/etc/authlib/authmysqlrc'
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/courier-authdaemon restart',
--						'/etc/init.d/courier-pop restart'
--					)
--				),
--				'postfix' => Array
--				(
--					'label' => 'Postfix (MTA)',
--					'files' => Array
--					(
--						'etc_postfix_main.cf' => '/etc/postfix/main.cf',
--						'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
--						'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
--						'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
--						'usr_lib_sasl2_smtpd.conf' => '/usr/lib/sasl2/smtpd.conf',
--					),
--					'commands' => Array
--					(
--						'mkdir -p /var/spool/postfix/etc/pam.d',
--						'groupadd -g '.$settings['system']['vmail_gid'].' vmail',
--						'useradd -u '.$settings['system']['vmail_uid'].' -g vmail vmail',
--						'mkdir -p '.$settings['system']['vmail_homedir'],
--						'chown -R vmail:vmail '.$settings['system']['vmail_homedir']
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/postfix restart'
--					)
--				),
--				'proftpd' => Array
--				(
--					'label' => 'ProFTPd (FTP)',
--					'files' => Array
--					(
--						'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
--						'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/proftpd restart'
--					)
--				),
--				'cron' => Array
--				(
--					'label' => 'Crond (cronscript)',
--					'files' => Array
--					(
--						'etc_php5_syscpcron_php.ini' => '/etc/php5/syscpcron/php.ini',
--						'etc_cron.d_syscp' => '/etc/cron.d/syscp'
--					),
--					'restart' => Array
--					(
--						'/etc/init.d/cron restart'
-+						'etc_cron.d_syscp' => 'crontab -e (As root)'
- 					)
- 				)
- 			)
-@@ -361,6 +146,7 @@
- 				'<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD',
- 				'<SQL_DB>' => $sql['db'],
- 				'<SQL_HOST>' => $sql['host'],
-+				'<ADMIN_EMAIL>' => $settings['panel']['adminmail'],
- 				'<SERVERNAME>' => $settings['system']['hostname'],
- 				'<SERVERIP>' => $settings['system']['ipaddress'],
- 				'<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'],
-diff -Naur syscp.orig/install/install.php syscp/install/install.php
---- syscp.orig/install/install.php	Wed Jan 31 13:21:59 2007
-+++ syscp/install/install.php	Mon Apr  2 10:44:48 2007
-@@ -491,9 +491,9 @@
- 		$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '".$db->escape($apacheversion)."' WHERE `settinggroup` = 'system' AND `varname` = 'apacheversion'");
- 		if($apacheversion == "apache2")
- 		{
--			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '/etc/apache2/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_directory'");
--			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = 'sites-available/99_syscp_vhosts.conf' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_filename'");
--			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '/etc/init.d/apache2 reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
-+			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '/usr/local/etc/apache22/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_directory'");
-+			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = 'extra/syscp-vhosts.conf' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_filename'");
-+			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '/usr/local/sbin/apachectl restart' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
- 		}
- 
- 		// insert the lastcronrun to be the installation date
-@@ -681,4 +681,4 @@
- 	 * END INSTALL ---------------------------------------------------
- 	 */
- 
--?>
-\ No newline at end of file
-+?>
-diff -Naur syscp.orig/install/syscp.sql syscp/install/syscp.sql
---- syscp.orig/install/syscp.sql	Tue Feb  6 14:20:28 2007
-+++ syscp/install/syscp.sql	Mon Apr  2 10:44:48 2007
-@@ -390,17 +390,17 @@
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (7, 'customer', 'mysqlprefix', 'sql');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (8, 'system', 'lastaccountnumber', '0');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (9, 'system', 'lastguid', '9999');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (10, 'system', 'documentroot_prefix', '/var/kunden/webs/');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (11, 'system', 'logfiles_directory', '/var/kunden/logs/');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (10, 'system', 'documentroot_prefix', '/usr/local/syscp/webs/');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (11, 'system', 'logfiles_directory', '/usr/local/syscp/logs/');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (12, 'system', 'ipaddress', 'SERVERIP');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (13, 'system', 'apacheconf_directory', '/etc/apache/');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (14, 'system', 'apachereload_command', '/etc/init.d/apache reload');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (13, 'system', 'apacheconf_directory', '/usr/local/etc/apache22/');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (14, 'system', 'apachereload_command', '/usr/local/sbin/apachectl restart');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (15, 'system', 'last_traffic_run', '000000');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (16, 'system', 'vmail_uid', '2000');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (17, 'system', 'vmail_gid', '2000');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/kunden/mail/');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (16, 'system', 'vmail_uid', '125');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (17, 'system', 'vmail_gid', '125');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/usr/local/syscp/mail/');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/namedb/');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/usr/sbin/rndc reload');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (21, 'system', 'binddefaultzone', 'default.zone');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '1.2.16');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
-@@ -411,11 +411,11 @@
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (28, 'panel', 'standardlanguage', 'English');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (29, 'system', 'mysql_access_host', 'localhost');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (30, 'panel', 'pathedit', 'Manual');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (31, 'system', 'apacheconf_filename', 'vhosts.conf');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (31, 'system', 'apacheconf_filename', 'extra/syscp-vhosts.conf');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (32, 'system', 'lastcronrun', '');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (33, 'panel', 'paging', '20');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (34, 'system', 'defaultip', '0');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (35, 'system', 'apacheversion', 'apache1');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (35, 'system', 'apacheversion', 'apache2');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (36, 'system', 'phpappendopenbasedir', '/tmp/');
- 
- # --------------------------------------------------------
-diff -Naur syscp.orig/scripts/cron_tasks.php syscp/scripts/cron_tasks.php
---- syscp.orig/scripts/cron_tasks.php	Fri Feb  2 14:10:26 2007
-+++ syscp/scripts/cron_tasks.php	Mon Apr  2 16:27:04 2007
-@@ -211,7 +211,7 @@
- 			{
- 				safe_exec('mkdir -p '.escapeshellarg($settings['system']['documentroot_prefix'].$row['data']['loginname'].'/webalizer'));
- 				safe_exec('mkdir -p '.escapeshellarg($settings['system']['vmail_homedir'].$row['data']['loginname']));
--				safe_exec('cp -a '.$pathtophpfiles.'/templates/misc/standardcustomer/* '.escapeshellarg($settings['system']['documentroot_prefix'].$row['data']['loginname'].'/'));
-+				safe_exec('cp -Rp '.$pathtophpfiles.'/templates/misc/standardcustomer/* '.escapeshellarg($settings['system']['documentroot_prefix'].$row['data']['loginname'].'/'));
- 				safe_exec('chown -R '.(int)$row['data']['uid'].':'.(int)$row['data']['gid'].' '.escapeshellarg($settings['system']['documentroot_prefix'].$row['data']['loginname']));
- 				safe_exec('chown -R '.(int)$settings['system']['vmail_uid'].':'.(int)$settings['system']['vmail_gid'].' '.escapeshellarg($settings['system']['vmail_homedir'].$row['data']['loginname']));
- 			}
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone syscp/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone
---- syscp.orig/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone	Mon Apr  2 10:44:48 2007
-@@ -0,0 +1,21 @@
-+$TTL 1W 
-+@ IN SOA ns root ( 
-+	2004060501 ; serial 
-+	8H ; refresh 
-+	2H ; retry 
-+	1W ; expiry 
-+	11h) ; minimum 
-+
-+        IN      NS      ns 
-+        IN      MX      10 mail 
-+
-+	IN      A       <SERVERIP> 
-+	IN      MX      10 mail 
-+
-+*       IN      A       <SERVERIP>
-+        IN      MX      10 mail 
-+
-+ns      IN      A       <SERVERIP> 
-+
-+mail    IN      A       <SERVERIP>
-+        IN      MX      10 mail 
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp syscp/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp
---- syscp.orig/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp	Mon Apr  2 10:44:48 2007
-@@ -0,0 +1,8 @@
-+#
-+# Set PATH, otherwise restart-scripts won't find start-stop-daemon
-+#
-+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-+#
-+# Regular cron jobs for the syscp package
-+#
-+*/5 * * * *	/usr/local/bin/php -q -c /usr/local/etc/syscpcron /usr/local/www/syscp/scripts/cronscript.php
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/cron/etc_php4_syscpcron_php.ini syscp/templates/misc/configfiles/freebsd_release/cron/etc_php4_syscpcron_php.ini
---- syscp.orig/templates/misc/configfiles/freebsd_release/cron/etc_php4_syscpcron_php.ini	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/cron/etc_php4_syscpcron_php.ini	Mon Apr  2 10:44:48 2007
-@@ -0,0 +1,1314 @@
-+[PHP]
-+
-+;;;;;;;;;;;;;;;;;;;
-+; About php.ini   ;
-+;;;;;;;;;;;;;;;;;;;
-+; This file controls many aspects of PHP's behavior.  In order for PHP to
-+; read it, it must be named 'php.ini'.  PHP looks for it in the current
-+; working directory, in the path designated by the environment variable
-+; PHPRC, and in the path that was defined in compile time (in that order).
-+; Under Windows, the compile-time path is the Windows directory.  The
-+; path in which the php.ini file is looked for can be overridden using
-+; the -c argument in command line mode.
-+;
-+; The syntax of the file is extremely simple.  Whitespace and Lines
-+; beginning with a semicolon are silently ignored (as you probably guessed).
-+; Section headers (e.g. [Foo]) are also silently ignored, even though
-+; they might mean something in the future.
-+;
-+; Directives are specified using the following syntax:
-+; directive = value
-+; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-+;
-+; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
-+; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
-+; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo").
-+;
-+; Expressions in the INI file are limited to bitwise operators and parentheses:
-+; |        bitwise OR
-+; &        bitwise AND
-+; ~        bitwise NOT
-+; !        boolean NOT
-+;
-+; Boolean flags can be turned on using the values 1, On, True or Yes.
-+; They can be turned off using the values 0, Off, False or No.
-+;
-+; An empty string can be denoted by simply not writing anything after the equal
-+; sign, or by using the None keyword:
-+;
-+;  foo =         ; sets foo to an empty string
-+;  foo = none    ; sets foo to an empty string
-+;  foo = "none"  ; sets foo to the string 'none'
-+;
-+; If you use constants in your value, and these constants belong to a
-+; dynamically loaded extension (either a PHP extension or a Zend extension),
-+; you may only use these constants *after* the line that loads the extension.
-+; 
-+;
-+;;;;;;;;;;;;;;;;;;;
-+; About this file ;
-+;;;;;;;;;;;;;;;;;;;
-+; This is the recommended, PHP 5-style version of the php.ini-dist file.  It
-+; sets some non standard settings, that make PHP more efficient, more secure,
-+; and encourage cleaner coding.
-+;
-+; The price is that with these settings, PHP may be incompatible with some
-+; applications, and sometimes, more difficult to develop with.  Using this
-+; file is warmly recommended for production sites.  As all of the changes from
-+; the standard settings are thoroughly documented, you can go over each one,
-+; and decide whether you want to use it or not.
-+;
-+; For general information about the php.ini file, please consult the php.ini-dist
-+; file, included in your PHP distribution.
-+;
-+; This file is different from the php.ini-dist file in the fact that it features
-+; different values for several directives, in order to improve performance, while
-+; possibly breaking compatibility with the standard out-of-the-box behavior of
-+; PHP.  Please make sure you read what's different, and modify your scripts
-+; accordingly, if you decide to use this file instead.
-+;
-+; - register_long_arrays = Off     [Performance]
-+;     Disables registration of the older (and deprecated) long predefined array
-+;     variables ($HTTP_*_VARS).  Instead, use the superglobals that were
-+;     introduced in PHP 4.1.0
-+; - display_errors = Off           [Security]
-+;     With this directive set to off, errors that occur during the execution of
-+;     scripts will no longer be displayed as a part of the script output, and thus,
-+;     will no longer be exposed to remote users.  With some errors, the error message
-+;     content may expose information about your script, web server, or database
-+;     server that may be exploitable for hacking.  Production sites should have this
-+;     directive set to off.
-+; - log_errors = On                [Security]
-+;     This directive complements the above one.  Any errors that occur during the
-+;     execution of your script will be logged (typically, to your server's error log,
-+;     but can be configured in several ways).  Along with setting display_errors to off,
-+;     this setup gives you the ability to fully understand what may have gone wrong,
-+;     without exposing any sensitive information to remote users.
-+; - output_buffering = 4096        [Performance]
-+;     Set a 4KB output buffer.  Enabling output buffering typically results in less
-+;     writes, and sometimes less packets sent on the wire, which can often lead to
-+;     better performance.  The gain this directive actually yields greatly depends
-+;     on which Web server you're working with, and what kind of scripts you're using.
-+; - register_argc_argv = Off       [Performance]
-+;     Disables registration of the somewhat redundant $argv and $argc global
-+;     variables.
-+; - magic_quotes_gpc = Off         [Performance]
-+;     Input data is no longer escaped with slashes so that it can be sent into
-+;     SQL databases without further manipulation.  Instead, you should use the
-+;     function addslashes() on each input element you wish to send to a database.
-+; - variables_order = "GPCS"       [Performance]
-+;     The environment variables are not hashed into the $_ENV.  To access
-+;     environment variables, you can use getenv() instead.
-+; - error_reporting = E_ALL        [Code Cleanliness, Security(?)]
-+;     By default, PHP suppresses errors of type E_NOTICE.  These error messages
-+;     are emitted for non-critical errors, but that could be a symptom of a bigger
-+;     problem.  Most notably, this will cause error messages about the use
-+;     of uninitialized variables to be displayed.
-+; - allow_call_time_pass_reference = Off     [Code cleanliness]
-+;     It's not possible to decide to force a variable to be passed by reference
-+;     when calling a function.  The PHP 4 style to do this is by making the
-+;     function require the relevant argument by reference.
-+
-+;;;;;;;;;;;;;;;;;;;;
-+; Language Options ;
-+;;;;;;;;;;;;;;;;;;;;
-+
-+; Enable the PHP scripting language engine under Apache.
-+engine = On
-+
-+; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
-+zend.ze1_compatibility_mode = Off
-+
-+; Allow the <? tag.  Otherwise, only <?php and <script> tags are recognized.
-+; NOTE: Using short tags should be avoided when developing applications or
-+; libraries that are meant for redistribution, or deployment on PHP
-+; servers which are not under your control, because short tags may not
-+; be supported on the target server. For portable, redistributable code,
-+; be sure not to use short tags.
-+short_open_tag = On
-+
-+; Allow ASP-style <% %> tags.
-+asp_tags = Off
-+
-+; The number of significant digits displayed in floating point numbers.
-+precision    =  14
-+
-+; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
-+y2k_compliance = On
-+
-+; Output buffering allows you to send header lines (including cookies) even
-+; after you send body content, at the price of slowing PHP's output layer a
-+; bit.  You can enable output buffering during runtime by calling the output
-+; buffering functions.  You can also enable output buffering for all files by
-+; setting this directive to On.  If you wish to limit the size of the buffer
-+; to a certain size - you can use a maximum number of bytes instead of 'On', as
-+; a value for this directive (e.g., output_buffering=4096).
-+output_buffering = 4096
-+
-+; You can redirect all of the output of your scripts to a function.  For
-+; example, if you set output_handler to "mb_output_handler", character
-+; encoding will be transparently converted to the specified encoding.
-+; Setting any output handler automatically turns on output buffering.
-+; Note: People who wrote portable scripts should not depend on this ini
-+;       directive. Instead, explicitly set the output handler using ob_start().
-+;       Using this ini directive may cause problems unless you know what script
-+;       is doing.
-+; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-+;       and you cannot use both "ob_gzhandler" and "zlib.output_compression".
-+; Note: output_handler must be empty if this is set 'On' !!!!
-+;       Instead you must use zlib.output_handler.
-+;output_handler =
-+
-+; Transparent output compression using the zlib library
-+; Valid values for this option are 'off', 'on', or a specific buffer size
-+; to be used for compression (default is 4KB)
-+; Note: Resulting chunk size may vary due to nature of compression. PHP
-+;       outputs chunks that are few hundreds bytes each as a result of
-+;       compression. If you prefer a larger chunk size for better
-+;       performance, enable output_buffering in addition.
-+; Note: You need to use zlib.output_handler instead of the standard
-+;       output_handler, or otherwise the output will be corrupted.
-+zlib.output_compression = Off
-+;zlib.output_compression_level = -1
-+
-+; You cannot specify additional output handlers if zlib.output_compression
-+; is activated here. This setting does the same as output_handler but in
-+; a different order.
-+;zlib.output_handler =
-+
-+; Implicit flush tells PHP to tell the output layer to flush itself
-+; automatically after every output block.  This is equivalent to calling the
-+; PHP function flush() after each and every call to print() or echo() and each
-+; and every HTML block.  Turning this option on has serious performance
-+; implications and is generally recommended for debugging purposes only.
-+implicit_flush = Off
-+
-+; The unserialize callback function will be called (with the undefined class'
-+; name as parameter), if the unserializer finds an undefined class
-+; which should be instantiated.
-+; A warning appears if the specified function is not defined, or if the
-+; function doesn't include/implement the missing class.
-+; So only set this entry, if you really want to implement such a
-+; callback-function.
-+unserialize_callback_func=
-+
-+; When floats & doubles are serialized store serialize_precision significant
-+; digits after the floating point. The default value ensures that when floats
-+; are decoded with unserialize, the data will remain the same.
-+serialize_precision = 100
-+
-+; Whether to enable the ability to force arguments to be passed by reference
-+; at function call time.  This method is deprecated and is likely to be
-+; unsupported in future versions of PHP/Zend.  The encouraged method of
-+; specifying which arguments should be passed by reference is in the function
-+; declaration.  You're encouraged to try and turn this option Off and make
-+; sure your scripts work properly with it in order to ensure they will work
-+; with future versions of the language (you will receive a warning each time
-+; you use this feature, and the argument will be passed by value instead of by
-+; reference).
-+allow_call_time_pass_reference = Off
-+
-+;
-+; Safe Mode
-+;
-+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
-+; the PHP Safe Mode feature not be relied upon for security, since the
-+; issues Safe Mode tries to handle cannot properly be handled in PHP
-+; (primarily due to PHP's use of external libraries).  While many bugs
-+; in Safe Mode has been fixed it's very likely that more issues exist
-+; which allows a user to bypass Safe Mode restrictions.
-+; For increased security we recommend to always install the Suhosin
-+; extension.
-+;
-+safe_mode = Off
-+
-+; By default, Safe Mode does a UID compare check when
-+; opening files. If you want to relax this to a GID compare,
-+; then turn on safe_mode_gid.
-+safe_mode_gid = Off
-+
-+; When safe_mode is on, UID/GID checks are bypassed when
-+; including files from this directory and its subdirectories.
-+; (directory must also be in include_path or full path must
-+; be used when including)
-+safe_mode_include_dir =
-+
-+; When safe_mode is on, only executables located in the safe_mode_exec_dir
-+; will be allowed to be executed via the exec family of functions.
-+safe_mode_exec_dir =
-+
-+; Setting certain environment variables may be a potential security breach.
-+; This directive contains a comma-delimited list of prefixes.  In Safe Mode,
-+; the user may only alter environment variables whose names begin with the
-+; prefixes supplied here.  By default, users will only be able to set
-+; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR).
-+;
-+; Note:  If this directive is empty, PHP will let the user modify ANY
-+; environment variable!
-+safe_mode_allowed_env_vars = PHP_
-+
-+; This directive contains a comma-delimited list of environment variables that
-+; the end user won't be able to change using putenv().  These variables will be
-+; protected even if safe_mode_allowed_env_vars is set to allow to change them.
-+safe_mode_protected_env_vars = LD_LIBRARY_PATH
-+
-+; open_basedir, if set, limits all file operations to the defined directory
-+; and below.  This directive makes most sense if used in a per-directory
-+; or per-virtualhost web server configuration file. This directive is
-+; *NOT* affected by whether Safe Mode is turned On or Off.
-+;open_basedir =
-+
-+; This directive allows you to disable certain functions for security reasons.
-+; It receives a comma-delimited list of function names. This directive is
-+; *NOT* affected by whether Safe Mode is turned On or Off.
-+disable_functions =
-+
-+; This directive allows you to disable certain classes for security reasons.
-+; It receives a comma-delimited list of class names. This directive is
-+; *NOT* affected by whether Safe Mode is turned On or Off.
-+disable_classes =
-+
-+; Colors for Syntax Highlighting mode.  Anything that's acceptable in
-+; <span style="color: ???????"> would work.
-+;highlight.string  = #DD0000
-+;highlight.comment = #FF9900
-+;highlight.keyword = #007700
-+;highlight.bg      = #FFFFFF
-+;highlight.default = #0000BB
-+;highlight.html    = #000000
-+
-+; If enabled, the request will be allowed to complete even if the user aborts
-+; the request. Consider enabling it if executing long request, which may end up
-+; being interrupted by the user or a browser timing out.
-+; ignore_user_abort = On
-+
-+; Determines the size of the realpath cache to be used by PHP. This value should
-+; be increased on systems where PHP opens many files to reflect the quantity of
-+; the file operations performed.
-+; realpath_cache_size=16k
-+
-+; Duration of time, in seconds for which to cache realpath information for a given
-+; file or directory. For systems with rarely changing files, consider increasing this
-+; value.
-+; realpath_cache_ttl=120
-+
-+;
-+; Misc
-+;
-+; Decides whether PHP may expose the fact that it is installed on the server
-+; (e.g. by adding its signature to the Web server header).  It is no security
-+; threat in any way, but it makes it possible to determine whether you use PHP
-+; on your server or not.
-+expose_php = On
-+
-+
-+;;;;;;;;;;;;;;;;;;;
-+; Resource Limits ;
-+;;;;;;;;;;;;;;;;;;;
-+
-+max_execution_time = 30     ; Maximum execution time of each script, in seconds
-+max_input_time = 60	; Maximum amount of time each script may spend parsing request data
-+memory_limit = 128M      ; Maximum amount of memory a script may consume (128MB)
-+
-+
-+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-+; Error handling and logging ;
-+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-+
-+; error_reporting is a bit-field.  Or each number up to get desired error
-+; reporting level
-+; E_ALL             - All errors and warnings (doesn't include E_STRICT)
-+; E_ERROR           - fatal run-time errors
-+; E_RECOVERABLE_ERROR  - almost fatal run-time errors
-+; E_WARNING         - run-time warnings (non-fatal errors)
-+; E_PARSE           - compile-time parse errors
-+; E_NOTICE          - run-time notices (these are warnings which often result
-+;                     from a bug in your code, but it's possible that it was
-+;                     intentional (e.g., using an uninitialized variable and
-+;                     relying on the fact it's automatically initialized to an
-+;                     empty string)
-+; E_STRICT          - run-time notices, enable to have PHP suggest changes
-+;                     to your code which will ensure the best interoperability
-+;                     and forward compatibility of your code
-+; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
-+; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
-+;                     initial startup
-+; E_COMPILE_ERROR   - fatal compile-time errors
-+; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-+; E_USER_ERROR      - user-generated error message
-+; E_USER_WARNING    - user-generated warning message
-+; E_USER_NOTICE     - user-generated notice message
-+;
-+; Examples:
-+;
-+;   - Show all errors, except for notices and coding standards warnings
-+;
-+;error_reporting = E_ALL & ~E_NOTICE
-+;
-+;   - Show all errors, except for notices
-+;
-+;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
-+;
-+;   - Show only errors
-+;
-+;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
-+;
-+;   - Show all errors, except coding standards warnings
-+;
-+error_reporting  =  E_ALL
-+
-+; Print out errors (as a part of the output).  For production web sites,
-+; you're strongly encouraged to turn this feature off, and use error logging
-+; instead (see below).  Keeping display_errors enabled on a production web site
-+; may reveal security information to end users, such as file paths on your Web
-+; server, your database schema or other information.
-+display_errors = Off
-+
-+; Even when display_errors is on, errors that occur during PHP's startup
-+; sequence are not displayed.  It's strongly recommended to keep
-+; display_startup_errors off, except for when debugging.
-+display_startup_errors = Off
-+
-+; Log errors into a log file (server-specific log, stderr, or error_log (below))
-+; As stated above, you're strongly advised to use error logging in place of
-+; error displaying on production web sites.
-+log_errors = On
-+
-+; Set maximum length of log_errors. In error_log information about the source is
-+; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-+log_errors_max_len = 1024
-+
-+; Do not log repeated messages. Repeated errors must occur in same file on same
-+; line until ignore_repeated_source is set true.
-+ignore_repeated_errors = Off
-+
-+; Ignore source of message when ignoring repeated messages. When this setting
-+; is On you will not log errors with repeated messages from different files or
-+; source lines.
-+ignore_repeated_source = Off
-+
-+; If this parameter is set to Off, then memory leaks will not be shown (on
-+; stdout or in the log). This has only effect in a debug compile, and if
-+; error reporting includes E_WARNING in the allowed list
-+report_memleaks = On
-+
-+;report_zend_debug = 0
-+
-+; Store the last error/warning message in $php_errormsg (boolean).
-+track_errors = Off
-+
-+; Disable the inclusion of HTML tags in error messages.
-+; Note: Never use this feature for production boxes.
-+;html_errors = Off
-+
-+; If html_errors is set On PHP produces clickable error messages that direct
-+; to a page describing the error or function causing the error in detail.
-+; You can download a copy of the PHP manual from http://www.php.net/docs.php
-+; and change docref_root to the base URL of your local copy including the
-+; leading '/'. You must also specify the file extension being used including
-+; the dot.
-+; Note: Never use this feature for production boxes.
-+;docref_root = "/phpmanual/"
-+;docref_ext = .html
-+
-+; String to output before an error message.
-+;error_prepend_string = "<font color=ff0000>"
-+
-+; String to output after an error message.
-+;error_append_string = "</font>"
-+
-+; Log errors to specified file.
-+;error_log = filename
-+
-+; Log errors to syslog (Event Log on NT, not valid in Windows 95).
-+;error_log = syslog
-+
-+
-+;;;;;;;;;;;;;;;;;
-+; Data Handling ;
-+;;;;;;;;;;;;;;;;;
-+;
-+; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
-+
-+; The separator used in PHP generated URLs to separate arguments.
-+; Default is "&".
-+;arg_separator.output = "&amp;"
-+
-+; List of separator(s) used by PHP to parse input URLs into variables.
-+; Default is "&".
-+; NOTE: Every character in this directive is considered as separator!
-+;arg_separator.input = ";&"
-+
-+; This directive describes the order in which PHP registers GET, POST, Cookie,
-+; Environment and Built-in variables (G, P, C, E & S respectively, often
-+; referred to as EGPCS or GPC).  Registration is done from left to right, newer
-+; values override older values.
-+variables_order = "GPCS"
-+
-+; Whether or not to register the EGPCS variables as global variables.  You may
-+; want to turn this off if you don't want to clutter your scripts' global scope
-+; with user data.  This makes most sense when coupled with track_vars - in which
-+; case you can access all of the GPC variables through the $HTTP_*_VARS[],
-+; variables.
-+;
-+; You should do your best to write your scripts so that they do not require
-+; register_globals to be on;  Using form variables as globals can easily lead
-+; to possible security problems, if the code is not very well thought of.
-+register_globals = Off
-+
-+; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-+; and friends.  If you're not using them, it's recommended to turn them off,
-+; for performance reasons.
-+register_long_arrays = Off
-+
-+; This directive tells PHP whether to declare the argv&argc variables (that
-+; would contain the GET information).  If you don't use these variables, you
-+; should turn it off for increased performance.
-+register_argc_argv = Off
-+
-+; When enabled, the SERVER and ENV variables are created when they're first
-+; used (Just In Time) instead of when the script starts. If these variables
-+; are not used within a script, having this directive on will result in a
-+; performance gain. The PHP directives register_globals, register_long_arrays,
-+; and register_argc_argv must be disabled for this directive to have any affect.
-+auto_globals_jit = On
-+
-+; Maximum size of POST data that PHP will accept.
-+post_max_size = 8M
-+
-+; Magic quotes
-+;
-+
-+; Magic quotes for incoming GET/POST/Cookie data.
-+magic_quotes_gpc = Off
-+
-+; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-+magic_quotes_runtime = Off
-+
-+; Use Sybase-style magic quotes (escape ' with '' instead of \').
-+magic_quotes_sybase = Off
-+
-+; Automatically add files before or after any PHP document.
-+auto_prepend_file =
-+auto_append_file =
-+
-+; As of 4.0b4, PHP always outputs a character encoding by default in
-+; the Content-type: header.  To disable sending of the charset, simply
-+; set it to be empty.
-+;
-+; PHP's built-in default is text/html
-+default_mimetype = "text/html"
-+;default_charset = "iso-8859-1"
-+
-+; Always populate the $HTTP_RAW_POST_DATA variable.
-+;always_populate_raw_post_data = On
-+
-+
-+;;;;;;;;;;;;;;;;;;;;;;;;;
-+; Paths and Directories ;
-+;;;;;;;;;;;;;;;;;;;;;;;;;
-+
-+; UNIX: "/path1:/path2"
-+include_path = ".:/usr/local/share/pear:/usr/local/share/smarty"
-+;
-+; Windows: "\path1;\path2"
-+;include_path = ".;c:\php\includes"
-+
-+; The root of the PHP pages, used only if nonempty.
-+; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-+; if you are running php as a CGI under any web server (other than IIS)
-+; see documentation for security issues.  The alternate is to use the
-+; cgi.force_redirect configuration below
-+doc_root =
-+
-+; The directory under which PHP opens the script using /~username used only
-+; if nonempty.
-+user_dir =
-+
-+; Directory in which the loadable extensions (modules) reside.
-+; extension_dir = "./"
-+
-+; Whether or not to enable the dl() function.  The dl() function does NOT work
-+; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-+; disabled on them.
-+enable_dl = On
-+
-+; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-+; most web servers.  Left undefined, PHP turns this on by default.  You can
-+; turn it off here AT YOUR OWN RISK
-+; **You CAN safely turn this off for IIS, in fact, you MUST.**
-+; cgi.force_redirect = 1
-+
-+; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
-+; every request.
-+; cgi.nph = 1
-+
-+; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
-+; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
-+; will look for to know it is OK to continue execution.  Setting this variable MAY
-+; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-+; cgi.redirect_status_env = ;
-+
-+; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
-+; security tokens of the calling client.  This allows IIS to define the
-+; security context that the request runs under.  mod_fastcgi under Apache
-+; does not currently support this feature (03/17/2002)
-+; Set to 1 if running under IIS.  Default is zero.
-+; fastcgi.impersonate = 1;
-+
-+; Disable logging through FastCGI connection
-+; fastcgi.log = 0
-+
-+; cgi.rfc2616_headers configuration option tells PHP what type of headers to
-+; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
-+; is supported by Apache. When this option is set to 1 PHP will send
-+; RFC2616 compliant header.
-+; Default is zero.
-+;cgi.rfc2616_headers = 0
-+
-+
-+;;;;;;;;;;;;;;;;
-+; File Uploads ;
-+;;;;;;;;;;;;;;;;
-+
-+; Whether to allow HTTP file uploads.
-+file_uploads = On
-+
-+; Temporary directory for HTTP uploaded files (will use system default if not
-+; specified).
-+;upload_tmp_dir =
-+
-+; Maximum allowed size for uploaded files.
-+upload_max_filesize = 2M
-+
-+
-+;;;;;;;;;;;;;;;;;;
-+; Fopen wrappers ;
-+;;;;;;;;;;;;;;;;;;
-+
-+; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-+allow_url_fopen = On
-+
-+; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
-+allow_url_include = Off
-+
-+; Define the anonymous ftp password (your email address)
-+;from="john@doe.com"
-+
-+; Define the User-Agent string
-+; user_agent="PHP"
-+
-+; Default timeout for socket based streams (seconds)
-+default_socket_timeout = 60
-+
-+; If your scripts have to deal with files from Macintosh systems,
-+; or you are running on a Mac and need to deal with files from
-+; unix or win32 systems, setting this flag will cause PHP to
-+; automatically detect the EOL character in those files so that
-+; fgets() and file() will work regardless of the source of the file.
-+; auto_detect_line_endings = Off
-+
-+
-+;;;;;;;;;;;;;;;;;;;;;;
-+; Dynamic Extensions ;
-+;;;;;;;;;;;;;;;;;;;;;;
-+;
-+; If you wish to have an extension loaded automatically, use the following
-+; syntax:
-+;
-+;   extension=modulename.extension
-+;
-+; For example, on Windows:
-+;
-+;   extension=msql.dll
-+;
-+; ... or under UNIX:
-+;
-+;   extension=msql.so
-+;
-+; Note that it should be the name of the module only; no directory information
-+; needs to go here.  Specify the location of the extension with the
-+; extension_dir directive above.
-+
-+
-+; Windows Extensions
-+; Note that ODBC support is built in, so no dll is needed for it.
-+; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-+; extension folders as well as the separate PECL DLL download (PHP 5).
-+; Be sure to appropriately set the extension_dir directive.
-+
-+;extension=php_bz2.dll
-+;extension=php_curl.dll
-+;extension=php_dba.dll
-+;extension=php_dbase.dll
-+;extension=php_exif.dll
-+;extension=php_fdf.dll
-+;extension=php_gd2.dll
-+;extension=php_gettext.dll
-+;extension=php_gmp.dll
-+;extension=php_ifx.dll
-+;extension=php_imap.dll
-+;extension=php_interbase.dll
-+;extension=php_ldap.dll
-+;extension=php_mbstring.dll
-+;extension=php_mcrypt.dll
-+;extension=php_mhash.dll
-+;extension=php_mime_magic.dll
-+;extension=php_ming.dll
-+;extension=php_msql.dll
-+;extension=php_mssql.dll
-+;extension=php_mysql.dll
-+;extension=php_mysqli.dll
-+;extension=php_oci8.dll
-+;extension=php_openssl.dll
-+;extension=php_pdo.dll
-+;extension=php_pdo_firebird.dll
-+;extension=php_pdo_mssql.dll
-+;extension=php_pdo_mysql.dll
-+;extension=php_pdo_oci.dll
-+;extension=php_pdo_oci8.dll
-+;extension=php_pdo_odbc.dll
-+;extension=php_pdo_pgsql.dll
-+;extension=php_pdo_sqlite.dll
-+;extension=php_pgsql.dll
-+;extension=php_pspell.dll
-+;extension=php_shmop.dll
-+;extension=php_snmp.dll
-+;extension=php_soap.dll
-+;extension=php_sockets.dll
-+;extension=php_sqlite.dll
-+;extension=php_sybase_ct.dll
-+;extension=php_tidy.dll
-+;extension=php_xmlrpc.dll
-+;extension=php_xsl.dll
-+;extension=php_zip.dll
-+
-+;;;;;;;;;;;;;;;;;;;
-+; Module Settings ;
-+;;;;;;;;;;;;;;;;;;;
-+
-+[Date]
-+; Defines the default timezone used by the date functions
-+;date.timezone =
-+
-+;date.default_latitude = 31.7667
-+;date.default_longitude = 35.2333
-+
-+;date.sunrise_zenith = 90.583333
-+;date.sunset_zenith = 90.583333
-+
-+[filter]
-+;filter.default = unsafe_raw
-+;filter.default_flags =
-+
-+[iconv]
-+;iconv.input_encoding = ISO-8859-1
-+;iconv.internal_encoding = ISO-8859-1
-+;iconv.output_encoding = ISO-8859-1
-+
-+[sqlite]
-+;sqlite.assoc_case = 0
-+
-+[xmlrpc]
-+;xmlrpc_error_number = 0
-+;xmlrpc_errors = 0
-+
-+[Pcre]
-+;pcre.recursion_limit=100000
-+;pcre.backtrack_limit=100000
-+
-+[Syslog]
-+; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-+; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
-+; runtime, you can define these variables by calling define_syslog_variables().
-+define_syslog_variables  = Off
-+
-+[mail function]
-+; For Win32 only.
-+SMTP = localhost
-+smtp_port = 25
-+
-+; For Win32 only.
-+;sendmail_from = me@example.com
-+
-+; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
-+;sendmail_path =
-+
-+; Force the addition of the specified parameters to be passed as extra parameters
-+; to the sendmail binary. These parameters will always replace the value of
-+; the 5th parameter to mail(), even in safe mode.
-+;mail.force_extra_parameters =
-+
-+[SQL]
-+sql.safe_mode = Off
-+
-+[ODBC]
-+;odbc.default_db    =  Not yet implemented
-+;odbc.default_user  =  Not yet implemented
-+;odbc.default_pw    =  Not yet implemented
-+
-+; Allow or prevent persistent links.
-+odbc.allow_persistent = On
-+
-+; Check that a connection is still valid before reuse.
-+odbc.check_persistent = On
-+
-+; Maximum number of persistent links.  -1 means no limit.
-+odbc.max_persistent = -1
-+
-+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-+odbc.max_links = -1
-+
-+; Handling of LONG fields.  Returns number of bytes to variables.  0 means
-+; passthru.
-+odbc.defaultlrl = 4096
-+
-+; Handling of binary data.  0 means passthru, 1 return as is, 2 convert to char.
-+; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-+; of uodbc.defaultlrl and uodbc.defaultbinmode
-+odbc.defaultbinmode = 1
-+
-+[MySQL]
-+; Allow or prevent persistent links.
-+mysql.allow_persistent = On
-+
-+; Maximum number of persistent links.  -1 means no limit.
-+mysql.max_persistent = -1
-+
-+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-+mysql.max_links = -1
-+
-+; Default port number for mysql_connect().  If unset, mysql_connect() will use
-+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-+; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
-+; at MYSQL_PORT.
-+mysql.default_port =
-+
-+; Default socket name for local MySQL connects.  If empty, uses the built-in
-+; MySQL defaults.
-+mysql.default_socket =
-+
-+; Default host for mysql_connect() (doesn't apply in safe mode).
-+mysql.default_host =
-+
-+; Default user for mysql_connect() (doesn't apply in safe mode).
-+mysql.default_user =
-+
-+; Default password for mysql_connect() (doesn't apply in safe mode).
-+; Note that this is generally a *bad* idea to store passwords in this file.
-+; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password")
-+; and reveal this password!  And of course, any users with read access to this
-+; file will be able to reveal the password as well.
-+mysql.default_password =
-+
-+; Maximum time (in seconds) for connect timeout. -1 means no limit
-+mysql.connect_timeout = 60
-+
-+; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
-+; SQL-Errors will be displayed.
-+mysql.trace_mode = Off
-+
-+[MySQLi]
-+
-+; Maximum number of links.  -1 means no limit.
-+mysqli.max_links = -1
-+
-+; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
-+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-+; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
-+; at MYSQL_PORT.
-+mysqli.default_port = 3306
-+
-+; Default socket name for local MySQL connects.  If empty, uses the built-in
-+; MySQL defaults.
-+mysqli.default_socket =
-+
-+; Default host for mysql_connect() (doesn't apply in safe mode).
-+mysqli.default_host =
-+
-+; Default user for mysql_connect() (doesn't apply in safe mode).
-+mysqli.default_user =
-+
-+; Default password for mysqli_connect() (doesn't apply in safe mode).
-+; Note that this is generally a *bad* idea to store passwords in this file.
-+; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
-+; and reveal this password!  And of course, any users with read access to this
-+; file will be able to reveal the password as well.
-+mysqli.default_pw =
-+
-+; Allow or prevent reconnect
-+mysqli.reconnect = Off
-+
-+[mSQL]
-+; Allow or prevent persistent links.
-+msql.allow_persistent = On
-+
-+; Maximum number of persistent links.  -1 means no limit.
-+msql.max_persistent = -1
-+
-+; Maximum number of links (persistent+non persistent).  -1 means no limit.
-+msql.max_links = -1
-+
-+[OCI8]
-+; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA)
-+;oci8.privileged_connect = Off
-+
-+; Connection: The maximum number of persistent OCI8 connections per
-+; process. Using -1 means no limit.
-+;oci8.max_persistent = -1
-+
-+; Connection: The maximum number of seconds a process is allowed to
-+; maintain an idle persistent connection. Using -1 means idle
-+; persistent connections will be maintained forever.
-+;oci8.persistent_timeout = -1
-+
-+; Connection: The number of seconds that must pass before issuing a
-+; ping during oci_pconnect() to check the connection validity. When
-+; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
-+; pings completely.
-+;oci8.ping_interval = 60
-+
-+; Tuning: This option enables statement caching, and specifies how
-+; many statements to cache. Using 0 disables statement caching.
-+;oci8.statement_cache_size = 20
-+
-+; Tuning: Enables statement prefetching and sets the default number of
-+; rows that will be fetched automatically after statement execution.
-+;oci8.default_prefetch = 10
-+
-+; Compatibility. Using On means oci_close() will not close
-+; oci_connect() and oci_new_connect() connections.
-+;oci8.old_oci_close_semantics = Off
-+
-+[PostgresSQL]
-+; Allow or prevent persistent links.
-+pgsql.allow_persistent = On
-+
-+; Detect broken persistent links always with pg_pconnect().
-+; Auto reset feature requires a little overheads.
-+pgsql.auto_reset_persistent = Off
-+
-+; Maximum number of persistent links.  -1 means no limit.
-+pgsql.max_persistent = -1
-+
-+; Maximum number of links (persistent+non persistent).  -1 means no limit.
-+pgsql.max_links = -1
-+
-+; Ignore PostgreSQL backends Notice message or not.
-+; Notice message logging require a little overheads.
-+pgsql.ignore_notice = 0
-+
-+; Log PostgreSQL backends Noitce message or not.
-+; Unless pgsql.ignore_notice=0, module cannot log notice message.
-+pgsql.log_notice = 0
-+
-+[Sybase]
-+; Allow or prevent persistent links.
-+sybase.allow_persistent = On
-+
-+; Maximum number of persistent links.  -1 means no limit.
-+sybase.max_persistent = -1
-+
-+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-+sybase.max_links = -1
-+
-+;sybase.interface_file = "/usr/sybase/interfaces"
-+
-+; Minimum error severity to display.
-+sybase.min_error_severity = 10
-+
-+; Minimum message severity to display.
-+sybase.min_message_severity = 10
-+
-+; Compatibility mode with old versions of PHP 3.0.
-+; If on, this will cause PHP to automatically assign types to results according
-+; to their Sybase type, instead of treating them all as strings.  This
-+; compatibility mode will probably not stay around forever, so try applying
-+; whatever necessary changes to your code, and turn it off.
-+sybase.compatability_mode = Off
-+
-+[Sybase-CT]
-+; Allow or prevent persistent links.
-+sybct.allow_persistent = On
-+
-+; Maximum number of persistent links.  -1 means no limit.
-+sybct.max_persistent = -1
-+
-+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-+sybct.max_links = -1
-+
-+; Minimum server message severity to display.
-+sybct.min_server_severity = 10
-+
-+; Minimum client message severity to display.
-+sybct.min_client_severity = 10
-+
-+[bcmath]
-+; Number of decimal digits for all bcmath functions.
-+bcmath.scale = 0
-+
-+[browscap]
-+;browscap = extra/browscap.ini
-+
-+[Informix]
-+; Default host for ifx_connect() (doesn't apply in safe mode).
-+ifx.default_host =
-+
-+; Default user for ifx_connect() (doesn't apply in safe mode).
-+ifx.default_user =
-+
-+; Default password for ifx_connect() (doesn't apply in safe mode).
-+ifx.default_password =
-+
-+; Allow or prevent persistent links.
-+ifx.allow_persistent = On
-+
-+; Maximum number of persistent links.  -1 means no limit.
-+ifx.max_persistent = -1
-+
-+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-+ifx.max_links = -1
-+
-+; If on, select statements return the contents of a text blob instead of its id.
-+ifx.textasvarchar = 0
-+
-+; If on, select statements return the contents of a byte blob instead of its id.
-+ifx.byteasvarchar = 0
-+
-+; Trailing blanks are stripped from fixed-length char columns.  May help the
-+; life of Informix SE users.
-+ifx.charasvarchar = 0
-+
-+; If on, the contents of text and byte blobs are dumped to a file instead of
-+; keeping them in memory.
-+ifx.blobinfile = 0
-+
-+; NULL's are returned as empty strings, unless this is set to 1.  In that case,
-+; NULL's are returned as string 'NULL'.
-+ifx.nullformat = 0
-+
-+[Session]
-+; Handler used to store/retrieve data.
-+session.save_handler = files
-+
-+; Argument passed to save_handler.  In the case of files, this is the path
-+; where data files are stored. Note: Windows users have to change this
-+; variable in order to use PHP's session functions.
-+;
-+; As of PHP 4.0.1, you can define the path as:
-+;
-+;     session.save_path = "N;/path"
-+;
-+; where N is an integer.  Instead of storing all the session files in
-+; /path, what this will do is use subdirectories N-levels deep, and
-+; store the session data in those directories.  This is useful if you
-+; or your OS have problems with lots of files in one directory, and is
-+; a more efficient layout for servers that handle lots of sessions.
-+;
-+; NOTE 1: PHP will not create this directory structure automatically.
-+;         You can use the script in the ext/session dir for that purpose.
-+; NOTE 2: See the section on garbage collection below if you choose to
-+;         use subdirectories for session storage
-+;
-+; The file storage module creates files using mode 600 by default.
-+; You can change that by using
-+;
-+;     session.save_path = "N;MODE;/path"
-+;
-+; where MODE is the octal representation of the mode. Note that this
-+; does not overwrite the process's umask.
-+;session.save_path = "/tmp"
-+
-+; Whether to use cookies.
-+session.use_cookies = 1
-+
-+;session.cookie_secure =
-+
-+; This option enables administrators to make their users invulnerable to
-+; attacks which involve passing session ids in URLs; defaults to 0.
-+; session.use_only_cookies = 1
-+
-+; Name of the session (used as cookie name).
-+session.name = PHPSESSID
-+
-+; Initialize session on request startup.
-+session.auto_start = 0
-+
-+; Lifetime in seconds of cookie or, if 0, until browser is restarted.
-+session.cookie_lifetime = 0
-+
-+; The path for which the cookie is valid.
-+session.cookie_path = /
-+
-+; The domain for which the cookie is valid.
-+session.cookie_domain =
-+
-+; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
-+session.cookie_httponly = 
-+
-+; Handler used to serialize data.  php is the standard serializer of PHP.
-+session.serialize_handler = php
-+
-+; Define the probability that the 'garbage collection' process is started
-+; on every session initialization.
-+; The probability is calculated by using gc_probability/gc_divisor,
-+; e.g. 1/100 means there is a 1% chance that the GC process starts
-+; on each request.
-+
-+session.gc_probability = 1
-+session.gc_divisor     = 1000
-+
-+; After this number of seconds, stored data will be seen as 'garbage' and
-+; cleaned up by the garbage collection process.
-+session.gc_maxlifetime = 1440
-+
-+; NOTE: If you are using the subdirectory option for storing session files
-+;       (see session.save_path above), then garbage collection does *not*
-+;       happen automatically.  You will need to do your own garbage
-+;       collection through a shell script, cron entry, or some other method.
-+;       For example, the following script would is the equivalent of
-+;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-+;          cd /path/to/sessions; find -cmin +24 | xargs rm
-+
-+; PHP 4.2 and less have an undocumented feature/bug that allows you to
-+; to initialize a session variable in the global scope, albeit register_globals
-+; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
-+; You can disable the feature and the warning separately. At this time,
-+; the warning is only displayed, if bug_compat_42 is enabled.
-+
-+session.bug_compat_42 = 0
-+session.bug_compat_warn = 1
-+
-+; Check HTTP Referer to invalidate externally stored URLs containing ids.
-+; HTTP_REFERER has to contain this substring for the session to be
-+; considered as valid.
-+session.referer_check =
-+
-+; How many bytes to read from the file.
-+session.entropy_length = 0
-+
-+; Specified here to create the session id.
-+session.entropy_file =
-+
-+;session.entropy_length = 16
-+
-+;session.entropy_file = /dev/urandom
-+
-+; Set to {nocache,private,public,} to determine HTTP caching aspects
-+; or leave this empty to avoid sending anti-caching headers.
-+session.cache_limiter = nocache
-+
-+; Document expires after n minutes.
-+session.cache_expire = 180
-+
-+; trans sid support is disabled by default.
-+; Use of trans sid may risk your users security.
-+; Use this option with caution.
-+; - User may send URL contains active session ID
-+;   to other person via. email/irc/etc.
-+; - URL that contains active session ID may be stored
-+;   in publically accessible computer.
-+; - User may access your site with the same session ID
-+;   always using URL stored in browser's history or bookmarks.
-+session.use_trans_sid = 0
-+
-+; Select a hash function
-+; 0: MD5   (128 bits)
-+; 1: SHA-1 (160 bits)
-+session.hash_function = 0
-+
-+; Define how many bits are stored in each character when converting
-+; the binary hash data to something readable.
-+;
-+; 4 bits: 0-9, a-f
-+; 5 bits: 0-9, a-v
-+; 6 bits: 0-9, a-z, A-Z, "-", ","
-+session.hash_bits_per_character = 5
-+
-+; The URL rewriter will look for URLs in a defined set of HTML tags.
-+; form/fieldset are special; if you include them here, the rewriter will
-+; add a hidden <input> field with the info which is otherwise appended
-+; to URLs.  If you want XHTML conformity, remove the form entry.
-+; Note that all valid entries require a "=", even if no value follows.
-+url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
-+
-+[MSSQL]
-+; Allow or prevent persistent links.
-+mssql.allow_persistent = On
-+
-+; Maximum number of persistent links.  -1 means no limit.
-+mssql.max_persistent = -1
-+
-+; Maximum number of links (persistent+non persistent).  -1 means no limit.
-+mssql.max_links = -1
-+
-+; Minimum error severity to display.
-+mssql.min_error_severity = 10
-+
-+; Minimum message severity to display.
-+mssql.min_message_severity = 10
-+
-+; Compatibility mode with old versions of PHP 3.0.
-+mssql.compatability_mode = Off
-+
-+; Connect timeout
-+;mssql.connect_timeout = 5
-+
-+; Query timeout
-+;mssql.timeout = 60
-+
-+; Valid range 0 - 2147483647.  Default = 4096.
-+;mssql.textlimit = 4096
-+
-+; Valid range 0 - 2147483647.  Default = 4096.
-+;mssql.textsize = 4096
-+
-+; Limits the number of records in each batch.  0 = all records in one batch.
-+;mssql.batchsize = 0
-+
-+; Specify how datetime and datetim4 columns are returned
-+; On => Returns data converted to SQL server settings
-+; Off => Returns values as YYYY-MM-DD hh:mm:ss
-+;mssql.datetimeconvert = On
-+
-+; Use NT authentication when connecting to the server
-+mssql.secure_connection = Off
-+
-+; Specify max number of processes. -1 = library default
-+; msdlib defaults to 25
-+; FreeTDS defaults to 4096
-+;mssql.max_procs = -1
-+
-+; Specify client character set. 
-+; If empty or not set the client charset from freetds.comf is used
-+; This is only used when compiled with FreeTDS
-+;mssql.charset = "ISO-8859-1"
-+
-+[Assertion]
-+; Assert(expr); active by default.
-+;assert.active = On
-+
-+; Issue a PHP warning for each failed assertion.
-+;assert.warning = On
-+
-+; Don't bail out by default.
-+;assert.bail = Off
-+
-+; User-function to be called if an assertion fails.
-+;assert.callback = 0
-+
-+; Eval the expression with current error_reporting().  Set to true if you want
-+; error_reporting(0) around the eval().
-+;assert.quiet_eval = 0
-+
-+[COM]
-+; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-+;com.typelib_file =
-+; allow Distributed-COM calls
-+;com.allow_dcom = true
-+; autoregister constants of a components typlib on com_load()
-+;com.autoregister_typelib = true
-+; register constants casesensitive
-+;com.autoregister_casesensitive = false
-+; show warnings on duplicate constant registrations
-+;com.autoregister_verbose = true
-+
-+[mbstring]
-+; language for internal character representation.
-+;mbstring.language = Japanese
-+
-+; internal/script encoding.
-+; Some encoding cannot work as internal encoding.
-+; (e.g. SJIS, BIG5, ISO-2022-*)
-+;mbstring.internal_encoding = EUC-JP
-+
-+; http input encoding.
-+;mbstring.http_input = auto
-+
-+; http output encoding. mb_output_handler must be
-+; registered as output buffer to function
-+;mbstring.http_output = SJIS
-+
-+; enable automatic encoding translation according to
-+; mbstring.internal_encoding setting. Input chars are
-+; converted to internal encoding by setting this to On.
-+; Note: Do _not_ use automatic encoding translation for
-+;       portable libs/applications.
-+;mbstring.encoding_translation = Off
-+
-+; automatic encoding detection order.
-+; auto means
-+;mbstring.detect_order = auto
-+
-+; substitute_character used when character cannot be converted
-+; one from another
-+;mbstring.substitute_character = none;
-+
-+; overload(replace) single byte functions by mbstring functions.
-+; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
-+; etc. Possible values are 0,1,2,4 or combination of them.
-+; For example, 7 for overload everything.
-+; 0: No overload
-+; 1: Overload mail() function
-+; 2: Overload str*() functions
-+; 4: Overload ereg*() functions
-+;mbstring.func_overload = 0
-+
-+; enable strict encoding detection.
-+;mbstring.strict_encoding = Off
-+
-+[FrontBase]
-+;fbsql.allow_persistent = On
-+;fbsql.autocommit = On
-+;fbsql.show_timestamp_decimals = Off
-+;fbsql.default_database =
-+;fbsql.default_database_password =
-+;fbsql.default_host =
-+;fbsql.default_password =
-+;fbsql.default_user = "_SYSTEM"
-+;fbsql.generate_warnings = Off
-+;fbsql.max_connections = 128
-+;fbsql.max_links = 128
-+;fbsql.max_persistent = -1
-+;fbsql.max_results = 128
-+
-+[gd]
-+; Tell the jpeg decode to libjpeg warnings and try to create
-+; a gd image. The warning will then be displayed as notices
-+; disabled by default
-+;gd.jpeg_ignore_warning = 0
-+
-+[exif]
-+; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
-+; With mbstring support this will automatically be converted into the encoding
-+; given by corresponding encode setting. When empty mbstring.internal_encoding
-+; is used. For the decode settings you can distinguish between motorola and
-+; intel byte order. A decode setting cannot be empty.
-+;exif.encode_unicode = ISO-8859-15
-+;exif.decode_unicode_motorola = UCS-2BE
-+;exif.decode_unicode_intel    = UCS-2LE
-+;exif.encode_jis =
-+;exif.decode_jis_motorola = JIS
-+;exif.decode_jis_intel    = JIS
-+
-+[Tidy]
-+; The path to a default tidy configuration file to use when using tidy
-+;tidy.default_config = /usr/local/lib/php/default.tcfg
-+
-+; Should tidy clean and repair output automatically?
-+; WARNING: Do not use this option if you are generating non-html content
-+; such as dynamic images
-+tidy.clean_output = Off
-+
-+[soap]
-+; Enables or disables WSDL caching feature.
-+soap.wsdl_cache_enabled=1
-+; Sets the directory name where SOAP extension will put cache files.
-+soap.wsdl_cache_dir="/tmp"
-+; (time to live) Sets the number of second while cached file will be used 
-+; instead of original one.
-+soap.wsdl_cache_ttl=86400
-+
-+; Local Variables:
-+; tab-width: 4
-+; End:
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf
---- syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf	Mon Apr  2 18:10:44 2007
-@@ -0,0 +1,45 @@
-+base_dir = /var/run/dovecot/
-+protocols = imap imaps pop3 pop3s
-+listen = *
-+disable_plaintext_auth = no
-+shutdown_clients = no
-+ssl_disable = no
-+ssl_cert_file = /etc/ssl/certs/dovecot.pem
-+ssl_key_file = /etc/ssl/private/dovecot.pem
-+login_greeting = www.domain.tld Server Ready.
-+mail_location = maildir:<VIRTUAL_MAILBOX_BASE>%n/%u
-+mail_extra_groups = mail
-+verbose_proctitle = yes
-+first_valid_uid = <VIRTUAL_UID_MAPS>
-+first_valid_gid = <VIRTUAL_GID_MAPS>
-+protocol imap {
-+  mail_plugins = quota imap_quota
-+  imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep
-+}
-+protocol pop3 {
-+  pop3_uidl_format = %08Xu%08Xv
-+  mail_plugins = quota
-+  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
-+}
-+protocol lda {
-+  postmaster_address = <ADMIN_EMAIL>
-+  sendmail_path = /usr/sbin/sendmail
-+}
-+auth default {
-+  mechanisms = plain login
-+  passdb sql {
-+    args = /usr/local/etc/dovecot-sql.conf
-+  }
-+  userdb sql {
-+    args = /usr/local/etc/dovecot-sql.conf
-+  }
-+  user = root
-+  socket listen {
-+    client {
-+      path = /var/spool/postfix/private/auth
-+      mode = 0660
-+      user = postfix
-+      group = postfix
-+    }
-+  }
-+}
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql
---- syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql	Mon Apr  2 10:44:48 2007
-@@ -0,0 +1,5 @@
-+driver = mysql
-+connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
-+default_pass_scheme = PLAIN
-+password_query = SELECT password FROM mail_users WHERE username = '%u'
-+user_query = SELECT maildir, <VIRTUAL_UID_MAPS> AS uid, <VIRTUAL_GID_MAPS> AS gid FROM mail_users WHERE username = '%u'
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf
---- syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf	Mon Apr  2 10:44:48 2007
-@@ -0,0 +1,71 @@
-+smtpd_banner = $myhostname ESMTP $mail_name (FreeBSD)
-+biff = no
-+append_dot_mydomain = no
-+mydestination = $myhostname $mydomain localhost localhost.$mydomain
-+smtpd_sender_restrictions = permit_sasl_authenticated, permit_mynetworks
-+smtpd_recipient_restrictions =
-+  permit_mynetworks,
-+  permit_sasl_authenticated,
-+  reject_non_fqdn_hostname,
-+  reject_non_fqdn_sender,
-+  reject_non_fqdn_recipient,
-+  reject_unauth_destination,
-+  reject_unauth_pipelining,
-+  reject_invalid_hostname,
-+  reject_rbl_client list.dsbl.org,
-+  reject_rbl_client bl.spamcop.net,
-+  reject_rbl_client sbl-xbl.spamhaus.org
-+smtpd_sasl_auth_enable = yes
-+smtpd_sasl_authenticated_header = yes
-+smtpd_sasl_local_domain = $myhostname
-+smtpd_sasl_security_options = noanonymous
-+broken_sasl_auth_clients = yes
-+smtpd_sasl_type = dovecot
-+smtpd_sasl_path = private/auth    
-+virtual_alias_maps = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_alias_maps.cf
-+virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
-+virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
-+virtual_mailbox_domains = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_mailbox_domains.cf
-+virtual_mailbox_limit = 51200000
-+virtual_mailbox_maps = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_mailbox_maps.cf
-+virtual_minimum_uid = 125
-+virtual_transport = virtual
-+virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
-+virtual_create_maildirsize = yes
-+virtual_mailbox_extended = yes
-+# virtual_mailbox_limit_maps = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_mailbox_limit_maps.cf
-+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps
-+  $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains
-+  $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps
-+  $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks
-+  $virtual_mailbox_limit_maps
-+virtual_mailbox_limit_override = yes
-+virtual_maildir_limit_message = Sorry, this user has overdrawn their diskspace quota. Please try again later.
-+virtual_overquota_bounce = yes
-+alias_maps = $alias_database
-+queue_directory = /var/spool/postfix
-+command_directory = /usr/local/sbin
-+daemon_directory = /usr/local/libexec/postfix
-+mail_owner = postfix
-+myhostname = <SERVERNAME>
-+mydomain = <SERVERNAME>
-+myorigin = $myhostname
-+inet_interfaces = all
-+unknown_local_recipient_reject_code = 550
-+mynetworks = 127.0.0.0/8
-+mynetworks_style = host
-+transport_maps = hash:/usr/local/etc/postfix/transport
-+vacation_destination_recipient_limit = 1
-+mailman_destination_recipient_limit = 1
-+debug_peer_level = 2
-+debugger_command =
-+	 PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-+	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
-+sendmail_path = /usr/local/sbin/sendmail
-+newaliases_path = /usr/local/bin/newaliases
-+mailq_path = /usr/local/bin/mailq
-+setgid_group = maildrop
-+html_directory = no
-+manpage_directory = /usr/local/man
-+sample_directory = /usr/local/etc/postfix
-+readme_directory = no
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf
---- syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf	Mon Apr  2 10:44:48 2007
-@@ -0,0 +1,8 @@
-+user = <SQL_UNPRIVILEGED_USER>
-+password = <SQL_UNPRIVILEGED_PASSWORD>
-+dbname = <SQL_DB>
-+table = mail_virtual
-+select_field = destination
-+where_field = email
-+additional_conditions = and destination <> '' and destination <> ' '
-+hosts = <SQL_HOST> 
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
---- syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf	Mon Apr  2 10:44:48 2007
-@@ -0,0 +1,8 @@
-+user = <SQL_UNPRIVILEGED_USER>
-+password = <SQL_UNPRIVILEGED_PASSWORD>
-+dbname = <SQL_DB>
-+table = panel_domains
-+select_field = domain
-+where_field = domain
-+additional_conditions = and isemaildomain = '1'
-+hosts = <SQL_HOST> 
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
---- syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf	Mon Apr  2 10:44:48 2007
-@@ -0,0 +1,7 @@
-+user = <SQL_UNPRIVILEGED_USER>
-+password = <SQL_UNPRIVILEGED_PASSWORD>
-+dbname = <SQL_DB>
-+table = mail_users
-+select_field = maildir
-+where_field = email
-+hosts = <SQL_HOST> 
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf syscp/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf
---- syscp.orig/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf	Wed Dec 31 17:00:00 1969
-+++ syscp/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf	Mon Apr  2 10:44:48 2007
-@@ -0,0 +1,57 @@
-+ServerName                      "<SERVERNAME> FTP Server"
-+ServerType                      standalone
-+DefaultServer                   on
-+ScoreboardFile                  /var/run/proftpd.scoreboard
-+DeferWelcome                    off
-+MultilineRFC2228                on
-+ShowSymlinks                    on
-+TimeoutNoTransfer               600
-+TimeoutStalled                  600
-+TimeoutIdle                     1200
-+
-+DisplayLogin                    welcome.msg
-+DisplayChdir                    .message
-+ListOptions                     "-l"
-+
-+DenyFilter                      \*.*/
-+
-+Port                            21
-+
-+Umask                           022
-+
-+MaxInstances                    30
-+
-+CommandBufferSize               512
-+
-+User                            nobody
-+Group                           nogroup
-+
-+DefaultRoot ~
-+
-+AllowOverwrite                  on
-+
-+RequireValidShell               off
-+
-+<Limit SITE_CHMOD>
-+  DenyAll
-+</Limit>
-+
-+SQLAuthTypes Crypt Plaintext
-+SQLAuthenticate users* groups*
-+SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
-+SQLUserInfo ftp_users username password uid gid homedir shell
-+SQLGroupInfo ftp_groups groupname gid members
-+SQLUserWhereClause "login_enabled = 'y'"
-+
-+SQLLog PASS login
-+SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
-+
-+SQLLog RETR download
-+SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
-+
-+SQLLog STOR upload
-+SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
-+
-+<IfModule mod_delay.c>
-+  DelayEngine off
-+</IfModule>
diff --git a/sysutils/syscp/files/pkg-message.in b/sysutils/syscp/files/pkg-message.in
index fa0713913f48..1a8401ebf515 100644
--- a/sysutils/syscp/files/pkg-message.in
+++ b/sysutils/syscp/files/pkg-message.in
@@ -20,3 +20,9 @@ Create and put the following lines into your
 
 ------------------------------------------------------
 
+Make sure Apache+PHP is properly configured and running 
+then visit:
+
+http://your-domain.tld/syscp/
+
+And enjoy!
diff --git a/sysutils/syscp/pkg-deinstall b/sysutils/syscp/pkg-deinstall
index 1fecb4dda8a6..49e769ce1bff 100644
--- a/sysutils/syscp/pkg-deinstall
+++ b/sysutils/syscp/pkg-deinstall
@@ -1,7 +1,8 @@
 #!/bin/sh
-
-/bin/echo ""
-/bin/echo "To delete SysCP permanently: rm -rf /usr/local/www/syscp"
-/bin/echo ""
-
-exit 0
+if [ "$2" = DEINSTALL ]; then
+	echo "==============================================================================="
+	echo "If you are permanently removing this port, run:"
+	echo ""
+	echo "rm -rf /usr/local/www/syscp"
+	echo "==============================================================================="
+fi
diff --git a/sysutils/syscp/pkg-plist b/sysutils/syscp/pkg-plist
index 8b500c917275..f883ddee2e1e 100644
--- a/sysutils/syscp/pkg-plist
+++ b/sysutils/syscp/pkg-plist
@@ -163,7 +163,6 @@ www/syscp/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_sasl_smtpd
 www/syscp/templates/misc/configfiles/debian_sarge/proftpd/etc_proftpd.conf
 www/syscp/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone
 www/syscp/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp
-www/syscp/templates/misc/configfiles/freebsd_release/cron/etc_php4_syscpcron_php.ini
 www/syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf
 www/syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql
 www/syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf