diff --git a/rating_tables.phtml b/rating_tables.phtml
index c70b3e2..a8ccf0d 100644
--- a/rating_tables.phtml
+++ b/rating_tables.phtml
@@ -1,54 +1,54 @@
 <?php
 require("/etc/cdrtool/global.inc");
 require('cdr_generic.php');
 
 page_open(
     array(
         "sess" => "CDRTool_Session",
         "auth" => "CDRTool_Auth",
         "perm" => "CDRTool_Perm"
     )
 );
 
 $perm->check("rates");
 include("rating.php");
 
 if ($perm->have_perm("readonly")) {
     $RatingTables = new RatingTables('readonly');
 } else {
     $RatingTables = new RatingTables();
 }
 
 if (!$_REQUEST['export']) {
     $title="Rating tables";
     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';
     }
     $layout = new pageLayoutLocal();
     $layout->showTopMenu($title);
 } else {
     print $RatingTables->table_to_csv_name[$_REQUEST['table']];
     Header("Content-type: text/csv");
     $h = sprintf("Content-Disposition: inline; filename=%s", $RatingTables->csv_export[$_REQUEST['table']]);
     Header($h);
 }
 
 if ($_REQUEST['import'] && $_REQUEST['table']) {
     $RatingTables->importTable($_REQUEST['table']);
 }
 
 $RatingTables->updateTable();
 $RatingTables->showTable();
 
 if (!$_REQUEST['export']) {
     $layout->showFooter();
     print "
     </body>
     </html>
     ";
 }
 
 page_close();
 ?>
diff --git a/sip_enrollment.phtml b/sip_enrollment.phtml
index 5e68b17..539ac11 100644
--- a/sip_enrollment.phtml
+++ b/sip_enrollment.phtml
@@ -1,20 +1,20 @@
 <?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('sip_settings.php');
+require '/etc/cdrtool/global.inc';
+require 'sip_settings.php';
 
 Header("Content-type: text/plain");
 
 $NewAccount = new Enrollment();
 $NewAccount->createAccount();
 
 ?>
diff --git a/sip_login.phtml b/sip_login.phtml
index aec7b15..ab0f25f 100644
--- a/sip_login.phtml
+++ b/sip_login.phtml
@@ -1,155 +1,155 @@
 <?php
 $title="Login";
