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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2013-04-26 16:34:56 -04:00
parent d52d4d7b3a ac1d9517b0
commit 877b180230
23 changed files with 485 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
workflow/engine/PmBootstrap.php
View File

@@ -138,46 +138,6 @@ class PmBootstrap extends Bootstrap
}
}
public function loadLeimud()
{
$oHeadPublisher = headPublisher::getSingleton();
// Defining the maborak js file, this file is the concat of many js files and here we are including all of them.
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/maborak.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'common/core/common.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'common/core/effects.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'common/core/webResource.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'dveditor/core/dveditor.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'tinymce/jscripts/tiny_mce/tiny_mce.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'common/tree/tree.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'json/core/json.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'form/core/form.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'form/core/pagedTable.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'grid/core/grid.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.panel.js' , true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.validator.js', true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.app.js' , true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.rpc.js' , true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.fx.js' , true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.drag.js' , true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.drop.js' , true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.dom.js' , true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.abbr.js' , true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'maborak/core/module.dashboard.js', true );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'widgets/js-calendar/js-calendar.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'widgets/suggest/bsn.AutoSuggest_2.1.3.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'widgets/tooltip/pmtooltip.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'thirdparty/krumo/krumo.js' );
$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'widgets/calendar/pmcalendar.js' , true );
$oHeadPublisher->addMaborakFile(PATH_CORE . 'js' . PATH_SEP . 'cases/core/cases.js' , true );
$oHeadPublisher->addMaborakFile(PATH_CORE . 'js' . PATH_SEP . 'cases/core/cases_Step.js', true );
$oHeadPublisher->addMaborakFile(PATH_CORE . 'js' . PATH_SEP . 'processmap/core/processmap.js', true );
$oHeadPublisher->addMaborakFile(PATH_CORE . 'js' . PATH_SEP . 'appFolder/core/appFolderList.js', true );
$oHeadPublisher->addMaborakFile(PATH_THIRDPARTY . 'htmlarea/editor.js', true );
//$oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . "widgets/jscalendar/lang/calendar-" . SYS_LANG . ".js");
}
public function dispatchResource()
{
$realPath = $this->matchRoute['path'];

21
workflow/engine/bin/tasks/cliBrowserCacheFiles.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
CLI::taskName("browser-cache-files-upgrade");
CLI::taskDescription(<<<EOT
Safe upgrade for files cached by the browser
This command should be run after any upgrade/modification of files cached by the browser.
EOT
);
CLI::taskRun(runBrowserCacheFiles);
function runBrowserCacheFiles($command, $args)
{
CLI::logging("Safe upgrade for files cached by the browser\n");
G::browserCacheFilesSetUid();
CLI::logging("Upgrade successful\n");
}

7
workflow/engine/bin/tasks/cliRake.php
View File

@@ -85,6 +85,13 @@ function minify_javascript($command, $args)
}
}
//Safe upgrade for JavaScript files
CLI::logging("\nSafe upgrade for files cached by the browser\n\n");
G::browserCacheFilesSetUid();
//Done
CLI::logging("BUILD-JS DONE\n");
}

19
workflow/engine/bin/tasks/cliUpgrade.php
View File

@@ -119,12 +119,6 @@ function run_upgrade($command, $args)
$errors = true;
}
}
if ($errors) {
CLI::logging("Upgrade finished but there were errors upgrading workspaces.\n");
CLI::logging(CLI::error("Please check the log above to correct any issues.")."\n");
} else {
CLI::logging("Upgrade successful\n");
}
// SAVE Upgrades/Patches
$arrayPatch = glob(PATH_TRUNK . 'patch-*');
@@ -151,6 +145,19 @@ function run_upgrade($command, $args)
CLI::logging('ProcessMaker ' . System::getVersion(). ' installed', PATH_DATA . 'log/upgrades.log');
}
//Safe upgrade for JavaScript files
CLI::logging("\nSafe upgrade for files cached by the browser\n\n");
G::browserCacheFilesSetUid();
//Status
if ($errors) {
CLI::logging("Upgrade finished but there were errors upgrading workspaces.\n");
CLI::logging(CLI::error("Please check the log above to correct any issues.") . "\n");
} else {
CLI::logging("Upgrade successful\n");
}
//setting flag to false
$flag = G::isPMUnderUpdating(0);
}

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

