From d65eaaf5960c525976ddcb8af32e3aa347f1a5b0 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Sat, 16 Jun 2012 13:44:25 -0400
Subject: [PATCH] Bugfix: remoting lib field validation "ISINT" differed from tform validation and leads to 0 values treated as invalid Bugfix: remoting lib did include_once instead of include at form definition files, that leads to malfunction when using multiple definition files at importing and actions like that
---
interface/lib/classes/functions.inc.php | 80 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index 8071429..2b11427 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -34,7 +34,7 @@
class functions {
- public function mail($to, $subject, $text, $from, $filepath = '', $filetype = 'application/pdf', $filename = '') {
+ public function mail($to, $subject, $text, $from, $filepath = '', $filetype = 'application/pdf', $filename = '', $cc = '', $bcc = '') {
global $app,$conf;
if($conf['demo_mode'] == true) $app->error("Mail sending disabled in demo mode.");
@@ -45,6 +45,7 @@
$content = file_get_contents($filepath);
$content = chunk_split(base64_encode($content));
$uid = strtoupper(md5(uniqid(time())));
+ $subject = "=?utf-8?B?".base64_encode($subject)."?=";
if($filename == '') {
$path_parts = pathinfo($filepath);
@@ -52,7 +53,9 @@
unset($path_parts);
}
- $header = "From: $from\nReply-To: $from\n";
+ $header = "Return-Path: $from\nFrom: $from\nReply-To: $from\n";
+ if($cc != '') $header .= "Cc: $cc\n";
+ if($bcc != '') $header .= "Bcc: $bcc\n";
$header .= "MIME-Version: 1.0\n";
$header .= "Content-Type: multipart/mixed; boundary=$uid\n";
@@ -73,6 +76,11 @@
mail($to, $subject, "", $header);
} else {
$header = "From: $from\nReply-To: $from\n";
+ if($cc != '') $header .= "Cc: $cc\n";
+ if($bcc != '') $header .= "Bcc: $bcc\n";
+ $header .= "Content-Type: text/plain;\n\tcharset=\"UTF-8\"\n";
+ $header .= "Content-Transfer-Encoding: 8bit\n\n";
+ $subject = "=?utf-8?B?".base64_encode($subject)."?=";
mail($to, $subject, $text, $header);
}
@@ -97,7 +105,7 @@
}
public function get_ispconfig_url() {
- $url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS'))?'https':'http';
+ $url = (stristr($_SERVER['SERVER_PROTOCOL'],'HTTPS') || stristr($_SERVER['HTTPS'],'on'))?'https':'http';
$url .= '://'.$_SERVER['SERVER_NAME'];
if($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
$url .= ':'.$_SERVER['SERVER_PORT'];
@@ -105,6 +113,72 @@
return $url;
}
+ function json_encode($data) {
+ if(!function_exists('json_encode')){
+ if(is_array($data) || is_object($data)){
+ $islist = is_array($data) && (empty($data) || array_keys($data) === range(0,count($data)-1));
+
+ if($islist){
+ $json = '[' . implode(',', array_map(array($this, "json_encode"), $data) ) . ']';
+ } else {
+ $items = Array();
+ foreach( $data as $key => $value ) {
+ $items[] = $this->json_encode("$key") . ':' . $this->json_encode($value);
+ }
+ $json = '{' . implode(',', $items) . '}';
+ }
+ } elseif(is_string($data)){
+ # Escape non-printable or Non-ASCII characters.
+ # I also put the \\ character first, as suggested in comments on the 'addclashes' page.
+ $string = '"'.addcslashes($data, "\\\"\n\r\t/".chr(8).chr(12)).'"';
+ $json = '';
+ $len = strlen($string);
+ # Convert UTF-8 to Hexadecimal Codepoints.
+ for($i = 0; $i < $len; $i++){
+ $char = $string[$i];
+ $c1 = ord($char);
+
+ # Single byte;
+ if($c1 <128){
+ $json .= ($c1 > 31) ? $char : sprintf("\\u%04x", $c1);
+ continue;
+ }
+
+ # Double byte
+ $c2 = ord($string[++$i]);
+ if(($c1 & 32) === 0){
+ $json .= sprintf("\\u%04x", ($c1 - 192) * 64 + $c2 - 128);
+ continue;
+ }
+
+ # Triple
+ $c3 = ord($string[++$i]);
+ if(($c1 & 16) === 0){
+ $json .= sprintf("\\u%04x", (($c1 - 224) <<12) + (($c2 - 128) << 6) + ($c3 - 128));
+ continue;
+ }
+
+ # Quadruple
+ $c4 = ord($string[++$i]);
+ if(($c1 & 8) === 0){
+ $u = (($c1 & 15) << 2) + (($c2>>4) & 3) - 1;
+
+ $w1 = (54<<10) + ($u<<6) + (($c2 & 15) << 2) + (($c3>>4) & 3);
+ $w2 = (55<<10) + (($c3 & 15)<<6) + ($c4-128);
+ $json .= sprintf("\\u%04x\\u%04x", $w1, $w2);
+ }
+ }
+ } else {
+ # int, floats, bools, null
+ $json = strtolower(var_export($data, true));
+ }
+ return $json;
+ } else {
+ return json_encode($data);
+ }
+ }
+
+
}
--
Gitblit v1.9.1