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_edit.php | 112 ++++++++++++-------------------------------------------
1 files changed, 25 insertions(+), 87 deletions(-)
diff --git a/interface/web/admin/users_edit.php b/interface/web/admin/users_edit.php
index 31e07a9..2bf4dcc 100644
--- a/interface/web/admin/users_edit.php
+++ b/interface/web/admin/users_edit.php
@@ -1,6 +1,6 @@
<?php
/*
-Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+Copyright (c) 2008, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -26,8 +26,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');
+
/******************************************
* Begin Form configuration
@@ -39,98 +38,37 @@
* 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');
-// Lade Template
-$app->uses('tpl,tform');
-$app->tpl->newTemplate("tabbed_form.tpl.htm");
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
-// Tabellendefinition und Formdefinition laden
-$app->tform->loadFormDef($tform_def_file);
+// Loading classes
+$app->uses('tpl,tform,tform_actions');
+$app->load('tform_actions');
-// ID importieren
-$id = intval($_REQUEST["id"]);
-
-if(count($_POST) > 1) {
-
- // Bestimme aktion
- if($id > 0) {
- $action = 'UPDATE';
- } else {
- $action = 'INSERT';
- }
-
- $sql = $app->tform->getSQL($_POST,$_SESSION["s"]["form"]["tab"],$action,$id,$ext_where);
- if($app->tform->errorMessage == '') {
- $app->db->query($sql);
- if($action == "INSERT") $id = $app->db->insertID();
-
- // Liste anzeigen, wenn speichern geklickt wurde
- if($_REQUEST["next_tab"] == '') {
- header("Location: ".$app->tform->formDef['list_default']);
- exit;
- }
-
- } else {
- $app->tpl->setVar("error","<b>Fehler:</b><br>".$app->tform->errorMessage);
- $app->tpl->setVar($_POST);
- }
-}
-
-// Welcher Tab wird angezeigt
-if($app->tform->errorMessage == '') {
- // wenn kein Fehler vorliegt
- if($_REQUEST["next_tab"] != '') {
- // wenn n�chster Tab bekannt
- $active_tab = $_REQUEST["next_tab"];
- } else {
- // ansonsten ersten tab nehmen
- $active_tab = $app->tform->formDef['tab_default'];
- }
-} else {
- // bei Fehlern den gleichen Tab nochmal anzeigen
- $active_tab = $_SESSION["s"]["form"]["tab"];
-}
-
-
-if($id > 0) {
- // bestehenden Datensatz anzeigen
- if($app->tform->errorMessage == '') {
- if($app->tform->formDef['auth'] == 'no') {
- $sql = "SELECT * FROM ".$app->tform->formDef['db_table']." WHERE ".$app->tform->formDef['db_table_idx']." = $id";
- } else {
- $sql = "SELECT * FROM ".$app->tform->formDef['db_table']." WHERE ".$app->tform->formDef['db_table_idx']." = $id AND ".$app->tform->getAuthSQL('u');
+class page_action extends tform_actions {
+
+ function onBeforeInsert() {
+ global $app, $conf;
+
+ if(!in_array($this->dataRecord['startmodule'],$this->dataRecord['modules'])) {
+ $app->tform->errorMessage .= $app->tform->wordbook['startmodule_err'];
}
- if(!$record = $app->db->queryOneRecord($sql)) die("You dont have the permission to view this record or this record does not exist.");
- } else {
- $record = $app->tform->encode($_POST,$active_tab);
}
- // Userdaten umwandeln
- $record = $app->tform->getHTML($record, $active_tab,'EDIT');
- $record['id'] = $id;
-} else {
- if($app->tform->errorMessage == '') {
- $record = array();
- $record = $app->tform->getHTML($record, $app->tform->formDef['tab_default'],'NEW');
- } else {
- $record = $app->tform->getHTML($app->tform->encode($_POST,$active_tab),$active_tab,'EDIT');
+ function onBeforeUpdate() {
+ global $app, $conf;
+
+ if(@is_array($this->dataRecord['modules']) && !in_array($this->dataRecord['startmodule'],$this->dataRecord['modules'])) {
+ $app->tform->errorMessage .= $app->tform->wordbook['startmodule_err'];
+ }
}
+
}
-$app->tpl->setVar($record);
-
-// Formular und Tabs erzeugen
-$app->tform->showForm();
-
-// Defaultwerte setzen
-$app->tpl_defaults();
-
-// Template parsen
-$app->tpl->pparse();
+$page = new page_action;
+$page->onLoad();
?>
\ No newline at end of file
--
Gitblit v1.9.1