From b5cbdd6b400aa1ec77c9846e9cc8d4257f437e3c Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 14 Mar 2011 16:09:03 +0100 Subject: Application in 3 Modules gesplittet, Dev = unsere entwicklungsumgebung, user = die weboberfläche fr anwender mit acl etc, fbgui = für die fbgui truppe - links in dev müssen noch angepasst werden --- .../modules/dev/views/scripts/auth/delete.phtml | 0 .../modules/dev/views/scripts/auth/index.phtml | 0 .../modules/dev/views/scripts/auth/login.phtml | 5 + .../modules/dev/views/scripts/auth/logout.phtml | 1 + .../dev/views/scripts/auth/recoverpassword.phtml | 4 + .../modules/dev/views/scripts/auth/register.phtml | 4 + .../dev/views/scripts/bootiso/createbootiso.phtml | 4 + .../dev/views/scripts/bootiso/editbootiso.phtml | 4 + .../modules/dev/views/scripts/bootiso/index.phtml | 56 +++++++++ .../views/scripts/bootmenu/addbootmenuentry.phtml | 4 + .../views/scripts/bootmenu/createbootmenu.phtml | 4 + .../dev/views/scripts/bootmenu/editbootmenu.phtml | 4 + .../views/scripts/bootmenu/editbootmenuentry.phtml | 4 + .../modules/dev/views/scripts/bootmenu/index.phtml | 119 +++++++++++++++++++ .../dev/views/scripts/bootos/createbootos.phtml | 4 + .../dev/views/scripts/bootos/editbootos.phtml | 4 + .../modules/dev/views/scripts/bootos/index.phtml | 62 ++++++++++ .../dev/views/scripts/client/addclient.phtml | 3 + .../dev/views/scripts/client/editclient.phtml | 3 + .../modules/dev/views/scripts/client/index.phtml | 44 +++++++ .../dev/views/scripts/client/removeclient.phtml | 1 + .../dev/views/scripts/config/createconfig.phtml | 4 + .../dev/views/scripts/config/editconfig.phtml | 4 + .../modules/dev/views/scripts/config/index.phtml | 50 ++++++++ .../modules/dev/views/scripts/error/error.phtml | 28 +++++ .../dev/views/scripts/filter/addfilter.phtml | 3 + .../dev/views/scripts/filter/addfilterentry.phtml | 3 + .../dev/views/scripts/filter/editfilter.phtml | 8 ++ .../dev/views/scripts/filter/editfilterentry.phtml | 2 + .../dev/views/scripts/filter/evaluate.phtml | 0 .../modules/dev/views/scripts/filter/index.phtml | 117 +++++++++++++++++++ .../dev/views/scripts/filter/testevaluate.phtml | 4 + .../modules/dev/views/scripts/group/add.phtml | 4 + .../modules/dev/views/scripts/group/delete.phtml | 6 + .../modules/dev/views/scripts/group/edit.phtml | 10 ++ .../dev/views/scripts/group/grantperson.phtml | 11 ++ .../modules/dev/views/scripts/group/index.phtml | 35 ++++++ .../modules/dev/views/scripts/group/link.phtml | 4 + .../dev/views/scripts/group/revokeperson.phtml | 6 + .../modules/dev/views/scripts/group/show.phtml | 122 ++++++++++++++++++++ .../modules/dev/views/scripts/index/index.phtml | 1 + .../modules/dev/views/scripts/person/edit.phtml | 4 + .../modules/dev/views/scripts/person/index.phtml | 0 .../modules/dev/views/scripts/person/leave.phtml | 6 + .../modules/dev/views/scripts/person/request.phtml | 6 + .../modules/dev/views/scripts/person/show.phtml | 79 +++++++++++++ .../dev/views/scripts/pool/createpool.phtml | 2 + .../dev/views/scripts/pool/deletepool.phtml | 1 + .../modules/dev/views/scripts/pool/editpool.phtml | 4 + .../modules/dev/views/scripts/pool/index.phtml | 126 +++++++++++++++++++++ .../dev/views/scripts/pool/linkclient.phtml | 3 + .../dev/views/scripts/pool/unlinkclient.phtml | 1 + .../scripts/resource/get-bootmenu-entry.phtml | 0 .../modules/dev/views/scripts/resource/index.phtml | 0 .../modules/dev/views/scripts/role/add.phtml | 1 + .../modules/dev/views/scripts/role/delete.phtml | 1 + .../modules/dev/views/scripts/role/edit.phtml | 1 + .../modules/dev/views/scripts/role/index.phtml | 1 + .../modules/dev/views/scripts/role/linkright.phtml | 1 + .../modules/dev/views/scripts/role/show.phtml | 1 + .../dev/views/scripts/role/unlinkright.phtml | 1 + .../dev/views/scripts/session/createsession.phtml | 5 + .../dev/views/scripts/session/deletesession.phtml | 1 + .../dev/views/scripts/session/editsession.phtml | 5 + .../modules/dev/views/scripts/session/index.phtml | 49 ++++++++ 65 files changed, 1055 insertions(+) create mode 100644 application/modules/dev/views/scripts/auth/delete.phtml create mode 100644 application/modules/dev/views/scripts/auth/index.phtml create mode 100644 application/modules/dev/views/scripts/auth/login.phtml create mode 100644 application/modules/dev/views/scripts/auth/logout.phtml create mode 100644 application/modules/dev/views/scripts/auth/recoverpassword.phtml create mode 100644 application/modules/dev/views/scripts/auth/register.phtml create mode 100644 application/modules/dev/views/scripts/bootiso/createbootiso.phtml create mode 100644 application/modules/dev/views/scripts/bootiso/editbootiso.phtml create mode 100644 application/modules/dev/views/scripts/bootiso/index.phtml create mode 100644 application/modules/dev/views/scripts/bootmenu/addbootmenuentry.phtml create mode 100644 application/modules/dev/views/scripts/bootmenu/createbootmenu.phtml create mode 100644 application/modules/dev/views/scripts/bootmenu/editbootmenu.phtml create mode 100644 application/modules/dev/views/scripts/bootmenu/editbootmenuentry.phtml create mode 100644 application/modules/dev/views/scripts/bootmenu/index.phtml create mode 100644 application/modules/dev/views/scripts/bootos/createbootos.phtml create mode 100644 application/modules/dev/views/scripts/bootos/editbootos.phtml create mode 100644 application/modules/dev/views/scripts/bootos/index.phtml create mode 100644 application/modules/dev/views/scripts/client/addclient.phtml create mode 100644 application/modules/dev/views/scripts/client/editclient.phtml create mode 100644 application/modules/dev/views/scripts/client/index.phtml create mode 100644 application/modules/dev/views/scripts/client/removeclient.phtml create mode 100644 application/modules/dev/views/scripts/config/createconfig.phtml create mode 100644 application/modules/dev/views/scripts/config/editconfig.phtml create mode 100644 application/modules/dev/views/scripts/config/index.phtml create mode 100644 application/modules/dev/views/scripts/error/error.phtml create mode 100644 application/modules/dev/views/scripts/filter/addfilter.phtml create mode 100644 application/modules/dev/views/scripts/filter/addfilterentry.phtml create mode 100644 application/modules/dev/views/scripts/filter/editfilter.phtml create mode 100644 application/modules/dev/views/scripts/filter/editfilterentry.phtml create mode 100644 application/modules/dev/views/scripts/filter/evaluate.phtml create mode 100644 application/modules/dev/views/scripts/filter/index.phtml create mode 100644 application/modules/dev/views/scripts/filter/testevaluate.phtml create mode 100644 application/modules/dev/views/scripts/group/add.phtml create mode 100644 application/modules/dev/views/scripts/group/delete.phtml create mode 100644 application/modules/dev/views/scripts/group/edit.phtml create mode 100644 application/modules/dev/views/scripts/group/grantperson.phtml create mode 100644 application/modules/dev/views/scripts/group/index.phtml create mode 100644 application/modules/dev/views/scripts/group/link.phtml create mode 100644 application/modules/dev/views/scripts/group/revokeperson.phtml create mode 100644 application/modules/dev/views/scripts/group/show.phtml create mode 100644 application/modules/dev/views/scripts/index/index.phtml create mode 100644 application/modules/dev/views/scripts/person/edit.phtml create mode 100644 application/modules/dev/views/scripts/person/index.phtml create mode 100644 application/modules/dev/views/scripts/person/leave.phtml create mode 100644 application/modules/dev/views/scripts/person/request.phtml create mode 100644 application/modules/dev/views/scripts/person/show.phtml create mode 100644 application/modules/dev/views/scripts/pool/createpool.phtml create mode 100644 application/modules/dev/views/scripts/pool/deletepool.phtml create mode 100644 application/modules/dev/views/scripts/pool/editpool.phtml create mode 100644 application/modules/dev/views/scripts/pool/index.phtml create mode 100644 application/modules/dev/views/scripts/pool/linkclient.phtml create mode 100644 application/modules/dev/views/scripts/pool/unlinkclient.phtml create mode 100644 application/modules/dev/views/scripts/resource/get-bootmenu-entry.phtml create mode 100644 application/modules/dev/views/scripts/resource/index.phtml create mode 100644 application/modules/dev/views/scripts/role/add.phtml create mode 100644 application/modules/dev/views/scripts/role/delete.phtml create mode 100644 application/modules/dev/views/scripts/role/edit.phtml create mode 100644 application/modules/dev/views/scripts/role/index.phtml create mode 100644 application/modules/dev/views/scripts/role/linkright.phtml create mode 100644 application/modules/dev/views/scripts/role/show.phtml create mode 100644 application/modules/dev/views/scripts/role/unlinkright.phtml create mode 100644 application/modules/dev/views/scripts/session/createsession.phtml create mode 100644 application/modules/dev/views/scripts/session/deletesession.phtml create mode 100644 application/modules/dev/views/scripts/session/editsession.phtml create mode 100644 application/modules/dev/views/scripts/session/index.phtml (limited to 'application/modules/dev/views/scripts') diff --git a/application/modules/dev/views/scripts/auth/delete.phtml b/application/modules/dev/views/scripts/auth/delete.phtml new file mode 100644 index 0000000..e69de29 diff --git a/application/modules/dev/views/scripts/auth/index.phtml b/application/modules/dev/views/scripts/auth/index.phtml new file mode 100644 index 0000000..e69de29 diff --git a/application/modules/dev/views/scripts/auth/login.phtml b/application/modules/dev/views/scripts/auth/login.phtml new file mode 100644 index 0000000..4e642a3 --- /dev/null +++ b/application/modules/dev/views/scripts/auth/login.phtml @@ -0,0 +1,5 @@ +loginForm->setAction($this->url()); +echo $this->loginForm; +?> +
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/auth/logout.phtml b/application/modules/dev/views/scripts/auth/logout.phtml new file mode 100644 index 0000000..a709bd9 --- /dev/null +++ b/application/modules/dev/views/scripts/auth/logout.phtml @@ -0,0 +1 @@ +

