Added global functions library which conatins a mail functin that supports attachments and a array_merge function that merges arrays that conatain numeric keys and strings correctly.

Author: tbrehm

interface/lib/app.inc.php

@@ -73,7 +73,7 @@ public function __construct() {
 			if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $conf['language'];
 		}
 
-		$this->uses('auth,plugin');
+		$this->uses('auth,plugin,functions');
 	}
 
 	public function uses($classes) {

interface/lib/classes/functions.inc.php

@@ -0,0 +1,94 @@
+<?php
+
+/*
+Copyright (c) 2010, 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.
+*/
+
+//* The purpose of this library is to provide some general functions.
+//* This class is loaded automatically by the ispconfig framework.
+
+class functions {
+	
+
+	public function mail($to, $subject, $text, $from, $filepath = '', $filetype = 'application/pdf', $filename = '') {
+		global $app,$conf;
+		
+		if($conf['demo_mode'] == true) $app->error("Mail sending disabled in demo mode.");
+		
+		if($filepath != '') {
+			if(!file_exists($filepath)) $app->error("Mail attachement does not exist ".$filepath);
+			
+			$content = file_get_contents($filepath);
+			$content = chunk_split(base64_encode($content));
+			$uid = strtoupper(md5(uniqid(time())));
+			
+			if($filename == '') {
+				$path_parts = pathinfo($filepath);
+				$filename = $path_parts["basename"];
+				unset($path_parts);
+			}
+
+			$header = "From: $from\nReply-To: $from\n";
+			$header .= "MIME-Version: 1.0\n";
+			$header .= "Content-Type: multipart/mixed; boundary=$uid\n";
+
+			$header .= "--$uid\n";
+			$header .= "Content-Type: text/plain\n";
+			$header .= "Content-Transfer-Encoding: 8bit\n\n";
+			$header .= "$text\n";
+
+			$header .= "--$uid\n";
+			$header .= "Content-Type: $filetype; name=\"$filename\"\n";
+
+			$header .= "Content-Transfer-Encoding: base64\n";
+			$header .= "Content-Disposition: attachment; filename=\"$filename\"\n\n";
+			$header .= "$content\n";
+
+			$header .= "--$uid--";
+
+			mail($to, $subject, "", $header);
+		} else {
+			$header = "From: $from\nReply-To: $from\n";
+			mail($to, $subject, $text, $header);
+		}
+
+		return true;
+	}
+	
+	public function array_merge($array1,$array2) {
+		$out = $array1;
+		foreach($array2 as $key => $val) {
+			$out[$key] = $val;
+		}
+		return $out;
+	}
+	
+	
+		
+}
+
+?>

interface/lib/classes/tform.inc.php

@@ -145,7 +145,7 @@ function loadFormDef($file,$module = '') {
                 }
 
 				if(is_array($wb_global)) {
-					$wb = $wb_global + $wb;
+					$wb = $app->functions->array_merge($wb_global,$wb);
 				}
 				if(isset($wb_global)) unset($wb_global);
 
@@ -363,7 +363,7 @@ function getHTML($record, $tab, $action = 'NEW') {
                                         if(isset($field['datasource']) && is_array($field['datasource'])) {
 												if(is_array($field["value"])) {
 													//$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
-													$field["value"] = $field["value"]+$this->getDatasourceData($field, $record);
+													$field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record));
 												} else {
                                                 	$field["value"] = $this->getDatasourceData($field, $record);
 												}
@@ -478,7 +478,7 @@ function getHTML($record, $tab, $action = 'NEW') {
                                 // If Datasource is set, get the data from there
                                 if(@is_array($field['datasource'])) {
                                 	if(is_array($field["value"])) {
-										$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
+										$field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record));
 									} else {
                                     	$field["value"] = $this->getDatasourceData($field, $record);
 									}