From 9c9382e6949e1366c6adb502b7aacae2c11023f7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 08 Sep 2011 09:42:04 -0400
Subject: [PATCH] Fixed: FS#1709 - Wrong message "Your hard-disk space is going full" in the "Monitor -> Show Disk Usage"
---
interface/lib/classes/listform_actions.inc.php | 114 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 53 deletions(-)
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index 012ebd9..70d6652 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -1,7 +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,
@@ -28,26 +28,22 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/**
-* Action framework for the listform library.
-*
-* @author Till Brehm <t.brehm@scrigo.org>
-* @copyright Copyright © 2005, Till Brehm
-*/
-
class listform_actions {
- var $id;
- var $idx_key;
- var $DataRowColor;
- var $SQLExtWhere = '';
+ private $id;
+ public $idx_key;
+ public $DataRowColor;
+ public $SQLExtWhere = '';
+ public $SQLOrderBy = '';
- function onLoad() {
+ public function onLoad()
+ {
global $app, $conf, $list_def_file;
- if(!is_object($app->tpl)) $app->uses('tpl');
- if(!is_object($app->listform)) $app->uses('listform');
- if(!is_object($app->tform)) $app->uses('tform');
+ $app->uses('tpl,listform,tform');
+
+ //* Clear session variable that is used when lists are embedded with the listview plugin
+ $_SESSION['s']['form']['return_to'] = '';
// Load list definition
$app->listform->loadListDef($list_def_file);
@@ -57,14 +53,14 @@
$app->listform_tpl_generator->buildHTML($app->listform->listDef);
}
- $app->tpl->newTemplate("form.tpl.htm");
+ $app->tpl->newTemplate("listpage.tpl.htm");
$app->tpl->setInclude('content_tpl','templates/'.$app->listform->listDef["name"].'_list.htm');
// Getting Datasets from DB
$records = $app->db->queryAllRecords($this->getQueryString());
-
$this->DataRowColor = "#FFFFFF";
+ $records_new = '';
if(is_array($records)) {
$this->idx_key = $app->listform->listDef["table_idx"];
foreach($records as $rec) {
@@ -79,73 +75,85 @@
}
- function prepareDataRow($rec) {
+ public function prepareDataRow($rec)
+ {
global $app;
$rec = $app->listform->decode($rec);
- // Alternating datarow colors
- $this->DataRowColor = ($this->DataRowColor == "#FFFFFF")?"#EEEEEE":"#FFFFFF";
- $rec["bgcolor"] = $this->DataRowColor;
+ //* Alternating datarow colors
+ $this->DataRowColor = ($this->DataRowColor == '#FFFFFF') ? '#EEEEEE' : '#FFFFFF';
+ $rec['bgcolor'] = $this->DataRowColor;
- // substitute value for select fields
- foreach($app->listform->listDef["item"] as $field) {
- $key = $field["field"];
- if($field['formtype'] == "SELECT") {
- $rec[$key] = $field['value'][$rec[$key]];
+ //* substitute value for select fields
+ foreach($app->listform->listDef['item'] as $field) {
+ $key = $field['field'];
+ if(isset($field['formtype']) && $field['formtype'] == 'SELECT') {
+ if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') {
+ // Set a additional image variable for bolean fields
+ $rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'x16/tick_circle.png':'x16/cross_circle.png';
+ }
+ //* substitute value for select field
+ $rec[$key] = @$field['value'][$rec[$key]];
}
}
- // The variable "id" contains always the index variable
- $rec["id"] = $rec[$this->idx_key];
-
+ //* The variable "id" contains always the index variable
+ $rec['id'] = $rec[$this->idx_key];
return $rec;
}
- function getQueryString() {
+ private function getQueryString() {
global $app;
-
- // Generate the search sql
- if($app->listform->listDef["auth"] != 'no') {
- if($_SESSION["s"]["user"]["typ"] == "admin") {
- $sql_where = "";
+ $sql_where = '';
+
+ //* Generate the search sql
+ if($app->listform->listDef['auth'] != 'no') {
+ if($_SESSION['s']['user']['typ'] == "admin") {
+ $sql_where = '';
} else {
- $sql_where = $app->tform->getAuthSQL('r')." and";
+ $sql_where = $app->tform->getAuthSQL('r').' and';
}
- }
-
+ }
if($this->SQLExtWhere != '') {
- $sql_where .= " ".$this->SQLExtWhere." and";
+ $sql_where .= ' '.$this->SQLExtWhere.' and';
}
$sql_where = $app->listform->getSearchSQL($sql_where);
$app->tpl->setVar($app->listform->searchValues);
-
- // Generate SQL for paging
- $limit_sql = $app->listform->getPagingSQL($sql_where);
- $app->tpl->setVar("paging",$app->listform->pagingHTML);
-
- return "SELECT * FROM ".$app->listform->listDef["table"]." WHERE $sql_where $limit_sql";
+ $order_by_sql = $this->SQLOrderBy;
+
+ //* Generate SQL for paging
+ $limit_sql = $app->listform->getPagingSQL($sql_where);
+ $app->tpl->setVar('paging',$app->listform->pagingHTML);
+
+ return 'SELECT * FROM '.$app->listform->listDef['table']." WHERE $sql_where $order_by_sql $limit_sql";
}
- function onShow() {
+ public function onShow()
+ {
global $app;
- // Language File setzen
- $lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$app->listform->listDef['name']."_list.lng";
+ //* Set global Language File
+ $lng_file = ISPC_LIB_PATH.'/lang/'.$_SESSION['s']['language'].'.lng';
+ if(!file_exists($lng_file))
+ $lng_file = ISPC_LIB_PATH.'/lang/en.lng';
include($lng_file);
$app->tpl->setVar($wb);
- $app->tpl->setVar("form_action",$app->listform->listDef["file"]);
- // Parse the templates and send output to the browser
+ $app->tpl->setVar('toolsarea_head_txt',$app->lng('toolsarea_head_txt'));
+ $app->tpl->setVar($app->listform->wordbook);
+ $app->tpl->setVar('form_action', $app->listform->listDef['file']);
+
+ //* Parse the templates and send output to the browser
$this->onShowEnd();
}
- function onShowEnd() {
+ private function onShowEnd()
+ {
global $app;
-
$app->tpl_defaults();
$app->tpl->pparse();
}
--
Gitblit v1.9.1