diff --git a/accounts.phtml b/accounts.phtml
index 73a0a58..04c56c2 100644
--- a/accounts.phtml
+++ b/accounts.phtml
@@ -1,473 +1,473 @@
 <?php
-require("/etc/cdrtool/global.inc");
+require '/etc/cdrtool/global.inc';
 
 page_open(
     array(
         "sess" => "CDRTool_Session",
         "auth" => "CDRTool_Auth",
         "perm" => "CDRTool_Perm"
     )
 );
 
 $title = "Login accounts";
-require("login_accounts.php");
+require 'login_accounts.php';
 
 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';
 }
 
 function log_accounts_action($action)
 {
     global $auth;
     $location = "Unknown";
     $_loc = geoip_record_by_name($_SERVER['REMOTE_ADDR']);
     if ($_loc['country_name']) {
         $location = $_loc['country_name'];
     }
     $log = sprintf(
         "CDRTool login username=%s, IP=%s, location=%s, action=%s, script=%s",
         $auth->auth["uname"],
         $_SERVER['REMOTE_ADDR'],
         $location,
         $action,
         $_SERVER['PHP_SELF']
     );
     syslog(LOG_NOTICE, $log);
 }
 
 $loginname = $auth->auth["uname"];
 
 $action          = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 $next            = isset($_REQUEST['next']) ? $_REQUEST['next'] : '';
 $search_text     = isset($_REQUEST['search_text']) ? $_REQUEST['search_text'] : '';
 
 $username        = isset($_REQUEST['username']) ? $_REQUEST['username'] : '';
 $password        = isset($_REQUEST['password']) ? $_REQUEST['password'] : '';
 $name            = isset($_REQUEST['name']) ? $_REQUEST['name'] : '';
 $organization    = isset($_REQUEST['organization']) ? $_REQUEST['organization'] : '';
 $tel             = isset($_REQUEST['tel']) ? $_REQUEST['tel'] : '';
 $email           = isset($_REQUEST['email']) ? $_REQUEST['email'] : '';
 $expire          = isset($_REQUEST['expire']) ? $_REQUEST['expire'] : '';
 
 $gatewayFilter   = isset($_REQUEST['gatewayFilter']) ? $_REQUEST['gatewayFilter'] : '';
 $domainFilter    = isset($_REQUEST['domainFilter']) ? $_REQUEST['domainFilter'] : '';
 $serviceFilter   = isset($_REQUEST['serviceFilter']) ? $_REQUEST['serviceFilter'] : '';
 $compidFilter    = isset($_REQUEST['compidFilter']) ? $_REQUEST['compidFilter'] : '';
 $aNumberFilter   = isset($_REQUEST['aNumberFilter']) ? $_REQUEST['aNumberFilter'] : '';
 $cscodeFilter    = isset($_REQUEST['cscodeFilter']) ? $_REQUEST['cscodeFilter'] : '';
 $afterDateFilter = isset($_REQUEST['afterDateFilter']) ? $_REQUEST['afterDateFilter'] : '';
 $aclFilter       = isset($_REQUEST['aclFilter']) ? $_REQUEST['aclFilter'] : '';
 $impersonate     = isset($_REQUEST['impersonate']) ? $_REQUEST['impersonate'] : '';
 
 $perms           = isset($_REQUEST['perms']) ? $_REQUEST['perms'] : '';
 $sources         = isset($_REQUEST['sources']) ? $_REQUEST['sources'] : '';
 $delete          = isset($_REQUEST['delete']) ? $_REQUEST['delete'] : '';
 
 $id              = isset($_REQUEST['id']) ? $_REQUEST['id'] : '';
 $uid             = isset($_REQUEST['uid']) ? $_REQUEST['uid'] : '';
 $check           = isset($_REQUEST['check']) ? $_REQUEST['check'] : '';
 $mailsettings    = isset($_REQUEST['mailsettings']) ? $_REQUEST['mailsettings'] : '';
 
 $otp_yubikey     = isset($_REQUEST["yubikey"]) ? $_REQUEST["yubikey"] : '';
 $auth_method     = isset($_REQUEST["auth_method"]) ? $_REQUEST["auth_method"] : '';
 
 $PHP_SELF        = htmlentities($_SERVER['PHP_SELF']);
 
 $db              = new DB_CDRTool;
 
 $layout = new pageLayoutLocal();
 $layout->showTopMenu($title);
 
 if ($action == "edit" && $id) {
     print "
         <ul class=\"breadcrumb\">
             <li><a href=accounts.phtml>Accounts</a> <span class=\"divider\">/</span> </li>
             <li class='active'>Edit account</li>
         </ul>
     ";
 
     $uid = $auth->auth["uid"];
     if (!$perm->have_perm("admin")) {
         $id = $uid;
     }
     if ($check || $delete) {
         if ($err = $f->validate()) {
             print "<div class=\"alert alert-error\">
             $err
             </div>";
             $perms = implode($perms, ",");
             $sources = implode($sources, ",");
 
             showForm($id);
         } else {
             $perms_text      = implode($perms, ",");
             $sources_text    = implode($sources, ",");
 
             if ($delete && $perm->have_perm("admin")) {
                 $query = "delete from auth_user";
             } else {
                 //print "<p>Updating user";
                 $query = sprintf(
                     "update auth_user set
                     username         = '%s',
                     name             = '%s',
                     organization     = '%s',
                     tel              = '%s',
                     email            = '%s',
                     yubikey          = '%s',
                     auth_method      = '%s'
                     ",
                     addslashes($username),
                     addslashes($name),
                     addslashes($organization),
                     addslashes($tel),
                     addslashes($email),
                     addslashes($otp_yubikey),
                     addslashes($auth_method)
                 );
                 if (strlen($password)) {
                     if ($CDRTool['provider']['clear_text_passwords'] != 1) {
                         $query .= sprintf(
                             ",
                             password = '',
                             password_hashed  = '%s'",
                             addslashes(md5($password))
                         );
                     } else {
                         $query .= sprintf(
                             ",
                             password = '%s',
                             password_hashed = ''",
                             addslashes($password)
                         );
                     }
                 }
 
                 if ($perm->have_perm("admin")) {
                     if (strlen($impersonate)) {
                         if (!preg_match("/^[0-9]*\.[0-9]*$/", $impersonate)) {
                             printf("<div class=\"alert\"><strong>Warning!</strong> Impersonate must be formated as CustomerId.ResellerId</div>");
                             unset($impersonate);
                         }
                     }
 
                     $query.= sprintf(
                         ",
                         perms           = '%s',
                         sources         = '%s',
                         expire          = '%s',
                         gatewayFilter   = '%s',
                         domainFilter    = '%s',
                         serviceFilter   = '%s',
                         compidFilter    = '%s',
                         aNumberFilter   = '%s',
                         cscodeFilter    = '%s',
                         afterDateFilter = '%s',
                         aclFilter       = '%s',
                         impersonate     = '%s'
                         ",
                         addslashes($perms_text),
                         addslashes($sources_text),
                         addslashes($expire),
                         addslashes($gatewayFilter),
                         addslashes($domainFilter),
                         addslashes($serviceFilter),
                         addslashes($compidFilter),
                         addslashes($aNumberFilter),
                         addslashes($cscodeFilter),
                         addslashes($afterDateFilter),
                         addslashes($aclFilter),
                         addslashes($impersonate)
                     );
                 }
             }
 
             $query .= sprintf(" where user_id = '%s'", addslashes($id));
 
 //            print $query;
             if (!$db->query($query)) {
                 print "<p>Failed to update user $id";
                 print "The error is $db->Error";
             } else {
                 if ($delete) {
                     log_accounts_action(sprintf("account %s deleted", $username));
                     print "<p>User <b>$name</b> deleted";
                 } else {
                     log_accounts_action(sprintf("account %s updated", $username));
                     print "<p>User <b>$name</b> updated";
                     if ($mailsettings) {
                         if ($_SERVER['HTTPS']=="on") {
                             $protocolURL="https://";
                         } else {
                             $protocolURL="http://";
                         }
 
                         $body .= sprintf("The following login account for CDRTool has been created for you:\n\n");
                         $body .= sprintf("Username: %s\n", $username);
                         $body .= sprintf("Password: %s\n", $password);
                         $body .= sprintf("URL: %s%s%s\n\n", $protocolURL, $_SERVER['HTTP_HOST'], $CDRTool['tld']);
                         $body .= sprintf("You may use your CDRTool account to access call detail records and \n");
                         $body .= sprintf("traces from OpenSIPs, MediaProxy and Asterisk servers.\n");
 
                         $from = sprintf("From: %s", $CDRTool['provider']['fromEmail']);
                         mail($email, "CDRTool login account", $body, $from);
                     }
                 }
 
                 accountList();
             }
         }
     } else {
         $query = "select * from auth_user";
         if (!$perm->have_perm("admin")) {
             $query .= sprintf(" where user_id = '%s'", addslashes($uid));
             $id=$uid;
         } else {
             $query .= sprintf(" where user_id = '%s'", addslashes($id));
         }
 
         dprint($query);
         $db->query($query);
         $db->next_record();
 
         $username         = $db->f('username');
         $name             = $db->f('name');
         $email            = $db->f('email');
         $tel              = $db->f('tel');
         $password         = $db->f('password');
         $organization     = $db->f('organization');
         $perms            = $db->f('perms');
         $sources          = $db->f('sources');
         $expire           = $db->f('expire');
         $aNumberFilter    = $db->f('aNumberFilter');
         $gatewayFilter    = $db->f('gatewayFilter');
         $domainFilter     = $db->f('domainFilter');
         $serviceFilter    = $db->f('serviceFilter');
         $compidFilter     = $db->f('compidFilter');
         $cscodeFilter     = $db->f('cscodeFilter');
         $afterDateFilter  = $db->f('afterDateFilter');
         $aclFilter        = $db->f('aclFilter');
         $impersonate      = $db->f('impersonate');
         $yubikey          = $db->f('yubikey');
         $auth_method      = $db->f('auth_method');
 
         showForm($id);
     }
 } elseif ($action=="insert" && $perm->have_perm("admin")) {
     print "<ul class=\"breadcrumb\">
         <li><a href=accounts.phtml>Accounts</a> <span class=\"divider\">/</span> </li>
         <li class='active'>Add account</li>
         </ul>";
 
     $uid = $auth->auth["uid"];
 
     if (!$password) $password = random_passwd_gen();
 
     if ($check) {
         if ($perms) $perms   = implode($perms,",");
         if ($sources) $sources = implode($sources,",");
 
         if (strlen($impersonate)) {
             if (!preg_match("/^[0-9]*\.[0-9]*$/", $impersonate)) {
                 printf("<p><font color=blue>Warning: Impersonate must be formated as CustomerId.ResellerId</font>");
                 unset($impersonate);
             }
         }
 
         if ($err = $f->validate()) {
             print "<p><font color=red>$err</font>
             <p>";
             showForm();
         } else {
             //print "<p>Adding user";
             $hash_secret = "ffdsdsd__ky...";
             $user_id = md5(uniqid($hash_secret));
             if ($CDRTool['provider']['clear_text_passwords']!=1) {
                 $query = sprintf(
                     "insert into auth_user
                     (
                         user_id,
                         username,
                         password,
                         password_hashed,
                         name,
                         organization,
                         tel,
                         email,
                         perms,
                         sources,
                         expire,
                         domainFilter,
                         aNumberFilter,
                         serviceFilter,
                         compidFilter,
                         cscodeFilter,
                         gatewayFilter,
                         afterDateFilter,
                         aclFilter,
                         impersonate,
                         yubikey,
                         auth_method
                     ) values (
                         '%s',
                         '%s',
                         '',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s'
                     )",
                     addslashes($user_id),
                     addslashes($username),
                     addslashes(md5($password)),
                     addslashes($name),
                     addslashes($organization),
                     addslashes($tel),
                     addslashes($email),
                     addslashes($perms),
                     addslashes($sources),
                     addslashes($expire),
                     addslashes($domainFilter),
                     addslashes($aNumberFilter),
                     addslashes($serviceFilter),
                     addslashes($compidFilter),
                     addslashes($cscodeFilter),
                     addslashes($gatewayFilter),
                     addslashes($afterDateFilter),
                     addslashes($aclFilter),
                     addslashes($impersonate),
                     addslashes($yubikey),
                     addslashes($auth_method)
                 );
             } else {
                 $query = sprintf(
                     "insert into auth_user
                     (
                         user_id,
                         username,
                         password,
                         name,
                         organization,
                         tel,
                         email,
                         perms,
                         sources,
                         expire,
                         domainFilter,
                         aNumberFilter,
                         serviceFilter,
                         compidFilter,
                         cscodeFilter,
                         gatewayFilter,
                         afterDateFilter,
                         aclFilter,
                         impersonate,
                         yubikey,
                         auth_method
                     ) values (
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s',
                         '%s'
                     )",
                     addslashes($user_id),
                     addslashes($username),
                     addslashes($password),
                     addslashes($name),
                     addslashes($organization),
                     addslashes($tel),
                     addslashes($email),
                     addslashes($perms),
                     addslashes($sources),
                     addslashes($expire),
                     addslashes($domainFilter),
                     addslashes($aNumberFilter),
                     addslashes($serviceFilter),
                     addslashes($compidFilter),
                     addslashes($cscodeFilter),
                     addslashes($gatewayFilter),
                     addslashes($afterDateFilter),
                     addslashes($aclFilter),
                     addslashes($impersonate),
                     addslashes($yubikey),
                     addslashes($auth_method)
                 );
             }
             dprint($query);
 
             if (!$db->query($query)) {
                 printf("<p>Failed to add user: %s(%s) %s", $db->Error, $db->Errno, $query);
             } else {
                 log_accounts_action(sprintf("account %s added", $username));
                 print "<p>User <b>$name</b> created";
                 if ($mailsettings) {
                     if ($_SERVER['HTTPS']=="on") {
                         $protocolURL="https://";
                     } else {
                         $protocolURL="http://";
                     }
 
                     $body .= sprintf("The following login account for CDRTool has been created for you:\n\n");
                     $body .= sprintf("Username: %s\n", $username);
                     $body .= sprintf("Password: %s\n", $password);
                     $body .= sprintf("URL: %s%s%s\n\n", $protocolURL, $_SERVER['HTTP_HOST'], $CDRTool['tld']);
                     $body .= sprintf("You may use your CDRTool account to access call detail records and \n");
                     $body .= sprintf("traces from OpenSIPs, MediaProxy and Asterisk servers.\n");
 
                     $from = sprintf("From: %s", $CDRTool['provider']['fromEmail']);
                     mail($email, "CDRTool login account", $body, $from);
                 }
             }
         }
     } else {
         showForm();
     }
     print "</td></tr></table></center>";
 } else {
     print "<h3>Account list</h3>";
     if ($perm->have_perm("admin")) {
         print "<center><a class=btn href=$PHP_SELF?action=insert>Add account</a></center>";
     }
     accountList();
 }
 
 $layout->showFooter();
 page_close();
 ?>
 </body>
 </html>
 
