fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-03-20 15:11:30 -04:00
parent 9de72c4132 f2c9366e84
commit b65d3aa48e
15 changed files with 1404 additions and 1293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build-vendor.php
View File

@@ -174,14 +174,16 @@ printf ( "mafe-{$hashVendors}.js file has %d bytes\n", filesize("{$rootPath}/wor
out("=> compresing and combining css files", 'info'); out("=> compresing and combining css files", 'info');
$cssFiles = array ( $cssFiles = array (
"workflow/public_html/lib/pmUI/pmui.min.css",
"workflow/public_html/lib/mafe/mafe.min.css",
"gulliver/js/codemirror/lib/codemirror.css", "gulliver/js/codemirror/lib/codemirror.css",
"gulliver/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css", "gulliver/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css",
"gulliver/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css", "gulliver/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css",
"gulliver/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css", "gulliver/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css",
"gulliver/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css" "gulliver/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css",
"workflow/public_html/lib/pmUI/pmui.min.css",
"workflow/public_html/lib/mafe/mafe.min.css"
); );
$bigHandler = fopen ("{$rootPath}/workflow/public_html/lib/css/mafe-{$hashVendors}.css", "w"); $bigHandler = fopen ("{$rootPath}/workflow/public_html/lib/css/mafe-{$hashVendors}.css", "w");
foreach ($cssFiles as $cssFile) { foreach ($cssFiles as $cssFile) {

9
features/backend/admin_setup/users/departments/basic_sequence_department.feature
View File

@@ -20,16 +20,17 @@ Background:
Then the response status code should be 200 Then the response status code should be 200
And the response charset is "UTF-8" And the response charset is "UTF-8"
And the type is "object" And the type is "object"
And the "dep_uid" property equals "12921473252d567506e6e63079240767"
And the "dep_parent" property equals "" And the "dep_parent" property equals ""
And the "dep_title" property equals "Sales Division" And the "dep_title" property equals "Sales Division"
And the "dep_status" property equals "ACTIVE" And the "dep_status" property equals "ACTIVE"
And the "dep_manager" property equals "" And the "dep_manager" property equals "38102442252d5671a629009013495090"
And the "dep_ldap_dn" property equals "" And the "dep_ldap_dn" property equals ""
And the "dep_last" property equals "0" And the "dep_last" property equals "0"
And the "dep_manager_username" property equals "" And the "dep_manager_username" property equals "dylan"
And the "dep_manager_lastname" property equals "" And the "dep_manager_firstname" property equals "Dylan"
And the "dep_manager_lastname" property equals "Burns"
And the "has_children" property equals "0" And the "has_children" property equals "0"
Scenario: Create a new department in the workspace Scenario: Create a new department in the workspace
Given POST this data: Given POST this data:

8
features/backend/admin_setup/users/departments/main_tests_department.feature
View File

@@ -20,14 +20,16 @@ Background:
Then the response status code should be 200 Then the response status code should be 200
And the response charset is "UTF-8" And the response charset is "UTF-8"
And the type is "object" And the type is "object"
And the "dep_uid" property equals "12921473252d567506e6e63079240767"
And the "dep_parent" property equals "" And the "dep_parent" property equals ""
And the "dep_title" property equals "Sales Division" And the "dep_title" property equals "Sales Division"
And the "dep_status" property equals "ACTIVE" And the "dep_status" property equals "ACTIVE"
And the "dep_manager" property equals "" And the "dep_manager" property equals "38102442252d5671a629009013495090"
And the "dep_ldap_dn" property equals "" And the "dep_ldap_dn" property equals ""
And the "dep_last" property equals "0" And the "dep_last" property equals "0"
And the "dep_manager_username" property equals "" And the "dep_manager_username" property equals "dylan"
And the "dep_manager_lastname" property equals "" And the "dep_manager_firstname" property equals "Dylan"
And the "dep_manager_lastname" property equals "Burns"
And the "has_children" property equals "0" And the "has_children" property equals "0"

11
features/backend/admin_setup/users/departments/negative_tests_department.feature
View File

@@ -25,4 +25,13 @@ Scenario Outline: Create a new departments in the workspace with bad parameters
| test_description | dep_title | dep_parent | dep_status | error_code | error_message | | test_description | dep_title | dep_parent | dep_status | error_code | error_message |
| without dep_title | | | ACTIVE | 400 | dep_title | | without dep_title | | | ACTIVE | 400 | dep_title |
| Invalid dep_parent | Department 2 | 28036030000000000000005009591640 | ACTIVE | 400 | dep_parent | | Invalid dep_parent | Department 2 | 28036030000000000000005009591640 | ACTIVE | 400 | dep_parent |
| Invalid dep_status | Department 3 | | TRIGGER | 400 | dep_status | | Invalid dep_status | Department 3 | | TRIGGER | 400 | dep_status |
Scenario: Delete a department when have asigned user (negative tests)
Given that I want to delete a resource with the key "15978182252d5674d210310076985235"
And I request "department/15978182252d5674d210310076985235"
Then the response status code should be 400
And the response status message should have the following text "<cannot be deleted>"

12
features/backend/application_cases/cases_lists_1-6/basic_sequence_cases_lists_1_6.feature
View File

@@ -92,7 +92,7 @@ Scenario Outline: Create a new case in workspace with process "Derivation rules
Scenario: Create a new case Impersonate in workspace with process "Derivation rules - sequential" Scenario Outline: Create a new case Impersonate in workspace with process "Derivation rules - sequential"
Given POST this data: Given POST this data:
""" """
{ {
@@ -107,7 +107,13 @@ Scenario: Create a new case Impersonate in workspace with process "Derivation ru
And the response charset is "UTF-8" And the response charset is "UTF-8"
And the content type is "application/json" And the content type is "application/json"
And the type is "object" And the type is "object"
And store "caseId" in session array as variable "case1" And store "caseId" in session array as variable "caseId_<case_number>"
And store "caseNumber" in session array as variable "caseNumber_<case_number>"
Examples:
| case_number |
| 1 |
Scenario: Reassigns a case to a different user Scenario: Reassigns a case to a different user
@@ -127,6 +133,8 @@ Scenario: Reassigns a case to a different user
And the type is "object" And the type is "object"
Scenario: Autoderivate a case to the next task in the process Scenario: Autoderivate a case to the next task in the process
Given PUT this data: Given PUT this data:
""" """

41
features/backend/projects/trigger_wizard/main_tests_trigger_wizards.feature
View File

@@ -142,46 +142,12 @@ Scenario Outline: Create new Trigger: createDWS
And store "tri_uid" in session array as variable "tri_uid<i>" And store "tri_uid" in session array as variable "tri_uid<i>"
Examples: Examples:
| i | lib_name | fn_name | tri_title | tri_description | tri_type | tri_params.input.sharepointServer | tri_params.input.auth | tri_params.input.name | tri_params.input.users | tri_params.input.title | tri_params.input.documents | tri_params.output.tri_answer | | i | Description | lib_name | fn_name | tri_title | tri_description | tri_type | tri_params.input.sharepointServer | tri_params.input.auth | tri_params.input.name | tri_params.input.users | tri_params.input.title | tri_params.input.documents | tri_params.output.tri_answer |
| 1 | pmTrSharepoint | createDWS | Sharepoint 1 | | SCRIPT | @@SERVER | username:password | Test DWS | @@users | Test DWS | /files/test.doc | $respuesta | | 1 | Create pmTrSharpoint | pmTrSharepoint | createDWS | Sharepoint 1 | | SCRIPT | @@SERVER | username:password | Test DWS | @@users | Test DWS | /files/test.doc | $respuesta |
| 2 | Create a trigger without sending fields not required | pmTrSharepoint | createDWS | Sharepoint 2 | | SCRIPT | @@SERVER | username:password | Test DWS 1 | @@users | Test DWS | /files/test.doc | |
Scenario Outline: Create new Trigger: createDWS (no enviar campos no requeridos)
Given POST this data:
"""
{
"tri_title": "<tri_title>",
"tri_description": "<tri_description>",
"tri_type": "<tri_type>",
"tri_params": {
"input": {
"sharepointServer": "<tri_params.input.sharepointServer>",
"auth": "<tri_params.input.auth>",
"name": "<tri_params.input.name>",
"users": "<tri_params.input.users>",
"title": "<tri_params.input.title>",
"documents": "<tri_params.input.documents>"
},
"output": {
"tri_answer": "<tri_params.output.tri_answer>"
}
}
}
"""
And I request "project/14414793652a5d718b65590036026581/trigger-wizard/<lib_name>/<fn_name>"
And the content type is "application/json"
Then the response status code should be 201
And the response charset is "UTF-8"
And the type is "object"
And store "tri_uid" in session array as variable "tri_uid<i>"
Examples:
| i | lib_name | fn_name | tri_title | tri_description | tri_type | tri_params.input.sharepointServer | tri_params.input.auth | tri_params.input.name | tri_params.input.users | tri_params.input.title | tri_params.input.documents | tri_params.output.tri_answer |
| 2 | pmTrSharepoint | createDWS | Sharepoint 1 | | SCRIPT | @@SERVER | username:password | Test DWS | @@users | Test DWS | /files/test.doc | $respuesta |
Scenario Outline: Update Trigger Scenario Outline: Update Trigger
Given PUT this data: Given PUT this data:
""" """
@@ -280,6 +246,7 @@ Scenario Outline: Create new Trigger: createDWS
| i | | i |
| 0 | | 0 |
| 1 | | 1 |
| 2 |
Scenario: Get a List of triggers of a project Scenario: Get a List of triggers of a project

31
framework/src/Maveriks/WebApplication.php
View File

@@ -344,8 +344,8 @@ class WebApplication
set_include_path(get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE); set_include_path(get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE);
// smarty constants // smarty constants
// define( "PATH_SMARTY_C", PATH_C . "smarty" . PATH_SEP . "c" ); define( "PATH_SMARTY_C", PATH_C . "smarty" . PATH_SEP . "c" );
// define( "PATH_SMARTY_CACHE", PATH_C . "smarty" . PATH_SEP . "cache" ); define( "PATH_SMARTY_CACHE", PATH_C . "smarty" . PATH_SEP . "cache" );
define("PATH_DATA_SITE", PATH_DATA . "sites/" . SYS_SYS . "/"); define("PATH_DATA_SITE", PATH_DATA . "sites/" . SYS_SYS . "/");
define("PATH_DOCUMENT", PATH_DATA_SITE . "files/"); define("PATH_DOCUMENT", PATH_DATA_SITE . "files/");
@@ -366,6 +366,33 @@ class WebApplication
echo "WARNING! No server info found!"; echo "WARNING! No server info found!";
} }
/**
* Global definitions, before it was the defines.php file
*/
// URL Key
define( "URL_KEY", 'c0l0s40pt1mu59r1m3' );
// Other definitions
define( 'TIMEOUT_RESPONSE', 100 ); //web service timeout
define( 'APPLICATION_CODE', 'ProcessMaker' ); //to login like workflow system
define( 'MAIN_POFILE', 'processmaker' );
define( 'PO_SYSTEM_VERSION', 'PM 4.0.1' );
// Environment definitions
define( 'G_PRO_ENV', 'PRODUCTION' );
define( 'G_DEV_ENV', 'DEVELOPMENT' );
define( 'G_TEST_ENV', 'TEST' );
// Number of files per folder at PATH_UPLOAD (cases documents)
define( 'APPLICATION_DOCUMENTS_PER_FOLDER', 1000 );
// Server of ProcessMaker Library
define( 'PML_SERVER', 'http://library.processmaker.com' );
define( 'PML_WSDL_URL', PML_SERVER . '/syspmLibrary/en/green/services/wsdl' );
define( 'PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess' );
define( 'PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download' );
// create memcached singleton // create memcached singleton
//\Bootstrap::LoadClass("memcached"); //\Bootstrap::LoadClass("memcached");
//$memcache = PMmemcached::getSingleton( SYS_SYS ); //$memcache = PMmemcached::getSingleton( SYS_SYS );

3
gulliver/system/class.bootstrap.php
View File

@@ -159,6 +159,7 @@ class Bootstrap
self::registerClass("XmlForm_Field_cellMark", PATH_GULLIVER . "class.xmlformExtension.php"); self::registerClass("XmlForm_Field_cellMark", PATH_GULLIVER . "class.xmlformExtension.php");
self::registerClass("XmlForm_Field_DVEditor", PATH_GULLIVER . "class.xmlformExtension.php"); self::registerClass("XmlForm_Field_DVEditor", PATH_GULLIVER . "class.xmlformExtension.php");
self::registerClass("XmlForm_Field_FastSearch", PATH_GULLIVER . "class.xmlformExtension.php"); self::registerClass("XmlForm_Field_FastSearch", PATH_GULLIVER . "class.xmlformExtension.php");
self::registerClass("xmlformTemplate", PATH_GULLIVER . "class.xmlformTemplate.php");
self::registerClass("ymlDomain", PATH_GULLIVER . "class.ymlDomain.php"); self::registerClass("ymlDomain", PATH_GULLIVER . "class.ymlDomain.php");
self::registerClass("ymlTestCases", PATH_GULLIVER . "class.ymlTestCases.php"); self::registerClass("ymlTestCases", PATH_GULLIVER . "class.ymlTestCases.php");
@@ -743,7 +744,7 @@ class Bootstrap
* @param array list plugins active * @param array list plugins active
* @return void * @return void
*/ */
public function LoadTranslationPlugins ($lang = SYS_LANG, $listPluginsActive) public static function LoadTranslationPlugins ($lang = SYS_LANG, $listPluginsActive)
{ {
if ( ! ( is_array ( $listPluginsActive ) ) ) { if ( ! ( is_array ( $listPluginsActive ) ) ) {
return null; return null;

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

@@ -5463,417 +5463,7 @@ class XmlForm
} }
} }
/**
* Class xmlformTemplate
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @package gulliver.system
* @access public
*/
class xmlformTemplate extends Smarty
{
public $template;
public $templateFile;
/**
* Function xmlformTemplate
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @param string templateFile
* @return string
*/
public function xmlformTemplate (&$form, $templateFile)
{
$this->template_dir = PATH_XMLFORM;
$this->compile_dir = PATH_SMARTY_C;
$this->cache_dir = PATH_SMARTY_CACHE;
$this->config_dir = PATH_THIRDPARTY . 'smarty/configs';
$this->caching = false;
// register the resource name "db"
$this->templateFile = $templateFile;
}
/**
* Function printTemplate
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @param string target
* @return string
*/
public function printTemplate (&$form, $target = 'smarty')
{
if (strcasecmp( $target, 'smarty' ) === 0) {
$varPrefix = '$';
}
if (strcasecmp( $target, 'templatePower' ) === 0) {
$varPrefix = '';
}
$ft = new StdClass();
foreach ($form as $name => $value) {
if (($name !== 'fields') && ($value !== '')) {
$ft->{$name} = '{$form_' . $name . '}';
}
if ($name === 'cols') {
$ft->{$name} = $value;
}
if ($name === 'owner') {
$ft->owner = & $form->owner;
}
if ($name === 'deleteRow') {
$ft->deleteRow = $form->deleteRow;
}
if ($name === 'addRow') {
$ft->addRow = $form->addRow;
}
if ($name === 'editRow') {
$ft->editRow = $form->editRow;
}
}
if (! isset( $ft->action )) {
$ft->action = '{$form_action}';
}
$hasRequiredFields = false;
foreach ($form->fields as $k => $v) {
$ft->fields[$k] = $v->cloneObject();
$ft->fields[$k]->label = '{' . $varPrefix . $k . '}';
if ($form->type === 'grid') {
if (strcasecmp( $target, 'smarty' ) === 0) {
$ft->fields[$k]->field = '{' . $varPrefix . 'form.' . $k . '[row]}';
}
if (strcasecmp( $target, 'templatePower' ) === 0) {
$ft->fields[$k]->field = '{' . $varPrefix . 'form[' . $k . '][row]}';
}
} else {
if (strcasecmp( $target, 'smarty' ) === 0) {
$ft->fields[$k]->field = '{' . $varPrefix . 'form.' . $k . '}';
}
if (strcasecmp( $target, 'templatePower' ) === 0) {
$ft->fields[$k]->field = '{' . $varPrefix . 'form[' . $k . ']}';
}
}
$hasRequiredFields = $hasRequiredFields | (isset( $v->required ) && ($v->required == '1') && ($v->mode == 'edit'));
if ($v->type == 'xmlmenu') {
$menu = $v;
}
}
if (isset( $menu )) {
if (isset( $menu->owner->values['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] )) {
$prevStep_url = $menu->owner->values['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'];
$this->assign( 'prevStep_url', $prevStep_url );
$this->assign( 'prevStep_label', G::loadTranslation( 'ID_BACK' ) );
}
}
$this->assign( 'hasRequiredFields', $hasRequiredFields );
$this->assign( 'form', $ft );
$this->assign( 'printTemplate', true );
$this->assign( 'printJSFile', false );
$this->assign( 'printJavaScript', false );
//$this->assign ( 'dynaformSetFocus', "try {literal}{{/literal} dynaformSetFocus();}catch(e){literal}{{/literal}}" );
return $this->fetch( $this->templateFile );
}
/**
* Function printJavaScript
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @return string
*/
public function printJavaScript (&$form)
{
$this->assign( 'form', $form );
$this->assign( 'printTemplate', false );
$this->assign( 'printJSFile', false );
$this->assign( 'printJavaScript', true );
return $this->fetch( $this->templateFile );
}
/**
* Function printJSFile
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @return string
*/
public function printJSFile (&$form)
{
//JS designer>preview
if (isset($_SERVER["HTTP_REFERER"]) && !empty($_SERVER["HTTP_REFERER"]) && preg_match("/^.*dynaforms_Editor\?.*PRO_UID=.*DYN_UID=.*$/", $_SERVER["HTTP_REFERER"]) && preg_match("/^.*dynaforms\/dynaforms_Ajax.*$/", $_SERVER["REQUEST_URI"])) {
$js = null;
foreach ($form->fields as $index => $value) {
$field = $value;
if ($field->type == "javascript" && !empty($field->code)) {
$js = $js . " " . $field->code;
}
}
if ($js != null) {
$form->jsDesignerPreview = "
//JS designer>preview
$js
loadForm_" . $form->id . "(\"../gulliver/defaultAjaxDynaform\");
if (typeof(dynaformOnload) != \"undefined\") {
dynaformOnload();
}
";
}
}
$this->assign( 'form', $form );
$this->assign( 'printTemplate', false );
$this->assign( 'printJSFile', true );
$this->assign( 'printJavaScript', false );
return $this->fetch( $this->templateFile );
}
/**
* Function getFields
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @return string
*/
public function getFields (&$form, $therow = -1)
{
$result = array ();
foreach ($form->fields as $k => $v) {
$field = $v;
if ($form->mode != '') {
#@ last modification: erik
$field->mode = $form->mode; #@
} #@
//if (isset($form->fields[$k]->sql)) $form->fields[$k]->executeSQL( $form );
$value = (isset( $form->values[$k] )) ? $form->values[$k] : null;
$result[$k] = G::replaceDataField( $form->fields[$k]->label, $form->values );
if ($form->type == 'xmlform') {
if (in_array($field->type, array("text", "currency", "percentage", "password", "suggest", "textarea", "dropdown", "yesno", "listbox", "checkbox", "date", "link", "file"))) {
$result[$k] = '<label for="form[' . $k . ']">' . $result[$k] . '</label>';
}
}
if (! is_array( $value )) {
if ($form->type == 'grid') {
$aAux = array ();
if (!isset($form->values[$form->name])) {
$form->values[$form->name] = array();
}
if ($therow == - 1) {
for ($i = 0; $i < count( $form->values[$form->name] ); $i ++) {
$aAux[] = '';
}
} else {
for ($i = 0; $i < $therow; $i ++) {
$aAux[] = '';
}
}
switch ($field->type) {
case "link":
$result["form"][$k] = $form->fields[$k]->renderGrid($aAux, array(), $form);
break;
default:
$result["form"][$k] = $form->fields[$k]->renderGrid($aAux, $form);
break;
}
} else {
switch ($field->type) {
case "link":
$result["form"][$k] = $form->fields[$k]->render(
$value,
(isset($form->values[$k . "_label"]))? $form->values[$k . "_label"] : null,
$form
);
break;
default:
$result["form"][$k] = $form->fields[$k]->render($value, $form);
break;
}
}
} else {
/*if (isset ( $form->owner )) {
if (count ( $value ) < count ( $form->owner->values [$form->name] )) {
$i = count ( $value );
$j = count ( $form->owner->values [$form->name] );
for($i; $i < $j; $i ++) {
$value [] = '';
}
}
}*/
if ($field->type == "grid") {
// Fix data for grids
if (is_array($form->fields[$k]->fields)) {
foreach ($form->fields[$k]->fields as $gridFieldName => $gridField) {
$valueLength = count($value);
for ($i = 1; $i <= $valueLength; $i++) {
if (!isset($value[$i][$gridFieldName])) {
switch ($gridField->type) {
case 'checkbox':
$defaultAttribute = 'falseValue';
break;
default:
$defaultAttribute = 'defaultValue';
break;
}
$value[$i][$gridFieldName] = isset($gridField->$defaultAttribute) ? $gridField->$defaultAttribute : '';
}
}
}
}
$form->fields[$k]->setScrollStyle( $form );
$result["form"][$k] = $form->fields[$k]->renderGrid( $value, $form, $therow );
} else {
switch ($field->type) {
case "dropdown":
$result["form"][$k] = $form->fields[$k]->renderGrid( $value, $form, false, $therow );
break;
case "file":
$result["form"][$k] = $form->fields[$k]->renderGrid( $value, $form, $therow );
break;
case "link":
$result["form"][$k] = $form->fields[$k]->renderGrid(
$value,
(isset($form->values[$k . "_label"]))? $form->values[$k . "_label"] : array(),
$form
);
break;
default:
$result["form"][$k] = $form->fields[$k]->renderGrid( $value, $form );
break;
}
}
}
}
foreach ($form as $name => $value) {
if ($name !== 'fields') {
$result['form_' . $name] = $value;
}
}
return $result;
}
/**
* Function printObject
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @return string
*/
public function printObject(&$form, $therow = -1)
{
//to do: generate the template for templatePower.
//DONE: The template was generated in printTemplate, to use it
// is necesary to load the file with templatePower and send the array
//result
$this->register_resource ( 'mem', array (array (&$this, '_get_template' ), array ($this, '_get_timestamp' ), array ($this, '_get_secure' ), array ($this, '_get_trusted' ) ) );
$result = $this->getFields ( $form, $therow );
$this->assign ( array ('PATH_TPL' => PATH_TPL ) );
$this->assign ( $result );
if ( defined('SYS_LANG_DIRECTION') && SYS_LANG_DIRECTION == 'R' ) {
switch( $form->type ){
case 'toolbar':
$form->align = 'right';
break;
}
}
$this->assign ( array ('_form' => $form ) );
//'mem:defaultTemplate'.$form->name obtains the template generated for the
//current "form" object, then this resource y saved by Smarty in the
//cache_dir. To avoiding troubles when two forms with the same id are being
//drawed in a same page with different templates, add an . rand(1,1000)
//to the resource name. This is because the process of creating templates
//(with the method "printTemplate") and painting takes less than 1 second
//so the new template resource generally will had the same timestamp.
$output = $this->fetch ( 'mem:defaultTemplate' . $form->name );
return $output;
}
/**
* Smarty plugin
* -------------------------------------------------------------
* Type: resource
* Name: mem
* Purpose: Fetches templates from this object
* -------------------------------------------------------------
*/
public function _get_template($tpl_name, &$tpl_source, &$smarty_obj)
{
$tpl_source = $this->template;
return true;
}
/**
* Function _get_timestamp
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string tpl_name
* @param string tpl_timestamp
* @param string smarty_obj
* @return string
*/
public function _get_timestamp($tpl_name, &$tpl_timestamp, &$smarty_obj)
{
//NOTE: +1 prevents to load the smarty cache instead of this resource
$tpl_timestamp = time () + 1;
return true;
}
/**
* Function _get_secure
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string tpl_name
* @param string smarty_obj
* @return string
*/
public function _get_secure($tpl_name, &$smarty_obj)
{
// assume all templates are secure
return true;
}
/**
* Function _get_trusted
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string tpl_name
* @param string smarty_obj
* @return string
*/
public function _get_trusted($tpl_name, &$smarty_obj)
{
// not used for templates
}
}
/** /**
* @package gulliver.system * @package gulliver.system

412
gulliver/system/class.xmlformTemplate.php Normal file
View File

@@ -0,0 +1,412 @@
<?php
/**
* Class xmlformTemplate
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @package gulliver.system
* @access public
*/
class xmlformTemplate extends Smarty
{
public $template;
public $templateFile;
/**
* Function xmlformTemplate
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @param string templateFile
* @return string
*/
public function xmlformTemplate (&$form, $templateFile)
{
$this->template_dir = PATH_XMLFORM;
$this->compile_dir = PATH_SMARTY_C;
$this->cache_dir = PATH_SMARTY_CACHE;
$this->config_dir = PATH_THIRDPARTY . 'smarty/configs';
$this->caching = false;
// register the resource name "db"
$this->templateFile = $templateFile;
}
/**
* Function printTemplate
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @param string target
* @return string
*/
public function printTemplate (&$form, $target = 'smarty')
{
if (strcasecmp( $target, 'smarty' ) === 0) {
$varPrefix = '$';
}
if (strcasecmp( $target, 'templatePower' ) === 0) {
$varPrefix = '';
}
$ft = new StdClass();
foreach ($form as $name => $value) {
if (($name !== 'fields') && ($value !== '')) {
$ft->{$name} = '{$form_' . $name . '}';
}
if ($name === 'cols') {
$ft->{$name} = $value;
}
if ($name === 'owner') {
$ft->owner = & $form->owner;
}
if ($name === 'deleteRow') {
$ft->deleteRow = $form->deleteRow;
}
if ($name === 'addRow') {
$ft->addRow = $form->addRow;
}
if ($name === 'editRow') {
$ft->editRow = $form->editRow;
}
}
if (! isset( $ft->action )) {
$ft->action = '{$form_action}';
}
$hasRequiredFields = false;
foreach ($form->fields as $k => $v) {
$ft->fields[$k] = $v->cloneObject();
$ft->fields[$k]->label = '{' . $varPrefix . $k . '}';
if ($form->type === 'grid') {
if (strcasecmp( $target, 'smarty' ) === 0) {
$ft->fields[$k]->field = '{' . $varPrefix . 'form.' . $k . '[row]}';
}
if (strcasecmp( $target, 'templatePower' ) === 0) {
$ft->fields[$k]->field = '{' . $varPrefix . 'form[' . $k . '][row]}';
}
} else {
if (strcasecmp( $target, 'smarty' ) === 0) {
$ft->fields[$k]->field = '{' . $varPrefix . 'form.' . $k . '}';
}
if (strcasecmp( $target, 'templatePower' ) === 0) {
$ft->fields[$k]->field = '{' . $varPrefix . 'form[' . $k . ']}';
}
}
$hasRequiredFields = $hasRequiredFields | (isset( $v->required ) && ($v->required == '1') && ($v->mode == 'edit'));
if ($v->type == 'xmlmenu') {
$menu = $v;
}
}
if (isset( $menu )) {
if (isset( $menu->owner->values['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] )) {
$prevStep_url = $menu->owner->values['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'];
$this->assign( 'prevStep_url', $prevStep_url );
$this->assign( 'prevStep_label', G::loadTranslation( 'ID_BACK' ) );
}
}
$this->assign( 'hasRequiredFields', $hasRequiredFields );
$this->assign( 'form', $ft );
$this->assign( 'printTemplate', true );
$this->assign( 'printJSFile', false );
$this->assign( 'printJavaScript', false );
//$this->assign ( 'dynaformSetFocus', "try {literal}{{/literal} dynaformSetFocus();}catch(e){literal}{{/literal}}" );
return $this->fetch( $this->templateFile );
}
/**
* Function printJavaScript
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @return string
*/
public function printJavaScript (&$form)
{
$this->assign( 'form', $form );
$this->assign( 'printTemplate', false );
$this->assign( 'printJSFile', false );
$this->assign( 'printJavaScript', true );
return $this->fetch( $this->templateFile );
}
/**
* Function printJSFile
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @return string
*/
public function printJSFile (&$form)
{
//JS designer>preview
if (isset($_SERVER["HTTP_REFERER"]) && !empty($_SERVER["HTTP_REFERER"]) && preg_match("/^.*dynaforms_Editor\?.*PRO_UID=.*DYN_UID=.*$/", $_SERVER["HTTP_REFERER"]) && preg_match("/^.*dynaforms\/dynaforms_Ajax.*$/", $_SERVER["REQUEST_URI"])) {
$js = null;
foreach ($form->fields as $index => $value) {
$field = $value;
if ($field->type == "javascript" && !empty($field->code)) {
$js = $js . " " . $field->code;
}
}
if ($js != null) {
$form->jsDesignerPreview = "
//JS designer>preview
$js
loadForm_" . $form->id . "(\"../gulliver/defaultAjaxDynaform\");
if (typeof(dynaformOnload) != \"undefined\") {
dynaformOnload();
}
";
}
}
$this->assign( 'form', $form );
$this->assign( 'printTemplate', false );
$this->assign( 'printJSFile', true );
$this->assign( 'printJavaScript', false );
return $this->fetch( $this->templateFile );
}
/**
* Function getFields
*
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @return string
*/
public function getFields (&$form, $therow = -1)
{
$result = array ();
foreach ($form->fields as $k => $v) {
$field = $v;
if ($form->mode != '') {
#@ last modification: erik
$field->mode = $form->mode; #@
} #@
//if (isset($form->fields[$k]->sql)) $form->fields[$k]->executeSQL( $form );
$value = (isset( $form->values[$k] )) ? $form->values[$k] : null;
$result[$k] = G::replaceDataField( $form->fields[$k]->label, $form->values );
if ($form->type == 'xmlform') {
if (in_array($field->type, array("text", "currency", "percentage", "password", "suggest", "textarea", "dropdown", "yesno", "listbox", "checkbox", "date", "link", "file"))) {
$result[$k] = '<label for="form[' . $k . ']">' . $result[$k] . '</label>';
}
}
if (! is_array( $value )) {
if ($form->type == 'grid') {
$aAux = array ();
if (!isset($form->values[$form->name])) {
$form->values[$form->name] = array();
}
if ($therow == - 1) {
for ($i = 0; $i < count( $form->values[$form->name] ); $i ++) {
$aAux[] = '';
}
} else {
for ($i = 0; $i < $therow; $i ++) {
$aAux[] = '';
}
}
switch ($field->type) {
case "link":
$result["form"][$k] = $form->fields[$k]->renderGrid($aAux, array(), $form);
break;
default:
$result["form"][$k] = $form->fields[$k]->renderGrid($aAux, $form);
break;
}
} else {
switch ($field->type) {
case "link":
$result["form"][$k] = $form->fields[$k]->render(
$value,
(isset($form->values[$k . "_label"]))? $form->values[$k . "_label"] : null,
$form
);
break;
default:
$result["form"][$k] = $form->fields[$k]->render($value, $form);
break;
}
}
} else {
/*if (isset ( $form->owner )) {
if (count ( $value ) < count ( $form->owner->values [$form->name] )) {
$i = count ( $value );
$j = count ( $form->owner->values [$form->name] );
for($i; $i < $j; $i ++) {
$value [] = '';
}
}
}*/
if ($field->type == "grid") {
// Fix data for grids
if (is_array($form->fields[$k]->fields)) {
foreach ($form->fields[$k]->fields as $gridFieldName => $gridField) {
$valueLength = count($value);
for ($i = 1; $i <= $valueLength; $i++) {
if (!isset($value[$i][$gridFieldName])) {
switch ($gridField->type) {
case 'checkbox':
$defaultAttribute = 'falseValue';
break;
default:
$defaultAttribute = 'defaultValue';
break;
}
$value[$i][$gridFieldName] = isset($gridField->$defaultAttribute) ? $gridField->$defaultAttribute : '';
}
}
}
}
$form->fields[$k]->setScrollStyle( $form );
$result["form"][$k] = $form->fields[$k]->renderGrid( $value, $form, $therow );
} else {
switch ($field->type) {
case "dropdown":
$result["form"][$k] = $form->fields[$k]->renderGrid( $value, $form, false, $therow );
break;
case "file":
$result["form"][$k] = $form->fields[$k]->renderGrid( $value, $form, $therow );
break;
case "link":
$result["form"][$k] = $form->fields[$k]->renderGrid(
$value,
(isset($form->values[$k . "_label"]))? $form->values[$k . "_label"] : array(),
$form
);
break;
default:
$result["form"][$k] = $form->fields[$k]->renderGrid( $value, $form );
break;
}
}
}
}
foreach ($form as $name => $value) {
if ($name !== 'fields') {
$result['form_' . $name] = $value;
}
}
return $result;
}
/**
* Function printObject
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string form
* @return string
*/
public function printObject(&$form, $therow = -1)
{
//to do: generate the template for templatePower.
//DONE: The template was generated in printTemplate, to use it
// is necesary to load the file with templatePower and send the array
//result
$this->register_resource ( 'mem', array (array (&$this, '_get_template' ), array ($this, '_get_timestamp' ), array ($this, '_get_secure' ), array ($this, '_get_trusted' ) ) );
$result = $this->getFields ( $form, $therow );
$this->assign ( array ('PATH_TPL' => PATH_TPL ) );
$this->assign ( $result );
if ( defined('SYS_LANG_DIRECTION') && SYS_LANG_DIRECTION == 'R' ) {
switch( $form->type ){
case 'toolbar':
$form->align = 'right';
break;
}
}
$this->assign ( array ('_form' => $form ) );
//'mem:defaultTemplate'.$form->name obtains the template generated for the
//current "form" object, then this resource y saved by Smarty in the
//cache_dir. To avoiding troubles when two forms with the same id are being
//drawed in a same page with different templates, add an . rand(1,1000)
//to the resource name. This is because the process of creating templates
//(with the method "printTemplate") and painting takes less than 1 second
//so the new template resource generally will had the same timestamp.
$output = $this->fetch ( 'mem:defaultTemplate' . $form->name );
return $output;
}
/**
* Smarty plugin
* -------------------------------------------------------------
* Type: resource
* Name: mem
* Purpose: Fetches templates from this object
* -------------------------------------------------------------
*/
public function _get_template($tpl_name, &$tpl_source, &$smarty_obj)
{
$tpl_source = $this->template;
return true;
}
/**
* Function _get_timestamp
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string tpl_name
* @param string tpl_timestamp
* @param string smarty_obj
* @return string
*/
public function _get_timestamp($tpl_name, &$tpl_timestamp, &$smarty_obj)
{
//NOTE: +1 prevents to load the smarty cache instead of this resource
$tpl_timestamp = time () + 1;
return true;
}
/**
* Function _get_secure
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string tpl_name
* @param string smarty_obj
* @return string
*/
public function _get_secure($tpl_name, &$smarty_obj)
{
// assume all templates are secure
return true;
}
/**
* Function _get_trusted
* @author David S. Callizaya S. <davidsantos@colosa.com>
* @access public
* @param string tpl_name
* @param string smarty_obj
* @return string
*/
public function _get_trusted($tpl_name, &$smarty_obj)
{
// not used for templates
}
}

1708
gulliver/thirdparty/pear/Archive/Tar.php vendored
View File

File diff suppressed because it is too large Load Diff

18
workflow/engine/classes/class.pluginRegistry.php
View File

@@ -139,6 +139,24 @@ class PMPluginRegistry
return self::$instance; return self::$instance;
} }
/**
* Load the singleton instance from a serialized stored file
*
* @param $file
* @return PMPluginRegistry
* @throws Exception
*/
public static function loadSingleton($file)
{
self::$instance = unserialize(file_get_contents($file));
if (! is_object(self::$instance) || get_class(self::$instance) != "PMPluginRegistry") {
throw new Exception("Can't load main PMPluginRegistry object.");
}
return self::$instance;
}
/** /**
* This function generates a storable representation of a value * This function generates a storable representation of a value
* param * param

15
workflow/engine/src/BusinessModel/CaseTracker.php
View File

@@ -155,13 +155,6 @@ class CaseTracker
//Array DB //Array DB
$arrayCaseTrackerObject = array(); $arrayCaseTrackerObject = array();
$arrayCaseTrackerObject[] = array(
"obj_uid" => "char",
"obj_title" => "char",
"obj_description" => "char",
"obj_type" => "char"
);
$delimiter = \DBAdapter::getStringDelimiter(); $delimiter = \DBAdapter::getStringDelimiter();
//DynaForms //DynaForms
@@ -297,13 +290,13 @@ class CaseTracker
); );
} }
$arrayAvailableCaseTrackerObject = \ProcessMaker\Util\ArrayUtil::sort( $arrayCaseTrackerObject = \ProcessMaker\Util\ArrayUtil::sort(
$arrayAvailableCaseTrackerObject, $arrayCaseTrackerObject,
array("obj_type", "obj_title"), array("obj_type", "obj_title"),
SORT_ASC SORT_ASC
); );
return $arrayAvailableCaseTrackerObject; return $arrayCaseTrackerObject;
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;
} }
@@ -390,8 +383,6 @@ class CaseTracker
); );
} }
//Set data
\G::LoadClass("ArrayPeer");
$arraydbCaseTrackerObject = \ProcessMaker\Util\ArrayUtil::sort($arraydbCaseTrackerObject, array("cto_position"), SORT_ASC); $arraydbCaseTrackerObject = \ProcessMaker\Util\ArrayUtil::sort($arraydbCaseTrackerObject, array("cto_position"), SORT_ASC);
return $arrayCaseTrackerObject; return $arrayCaseTrackerObject;

5
workflow/engine/src/BusinessModel/WebEntry.php
View File

@@ -477,6 +477,11 @@ class WebEntry
case "HTML": case "HTML":
global $G_FORM; global $G_FORM;
if (! class_exists("Smarty")) {
$loader = \Maveriks\Util\ClassLoader::getInstance();
$loader->addClass("Smarty", PATH_THIRDPARTY . "smarty".PATH_SEP."libs".PATH_SEP."Smarty.class.php");
}
$G_FORM = new \Form($processUid . "/" . $dynaFormUid, PATH_DYNAFORM, SYS_LANG, false); $G_FORM = new \Form($processUid . "/" . $dynaFormUid, PATH_DYNAFORM, SYS_LANG, false);
$G_FORM->action = $http . $_SERVER["HTTP_HOST"] . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/services/cases_StartExternal.php"; $G_FORM->action = $http . $_SERVER["HTTP_HOST"] . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/services/cases_StartExternal.php";

6
workflow/public_html/sysGeneric.php
View File

@@ -27,7 +27,6 @@
* this file is used initialize main variables, redirect and dispatch all requests * this file is used initialize main variables, redirect and dispatch all requests
*/ */
function transactionLog($transactionName){ function transactionLog($transactionName){
if (extension_loaded('newrelic')) { if (extension_loaded('newrelic')) {
$baseName="ProcessMaker"; $baseName="ProcessMaker";
@@ -609,12 +608,13 @@ Bootstrap::LoadClass( 'plugin' );
//here we are loading all plugins registered //here we are loading all plugins registered
//the singleton has a list of enabled plugins //the singleton has a list of enabled plugins
$sSerializedFile = PATH_DATA_SITE . 'plugin.singleton'; $sSerializedFile = PATH_DATA_SITE . 'plugin.singleton';
$oPluginRegistry = & PMPluginRegistry::getSingleton();
if (file_exists( $sSerializedFile )) { if (file_exists( $sSerializedFile )) {
$oPluginRegistry->unSerializeInstance( file_get_contents( $sSerializedFile ) ); $oPluginRegistry = PMPluginRegistry::loadSingleton($sSerializedFile);
$attributes = $oPluginRegistry->getAttributes(); $attributes = $oPluginRegistry->getAttributes();
Bootstrap::LoadTranslationPlugins( defined( 'SYS_LANG' ) ? SYS_LANG : "en" , $attributes); Bootstrap::LoadTranslationPlugins( defined( 'SYS_LANG' ) ? SYS_LANG : "en" , $attributes);
} else{
$oPluginRegistry = PMPluginRegistry::getSingleton();
} }
// setup propel definitions and logging // setup propel definitions and logging