zfproject angepasst

9 files changed, 116 insertions, 51 deletions

diff --git a/.zfproject.xml b/.zfproject.xml
index f717ab6..f07e618 100644
--- a/.zfproject.xml
+++ b/.zfproject.xml
@@ -13,12 +13,11 @@
         </controllerFile>
         <controllerFile controllerName="Error"/>
         <controllerFile controllerName="Auth">
-          <actionMethod actionName="index"/>
           <actionMethod actionName="login"/>
           <actionMethod actionName="register"/>
           <actionMethod actionName="logout"/>
           <actionMethod actionName="recoverPassword"/>
-          <actionMethod actionName="deleteAccount"/>
+          <actionMethod actionName="delete"/>
         </controllerFile>
         <controllerFile controllerName="Person">
           <actionMethod actionName="index"/>
@@ -29,6 +28,10 @@
           <actionMethod actionName="removefilter"/>
           <actionMethod actionName="editfilter"/>
           <actionMethod actionName="addfilterentry"/>
+          <actionMethod actionName="editfilterentry"/>
+          <actionMethod actionName="evaluate"/>
+          <actionMethod actionName="fillIP"/>
+          <actionMethod actionName="removefilterentry"/>
         </controllerFile>
         <controllerFile controllerName="Bootos">
           <actionMethod actionName="index"/>
@@ -38,25 +41,29 @@
         </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>
       </controllersDirectory>
       <formsDirectory>
         <formFile formName="AuthLogin"/>
-        <formFile formName="Register"/>
-        <formFile formName="PersonRegister"/>
-        <formFile formName="FilterCreate"/>
-        <formFile formName="AuthDelete"/>
+	<formFile formName="AuthDelete"/>
+        <formFile formName="AuthRegister"/>
         <formFile formName="FilterAdd"/>
+        <formFile formName="FilterEntriesAdd"/>
         <formFile formName="BootosCreate"/>
-        <formFile formName="BootosDelete"/>
         <formFile formName="BootosEdit"/>
-        <formFile formName="BootosIndex"/>
-        <formFile formName="FilterEdit"/>
-        <formFile formName="FilterEntriesAdd"/>
-        <formFile formName="ConfigAdd"/>
+        <formFile formName="ConfigCreate"/>
         <formFile formName="ConfigEdit"/>
         <formFile formName="BootmenuCreate"/>
         <formFile formName="BootmenuEdit"/>
@@ -171,9 +178,6 @@
             <viewScriptFile forActionName="addfilter"/>
           </viewControllerScriptsDirectory>
           <viewControllerScriptsDirectory forControllerName="Filter">
-            <viewScriptFile forActionName="removefilter"/>
-          </viewControllerScriptsDirectory>
-          <viewControllerScriptsDirectory forControllerName="Filter">
             <viewScriptFile forActionName="editfilter"/>
           </viewControllerScriptsDirectory>
           <viewControllerScriptsDirectory forControllerName="Bootos">
@@ -188,19 +192,19 @@
           <viewControllerScriptsDirectory forControllerName="Bootos">
             <viewScriptFile forActionName="editbootos"/>
           </viewControllerScriptsDirectory>
-          <viewControllerScriptsDirectory forControllerName="Bootos">
-            <viewScriptFile forActionName="deletebootos"/>
-          </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">
+          <viewControllerScriptsDirectory forControllerName="Config">
             <viewScriptFile forActionName="createconfig"/>
           </viewControllerScriptsDirectory>
-          <viewControllerScriptsDirectory forControllerName="config">
+          <viewControllerScriptsDirectory forControllerName="Config">
             <viewScriptFile forActionName="editconfig"/>
           </viewControllerScriptsDirectory>
           <viewControllerScriptsDirectory forControllerName="Bootmenu">
@@ -210,15 +214,12 @@
             <viewScriptFile forActionName="createbootmenu"/>
           </viewControllerScriptsDirectory>
           <viewControllerScriptsDirectory forControllerName="Bootmenu">
-            <viewScriptFile forActionName="editbootfilter"/>
+            <viewScriptFile forActionName="editbootmenu"/>
           </viewControllerScriptsDirectory>
           <viewControllerScriptsDirectory forControllerName="Bootmenu">
             <viewScriptFile forActionName="addbootmenuentry"/>
           </viewControllerScriptsDirectory>
           <viewControllerScriptsDirectory forControllerName="Bootmenu">
-            <viewScriptFile forActionName="removebootmenuentry"/>
-          </viewControllerScriptsDirectory>
-          <viewControllerScriptsDirectory forControllerName="Bootmenu">
             <viewScriptFile forActionName="editbootmenuentry"/>
           </viewControllerScriptsDirectory>
         </viewScriptsDirectory>
diff --git a/application/controllers/BootmenuController.php b/application/controllers/BootmenuController.php
index b365dc9..20f471e 100644
--- a/application/controllers/BootmenuController.php
+++ b/application/controllers/BootmenuController.php
@@ -13,6 +13,48 @@ class BootmenuController extends Zend_Controller_Action
         // action body
     }
 
