From 9547cfe92728bb99f4c826358a78e009fef21452 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Fri, 11 Jun 2021 08:54:24 +0200
Subject: [PATCH] Clean up and document redirect changes

Add comments
Standardise URL's
Remove surplus cases
---
 conf/Sccp.class.php.v433       |  6 ++++-
 sccpManTraits/bmoFunctions.php | 41 +++++++++-------------------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/conf/Sccp.class.php.v433 b/conf/Sccp.class.php.v433
index 0c0ee07..253caef 100644
--- a/conf/Sccp.class.php.v433
+++ b/conf/Sccp.class.php.v433
@@ -32,6 +32,7 @@ class Sccp extends \FreePBX\modules\Core\Driver {
     }
 
     public function addDevice($id, $settings) {
+        global $currentcomponent;
         $add_fld = array ("name"=>'label',"outboundcid"=>'cid_num',"langcode"=>'language',"extdisplay"=>'description');
         $settings['cid_num']['value'] = '';
         $settings['cid_name']['value'] = $label;
@@ -88,7 +89,10 @@ class Sccp extends \FreePBX\modules\Core\Driver {
 
         $sth = $this->database->prepare($sql);
         $sth->execute();
-        redirect("http://{$_SERVER['SERVER_ADDR']}/admin/config.php?display=sccp_phone", false);
+        // Redirect to SCCP Phone page. This was last function in add so
+        // should be safe. Prefer to add in Hooks, but is not followed
+        // even if set for $currentcomponent
+        redirect("config.php?display=sccp_phone", false);
         return true;
     }
 
diff --git a/sccpManTraits/bmoFunctions.php b/sccpManTraits/bmoFunctions.php
index b75a159..1bd6817 100644
--- a/sccpManTraits/bmoFunctions.php
+++ b/sccpManTraits/bmoFunctions.php
@@ -24,12 +24,19 @@ trait bmoFunctions {
 
     public function doGuiHook(&$cc) {
         if ($_REQUEST['display'] == "extensions" ) {
-      			if (isset($_REQUEST['tech_hardware']))  {
-                //this is the add extensions form
+      			if ($_REQUEST['tech_hardware'] == 'sccp_custom')  {
+                /*
+                this is the add extensions form
+                On submit returns to extensions page. Users prefer that it returns
+                To Sccp Phone.
+                Below adds redirect URL, but it is not followed
+                $cc->setRedirectURL("config.php?display=sccp_phone");
+                so force redirect at end of addDevice in SccpClass
+                */  
             }
         }
     }
-    
+
     /* unused but FPBX API requires it */
 
     public function install() {
@@ -56,7 +63,6 @@ trait bmoFunctions {
 
     public function getActionBar($request) {
         $buttons = array();
-        dbug('Request in BMO is', $request);
         switch ($request['display']) {
             case 'sccp_adv':
                 if (empty($request['tech_hardware'])) {
@@ -123,38 +129,13 @@ trait bmoFunctions {
                     ),
                 );
                 break;
-                case 'extensions':
-                    // only called from configpage inits
-                    dbug('in case extensions');
-                    $buttons = array(
-                    'submit' => array(
-                        'name' => 'ajaxsubmit',
-                        'id' => 'ajaxsubmit',
-                        'data-search' => '?display=sccp_custom',
-                        'value' => _("Save")
-                    ),
-                    'Save' => array(
-                        'name' => 'ajaxsubmit2',
-                        'id' => 'ajaxsubmit2',
-                        'stayonpage' => 'yes',
-                        'value' => _("Save + Continue")
-                    ),
-                    'cancel' => array(
-                        'name' => 'cancel',
-                        'id' => 'ajaxcancel',
-                        'data-search' => '?display=sccp_custom',
-                        'data-hash' => 'sccpdevice',
-                        'value' => _("Cancel")
-                    ),
-                    );
-                break;
         }
         return $buttons;
     }
 
     public function getRightNav($request) {
         if (isset($request['tech_hardware']) && ($request['tech_hardware'] == 'cisco')) {
-            return load_view("/var/www/html/admin/modules/sccp_manager/views/hardware.rnav.php", array('request' => $request));
+            return load_view($_SERVER['DOCUMENT_ROOT'] .'/admin/modules/sccp_manager/views/hardware.rnav.php', array('request' => $request));
         }
     }