Welcome
"; + print_a('Session is now set','Your alphasessionID is '.$session->getAlphasessionID()); + $this->_redirect('/dev/bootmenu/index/bootmenuid/1'); + } + else{ + echo "Not Welcome
"; + print_a($_POST); + } + die(); } diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php index d40e1b1..4bb2b35 100644 --- a/application/modules/user/controllers/ClientController.php +++ b/application/modules/user/controllers/ClientController.php @@ -5,6 +5,10 @@ class User_ClientController extends Zend_Controller_Action private $membership; public function init() { + if($_SESSION['membershipID'] ==''){ + $pbsNotifier = new Pbs_Notifier(); + echo $pbsNotifier->notify('No membershipID set','forbidden'); + } /* Initialize action controller here */ $membershipMapper = new Application_Model_MembershipMapper(); $this->membership = new Application_Model_Membership(); diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index 2704309..8ceefe3 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -2,13 +2,100 @@ class User_FilterController extends Zend_Controller_Action { - + protected $filterMapper; + protected $membershipMapper; public function init() { - /* Initialize action controller here */ + if($_SESSION['membershipID'] ==''){ + $pbsNotifier = new Pbs_Notifier(); + echo $pbsNotifier->notify('No membershipID set','forbidden'); + } + $this->filterMapper = new Application_Model_FilterMapper(); + + $membershipMapper = new Application_Model_MembershipMapper(); + $this->membership = new Application_Model_Membership(); + $membershipMapper->find($_SESSION['membershipID'],$this->membership); + + $this->db = Zend_Db_Table::getDefaultAdapter(); } public function indexAction() + { + // TODO: ACL: is he authorized to see this? + + $result = $this->_request->getParam('addresult'); + if($result != ""){ + $pbsNotifier = new Pbs_Notifier(); + $this->view->notification = $pbsNotifier->notify('create',$result); + } + + $filters = $this->filterMapper->findBy('groupID',$this->membership->getGroupID()); + foreach($filters as $filter){ + $ff = new Application_Model_Filter(); + $ff->setOptions($filter); + $ff->setID($filter['filterID']); + $allFilter[] = $ff; + } + $this->view->filters = $allFilter; + } + + public function addfilterAction() + { + // TODO: ACL: is he authorized to add a filter? + $bmmapper = new Application_Model_BootMenuMapper(); + $result = $bmmapper->findBy('groupID',$this->membership->getGroupID()); + foreach($result as $rr){ + $bm = new Application_Model_BootMenu(); + $bm->setOptions($rr); + $bm->setID($rr['bootmenuID']); + $bootmenus[] = $bm; + } + $this->view->bootmenus = $bootmenus; + + if (!isset($_POST["add"])){ + $addfilterform = new user_Form_Filter(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus)); + $this->view->addfilterform = $addfilterform; + }else { + $addfilterform = new user_Form_Filter(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus),$_POST); + if ($addfilterform->isValid($_POST)) { + try{ + $newfilter = new Application_Model_Filter($_POST); + $newfilter->setCreated(time()); + $newfilter->setGroupID($this->membership->getGroupID()); + $newfilter->setMembershipID($this->membership->getID()); + $newfilter2 = new Application_Model_FilterMapper(); + $newfilter2->save($newfilter); + $this->_redirect('/user/filter/index/addresult/ok'); + }catch (Zend_Exception $e) { + echo "Error message 2: " . $e->getMessage() . "\n"; + $this->_redirect('/user/filter/index/addresult/error'); + } + } + $this->view->addfilterform = $addfilterform; + } + } + + public function removefilterAction() + { + // action body + } + + public function editfilterAction() + { + // action body + } + + public function addfilterentryAction() + { + // action body + } + + public function editfilterentryAction() + { + // action body + } + + public function removefilterentryAction() { // action body } @@ -16,3 +103,15 @@ class User_FilterController extends Zend_Controller_Action } + + + + + + + + + + + + diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php index 7ff4da1..f786aa8 100644 --- a/application/modules/user/controllers/PoolController.php +++ b/application/modules/user/controllers/PoolController.php @@ -5,6 +5,11 @@ class User_PoolController extends Zend_Controller_Action private $membership; public function init() { + if($_SESSION['membershipID'] ==''){ + $pbsNotifier = new Pbs_Notifier(); + echo $pbsNotifier->notify('No membershipID set','forbidden'); + } + $membershipMapper = new Application_Model_MembershipMapper(); $this->membership = new Application_Model_Membership(); $membershipMapper->find($_SESSION['membershipID'],$this->membership); @@ -41,7 +46,14 @@ class User_PoolController extends Zend_Controller_Action } $poolMapper = new Application_Model_PoolMapper(); - $this->view->pools = $poolMapper->fetchAll(); + $pools = $poolMapper->findBy('groupID',$this->membership->getGroupID()); + foreach($pools as $pool){ + $ff = new Application_Model_Pool(); + $ff->setOptions($pool); + $ff->setID($pool['poolID']); + $yourpools[] = $ff; + } + $this->view->pools = $yourpools; $clientmapper = new Application_Model_ClientMapper(); $clients = $clientmapper->fetchAll(); diff --git a/application/modules/user/forms/Filter.php b/application/modules/user/forms/Filter.php new file mode 100644 index 0000000..69aaf4b --- /dev/null +++ b/application/modules/user/forms/Filter.php @@ -0,0 +1,68 @@ +setName("Add Filter"); + $this->setMethod('post'); + + $this->addElement('text', 'title', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => true, + 'label' => 'Title:', + )); + $this->addElement('textarea', 'description', array( + 'filters' => array('StringTrim'), + 'required' => false, + 'label' => 'Description:', + )); + + $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'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => true, + 'label' => 'Priority:', + )); + $this->addElement('submit', 'add', array( + 'required' => false, + 'ignore' => true, + 'label' => $this->buttontext, + )); + + $this->addElement('button', 'Cancel', array( + 'onclick' => 'self.location="/user/filter"' + )); + } + function setBootmenus($val){ + $this->bootmenus = $val; + return; + } + private $buttontext = 'Save'; + function setButtontext($v){ + $this->buttontext = $v; + } + + + +} + diff --git a/application/modules/user/views/scripts/filter/addfilter.phtml b/application/modules/user/views/scripts/filter/addfilter.phtml new file mode 100644 index 0000000..3c7eb9f --- /dev/null +++ b/application/modules/user/views/scripts/filter/addfilter.phtml @@ -0,0 +1,2 @@ +addfilterform; diff --git a/application/modules/user/views/scripts/filter/addfilterentry.phtml b/application/modules/user/views/scripts/filter/addfilterentry.phtml new file mode 100644 index 0000000..f7240c8 --- /dev/null +++ b/application/modules/user/views/scripts/filter/addfilterentry.phtml @@ -0,0 +1 @@ +Filters
+notification != ''){echo $this->notification;} ?> +formButton('createconfig', 'Create Filter', array( + 'onclick' => 'self.location="/user/filter/addfilter"', + 'class' => 'addbutton'))?> + +filters): ?> +| ID | +Title | +Description | +Priority | +TargetBootMenu | +Actions | +||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| escape($filter->getID()) ?> | +escape($filter->title) ?> | +escape($filter->Description) ?> | +escape($filter->priority) ?> | +escape($filter->bootmenuID) ?> | + |
+  |
+  |
+ ||||||||||
| ↳ | +
+
+
|
+ ||||||||||||||||
There are no filters to display.
+ + +formButton('createconfig', 'Test Filters', array( + 'onclick' => 'self.location="/user/filter/testevaluate"', + 'class' => 'addbutton'))?> diff --git a/application/modules/user/views/scripts/filter/removefilter.phtml b/application/modules/user/views/scripts/filter/removefilter.phtml new file mode 100644 index 0000000..a46f9ec --- /dev/null +++ b/application/modules/user/views/scripts/filter/removefilter.phtml @@ -0,0 +1 @@ +$action
";
+ break;
case "delete":
switch($result){
case "forbidden":
diff --git a/library/Pbs/Session.php b/library/Pbs/Session.php
index 592b89c..eb7c927 100644
--- a/library/Pbs/Session.php
+++ b/library/Pbs/Session.php
@@ -2,7 +2,7 @@
class Pbs_Session{
- public function createsession(Application_Model_Session $session){
+ public function CreateSession(Application_Model_Session $session){
$sessionmapper = new Application_Model_SessionMapper();
$uniqid = $this->getUniqueCode(10);
@@ -16,6 +16,18 @@ class Pbs_Session{
$sessionmapper->find($id, $session);
return $session;
}
+ public function createClient(Application_Model_Client $client){
+ $clientmapper = new Application_Model_ClientMapper();
+ $result = $clientmapper->findBy('macadress',$client->getMacadress());
+ if(($result)>0){
+ $client->setOptions($result);
+ }
+ else{
+ $id = $clientmapper->save($client);
+ $clientmapper->find($id, $client);
+ }
+ return $client;
+ }
private function getUniqueCode($length = "")
{
$code = md5(uniqid(rand(), true));
diff --git a/pbs-newdata.sql b/pbs-newdata.sql
index a412195..1490fd5 100644
--- a/pbs-newdata.sql
+++ b/pbs-newdata.sql
@@ -55,9 +55,9 @@ INSERT INTO `pbs_bootos` (`bootosID`, `configID`, `groupID`, `membershipID`, `ti
-- Adding bootiso
INSERT INTO `pbs_bootiso` (`bootisoID`, `title`, `membershipID`, `groupID`, `path`, `serialnumber`, `created`, `expires`, `public`) VALUES
-(1, 'BootIso 1', 1, 1, 'Path 1', 123456789, '1299693879', '2012-03-09', 0),
-(2, 'BootIso 2', 1, 1, 'Path 2', 2147483647, '1299693899', '2012-03-09', 0),
-(3, 'BootIso 3', 1, 1, 'Path 3', 2147483647, '1299693899', '2012-03-09', 0);
+(1, 'BootIso 1', 1, 1, 'Path 1', 123456789, '123', '2012-03-09', 0),
+(2, 'BootIso 2', 1, 1, 'Path 2', 2147483647, '456', '2012-03-09', 0),
+(3, 'BootIso 3', 1, 1, 'Path 3', 2147483647, '789', '2012-03-09', 0);
-- Adding Pools
INSERT INTO `pbs_pool` (`poolID`, `groupID`, `title`, `description`, `location`) VALUES
diff --git a/pbs.sql b/pbs.sql
index 58c21b2..76bfc9c 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -209,6 +209,7 @@ CREATE TABLE IF NOT EXISTS `pbs_client` (
PRIMARY KEY (`clientID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;
ALTER TABLE `pbs_client` ADD `groupID` INT NOT NULL AFTER `clientID` ;
+ALTER TABLE `pbs_client` ADD UNIQUE (`macadress`);
ALTER TABLE `pbs_client`
ADD CONSTRAINT `pbs_client_ibfk_1` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE;
--
cgit v1.2.3-55-g7522