-include("header.phtml");
+include 'header.phtml';
 ?>
 
 <script language="javascript" src="md5.js"></script>
 <script language="javascript">
 
   function doChallengeResponse() {
     str = document.login.username.value + ":" +
           MD5(document.login.password.value) + ":" +
           document.login.challenge.value;
 
     document.login.response.value = MD5(str);
     items = document.login.username.value.split("@");
     if (items.length == 2) {
        username = items[0];
        domain = items[1];
     } else {
        username = domain = "";
     }
     str = username + ":" + domain + ":" + document.login.password.value;
     document.login.response_ha1.value = MD5(str);
     document.login.password.value = "";
     document.login.submit();
   }
 
 </script>
 <?php
 print "<div class=row-fluid><div id=wrapper2><div class=\"page-header\"><h2>";
 print _("Login");
 print "</h2></div>";
 ?>
 
 <!-- failed login code -->
 <?php
 if ($username) {
     print "<div class='alert alert-error'>";
     print _("Either your SIP account or password are invalid");
 
     print "
     </div>
     <p>$login_msg</p>";
 
 }
 ?>
 
     <form class='form-horizontal' action="<?php print $this->url() ?>" method=post name=login>
 
 <?php
 print "<div class=control-group>
         <label class='control-label'>";
 print _("SIP address");
 print "</label>";
 ?>
 
 
         <div class=controls>
             <input type="text" name="username"
         value="
 <?php
 if (isset($this->auth["uname"])) {
     print $this->auth["uname"];
 } else if (isset($_REQUEST['username'])) {
     print $_REQUEST['username'];
 }
 ?>" placeholder="Example: 
 <?php
 if ($example_domain) {
     print "account@$example_domain";
 } else {
     print "account@example.com";
 }
 ?>" size=35 maxlength=50 class='span11'></div></div>
 
 <?php
 print "
                 <div class=control-group>
                     <label class='control-label'>";
 print _("Password");
 print "
                     </label>
 ";
 ?>
 
                 <div class='controls'>
                     <input type="password" name="password" size=35 maxlength=50 class='span11'></td>
                     <input type="hidden" name="step" value=<?php print $step?>>
 
 <?php
 
 $use_yubikey=0;
 if (stream_resolve_include_path('Auth/Yubico.php')) {
     require_once 'Auth/Yubico.php';
     $use_yubikey=1;
 }
 
 if ($use_yubikey == 1 ) {
     print "</div></div>
     <div class=control-group>
     <label class=control-label>";
     print _("Yubikey");
     print "</label><div class=controls>";
     print '
         <input rel="popover" placeholder="This field is optional" data-trigger="hover" data-delay="1000" data-original-title="OTP hardware authentication" data-content="With this field you can login using a hardware OTP device called \'yubikey\'.<br/><br>
     		You can set your yubikey-id in the SIP settings page after you login with your SIP account and pasword.<br>
                 <br/>
                 For info and purchase of this key see <a href=\'http://www.yubico.com\' target=\'_blank\'>http://www.yubico.com</a>" type="text" name="yubikey" size="35">
         <p class="help-block"><a href=sip_login_reminder.phtml>';
         print _("SIP address or password forgotten?");
     print "
     </a></p>
     </div>
     </div>";
 } else {
     print '<p class="help-block"><a href=sip_login_reminder.phtml>';
         print _("SIP address or password forgotten?");
     print "
     </a></p>
     </div>
     </div>";
 }
 
 $sess->hidden_session(); ?>
             <p class="help-block">
                 <a href=sip_login_reminder.phtml>
                     SIP address or password forgotten?
                 </a>
             </p>
             <div class='form-actions'>
                 <input class='btn btn-primary' onClick="doChallengeResponse(); return false;" type="submit" name="submitbtn" value="Login now">
             </div>
 
 <?php
 ?>
 
 <!-- Set up the form with the challenge value and an empty reply value -->
                 <input type="hidden" name="challenge" value="<?php print $challenge ?>">
                 <input type="hidden" name="response"  value="">
                 <input type="hidden" name="response_ha1"  value="">
             </form>
         </div>
     </div>
 </body>
 <script language="JavaScript">
   // Activate the appropriate input form field.
   if (document.login.username.value == '') {
     document.login.username.focus();
   } else {
     document.login.password.focus();
   }
 
 </script>
 
 </html>
diff --git a/sip_usage.phtml b/sip_usage.phtml
index 86309dc..0edf825 100644
--- a/sip_usage.phtml
+++ b/sip_usage.phtml
@@ -1,277 +1,278 @@
 <?php
-require("/etc/cdrtool/global.inc");
+require '/etc/cdrtool/global.inc';
 
 page_open(
      array("sess" => "CDRTool_Session",
            "auth" => "CDRTool_Auth",
            "perm" => "CDRTool_Perm"
-           ));
+     )
+);
 
-$loginname=$auth->auth["uname"];
+$loginname = $auth->auth["uname"];
 
 $perm->check("statistics");
 
 $start_date = isset($_REQUEST['start_date']) ? new DateTime($_REQUEST['start_date']) : new DateTime('-1 days');
 $stop_date  = isset($_REQUEST['stop_date']) ? new DateTime($_REQUEST['stop_date']) : new DateTime('now');
 
 if ($start_date == $stop_date){
     $start_date = $start_date->setTime(00, 00, 00);
     $stop_date  = $stop_date->setTime(00, 00, 00);
     $stop_date->add(new DateInterval('P1D'));
 }
 
 global $CDRTool;
 
