From 11af87ca38160a79560212a3cba46d700c8e9a39 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Thu, 28 Jan 2021 08:11:21 +0100
Subject: [PATCH] Remove extraneous calls

Duplicate calls from page.settings removed
---
 page.html.php         | 46 ++++++++++++++++++++++++++++++++++++++
 page.sccp_adv.php     | 50 ++---------------------------------------
 page.sccp_phone.php   | 49 +---------------------------------------
 page.sccpsettings.php | 52 +++++--------------------------------------
 4 files changed, 54 insertions(+), 143 deletions(-)
 create mode 100644 page.html.php

diff --git a/page.html.php b/page.html.php
new file mode 100644
index 0000000..5ede85b
--- /dev/null
+++ b/page.html.php
@@ -0,0 +1,46 @@
+<div class="container-fluid">
+    <h1><?php echo $display_info?></h1>
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="fpbx-container">
+                <div class="display no-border">
+                    <div class="nav-container">
+                        <div class="scroller scroller-left"><i class="glyphicon glyphicon-chevron-left"></i></div>
+                        <div class="scroller scroller-right"><i class="glyphicon glyphicon-chevron-right"></i></div>
+                        <div class="wrapper">
+                            <ul class="nav nav-tabs list" role="tablist">
+                                <?php foreach ($display_page as $key => $page) { ?>
+                                    <li data-name="<?php echo $key?>" class="change-tab <?php echo $key == 'general' ? 'active' : ''?>"><a href="#<?php echo $key?>" aria-controls="<?php echo $key?>" role="tab" data-toggle="tab"><?php echo $page['name']?></a></li>
+                                <?php } ?>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="tab-content display">
+                        <?php foreach ($display_page as $key => $page) { ?>
+                            <div id="<?php echo $key?>" class="tab-pane <?php echo $key == 'general' ? 'active' : ''?>">
+                                <?php echo $page['content']?>
+                            </div>
+                        <?php } ?>
+                                        </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Modal alerts-->
+<div class="modal" id="hwalert" tabindex="-1" role="dialog" aria-labelledby="lhwalert">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="myModalLabel">Modal title</h4>
+      </div>
+      <div class="modal-body">
+        ...
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/page.sccp_adv.php b/page.sccp_adv.php
index 0c2b530..bdc492f 100644
--- a/page.sccp_adv.php
+++ b/page.sccp_adv.php
@@ -22,53 +22,7 @@ if (empty($spage->class_error)) {
     $display_page = $spage->infoServerShowPage();
     $display_info = _("SCCP Server Configuration");
 }
+
+include('page.html.php');
 ?>
-
-<div class="container-fluid">
-    <h1><?php echo $display_info?></h1>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="fpbx-container">
-                <div class="display no-border">
-                    <div class="nav-container">
-                        <div class="scroller scroller-left"><i class="glyphicon glyphicon-chevron-left"></i></div>
-                        <div class="scroller scroller-right"><i class="glyphicon glyphicon-chevron-right"></i></div>
-                        <div class="wrapper">
-                            <ul class="nav nav-tabs list" role="tablist">
-                                <?php foreach ($display_page as $key => $page) { ?>
-                                    <li data-name="<?php echo $key?>" class="change-tab <?php echo $key == 'general' ? 'active' : ''?>"><a href="#<?php echo $key?>" aria-controls="<?php echo $key?>" role="tab" data-toggle="tab"><?php echo $page['name']?></a></li>
-                                <?php } ?>
-                            </ul>
-                        </div>
-                    </div>
-                    <div class="tab-content display">
-                        <?php foreach ($display_page as $key => $page) { ?>
-                            <div id="<?php echo $key?>" class="tab-pane <?php echo $key == 'general' ? 'active' : ''?>">
-                                <?php echo $page['content']?>
-                            </div>
-                        <?php } ?>
-                                        </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- Modal alerts-->
-<div class="modal" id="hwalert" tabindex="-1" role="dialog" aria-labelledby="lhwalert">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">Modal title</h4>
-      </div>
-      <div class="modal-body">
-        ...
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <!-- End Modal alerts-->
diff --git a/page.sccp_phone.php b/page.sccp_phone.php
index 038860e..eb4776a 100644
--- a/page.sccp_phone.php
+++ b/page.sccp_phone.php
@@ -22,54 +22,7 @@ if (empty($spage->class_error)) {
     $display_page = $spage->infoServerShowPage();
     $display_info = _("SCCP Server Configuration");
 }
