Updated several base libraries and added advanced search functionality.

Author: tbrehm

config/exim4/exim4_without_amavisd.conf.template

@@ -0,0 +1,53 @@
+<?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;
+	}
+	
+	
+}
+
+?>

interface/lib/classes/datasources_enbion.inc.php

@@ -147,6 +147,11 @@ function numRows()
 			return mysql_num_rows($this->queryId);
 		}
 
+		function affectedRows()
+		{
+			return mysql_affected_rows($this->linkId);
+		}
+		
 		// returns mySQL insert id
 		function insertID()
 		{
@@ -256,12 +261,23 @@ function createTable($table_name,$columns) {
        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