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_list.php | 74 +++---------------------------------
1 files changed, 7 insertions(+), 67 deletions(-)
diff --git a/interface/web/admin/users_list.php b/interface/web/admin/users_list.php
index 5f7fe04..b113e40 100644
--- a/interface/web/admin/users_list.php
+++ b/interface/web/admin/users_list.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,6 +27,7 @@
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');
@@ -39,73 +41,11 @@
* End Form configuration
******************************************/
-// Checke Berechtigungen f�r Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
-$app->uses('tpl,listform');
-
-// Listen Definition laden
-$app->listform->loadListDef($list_def_file);
-
-if(!is_file('templates/'.$app->listform->listDef["name"].'_list.htm')) {
- $app->uses('listform_tpl_generator');
- $app->listform_tpl_generator->buildHTML($app->listform->listDef);
-}
-
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl','templates/'.$app->listform->listDef["name"].'_list.htm');
-
-// SQL f�r Suche generieren
-if($app->listform->listDef["name"] != 'no') {
- if($_SESSION["s"]["user"]["typ"] == "admin") {
- $sql_where = "";
- } else {
- $sql_where = "userid = ".$_SESSION["s"]["user"]["userid"]." and";
- }
-}
-
-$sql_where = $app->listform->getSearchSQL($sql_where);
-$app->tpl->setVar($app->listform->searchValues);
-
-// SQL f�r Paging generieren
-$limit_sql = $app->listform->getPagingSQL($sql_where);
-$app->tpl->setVar("paging",$app->listform->pagingHTML);
-
-// hole alle Datens�tze
-$records = $app->db->queryAllRecords("SELECT * FROM ".$app->listform->listDef["table"]." WHERE $sql_where $limit_sql");
-
-$bgcolor = "#FFFFFF";
-
-if(is_array($records)) {
- $idx_key = $app->listform->listDef["table_idx"];
- foreach($records as $rec) {
-
- $rec = $app->listform->decode($rec);
-
- // Farbwechsel
- $bgcolor = ($bgcolor == "#FFFFFF")?"#EEEEEE":"#FFFFFF";
- $rec["bgcolor"] = $bgcolor;
-
- // die Variable "id" enth�lt immer die Index variable
- $rec["id"] = $rec[$idx_key];
-
- $records_new[] = $rec;
- }
-}
-
-$app->tpl->setLoop('records',$records_new);
-
-// Language File setzen
-$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$app->listform->listDef['name']."_list.lng";
-include($lng_file);
-$app->tpl->setVar($wb);
-
-$app->tpl_defaults();
-$app->tpl->pparse();
-
+$app->uses('listform_actions');
+$app->listform_actions->onLoad();
?>
\ No newline at end of file
--
Gitblit v1.9.1