-
+include('page.html.php');
 ?>
 
-<div class="container-fluid">
-    <h1><?php echo $display_info?></h1>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="fpbx-container">
-                <div class="display no-border">
-                    <div class="nav-container">
-                        <div class="scroller scroller-left"><i class="glyphicon glyphicon-chevron-left"></i></div>
-                        <div class="scroller scroller-right"><i class="glyphicon glyphicon-chevron-right"></i></div>
-                        <div class="wrapper">
-                            <ul class="nav nav-tabs list" role="tablist">
-                                <?php foreach ($display_page as $key => $page) { ?>
-                                    <li data-name="<?php echo $key?>" class="change-tab <?php echo $key == 'general' ? 'active' : ''?>"><a href="#<?php echo $key?>" aria-controls="<?php echo $key?>" role="tab" data-toggle="tab"><?php echo $page['name']?></a></li>
-                                <?php } ?>
-                            </ul>
-                        </div>
-                    </div>
-                    <div class="tab-content display">
-                        <?php foreach ($display_page as $key => $page) { ?>
-                            <div id="<?php echo $key?>" class="tab-pane <?php echo $key == 'general' ? 'active' : ''?>">
-                                <?php echo $page['content']?>
-                            </div>
-                        <?php } ?>
-                                        </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- Modal alerts-->
-<div class="modal" id="hwalert" tabindex="-1" role="dialog" aria-labelledby="lhwalert">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">Modal title</h4>
-      </div>
-      <div class="modal-body">
-        ...
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <!-- End Modal alerts-->
diff --git a/page.sccpsettings.php b/page.sccpsettings.php
index 2d969c6..e2b12fd 100644
--- a/page.sccpsettings.php
+++ b/page.sccpsettings.php
@@ -11,53 +11,11 @@ if (!defined('FREEPBX_IS_AUTH')) {
 
 //
 $spage = FreePBX::create()->Sccp_manager;
+
+$display_page = $spage->myShowPage();
+$display_info = _("SCCP Server Settings");
+
+include('page.html.php');
 ?>
 
-<div class="container-fluid">
-    <h1><?php echo _("SCCP Server Settings")?></h1>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="fpbx-container">
-                <div class="display no-border">
-                    <div class="nav-container">
-                        <div class="scroller scroller-left"><i class="glyphicon glyphicon-chevron-left"></i></div>
-                        <div class="scroller scroller-right"><i class="glyphicon glyphicon-chevron-right"></i></div>
-                        <div class="wrapper">
-                            <ul class="nav nav-tabs list" role="tablist">
-                                <?php foreach ($spage->myShowPage() as $key => $page) { ?>
-                                    <li data-name="<?php echo $key?>" class="change-tab <?php echo $key == 'general' ? 'active' : ''?>"><a href="#<?php echo $key?>" aria-controls="<?php echo $key?>" role="tab" data-toggle="tab"><?php echo $page['name']?></a></li>
-                                <?php } ?>
-                            </ul>
-                        </div>
-                    </div>
-                    <div class="tab-content display">
-                        <?php foreach ($spage->myShowPage() as $key => $page) { ?>
-                            <div id="<?php echo $key?>" class="tab-pane <?php echo $key == 'general' ? 'active' : ''?>">
-                                <?php echo $page['content']?>
-                            </div>
-                        <?php } ?>
-                                        </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- Modal alerts-->
-<div class="modal" id="hwalert" tabindex="-1" role="dialog" aria-labelledby="lhwalert">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">Modal title</h4>
-      </div>
-      <div class="modal-body">
-        ...
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <!-- End Modal alerts-->