View script for controller Auth and script/action name logout
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/auth/recoverpassword.phtml b/application/modules/dev/views/scripts/auth/recoverpassword.phtml new file mode 100644 index 0000000..881e00e --- /dev/null +++ b/application/modules/dev/views/scripts/auth/recoverpassword.phtml @@ -0,0 +1,4 @@ +recoverPasswordForm->setAction($this->url()); +echo $this->recoverPasswordForm; +?> diff --git a/application/modules/dev/views/scripts/auth/register.phtml b/application/modules/dev/views/scripts/auth/register.phtml new file mode 100644 index 0000000..5196738 --- /dev/null +++ b/application/modules/dev/views/scripts/auth/register.phtml @@ -0,0 +1,4 @@ +registerForm->setAction($this->url()); +echo $this->registerForm; +?> diff --git a/application/modules/dev/views/scripts/bootiso/createbootiso.phtml b/application/modules/dev/views/scripts/bootiso/createbootiso.phtml new file mode 100644 index 0000000..a5ad609 --- /dev/null +++ b/application/modules/dev/views/scripts/bootiso/createbootiso.phtml @@ -0,0 +1,4 @@ +createbootisoForm->setAction($this->url()); +echo $this->createbootisoForm; +?> diff --git a/application/modules/dev/views/scripts/bootiso/editbootiso.phtml b/application/modules/dev/views/scripts/bootiso/editbootiso.phtml new file mode 100644 index 0000000..9b04c95 --- /dev/null +++ b/application/modules/dev/views/scripts/bootiso/editbootiso.phtml @@ -0,0 +1,4 @@ +editbootisoForm->setAction($this->url()); +echo $this->editbootisoForm; +?> diff --git a/application/modules/dev/views/scripts/bootiso/index.phtml b/application/modules/dev/views/scripts/bootiso/index.phtml new file mode 100644 index 0000000..5e7da1e --- /dev/null +++ b/application/modules/dev/views/scripts/bootiso/index.phtml @@ -0,0 +1,56 @@ +

BootISO

+formButton('createbootiso', 'Create BootISO', array( + 'onclick' => 'self.location="/bootiso/createbootiso"', + 'class' => 'addbutton'))?> + + + + + + + + + + + + + + bootisolist)==0) + echo "
IDTitleGroupIDMembershipIDPathSerialnumberCreatedExpiresPublicActions
There are no BootISO's entries for the Bootmenuto display." ?> + bootisolist as $bootiso): ?> + + escape($bootiso->getID()); ?> + escape($bootiso->getTitle()); ?> + escape($bootiso->getGroupID()); ?> + escape($bootiso->getMembershipID()); ?> + escape($bootiso->getPath()); ?> + escape($bootiso->getSerialnumber()); ?> + escape(date('Y-m-d H:i:s', $bootiso->getCreated())); ?> + escape($bootiso->getExpires()); ?> + escape($bootiso->getPublic()); ?> + Edit BootISO + Delete BootISO + + + + + + + + + + diff --git a/application/modules/dev/views/scripts/bootmenu/addbootmenuentry.phtml b/application/modules/dev/views/scripts/bootmenu/addbootmenuentry.phtml new file mode 100644 index 0000000..914cc9c --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/addbootmenuentry.phtml @@ -0,0 +1,4 @@ +addbootmenuentryForm->setAction($this->url()); +echo $this->addbootmenuentryForm; +?> \ No newline at end of file diff --git a/application/modules/dev/views/scripts/bootmenu/createbootmenu.phtml b/application/modules/dev/views/scripts/bootmenu/createbootmenu.phtml new file mode 100644 index 0000000..2d2c2df --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/createbootmenu.phtml @@ -0,0 +1,4 @@ +createbootmenuForm->setAction($this->url()); +echo $this->createbootmenuForm; +?> diff --git a/application/modules/dev/views/scripts/bootmenu/editbootmenu.phtml b/application/modules/dev/views/scripts/bootmenu/editbootmenu.phtml new file mode 100644 index 0000000..b7adc4a --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/editbootmenu.phtml @@ -0,0 +1,4 @@ +editbootmenuForm->setAction($this->url()); +echo $this->editbootmenuForm; +?> diff --git a/application/modules/dev/views/scripts/bootmenu/editbootmenuentry.phtml b/application/modules/dev/views/scripts/bootmenu/editbootmenuentry.phtml new file mode 100644 index 0000000..5680d65 --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/editbootmenuentry.phtml @@ -0,0 +1,4 @@ +editbootmenuentryForm->setAction($this->url()); +echo $this->editbootmenuentryForm; +?> \ No newline at end of file diff --git a/application/modules/dev/views/scripts/bootmenu/index.phtml b/application/modules/dev/views/scripts/bootmenu/index.phtml new file mode 100644 index 0000000..fa722e4 --- /dev/null +++ b/application/modules/dev/views/scripts/bootmenu/index.phtml @@ -0,0 +1,119 @@ +