-require("sip_statistics.php");
+require 'sip_statistics.php';
 
 // trap AJAX requests
 
 if (isset($_POST['action'])) {
     switch ($_POST['action']) {
         case 'log':
             $layout = new pageLayoutLocal();
             try {
                 $entity = new MRTGEntity($_POST['entity']);
                 $json = $entity->retrieveLog();
             } catch (Exception $e) {
                 $json = json_encode(array('error' => "entity not found"));
             }
-        break;
+            break;
     }
 
     // return data and terminate
     print $json;
     exit;
 }
 
 
 // setup
 $mrtggraphs = new MRTGGraphs();
 
 ?>
 
 
 <style type="text/css">
 
     DIV.entity H4 {
         font-weight: bolder;
         margin-left: 10px;
         font-size: 12px;
     }
 
     .graph {
         height: 125px;
         margin: 8px auto;
     }
 
     .graphs {
         margin-left: auto;
         margin-right: auto;
     }
 
     .flotr-mouse-value {
         background-color:rgb(249, 249, 249) !important;
         color: #333333 !important;
         opacity: 0.9 !important;
         border: solid 1px #000000 !important;
         z-index: 200;
     }
 
     .grid {
         padding: 10px 0;
     }
 
     hr + .grid {
         margin-top: -14px;
         padding-bottom: 10px;
     }
     .grid:nth-child(odd) {
         background-color:#f9f9f9;
     }
     .flotr-axis-title-y1 {
         -ms-transform: rotate(-90deg); /* IE 9 */
         -webkit-transform: rotate(-90deg); /* Chrome, Safari, Opera */
         transform: rotate(-90deg);
     }
     .entity h4 {
         padding-bottom: 6px;
     }
     .graphs table {
         margin: 0 auto; /* or margin: 0 auto 0 auto */
     }
 </style>
 
 <?php print "<script type=\"text/javascript\">var start_date_set=\"".$start_date->format('Y-m-d H:i:s')."\";var stop_date_set=\"".$stop_date->format('Y-m-d H:i:s')."\";</script>";?>
 <script type="text/javascript">
 
     $(document).ready(function() {
         $('#reportrange').detach().appendTo('.page-header h1');
         // initial update
         updateGraphs();
     });
 
     function addGraph(entity, obj) {
         $.ajax({
 
             dataType: 'json',
             type: 'POST',
             data: { action: 'log', entity: entity },
 
             success: function(log) {
 
                 better_data = [];
                 better_data1 = [];
 
                 var suffix = '';
                 var extra_options = {};
                 for (var j = 0; j < log.inData.length; j++) {
                     var t = log.inData[j][0].split(/[- :]/);
                     log.inData[j][0] = Date.UTC(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
                     better_data1[j]=[log.inData[j][0],log.inData[j][1]];
                 }
 
 
                 var flotr_data = []
                 var ticks1 = function(y){
                     return y;
                 };
                 var title;
                 var trackY = false;
                 var suffix = ''
 
                 flotr_data = [
                     {idx: 0,data: better_data1},
                 ]
 
                 if (entity.indexOf("traffic") != -1) {
                     title = 'bits/s';
                     suffix = 'bits/s';
                     ticks1 = function(y){
                         return bytes(y, true);
                     };
 
                     better_data2 = [];
                     for (var j = 0; j < log.outData.length; j++) {
                         var t = log.outData[j][0].split(/[- :]/);
                         log.outData[j][0] = Date.UTC(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
                         better_data2[j]=[log.outData[j][0],log.outData[j][1]];
                     }
                     flotr_data[0]['label'] = 'Caller';
                     flotr_data[0]['suffix'] = suffix;
 
                     flotr_data[1] = {idx: 1,label:'Called',data: better_data2,suffix: suffix, ticks: function(y){
                         return bytes(y, true);
                     }}
 
                     trackY = true;
                 }
                 else if (entity.indexOf("users") != -1) {
                     title = "Users";
                     suffix = ' users';
 
                     flotr_data[0]['label'] = 'Users';
                     flotr_data[0]['suffix'] = suffix;
                     flotr_data[0]['lines'] = { fill : true };
                 }
                 else if (entity.indexOf("sessions") != -1) {
                     title = 'sessions';
                     suffix = ' sessions';
 
                     flotr_data[0]['label'] = 'Sessions';
                     flotr_data[0]['suffix'] = suffix;
                     flotr_data[0]['lines'] = { fill : true }
                 }
 
                 extra_options = {
                     ytitle: title,
                     title: '',
                     suffix: suffix,
                     ticks1: ticks1,
                     trackY: trackY
                 };
                 basicTimeGraph(document.getElementById(entity.replace(/\/|[0-9]|\./g,'')), document.getElementById('LegendA'+entity.replace(/\/|[0-9]|\./g,'')),flotr_data,extra_options);
             },
             error: function() {
                 $('#error').html('<div class="alert alert-error">Unable to load '+$(this).attr('entity')+'.log from the server.</div>');
             }
         });
     }
 
 
     /**
     * Refresh all entities.
     *
     * @param specificGraph		- pass one graph just to process that one
     *
     * @return void
     */
     function updateGraphs(specificGraph) {
 
         // if no specific graph passed then update all
         if (specificGraph) {
             var graphs = specificGraph;
         } else {
             var graphs = $("DIV.graph");
         }
 
         // update graphs
         graphs.each(function() {
             var graph = $(this);
             entity = $(this).attr('entity');
             addGraph(entity, $(this));
         });
     }
 </script>
 
     <div id='error'></div>
     <div id="reportrange" class="btn pull-right">
         <i class="icon-calendar"></i>
         <span><?php echo $start_date->format('F j, Y H:i:s')." - ".$stop_date->format('F j, Y H:i:s')?></span>
         <b class=\"caret\"></b>
     </div>
     <div style='clear:both'></div>
     <br />
     <div class='row-fluid'>
 
     <?php rsort($mrtggraphs->entities) ; foreach ($mrtggraphs->entities as $entity) :
         if (strstr($entity->name,'total')) { ?>
         <div class="entity span4">
             <h4><?php print $entity->title; ?><small> (<a href="<?php print $entity->link; ?>">MRTG</a>)</small></h4>
             <div class="graphs">
                 <div class='graph gg'  entity='<?php print $entity->name; ?>' id='<?php print preg_replace("/\/|[0-9]|\./","",$entity->name); ?>'></div>
                 <div id='LegendA<?php print preg_replace("/\/|[0-9]|\./","",$entity->name); ?>'></div>
             </div>
 
         </div>
 
     <?php } endforeach; ?>
 
     </div><hr />
 
     <div class='row-fluid grid'>
 
     <?php $counter = 0; rsort($mrtggraphs->entities) ; foreach ($mrtggraphs->entities as $entity) :
         if (!strstr($entity->name,'total')) {
 
             if ($counter == 3){
                 $counter = 0;
                 print "</div><div class='row-fluid grid'>";
             }
             $counter++; ?>
         <div class="entity span4">
             <div id="chart"></div>
                 <h4><?php print $entity->title; ?><small> (<a href="<?php print $entity->link; ?>">MRTG</a>)</small></h4>
                 <div class="graphs">
                     <div class='graph'  entity='<?php print $entity->name; ?>' id='<?php print preg_replace("/\/|[0-9]|\./","",$entity->name); ?>'></div>
                     <div id='LegendA<?php print preg_replace("/\/|[0-9]|\./","",$entity->name); ?>'></div>
                 </div>
 
             </div>
 
     <?php } endforeach; ?>
 
     </div>
 <?php $mrtggraphs->layout->showFooter(); ?>
 </body>
 </html>
 <?php page_close(); ?>