diff --git a/provisioning.phtml b/provisioning.phtml
index e72fcb9..0cc0e46 100644
--- a/provisioning.phtml
+++ b/provisioning.phtml
@@ -1,159 +1,159 @@
 <?php
 
 /**
  * Copyright (c) 2007-2020 AG Projects
  * https://ag-projects.com
  *
  * This page provides the functions for managing SIP accounts,
  * ENUM ranges, ENUM numbers, Trusted Peers, LCR, Rating plans
  * on a remote NGNPro server
  *
  */
 
-require("/etc/cdrtool/global.inc");
-require("ngnpro_client.php");
+require '/etc/cdrtool/global.inc';
+require 'ngnpro_client.php';
 
 set_time_limit(600);
 
 page_open(
     array(
         "sess" => "CDRTool_Session",
         "auth" => "CDRTool_Auth",
         "perm" => "CDRTool_Perm"
     )
 );
 
 $title = "Provisioning";
 
 if (is_readable("/etc/cdrtool/local/header.phtml")) {
-    include("/etc/cdrtool/local/header.phtml");
+    include '/etc/cdrtool/local/header.phtml';
 } else {
-    include("header.phtml");
+    include 'header.phtml';
 }
 
 $perm->check("provisioning");
 
 if ($_REQUEST['action'] == 'PerformActions' && $_REQUEST['sub_action'] == 'export') {
     $export = true;
 }
 
 if ($export) {
     Header("Content-type: application/json");
     Header("Content-Disposition: attachment; filename=ngnpro_export.json");
 } else {
     $layout = new pageLayoutLocal();
     $layout->showTopMenu($title);
 }
 
 global $CDRTool;
 
-$login_credentials=array();
-$login_credentials['username']=$auth->auth["uname"];
+$login_credentials = array();
+$login_credentials['username'] = $auth->auth["uname"];
 
 if ($CDRTool['impersonate']) {
     if (preg_match("/^([0-9]*)\.([0-9]*)$/", $CDRTool['impersonate'], $m)) {
         $_customer = $m[1];
         $_reseller = $m[2];
     } else {
         page_close();
         printf("Error: Invalid impersonate value %s", $CDRTool['impersonate']);
         exit;
     }
 
     if ($_customer == "0" && $_reseller == "0") {
         $login_credentials['login_type'] = 'admin';
         $login_credentials['reseller'] = '0';
     } else if ($_customer == $_reseller) {
         $login_credentials = array(
             'soap_username'      => $CDRTool['soap_username'],
             'soap_password'      => $CDRTool['soap_password'],
             'customer'           => $_customer,
             'reseller'           => $_reseller,
             'login_type'         => 'reseller'
         );
     } else {
         $login_credentials = array(
             'soap_username'      => $CDRTool['soap_username'],
             'soap_password'      => $CDRTool['soap_password'],
             'customer'           => $_customer,
             'reseller'           => $_reseller,
             'login_type'         => 'customer'
         );
     }
 
     $login_credentials['username'] = $auth->auth["uname"];
 } else {
     page_close();
     printf("Please define impersonate field for login account <b>%s</b>", $auth->auth["uname"]);
     exit;
 }
 
 if (file_exists("/etc/cdrtool/ngnpro_engines.inc")) {
-    require("/etc/cdrtool/ngnpro_engines.inc");
+    require '/etc/cdrtool/ngnpro_engines.inc';
 } else {
     page_close();
     printf("Error: you must copy setup/ngnpro_engines.inc.sample to /etc/cdrtool/ngnpro_engines.inc and edit it before trying again");
     exit;
 }
 
 if (array_key_exists($login_credentials['reseller'], $resellerFilters)) {
     $login_credentials['soap_filter']      = $resellerFilters[$login_credentials['reseller']]['soap_filter'];
     $login_credentials['record_generator'] = $resellerFilters[$login_credentials['reseller']]['record_generator'];
     $login_credentials['name_servers']     = $resellerFilters[$login_credentials['reseller']]['name_servers'];
 } else if ($resellerFilters['default']) {
     $login_credentials['soap_filter']      = $resellerFilters['default']['soap_filter'];
     $login_credentials['record_generator'] = isset($resellerFilters['default']['record_generator']) ? $resellerFilters['default']['record_generator'] : '';
     $login_credentials['name_servers']     = isset($resellerFilters['default']['name_servers']) ? $resellerFilters['default']['name_servers'] : '' ;
 }
 
 $login_credentials['reseller_filters'] = $resellerFilters;
 
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
 if (isset($_REQUEST['generatorId'])) {
     $generator  = new recordGenerator($_REQUEST['generatorId'], $recordGenerators, $soapEngines, $login_credentials);
     if ($action == 'Generate') {
         $generator->generateRecords();
         $generator->showGeneratorForm();
     } else {
         $generator->showGeneratorForm();
     }
 } else {
     $service = isset($_REQUEST['service']) ? $_REQUEST['service'] : '' ;
     $SoapEngine = new SoapEngine($service, $soapEngines, $login_credentials);
     $_class     = $SoapEngine->records_class;
     $RECORDS    = new $_class($SoapEngine);
 
     $RECORDS->showWelcomeMessage();
 
     if ($action =='Add') {
         $RECORDS->addRecord();
     }
     if ($action =='Copy') {
         $RECORDS->copyRecord();
     }
     if ($action =='Delete') {
         $RECORDS->deleteRecord();
     }
     if ($action =='Update') {
         $RECORDS->updateRecord();
     }
 
     if ($action == 'PerformActions') {
         $RECORDS->executeActions();
     } else {
         $RECORDS->listRecords();
     }
 }
 
 if (!$export) {
     $layout->showFooter();
 
     echo "
     </body>
     </html>
     ";
 }
 
 page_close();
 ?>