BootMenu

+formButton('createbootmenu', 'Create BootMenu', array( + 'onclick' => 'self.location="/bootmenu/createbootmenu"', + 'class' => 'addbutton'))?> + + + + + + + + + + + + bootmenulist)==0) + echo "
IDTitleGroupIDMembershipIDChangedActions
There are no BootMenus to display." ?> + bootmenulist as $bootmenu): ?> + + escape($bootmenu->getID()); ?> + escape($bootmenu->getTitle()); ?> + escape($bootmenu->getGroupID()); ?> + escape($bootmenu->getMembershipID()); ?> + escape(date('Y-m-d H:i:s', $bootmenu->getCreated())); ?> + Edit Bootmenu + Delete Bootmenu + Add Entry + + +bootmenuentrylist[$bootmenu->getID()]) > 0):?> + + ↳ + + + + + + + + + + + + + + + + bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?> + bootosmapper->find($bootmenuentry->getBootosID());?> + configmapper->find($bootmenuentry->getConfigID());?> + + + + + + + + + + + + +
IDTitleBootOSkclConfigPositionActions
+ + + + escape($bootmenuentry->getID()); ?>escape($bootmenuentry->getTitle()); ?>escape($bootmenuentry->getBootosID()."] ". $bootos->getTitle()); ?>escape($bootmenuentry->getkcl()); ?>escape($bootmenuentry->getConfigID()."] ". $config->getTitle()); ?>escape($bootmenuentry->getOrder() + 1); ?>Edit EntryRemove Entry
+ + + + + + + + + + + + diff --git a/application/modules/dev/views/scripts/bootos/createbootos.phtml b/application/modules/dev/views/scripts/bootos/createbootos.phtml new file mode 100644 index 0000000..3d35695 --- /dev/null +++ b/application/modules/dev/views/scripts/bootos/createbootos.phtml @@ -0,0 +1,4 @@ +createbootosForm->setAction($this->url()); +echo $this->createbootosForm; +?> diff --git a/application/modules/dev/views/scripts/bootos/editbootos.phtml b/application/modules/dev/views/scripts/bootos/editbootos.phtml new file mode 100644 index 0000000..43813de --- /dev/null +++ b/application/modules/dev/views/scripts/bootos/editbootos.phtml @@ -0,0 +1,4 @@ +editbootosForm->setAction($this->url()); +echo $this->editbootosForm; +?> diff --git a/application/modules/dev/views/scripts/bootos/index.phtml b/application/modules/dev/views/scripts/bootos/index.phtml new file mode 100644 index 0000000..6da7a16 --- /dev/null +++ b/application/modules/dev/views/scripts/bootos/index.phtml @@ -0,0 +1,62 @@ +

BootOS

+formButton('createbootos', 'Create BootOS', array( + 'onclick' => 'self.location="/bootos/createbootos"', + 'class' => 'addbutton'))?> + + + + + + + + + + + + + + + + + + bootoslist)==0) + echo "
IDTitleGroupIDMembershipIDConfigIDInitKernelKclDescriptionChangedExpiresPublicActions
There are no BootOs's to display." ?> + bootoslist as $bootos): ?> + + escape($bootos->getID()); ?> + escape($bootos->getTitle()); ?> + escape($bootos->getGroupID()); ?> + escape($bootos->getMembershipID()); ?> + escape($bootos->getConfigID()); ?> + escape($bootos->getPath_init()); ?> + escape($bootos->getPath_kernel()); ?> + escape($bootos->getDefaultkcl()); ?> + escape($bootos->getDescription()); ?> + escape(date('Y-m-d H:i:s', $bootos->getCreated())); ?> + escape($bootos->getExpires()); ?> + escape($bootos->getPublic()); ?> + Edit BootOS + Delete BootOS + + + + + + + + + diff --git a/application/modules/dev/views/scripts/client/addclient.phtml b/application/modules/dev/views/scripts/client/addclient.phtml new file mode 100644 index 0000000..e5b0bcf --- /dev/null +++ b/application/modules/dev/views/scripts/client/addclient.phtml @@ -0,0 +1,3 @@ +addclient; diff --git a/application/modules/dev/views/scripts/client/editclient.phtml b/application/modules/dev/views/scripts/client/editclient.phtml new file mode 100644 index 0000000..94d6b34 --- /dev/null +++ b/application/modules/dev/views/scripts/client/editclient.phtml @@ -0,0 +1,3 @@ +editclient; diff --git a/application/modules/dev/views/scripts/client/index.phtml b/application/modules/dev/views/scripts/client/index.phtml new file mode 100644 index 0000000..fd7725c --- /dev/null +++ b/application/modules/dev/views/scripts/client/index.phtml @@ -0,0 +1,44 @@ +

Clients

+formButton('createbootos', 'Create Client', array( + 'onclick' => 'self.location="/client/addclient"', + 'class' => 'addbutton'))?> + +clients): ?> + + + + + + + + clients as $client): ?> + + + + + + + + +
IDMACHardwarehashActions
escape($client->getID()) ?>escape($client->getMacadress()) ?>escape($client->getHardwarehash()) ?>Edit ClientDelete Client
+ + + + +

There are no clients to display.

+ + diff --git a/application/modules/dev/views/scripts/client/removeclient.phtml b/application/modules/dev/views/scripts/client/removeclient.phtml new file mode 100644 index 0000000..7b5f64f --- /dev/null +++ b/application/modules/dev/views/scripts/client/removeclient.phtml @@ -0,0 +1 @@ +

View script for controller Client and script/action name deleteclient
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/config/createconfig.phtml b/application/modules/dev/views/scripts/config/createconfig.phtml new file mode 100644 index 0000000..e6edf7b --- /dev/null +++ b/application/modules/dev/views/scripts/config/createconfig.phtml @@ -0,0 +1,4 @@ +createconfigForm->setAction($this->url()); +echo $this->createconfigForm; +?> diff --git a/application/modules/dev/views/scripts/config/editconfig.phtml b/application/modules/dev/views/scripts/config/editconfig.phtml new file mode 100644 index 0000000..4971f2e --- /dev/null +++ b/application/modules/dev/views/scripts/config/editconfig.phtml @@ -0,0 +1,4 @@ +editconfigForm->setAction($this->url()); +echo $this->editconfigForm; +?> diff --git a/application/modules/dev/views/scripts/config/index.phtml b/application/modules/dev/views/scripts/config/index.phtml new file mode 100644 index 0000000..5562b86 --- /dev/null +++ b/application/modules/dev/views/scripts/config/index.phtml @@ -0,0 +1,50 @@ +

Config

