From e313b9da3ff56a68374b31fd153d010f7e1bfbc8 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Fri, 30 Jul 2021 22:43:35 +0200
Subject: [PATCH] Change pathname style from {} to .

Instability seen when pathnames with globals enclosed in {} - revert to . style pathnames
---
 install.php                         | 8 ++++----
 sccpManClasses/extconfigs.class.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install.php b/install.php
index c1ed252..311bb32 100644
--- a/install.php
+++ b/install.php
@@ -737,7 +737,7 @@ function InstallDB_CreateSccpDeviceConfigView($sccp_compatible)
                 sccpdevice.mwioncall, sccpdevice.dndFeature, sccpdevice.transfer, sccpdevice.cfwdall, sccpdevice.cfwdbusy, sccpdevice.private, sccpdevice.privacy,
                 sccpdevice.nat, sccpdevice.directrtp, sccpdevice.softkeyset, sccpdevice.audio_tos, sccpdevice.audio_cos, sccpdevice.video_tos, sccpdevice.video_cos,
                 sccpdevice.conf_allow, sccpdevice.conf_play_general_announce, sccpdevice.conf_play_part_announce, sccpdevice.conf_mute_on_entry,
-                sccpdevice.conf_music_on_hold_class, sccpdevice.conf_show_conflist, sccpdevice.force_dtmfmode, sccpdevice.setvar, sccpdevice.backgroundImage, 
+                sccpdevice.conf_music_on_hold_class, sccpdevice.conf_show_conflist, sccpdevice.force_dtmfmode, sccpdevice.setvar, sccpdevice.backgroundImage,
                 sccpdevice.backgroundThumbnail, sccpdevice.ringtone, sccpdevice.callhistory_answered_elsewhere, sccpdevice.useRedialMenu, sccpdevice.cfwdnoanswer,
                 sccpdevice.park, sccpdevice.monitor, sccpdevice.phonecodepage, sccpdevice.keepalive
             FROM sccpdevice
@@ -923,7 +923,7 @@ function Setup_RealTime()
 
 function addDriver($sccp_compatible) {
     outn("<li>" . _("Adding driver ...") . "</li>");
-    $file = "{$_SERVER['DOCUMENT_ROOT']}/admin/modules/core/functions.inc/drivers/Sccp.class.php";
+    $file = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/core/functions.inc/drivers/Sccp.class.php';
     $contents = "<?php include '/var/www/html/admin/modules/sccp_manager/sccpManClasses/Sccp.class.php.v{$sccp_compatible}'; ?>";
     file_put_contents($file, $contents);
 
@@ -931,7 +931,7 @@ function addDriver($sccp_compatible) {
     $dir = $cnf_int->get('ASTETCDIR');
     if (!file_exists("{$dir}/sccp.conf")) { // System re Config
         outn("<li>" . _("Adding default configuration file ...") . "</li>");
-        $sccpfile = file_get_contents("{$_SERVER['DOCUMENT_ROOT']}/admin/modules/sccp_manager/conf/sccp.conf");
+        $sccpfile = file_get_contents($_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/sccp.conf');
         file_put_contents("{$dir}/sccp.conf", $sccpfile);
     }
 }
@@ -1044,7 +1044,7 @@ function cleanUpSccpSettings() {
     */
 
     // Clean up sccpsettings to remove legacy values.
-    $xml_vars = "{$_SERVER['DOCUMENT_ROOT']}/admin/modules/sccp_manager/conf/sccpgeneral.xml.v{$sccp_compatible}";
+    $xml_vars = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/sccpgeneral.xml.v{$sccp_compatible}';
     $thisInstaller->xml_data = simplexml_load_file($xml_vars);
     $thisInstaller->initVarfromXml();
     foreach ( array_diff_key($settingsFromDb,$thisInstaller->sccpvalues) as $key => $valueArray) {
diff --git a/sccpManClasses/extconfigs.class.php b/sccpManClasses/extconfigs.class.php
index 73d5d5f..5ad23ea 100644
--- a/sccpManClasses/extconfigs.class.php
+++ b/sccpManClasses/extconfigs.class.php
@@ -352,7 +352,7 @@ class extconfigs
         }
         // TODO: Need to add index.cnf, after setting defaults correctly
         if (!file_exists("{$baseConfig['tftp_templates_path']}/XMLDefault.cnf.xml_template")) {
-            $src_path = "{$_SERVER['DOCUMENT_ROOT']}/admin/modules/sccp_manager/conf/";
+            $src_path = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/';
             $dst_path = "{$baseConfig["tftp_templates_path"]}/";
             foreach (glob("{$src_path}*.*_template") as $filename) {
                 copy($filename, $dst_path . basename($filename));