@@ -209,7 +209,9 @@ class dynaformEditor extends WebResource
$G_PUBLISH->AddContent('blank');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_PREVIEW"), $sName . '[3]', 'dynaformEditor.changeToPreview', 'dynaformEditor.saveCurrentView');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_XML"), $sName . '[4]', 'dynaformEditor.changeToXmlCode', 'dynaformEditor.saveCurrentView');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_HTML"), $sName . '[5]', 'dynaformEditor.changeToHtmlCode', 'dynaformEditor.saveCurrentView');
if ($Properties['DYN_TYPE'] != 'grid') {
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_HTML"), $sName . '[5]', 'dynaformEditor.changeToHtmlCode', 'dynaformEditor.saveCurrentView');
}
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_FIELDS_LIST"), $sName . '[6]', 'dynaformEditor.changeToFieldsList', 'dynaformEditor.saveCurrentView');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_JAVASCRIPTS"), $sName . '[7]', 'dynaformEditor.changeToJavascripts', 'dynaformEditor.saveCurrentView');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_PROPERTIES"), $sName . '[8]', 'dynaformEditor.changeToProperties', 'dynaformEditor.saveCurrentView');
@@ -227,7 +229,7 @@ class dynaformEditor extends WebResource
//Javascript codemirror 3.13
$oHeadPublisher->addScriptFile('/js/codemirror/addon/edit/closebrackets.js', 1);
$oHeadPublisher->addScriptFile('/js/codemirror/mode/javascript/javascript.js', 1);
$oHeadPublisher->addScriptFile('/js/grid/core/grid.js');
$oHeadPublisher->addScriptCode('
var DYNAFORM_URL="' . $Parameters['URL'] . '";

14
workflow/engine/controllers/main.php
View File

@@ -277,10 +277,11 @@ class Main extends Controller
$this->setVar( 'advise_text', $adviseText );
$loginScript = $this->getHeadPublisher()->getExtJsLibraries();
$loginScript .= $this->getHeadPublisher()->getExtJsScripts();
$this->setVar( 'login_script', $loginScript );
$this->setVar( 'login_vars', $this->getHeadPublisher()->getExtJsVariablesScript() );
$this->setVar("login_script", $loginScript);
$this->setVar("login_vars", $this->getHeadPublisher()->getExtJsVariablesScript());
$this->setVar("URL_TRANSLATION_JS", G::browserCacheFilesUrl("/js/ext/translation.en.js"));
$this->setLayout( 'pm-modern-login' );
$this->setLayout("pm-modern-login");
$this->render();
}
@@ -342,10 +343,11 @@ class Main extends Controller
$loginScript = $this->getHeadPublisher()->getExtJsLibraries();
$loginScript .= $this->getHeadPublisher()->getExtJsScripts();
$this->setVar( 'login_script', $loginScript );
$this->setVar( 'login_vars', $this->getHeadPublisher()->getExtJsVariablesScript() );
$this->setVar("login_script", $loginScript);
$this->setVar("login_vars", $this->getHeadPublisher()->getExtJsVariablesScript());
$this->setVar("URL_TRANSLATION_JS", G::browserCacheFilesUrl("/js/ext/translation.en.js"));
$this->setLayout( 'pm-modern-login' );
$this->setLayout("pm-modern-login");
$this->render();
}

35
workflow/engine/js/dynaformEditor/core/dynaformEditor.js
View File