+    public function addbootmenuentryAction()
+    {
+        // action body
+    }
+
+    public function createbootmenuAction()
+    {
+        // action body
+    }
+
+    public function editbootmenuAction()
+    {
+        // action body
+    }
+
+    public function editbootmenuentryAction()
+    {
+        // action body
+    }
+
+    public function removebootmenuentryAction()
+    {
+        // action body
+    }
+
+    public function deletebootmenuAction()
+    {
+        // action body
+    }
+
 
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 4413ee7..61d58f1 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -13,6 +13,27 @@ class ConfigController extends Zend_Controller_Action
         // action body
     }
 
+    public function createconfigAction()
+    {
+        // action body
+    }
+
+    public function editconfigAction()
+    {
+        // action body
+    }
+
+    public function deleteconfigAction()
+    {
+        // action body
+    }
+
 
 }
 
+
+
+
+
+
+
diff --git a/application/forms/ConfigCreate.php b/application/forms/ConfigCreate.php
new file mode 100644
index 0000000..2c9516d
--- /dev/null
+++ b/application/forms/ConfigCreate.php
@@ -0,0 +1,13 @@
+<?php
+
+class Application_Form_ConfigAdd extends Zend_Form
+{
+
+    public function init()
+    {
+        /* Form Elements & Other Definitions Here ... */
+    }
+
+
+}
+
diff --git a/application/views/scripts/auth/recoverPassword.phtml b/application/views/scripts/auth/recoverPassword.phtml
new file mode 100644
index 0000000..e133420
--- /dev/null
+++ b/application/views/scripts/auth/recoverPassword.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Auth</b> and script/action name <b>recoverPassword</b></center>
\ No newline at end of file
diff --git a/application/views/scripts/bootmenu/editbootmenu.phtml b/application/views/scripts/bootmenu/editbootmenu.phtml
new file mode 100644
index 0000000..3274ee4
--- /dev/null
+++ b/application/views/scripts/bootmenu/editbootmenu.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Bootmenu</b> and script/action name <b>editbootfilter</b></center>
\ No newline at end of file
diff --git a/application/views/scripts/config/createconfig.phtml b/application/views/scripts/config/createconfig.phtml
index 4b30490..5b92915 100644
--- a/application/views/scripts/config/createconfig.phtml
+++ b/application/views/scripts/config/createconfig.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>config</b> and script/action name <b>createconfig</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b>Config</b> and script/action name <b>createconfig</b></center>
\ No newline at end of file
diff --git a/application/views/scripts/config/editconfig.phtml b/application/views/scripts/config/editconfig.phtml
index c1c0d06..0e002b7 100644
--- a/application/views/scripts/config/editconfig.phtml
+++ b/application/views/scripts/config/editconfig.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>config</b> and script/action name <b>editconfig</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b>Config</b> and script/action name <b>editconfig</b></center>
\ No newline at end of file
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index d404906..a91cb9c 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -4,40 +4,26 @@
     <th>ID</th>
     <th>Title</th>
     <th>GroupID</th>
-    <th>ConfigID</th>
-    <th>Init</th>
-    <th>Kernel</th>
-    <th>Kcl</th>
-    <th>Description</th>
-    <th>Changed</th>
-    <th>Expires</th>
-    <th>Public</th>
+    <th>Shellscript</th>
   </tr>
-  <?php foreach ($this->bootoslist as $bootos): ?>
+  <?php foreach ($this->configlist as $config): ?>
   <tr>
-    <td><?php echo $this->escape($bootos->getID()); ?></td>
-    <td><?php echo $this->escape($bootos->getTitle()); ?></td>
-    <td><?php echo $this->escape($bootos->getGroupID()); ?></td>
-    <td><?php echo $this->escape($bootos->getConfigID()); ?></td>
-    <td><?php echo $this->escape($bootos->getPath_init()); ?></td>
-    <td><?php echo $this->escape($bootos->getPath_kernel()); ?></td>
-    <td><?php echo $this->escape($bootos->getDefaultkcl()); ?></td>
-    <td><?php echo $this->escape($bootos->getDescription()); ?></td>
-    <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><?php echo $this->escape($config->getID()); ?></td>
+    <td><?php echo $this->escape($config->getTitle()); ?></td>
+    <td><?php echo $this->escape($config->getGroupID()); ?></td>
+    <td><?php echo $this->escape($config->getShellscript()); ?></td>
     <td><a href="<?php echo $this->url(
 					array(
-						'controller' => 'bootos',
-						'action'     => 'editbootos',
-						'bootosID'   =>  $bootos->getID()
+						'controller' => 'config',
+						'action'     => 'editconfig',
+						'configID'   =>  $config->getID()
 					),
 					'default',
-					true, false) ?>">Edit BootOS</a></td>
+					true, false) ?>">Edit Config</a></td>
 	<td><a href="<?php echo $this->url(
 					array(
-						'controller' => 'bootos',
-						'action'     => 'deletebootos',
+						'controller' => 'config',
+						'action'     => 'deleteconfig',
 						'bootosID'   =>  $bootos->getID()
 					),
 					'default',