summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/modules/fbgui/controllers/IndexController.php9
-rw-r--r--application/modules/fbgui/views/scripts/index/index.phtml10
-rw-r--r--application/modules/user/controllers/FilterController.php58
-rw-r--r--library/Pbs/Filter.php142
-rw-r--r--public/media/img/button-green.pngbin0 -> 385 bytes
-rw-r--r--public/media/img/button-red.pngbin0 -> 349 bytes
-rw-r--r--send-post.html2
7 files changed, 100 insertions, 121 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 91d045d..c66a3f5 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -11,10 +11,8 @@ class Fbgui_IndexController extends Zend_Controller_Action
public function indexAction()
{
$params = $this->_request->getParam('postdata');
-
if(isset($_SESSION['postdata'])){
$_POST = ($_SESSION['postdata']);
- #unset($_SESSION['postdata']);
}
if(isset($_POST['bootisoID']) || isset($_POST['serialnumber'])){
@@ -27,10 +25,11 @@ class Fbgui_IndexController extends Zend_Controller_Action
$bootisomapper->find($_POST['bootisoID'],$bootiso);
$groupID = $bootiso->getGroupID();
}
- elseif(isset($_POST['serialnumber'])){
-
+ elseif(isset($_POST['serialnumber'])){
$results = $bootisomapper->findBy('serialnumber',$_POST['serialnumber']);
- print_a($results);
+ if(count($results) == 0){
+ echo 'Your serialnumber is not known by the system';
+ }
$bootiso->setOptions($results[0]);
$bootiso->setID($results[0]['bootisoID']);
$groupID = $bootiso->getGroupID();
diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml
index 60ec5a8..4ed489c 100644
--- a/application/modules/fbgui/views/scripts/index/index.phtml
+++ b/application/modules/fbgui/views/scripts/index/index.phtml
@@ -5,6 +5,7 @@
$('.menu').removeClass('selected');
$(this).addClass('selected');
$("#selectedBootOs").val($(this).find('.id').val());
+ $("#startball").attr('src','/media/img/button-green.png');
});
});
function start(){
@@ -35,8 +36,9 @@
<input style="display:none;" type='text' id="selectedBootOs" />
- <div class="right" style='cursor:pointer;' onClick="start();">
- <img style='vertical-align:-8px;' src='/media/img/startOs.png'>
- <span style='font-size:18px;'>Start System</span>
- </div>
+ <button style='cursor:pointer;float:right;' onClick="start();">
+ <img id='startball' style='vertical-align:-3px;' src='/media/img/button-red.png'>
+ <span style='font-size:14px;'>Start System</span>
+ </button>
+ <div class='clear'></div>
<?php endif;?>
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index 934fd2e..70aa60b 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -179,6 +179,7 @@ class User_FilterController extends Zend_Controller_Action
else{
$this->_redirect('/user/filter/index/modifyresult/forbidden');
}
+ }
// TODO: ACL: he is allowed to edit the filter
elseif(true){
$filtermapper->save($newfilterentry);
@@ -354,30 +355,12 @@ class User_FilterController extends Zend_Controller_Action
else{
$newfilterenty->setFiltervalue($_POST['filtervalue']);
$newfilterenty->setFiltervalue2($_POST['filtervalue2']);
- }
-
- // check if it's the last groupID filterentry
- $allFilters = $filterentriesmapper->findBy('filterID',$filterentry->getFilterID());
- $lastfilter = true;
- foreach($allFilters as $thisFilterentry){
- if($thisFilterentry['filtertypeID'] == 6 && $thisFilterentry['filterentriesID'] != $filterentriesID){
- // one other filter with a groupID exists
- $lastfilter = false;
- }
- if($newfilterenty->getFiltertypeID() == 6){
- // this filter will be a GroupFilter
- $lastfilter = false;
- }
- }
- if($lastfilter){
- $pbsNotifier = new Pbs_Notifier();
- echo $pbsNotifier->notify('You cannot modify the last GroupFilter','forbidden');
- }
- else{
- $newfilter2 = new Application_Model_FilterEntriesMapper();
- $newfilter2->save($newfilterenty);
- $this->_redirect('/user/filter/index/modifyresult/ok');
- }
+ }
+
+ $newfilter2 = new Application_Model_FilterEntriesMapper();
+ $newfilter2->save($newfilterenty);
+ $this->_redirect('/user/filter/index/modifyresult/ok');
+
}
else{
$this->_redirect('/user/filter/index/modifyresult/forbidden');
@@ -409,28 +392,11 @@ class User_FilterController extends Zend_Controller_Action
try{
$deletefilterentry = new Application_Model_FilterEntries();
$deletefilterentry->setID($filterentriesID);
-
- // check if it's the last groupID filterentry
- $allFilters = $filterentriesmapper->findBy('filterID',$filterID);
- $lastfilter = true;
- foreach($allFilters as $thisFilterentry){
- if($thisFilterentry['filtertypeID'] == 6 && $thisFilterentry['filterentriesID'] != $filterentriesID){
- // one other filter with a groupID exists
- $lastfilter = false;
- }
- if($deletefilterentry->getFiltertypeID() == 6){
- // this filter will be a GroupFilter
- $lastfilter = false;
- }
- }
- if($lastfilter){
- $this->_redirect('/user/filter/index/deleteresult/forbidden');
- }
- else{
- $filterentriesmapper = new Application_Model_FilterEntriesMapper();
- $filterentriesmapper->delete($deletefilterentry);
- $this->_redirect('/user/filter/index/deleteresult/ok');
- }
+
+ $filterentriesmapper = new Application_Model_FilterEntriesMapper();
+ $filterentriesmapper->delete($deletefilterentry);
+ $this->_redirect('/user/filter/index/deleteresult/ok');
+
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
$this->_redirect('/user/filter/index/deleteresult/error');
diff --git a/library/Pbs/Filter.php b/library/Pbs/Filter.php
index 5b5e523..753bdf7 100644
--- a/library/Pbs/Filter.php
+++ b/library/Pbs/Filter.php
@@ -59,6 +59,12 @@ class Pbs_Filter{
$sessionarray = $sessionmapper->findBy('alphasessionID',$_SESSION['alphasessionID']);
$session->setOptions($sessionarray[0]);
$session->setID($sessionarray['sessionID']);
+
+ $bootisoMapper = new Application_Model_BootisoMapper();
+ $bootiso = new Application_Model_BootIso();
+ $bootisoMapper->find($session->getBootisoID(),$bootiso);
+ $groupID = $bootiso->getGroupID();
+
#########################################################
// IP Adress
$filtertypID = 1;
@@ -66,17 +72,15 @@ class Pbs_Filter{
if(!$testFilter){
$ipAdress = $session->getIp();
}
- $ipAdress = str_replace(".","",$this->fillIP($ipAdress));
-
- $select = $db->select()
- ->from(array('pbs_filterentries')
- )
- ->where('filtertypeID = ?',$filtertypID)
- ->where('REPLACE(filtervalue,".","") <= ?',$ipAdress)
- ->where('? <= REPLACE(filtervalue2,".","")',$ipAdress);
-
- $stmt = $select->query();
- $result = $stmt->fetchAll();
+ $ipAdress = str_replace(".","",$this->fillIP($ipAdress));
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ REPLACE(fe.filtervalue,'.','') <= '".$ipAdress."' AND
+ '".$ipAdress."' <= REPLACE(fe.filtervalue2,'.','') AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+
+ $result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
}
@@ -96,10 +100,13 @@ class Pbs_Filter{
}
try{
$macAdress = $this->fillMac($macAdress);
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue <= '".$macAdress."' AND
- '".$macAdress."' <= filtervalue2");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue <= '".$macAdress."' AND
+ '".$macAdress."' <= fe.filtervalue2 AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -123,9 +130,11 @@ class Pbs_Filter{
}
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$poolID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$poolID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
if(count($result)>0){
foreach($result as $r){
@@ -146,9 +155,12 @@ class Pbs_Filter{
$clientID = $session->getClientID();
}
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$clientID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$clientID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -166,9 +178,11 @@ class Pbs_Filter{
$bootisoID = $session->getBootisoID();
}
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$bootisoID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$bootisoID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -188,9 +202,11 @@ class Pbs_Filter{
$membershipID = $this->membership->getID();
}
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$membershipID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$membershipID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -208,20 +224,16 @@ class Pbs_Filter{
if(!$testFilter){
// get membership from the session
//TODO: GET GROUP from SESSION
- $groupID = $this->membership->getGroupID();
+ $membergroupID = $this->membership->getGroupID();
}
- }
- else{
- $bootisoMapper = new Application_Model_BootisoMapper();
- $bootiso = new Application_Model_BootIso();
- $bootisoMapper->find($session->getBootisoID(),$bootiso);
- $groupID = $bootiso->getGroupID();
- }
+ }
if(isset($groupID)){
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$groupID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$membergroupID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -245,10 +257,12 @@ class Pbs_Filter{
$nowShort = str_replace(":","",$nowShort);
try{
- $stmt = $db->query('SELECT * FROM pbs_filterentries WHERE
- filtertypeID = '.$filtertypID.' AND
- REPLACE(filtervalue,":","") <= '.$nowShort.' AND
- REPLACE(filtervalue2,":","") >= '.$nowShort.' ');
+ $stmt = $db->query('SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = '.$filtertypID.' AND
+ REPLACE(fe.filtervalue,":","") <= '.$nowShort.' AND
+ REPLACE(fe.filtervalue2,":","") >= '.$nowShort." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -270,13 +284,13 @@ class Pbs_Filter{
}
try{
- $select = $db->select()
- ->from(array('pbs_filterentries')
- )
- ->where('filtertypeID = ?',$filtertypID)
- ->where('`filtervalue` = ?',$hardwarehash);
- $stmt = $select->query();
- $result = $stmt->fetchAll();
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$hardwarehash." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+ $result = $stmt->fetchAll();
+
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
}
@@ -293,14 +307,13 @@ class Pbs_Filter{
}
try{
- $select = $db->select()
- ->from(array('pbs_filterentries')
- )
- ->where('filtertypeID = ?',$filtertypID)
- ->where('filtervalue = ? ',$weekday);
-
- $stmt = $select->query();
- $result = $stmt->fetchAll();
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue <= ".$weekday." AND
+ ".$weekday." <= fe.filtervalue2 AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+ $result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
}
@@ -317,14 +330,13 @@ class Pbs_Filter{
}
try{
- $select = $db->select()
- ->from(array('pbs_filterentries')
- )
- ->where('filtertypeID = ?',$filtertypID)
- ->where('REPLACE(filtervalue,".","") <= ? AND ? <= REPLACE(filtervalue2,".","")',$date);
-
- $stmt = $select->query();
- $result = $stmt->fetchAll();
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ REPLACE(fe.filtervalue,'.','') <= ".$date." AND
+ ".$date." <= REPLACE(fe.filtervalue2,'.','') <= AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+ $result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
}
diff --git a/public/media/img/button-green.png b/public/media/img/button-green.png
new file mode 100644
index 0000000..b07bf46
--- /dev/null
+++ b/public/media/img/button-green.png
Binary files differ
diff --git a/public/media/img/button-red.png b/public/media/img/button-red.png
new file mode 100644
index 0000000..81dccc0
--- /dev/null
+++ b/public/media/img/button-red.png
Binary files differ
diff --git a/send-post.html b/send-post.html
index 6cad8c8..f3ae995 100644
--- a/send-post.html
+++ b/send-post.html
@@ -22,7 +22,7 @@
<legend>http://pbs2.local/</legend>
<form action='http://pbs2.local/' method='post'>
<label>serialnumber</label>
- <input type='text' name='serialnumber' value='10-20-30-40-50'></br>
+ <input type='text' name='serialnumber' value='123456789'></br>
<label>Mac</label>
<input type='text' name='mac' value='00:0c:29:01:63:88'></br>
<label>Hardwarehash</label>