diff --git a/callsearch.phtml b/callsearch.phtml
index 0c097b6..b6677c5 100644
--- a/callsearch.phtml
+++ b/callsearch.phtml
@@ -1,103 +1,103 @@
 <?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"];
 $perm->check('callsearch');
 
 $export     = isset($_REQUEST['export']) ? $_REQUEST['export'] : '';
 $cdr_source = isset($_REQUEST["cdr_source"]) ? $_REQUEST['cdr_source'] : '';
 $trace      = isset($_REQUEST["trace"])? $_REQUEST['trace'] : '';
 $action     = isset($_REQUEST["action"])? $_REQUEST['action'] : '';
 $previous_page = isset($_REQUEST['previous_page']) ? $_REQUEST['previous_page'] : '';
-require("cdr_generic.php");
-require("rating.php");
+require 'cdr_generic.php';
+require 'rating.php';
 
 set_time_limit(1800);
 
 if (!$export) {
     $title="CDRTool call search ";
     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';
     }
 
     if ($previous_page == 'license_page') {
         $db = new DB_CDRTool();
 
         $query = sprintf(
             "insert into settings (billing_party, var_module,var_name,var_value) values ('%s','login','I_agree_with_license','True')",
             $auth->auth["uname"]
         );
 
         $db->query($query);
     }
 } else {
     Header("Content-type: text/plain");
     Header("Content-Disposition: inline; filename=cdr.txt");
 }
 
 if (isset($CDRTool['dataSourcesAllowed'])) {
     while (list($k,$v)=each($CDRTool['dataSourcesAllowed'])) {
         $cdr_source_els[]=array("label"=>$DATASOURCES[$v]['name'],"value"=>$v);
     }
     if (!$cdr_source) {
         $cdr_source = $cdr_source_els[0]['value'];
     }
 }
 
 $CDR_class=$DATASOURCES[$cdr_source]["class"];
 
 if (!$export && !$trace) {
     $layout = new pageLayoutLocal();
     if ($CDRTool['filter']['aNumber']) {
         $layout->showHeader();
         $layout->showTopMenuSubscriber();
     } else {
         $layout->showTopMenu();
     }
 }
 
 if (is_array($DATASOURCES[$cdr_source])) {
     if (class_exists($CDR_class)) {
         $CDRS = new $CDR_class($cdr_source);
 
         if ($action=='edit' || !$action) {
             if ($CDRTool['filter']['aNumber']) {
                 $CDRS->searchFormSubscriber();
             } else {
                 $CDRS->searchForm();
             }
         } elseif ($action==search) {
             $CDRS->show();
         }
 
         if (!$export && !$trace) {
             $layout->showFooter();
         }
     } else {
         $log = sprintf("Error initializing datasource '%s', class '%s' is not defined", $cdr_source, $CDR_class);
         print "<p class='alert alert-danger'>$log</p>";
     }
 } else {
     $log = sprintf("Error: datasource '%s' is not defined", $cdr_source);
     print "<p class='alert alert-danger'>$log</p>";
 }
 
 if (!$export && !$trace) {
     print "
     </body>
     </html>
     ";
 }
 
 page_close();
 ?>
