From 1d258eef7ce12c81cf4707ea62b4d2f1ae7b1a91 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 12 May 2014 08:18:51 -0400
Subject: [PATCH] Merge branch 'ftp-autoexpire' into 'master'
---
interface/lib/classes/functions.inc.php | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index a964634..8a287a4 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -229,7 +229,8 @@
if(preg_match($regex, $result['ip'])) $ips[] = $result['ip'];
}
}
-
+
+ /*
$results = $app->db->queryAllRecords("SELECT xfer FROM dns_slave WHERE xfer != ''");
if(!empty($results) && is_array($results)){
foreach($results as $result){
@@ -260,6 +261,8 @@
}
}
}
+ */
+
$results = $app->db->queryAllRecords("SELECT remote_ips FROM web_database WHERE remote_ips != ''");
if(!empty($results) && is_array($results)){
foreach($results as $result){
--
Gitblit v1.9.1