From 65ee3af0845f20cd3ae4a3d0c2ee3ce865f7fc7c Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 27 Jun 2016 11:52:02 -0400
Subject: [PATCH] Change file mode of backups that are made available for download to 0600.
---
interface/web/sites/ajax_get_ip.php | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/interface/web/sites/ajax_get_ip.php b/interface/web/sites/ajax_get_ip.php
index fbe9203..8c83191 100644
--- a/interface/web/sites/ajax_get_ip.php
+++ b/interface/web/sites/ajax_get_ip.php
@@ -28,29 +28,41 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('sites');
+$app->uses('getconf');
-$server_id = intval($_GET["server_id"]);
+$server_id = $app->functions->intval($_GET["server_id"]);
+$client_group_id = $app->functions->intval($_GET["client_group_id"]);
+$ip_type = $_GET['ip_type'];
-if($_SESSION["s"]["user"]["typ"] == 'admin') {
+//if($_SESSION["s"]["user"]["typ"] == 'admin' or $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $sql = "SELECT ip_address FROM server_ip WHERE server_id = $server_id";
- $ips = $app->db->queryAllRecords($sql);
+ //* Get global web config
+ $web_config = $app->getconf->get_server_config($server_id, 'web');
+
+ $tmp = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $client_group_id);
+ $sql = "SELECT ip_address FROM server_ip WHERE ip_type = ? AND server_id = ? AND (client_id = 0 OR client_id=?)";
+
+ $ips = $app->db->queryAllRecords($sql, $ip_type, $server_id, $tmp['groupid']);
// $ip_select = "<option value=''></option>";
- $ip_select = "<option value='*'>*</option>\r\n";
+ if($ip_type == 'IPv4'){
+ $ip_select = ($web_config['enable_ip_wildcard'] == 'y')?"*#":"";
+ } else {
+ $ip_select = "#";
+ }
if(is_array($ips)) {
foreach( $ips as $ip) {
//$selected = ($ip["ip_address"] == $this->dataRecord["ip_address"])?'SELECTED':'';
- $ip_select .= "<option value='$ip[ip_address]'>$ip[ip_address]</option>\r\n";
+ $ip_select .= "$ip[ip_address]#";
}
}
unset($tmp);
unset($ips);
-}
+//}
-echo $ip_select;
-?>
\ No newline at end of file
+echo substr($ip_select, 0, -1);
+?>
--
Gitblit v1.9.1