Skip to content

Commit afe87b0

Browse files
author
Dominik
committed
Merge branch 'reject_sender_login_mismatch' into mdbox-format
2 parents f339ebf + 3299ad4 commit afe87b0

File tree

478 files changed

+4608
-9170
lines changed

Some content is hidden

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

478 files changed

+4608
-9170
lines changed

‎helper_scripts/recreate_webalizer_stats.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
//######################################################################################################
66

77

8-
$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE server_id = ".$conf["server_id"];
9-
$records = $app->db->queryAllRecords($sql);
8+
$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE server_id = ?";
9+
$records = $app->db->queryAllRecords($sql, $conf["server_id"]);
1010
foreach($records as $rec) {
1111
$domain = escapeshellcmd($rec["domain"]);
1212
$logdir = escapeshellcmd($rec["document_root"].'/log');

‎install/apps/metronome_libs/mod_auth_external/db_auth.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
// check for existing user
1919
$dbmail = $db->real_escape_string($arg_email);
20-
$result = $db->query("SELECT jid, password FROM xmpp_user WHERE jid LIKE '".$dbmail."' AND active='y' AND server_id='".$isp_server_id."'");
20+
$result = $db->query("SELECT jid, password FROM xmpp_user WHERE jid LIKE ? AND active='y' AND server_id=?", $dbmail, $isp_server_id);
2121
result_false($result->num_rows != 1);
2222

2323
$user = $result->fetch_object();

‎install/apps/metronome_libs/mod_auth_external/db_isuser.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
// check for existing user
1717
$dbmail = $db->real_escape_string($arg_email);
18-
$result = $db->query("SELECT jid, password FROM xmpp_user WHERE jid LIKE '".$dbmail."' AND active='y' AND server_id='".$isp_server_id."'");
18+
$result = $db->query("SELECT jid, password FROM xmpp_user WHERE jid LIKE ? AND active='y' AND server_id=?", $dbmail, $isp_server_id);
1919
result_false($result->num_rows != 1);
2020
result_true();
2121

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

Lines changed: 1 addition & 5 deletions
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

@@ -154,10 +154,6 @@ public function configure_fail2ban() {
154154
*/
155155
}
156156

157-
public function configure_xmpp() {
158-
parent::configure_xmpp();
159-
}
160-
161157
}
162158

163159
?>

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

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

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

@@ -404,7 +404,7 @@ public function configure_dovecot()
404404

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

@@ -713,7 +713,7 @@ public function configure_apache()
713713
$tpl = new tpl('apache_ispconfig.conf.master');
714714
$tpl->setVar('apache_version',getapacheversion());
715715

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

719719
if(is_array($records) && count($records) > 0) {
@@ -799,7 +799,7 @@ public function configure_nginx(){
799799
if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
800800
}
801801

802-
public function configure_firewall()
802+
public function configure_bastille_firewall()
803803
{
804804
global $conf;
805805

@@ -821,7 +821,7 @@ public function configure_firewall()
821821
$tcp_public_services = '';
822822
$udp_public_services = '';
823823

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

826826
if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){
827827
$tcp_public_services = trim(str_replace(',', ' ', $row["tcp_port"]));
@@ -832,7 +832,7 @@ public function configure_firewall()
832832
}
833833
if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
834834
$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']);
835-
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']));
835+
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']);
836836
}
837837

838838
$content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content);
@@ -1032,13 +1032,11 @@ public function install_ispconfig()
10321032
$file_server_enabled = ($conf['services']['file'])?1:0;
10331033
$db_server_enabled = ($conf['services']['db'])?1:0;
10341034
$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
1035-
$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']);
1035+
$sql = "UPDATE `server` SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ? WHERE server_id = ?";
10361036

1037+
$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']);
10371038
if($conf['mysql']['master_slave_setup'] == 'y') {
1038-
$this->dbmaster->query($sql);
1039-
$this->db->query($sql);
1040-
} else {
1041-
$this->db->query($sql);
1039+
$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']);
10421040
}
10431041

10441042
// chown install dir to root and chmod 755

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

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public function configure_dovecot()
258258

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

@@ -450,13 +450,13 @@ public function configure_powerdns()
450450
global $conf;
451451

452452
//* Create the database
453-
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$conf['powerdns']['database'].' DEFAULT CHARACTER SET '.$conf['mysql']['charset'])) {
453+
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS ?? DEFAULT CHARACTER SET ?', $conf['powerdns']['database'], $conf['mysql']['charset'])) {
454454
$this->error('Unable to create MySQL database: '.$conf['powerdns']['database'].'.');
455455
}
456456

