diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 46416679e..144ba5afc 100644 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -2916,6 +2916,18 @@ class G } } + /** + * isHttpRequest + * + * @return boolean true or false + */ + function isHttpRequest(){ + if( isset($_SERVER['SERVER_SOFTWARE']) && strpos(strtolower($_SERVER['SERVER_SOFTWARE']), 'apache') !== false ){ + return true; + } + return false; + } + /** * Get the type of a variable * Returns the type of the PHP variable var. diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 18e488706..3ebe04cce 100644 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -4191,12 +4191,12 @@ class XmlForm_Field_Image extends XmlForm_Field // function mask to php function masktophp ($mask){ $tmp = str_replace("%", "", $mask); - if(ereg('b',$tmp)) { + if(preg_match('/b/',$tmp)) { $tmp2 = str_replace("b", "M", $tmp); $value=date($tmp2); return $value; } - if(ereg('B',$tmp)) { + if(preg_match('/B/',$tmp)) { $tmp2 = str_replace("B", "F", $tmp); $value=date($tmp2); return $value; diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 94d23c8da..6b98d416e 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -247,7 +247,7 @@ function executePlugins(){ $className = $filename . 'ClassCron'; include_once ( $pathCronPlugins . $file ); //$filename. ".php" - $oPlugin =& new $className(); + $oPlugin = new $className(); if (method_exists($oPlugin, 'executeCron')) { $oPlugin->executeCron(); setExecutionMessage("Executing Pentaho Reports Plugin"); diff --git a/workflow/engine/classes/class.spool.php b/workflow/engine/classes/class.spool.php index 583b6454c..1bd543d96 100755 --- a/workflow/engine/classes/class.spool.php +++ b/workflow/engine/classes/class.spool.php @@ -254,6 +254,9 @@ class spoolRun { $holdcc = array (); $holdbcc = array (); $text = trim($this->fileData['to']); + + $textcc =''; + $textbcc=''; if( isset($this->fileData['cc']) && trim($this->fileData['cc']) != '' ) { $textcc = trim($this->fileData['cc']); } diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index d76feee79..2dbb046f7 100644 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -351,7 +351,7 @@ switch($_POST['action']) { break; case 'pauseCase': - $unpausedate = $_POST['unpausedate']; + $unpauseDate = $_POST['unpausedate']; $oCase = new Cases(); if( isset($_POST['APP_UID']) && isset($_POST['DEL_INDEX']) ) { $APP_UID = $_POST['APP_UID'];