Merge pull request #842 from ralpheav/master

Code Style change  workflow/engine/methods/cases/

workflow/engine/methods/cases/cases_Reassign.php

@@ -66,7 +66,8 @@ try {
             $aAux2 = $oGroups->getUsersOfGroup( $value1['GRP_UID'] );
             foreach ($aAux2 as $value2) {
                 if ($aRow['USR_UID'] != $value2['USR_UID']) {
-                    if (! in_array( $value2['USR_UID'], $aUsrUid )) { //var_dump($aRow['USR_UID'], $value2['USR_UID']);echo '<br /><br />';
+                    if (! in_array( $value2['USR_UID'], $aUsrUid )) {
+                        //var_dump($aRow['USR_UID'], $value2['USR_UID']);echo '<br /><br />';
                         $aAux = $oUser->load( $value2['USR_UID'] );
                         $aUsr[$aAux['USR_FIRSTNAME'] . ' ' . $aAux['USR_LASTNAME']] = $aAux;
                         $aUsrUid[] = $value2['USR_UID'];
@@ -78,10 +79,11 @@ try {
         $aUsers = $oTasks->getUsersOfTask( $aRow['TAS_UID'], 1 );
         foreach ($aUsers as $key => $value) {
             if ($aRow['USR_UID'] != $value['USR_UID']) {
-                if (! in_array( $value['USR_UID'], $aUsrUid ))
+                if (! in_array( $value['USR_UID'], $aUsrUid )) {
                     $aUsr[$value['USR_FIRSTNAME'] . ' ' . $value['USR_LASTNAME']] = $value;
                 }
             }
+        }
         ksort( $aUsr );
         //$users='';
         //$users='<select name="USERS"><option value="">Seleccione</option>';

workflow/engine/methods/cases/cases_ReassignByUser.php

@@ -148,3 +148,5 @@ try {
 ?>
 <div id="publisherContent[10]" style="display: none"></div>
 
+<?php
+

workflow/engine/methods/cases/cases_Resume.php

@@ -76,8 +76,9 @@ if (isset( $aRow['APP_TYPE'] )) {
 }
 
 $actions = 'false';
-if ($_GET['action'] == 'paused')
+if ($_GET['action'] == 'paused') {
     $actions = 'true';
+}
 
     /* Render page */
 $oHeadPublisher = & headPublisher::getSingleton();

workflow/engine/methods/cases/cases_Save.php

@@ -28,7 +28,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' );
@@ -42,16 +41,21 @@ G::LoadClass( 'case' );
 /* GET , POST & $_SESSION Vars */
 
 /* unset any variable, because we are starting a new case */
-if (isset( $_SESSION['APPLICATION'] ))
+if (isset( $_SESSION['APPLICATION'] )) {
     unset( $_SESSION['APPLICATION'] );
-if (isset( $_SESSION['PROCESS'] ))
+}
+if (isset( $_SESSION['PROCESS'] )) {
     unset( $_SESSION['PROCESS'] );
-if (isset( $_SESSION['TASK'] ))
+}
+if (isset( $_SESSION['TASK'] )) {
     unset( $_SESSION['TASK'] );
-if (isset( $_SESSION['INDEX'] ))
+}
+if (isset( $_SESSION['INDEX'] )) {
     unset( $_SESSION['INDEX'] );
-if (isset( $_SESSION['STEP_POSITION'] ))
+}
+if (isset( $_SESSION['STEP_POSITION'] )) {
     unset( $_SESSION['STEP_POSITION'] );
+}
 
     /* Process */
 try {

workflow/engine/methods/cases/cases_SaveData.php

@@ -155,7 +155,8 @@ try {
     // saving the data ina pm table in case that is a new record
     if (! empty( $newValues )) {
         $id = key( $newValues );
-        if (! $oAdditionalTables->updateDataInTable( $oForm->fields[$oForm->fields[$id]->pmconnection]->pmtable, $newValues )) { //<--This is to know if it is a new registry on the PM Table
+        if (! $oAdditionalTables->updateDataInTable( $oForm->fields[$oForm->fields[$id]->pmconnection]->pmtable, $newValues )) {
+            //<--This is to know if it is a new registry on the PM Table
             $oAdditionalTables->saveDataInTable( $oForm->fields[$oForm->fields[$id]->pmconnection]->pmtable, $newValues );
         }
     }

workflow/engine/methods/cases/cases_SaveDocument.php

@@ -49,7 +49,6 @@ if ((isset( $_FILES['form'] )) && ($_FILES['form']['error']['APP_DOC_FILENAME']
         case UPLOAD_ERR_EXTENSION:
             $message = G::LoadTranslation( 'ID_UPLOAD_ERR_EXTENSION' );
             break;
-
         default:
             $message = G::LoadTranslation( 'ID_UPLOAD_ERR_UNKNOWN' );
             break;

workflow/engine/methods/cases/cases_SchedulerGetPlugins.php

@@ -28,8 +28,9 @@ function pluginsList ()
     $oPluginRegistry = & PMPluginRegistry::getSingleton();
     $activePluginsForCaseScheduler = $oPluginRegistry->getCaseSchedulerPlugins();
     $selectedPlugin = "";
-    if ((isset( $_REQUEST['plg_uid'] )) && ($_REQUEST['plg_uid'] != ""))
+    if ((isset( $_REQUEST['plg_uid'] )) && ($_REQUEST['plg_uid'] != "")) {
         $selectedPlugin = $_REQUEST['plg_uid'];
+    }
     if (! empty( $activePluginsForCaseScheduler )) {
         echo '<select style="width: 300px;" name="form[CASE_SH_PLUGIN_UID]" id="form[CASE_SH_PLUGIN_UID]" class="module_app_input___gray" required="1" onChange="showPluginSelection(this.options[this.selectedIndex].value,getField(\'PRO_UID\').value)">';
         echo "<option value=\"\">- Select -</option>";
@@ -38,8 +39,9 @@ function pluginsList ()
             $sNamespace = $caseSchedulerPluginDetail->sNamespace;
             $optionId = $sNamespace . "--" . $sActionId;
             $selectedOption = "";
-            if ($selectedPlugin == $optionId)
+            if ($selectedPlugin == $optionId) {
                 $selectedOption = "selected";
+            }
             echo "<option value=\"$optionId\" $selectedOption>" . $sActionId . "</option>";
         }
         echo '</select>';
@@ -49,8 +51,9 @@ function pluginsList ()
 
 function pluginCaseSchedulerForm ()
 {
-    if (! isset( $_REQUEST['selectedOption'] ))
+    if (! isset( $_REQUEST['selectedOption'] )) {
         die();
+    }
     $G_PUBLISH = new Publisher();
     $params = explode( "--", $_REQUEST['selectedOption'] );
     $oPluginRegistry = & PMPluginRegistry::getSingleton();

workflow/engine/methods/cases/cases_SchedulerGetTasks.php

@@ -20,4 +20,5 @@ foreach ($startTasks as $task) {
 //  echo "<option value=\"".$value."\">".$label."</option>";
 ?>
 </select>
+<?php
 

workflow/engine/methods/cases/cases_Scheduler_Edit.php

@@ -115,7 +115,7 @@ try {
     //        var_dump($aFields['SCH_END_DATE']);
     //        var_dump($aFields['SCH_REPEAT_EVERY']);
     //        die();
-    if ($aFields['SCH_END_DATE'] != NULL || trim( $aFields['SCH_REPEAT_EVERY'] ) != '') {
+    if ($aFields['SCH_END_DATE'] != null || trim( $aFields['SCH_REPEAT_EVERY'] ) != '') {
         $aFields['SCH_ADVANCED'] = 'true';
     } else {
         $aFields['SCH_ADVANCED'] = 'false';

workflow/engine/methods/cases/cases_Scheduler_Log.php

@@ -22,8 +22,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_LOGIN" )) != 1)
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_LOGIN" )) != 1) {
     return $RBAC_Response;
+}
 
 $G_PUBLISH = new Publisher();
 G::LoadClass( 'configuration' );

workflow/engine/methods/cases/cases_Scheduler_New.php

@@ -39,7 +39,6 @@ try {
     break;
     }
     */
-
     /*
     $aFields['MESSAGE0']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_USER_REGISTERED')) . '!';
     $aFields['MESSAGE1']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_USERNAME'));

workflow/engine/methods/cases/cases_Scheduler_Save.php

@@ -103,12 +103,12 @@ try {
                     break;
             }
             break;
-
         case '2': // If the option is zero, set by default 1
-            if (empty( $_POST['form']['SCH_EVERY_DAYS'] ))
+            if (empty( $_POST['form']['SCH_EVERY_DAYS'] )) {
                 $nEveryDays = 1;
-            else
+            } else {
                 $nEveryDays = $_POST['form']['SCH_EVERY_DAYS'];
+            }
             $aData['SCH_EVERY_DAYS'] = $nEveryDays;
             $sWeeks = '';
             if (! empty( $_POST['form']['SCH_WEEK_DAYS'] )) {
@@ -125,7 +125,6 @@ try {
             }
             $sStartTime = $_POST['form']['SCH_START_TIME'];
             $aData['SCH_WEEK_DAYS'] = $sWeeks;
-
             break;
         case '3':
             $nStartDay = $_POST['form']['SCH_START_DAY'];
@@ -158,7 +157,6 @@ try {
             $sStartDay = $aData['SCH_START_DAY'];
             $sValue = $nStartDay;
             break;
-
     }
     echo "<br>sOption: " . $sOption;
     if (($sOption != '1') && ($sOption != '4') && ($sOption != '5')) {
@@ -207,10 +205,11 @@ try {
 
     if (! empty( $_POST['form']['SCH_REPEAT_TASK_CHK'] )) {
         $nOptEvery = $_POST['form']['SCH_REPEAT_EVERY_OPT'];
-        if ($nOptEvery == 2)
+        if ($nOptEvery == 2) {
             $aData['SCH_REPEAT_EVERY'] = $_POST['form']['SCH_REPEAT_EVERY'] * 60;
-        else
+        } else {
             $aData['SCH_REPEAT_EVERY'] = $_POST['form']['SCH_REPEAT_EVERY'];
+        }
 
     }
 
@@ -229,7 +228,6 @@ try {
         foreach ($activePluginsForCaseScheduler as $key => $caseSchedulerPluginDetail) {
             if (($caseSchedulerPluginDetail->sNamespace == $params[0]) && ($caseSchedulerPluginDetail->sActionId == $params[1])) {
                 $caseSchedulerSelected = $caseSchedulerPluginDetail;
-
             }
         }
         if ((isset( $caseSchedulerSelected )) && (is_object( $caseSchedulerSelected ))) {

workflow/engine/methods/cases/cases_Scheduler_Update.php

@@ -83,7 +83,8 @@ try {
     $nSW = 0;
 
     switch ($sOption) {
-        case '1': // Option 1
+        case '1':
+            // Option 1
             $sValue = $_POST['form']['SCH_DAYS_PERFORM_TASK'];
             switch ($sValue) {
                 case '1':
@@ -100,11 +101,13 @@ try {
                     break;
             }
             break;
-        case '2': // If the option is zero, set by default 1
+        case '2':
-            if (empty( $_POST['form']['SCH_EVERY_DAYS'] ))
+            // If the option is zero, set by default 1
+            if (empty( $_POST['form']['SCH_EVERY_DAYS'] )) {
                 $nEveryDays = 1;
-            else
+            } else {
                 $nEveryDays = $_POST['form']['SCH_EVERY_DAYS'];
+            }
             $aData['SCH_EVERY_DAYS'] = $nEveryDays;
             $sWeeks = '';
             if (! empty( $_POST['form']['SCH_WEEK_DAYS'] )) {
@@ -122,7 +125,6 @@ try {
             $sStartTime = $_POST['form']['SCH_START_TIME'];
             $aData['SCH_WEEK_DAYS'] = $sWeeks;
             break;
-
         case '3':
             $nStartDay = $_POST['form']['SCH_START_DAY'];
             if ($nStartDay == 1) {
@@ -245,10 +247,11 @@ try {
 
     if (! empty( $_POST['form']['SCH_REPEAT_TASK_CHK'] )) {
         $nOptEvery = $_POST['form']['SCH_REPEAT_EVERY_OPT'];
-        if ($nOptEvery == 2)
+        if ($nOptEvery == 2) {
             $aData['SCH_REPEAT_EVERY'] = $_POST['form']['SCH_REPEAT_EVERY'] * 60;
-        else
+        } else {
             $aData['SCH_REPEAT_EVERY'] = $_POST['form']['SCH_REPEAT_EVERY'];
+        }
 
     }
     //	 	var_dump ($aData['SCH_TIME_NEXT_RUN']);