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

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

Browse Source
This commit is contained in:
Dante
2015-04-21 10:21:48 -04:00
parent 98f8cf7e16 c86ef0b935
commit 4fcc6ff89a
47 changed files with 403 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
workflow/engine/classes/class.case.php
View File

@@ -5067,8 +5067,10 @@ class Cases
}
$aConfiguration = System::getEmailConfiguration();
$msgError = "";
if (!isset($aConfiguration['MESS_ENABLED']) || $aConfiguration['MESS_ENABLED'] != '1') {
return false;
$msgError = "The default configuration wasn't defined";
$aConfiguration['MESS_ENGINE'] = '';
}
//Send derivation notification - Start
@@ -5225,13 +5227,16 @@ class Cases
"app_msg_bcc" => "",
"app_msg_attach" => "",
"app_msg_template" => "",
"app_msg_status" => "pending"
"app_msg_status" => "pending",
"app_msg_error" => $msgError
));
if (($aConfiguration["MESS_BACKGROUND"] == "") ||
($aConfiguration["MESS_TRY_SEND_INMEDIATLY"] == "1")
) {
$oSpool->sendMail();
if ($msgError == '') {
if (($aConfiguration["MESS_BACKGROUND"] == "") ||
($aConfiguration["MESS_TRY_SEND_INMEDIATLY"] == "1")
) {
$oSpool->sendMail();
}
}
}
}

11
workflow/engine/classes/class.configuration.php
View File

@@ -320,8 +320,17 @@ class Configurations // extends Configuration
if ($usrUid != '') {
$oUser = UsersPeer::retrieveByPK($usrUid);
$aux = str_replace('@userName', trim($username), $this->UserConfig['format']);
$theFormat = $this->UserConfig['format'];
$fname = $oUser->getUsrFirstname();
$lname = $oUser->getUsrLastname();
if (strpos($theFormat, ',') !== false && ( trim($fname) == '' || trim($lname) == '')) {
$theFormat = str_replace(',', '', $theFormat);
}
$aux = str_replace('@userName', trim($username), $theFormat);
$aux = str_replace('@firstName', $oUser->getUsrFirstname(), $aux);
$aux = str_replace('@lastName', $oUser->getUsrLastname(), $aux);
$aux = str_replace('@lastName', $oUser->getUsrLastname(), $aux);
}
return $aux;
}

2
workflow/engine/classes/class.licensedFeatures.php
View File