+formButton('createconfig', 'Create Config', array( + 'onclick' => 'self.location="/config/createconfig"', + 'class' => 'addbutton'))?> + + + + + + + + + + + + configlist)==0) + echo "
IDTitleGroupIDMembershipIDShellscriptChangedActions
There are no Config's to display." ?> + configlist as $config): ?> + + escape($config->getID()); ?> + escape($config->getTitle()); ?> + escape($config->getGroupID()); ?> + escape($config->getMembershipID()); ?> + escape($config->getShellscript()); ?> + escape(date('Y-m-d H:i:s', $config->getCreated())); ?> + Edit Config + Delete Config + + + + + + + + + diff --git a/application/modules/dev/views/scripts/error/error.phtml b/application/modules/dev/views/scripts/error/error.phtml new file mode 100644 index 0000000..1997506 --- /dev/null +++ b/application/modules/dev/views/scripts/error/error.phtml @@ -0,0 +1,28 @@ + + + + + Zend Framework Default Application + + +

An error occurred

+

message ?>

+ + exception)): ?> + +

Exception information:

+

+ Message: exception->getMessage() ?> +

+ +

Stack trace:

+ 
exception->getTraceAsString() ?>
+
+ +

Request Parameters:

+ 
request->getParams(), true) ?>
+
+ + + + diff --git a/application/modules/dev/views/scripts/filter/addfilter.phtml b/application/modules/dev/views/scripts/filter/addfilter.phtml new file mode 100644 index 0000000..40b4ccf --- /dev/null +++ b/application/modules/dev/views/scripts/filter/addfilter.phtml @@ -0,0 +1,3 @@ +addfilterform->setAction($this->url()); +echo $this->addfilterform; diff --git a/application/modules/dev/views/scripts/filter/addfilterentry.phtml b/application/modules/dev/views/scripts/filter/addfilterentry.phtml new file mode 100644 index 0000000..8bf501a --- /dev/null +++ b/application/modules/dev/views/scripts/filter/addfilterentry.phtml @@ -0,0 +1,3 @@ +editfilterform->setAction($this->url()); +echo $this->editfilterform; diff --git a/application/modules/dev/views/scripts/filter/editfilter.phtml b/application/modules/dev/views/scripts/filter/editfilter.phtml new file mode 100644 index 0000000..8bc38f7 --- /dev/null +++ b/application/modules/dev/views/scripts/filter/editfilter.phtml @@ -0,0 +1,8 @@ +

Edit Filter

+editfilterform->setAction($this->url()); +echo $this->editfilterform; + + +?> diff --git a/application/modules/dev/views/scripts/filter/editfilterentry.phtml b/application/modules/dev/views/scripts/filter/editfilterentry.phtml new file mode 100644 index 0000000..038f16a --- /dev/null +++ b/application/modules/dev/views/scripts/filter/editfilterentry.phtml @@ -0,0 +1,2 @@ +editfilterform; diff --git a/application/modules/dev/views/scripts/filter/evaluate.phtml b/application/modules/dev/views/scripts/filter/evaluate.phtml new file mode 100644 index 0000000..e69de29 diff --git a/application/modules/dev/views/scripts/filter/index.phtml b/application/modules/dev/views/scripts/filter/index.phtml new file mode 100644 index 0000000..188bed3 --- /dev/null +++ b/application/modules/dev/views/scripts/filter/index.phtml @@ -0,0 +1,117 @@ +

Filters

+formButton('createconfig', 'Create Filter', array( + 'onclick' => 'self.location="/filter/addfilter"', + 'class' => 'addbutton'))?> + +filters): ?> + + + + + + + + + + filters as $filter): ?> + + + + + + + + + + + findBy('filterID',$filter->getID())); + $erg = $fe->findBy('filterID',$filter->getID()); + ?> + 0): ?> + + + + + + +
IDTitleDescriptionPriorityTargetBootMenuActions
escape($filter->getID()) ?>escape($filter->title) ?>escape($filter->Description) ?>escape($filter->priority) ?>escape($filter->bootmenuID) ?>Edit FilterDelete FilterAdd Filterentry
↳ + + + + + + + + + + + + + + + + + +
FiltertypeValueValue2Actions
find($filterentry['filtertypeID'],$erg); + //name zur ID finden + echo "[".$filterentry['filtertypeID']."] "; + echo $erg->getFiltertypename(); + + + ?>Edit Filterentry + Delete Filterentry +
+
+ + + + +

There are no filters to display.

+ + +formButton('createconfig', 'Test Filters', array( + 'onclick' => 'self.location="/filter/testevaluate"', + 'class' => 'addbutton'))?> diff --git a/application/modules/dev/views/scripts/filter/testevaluate.phtml b/application/modules/dev/views/scripts/filter/testevaluate.phtml new file mode 100644 index 0000000..8a10629 --- /dev/null +++ b/application/modules/dev/views/scripts/filter/testevaluate.phtml @@ -0,0 +1,4 @@ +

Test Filters

