summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/dev/controllers/GroupController.php4
-rw-r--r--application/modules/dev/controllers/IndexController.php2
-rw-r--r--application/modules/dev/controllers/PersonController.php4
-rw-r--r--application/modules/dev/controllers/RoleController.php2
-rw-r--r--application/modules/dev/layouts/dev.phtml6
-rw-r--r--application/modules/dev/views/scripts/group/edit.phtml4
-rw-r--r--application/modules/dev/views/scripts/group/index.phtml2
-rw-r--r--application/modules/dev/views/scripts/group/show.phtml10
-rw-r--r--application/modules/user/controllers/AuthController.php18
-rw-r--r--application/modules/user/controllers/BootisoController.php18
-rw-r--r--application/modules/user/controllers/BootmenuController.php18
-rw-r--r--application/modules/user/controllers/BootosController.php18
-rw-r--r--application/modules/user/controllers/ClientController.php18
-rw-r--r--application/modules/user/controllers/ConfigController.php18
-rw-r--r--application/modules/user/controllers/FilterController.php18
-rw-r--r--application/modules/user/controllers/GroupController.php18
-rw-r--r--application/modules/user/controllers/IndexController.php7
-rw-r--r--application/modules/user/controllers/PersonController.php18
-rw-r--r--application/modules/user/controllers/PoolController.php18
-rw-r--r--application/modules/user/controllers/RoleController.php18
-rw-r--r--application/modules/user/layouts/user.phtml30
-rw-r--r--application/modules/user/views/scripts/auth/index.phtml1
-rw-r--r--application/modules/user/views/scripts/bootiso/index.phtml1
-rw-r--r--application/modules/user/views/scripts/bootmenu/index.phtml1
-rw-r--r--application/modules/user/views/scripts/bootos/index.phtml1
-rw-r--r--application/modules/user/views/scripts/client/index.phtml1
-rw-r--r--application/modules/user/views/scripts/config/index.phtml1
-rw-r--r--application/modules/user/views/scripts/filter/index.phtml1
-rw-r--r--application/modules/user/views/scripts/group/index.phtml1
-rw-r--r--application/modules/user/views/scripts/index/index.phtml47
-rw-r--r--application/modules/user/views/scripts/person/index.phtml1
-rw-r--r--application/modules/user/views/scripts/pool/index.phtml1
-rw-r--r--application/modules/user/views/scripts/role/index.phtml1
33 files changed, 247 insertions, 80 deletions
diff --git a/application/modules/dev/controllers/GroupController.php b/application/modules/dev/controllers/GroupController.php
index 0456665..1a063a7 100644
--- a/application/modules/dev/controllers/GroupController.php
+++ b/application/modules/dev/controllers/GroupController.php
@@ -20,8 +20,8 @@ class dev_GroupController extends Zend_Controller_Action
$this->personmapper = new Application_Model_PersonMapper();
$this->rolemapper = new Application_Model_RoleMapper();
$this->groupList = $this->groupMapper->fetchAll();
- } else {
- $this->_helper->redirector('dev', 'login', 'auth');
+ } else {
+ $this->_redirect('/dev/login/auth');
}
}
diff --git a/application/modules/dev/controllers/IndexController.php b/application/modules/dev/controllers/IndexController.php
index 4c9385c..f261304 100644
--- a/application/modules/dev/controllers/IndexController.php
+++ b/application/modules/dev/controllers/IndexController.php
@@ -11,9 +11,9 @@ class dev_IndexController extends Zend_Controller_Action
public function indexAction()
{
// action body
+
}
-
}
diff --git a/application/modules/dev/controllers/PersonController.php b/application/modules/dev/controllers/PersonController.php
index 74c58c7..b7e050f 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('dev','login', 'auth');
+ $this->_redirect('/dev/auth/login');
}
}
public function indexAction()
{
- $this->_helper->redirector('dev','show', 'person');
+ $this->_redirect('/dev/person/show');
}
public function showAction()
diff --git a/application/modules/dev/controllers/RoleController.php b/application/modules/dev/controllers/RoleController.php
index 2f2de2d..3b45a8c 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('dev', 'login', 'auth');
+ $this->_redirect('/dev/login/auth');
}
}
diff --git a/application/modules/dev/layouts/dev.phtml b/application/modules/dev/layouts/dev.phtml
index f48b9ad..2c7f6f0 100644
--- a/application/modules/dev/layouts/dev.phtml
+++ b/application/modules/dev/layouts/dev.phtml
@@ -13,9 +13,9 @@ echo $this->headStyle()."\n";
echo $this->headLink()."\n";
echo $this->headScript()."\n";
?>
-<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
+<link href="/media/css/jquery-ui.css" rel="stylesheet" type="text/css"/>
+<script src="/media/js/jquery.min.js"></script>
+<script src="/media/js/jquery-ui.min.js"></script>
</head>
<body>
diff --git a/application/modules/dev/views/scripts/group/edit.phtml b/application/modules/dev/views/scripts/group/edit.phtml
index 64dde9d..dd3acbe 100644
--- a/application/modules/dev/views/scripts/group/edit.phtml
+++ b/application/modules/dev/views/scripts/group/edit.phtml
@@ -1,10 +1,10 @@
<?php
if(isset($this->addForm)) {
- $this->addForm->setAction('/group/add');
+ $this->addForm->setAction('/etc/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/index.phtml b/application/modules/dev/views/scripts/group/index.phtml
index d1faf04..714498e 100644
--- a/application/modules/dev/views/scripts/group/index.phtml
+++ b/application/modules/dev/views/scripts/group/index.phtml
@@ -10,7 +10,7 @@
<tr>
<td><?php echo $group->getTitle(); ?></td>
<td>
- <form name="show<?php echo $count; ?>" action="/group/show"
+ <form name="show<?php echo $count; ?>" action="/dev/group/show"
method="post"><input type="hidden" name="groupID"
value="<?php echo $group->getID(); ?>" /><a
href="javascript:document.show<?php echo $count; ?>.submit();">Details</a></form>
diff --git a/application/modules/dev/views/scripts/group/show.phtml b/application/modules/dev/views/scripts/group/show.phtml
index addf3db..7b3660d 100644
--- a/application/modules/dev/views/scripts/group/show.phtml
+++ b/application/modules/dev/views/scripts/group/show.phtml
@@ -2,11 +2,11 @@
if($_POST['groupID']) {
?>
<div align="right">
-<form name="editForm" action="/group/edit/" method="post"><input
+<form name="editForm" action="/dev/group/edit/" method="post"><input
type="hidden" name="groupID"
value="<?php echo $this->group->getID(); ?>" /> <input type="submit"
name="edit" value="Edit" /></form>
-<form name="deleteForm" action="/group/delete/" method="post"><input
+<form name="deleteForm" action="/dev/group/delete/" method="post"><input
type="hidden" name="groupID"
value="<?php echo $this->group->getID(); ?>" /> <input type="submit"
name="delete" value="Delete" /></form>
@@ -56,7 +56,7 @@ if($_POST['groupID']) {
<td><?php echo $person->getEmail(); ?></td>
<td><?php echo $person->getCity(); ?></td>
<td>
- <form action="/group/grantperson" method="post"><input type="hidden"
+ <form action="/dev/group/grantperson" method="post"><input type="hidden"
name="grouprequestID" value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?>
<input type="submit" name="confirm" value="confirm" /></form>
</td>
@@ -92,7 +92,7 @@ if($_POST['groupID']) {
<td><?php echo $person->getEmail(); ?></td>
<td><?php echo $person->getCity(); ?></td>
<td>
- <form action="/group/revokeperson" method="post"><input type="hidden"
+ <form action="/dev/group/revokeperson" method="post"><input type="hidden"
name="membershipID" value="<?php echo $membershipID; ?>" /><input
type="hidden" name="personID" value="<?php echo $person->getID(); ?>" />
<input type="submit" name="revoke" value="revoke" /></form>
@@ -119,4 +119,4 @@ function printRoleSelect($roleList) {
echo "<option value=\"" . $role['roleID'] . "\">" . $role['title'] . "</option>";
}
echo "</select>";
-} \ No newline at end of file
+}
diff --git a/application/modules/user/controllers/AuthController.php b/application/modules/user/controllers/AuthController.php
new file mode 100644
index 0000000..4721616
--- /dev/null
+++ b/application/modules/user/controllers/AuthController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_AuthController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php
new file mode 100644
index 0000000..492e035
--- /dev/null
+++ b/application/modules/user/controllers/BootisoController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_BootisoController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
new file mode 100644
index 0000000..2ecab8d
--- /dev/null
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_BootmenuController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php
new file mode 100644
index 0000000..7fc72d1
--- /dev/null
+++ b/application/modules/user/controllers/BootosController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_BootosController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php
new file mode 100644
index 0000000..54280f4
--- /dev/null
+++ b/application/modules/user/controllers/ClientController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_ClientController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
new file mode 100644
index 0000000..ffc5387
--- /dev/null
+++ b/application/modules/user/controllers/ConfigController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_ConfigController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
new file mode 100644
index 0000000..2704309
--- /dev/null
+++ b/application/modules/user/controllers/FilterController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_FilterController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
new file mode 100644
index 0000000..21944d3
--- /dev/null
+++ b/application/modules/user/controllers/GroupController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_GroupController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/IndexController.php b/application/modules/user/controllers/IndexController.php
index 3a18bff..1d41157 100644
--- a/application/modules/user/controllers/IndexController.php
+++ b/application/modules/user/controllers/IndexController.php
@@ -9,8 +9,11 @@ class User_IndexController extends Zend_Controller_Action
}
public function indexAction()
- {
- echo 'test';
+ {
+ $n = new Pbs_PbsSession();
+ $session = new Application_Model_Session();
+ $session->setID('1');
+ $n->createsession($session);
}
diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
new file mode 100644
index 0000000..f43989a
--- /dev/null
+++ b/application/modules/user/controllers/PersonController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_PersonController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php
new file mode 100644
index 0000000..caa7dd4
--- /dev/null
+++ b/application/modules/user/controllers/PoolController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_PoolController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
new file mode 100644
index 0000000..d7abc62
--- /dev/null
+++ b/application/modules/user/controllers/RoleController.php
@@ -0,0 +1,18 @@
+<?php
+
+class User_RoleController extends Zend_Controller_Action
+{
+
+ public function init()
+ {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction()
+ {
+ // action body
+ }
+
+
+}
+
diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index f5e9db4..91e5eb8 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -27,24 +27,24 @@ echo $this->headScript()."\n";
<h1>user</h1>
<li>Controller:
<ul>
- <li><a href='/dev/person'>Person</a></li>
- <li><a href='/dev/group'>Group</a></li>
- <li><a href='/dev/role'>Role</a></li>
- <li><a href='/dev/bootiso'>BootIso</a></li>
- <li><a href='/dev/bootmenu'>BootMenu</a></li>
- <li><a href='/dev/config'>Config</a></li>
- <li><a href='/dev/bootos'>BootOs</a></li>
- <li><a href='/dev/client'>Client</a></li>
- <li><a href='/dev/filter'>Filter</a></li>
- <li><a href='/dev/pool'>Pool</a></li>
- <li><a href='/dev/session'>Session</a></li>
+ <li><a href='/user/person'>Person</a></li>
+ <li><a href='/user/group'>Group</a></li>
+ <li><a href='/user/role'>Role</a></li>
+ <li><a href='/user/bootiso'>BootIso</a></li>
+ <li><a href='/user/bootmenu'>BootMenu</a></li>
+ <li><a href='/user/config'>Config</a></li>
+ <li><a href='/user/bootos'>BootOs</a></li>
+ <li><a href='/user/client'>Client</a></li>
+ <li><a href='/user/filter'>Filter</a></li>
+ <li><a href='/user/pool'>Pool</a></li>
+
<?php if (!Zend_Auth::getInstance()->hasIdentity()) {?>
- <li><a href='/dev/auth/login'>Login</a></li>
- <li><a href='/dev/auth/register'>Register</a></li>
+ <li><a href='/user/auth/login'>Login</a></li>
+ <li><a href='/user/auth/register'>Register</a></li>
<?php
} else {?>
- <li><a href='/dev/auth/delete'>Account Löschen</a></li>
- <li><a href='/dev/auth/logout'>Logout</a></li>
+ <li><a href='/user/auth/delete'>Account Löschen</a></li>
+ <li><a href='/user/auth/logout'>Logout</a></li>
<?php
}
?>
diff --git a/application/modules/user/views/scripts/auth/index.phtml b/application/modules/user/views/scripts/auth/index.phtml
new file mode 100644
index 0000000..4a9f827
--- /dev/null
+++ b/application/modules/user/views/scripts/auth/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Auth</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
new file mode 100644
index 0000000..5d756d0
--- /dev/null
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Bootiso</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
new file mode 100644
index 0000000..eab3ca4
--- /dev/null
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Bootmenu</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml
new file mode 100644
index 0000000..c9bbeb9
--- /dev/null
+++ b/application/modules/user/views/scripts/bootos/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Bootos</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml
new file mode 100644
index 0000000..4f0e6ec
--- /dev/null
+++ b/application/modules/user/views/scripts/client/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Client</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml
new file mode 100644
index 0000000..4d9a1fb
--- /dev/null
+++ b/application/modules/user/views/scripts/config/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Config</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
new file mode 100644
index 0000000..bace90f
--- /dev/null
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Filter</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/group/index.phtml b/application/modules/user/views/scripts/group/index.phtml
new file mode 100644
index 0000000..a1e5635
--- /dev/null
+++ b/application/modules/user/views/scripts/group/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Group</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/index/index.phtml b/application/modules/user/views/scripts/index/index.phtml
index fe78dba..57e6edb 100644
--- a/application/modules/user/views/scripts/index/index.phtml
+++ b/application/modules/user/views/scripts/index/index.phtml
@@ -1,46 +1 @@
-<?php
-echo $this->loginform;
-?>
-<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>
+<h1>Welcome</h1>
diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
new file mode 100644
index 0000000..7a96e97
--- /dev/null
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Person</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml
new file mode 100644
index 0000000..5266a4e
--- /dev/null
+++ b/application/modules/user/views/scripts/pool/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Pool</b> and script/action name <b>index</b></center> \ No newline at end of file
diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml
new file mode 100644
index 0000000..d30131e
--- /dev/null
+++ b/application/modules/user/views/scripts/role/index.phtml
@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Role</b> and script/action name <b>index</b></center> \ No newline at end of file