From 6026b34f90b9694920c7a03d62a03046a9ccfd1f Mon Sep 17 00:00:00 2001 From: redray <redray@ispconfig3> Date: Sun, 26 Oct 2008 08:25:58 -0400 Subject: [PATCH] new theme for status --- install/update.php | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/install/update.php b/install/update.php index 781f134..3200a6d 100644 --- a/install/update.php +++ b/install/update.php @@ -59,15 +59,18 @@ } //** Get distribution identifier -$distname = get_distname(); +$dist = get_distname(); include_once("/usr/local/ispconfig/server/lib/config.inc.php"); $conf_old = $conf; unset($conf); +if($dist['id'] == '') die('Linux Dustribution or Version not recognized.'); + //** Include the distribution specific installer class library and configuration -include_once('dist/lib/'.$distname.'.lib.php'); -include_once('dist/conf/'.$distname.'.conf.php'); +if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php'); +include_once('dist/lib/'.$dist['id'].'.lib.php'); +include_once('dist/conf/'.$dist['id'].'.conf.php'); //** Get hostname exec('hostname -f', $tmp_out); @@ -154,7 +157,7 @@ } $new_ini = array_to_ini($tpl_ini_array); -$inst->db->query("UPDATE server SET config = '".addslashes($new_ini)."' WHERE server_id = ".$conf['server_id']); +$inst->db->query("UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']); unset($old_ini_array); unset($tpl_ini_array); unset($new_ini); @@ -237,19 +240,19 @@ //** Restart services: if($reconfigure_services_answer == 'yes') { swriteln('Restarting services ...'); - system("/etc/init.d/mysql restart"); - system("/etc/init.d/postfix restart"); - system("/etc/init.d/saslauthd restart"); - system("/etc/init.d/amavis restart"); - system("/etc/init.d/clamav-daemon restart"); - system("/etc/init.d/courier-authdaemon restart"); - system("/etc/init.d/courier-imap restart"); - system("/etc/init.d/courier-imap-ssl restart"); - system("/etc/init.d/courier-pop restart"); - system("/etc/init.d/courier-pop-ssl restart"); - system("/etc/init.d/apache2 restart"); - system("/etc/init.d/pure-ftpd-mysql restart"); - system("/etc/init.d/mydns restart"); + system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart'); + system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart'); + system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart'); + system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart'); + system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart'); + system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart'); + system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart'); + system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart'); + system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart'); + system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart'); + system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart'); + system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart'); + system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null'); } echo "Update finished.\n"; -- Gitblit v1.9.1