+ +filterevaluate; diff --git a/application/modules/dev/views/scripts/group/add.phtml b/application/modules/dev/views/scripts/group/add.phtml new file mode 100644 index 0000000..4f96cf0 --- /dev/null +++ b/application/modules/dev/views/scripts/group/add.phtml @@ -0,0 +1,4 @@ +addForm->setAction($this->url()); +echo $this->addForm; +?> \ No newline at end of file diff --git a/application/modules/dev/views/scripts/group/delete.phtml b/application/modules/dev/views/scripts/group/delete.phtml new file mode 100644 index 0000000..fc96431 --- /dev/null +++ b/application/modules/dev/views/scripts/group/delete.phtml @@ -0,0 +1,6 @@ + +
No group has been chosen.
+ addForm)) { + $this->addForm->setAction('/group/add'); + echo $this->addForm; +} +else { + $this->editForm->setAction($this->url()); + echo $this->editForm; +} +?> \ No newline at end of file diff --git a/application/modules/dev/views/scripts/group/grantperson.phtml b/application/modules/dev/views/scripts/group/grantperson.phtml new file mode 100644 index 0000000..f15d08a --- /dev/null +++ b/application/modules/dev/views/scripts/group/grantperson.phtml @@ -0,0 +1,11 @@ + +
No Request has been chosen.
+ +
No Role has been chosen.
+ + + Title: + Functions: + + groupList as $group) { + ?> + + getTitle(); ?> + +
Details
+
Edit
+
Delete
+ + + + +
+
+ +
diff --git a/application/modules/dev/views/scripts/group/link.phtml b/application/modules/dev/views/scripts/group/link.phtml new file mode 100644 index 0000000..94ad343 --- /dev/null +++ b/application/modules/dev/views/scripts/group/link.phtml @@ -0,0 +1,4 @@ +linkForm->setAction($this->url()); +echo $this->linkForm; +?> \ No newline at end of file diff --git a/application/modules/dev/views/scripts/group/revokeperson.phtml b/application/modules/dev/views/scripts/group/revokeperson.phtml new file mode 100644 index 0000000..6af5564 --- /dev/null +++ b/application/modules/dev/views/scripts/group/revokeperson.phtml @@ -0,0 +1,6 @@ + +
No Membership has been chosen.
+ +
+
+
+
+ + + + + + + + + + + + + + + +
Title:group->getTitle(); ?>
Description:group->getDescription(); ?>
Superordinated Group:parentGroup->getTitle(); ?>
+ groupRequestList)) { + ?> +
+
Grouprequests:
+
+ + + + + + + + + groupRequestList as $grouprequest) { + $grouprequestID = $grouprequest['grouprequestID']; + $person = $grouprequest['person']; + ?> + + + + + + + + +
Firstname:Name:email:city:grant:
getFirstname(); ?>getName(); ?>getEmail(); ?>getCity(); ?> +
roleList); ?> +
+
+ memberslist)) { + ?> +
+
Members:
+
+ + + + + + + + + + memberslist as $member) { + $membershipID = $member['membershipID']; + $person = $member['person']; + ?> + + + + + + + + +
Firstname:Name:email:city:
getFirstname(); ?>getName(); ?>getEmail(); ?>getCity(); ?> +
+
+
+ +
No Group has been chosen.
+ "; + foreach($roleList as $role) { + echo ""; + } + echo ""; +} \ No newline at end of file diff --git a/application/modules/dev/views/scripts/index/index.phtml b/application/modules/dev/views/scripts/index/index.phtml new file mode 100644 index 0000000..57e6edb --- /dev/null +++ b/application/modules/dev/views/scripts/index/index.phtml @@ -0,0 +1 @@ +

Welcome

diff --git a/application/modules/dev/views/scripts/person/edit.phtml b/application/modules/dev/views/scripts/person/edit.phtml new file mode 100644 index 0000000..955ed35 --- /dev/null +++ b/application/modules/dev/views/scripts/person/edit.phtml @@ -0,0 +1,4 @@ +editForm->setAction($this->url()); +echo $this->editForm; +?> \ No newline at end of file diff --git a/application/modules/dev/views/scripts/person/index.phtml b/application/modules/dev/views/scripts/person/index.phtml new file mode 100644 index 0000000..e69de29 diff --git a/application/modules/dev/views/scripts/person/leave.phtml b/application/modules/dev/views/scripts/person/leave.phtml new file mode 100644 index 0000000..fc96431 --- /dev/null +++ b/application/modules/dev/views/scripts/person/leave.phtml @@ -0,0 +1,6 @@ + +
No group has been chosen.
+ requestForm->getGrouplist())>0) { + $this->requestForm->setAction($this->url()); + echo $this->requestForm; +} +?> \ No newline at end of file diff --git a/application/modules/dev/views/scripts/person/show.phtml b/application/modules/dev/views/scripts/person/show.phtml new file mode 100644 index 0000000..5386c06 --- /dev/null +++ b/application/modules/dev/views/scripts/person/show.phtml @@ -0,0 +1,79 @@ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Title:person->getTitle(); ?>
Name:person->getName(); ?>
Firstname:person->getFirstname(); ?>
Street:person->getStreet(); ?>
Housenumber:person->getHousenumber(); ?>
City:person->getCity(); ?>
Postalcode:person->getPostalcode(); ?>
Email:person->getEmail(); ?>
Last Login Date:person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()); ?> Uhr
Register Date:person->getRegisterdate()); ?> Uhr
+groups)) { + ?> +
+
Member in the following Groups:
+
+ +groups as $group) { + ?> + + + + + + + + + +
TitleFunctions
+
Remove + Membership
+
+
+
+ +
diff --git a/application/modules/dev/views/scripts/pool/createpool.phtml b/application/modules/dev/views/scripts/pool/createpool.phtml new file mode 100644 index 0000000..305b36e --- /dev/null +++ b/application/modules/dev/views/scripts/pool/createpool.phtml @@ -0,0 +1,2 @@ +addpool; diff --git a/application/modules/dev/views/scripts/pool/deletepool.phtml b/application/modules/dev/views/scripts/pool/deletepool.phtml new file mode 100644 index 0000000..622e663 --- /dev/null +++ b/application/modules/dev/views/scripts/pool/deletepool.phtml @@ -0,0 +1 @@ +

View script for controller Pool and script/action name deletepool
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/pool/editpool.phtml b/application/modules/dev/views/scripts/pool/editpool.phtml new file mode 100644 index 0000000..359a5f9 --- /dev/null +++ b/application/modules/dev/views/scripts/pool/editpool.phtml @@ -0,0 +1,4 @@ +

Edit Pool

+editpoolform; diff --git a/application/modules/dev/views/scripts/pool/index.phtml b/application/modules/dev/views/scripts/pool/index.phtml new file mode 100644 index 0000000..2c6ba16 --- /dev/null +++ b/application/modules/dev/views/scripts/pool/index.phtml @@ -0,0 +1,126 @@ +

Pools

+formButton('createconfig', 'Create Pool', array( + 'onclick' => 'self.location="/pool/createpool"', + 'class' => 'addbutton'))?> + +pools): ?> + + + + + + + + + pools as $pool): ?> + + + + + + + + + + findBy('poolID',$pool->getID()); + ?> + 0): ?> + + + + + + +
IDTitleDescriptionLocationActions
escape($pool->getID()) ?>escape($pool->getTitle()) ?>escape($pool->getDescription()) ?>escape($pool->getLocation()) ?>Edit PoolDelete PoolLink Client
↳ + + + + + + + + + + + find($client['clientID'],$cli); + ?> + + + + + +
ClientIDMacHardwarehashActions
macAdress); ?>hardwarehash); ?>Unlink Client
+
+

Free clients

+ + + + + + + +freeclients as $client): ?> + + + + + ?> + + + + + +
ClientIDMacAdressHardwarehashActions
+ + + +

There are no pools to display.

+ + diff --git a/application/modules/dev/views/scripts/pool/linkclient.phtml b/application/modules/dev/views/scripts/pool/linkclient.phtml new file mode 100644 index 0000000..cbd2dd4 --- /dev/null +++ b/application/modules/dev/views/scripts/pool/linkclient.phtml @@ -0,0 +1,3 @@ +

Link Clients

+poolclient; diff --git a/application/modules/dev/views/scripts/pool/unlinkclient.phtml b/application/modules/dev/views/scripts/pool/unlinkclient.phtml new file mode 100644 index 0000000..35aa9c5 --- /dev/null +++ b/application/modules/dev/views/scripts/pool/unlinkclient.phtml @@ -0,0 +1 @@ +

View script for controller Pool and script/action name unlinkclient
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/resource/get-bootmenu-entry.phtml b/application/modules/dev/views/scripts/resource/get-bootmenu-entry.phtml new file mode 100644 index 0000000..e69de29 diff --git a/application/modules/dev/views/scripts/resource/index.phtml b/application/modules/dev/views/scripts/resource/index.phtml new file mode 100644 index 0000000..e69de29 diff --git a/application/modules/dev/views/scripts/role/add.phtml b/application/modules/dev/views/scripts/role/add.phtml new file mode 100644 index 0000000..5277b9d --- /dev/null +++ b/application/modules/dev/views/scripts/role/add.phtml @@ -0,0 +1 @@ +

View script for controller Role and script/action name add
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/role/delete.phtml b/application/modules/dev/views/scripts/role/delete.phtml new file mode 100644 index 0000000..6b0ebf1 --- /dev/null +++ b/application/modules/dev/views/scripts/role/delete.phtml @@ -0,0 +1 @@ +

View script for controller Role and script/action name delete
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/role/edit.phtml b/application/modules/dev/views/scripts/role/edit.phtml new file mode 100644 index 0000000..c30d295 --- /dev/null +++ b/application/modules/dev/views/scripts/role/edit.phtml @@ -0,0 +1 @@ +

View script for controller Role and script/action name edit
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/role/index.phtml b/application/modules/dev/views/scripts/role/index.phtml new file mode 100644 index 0000000..d30131e --- /dev/null +++ b/application/modules/dev/views/scripts/role/index.phtml @@ -0,0 +1 @@ +

View script for controller Role and script/action name index
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/role/linkright.phtml b/application/modules/dev/views/scripts/role/linkright.phtml new file mode 100644 index 0000000..bfba9db --- /dev/null +++ b/application/modules/dev/views/scripts/role/linkright.phtml @@ -0,0 +1 @@ +