457457
//* Create the ISPConfig database user in the local database
458-
$query = 'GRANT ALL ON `'.$conf['powerdns']['database'].'` . * TO \''.$conf['mysql']['ispconfig_user'].'\'@\'localhost\';';
459-
if(!$this->db->query($query)) {
458+
$query = 'GRANT ALL ON ??.* TO ?@?';
459+
if(!$this->db->query($query, $conf['powerdns']['database'], $conf['mysql']['ispconfig_user'], 'localhost')) {
460460
$this->error('Unable to create user for powerdns database Error: '.$this->db->errorMessage);
461461
}
462462

@@ -566,25 +566,10 @@ public function configure_apache()
566566

567567

568568
//* Copy the ISPConfig configuration include
569-
/*
570-
$content = $this->get_template_file('apache_ispconfig.conf', true);
571-
572-
$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
573-
if(is_array($records) && count($records) > 0)
574-
{
575-
foreach($records as $rec) {
576-
$content .= "NameVirtualHost ".$rec["ip_address"].":80\n";
577-
$content .= "NameVirtualHost ".$rec["ip_address"].":443\n";
578-
}
579-
}
580-
581-
$this->write_config_file($conf['apache']['vhost_conf_dir'].'/000-ispconfig.conf', $content);
582-
*/
583-
584569
$tpl = new tpl('apache_ispconfig.conf.master');
585570
$tpl->setVar('apache_version',getapacheversion());
586571

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

590575
if(is_array($records) && count($records) > 0) {
@@ -933,13 +918,11 @@ public function install_ispconfig()
933918
$db_server_enabled = ($conf['services']['db'])?1:0;
934919
$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
935920

936-
$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']);
921+
$sql = "UPDATE `server` SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ? WHERE server_id = ?";
937922

923+
$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']);
938924
if($conf['mysql']['master_slave_setup'] == 'y') {
939-
$this->dbmaster->query($sql);
940-
$this->db->query($sql);
941-
} else {
942-
$this->db->query($sql);
925+
$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']);
943926
}
944927

945928
// chown install dir to root and chmod 755

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ function configure_postfix($options = '')
215215
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']);
216216

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

@@ -459,7 +459,7 @@ public function configure_dovecot()
459459

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

@@ -745,7 +745,7 @@ public function configure_apache()
745745
$tpl = new tpl('apache_ispconfig.conf.master');
746746
$tpl->setVar('apache_version',getapacheversion());
747747

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

751751
if(is_array($records) && count($records) > 0) {
@@ -873,7 +873,7 @@ public function configure_nginx(){
873873
if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
874874
}
875875

876-
public function configure_firewall()
876+
public function configure_bastille_firewall()
877877
{
878878
global $conf;
879879

@@ -895,7 +895,7 @@ public function configure_firewall()
895895
$tcp_public_services = '';
896896
$udp_public_services = '';
897897

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

900900
if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){
901901
$tcp_public_services = trim(str_replace(',', ' ', $row["tcp_port"]));
@@ -907,7 +907,7 @@ public function configure_firewall()
907907

908908
if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
909909
$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']);
910-
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']));
910+
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']);
911911
}
912912

913913
$content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content);
@@ -1105,13 +1105,11 @@ public function install_ispconfig()
11051105
$file_server_enabled = ($conf['services']['file'])?1:0;
11061106
$db_server_enabled = ($conf['services']['db'])?1:0;
11071107
$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
1108-
$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']);
1108+
$sql = "UPDATE `server` SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ? WHERE server_id = ?";
11091109

1110+
$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']);
11101111
if($conf['mysql']['master_slave_setup'] == 'y') {
1111-
$this->dbmaster->query($sql);
1112-
$this->db->query($sql);
1113-
} else {
1114-
$this->db->query($sql);
1112+
$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']);
11151113
}
11161114

11171115
// chown install dir to root and chmod 755

‎install/install.php‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -449,10 +449,8 @@
449449
// initialize the connection to the master database
450450
$inst->dbmaster = new db();
451451
if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
452-
$inst->dbmaster->dbHost = $conf['mysql']["master_host"];
453-
$inst->dbmaster->dbName = $conf['mysql']["master_database"];
454-
$inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
455-
$inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
452+
$inst->dbmaster->setDBData($conf['mysql']["master_host"], $conf['mysql']["master_admin_user"], $conf['mysql']["master_admin_password"]);
453+
$inst->dbmaster->setDBName($conf['mysql']["master_database"]);
456454

457455
} else {
458456
// the master DB is the same then the slave DB
@@ -623,23 +621,17 @@
623621

624622
//** Configure Firewall
625623
if(strtolower($inst->simple_query('Configure Firewall Server', array('y', 'n'), 'y','configure_firewall')) == 'y') {
626-
//if($conf['bastille']['installed'] == true) {
627-
//* Configure Bastille Firewall
628-
$conf['services']['firewall'] = true;
629-
swriteln('Configuring Bastille Firewall');
630-
$inst->configure_firewall();
631-
/*} elseif($conf['ufw']['installed'] == true) {
632-
//* Configure Ubuntu Firewall
633-
$conf['services']['firewall'] = true;
634-
swriteln('Configuring Ubuntu Firewall');
635-
$inst->configure_ufw_firewall();
636-
} else {
637-
//* Configure Bastille Firewall
638-
$conf['services']['firewall'] = true;
639-
swriteln('Configuring Bastille Firewall');
640-
$inst->configure_bastille_firewall();
641-
}
642-
*/
624+
if($conf['ufw']['installed'] == true) {
625+
//* Configure Ubuntu Firewall
626+
$conf['services']['firewall'] = true;
627+
swriteln('Configuring Ubuntu Firewall');
628+
$inst->configure_ufw_firewall();
629+
} else {
630+
//* Configure Bastille Firewall
631+
$conf['services']['firewall'] = true;
632+
swriteln('Configuring Bastille Firewall');
633+
$inst->configure_bastille_firewall();
634+
}
643635
}
644636

645637
//** Configure Firewall
@@ -713,6 +705,8 @@
713705

714706
} //* << $install_mode / 'Standard' or Genius
715707

708+
$inst->create_mount_script();
709+
716710
//* Create md5 filelist
717711
$md5_filename = '/usr/local/ispconfig/security/data/file_checksums_'.date('Y-m-d_h-i').'.md5';
718712
exec('find /usr/local/ispconfig -type f -print0 | xargs -0 md5sum > '.$md5_filename);

0 commit comments

Comments
 (0)