fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Ronald Quenta
2015-02-27 14:08:00 -04:00
parent 4526581ddf da4213dd2d
commit 69cccfac41
13 changed files with 146 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.dvEditor.php
View File

@@ -55,7 +55,7 @@ class XmlForm_Field_HTML extends XmlForm_Field
* @return string
*
*/
public function render ($value, $owner = null)
public function render($value = null, $owner = null)
{
$value = ($value == '') ? '<br/>' : $value;
$html = "<div style='width:" . $this->width . ";'>";

5
gulliver/system/class.g.php
View File

@@ -713,7 +713,7 @@ class G
* @param string $strClass
* @return void
*/
public function LoadThirdParty ($sPath, $sFile)
public static function LoadThirdParty($sPath, $sFile)
{
$classfile = PATH_THIRDPARTY . $sPath . '/' . $sFile . ((substr( $sFile, 0, - 4 ) !== '.php') ? '.php' : '');
return require_once ($classfile);
@@ -3330,7 +3330,7 @@ class G
*
* @return boolean true or false
*/
public function isHttpRequest()
public static function isHttpRequest()
{
if (isset($_SERVER['SERVER_SOFTWARE']) && strpos(strtolower($_SERVER['SERVER_SOFTWARE']), 'apache') !== false) {
return true;
@@ -5647,3 +5647,4 @@ function __ ($msgID, $lang = SYS_LANG, $data = null)
{
return G::LoadTranslation( $msgID, $lang, $data );
}

4
gulliver/system/class.xmlMenu.php
View File

@@ -76,7 +76,7 @@ class XmlForm_Field_XmlMenu extends XmlForm_Field
*
* @return object $out
*/
public function render ($value)
public function render($value = null, $paramDummy2 = null)
{
$this->xmlMenu = new xmlMenu( $this->xmlfile, $this->home );
$this->xmlMenu->setValues( $value );
@@ -97,7 +97,7 @@ class XmlForm_Field_XmlMenu extends XmlForm_Field
*
* @return none
*/
public function renderGrid ($value)
public function renderGrid($value = null, $paramDummy2 = null, $paramDummy3 = null, $paramDummy4 = null)
{
return $this->render( $value );
}

79
gulliver/system/class.xmlform.php
View File

@@ -394,7 +394,7 @@ class XmlForm_Field
* @param string value
* @return string
*/
public function render ($value = null)
public function render($value = null, $paramDummy2 = null)
{
//this is an unknown field type.
return $this->htmlentities( $value != '' ? $value : $this->name, ENT_COMPAT, 'utf-8' );
@@ -934,7 +934,7 @@ class XmlForm_Field_Title extends XmlForm_Field
* @param string value
* @return string
*/
public function render ($value = null, &$owner = null)
public function render($value = null, $owner = null)
{
$this->label = G::replaceDataField( $this->label, $owner->values );
return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' ' . $this->NSFieldType() . ' >' . $this->htmlentities( $this->label ) . '</span>';
@@ -970,7 +970,7 @@ class XmlForm_Field_Subtitle extends XmlForm_Field
* @param string value
* @return string
*/
public function render ($value = null)
public function render($value = null, $paramDummy2 = null)
{
return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' ' . $this->NSFieldType() . ' >' . $this->htmlentities( $this->label ) . '</span>';
}
@@ -1012,7 +1012,7 @@ class XmlForm_Field_SimpleText extends XmlForm_Field
* @param string value
* @return string
*/
public function render ($value = null, &$owner = null)
public function render($value = null, $owner = null)
{
if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
$value = $this->getPMTableValue( $owner );
@@ -1040,7 +1040,7 @@ class XmlForm_Field_SimpleText extends XmlForm_Field
* @param string owner
* @return string
*/
public function renderGrid ($values = array(), $owner = null)
public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$result = array ();
$r = 1;
@@ -1204,7 +1204,7 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText
* @param string owner
* @return string
*/
public function renderGrid ($values = array(), $owner = null)
public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$result = $aux = array ();
$r = 1;
@@ -1257,7 +1257,7 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText
return $result;
}
public function renderTable ($values = '', $owner = null)
public function renderTable($values = "", $owner = null, $paramDummy3 = null)
{
$result = $this->htmlentities( $values, ENT_COMPAT, 'utf-8' );
return $result;
@@ -1716,7 +1716,7 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
* @param string owner
* @return string
*/
public function renderGrid ($values = array(), $owner = null)
public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$aResult = array();
$r = 1;
@@ -1735,7 +1735,7 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
* @param <String> $owner
* @return <String> $result
*/
public function renderTable ($values = '', $owner = null)
public function renderTable($values = "", $owner = null, $paramDummy3 = null)
{
$result = $this->htmlentities( $values, ENT_COMPAT, 'utf-8' );
return $result;
@@ -1812,10 +1812,8 @@ class XmlForm_Field_Caption extends XmlForm_Field
* @param $owner
* @return true
*/
public function validateValue ($value, &$owner)
public function validateValue($value)
{
/*$this->executeSQL( $owner );
return isset($value) && ( array_key_exists( $value , $this->options ) );*/
return true;
}
@@ -1897,7 +1895,7 @@ class XmlForm_Field_Password extends XmlForm_Field
* @param string value
* @return string
*/
public function render ($value = null)
public function render($value = null, $paramDummy2 = null)
{
if ($this->autocomplete === '1') {
$this->autocomplete = "on";
@@ -2013,7 +2011,7 @@ class XmlForm_Field_Textarea extends XmlForm_Field
* @param string owner
* @return string
*/
public function renderGrid ($values = array(), $owner = null)
public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$this->gridFieldType = 'textarea';
@@ -2176,7 +2174,7 @@ class XmlForm_Field_Currency extends XmlForm_Field_SimpleText
* @param string owner
* @return string
*/
public function renderGrid ($values = array(), $owner = null)
public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$result = array ();
$r = 1;
@@ -2242,7 +2240,7 @@ class XmlForm_Field_CaptionCurrency extends XmlForm_Field
* @param string value
* @return string
*/
public function render ($value = null)
public function render($value = null, $paramDummy2 = null)
{
return '$ ' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
}
@@ -2323,7 +2321,7 @@ class XmlForm_Field_Percentage extends XmlForm_Field_SimpleText
return $html;
}
public function renderGrid ($values = array(), $owner = null)
public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$result = array ();
$r = 1;
@@ -2381,7 +2379,7 @@ class XmlForm_Field_Percentage extends XmlForm_Field_SimpleText
class XmlForm_Field_CaptionPercentage extends XmlForm_Field
{
public function render ($value = null)
public function render($value = null, $paramDummy2 = null)
{
return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
}
@@ -2575,7 +2573,7 @@ class XmlForm_Field_Date2 extends XmlForm_Field_SimpleText
* @param $onlyValue
* @return <String>
*/
public function renderGrid ($values = null, $owner = null, $onlyValue = false)
public function renderGrid($values = null, $owner = null, $onlyValue = false, $paramDummy4 = null)
{
$result = array ();
$r = 1;
@@ -2658,7 +2656,7 @@ class XmlForm_Field_Date2 extends XmlForm_Field_SimpleText
class XmlForm_Field_DateView extends XmlForm_Field
{
public function render ($value = null)
public function render($value = null, $paramDummy2 = null)
{
return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
}
@@ -2741,7 +2739,7 @@ class XmlForm_Field_YesNo extends XmlForm_Field
* @param $owner
* @return <array>
*/
public function renderGrid ($values = array(), $owner = null)
public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$this->gridFieldType = 'yesno';
$result = array ();
@@ -2888,7 +2886,7 @@ class XmlForm_Field_Link extends XmlForm_Field
* @param $owner
* @return <array>
*/
public function renderGrid($value = array(), $label = array(), $owner = null)
public function renderGrid($value = array(), $label = array(), $owner = null, $paramDummy4 = null)
{
$arrayResult = array();
$row = 1;
@@ -2914,7 +2912,7 @@ class XmlForm_Field_Link extends XmlForm_Field
* @param $owner
* @return <String>
*/
public function renderTable ($value = null, $owner = null)
public function renderTable($value = null, $owner = null, $paramDummy3 = null)
{
$onclick = $this->htmlentities( G::replaceDataField( $this->onclick, $owner->values ), ENT_QUOTES, 'utf-8' );
$link = $this->htmlentities( G::replaceDataField( $this->link, $owner->values ), ENT_QUOTES, 'utf-8' );
@@ -3053,7 +3051,7 @@ class XmlForm_Field_File extends XmlForm_Field
return $html;
}
public function renderGrid ($value = array(), $owner = null, $therow = -1)
public function renderGrid($value = array(), $owner = null, $therow = -1, $paramDummy4 = null)
{
$arrayResult = array ();
$r = 1;
@@ -3142,7 +3140,7 @@ class XmlForm_Field_Checkboxpt extends XmlForm_Field
* @param $owner
* @return <Array> result
*/
public function renderGrid ($values = array(), $owner = null)
public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$result = array ();
$r = 1;
@@ -3238,7 +3236,7 @@ class XmlForm_Field_Checkbox extends XmlForm_Field
* @param $owner
* @return <Array> result
*/
public function renderGrid ($values = array(), $owner = null)
public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$this->gridFieldType = 'checkbox';
$result = array ();
@@ -3286,7 +3284,7 @@ class XmlForm_Field_Checkbox2 extends XmlForm_Field
{
public $required = false;
public function render ($value = null)
public function render($value = null, $paramDummy2 = null)
{
return '<input class="FormCheck" name="' . $this->name . '" type ="checkbox" disabled>' . $this->label . '</input>';
}
@@ -3461,7 +3459,7 @@ class XmlForm_Field_Hidden extends XmlForm_Field
* @param $owner
* @return <Array> result
*/
public function renderGrid ($values = null, $owner = null)
public function renderGrid($values = null, $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
$result = array ();
$r = 1;
@@ -3480,7 +3478,7 @@ class XmlForm_Field_Hidden extends XmlForm_Field
* @param $owner
* @return <Array> result
*/
public function renderTable ($value = '', $owner = null)
public function renderTable($value = "", $owner = null, $paramDummy3 = null)
{
return '<input id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'hidden\' value=\'' . $value . '\'/>';
}
@@ -3509,10 +3507,8 @@ class XmlForm_Field_Dropdown extends XmlForm_Field
public $renderMode = '';
public $selectedValue = '';
public function validateValue ($value, &$owner)
public function validateValue($value)
{
/*$this->executeSQL( $owner );
return isset($value) && ( array_key_exists( $value , $this->options ) );*/
return true;
}
@@ -3827,7 +3823,7 @@ class XmlForm_Field_Listbox extends XmlForm_Field
* @param $owner
* @return <Array> result
*/
public function renderGrid ($value = null, $owner = null)
public function renderGrid($value = null, $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
return $this->render( $value, $owner );
}
@@ -4046,7 +4042,7 @@ class XmlForm_Field_CheckGroupView extends XmlForm_Field
* @param string value
* @return string
*/
public function render ($value = null)
public function render($value = null, $paramDummy2 = null)
{
$html = '';
foreach ($this->option as $optionName => $option) {
@@ -4125,7 +4121,7 @@ class XmlForm_Field_Grid extends XmlForm_Field
* @return <Template Object>
*/
public function render ($values, $owner = null)
public function render($values = null, $owner = null)
{
$emptyRow = $this->setScrollStyle( $owner );
return $this->renderGrid( $emptyRow, $owner );
@@ -4140,7 +4136,7 @@ class XmlForm_Field_Grid extends XmlForm_Field
* @param string values
* @return string
*/
public function renderGrid ($values, $owner = null, $therow = -1)
public function renderGrid($values = array(), $owner = null, $therow = -1, $paramDummy4 = null)
{
$this->id = $this->owner->id . $this->name;
$using_template = 'grid';
@@ -4396,7 +4392,7 @@ class XmlForm_Field_JavaScript extends XmlForm_Field
* @param string owner
* @return string
*/
public function renderGrid ($value, $owner)
public function renderGrid($values = null, $owner = null, $paramDummy3 = null, $paramDummy4 = null)
{
return array ('');
}
@@ -4571,7 +4567,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
* @param $onlyValue
* @return Array $result
*/
public function renderGrid ($values = null, $owner = null, $onlyValue = false)
public function renderGrid($values = null, $owner = null, $onlyValue = false, $paramDummy4 = null)
{
$this->gridFieldType = 'date';
$result = array ();
@@ -4999,7 +4995,7 @@ class XmlForm_Field_Date5 extends XmlForm_Field_SimpleText
* @param $onlyValue
* @return Array $result
*/
public function renderGrid ($values = null, $owner = null, $onlyValue = false)
public function renderGrid($values = null, $owner = null, $onlyValue = false, $paramDummy4 = null)
{
$result = array ();
$r = 1;
@@ -5331,7 +5327,7 @@ class XmlForm_Field_Xmlform extends XmlForm_Field
* @param string values
* @return string
*/
public function render ($values)
public function render($values = null, $paramDummy2 = null)
{
$html = '';
foreach ($this->fields as $f => $v) {
@@ -5668,7 +5664,7 @@ class XmlForm_Field_Image extends XmlForm_Field
* @param string values
* @return string
*/
public function render ($value, $owner = null)
public function render($value = null, $owner = null)
{
$url = G::replaceDataField($this->file, $owner->values);
if ($this->home === "methods") {
@@ -5805,3 +5801,4 @@ if (!function_exists('strptime')) {
return $ret;
}
}

2
gulliver/system/class.xmlformExtension.php
View File

@@ -112,7 +112,7 @@ class XmlForm_Field_DVEditor extends XmlForm_Field
*
* @return string '<div> ... </div>'
*/
public function render($value, $owner = null)
public function render($value = null, $owner = null)
{
return '<div style="width:' . htmlentities($this->width, ENT_QUOTES, 'utf-8') . ';height:' . htmlentities($this->height, ENT_QUOTES, 'utf-8') . '"><input id="form[' . $this->name . ']" name="form[' . $this->name . ']" type="hidden" value="' . htmlentities($value, ENT_QUOTES, 'UTF-8') . '"/></div>';
}

55
workflow/engine/bin/cron_single.php
View File

@@ -41,6 +41,20 @@ if (!defined('PATH_HOME')) {
require_once (PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php');
require_once PATH_TRUNK . "framework/src/Maveriks/Util/ClassLoader.php";
//Class Loader - /ProcessMaker/BusinessModel
$classLoader = \Maveriks\Util\ClassLoader::getInstance();
$classLoader->add(PATH_TRUNK . "framework" . PATH_SEP . "src" . PATH_SEP, "Maveriks");
$classLoader->add(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "src" . PATH_SEP, "ProcessMaker");
$classLoader->add(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "src" . PATH_SEP);
//Add vendors to autoloader
//$classLoader->add(PATH_TRUNK . "vendor" . PATH_SEP . "luracast" . PATH_SEP . "restler" . PATH_SEP . "vendor", "Luracast");
//$classLoader->add(PATH_TRUNK . "vendor" . PATH_SEP . "bshaffer" . PATH_SEP . "oauth2-server-php" . PATH_SEP . "src" . PATH_SEP, "OAuth2");
$classLoader->addClass("Bootstrap", PATH_TRUNK . "gulliver" . PATH_SEP . "system" . PATH_SEP . "class.bootstrap.php");
//$classLoader->addModelClassPath(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP);
//Load classes
G::LoadThirdParty('pear/json','class.json');
G::LoadThirdParty('smarty/libs','Smarty.class');
G::LoadSystem('error');
@@ -87,7 +101,7 @@ if (!defined('PATH_HOME')) {
define ('TIME_ZONE', $config['time_zone']);
}
require_once (PATH_GULLIVER . PATH_SEP . 'class.bootstrap.php');
//require_once (PATH_GULLIVER . PATH_SEP . 'class.bootstrap.php');
//define( 'PATH_GULLIVER_HOME', PATH_TRUNK . 'gulliver' . PATH_SEP );
spl_autoload_register(array('Bootstrap', 'autoloadClass'));
@@ -339,7 +353,13 @@ Bootstrap::registerClass('wsResponse', PATH_HOME . "engine/classes/clas
Bootstrap::registerClass('PMLicensedFeatures', PATH_HOME . "engine/classes/class.LicensedFeatures.php");
Bootstrap::registerClass('AddonsManagerPeer', PATH_HOME . "engine/classes/model/AddonsManagerPeer.php");
G::LoadClass("dates");
Bootstrap::registerClass("BaseEmailServer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseEmailServer.php");
Bootstrap::registerClass("EmailServer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "EmailServer.php");
Bootstrap::registerClass("BaseEmailServerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseEmailServerPeer.php");
Bootstrap::registerClass("EmailServerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "EmailServerPeer.php");
G::LoadClass("serverConfiguration");
G::LoadClass("dates"); //Load Criteria
if (!defined('SYS_SYS')) {
$sObject = $argv[1];
@@ -382,25 +402,28 @@ if (!defined('SYS_SYS')) {
eprintln("WARNING! No server info found!", 'red');
}
$sContent = file_get_contents(PATH_DB . $sObject . PATH_SEP . 'db.php');
//DB
$phpCode = "";
$sContent = str_replace('<?php', '', $sContent);
$sContent = str_replace('<?', '', $sContent);
$sContent = str_replace('?>', '', $sContent);
$sContent = str_replace('define', '', $sContent);
$sContent = str_replace("('", "$", $sContent);
$sContent = str_replace("',", '=', $sContent);
$sContent = str_replace(");", ';', $sContent);
$fileDb = fopen(PATH_DB . $sObject . PATH_SEP . "db.php", "r");
eval($sContent);
if ($fileDb) {
while (!feof($fileDb)) {
$buffer = fgets($fileDb, 4096); //Read a line
$dsn = $DB_ADAPTER . '://' . $DB_USER . ':' . $DB_PASS . '@' . $DB_HOST . '/' . $DB_NAME;
$phpCode .= preg_replace("/define\s*\(\s*[\x22\x27](.*)[\x22\x27]\s*,\s*(\x22.*\x22|\x27.*\x27)\s*\)\s*;/i", "\$$1 = $2;", $buffer);
}
$dsnRbac = $DB_ADAPTER . '://' . $DB_RBAC_USER . ':' . $DB_RBAC_PASS . '@' . $DB_RBAC_HOST . '/';
$dsnRbac = $dsnRbac . $DB_RBAC_NAME;
fclose($fileDb);
}
$dsnRp = $DB_ADAPTER . '://' . $DB_REPORT_USER . ':' . $DB_REPORT_PASS . '@' . $DB_REPORT_HOST . '/';
$dsnRp = $dsnRp . $DB_REPORT_NAME;
$phpCode = str_replace(array("<?php", "<?", "?>"), array("", "", ""), $phpCode);
eval($phpCode);
$dsn = $DB_ADAPTER . "://" . $DB_USER . ":" . $DB_PASS . "@" . $DB_HOST . "/" . $DB_NAME;
$dsnRbac = $DB_ADAPTER . "://" . $DB_RBAC_USER . ":" . $DB_RBAC_PASS . "@" . $DB_RBAC_HOST . "/" . $DB_RBAC_NAME;
$dsnRp = $DB_ADAPTER . "://" . $DB_REPORT_USER . ":" . $DB_REPORT_PASS . "@" . $DB_REPORT_HOST . "/" . $DB_REPORT_NAME;
switch ($DB_ADAPTER) {
case 'mysql':

2
workflow/engine/bin/messageeventcron_single.php
View File

@@ -36,7 +36,7 @@ try {
require_once(PATH_HOME . "engine" . PATH_SEP . "config" . PATH_SEP . "paths.php");
require_once(PATH_TRUNK . "framework" . PATH_SEP . "src" . PATH_SEP . "Maveriks" . PATH_SEP . "Util" . PATH_SEP . "ClassLoader.php");
//Class loader - /ProcessMaker/BusinessModel
//Class Loader - /ProcessMaker/BusinessModel
$classLoader = \Maveriks\Util\ClassLoader::getInstance();
$classLoader->add(PATH_TRUNK . "framework" . PATH_SEP . "src" . PATH_SEP, "Maveriks");
$classLoader->add(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "src" . PATH_SEP, "ProcessMaker");

2
workflow/engine/bin/tasks/cliAddons.php
View File

@@ -21,7 +21,7 @@ EOT
/*----------------------------------********---------------------------------*/
CLI::taskName('change-password-hash-method');
CLI::taskDescription(<<<EOT
Create .po file for the plugin
Change password hash method to md5 or sha256 for the specified workspace
EOT
);
CLI::taskArg('workspace', false);

14
workflow/engine/classes/class.pmFunctions.php
View File

@@ -1235,7 +1235,7 @@ function WSInformationUser($userUid)
*
* @method
*
* Returns the unique ID for the current active session.
* Returns the unique ID for the current login session.
*
* @name WSGetSession
* @label WS Get Session
@@ -1400,7 +1400,7 @@ function WSUnpauseCase ($caseUid, $delIndex, $userUid)
*
* @method
*
* Add case note.
* Add a case note.
*
* @name WSAddCaseNote
* @label WS Add case note
@@ -1537,7 +1537,7 @@ function PMFUserList () //its test was successfull
/**
* @method
*
* Add a input document.
* Add an Input Document.
*
* @name PMFAddInputDocument
* @label PMF Add a input document
@@ -1552,7 +1552,7 @@ function PMFUserList () //its test was successfull
* @param string(32) | $caseUid | ID of the case | The unique ID of the case.
* @param int | $delIndex | Delegation index of the case | The delegation index of the current task in the case.
* @param string(32) | $taskUid | ID of the task | The unique ID of the task.
* @param string(32) | $userUid | ID user | The unique ID of the user who will add a input document.
* @param string(32) | $userUid | ID user | The unique ID of the user who will add an input document.
* @param string | $option = "file" | Option | Option, value: "file".
* @param string | $file = "path_to_file/myfile.txt" | File, path to file | File, path to file.
* @return string | $appDocUid | ID of the application document | Returns ID if it has added the input document successfully; otherwise, returns null or empty if an error occurred.
@@ -2061,7 +2061,7 @@ function PMFNewCase ($processId, $userId, $taskId, $variables)
*
* @method
*
* Assigns a user to a group.
*
*
* Assigns a user to a group. Note that the logged-in user must have the PM_USERS permission in his/her role to be able to assign a user to a group.
*
@@ -2466,7 +2466,7 @@ function PMFGetNextAssignedUser ($application, $task, $delIndex = null, $userUid
/**
* @method
*
* Returns a list or user.
* Returns the email address of the specified user.
*
* @name PMFGetUserEmailAddress
* @label PMF Get User Email Address
@@ -2845,7 +2845,7 @@ function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i
/**
*@method
*
* It delete the mask a field.
* Removes the currency symbol and thousands separator inserted by a currency mask.
*
* @name PMFRemoveMask
* @label PMF Remove Mask

2
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -55,6 +55,8 @@ class CaseScheduler extends BaseCaseScheduler
$con->commit();
//Add Audit Log
$perform = $aData["SCH_OPTION"];
switch ($aData['SCH_OPTION']) {
case '1':
$perform = 'Daily';

32
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -1283,7 +1283,12 @@ class BpmnWorkflow extends Project\Bpmn
$activity = $bwp->getActivity($activityData["ACT_UID"]);
if ($activity["BOU_CONTAINER"] != $activityData["BOU_CONTAINER"]) {
$activity = null;
}
if ($forceInsert || is_null($activity)) {
if ($generateUid) {
//Activity
@@ -1316,6 +1321,7 @@ class BpmnWorkflow extends Project\Bpmn
$diagram["activities"][$i] = $activityData;
$whiteList[] = $activityData["ACT_UID"];
}
$activities = $bwp->getActivities();
@@ -1337,6 +1343,10 @@ class BpmnWorkflow extends Project\Bpmn
$artifact = $bwp->getArtifact($artifactData["ART_UID"]);
if ($artifact["BOU_CONTAINER"] != $artifactData["BOU_CONTAINER"]) {
$artifact = null;
}
if ($forceInsert || is_null($artifact)) {
if ($generateUid) {
//Artifact
@@ -1397,6 +1407,10 @@ class BpmnWorkflow extends Project\Bpmn
$gateway = $bwp->getGateway($gatewayData["GAT_UID"]);
if ($gateway["BOU_CONTAINER"] != $gatewayData["BOU_CONTAINER"]) {
$gateway = null;
}
if ($forceInsert || is_null($gateway)) {
if ($generateUid) {
//Gateway
@@ -1471,6 +1485,10 @@ class BpmnWorkflow extends Project\Bpmn
$event = $bwp->getEvent($eventData["EVN_UID"]);
if ($event["BOU_CONTAINER"] != $eventData["BOU_CONTAINER"]) {
$event = null;
}
if ($forceInsert || is_null($event)) {
if ($generateUid) {
//Event
@@ -1527,6 +1545,10 @@ class BpmnWorkflow extends Project\Bpmn
$dataObject = $bwp->getData($dataObjectData["DAT_UID"]);
if ($dataObject["BOU_CONTAINER"] != $dataObjectData["BOU_CONTAINER"]) {
$dataObject = null;
}
if ($forceInsert || is_null($dataObject)) {
if ($generateUid) {
//Data
@@ -1581,9 +1603,13 @@ class BpmnWorkflow extends Project\Bpmn
$participantData = array_change_key_case($participantData, CASE_UPPER);
unset($participantData["_EXTENDED"]);
$dataObject = $bwp->getParticipant($participantData["PAR_UID"]);
$participant = $bwp->getParticipant($participantData["PAR_UID"]);
if ($forceInsert || is_null($dataObject)) {
if ($participant["BOU_CONTAINER"] != $participantData["BOU_CONTAINER"]) {
$participant = null;
}
if ($forceInsert || is_null($participant)) {
if ($generateUid) {
//Participant
@@ -1609,7 +1635,7 @@ class BpmnWorkflow extends Project\Bpmn
}
$bwp->addParticipant($participantData);
} elseif (! $bwp->isEquals($dataObject, $participantData)) {
} elseif (! $bwp->isEquals($participant, $participantData)) {
$bwp->updateParticipant($participantData["PAR_UID"], $participantData);
} else {
Util\Logger::log("Update Participant ({$participantData["PAR_UID"]}) Skipped - No changes required");

1
workflow/engine/templates/designer/index.html
View File

@@ -83,6 +83,7 @@
<div class="head"></div>
<nav>
<ul>
<li><a href="#" ><span class="mafe-button-close" ></span></a></li>
<li><a href="#" class="mafe-button-save"></a></li>
<li><a href="#" class="mafe-button-export-process"></a></li>
<li><a class="mafe-button-export-bpmn-process"></a></li>

12
workflow/engine/templates/processes/main.js
View File

@@ -32,6 +32,15 @@ new Ext.KeyMap(document, {
}
});
Ext.apply(Ext.form.VTypes, {
textWithoutTags: function (value, field)
{
var strAux = "a|applet|b|body|br|button|code|div|em|embed|form|frame|frameset|head|header|html|iframe|img|input|noscript|object|script|select|style|table|textarea";
return !(eval("/^.*\\x3C[\\s\\x2F]*(?:" + strAux + ")\\s*.*\\x3E.*$/").test(value));
},
textWithoutTagsText: ""
});
Ext.onReady(function(){
Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
@@ -520,7 +529,8 @@ function newProcess(params)
xtype:'textfield',
width: 260,
maskRe: /^(?!^(PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\...*)(\..+)?$)[^\x00-\x1f\\?*\";|/]+$/i,
allowBlank: false
allowBlank: false,
vtype: "textWithoutTags"
}, {
id: 'PRO_DESCRIPTION',
fieldLabel: _('ID_DESCRIPTION'),