[puntoengine] r87 committed - Added login page for administrator
punto...@googlecode.com
Author: jbalde
Date: Mon Aug 22 00:02:22 2011
Log: Added login page for administrator
http://code.google.com/p/puntoengine/source/detail?r=87
Added:
/trunk/puntoengine/core/admin/template/login.php
/trunk/puntoengine/core/admin/template/master.php
Modified:
/trunk/puntoengine/config/web.xml
/trunk/puntoengine/core/Kernel.php
/trunk/puntoengine/core/admin/AdminController.php
=======================================
--- /dev/null
+++ /trunk/puntoengine/core/admin/template/login.php Mon Aug 22 00:02:22
2011
@@ -0,0 +1,21 @@
+<div class="container minibox">
+ <div class="content">
+ <form method="post" action="install.php">
+ <p>
+ <label for="user">User:<br/>
+ <input type="text" name="user" id="user" autocomplete="off" />
+ </label>
+ </p>
+ <p>
+ <label for="pass">Password:<br/>
+ <input type="password" name="pass" id="pass" autocomplete="off" />
+ </label>
+ </p>
+ <div class="float">
+ <div class="right">
+ <input type="submit" name="install" value="Install" />
+ </div>
+ </div>
+ </form>
+ </div>
+</div>
=======================================
--- /dev/null
+++ /trunk/puntoengine/core/admin/template/master.php Mon Aug 22 00:02:22
2011
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=Edge;chrome=1" />
+ <title>PuntoEngine - Administrator</title>
+ <link href="~/core/resources/css/admin.css" rel="stylesheet"
type="text/css" media="all" />
+ </head>
+ <body>
+ <header id="header">Install</header>
+ <div id="wrapper">
+ <div id="container">
+ <header>
+ <div id="logo" class="minibox center">
+ <img src="~/core/resources/images/logo.png" alt="PuntoEngine"
title="PuntoEngine" />
+ </div>
+ </header>
+ <article>
+ <pep:place name="content" />
+ </article>
+ <footer class="center">
+ <p>PuntoEngine © 2011</p>
+ </footer>
+ </div>
+ </div>
+ </body>
+</html>
=======================================
--- /trunk/puntoengine/config/web.xml Thu Jun 9 03:02:23 2011
+++ /trunk/puntoengine/config/web.xml Mon Aug 22 00:02:22 2011
@@ -6,33 +6,33 @@
@since 0.3
-->
<Web>
- <!-- Config section -->
- <Config>
- <!-- activate true for show detailed error trace in error page -->
- <Debug activate="true" />
- </Config>
- <!-- Servlets container -->
- <Servlets>
- <!-- Admin servlet -->
- <!--<Servlet>
- <Name>Admin</Name>
- <Class>PepAdminController</Class>
- <Namespace>servlet.pepadmin</Namespace>
- <Patterns>
- <Pattern>/pepadmin</Pattern>
- </Patterns>
- <Description>Framework administration</Description>
- </Servlet>-->
- <!-- Home example servlet -->
- <Servlet>
- <Name>Test</Name>
- <Class>TestController</Class>
- <Namespace>servlet</Namespace>
- <Patterns>
- <Pattern>/</Pattern>
- <Pattern>/test</Pattern>
- </Patterns>
- <Description>Page with many examples</Description>
- </Servlet>
- </Servlets>
+ <!-- Config section -->
+ <Config>
+ <!-- activate true for show detailed error trace in error page -->
+ <Debug activate="true" />
+ </Config>
+ <!-- Servlets container -->
+ <Servlets>
+ <!-- Admin servlet -->
+ <Servlet>
+ <Name>Admin</Name>
+ <Class>AdminController</Class>
+ <Namespace>core.admin</Namespace>
+ <Patterns>
+ <Pattern>/admin</Pattern>
+ </Patterns>
+ <Description>Framework administration</Description>
+ </Servlet>
+ <!-- Home example servlet -->
+ <Servlet>
+ <Name>Test</Name>
+ <Class>TestController</Class>
+ <Namespace>servlet</Namespace>
+ <Patterns>
+ <Pattern>/</Pattern>
+ <Pattern>/test</Pattern>
+ </Patterns>
+ <Description>Page with many examples</Description>
+ </Servlet>
+ </Servlets>
</Web>
=======================================
--- /trunk/puntoengine/core/Kernel.php Fri Jul 15 15:01:37 2011
+++ /trunk/puntoengine/core/Kernel.php Mon Aug 22 00:02:22 2011
@@ -249,7 +249,7 @@
$document->loadXmlFile('/config/web.xml');
- if(substr($servletName, -1) == '/') {
+ if(substr($servletName, -1) == '/') {
$servletClass =
$document->selectSingleNode('/Web/Servlets/Servlet[Patterns/Pattern
= "'.$servletName.'" or Patterns/Pattern = "'.substr($servletName, 0,
-1).'"]/Class');
} else {
$servletClass =
$document->selectSingleNode('/Web/Servlets/Servlet[Patterns/Pattern
= "'.$servletName.'"]/Class');
=======================================
--- /trunk/puntoengine/core/admin/AdminController.php Fri Jul 15 15:01:37
2011
+++ /trunk/puntoengine/core/admin/AdminController.php Mon Aug 22 00:02:22
2011
@@ -26,12 +26,12 @@
* @param HttpRequest $request Page request
*/
protected function doGet(HttpRequest $request) {
- if($request->getSession('admin') == 'true') {
- $this->master = null;
- $this->setRequestDispatcher('/template/pepadmin/admin.php', $request);
- } else {
- $this->setRequestDispatcher('/template/pepadmin/login.php', $request);
- }
+ if($request->getSession('admin') == 'true') {
+ $this->master = null;
+ $this->setRequestDispatcher('/template/pepadmin/admin.php', $request);
+ } else {
+ $this->addTemplateSection('content',
$this->addTemplate('/core/admin/template/login.php', $request));
+ }
}//doGet
@@ -40,19 +40,19 @@
* @param HttpRequest $request Page request
*/
protected function doPost(HttpRequest $request) {
- $document = new XmlDocument();
- $document->loadXmlFile('/config/admin.xml');
-
- try {
- $admin =
$document->selectSingleNode('/Admin/Users/User[Credentials/@user="'.$request->getParam('user').'"
and Credentials/@pass="'.$request->getParam('pass').'"]');
-
- if($admin != '') {
- $request->addSession('admin', 'true');
- }
- } catch(Exception $ex) {
- }
-
- $this->sendRedirect('~/'.$this->url);
+ $document = new XmlDocument();
+ $document->loadXmlFile('/config/admin.xml');
+
+ try {
+ $admin =
$document->selectSingleNode('/Admin/Users/User[Credentials/@user="'.$request->getParam('user').'"
and Credentials/@pass="'.$request->getParam('pass').'"]');
+
+ if($admin != '') {
+ $request->addSession('admin', 'true');
+ }
+ } catch(Exception $ex) {
+ }
+
+ $this->sendRedirect('~/'.$this->url);
}//doPost
}//PepAdminController
?>