From 7120b51cd52076e2eabd90be9a0a4d11209b0ee7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sat, 14 Jun 2008 17:20:34 +0000
Subject: [PATCH] - Deleted old login script - Improved the list generator -
Added delete icon to database list
---
.../classes/listform_tpl_generator.inc.php | 2 +-
interface/web/login/_index.php | 84 -------------------
.../web/sites/templates/database_list.htm | 2 +-
3 files changed, 2 insertions(+), 86 deletions(-)
delete mode 100644 interface/web/login/_index.php
diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php
index fb461440bc..4c9c263bae 100644
--- a/interface/lib/classes/listform_tpl_generator.inc.php
+++ b/interface/lib/classes/listform_tpl_generator.inc.php
@@ -76,7 +76,7 @@ class listform_tpl_generator {
$html .= " <td class=\"frmText11\"><a href=\"#\" onClick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\" class=\"frmText11\">{tmpl_var name=\"".$key."\"}</a></td>\r\n";
}
- $html .= " <td class=\"frmText11\" align=\"right\">[<a href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\" class=\"frmText11\">{tmpl_var name='delete_txt'}</a>]</td>
+ $html .= " <td class=\"frmText11\" align=\"right\"><a href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\" class=\"frmText11\"><img src=\"themes/{tmpl_var name='theme'}/icons/list_icon_delete.png\" alt=\"{tmpl_var name='delete_txt'}\" border=\"0\" /></a></td>
</tr>
</tmpl_loop>
";
diff --git a/interface/web/login/_index.php b/interface/web/login/_index.php
deleted file mode 100644
index d1e5e1075c..0000000000
--- a/interface/web/login/_index.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/*
-Copyright (c) 2005, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-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");
-
-// Login Formular wurde abgesandt
-if(count($_POST) > 0) {
-
- // 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);
- }
-}
-if($error != ''){
- $error = '<table width="100%" border="0" cellspacing="0" cellpadding="2">
-<tr>
-<td class="error"><b>Error:</b><br>'.$error.'</td>
-</tr>
-</table>';
-}
-
-$app->tpl->setVar('error',$error);
-$app->tpl->setInclude('content_tpl','templates/index.htm');
-$app->tpl_defaults();
-$app->tpl->pparse();
-
-?>
\ No newline at end of file
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
index dbfd53f50b..108006052b 100644
--- a/interface/web/sites/templates/database_list.htm
+++ b/interface/web/sites/templates/database_list.htm
@@ -21,7 +21,7 @@
<td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_remote_access_'}" border="0" /></a></td>
<td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
<td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="database_name"}</a></td>
- <td class="frmText11" align="right">[<a href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ <td class="frmText11" align="right"><a href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/list_icon_delete.png" alt="{tmpl_var name='delete_txt'}" border="0" /></a></td>
</tr>
</tmpl_loop>
--
GitLab