From c283150454723778b75baaae30938293810d8e13 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 19 Aug 2007 11:24:53 +0000
Subject: [PATCH] Removed unneeded code in login/index.php Added a variable
check in app.inc.php
---
interface/lib/app.inc.php | 5 +++--
interface/web/login/index.php | 21 +++------------------
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 0b8e78bc78..bf5df99fe9 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -165,9 +165,10 @@ class app {
}
$this->tpl->setVar('app_title', $this->_conf['app_title']);
$this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation'));
- //TODO: Silence this notice
//print_r($_SESSION);
- $this->tpl->setVar('app_module', $_SESSION['s']['module']['name']);
+ if(isset($_SESSION['s']['module']['name'])) {
+ $this->tpl->setVar('app_module', $_SESSION['s']['module']['name']);
+ }
if(isset($_SESSION['s']['user']) && $_SESSION['s']['user']['typ'] == 'admin') {
$this->tpl->setVar('is_admin', 1);
}
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index f1b49e34b5..b59a760db1 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -47,10 +47,10 @@ public function render() {
$error = '';
- //* Login Formular wurde abgesandt
+ //* Login Form was send
if(count($_POST) > 0) {
- //die('Hier');
- // importiere Variablen
+
+ // iporting variables
$username = $app->db->quote($_POST['username']);
$passwort = $app->db->quote($_POST['passwort']);
@@ -69,20 +69,6 @@ public function render() {
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';
@@ -113,7 +99,6 @@ public function render() {
$app->tpl->setVar('error', $error);
$app->tpl->setInclude('content_tpl','login/templates/index.htm');
$app->tpl_defaults();
- //$app->tpl->pparse();
$this->status = 'OK';
--
GitLab