diff --git a/sip_settings.phtml b/sip_settings.phtml
index 234e1cf..6c3fa57 100644
--- a/sip_settings.phtml
+++ b/sip_settings.phtml
@@ -1,119 +1,119 @@
 <?php
 /**
  * Copyright (c) 2020 AG Projects
  * https://ag-projects.com
  *
  * This page provides functions for management of
  * SIP account settings on a remote NGNPro server
  *
  */
 
 Header('Content-Type: text/html; charset=utf-8');
 
-require("/etc/cdrtool/global.inc");
-require("/etc/cdrtool/ngnpro_engines.inc");
-require('sip_settings.php');
+require '/etc/cdrtool/global.inc';
+require '/etc/cdrtool/ngnpro_engines.inc';
+require 'sip_settings.php';
 
 if ($_REQUEST['action'] == 'get_location') {
     $location = get_location($_SERVER['REMOTE_ADDR']);
     print $location;
     exit;
 }
 
 if (strlen($_REQUEST['reseller'] || strlen($_REQUEST['customer']))) {
     page_open(
         array(
             "sess" => "CDRTool_Session",
             "auth" => "CDRTool_Auth",
             "perm" => "CDRTool_Perm"
         )
     );
 
     $account     = $_REQUEST['account'];
     $reseller    = $_REQUEST['reseller'];
     $customer    = $_REQUEST['customer'];
     $sip_engine  = $_REQUEST['sip_engine'];
     if ($reseller && !$customer) {
         $customer = $reseller;
     } else if ($customer && !$reseller) {
         $reseller =  $customer;
     }
 
     $perm->check("provisioning");
 
     global $CDRTool;
 
     if ($CDRTool['impersonate']) {
         if (preg_match("/^([1-9][0-9]*)\.([1-9][0-9]*)$/", $CDRTool['impersonate'], $m)) {
             $_customer = $m[1];
             $_reseller = $m[2];
             if ($_customer == $_reseller) {
                 $login_type = 'reseller';
             } else {
                 $login_type = 'customer';
             }
 
             $login_credentials=array(
                 'customer'           => $_customer,
                 'reseller'           => $_reseller,
                 'login_type'         => $login_type
             );
         } else if ($CDRTool['impersonate'] == '0' || $CDRTool['impersonate'] = '0.0') {
             $login_credentials = array(
                 'customer'           => $customer,
                 'reseller'           => $reseller,
                 'login_type'         => 'admin'
             );
         } else {
             page_close();
             printf("Error: Invalid impersonate value %s", $CDRTool['impersonate']);
             exit;
         }
     } else {
         page_close();
         printf("Error: Missing impersonate setting");
         exit;
     }
 } else {
     page_open(
         array(
             "sess" => "SIP_Subscriber_Session",
             "auth" => "SIP_Subscriber_Auth"
         )
     );
     $account    = $SIP['account'];
     $reseller   = $SIP['reseller'];
     $customer   = $SIP['customer'];
     $sip_engine = $SIP['engine'];
     $login_type = "subscriber";
 
     $login_credentials=array(
         'login_type' => $login_type,
         'customer'   => $customer,
         'reseller'   => $reseller,
         'sip_engine' => $sip_engine
     );
 }
 
 
 $_class = 'SipSettings';
 $_reseller_class = $_class.$reseller;
 
 if (class_exists($_reseller_class)) {
-    $SipSettings_class=$_reseller_class;
+    $SipSettings_class = $_reseller_class;
 } else {
-    $SipSettings_class=$_class;
+    $SipSettings_class = $_class;
 }
 
 if ($resellerFilters[$login_credentials['reseller']]['sip_engine']) {
     $login_credentials['sip_engine'] = $resellerFilters[$login_credentials['reseller']]['sip_engine'];
 } else if ($_REQUEST['sip_engine']) {
     $login_credentials['sip_engine'] = $_REQUEST['sip_engine'];
 } else if ($resellerFilters['default']['sip_engine']) {
     $login_credentials['sip_engine'] = $resellerFilters['default']['sip_engine'];
 }
 
 renderUI($SipSettings_class, $account, $login_credentials, $soapEngines);
 
 page_close();
 ?>