View script for controller Role and script/action name linkright
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/role/show.phtml b/application/modules/dev/views/scripts/role/show.phtml new file mode 100644 index 0000000..dcd232b --- /dev/null +++ b/application/modules/dev/views/scripts/role/show.phtml @@ -0,0 +1 @@ +

View script for controller Role and script/action name show
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/role/unlinkright.phtml b/application/modules/dev/views/scripts/role/unlinkright.phtml new file mode 100644 index 0000000..8c7615d --- /dev/null +++ b/application/modules/dev/views/scripts/role/unlinkright.phtml @@ -0,0 +1 @@ +

View script for controller Role and script/action name unlinkright
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/session/createsession.phtml b/application/modules/dev/views/scripts/session/createsession.phtml new file mode 100644 index 0000000..11fe7ce --- /dev/null +++ b/application/modules/dev/views/scripts/session/createsession.phtml @@ -0,0 +1,5 @@ +

create session

+ +createsession; +?> diff --git a/application/modules/dev/views/scripts/session/deletesession.phtml b/application/modules/dev/views/scripts/session/deletesession.phtml new file mode 100644 index 0000000..57f8698 --- /dev/null +++ b/application/modules/dev/views/scripts/session/deletesession.phtml @@ -0,0 +1 @@ +

View script for controller Session and script/action name deletesession
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/session/editsession.phtml b/application/modules/dev/views/scripts/session/editsession.phtml new file mode 100644 index 0000000..88fb273 --- /dev/null +++ b/application/modules/dev/views/scripts/session/editsession.phtml @@ -0,0 +1,5 @@ +

edit session

+ +editsession; +?> diff --git a/application/modules/dev/views/scripts/session/index.phtml b/application/modules/dev/views/scripts/session/index.phtml new file mode 100644 index 0000000..c9f726b --- /dev/null +++ b/application/modules/dev/views/scripts/session/index.phtml @@ -0,0 +1,49 @@ +

Session

