Merge pull request #838 from ralpheav/master

Code Style change workflow/engine/methods/cases/
2012-10-19 11:51:22 -07:00
parent 717ed5d87e 4a4321615f
commit d5de803603
14 changed files with 2140 additions and 2130 deletions
--- a/workflow/engine/methods/cases/cases_Delete.php
+++ b/workflow/engine/methods/cases/cases_Delete.php
@@ -43,14 +43,16 @@ try {
    $oCase = new Cases();
    if (isset( $_POST['APP_UIDS'] )) {
        $ids = explode( ',', $_POST['APP_UIDS'] );
-        foreach ($ids as $id)
+        foreach ($ids as $id) {
            $oCase->removeCase( $id );
+        }

-        if (count( $_POST['APP_UIDS'] ) > 1)
+        if (count( $_POST['APP_UIDS'] ) > 1) {
            echo 'The Case was deleted successfully';
-        else
+        } else {
            echo 'All Cases were deleted successfully';
        }
+    }
 } catch (Exception $e) {
    echo $e->getMessage();
 }
--- a/workflow/engine/methods/cases/cases_List.php
+++ b/workflow/engine/methods/cases/cases_List.php
@@ -29,8 +29,9 @@
 */

 /* Permissions */
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_CASES" )) != 1)
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_CASES" )) != 1) {
    return $RBAC_Response;
+}

    /* Includes */
 G::LoadClass( 'case' );
@@ -99,8 +100,9 @@ switch ($sTypeList) {
        if (defined( 'ENABLE_CASE_LIST_OPTIMIZATION' )) {
            $aCriteria = $oCases->prepareCriteriaForToDo( $sUIDUserLogged );
            $xmlfile = 'cases/cases_ListTodoNew';
-        } else
+        } else {
            list ($aCriteria, $xmlfile) = $oCases->getConditionCasesList( $sTypeList, $sUIDUserLogged, true, $aAdditionalFilter );
+        }
        break;
    default:
        list ($aCriteria, $xmlfile) = $oCases->getConditionCasesList( $sTypeList, $sUIDUserLogged, true, $aAdditionalFilter );
@@ -156,14 +158,14 @@ G::RenderPage( 'publish', 'blank' );
 function InAssocArray ($a, $k, $v)
 {
    foreach ($a as $item) {
-        if (isset( $item[$k] ) && $v == $item[$k])
+        if (isset( $item[$k] ) && $v == $item[$k]) {
            return true;
        }
+    }
    return false;
 }

 ?>
-
 <script>
  try{
    oPropelTable = document.getElementById('publisherContent[0]');
@@ -176,4 +178,5 @@ function InAssocArray ($a, $k, $v)
 if(parent.refreshCountFolders) parent.refreshCountFolders();
  }catch(e){}
 </script>
+<?php

--- a/workflow/engine/methods/cases/cases_New.php
+++ b/workflow/engine/methods/cases/cases_New.php
@@ -48,7 +48,6 @@ switch ($RBAC->userCanAccess( 'PM_CASES' )) {
        G::header( 'location: ../login/login' );
        die();
        break;
-
    case - 1:
        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
        G::header( 'location: ../login/login' );
@@ -137,18 +136,21 @@ $aFields['CHANGE_LINK'] = G::LoadTranslation( 'ID_CHANGE_VIEW' );
 if (isset( $aMessage )) {
    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
 }
-if ($listType == 'dropdown')
+if ($listType == 'dropdown') {
    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $sXmlForm, '', $aFields, 'cases_Save' );
+}

 if ($listType == 'link') {
-    if ($bCanStart)
+    if ($bCanStart) {
        $sXmlForm = 'cases/cases_NewRadioGroup.xml';
+    }
    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $sXmlForm, '', $aFields, 'cases_Save' );
 }

 if ($listType == 'category') {
-    if ($bCanStart)
+    if ($bCanStart) {
        $sXmlForm = 'cases/cases_NewCategory.xml';
+    }
    $G_PUBLISH->AddContent( 'view', 'cases/cases_NewCategory' );
 }

@@ -160,3 +162,5 @@ G::RenderPage( 'publish', 'blank' );
    parent.PANEL_EAST_OPEN = false;
 </script>

+<?php
+
--- a/workflow/engine/methods/cases/cases_NextStep.php
+++ b/workflow/engine/methods/cases/cases_NextStep.php
@@ -21,8 +21,9 @@
 * 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_CASES" )) != 1)
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_CASES" )) != 1) {
    return $RBAC_Response;
+}
    //go to the next step
 G::LoadClass( 'case' );
 $oCase = new Cases();