diff --git a/sip_settings_digest.phtml b/sip_settings_digest.phtml
index 82c7430..1ec0ae4 100644
--- a/sip_settings_digest.phtml
+++ b/sip_settings_digest.phtml
@@ -1,48 +1,48 @@
 <?php
 /**
  * Copyright (c) 2020 AG Projects
  * https://ag-projects.com
  *
  * This page provides functions for management of
  * SIP account settings on a remote NGNPro server
  *
  */
 
-require("/etc/cdrtool/global.inc");
-require("/etc/cdrtool/ngnpro_engines.inc");
-require('sip_settings.php');
+require '/etc/cdrtool/global.inc';
+require '/etc/cdrtool/ngnpro_engines.inc';
+require 'sip_settings.php';
 
 if ($credentials=getSipAccountFromHTTPDigest()) {
     $account    = $credentials['account'];
     $sip_engine = $credentials['engine'];
     $reseller   = $credentials['reseller'];
     $customer   = $credentials['customer'];
     $login_type = "subscriber";
 } else {
     die('HTP digest Credentials error');
 }
 
 if ($CDRTool['sip_settings_class']) {
-    $_class=$CDRTool['sip_settings_class'];
+    $_class = $CDRTool['sip_settings_class'];
 } else {
-    $_class='SipSettings';
+    $_class = 'SipSettings';
 }
-$_reseller_class=$_class.$reseller;
+$_reseller_class = $_class.$reseller;
 
 if (class_exists($_reseller_class)) {
-    $SipSettings_class=$_reseller_class;
+    $SipSettings_class = $_reseller_class;
 } else {
-    $SipSettings_class=$_class;
+    $SipSettings_class = $_class;
 }
 
 $login_credentials = array(
     'reseller'       => $reseller,
     'customer'       => $customer,
     'login_type'     => $login_type,
     'sip_engine'     => $sip_engine,
     'templates_path' => './templates'
 );
 
 renderUI($SipSettings_class, $account, $login_credentials, $soapEngines);
 
 ?>
diff --git a/sip_settings_tlscert.phtml b/sip_settings_tlscert.phtml
index 577e763..b37b464 100644
--- a/sip_settings_tlscert.phtml
+++ b/sip_settings_tlscert.phtml
@@ -1,44 +1,44 @@
 <?php
 /**
  * Copyright (c) 2020 AG Projects
  * https://ag-projects.com
  *
  * This page provides functions for management of
  * SIP account settings on a remote NGNPro server
  *
  */
 
