Restructured execute function to reduce cyclomatic complexity

adminlib.php

@@ -365,10 +365,46 @@ class workflow_settings {
      * This is the entry point for this controller class.
      */
     public function execute($action, $subplugin) {
-        global $PAGE, $OUTPUT;
+        global $PAGE;
         $this->check_permissions();
 
         if ($action === ACTION_TRIGGER_INSTANCE_FORM) {
+            if ($this->handle_trigger_instance_form()) {
+                return;
+            }
+        }
+
+        // If trigger is not yet set, redirect to trigger form!
+        $trigger = trigger_manager::get_trigger_for_workflow($this->workflowid);
+        if ($trigger === null) {
+            $subpluginname = null;
+            if ($name = optional_param('subpluginname', null, PARAM_ALPHA)) {
+                $subpluginname = $name;
+            }
+            $triggerform = new form_trigger_instance($PAGE->url, $this->workflowid, null, $subpluginname);
+            $this->view_trigger_instance_form($triggerform);
+            return;
+        }
+
+        // Handle other actions.
+        step_manager::handle_action($action, $subplugin);
+        workflow_manager::handle_action($action, $subplugin);
+
+        if ($action === ACTION_STEP_INSTANCE_FORM) {
+            if ($this->handle_step_instance_form()) {
+                return;
+            }
+        }
+        // If no action handler has printed any form yet, display the plugins tables.
+        $this->view_plugins_table();
+    }
+
+    /**
+     * Handles actions for the trigger instance form and causes related forms to be rendered.
+     * @return bool True, if no further action handling or output should be conducted.
+     */
+    private function handle_trigger_instance_form() {
+        global $OUTPUT, $PAGE;
         $subpluginname = null;
         $settings = null;
         if ($trigger = trigger_manager::get_trigger_for_workflow($this->workflowid)) {
@@ -399,31 +435,21 @@ class workflow_settings {
                     // Save local subplugin settings.
                     settings_manager::save_settings($trigger->id, SETTINGS_TYPE_TRIGGER, $data->subpluginname, $data);
                 }
-                    $this->view_plugins_table();
-                    return;
+                return false;
             } else {
                 $this->view_trigger_instance_form($form);
-                    return;
-                }
+                return true;
             }
         }
-
-        // If trigger is not yet set, redirect to trigger form!
-        $trigger = trigger_manager::get_trigger_for_workflow($this->workflowid);
-        if ($trigger === null) {
-            $subpluginname = null;
-            if ($name = optional_param('subpluginname', null, PARAM_ALPHA)) {
-                $subpluginname = $name;
-            }
-            $triggerform = new form_trigger_instance($PAGE->url, $this->workflowid, null, $subpluginname);
-            $this->view_trigger_instance_form($triggerform);
-            return;
+        return false;
     }
 
-        step_manager::handle_action($action, $subplugin);
-        workflow_manager::handle_action($action, $subplugin);
-
-        if ($action === ACTION_STEP_INSTANCE_FORM) {
+    /**
+     * Handles actions for the trigger instance form and causes related forms to be rendered.
+     * @return bool True, if no further action handling or output should be conducted.
+     */
+    private function handle_step_instance_form() {
+        global $OUTPUT, $PAGE;
         $steptomodify = null;
         $subpluginname = null;
         $stepsettings = null;
@@ -431,22 +457,19 @@ class workflow_settings {
             $steptomodify = step_manager::get_step_instance($stepid);
             // If step was removed!
             if (!$steptomodify) {
-                    $this->view_plugins_table();
-                    return;
+                return false;
             }
             $stepsettings = settings_manager::get_settings($stepid, SETTINGS_TYPE_STEP);
         } else if ($name = optional_param('subpluginname', null, PARAM_ALPHA)) {
             $subpluginname = $name;
         } else {
-                $this->view_plugins_table();
-                return;
+            return false;
         }
 
         $form = new form_step_instance($PAGE->url, $steptomodify, $this->workflowid, $subpluginname, $stepsettings);
 
         if ($form->is_cancelled()) {
-                $this->view_plugins_table();
-                return;
+            return false;
         } else if ($form->is_submitted() && $form->is_validated() && $data = $form->get_submitted_data()) {
             // In case the workflow is active, we do not allow changes to the steps or trigger.
             if (workflow_manager::is_active($this->workflowid)) {
@@ -464,14 +487,12 @@ class workflow_settings {
                 // Save local subplugin settings.
                 settings_manager::save_settings($step->id, SETTINGS_TYPE_STEP, $form->subpluginname, $data);
             }
-                $this->view_plugins_table();
-                return;
         } else {
             $this->view_step_instance_form($form);
-                return;
-            }
+            return true;
         }
-        $this->view_plugins_table();
+        return false;
     }
 
+
 }
\ No newline at end of file