Updated several base libraries and added advanced search functionality.

interface/lib/classes/datasources_enbion.inc.php

+<?php
+
+/*
+Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class datasources_enbion {
+	
+	function get_employees() {
+		global $app, $conf;
+		
+		$out = array();
+		
+		// Empty item for userlist
+		$out[0] = '';
+		
+		$records = $app->db->queryAllRecords("SELECT * FROM sys_user ORDER BY username");
+		foreach($records as $rec) {
+			$key = $rec["userid"];
+			$out[$key] = $rec['username'];
+		}
+		
+		return $out;
+	}
+	
+	
+}
+
+?>
\ No newline at end of file

interface/lib/classes/db_mysql.inc.php

@@ -147,6 +147,11 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			return mysql_num_rows($this->queryId);
 		}
 		
+		function affectedRows()
+		{
+			return mysql_affected_rows($this->linkId);
+		}
+		
 		// returns mySQL insert id
 		function insertID()
 		{
@@ -256,12 +261,23 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        foreach($columns as $col){
             $sql .= $col["name"]." ".$this->mapType($col["type"],$col["typeValue"])." ";
        
-            if($col["defaultValue"] != "") $sql .= "DEFAULT '".$col["defaultValue"]."' ";
-            if($col["notNull"] == true) {
-                $sql .= "NOT NULL ";
-            } else {
-                $sql .= "NULL ";
-            }
+            if($col["defaultValue"] != "") {
+				if($col["defaultValue"] == "NULL" or $col["defaultValue"] == "NOT NULL") {
+					$sql .= "DEFAULT ".$col["defaultValue"]." ";
+				} else {
+					$sql .= "DEFAULT '".$col["defaultValue"]."' ";
+				}
+				
+			} elseif($col["defaultValue"] != false) {
+				$sql .= "DEFAULT '' ";
+			}
+			if($col["defaultValue"] != "NULL" && $col["defaultValue"] != "NOT NULL") {
+            	if($col["notNull"] == true) {
+                	$sql .= "NOT NULL ";
+            	} else {
+                	$sql .= "NULL ";
+            	}
+			}
             if($col["autoInc"] == true) $sql .= "auto_increment ";
             $sql.= ",";
             // key Definitionen

interface/lib/classes/listform_actions.inc.php

-<?php
-
-/*
-Copyright (c) 2005, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
-* Action framework for the listform library.
-*
-* @author Till Brehm <t.brehm@scrigo.org>
-* @copyright Copyright &copy; 2005, Till Brehm
-*/
-
-class listform_actions {
-	
-	var $id;
-	var $idx_key;
-	var $DataRowColor;
-	var $SQLExtWhere = '';
-	
-	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');
-		
-		// Load list definition
-		$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');
-
-		// Getting Datasets from DB
-		$records = $app->db->queryAllRecords($this->getQueryString());
-
-
-		$this->DataRowColor = "#FFFFFF";
-		if(is_array($records)) {
-			$this->idx_key = $app->listform->listDef["table_idx"]; 
-			foreach($records as $rec) {
-				$records_new[] = $this->prepareDataRow($rec);
-			}
-		}
-
-		$app->tpl->setLoop('records',$records_new);
-
-		$this->onShow();
-		
-		
-	}
-	
-	function prepareDataRow($rec) {
-		global $app;
-		
-		$rec = $app->listform->decode($rec);
-
-		// 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]];
-			}
-		}
-		
-		// 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";
-			}
-		}
-		
-		if($this->SQLExtWhere != '') {
-			$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";
-		
-	}
-	
-	
-	function onShow() {
-		global $app;
-		
-		// 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->setVar("form_action",$app->listform->listDef["file"]);
-		
-		// Parse the templates and send output to the browser
-		$this->onShowEnd();
-	}
-	
-	function onShowEnd() {
-		global $app;
-		
-		$app->tpl_defaults();
-		$app->tpl->pparse();
-	}
-}
-
+<?php
+
+/*
+Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+* Action framework for the listform library.
+*
+* @author Till Brehm <t.brehm@scrigo.org>
+* @copyright Copyright &copy; 2005, Till Brehm
+*/
+
+class listform_actions {
+	
+	var $id;
+	var $idx_key;
+	var $DataRowColor;
+	var $SQLExtWhere = '';
+	var $SQLOrderBy = '';
+	
+	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');
+		
+		// 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);
+		
+		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("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";
+		if(is_array($records)) {
+			$this->idx_key = $app->listform->listDef["table_idx"]; 
+			foreach($records as $rec) {
+				$records_new[] = $this->prepareDataRow($rec);
+			}
+		}
+
+		$app->tpl->setLoop('records',$records_new);
+
+		$this->onShow();
+		
+		
+	}
+	
+	function prepareDataRow($rec) {
+		global $app;
+		
+		$rec = $app->listform->decode($rec);
+
+		// 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]];
+			}
+		}
+		
+		// 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";
+			}
+		}
+		
+		if($this->SQLExtWhere != '') {
+			$sql_where .= " ".$this->SQLExtWhere." and";
+		}
+
+		$sql_where = $app->listform->getSearchSQL($sql_where);
+		$app->tpl->setVar($app->listform->searchValues);
+		
+		$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() {
+		global $app;
+		
+		// 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->setVar("form_action",$app->listform->listDef["file"]);
+		
+		// Parse the templates and send output to the browser
+		$this->onShowEnd();
+	}
+	
+	function onShowEnd() {
+		global $app;
+		
+		$app->tpl_defaults();
+		$app->tpl->pparse();
+	}
+}
+
 ?>