-require("/etc/cdrtool/global.inc");
-require("/etc/cdrtool/ngnpro_engines.inc");
-require('sip_settings.php');
+require '/etc/cdrtool/global.inc';
+require '/etc/cdrtool/ngnpro_engines.inc';
+require 'sip_settings.php';
 
 if ($credentials=getSipAccountFromX509Certificate($_REQUEST['account'])) {
     $account    = $credentials['account'];
     $sip_engine = $credentials['engine'];
     $reseller   = $credentials['reseller'];
     $customer   = $credentials['customer'];
     $login_type = "subscriber";
 } else {
     die('X.509 Credentials error');
 }
 
-$_class='SipSettings';
-$_reseller_class=$_class.$reseller;
+$_class = 'SipSettings';
+$_reseller_class = $_class.$reseller;
 
 if (class_exists($_reseller_class)) {
-    $SipSettings_class=$_reseller_class;
+    $SipSettings_class = $_reseller_class;
 } else {
-    $SipSettings_class=$_class;
+    $SipSettings_class = $_class;
 }
 
 $login_credentials = array(
     'reseller'       => $reseller,
     'customer'       => $customer,
     'login_type'     => $login_type,
     'sip_engine'     => $sip_engine,
     'templates_path' => './templates'
 );
 
 renderUI($SipSettings_class, $account, $login_credentials, $soapEngines);
 
 ?>
diff --git a/sip_trace.phtml b/sip_trace.phtml
index 3590bef..66370f7 100644
--- a/sip_trace.phtml
+++ b/sip_trace.phtml
@@ -1,68 +1,68 @@
 <?php
-require("/etc/cdrtool/global.inc");
+require '/etc/cdrtool/global.inc';
 
 // if ($_REQUEST['public']) {
 //     $db = new DB_CDRTool;
 //     $key="callid-".trim($_REQUEST['callid']).trim($_REQUEST['fromtag']);
 //     $query=sprintf("select * from memcache where `key` = '%s'",addslashes($key));
 //     sleep(1);
 //     dprint($query);
 //     if ($db->query($query)) {
 //         if ($db->num_rows()) {
 //             $authorize=0;
 //         } else {
 //             $authorize=1;
 //         }
 //     } else {
 //         $authorize=1;
 //     }
 // } else {
 //     $authorize=1;
 // }
 
 // if ($authorize==1) {
 //     page_open(array(
 //           "sess" => "CDRTool_Session",
 //           "auth" => "CDRTool_Auth",
 //           "perm" => "CDRTool_Perm")
 //           );
 
 // } else {
 //     unset($auth);
 //     unset($sess);
 //     unset($perm);
 // }
 
 $proxyIP     = $_REQUEST['proxyIP'];
 $callid      = $_REQUEST['callid'];
 $fromtag     = $_REQUEST['fromtag'];
 $totag       = $_REQUEST['totag'];
 $cdr_source  = $_REQUEST['cdr_source'];
 $format      = isset($_REQUEST['format']) ? $_REQUEST['format'] : 'html';
 
 
 $title = sprintf("CDRTool SIP trace for session %s", $callid);
 
-include("header.phtml");
-require("cdr_generic.php");
+include 'header.phtml';
+require 'cdr_generic.php';
 
 if (!$authorize || in_array($cdr_source, $CDRTool['dataSourcesAllowed'])) {
     $sipTrace = new SIP_trace($cdr_source);
     if ($format == 'html') {
         $sipTrace->show($proxyIP, $callid, $fromtag, $totag);
     } elseif ($format == 'text') {
         $sipTrace->showText($proxyIP, $callid, $fromtag, $totag);
     }
 } else {
     printf("Error: Invalid datasource '%s' for user '%s'", $cdr_source, $auth->auth["uname"]);
 }
 
 print "
     </body>
 </html>
 ";
 
 if ($authorize=1) {
     page_close();
 }
 ?>