Commit 7fe908c5 authored by Marius Cramer's avatar Marius Cramer

Cleaning up code to match coding guidelines

parent 7d52e00a

Too many changes to show.

To preserve performance only 133 of 133+ files are displayed.
...@@ -2,103 +2,103 @@ ...@@ -2,103 +2,103 @@
$host="IP_ADDRESS"; $host="IP_ADDRESS";
$user="USERNAME"; $user="USERNAME";
$password="PASSWORD"; $password="PASSWORD";
mysql_connect($host,$user,$password) or die(mysql_error()); mysql_connect($host, $user, $password) or die(mysql_error());
mysql_select_db("dbispconfig"); mysql_select_db("dbispconfig");
$result = ""; $result = "";
$result = mysql_query("SELECT id,origin,ns,ttl,mbox,serial,refresh,retry,expire,minimum FROM dns_soa;"); $result = mysql_query("SELECT id,origin,ns,ttl,mbox,serial,refresh,retry,expire,minimum FROM dns_soa;");
function hostname2ipfunktion($tmp1, $timeout = 1) function hostname2ipfunktion($tmp1, $timeout = 1)
{ {
if ($tmp1 == 0) if ($tmp1 == 0)
{ {
$query = `nslookup -timeout=$timeout -retry=0 $tmp1`; $query = `nslookup -timeout=$timeout -retry=0 $tmp1`;
if(preg_match('/\nAddress: (.*)\n/', $query, $matches)) if(preg_match('/\nAddress: (.*)\n/', $query, $matches))
return trim($matches[1]); return trim($matches[1]);
return $tmp1; return $tmp1;
} }
} }
$serialsearch=date("Ymd"); $serialsearch=date("Ymd");
$resultx12 = mysql_query("SELECT origin,serial FROM dns_soa WHERE serial LIKE '$serialsearch%' ORDER BY origin ASC;"); $resultx12 = mysql_query("SELECT origin,serial FROM dns_soa WHERE serial LIKE '$serialsearch%' ORDER BY origin ASC;");
while ($rowx12=mysql_fetch_array($resultx12)) { while ($rowx12=mysql_fetch_array($resultx12)) {
$zone=substr($rowx12["origin"],0,-1); $zone=substr($rowx12["origin"], 0, -1);
$filename_x1="/var/cache/bind/".$zone; $filename_x1="/var/cache/bind/".$zone;
if (file_exists($filename_x1)) { if (file_exists($filename_x1)) {
$serialvergleich[$zone]=exec("grep \";Serial\" /var/cache/bind/$zone |cut -d\" \" -f1 | awk '{print $1}'"); $serialvergleich[$zone]=exec("grep \";Serial\" /var/cache/bind/$zone |cut -d\" \" -f1 | awk '{print $1}'");
} }
} }
while($row = mysql_fetch_array($result)) while($row = mysql_fetch_array($result))
{ {
### Hier ALLES Aktivieren bei Primary Nameserver TEIL 1 ################################################################################# //## Hier ALLES Aktivieren bei Primary Nameserver TEIL 1 #################################################################################
$varx11=substr($row["origin"],0,-1); $varx11=substr($row["origin"], 0, -1);
$filename="/var/cache/bind/".$varx11; $filename="/var/cache/bind/".$varx11;
if (file_exists($filename)) { if (file_exists($filename)) {
unlink("/var/cache/bind/$varx11"); unlink("/var/cache/bind/$varx11");
} }
$arr1[$x11]="zone \"$varx11\" in { type master; file \"$varx11\"; };\n"; $arr1[$x11]="zone \"$varx11\" in { type master; file \"$varx11\"; };\n";
$x11=$x11+1; $x11=$x11+1;
$result2 = mysql_query("select name,type,aux,data from dns_rr where zone=$row[id] and active='Y' ORDER BY name ASC;"); $result2 = mysql_query("select name,type,aux,data from dns_rr where zone=$row[id] and active='Y' ORDER BY name ASC;");
$arr3[0]="\$TTL ".$row['ttl']."\n@ IN SOA ".$row['ns']." ".$row['mbox']." (\n ".$row['serial']." ;Serial\n"." ".$row['refresh']." ;Refresh\n"." ".$row['retry']." ;Retry\n"." ".$row['expire']." ;Expire\n"." ".$row['minimum']." ) ;Minimum\n\n"; $arr3[0]="\$TTL ".$row['ttl']."\n@ IN SOA ".$row['ns']." ".$row['mbox']." (\n ".$row['serial']." ;Serial\n"." ".$row['refresh']." ;Refresh\n"." ".$row['retry']." ;Retry\n"." ".$row['expire']." ;Expire\n"." ".$row['minimum']." ) ;Minimum\n\n";
$xx1=1; $xx1=1;
while($row2 = mysql_fetch_row($result2)) while($row2 = mysql_fetch_row($result2))
{ {
$arr2[$xx1]=$row2['0']." IN ".$row2['1']." "; $arr2[$xx1]=$row2['0']." IN ".$row2['1']." ";
if ($row2['2']>0) if ($row2['2']>0)
{ {
$arr3[$xx1]=$arr2[$xx1].$row2['2']." ".$row2['3']."\n"; $arr3[$xx1]=$arr2[$xx1].$row2['2']." ".$row2['3']."\n";
} }
else else
{ {
$arr3[$xx1]=$arr2[$xx1].$row2['3']."\n"; $arr3[$xx1]=$arr2[$xx1].$row2['3']."\n";
} }
$xx1=$xx1+1; $xx1=$xx1+1;
} }
$f = fopen("/var/cache/bind/$varx11", "a+"); $f = fopen("/var/cache/bind/$varx11", "a+");
foreach($arr3 as $values) fputs($f, $values); foreach($arr3 as $values) fputs($f, $values);
fclose($f); fclose($f);
$arr2=array(); $arr2=array();
$arr3=array(); $arr3=array();
### ENDE Primärer Nameserver TEIL 2 ##################################################################################################### //## ENDE Primärer Nameserver TEIL 2 #####################################################################################################
### Hier ALLES Aktivieren bei Secondary Nameserver ###################################################################################### //## Hier ALLES Aktivieren bei Secondary Nameserver ######################################################################################
# $tmp1 = substr($row["ns"],0,-1); // $tmp1 = substr($row["ns"],0,-1);
# $tmp2 = substr($row["origin"],0,-1); // $tmp2 = substr($row["origin"],0,-1);
# if (!isset($dnscache[$tmp1])) $nsip = hostname2ipfunktion($tmp1) ; // if (!isset($dnscache[$tmp1])) $nsip = hostname2ipfunktion($tmp1) ;
# else $nsip=$dnscache[$tmp1] ; // else $nsip=$dnscache[$tmp1] ;
# if ($nsip == $tmp1) // if ($nsip == $tmp1)
# { // {
# echo "$tmp2 $tmp1 Not a valid Nameserver"; // echo "$tmp2 $tmp1 Not a valid Nameserver";
# echo "\n"; // echo "\n";
# } // }
# else // else
# { // {
# $dnscache[$tmp1]=$nsip; // $dnscache[$tmp1]=$nsip;
# $arr1[$x11]="zone \"".$tmp2."\" in { type slave; file \"".$tmp2."\"; masters {".$nsip."; }; };\n"; // $arr1[$x11]="zone \"".$tmp2."\" in { type slave; file \"".$tmp2."\"; masters {".$nsip."; }; };\n";
# $x11=$x11+1; // $x11=$x11+1;
# } // }
### ENDE Secondary Nameserver ########################################################################################################### //## ENDE Secondary Nameserver ###########################################################################################################
} }
unlink ("/etc/bind/named.conf.local"); unlink("/etc/bind/named.conf.local");
$fx = fopen("/etc/bind/named.conf.local", "a+"); $fx = fopen("/etc/bind/named.conf.local", "a+");
foreach($arr1 as $values) fputs($fx, $values); foreach($arr1 as $values) fputs($fx, $values);
fclose($fx); fclose($fx);
system("rndc reconfig >/dev/null 2>&1"); system("rndc reconfig >/dev/null 2>&1");
### ANFANG Primärer Namerserver TEIL 2 ################################################################################################## //## ANFANG Primärer Namerserver TEIL 2 ##################################################################################################
$serialsearch=date("Ymd"); $serialsearch=date("Ymd");
$resultx13 = mysql_query("SELECT origin,serial FROM dns_soa WHERE serial LIKE '$serialsearch%' ORDER BY origin ASC;"); $resultx13 = mysql_query("SELECT origin,serial FROM dns_soa WHERE serial LIKE '$serialsearch%' ORDER BY origin ASC;");
while ($rowx13=mysql_fetch_array($resultx13)) { while ($rowx13=mysql_fetch_array($resultx13)) {
$serial_ist=($rowx13["serial"]); $serial_ist=($rowx13["serial"]);
$zone=substr($rowx13["origin"],0,-1); $zone=substr($rowx13["origin"], 0, -1);
# echo "zone: ".$zone." ist: ".$serial_ist." vergleich: ".$serialvergleich[$zone]."\n"; // echo "zone: ".$zone." ist: ".$serial_ist." vergleich: ".$serialvergleich[$zone]."\n";
if ($serialvergleich[$zone] != $serial_ist) { if ($serialvergleich[$zone] != $serial_ist) {
$reload=system("rndc reload $zone >/dev/null 2>&1"); $reload=system("rndc reload $zone >/dev/null 2>&1");
} }
} }
### ENDE Primärer NamerserverTEIL 2 ###################################################################################################### //## ENDE Primärer NamerserverTEIL 2 ######################################################################################################
?> ?>
\ No newline at end of file
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
$host="IP_ADDRESS"; $host="IP_ADDRESS";
$user="USERNAME"; $user="USERNAME";
$password="PASSWORD"; $password="PASSWORD";
mysql_connect($host,$user,$password) or die(mysql_error()); mysql_connect($host, $user, $password) or die(mysql_error());
mysql_select_db("dbispconfig"); mysql_select_db("dbispconfig");
$result = ""; $result = "";
$result = mysql_query("SELECT origin FROM dns_soa ORDER BY origin ASC;"); $result = mysql_query("SELECT origin FROM dns_soa ORDER BY origin ASC;");
while($row = mysql_fetch_array($result)) while($row = mysql_fetch_array($result))
{ {
$zone=substr($row["origin"],0,-1); $zone=substr($row["origin"], 0, -1);
system("rndc retransfer ".$zone); system("rndc retransfer ".$zone);
} }
?> ?>
\ No newline at end of file
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
$host="localhost"; $host="localhost";
$user="root"; $user="root";
$password="MYSQL-ROOT-PASSWD"; $password="MYSQL-ROOT-PASSWD";
mysql_connect($host,$user,$password) or die(mysql_error()); mysql_connect($host, $user, $password) or die(mysql_error());
mysql_select_db("dbispconfig"); mysql_select_db("dbispconfig");
$sql1 = mysql_query("SELECT id, substr(origin,1, LENGTH(origin)-1) AS origin, substr(ns,1, LENGTH(ns)-1) AS ns, substr(mbox,1, LENGTH(mbox)-1) AS mbox,ttl FROM dns_soa order by id asc;"); $sql1 = mysql_query("SELECT id, substr(origin,1, LENGTH(origin)-1) AS origin, substr(ns,1, LENGTH(ns)-1) AS ns, substr(mbox,1, LENGTH(mbox)-1) AS mbox,ttl FROM dns_soa order by id asc;");
mysql_select_db("powerdns"); mysql_select_db("powerdns");
while($row1 = mysql_fetch_array($sql1)) while($row1 = mysql_fetch_array($sql1))
{ {
mysql_query("INSERT INTO domains (id,name,type,ispconfig_id) values ('$row1[id]','$row1[origin]','NATIVE','$row1[id]');"); mysql_query("INSERT INTO domains (id,name,type,ispconfig_id) values ('$row1[id]','$row1[origin]','NATIVE','$row1[id]');");
mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row1[id]','$row1[origin]','$row1[ns] $row1[mbox] 0','$row1[id]','SOA','$row1[ttl]','0','1260446221');"); mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row1[id]','$row1[origin]','$row1[ns] $row1[mbox] 0','$row1[id]','SOA','$row1[ttl]','0','1260446221');");
} }
mysql_select_db("dbispconfig"); mysql_select_db("dbispconfig");
...@@ -18,44 +18,44 @@ $sql2 = mysql_query("SELECT id,zone,name,data,aux,ttl,type FROM dns_rr order by ...@@ -18,44 +18,44 @@ $sql2 = mysql_query("SELECT id,zone,name,data,aux,ttl,type FROM dns_rr order by
mysql_select_db("powerdns"); mysql_select_db("powerdns");
while($row2 = mysql_fetch_array($sql2)) while($row2 = mysql_fetch_array($sql2))
{ {
if (strlen($row2['name'])) if (strlen($row2['name']))
{ {
$file1=substr($row2['data'], -1); $file1=substr($row2['data'], -1);
if ($file1==".") if ($file1==".")
{ {
$text = $row2['data']; $text = $row2['data'];
$laenge = strlen($row2['data'])-1; $laenge = strlen($row2['data'])-1;
$file2 = substr($text, 0,strlen($text)-1); $file2 = substr($text, 0, strlen($text)-1);
} }
else else
{ {
$file2=$row2['data']; $file2=$row2['data'];
} }
mysql_select_db("dbispconfig"); mysql_select_db("dbispconfig");
$sql3 = mysql_query("SELECT substr(origin,1, LENGTH(origin)-1) AS origin FROM dns_soa where id=$row2[zone];"); $sql3 = mysql_query("SELECT substr(origin,1, LENGTH(origin)-1) AS origin FROM dns_soa where id=$row2[zone];");
$row3 = mysql_fetch_array($sql3); $row3 = mysql_fetch_array($sql3);
mysql_select_db("powerdns"); mysql_select_db("powerdns");
mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row2[zone]','$row2[name].$row3[origin]','$file2','$row2[id]','$row2[type]','$row2[ttl]','$row2[aux]','1260446221');"); mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row2[zone]','$row2[name].$row3[origin]','$file2','$row2[id]','$row2[type]','$row2[ttl]','$row2[aux]','1260446221');");
} }
else else
{ {
$file1=substr($row2['data'], -1); $file1=substr($row2['data'], -1);
if ($file1==".") if ($file1==".")
{ {
$text = $row2['data']; $text = $row2['data'];
$laenge = strlen($row2['data'])-1; $laenge = strlen($row2['data'])-1;
$file2 = substr($text, 0,strlen($text)-1); $file2 = substr($text, 0, strlen($text)-1);
} }
else else
{ {
$file2=$row2['data']; $file2=$row2['data'];
} }
mysql_select_db("dbispconfig"); mysql_select_db("dbispconfig");
$sql3 = mysql_query("SELECT substr(origin,1, LENGTH(origin)-1) AS origin FROM dns_soa where id=$row2[zone];"); $sql3 = mysql_query("SELECT substr(origin,1, LENGTH(origin)-1) AS origin FROM dns_soa where id=$row2[zone];");
$row3 = mysql_fetch_array($sql3); $row3 = mysql_fetch_array($sql3);
mysql_select_db("powerdns"); mysql_select_db("powerdns");
mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row2[zone]','$row3[origin]','$file2','$row2[id]','$row2[type]','$row2[ttl]','$row2[aux]','1260446221');"); mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row2[zone]','$row3[origin]','$file2','$row2[id]','$row2[type]','$row2[ttl]','$row2[aux]','1260446221');");
} }
} }
mysql_select_db("powerdns"); mysql_select_db("powerdns");
...@@ -63,8 +63,8 @@ $sql4 = mysql_query("SELECT records.id,records.content,records.type,domains.name ...@@ -63,8 +63,8 @@ $sql4 = mysql_query("SELECT records.id,records.content,records.type,domains.name
while($row4 = mysql_fetch_array($sql4)) while($row4 = mysql_fetch_array($sql4))
{ {
mysql_query("UPDATE records SET content = '$row4[content].$row4[name]' where id='$row4[id]';"); mysql_query("UPDATE records SET content = '$row4[content].$row4[name]' where id='$row4[id]';");
} }
?> ?>
\ No newline at end of file
<?php <?php
####################################################################################################### //######################################################################################################
// Re-Create webalizer statistics // Re-Create webalizer statistics
####################################################################################################### //######################################################################################################
$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE server_id = ".$conf["server_id"]; $sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE server_id = ".$conf["server_id"];
$records = $app->db->queryAllRecords($sql); $records = $app->db->queryAllRecords($sql);
foreach($records as $rec) { foreach($records as $rec) {
$domain = escapeshellcmd($rec["domain"]); $domain = escapeshellcmd($rec["domain"]);
$logdir = escapeshellcmd($rec["document_root"].'/log'); $logdir = escapeshellcmd($rec["document_root"].'/log');
$statsdir = escapeshellcmd($rec["document_root"].'/web/stats'); $statsdir = escapeshellcmd($rec["document_root"].'/web/stats');
$webalizer = '/usr/bin/webalizer'; $webalizer = '/usr/bin/webalizer';
$webalizer_conf_main = '/etc/webalizer/webalizer.conf'; $webalizer_conf_main = '/etc/webalizer/webalizer.conf';
$webalizer_conf = escapeshellcmd($rec["document_root"].'/log/webalizer.conf'); $webalizer_conf = escapeshellcmd($rec["document_root"].'/log/webalizer.conf');
exec("rm -rf $webalizer_conf"); exec("rm -rf $webalizer_conf");
if(!@is_file($webalizer_conf)) { if(!@is_file($webalizer_conf)) {
exec("cp $webalizer_conf_main $webalizer_conf"); exec("cp $webalizer_conf_main $webalizer_conf");
setConfigVar($webalizer_conf, 'Incremental', 'yes'); setConfigVar($webalizer_conf, 'Incremental', 'yes');
setConfigVar($webalizer_conf, 'IncrementalName', $logdir.'/webalizer.current'); setConfigVar($webalizer_conf, 'IncrementalName', $logdir.'/webalizer.current');
setConfigVar($webalizer_conf, 'HistoryName', $logdir.'/webalizer.hist'); setConfigVar($webalizer_conf, 'HistoryName', $logdir.'/webalizer.hist');
} }
if(!@is_dir($statsdir)) mkdir($statsdir); if(!@is_dir($statsdir)) mkdir($statsdir);
echo "Remove stats dir $statsdir ...\n"; echo "Remove stats dir $statsdir ...\n";
exec("rm -rf $statsdir/*"); exec("rm -rf $statsdir/*");
echo "Re-Create stats for $domain...\n"; echo "Re-Create stats for $domain...\n";
exec("for logfile in $logdir/*access*; do\n$webalizer -c $webalizer_conf -n $domain -s $domain -r $domain -q -T -p -o $statsdir ".'$logfile'."\ndone"); exec("for logfile in $logdir/*access*; do\n$webalizer -c $webalizer_conf -n $domain -s $domain -r $domain -q -T -p -o $statsdir ".'$logfile'."\ndone");
echo "done.\n"; echo "done.\n";
} }
die("finished.\n"); die("finished.\n");
?> ?>
\ No newline at end of file
...@@ -41,7 +41,7 @@ error_reporting(E_ALL|E_STRICT); ...@@ -41,7 +41,7 @@ error_reporting(E_ALL|E_STRICT);
if (!file_exists('autoupdate')) { if (!file_exists('autoupdate')) {
//** The banner on the command line //** The banner on the command line
echo "\n\n".str_repeat('-',80)."\n"; echo "\n\n".str_repeat('-', 80)."\n";
echo " _____ ___________ _____ __ _ ____ echo " _____ ___________ _____ __ _ ____
|_ _/ ___| ___ \ / __ \ / _(_) /__ \ |_ _/ ___| ___ \ / __ \ / _(_) /__ \
| | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ / | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
...@@ -50,19 +50,19 @@ if (!file_exists('autoupdate')) { ...@@ -50,19 +50,19 @@ if (!file_exists('autoupdate')) {
\___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/ \___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
__/ | __/ |
|___/ "; |___/ ";
echo "\n".str_repeat('-',80)."\n"; echo "\n".str_repeat('-', 80)."\n";
echo "\n\n>>This script is for internal use only! Please use update.php! \n\n"; echo "\n\n>>This script is for internal use only! Please use update.php! \n\n";
exit; exit;
} }
//** Include the library with the basic installer functions //** Include the library with the basic installer functions
require_once('lib/install.lib.php'); require_once 'lib/install.lib.php';
//** Include the library with the basic updater functions //** Include the library with the basic updater functions
require_once('lib/update.lib.php'); require_once 'lib/update.lib.php';
//** Include the base class of the installer class //** Include the base class of the installer class
require_once('lib/installer_base.lib.php'); require_once 'lib/installer_base.lib.php';
//** Ensure that current working directory is install directory //** Ensure that current working directory is install directory
$cur_dir = getcwd(); $cur_dir = getcwd();
...@@ -75,16 +75,16 @@ define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../')); ...@@ -75,16 +75,16 @@ define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
//** Get distribution identifier //** Get distribution identifier
$dist = get_distname(); $dist = get_distname();
include_once("/usr/local/ispconfig/server/lib/config.inc.php"); include_once "/usr/local/ispconfig/server/lib/config.inc.php";
$conf_old = $conf; $conf_old = $conf;
unset($conf); unset($conf);
if($dist['id'] == '') die('Linux distribution or version not recognized.'); if($dist['id'] == '') die('Linux distribution or version not recognized.');
//** Include the distribution-specific installer class library and configuration //** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.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/lib/'.$dist['id'].'.lib.php';
include_once('dist/conf/'.$dist['id'].'.conf.php'); include_once 'dist/conf/'.$dist['id'].'.conf.php';
//** Get hostname //** Get hostname
exec('hostname -f', $tmp_out); exec('hostname -f', $tmp_out);
...@@ -124,22 +124,22 @@ $inst->is_update = true; ...@@ -124,22 +124,22 @@ $inst->is_update = true;
$inst->find_installed_apps(); $inst->find_installed_apps();
//** Initialize the MySQL server connection //** Initialize the MySQL server connection
include_once('lib/mysql.lib.php'); include_once 'lib/mysql.lib.php';
//** Database update is a bit brute force and should be rebuild later ;) //** Database update is a bit brute force and should be rebuild later ;)
/* /*
* Try to read the DB-admin settings * Try to read the DB-admin settings
*/ */
$clientdb_host = ''; $clientdb_host = '';
$clientdb_user = ''; $clientdb_user = '';
$clientdb_password = ''; $clientdb_password = '';
include_once("/usr/local/ispconfig/server/lib/mysql_clientdb.conf"); include_once "/usr/local/ispconfig/server/lib/mysql_clientdb.conf";
$conf["mysql"]["admin_user"] = $clientdb_user; $conf["mysql"]["admin_user"] = $clientdb_user;
$conf["mysql"]["admin_password"] = $clientdb_password; $conf["mysql"]["admin_password"] = $clientdb_password;
$clientdb_host = ''; $clientdb_host = '';
$clientdb_user = ''; $clientdb_user = '';
$clientdb_password = ''; $clientdb_password = '';
//** There is a error if user for mysql admin_password if empty //** There is a error if user for mysql admin_password if empty
if( empty($conf["mysql"]["admin_password"]) ) { if( empty($conf["mysql"]["admin_password"]) ) {
...@@ -147,7 +147,7 @@ if( empty($conf["mysql"]["admin_password"]) ) { ...@@ -147,7 +147,7 @@ if( empty($conf["mysql"]["admin_password"]) ) {
} }
//** Test mysql root connection //** Test mysql root connection
if(!@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) { if(!@mysql_connect($conf["mysql"]["host"], $conf["mysql"]["admin_user"], $conf["mysql"]["admin_password"])) {
die("internal error - MYSQL-Root passord wrong"); die("internal error - MYSQL-Root passord wrong");
} }
...@@ -157,7 +157,7 @@ if(!@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["my ...@@ -157,7 +157,7 @@ if(!@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["my
checkDbHealth(); checkDbHealth();
/* /*
* Prepare the dump of the database * Prepare the dump of the database
*/ */
prepareDBDump(); prepareDBDump();
...@@ -196,7 +196,7 @@ if($conf['services']['mail'] == true) { ...@@ -196,7 +196,7 @@ if($conf['services']['mail'] == true) {
//** Configure postfix //** Configure postfix
swriteln('Configuring Postfix'); swriteln('Configuring Postfix');
$inst->configure_postfix('dont-create-certs'); $inst->configure_postfix('dont-create-certs');
//** Configure mailman //** Configure mailman
swriteln('Configuring Mailman'); swriteln('Configuring Mailman');
$inst->configure_mailman('update'); $inst->configure_mailman('update');
...@@ -217,7 +217,7 @@ if($conf['services']['mail'] == true) { ...@@ -217,7 +217,7 @@ if($conf['services']['mail'] == true) {