--- a/workflow/engine/methods/cases/cases_Open.php
+++ b/workflow/engine/methods/cases/cases_Open.php
@@ -108,8 +108,8 @@ try {
                $oDataset->next();
                $aData = $oDataset->getRow();

-                if ($aData['USR_UID'] != $_SESSION['USER_LOGGED'] && $aData['USR_UID'] != "")                 //distinct "" for selfservice
-{
+                if ($aData['USR_UID'] != $_SESSION['USER_LOGGED'] && $aData['USR_UID'] != "") {
+                    //distinct "" for selfservice
                    //so we show just the resume
                    $_SESSION['alreadyDerivated'] = true;
                    //the case is paused show only the resume
@@ -183,7 +183,6 @@ try {
                require_once (PATH_METHODS . 'cases' . PATH_SEP . 'cases_Resume.php');
            }
            break;
-
        default: //APP_STATUS <> DRAFT and TO_DO
            $_SESSION['APPLICATION'] = $sAppUid;
            $_SESSION['INDEX'] = $iDelIndex != "" ? $iDelIndex : $oCase->getCurrentDelegationCase( $_GET['APP_UID'] );
--- a/workflow/engine/methods/cases/cases_OpenToRevise.php
+++ b/workflow/engine/methods/cases/cases_OpenToRevise.php
@@ -23,7 +23,7 @@
 */
 /* Permissions */

-if ($RBAC->userCanAccess( 'PM_SUPERVISOR' ) != 1)
+if ($RBAC->userCanAccess( 'PM_SUPERVISOR' ) != 1) {
    switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
        case - 2:
            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
@@ -36,6 +36,7 @@ if ($RBAC->userCanAccess( 'PM_SUPERVISOR' ) != 1)
            die();
            break;
    }
+}

    /* Includes */
 G::LoadClass( 'case' );
--- a/workflow/engine/methods/cases/cases_PrintView.php
+++ b/workflow/engine/methods/cases/cases_PrintView.php
@@ -123,3 +123,5 @@ try {
    } catch(e){}
 </script>

+<?php
+
--- a/workflow/engine/methods/cases/cases_generatePMTable.php
+++ b/workflow/engine/methods/cases/cases_generatePMTable.php
@@ -42,11 +42,9 @@ foreach ($pmTableFields as $iRow => $aRow) {

 foreach ($pmTableFields as $iRow => $aRow) {

-    $oFields->create( array ('FLD_INDEX' => $iRow + 1,'ADD_TAB_UID' => $sAddTabUid,'FLD_NAME' => $aRow['FLD_NAME'],'FLD_DESCRIPTION' => isset( $aRow['FLD_DESCRIPTION'] ) ? $aRow['FLD_DESCRIPTION'] : '','FLD_TYPE' => isset( $aRow['FLD_TYPE'] ) ? $aRow['FLD_TYPE'] : 'VARCHAR','FLD_SIZE' => isset( $aRow['FLD_SIZE'] ) ? $aRow['FLD_SIZE'] : '32','FLD_NULL' => ($aRow['FLD_NULL'] == 'on' ? 1 : 0),'FLD_AUTO_INCREMENT' => ($aRow['FLD_AUTO_INCREMENT'] == 'on' ? 1 : 0),'FLD_KEY' => ($aRow['FLD_KEY'] == 'on' ? 1 : 0),'FLD_FOREIGN_KEY' => ($aRow['FLD_FOREIGN_KEY'] == 'on' ? 1 : 0),'FLD_FOREIGN_KEY_TABLE' => isset( $aRow['FLD_FOREIGN_KEY_TABLE'] ) ? $aRow['FLD_FOREIGN_KEY_TABLE'] : ''
-    ) );
+    $oFields->create( array ('FLD_INDEX' => $iRow + 1,'ADD_TAB_UID' => $sAddTabUid,'FLD_NAME' => $aRow['FLD_NAME'],'FLD_DESCRIPTION' => isset( $aRow['FLD_DESCRIPTION'] ) ? $aRow['FLD_DESCRIPTION'] : '','FLD_TYPE' => isset( $aRow['FLD_TYPE'] ) ? $aRow['FLD_TYPE'] : 'VARCHAR','FLD_SIZE' => isset( $aRow['FLD_SIZE'] ) ? $aRow['FLD_SIZE'] : '32','FLD_NULL' => ($aRow['FLD_NULL'] == 'on' ? 1 : 0),'FLD_AUTO_INCREMENT' => ($aRow['FLD_AUTO_INCREMENT'] == 'on' ? 1 : 0),'FLD_KEY' => ($aRow['FLD_KEY'] == 'on' ? 1 : 0),'FLD_FOREIGN_KEY' => ($aRow['FLD_FOREIGN_KEY'] == 'on' ? 1 : 0),'FLD_FOREIGN_KEY_TABLE' => isset( $aRow['FLD_FOREIGN_KEY_TABLE'] ) ? $aRow['FLD_FOREIGN_KEY_TABLE'] : '') );

-    $aFields[] = array ('sType' => isset( $aRow['FLD_TYPE'] ) ? $aRow['FLD_TYPE'] : 'VARCHAR','iSize' => isset( $aRow['FLD_SIZE'] ) ? $aRow['FLD_SIZE'] : '32','sFieldName' => $aRow['FLD_NAME'],'bNull' => ($aRow['FLD_NULL'] == 'on' ? 1 : 0),'bAI' => ($aRow['FLD_AUTO_INCREMENT'] == 'on' ? 1 : 0),'bPrimaryKey' => ($aRow['FLD_KEY'] == 'on' ? 1 : 0)
-    );
+    $aFields[] = array ('sType' => isset( $aRow['FLD_TYPE'] ) ? $aRow['FLD_TYPE'] : 'VARCHAR','iSize' => isset( $aRow['FLD_SIZE'] ) ? $aRow['FLD_SIZE'] : '32','sFieldName' => $aRow['FLD_NAME'],'bNull' => ($aRow['FLD_NULL'] == 'on' ? 1 : 0),'bAI' => ($aRow['FLD_AUTO_INCREMENT'] == 'on' ? 1 : 0),'bPrimaryKey' => ($aRow['FLD_KEY'] == 'on' ? 1 : 0));
 }

 $oAdditionalTables->createTable( strtoupper( $pmTableName ), 'wf', $aFields );