diff --git a/index.phtml b/index.phtml
index e94ea08..d28ee95 100644
--- a/index.phtml
+++ b/index.phtml
@@ -1,87 +1,87 @@
 <?php
 $errorReporting = (E_ALL & ~E_NOTICE);
 $errorReporting = 1;    // comment this out to enable PHP warnings
 error_reporting($errorReporting);
 
-include("/etc/cdrtool/global.inc");
+include '/etc/cdrtool/global.inc';
 
 if ($DATASOURCES) {
     page_open(array(
              "sess" => "CDRTool_Session",
              "auth" => "CDRTool_Auth",
              "perm" => "CDRTool_Perm")
              );
     $loginname=$auth->auth["uname"];
 
     $title="Legal notice";
 
     $db = new DB_CDRTool();
     $query=sprintf("select * from settings
     where billing_party = '%s'
     and var_module= 'login'
     and var_name = 'I_agree_with_license'",addslashes($loginname));
     if ($db->query($query)) {
     	if ($db->num_rows()) {
         	$refreshURL='callsearch.phtml';
         	$refreshTime=0;
         }
     }
 
-	if (is_readable("/etc/cdrtool/local/header.phtml")) {
-		include_once("/etc/cdrtool/local/header.phtml");
-	} else {
-		include_once("header.phtml");
-	}
+    if (is_readable("/etc/cdrtool/local/header.phtml")) {
+        include_once '/etc/cdrtool/local/header.phtml';
+    } else {
+        include_once 'header.phtml';
+    }
 
     $layout = new pageLayoutLocal();
     $layout->showHeader();
     $layout->showLegalNotice();
     $layout->showFooter();
     page_close();
 
 } else {
     $Setup = new SETUP ();
     $Setup->showIntro();
 }
 
 class SETUP {
     function showIntro() {
         print "
         <html>
         <head>
         <title>CDRTool setup</title>
         </head>
         <body>
         <h2>CDRTool setup</h2>
         CDRTool has not been setup on this machine yet.
         <p>
 
 	You must first setup php, apache and to create the cdrtool database.
 	Detailed installation instructions are available in <a href=doc/INSTALL.txt>doc/INSTALL.txt</a>
 
         <p>
         Once the database is available, create the cdrtool configuration
         file by copying the sample configuration file:
         <p>
         cp setup/global.inc.simple.sample /etc/cdrtool/global.inc
         <p>
         Then edit the configuration file global.inc to reflect your platform setup.
         This is the content of the current sample configuration file:
         ";
 
         print "<pre>";
         $fp=fopen("setup/global.inc.simple.sample",r);
         while ($buffer = fgets($fp,1024)) {
             if (!preg_match("/(<\?)|(\?>)/",$buffer)) {
                 print "$buffer";
             }
         }
         print "</pre>";
     }
 }
 
 print "
 </body>
 </html>
 ";
 ?>
diff --git a/log.phtml b/log.phtml
index 794531e..2eb268e 100644
--- a/log.phtml
+++ b/log.phtml
@@ -1,357 +1,357 @@
 <?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"];
 
 $title           = "Logs";
 $search_text     = isset($_REQUEST['search_text']) ? $_REQUEST['search_text'] : '';
 $task            = isset($_REQUEST['task']) ? $_REQUEST['task'] : '';
 $current_log     = isset($_REQUEST['current_log']) ? $_REQUEST['current_log'] : '';
 $log_description = isset($_REQUEST['log_description']) ? $_REQUEST['log_description'] : '';
 $next            = isset($_REQUEST['next']) ? intval($_REQUEST['next']) : 0;
 $maxrowsperpage  = 20;
 $PHP_SELF        = htmlentities($_SERVER['PHP_SELF']);
 $thisMonth       = isset($_REQUEST['thisMonth']) ? $_REQUEST['thisMonth'] : '';
 $recipient       = isset($_REQUEST['recipient']) ? $_REQUEST['recipient'] : '';
 
 $db              = new DB_CDRTool;
 
 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';
 }
 
 if ($search_text) {
     $search_text = preg_replace("/[^\d|\w| -\.@_]/s", "", $search_text);
 }
 
 $layout = new pageLayoutLocal();
 $layout->showTopMenu($title);
 
 if ($thisMonth) {
     $checked_thisMonth = 'checked';
 } else {
     $checked_thisMonth = '';
 }
 
 $where = " (1=1) ";
 
 if ($CDRTool['filter']['reseller']) {
     $where .= sprintf(' and reseller_id = %s', addslashes($CDRTool['filter']['reseller']));
 } else if (!$perm->have_perm("admin")) {
     $where .= sprintf(" and login = '%s'", addslashes($auth->auth["uname"]));
 }
 
 if ($perm->have_perm('admin')) {
     $query = "select * from auth_user where perms like '%admin%'";
     $db->query($query);
     while ($db->next_record()) {
         $Collegues[$db->f('email')] = $db->f('name');
         if ($loginname == $db->f('username')) {
             $myEmailAddress = $db->f('email');
             $myName = $db->f('name');
         }
     }
 } else {
     $Collegues[$CDRTool['provider']['toEmail']] = $CDRTool['provider']['name'];
     $myName = $CDRTool["loginName"];
     $myEmailAddress = $CDRTool["loginEmail"];
 }
 
 if ($current_log) {
     if ($task == "edit") {
         $query = sprintf(
             "update log set description = '%s' where %s and id = %d",
             addslashes($log_description),
             $where,
             intval($current_log)
         );
 
         $db->query($query);
     } else if ($task == "mailLog" && $recipient) {
         $query = sprintf(
             "select * from log where %s and id = %d",
             $where,
             intval($current_log)
         );
 
         $db->query($query);
         $db->next_record();
         $rerun = $db->f('rerun');
         $description = $db->f('description');
 
         if ($_SERVER['HTTPS']=="on") {
             $protocolURL="https://";
         } else {
             $protocolURL="http://";
         }
 
         $subject = "CDRTool";
 
         $fullURL = $protocolURL.$_SERVER['HTTP_HOST'].$CDRTool['tld']."/".$rerun;
         $body = "CDRTool query to analyse:\n\n$fullURL\n\n";
         if ($description) {
             $body = $body."The query id $current_log is saved with name \"$description\"\n\n";
             $subject = $subject.": ".$description;
         }
 
         $body = $body."This notification has been sent to you from CDRTool log interface by $myName";
 
         mail($recipient, $subject, $body, "From: $myEmailAddress");
         print "<p>Notified $recipient.";
     }
 }
 
 $url_log = array();
 if ($search_text) {
     $where.= sprintf(
         " and (description like '%s%s%s' or url like '%s' or id = '%s')",
         "%",
         addslashes($search_text),
         "%",
         addslashes($search_text),
         addslashes($search_text)
     );
     $url_log["search_text"] = $search_text;
 }
 
 if ($thisMonth) {
     $where .= sprintf(" and date like '%s'", date('Y-m').'%');
     $url_log["thisMonth"] = 1;
 }
 
 $query = sprintf("select count(*) as records from log where %s ", $where);
 
 if ($db->query($query)) {
     $db->next_record();
     $rows = $db->f('records');
 } else {
     $rows = 0;
 }
 
 if (!$next) {
     $i = 0;
     $next = 0;
 } else {
     $i = intval($next);
 }
 $j = 0;
 $z = 0;
 
 print "
 <form method=post action=$PHP_SELF>
 <table border=0 align=center>
 <tr>
 <td>
 Found $rows records.
 </td>
 <td>
 <div class='input-append'>
 <input class=span2 type=text size=30 name=search_text value=\"$search_text\"><button class='btn btn-primary' type=submit value=Search>Search</button></div>
 </td>
 <td>
 <input type=checkbox name=thisMonth value=1 $checked_thisMonth>
 Only this month?
 </td>
 </tr>
 </table>
 </form>
 ";
 
 if ($rows > 0) {
     if ($rows > $maxrowsperpage) {
         $maxrows=$maxrowsperpage + $next;
         if ($maxrows > $rows) {
             $maxrows = $rows;
             $prev_rows = $maxrows;
         }
     } else {
         $maxrows=$rows;
     }
 
     $_max_rows= intval($maxrowsperpage);
     if (!$_max_rows) {
         $_max_rows = 10;
     }
     $query = sprintf("select * from log where %s order by id desc limit %d, %d", $where, intval($i), $_max_rows);
 
     $db->query($query);
 
     print "<br/>
            <table id='log' class='table table-striped table-condensed' width=100% align=center>
            <thead>
            <tr>
            <th> </th>
            <th> <b>Log id</th>
            <th> <b>Reseller</th>
            <th> <b>Date and time</th>
            <th> <b>Account</th>
            <th> <b>IP address</th>
            <th> <b>Data source</th>
            <th> <b>Rows</th>
            <th> <b>Description  </th>
            <th> <b>Actions</th>
            </tr>
            </thead>
 	";
 
     while ($i < $maxrows) {
         $found = $i+1;
         $db->next_record();
 
         $current_log = $db->f('id');
         $reseller_id = $db->f('reseller_id');
         $log_date = $db->f('date');
         $login = $db->f('login');
         $ip = $db->f('ip');
         $url = $db->f('url');
         $reedit = $db->f('reedit');
         $rerun = $db->f('rerun');
         $results = $db->f('results');
         $description = $db->f('description');
         $datasource = $db->f('datasource');
 
         if ($rerun && $DATASOURCES[$datasource]['name']) {
             $datasource_print=$DATASOURCES[$datasource]['name'];
         } else {
             $datasource_print=$datasource;
         }
 
         if (!$reedit || !$rerun) {
             if (preg_match("/do_search/", $url)) {
                 $url_run = "<a href=\"../search_call/$url"."&history_id=$current_log"."\">Run</a>";
                 $url_edit = preg_replace("/do_/", "", $url);
                 $url_edit = "<a href=\"../search_call/$url_edit\">Edit</a>";
                 $display_form = 1;
             } elseif (preg_match("/do_statistics/", $url)) {
                 $url_run = "<a href=\"../statistics/$url"."&history_id=$current_log"."\">Run</a>";
                 $url_edit = preg_replace("/do_/", "", $url);
                 $url_edit = "<a href=\"../statistics/$url_edit\">Edit stat</a>";
                 $display_form = 1;
             } else {
                 $url_edit = "";
                 $url_run = "";
                 $display_form = 0;
             }
         } else {
             $display_form=1;
             $url_run="<a class='btn' href=\"$rerun\">Run</a>";
             $url_edit="<a class='btn btn-info' href=\"$reedit\">Edit</a>";
         }
 
         $rr = floor($found / 2);
         $mod = $found - $rr * 2;
 
         if ($mod == 0) {
             //$bgcolor="lightgrey";
         } else {
             //$bgcolor="white";
         }
 
         print  "
 		<tr>
 		<td class=cdr><b>$found.</b></td>
 		<td class=cdr>$current_log</td>
                 <td class=cdr>$reseller_id</td>
                 <td class=cdr>$log_date</td>
 		<td class=cdr>$login</td>
 		<td class=cdr>$ip</td>
                 <td class=cdr>$datasource_print</td>
 		<td class=cdr>$results</td>
                 <td class=cdr><form class='cform form-inline' method=post>";
 
         if ($display_form == 1) {
             print "
             <input type=hidden name=current_log value=\"$current_log\">
             <input type=hidden name=task value=edit>
             <input type=hidden name=next value=$next>
             <input type=hidden name=search_text value=\"$search_text\">
             <div class='input-append'>
             <input type=text class=span2 size=25 name=log_description value=\"$description\"><button class=btn type=submit value=Save>Save</button>
             </div>
             ";
         } else {
             print "$description";
         }
 
         print "</form>
         </td>        <td class=cdr>
         <form class='cform form-inline' method=post>
             <div class='btn-group'>
             $url_run $url_edit
         ";
 
         if (strlen($description) && $rerun) {
             print "
             <button class='btn' type=submit value=Notify>Notify</button>
             <select class=span3 name=recipient>
             ";
             foreach (array_keys($Collegues) as $col) {
                 print "<option value=\"$col\">$Collegues[$col]";
             }
 
             print "
             </select>
             <input type=hidden name=current_log value=\"$current_log\">
             <input type=hidden name=task value=mailLog>
             <input type=hidden name=next value=$next>
             <input type=hidden name=search_text value=\"$search_text\">
             ";
         }
         print "</div></form>
         </td>
 		</tr>
 
 		";
         $i++;
     }
     print "</table>";
 }
 
 print "<ul class=\"pager\">";
 
 if ($next != 0) {
     $show_next = $maxrowsperpage - $next;
     $url_log['action'] = "search";
     if ($show_next < 0) {
         $url_log['next'] = $show_next - 2 * $show_next;
     }
     $url_prev = sprintf(
         "%s?%s",
         $PHP_SELF,
         http_build_query($url_log)
     );
     print "<li><a href=\"$url_prev\">&larr; Previous</a></li>";
 }
 
 if ($rows > $maxrowsperpage && $rows != $maxrows) {
     $url_log['action'] = "search";
     $url_log['next'] = $maxrowsperpage + $next;
     $url_next = sprintf(
         "%s?%s",
         $PHP_SELF,
         http_build_query($url_log)
     );
     print "<li><a href=\"$url_next\">Next &rarr;</a></li>";
 }
 
 print "</div>";
 
 $layout->showFooter();
 
 print "
 </body>
 </html>
 ";
 
 page_close();
 ?>
