Merge pull request #833 from ralpheav/master

Code Style change  workflow/engine/methods/events  workflow/engine/methods/dynaforms/
This commit is contained in:
ferOnti
2012-10-19 08:05:07 -07:00
12 changed files with 52 additions and 69 deletions

View File

@@ -12,82 +12,76 @@
*
* This program is distributed in the hope that it will be useful,
* 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.
*
* 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.,
* 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
*
*/
G::LoadClass('dynaformEditor');
G::LoadClass('toolBar');
G::LoadClass('dynaFormField');
G::LoadClass( 'dynaformEditor' );
G::LoadClass( 'toolBar' );
G::LoadClass( 'dynaFormField' );
//G::LoadClass('configuration');
$G_MAIN_MENU = 'processmaker';
$G_SUB_MENU = 'processes';
$G_ID_MENU_SELECTED = 'PROCESSES';
$G_ID_SUB_MENU_SELECTED = 'FIELDS';
//G::LoadClass('configuration');
$G_MAIN_MENU = 'processmaker';
$G_SUB_MENU = 'processes';
$G_ID_MENU_SELECTED = 'PROCESSES';
$G_ID_SUB_MENU_SELECTED = 'FIELDS';
$PRO_UID=isset($_GET['PRO_UID'])?$_GET['PRO_UID']:'0';
$DYN_UID=(isset($_GET['DYN_UID'])) ? urldecode($_GET['DYN_UID']):'0';
$_SESSION['PROCESS'] = $_GET['PRO_UID'];
$PRO_UID = isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : '0';
$DYN_UID = (isset( $_GET['DYN_UID'] )) ? urldecode( $_GET['DYN_UID'] ) : '0';
$_SESSION['PROCESS'] = $_GET['PRO_UID'];
if ($PRO_UID==='0') return;
$process = new Process;
if ($process->exists($PRO_UID))
{
if ($PRO_UID === '0') {
return;
}
$process = new Process();
if ($process->exists( $PRO_UID )) {
$process->load( $PRO_UID );
}
else
{
} else {
//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 );
$_SESSION['CURRENT_DYN_UID'] = $DYN_UID;
}
else
{
/* New Dynaform
*
*/
$dynaform->create(array('PRO_UID'=>$PRO_UID));
}
} else {
/* New Dynaform
*
*/
$dynaform->create( array ('PRO_UID' => $PRO_UID) );
}
//creating SESSION for redirecting to new bpmn editor after closing Dynaform
if(isset($_GET['bpmn']) && $_GET['bpmn'] == '1')
{$_SESSION['dynaform_editor'] = 'bpmn';}
else if(!isset($_GET['bpmn']))
{$_SESSION['dynaform_editor'] = 'processmap';}
//creating SESSION for redirecting to new bpmn editor after closing Dynaform
if (isset( $_GET['bpmn'] ) && $_GET['bpmn'] == '1') {
$_SESSION['dynaform_editor'] = 'bpmn';
} elseif (! isset( $_GET['bpmn'] )) {
$_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();
?>

View File

@@ -211,3 +211,4 @@ G::RenderPage( "publish", "raw" );
return myPanel;
}
</script>

View File

@@ -1,5 +1,4 @@
<?php
/**
* eventList.php
*

View File

@@ -1,5 +1,4 @@
<?php
//$req = $_POST['request'];
$req = (isset($_POST['request']))? $_POST['request']:((isset($_REQUEST['request']))? $_REQUEST['request'] : 'No hayyy tal');

View File

@@ -1,5 +1,4 @@
<?php
/**
* eventsCompleted.php
*

View File

@@ -1,5 +1,4 @@
<?php
/**
* events_Delete.php
*

View File

@@ -1,5 +1,4 @@
<?php
/**
* events_Edit.php
*

View File

@@ -1,5 +1,4 @@
<?php
/**
* events_EditAction.php
*

View File

@@ -1,5 +1,4 @@
<?php
/**
* eventsPending.php
*

View File

@@ -1,5 +1,4 @@
<?php
/**
* events_Save.php
*

View File

@@ -70,7 +70,6 @@ imagerectangle( $im, 0, 0, $w - 1, $h - 1, $gray );
// imageline($im, $x +$mean, $h , $x + $mean, $h-1, $red);
// }
function drawTask ($im, $x1, $x2, $y, $h)
{
global $w;
@@ -88,7 +87,6 @@ function drawTask ($im, $x1, $x2, $y, $h)
}
imagerectangle( $im, $x1, $y - 10, $x2, $y, $black );
}
;
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 + 2 * $terca, $x1 + 3 * $terca, $y );
}
;
function drawTimerEvent ($im, $x1, $y1, $h)
{

View File

@@ -1,5 +1,4 @@
<?php
/**
* triggers_Save.php
*