From a5b276444c1e2fa9c960131723ffd6955fb92f48 Mon Sep 17 00:00:00 2001
From: karailiev <karailiev@ispconfig3>
Date: Tue, 11 Aug 2009 15:20:21 -0400
Subject: [PATCH] ticket 827 For some reason till has made the version number not to load when no user is logged in. Due to ajax login the version number remains not loaded even after login until the whole page is reloaded. I didn't find any comment why is this done, so I revert it.

---
 interface/web/admin/users_del.php |   31 +++++++++----------------------
 1 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/interface/web/admin/users_del.php b/interface/web/admin/users_del.php
index 4fe36df..b4f3e72 100644
--- a/interface/web/admin/users_del.php
+++ b/interface/web/admin/users_del.php
@@ -1,6 +1,7 @@
 <?php
+
 /*
-Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -26,39 +27,25 @@
 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');
 
 /******************************************
 * Begin Form configuration
 ******************************************/
 
 $list_def_file = "list/users.list.php";
+$tform_def_file = "form/users.tform.php";
 
 /******************************************
 * End Form configuration
 ******************************************/
 
-// Checke Berechtigungen f�r Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
-	header("Location: ../index.php");
-	exit;
-}
+require_once('../../lib/config.inc.php');
+require_once('../../lib/app.inc.php');
 
-include_once($list_def_file);
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
 
-// ID importieren
-$id = intval($_REQUEST["id"]);
+$app->uses("tform_actions");
+$app->tform_actions->onDelete();
 
-if($id > 0) {
-	if($_SESSION["s"]["user"]["typ"] == "admin") {
-		$app->db->query("DELETE FROM ".$liste["table"]." WHERE ".$liste["table_idx"]." = $id");
-	} else {
-		$app->db->query("DELETE FROM ".$liste["table"]." WHERE ".$liste["table_idx"]." = $id and userid = ".$_SESSION["s"]["user"]["userid"]);
-	}
-}
-
-
-header("Location: ".$liste["file"]."?PHPSESSID=".$_SESSION["s"]["id"]);
-exit;
 ?>
\ No newline at end of file

--
Gitblit v1.9.1