summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-19 12:11:46 +0200
committerBjörn Geiger2011-10-19 12:11:46 +0200
commit26d7066817b0dd8e3228da1a20421789f42eb9eb (patch)
treef63e1915d4c9abe20b0a61b90215950a6dd19545
parentminor (diff)
downloadpbs2-26d7066817b0dd8e3228da1a20421789f42eb9eb.tar.gz
pbs2-26d7066817b0dd8e3228da1a20421789f42eb9eb.tar.xz
pbs2-26d7066817b0dd8e3228da1a20421789f42eb9eb.zip
kleine Korrekturen
-rwxr-xr-xapplication/modules/user/controllers/PoolController.php2
-rwxr-xr-xapplication/modules/user/views/scripts/client/index.phtml2
-rwxr-xr-xapplication/modules/user/views/scripts/pool/index.phtml4
3 files changed, 7 insertions, 1 deletions
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 @@
<div class='head'>Available searchfilter:</div>
<div class='code'>clientID</div>
<div class='code'>macadress</div>
+ <div class='code'>ip</div>
+ <div class='code'>ip6</div>
<div class='code'>hardwarehash</div>
<div class='code'>created</div>
</div>
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 @@
<div class='details'>
<label>MacAdress</label>
<div class='item'><?php echo $this->escape($client['macadress']); ?></div>
+ <label>IpAddress</label>
+ <div class='item'><?php echo $this->escape($client['ip']); ?>&nbsp;</div>
+ <label>Ip6Address</label>
+ <div class='item'><?php echo $this->escape($client['ip6']); ?>&nbsp;</div>
<label>HardwareHash</label>
<div class='item'><?php echo $this->escape($client['hardwarehash']); ?></div>
<label>Created</label>