diff --git a/logout.phtml b/logout.phtml
index a9ae402..1424de5 100644
--- a/logout.phtml
+++ b/logout.phtml
@@ -1,32 +1,32 @@
 <?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"];
 
 $auth->logout();
 $sess->delete();
 
 $title = "Logout";
 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->showLogout($loginname);
 $layout->showFooter();
 
 print "
 </body>
 </html>
 ";
 ?>
diff --git a/media_sessions.phtml b/media_sessions.phtml
index cffc01c..cff1847 100644
--- a/media_sessions.phtml
+++ b/media_sessions.phtml
@@ -1,73 +1,73 @@
 <?php
-require("/etc/cdrtool/global.inc");
+require '/etc/cdrtool/global.inc';
 
 page_open(
     array(
         "sess" => "CDRTool_Session",
         "auth" => "CDRTool_Auth",
         "perm" => "CDRTool_Perm"
     )
 );
 
 $perm->check("statistics");
 
-require("media_sessions.php");
+require 'media_sessions.php';
 
-$title="Media sessions";
-include("header.phtml");
+$title = "Media sessions";
+include 'header.phtml';
 
 global $CDRTool;
 $allowedDomains = array();
 if (strlen($CDRTool['filter']['domain'])) {
     $allowedDomains = explode(' ', $CDRTool['filter']['domain']);
 }
 
 $layout = new pageLayoutLocal();
 $layout->showTopMenu($title);
 
 if (isset($_REQUEST['datasource'])) {
     $datasources = array($_REQUEST['datasource']);
 } else {
     $datasources = array_keys($DATASOURCES);
 }
 
 $user = isset($_REQUEST['user']) ? $_REQUEST['user'] : '';
 
 foreach ($datasources as $datasource) {
     if (in_array($datasource, $CDRTool['dataSourcesAllowed'])) {
         if (array_key_exists('mediaSessions', $DATASOURCES[$datasource])) {
             // MediaProxy 2 over NGNPro
 
             printf("<h2>%s (MediaProxy 2)</h2><br />", $DATASOURCES[$datasource]['name']);
             $filters = array('user' => $user);
             $MediaSessions = new MediaSessionsNGNPro($DATASOURCES[$datasource]['mediaSessions'], $allowedDomains, $filters);
             $MediaSessions->getSessions();
             $MediaSessions->showAll();
         } else if (array_key_exists('mediaDispatcher', $DATASOURCES[$datasource])) {
             // MediaProxy 2 via dispatcher tcp socket
 
             printf("<h2>%s (MediaProxy 2.x)</h2><br />", $DATASOURCES[$datasource]['name']);
             $filters = array('user' => $user);
             $MediaSessions = new MediaSessions($DATASOURCES[$datasource]['mediaDispatcher'], $allowedDomains, $filters);
             $MediaSessions->getSessions();
             $MediaSessions->showAll();
         } else if (array_key_exists('mediaServers', $DATASOURCES[$datasource])) {
             // MediaProxy 1 via relay tcp socket
 
             printf("<h2>%s (MediaProxy 1.x)</h2><br />", $DATASOURCES[$datasource]['name']);
             $MediaSessions = new MediaSessions1($DATASOURCES[$datasource]['mediaServers'], $allowedDomains);
             $MediaSessions->getSessions();
             $MediaSessions->show();
         }
     }
 }
 
 $layout->showFooter();
 
 print "
 </body>
 </html>
 ";
 page_close();
 
 ?>