@@ -224,6 +224,7 @@ class PMLicensedFeatures
$rs = AddonsManagerPeer::doSelectRS($criteria);
$rs->next();
$row = $rs->getRow();
$ids = array();
if(sizeof($row)) {
while (is_array($row)) {
$ids[] = $row[0];
@@ -244,6 +245,7 @@ class PMLicensedFeatures
}
}
$i = 0;
foreach($newFeaturesList as $k => $newFeature){
$newData[] = array (
'db' => 'wf',

3
workflow/engine/classes/class.plugin.php
View File

@@ -44,6 +44,9 @@ define('PM_GET_CASES_AJAX_LISTENER', 1015);
define('PM_BEFORE_CREATE_USER', 1016);
define('PM_AFTER_LOGIN', 1017);
define('PM_HASH_PASSWORD', 1018);
define('PM_SCHEDULER_CREATE_CASE_BEFORE', 1019);
define('PM_SCHEDULER_CREATE_CASE_AFTER', 1020);
/**
* @package workflow.engine.classes

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

@@ -277,12 +277,15 @@ class PMPluginRegistry
$pluginSrcDir = PATH_PLUGINS . $detail->sNamespace . PATH_SEP . 'src';
if (is_dir($pluginSrcDir)) {
Bootstrap::registerDir($detail->sNamespace.'/src', $pluginSrcDir);
//Bootstrap::registerDir($detail->sNamespace.'/src', $pluginSrcDir);
$loader = \Maveriks\Util\ClassLoader::getInstance();
$loader->add($pluginSrcDir);
}
if (array_key_exists($detail->sNamespace, $this->_restServiceEnabled)
&& $this->_restServiceEnabled[$detail->sNamespace] == true
) {
$oPlugin->registerRestService();
}
@@ -1400,7 +1403,6 @@ class PMPluginRegistry
foreach ($classesList as $classFile) {
if (pathinfo($classFile, PATHINFO_EXTENSION) === 'php') {
$ns = str_replace(
DIRECTORY_SEPARATOR,
'\\',
@@ -1413,6 +1415,8 @@ class PMPluginRegistry
"filepath" => $classFile,
"namespace" => $ns
);
\Maveriks\WebApplication::purgeRestApiCache(basename(PATH_DATA_SITE));
}
}
}
@@ -1601,4 +1605,3 @@ class PMPluginRegistry
}
}
}

13
workflow/engine/classes/class.pmDynaform.php
View File

@@ -33,6 +33,14 @@ class pmDynaform
}
}
public function getDynaformTitle($idDynaform)
{
$d = new Dynaform();
$d->setDynUid($idDynaform);
$titleDynaform = $d->getDynTitle();
return $titleDynaform;
}
public function getDynaform()
{
if (!isset($this->fields["CURRENT_DYNAFORM"])) {
@@ -173,6 +181,9 @@ class pmDynaform
"value" => isset($this->fields["APP_DATA"][$json->name]) ? $this->fields["APP_DATA"][$json->name] : (is_array($json->data) ? $json->data["value"] : $json->data->value),
"label" => isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : (is_array($json->data) ? $json->data["label"] : $json->data->label)
);
if ($json->data["label"] === "") {
$json->data["label"] = $json->data["value"];
}
}
if ($key === "type" && ($value === "checkbox")) {
$json->data = array(
@@ -253,7 +264,7 @@ class pmDynaform
return $this->record != null && $this->record["DYN_VERSION"] == 2 ? true : false;
}
public function printViewWithoutSubmit()
public function printTracker()
{
ob_clean();

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

@@ -2706,10 +2706,10 @@ function PMFCancelCase ($caseUid, $delIndex, $userUid)
* @label PMF Pauses a specified case.
* @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#PMFPauseCase.28.29
*
* @param string(32) | $caseUid | ID of the case | The unique ID of the case.
* @param string(32) | $caseUid | Case UID | 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) | $userUid | ID user | The unique ID of the user who will pause the case.
* @param string(32) | $unpauseDate=null | Date | Optional parameter. The date in the format "yyyy-mm-dd" indicating when to unpause the case.
* @param string(32) | $userUid | User UID | The unique ID of the user who will pause the case.
* @param string(32) | $unpauseDate=null | Unpaused date | The date in the format "yyyy-mm-dd" indicating when to unpause the case.
* @return int | $result | Result of the pause | Returns 1 if the case is paused successfully; otherwise, returns 0 if an error occurred.
*
*/

8
workflow/engine/classes/class.spool.php
View File

@@ -115,6 +115,7 @@ class spoolRun
$this->fileData['bcc'] = $rs->getString( 'APP_MSG_BCC' );
$this->fileData['template'] = $rs->getString( 'APP_MSG_TEMPLATE' );
$this->fileData['attachments'] = array (); //$rs->getString('APP_MSG_ATTACH');
$this->fileData['error'] = $rs->getString( 'APP_MSG_ERROR' );
if ($this->config['MESS_ENGINE'] == 'OPENMAIL') {
if ($this->config['MESS_SERVER'] != '') {
if (($sAux = @gethostbyaddr( $this->config['MESS_SERVER'] ))) {
@@ -148,6 +149,7 @@ class spoolRun
}
$aData['app_msg_attach'] = serialize($attachment);
$aData['app_msg_show_message'] = (isset($aData['app_msg_show_message'])) ? $aData['app_msg_show_message'] : 1;
$aData["app_msg_error"] = (isset($aData["app_msg_error"]))? $aData["app_msg_error"] : '';
$sUID = $this->db_insert( $aData );
$aData['app_msg_date'] = isset( $aData['app_msg_date'] ) ? $aData['app_msg_date'] : '';
@@ -158,7 +160,7 @@ class spoolRun
$aData["contentTypeIsHtml"] = (isset($aData["contentTypeIsHtml"]))? $aData["contentTypeIsHtml"] : true;
$this->setData($sUID, $aData["app_msg_subject"], $aData["app_msg_from"], $aData["app_msg_to"], $aData["app_msg_body"], $aData["app_msg_date"], $aData["app_msg_cc"], $aData["app_msg_bcc"], $aData["app_msg_template"], $aData["app_msg_attach"], $aData["contentTypeIsHtml"]);
$this->setData($sUID, $aData["app_msg_subject"], $aData["app_msg_from"], $aData["app_msg_to"], $aData["app_msg_body"], $aData["app_msg_date"], $aData["app_msg_cc"], $aData["app_msg_bcc"], $aData["app_msg_template"], $aData["app_msg_attach"], $aData["contentTypeIsHtml"], $aData["app_msg_error"]);
}
/**
@@ -214,7 +216,7 @@ class spoolRun
* @param string $sAppMsgUid, $sSubject, $sFrom, $sTo, $sBody, $sDate, $sCC, $sBCC, $sTemplate
* @return none
*/
public function setData($sAppMsgUid, $sSubject, $sFrom, $sTo, $sBody, $sDate = "", $sCC = "", $sBCC = "", $sTemplate = "", $aAttachment = array(), $bContentTypeIsHtml = true)
public function setData($sAppMsgUid, $sSubject, $sFrom, $sTo, $sBody, $sDate = "", $sCC = "", $sBCC = "", $sTemplate = "", $aAttachment = array(), $bContentTypeIsHtml = true, $sError = "")
{
$this->spool_id = $sAppMsgUid;
$this->fileData['subject'] = $sSubject;
@@ -228,6 +230,7 @@ class spoolRun
$this->fileData['attachments'] = $aAttachment;
$this->fileData['envelope_to'] = array ();
$this->fileData["contentTypeIsHtml"] = $bContentTypeIsHtml;
$this->fileData["error"] = $sError;
if (array_key_exists('MESS_ENGINE',$this->config)) {
if ($this->config['MESS_ENGINE'] == 'OPENMAIL') {
@@ -685,6 +688,7 @@ class spoolRun
$spool->setAppMsgStatus( $db_spool['app_msg_status'] );
$spool->setAppMsgSendDate( date( 'Y-m-d H:i:s' ) ); // Add by Ankit
$spool->setAppMsgShowMessage( $db_spool['app_msg_show_message'] ); // Add by Ankit
$spool->setAppMsgError( $db_spool['app_msg_error'] );
if (! $spool->validate()) {

6
workflow/engine/classes/class.wsBase.php
View File

@@ -943,6 +943,11 @@ class wsBase
}
/*----------------------------------********---------------------------------*/
$msgError = "";
if(sizeof($aSetup) == 0){
$msgError = "The default configuration wasn't defined";
}
$oSpool = new spoolRun();
$oSpool->setConfig($aSetup);
@@ -989,6 +994,7 @@ class wsBase
"app_msg_template" => "",
"app_msg_status" => "pending",
"app_msg_show_message" => $showMessage,
"app_msg_error" => $msgError,
"contentTypeIsHtml" => (preg_match("/^.+\.html?$/i", $fileTemplate))? true : false
);

1
workflow/engine/classes/model/AppMessage.php
View File

@@ -84,6 +84,7 @@ class AppMessage extends BaseAppMessage
$spool->setappMsgAttach( $data_spool['app_msg_attach'] );
$spool->setAppMsgTemplate( $data_spool['app_msg_template'] );
$spool->setAppMsgStatus( $data_spool['app_msg_status'] );
$spool->setAppMsgError( $data_spool['app_msg_error'] );
if (! $spool->validate()) {
$this->error_spool = $spool->getValidationFailures();

28
workflow/engine/classes/model/AppNotes.php
View File

@@ -153,8 +153,10 @@ class AppNotes extends BaseAppNotes
}
$aConfiguration = System::getEmailConfiguration();
$msgError = "";
if (! isset( $aConfiguration['MESS_ENABLED'] ) || $aConfiguration['MESS_ENABLED'] != '1') {
return false;
$msgError = "The default configuration wasn't defined";
$aConfiguration['MESS_ENGINE'] = '';
}
$oUser = new Users();
@@ -185,9 +187,27 @@ class AppNotes extends BaseAppNotes
$oSpool = new spoolRun();
$oSpool->setConfig($aConfiguration);
$oSpool->create( array ('msg_uid' => '','app_uid' => $appUid,'del_index' => 0,'app_msg_type' => 'DERIVATION','app_msg_subject' => $sSubject,'app_msg_from' => $sFrom,'app_msg_to' => $sTo,'app_msg_body' => $sBody,'app_msg_cc' => '','app_msg_bcc' => '','app_msg_attach' => '','app_msg_template' => '','app_msg_status' => 'pending') );
if (($aConfiguration['MESS_BACKGROUND'] == '') || ($aConfiguration['MESS_TRY_SEND_INMEDIATLY'] == '1')) {
$oSpool->sendMail();
$oSpool->create(
array ('msg_uid' => '',
'app_uid' => $appUid,
'del_index' => 0,
'app_msg_type' => 'DERIVATION',
'app_msg_subject' => $sSubject,
'app_msg_from' => $sFrom,
'app_msg_to' => $sTo,
'app_msg_body' => $sBody,
'app_msg_cc' => '',
'app_msg_bcc' => '',
'app_msg_attach' => '',
'app_msg_template' => '',
'app_msg_status' => 'pending',
'app_msg_error' => $msgError
)
);
if ($msgError == '') {
if (($aConfiguration['MESS_BACKGROUND'] == '') || ($aConfiguration['MESS_TRY_SEND_INMEDIATLY'] == '1')) {
$oSpool->sendMail();
}
}
}

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

@@ -342,6 +342,7 @@ class CaseScheduler extends BaseCaseScheduler
@file_put_contents( PATH_DATA . "cron", serialize( $arrayCron ) );
}
$sSchedulerUid = $aRow['SCH_UID'];
$sOption = $aRow['SCH_OPTION'];
switch ($sOption) {
@@ -445,13 +446,23 @@ class CaseScheduler extends BaseCaseScheduler
$paramsLogResult = $paramsLogResultFromPlugin['paramsLogResult'];
$paramsRouteLogResult = $paramsLogResultFromPlugin['paramsRouteLogResult'];
} else {
eprint( " - Creating the new case............." );
$paramsAux = $params;
$paramsAux["executeTriggers"] = 1;
$oPluginRegistry = &PMPluginRegistry::getSingleton();
if ($oPluginRegistry->existsTrigger ( PM_SCHEDULER_CREATE_CASE_BEFORE )) {
$oPluginRegistry->executeTriggers(PM_SCHEDULER_CREATE_CASE_BEFORE, $paramsAux);
}
$result = $client->__SoapCall("NewCase", array($paramsAux));
if ($oPluginRegistry->existsTrigger ( PM_SCHEDULER_CREATE_CASE_AFTER )) {
$oPluginRegistry->executeTriggers(PM_SCHEDULER_CREATE_CASE_AFTER, $result);
}
if ($result->status_code == 0) {
eprintln( "OK+ CASE #{$result->caseNumber} was created!", 'green' );
@@ -568,8 +579,17 @@ class CaseScheduler extends BaseCaseScheduler
$paramsAux = $params;
$paramsAux["executeTriggers"] = 1;
$oPluginRegistry = &PMPluginRegistry::getSingleton();
if ($oPluginRegistry->existsTrigger ( PM_SCHEDULER_CREATE_CASE_BEFORE )) {
$oPluginRegistry->executeTriggers(PM_SCHEDULER_CREATE_CASE_BEFORE, $paramsAux);
}
$result = $client->__SoapCall("NewCase", array($paramsAux));
if ($oPluginRegistry->existsTrigger ( PM_SCHEDULER_CREATE_CASE_AFTER )) {
$oPluginRegistry->executeTriggers(PM_SCHEDULER_CREATE_CASE_AFTER, $result);
}
eprint( " - Creating the new case............." );
if ($result->status_code == 0) {
eprintln( "OK+ CASE #{$result->caseNumber} was created!", 'green' );

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

@@ -18,7 +18,7 @@ class DashletInstance extends BaseDashletInstance
{
private $filterThisFields = array('DAS_INS_UID', 'DAS_UID', 'DAS_INS_OWNER_TYPE', 'DAS_INS_OWNER_UID',
'DAS_INS_CREATE_DATE', 'DAS_INS_UPDATE_DATE', 'DAS_INS_STATUS',
'pmos_generik', 'ys-admin-tabpanel', 'PHPSESSID');
"pm_sys_sys", "ys-admin-tabpanel", "PHPSESSID");
public function load($dasInsUid)
{

2
workflow/engine/classes/model/map/AppMessageMapBuilder.php
View File

@@ -99,6 +99,8 @@ class AppMessageMapBuilder
$tMap->addColumn('APP_MSG_SHOW_MESSAGE', 'AppMsgShowMessage', 'int', CreoleTypes::TINYINT, true, null);
$tMap->addColumn('APP_MSG_ERROR', 'AppMsgError', 'string', CreoleTypes::LONGVARCHAR, true, null);
} // doBuild()
} // AppMessageMapBuilder

57
workflow/engine/classes/model/om/BaseAppMessage.php
View File

@@ -129,6 +129,12 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
*/
protected $app_msg_show_message = 1;
/**
* The value for the app_msg_error field.
* @var int
*/
protected $app_msg_error;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -372,6 +378,17 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
return $this->app_msg_show_message;
}
/**
* Get the [app_msg_error] column value.
*
* @return String
*/
public function getAppMsgError()
{
return $this->app_msg_error;
}
/**
* Set the value of [app_msg_uid] column.
*
@@ -760,6 +777,28 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
} // setAppMsgShowMessage()
/**
* Set the value of [app_msg_error] column.
*
* @param string $v new value
* @return void
*/
public function setAppMsgError($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->app_msg_error !== $v || $v === '') {
$this->app_msg_error = $v;
$this->modifiedColumns[] = AppMessagePeer::APP_MSG_ERROR;
}
} // setAppMsgFrom()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -811,12 +850,14 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
$this->app_msg_show_message = $rs->getInt($startcol + 16);
$this->app_msg_error = $rs->getString($startcol + 17);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 17; // 17 = AppMessagePeer::NUM_COLUMNS - AppMessagePeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 18; // 17 = AppMessagePeer::NUM_COLUMNS - AppMessagePeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating AppMessage object", $e);
@@ -1071,6 +1112,9 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
case 16:
return $this->getAppMsgShowMessage();
break;
case 17:
return $this->getAppMsgError();
break;
default:
return null;
break;
@@ -1108,6 +1152,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
$keys[14] => $this->getAppMsgAttach(),
$keys[15] => $this->getAppMsgSendDate(),
$keys[16] => $this->getAppMsgShowMessage(),
$keys[17] => $this->getAppMsgError(),
);
return $result;
}
@@ -1190,6 +1235,9 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
case 16:
$this->setAppMsgShowMessage($value);
break;
case 17:
$this->setAppMsgError($value);
break;
} // switch()
}
@@ -1281,6 +1329,9 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
$this->setAppMsgShowMessage($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
$this->setAppMsgError($arr[$keys[17]]);
}
}
/**
@@ -1360,6 +1411,9 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
$criteria->add(AppMessagePeer::APP_MSG_SHOW_MESSAGE, $this->app_msg_show_message);
}
if ($this->isColumnModified(AppMessagePeer::APP_MSG_ERROR)) {
$criteria->add(AppMessagePeer::APP_MSG_ERROR, $this->app_msg_error);
}
return $criteria;
}
@@ -1446,6 +1500,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
$copyObj->setAppMsgShowMessage($this->app_msg_show_message);
$copyObj->setAppMsgError($this->app_msg_error);
$copyObj->setNew(true);

23
workflow/engine/classes/model/om/BaseAppMessagePeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseAppMessagePeer
const CLASS_DEFAULT = 'classes.model.AppMessage';
/** The total number of columns. */
const NUM_COLUMNS = 17;
const NUM_COLUMNS = 18;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -82,6 +82,9 @@ abstract class BaseAppMessagePeer
/** the column name for the APP_MSG_SHOW_MESSAGE field */
const APP_MSG_SHOW_MESSAGE = 'APP_MESSAGE.APP_MSG_SHOW_MESSAGE';
/** the column name for the APP_MSG_ERROR field */
const APP_MSG_ERROR = 'APP_MESSAGE.APP_MSG_ERROR';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -93,10 +96,10 @@ abstract class BaseAppMessagePeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AppMsgUid', 'MsgUid', 'AppUid', 'DelIndex', 'AppMsgType', 'AppMsgSubject', 'AppMsgFrom', 'AppMsgTo', 'AppMsgBody', 'AppMsgDate', 'AppMsgCc', 'AppMsgBcc', 'AppMsgTemplate', 'AppMsgStatus', 'AppMsgAttach', 'AppMsgSendDate', 'AppMsgShowMessage', ),
BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID, AppMessagePeer::MSG_UID, AppMessagePeer::APP_UID, AppMessagePeer::DEL_INDEX, AppMessagePeer::APP_MSG_TYPE, AppMessagePeer::APP_MSG_SUBJECT, AppMessagePeer::APP_MSG_FROM, AppMessagePeer::APP_MSG_TO, AppMessagePeer::APP_MSG_BODY, AppMessagePeer::APP_MSG_DATE, AppMessagePeer::APP_MSG_CC, AppMessagePeer::APP_MSG_BCC, AppMessagePeer::APP_MSG_TEMPLATE, AppMessagePeer::APP_MSG_STATUS, AppMessagePeer::APP_MSG_ATTACH, AppMessagePeer::APP_MSG_SEND_DATE, AppMessagePeer::APP_MSG_SHOW_MESSAGE, ),
BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID', 'MSG_UID', 'APP_UID', 'DEL_INDEX', 'APP_MSG_TYPE', 'APP_MSG_SUBJECT', 'APP_MSG_FROM', 'APP_MSG_TO', 'APP_MSG_BODY', 'APP_MSG_DATE', 'APP_MSG_CC', 'APP_MSG_BCC', 'APP_MSG_TEMPLATE', 'APP_MSG_STATUS', 'APP_MSG_ATTACH', 'APP_MSG_SEND_DATE', 'APP_MSG_SHOW_MESSAGE', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
BasePeer::TYPE_PHPNAME => array ('AppMsgUid', 'MsgUid', 'AppUid', 'DelIndex', 'AppMsgType', 'AppMsgSubject', 'AppMsgFrom', 'AppMsgTo', 'AppMsgBody', 'AppMsgDate', 'AppMsgCc', 'AppMsgBcc', 'AppMsgTemplate', 'AppMsgStatus', 'AppMsgAttach', 'AppMsgSendDate', 'AppMsgShowMessage', 'AppMsgError', ),
BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID, AppMessagePeer::MSG_UID, AppMessagePeer::APP_UID, AppMessagePeer::DEL_INDEX, AppMessagePeer::APP_MSG_TYPE, AppMessagePeer::APP_MSG_SUBJECT, AppMessagePeer::APP_MSG_FROM, AppMessagePeer::APP_MSG_TO, AppMessagePeer::APP_MSG_BODY, AppMessagePeer::APP_MSG_DATE, AppMessagePeer::APP_MSG_CC, AppMessagePeer::APP_MSG_BCC, AppMessagePeer::APP_MSG_TEMPLATE, AppMessagePeer::APP_MSG_STATUS, AppMessagePeer::APP_MSG_ATTACH, AppMessagePeer::APP_MSG_SEND_DATE, AppMessagePeer::APP_MSG_SHOW_MESSAGE, AppMessagePeer::APP_MSG_ERROR, ),
BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID', 'MSG_UID', 'APP_UID', 'DEL_INDEX', 'APP_MSG_TYPE', 'APP_MSG_SUBJECT', 'APP_MSG_FROM', 'APP_MSG_TO', 'APP_MSG_BODY', 'APP_MSG_DATE', 'APP_MSG_CC', 'APP_MSG_BCC', 'APP_MSG_TEMPLATE', 'APP_MSG_STATUS', 'APP_MSG_ATTACH', 'APP_MSG_SEND_DATE', 'APP_MSG_SHOW_MESSAGE', 'APP_MSG_ERROR', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
);
/**
@@ -106,10 +109,10 @@ abstract class BaseAppMessagePeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AppMsgUid' => 0, 'MsgUid' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'AppMsgType' => 4, 'AppMsgSubject' => 5, 'AppMsgFrom' => 6, 'AppMsgTo' => 7, 'AppMsgBody' => 8, 'AppMsgDate' => 9, 'AppMsgCc' => 10, 'AppMsgBcc' => 11, 'AppMsgTemplate' => 12, 'AppMsgStatus' => 13, 'AppMsgAttach' => 14, 'AppMsgSendDate' => 15, 'AppMsgShowMessage' => 16, ),
BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID => 0, AppMessagePeer::MSG_UID => 1, AppMessagePeer::APP_UID => 2, AppMessagePeer::DEL_INDEX => 3, AppMessagePeer::APP_MSG_TYPE => 4, AppMessagePeer::APP_MSG_SUBJECT => 5, AppMessagePeer::APP_MSG_FROM => 6, AppMessagePeer::APP_MSG_TO => 7, AppMessagePeer::APP_MSG_BODY => 8, AppMessagePeer::APP_MSG_DATE => 9, AppMessagePeer::APP_MSG_CC => 10, AppMessagePeer::APP_MSG_BCC => 11, AppMessagePeer::APP_MSG_TEMPLATE => 12, AppMessagePeer::APP_MSG_STATUS => 13, AppMessagePeer::APP_MSG_ATTACH => 14, AppMessagePeer::APP_MSG_SEND_DATE => 15, AppMessagePeer::APP_MSG_SHOW_MESSAGE => 16, ),
BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID' => 0, 'MSG_UID' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'APP_MSG_TYPE' => 4, 'APP_MSG_SUBJECT' => 5, 'APP_MSG_FROM' => 6, 'APP_MSG_TO' => 7, 'APP_MSG_BODY' => 8, 'APP_MSG_DATE' => 9, 'APP_MSG_CC' => 10, 'APP_MSG_BCC' => 11, 'APP_MSG_TEMPLATE' => 12, 'APP_MSG_STATUS' => 13, 'APP_MSG_ATTACH' => 14, 'APP_MSG_SEND_DATE' => 15, 'APP_MSG_SHOW_MESSAGE' => 16, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
BasePeer::TYPE_PHPNAME => array ('AppMsgUid' => 0, 'MsgUid' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'AppMsgType' => 4, 'AppMsgSubject' => 5, 'AppMsgFrom' => 6, 'AppMsgTo' => 7, 'AppMsgBody' => 8, 'AppMsgDate' => 9, 'AppMsgCc' => 10, 'AppMsgBcc' => 11, 'AppMsgTemplate' => 12, 'AppMsgStatus' => 13, 'AppMsgAttach' => 14, 'AppMsgSendDate' => 15, 'AppMsgShowMessage' => 16, 'AppMsgError' => 17, ),
BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID => 0, AppMessagePeer::MSG_UID => 1, AppMessagePeer::APP_UID => 2, AppMessagePeer::DEL_INDEX => 3, AppMessagePeer::APP_MSG_TYPE => 4, AppMessagePeer::APP_MSG_SUBJECT => 5, AppMessagePeer::APP_MSG_FROM => 6, AppMessagePeer::APP_MSG_TO => 7, AppMessagePeer::APP_MSG_BODY => 8, AppMessagePeer::APP_MSG_DATE => 9, AppMessagePeer::APP_MSG_CC => 10, AppMessagePeer::APP_MSG_BCC => 11, AppMessagePeer::APP_MSG_TEMPLATE => 12, AppMessagePeer::APP_MSG_STATUS => 13, AppMessagePeer::APP_MSG_ATTACH => 14, AppMessagePeer::APP_MSG_SEND_DATE => 15, AppMessagePeer::APP_MSG_SHOW_MESSAGE => 16, AppMessagePeer::APP_MSG_ERROR => 17, ),
BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID' => 0, 'MSG_UID' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'APP_MSG_TYPE' => 4, 'APP_MSG_SUBJECT' => 5, 'APP_MSG_FROM' => 6, 'APP_MSG_TO' => 7, 'APP_MSG_BODY' => 8, 'APP_MSG_DATE' => 9, 'APP_MSG_CC' => 10, 'APP_MSG_BCC' => 11, 'APP_MSG_TEMPLATE' => 12, 'APP_MSG_STATUS' => 13, 'APP_MSG_ATTACH' => 14, 'APP_MSG_SEND_DATE' => 15, 'APP_MSG_SHOW_MESSAGE' => 16, 'APP_MSG_ERROR' => 17, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
);
/**
@@ -244,6 +247,8 @@ abstract class BaseAppMessagePeer
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_SHOW_MESSAGE);
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_ERROR);
}
const COUNT = 'COUNT(APP_MESSAGE.APP_MSG_UID)';

8
workflow/engine/classes/triggers/api/class.zimbraApi.php
View File

@@ -77,7 +77,11 @@ class Zimbra
public function sso($options = '')
{
if ($this->_username) {
setcookie('ZM_SKIN', 'plymouth', time() + 60 * 60 * 24 * 30, '/', '.plymouth.edu');
if (PHP_VERSION < 5.2) {
setcookie("ZM_SKIN", "plymouth", time() + (60 * 60 * 24 * 30), "/", ".plymouth.edu");
} else {
setcookie("ZM_SKIN", "plymouth", time() + (60 * 60 * 24 * 30), "/", ".plymouth.edu", false, true);
}
$pre_auth = $this->getPreAuth($this->_username);
$url = $this->_protocol . '/service/preauth?account=' . $this->_username . '@' . $this->_server . '&expires=' . $this->_preauth_expiration . '&timestamp=' . $this->_timestamp . '&preauth=' . $pre_auth; //.'&'.$options;
@@ -828,7 +832,7 @@ class Zimbra
{
G::LoadSystem('inputfilter');
$filter = new InputFilter();
if (!$connecting && !$this->_connected) {
throw new Exception('zimbra.class: soapRequest called without a connection to Zimbra server');
}

3
workflow/engine/config/schema.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<database name="workflow">
<table name="APPLICATION">
<vendor type="mysql">
@@ -269,6 +269,7 @@
<column name="APP_MSG_ATTACH" type="LONGVARCHAR" required="false"/>
<column name="APP_MSG_SEND_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_MSG_SHOW_MESSAGE" type="TINYINT" required="true" default="1"/>
<column name="APP_MSG_ERROR" type="LONGVARCHAR" required="false" default=""/>
</table>
<table name="APP_OWNER">
<vendor type="mysql">

2
workflow/engine/content/languages/translation.en
View File

File diff suppressed because one or more lines are too long

36
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker 3.0\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2015-04-07 17:56:03\n"
"PO-Revision-Date: 2015-04-20 14:19:11\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -5140,8 +5140,8 @@ msgstr "Detach"
# TRANSLATION
# LABEL/ID_PRO_USER
#: LABEL/ID_PRO_USER
msgid "User Owner"
msgstr "User Owner"
msgid "Assigned users"
msgstr "Assigned users"
# TRANSLATION
# LABEL/ID_SYSTEM
@@ -12838,8 +12838,8 @@ msgstr "the process uid is not defined!"
# TRANSLATION
# LABEL/ID_MYSQL_SUCCESS_CONNECT
#: LABEL/ID_MYSQL_SUCCESS_CONNECT
msgid "Succesfully connected to MySQL Server"
msgstr "Succesfully connected to MySQL Server"
msgid "Successfully connected to MySQL Server"
msgstr "Successfully connected to MySQL Server"
# TRANSLATION
# LABEL/ID_PROCESSMAKER_INSTALLATION
@@ -12850,8 +12850,8 @@ msgstr "ProcessMaker Installation"
# TRANSLATION
# LABEL/ID_MSSQL_SUCCESS_CONNECT
#: LABEL/ID_MSSQL_SUCCESS_CONNECT
msgid "Succesfully connected to MSSQL Server"
msgstr "Succesfully connected to MSSQL Server"
msgid "Successfully connected to MSSQL Server"
msgstr "Successfully connected to MSSQL Server"
# TRANSLATION
# LABEL/ID_CONNECTION_ERROR_SECURITYADMIN
@@ -16360,8 +16360,8 @@ msgstr "The filename is required."
# TRANSLATION
# LABEL/ID_VARIABLE_IN_USE
#: LABEL/ID_VARIABLE_IN_USE
msgid "The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}"
msgstr "The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}"
msgid "This variable can not be deleted because it is being used in DynaForm : {0}. To delete it, first remove it from the DynaForm."
msgstr "This variable can not be deleted because it is being used in DynaForm : {0}. To delete it, first remove it from the DynaForm."
# TRANSLATION
# LABEL/ID_ROUTE_IS_SECJOIN
@@ -17704,8 +17704,8 @@ msgstr "Email Servers"
# TRANSLATION
# LABEL/ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT
#: LABEL/ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT
msgid "Set that this configuration is the default"
msgstr "Set that this configuration is the default"
msgid "Set as default configuration"
msgstr "Set as default configuration"
# TRANSLATION
# LABEL/ID_EMAIL_SERVER_TESTING
@@ -18472,8 +18472,8 @@ msgstr "Inefficience Cost By User"
# TRANSLATION
# LABEL/ID_OVER_DUE
#: LABEL/ID_OVER_DUE
msgid "% Overdue"
msgstr "% Overdue"
msgid "[LABEL/ID_OVER_DUE] Status"
msgstr "Status"
# TRANSLATION
# LABEL/ID_NEW_CASES
@@ -18652,8 +18652,8 @@ msgstr "The user: {0} is other department manager."
# TRANSLATION
# LABEL/ID_STRATEGIC_DASHBOARD
#: LABEL/ID_STRATEGIC_DASHBOARD
msgid "KPI"
msgstr "KPI"
msgid "KPIs"
msgstr "KPIs"
# TRANSLATION
# LABEL/ID_MANAGERS_DASHBOARDS
@@ -18775,6 +18775,12 @@ msgstr "Untitled task"
msgid "(Goal value)"
msgstr "(Goal value)"
# TRANSLATION
# LABEL/ID_PLEASE_ENTER_CREDENTIALS
#: LABEL/ID_PLEASE_ENTER_CREDENTIALS
msgid "Please enter your credentials below"
msgstr "Please enter your credentials below"
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME

4
workflow/engine/controllers/installer.php
View File

@@ -840,10 +840,10 @@ class Installer extends Controller
$query = sprintf( "USE %s;", $wf_workpace );
$this->mysqlQuery( $query );
$query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) );
$query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_LASTNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, $adminUsername, md5( $adminPassword ) );
$this->mysqlQuery( $query );
$query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) );
$query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_LASTNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, $adminUsername, md5( $adminPassword ) );
$this->mysqlQuery( $query );
// Write the paths_installed.php file (contains all the information configured so far)

1
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -6,6 +6,7 @@
* @inherits HttpProxyController
* @access public
*/
header("Content-type: text/html;charset=utf-8");
require_once 'classes/model/AdditionalTables.php';
class pmTablesProxy extends HttpProxyController