+formButton('createconfig', 'Create Session', array( + 'onclick' => 'self.location="/session/createsession"', + 'class' => 'addbutton'))?> + + + + + + + + + + + + + + +sessions as $session): ?> + + + + + + + + + + + + + + + +
IDalphasessionIDClientIDBootmenuentryIDBootOsIDBootIsoIDMembershipIDTimeIPIPv6Actions
escape($session->getID()) ?>escape($session->getAlphasessionID()) ?>escape($session->getClientID()) ?>escape($session->getBootmenuentryID()) ?>escape($session->getBootosID()) ?>escape($session->getBootisoID()) ?>escape($session->getMembershipID()) ?>escape($session->getTime())) ?>escape($session->getIp()) ?>escape($session->getIp6()) ?>Edit FilterDelete Filter
-- cgit v1.2.3-55-g7522 From 1c83a304a1619de153649e14730aa05a07a87f10 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 15 Mar 2011 11:15:47 +0100 Subject: links korrigiert, dev ist nun lauffähig --- application/modules/dev/controllers/AuthController.php | 4 ++-- .../modules/dev/controllers/BootisoController.php | 10 +++++----- .../modules/dev/controllers/BootmenuController.php | 16 ++++++++-------- .../modules/dev/controllers/BootosController.php | 10 +++++----- .../modules/dev/controllers/ClientController.php | 6 +++--- .../modules/dev/controllers/ConfigController.php | 10 +++++----- .../modules/dev/controllers/FilterController.php | 17 +++++++---------- application/modules/dev/controllers/GroupController.php | 2 +- .../modules/dev/controllers/PersonController.php | 4 ++-- application/modules/dev/controllers/PoolController.php | 10 +++++----- application/modules/dev/controllers/RoleController.php | 2 +- .../modules/dev/controllers/SessionController.php | 6 +++--- application/modules/dev/views/scripts/auth/login.phtml | 2 +- .../modules/dev/views/scripts/bootiso/index.phtml | 4 +++- .../modules/dev/views/scripts/bootmenu/index.phtml | 9 +++++++-- .../modules/dev/views/scripts/bootos/index.phtml | 4 +++- .../modules/dev/views/scripts/client/index.phtml | 4 +++- .../modules/dev/views/scripts/config/index.phtml | 4 +++- .../modules/dev/views/scripts/filter/index.phtml | 9 +++++++-- application/modules/dev/views/scripts/group/index.phtml | 2 +- application/modules/dev/views/scripts/person/show.phtml | 6 +++--- application/modules/dev/views/scripts/pool/index.phtml | 9 +++++++-- .../modules/dev/views/scripts/session/index.phtml | 4 +++- 23 files changed, 88 insertions(+), 66 deletions(-) (limited to 'application/modules/dev/views/scripts') diff --git a/application/modules/dev/controllers/AuthController.php b/application/modules/dev/controllers/AuthController.php index 32783c9..49640c0 100644 --- a/application/modules/dev/controllers/AuthController.php +++ b/application/modules/dev/controllers/AuthController.php @@ -54,7 +54,7 @@ class dev_AuthController extends Zend_Controller_Action $date = new DateTime(); $person->setLogindate($date->getTimestamp()); $this->personmapper->save($person); - $this->_redirect('/'); + $this->_redirect('/dev/'); return; } else { echo "Wrong Email or Password."; @@ -96,7 +96,7 @@ class dev_AuthController extends Zend_Controller_Action return; } echo "Successfully registered.
"; - echo "Continue to Login: Login"; + echo "Continue to Login: Login"; $this->_helper->redirector('login', 'auth'); return; } diff --git a/application/modules/dev/controllers/BootisoController.php b/application/modules/dev/controllers/BootisoController.php index 770271d..2b0e624 100644 --- a/application/modules/dev/controllers/BootisoController.php +++ b/application/modules/dev/controllers/BootisoController.php @@ -49,7 +49,7 @@ class dev_BootisoController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } } @@ -64,7 +64,7 @@ class dev_BootisoController extends Zend_Controller_Action if (!isset($_POST["editbootiso"])){ $bootisoID = $this->_request->getParam('bootisoID'); if (!isset($bootisoID) || !is_numeric($bootisoID)){ - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } else { $bootiso = new Application_Model_BootIso(); $bootisomapper = new Application_Model_BootIsoMapper(); @@ -92,7 +92,7 @@ class dev_BootisoController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } } @@ -104,14 +104,14 @@ class dev_BootisoController extends Zend_Controller_Action { $bootisoID = $this->_request->getParam('bootisoID'); if (!isset($bootisoID)){ - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } else { $bootiso = new Application_Model_BootIso(); $bootiso->setID($bootisoID); $bootisomapper = new Application_Model_BootIsoMapper(); $bootisomapper->delete($bootiso); } - $this->_redirect('/bootiso'); + $this->_redirect('/dev/bootiso'); } diff --git a/application/modules/dev/controllers/BootmenuController.php b/application/modules/dev/controllers/BootmenuController.php index f47b78c..07924d4 100644 --- a/application/modules/dev/controllers/BootmenuController.php +++ b/application/modules/dev/controllers/BootmenuController.php @@ -123,7 +123,7 @@ class dev_BootmenuController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } } @@ -156,7 +156,7 @@ class dev_BootmenuController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } } @@ -201,7 +201,7 @@ class dev_BootmenuController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } } @@ -221,7 +221,7 @@ class dev_BootmenuController extends Zend_Controller_Action if (!isset($_POST["editbootmenuentry"])){ $bootmenuentryID = $this->_request->getParam('bootmenuentryID'); if (!isset($bootmenuentryID) || !is_numeric($bootmenuentryID)){ - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } else { $bootmenuentrymapper->find($bootmenuentryID, $bootmenuentry); @@ -262,7 +262,7 @@ class dev_BootmenuController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } } @@ -283,21 +283,21 @@ class dev_BootmenuController extends Zend_Controller_Action $bootmenuentrymapper->delete($bootmenuentry); $bootmenuentrymapper->orderremove($bootmenuentry); } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } public function deletebootmenuAction() { $bootmenuID = $this->_request->getParam('bootmenuID'); if (!isset($bootmenuID) || !is_numeric($bootmenuID)){ - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } else { $bootmenu = new Application_Model_BootMenu(); $bootmenu->setID($bootmenuID); $bootmenumapper = new Application_Model_BootMenuMapper(); $bootmenumapper->delete($bootmenu); } - $this->_redirect('/bootmenu'); + $this->_redirect('/dev/bootmenu'); } private function arrayDiff($a, $b){ diff --git a/application/modules/dev/controllers/BootosController.php b/application/modules/dev/controllers/BootosController.php index 00c2297..36c1cf5 100644 --- a/application/modules/dev/controllers/BootosController.php +++ b/application/modules/dev/controllers/BootosController.php @@ -70,7 +70,7 @@ class dev_BootosController extends Zend_Controller_Action } - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } } @@ -86,7 +86,7 @@ class dev_BootosController extends Zend_Controller_Action if (!isset($_POST["editbootos"])){ $bootosID = $this->_request->getParam('bootosID'); if (!isset($bootosID) || !is_numeric($bootosID)){ - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } else { $bootos = new Application_Model_BootOs(); $bootosmapper = new Application_Model_BootOsMapper(); @@ -116,7 +116,7 @@ class dev_BootosController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } } @@ -129,14 +129,14 @@ class dev_BootosController extends Zend_Controller_Action { $bootosID = $this->_request->getParam('bootosID'); if (!isset($bootosID)){ - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } else { $bootos = new Application_Model_BootOs(); $bootos->setID($bootosID); $bootosmapper = new Application_Model_BootOsMapper(); $bootosmapper->delete($bootos); } - $this->_redirect('/bootos'); + $this->_redirect('/dev/bootos'); } diff --git a/application/modules/dev/controllers/ClientController.php b/application/modules/dev/controllers/ClientController.php index b6bcb7e..d73379c 100644 --- a/application/modules/dev/controllers/ClientController.php +++ b/application/modules/dev/controllers/ClientController.php @@ -34,7 +34,7 @@ class dev_ClientController extends Zend_Controller_Action $clientmapper = new Application_Model_ClientMapper(); $clientmapper->save($client); print_a('inserted'); - $this->_redirect('/client'); + $this->_redirect('/dev/client'); } $this->view->addclient = $addclient; } @@ -50,7 +50,7 @@ class dev_ClientController extends Zend_Controller_Action $clientMapper = new Application_Model_ClientMapper(); $clientMapper->delete($removeClient); } - $this->_redirect('/client'); + $this->_redirect('/dev/client'); } public function editclientAction() @@ -73,7 +73,7 @@ class dev_ClientController extends Zend_Controller_Action $clientmapper = new Application_Model_ClientMapper(); $clientmapper->save($client); print_a('updated'); - $this->_redirect('/client'); + $this->_redirect('/dev/client'); } $this->view->editclient = $editclient; } diff --git a/application/modules/dev/controllers/ConfigController.php b/application/modules/dev/controllers/ConfigController.php index 5528b28..47b9eeb 100644 --- a/application/modules/dev/controllers/ConfigController.php +++ b/application/modules/dev/controllers/ConfigController.php @@ -50,7 +50,7 @@ class dev_ConfigController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } } @@ -65,7 +65,7 @@ class dev_ConfigController extends Zend_Controller_Action if (!isset($_POST["editconfig"])){ $configID = $this->_request->getParam('configID'); if (!isset($configID) || !is_numeric($configID)){ - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } else { $config = new Application_Model_Config(); $configmapper = new Application_Model_ConfigMapper(); @@ -93,7 +93,7 @@ class dev_ConfigController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; } - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } } @@ -105,14 +105,14 @@ class dev_ConfigController extends Zend_Controller_Action { $configID = $this->_request->getParam('configID'); if (!isset($configID)){ - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } else { $config = new Application_Model_Config(); $config->setID($configID); $configmapper = new Application_Model_ConfigMapper(); $configmapper->delete($config); } - $this->_redirect('/config'); + $this->_redirect('/dev/config'); } diff --git a/application/modules/dev/controllers/FilterController.php b/application/modules/dev/controllers/FilterController.php index e6978ab..b346810 100644 --- a/application/modules/dev/controllers/FilterController.php +++ b/application/modules/dev/controllers/FilterController.php @@ -50,7 +50,7 @@ class dev_FilterController extends Zend_Controller_Action $newfilter2 = new Application_Model_FilterMapper(); $newfilter2->save($newfilter); - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); return; }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; @@ -70,7 +70,7 @@ class dev_FilterController extends Zend_Controller_Action $filtermapper = new Application_Model_FilterMapper(); $filtermapper->delete($deletefilter); } - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); } public function editfilterAction() @@ -108,7 +108,7 @@ class dev_FilterController extends Zend_Controller_Action $newfilter2 = new Application_Model_FilterMapper(); $newfilter2->save($newfilterenty); echo 'valid'; - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); } $this->view->editfilterform = $editfilterform; }catch (Zend_Exception $e) { @@ -151,7 +151,7 @@ class dev_FilterController extends Zend_Controller_Action $newfilter2 = new Application_Model_FilterEntriesMapper(); $newfilter2->save($newfilterenty); #print_a($newfilterenty); - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); } $this->view->editfilterform = $editfilterform; } @@ -206,7 +206,7 @@ class dev_FilterController extends Zend_Controller_Action $newfilter2 = new Application_Model_FilterEntriesMapper(); $newfilter2->save($newfilterenty); #print_a($newfilterenty); - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); } $this->view->editfilterform = $editfilterform; @@ -224,16 +224,13 @@ class dev_FilterController extends Zend_Controller_Action // TODO: ACL implementieren ob er den filter löschen darf if(is_numeric($filterentriesID)){ $deletefilterentry = new Application_Model_FilterEntries(); - $deletefilterentry->setID($filterentriesID); - echo "
";
-    				print_r($deletefilterentry);
-    				echo "
"; + $deletefilterentry->setID($filterentriesID); $filterentriesmapper = new Application_Model_FilterEntriesMapper(); $filterentriesmapper->delete($deletefilterentry); echo "ok"; } - $this->_redirect('/filter'); + $this->_redirect('/dev/filter'); }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; } diff --git a/application/modules/dev/controllers/GroupController.php b/application/modules/dev/controllers/GroupController.php index 45c28d4..0456665 100644 --- a/application/modules/dev/controllers/GroupController.php +++ b/application/modules/dev/controllers/GroupController.php @@ -21,7 +21,7 @@ class dev_GroupController extends Zend_Controller_Action $this->rolemapper = new Application_Model_RoleMapper(); $this->groupList = $this->groupMapper->fetchAll(); } else { - $this->_helper->redirector('login', 'auth'); + $this->_helper->redirector('dev', 'login', 'auth'); } } diff --git a/application/modules/dev/controllers/PersonController.php b/application/modules/dev/controllers/PersonController.php index 3cb1756..74c58c7 100644 --- a/application/modules/dev/controllers/PersonController.php +++ b/application/modules/dev/controllers/PersonController.php @@ -30,13 +30,13 @@ class dev_PersonController extends Zend_Controller_Action } } } else { - $this->_helper->redirector('login', 'auth'); + $this->_helper->redirector('dev','login', 'auth'); } } public function indexAction() { - $this->_helper->redirector('show', 'person'); + $this->_helper->redirector('dev','show', 'person'); } public function showAction() diff --git a/application/modules/dev/controllers/PoolController.php b/application/modules/dev/controllers/PoolController.php index cf6395d..375f709 100644 --- a/application/modules/dev/controllers/PoolController.php +++ b/application/modules/dev/controllers/PoolController.php @@ -42,7 +42,7 @@ class dev_PoolController extends Zend_Controller_Action $pool = new Application_Model_Pool($_POST); $poolmapper = new Application_Model_PoolMapper(); $poolmapper->save($pool); - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); return; }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; @@ -62,7 +62,7 @@ class dev_PoolController extends Zend_Controller_Action $poolmapper = new Application_Model_PoolMapper(); $poolmapper->delete($deletepool); } - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); } public function editpoolAction() @@ -87,7 +87,7 @@ class dev_PoolController extends Zend_Controller_Action $pool->setID($this->_request->getParam('poolID')); $poolmapper = new Application_Model_PoolMapper(); $poolmapper->save($pool); - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; } @@ -125,7 +125,7 @@ class dev_PoolController extends Zend_Controller_Action } $poolmapper = new Application_Model_PoolEntriesMapper(); $poolmapper->save($pool); - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; } @@ -158,7 +158,7 @@ class dev_PoolController extends Zend_Controller_Action $deletepoolentriesmapper->delete($deletepoolentries); echo "ok"; } - $this->_redirect('/pool'); + $this->_redirect('/dev/pool'); } diff --git a/application/modules/dev/controllers/RoleController.php b/application/modules/dev/controllers/RoleController.php index 195accc..2f2de2d 100644 --- a/application/modules/dev/controllers/RoleController.php +++ b/application/modules/dev/controllers/RoleController.php @@ -8,7 +8,7 @@ class dev_RoleController extends Zend_Controller_Action if (Zend_Auth::getInstance()->hasIdentity()) { } else { - $this->_helper->redirector('login', 'auth'); + $this->_helper->redirector('dev', 'login', 'auth'); } } diff --git a/application/modules/dev/controllers/SessionController.php b/application/modules/dev/controllers/SessionController.php index e7092bc..bb92da9 100644 --- a/application/modules/dev/controllers/SessionController.php +++ b/application/modules/dev/controllers/SessionController.php @@ -76,7 +76,7 @@ class dev_SessionController extends Zend_Controller_Action $sessionmapper = new Application_Model_SessionMapper(); $sessionmapper->save($session); - $this->_redirect('/session'); + $this->_redirect('/dev/session'); }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; @@ -155,7 +155,7 @@ class dev_SessionController extends Zend_Controller_Action }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; } - $this->_redirect('/session'); + $this->_redirect('/dev/session'); } } @@ -168,7 +168,7 @@ class dev_SessionController extends Zend_Controller_Action $sessionmapper = new Application_Model_SessionMapper(); $sessionmapper->delete($deletesession); } - $this->_redirect('/session'); + $this->_redirect('/dev/session'); } diff --git a/application/modules/dev/views/scripts/auth/login.phtml b/application/modules/dev/views/scripts/auth/login.phtml index 4e642a3..815cda4 100644 --- a/application/modules/dev/views/scripts/auth/login.phtml +++ b/application/modules/dev/views/scripts/auth/login.phtml @@ -2,4 +2,4 @@ $this->loginForm->setAction($this->url()); echo $this->loginForm; ?> -
\ No newline at end of file +
diff --git a/application/modules/dev/views/scripts/bootiso/index.phtml b/application/modules/dev/views/scripts/bootiso/index.phtml index 5e7da1e..b119aff 100644 --- a/application/modules/dev/views/scripts/bootiso/index.phtml +++ b/application/modules/dev/views/scripts/bootiso/index.phtml @@ -1,6 +1,6 @@