diff --git a/media_trace.phtml b/media_trace.phtml
index 1f134f8..b08e6f1 100644
--- a/media_trace.phtml
+++ b/media_trace.phtml
@@ -1,37 +1,37 @@
 <?php
-require("/etc/cdrtool/global.inc");
+require '/etc/cdrtool/global.inc';
 
 page_open(
     array(
         "sess" => "CDRTool_Session",
         "auth" => "CDRTool_Auth",
         "perm" => "CDRTool_Perm"
     )
 );
 
 $title = sprintf("CDRTool media trace for session %s", $callid);
-include("header.phtml");
-$cdr_source  = $_REQUEST['cdr_source'];
+include 'header.phtml';
+$cdr_source = $_REQUEST['cdr_source'];
 
 if (in_array($cdr_source,$CDRTool['dataSourcesAllowed'])) {
 
     $proxyIP     = $_REQUEST['proxyIP'];
     $callid      = $_REQUEST['callid'];
     $fromtag     = $_REQUEST['fromtag'];
     $totag       = $_REQUEST['totag'];
 
-    require("cdr_generic.php");
+    require 'cdr_generic.php';
 
     $mediaTrace = new Media_trace($cdr_source);
     $mediaTrace->show($proxyIP, $callid, $fromtag, $totag);
 
 } else {
     printf("Error: Invalid datasource '%s' for user '%s'", $cdr_source, $auth->auth["uname"]);
 }
 
 print "
 </body>
 </html>
 ";
 page_close();
 ?>
