From c02e3dc6a5b0b65a95a75ca1e37294aee615d108 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 26 Jan 2016 04:03:32 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/lib/installer_base.lib.php | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index be878c1..69d5ccf 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -400,32 +400,32 @@
"riud",
"riud",
"",
- ' . $conf['server_id'] . ',
+ ?,
0,
- "'.$ip_type.'",
- "'.$line.'",
+ ?,
+ ?,
"y",
"80,443"
- )');
+ )', $conf['server_id'], $ip_type, $line);
$server_ip_id = $this->dbmaster->insertID();
$this->db->query('INSERT INTO server_ip (
server_php_id, sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
sys_perm_other, server_id, client_id, ip_type, ip_address,
virtualhost, virtualhost_port
) VALUES (
- '.$server_ip_id.',
+ ?,
1,
1,
"riud",
"riud",
"",
- ' . $conf['server_id'] . ',
+ ?,
0,
- "'.$ip_type.'",
- "'.$line.'",
+ ?,
+ ?,
"y",
"80,443"
- )');
+ )', $server_ip_id, $conf['server_id'], $ip_type, $line);
} else {
$this->db->query('INSERT INTO server_ip (
sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
@@ -437,13 +437,13 @@
"riud",
"riud",
"",
- ' . $conf['server_id'] . ',
+ ?,
0,
- "'.$ip_type.'",
- "'.$line.'",
+ ?,
+ ?,
"y",
"80,443"
- )');
+ )', $conf['server_id'], $ip_type, $line);
}
}
}
@@ -1481,12 +1481,12 @@
//* Create the slave subdirectory
$content .= 'slave';
- if(!@is_dir($content)) mkdir($content, 2770, true);
+ if(!@is_dir($content)) mkdir($content, 02770, true);
//* Chown the slave subdirectory to $conf['bind']['bind_user']
chown($content, $conf['bind']['bind_user']);
chgrp($content, $conf['bind']['bind_group']);
- chmod($content, 2770);
+ chmod($content, 02770);
}
@@ -2822,4 +2822,4 @@
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1