summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.zfproject.xml345
-rw-r--r--application/controllers/IndexController.php7
-rw-r--r--application/modules/fbgui/controllers/IndexController.php54
-rw-r--r--application/modules/fbgui/views/scripts/index/index.phtml52
-rw-r--r--application/modules/fbgui/views/scripts/index/start.phtml100
-rw-r--r--application/modules/user/controllers/FilterController.php7
-rw-r--r--application/modules/user/forms/FilterEntry.php68
-rw-r--r--library/Pbs/Filter.php8
-rw-r--r--pbs-newdata.sql56
-rw-r--r--pbs.sql36
-rw-r--r--send-post.html6
11 files changed, 319 insertions, 420 deletions
diff --git a/.zfproject.xml b/.zfproject.xml
index 1eb61e7..2a7a29e 100644
--- a/.zfproject.xml
+++ b/.zfproject.xml
@@ -12,110 +12,6 @@
<actionMethod actionName="index"/>
</controllerFile>
<controllerFile controllerName="Error"/>
- <controllerFile controllerName="Auth">
- <actionMethod actionName="login"/>
- <actionMethod actionName="register"/>
- <actionMethod actionName="logout"/>
- <actionMethod actionName="recoverpassword"/>
- <actionMethod actionName="delete"/>
- <actionMethod actionName="index"/>
- </controllerFile>
- <controllerFile controllerName="Person">
- <actionMethod actionName="index"/>
- <actionMethod actionName="show"/>
- <actionMethod actionName="edit"/>
- <actionMethod actionName="request"/>
- <actionMethod actionName="leave"/>
- </controllerFile>
- <controllerFile controllerName="Filter">
- <actionMethod actionName="index"/>
- <actionMethod actionName="addfilter"/>
- <actionMethod actionName="removefilter"/>
- <actionMethod actionName="editfilter"/>
- <actionMethod actionName="addfilterentry"/>
- <actionMethod actionName="editfilterentry"/>
- <actionMethod actionName="evaluate"/>
- <actionMethod actionName="fillIP"/>
- <actionMethod actionName="removefilterentry"/>
- <actionMethod actionName="testevaluate"/>
- </controllerFile>
- <controllerFile controllerName="Bootos">
- <actionMethod actionName="index"/>
- <actionMethod actionName="createbootos"/>
- <actionMethod actionName="editbootos"/>
- <actionMethod actionName="deletebootos"/>
- </controllerFile>
- <controllerFile controllerName="Config">
- <actionMethod actionName="index"/>
- <actionMethod actionName="createconfig"/>
- <actionMethod actionName="editconfig"/>
- <actionMethod actionName="deleteconfig"/>
- </controllerFile>
- <controllerFile controllerName="Bootmenu">
- <actionMethod actionName="index"/>
- <actionMethod actionName="addbootmenuentry"/>
- <actionMethod actionName="createbootmenu"/>
- <actionMethod actionName="editbootmenu"/>
- <actionMethod actionName="editbootmenuentry"/>
- <actionMethod actionName="removebootmenuentry"/>
- <actionMethod actionName="deletebootmenu"/>
- </controllerFile>
- <controllerFile controllerName="Client">
- <actionMethod actionName="index"/>
- <actionMethod actionName="addclient"/>
- <actionMethod actionName="removeclient"/>
- <actionMethod actionName="editclient"/>
- </controllerFile>
- <controllerFile controllerName="Pool">
- <actionMethod actionName="index"/>
- <actionMethod actionName="createpool"/>
- <actionMethod actionName="deletepool"/>
- <actionMethod actionName="editpool"/>
- <actionMethod actionName="linkclient"/>
- <actionMethod actionName="unlinkclient"/>
- </controllerFile>
- <controllerFile controllerName="Bootiso">
- <actionMethod actionName="index"/>
- <actionMethod actionName="createbootiso"/>
- <actionMethod actionName="editbootiso"/>
- <actionMethod actionName="deletebootiso"/>
- </controllerFile>
- <controllerFile controllerName="Session">
- <actionMethod actionName="index"/>
- <actionMethod actionName="createsession"/>
- <actionMethod actionName="editsession"/>
- <actionMethod actionName="deletesession"/>
- </controllerFile>
- <controllerFile controllerName="Resource">
- <actionMethod actionName="index"/>
- <actionMethod actionName="getinitramfs"/>
- <actionMethod actionName="getconfig"/>
- <actionMethod actionName="getkernel"/>
- <actionMethod actionName="getkcl"/>
- <actionMethod actionName="getbootmenuentry"/>
- </controllerFile>
- <controllerFile controllerName="Group">
- <actionMethod actionName="index"/>
- <actionMethod actionName="add"/>
- <actionMethod actionName="edit"/>
- <actionMethod actionName="show"/>
- <actionMethod actionName="link"/>
- <actionMethod actionName="delete"/>
- <actionMethod actionName="grantperson"/>
- <actionMethod actionName="revokeperson"/>
- </controllerFile>
- <controllerFile controllerName="Role">
- <actionMethod actionName="index"/>
- <actionMethod actionName="add"/>
- <actionMethod actionName="edit"/>
- <actionMethod actionName="show"/>
- <actionMethod actionName="delete"/>
- <actionMethod actionName="linkright"/>
- <actionMethod actionName="unlinkright"/>
- </controllerFile>
- <controllerFile controllerName="Preboot">
- <actionMethod actionName="index"/>
- </controllerFile>
</controllersDirectory>
<formsDirectory enabled="false"/>
<layoutsDirectory enabled="false"/>
@@ -406,8 +302,8 @@
<actionMethod actionName="delete"/>
<actionMethod actionName="index"/>
</controllerFile>
- <controllerFile controllerName="Person">
- <actionMethod actionName="index"/>
+ <controllerFile controllerName="Person">
+ <actionMethod actionName="index"/>
<actionMethod actionName="show"/>
<actionMethod actionName="edit"/>
<actionMethod actionName="request"/>
@@ -499,6 +395,14 @@
<actionMethod actionName="linkright"/>
<actionMethod actionName="unlinkright"/>
</controllerFile>
+ <controllerFile controllerName="Preboot">
+ <actionMethod actionName="index"/>
+ <actionMethod actionName="createpreboot"/>
+ <actionMethod actionName="checkupdate"/>
+ <actionMethod actionName="updatepreboot"/>
+ <actionMethod actionName="editpreboot"/>
+ <actionMethod actionName="deletepreboot"/>
+ </controllerFile>
</controllersDirectory>
<formsDirectory>
<formFile formName="AuthLogin"/>
@@ -533,7 +437,7 @@
</modelsDirectory>
<viewsDirectory>
<viewScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Index">
+ <viewControllerScriptsDirectory forControllerName="Index">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Error">
@@ -684,7 +588,7 @@
<viewScriptFile forActionName="edit"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Group">
- <viewScriptFile forActionName="show"/>
+ <viewScriptFile forActionName="show"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Group">
<viewScriptFile forActionName="link"/>
@@ -739,10 +643,19 @@
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Resource">
<viewScriptFile forActionName="getkcl"/>
- </viewControllerScriptsDirectory>
+ </viewControllerScriptsDirectory>
+ <viewControllerScriptsDirectory forControllerName="Preboot">
+ <viewScriptFile forActionName="index"/>
+ </viewControllerScriptsDirectory>
+ <viewControllerScriptsDirectory forControllerName="Preboot">
+ <viewScriptFile forActionName="createpreboot"/>
+ </viewControllerScriptsDirectory>
+ <viewControllerScriptsDirectory forControllerName="Preboot">
+ <viewScriptFile forActionName="editpreboot"/>
+ </viewControllerScriptsDirectory>
</viewScriptsDirectory>
- <viewHelpersDirectory/>
- <viewFiltersDirectory/>
+ <viewHelpersDirectory/>
+ <viewFiltersDirectory/>
</viewsDirectory>
<bootstrapFile filesystemName="Bootstrap.php"/>
</moduleDirectory>
@@ -755,216 +668,6 @@
<viewControllerScriptsDirectory forControllerName="Error">
<viewScriptFile forActionName="error"/>
</viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Auth">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Auth">
- <viewScriptFile forActionName="login"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Auth">
- <viewScriptFile forActionName="register"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Person">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Auth">
- <viewScriptFile forActionName="logout"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Auth">
- <viewScriptFile forActionName="recoverpassword"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Auth">
- <viewScriptFile forActionName="deleteAccount"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Filter">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Filter">
- <viewScriptFile forActionName="addfilter"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Filter">
- <viewScriptFile forActionName="editfilter"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootos">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Index">
- <viewScriptFile forActionName="createbootos"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootos">
- <viewScriptFile forActionName="createbootos"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootos">
- <viewScriptFile forActionName="editbootos"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Filter">
- <viewScriptFile forActionName="addfilterentry"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Filter">
- <viewScriptFile forActionName="editfilterentry"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Config">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Config">
- <viewScriptFile forActionName="createconfig"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Config">
- <viewScriptFile forActionName="editconfig"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootmenu">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootmenu">
- <viewScriptFile forActionName="createbootmenu"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootmenu">
- <viewScriptFile forActionName="editbootmenu"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootmenu">
- <viewScriptFile forActionName="addbootmenuentry"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootmenu">
- <viewScriptFile forActionName="editbootmenuentry"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Client">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Pool">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Client">
- <viewScriptFile forActionName="addclient"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Client">
- <viewScriptFile forActionName="removeclient"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Pool">
- <viewScriptFile forActionName="createpool"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Pool">
- <viewScriptFile forActionName="deletepool"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Pool">
- <viewScriptFile forActionName="editpool"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootiso">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootiso">
- <viewScriptFile forActionName="createbootiso"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Bootiso">
- <viewScriptFile forActionName="editbootiso"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Pool">
- <viewScriptFile forActionName="linkclient"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Pool">
- <viewScriptFile forActionName="unlinkclient"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Client">
- <viewScriptFile forActionName="editclient"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Session">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Session">
- <viewScriptFile forActionName="createsession"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Session">
- <viewScriptFile forActionName="editsession"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Session">
- <viewScriptFile forActionName="deletesession"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Auth">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Person">
- <viewScriptFile forActionName="show"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Person">
- <viewScriptFile forActionName="edit"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Person">
- <viewScriptFile forActionName="request"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Person">
- <viewScriptFile forActionName="leave"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Group">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Group">
- <viewScriptFile forActionName="add"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Group">
- <viewScriptFile forActionName="edit"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Group">
- <viewScriptFile forActionName="show"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Group">
- <viewScriptFile forActionName="link"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Group">
- <viewScriptFile forActionName="delete"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Group">
- <viewScriptFile forActionName="grantperson"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Group">
- <viewScriptFile forActionName="revokeperson"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Role">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Role">
- <viewScriptFile forActionName="add"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Role">
- <viewScriptFile forActionName="edit"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Role">
- <viewScriptFile forActionName="show"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Role">
- <viewScriptFile forActionName="delete"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Role">
- <viewScriptFile forActionName="linkright"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Role">
- <viewScriptFile forActionName="unlinkright"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Filter">
- <viewScriptFile forActionName="testevaluate"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Resource">
- <viewScriptFile forActionName="getbootmenuentry"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Resource">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Resource">
- <viewScriptFile forActionName="getinitramfs"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Resource">
- <viewScriptFile forActionName="getconfig"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Resource">
- <viewScriptFile forActionName="getkernel"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Resource">
- <viewScriptFile forActionName="getkcl"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Preboot">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
- <viewControllerScriptsDirectory forControllerName="Preboot">
- <viewScriptFile forActionName="index"/>
- </viewControllerScriptsDirectory>
</viewScriptsDirectory>
<viewScriptsDirectory/>
<viewHelpersDirectory/>
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 2972e9e..f3e5256 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -10,9 +10,12 @@ class IndexController extends Zend_Controller_Action
public function indexAction()
{
- if(stristr($_SERVER['HTTP_USER_AGENT'],'prebootGUI')){
- $this->_forward('index','Index','fbgui');
+ if(stristr($_SERVER['HTTP_USER_AGENT'],'prebootGUI')){
+ $_SESSION['postdata'] = $_POST;
+ $this->_redirect('/fbgui/index/index') ;
}
+
+
// action body
}
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index f5f8cdf..6c4a542 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -10,7 +10,10 @@ class Fbgui_IndexController extends Zend_Controller_Action
public function indexAction()
{
-
+ if(isset($_SESSION['postdata'])){
+ $_POST = ($_SESSION['postdata']);
+ unset($_SESSION['postdata']);
+ }
$keys = $this->_request->getParam('keys');
$post = $this->_request->getParam('post');
if($post != '' && $keys != ''){
@@ -25,8 +28,17 @@ class Fbgui_IndexController extends Zend_Controller_Action
$bootisomapper = new Application_Model_BootIsoMapper();
$bootiso = new Application_Model_BootIso();
- $bootisomapper->find($_POST['bootisoID'],$bootiso);
- $groupID = $bootiso->getGroupID();
+ if(isset($_POST['bootisoID'])){
+ $bootisomapper->find($_POST['bootisoID'],$bootiso);
+ $groupID = $bootiso->getGroupID();
+ }
+ elseif(isset($_POST['serialnumber'])){
+ $results = $bootisomapper->findBy('serialnumber',$_POST['serialnumber']);
+ $bootiso->setOptions($results[0]);
+ $bootiso->setID($result[0]['bootisoID']);
+ $groupID = $bootiso->getGroupID();
+
+ }
$client = new Application_Model_Client();
$client->setMacadress($_POST['mac']);
@@ -51,10 +63,11 @@ class Fbgui_IndexController extends Zend_Controller_Action
// Request Bootmenu
$pbsFilter = new Pbs_Filter();
$bootmenuID = $pbsFilter->evaluate();
- print_a('bootmenuID is ',$bootmenuID);
if($bootmenuID != null){
- print_a('goto bootmenu');
- #$this->_redirect('/dev/bootmenu/index/bootmenuid/'.$bootmenuID);
+ print_a('goto bootmenu '.$bootmenuID);
+ $bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper();
+ $res = $bootmenuentriesMapper->findBy('bootmenuID',$bootmenuID);
+ $this->view->entries = $res;
}
else{
print_a('no filter is valid, goto login');
@@ -64,10 +77,33 @@ class Fbgui_IndexController extends Zend_Controller_Action
else{
echo "<h1>Not Welcome</h1>";
print_a($_POST);
- }
- die();
+ }
+
}
-
+ public function startAction(){
+ $bootmenuntryID = $this->_request->getParam('bme');
+ $bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper();
+ $bootmenuentry = new Application_Model_BootMenuEntries();
+ $bootmenuentriesMapper->find($bootmenuntryID,$bootmenuentry);
+
+ $sessionMapper = new Application_Model_SessionMapper();
+ $session_k = $sessionMapper->findBy('alphasessionID',$_SESSION['alphasessionID']);
+
+ $session = new Application_Model_Session();
+ $session->setOptions($session_k[0]);
+ $session->setID($session_k[0]['sessionID']);
+# print_a($bootmenuentry);die();
+ $session->setBootmenuentryID($bootmenuntryID);
+ $session->setBootosID($bootmenuentry->getBootosID());
+ echo "<h1>Downloading</h1>";
+ echo "<script>\n";
+ echo "fbgui.startDownload('http://132.230.2.27/dev/resource/getkernel/".$_SESSION['alphasessionID']."/file/kernel');\n";
+ echo "fbgui.startDownload('http://132.230.2.27/dev/resource/getkernel/".$_SESSION['alphasessionID']."/file/initramfs');\n";
+ echo "fbgui.startDownload('http://132.230.2.27/dev/resource/getkernel/".$_SESSION['alphasessionID']."/file/kcl');\n";
+ echo "fbgui.getSession('".$_SESSION['alphasessionID']."');\n";
+ echo "</script>";
+
+ }
}
diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml
index 4b38f0a..b2b813d 100644
--- a/application/modules/fbgui/views/scripts/index/index.phtml
+++ b/application/modules/fbgui/views/scripts/index/index.phtml
@@ -1,43 +1,9 @@
-<style>
- a:link,
- a:visited
- {
- color: #0398CA;
- }
-
- span#zf-name
- {
- color: #91BE3F;
- }
-
- div#welcome
- {
- color: #FFFFFF;
- background-image: url(http://framework.zend.com/images/bkg_header.jpg);
- width: 600px;
- height: 400px;
- border: 2px solid #444444;
- overflow: hidden;
- text-align: center;
- }
-
- div#more-information
- {
- background-image: url(http://framework.zend.com/images/bkg_body-bottom.gif);
- height: 100%;
- }
-</style>
-<div id="welcome">
- <h1>Welcome to the <span id="zf-name">Zend Framework!</span></h1>
-
- <h3>This is your project's main page</h3>
-
- <div id="more-information">
- <p><img src="http://framework.zend.com/images/PoweredBy_ZF_4LightBG.png" /></p>
- <p>
- Helpful Links: <br />
- <a href="http://framework.zend.com/">Zend Framework Website</a> |
- <a href="http://framework.zend.com/manual/en/">Zend Framework Manual</a>
- </p>
- </div>
-</div> \ No newline at end of file
+<table>
+<?php foreach($this->entries as $entry):?>
+<tr>
+ <td><?php echo $entry->getID();?></td>
+ <td><?php echo $entry->getTitle();?></td>
+ <td><a href='/fbgui/index/start/bme/<?php echo $entry->getID();?>'>take this</td>
+</tr>
+<?php endforeach; ?>
+</table>
diff --git a/application/modules/fbgui/views/scripts/index/start.phtml b/application/modules/fbgui/views/scripts/index/start.phtml
new file mode 100644
index 0000000..a8f91fe
--- /dev/null
+++ b/application/modules/fbgui/views/scripts/index/start.phtml
@@ -0,0 +1,100 @@
+<style>
+/* position the bars and balls correctly (rotate them and translate them outward)*/
+.bar1 {
+ -moz-transform:rotate(0deg) translate(0, -40px);
+ -webkit-transform:rotate(0deg) translate(0, -40px);opacity:0.12;
+}
+.bar2 {
+ -moz-transform:rotate(45deg) translate(0, -40px);
+ -webkit-transform:rotate(45deg) translate(0, -40px);opacity:0.25;
+}
+.bar3 {
+ -moz-transform:rotate(90deg) translate(0, -40px);
+ -webkit-transform:rotate(90deg) translate(0, -40px);opacity:0.37;
+}
+.bar4 {
+ -moz-transform:rotate(135deg) translate(0, -40px);
+ -webkit-transform:rotate(135deg) translate(0, -40px);opacity:0.50;
+}
+.bar5 {
+ -moz-transform:rotate(180deg) translate(0, -40px);
+ -webkit-transform:rotate(180deg) translate(0, -40px);opacity:0.62;
+}
+.bar6 {
+ -moz-transform:rotate(225deg) translate(0, -40px);
+ -webkit-transform:rotate(225deg) translate(0, -40px);opacity:0.75;
+}
+.bar7 {
+ -moz-transform:rotate(270deg) translate(0, -40px);
+ -webkit-transform:rotate(270deg) translate(0, -40px);opacity:0.87;
+}
+.bar8 {
+ -moz-transform:rotate(315deg) translate(0, -40px);
+ -webkit-transform:rotate(315deg) translate(0, -40px);opacity:1;
+}
+#div4 {
+ position:relative;
+
+ width:100px;
+ height:100px;
+ -moz-border-radius:100px;
+ -webkit-border-radius:100px;
+ margin:25px auto;
+ -moz-transform:scale(0.5);
+ -webkit-transform:scale(0.5);
+
+ -webkit-animation-name: rotateThis;
+ -webkit-animation-duration:2s;
+ -webkit-animation-iteration-count:infinite;
+ -webkit-animation-timing-function:linear;
+}
+#div4 div {
+ width:20px;
+ height:20px;
+ background:#000;
+ -moz-border-radius:40px;
+ -webkit-border-radius:40px;
+ position:absolute;
+ left:40px;
+ top:40px;
+}
+/* add a shadow to the first */
+#div4 div {
+ -moz-box-shadow:black 0 0 4px;
+ -webkit-box-shadow:black 0 0 4px;
+}
+/* uncomment this to use css animation in webkit browsers */
+/* @-webkit-keyframes rotateThis {
+ from {-webkit-transform:scale(0.5) rotate(0deg);}
+ to {-webkit-transform:scale(0.5) rotate(360deg);}
+} */
+</style>
+<script>
+
+ //simple script to rotate all spinners 45 degrees on each tick
+ //this works differently from the css transforms, which is smooth
+
+ var count = 0;
+ function rotate() {
+ var elem4 = document.getElementById('div4');
+
+ elem4.style.MozTransform = 'scale(0.5) rotate('+count+'deg)';
+ elem4.style.WebkitTransform = 'scale(0.5) rotate('+count+'deg)';
+ if (count==360) { count = 0 }
+ count+=45;
+ window.setTimeout(rotate, 100);
+ }
+ window.setTimeout(rotate, 100);
+</script>
+
+
+<div id="div4">
+ <div class="bar1"></div>
+ <div class="bar2"></div>
+ <div class="bar3"></div>
+ <div class="bar4"></div>
+ <div class="bar5"></div>
+ <div class="bar6"></div>
+ <div class="bar7"></div>
+ <div class="bar8"></div>
+</div>
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index 444a33a..307c40d 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -206,13 +206,16 @@ class User_FilterController extends Zend_Controller_Action
// TODO: get all child groups
$grouppMapper = new Application_Model_GroupMapper();
- $groups = $grouppMapper->findBY('groupID',$this->membership->getGroupID());
+ $group = new Application_Model_Group();
+ $grouppMapper->find($this->membership->getGroupID(),$group);
+ $groups[] = $group->toArray();
$clientMapper = new Application_Model_ClientMapper();
$clients = $clientMapper->findBY('groupID',$this->membership->getGroupID());
return array ( 'clients' => $clients,
'memberships' => $memberships,
+ 'groups' => $groups,
'bootisos' => $bootisos,
'pools' => $pools);
@@ -246,7 +249,7 @@ class User_FilterController extends Zend_Controller_Action
$addform = new user_Form_FilterEntry(array('buttontext' => 'Add Filterentry',
'selectData' => $selectData,
'data'=>$_POST
- ));
+ ));
if ($addform->isValid($_POST)) {
print_a('valid');
$newfilterenty = new Application_Model_FilterEntries();
diff --git a/application/modules/user/forms/FilterEntry.php b/application/modules/user/forms/FilterEntry.php
index 55941c0..c2581c2 100644
--- a/application/modules/user/forms/FilterEntry.php
+++ b/application/modules/user/forms/FilterEntry.php
@@ -11,7 +11,7 @@ class user_Form_FilterEntry extends Zend_Form
$this->setMethod('post');
$this->setAttrib('id','filterentryform');
#print_a($this->data);
- print_a($this->selectData);
+ #print_a($this->selectData);
try{
$filtertypemapper = new Application_Model_FilterTypeMapper();
$filtertype = $filtertypemapper->fetchAll();
@@ -189,11 +189,37 @@ class user_Form_FilterEntry extends Zend_Form
$filtervalue1 = $this->createElement('text', 'filtervalue', array(
'label' => $label1,
+ 'validators' => array(
+ array(
+ 'regex',
+ false,
+ array(
+ '/^([0-1][0-9]|[2][0-3]):([0-5][0-9])$/i',
+ 'messages' => array(
+ Zend_Validate_Regex::NOT_MATCH => "'%value%' is not a valid Time-Format, It must be HH:MM",
+ Zend_Validate_Regex::INVALID => 'Time contains invalid characters.'
+ )
+ )
+ )
+ ),
'required' => true,
'id' => 'val1'
));
$filtervalue2 = $this->createElement('text', 'filtervalue2', array(
'label' => $label2,
+ 'validators' => array(
+ array(
+ 'regex',
+ false,
+ array(
+ '/^([0-1][0-9]|[2][0-3]):([0-5][0-9])$/i',
+ 'messages' => array(
+ Zend_Validate_Regex::NOT_MATCH => "'%value%' is not a valid Time-Format, It must be HH:MM",
+ Zend_Validate_Regex::INVALID => 'Time contains invalid characters.'
+ )
+ )
+ )
+ ),
'required' => true,
'id' => 'val2'
));
@@ -231,11 +257,37 @@ class user_Form_FilterEntry extends Zend_Form
$filtervalue1 = $this->createElement('text', 'filtervalue', array(
'label' => $label1,
+ 'validators' => array(
+ array(
+ 'regex',
+ false,
+ array(
+ '/^([1-7])$/i',
+ 'messages' => array(
+ Zend_Validate_Regex::NOT_MATCH => "'%value%' is not a valid Day-Format, It must be betweeen 1 and 7",
+ Zend_Validate_Regex::INVALID => 'Day contains invalid characters.'
+ )
+ )
+ )
+ ),
'required' => true,
'id' => 'val1'
));
$filtervalue2 = $this->createElement('text', 'filtervalue2', array(
'label' => $label2,
+ 'validators' => array(
+ array(
+ 'regex',
+ false,
+ array(
+ '/^([1-7])$/i',
+ 'messages' => array(
+ Zend_Validate_Regex::NOT_MATCH => "'%value%' is not a valid Day-Format, It must be betweeen 1 and 7",
+ Zend_Validate_Regex::INVALID => 'Day contains invalid characters.'
+ )
+ )
+ )
+ ),
'required' => true,
'id' => 'val2'
));
@@ -246,15 +298,19 @@ class user_Form_FilterEntry extends Zend_Form
$label2 = 'End Date:';
$filtervalue1 = $this->createElement('text', 'filtervalue', array(
- 'label' => $label1,
+ 'label' => $label1,
'required' => true,
'id' => 'val1'
- ));
+ ));
+ $filtervalue1->addValidator('Date',false, array('format'=>'dd.MM.yyyy'));
+
$filtervalue2 = $this->createElement('text', 'filtervalue2', array(
- 'label' => $label2,
- 'required' => true,
+ 'label' => $label2,
+ 'required' => true,
'id' => 'val2'
- ));
+ ));
+ $filtervalue2->addValidator('Date',false, array('format'=>'dd.MM.yyyy'));
+
break;
}
$filtertypes->setDescription($desc);
diff --git a/library/Pbs/Filter.php b/library/Pbs/Filter.php
index 91e97e9..1759412 100644
--- a/library/Pbs/Filter.php
+++ b/library/Pbs/Filter.php
@@ -208,6 +208,14 @@ class Pbs_Filter{
//TODO: GET GROUP from SESSION
$groupID = $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
diff --git a/pbs-newdata.sql b/pbs-newdata.sql
index d3dd6ab..e075c29 100644
--- a/pbs-newdata.sql
+++ b/pbs-newdata.sql
@@ -13,9 +13,28 @@ INSERT INTO `pbs_person` (`personID`, `title`, `name`, `firstname`, `street`, `h
-- Adding group
INSERT INTO `pbs`.`pbs_group` (`groupID` ,`title` ,`description`)VALUES
-(1, 'Group 1', 'Our Testgroup'),
-(2, 'Group 2', 'The Second Testgroup'),
-(3, 'Group 3', 'Wohoo');
+(1, 'Group 1', 'First Group'),
+(2, 'Group 2', 'Second Group'),
+(3, 'Group 3', 'Third Group'),
+(4, 'Group 4', 'Fourth Group'),
+(5, 'Group 5', 'Fifth Group'),
+(6, 'Group 6', 'Sixth Group'),
+(7, 'Group 7', 'Seventh Group'),
+(8, 'Group 8', 'Eight Group'),
+(9, 'Group 9', 'Nineth Group'),
+(10, 'Group 10', 'Tenth Group');
+
+INSERT INTO `pbs`.`pbs_groupgroups` (`parentID`, `groupID`) VALUES
+(1, 2),
+(1, 3),
+(2, 4),
+(2, 5),
+(1, 8),
+(3, 6),
+(3, 7),
+(3, 9),
+(3, 10);
+
-- Adding role
INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`) VALUES (1, '1', 'Role 1-Group1', NULL);
@@ -66,18 +85,18 @@ INSERT INTO `pbs_bootos` (`bootosID`, `configID`, `groupID`, `membershipID`, `ti
(9, 1, 1, 1, 'BootOs 9', 'Description 9', 'initpath 9', 'kernelpath 9', 'default kcl 9', '1299693782', '2012-03-09', 0),
(10, 1, 1, 1, 'BootOs 10', 'Description 10', 'initpath 10', 'kernelpath 10', 'default kcl 10', '1299693782', '2012-03-09', 0);
+-- Adding preboot
+INSERT INTO `pbs_preboot` (`prebootID`, `title`, `membershipID`, `groupID`, `path_preboot`) VALUES
+(1, 'Preboot 1', 1, 1, 'path 1'),
+(2, 'Preboot 2', 1, 1, 'path 2'),
+(3, 'Preboot 3', 1, 1, 'path 3');
+
-- Adding bootiso
INSERT INTO `pbs_bootiso` (`bootisoID`, `title`, `membershipID`, `groupID`, `prebootID`, `serialnumber`, `created`, `expires`, `public`) VALUES
(1, 'BootIso 1', 1, 1, '1', 123456789, '123', '2012-03-09', 0),
(2, 'BootIso 2', 1, 1, '2', 2147483647, '456', '2012-03-09', 0),
(3, 'BootIso 3', 1, 1, '3', 2147483647, '789', '2012-03-09', 0);
--- Adding preboot
-INSERT INTO `pbs_preboot` (`prebootID`, `title`, `membershipID`, `groupID`, `path_preboot`) VALUES
-(1, 'Preboot 1', 1, 1, 'path 1'),
-(2, 'Preboot 2', 1, 1, 'path 1'),
-(3, 'Preboot 3', 1, 1, 'path 1');
-
-- Adding Pools
INSERT INTO `pbs_pool` (`poolID`, `groupID`, `title`, `description`, `location`) VALUES
(1, 1, 'Pool 1', 'Description 1', 'Keller'),
@@ -127,14 +146,17 @@ INSERT INTO `pbs_session` (`sessionID`, `alphasessionID`,`clientID`, `bootmenuen
-- Adding Filter
INSERT INTO `pbs_filter` (`filterID`, `membershipID`, `groupID`, `bootmenuID`, `title`, `description`, `created`, `priority`) VALUES
-(1, 1, 1, 1, 'Filter 1', 'Innerhalb der Uni', '1299697337', 10),
-(2, 1, 1, 5, 'Filter 2', 'Ausserhalb der Uni', '1299697073', 20),
-(3, 1, 1, 4, 'Filter 3', 'Desc3', '1299697277', 5);
+(1, 1, 1, 1, 'Filter 1', 'Innerhalb der Uni', '', 1),
+(2, 1, 1, 2, 'Filter 2', 'Ausserhalb der Uni', '', 1),
+(3, 1, 1, 3, 'Filter 3', 'Montags-Freitag \r\nvon 8 bis 16 Uhr \r\nInnerhalb der Uni', '', 10);
-- Adding Filterentries
INSERT INTO `pbs_filterentries` (`filterentriesID`, `filterID`, `filtertypeID`, `filtervalue`, `filtervalue2`) VALUES
-(1, 1, 7, '08:00', '18:00'),
-(2, 2, 1, '001.001.001.001', '132.229.255.255'),
-(3, 2, 1, '132.231.001.001', '255.255.255.255'),
-(4, 1, 1, '132.230.001.001', '132.230.255.255'),
-(5, 3, 3, '1', '');
+(1, 1, 6, '1', NULL),
+(2, 1, 1, '132.230.001.001', '132.230.255.255'),
+(3, 2, 6, '1', NULL),
+(4, 2, 1, '000.000.000.000', '132.229.255.255'),
+(5, 2, 1, '132.231.001.001', '255.255.255.255'),
+(6, 3, 6, '1', NULL),
+(7, 3, 7, '08:00', '16:00'),
+(8, 3, 10, '1', '5');
diff --git a/pbs.sql b/pbs.sql
index 4cb68d9..90c6b24 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -182,7 +182,23 @@ ALTER TABLE `pbs_bootmenuentries`
ADD CONSTRAINT `pbs_bootmenuentries_ibfk_3` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`) ON DELETE SET NULL,
ADD CONSTRAINT `pbs_bootmenuentries_ibfk_4` FOREIGN KEY (`kcl`) REFERENCES `pbs_bootos` (`defaultkcl`) ON DELETE CASCADE,
ADD CONSTRAINT `pbs_bootmenuentries_ibfk_5` FOREIGN KEY (`kcl`) REFERENCES `pbs_bootos` (`defaultkcl`) ON UPDATE CASCADE;
-
+
+CREATE TABLE IF NOT EXISTS `pbs_preboot` (
+ `prebootID` int(11) NOT NULL AUTO_INCREMENT,
+ `title` varchar(30) NOT NULL,
+ `membershipID` int(11),
+ `groupID` int(11) NOT NULL,
+ `path_preboot` varchar(30) NOT NULL,
+ PRIMARY KEY (`prebootID`),
+ KEY `membershipID` (`membershipID`),
+ KEY `groupID` (`groupID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
+
+ALTER TABLE `pbs_preboot`
+ ADD CONSTRAINT `pbs_preboot_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL,
+ ADD CONSTRAINT `pbs_preboot_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE;
+
+
CREATE TABLE IF NOT EXISTS `pbs_bootiso` (
`bootisoID` int(11) NOT NULL AUTO_INCREMENT,
`title` varchar(30) NOT NULL,
@@ -198,26 +214,12 @@ CREATE TABLE IF NOT EXISTS `pbs_bootiso` (
KEY `groupID` (`groupID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
+
ALTER TABLE `pbs_bootiso`
ADD CONSTRAINT `pbs_bootiso_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL,
ADD CONSTRAINT `pbs_bootiso_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE,
ADD CONSTRAINT `pbs_bootiso_ibfk_3` FOREIGN KEY (`prebootID`) REFERENCES `pbs_preboot` (`prebootID`) ON DELETE CASCADE;
-CREATE TABLE IF NOT EXISTS `pbs_preboot` (
- `prebootID` int(11) NOT NULL AUTO_INCREMENT,
- `title` varchar(30) NOT NULL,
- `membershipID` int(11),
- `groupID` int(11) NOT NULL,
- `path_preboot` varchar(30) NOT NULL,
- PRIMARY KEY (`prebootID`),
- KEY `membershipID` (`membershipID`),
- KEY `groupID` (`groupID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-
-ALTER TABLE `pbs_preboot`
- ADD CONSTRAINT `pbs_preboot_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL,
- ADD CONSTRAINT `pbs_preboot_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE;
-
CREATE TABLE IF NOT EXISTS `pbs_client` (
`clientID` int(11) NOT NULL AUTO_INCREMENT,
`macadress` varchar(17) NOT NULL,
@@ -327,7 +329,7 @@ CREATE TABLE IF NOT EXISTS `pbs_filterentries` (
`filterID` int(11) NOT NULL,
`filtertypeID` int(11) NOT NULL,
`filtervalue` varchar(140) NOT NULL,
- `filtervalue2` varchar(140) NOT NULL
+ `filtervalue2` varchar(140) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
ALTER TABLE `pbs_filterentries` CHANGE `filtervalue2` `filtervalue2` VARCHAR( 140 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL;
ALTER TABLE `pbs_filterentries` ADD `filterentriesID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
diff --git a/send-post.html b/send-post.html
index d657552..fd5752d 100644
--- a/send-post.html
+++ b/send-post.html
@@ -7,8 +7,8 @@
</style>
<body>
<fieldset>
- <legend>localhost</legend>
- <form action='http://localhost/' method='post'>
+ <legend>http://pbs2.local/</legend>
+ <form action='http://pbs2.local/' method='post'>
<label>BootisoID</label>
<input type='text' name='bootisoID' value='1'></br>
<label>Mac</label>
@@ -19,7 +19,7 @@
</form>
</fieldset>
<fieldset>
- <legend>localhost:81</legend>
+ <legend>http://localhost:81/</legend>
<form action='http://localhost:81/' method='post'>
<label>BootisoID</label>
<input type='text' name='bootisoID' value='1'></br>
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-03 21:06:39 +0200