From 0ef490b4ce268b51e7b63127fedff7c8a0c39ecc Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sat, 25 Oct 2008 16:46:51 -0400
Subject: [PATCH] new theme

---
 interface/lib/classes/listform_actions.inc.php |  108 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index c76a23c..04bdebb 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -37,16 +37,20 @@
 
 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');
+		$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);
@@ -56,14 +60,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) {
@@ -78,65 +82,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;
 		
-		// The variable "id" contains always the index variable
-		$rec["id"] = $rec[$this->idx_key];
-		
-		return $rec;
-	}
-	
-	function getQueryString() {
-		global $app;
-		
-		// 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";
+		//* 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];
+		return $rec;
+	}
+	
+	private function getQueryString() {
+		global $app;
+		$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';
+			}
+		}		
 		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() {
+	private 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';
 		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
+		//* Set local Language File
+		$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_'.$app->listform->listDef['name'].'_list.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
 		$this->onShowEnd();
 	}
 	
-	function onShowEnd() {
+	private function onShowEnd()
+    {
 		global $app;
-		
 		$app->tpl_defaults();
 		$app->tpl->pparse();
 	}

--
Gitblit v1.9.1