BootISO

formButton('createbootiso', 'Create BootISO', array( - 'onclick' => 'self.location="/bootiso/createbootiso"', + 'onclick' => 'self.location="/dev/bootiso/createbootiso"', 'class' => 'addbutton'))?> @@ -30,6 +30,7 @@
escape($bootiso->getPublic()); ?> Edit BootISO 'self.location="/dev/bootmenu/createbootmenu"', 'class' => 'addbutton'))?> @@ -24,6 +24,7 @@ escape(date('Y-m-d H:i:s', $bootmenu->getCreated())); ?> Edit Bootmenu Delete Bootmenu url( array( + 'module' => 'dev', 'controller' => 'bootmenu', 'action' => 'editbootmenuentry', 'bootmenuentryID' => $bootmenuentry->getID(), @@ -96,6 +100,7 @@ true, false) ?>">Edit Entry 'self.location="/dev/bootos/createbootos"', 'class' => 'addbutton'))?> @@ -37,6 +37,7 @@
escape($bootos->getPublic()); ?> Edit BootOS 'self.location="/dev/client/addclient"', 'class' => 'addbutton'))?> clients): ?> @@ -18,6 +18,7 @@ escape($client->getHardwarehash()) ?> Edit Client 'self.location="/dev/config/createconfig"', 'class' => 'addbutton'))?> @@ -25,6 +25,7 @@
escape(date('Y-m-d H:i:s', $config->getCreated())); ?> Edit Config 'self.location="/dev/filter/addfilter"', 'class' => 'addbutton'))?> filters): ?> @@ -22,6 +22,7 @@ escape($filter->bootmenuID) ?> Edit Filter Delete Filter url( array( + 'module' => 'dev', 'controller' => 'filter', 'action' => 'editfilterentry', 'filterentriesID' => $filterentry['filterentriesID'] @@ -90,6 +94,7 @@ true) ?>">Edit Filterentry 'self.location="/dev/filter/testevaluate"', 'class' => 'addbutton'))?> diff --git a/application/modules/dev/views/scripts/group/index.phtml b/application/modules/dev/views/scripts/group/index.phtml index b8178dc..d1faf04 100644 --- a/application/modules/dev/views/scripts/group/index.phtml +++ b/application/modules/dev/views/scripts/group/index.phtml @@ -31,5 +31,5 @@

- +
diff --git a/application/modules/dev/views/scripts/person/show.phtml b/application/modules/dev/views/scripts/person/show.phtml index 5386c06..945bb61 100644 --- a/application/modules/dev/views/scripts/person/show.phtml +++ b/application/modules/dev/views/scripts/person/show.phtml @@ -1,5 +1,5 @@
- +
@@ -61,7 +61,7 @@ foreach($this->groups as $group) {
Remove Membership
@@ -74,6 +74,6 @@ foreach($this->groups as $group) {

-
diff --git a/application/modules/dev/views/scripts/pool/index.phtml b/application/modules/dev/views/scripts/pool/index.phtml index 2c6ba16..06764d0 100644 --- a/application/modules/dev/views/scripts/pool/index.phtml +++ b/application/modules/dev/views/scripts/pool/index.phtml @@ -1,6 +1,6 @@

Pools

formButton('createconfig', 'Create Pool', array( - 'onclick' => 'self.location="/pool/createpool"', + 'onclick' => 'self.location="/dev/pool/createpool"', 'class' => 'addbutton'))?> pools): ?> @@ -20,6 +20,7 @@ 		escape($pool->getLocation()) ?> Edit Pool Delete Pool url( array( + 'module' => 'dev', 'controller' => 'pool', 'action' => 'unlinkclient', 'poolentriesID' => $client['poolentriesID'] @@ -104,6 +108,7 @@ foreach ($this->freeclients as $client): ?> pools as $pool): ?>