CODE Style changes
files modified: workflow/engine/methods/dynaforms/dynaforms_Editor.php
workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php
workflow/engine/methods/events/eventList.php
workflow/engine/methods/events/eventsAjax.php
workflow/engine/methods/events/eventsCompleted.php
workflow/engine/methods/events/eventsDelete.php
workflow/engine/methods/events/eventsEdit.php
workflow/engine/methods/events/eventsEditAction.php
workflow/engine/methods/events/eventsPending.php
workflow/engine/methods/events/eventsSave.php
workflow/engine/methods/events/eventsSetupGraph.php
workflow/engine/methods/events/triggersSave.php
This commit is contained in:
@@ -12,82 +12,76 @@
|
|||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU Affero General Public License for more details.
|
* GNU Affero General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
|
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
|
||||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Response;
|
if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) {
|
||||||
/*
|
return $RBAC_Response;
|
||||||
|
}
|
||||||
|
/*
|
||||||
* Created on 21/12/2007
|
* Created on 21/12/2007
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
G::LoadClass('dynaformEditor');
|
G::LoadClass( 'dynaformEditor' );
|
||||||
G::LoadClass('toolBar');
|
G::LoadClass( 'toolBar' );
|
||||||
G::LoadClass('dynaFormField');
|
G::LoadClass( 'dynaFormField' );
|
||||||
|
|
||||||
//G::LoadClass('configuration');
|
//G::LoadClass('configuration');
|
||||||
$G_MAIN_MENU = 'processmaker';
|
$G_MAIN_MENU = 'processmaker';
|
||||||
$G_SUB_MENU = 'processes';
|
$G_SUB_MENU = 'processes';
|
||||||
$G_ID_MENU_SELECTED = 'PROCESSES';
|
$G_ID_MENU_SELECTED = 'PROCESSES';
|
||||||
$G_ID_SUB_MENU_SELECTED = 'FIELDS';
|
$G_ID_SUB_MENU_SELECTED = 'FIELDS';
|
||||||
|
|
||||||
$PRO_UID=isset($_GET['PRO_UID'])?$_GET['PRO_UID']:'0';
|
$PRO_UID = isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : '0';
|
||||||
$DYN_UID=(isset($_GET['DYN_UID'])) ? urldecode($_GET['DYN_UID']):'0';
|
$DYN_UID = (isset( $_GET['DYN_UID'] )) ? urldecode( $_GET['DYN_UID'] ) : '0';
|
||||||
$_SESSION['PROCESS'] = $_GET['PRO_UID'];
|
$_SESSION['PROCESS'] = $_GET['PRO_UID'];
|
||||||
|
|
||||||
|
if ($PRO_UID === '0') {
|
||||||
if ($PRO_UID==='0') return;
|
return;
|
||||||
$process = new Process;
|
}
|
||||||
if ($process->exists($PRO_UID))
|
$process = new Process();
|
||||||
{
|
if ($process->exists( $PRO_UID )) {
|
||||||
$process->load( $PRO_UID );
|
$process->load( $PRO_UID );
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
//TODO
|
//TODO
|
||||||
print("$PRO_UID doesn't exist, continue? yes");
|
print ("$PRO_UID doesn't exist, continue? yes") ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$dynaform = new dynaform();
|
||||||
|
|
||||||
$dynaform = new dynaform;
|
if ($dynaform->exists( $DYN_UID )) {
|
||||||
|
|
||||||
if ($dynaform->exists($DYN_UID))
|
|
||||||
{
|
|
||||||
$dynaform->load( $DYN_UID );
|
$dynaform->load( $DYN_UID );
|
||||||
$_SESSION['CURRENT_DYN_UID'] = $DYN_UID;
|
$_SESSION['CURRENT_DYN_UID'] = $DYN_UID;
|
||||||
}
|
} else {
|
||||||
else
|
/* New Dynaform
|
||||||
{
|
*
|
||||||
/* New Dynaform
|
*/
|
||||||
*
|
$dynaform->create( array ('PRO_UID' => $PRO_UID) );
|
||||||
*/
|
}
|
||||||
$dynaform->create(array('PRO_UID'=>$PRO_UID));
|
|
||||||
}
|
|
||||||
|
|
||||||
//creating SESSION for redirecting to new bpmn editor after closing Dynaform
|
//creating SESSION for redirecting to new bpmn editor after closing Dynaform
|
||||||
if(isset($_GET['bpmn']) && $_GET['bpmn'] == '1')
|
if (isset( $_GET['bpmn'] ) && $_GET['bpmn'] == '1') {
|
||||||
{$_SESSION['dynaform_editor'] = 'bpmn';}
|
$_SESSION['dynaform_editor'] = 'bpmn';
|
||||||
else if(!isset($_GET['bpmn']))
|
} elseif (! isset( $_GET['bpmn'] )) {
|
||||||
{$_SESSION['dynaform_editor'] = 'processmap';}
|
$_SESSION['dynaform_editor'] = 'processmap';
|
||||||
|
}
|
||||||
|
|
||||||
|
$editor = new dynaformEditor( $_POST );
|
||||||
|
$editor->file = $dynaform->getDynFilename();
|
||||||
|
$editor->home = PATH_DYNAFORM;
|
||||||
|
$editor->title = $dynaform->getDynTitle();
|
||||||
|
$editor->dyn_uid = $dynaform->getDynUid();
|
||||||
|
$editor->pro_uid = $dynaform->getProUid();
|
||||||
|
$editor->dyn_type = $dynaform->getDynType();
|
||||||
|
$editor->dyn_title = $dynaform->getDynTitle();
|
||||||
|
$editor->dyn_description = $dynaform->getDynDescription();
|
||||||
|
$editor->dyn_editor = $_SESSION['dynaform_editor'];
|
||||||
|
$editor->_setUseTemporalCopy( true );
|
||||||
|
$editor->_render();
|
||||||
|
|
||||||
$editor=new dynaformEditor($_POST);
|
|
||||||
$editor->file=$dynaform->getDynFilename();
|
|
||||||
$editor->home=PATH_DYNAFORM;
|
|
||||||
$editor->title=$dynaform->getDynTitle();
|
|
||||||
$editor->dyn_uid=$dynaform->getDynUid();
|
|
||||||
$editor->pro_uid=$dynaform->getProUid();
|
|
||||||
$editor->dyn_type=$dynaform->getDynType();
|
|
||||||
$editor->dyn_title=$dynaform->getDynTitle();
|
|
||||||
$editor->dyn_description=$dynaform->getDynDescription();
|
|
||||||
$editor->dyn_editor=$_SESSION['dynaform_editor'];
|
|
||||||
$editor->_setUseTemporalCopy(true);
|
|
||||||
$editor->_render();
|
|
||||||
|
|
||||||
?>
|
|
||||||
@@ -211,3 +211,4 @@ G::RenderPage( "publish", "raw" );
|
|||||||
return myPanel;
|
return myPanel;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* eventList.php
|
* eventList.php
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
//$req = $_POST['request'];
|
//$req = $_POST['request'];
|
||||||
$req = (isset($_POST['request']))? $_POST['request']:((isset($_REQUEST['request']))? $_REQUEST['request'] : 'No hayyy tal');
|
$req = (isset($_POST['request']))? $_POST['request']:((isset($_REQUEST['request']))? $_REQUEST['request'] : 'No hayyy tal');
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* eventsCompleted.php
|
* eventsCompleted.php
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* events_Delete.php
|
* events_Delete.php
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* events_Edit.php
|
* events_Edit.php
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* events_EditAction.php
|
* events_EditAction.php
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* eventsPending.php
|
* eventsPending.php
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* events_Save.php
|
* events_Save.php
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -70,7 +70,6 @@ imagerectangle( $im, 0, 0, $w - 1, $h - 1, $gray );
|
|||||||
// imageline($im, $x +$mean, $h , $x + $mean, $h-1, $red);
|
// imageline($im, $x +$mean, $h , $x + $mean, $h-1, $red);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
function drawTask ($im, $x1, $x2, $y, $h)
|
function drawTask ($im, $x1, $x2, $y, $h)
|
||||||
{
|
{
|
||||||
global $w;
|
global $w;
|
||||||
@@ -88,7 +87,6 @@ function drawTask ($im, $x1, $x2, $y, $h)
|
|||||||
}
|
}
|
||||||
imagerectangle( $im, $x1, $y - 10, $x2, $y, $black );
|
imagerectangle( $im, $x1, $y - 10, $x2, $y, $black );
|
||||||
}
|
}
|
||||||
;
|
|
||||||
|
|
||||||
function smallTask ($im, $x1, $x2, $y)
|
function smallTask ($im, $x1, $x2, $y)
|
||||||
{
|
{
|
||||||
@@ -120,7 +118,6 @@ function drawMultipleTask ($im, $x1, $x2, $y, $h)
|
|||||||
smallTask( $im, $x1 + 1 * $terca, $x1 + 2 * $terca, $y - 6 );
|
smallTask( $im, $x1 + 1 * $terca, $x1 + 2 * $terca, $y - 6 );
|
||||||
smallTask( $im, $x1 + 2 * $terca, $x1 + 3 * $terca, $y );
|
smallTask( $im, $x1 + 2 * $terca, $x1 + 3 * $terca, $y );
|
||||||
}
|
}
|
||||||
;
|
|
||||||
|
|
||||||
function drawTimerEvent ($im, $x1, $y1, $h)
|
function drawTimerEvent ($im, $x1, $y1, $h)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* triggers_Save.php
|
* triggers_Save.php
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user