@@ -43,9 +43,18 @@ var verifyLogin = function() {
case 'saveJavascript':
dynaformEditor.saveJavascript();
break;
case 'changeJavascriptCode':
dynaformEditor.changeJavascriptCode(false);
break;
case 'close':
dynaformEditor.close();
break;
case 'saveProperties':
dynaformEditor.saveProperties(false);
break;
case 'changeFormType':
changeFormType(false);
break;
case 'changeToPreview':
dynaformEditor.changeToPreview();
break;
@@ -329,7 +338,7 @@ var dynaformEditor={
this.saveJavascript();
break;
case "properties":
this.saveProperties();
this.saveProperties(false);
break;
}
},
@@ -354,7 +363,7 @@ var dynaformEditor={
this.saveJavascript();
break;
case "properties":
this.saveProperties();
this.saveProperties(false);
break;
}
},
@@ -402,13 +411,20 @@ var dynaformEditor={
}
this.responseAction = true;
},
saveProperties:function()
saveProperties:function(checkSessionPersists)
{
checkSessionPersists = typeof(checkSessionPersists) != 'undefined' ? checkSessionPersists : true;
if (checkSessionPersists) {
if (!sessionPersits()) {
showPrompt('saveProperties');
return;
}
}
var form=this.views["properties"].getElementsByTagName("form")[0];
var post=ajax_getForm(form);
var response=this.ajax.set_properties(this.A,this.dynUid,post);
if (response!=0){
G.alert(response["*message"]);
if (typeof(response["*message"])==="string") {
G.alert(response["*message"]);
}
this.responseAction = true;
},
@@ -785,8 +801,15 @@ var dynaformEditor={
showRowById('JS_TITLE');hideRowById('JS_LIST');hideRowById('JS');}
},
changeJavascriptCode:function()
changeJavascriptCode:function(checkSessionPersists)
{
checkSessionPersists = typeof(checkSessionPersists) != 'undefined' ? checkSessionPersists : true;
if (checkSessionPersists) {
if (!sessionPersits()) {
showPrompt('changeJavascriptCode');
return;
}
}
var field=getField("JS_LIST","dynaforms_JSEditor");
var value=field.value;
if (this.currentJS)

17
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -909,12 +909,18 @@ function copyMoveAction($type)
$paths = array();
$folderResult = findChilds('/', '', $paths);
$withCombo = 30;
$folderSelected = $oPMFolder->load($dir);
$root = array("/","/");
array_unshift ($folderResult, $root);
$folderResultSel = array();
foreach ($folderResult as $key => $value) {
$count = strlen($value[1]);
$withCombo = ($count>$withCombo) ? $count : $withCombo;
if ($folderSelected['FOLDER_PARENT_UID'] != $value[0] && $dir != $value[0]) {
$folderResultSel[] = $value;
}
}
$root = array("/","/");
array_unshift ($folderResult,$root);
$dirCompletePath=$oPMFolder->getFolderStructure($dir);
$copyDialog["xtype"] = "form";
@@ -939,7 +945,7 @@ function copyMoveAction($type)
$itemField["name"] = "new_dir_label";
$itemField["mode"] = "local";
$itemField["triggerAction"] = "all";
$itemField["store"] = $folderResult;
$itemField["store"] = $folderResultSel;
$itemField["valueField"] = "FOLDER_UID";
$itemField["editable"] = false;
$itemField["displayField"] = "FOLDER_NAME";
@@ -1100,6 +1106,11 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder)
$appFoder = new AppFolder ();
$folderContent = $appFoder->getFolderContent($uidFolder);
$folderOrigin = $appFoder->getFolderStructure($uidFolder);
if ($newUidFolder == $folderOrigin[$uidFolder]['PARENT'] && $_REQUEST['action'] == 'moveExecute') {
return $uidFolder;
}
$FolderParentUid = trim($newUidFolder);//$form['FOLDER_PARENT_UID'];
$FolderName = $folderOrigin[$uidFolder]['NAME'];
$newFolderContent = $appFoder->createFolder ($FolderName, $FolderParentUid, "new");

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

