Skip to content

Commit 2af58c7

Browse files
author
Marius Cramer
committed
- finished rewriting of sql statements
1 parent f49af08 commit 2af58c7

File tree

82 files changed

+1611
-1242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1611
-1242
lines changed

‎install/dist/lib/debian60.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function configure_dovecot()
3838

3939
// check if virtual_transport must be changed
4040
if ($this->is_update) {
41-
$tmp = $this->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
41+
$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
4242
$ini_array = ini_to_array(stripslashes($tmp['config']));
4343
// ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
4444

‎install/dist/lib/fedora.lib.php‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ function configure_postfix($options = '')
182182
if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
183183

184184
//* These postconf commands will be executed on installation and update
185-
$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
185+
$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ?", $conf['server_id']);
186186
$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
187187
unset($server_ini_rec);
188188

@@ -396,7 +396,7 @@ public function configure_dovecot()
396396

397397
// check if virtual_transport must be changed
398398
if ($this->is_update) {
399-
$tmp = $this->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
399+
$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
400400
$ini_array = ini_to_array(stripslashes($tmp['config']));
401401
// ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
402402

@@ -705,7 +705,7 @@ public function configure_apache()
705705
$tpl = new tpl('apache_ispconfig.conf.master');
706706
$tpl->setVar('apache_version',getapacheversion());
707707

708-
$records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
708+
$records = $this->db->queryAllRecords("SELECT * FROM ?? WHERE server_id = ? AND virtualhost = 'y'", $conf['mysql']['master_database'] . '.server_ip', $conf['server_id']);
709709
$ip_addresses = array();
710710

711711
if(is_array($records) && count($records) > 0) {
@@ -813,7 +813,7 @@ public function configure_firewall()
813813
$tcp_public_services = '';
814814
$udp_public_services = '';
815815

816-
$row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id']));
816+
$row = $this->db->queryOneRecord('SELECT * FROM ?? WHERE server_id = ?', $conf["mysql"]["database"] . '.firewall', $conf['server_id']);
817817

818818
if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){
819819
$tcp_public_services = trim(str_replace(',', ' ', $row["tcp_port"]));
@@ -824,7 +824,7 @@ public function configure_firewall()
824824
}
825825
if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
826826
$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']);
827-
if($row["tcp_port"] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ',".intval($conf['apache']['vhost_port'])."' WHERE server_id = ".intval($conf['server_id']));
827+
if($row["tcp_port"] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ? WHERE server_id = ?", ',' . intval($conf['apache']['vhost_port']), $conf['server_id']);
828828
}
829829

830830
$content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content);
@@ -1024,13 +1024,11 @@ public function install_ispconfig()
10241024
$file_server_enabled = ($conf['services']['file'])?1:0;
10251025
$db_server_enabled = ($conf['services']['db'])?1:0;
10261026
$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
1027-
$sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled' WHERE server_id = ".intval($conf['server_id']);
1027+
$sql = "UPDATE `server` SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ? WHERE server_id = ?";
10281028

1029+
$this->db->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']);
10291030
if($conf['mysql']['master_slave_setup'] == 'y') {
1030-
$this->dbmaster->query($sql);
1031-
$this->db->query($sql);
1032-
} else {
1033-
$this->db->query($sql);
1031+
$this->dbmaster->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']);
10341032
}
10351033

10361034
// chown install dir to root and chmod 755

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ public function configure_apache()
540540
$tpl = new tpl('apache_ispconfig.conf.master');
541541
$tpl->setVar('apache_version',getapacheversion());
542542

543-
$records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
543+
$records = $this->db->queryAllRecords("SELECT * FROM ?? WHERE server_id = ? AND virtualhost = 'y'", $conf['mysql']['master_database'] . '.server_ip', $conf['server_id']);
544544
$ip_addresses = array();
545545

546546
if(is_array($records) && count($records) > 0) {
@@ -889,13 +889,11 @@ public function install_ispconfig()
889889
$db_server_enabled = ($conf['services']['db'])?1:0;
890890
$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
891891

892-
$sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled' WHERE server_id = ".intval($conf['server_id']);
892+
$sql = "UPDATE `server` SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ? WHERE server_id = ?";
893893

894+
$this->db->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']);
894895
if($conf['mysql']['master_slave_setup'] == 'y') {
895-
$this->dbmaster->query($sql);
896-
$this->db->query($sql);
897-
} else {
898-
$this->db->query($sql);
896+
$this->dbmaster->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']);
899897
}
900898

901899
// chown install dir to root and chmod 755

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ function configure_postfix($options = '')
212212
if($cf['vmail_mailbox_base'] != '' && strlen($cf['vmail_mailbox_base']) >= 10 && $this->is_update === false) exec('chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base']);
213213

214214
//* These postconf commands will be executed on installation and update
215-
$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
215+
$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ?", $conf['server_id']);
216216
$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
217217
unset($server_ini_rec);
218218

@@ -451,7 +451,7 @@ public function configure_dovecot()
451451

452452
// check if virtual_transport must be changed
453453
if ($this->is_update) {
454-
$tmp = $this->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
454+
$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
455455
$ini_array = ini_to_array(stripslashes($tmp['config']));
456456
// ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
457457

@@ -737,7 +737,7 @@ public function configure_apache()
737737
$tpl = new tpl('apache_ispconfig.conf.master');
738738
$tpl->setVar('apache_version',getapacheversion());
739739

740-
$records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
740+
$records = $this->db->queryAllRecords("SELECT * FROM ?? WHERE server_id = ? AND virtualhost = 'y'", $conf['mysql']['master_database'] . '.server_ip', $conf['server_id']);
741741
$ip_addresses = array();
742742

743743
if(is_array($records) && count($records) > 0) {
@@ -887,7 +887,7 @@ public function configure_firewall()
887887
$tcp_public_services = '';
888888
$udp_public_services = '';
889889

890-
$row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id']));
890+
$row = $this->db->queryOneRecord('SELECT * FROM ?? WHERE server_id = ?', $conf["mysql"]["database"] . '.firewall', $conf['server_id']);
891891

892892
if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){
893893
$tcp_public_services = trim(str_replace(',', ' ', $row["tcp_port"]));
@@ -899,7 +899,7 @@ public function configure_firewall()
899899

900900
if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
901901
$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']);
902-
if($row["tcp_port"] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ',".intval($conf['apache']['vhost_port'])."' WHERE server_id = ".intval($conf['server_id']));
902+
if($row["tcp_port"] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ? WHERE server_id = ?", ',' . intval($conf['apache']['vhost_port']), $conf['server_id']);
903903
}
904904

905905
$content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content);
@@ -1097,13 +1097,11 @@ public function install_ispconfig()
10971097
$file_server_enabled = ($conf['services']['file'])?1:0;
10981098
$db_server_enabled = ($conf['services']['db'])?1:0;
10991099
$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
1100-
$sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled' WHERE server_id = ".intval($conf['server_id']);
1100+
$sql = "UPDATE `server` SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ? WHERE server_id = ?";
11011101

1102+
$this->db->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']););
11021103
if($conf['mysql']['master_slave_setup'] == 'y') {
1103-
$this->dbmaster->query($sql);
1104-
$this->db->query($sql);
1105-
} else {
1106-
$this->db->query($sql);
1104+
$this->dbmaster->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']););
11071105
}
11081106

11091107
// chown install dir to root and chmod 755

0 commit comments

Comments
 (0)