From 80fbf7b1b437de518091375d4bcd8dbf4af760ba 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 1/2] 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 @@ +
+

+
+
+
+
+
+
+
+
+
    + $page) { ?> +
    • + +
+
+
+
+ $page) { ?> +
+ +
+ +
+
+
+
+
+
+ + 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'); ?> - -
-

-
-
-
-
-
-
-
-
-
    - $page) { ?> -
    • - -
-
-
-
- $page) { ?> -
- -
- -
-
-
-
-
-
- - - 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'); ?> -
-

-
-
-
-
-
-
-
-
-
    - $page) { ?> -
    • - -
-
-
-
- $page) { ?> -
- -
- -
-
-
-
-
-
- - - 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'); ?> -
-

-
-
-
-
-
-
-
-
-
    - myShowPage() as $key => $page) { ?> -
    • - -
-
-
-
- myShowPage() as $key => $page) { ?> -
- -
- -
-
-
-
-
-
- - - From d5c8cc9ab24998ff2e0edd826c9aa2bbb880825c Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Thu, 28 Jan 2021 10:00:10 +0100 Subject: [PATCH 2/2] Match to previous commit Add missing comments --- page.sccp_adv.php | 3 +-- page.sccp_phone.php | 3 +-- page.sccpsettings.php | 9 +++------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/page.sccp_adv.php b/page.sccp_adv.php index bdc492f..889526b 100644 --- a/page.sccp_adv.php +++ b/page.sccp_adv.php @@ -22,7 +22,6 @@ if (empty($spage->class_error)) { $display_page = $spage->infoServerShowPage(); $display_info = _("SCCP Server Configuration"); } - +// standardise code to reduce base include('page.html.php'); ?> - diff --git a/page.sccp_phone.php b/page.sccp_phone.php index eb4776a..4d65ba7 100644 --- a/page.sccp_phone.php +++ b/page.sccp_phone.php @@ -22,7 +22,6 @@ if (empty($spage->class_error)) { $display_page = $spage->infoServerShowPage(); $display_info = _("SCCP Server Configuration"); } +// standardise code to reduce base include('page.html.php'); ?> - - diff --git a/page.sccpsettings.php b/page.sccpsettings.php index e2b12fd..deb8315 100644 --- a/page.sccpsettings.php +++ b/page.sccpsettings.php @@ -10,12 +10,9 @@ if (!defined('FREEPBX_IS_AUTH')) { // AGPL v3 Licened // -$spage = FreePBX::create()->Sccp_manager; - -$display_page = $spage->myShowPage(); +// Initialise page before to avoid double calls and improve performance +$display_page = FreePBX::create()->Sccp_manager->myShowPage(); $display_info = _("SCCP Server Settings"); - +// standardise code to reduce base include('page.html.php'); ?> - -