From a44efae424f6cdca4e0d11d59631bb6f8558d069 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 05:28:14 -0400
Subject: [PATCH] Removed debug alert()
---
interface/web/login/index.php | 131 ++++++++++++++++++++++++++++++-------------
1 files changed, 90 insertions(+), 41 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 805f7f2..f1b49e3 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -1,4 +1,5 @@
<?php
+
/*
Copyright (c) 2005, Till Brehm, projektfarm Gmbh
All rights reserved.
@@ -27,51 +28,99 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+//
-$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
+class login_index {
-// Login Formular wurde abgesandt
-if(count($_POST) > 0) {
+public $status = '';
+private $target = '';
- // importiere Variablen
- $username = $app->db->quote($_POST["username"]);
- $passwort = $app->db->quote($_POST["passwort"]);
-
- if($username != '' and $passwort != '') {
- $sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and ( PASSWORT = '".md5($passwort)."' or PASSWORT = password('$passwort') )";
- if($user = $app->db->queryOneRecord($sql)) {
- if($user["active"] == 1) {
- $user = $app->db->toLower($user);
- $_SESSION = array();
- $_SESSION["s"]["user"] = $user;
- $_SESSION["s"]["user"]["theme"] = $user["app_theme"];
- $_SESSION["s"]["language"] = $user["language"];
-
- $site = $app->db->queryOneRecord("SELECT * FROM mb_sites WHERE name = '".$user["site_preset"]."'");
- $_SESSION["s"]["site"] = $site;
-
- header("Location: ../capp.php?mod=".$user["startmodule"]."&phpsessid=".$_SESSION["s"]["id"]);
- exit;
- } else {
- $error = $app->lng(1003);
- }
- } else {
- // Username oder Passwort falsch
- $error = $app->lng(1002);
- if($app->db->errorMessage != '') $error .= "<br>".$app->db->errorMessage != '';
- }
- } else {
- // Username oder Passwort leer
- $error = $app->lng(1001);
+public function render() {
+ if(isset($_SESSION['s']['user']) && is_array($_SESSION['s']['user']) && is_array($_SESSION['s']['module'])) {
+ die('HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage']);
}
-}
+
+ global $app;
+ $app->uses('tpl');
+ $app->tpl->newTemplate('form.tpl.htm');
+
+ $error = '';
-$app->tpl->setVar('error',$error);
-$app->tpl->setInclude('content_tpl','templates/index.htm');
-$app->tpl_defaults();
-$app->tpl->pparse();
+
+ //* Login Formular wurde abgesandt
+ if(count($_POST) > 0) {
+ //die('Hier');
+ // importiere Variablen
+ $username = $app->db->quote($_POST['username']);
+ $passwort = $app->db->quote($_POST['passwort']);
+
+ if($username != '' and $passwort != '') {
+ $sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and ( PASSWORT = '".md5($passwort)."' or PASSWORT = password('$passwort') )";
+ $user = $app->db->queryOneRecord($sql);
+ if($user) {
+ if($user['active'] == 1) {
+ $user = $app->db->toLower($user);
+ $_SESSION = array();
+ $_SESSION['s']['user'] = $user;
+ $_SESSION['s']['user']['theme'] = isset($user['app_theme']) ? $user['app_theme'] : 'default';
+ $_SESSION['s']['language'] = $user['language'];
+ //print_r($_SESSION);
+ if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
+ include_once($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php');
+ $_SESSION['s']['module'] = $module;
+ }
+
+ // TODO: What is all this - pedro
+ //$site = $app->db->queryOneRecord("SELECT * FROM mb_sites WHERE name = '".$user["site_preset"]."'");
+ //$_SESSION["s"]["site"] = $site;
+
+ //header ("HTTP/1.0 307 Temporary redirect");
+ //header("Location: http://localhost:8080/ispconfig3_export/interface/web/admin/index.php");
+
+ /*header("Location: ../capp.php?mod=".$user["startmodule"]."&phpsessid=".$_SESSION["s"]["id"]);*/
+ //header('Content-type: text/javascript');
+ /*echo "<script language=\"javascript\" type=\"text/javascript\">loadContent('admin/users_list.php','')</script>";*/
+ //$this->status = 'REDIRECT';
+ //$this->target = 'admin:index';
+ //return '';
+
+ echo 'HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage'];
+ //echo 'HEADER_REDIRECT:content.php?s_mod=admin&s_pg=index';
+ exit;
+ } else {
+ $error = $app->lng(1003);
+ }
+ } else {
+ //* Incorrect login - Username and password incorrect
+ $error = $app->lng(1002);
+ if($app->db->errorMessage != '') $error .= '<br>'.$app->db->errorMessage != '';
+ }
+ } else {
+ //* Username or password empty
+ $error = $app->lng(1001);
+ }
+ }
+ if($error != ''){
+ $error = '<table class="error">
+ <tr>
+ <td><strong>Error:</strong><br>'.$error.'</td>
+ </tr>
+ </table>';
+ }
+
+
+
+ $app->tpl->setVar('error', $error);
+ $app->tpl->setInclude('content_tpl','login/templates/index.htm');
+ $app->tpl_defaults();
+ //$app->tpl->pparse();
+
+ $this->status = 'OK';
+
+ return $app->tpl->grab();
+
+} // << end function
+
+} // << end class
?>
\ No newline at end of file
--
Gitblit v1.9.1