20
workflow/engine/data/mssql/insert.sql
View File

@@ -3118,7 +3118,7 @@ SELECT 'LABEL','ID_OPEN_IN_:POPUP','en','Open in a popup','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_DEATACH','en','Detach','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_PRO_USER','en','User Owner','2014-01-15'
SELECT 'LABEL','ID_PRO_USER','en','Assigned users','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_SYSTEM','en','System','2014-01-15'
UNION ALL
@@ -5716,11 +5716,11 @@ SELECT 'LABEL','ID_AGREE','en','I agree','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_PROCESS_UID_NOT_DEFINED','en','the process uid is not defined!','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_MYSQL_SUCCESS_CONNECT','en','Succesfully connected to MySQL Server','2014-01-15'
SELECT 'LABEL','ID_MYSQL_SUCCESS_CONNECT','en','Successfully connected to MySQL Server','2015-04-08'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_INSTALLATION','en','ProcessMaker Installation','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_MSSQL_SUCCESS_CONNECT','en','Succesfully connected to MSSQL Server','2014-01-15'
SELECT 'LABEL','ID_MSSQL_SUCCESS_CONNECT','en','Successfully connected to MSSQL Server','2015-04-08'
UNION ALL
SELECT 'LABEL','ID_CONNECTION_ERROR_SECURITYADMIN','en','Connection Error: User "{0}" can''t create databases and Users <br>Please provide an user with sysadmin role or dbcreator and securityadmin roles.','2014-01-15'
UNION ALL
@@ -5858,7 +5858,7 @@ SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP2_1','en','These se
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly.','2015-01-16'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-01-16'
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-04-07'
UNION ALL
SELECT 'LABEL','ID_LDAP_OPTIONAL','en','LDAP is optional.','2014-01-15'
UNION ALL
@@ -6286,7 +6286,7 @@ SELECT 'LABEL','ID_CHECKING','en','Checking...','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No) then please take actions to correct them.<br />','2014-01-15'
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No), then please take actions to correct them.<br />','2015-04-07'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16'
UNION ALL
@@ -6906,7 +6906,7 @@ SELECT 'LABEL','ID_EXISTS_FILES','en','The file exists.','2014-07-17'
UNION ALL
SELECT 'LABEL','ID_FILENAME_REQUIRED','en','The filename is required.','2014-07-17'
UNION ALL
SELECT 'LABEL','ID_VARIABLE_IN_USE','en','The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}','2014-08-01'
SELECT 'LABEL','ID_VARIABLE_IN_USE','en','This variable can not be deleted because it is being used in DynaForm : {0}. To delete it, first remove it from the DynaForm.','2015-04-08'
UNION ALL
SELECT 'LABEL','ID_ROUTE_IS_SECJOIN','en','The route is of "SEC-JOIN" type.','2014-07-29'
UNION ALL
@@ -7358,7 +7358,7 @@ SELECT 'LABEL','ID_EMAIL_SERVER_RESULT_TESTING','en','Result Testing Email Serve
UNION ALL
SELECT 'LABEL','ID_EMAIL_SERVER_TITLE','en','Email Servers','2015-01-21'
UNION ALL
SELECT 'LABEL','ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT','en','Set that this configuration is the default','2014-12-24'
SELECT 'LABEL','ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT','en','Set as default configuration','2015-04-17'
UNION ALL
SELECT 'LABEL','ID_EMAIL_SERVER_TESTING','en','Testing Email Server','2014-12-24'
UNION ALL
@@ -7618,7 +7618,7 @@ SELECT 'LABEL','ID_EMPLYEE_EFFICIENCIE','en','Employee Efficience Index','2015-0
UNION ALL
SELECT 'LABEL','ID_USER_INEFFICIENCE','en','Inefficience Cost By User','2015-03-09'
UNION ALL
SELECT 'LABEL','ID_OVER_DUE','en','% Overdue','2015-04-01'
SELECT 'LABEL','ID_OVER_DUE','en','Status','2015-04-01'
UNION ALL
SELECT 'LABEL','ID_NEW_CASES','en','% New Cases','2015-04-06'
UNION ALL
@@ -7678,7 +7678,7 @@ SELECT 'LABEL','ID_CONSOLIDATED_DYNAFORM_REQUIRED','en','The process has no type
UNION ALL
SELECT 'LABEL','ID_DEPARTMENT_MANAGER_EXIST','en','The user: {0} is other department manager.','2015-03-24'
UNION ALL
SELECT 'LABEL','ID_STRATEGIC_DASHBOARD','en','KPI','2015-04-06'
SELECT 'LABEL','ID_STRATEGIC_DASHBOARD','en','KPIs','2015-04-06'
UNION ALL
SELECT 'LABEL','ID_MANAGERS_DASHBOARDS','en','Managers dashboard','2015-03-30'
UNION ALL
@@ -7721,6 +7721,8 @@ SELECT 'LABEL','ID_DIRECTION','en','Direction','2015-03-31'
SELECT 'LABEL','ID_UNTITLED_TASK','en','Untitled task','2015-04-01'
UNION ALL
SELECT 'LABEL','ID_GOAL_HELP','en','(Goal value)','2015-04-06'
UNION ALL
SELECT 'LABEL','ID_PLEASE_ENTER_CREDENTIALS','en','Please enter your credentials below','2015-04-09'
;
INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID])