diff --git a/mysql_replication_status.phtml b/mysql_replication_status.phtml
index a07ebf5..f7bcd32 100644
--- a/mysql_replication_status.phtml
+++ b/mysql_replication_status.phtml
@@ -1,38 +1,38 @@
 <?php
-require("/etc/cdrtool/global.inc");
+require '/etc/cdrtool/global.inc';
 
 page_open(
     array(
         "sess" => "CDRTool_Session",
         "auth" => "CDRTool_Auth",
         "perm" => "CDRTool_Perm"
     )
 );
 
 $perm->check("admin");
 
 $title = "MySQL replication status";
 
 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);
 
-require("mysql_replication.php");
+require 'mysql_replication.php';
 
 $ReplicationOverview = new ReplicationOverview($replicated_databases);
 $ReplicationOverview->showOverview();
 
 $layout->showFooter();
 
 print "
     </body>
 </html>
 ";
 
 page_close();
 ?>
diff --git a/network_status.phtml b/network_status.phtml
index bf6db5f..28d5676 100644
--- a/network_status.phtml
+++ b/network_status.phtml
@@ -1,86 +1,86 @@
 <?php
-require("/etc/cdrtool/global.inc");
+require '/etc/cdrtool/global.inc';
 page_open(
     array(
         "sess" => "CDRTool_Session",
         "auth" => "CDRTool_Auth",
         "perm" => "CDRTool_Perm"
     )
 );
 