\ No newline at end of file

interface/lib/classes/listform_tpl_generator.inc.php

@@ -56,7 +56,11 @@ class listform_tpl_generator {
   
   		foreach($listDef["item"] as $field) {
 			$key = $field["field"];
-			$html .= "    <td class=\"frmText11\"><input type=\"text\" name=\"".$listDef["search_prefix"].$key."\" value=\"{tmpl_var name='".$listDef["search_prefix"].$key."'}\" class=\"text\" /></td>\r\n";
+			if($field["formtype"] == 'SELECT') {
+				$html .= "    <td class=\"frmText11\"><select name=\"".$listDef["search_prefix"].$key."\" onChange=\"document.myform.submit();\">{tmpl_var name='".$listDef["search_prefix"].$key."'}</select></td>\r\n";
+			} else {
+				$html .= "    <td class=\"frmText11\"><input type=\"text\" name=\"".$listDef["search_prefix"].$key."\" value=\"{tmpl_var name='".$listDef["search_prefix"].$key."'}\" class=\"text\" /></td>\r\n";
+			}
 		}
 		
 		$html .= '    <td class="frmText11" align="right"><input name="Filter" type="submit" id="Filter" value="{tmpl_var name="filter_txt"}"></td>
@@ -112,10 +116,10 @@ class listform_tpl_generator {
     }
 	
 	function lng_add($lang,$listDef,$module = '') {
-		global $go_api, $go_info;
+		global $go_api, $go_info,$conf;
 		
 		if($module == '') {
-			$lng_file = "lib/lang/en_".$listDef['name']."_list.lng";
+			$lng_file = "lib/lang/".$conf["language"]."_".$listDef['name']."_list.lng";
 		} else {
 			$lng_file = '../'.$module."/lib/lang/en_".$listDef['name']."_list.lng";
 		}

interface/lib/classes/plugin_base.inc.php

@@ -4,6 +4,7 @@ class plugin_base {
 	
 	var $plugin_name;
 	var $options;
+	var $form;
 	
 	function onLoad() {
 	

interface/lib/classes/plugin_dbhistory.inc.php

+<?php
+
+class plugin_dbhistory extends plugin_base {
+
+        var $module;
+        var $form;
+        var $tab;
+        var $record_id;
+        var $formdef;
+        var $options;
+
+        function onShow() {
+		
+			global $app, $conf;
+			
+			$content = '';
+			
+			$db_table = $app->tform->formDef["db_table"];
+			$db_table_idx = $app->tform->formDef["db_table_idx"];
+			$primary_id = $this->form->id;
+			if($_SESSION["s"]["user"]["typ"] == 'admin') {
+				$sql = "SELECT action, tstamp, user, data FROM sys_datalog WHERE dbtable = '".$db_table."' AND dbidx = '".$db_table_idx.":".$primary_id."'";
+			} else {
+				$sql = "SELECT action, tstamp, user, data FROM sys_datalog WHERE user = '".$_SESSION["s"]["user"]["username"]."' dbtable = '".$db_table."' AND dbidx = '".$db_table_idx.":".$primary_id."'";
+			}
+			
+			$records = $app->db->queryAllRecords($sql);
+			if(is_array($records)) {
+				$content .= '<table width="100%">';
+				foreach($records as $rec) {
+					$content .= "<tr><td class='frmText11' bgcolor='#EEEEEE'><b>".date("d.m.Y",$rec["tstamp"])." ".$rec["user"]."</b></td></tr>";
+				}
+				$content .= '</table>';
+			}
+			
+			return $content;
+
+        }
+}
+
+?>
\ No newline at end of file

interface/lib/classes/plugin_listview.inc.php

@@ -20,10 +20,13 @@ class plugin_listview extends plugin_base {
 
                 $listTpl = new tpl;
                 $listTpl->newTemplate('templates/'.$app->listform->listDef["name"].'_list.htm');
+				
+				//die(print_r($app->tform_actions));
 
                 // Changing some of the list values to reflect that the list is called within a tform page
                 $app->listform->listDef["file"] = $app->tform->formDef["action"];
-                $app->listform->listDef["page_params"] = "&id=".$app->tform_actions->id."&next_tab=".$_SESSION["s"]["form"]["tab"];
+                // $app->listform->listDef["page_params"] = "&id=".$app->tform_actions->id."&next_tab=".$_SESSION["s"]["form"]["tab"];
+				$app->listform->listDef["page_params"] = "&id=".$_REQUEST["id"]."&next_tab=".$_SESSION["s"]["form"]["tab"];
 
 
                 // Generate the SQL for searching
@@ -45,6 +48,8 @@ class plugin_listview extends plugin_base {
                 // Generate SQL for paging
                 $limit_sql = $app->listform->getPagingSQL($sql_where);
                 $listTpl->setVar("paging",$app->listform->pagingHTML);
+				
+				
 
                 // Get the data
                 $records = $app->db->queryAllRecords("SELECT * FROM ".$app->listform->listDef["table"]." WHERE $sql_where $limit_sql");
@@ -59,6 +64,14 @@ class plugin_listview extends plugin_base {
                                 // Change of color
                                 $bgcolor = ($bgcolor == "#FFFFFF")?"#EEEEEE":"#FFFFFF";
                                 $rec["bgcolor"] = $bgcolor;
+								
+								// 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]];
+									}
+								}
 
                                 // The variable "id" contains always the index field
                                 $rec["id"] = $rec[$idx_key];

interface/lib/classes/searchform.inc.php

+<?php
+
+/*
+Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+* Listenbehandlung
+*
+* @package searchform
+* @author Till Brehm
+* @version 1.1
+*/
+
+class searchform {
+
+        var $debug = 0;
+        var $errorMessage;
+    var $listDef;
+        var $searchValues;
+        var $pagingHTML;
+        var $pagingValues;
+        var $searchChanged = 0;
+        var $module;
+
+    function loadListDef($file,$module = '') {
+                global $app,$conf;
+                if(!is_file($file)) die("List-Definition: $file not found.");
+                include_once($file);
+                $this->listDef = $liste;
+                $this->module = $module;
+				
+				// Fill datasources
+				foreach($this->listDef["item"] as $key => $field) {
+					if(is_array($field['datasource'])) {
+                    	$this->listDef["item"][$key]["value"] = $this->getDatasourceData($field);
+                    }
+				}
+				
+                return true;
+        }
+		
+		/**