CODE STYLE

FILES:
workflow/engine/methods/processes/processesList.php
workflow/engine/methods/processes/processes_SaveEditObjectPermission.php
workflow/engine/methods/processes/processes_SaveObjectPermission.php
workflow/engine/methods/processes/processes_UploadFiles.php
workflow/engine/methods/processes/processes_UploadFilesForm.php
workflow/engine/methods/processes/processes_User.php
workflow/engine/methods/processes/processes_subProcessSave.php
workflow/engine/methods/processes/processes_webEntryGenerate.php
workflow/engine/methods/processes/processes_webEntryValidate.php
workflow/engine/methods/processes/webEntry_Val_Assig.php
This commit is contained in:
jennylee
2012-10-17 12:20:58 -04:00
parent 06683e9a3d
commit 57c78b8342
10 changed files with 636 additions and 674 deletions

View File

@@ -20,7 +20,6 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
require_once 'classes/model/Process.php';
@@ -30,7 +29,6 @@ $limit = isset($_POST['limit'])? $_POST['limit']: '';
$oProcess = new Process();
$memcache = & PMmemcached::getSingleton( SYS_SYS );
$memkey = 'no memcache';
@@ -42,8 +40,7 @@ $oProcess = new Process();
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName'] );
else
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'] );
}
else {
} else {
if (isset( $_POST['processName'] )) {
$memkey = 'processList-' . $start . '-' . $limit . '-' . $_POST['processName'];
$memcacheUsed = 'yes';
@@ -52,8 +49,7 @@ $oProcess = new Process();
$memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR );
$memcacheUsed = 'no';
}
}
else {
} else {
$memkey = 'processList-allProcesses-' . $start . '-' . $limit;
$memkeyTotal = $memkey . '-total';
$memcacheUsed = 'yes';

View File

@@ -20,27 +20,25 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
global $RBAC;
$access = $RBAC->userCanAccess( 'PM_FACTORY' );
if ($access != 1) {
switch ($access)
{
switch ($access) {
case - 1:
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
G::header( 'location: ../login/login' );
die;
die();
break;
case - 2:
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
G::header( 'location: ../login/login' );
die;
die();
break;
default:
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
G::header( 'location: ../login/login' );
die;
die();
break;
}
}
@@ -50,6 +48,7 @@ if(isset($_POST['form']))
else
$sValue = $_POST; //For new processmap EXtjs
list ($iRelation, $sUserGroup) = explode( '|', $sValue['GROUP_USER'] );
$sObjectUID = '';
switch ($sValue['OP_OBJ_TYPE']) {
@@ -68,17 +67,7 @@ switch ($sValue['OP_OBJ_TYPE']) {
}
require_once 'classes/model/ObjectPermission.php';
$oOP = new ObjectPermission();
$aData = array('OP_UID' => $sValue['OP_UID'],
'PRO_UID' => $sValue['PRO_UID'],
'TAS_UID' => $sValue['TAS_UID']!='' ? $sValue['TAS_UID'] : '0' ,
'USR_UID' => (string)$sUserGroup,
'OP_USER_RELATION' => $iRelation,
'OP_TASK_SOURCE' => $sValue['OP_TASK_SOURCE']!='' ? $sValue['OP_TASK_SOURCE'] : '0',
'OP_PARTICIPATE' => $sValue['OP_PARTICIPATE']!='' ? $sValue['OP_PARTICIPATE'] : 0,
'OP_OBJ_TYPE' => $sValue['OP_OBJ_TYPE']!='' ? $sValue['OP_OBJ_TYPE'] : '0',
'OP_OBJ_UID' => $sObjectUID!='' ? $sObjectUID : '0',
'OP_ACTION' => $sValue['OP_ACTION']!='' ? $sValue['OP_ACTION'] : '0',
'OP_CASE_STATUS' => $sValue['OP_CASE_STATUS']!='' ? $sValue['OP_CASE_STATUS'] : '0'
$aData = array ('OP_UID' => $sValue['OP_UID'],'PRO_UID' => $sValue['PRO_UID'],'TAS_UID' => $sValue['TAS_UID'] != '' ? $sValue['TAS_UID'] : '0','USR_UID' => (string) $sUserGroup,'OP_USER_RELATION' => $iRelation,'OP_TASK_SOURCE' => $sValue['OP_TASK_SOURCE'] != '' ? $sValue['OP_TASK_SOURCE'] : '0','OP_PARTICIPATE' => $sValue['OP_PARTICIPATE'] != '' ? $sValue['OP_PARTICIPATE'] : 0,'OP_OBJ_TYPE' => $sValue['OP_OBJ_TYPE'] != '' ? $sValue['OP_OBJ_TYPE'] : '0','OP_OBJ_UID' => $sObjectUID != '' ? $sObjectUID : '0','OP_ACTION' => $sValue['OP_ACTION'] != '' ? $sValue['OP_ACTION'] : '0','OP_CASE_STATUS' => $sValue['OP_CASE_STATUS'] != '' ? $sValue['OP_CASE_STATUS'] : '0'
);
$oObj = new ObjectPermission();

View File

@@ -20,27 +20,25 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
global $RBAC;
$access = $RBAC->userCanAccess( 'PM_FACTORY' );
if ($access != 1) {
switch ($access)
{
switch ($access) {
case - 1:
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
G::header( 'location: ../login/login' );
die;
die();
break;
case - 2:
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
G::header( 'location: ../login/login' );
die;
die();
break;
default:
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
G::header( 'location: ../login/login' );
die;
die();
break;
}
}
@@ -49,6 +47,7 @@ if(isset($_POST['form']))
else
$sValue = $_POST; //For new processmap EXtjs
list ($iRelation, $sUserGroup) = explode( '|', $sValue['GROUP_USER'] );
$sObjectUID = '';
switch ($sValue['OP_OBJ_TYPE']) {
@@ -70,17 +69,8 @@ switch ($sValue['OP_OBJ_TYPE']) {
}
require_once 'classes/model/ObjectPermission.php';
$oOP = new ObjectPermission();
$aData = array('OP_UID' => G::generateUniqueID(),
'PRO_UID' =>$sValue['PRO_UID'],
'TAS_UID' => $sValue['TAS_UID'],
'USR_UID' => (string)$sUserGroup,
'OP_USER_RELATION' => $iRelation,
'OP_TASK_SOURCE' => $sValue['OP_TASK_SOURCE'],
'OP_PARTICIPATE' => $sValue['OP_PARTICIPATE'],
'OP_OBJ_TYPE' => $sValue['OP_OBJ_TYPE'],
'OP_OBJ_UID' => $sObjectUID,
'OP_ACTION' => $sValue['OP_ACTION'],
'OP_CASE_STATUS' => $sValue['OP_CASE_STATUS']);
$aData = array ('OP_UID' => G::generateUniqueID(),'PRO_UID' => $sValue['PRO_UID'],'TAS_UID' => $sValue['TAS_UID'],'USR_UID' => (string) $sUserGroup,'OP_USER_RELATION' => $iRelation,'OP_TASK_SOURCE' => $sValue['OP_TASK_SOURCE'],'OP_PARTICIPATE' => $sValue['OP_PARTICIPATE'],'OP_OBJ_TYPE' => $sValue['OP_OBJ_TYPE'],'OP_OBJ_UID' => $sObjectUID,'OP_ACTION' => $sValue['OP_ACTION'],'OP_CASE_STATUS' => $sValue['OP_CASE_STATUS']
);
$oOP->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
$oOP->save();
G::LoadClass( 'processMap' );

View File

@@ -8,7 +8,7 @@ switch ($_POST['form']['MAIN_DIRECTORY']) {
$sDirectory = PATH_DATA_PUBLIC . $_POST['form']['PRO_UID'] . PATH_SEP . ($_POST['form']['CURRENT_DIRECTORY'] != '' ? $_POST['form']['CURRENT_DIRECTORY'] . PATH_SEP : '');
break;
default:
die;
die();
break;
}
for ($i = 1; $i <= 5; $i ++) {

View File

@@ -20,22 +20,18 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
if ($_GET['NAVIGATOR'] == 'ie') {
$oForm = new Form( 'processes/processes_UploadFilesForm', '', SYS_LANG );
$oForm->action = 'processes_UploadFiles';
$oForm->values = array('PRO_UID' => $_GET['PRO_UID'],
'MAIN_DIRECTORY' => $_GET['MAIN_DIRECTORY'],
'CURRENT_DIRECTORY' => $_GET['CURRENT_DIRECTORY']);
echo '<link rel="stylesheet" type="text/css" href="/skins/' . SYS_SKIN . '/style.css"/>' .
$oForm->render(PATH_CORE . 'templates/xmlform.html', $scriptCode = '');
$oForm->values = array ('PRO_UID' => $_GET['PRO_UID'],'MAIN_DIRECTORY' => $_GET['MAIN_DIRECTORY'],'CURRENT_DIRECTORY' => $_GET['CURRENT_DIRECTORY']
);
echo '<link rel="stylesheet" type="text/css" href="/skins/' . SYS_SKIN . '/style.css"/>' . $oForm->render( PATH_CORE . 'templates/xmlform.html', $scriptCode = '' );
} else {
$params = Array('PRO_UID' => $_GET['PRO_UID'],
'MAIN_DIRECTORY' => $_GET['MAIN_DIRECTORY'],
'CURRENT_DIRECTORY' => $_GET['CURRENT_DIRECTORY']);
$params = Array ('PRO_UID' => $_GET['PRO_UID'],'MAIN_DIRECTORY' => $_GET['MAIN_DIRECTORY'],'CURRENT_DIRECTORY' => $_GET['CURRENT_DIRECTORY']
);
$_SESSION['processes_upload'] = $params;
$G_PUBLISH = new Publisher();

View File

@@ -20,11 +20,11 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
/**
* @Description This is a callback for the View of all groups from a determinated user
* ription This is a callback for the View of all groups from a determinated user
*
* @author Everth S. Berrios Morales <everth@colosa.com>
* @Date 16/05/2008
* @LastModification none
@@ -45,13 +45,13 @@ try {
$oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addScriptFile( '/jscore/processmap/core/processUser.js' );
$G_PUBLISH = new Publisher;
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'processes/processes_User', $c, array('PRO_UID' => $sProUid));
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'processes/processes_User', $c, array ('PRO_UID' => $sProUid
) );
G::RenderPage( 'publish', 'raw' );
}
catch ( Exception $e ){
$G_PUBLISH = new Publisher;
} catch (Exception $e) {
$G_PUBLISH = new Publisher();
$aMessage['MESSAGE'] = $e->getMessage();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
G::RenderPage( 'publish', 'raw' );

View File

@@ -20,43 +20,40 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
global $RBAC;
$access = $RBAC->userCanAccess( 'PM_FACTORY' );
if ($access != 1) {
switch ($access)
{
switch ($access) {
case - 1:
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
G::header( 'location: ../login/login' );
die;
die();
break;
case - 2:
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
G::header( 'location: ../login/login' );
die;
die();
break;
default:
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
G::header( 'location: ../login/login' );
die;
die();
break;
}
}
//print_r($_POST); die;
$out = array ();
for($i=1; $i<=count($_POST['form']['grid1']); $i++)
{
for ($i = 1; $i <= count( $_POST['form']['grid1'] ); $i ++) {
$out[$_POST['form']['grid1'][$i]['VAR_OUT1']] = $_POST['form']['grid1'][$i]['VAR_OUT2'];
}
$in = array ();
for($j=1; $j<=count($_POST['form']['grid2']); $j++)
{
for ($j = 1; $j <= count( $_POST['form']['grid2'] ); $j ++) {
$in[$_POST['form']['grid2'][$j]['VAR_IN1']] = $_POST['form']['grid2'][$j]['VAR_IN2'];
}
@@ -67,6 +64,7 @@ $oTask= new Task();
$aTask = ($_POST['form']['TASKS'] != 0) ? $oTask->load( $_POST['form']['TASKS'] ) : 0;
//$aTask['PRO_UID']=0;
if (isset( $_POST['form']['SP_SYNCHRONOUS'] ) && $_POST['form']['SP_SYNCHRONOUS'] == '') {
$_POST['form']['SP_SYNCHRONOUS'] = '0';
}
@@ -78,18 +76,8 @@ if ( !isset ( $_POST['form']['SP_SYNCHRONOUS']) ) {
require_once 'classes/model/SubProcess.php';
$oOP = new SubProcess();
$aData = array ('SP_UID' => $_POST['form']['SP_UID'],//G::generateUniqueID(),
'PRO_UID' => (isset($aTask['PRO_UID']))?$aTask['PRO_UID']:'',
'TAS_UID' => $_POST['form']['TASKS'],
'PRO_PARENT' => $_POST['form']['PRO_PARENT'],
'TAS_PARENT' => $_POST['form']['TAS_PARENT'],
'SP_TYPE' => 'SIMPLE',
'SP_SYNCHRONOUS' => $_POST['form']['SP_SYNCHRONOUS'],
'SP_SYNCHRONOUS_TYPE' => 'ALL',
'SP_SYNCHRONOUS_WAIT' => 0,
'SP_VARIABLES_OUT' => serialize($out),
'SP_VARIABLES_IN' => serialize($in),
'SP_GRID_IN' => '');
'PRO_UID' => (isset( $aTask['PRO_UID'] )) ? $aTask['PRO_UID'] : '','TAS_UID' => $_POST['form']['TASKS'],'PRO_PARENT' => $_POST['form']['PRO_PARENT'],'TAS_PARENT' => $_POST['form']['TAS_PARENT'],'SP_TYPE' => 'SIMPLE','SP_SYNCHRONOUS' => $_POST['form']['SP_SYNCHRONOUS'],'SP_SYNCHRONOUS_TYPE' => 'ALL','SP_SYNCHRONOUS_WAIT' => 0,'SP_VARIABLES_OUT' => serialize( $out ),'SP_VARIABLES_IN' => serialize( $in ),'SP_GRID_IN' => ''
);
$oOP->update( $aData );
@@ -99,4 +87,4 @@ $lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
$cont = Content::addContent( 'TAS_TITLE', '', $_POST['form']['TAS_PARENT'], $lang, $_POST['form']['SPROCESS_NAME'] );
//$cont = Content::addContent( 'TAS_TITLE', '', $_POST['form']['SP_UID'], $lang, $_POST['form']['SPROCESS_NAME'] );
//G::header('location: processes_Map?PRO_UID='. $_POST['form']['PRO_UID']);
die;
die();

View File

@@ -42,7 +42,8 @@ try {
if ($withWS) {
//creating sys.info;
$SITE_PUBLIC_PATH = '';
if (file_exists ( $SITE_PUBLIC_PATH . '' )) {}
if (file_exists( $SITE_PUBLIC_PATH . '' )) {
}
//creating the first file
require_once 'classes/model/Dynaform.php';
@@ -79,7 +80,6 @@ try {
$template->assign( 'USR_VAR', '$USR_UID = -1;' );
}
$template->assign( 'dynaform', $dynTitle );
$template->assign( 'timestamp', date( 'l jS \of F Y h:i:s A' ) );
$template->assign( 'ws', SYS_SYS );
@@ -138,7 +138,6 @@ 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 );

View File

@@ -20,6 +20,7 @@ $sWE_USR = $oData->WE_USR;
//echo ($sTASKS."<br>");
//echo ($sDYNAFORM."<br>");
if (G::is_https())
$http = 'https://';
else
@@ -31,22 +32,25 @@ $endpoint = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG .
$user = $sWS_USER;
$pass = $sWS_PASS;
$params = array ('userid' => $user, 'password' => $pass );
$result = $client->__SoapCall ( 'login', array ($params ) );
$params = array ('userid' => $user,'password' => $pass
);
$result = $client->__SoapCall( 'login', array ($params
) );
//$_SESSION ['WS_SESSION_ID'] = '';
//if ($result->status_code == 0) {
// $_SESSION ['WS_SESSION_ID'] = $result->message;
//}
$fields['status_code'] = $result->status_code;
$fields['message'] = 'ProcessMaker WebService version: ' . $result->version . "\n" . $result->message;
$fields['version'] = $result->version;
$fields['time_stamp'] = $result->timestamp;
$messageCode = 1;
G::LoadClass( 'Task' );
G::LoadClass( 'User' );
G::LoadClass( 'TaskUser' );
@@ -58,7 +62,7 @@ G::LoadClass ( 'Groupwf' );
* It's seems that could be replicated in a Linux server easily.
* I recomend that in some way check already if a imported class is declared
* somewhere else or maybe delegate the task to the G Class LoadClass method.
**/
*/
if (! class_exists( 'GroupUser' )) {
G::LoadClass( 'GroupUser' );
}

View File

@@ -9,7 +9,6 @@ $sPRO_UID = $oData->PRO_UID;
$sTASKS = $oData->TASKS;
$sDYNAFORM = $oData->DYNAFORM;
if (G::is_https())
$http = 'https://';
else
@@ -18,7 +17,6 @@ if (G::is_https ())
$endpoint = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/wsdl2';
@$client = new SoapClient( $endpoint );
G::LoadClass( 'Task' );
G::LoadClass( 'User' );
G::LoadClass( 'TaskUser' );
@@ -26,7 +24,9 @@ G::LoadClass ( 'TaskUser' );
$oTask = new Task();
$TaskFields = $oTask->kgetassigType( $sPRO_UID, $sTASKS );
if ($TaskFields['TAS_ASSIGN_TYPE'] == 'BALANCED')echo 1;
else echo 0;
if ($TaskFields['TAS_ASSIGN_TYPE'] == 'BALANCED')
echo 1;
else
echo 0;
?>