-require("sip_statistics.php");
-require("media_sessions.php");
+require 'sip_statistics.php';
+require 'media_sessions.php';
 
 $perm->check("admin");
 
 $title = "SIP network status";
-include("header.phtml");
+include 'header.phtml';
 
 global $CDRTool;
 $allowedDomains = array();
 if (strlen($CDRTool['filter']['domain'])) {
     $allowedDomains = explode(' ', $CDRTool['filter']['domain']);
 }
 
 $layout = new pageLayoutLocal();
 $layout->showTopMenu($title);
 
 foreach (array_keys($DATASOURCES) as $datasource) {
     print "<div class='row-fluid'>";
     if (in_array($datasource, $CDRTool['dataSourcesAllowed']) && !$DATASOURCES[$datasource]['invisible']) {
         if ($DATASOURCES[$datasource]['networkStatus']) {
             print "<div class='span6'>";
             printf("<h2>%s</h2>", $DATASOURCES[$datasource]['name']);
             $SipThorNetworkImage = new SipThorNetworkImage($DATASOURCES[$datasource]['networkStatus'], $allowedDomains);
             //printf ("<img src=images/SipThorNetwork.php?engine=%s align=left>",$DATASOURCES[$datasource]['networkStatus']);
             print "<div id='thorMap__$datasource'><script>";
             printf("var thorData__$datasource = %s", json_encode($SipThorNetworkImage->returnImageData()));
             print "</script></div>";
             print "</div>";
             print "<div class='span6'>";
         } else if ($DATASOURCES[$datasource]['db_registrar']) {
             print "<div class='span7'>";
             printf("<h2>%s</h2>", $DATASOURCES[$datasource]['name']);
             require_once("cdr_generic.php");
             $online = new SIPonline($datasource, $DATASOURCES[$datasource]['db_registrar']);
             $online->showAll();
             print "</div>";
             print "<div class='span5'>";
         }
 
 
         if (array_key_exists('mediaSessions', $DATASOURCES[$datasource])) {
             $MediaSessions = new MediaSessionsNGNPro($DATASOURCES[$datasource]['mediaSessions'], $allowedDomains);
             $MediaSessions->getSessions();
             $MediaSessions->getSummary();
             print "<div class=row><h2>Media relays</h2></div>";
             $MediaSessions->showSummary();
         } else if (array_key_exists('mediaDispatcher', $DATASOURCES[$datasource])) {
             $MediaSessions = new MediaSessions($DATASOURCES[$datasource]['mediaDispatcher'], $allowedDomains);
             $MediaSessions->getSessions();
             $MediaSessions->getSummary();
             print "<div class=row><h2>Media relays</h2></div>";
             $MediaSessions->showSummary();
         }
 
         if (array_key_exists('networkStatus', $DATASOURCES[$datasource])) {
             $NetworkStatistics = new NetworkStatistics($DATASOURCES[$datasource]['networkStatus'], $allowedDomains);
             print "<div class=row><h2>SIP accounts</h2></div>";
             $NetworkStatistics->showStatistics();
             print "<div class=row><h2>Network topology</h2></div>";
             $NetworkStatistics->showStatus();
         }
 
         print "</div>";
     }
     print "</div>";
 }
 
 
 $layout->showFooter();
 
 print "
 </body>
 </html>";
 page_close();
 ?>