@@ -69,7 +69,6 @@ if (isset ($_SESSION['USER_LOGGED'])) {
$aRow = $oDataset->getRow();
if ($aRow) {
setcookie("workspaceSkin", SYS_SKIN, time() + 24*60*60, "/sys".SYS_SYS);
if ($aRow['LOG_STATUS'] != 'CLOSED' && $aRow['LOG_END_DATE'] == null) {
$weblog = new LoginLog();
@@ -111,6 +110,8 @@ if (isset ($_SESSION['USER_LOGGED'])) {
session_start();
session_regenerate_id();
setcookie("workspaceSkin", SYS_SKIN, time() + 24*60*60, "/sys".SYS_SYS);
if (strlen($msg) > 0) {
$_SESSION['G_MESSAGE'] = $msg;
}

25
workflow/engine/methods/processes/processes_webEntryGenerate.php
View File

@@ -138,16 +138,20 @@ try {
$oStep = new Step();
$sUidGrids = $oStep->lookingforUidGrids( $sPRO_UID, $sDYNAFORM );
$template->assign( 'siteUrl', $http . $_SERVER['HTTP_HOST'] );
$template->assign( 'sysSys', SYS_SYS );
$template->assign( 'sysLang', SYS_LANG );
$template->assign( 'sysSkin', SYS_SKIN );
$template->assign( 'processUid', $sPRO_UID );
$template->assign( 'dynaformUid', $sDYNAFORM );
$template->assign( 'taskUid', $sTASKS );
$template->assign( 'dynFileName', $sPRO_UID . '/' . $sDYNAFORM );
$template->assign( 'formId', $G_FORM->id );
$template->assign( 'scriptCode', $scriptCode );
$browserCacheFilesUid = G::browserCacheFilesGetUid();
$template->assign("URL_MABORAK_JS", G::browserCacheFilesUrl("/js/maborak/core/maborak.js"));
$template->assign("URL_TRANSLATION_ENV_JS", G::browserCacheFilesUrl("/jscore/labels/" . SYS_LANG . ".js"));
$template->assign("siteUrl", $http . $_SERVER["HTTP_HOST"]);
$template->assign("sysSys", SYS_SYS);
$template->assign("sysLang", SYS_LANG);
$template->assign("sysSkin", SYS_SKIN);
$template->assign("processUid", $sPRO_UID);
$template->assign("dynaformUid", $sDYNAFORM);
$template->assign("taskUid", $sTASKS);
$template->assign("dynFileName", $sPRO_UID . "/" . $sDYNAFORM);
$template->assign("formId", $G_FORM->id);
$template->assign("scriptCode", $scriptCode);
if (sizeof( $sUidGrids ) > 0) {
foreach ($sUidGrids as $k => $v) {
@@ -167,4 +171,3 @@ try {
G::RenderPage( 'publish', 'raw' );
}

3
workflow/engine/methods/services/login_getStarted.php
View File

@@ -41,6 +41,9 @@ $oTemplatePower->newBlock('users');
$oTemplatePower->assign('USR_UID', $aUser['USR_UID']);
$oTemplatePower->assign('USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')');
*/
$oTemplatePower->assign("URL_MABORAK_JS", G::browserCacheFilesUrl("/js/maborak/core/maborak.js"));
$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
G::RenderPage( 'publish', 'raw' );

11
workflow/engine/methods/setup/skin_Ajax.php
View File

@@ -69,7 +69,7 @@ function skinList ()
} else {
$value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
}
$skinListArray['skins'][] = $value;
}
}
@@ -134,6 +134,7 @@ function newSkin ($baseSkin = 'classic')
//TODO: Improve this pre_replace lines
$configFileOriginal = $pathBase . "config.xml";
$configFileFinal = PATH_CUSTOM_SKINS . $skinFolder . PATH_SEP . 'config.xml';
$xmlConfiguration = file_get_contents( $configFileOriginal );
$workspace = ($_REQUEST['workspace'] == 'global') ? '' : SYS_SYS;
@@ -143,8 +144,8 @@ function newSkin ($baseSkin = 'classic')
$xmlConfiguration = preg_replace( '/(<id>)(.+?)(<\/id>)/i', '<id>' . G::generateUniqueID() . '</id><!-- $2 -->', $xmlConfiguration );
if ($workspace != "" && isset($skinInformationArray["workspace"]["__VALUE__"])) {
$workspace = (!empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
if (isset($skinInformationArray["workspace"]["__VALUE__"])) {
$workspace = ($workspace != "" && !empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
$xmlConfiguration = preg_replace("/(<workspace>)(.*)(<\/workspace>)/i", "<workspace>" . $workspace . "</workspace><!-- $2 -->", $xmlConfiguration);
$xmlConfiguration = preg_replace("/(<name>)(.*)(<\/name>)/i", "<name>" . $skinName . "</name><!-- $2 -->", $xmlConfiguration);
@@ -260,8 +261,8 @@ function importSkin ()
$xmlConfigurationObj = G::xmlParser($xmlConfiguration);
$skinInformationArray = $xmlConfigurationObj->result["skinConfiguration"]["__CONTENT__"]["information"]["__CONTENT__"];
if ($workspace != "" && isset($skinInformationArray["workspace"]["__VALUE__"])) {
$workspace = (!empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
if (isset($skinInformationArray["workspace"]["__VALUE__"])) {
$workspace = ($workspace != "" && !empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
$xmlConfiguration = preg_replace("/(<workspace>)(.*)(<\/workspace>)/i", "<workspace>" . $workspace . "</workspace><!-- $2 -->", $xmlConfiguration);
} else {

10
workflow/engine/skinEngine/uxmodern/layout-pm-modern-login.html
View File

@@ -5,7 +5,7 @@
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link rel='stylesheet' type='text/css' href='/css/{$_skin}-extJs.css' />
</head>
<body class="x-pm-login-body">
<br/> <br/>
@@ -13,9 +13,9 @@
<tr>
<td>
<div class="companyLogo"><img src="{$logo_company}"/></div>
<div id="loading-mask">&nbsp;</div>
<div id="loading">
<table width="100%" height="25" border="0" cellspacing="0" cellpadding="0" class="headerLeftSection">
<tr>
@@ -48,13 +48,13 @@
</td>
</tr>
</table>
<script type="text/javascript">document.getElementById('loading-message').innerHTML = 'Loading Core API...';</script>
<script type='text/javascript' src='/js/ext/ext-base.js'></script>
<script type="text/javascript">document.getElementById('loading-message').innerHTML = 'Loading Components...';</script>
<script type='text/javascript' src='/js/ext/ext-all.js'></script>
<script type="text/javascript">document.getElementById('loading-message').innerHTML = 'Initializing...';</script>
<script type='text/javascript' src='/js/ext/translation.en.js'></script>
<script type="text/javascript" src="{$URL_TRANSLATION_JS}"></script>
{$login_script}
{$login_vars}
</body>

91
workflow/engine/templates/processes/webentry.tpl
View File

@@ -1,45 +1,46 @@
<html>
<head>
<script type="text/javascript" src="{siteUrl}/jscore/labels/{sysLang}.js"></script>
<script type="text/javascript" src="{siteUrl}/js/maborak/core/maborak.js"></script>
<script type="text/javascript" src="{siteUrl}/js/jscalendar/lang/calendar-{sysLang}.js"></script>
<script type="text/javascript" src="{siteUrl}/jsform/gulliver/dynaforms_Options.js"></script>
<script type="text/javascript" src="{siteUrl}/jsform/{dynFileName}.js"></script>
<!-- START BLOCK : grid_uids -->
<script type="text/javascript" src="{siteUrl}/jsform/{gridFileName}.js"></script>
<!-- END BLOCK : grid_uids -->
<script type="text/javascript">
var leimnud = new maborak();
leimnud.make();
leimnud.Package.Load("panel,validator,app,rpc,fx,drag,drop,dom,abbr",{ Instance:leimnud,Type:"module" });
leimnud.exec(leimnud.fix.memoryLeak);
if(leimnud.browser.isIphone)
{ leimnud.iphone.make(); }
leimnud.event.add(window,"load",function(){ loadForm_{formId}("{siteUrl}/sys{sysSys}/{sysLang}/{sysSkin}/gulliver/defaultAjaxDynaform")});
</script>
<script type="text/javascript">
var aux1 = window.location.href.split("?");
if(aux1[1]){
if(aux1[1]!=""){
var aux2 = aux1[1].split("&");
for(var i=0; i<=aux2.length; i++){
if(aux2[i]=="__flag__=1"){
alert("Request sent!");
}
}
}
}
</script>
</head>
<body>
{scriptCode}
<input type="hidden" name="PRO_UID" value="{processUid}">
<input type="hidden" name="TASKS" value="{taskUid}">
<input type="hidden" name="DYNAFORM" value="{dynaformUid}">
</form>
</body>
</html>
<html>
<head>
<script type="text/javascript" src="{siteUrl}{URL_TRANSLATION_ENV_JS}"></script>
<script type="text/javascript" src="{siteUrl}{URL_MABORAK_JS}"></script>
<script type="text/javascript" src="{siteUrl}/js/jscalendar/lang/calendar-{sysLang}.js"></script>
<script type="text/javascript" src="{siteUrl}/jsform/gulliver/dynaforms_Options.js"></script>
<script type="text/javascript" src="{siteUrl}/jsform/{dynFileName}.js"></script>
<!-- START BLOCK : grid_uids -->
<script type="text/javascript" src="{siteUrl}/jsform/{gridFileName}.js"></script>
<!-- END BLOCK : grid_uids -->
<script type="text/javascript">
var leimnud = new maborak();
leimnud.make();
leimnud.Package.Load("panel,validator,app,rpc,fx,drag,drop,dom,abbr",{ Instance:leimnud,Type:"module" });
leimnud.exec(leimnud.fix.memoryLeak);
if (leimnud.browser.isIphone) {
leimnud.iphone.make();
}
leimnud.event.add(window,"load",function(){ loadForm_{formId}("{siteUrl}/sys{sysSys}/{sysLang}/{sysSkin}/gulliver/defaultAjaxDynaform")});
</script>
<script type="text/javascript">
var aux1 = window.location.href.split("?");
if (aux1[1]) {
if (aux1[1] != "") {
var aux2 = aux1[1].split("&");
for (var i = 0; i <= aux2.length; i++) {
if (aux2[i] == "__flag__=1") {
alert("Request sent!");
}
}
}
}
</script>
</head>
<body>
{scriptCode}
<input type="hidden" name="PRO_UID" value="{processUid}">
<input type="hidden" name="TASKS" value="{taskUid}">
<input type="hidden" name="DYNAFORM" value="{dynaformUid}">
</form>
</body>
</html>

249
workflow/engine/templates/services/login_getStarted.html
View File

@@ -1,124 +1,125 @@
<html>
<head>
<script type='text/javascript' src='/js/maborak/core/maborak.js'></script>
<script type='text/javascript'>
var leimnud = new maborak();
leimnud.make({
zip:true,
inGulliver:true,
modules :"dom,abbr,rpc,drag,drop,app,panel,fx,grid,xmlform,validator,dashboard",
files :""
});
try{
leimnud.exec(leimnud.fix.memoryLeak);
if(leimnud.browser.isIphone){
leimnud.iphone.make();
}
}catch(e){}
</script>
<style type="text/css">
body, table {
font-family: tahoma,arial,verdana,sans-serif;
}
span.cMargLeft { padding-left: 20; }
.cell2 {
font-size: 13px;
background: #fff;
border-right: #fff 1px solid;
padding-right: 10px;
border-top: #fff 1px solid;
padding-top: 10px;
border-left: #fff 1px solid;
padding-left: 10px;
border-bottom: #fff 1px solid;
padding-bottom: 10px;
}
span.cNeg {
color: #002c72;
font-weight: bold;
}
span.cLow {
color: #002c72;
}
</style>
<!--[if IE]>
<style>
span.cMargLeft { padding-left: 9; }
.cell2 {
font-size: 12px !important;
padding-top: 1px !important;
padding-bottom: 1px !important;
}
</style>
<![endif]-->
</head>
<body>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
<a target="_blank" href="http://www.processmaker.com">
<img src="/images/get_started.png" border="0" width="163" height="438">
</a>
</td>
<td class="cell2" valign="top">
<span class="cLow"><strong>Get Started</strong></span>
<p><span class="cLow">Welcome to ProcessMaker!</span></p>
<p><span class="cLow">To get started, log in using the following credentials. You can change them later:</span></p>
<span class="cNeg">Username:</span><span class="cLow"> admin</span><br>
<span class="cNeg">Password:</span><span class="cLow"> admin</span>
<p><span class="cLow">We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at&nbsp;<a target="_blank" href="http://www.processmaker.com/demos/">http://www.processmaker.com/demos/</a> </span></p>
<span class="cLow">Other Resources:</span><br/><br/>
<span class="cLow"><a target="_blank" href="http://library.processmaker.com">PM Library </a>- Import Templates</span><br/>
<span class="cLow"><a target="_blank" href="http://wiki.processmaker.com">PM Wiki </a>- Manuals</span><br/>
<span class="cLow"><a target="_blank" href="http://forum.processmaker.com">PM Forum </a>- Ask Questions</span><br/>
<p><span class="cLow">We hope you enjoy using ProcessMaker. For more information about our enterprise support and consulting services <a target="_blank" href="http://www.processmaker.com/contact-us">contact us.</a>
</span></p>
<p><span class="cLow">The ProcessMaker Team</span></p>
<input type="checkbox" name="getStarted" id="getStarted" onclick="saveConfig();"><span class="cLow">Don't show me again</span>
</td>
</tr>
</table>
</body>
</html>
<script>
var saveConfig = function() {
if(document.getElementById("getStarted").checked==true) {
var oRPC = new leimnud.module.rpc.xmlhttp({
url : '../login/login_Ajax',
async : false,
method: 'POST',
args : 'function=getStarted_save'
});
oRPC.make();
}
if(panel) {
if(panel.remove) {
panel.remove();
return false;
}
}
if(window.parent) {
if (parent.Ext) {
parent.Ext.getCmp('gettingStartedWindow').close();
}
}
}
</script>
<html>
<head>
<script type="text/javascript" src="{URL_MABORAK_JS}"></script>
<script type="text/javascript">
var leimnud = new maborak();
leimnud.make({
zip: true,
inGulliver: true,
modules: "dom,abbr,rpc,drag,drop,app,panel,fx,grid,xmlform,validator,dashboard",
files: ""
});
try {
leimnud.exec(leimnud.fix.memoryLeak);
if (leimnud.browser.isIphone) {
leimnud.iphone.make();
}
} catch (e) {
}
</script>
<style type="text/css">
body, table {
font-family: tahoma,arial,verdana,sans-serif;
}
span.cMargLeft { padding-left: 20; }
.cell2 {
font-size: 13px;
background: #fff;
border-right: #fff 1px solid;
padding-right: 10px;
border-top: #fff 1px solid;
padding-top: 10px;
border-left: #fff 1px solid;
padding-left: 10px;
border-bottom: #fff 1px solid;
padding-bottom: 10px;
}
span.cNeg {
color: #002c72;
font-weight: bold;
}
span.cLow {
color: #002c72;
}
</style>
<!--[if IE]>
<style type="text/css">
span.cMargLeft { padding-left: 9; }
.cell2 {
font-size: 12px !important;
padding-top: 1px !important;
padding-bottom: 1px !important;
}
</style>
<![endif]-->
</head>
<body>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
<a target="_blank" href="http://www.processmaker.com"><img src="/images/get_started.png" border="0" width="163" height="438"></a>
</td>
<td class="cell2" valign="top">
<span class="cLow"><strong>Get Started</strong></span>
<p><span class="cLow">Welcome to ProcessMaker!</span></p>
<p><span class="cLow">To get started, log in using the following credentials. You can change them later:</span></p>
<span class="cNeg">Username:</span><span class="cLow"> admin</span><br>
<span class="cNeg">Password:</span><span class="cLow"> admin</span>
<p><span class="cLow">We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at&nbsp;<a target="_blank" href="http://www.processmaker.com/demos/">http://www.processmaker.com/demos/</a> </span></p>
<span class="cLow">Other Resources:</span><br/><br/>
<span class="cLow"><a target="_blank" href="http://library.processmaker.com">PM Library </a>- Import Templates</span><br/>
<span class="cLow"><a target="_blank" href="http://wiki.processmaker.com">PM Wiki </a>- Manuals</span><br/>
<span class="cLow"><a target="_blank" href="http://forum.processmaker.com">PM Forum </a>- Ask Questions</span><br/>
<p><span class="cLow">We hope you enjoy using ProcessMaker. For more information about our enterprise support and consulting services <a target="_blank" href="http://www.processmaker.com/contact-us">contact us.</a>
</span></p>
<p><span class="cLow">The ProcessMaker Team</span></p>
<input type="checkbox" name="getStarted" id="getStarted" onclick="saveConfig();"><span class="cLow">Don't show me again</span>
</td>
</tr>
</table>
</body>
</html>
<script type="text/javascript">
var saveConfig = function()
{
if (document.getElementById("getStarted").checked == true) {
var oRPC = new leimnud.module.rpc.xmlhttp({
url : "../login/login_Ajax",
async : false,
method: "POST",
args : "function=getStarted_save"
});
oRPC.make();
}
if (panel) {
if (panel.remove) {
panel.remove();
return false;
}
}
if (window.parent) {
if (parent.Ext) {
parent.Ext.getCmp("gettingStartedWindow").close();
}
}
};
</script>

37
workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
View File

@@ -89,6 +89,28 @@ if(document.getElementById("form[DYN_TYPE]").value=="grid"){
hideRowById('ADJUSTGRIDSWIDTH');
}
function changeFormType(checkSessionPersists) {
checkSessionPersists = typeof(checkSessionPersists) != 'undefined' ? checkSessionPersists : true;
if (checkSessionPersists) {
if (!sessionPersits()) {
showPrompt('changeFormType');
return;
}
}
var proUid = document.getElementById("form[PRO_UID]").value;
var dynUid = document.getElementById("form[DYN_UID]").value;
if(document.getElementById("form[DYN_TYPE]").value=="grid"){
validateGridConversion(proUid,dynUid);
} else {
changeToolbar("xmlform");
showRowById('WIDTH');
showRowById('NEXTSTEPSAVE');
showRowById('PRINTDYNAFORM');
showRowById('ADJUSTGRIDSWIDTH');
}
}
function getElementsByClassNameCrossBrowser(searchClass,node,tag) {
var classElements = new Array();
@@ -112,20 +134,7 @@ function getElementsByClassNameCrossBrowser(searchClass,node,tag) {
// this evaluates whenever a change is made and if its posible to convert
// a dynaform grid into a normal dynaform and vice versa.
leimnud.event.add(getField('DYN_TYPE'), 'change', function() {
var proUid = document.getElementById("form[PRO_UID]").value;
var dynUid = document.getElementById("form[DYN_UID]").value;
if(document.getElementById("form[DYN_TYPE]").value=="grid"){
validateGridConversion(proUid,dynUid);
} else {
changeToolbar("xmlform");
showRowById('WIDTH');
showRowById('NEXTSTEPSAVE');
showRowById('PRINTDYNAFORM');
showRowById('ADJUSTGRIDSWIDTH');
}
});
leimnud.event.add(getField('DYN_TYPE'), 'change', changeFormType);
// function validateGridConversion
// @param proUid process id

2
workflow/public_html/sysGeneric.php
View File

@@ -343,6 +343,8 @@ $virtualURITable['/update/(*)'] = PATH_GULLIVER_HOME . 'methods/update/';
//$virtualURITable['/(*)'] = PATH_HTML;
$virtualURITable['/css/(*)'] = PATH_HTML . 'css/'; //ugly
$virtualURITable['/skin/(*)'] = PATH_HTML;
$virtualURITable['/skins/(*)'] = PATH_HTML . 'skins/'; //ugly
$virtualURITable['/images/(*)'] = PATH_HTML . 'images/'; //ugly
$virtualURITable['/[a-zA-Z][a-zA-Z0-9]{0,}/'] = 'errorFile';
$isRestRequest = false;