diff --git a/gulliver/js/pmchart/pmCharts.js b/gulliver/js/pmchart/pmCharts.js index e0be418c8..11b446e1b 100644 --- a/gulliver/js/pmchart/pmCharts.js +++ b/gulliver/js/pmchart/pmCharts.js @@ -115,7 +115,7 @@ BarChart.prototype.drawBars = function(data, canvas, param) { .attr("x", graphDim.left*2 + graphDim.width/2) .attr("dy", "1.5em") .style("text-anchor", "end") - .text("No data to draw..."); + .text(param.canvas.noDataText); data = [ {"value":"0", "datalabel":"None"} ]; } @@ -1097,7 +1097,7 @@ PieChart.prototype.drawChart = function () { PieChart.prototype.drawPie2D = function (dataset, canvas, param) { if (dataset == null || dataset.length == 0) { - this.$container.html( "
No data to draw ...
" ); + this.$container.html( "
"+param.canvas.noDataText+"
" ); } var parameter = createDefaultParamsForGraphPie(param); @@ -1443,7 +1443,7 @@ Pie3DChart.prototype.drawChart = function () { Pie3DChart.prototype.drawPie3D = function (data, canvas, param) { if (data == null || data.length == 0) { - this.$container.html( "
No data to draw ...
" ); + this.$container.html( "
"+param.canvas.noDataText+"
" ); } var duration_transition = 0; @@ -1613,7 +1613,7 @@ RingChart.prototype.drawChart = function () { RingChart.prototype.drawRing = function(data, canvas, param){ if (data == null || data.length == 0) { - this.$container.html( "
No data to draw ...
" ); + this.$container.html( "
"+param.canvas.noDataText+"
" ); } //d3.select('#'+parent).select('svg').remove(); diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index 0edcae85b..d09defa5d 100644 --- a/gulliver/system/class.bootstrap.php +++ b/gulliver/system/class.bootstrap.php @@ -670,10 +670,18 @@ class Bootstrap */ public static function LoadClass($strClass) { + Bootstrap::LoadSystem('inputfilter'); + $filter = new InputFilter(); + + $path = PATH_GULLIVER . 'class.' . $strClass . '.php'; + $path = $filter->validateInput($path, "path"); + $classfile = Bootstrap::ExpandPath("classes") . 'class.' . $strClass . '.php'; + $classfile = $filter->validateInput($classfile, "path"); + if (!file_exists($classfile)) { - if (file_exists(PATH_GULLIVER . 'class.' . $strClass . '.php')) { - return require_once (PATH_GULLIVER . 'class.' . $strClass . '.php'); + if (file_exists($path)) { + return require_once ($path); } else { return false; } diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index ca57a81f0..85dd96ca4 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -2653,6 +2653,7 @@ class G G::LoadSystem('inputfilter'); $filter = new InputFilter(); $file = $filter->validateInput($file, "path"); + $path = $filter->validateInput($path, "path"); move_uploaded_file( $file, $path . "/" . $nameToSave ); @chmod( $path . "/" . $nameToSave, $permission ); diff --git a/gulliver/thirdparty/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php b/gulliver/thirdparty/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php index 2d52acfaa..e1f40e701 100644 --- a/gulliver/thirdparty/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php +++ b/gulliver/thirdparty/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php @@ -83,6 +83,21 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac if (!file_exists($file)) { return false; } + + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $file = $filter->validateInput($file,"path"); + return unlink($file); } @@ -182,6 +197,20 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac */ private function _write($file, $data, $config) { + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $file = $filter->validateInput($file,"path"); + if(is_file($file)) { $result = file_put_contents($file, $data); } else { diff --git a/gulliver/thirdparty/pear/Archive/Zip.php b/gulliver/thirdparty/pear/Archive/Zip.php index 631b7d070..e96111080 100755 --- a/gulliver/thirdparty/pear/Archive/Zip.php +++ b/gulliver/thirdparty/pear/Archive/Zip.php @@ -3602,7 +3602,16 @@ class Archive_Zip public function encryptCrc32($string) { - return crc32($string); + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + return G::encryptCrc32($string); } } diff --git a/gulliver/thirdparty/pear/Log/syslog.php b/gulliver/thirdparty/pear/Log/syslog.php index 0bc5a3466..93ce84efc 100755 --- a/gulliver/thirdparty/pear/Log/syslog.php +++ b/gulliver/thirdparty/pear/Log/syslog.php @@ -178,7 +178,16 @@ class Log_syslog extends Log public function encryptOld($string) { - return md5($string); + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + return G::encryptOld($string); } } diff --git a/gulliver/thirdparty/pear/Log/win.php b/gulliver/thirdparty/pear/Log/win.php index e267d3788..1f7d1ae62 100755 --- a/gulliver/thirdparty/pear/Log/win.php +++ b/gulliver/thirdparty/pear/Log/win.php @@ -268,7 +268,16 @@ EOT; public function encryptOld($string) { - return md5($string); + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + return G::encryptOld($string); } } diff --git a/gulliver/thirdparty/pear/PEAR/Builder.php b/gulliver/thirdparty/pear/PEAR/Builder.php index 9e3ab3411..cbd443d50 100755 --- a/gulliver/thirdparty/pear/PEAR/Builder.php +++ b/gulliver/thirdparty/pear/PEAR/Builder.php @@ -107,7 +107,20 @@ class PEAR_Builder extends PEAR_Common } else { return $this->raiseError("Did not understand the completion status returned from msdev.exe."); } - + + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $dsp = $filter->validateInput($dsp,"path"); // msdev doesn't tell us the output directory :/ // open the dsp, find /out and use that directory $dsptext = join(file($dsp),''); @@ -347,6 +360,20 @@ class PEAR_Builder extends PEAR_Common */ function _runCommand($command, $callback = null) { + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $command = $filter->validateInput($command); + $this->log(1, "running: $command"); $pp = @popen("$command 2>&1", "r"); if (!$pp) { diff --git a/gulliver/thirdparty/pear/PEAR/Command/Package.php b/gulliver/thirdparty/pear/PEAR/Command/Package.php index f7b24490f..fe1fe03ff 100755 --- a/gulliver/thirdparty/pear/PEAR/Command/Package.php +++ b/gulliver/thirdparty/pear/PEAR/Command/Package.php @@ -358,6 +358,21 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm $this->output .= "+ $command\n"; } $this->output .= "+ $command\n"; + + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $command = $filter->validateInput($command); + if (empty($options['dry-run'])) { $fp = popen($command, "r"); while ($line = fgets($fp, 1024)) { diff --git a/gulliver/thirdparty/pear/PEAR/Common.php b/gulliver/thirdparty/pear/PEAR/Common.php index 8c49511b3..88a4f6049 100755 --- a/gulliver/thirdparty/pear/PEAR/Common.php +++ b/gulliver/thirdparty/pear/PEAR/Common.php @@ -1218,6 +1218,20 @@ class PEAR_Common extends PEAR */ function analyzeSourceCode($file) { + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $file = $filter->validateInput($file,"path"); + if (!function_exists("token_get_all")) { return false; } @@ -1631,6 +1645,20 @@ class PEAR_Common extends PEAR } } $dest_file = $save_dir . DIRECTORY_SEPARATOR . $save_as; + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $dest_file = $filter->validateInput($dest_file,"path"); + if (!$wp = @fopen($dest_file, 'wb')) { fclose($fp); if ($callback) { diff --git a/gulliver/thirdparty/pear/PEAR/Installer.php b/gulliver/thirdparty/pear/PEAR/Installer.php index 9c8e15c95..0e7f9d7fa 100755 --- a/gulliver/thirdparty/pear/PEAR/Installer.php +++ b/gulliver/thirdparty/pear/PEAR/Installer.php @@ -232,23 +232,28 @@ class PEAR_Installer extends PEAR_Common $fp = fopen($orig_file, "r"); $contents = fread($fp, filesize($orig_file)); fclose($fp); - if(!class_exists('G')){ - $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); - $docuroot = explode( '/', $realdocuroot ); - array_pop( $docuroot ); - $pathhome = implode( '/', $docuroot ) . '/'; - array_pop( $docuroot ); - $pathTrunk = implode( '/', $docuroot ) . '/'; - require_once($pathTrunk.'gulliver/system/class.g.php'); + if(!class_exists('G')){ + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); } if (isset($atts['md5sum'])) { $md5sum = G::encryptOld($contents); } + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $subst_from = $subst_to = array(); foreach ($atts['replacements'] as $a) { $to = ''; if ($a['type'] == 'php-const') { if (preg_match('/^[a-z0-9_]+$/i', $a['to'])) { + $a['to'] = $filter->validateInput($a['to']); eval("\$to = $a[to];"); } else { $this->log(0, "invalid php-const replacement: $a[to]"); @@ -872,14 +877,14 @@ class PEAR_Installer extends PEAR_Common if (!function_exists("md5_file")) { function md5_file($filename) { - if(!class_exists('G')){ - $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); - $docuroot = explode( '/', $realdocuroot ); - array_pop( $docuroot ); - $pathhome = implode( '/', $docuroot ) . '/'; - array_pop( $docuroot ); - $pathTrunk = implode( '/', $docuroot ) . '/'; - require_once($pathTrunk.'gulliver/system/class.g.php'); + if(!class_exists('G')){ + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); } $fp = fopen($filename, "r"); if (!$fp) return null; diff --git a/gulliver/thirdparty/pear/PEAR/Registry.php b/gulliver/thirdparty/pear/PEAR/Registry.php index 0e7849327..84d57292c 100755 --- a/gulliver/thirdparty/pear/PEAR/Registry.php +++ b/gulliver/thirdparty/pear/PEAR/Registry.php @@ -165,6 +165,19 @@ class PEAR_Registry extends PEAR { $this->_assertStateDir(); $file = $this->_packageFileName($package); + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $file = $filter->validateInput($file,"path"); + $fp = @fopen($file, $mode); if (!$fp) { return null; @@ -425,6 +438,20 @@ class PEAR_Registry extends PEAR return $e; } $file = $this->_packageFileName($package); + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $file = $filter->validateInput($file,"path"); + $ret = @unlink($file); $this->rebuildFileMap(); $this->_unlock(); diff --git a/gulliver/thirdparty/pear/SOAP/Value.php b/gulliver/thirdparty/pear/SOAP/Value.php index fd2d7b624..aafb53b7c 100755 --- a/gulliver/thirdparty/pear/SOAP/Value.php +++ b/gulliver/thirdparty/pear/SOAP/Value.php @@ -237,7 +237,16 @@ class SOAP_Attachment extends SOAP_Value public function encryptOld($string) { - return md5($string); + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + return G::encryptOld($string); } } diff --git a/gulliver/thirdparty/pear/SOAP/WSDL.php b/gulliver/thirdparty/pear/SOAP/WSDL.php index e3ee87265..9e760f519 100755 --- a/gulliver/thirdparty/pear/SOAP/WSDL.php +++ b/gulliver/thirdparty/pear/SOAP/WSDL.php @@ -1106,7 +1106,16 @@ class SOAP_WSDL_Cache extends SOAP_Base public function encryptOld($string) { - return md5($string); + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + return G::encryptOld($string); } } diff --git a/gulliver/thirdparty/phing/lib/Capsule.php b/gulliver/thirdparty/phing/lib/Capsule.php index be8fe46a7..693649177 100755 --- a/gulliver/thirdparty/phing/lib/Capsule.php +++ b/gulliver/thirdparty/phing/lib/Capsule.php @@ -122,8 +122,16 @@ class Capsule { // so that include "path/relative/to/templates"; can be used within templates $__old_inc_path = ini_get('include_path'); - if(is_dir($this->templatePath . PATH_SEPARATOR . $__old_inc_path)) { - ini_set('include_path', $this->templatePath . PATH_SEPARATOR . $__old_inc_path); + $path = $this->templatePath . PATH_SEPARATOR . $__old_inc_path; + if(strpos($path,":")>0){ + $firstPath = explode(":", $this->templatePath . PATH_SEPARATOR . $__old_inc_path); + if (is_dir($firstPath[0])) { + ini_set('include_path', $this->templatePath . PATH_SEPARATOR . $__old_inc_path); + } + } else { + if(is_dir($this->templatePath . PATH_SEPARATOR . $__old_inc_path)) { + ini_set('include_path', $this->templatePath . PATH_SEPARATOR . $__old_inc_path); + } } @ini_set('track_errors', true); diff --git a/gulliver/thirdparty/phing/lib/Zip.php b/gulliver/thirdparty/phing/lib/Zip.php index 16b1222ff..40dfe5959 100755 --- a/gulliver/thirdparty/phing/lib/Zip.php +++ b/gulliver/thirdparty/phing/lib/Zip.php @@ -3584,7 +3584,16 @@ class Archive_Zip public function encryptCrc32($string) { - return crc32($string); + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + return G::encryptCrc32($string); } } diff --git a/gulliver/thirdparty/tcpdf/tcpdf.php b/gulliver/thirdparty/tcpdf/tcpdf.php index 7a3594c2e..5e96dd903 100644 --- a/gulliver/thirdparty/tcpdf/tcpdf.php +++ b/gulliver/thirdparty/tcpdf/tcpdf.php @@ -29708,7 +29708,16 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: public function encryptOld($string) { - return md5($string); + if (!class_exists('G')) { + $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] ); + $docuroot = explode( '/', $realdocuroot ); + array_pop( $docuroot ); + $pathhome = implode( '/', $docuroot ) . '/'; + array_pop( $docuroot ); + $pathTrunk = implode( '/', $docuroot ) . '/'; + require_once($pathTrunk.'gulliver/system/class.g.php'); + } + return G::encryptOld($string); } } // END OF TCPDF CLASS diff --git a/workflow/engine/bin/cron.php b/workflow/engine/bin/cron.php index 9ab67a4ad..b3d4774f5 100755 --- a/workflow/engine/bin/cron.php +++ b/workflow/engine/bin/cron.php @@ -33,6 +33,12 @@ $e_all = defined('E_DEPRECATED') ? E_ALL & ~E_DEPRECATED : E_ALL; $e_all = defined('E_STRICT') ? $e_all & ~E_STRICT : $e_all; $e_all = $config['debug'] ? $e_all : $e_all & ~E_NOTICE; +G::LoadSystem('inputfilter'); +$filter = new InputFilter(); +$config['debug'] = $filter->validateInput($config['debug']); +$config['memory_limit'] = $filter->validateInput($config['memory_limit']); +$config['wsdl_cache'] = $filter->validateInput($config['wsdl_cache'],'int'); +$config['time_zone'] = $filter->validateInput($config['time_zone']); // Do not change any of these settings directly, use env.ini instead ini_set('display_errors', $config['debug']); ini_set('error_reporting', $e_all); diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 4d7b59945..205e981b3 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -90,6 +90,12 @@ if (!defined('PATH_HOME')) { $e_all = defined('E_STRICT') ? $e_all & ~E_STRICT : $e_all; $e_all = $config['debug'] ? $e_all : $e_all & ~E_NOTICE; + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $config['debug'] = $filter->validateInput($config['debug']); + $config['memory_limit'] = $filter->validateInput($config['memory_limit']); + $config['wsdl_cache'] = $filter->validateInput($config['wsdl_cache'],'int'); + $config['time_zone'] = $filter->validateInput($config['time_zone']); // Do not change any of these settings directly, use env.ini instead ini_set('display_errors', $config['debug']); ini_set('error_reporting', $e_all); @@ -355,8 +361,8 @@ Bootstrap::registerClass('wsResponse', PATH_HOME . "engine/classes/clas Bootstrap::registerClass("PMLicensedFeatures", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.licensedFeatures.php"); Bootstrap::registerClass("AddonsManagerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AddonsManagerPeer.php"); -/*----------------------------------********---------------------------------*/ -Bootstrap::registerClass('dashboards', PATH_HOME . "engine/classes/class.dashboards.php"); +/*----------------------------------********---------------------------------*/ +Bootstrap::registerClass('dashboards', PATH_HOME . "engine/classes/class.dashboards.php"); /*----------------------------------********---------------------------------*/ $arrayClass = array("Configuration", "EmailServer", "ListInbox", "ListParticipatedHistory"); @@ -371,18 +377,18 @@ foreach ($arrayClass as $value) { G::LoadClass("serverConfiguration"); G::LoadClass("dates"); //Load Criteria -/*----------------------------------********---------------------------------*/ -global $dateInit; -global $dateFinish; +/*----------------------------------********---------------------------------*/ +global $dateInit; +global $dateFinish; /*----------------------------------********---------------------------------*/ if (!defined('SYS_SYS')) { $sObject = $argv[1]; $sNow = $argv[2]; $dateSystem = $argv[3]; - /*----------------------------------********---------------------------------*/ - $dateInit = null; - $dateFinish = null; + /*----------------------------------********---------------------------------*/ + $dateInit = null; + $dateFinish = null; /*----------------------------------********---------------------------------*/ $sFilter = ''; @@ -527,17 +533,17 @@ function processWorkspace() resendEmails(); unpauseApplications(); calculateDuration(); - /*----------------------------------********---------------------------------*/ - calculateAppDuration(); + /*----------------------------------********---------------------------------*/ + calculateAppDuration(); /*----------------------------------********---------------------------------*/ executeEvents($sLastExecution); executeScheduledCases(); executeUpdateAppTitle(); executeCaseSelfService(); executePlugins(); - /*----------------------------------********---------------------------------*/ - fillReportByUser(); - fillReportByProcess(); + /*----------------------------------********---------------------------------*/ + fillReportByUser(); + fillReportByProcess(); /*----------------------------------********---------------------------------*/ } catch (Exception $oError) { saveLog("main", "error", "Error processing workspace : " . $oError->getMessage() . "\n"); @@ -728,29 +734,29 @@ function calculateDuration() } } -/*----------------------------------********---------------------------------*/ -function calculateAppDuration() -{ - global $sFilter; - - if ($sFilter != '' && strpos($sFilter, 'calculateapp') === false) { - return false; - } - - setExecutionMessage("Calculating Duration by Application"); - - try { - $oApplication = new Application(); - $oApplication->calculateAppDuration(1); - - setExecutionResultMessage('DONE'); - saveLog('calculateDurationByApp', 'action', 'Calculating Duration by Application'); - } catch (Exception $oError) { - setExecutionResultMessage('WITH ERRORS', 'error'); - eprintln(" '-".$oError->getMessage(), 'red'); - saveLog('calculateDurationByApp', 'error', 'Error Calculating Duration: ' . $oError->getMessage()); - } -} +/*----------------------------------********---------------------------------*/ +function calculateAppDuration() +{ + global $sFilter; + + if ($sFilter != '' && strpos($sFilter, 'calculateapp') === false) { + return false; + } + + setExecutionMessage("Calculating Duration by Application"); + + try { + $oApplication = new Application(); + $oApplication->calculateAppDuration(1); + + setExecutionResultMessage('DONE'); + saveLog('calculateDurationByApp', 'action', 'Calculating Duration by Application'); + } catch (Exception $oError) { + setExecutionResultMessage('WITH ERRORS', 'error'); + eprintln(" '-".$oError->getMessage(), 'red'); + saveLog('calculateDurationByApp', 'error', 'Error Calculating Duration: ' . $oError->getMessage()); + } +} /*----------------------------------********---------------------------------*/ function executeEvents($sLastExecution, $sNow=null) @@ -1095,66 +1101,66 @@ function setExecutionResultMessage($m, $t='') eprintln("[$m]", $c); } -/*----------------------------------********---------------------------------*/ -function fillReportByUser () -{ - try { - global $sFilter; - global $dateInit; - global $dateFinish; - - if (strpos($sFilter, 'report_by_user') === false) { - return false; - } - if ($dateInit == null) { - eprintln("You must enter the starting date.", "red"); - eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red"); - return false; - } - - $dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s"); - - $appcv = new AppCacheView(); - $appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP ); - setExecutionMessage("Calculating data to fill the 'User Reporting'..."); - $appcv->fillReportByUser($dateInit, $dateFinish); - setExecutionResultMessage("DONE"); - } catch (Exception $e) { - setExecutionResultMessage("WITH ERRORS", "error"); - eprintln(" '-" . $e->getMessage(), "red"); - saveLog("fillReportByUser", "error", "Error in fill report by user: " . $e->getMessage()); - } -} - -function fillReportByProcess () -{ - try { - global $sFilter; - global $dateInit; - global $dateFinish; - - if (strpos($sFilter, 'report_by_process') === false) { - return false; - } - - if ($dateInit == null) { - eprintln("You must enter the starting date.", "red"); - eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red"); - return false; - } - - $dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s"); - $appcv = new AppCacheView(); - $appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP ); - - setExecutionMessage("Calculating data to fill the 'Process Reporting'..."); - $appcv->fillReportByProcess($dateInit, $dateFinish); - setExecutionResultMessage("DONE"); - } catch (Exception $e) { - setExecutionResultMessage("WITH ERRORS", "error"); - eprintln(" '-" . $e->getMessage(), "red"); - saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage()); - } -} +/*----------------------------------********---------------------------------*/ +function fillReportByUser () +{ + try { + global $sFilter; + global $dateInit; + global $dateFinish; + + if (strpos($sFilter, 'report_by_user') === false) { + return false; + } + if ($dateInit == null) { + eprintln("You must enter the starting date.", "red"); + eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red"); + return false; + } + + $dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s"); + + $appcv = new AppCacheView(); + $appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP ); + setExecutionMessage("Calculating data to fill the 'User Reporting'..."); + $appcv->fillReportByUser($dateInit, $dateFinish); + setExecutionResultMessage("DONE"); + } catch (Exception $e) { + setExecutionResultMessage("WITH ERRORS", "error"); + eprintln(" '-" . $e->getMessage(), "red"); + saveLog("fillReportByUser", "error", "Error in fill report by user: " . $e->getMessage()); + } +} + +function fillReportByProcess () +{ + try { + global $sFilter; + global $dateInit; + global $dateFinish; + + if (strpos($sFilter, 'report_by_process') === false) { + return false; + } + + if ($dateInit == null) { + eprintln("You must enter the starting date.", "red"); + eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red"); + return false; + } + + $dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s"); + $appcv = new AppCacheView(); + $appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP ); + + setExecutionMessage("Calculating data to fill the 'Process Reporting'..."); + $appcv->fillReportByProcess($dateInit, $dateFinish); + setExecutionResultMessage("DONE"); + } catch (Exception $e) { + setExecutionResultMessage("WITH ERRORS", "error"); + eprintln(" '-" . $e->getMessage(), "red"); + saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage()); + } +} /*----------------------------------********---------------------------------*/ diff --git a/workflow/engine/bin/messageeventcron.php b/workflow/engine/bin/messageeventcron.php index 4d884768d..60d79ee13 100644 --- a/workflow/engine/bin/messageeventcron.php +++ b/workflow/engine/bin/messageeventcron.php @@ -43,7 +43,11 @@ try { G::LoadClass("system"); $config = System::getSystemConfiguration(); - + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $config['time_zone'] = $filter->validateInput($config['time_zone']); + ini_set("date.timezone", $config["time_zone"]); //CRON command options diff --git a/workflow/engine/bin/messageeventcron_single.php b/workflow/engine/bin/messageeventcron_single.php index b64d86f7c..f92ccca8e 100644 --- a/workflow/engine/bin/messageeventcron_single.php +++ b/workflow/engine/bin/messageeventcron_single.php @@ -91,6 +91,11 @@ try { $e_all = (defined("E_STRICT"))? $e_all & ~E_STRICT : $e_all; $e_all = ($config["debug"])? $e_all : $e_all & ~E_NOTICE; + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $config['debug'] = $filter->validateInput($config['debug']); + $config['wsdl_cache'] = $filter->validateInput($config['wsdl_cache'],'int'); + $config['time_zone'] = $filter->validateInput($config['time_zone']); //Do not change any of these settings directly, use env.ini instead ini_set("display_errors", $config["debug"]); ini_set("error_reporting", $e_all); diff --git a/workflow/engine/bin/reindex_solr.php b/workflow/engine/bin/reindex_solr.php index 0c4795091..97206b169 100644 --- a/workflow/engine/bin/reindex_solr.php +++ b/workflow/engine/bin/reindex_solr.php @@ -207,9 +207,16 @@ if (! defined ('SYS_SYS')) { define ('TIME_ZONE', $config ['time_zone']); date_default_timezone_set (TIME_ZONE); - print "TIME_ZONE: " . TIME_ZONE . "\n"; - print "MEMCACHED_ENABLED: " . MEMCACHED_ENABLED . "\n"; - print "MEMCACHED_SERVER: " . MEMCACHED_SERVER . "\n"; + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $TIME_ZONE = $filter->xssFilterHard(TIME_ZONE); + $MEMCACHED_ENABLED = $filter->xssFilterHard(MEMCACHED_ENABLED); + $MEMCACHED_SERVER = $filter->xssFilterHard(MEMCACHED_SERVER); + + print "TIME_ZONE: " . $TIME_ZONE . "\n"; + print "MEMCACHED_ENABLED: " . $MEMCACHED_ENABLED . "\n"; + print "MEMCACHED_SERVER: " . $MEMCACHED_SERVER . "\n"; // **************************************** include_once (PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths_installed.php'); diff --git a/workflow/engine/bin/verify_solr.php b/workflow/engine/bin/verify_solr.php index 5466c7362..1c5c872a7 100644 --- a/workflow/engine/bin/verify_solr.php +++ b/workflow/engine/bin/verify_solr.php @@ -139,13 +139,21 @@ if (! defined ('SYS_SYS')) { define ('TIME_ZONE', $config ['time_zone']); date_default_timezone_set (TIME_ZONE); - print "TIME_ZONE: " . TIME_ZONE . "\n"; - print "MEMCACHED_ENABLED: " . MEMCACHED_ENABLED . "\n"; - print "MEMCACHED_SERVER: " . MEMCACHED_SERVER . "\n"; + // **************************************** include_once (PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths_installed.php'); include_once (PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php'); + + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $TIME_ZONE = $filter->xssFilterHard(TIME_ZONE); + $MEMCACHED_ENABLED = $filter->xssFilterHard(MEMCACHED_ENABLED); + $MEMCACHED_SERVER = $filter->xssFilterHard(MEMCACHED_SERVER); + + print "TIME_ZONE: " . $TIME_ZONE . "\n"; + print "MEMCACHED_ENABLED: " . $MEMCACHED_ENABLED . "\n"; + print "MEMCACHED_SERVER: " . $MEMCACHED_SERVER . "\n"; // ***************** PM Paths DATA ************************** define ('PATH_DATA_SITE', PATH_DATA . 'sites/' . SYS_SYS . '/'); diff --git a/workflow/engine/classes/class.indicatorsCalculator.php b/workflow/engine/classes/class.indicatorsCalculator.php index badf19261..aeb6cc16f 100644 --- a/workflow/engine/classes/class.indicatorsCalculator.php +++ b/workflow/engine/classes/class.indicatorsCalculator.php @@ -513,9 +513,9 @@ class indicatorsCalculator $params[':usrUid'] = $usrUid; $sqlString = "SELECT - COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS OVERDUE, - COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) > 0 ) , 0 ) AS ONTIME, - COALESCE( SUM( DATEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 ) , 0 ) AS ATRISK + COALESCE( SUM( TIMEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS OVERDUE, + COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) > 0 ) , 0 ) AS ONTIME, + COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 && TIMEDIFF( DEL_DUE_DATE , NOW( ) ) > 0) , 0 ) AS ATRISK FROM LIST_INBOX WHERE USR_UID = :usrUid AND APP_STATUS = 'TO_DO' @@ -534,9 +534,9 @@ class indicatorsCalculator APP_TAS_TITLE AS taskTitle, APP_PRO_TITLE AS proTitle, - COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS overdue, - COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) > 0 ) , 0 ) AS onTime, - COALESCE( SUM( DATEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 ) , 0 ) AS atRisk + COALESCE( SUM( TIMEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS overdue, + COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) > 0 ) , 0 ) AS onTime, + COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 && TIMEDIFF( DEL_DUE_DATE , NOW( ) ) > 0) , 0 ) AS atRisk FROM LIST_INBOX WHERE USR_UID = :usrUid AND APP_STATUS = 'TO_DO' @@ -561,8 +561,8 @@ class indicatorsCalculator if (is_array($result) && isset($result[0])) { $response['overdue'] = $result[0]['OVERDUE']; - $response['atRisk'] = $result[0]['ONTIME']; - $response['onTime'] = $result[0]['ATRISK']; + $response['atRisk'] = $result[0]['ATRISK']; + $response['onTime'] = $result[0]['ONTIME']; $total = $response['overdue'] + $response['atRisk'] + $response['onTime']; if ($total != 0) { @@ -578,20 +578,20 @@ class indicatorsCalculator $result[$key]['overdue'] = $value['overdue']; $result[$key]['atRisk'] = $value['atRisk']; $result[$key]['onTime'] = $value['onTime']; - $result[$key]['percentageOverdue'] = 0; - $result[$key]['percentageAtRisk'] = 0; - $result[$key]['percentageOnTime'] = 0; - $result[$key]['percentageTotalOverdue'] = 0; - $result[$key]['percentageTotalAtRisk'] = 0; - $result[$key]['percentageTotalOnTime'] = 0; + $result[$key]['percentageOverdue'] = 0; + $result[$key]['percentageAtRisk'] = 0; + $result[$key]['percentageOnTime'] = 0; + $result[$key]['percentageTotalOverdue'] = 0; + $result[$key]['percentageTotalAtRisk'] = 0; + $result[$key]['percentageTotalOnTime'] = 0; $total = $value['overdue'] + $value['onTime'] + $value['atRisk']; if ($total != 0) { $result[$key]['percentageOverdue'] = ($value['overdue']*100)/$total; $result[$key]['percentageAtRisk'] = ($value['atRisk']*100)/$total; $result[$key]['percentageOnTime'] = ($value['onTime']*100)/$total; - $result[$key]['percentageTotalOverdue'] = $response['overdue'] != 0 ? ($value['overdue']*100)/$response['overdue']: 0; - $result[$key]['percentageTotalAtRisk'] = $response['atRisk'] != 0 ? ($value['atRisk']*100)/$response['atRisk'] : 0; - $result[$key]['percentageTotalOnTime'] = $response['onTime'] != 0 ? ($value['onTime']*100)/$response['onTime']: 0; + $result[$key]['percentageTotalOverdue'] = $response['overdue'] != 0 ? ($value['overdue']*100)/$response['overdue']: 0; + $result[$key]['percentageTotalAtRisk'] = $response['atRisk'] != 0 ? ($value['atRisk']*100)/$response['atRisk'] : 0; + $result[$key]['percentageTotalOnTime'] = $response['onTime'] != 0 ? ($value['onTime']*100)/$response['onTime']: 0; } } $response['dataList'] = $result; diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php index 0ab57a374..e13391417 100755 --- a/workflow/engine/classes/model/AdditionalTables.php +++ b/workflow/engine/classes/model/AdditionalTables.php @@ -451,17 +451,18 @@ class AdditionalTables extends BaseAdditionalTables if (isset($_POST['sort'])) { $_POST['sort'] = $filter->validateInput($_POST['sort']); + $_POST['dir'] = $filter->validateInput($_POST['dir']); if ($_POST['dir'] == 'ASC') { if ($keyOrderUppercase) { - eval('$oCriteria->addAscendingOrderByColumn("' . $sort . '");'); + eval('$oCriteria->addAscendingOrderByColumn("' . $_POST['sort'] . '");'); } else { - eval('$oCriteria->addAscendingOrderByColumn(' . $sClassPeerName . '::' . $sort . ');'); + eval('$oCriteria->addAscendingOrderByColumn(' . $sClassPeerName . '::' . $_POST['sort'] . ');'); } } else { if ($keyOrderUppercase) { - eval('$oCriteria->addDescendingOrderByColumn("' . $sort . '");'); + eval('$oCriteria->addDescendingOrderByColumn("' . $_POST['sort'] . '");'); } else { - eval('$oCriteria->addDescendingOrderByColumn(' . $sClassPeerName . '::' . $sort . ');'); + eval('$oCriteria->addDescendingOrderByColumn(' . $sClassPeerName . '::' . $_POST['sort'] . ');'); } } } diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index 91b444eef..724088f89 100755 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -404,7 +404,7 @@ class AppDelegation extends BaseAppDelegation } //Risk date - $riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), round($riskTime), $data['TAS_TIMEUNIT'], $arrayCalendarData); + $riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), $riskTime, $data['TAS_TIMEUNIT'], $arrayCalendarData); return $riskDate; } catch (Exception $e) { diff --git a/workflow/engine/classes/model/DashboardIndicator.php b/workflow/engine/classes/model/DashboardIndicator.php index e0eef6b5c..baa10cc79 100644 --- a/workflow/engine/classes/model/DashboardIndicator.php +++ b/workflow/engine/classes/model/DashboardIndicator.php @@ -65,14 +65,18 @@ class DashboardIndicator extends BaseDashboardIndicator $oldValue = current(reset($calculator->peiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE))); $row['DAS_IND_VARIATION'] = $value - $oldValue; $row['DAS_IND_OLD_VALUE'] = $oldValue; - $row['DAS_IND_PERCENT_VARIATION'] = round(($value - $oldValue) * 100 / (($oldValue == 0) ? 1 : $oldValue), 1); + $row['DAS_IND_PERCENT_VARIATION'] = $oldValue != 0 + ? round(($value - $oldValue) * 100 / $oldValue) + : "--"; break; case '1030': $value = current(reset($calculator->ueiHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE))); $oldValue = current(reset($calculator->ueiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE))); $row['DAS_IND_VARIATION'] = $value - $oldValue; $row['DAS_IND_OLD_VALUE'] = $oldValue; - $row['DAS_IND_PERCENT_VARIATION'] = round(($value - $oldValue) * 100 / (($oldValue == 0) ? 1 : $oldValue), 1); + $row['DAS_IND_PERCENT_VARIATION'] = $oldValue != 0 + ? round(($value - $oldValue) * 100 / $oldValue) + : "--"; break; case '1050': $value = $calculator->statusIndicatorGeneral($userUid); diff --git a/workflow/engine/classes/model/Dynaform.php b/workflow/engine/classes/model/Dynaform.php index 598db7931..16581db1a 100755 --- a/workflow/engine/classes/model/Dynaform.php +++ b/workflow/engine/classes/model/Dynaform.php @@ -180,6 +180,10 @@ class Dynaform extends BaseDynaform $aData['DYN_VERSION'] = 0; } $this->setDynVersion( $aData['DYN_VERSION'] ); + if (!isset($aData['DYN_CONTENT'])) { + $aData['DYN_CONTENT'] = "{}"; + } + $this->setDynContent( $aData['DYN_CONTENT'] ); if ($this->validate()) { $con->begin(); $res = $this->save(); diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index b7507c36e..5b5925fa1 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -25,6 +25,15 @@ class ListCompleted extends BaseListCompleted */ public function create($data) { + $criteria = new Criteria(); + $criteria->addSelectColumn(ListCompletedPeer::APP_UID); + $criteria->add( ListCompletedPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $dataset = ListCompletedPeer::doSelectRS($criteria); + $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + if ($dataset->next()) { + return 1; + } + $criteria = new Criteria(); $criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); @@ -97,9 +106,27 @@ class ListCompleted extends BaseListCompleted $users = new Users(); $users->refreshTotal($data['USR_UID'], 'add', 'completed'); if ($data['DEL_PREVIOUS'] != 0) { - $users->refreshTotal($data['USR_UID'], 'remove', 'inbox'); + $criteria = new Criteria(); + $criteria->addSelectColumn(TaskPeer::TAS_TYPE); + $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL ); + $dataset = TaskPeer::doSelectRS($criteria); + $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $dataset->next(); + $aRow = $dataset->getRow(); + if ($aRow['TAS_TYPE'] != 'SUBPROCESS') { + $users->refreshTotal($data['USR_UID'], 'remove', 'inbox'); + } } else { - $users->refreshTotal($data['USR_UID'], 'remove', 'draft'); + $criteria = new Criteria(); + $criteria->addSelectColumn(SubApplicationPeer::APP_UID); + $criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $dataset = SubApplicationPeer::doSelectRS($criteria); + $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + if ($dataset->next()) { + $users->refreshTotal($data['USR_UID'], 'remove', 'inbox'); + } else { + $users->refreshTotal($data['USR_UID'], 'remove', 'draft'); + } } $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 737653c5a..e0248996e 100755 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -699,6 +699,9 @@ class Installer extends Controller try { $db_host = ($db_port != '' && $db_port != 3306) ? $db_hostname . ':' . $db_port : $db_hostname; + $db_host = $filter->validateInput($db_host); + $db_username = $filter->validateInput($db_username); + $db_password = $filter->validateInput($db_password); $this->link = @mysql_connect( $db_host, $db_username, $db_password ); $this->installLog( G::LoadTranslation('ID_CONNECT_TO_SERVER', SYS_LANG, Array($db_hostname, $db_port, $db_username ) )); @@ -1032,6 +1035,9 @@ class Installer extends Controller try { $db_host = ($db_port != '' && $db_port != 1433) ? $db_hostname . ':' . $db_port : $db_hostname; + $db_host = $filter->validateInput($db_host); + $db_username = $filter->validateInput($db_username); + $db_password = $filter->validateInput($db_password); $this->link = @mssql_connect( $db_host, $db_username, $db_password ); $this->installLog( G::LoadTranslation('ID_CONNECT_TO_SERVER', SYS_LANG, Array( $db_hostname, $db_port, $db_username )) ); @@ -1231,6 +1237,9 @@ class Installer extends Controller $info = new stdclass(); if ($_REQUEST['db_engine'] == 'mysql') { + $_REQUEST['db_hostname'] = $filter->validateInput($_REQUEST['db_hostname']); + $_REQUEST['db_username'] = $filter->validateInput($_REQUEST['db_username']); + $_REQUEST['db_password'] = $filter->validateInput($_REQUEST['db_password']); $link = @mysql_connect( $_REQUEST['db_hostname'], $_REQUEST['db_username'], $_REQUEST['db_password'] ); $_REQUEST['wfDatabase'] = $filter->validateInput($_REQUEST['wfDatabase'], 'nosql'); $query = "show databases like '%s' "; @@ -1296,6 +1305,7 @@ class Installer extends Controller } $db_host = ($db_port != '' && $db_port != 1433) ? $db_hostname . ':' . $db_port : $db_hostname; + $link = @mysql_connect( $db_host, $db_username, $db_password ); if (! $link) { $info->message .= G::LoadTranslation('ID_MYSQL_CREDENTIALS_WRONG'); @@ -1348,6 +1358,7 @@ class Installer extends Controller } $db_host = ($db_port != '' && $db_port != 1433) ? $db_hostname . ':' . $db_port : $db_hostname; + $link = @mssql_connect( $db_host, $db_username, $db_password ); if (! $link) { $info->message .= G::LoadTranslation('ID_MYSQL_CREDENTIALS_WRONG'); @@ -1661,6 +1672,7 @@ class Installer extends Controller $wf = trim( $_REQUEST['wfDatabase'] ); $db_host = ($db_port != '' && $db_port != 3306) ? $db_hostname . ':' . $db_port : $db_hostname; + $link = @mysql_connect( $db_host, $db_username, $db_password ); @mysql_select_db($wf, $link); $res = mysql_query( "SELECT STORE_ID FROM ADDONS_MANAGER WHERE ADDON_NAME = '" . $namePlugin . "'", $link ); diff --git a/workflow/engine/js/strategicDashboard/viewDashboardModel.js b/workflow/engine/js/strategicDashboard/viewDashboardModel.js index c2b63eca1..6a96e1c3f 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardModel.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardModel.js @@ -78,7 +78,6 @@ ViewDashboardModel.prototype.getPositionIndicator = function(callBack) { "y" : originalObject.y, "width" : originalObject.width, "height" : originalObject.height - }; graphData.push(map); }); diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js index 1890c651e..e1ed03b45 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js @@ -90,18 +90,37 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) { newObject.comparative = Math.round(newObject.comparative*1000)/1000; newObject.comparative = ((newObject.comparative > 0)? "+": "") + newObject.comparative; + newObject.percentComparative = (newObject.percentComparative != '--') + ? '(' + newObject.percentComparative + '%)' + : ""; + + newObject.value = (newObject.category == "normal") ? Math.round(newObject.value) + "" : Math.round(newObject.value*100)/100 + "" newObject.favorite = 0; - newObject.percentageOverdue = Math.round(newObject.percentageOverdue); - newObject.percentageAtRisk = Math.round(newObject.percentageAtRisk); - //to be sure that percentages sum up to 100 (the rounding will lost decimals)% - newObject.percentageOnTime = 100 - newObject.percentageOverdue - newObject.percentageAtRisk; - newObject.overdueVisibility = (newObject.percentageOverdue > 0)? "visible" : "hidden"; - newObject.atRiskVisibility = (newObject.percentageAtRisk > 0)? "visible" : "hidden"; - newObject.onTimeVisibility = (newObject.percentageOnTime > 0)? "visible" : "hidden"; + + newObject.percentageOverdueWidth = Math.round(newObject.percentageOverdue); + newObject.percentageAtRiskWidth = Math.round(newObject.percentageAtRisk); + //to be sure that percentages sum up to 100 (the rounding will lose decimals)% + newObject.percentageOnTimeWidth = 100 - newObject.percentageOverdueWidth - newObject.percentageAtRiskWidth; + + newObject.percentageOverdueToShow = ((newObject.percentageOverdue == 0 ||newObject.percentageOverdue == null ) + ? "" + : newObject.percentageOverdueWidth + "%"); + + newObject.percentageAtRiskToShow = ((newObject.percentageAtRisk == 0 || newObject.percentageAtRisk == null) + ? "" + : newObject.percentageAtRiskWidth + "%"); + + newObject.percentageOnTimeToShow = ((newObject.percentageOnTime == 0 || newObject.percentageOnTime == 0) + ? G_STRING['ID_INBOX'] + ' ' + G_STRING['ID_EMPTY'] + : newObject.percentageOnTimeWidth + "%"); + + newObject.overdueVisibility = (newObject.percentageOverdueWidth > 0) ? "visible" : "hidden"; + newObject.atRiskVisibility = (newObject.percentageAtRiskWidth > 0) ? "visible" : "hidden"; + newObject.onTimeVisibility = (newObject.percentageOnTimeWidth > 0) ? "visible" : "hidden"; returnList.push(newObject); i++; }); diff --git a/workflow/engine/js/strategicDashboard/viewDashboardView.js b/workflow/engine/js/strategicDashboard/viewDashboardView.js index d62c6fc20..e56fb4f56 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardView.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js @@ -353,20 +353,17 @@ $(document).ready(function() { presenter.getDashboardIndicators(dashboardId, defaultInitDate(), defaultEndDate()) .done(function(indicatorsVM) { fillIndicatorWidgets(indicatorsVM); - //TODO use real data loadIndicator(getFavoriteIndicator().id, defaultInitDate(), defaultEndDate()); }); }); $('#indicatorsGridStack').on('click','.ind-button-selector', function() { var indicatorId = $(this).data('indicator-id'); - //TODO use real data loadIndicator(indicatorId, defaultInitDate(), defaultEndDate()); }); $('body').on('click','.bread-back-selector', function() { var indicatorId = window.currentIndicator.id; - //TODO use real data loadIndicator(indicatorId, defaultInitDate(), defaultEndDate()); return false; }); @@ -380,7 +377,6 @@ $(document).ready(function() { "inefficiencyCost":$(this).data('detail-cost'), "name":$(this).data('detail-name') }; - //TODO PASS REAL VALUES presenter.getSpecialIndicatorSecondLevel(detailId, window.currentIndicator.type, defaultInitDate(), defaultEndDate()) .done(function (viewModel) { fillSpecialIndicatorSecondView(viewModel); @@ -406,8 +402,15 @@ var hideTitleAndSortDiv = function(){ switch (window.currentIndicator.type) { case "1010": case "1030": - $('#relatedLabel').css('visibility', 'visible'); - $('#relatedLabel').show(); + if($('.detail-button-selector').length == 0) { + $('#relatedLabel').hide(); + //$('#relatedLabel').find('h3').text(G_STRING['ID_NO_DATA_TO_DISPLAY']); + } + else { + $('#relatedLabel').css('visibility', 'visible'); + $('#relatedLabel').show(); + } + break; default: $('#relatedLabel').hide(); @@ -419,7 +422,17 @@ var selectedOrderOfDetailList = function () { return ($('#sortListButton').hasClass('fa-chevron-up') ? "up" : "down"); } +var selectDefaultMonthAndYear = function () { + var compareDate = new Date(); + compareDate.setMonth(compareDate.getMonth() - 1); + var compareMonth = compareDate.getMonth() + 1; + var compareYear = compareDate.getYear(); + $('#month').val(compareMonth); + $('#year').val(compareYear); +} + var initialDraw = function () { + selectDefaultMonthAndYear(); presenter.getUserDashboards(pageUserId) .then(function(dashboardsVM) { fillDashboardsList(dashboardsVM); @@ -523,10 +536,6 @@ var fillIndicatorWidgets = function (presenterData) { $.each(presenterData, function(key, indicator) { var $widget = widgetBuilder.getIndicatorWidget(indicator); grid.add_widget($widget, indicator.toDrawX, indicator.toDrawY, indicator.toDrawWidth, indicator.toDrawHeight, true); - //TODO will exist animation? - /*if (indicator.category == "normal") { - animateProgress(indicator, $widget); - }*/ var $title = $widget.find('.ind-title-selector'); if (indicator.favorite == "1") { $title.addClass("panel-active"); @@ -548,7 +557,8 @@ var fillStatusIndicatorFirstView = function (presenterData) { containerId:'graph1', width:300, height:300, - stretch:true + stretch:true, + noDataText: G_STRING.ID_DISPLAY_EMPTY }, graph: { @@ -608,7 +618,8 @@ var fillSpecialIndicatorFirstView = function(presenterData) { containerId:'specialIndicatorGraph', width:300, height:300, - stretch:true + stretch:true, + noDataText: G_STRING.ID_NO_INEFFICIENT_PROCESSES }, graph: { allowDrillDown:false, @@ -627,7 +638,8 @@ var fillSpecialIndicatorFirstView = function(presenterData) { containerId:'specialIndicatorGraph', width:500, height:300, - stretch:true + stretch:true, + noDataText: G_STRING.ID_NO_INEFFICIENT_USER_GROUPS }, graph: { allowDrillDown:false, @@ -725,11 +737,13 @@ var fillSpecialIndicatorSecondView = function(presenterData) { if (window.currentIndicator.type == "1010") { detailParams.graph.axisX.label = G_STRING['ID_TASK'] ; + detailParams.canvas.noDataText = G_STRING['ID_NO_INEFFICIENT_TASKS'] ; var graph = new BarChart(presenterData.dataToDraw, detailParams, null, null); graph.drawChart(); } if (window.currentIndicator.type == "1030") { + detailParams.canvas.noDataText = G_STRING['ID_NO_INEFFICIENT_USERS'] ; var graph = new BarChart(presenterData.dataToDraw, detailParams, null, null); graph.drawChart(); } diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php index ca0f32829..bd3dc2998 100755 --- a/workflow/engine/menus/setup.php +++ b/workflow/engine/menus/setup.php @@ -156,5 +156,5 @@ if ($RBAC->userCanAccess("PM_SETUP") == 1) { /*----------------------------------********---------------------------------*/ $G_TMP_MENU->AddIdRawOption("PMENTERPRISE", "../enterprise/addonsStore", G::LoadTranslation('ID_MENU_NAME') . $licStatusMsg, "", "", "plugins"); /*----------------------------------********---------------------------------*/ - $G_TMP_MENU->AddIdRawOption("CASES_LIST_SETUP", "../cases/casesListSetup", G::LoadTranslation('ID_CASES_LIST'), "", "", "settings"); + $G_TMP_MENU->AddIdRawOption("CASES_LIST_SETUP", "../cases/casesListSetup", G::LoadTranslation("ID_CUSTOM_CASES_LISTS"), "", "", "settings"); } diff --git a/workflow/engine/methods/setup/setup.php b/workflow/engine/methods/setup/setup.php index 022c36cff..978cddd1c 100755 --- a/workflow/engine/methods/setup/setup.php +++ b/workflow/engine/methods/setup/setup.php @@ -33,7 +33,6 @@ G::LoadSystem('inputfilter'); $filter = new InputFilter(); $_GET['i18'] = $filter->xssFilterHard($_GET['i18']); $_GET['newSite'] = $filter->xssFilterHard($_GET['newSite']); -$_GET['module'] = $filter->xssFilterHard($_GET['module']); if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1) return $RBAC_Response; @@ -78,10 +77,10 @@ foreach ($toolItems as $item) { $G_PUBLISH->AddContent( 'template', '', '', '', $template ); G::RenderPage( 'publish' ); if (isset( $_GET['module'] )) { - + $module = $filter->xssFilterHard($_GET['module']); print " "; } diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php index b6578b3e3..e81f79ccd 100755 --- a/workflow/engine/methods/setup/skin_Ajax.php +++ b/workflow/engine/methods/setup/skin_Ajax.php @@ -319,9 +319,9 @@ function importSkin () function exportSkin ($skinToExport = "") { + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); try { - G::LoadSystem('inputfilter'); - $filter = new InputFilter(); if (! isset( $_REQUEST['SKIN_FOLDER_ID'] )) { throw (new Exception( G::LoadTranslation( 'ID_SKIN_NAME_REQUIRED' ) )); } @@ -356,19 +356,23 @@ function exportSkin ($skinToExport = "") $response['success'] = true; $response['message'] = $skinTar; G::auditLog("ExportSkin", "Skin Name: ".$skinName); + + $response = $filter->xssFilterHard($response); + print_r( G::json_encode( $response ) ); } catch (Exception $e) { $response['success'] = false; $response['message'] = $e->getMessage(); + $response = $filter->xssFilterHard($response); print_r( G::json_encode( $response ) ); } } function deleteSkin () { + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); try { - G::LoadSystem('inputfilter'); - $filter = new InputFilter(); $_REQUEST['SKIN_FOLDER_ID'] = $filter->xssFilterHard($_REQUEST['SKIN_FOLDER_ID']); if (! (isset( $_REQUEST['SKIN_FOLDER_ID'] ))) { @@ -389,6 +393,7 @@ function deleteSkin () } catch (Exception $e) { $response['success'] = false; $response['error'] = $response['message'] = $e->getMessage(); + $response = $filter->xssFilterHard($response); print_r( G::json_encode( $response ) ); } } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php index 981562d4e..9797e571c 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php @@ -323,11 +323,15 @@ class Consolidated $oCriteria->add($oCriteria->getNewCriterion(AppCacheViewPeer::APP_NUMBER, $search, Criteria::LIKE)); } } + + G::LoadSystem('inputfilter'); + $filter = new \InputFilter(); if ($sort != "") { $reportTable = new ReportTables(); $arrayReportTableVar = $reportTable->getTableVars($tableUid); - + $tableName = $filter->validateInput($tableName); + $sort = $filter->validateInput($sort); if (in_array($sort, $arrayReportTableVar)) { $sort = strtoupper($sort); eval("\$field = " . $tableName . "Peer::" . $sort . ";"); diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php index 2bbf9ba5d..81b145247 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php @@ -47,10 +47,6 @@ class DynaForm extends Api $dynaForm->setArrayFieldNameForException(array("processUid" => "prj_uid")); $arrayData = $dynaForm->executeCreate($prj_uid, $request_data); - if (!array_key_exists('dyn_content', $request_data)) { - $request_data['dyn_content']="{}"; - } - $arrayData = $dynaForm->update($arrayData['dyn_uid'], $request_data); $response = $arrayData; diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index c9d76d383..d47f23a3d 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -88,9 +88,9 @@
    • -
  • +
    • -
    • +
  • diff --git a/workflow/engine/templates/strategicDashboard/formDashboard.js b/workflow/engine/templates/strategicDashboard/formDashboard.js index ab4025611..46df67957 100644 --- a/workflow/engine/templates/strategicDashboard/formDashboard.js +++ b/workflow/engine/templates/strategicDashboard/formDashboard.js @@ -41,7 +41,6 @@ var frmDashboard; var addTabButton; var tabPanel; var dashboardIndicatorFields; -var dashboardIndicatorPanel; var store; var indexTab = 0; @@ -49,12 +48,11 @@ var comboPageSize = 10; var resultTpl; var storeIndicatorType; var storeGraphic; -var storeFrecuency; +var storeFrequency; var storeProject; var storeGroup; var storeUsers; var dataUserGroup; -var dasIndUid; var flag = true; var myMask; var dataIndicator = ''; @@ -63,13 +61,13 @@ var tabActivate = []; Ext.onReady( function() { myMask = new Ext.LoadMask(Ext.getBody(), {msg:_('ID_LOADING')}); - + Ext.QuickTips.init(); resultTpl = new Ext.XTemplate( '
    ', - ' {APP_PRO_TITLE}', + ' {APP_PRO_TITLE}', '
    ' ); @@ -79,21 +77,22 @@ Ext.onReady( function() { items : [ { id : 'DAS_TITLE', - fieldLabel : _('ID_DASHBOARD_TITLE'), + fieldLabel : ' * ' + _('ID_DASHBOARD_TITLE'), xtype : 'textfield', anchor : '85%', maxLength : 250, - maskRe : /([a-zA-Z0-9\s]+)$/, + maskRe : /([a-zA-Z0-9_'\s]+)$/, + regex : /([a-zA-Z0-9_'\s]+)$/, + regexText : _('ID_INVALID_VALUE', _('ID_DASHBOARD_TITLE')), allowBlank : false }, { xtype : 'textarea', id : 'DAS_DESCRIPTION', fieldLabel : _('ID_DESCRIPTION'), - labelSeparator : '', anchor : '85%', - maskRe : /([a-zA-Z0-9\s]+)$/, - height : 50, + maskRe : /([a-zA-Z0-9_'\s]+)$/, + height : 50 } ] }); @@ -238,7 +237,7 @@ Ext.onReady( function() { } }); - + storeIndicatorType = new Ext.data.GroupingStore( { proxy : new Ext.data.HttpProxy({ api: { @@ -295,7 +294,7 @@ Ext.onReady( function() { } }); - storeFrecuency = new Ext.data.GroupingStore( { + storeFrequency = new Ext.data.GroupingStore( { proxy : new Ext.data.HttpProxy({ api: { read : urlProxy + 'catalog/periodicity' @@ -448,7 +447,7 @@ Ext.onReady( function() { return '
    ' + '

    {owner_uid}{owner_label}

    ' + '{excerpt}' + - '
    '; + ''; } }, //pageSize : 10, @@ -485,7 +484,7 @@ Ext.onReady( function() { } }, { - title: _('ID_PRO_USER'), + title: _('ID_PRO_USER') }, ownerInfoGrid ] @@ -494,7 +493,7 @@ Ext.onReady( function() { addTabButton = new Ext.Button ({ text: _('ID_NEW_TAB_INDICATOR'), iconCls: 'button_menu_ext ss_sprite ss_add', - handler: addTab, + handler: addTab }); tabPanel = new Ext.TabPanel({ @@ -528,23 +527,24 @@ Ext.onReady( function() { flag = true; break; case 'yes': + tabPanel.getItem(component.id).show(); flag = false; var dasIndUid = Ext.getCmp('DAS_IND_UID_'+component.id).getValue(); if (typeof dasIndUid != 'undefined' && dasIndUid != '') { removeIndicator(dasIndUid); } tabActivate.remove(component.id); - tabPanel.remove(component); + tabPanel.remove(component, true); break; } }, scope: that }); - return false; + return false; } else { flag = true; } - + }, tabchange : function ( that, tab ) { var id = tabPanel.getActiveTab().id; @@ -626,12 +626,9 @@ Ext.onReady( function() { items : [ addTabButton, tabPanel - ] }); - - //form frmDashboard = new Ext.FormPanel({ id : 'frmDashboard', @@ -644,11 +641,11 @@ Ext.onReady( function() { waitMsgTarget : true, frame : true, defaults : { - anchor : '100%', - allowBlank : false, - resizable : true, - msgTarget : 'side', - align : 'center' + anchor : '100%', + allowBlank : false, + resizable : true, + msgTarget : 'side', + align : 'center' }, items : [ dashboardFields, @@ -671,10 +668,9 @@ Ext.onReady( function() { ] }); - ownerInfoGrid.store.load(); ownerInfoGrid.on("afterrender", function(component) { component.getBottomToolbar().refresh.hideParent = true; - component.getBottomToolbar().refresh.hide(); + component.getBottomToolbar().refresh.hide(); }); viewport = new Ext.Viewport({ @@ -698,6 +694,7 @@ Ext.onReady( function() { } dashboardOwnerFields.items.items[0].bindStore(dataUserGroup); } ); + storeUsers.on( 'load', function( store, records, options ) { for (var i=0; i< store.data.length; i++) { row = []; @@ -730,243 +727,245 @@ var addTab = function (flag) { return false; } var tab = { - title : _('ID_INDICATOR')+ ' '+ (++indexTab), - id : indexTab, - iconCls : 'tabs', - width : "100%", - items : [ - new Ext.Panel({ - height : 230, - width : "100%", - border : true, - bodyStyle : 'padding:10px', - items : [ - new Ext.form.FieldSet({ - labelWidth : 150, - labelAlign :'right', - items : [ - { - id : 'DAS_IND_UID_' + indexTab, - xtype : 'textfield', - hidden : true - }, - { - fieldLabel : _('ID_INDICATOR_TITLE'), - id : 'IND_TITLE_'+ indexTab, - xtype : 'textfield', - anchor : '85%', - maskRe : /([a-zA-Z0-9\s]+)$/, - maxLength : 250, - allowBlank : false - }, - new Ext.form.ComboBox({ - anchor : '85%', - editable : false, - id : 'IND_TYPE_'+ indexTab, - fieldLabel : _('ID_INDICATOR_TYPE'), - displayField : 'CAT_LABEL_ID', - valueField : 'CAT_UID', - forceSelection : false, - emptyText : _('ID_SELECT'), - selectOnFocus : true, - typeAhead : true, - autocomplete : true, - triggerAction : 'all', - store : storeIndicatorType, - listeners:{ - scope: this, - select: function(combo, record, index) { - var value = combo.getValue(); - var field = ''; - var index = tabPanel.getActiveTab().id; - var fields = ['DAS_IND_FIRST_FIGURE_'+index,'DAS_IND_FIRST_FREQUENCY_'+index,'DAS_IND_SECOND_FIGURE_'+index, 'DAS_IND_SECOND_FREQUENCY_'+index]; - if (value == '1050') { - field = Ext.getCmp('IND_PROCESS_'+index); + title : _('ID_INDICATOR')+ ' '+ (++indexTab), + id : indexTab, + iconCls : 'tabs', + width : "100%", + items : [ + new Ext.Panel({ + height : 230, + width : "100%", + border : true, + bodyStyle : 'padding:10px', + items : [ + new Ext.form.FieldSet({ + labelWidth : 150, + labelAlign :'right', + items : [ + { + id : 'DAS_IND_UID_' + indexTab, + xtype : 'textfield', + hidden : true + }, + { + fieldLabel : ' * ' + _('ID_INDICATOR_TITLE'), + id : 'IND_TITLE_'+ indexTab, + xtype : 'textfield', + anchor : '85%', + maskRe : /([a-zA-Z0-9_'\s]+)$/, + regex : /([a-zA-Z0-9_'\s]+)$/, + regexText : _('ID_INVALID_VALUE', _('ID_INDICATOR_TITLE')), + maxLength : 250, + allowBlank : false + }, + new Ext.form.ComboBox({ + anchor : '85%', + editable : false, + id : 'IND_TYPE_'+ indexTab, + fieldLabel : ' * ' + _('ID_INDICATOR_TYPE'), + displayField : 'CAT_LABEL_ID', + valueField : 'CAT_UID', + forceSelection : false, + emptyText : _('ID_SELECT'), + selectOnFocus : true, + typeAhead : true, + autocomplete : true, + triggerAction : 'all', + store : storeIndicatorType, + listeners:{ + scope: this, + select: function(combo, record, index) { + var value = combo.getValue(); + var field = ''; + var index = tabPanel.getActiveTab().id; + var fields = ['DAS_IND_FIRST_FIGURE_'+index,'DAS_IND_FIRST_FREQUENCY_'+index,'DAS_IND_SECOND_FIGURE_'+index, 'DAS_IND_SECOND_FREQUENCY_'+index]; + if (value == '1050') { + field = Ext.getCmp('IND_PROCESS_'+index); + field.setValue('0'); + field.disable(); + field.hide(); + } else { + field = Ext.getCmp('IND_PROCESS_'+index); + field.enable(); + field.show(); + } + if (value == '1010' || value == '1030' || value == '1050') { + for (var i=0; i