21
workflow/engine/data/mysql/insert.sql
View File

@@ -2264,7 +2264,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'JAVASCRIPT','ID_RSTDATAFIELD','en','Reset Data Field','2014-01-15') ,
( 'LABEL','ID_OPEN_IN_:POPUP','en','Open in a popup','2014-01-15') ,
( 'LABEL','ID_DEATACH','en','Detach','2014-01-15') ,
( 'LABEL','ID_PRO_USER','en','User Owner','2014-01-15') ,
( 'LABEL','ID_PRO_USER','en','Assigned users','2014-01-15') ,
( 'LABEL','ID_SYSTEM','en','System','2014-01-15') ,
( 'LABEL','ID_VARIABLES','en','Variables','2014-01-15') ,
( 'LABEL','ID_OPEN_CASE','en','Open Case','2014-01-15') ,
@@ -3579,9 +3579,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_NOT_HAVE_USERS','en','doesn''t have users.','2014-01-15') ,
( 'LABEL','ID_AGREE','en','I agree','2014-01-15') ,
( 'LABEL','ID_PROCESS_UID_NOT_DEFINED','en','the process uid is not defined!','2014-01-15') ,
( 'LABEL','ID_MYSQL_SUCCESS_CONNECT','en','Succesfully connected to MySQL Server','2014-01-15') ,
( 'LABEL','ID_MYSQL_SUCCESS_CONNECT','en','Successfully connected to MySQL Server','2015-04-08') ,
( 'LABEL','ID_PROCESSMAKER_INSTALLATION','en','ProcessMaker Installation','2014-01-15') ,
( 'LABEL','ID_MSSQL_SUCCESS_CONNECT','en','Succesfully connected to MSSQL Server','2014-01-15') ,
( 'LABEL','ID_MSSQL_SUCCESS_CONNECT','en','Successfully connected to MSSQL Server','2015-04-08') ,
( 'LABEL','ID_CONNECTION_ERROR_SECURITYADMIN','en','Connection Error: User "{0}" can''t create databases and Users <br>Please provide an user with sysadmin role or dbcreator and securityadmin roles.','2014-01-15') ,
( 'LABEL','ID_PHP_MSSQL_NOT_INSTALLED','en','php-mssql is Not Installed','2014-01-15') ,
( 'LABEL','ID_CONNECTION_ERROR_PRIVILEGE','en','Connection Error: User \"{0}\" can''t create databases and users. <br>Please, provide a user with SUPER privileges.','2015-01-16') ,
@@ -3651,7 +3651,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP2_2','en','However, ProcessMaker still operates if your settings do not match the recommended.','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP2_1','en','These settings are recommended for PHP in order to ensure full compatibility with ProcessMaker.','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly.','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-04-07') ,
( 'LABEL','ID_LDAP_OPTIONAL','en','LDAP is optional.','2014-01-15') ,
( 'LABEL','ID_MSSQL_SUPPORT_OPTIONAL','en','MSSQL Support is optional.','2014-01-15') ,
( 'LABEL','ID_OPENSSL_OPTIONAL','en','OpenSSL is optional.','2014-01-15') ,
@@ -3868,7 +3868,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PHP_INFO','en','PHP Information','2014-01-15') ,
( 'LABEL','ID_CHECKING','en','Checking...','2014-01-15') ,
( 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No) then please take actions to correct them.<br />','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No), then please take actions to correct them.<br />','2015-04-07') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP Version >= 5.2.10','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MYSQL','en','MySQL Support','2014-01-15') ,
@@ -4182,7 +4182,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_OUTPUT_DOCUMENT_ITS_ASSIGNED','en','The Output Document with {0}: {1} it''s assigned in "{2}".','2014-07-01') ,
( 'LABEL','ID_EXISTS_FILES','en','The file exists.','2014-07-17') ,
( 'LABEL','ID_FILENAME_REQUIRED','en','The filename is required.','2014-07-17') ,
( 'LABEL','ID_VARIABLE_IN_USE','en','The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}','2014-08-01') ,
( 'LABEL','ID_VARIABLE_IN_USE','en','This variable can not be deleted because it is being used in DynaForm : {0}. To delete it, first remove it from the DynaForm.','2015-04-08') ,
( 'LABEL','ID_ROUTE_IS_SECJOIN','en','The route is of "SEC-JOIN" type.','2014-07-29') ,
( 'LABEL','ID_ROUTE_PARENT_DOES_NOT_EXIST_FOR_ROUTE_SECJOIN','en','The parent route does not exist for this route of "SEC-JOIN" type.','2014-07-29') ,
( 'LABEL','ID_GENERATE_BPMN_PROJECT','en','Generate BPMN Project','2014-07-24') ,
@@ -4410,7 +4410,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_EMAIL_SERVER_TITLE_TESTING','en','Testing Email Server','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_RESULT_TESTING','en','Result Testing Email Server','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_TITLE','en','Email Servers','2015-01-21') ,
( 'LABEL','ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT','en','Set that this configuration is the default','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT','en','Set as default configuration','2015-04-17') ,
( 'LABEL','ID_EMAIL_SERVER_TESTING','en','Testing Email Server','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_CONFIRM_DELETE','en','Do you want to delete the Email Server?','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_PORT','en','Port','2014-12-24') ,
@@ -4542,7 +4542,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PROCESS_INEFFICIENCE','en','Process Inefficiency Cost','2015-04-01') ,
( 'LABEL','ID_EMPLYEE_EFFICIENCIE','en','Employee Efficience Index','2015-03-09') ,
( 'LABEL','ID_USER_INEFFICIENCE','en','Inefficience Cost By User','2015-03-09') ,
( 'LABEL','ID_OVER_DUE','en','% Overdue','2015-04-01') ,
( 'LABEL','ID_OVER_DUE','en','Status','2015-04-01') ,
( 'LABEL','ID_NEW_CASES','en','% New Cases','2015-04-06') ,
( 'LABEL','ID_COMPLETED_CASES','en','Completed Cases','2015-03-09') ,
( 'LABEL','ID_WORKING_CASES','en','% In Progress','2015-04-06') ,
@@ -4572,7 +4572,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CONSOLIDATED_CASE_LIST','en','Consolidated Case List','2015-03-24') ,
( 'LABEL','ID_CONSOLIDATED_DYNAFORM_REQUIRED','en','The process has no type template Dynaform grid, this Dynaform is required','2015-03-24') ,
( 'LABEL','ID_DEPARTMENT_MANAGER_EXIST','en','The user: {0} is other department manager.','2015-03-24') ,
( 'LABEL','ID_STRATEGIC_DASHBOARD','en','KPI','2015-04-06') ,
( 'LABEL','ID_STRATEGIC_DASHBOARD','en','KPIs','2015-04-06') ,
( 'LABEL','ID_MANAGERS_DASHBOARDS','en','Managers dashboard','2015-03-30') ,
( 'LABEL','ID_PRO_EFFICIENCY_INDEX','en','Process Efficiency Index','2015-03-30') ,
( 'LABEL','ID_EFFICIENCY_USER','en','User Efficiency','2015-03-30') ,
@@ -4594,7 +4594,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_DELETE_INDICATOR_SURE','en','Are you sure you want to delete this Indicator?','2015-03-31') ,
( 'LABEL','ID_DIRECTION','en','Direction','2015-03-31') ,
( 'LABEL','ID_UNTITLED_TASK','en','Untitled task','2015-04-01') ,
( 'LABEL','ID_GOAL_HELP','en','(Goal value)','2015-04-06') ;
( 'LABEL','ID_GOAL_HELP','en','(Goal value)','2015-04-06') ,
( 'LABEL','ID_PLEASE_ENTER_CREDENTIALS','en','Please enter your credentials below','2015-04-09') ;
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('AD','','',' ','') ,

