From 26d7066817b0dd8e3228da1a20421789f42eb9eb Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Wed, 19 Oct 2011 12:11:46 +0200 Subject: kleine Korrekturen --- application/modules/user/controllers/PoolController.php | 2 +- application/modules/user/views/scripts/client/index.phtml | 2 ++ application/modules/user/views/scripts/pool/index.phtml | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php index d85bfdc..ec71096 100755 --- a/application/modules/user/controllers/PoolController.php +++ b/application/modules/user/controllers/PoolController.php @@ -111,7 +111,7 @@ class User_PoolController extends Zend_Controller_Action $db = Zend_Db_Table::getDefaultAdapter(); // extract the un-assigned clients from the clientlist of the group - $stmt = $db->query("SELECT c.clientID, c.groupID, macadress,hardwarehash,created + $stmt = $db->query("SELECT c.clientID, c.groupID, macadress,hardwarehash,ip, ip6, created FROM pbs_poolentries pe RIGHT OUTER JOIN pbs_client c ON c.clientID = pe.clientID WHERE poolentriesID IS NULL diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml index eae3cd2..7a3f3fe 100755 --- a/application/modules/user/views/scripts/client/index.phtml +++ b/application/modules/user/views/scripts/client/index.phtml @@ -10,6 +10,8 @@
Available searchfilter:
clientID
macadress
+
ip
+
ip6
hardwarehash
created
diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml index dcf62f4..f292b76 100755 --- a/application/modules/user/views/scripts/pool/index.phtml +++ b/application/modules/user/views/scripts/pool/index.phtml @@ -172,6 +172,10 @@
escape($client['macadress']); ?>
+ +
escape($client['ip']); ?> 
+ +
escape($client['ip6']); ?> 
escape($client['hardwarehash']); ?>
-- cgit v1.2.3-55-g7522