summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/Bootstrap.php1
-rw-r--r--application/controllers/ClientController.php21
-rw-r--r--application/controllers/FilterController.php563
-rw-r--r--application/controllers/PoolController.php20
-rw-r--r--application/controllers/SessionController.php51
-rw-r--r--application/forms/FilterAdd.php24
-rw-r--r--application/forms/FilterEvaluate.php123
-rw-r--r--application/forms/Session.php71
-rw-r--r--application/layouts/main.phtml11
-rw-r--r--application/views/scripts/bootiso/index.phtml8
-rw-r--r--application/views/scripts/bootmenu/index.phtml22
-rw-r--r--application/views/scripts/bootos/index.phtml8
-rw-r--r--application/views/scripts/client/index.phtml8
-rw-r--r--application/views/scripts/config/index.phtml8
-rw-r--r--application/views/scripts/filter/index.phtml42
-rw-r--r--application/views/scripts/filter/testevaluate.phtml4
-rw-r--r--application/views/scripts/pool/index.phtml50
-rw-r--r--application/views/scripts/session/index.phtml10
18 files changed, 681 insertions, 364 deletions
diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index c286ad1..f0fe7d3 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -22,7 +22,6 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->doctype('XHTML1_STRICT');
$view->headMeta()->appendHttpEquiv('Content-Type', 'text/html;charset=utf-8');
$view->headLink()->appendStylesheet('/media/css/style.css');
- $view->headTitle()->setSeparator(' - ');
$view->headTitle('pbs²')
->setSeparator(' :: ');
}
diff --git a/application/controllers/ClientController.php b/application/controllers/ClientController.php
index ff663ba..580eb6e 100644
--- a/application/controllers/ClientController.php
+++ b/application/controllers/ClientController.php
@@ -16,16 +16,15 @@ class ClientController extends Zend_Controller_Action
public function addclientAction()
{
- $mac = $this->_request->getParam('mac');
- $hh = $this->_request->getParam('hh');
+ $mac = $this->_request->getParam('mac');
+ $hh = $this->_request->getParam('hh');
if (!isset($_POST["add"])){
- $addclient = new Application_Form_Client();
- $this->view->addclient = $addclient;
+ $addclient = new Application_Form_Client();
+ $this->view->addclient = $addclient;
}
else{
$addfilterform = new Application_Form_Client($_POST);
- print_a($_POST,$addfilterform->isValid($_POST));
if ($addfilterform->isValid($_POST) || ($mac != '' && $hh != '') ) {
$client = new Application_Model_Client();
$mac = ($mac!='')?$mac:$_POST['macadress'];
@@ -37,9 +36,7 @@ class ClientController extends Zend_Controller_Action
print_a('inserted');
$this->_redirect('/client');
}
- else{
- print_a('no insert');
- }
+ $this->view->addclient = $addclient;
}
}
@@ -69,8 +66,8 @@ class ClientController extends Zend_Controller_Action
$this->view->editclient = $editclient;
}
else{
- $addfilterform = new Application_Form_Client($_POST);
- if ($addfilterform->isValid($_POST) || ($mac != '' && $hh != '') ) {
+ $editclient = new Application_Form_Client($_POST);
+ if ($editclient->isValid($_POST) || ($mac != '' && $hh != '') ) {
$client = new Application_Model_Client($_POST);
$client->setID($this->_request->getParam('clientID'));
$clientmapper = new Application_Model_ClientMapper();
@@ -78,9 +75,7 @@ class ClientController extends Zend_Controller_Action
print_a('updated');
$this->_redirect('/client');
}
- else{
- print_a('no update');
- }
+ $this->view->editclient = $editclient;
}
}
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 54bcb19..9141e10 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -4,16 +4,18 @@ class FilterController extends Zend_Controller_Action
{
private $_filtermapper = null;
- private $db;
+
+ private $db = null;
+
public function init()
{
try{
-
- $this->_filtermapper = new Application_Model_FilterMapper();
- }catch (Zend_Exception $e) {
- echo "Error message 1: " . $e->getMessage() . "\n";
- }
- $this->db = Zend_Db_Table::getDefaultAdapter();
+
+ $this->_filtermapper = new Application_Model_FilterMapper();
+ }catch (Zend_Exception $e) {
+ echo "Error message 1: " . $e->getMessage() . "\n";
+ }
+ $this->db = Zend_Db_Table::getDefaultAdapter();
}
public function indexAction()
@@ -21,25 +23,25 @@ class FilterController extends Zend_Controller_Action
try{
$this->_filtermapper = new Application_Model_FilterMapper();
$this->view->filters = $this->_filtermapper->fetchAll();
- }catch (Zend_Exception $e) {
+ }catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- }
- }
+ }
+ }
public function addfilterAction()
{
- if (!isset($_POST["add"])){
- $addfilterform = new Application_Form_FilterAdd();
- $this->view->addfilterform = $addfilterform;
+ $bmmapper = new Application_Model_BootMenuMapper();
+ //TODO get bootmenu by group
+ $bootmenus = $bmmapper->fetchAll();
+ if (!isset($_POST["add"])){
+ $addfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus));
+ $this->view->addfilterform = $addfilterform;
}else {
- $addfilterform = new Application_Form_FilterAdd($_POST);
+ $addfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus),$_POST);
if ($addfilterform->isValid($_POST)) {
try{
- $newfilter = new Application_Model_Filter();
- $newfilter->setTitle($_POST['title']);
+ $newfilter = new Application_Model_Filter($_POST);
$newfilter->setCreated(time());
- $newfilter->setDescription($_POST['description']);
- $newfilter->setPriority($_POST['priority']);
// TODO: Ändere mit ACL
$newfilter->setGroupID('1');
@@ -54,89 +56,80 @@ class FilterController extends Zend_Controller_Action
echo "Error message 2: " . $e->getMessage() . "\n";
}
}
+ $this->view->addfilterform = $addfilterform;
}
}
public function removefilterAction()
{
-
- $filterID = $this->_request->getParam('filterID');
- // TODO: ACL implementieren ob er den filter löschen darf
- if(is_numeric($filterID)){
- $deletefilter = new Application_Model_Filter();
- $deletefilter->setID($filterID);
- $filtermapper = new Application_Model_FilterMapper();
- $filtermapper->delete($deletefilter);
- }
- $this->_redirect('/filter');
+ $filterID = $this->_request->getParam('filterID');
+ // TODO: ACL implementieren ob er den filter löschen darf
+ if(is_numeric($filterID)){
+ $deletefilter = new Application_Model_Filter();
+ $deletefilter->setID($filterID);
+ $filtermapper = new Application_Model_FilterMapper();
+ $filtermapper->delete($deletefilter);
+ }
+ $this->_redirect('/filter');
}
public function editfilterAction()
{
- if (!isset($_POST["add"])){
- // TODO: ACL implementieren ob er editieren darf
- $filterID = $this->_request->getParam('filterID');
- $filter = new Application_Model_Filter();
-
-
- $filtermapper = new Application_Model_FilterMapper();
- $filtermapper->find($filterID,$filter);
- $filter2 = $filter->toArray();
-
- $editfilterform = new Application_Form_FilterAdd();
- $editfilterform->populate($filter2);
- $this->view->editfilterform = $editfilterform;
-
- } else{
- try{
- $filterID = $this->_request->getParam('filterID');
-
- $editfilterform = new Application_Form_FilterAdd($_POST);
- //TODO: ACL integrieren
- $_POST['groupID'] = 1;
- $_POST['membershipID'] = 1;
- $_POST['created'] = time();
-
- if ($editfilterform->isValid($_POST)) {
- $newfilterenty = new Application_Model_Filter($_POST);
- $newfilterenty->setID($this->_request->getParam('filterID'));
- $newfilter2 = new Application_Model_FilterMapper();
- $newfilter2->save($newfilterenty);
- echo 'valid';
- }
- else
- {
- echo 'not valid';
- }
- }catch (Zend_Exception $e) {
- echo "Error message 2: " . $e->getMessage() . "\n";
- }
- $this->_redirect('/filter');
- }
+ $bmmapper = new Application_Model_BootMenuMapper();
+ //TODO get bootmenu by group
+ $bootmenus = $bmmapper->fetchAll();
+ if (!isset($_POST["add"])){
+ // TODO: ACL implementieren ob er editieren darf
+ $filterID = $this->_request->getParam('filterID');
+ $filter = new Application_Model_Filter();
+
+
+ $filtermapper = new Application_Model_FilterMapper();
+ $filtermapper->find($filterID,$filter);
+ $filter2 = $filter->toArray();
+
+ $editfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus));
+ $editfilterform->populate($filter2);
+ $this->view->editfilterform = $editfilterform;
+
+ } else{
+ try{
+ $filterID = $this->_request->getParam('filterID');
+
+ $editfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus),$_POST);
+ //TODO: ACL integrieren
+ $_POST['groupID'] = 1;
+ $_POST['membershipID'] = 1;
+ $_POST['created'] = time();
+
+ if ($editfilterform->isValid($_POST)) {
+ $newfilterenty = new Application_Model_Filter($_POST);
+ $newfilterenty->setID($this->_request->getParam('filterID'));
+ $newfilter2 = new Application_Model_FilterMapper();
+ $newfilter2->save($newfilterenty);
+ echo 'valid';
+ $this->_redirect('/filter');
+ }
+ $this->view->editfilterform = $editfilterform;
+ }catch (Zend_Exception $e) {
+ echo "Error message 2: " . $e->getMessage() . "\n";
+ }
+ }
}
public function addfilterentryAction()
{
-
// TODO: ACL implementieren ob er editieren darf
if (!isset($_POST["add"])){
- echo "case1";
try{
$editfilterform = new Application_Form_FilterEntriesAdd(array('filterID' => $this->_request->getParam('filterID')));
$this->view->editfilterform = $editfilterform;
- echo "<pre style='padding:5px;border:1px solid black;background-color:#3CF'>";
- print_r(array('debug','case1'));
- echo "</pre>";
-
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
} else{
- $editfilterform = new Application_Form_FilterEntriesAdd($_POST);
- echo "<pre style='padding:5px;border:1px solid black; background-color:#3CF;'>case2</pre>";
-
- if ($editfilterform->isValid($_POST)) {
- echo "<pre style='padding:5px;border:1px solid black; background-color:#3CF;'>case 2.2</pre>";
+ $editfilterform = new Application_Form_FilterEntriesAdd($_POST);
+ if ($editfilterform->isValid($_POST)) {
$newfilterenty = new Application_Model_FilterEntries();
$newfilterenty->setFilterID($_POST['filterID']);
$newfilterenty->setFiltertypeID($_POST['filtertypeID']);
@@ -151,15 +144,14 @@ class FilterController extends Zend_Controller_Action
}
$newfilter2 = new Application_Model_FilterEntriesMapper();
- echo "<pre style='border:1px solid black;background-color:#F5B800'>";
- print_r($newfilterenty);
- echo "</pre>";
$newfilter2->save($newfilterenty);
+ $this->_redirect('/filter');
}
- $this->_redirect('/filter');
+ $this->view->editfilterform = $editfilterform;
}
}
- public function editfilterentryAction()
+
+ public function editfilterentryAction()
{
if (!isset($_POST["add"])){
echo "case1";
@@ -174,13 +166,9 @@ class FilterController extends Zend_Controller_Action
$editfilterform = new Application_Form_FilterEntriesAdd();
- echo "<pre style='border:1px solid black;background-color:#F5B800'>";
- print_r($filterentry->toArray());
- echo "</pre>";
$editfilterform->populate($filterentry->toArray());
$editfilterform->setFilterID($filterID);
$this->view->editfilterform = $editfilterform;
- echo "case 1.1";
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
@@ -189,8 +177,7 @@ class FilterController extends Zend_Controller_Action
try{
$filterentriesID = $this->_request->getParam('filterentriesID');
$editfilterform = new Application_Form_FilterEntriesAdd($_POST);
- if ($editfilterform->isValid($_POST)) {
- echo "valid\n";
+ if ($editfilterform->isValid($_POST)) {
$newfilterenty = new Application_Model_FilterEntries($_POST);
$newfilterenty->setID($filterentriesID);
if($_POST['filtertypeID'] == 1){
@@ -201,68 +188,94 @@ class FilterController extends Zend_Controller_Action
$newfilterenty->setFiltervalue($_POST['filtervalue']);
$newfilterenty->setFiltervalue2($_POST['filtervalue2']);
}
- echo "<pre style='border:1px solid black;background-color:#F5B800'>";
- print_r($newfilterenty);
- echo "</pre>";
$newfilter2 = new Application_Model_FilterEntriesMapper();
$newfilter2->save($newfilterenty);
+ $this->_redirect('/filter');
}
- else{
- echo 'nö';
- }
+ $this->view->editfilterform = $editfilterform;
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- }
- $this->_redirect('/filter');
+ }
}
}
- public function removefilterentryAction()
- {
-
- try{
- $filterentriesID = $this->_request->getParam('filterentriesID');
-
- // TODO: ACL implementieren ob er den filter löschen darf
- if(is_numeric($filterentriesID)){
- $deletefilterentry = new Application_Model_FilterEntries();
- $deletefilterentry->setID($filterentriesID);
- echo "<pre style='border:1px solid black;background-color:#F5B800'>";
- print_r($deletefilterentry);
- echo "</pre>";
- $filterentriesmapper = new Application_Model_FilterEntriesMapper();
- $filterentriesmapper->delete($deletefilterentry);
- echo "ok";
+ public function removefilterentryAction()
+ {
+ try{
+ $filterentriesID = $this->_request->getParam('filterentriesID');
+
+ // TODO: ACL implementieren ob er den filter löschen darf
+ if(is_numeric($filterentriesID)){
+ $deletefilterentry = new Application_Model_FilterEntries();
+ $deletefilterentry->setID($filterentriesID);
+ echo "<pre style='border:1px solid black;background-color:#F5B800'>";
+ print_r($deletefilterentry);
+ echo "</pre>";
+
+ $filterentriesmapper = new Application_Model_FilterEntriesMapper();
+ $filterentriesmapper->delete($deletefilterentry);
+ echo "ok";
+ }
+ $this->_redirect('/filter');
+ }catch (Zend_Exception $e) {
+ echo "Error message 2: " . $e->getMessage() . "\n";
}
-# echo "ready";
- $this->_redirect('/filter');
- }catch (Zend_Exception $e) {
- echo "Error message 2: " . $e->getMessage() . "\n";
- }
}
- private function fillIP($ip){
- $ar = explode(".",$ip);
- $representation = array();
- foreach($ar as $part){
- $representation[] = sprintf("%03s",$part);
- }
- return implode(".",$representation);
- }
- private function fillMac($ip){
- $ar = explode(":",$ip);
- $representation = array();
- foreach($ar as $part){
- $representation[] = sprintf("%02s",$part);
+
+ private function fillIP($ip)
+ {
+ $ar = explode(".",$ip);
+ $representation = array();
+ foreach($ar as $part){
+ $representation[] = sprintf("%03s",$part);
+ }
+ return implode(".",$representation);
+ }
+
+ private function fillMac($ip)
+ {
+ $ar = explode(":",$ip);
+ $representation = array();
+ foreach($ar as $part){
+ $representation[] = sprintf("%02s",$part);
+ }
+ return implode(":",$representation);
+ }
+
+ public function evaluateAction()
+ {
+ $db = $this->db;
+ $showPartResults = false;
+ // For Testing Filters
+
+
+ $testFilter = (isset($_POST['submit']))?true:false;
+
+ if($testFilter){
+ $ipAdress = $_POST['ip'];
+ $macAdress = $_POST['mac'];
+ $poolID = $_POST['poolID'];
+ $bootisoID = $_POST['bootisoID'];
+ $membershipID = $_POST['membershipID'];
+ $groupID = $_POST['groupID'];
+ $time = strtotime($_POST['time']);
+ $clientID = $_POST['clientID'];
+ print_a('Input',
+ array('ipAdress'=>$ipAdress,
+ 'macAdress'=>$macAdress,
+ 'poolID' => $poolID,
+ 'bootisoID' => $bootisoID,
+ 'membershipID'=>$membershipID,
+ 'groupID'=>$groupID,
+ 'time'=>$time." - ".date('d.m.Y H:i:s',$time),
+ 'clientID' => $clientID));
}
- return implode(":",$representation);
- }
- public function evaluateAction(){
- $db = $this->db;
- $showPartResults = false;
- try{
-
+
+
+ try{
$mysession = '1';
+ $set = array();
$filtertypID = 8;
$session = new Application_Model_Session();
@@ -272,148 +285,199 @@ class FilterController extends Zend_Controller_Action
// IP Adress
$filtertypID = 1;
// get it from session_table with session_id from the session
- $ipAdress = $session->getIp();
+ if(!$testFilter){
+ $ipAdress = $session->getIp();
+ }
$ipAdress = str_replace(".","",$this->fillIP($ipAdress));
+
$select = $db->select()
- ->from(array('pbs_filterentries')
+ ->from(array('pbs_filterentries')
)
->where('filtertypeID = ?',$filtertypID)
->where('REPLACE(filtervalue,".","") <= ?',$ipAdress)
->where('? <= REPLACE(filtervalue2,".","")',$ipAdress);
-
+
$stmt = $select->query();
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
}
+
if($showPartResults)
print_a('ipAdress',$result,$set[$filtertypID]);
+
#########################################################
// Mac range
$filtertypID = 2;
// get it from session_table with session_id from the session
- $client = new Application_Model_Client();
- $clientmapper = new Application_Model_ClientMapper();
- $clientmapper->find($session->getClientID(),$client);
-
- $macAdress = $client->getMacadress();
- $macAdress = str_replace(":","",$this->fillMac($ipAdress));
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- CONV(HEX('filtervalue'),16,10) <= CONV(HEX('".$macAdress."'),16,10) AND
- CONV(HEX('".$macAdress."'),16,10) <= CONV(HEX('filtervalue2'),16,10)");
- $result = $stmt->fetchAll();
- foreach($result as $r){
- $set[$filtertypID][] = $r['filterID'];
+ if(!$testFilter){
+ $client = new Application_Model_Client();
+ $clientmapper = new Application_Model_ClientMapper();
+ $clientmapper->find($session->getClientID(),$client);
+ $macAdress = $client->getMacadress();
}
+ try{
+ $macAdress = str_replace(":","",$this->fillMac($ipAdress));
+ $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
+ filtertypeID = ".$filtertypID." AND
+ CONV(HEX('filtervalue'),16,10) <= CONV(HEX('".$macAdress."'),16,10) AND
+ CONV(HEX('".$macAdress."'),16,10) <= CONV(HEX('filtervalue2'),16,10)");
+ $result = $stmt->fetchAll();
+ foreach($result as $r){
+ $set[$filtertypID][] = $r['filterID'];
+ }
+ }
+ catch(Exception $e){}
if($showPartResults)
print_a('macAdress',$result,$set[$filtertypID]);
+
#########################################################
// PoolID
$filtertypID = 3;
// get PoolID from client_ID from session_id from the session
- $poolentry = new Application_Model_PoolEntries();
- $poolentrymapper = new Application_Model_PoolEntriesMapper();
- $poolentry = $poolentrymapper->findby('clientID',$client->getID());
- $poolentry = $poolentry[0];
-
- $poolID = $poolentry['poolID'];
- print_a($poolentry);
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$poolID." ");
- $result = $stmt->fetchAll();
- foreach($result as $r){
- $set[$filtertypID][] = $r['filterID'];
+ if(!$testFilter){
+ $poolentry = new Application_Model_PoolEntries();
+ $poolentrymapper = new Application_Model_PoolEntriesMapper();
+ $poolentry = $poolentrymapper->findby('clientID',$client->getID());
+ $poolentry = $poolentry[0];
+
+ $poolID = $poolentry['poolID'];
+ }
+
+ try{
+ $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
+ filtertypeID = ".$filtertypID." AND
+ filtervalue = ".$poolID." ");
+ $result = $stmt->fetchAll();
+ if(count($result)>0){
+ foreach($result as $r){
+ $set[$filtertypID][] = $r['filterID'];
+ }
+ }
}
+ catch(Exception $e){}
+
if($showPartResults)
print_a('poolID',$result,$set[$filtertypID]);
#########################################################
// ClientID
$filtertypID = 8;
// get client_ID from session_id from the session
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$session->getClientID()." ");
- $result = $stmt->fetchAll();
- foreach($result as $r){
- $set[$filtertypID][] = $r['filterID'];
+
+ if(!$testFilter){
+ $clientID = $session->getClientID();
}
+ try{
+ $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
+ filtertypeID = ".$filtertypID." AND
+ filtervalue = ".$clientID." ");
+ $result = $stmt->fetchAll();
+ foreach($result as $r){
+ $set[$filtertypID][] = $r['filterID'];
+ }
+ }
+ catch(Exception $e){}
+
if($showPartResults)
print_a('clientID',$result,$set[$filtertypID]);
#########################################################
// BootIsoID
$filtertypID = 4;
- // get BootIsoID from client_ID from session_id from the session
- $bootisoID = $session->getBootisoID();
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$bootisoID." ");
- $result = $stmt->fetchAll();
- foreach($result as $r){
- $set[$filtertypID][] = $r['filterID'];
+ // get BootIsoID from client_ID from session_id from the session
+ if(!$testFilter){
+ $bootisoID = $session->getBootisoID();
+ }
+ try{
+ $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
+ filtertypeID = ".$filtertypID." AND
+ filtervalue = ".$bootisoID." ");
+ $result = $stmt->fetchAll();
+ foreach($result as $r){
+ $set[$filtertypID][] = $r['filterID'];
+ }
}
+ catch(Exception $e){}
+
if($showPartResults)
print_a('bootisoID',$result,$set[$filtertypID]);
#########################################################
// MembershipID
$filtertypID = 5;
- // get membership from the session
- //TODO: GET MEMBERSHIP from SESSION
- $membershipID = 1;
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$membershipID." ");
- $result = $stmt->fetchAll();
- foreach($result as $r){
- $set[$filtertypID][] = $r['filterID'];
+ if(!$testFilter){
+ // get membership from the session
+ //TODO: GET MEMBERSHIP from SESSION
+ $membershipID = 1;
}
+ try{
+ $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
+ filtertypeID = ".$filtertypID." AND
+ filtervalue = ".$membershipID." ");
+ $result = $stmt->fetchAll();
+ foreach($result as $r){
+ $set[$filtertypID][] = $r['filterID'];
+ }
+ }
+ catch(Exception $e){}
+
if($showPartResults)
print_a('membership',$result,$set[$filtertypID]);
#########################################################
// GroupID
$filtertypID = 6;
- // get membership from the session
- //TODO: GET GROUP from SESSION
- $groupID = 1;
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$groupID." ");
- $result = $stmt->fetchAll();
- foreach($result as $r){
- $set[$filtertypID][] = $r['filterID'];
+ if(!$testFilter){
+ // get membership from the session
+ //TODO: GET GROUP from SESSION
+ $groupID = 1;
}
+ try{
+ $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
+ filtertypeID = ".$filtertypID." AND
+ filtervalue = ".$groupID." ");
+ $result = $stmt->fetchAll();
+ foreach($result as $r){
+ $set[$filtertypID][] = $r['filterID'];
+ }
+ }
+ catch(Exception $e){}
+
if($showPartResults)
print_a('membership',$result,$set[$filtertypID]);
#########################################################
// Time
$filtertypID = 7;
- $nowShort = date('H-i',time());
- $nowLong = date('Y-m-d-H-i',time());
+ if(!$testFilter){
+ $time = time();
+ }
+
+ $nowShort = date('H-i',$time);
+ $nowLong = date('Y-m-d-H-i',$time);
$nowShort = str_replace("-","",$nowShort);
$nowLong = str_replace("-","",$nowLong);
-
- $select = $db->select()
- ->from(array('pbs_filterentries')
- )
- ->where('filtertypeID = ?',$filtertypID)
- ->where('REPLACE(filtervalue,"-","") <= ? AND ? <= REPLACE(filtervalue2,"-","")',$nowShort)
- ->orWhere('REPLACE(filtervalue,"-","") <= ? AND ? <= REPLACE(filtervalue2,"-","")',$nowLong);
-
- $stmt = $select->query();
- $result = $stmt->fetchAll();
- foreach($result as $r){
- $set[$filtertypID][] = $r['filterID'];
+ try{
+ $select = $db->select()
+ ->from(array('pbs_filterentries')
+ )
+ ->where('filtertypeID = ?',$filtertypID)
+ ->where('REPLACE(filtervalue,"-","") <= ? AND ? <= REPLACE(filtervalue2,"-","")',$nowShort)
+ ->orWhere('REPLACE(filtervalue,"-","") <= ? AND ? <= REPLACE(filtervalue2,"-","")',$nowLong);
+
+ $stmt = $select->query();
+ $result = $stmt->fetchAll();
+ foreach($result as $r){
+ $set[$filtertypID][] = $r['filterID'];
+ }
}
+ catch(Exception $e){}
+
if($showPartResults)
print_a('time',$result,$set[$filtertypID]);
########################################
// ErgebnisSet auswerten
print_a('the result sets of the filtertypes',$set);
-
+
// Merging of the resultsets of the filter
$kk = array();
foreach($set as $myset){
@@ -421,18 +485,21 @@ class FilterController extends Zend_Controller_Action
}
$set = $kk;
// counting how often a filter is evaluated at database
+ $a = array();
foreach($set as $k=> $s){
$a[$s] += 1;
}
-
+ print_a('Übereinstimmungen pro Filter',$a);
// Get the number of filtertypes every filter has
$stmt = $db->query('SELECT filterID, COUNT(filtertypeID) as num FROM pbs_filterentries GROUP BY filterID');
$resultset = $stmt->fetchAll();
foreach($resultset as $d){
$database[$d['filterID']] = $d['num'];
}
-
+ print_a('Anzahl Filterentries in Datenbank',$database);
+
// remove all filters from resultset, which to few filtertypes satisfied
+ $result = array();
foreach($a as $i=>$b){
if($a[$i] < $database[$i]){
unset($a[$i]);
@@ -441,8 +508,8 @@ class FilterController extends Zend_Controller_Action
$result[] = $i;
}
}
-
- print_a('result set of filterIDs',$result);
+
+ print_a('True Filters',$result);
// now selecting the filter with the highest priority
$query = 'SELECT filterID, bootmenuID, priority
FROM pbs_filter WHERE ';
@@ -451,16 +518,58 @@ class FilterController extends Zend_Controller_Action
}
$query .= implode(" OR ", $queryTmp);
$query .= 'ORDER BY priority DESC LIMIT 0,1';
- $stmt = $db->query($query);
- $resultset = $stmt->fetchAll();
- print_a($resultset);
- echo "<h1>".$resultset[0]['bootmenuID']."</h1>";
-
+ $bootmenuID = 'null';
+ try{
+ $stmt = $db->query($query);
+ $resultset = $stmt->fetchAll();
+ $bootmenuID = $resultset[0]['bootmenuID'];
+ }
+ catch(Exception $e){
+ }
+ if($bootmenuID != 'null'){
+ $bm = new Application_Model_BootMenu();
+ $bmmapper = new Application_Model_BootMenuMapper();
+ $bmmapper->find($bootmenuID,$bm);
+ echo "<h1><a href='/bootmenu/index/bootmenuID/".$bootmenuID."'>Goto BootmenuID: ".$bootmenuID."</a></h1>";
+ }
+ else{
+ echo "<h1>No Result :-(</h1>";
+ }
+
}catch (Zend_Exception $e) {
echo "class: ".get_class($e)."<br>\n";
- echo "Error message 2: " . $e->getMessage() . "\n";
+ echo "Error message 2: " . $e->getMessage() . "\n";
}
- }
+ }
+
+ public function testevaluateAction()
+ {
+ $pm = new Application_Model_PoolMapper();
+ $pools = $pm->fetchAll();
+
+ $bim = new Application_Model_BootIsoMapper();
+ $bootisos = $bim->fetchAll();
+
+ $mm = new Application_Model_MembershipMapper();
+ $memberships = $mm->fetchAll();
+
+ $gm = new Application_Model_GroupMapper();
+ $groups = $gm->fetchAll();
+
+ $cm = new Application_Model_ClientMapper();
+ $clients = $cm->fetchAll();
+
+ $filterevaluate = new Application_Form_FilterEvaluate(
+ array( 'pools' => $pools,
+ 'bootisos' => $bootisos,
+ 'memberships' => $memberships,
+ 'groups' => $groups,
+ 'clients' => $clients,
+
+ ));
+ $this->view->filterevaluate = $filterevaluate;
+ }
+
}
@@ -472,3 +581,5 @@ class FilterController extends Zend_Controller_Action
+
+
diff --git a/application/controllers/PoolController.php b/application/controllers/PoolController.php
index cb38a80..7c5092e 100644
--- a/application/controllers/PoolController.php
+++ b/application/controllers/PoolController.php
@@ -25,7 +25,6 @@ class PoolController extends Zend_Controller_Action
$assignedclientsArray[] = $c->toArray();
}
$freeclients = $this->arrayDiff($clientsArray,$assignedclientsArray);
- #print_a($freeclients);
$this->view->freeclients = $freeclients;
@@ -49,6 +48,7 @@ class PoolController extends Zend_Controller_Action
echo "Error message 2: " . $e->getMessage() . "\n";
}
}
+ $this->view->addpool = $addfilterform;
}
}
@@ -80,8 +80,8 @@ class PoolController extends Zend_Controller_Action
$this->view->editpoolform = $editpool;
}else {
- $addpoolform = new Application_Form_Pool($_POST);
- if ($addpoolform->isValid($_POST)) {
+ $editpoolform = new Application_Form_Pool($_POST);
+ if ($editpoolform->isValid($_POST)) {
try{
$pool = new Application_Model_Pool($_POST);
$pool->setID($this->_request->getParam('poolID'));
@@ -92,6 +92,7 @@ class PoolController extends Zend_Controller_Action
echo "Error message 2: " . $e->getMessage() . "\n";
}
}
+ $this->view->editpoolform = $editpoolform;
}
}
@@ -99,10 +100,8 @@ class PoolController extends Zend_Controller_Action
{
$clientID = $this->_request->getParam('clientID');
$poolID = $this->_request->getParam('poolID');
- print_a($clientID,$poolID);
if(!isset($_POST['clientID']) && ($clientID == '' && $poolID == '')){
- print_a($_POST);
$clientmapper = new Application_Model_ClientMapper();
$clients = $clientmapper->fetchAll();
foreach($clients as $c){
@@ -117,10 +116,8 @@ class PoolController extends Zend_Controller_Action
$poolclient = new Application_Form_PoolClient(array('clients'=> $freeclients));
$this->view->poolclient = $poolclient;
- }else {
- #$_POST['poolID'] = $this->_request->getParam('poolID');
- $poolclientform = new Application_Form_PoolClient($_POST);
-
+ }else {
+ $poolclient = new Application_Form_PoolClient($_POST);
try{
$pool = new Application_Model_PoolEntries($_POST);
$pool->setPoolID($this->_request->getParam('poolID'));
@@ -133,6 +130,7 @@ class PoolController extends Zend_Controller_Action
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
+ $this->view->poolclient = $poolclient;
}
}
@@ -156,15 +154,11 @@ class PoolController extends Zend_Controller_Action
if(is_numeric($poolentriesID)){
$deletepoolentries = new Application_Model_PoolEntries();
$deletepoolentries->setID($poolentriesID);
- echo "<pre style='border:1px solid black;background-color:#F5B800'>";
- print_r($deletepoolentries);
- echo "</pre>";
$deletepoolentriesmapper = new Application_Model_PoolEntriesMapper();
$deletepoolentriesmapper->delete($deletepoolentries);
echo "ok";
}
-# echo "ready";
$this->_redirect('/pool');
}
diff --git a/application/controllers/SessionController.php b/application/controllers/SessionController.php
index fc3b962..09eadc9 100644
--- a/application/controllers/SessionController.php
+++ b/application/controllers/SessionController.php
@@ -16,15 +16,32 @@ class SessionController extends Zend_Controller_Action
public function createsessionAction()
{
+ $cm = new Application_Model_ClientMapper();
+ $clients = $cm->fetchAll();
+
+ $bm = new Application_Model_BootOsMapper();
+ $bootos = $bm->fetchAll();
+
+ $bi = new Application_Model_BootIsoMapper();
+ $bootisos = $bi->fetchAll();
+
if (!isset($_POST["add"])){
- $createsession = new Application_Form_Session();
+ $createsession = new Application_Form_Session(array('clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos));
$this->view->createsession = $createsession;
}else {
- $createsession = new Application_Form_Session($_POST);
+ // TODO extend with normal function not only with post
+ $createsession = new Application_Form_Session(array('clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos),$_POST);
print_a($_POST);
if ($createsession->isValid($_POST)) {
try{
$session = new Application_Model_Session($_POST);
+ $session->setTime(strtotime($_POST['time']));
+ if($session->getClientID() == ''){
+ $session->setClientID(null);
+ }
+ if($session->getBootosID() == ''){
+ $session->setBootosID(null);
+ }
$sessionmapper = new Application_Model_SessionMapper();
$sessionmapper->save($session);
@@ -34,16 +51,22 @@ class SessionController extends Zend_Controller_Action
echo "Error message 2: " . $e->getMessage() . "\n";
}
print_a('saved');
- $this->_redirect('/session');
- }
- else{
- print_a('not saved');
+ #$this->_redirect('/session');
}
+ $this->view->createsession = $createsession;
}
}
public function editsessionAction()
{
+ $cm = new Application_Model_ClientMapper();
+ $clients = $cm->fetchAll();
+
+ $bm = new Application_Model_BootOsMapper();
+ $bootos = $bm->fetchAll();
+
+ $bi = new Application_Model_BootIsoMapper();
+ $bootisos = $bi->fetchAll();
if (!isset($_POST["add"])){
// TODO: ACL implementieren ob er editieren darf
$sessionID = $this->_request->getParam('sessionID');
@@ -51,10 +74,11 @@ class SessionController extends Zend_Controller_Action
$sessionmapper = new Application_Model_SessionMapper();
- $sessionmapper->find($sessionID,$session);
+ $sessionmapper->find($sessionID,$session);
+ $session->setTime(date('d.m.Y H:i',$session->getTime()));
$session2 = $session->toArray();
- $editsession = new Application_Form_Session();
+ $editsession = new Application_Form_Session(array('clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos));
$editsession->populate($session2);
$this->view->editsession = $editsession;
@@ -62,11 +86,18 @@ class SessionController extends Zend_Controller_Action
try{
$sessionID = $this->_request->getParam('sessionID');
- $editsession = new Application_Form_Session($_POST);
+ $editsession = new Application_Form_Session(array('clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos),$_POST);
if ($editsession->isValid($_POST)) {
$session = new Application_Model_Session($_POST);
- $session->setID($this->_request->getParam('sessionID'));
+ $session->setID($this->_request->getParam('sessionID'));
+ $session->setTime(strtotime($_POST['time']));
+ if($session->getClientID() == ''){
+ $session->setClientID(null);
+ }
+ if($session->getBootosID() == ''){
+ $session->setBootosID(null);
+ }
$sessionmapper = new Application_Model_SessionMapper();
$sessionmapper->save($session);
echo 'valid';
diff --git a/application/forms/FilterAdd.php b/application/forms/FilterAdd.php
index af4f9b2..091eb37 100644
--- a/application/forms/FilterAdd.php
+++ b/application/forms/FilterAdd.php
@@ -2,6 +2,7 @@
class Application_Form_FilterAdd extends Zend_Form
{
+ private $bootmenus;
public function init()
{
@@ -22,14 +23,16 @@ class Application_Form_FilterAdd extends Zend_Form
'label' => 'Description:',
));
- $this->addElement('text', 'bootmenuID', array(
- 'filters' => array('StringTrim'),
- 'validators' => array(
- array('StringLength', false, array(0, 50)),
- ),
- 'required' => true,
- 'label' => 'bootmenuID:',
- ));
+ $bootmenufield = $this->createElement('select','bootmenuID');
+ $bootmenufield ->setLabel('Bootmenu:');
+
+ if(count($this->bootmenus)>0){
+ foreach($this->bootmenus as $id => $g){
+ $bootmenufield->addMultiOption($g->getID(), $g->getTitle());
+ }
+ }
+ $bootmenufield->setRegisterInArrayValidator(false);
+ $this->addElement($bootmenufield);
$this->addElement('text', 'priority', array(
'filters' => array('StringTrim'),
@@ -45,7 +48,10 @@ class Application_Form_FilterAdd extends Zend_Form
'label' => 'Save',
));
}
-
+ function setBootmenus($val){
+ $this->bootmenus = $val;
+ return;
+ }
}
diff --git a/application/forms/FilterEvaluate.php b/application/forms/FilterEvaluate.php
new file mode 100644
index 0000000..2c93aef
--- /dev/null
+++ b/application/forms/FilterEvaluate.php
@@ -0,0 +1,123 @@
+<?php
+
+class Application_Form_FilterEvaluate extends Zend_Form
+{
+ private $pools;
+ private $bootisos;
+ private $memberships;
+ private $groups;
+ private $clients;
+
+ public function init()
+ {
+ $this->setName("Test Filter");
+ $this->setMethod('post');
+ $this->setAction('/filter/evaluate');
+
+ $this->addElement('text', 'ip', array(
+ 'filters' => array('StringTrim'),
+ 'validators' => array(
+ array('StringLength', false, array(0, 50)),
+ ),
+ 'required' => false,
+ 'label' => 'IP:',
+ ));
+ ######################################
+ $this->addElement('text', 'mac', array(
+ 'filters' => array('StringTrim'),
+ 'validators' => array(
+ array('StringLength', false, array(0, 50)),
+ ),
+ 'required' => false,
+ 'label' => 'Mac:',
+ ));
+ ######################################
+ $poolfield = $this->createElement('select','poolID');
+ $poolfield ->setLabel('Pool:');
+ $poolfield->addMultiOption('','');
+ if(count($this->pools)>0){
+ foreach($this->pools as $id => $g){
+ $poolfield->addMultiOption($g->getID(), $g->getTitle());
+ }
+ }
+ $poolfield->setRegisterInArrayValidator(false);
+ $this->addElement($poolfield);
+ ######################################
+ $bootisofield = $this->createElement('select','bootisoID');
+ $bootisofield ->setLabel('BootIso:');
+ $bootisofield->addMultiOption('','');
+ if(count($this->bootisos)>0){
+ foreach($this->bootisos as $id => $g){
+ $bootisofield->addMultiOption($g->getID(), $g->getTitle());
+ }
+ }
+ $bootisofield->setRegisterInArrayValidator(false);
+ $this->addElement($bootisofield);
+ ######################################
+ $membershipfield = $this->createElement('select','membershipID');
+ $membershipfield ->setLabel('Membership:');
+ $membershipfield->addMultiOption('','');
+ if(count($this->memberships)>0){
+ foreach($this->memberships as $id => $g){
+ $membershipfield->addMultiOption($g->getID(), $g->getPersonID());
+ }
+ }
+ $membershipfield->setRegisterInArrayValidator(false);
+ $this->addElement($membershipfield);
+ ######################################
+ $groupfield = $this->createElement('select','groupID');
+ $groupfield ->setLabel('Group:');
+ $groupfield->addMultiOption('','');
+ if(count($this->groups)>0){
+ foreach($this->groups as $id => $g){
+ $groupfield->addMultiOption($g->getID(), $g->getTitle());
+ }
+ }
+ $groupfield->setRegisterInArrayValidator(false);
+ $this->addElement($groupfield);
+ ######################################
+ $this->addElement('text', 'time', array(
+ 'filters' => array('StringTrim'),
+ 'validators' => array(
+ array('StringLength', false, array(0, 50)),
+ ),
+ 'required' => false,
+ 'label' => 'Time:',
+ ));
+ ######################################
+ $clientfield = $this->createElement('select','clientID');
+ $clientfield ->setLabel('Client:');
+ $clientfield->addMultiOption('','');
+ if(count($this->clients)>0){
+ foreach($this->clients as $id => $g){
+ $clientfield->addMultiOption($g->getID(), $g->getMacadress());
+ }
+ }
+ $clientfield->setRegisterInArrayValidator(false);
+ $this->addElement($clientfield);
+
+ $this->addElement('submit', 'submit', array(
+ 'required' => false,
+ 'ignore' => true,
+ 'label' => 'Get It On!',
+ ));
+ }
+ function setPools($v){
+ $this->pools = $v;
+ }
+ function setBootisos($v){
+ $this->bootisos = $v;
+ }
+ function setMemberships($v){
+ $this->memberships = $v;
+ }
+ function setGroups($v){
+ $this->groups = $v;
+ }
+ function setClients($v){
+ $this->clients = $v;
+ }
+
+
+}
+
diff --git a/application/forms/Session.php b/application/forms/Session.php
index f094676..30aefda 100644
--- a/application/forms/Session.php
+++ b/application/forms/Session.php
@@ -3,36 +3,48 @@
class Application_Form_Session extends Zend_Form
{
+ private $clients;
+ private $bootos;
+ private $bootisos;
+
public function init()
{
$this->setName("session");
$this->setMethod('post');
- $this->addElement('text', 'clientID', array(
- 'filters' => array('StringTrim'),
- 'validators' => array(
- array('StringLength', false, array(0, 50)),
- ),
- 'required' => true,
- 'label' => 'clientID:',
- ));
+ $clientfield = $this->createElement('select','clientID');
+ $clientfield ->setLabel('Client:');
+ $clientfield->addMultiOption('','');
+ if(count($this->clients)>0){
+ foreach($this->clients as $id => $g){
+ $clientfield->addMultiOption($g->getID(), $g->getMacadress());
+ }
+ }
+ $clientfield->setRegisterInArrayValidator(false);
+ $this->addElement($clientfield);
+
+
+ $bootosfield = $this->createElement('select','bootosID');
+ $bootosfield ->setLabel('BootOs:');
+ $bootosfield->addMultiOption('','');
+ if(count($this->bootos)>0){
+ foreach($this->bootos as $id => $g){
+ $bootosfield->addMultiOption($g->getID(), $g->getTitle());
+ }
+ }
+ $bootosfield->setRegisterInArrayValidator(false);
+ $this->addElement($bootosfield);
+
+ $bootisofield = $this->createElement('select','bootisoID');
+ $bootisofield ->setLabel('BootIso:');
+ if(count($this->bootisos)>0){
+ foreach($this->bootisos as $id => $g){
+ $bootisofield->addMultiOption($g->getID(), $g->getTitle());
+ }
+ }
+ $bootisofield->setRegisterInArrayValidator(false);
+ $this->addElement($bootisofield);
- $this->addElement('text', 'bootosID', array(
- 'filters' => array('StringTrim'),
- 'validators' => array(
- array('StringLength', false, array(0, 50)),
- ),
- 'required' => true,
- 'label' => 'bootosID:',
- ));
-$this->addElement('text', 'bootisoID', array(
- 'filters' => array('StringTrim'),
- 'validators' => array(
- array('StringLength', false, array(0, 50)),
- ),
- 'required' => true,
- 'label' => 'bootisoID:',
- ));
$this->addElement('text', 'time', array(
'filters' => array('StringTrim'),
'validators' => array(
@@ -64,7 +76,16 @@ $this->addElement('text', 'ip6', array(
'label' => 'Save',
));
}
-
+ function setClients($v){
+ $this->clients = $v;
+ }
+ function setBootos($v){
+ $this->bootos = $v;
+ }
+ function setBootisos($v){
+ $this->bootisos = $v;
+ }
+
}
diff --git a/application/layouts/main.phtml b/application/layouts/main.phtml
index 3d95f2f..57d09c7 100644
--- a/application/layouts/main.phtml
+++ b/application/layouts/main.phtml
@@ -4,6 +4,9 @@
<head>
<?php
+$request = Zend_Controller_Front::getInstance()->getRequest();
+$this->headTitle()->append(ucwords($request->getControllerName()));
+$this->headTitle()->append(ucwords($request->getActionName()));
echo $this->headTitle()."\n";
echo $this->headMeta()."\n";
echo $this->headStyle()."\n";
@@ -32,6 +35,14 @@ echo $this->headScript()."\n";
</div>
<div id='innerwrapper'>
<?php echo $this->layout()->content; ?>
+ <div class='clear footer'><?php
+if (Zend_Auth::getInstance()->hasIdentity()) {
+ //TODO: Display Auth info
+ // echo "<b>angemeldet</b>";
+ // echo " - <a href='/auth/logout'>logout</a>";
+}
+?></div>
</div>
</div>
+
</body></html>
diff --git a/application/views/scripts/bootiso/index.phtml b/application/views/scripts/bootiso/index.phtml
index 20de6a1..5e7da1e 100644
--- a/application/views/scripts/bootiso/index.phtml
+++ b/application/views/scripts/bootiso/index.phtml
@@ -28,22 +28,22 @@
<td><?php echo $this->escape(date('Y-m-d H:i:s', $bootiso->getCreated())); ?></td>
<td><?php echo $this->escape($bootiso->getExpires()); ?></td>
<td><?php echo $this->escape($bootiso->getPublic()); ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'bootiso',
'action' => 'editbootiso',
'bootisoID' => $bootiso->getID()
),
'default',
- true, false) ?>">Edit BootISO</a></td>
- <td><a href="<?php echo $this->url(
+ true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootISO' /></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'bootiso',
'action' => 'deletebootiso',
'bootisoID' => $bootiso->getID()
),
'default',
- true) ?>">Delete BootISO</a></td>
+ true) ?>"><img src='/media/img/delete.png' alt='Delete BootISO'/></a></td>
</tr>
<?php endforeach; ?>
</table>
diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml
index 019a799..6fb55e4 100644
--- a/application/views/scripts/bootmenu/index.phtml
+++ b/application/views/scripts/bootmenu/index.phtml
@@ -22,23 +22,23 @@
<td><?php echo $this->escape($bootmenu->getGroupID()); ?></td>
<td><?php echo $this->escape($bootmenu->getMembershipID()); ?></td>
<td><?php echo $this->escape(date('Y-m-d H:i:s', $bootmenu->getCreated())); ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'bootmenu',
'action' => 'editbootmenu',
'bootmenuID' => $bootmenu->getID()
),
'default',
- true, false) ?>">Edit Bootmenu</a></td>
- <td><a href="<?php echo $this->url(
+ true, false) ?>"><img src='/media/img/edit.png' alt='Edit Bootmenu'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'bootmenu',
'action' => 'deletebootmenu',
'bootmenuID' => $bootmenu->getID()
),
'default',
- true) ?>">Delete Bootmenu</a></td>
- <td><a href="<?php echo $this->url(
+ true) ?>"><img src='/media/img/delete.png' alt='Delete Bootmenu'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'bootmenu',
'action' => 'addbootmenuentry',
@@ -46,12 +46,12 @@
'maxorder' => count($this->bootmenuentrylist[$bootmenu->getID()])
),
'default',
- true) ?>">Add Entry</a></td>
+ true) ?>"><img src='/media/img/add.png' alt='Add Entry'/></a></td>
</tr>
<?php if(count($this->bootmenuentrylist[$bootmenu->getID()]) > 0):?>
<tr class=detail>
- <td></td>
+ <td class=arrowtop>↳</td>
<td colspan=7>
<table>
<tr>
@@ -78,7 +78,7 @@
<td><?php echo $this->escape($bootmenuentry->getkcl()); ?></td>
<td><?php echo "[".$this->escape($bootmenuentry->getConfigID()."] ". $config->getTitle()); ?></td>
<td><?php echo $this->escape($bootmenuentry->getOrder() + 1); ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'bootmenu',
'action' => 'editbootmenuentry',
@@ -88,15 +88,15 @@
'oldorder' => $bootmenuentry->getOrder()
),
'default',
- true, false) ?>">Edit Entry</a></td>
- <td><a href="<?php echo $this->url(
+ true, false) ?>"><img src='/media/img/edit.png' alt='Edit Entry'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'bootmenu',
'action' => 'removebootmenuentry',
'bootmenuentryID' => $bootmenuentry->getID()
),
'default',
- true) ?>">Remove Entry</a></td>
+ true) ?>"><img src='/media/img/delete.png' alt='Remove Entry'/></a></td>
</tr>
<?php endforeach; ?>
</table>
diff --git a/application/views/scripts/bootos/index.phtml b/application/views/scripts/bootos/index.phtml
index df4f072..6da7a16 100644
--- a/application/views/scripts/bootos/index.phtml
+++ b/application/views/scripts/bootos/index.phtml
@@ -35,22 +35,22 @@
<td><?php echo $this->escape(date('Y-m-d H:i:s', $bootos->getCreated())); ?></td>
<td><?php echo $this->escape($bootos->getExpires()); ?></td>
<td><?php echo $this->escape($bootos->getPublic()); ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'bootos',
'action' => 'editbootos',
'bootosID' => $bootos->getID()
),
'default',
- true, false) ?>">Edit BootOS</a></td>
- <td><a href="<?php echo $this->url(
+ true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootOS'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'bootos',
'action' => 'deletebootos',
'bootosID' => $bootos->getID()
),
'default',
- true) ?>">Delete BootOS</a></td>
+ true) ?>"><img src='/media/img/delete.png' alt='Delete BootOS'/></a></td>
</tr>
<?php endforeach; ?>
</table>
diff --git a/application/views/scripts/client/index.phtml b/application/views/scripts/client/index.phtml
index 9ef344b..fd7725c 100644
--- a/application/views/scripts/client/index.phtml
+++ b/application/views/scripts/client/index.phtml
@@ -16,22 +16,22 @@
<td><?php echo $this->escape($client->getID()) ?></td>
<td class='monospace'><?php echo $this->escape($client->getMacadress()) ?></td>
<td class='monospace'><?php echo $this->escape($client->getHardwarehash()) ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'client',
'action' => 'editclient',
'clientID' => $client->getID()
),
'default',
- true) ?>">edit client</a></td>
- <td><a href="<?php echo $this->url(
+ true) ?>"><img src='/media/img/edit.png' alt='Edit Client'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'client',
'action' => 'removeclient',
'clientID' => $client->getID()
),
'default',
- true) ?>">remove client</a></td>
+ true) ?>"><img src='/media/img/delete.png' alt='Delete Client'/></a></td>
</tr>
<?php endforeach ?>
</table>
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index 6457d8f..5562b86 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -23,22 +23,22 @@
<td><?php echo $this->escape($config->getMembershipID()); ?></td>
<td><?php echo $this->escape($config->getShellscript()); ?></td>
<td><?php echo $this->escape(date('Y-m-d H:i:s', $config->getCreated())); ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'config',
'action' => 'editconfig',
'configID' => $config->getID()
),
'default',
- true, false) ?>">Edit Config</a></td>
- <td><a href="<?php echo $this->url(
+ true, false) ?>"><img src='/media/img/edit.png' alt='Edit Config'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'config',
'action' => 'deleteconfig',
'configID' => $config->getID()
),
'default',
- true) ?>">Delete Config</a></td>
+ true) ?>"><img src='/media/img/delete.png' alt='Delete Config'/></a></td>
</tr>
<?php endforeach; ?>
</table>
diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml
index 253d14d..188bed3 100644
--- a/application/views/scripts/filter/index.phtml
+++ b/application/views/scripts/filter/index.phtml
@@ -1,5 +1,5 @@
<h1>Filters</h1>
-<?php echo $this->formButton('createconfig', 'Add Filter', array(
+<?php echo $this->formButton('createconfig', 'Create Filter', array(
'onclick' => 'self.location="/filter/addfilter"',
'class' => 'addbutton'))?>
@@ -8,6 +8,7 @@
<tr>
<th>ID</th>
<th>Title</th>
+ <th>Description</th>
<th>Priority</th>
<th>TargetBootMenu</th>
<th colspan=3>Actions</th>
@@ -16,40 +17,45 @@
<tr class='entry'>
<td><?php echo $this->escape($filter->getID()) ?></td>
<td><?php echo $this->escape($filter->title) ?></td>
+ <td><?php echo $this->escape($filter->Description) ?></td>
<td><?php echo $this->escape($filter->priority) ?></td>
<td><?php echo $this->escape($filter->bootmenuID) ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'filter',
'action' => 'editfilter',
'filterID' => $filter->getID()
),
'default',
- true) ?>">edit filter</a></td>
- <td><a href="<?php echo $this->url(
+ true) ?>"><img src='/media/img/edit.png' alt='Edit Filter'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'filter',
'action' => 'removefilter',
'filterID' => $filter->getID()
),
'default',
- true) ?>">delete filter</a></td>
- <td><a href="<?php echo $this->url(
+ true) ?>"><img src='/media/img/delete.png' alt='Delete Filter'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'filter',
'action' => 'addfilterentry',
'filterID' => $filter->getID()
),
'default',
- true) ?>">add filterentry</a></td>
+ true) ?>"><img src='/media/img/add.png' alt='Add Filterentry'/></a></td>
</tr>
+ <?php
+ $fe = new Application_Model_FilterEntriesMapper();
+ # print_a($erg = $fe->findBy('filterID',$filter->getID()));
+ $erg = $fe->findBy('filterID',$filter->getID());
+ ?>
+ <?php if (count($erg)>0): ?>
<tr class=detail>
- <td></td>
- <td colspan=6>
+ <td class=arrowtop>↳</td>
+ <td colspan=7>
<?php
- $fe = new Application_Model_FilterEntriesMapper();
- # print_a($erg = $fe->findBy('filterID',$filter->getID()));
- $erg = $fe->findBy('filterID',$filter->getID());
+
?>
<table>
<tr>
@@ -74,28 +80,29 @@
?></td>
<td><?php echo $filterentry['filtervalue'];?></td>
<td><?php echo $filterentry['filtervalue2'];?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'filter',
'action' => 'editfilterentry',
'filterentriesID' => $filterentry['filterentriesID']
),
'default',
- true) ?>">edit filterentry</a>
- <td><a href="<?php echo $this->url(
+ true) ?>"><img src='/media/img/edit.png' alt='Edit Filterentry'/></a>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'filter',
'action' => 'removefilterentry',
'filterentriesID' => $filterentry['filterentriesID']
),
'default',
- true) ?>">remove filterentry</a>
+ true) ?>"><img src='/media/img/delete.png' alt='Delete Filterentry'/></a>
</tr>
<?php endforeach ?>
</table>
</td>
</tr>
+ <?php endif;?>
<?php endforeach ?>
</table>
@@ -105,3 +112,6 @@
<p>There are no filters to display.</p>
<?php endif;?>
+<?php echo $this->formButton('createconfig', 'Test Filters', array(
+ 'onclick' => 'self.location="/filter/testevaluate"',
+ 'class' => 'addbutton'))?>
diff --git a/application/views/scripts/filter/testevaluate.phtml b/application/views/scripts/filter/testevaluate.phtml
new file mode 100644
index 0000000..8a10629
--- /dev/null
+++ b/application/views/scripts/filter/testevaluate.phtml
@@ -0,0 +1,4 @@
+<h1>Test Filters</h1>
+
+<?php
+echo $this->filterevaluate;
diff --git a/application/views/scripts/pool/index.phtml b/application/views/scripts/pool/index.phtml
index 68fcbc4..2c6ba16 100644
--- a/application/views/scripts/pool/index.phtml
+++ b/application/views/scripts/pool/index.phtml
@@ -18,33 +18,38 @@
<td><?php echo $this->escape($pool->getTitle()) ?></td>
<td><?php echo $this->escape($pool->getDescription()) ?></td>
<td><?php echo $this->escape($pool->getLocation()) ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'pool',
'action' => 'editpool',
'poolID' => $pool->getID()
),
'default',
- true) ?>">edit pool</a></td>
- <td><a href="<?php echo $this->url(
+ true) ?>"><img src='/media/img/edit.png' alt='Edit Pool'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'pool',
'action' => 'deletepool',
'poolID' => $pool->getID()
),
'default',
- true) ?>">delete pool</a></td>
- <td><a href="<?php echo $this->url(
+ true) ?>"><img src='/media/img/delete.png' alt='Delete Pool'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'pool',
'action' => 'linkclient',
'poolID' => $pool->getID()
),
'default',
- true) ?>">link client</a></td>
+ true) ?>"><img src='/media/img/add.png' alt='Link Client'/></a></td>
</tr>
+ <?php
+ $poolentriesMapper = new Application_Model_PoolEntriesMapper();
+ $clients = $poolentriesMapper->findBy('poolID',$pool->getID());
+ ?>
+ <?php if (count($clients)>0): ?>
<tr class=detail>
- <td></td>
+ <td class=arrowtop>↳</td>
<td colspan=6>
<table>
<tr>
@@ -54,8 +59,6 @@
<th>Actions</th>
</tr>
<?php
- $poolentriesMapper = new Application_Model_PoolEntriesMapper();
- $clients = $poolentriesMapper->findBy('poolID',$pool->getID());
foreach ($clients as $client): ?>
<tr>
<td><?php echo $client['clientID'];?></td>
@@ -66,25 +69,29 @@
?>
<td><?php echo ($cli->macAdress); ?></td>
<td><?php echo ($cli->hardwarehash); ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'pool',
'action' => 'unlinkclient',
'poolentriesID' => $client['poolentriesID']
),
'default',
- true) ?>">unlink client</a></td>
+ true) ?>"><img src='/media/img/delete.png' alt='Unlink Client'/></a></td>
</tr>
<?php endforeach ?>
</table>
+ </td>
+ </tr>
+ <?php endif;?>
<?php endforeach ?>
</table>
<h2>Free clients</h2>
-<table border=1 >
-<tr><th>ClientID</th><th>MacAdress</th><th>Hardwarehash</th>
-<?php foreach ($this->pools as $pool): ?>
- <th><?php echo $this->escape($pool->getTitle()) ?></th>
- <?php endforeach ?>
+<table >
+<tr>
+<th>ClientID</th>
+<th>MacAdress</th>
+<th>Hardwarehash</th>
+<th>Actions</th>
</tr>
<?php
foreach ($this->freeclients as $client): ?>
@@ -92,8 +99,10 @@ foreach ($this->freeclients as $client): ?>
<td><?php echo $client['clientID']; ?></td>
<td><?php echo $client['macadress']; ?></td>
<td><?php echo $client['hardwarehash']; ?></td>
+ <td><select onChange="location.href=this.options[this.selectedIndex].value">
+ <option></option>
<?php foreach ($this->pools as $pool): ?>
- <td><a href='<?php echo $this->url(
+ <option value="<?php echo $this->url(
array(
'controller' => 'pool',
'action' => 'linkclient',
@@ -101,8 +110,11 @@ foreach ($this->freeclients as $client): ?>
'poolID' => $pool->getID(),
),
'default',
- true) ?>'>link</a></td>
- <?php endforeach ?>
+ true) ?>"><?php echo $pool->getTitle(); ?></option>
+ <?php //<img src='/media/img/add.png' alt='Link to Pool'/></a></td> ?>
+ <?php endforeach ?>
+ </select>
+ </td>
</tr>
<?php endforeach ?>
</table>
diff --git a/application/views/scripts/session/index.phtml b/application/views/scripts/session/index.phtml
index f98fa48..6e87acf 100644
--- a/application/views/scripts/session/index.phtml
+++ b/application/views/scripts/session/index.phtml
@@ -19,25 +19,25 @@
<td><?php echo $this->escape($session->getClientID()) ?></td>
<td><?php echo $this->escape($session->getBootosID()) ?></td>
<td><?php echo $this->escape($session->getBootisoID()) ?></td>
- <td><?php echo $this->escape($session->getTime()) ?></td>
+ <td><?php echo date('d.m.Y H:i',$this->escape($session->getTime())) ?></td>
<td><?php echo $this->escape($session->getIp()) ?></td>
<td><?php echo $this->escape($session->getIp6()) ?></td>
- <td><a href="<?php echo $this->url(
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'session',
'action' => 'editsession',
'sessionID' => $session->getID()
),
'default',
- true) ?>">edit filter</a></td>
- <td><a href="<?php echo $this->url(
+ true) ?>"><img src='/media/img/edit.png' alt='Edit Filter'/></a></td>
+ <td class='action'><a href="<?php echo $this->url(
array(
'controller' => 'session',
'action' => 'deletesession',
'sessionID' => $session->getID()
),
'default',
- true) ?>">delete filter</a></td>
+ true) ?>"><img src='/media/img/delete.png' alt='Delete Filter'/></a></td>
</tr>
<?php endforeach ?>
</table>
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 08:42:46 +0100