1
workflow/engine/data/mysql/schema.sql
View File

@@ -124,6 +124,7 @@ CREATE TABLE `APP_MESSAGE`
`APP_MSG_ATTACH` MEDIUMTEXT,
`APP_MSG_SEND_DATE` DATETIME NOT NULL,
`APP_MSG_SHOW_MESSAGE` TINYINT default 1 NOT NULL,
`APP_MSG_ERROR` MEDIUMTEXT default '' NOT NULL,
PRIMARY KEY (`APP_MSG_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Messages in an Application';
#-----------------------------------------------------------------------------

2
workflow/engine/menus/setup.php
View File

@@ -75,7 +75,7 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1) {
/*----------------------------------********---------------------------------*/
if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
$G_TMP_MENU->AddIdRawOption('NEW_DASHBOARD', '../strategicDashboard/dashboardList', ucfirst(G::LoadTranslation('ID_STRATEGIC_DASHBOARD')), '', '', 'settings');
$G_TMP_MENU->AddIdRawOption('STRATEGIC_DASHBOARD', '../strategicDashboard/dashboardList', ucfirst(G::LoadTranslation('ID_STRATEGIC_DASHBOARD')), '', '', 'settings');
}
/*----------------------------------********---------------------------------*/

6
workflow/engine/methods/login/login.php
View File

@@ -125,7 +125,11 @@ if (isset ($_SESSION['USER_LOGGED'])) {
session_start();
session_regenerate_id();
setcookie("workspaceSkin", SYS_SKIN, time() + 24*60*60, "/sys".SYS_SYS);
if (PHP_VERSION < 5.2) {
setcookie("workspaceSkin", SYS_SKIN, time() + (24 * 60 * 60), "/sys" . SYS_SYS, "; HttpOnly");
} else {
setcookie("workspaceSkin", SYS_SKIN, time() + (24 * 60 * 60), "/sys" . SYS_SYS, null, false, true);
}
if (strlen($msg) > 0) {
$_SESSION['G_MESSAGE'] = $msg;

1
workflow/engine/methods/mails/emailsAjax.php
View File

@@ -73,6 +73,7 @@ switch($req){
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_DATE);
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_SEND_DATE);
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_SHOW_MESSAGE);
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_ERROR);
$criteria->addSelectColumn(ApplicationPeer::PRO_UID);
$criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);

2
workflow/engine/methods/tracker/tracker_Show.php
View File

@@ -67,7 +67,7 @@ switch ($_GET['CTO_TYPE_OBJ']) {
$pmDynaForm = new pmDynaform($Fields);
if ($pmDynaForm->isResponsive()) {
$pmDynaForm->printViewWithoutSubmit();
$pmDynaForm->printTracker();
}
} else {
$G_PUBLISH = new Publisher();

6
workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css
View File

@@ -827,6 +827,12 @@ antes funcionaba.
height:15px !important;
}
.ICON_STRATEGIC_DASHBOARD {
background-image: url(/skins/neoclassic/images/dashboard.png) !important;
width: 15px !important;
height: 15px !important;
}
.ICON_PM_REQUIREMENTS{
/*ss_wrench*/
background-image: url(/images/icons_silk/sprites.png) !important;

7
workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css
View File

@@ -959,6 +959,13 @@ antes funcionaba.
width: 15px !important;
height: 15px !important;
}
.ICON_STRATEGIC_DASHBOARD {
background-image: url(/skins/neoclassic/images/dashboard.png) !important;
width: 15px !important;
height: 15px !important;
}
.ICON_PM_REQUIREMENTS {
/*ss_wrench*/

2
workflow/engine/skinEngine/skinEngine.php
View File

@@ -752,7 +752,7 @@ class SkinEngine
} else {
$smarty->assign('udate', G::getformatedDate(date('Y-m-d H:i:s'), 'M d, yyyy', SYS_LANG));
}
$name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME']: '', isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'] , ENT_QUOTES, 'UTF-8'): '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '');
$name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME']: '', isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'] , ENT_QUOTES, 'UTF-8'): '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '');
$smarty->assign('user',$name);
}

3
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -555,7 +555,7 @@ class Light
session_start();
session_regenerate_id();
setcookie("workspaceSkin", SYS_SKIN, time() + 24*60*60, "/sys".SYS_SYS);
setcookie("workspaceSkin", SYS_SKIN, time() + (24 * 60 * 60), "/sys" . SYS_SYS, null, false, true);
if (strlen($msg) > 0) {
$_SESSION['G_MESSAGE'] = $msg;
@@ -811,3 +811,4 @@ class Light
return $response;
}
}

4
workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php
View File

@@ -374,12 +374,12 @@ class MessageEventDefinition
$arrayData["MSGED_VARIABLES"] = array();
}
$messageEventDefinition->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
if (isset($arrayData["MSGED_VARIABLES"])) {
$messageEventDefinition->setMsgedVariables(serialize($arrayData["MSGED_VARIABLES"]));
}
$messageEventDefinition->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
if ($messageEventDefinition->validate()) {
$cnn->begin();

3
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -227,7 +227,8 @@ class Variable
$pmDynaform = new \pmDynaform();
$isUsed = $pmDynaform->isUsed($processUid, $variable);
if ($isUsed !== false) {
throw new \Exception(\G::LoadTranslation("ID_VARIABLE_IN_USE", array($variableUid, $isUsed)));
$titleDynaform=$pmDynaform->getDynaformTitle($isUsed);
throw new \Exception(\G::LoadTranslation("ID_VARIABLE_IN_USE", array($titleDynaform)));
}
//Delete
$criteria = new \Criteria("workflow");

4
workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
View File

@@ -175,9 +175,11 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
{
$access_token = new \OauthAccessTokens();
$access_token->load($token);
$stmt = $this->db->prepare(sprintf('DELETE FROM %s WHERE ACCESS_TOKEN = :token', $this->config['access_token_table']));
$stmt->execute(compact('token'));
$stmt = $this->db->prepare(sprintf('DELETE FROM %s WHERE EXPIRES>%s', $this->config['refresh_token_table'], "'".Date('Y-m-d H:i:s')."'"));
$stmt = $this->db->prepare(sprintf("DELETE FROM %s WHERE EXPIRES < %s", $this->config["refresh_token_table"], "'" . date("Y-m-d H:i:s") . "'"));
return $stmt->execute(compact('token'));
}

15
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -68,7 +68,10 @@ class Server implements iAuthenticate
$this->server->addGrantType(new \ProcessMaker\Services\OAuth2\PmClientCredentials($this->storage));
// Add the "Refresh token" grant type
$this->server->addGrantType(new \OAuth2\GrantType\RefreshToken($this->storage));
$this->server->addGrantType(new \OAuth2\GrantType\RefreshToken(
$this->storage,
array("always_issue_new_refresh_token" => true)
));
// create some users in memory
//$users = array('bshaffer' => array('password' => 'brent123', 'first_name' => 'Brent', 'last_name' => 'Shaffer'));
@@ -261,7 +264,9 @@ class Server implements iAuthenticate
if ($returnResponse) {
return $response;
} else {
die($response->send());
$response->send();
exit(0);
}
}
@@ -279,9 +284,11 @@ class Server implements iAuthenticate
if ($request == null) {
$request = \OAuth2\Request::createFromGlobals();
}
$response = $this->server->handleTokenRequest($request);
$response = $this->server->handleTokenRequest($request); //Set/Get token //PmPdo->setAccessToken()
$token = $response->getParameters();
if (array_key_exists('access_token', $token)
&& array_key_exists('refresh_token', $token)
) {
@@ -348,7 +355,7 @@ class Server implements iAuthenticate
$lifetime = 1440;
}
setcookie($session->getSessionName(), $_COOKIE[$session->getSessionName()], time() + $lifetime, "/");
setcookie($session->getSessionName(), $_COOKIE[$session->getSessionName()], time() + $lifetime, "/", null, false, true);
}
}

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

@@ -144,6 +144,14 @@
<a href="#" class="mafe-menu-databaseconnections"></a>
<a href="#" class="btn_create mafe-menu-databaseconnections-create"><span></span></a>
</li>
<li>
<a href="#" class="mafe-menu-permissions"></a>
<a href="#" class="btn_create mafe-menu-permissions-create"><span></span></a>
</li>
<li>
<a href="#" class="mafe-menu-filemanager"></a>
<a href="#" class="btn_create mafe-menu-filemanager-create"><span></span></a>
</li>
</ul>
</div>
<div class="bpmn_shapes_legend">

4
workflow/engine/templates/mails/emailList.js
View File

@@ -172,7 +172,8 @@ Ext.onReady(function(){
{name : 'APP_MSG_STATUS'},
{name : 'APP_MSG_DATE'},
{name : 'APP_MSG_SEND_DATE'},
{name : 'APP_MSG_BODY'}
{name : 'APP_MSG_BODY'},
{name : 'APP_MSG_ERROR'}
]
})
});
@@ -219,6 +220,7 @@ Ext.onReady(function(){
{header: _('ID_SUBJECT'), dataIndex: 'APP_MSG_SUBJECT', width: 80,hidden:false, renderer: columnRenderer, sortable: true},
{header: _('ID_FROM'), dataIndex: 'APP_MSG_FROM', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
{header: _('ID_TO'), dataIndex: 'APP_MSG_TO', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
{header: _('ID_ERROR_EMAIL'), dataIndex: 'APP_MSG_ERROR', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
{
header: _('ID_STATUS'),

1
workflow/engine/templates/pmTables/edit.js
View File

@@ -912,7 +912,6 @@ function createReportTable()
try {
result = Ext.util.JSON.decode(resp.responseText);
Ext.MessageBox.hide();
if (result.success) {
proParam = PRO_UID !== false ? '?PRO_UID='+PRO_UID : '';
location.href = '../pmTables' + proParam; //history.back();

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

@@ -6,6 +6,8 @@ var processesGrid;
var store;
var comboCategory;
var winDesigner;
var typeMnuNew;
var newTypeProcess;
/**
@@ -200,10 +202,35 @@ Ext.onReady(function(){
if (typeof(arrayMenuNewOption["bpmn"]) != "undefined") {
arrayMenuNew.push(mnuNewBpmnProject);
typeMnuNew = "bpmnProject";
}
if (typeof(arrayMenuNewOption["pm"]) != "undefined") {
arrayMenuNew.push(mnuNewProject);
typeMnuNew = "classicProject";
}
if(typeof(arrayMenuNewOption["bpmn"]) != "undefined" && typeof(arrayMenuNewOption["pm"]) != "undefined"){
newTypeProcess = {
xtype: 'tbsplit',
text: _('ID_NEW'),
iconCls: 'button_menu_ext ss_sprite ss_add',
menu: arrayMenuNew,
listeners: {
"click": function (obj, e) {
obj.showMenu();
}
}
};
} else {
newTypeProcess = {
xtype: 'tbsplit',
text: _('ID_NEW'),
iconCls: 'button_menu_ext ss_sprite ss_add',
handler: function (){
newProcess({type: typeMnuNew});
}
};
}
processesGrid = new Ext.grid.GridPanel( {
@@ -272,17 +299,7 @@ Ext.onReady(function(){
}),
store: store,
tbar:[
{
xtype: 'tbsplit',
text: _('ID_NEW'),
iconCls: 'button_menu_ext ss_sprite ss_add',
menu: arrayMenuNew,
listeners: {
"click": function (obj, e) {
obj.showMenu();
}
}
},/*
newTypeProcess,/*
{
text: _('ID_NEW'),
iconCls: 'button_menu_ext ss_sprite ss_add',

16
workflow/engine/templates/users/users.js
View File

@@ -409,14 +409,26 @@ Ext.onReady(function () {
fieldLabel : '<span style=\"color:red;\" ext:qtip="'+ _('ID_FIELD_REQUIRED', _('ID_FIRSTNAME')) +'"> * </span>' + _('ID_FIRSTNAME'),
xtype : 'textfield',
width : 260,
allowBlank : false
allowBlank : false,
listeners: {
'change': function(field, newVal, oldVal){
var fname = newVal.replace(/^\s+/,'').replace(/\s+$/,'');
field.setValue(fname.trim());
}
}
},
{
id : 'USR_LASTNAME',
fieldLabel : '<span style=\"color:red;\" ext:qtip="'+ _('ID_FIELD_REQUIRED', _('ID_LASTNAME')) +'"> * </span>' + _('ID_LASTNAME'),
xtype : 'textfield',
width : 260,
allowBlank : false
allowBlank : false,
listeners: {
'change': function(field, newVal, oldVal){
var lname = newVal.replace(/^\s+/,'').replace(/\s+$/,'');
field.setValue(lname.trim());
}
}
},
{
id : 'USR_USERNAME',

13
workflow/engine/xmlform/login/sysLogin.xml
View File

@@ -26,8 +26,7 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
setFocus (getField ('USR_USERNAME'));
leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() {
ws = getField('USER_ENV').value;
createCookie('pmos_generik2', '{"ws":"'+ws+'"}', 365);
createCookie("pm_sys_sys", "{\"sys_sys\": \"" + getField("USER_ENV").value + "\"}", 365);
var client = getBrowserClient();
if (client.browser == "msie" || client.browser == "safari"){
@@ -36,12 +35,14 @@ leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function()
}.extend(document.getElementById('form[BSUBMIT]')));
try{
c = new String(readCookie('pmos_generik2'));
o = eval("("+c+")");
if( o != null){
getField('USER_ENV').value = o.ws;
var s = new String(readCookie("pm_sys_sys"));
var obj = eval("(" + s + ")");
if (obj != null) {
getField("USER_ENV").value = obj.sys_sys;
}
} catch(e){}
]]></JS>
</dynaForm>

13
workflow/engine/xmlform/login/sysLoginNoWS.xml
View File

@@ -42,8 +42,7 @@ leimnud.event.add(document.getElementById('form[USR_PASSWORD_MASK]'), 'keypress'
});
leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() {
ws = getField('USER_ENV').value;
createCookie('pmos_generik2', '{"ws":"'+ws+'"}', 365);
createCookie("pm_sys_sys", "{\"sys_sys\": \"" + getField("USER_ENV").value + "\"}", 365);
/*
var client = getBrowserClient();
@@ -59,12 +58,14 @@ leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function()
}.extend(document.getElementById('form[BSUBMIT]')));
try{
c = new String(readCookie('pmos_generik2'));
o = eval("("+c+")");
if( o != null){
getField('USER_ENV').value = o.ws;
var s = new String(readCookie("pm_sys_sys"));
var obj = eval("(" + s + ")");
if (obj != null) {
getField("USER_ENV").value = obj.sys_sys;
}
} catch(e){}
]]></JS>
</dynaForm>

17
workflow/engine/xmlform/login/sysLoginNoWSpm3.xml
View File

@@ -24,12 +24,12 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
</BSUBMIT>
<JS type="javascript"><![CDATA[
window.onload= function(){
window.onload= function(){
document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER');
document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD');
document.getElementById('form[USER_ENV]').placeholder = _('ID_WORKSPACE');
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray');
document.getElementById('form[BSUBMIT]').classList.add('button-login-success');
document.getElementById('form[BSUBMIT]').classList.add('button-login-success');
};
setFocus (getField ('USR_USERNAME'));
@@ -49,8 +49,7 @@ leimnud.event.add(document.getElementById('form[USR_PASSWORD_MASK]'), 'keypress'
});
leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() {
ws = getField('USER_ENV').value;
createCookie('pmos_generik2', '{"ws":"'+ws+'"}', 365);
createCookie("pm_sys_sys", "{\"sys_sys\": \"" + getField("USER_ENV").value + "\"}", 365);
var client = getBrowserClient();
if (client.browser == "msie" || client.browser == "safari"){
@@ -63,12 +62,14 @@ leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function()
}.extend(document.getElementById('form[BSUBMIT]')));
try{
c = new String(readCookie('pmos_generik2'));
o = eval("("+c+")");
if( o != null){
getField('USER_ENV').value = o.ws;
var s = new String(readCookie("pm_sys_sys"));
var obj = eval("(" + s + ")");
if (obj != null) {
getField("USER_ENV").value = obj.sys_sys;
}
} catch(e){}
]]></JS>
</dynaForm>

7
workflow/public_html/app.php
View File

@@ -10,12 +10,12 @@ register_shutdown_function(
)
);
/*
* ProcessMaker Web Application Bootstrap
*/
ini_set("session.cookie_httponly", 1);
if (isset($_SERVER['UNENCODED_URL'])) {
$_SERVER['REQUEST_URI'] = $_SERVER['UNENCODED_URL'];
}
try {
$rootDir = realpath(__DIR__ . "/../../") . DIRECTORY_SEPARATOR;
@@ -90,3 +90,4 @@ try {
$response = new Maveriks\Http\Response($view->getOutput(), 503);
$response->send();
}