diff --git a/accounts.phtml b/accounts.phtml
index 562a602..2fd2ac3 100644
--- a/accounts.phtml
+++ b/accounts.phtml
@@ -1,467 +1,470 @@
 <?php
 require("/etc/cdrtool/global.inc");
 
 page_open(array("sess" => "CDRTool_Session",
                 "auth" => "CDRTool_Auth",
                 "perm" => "CDRTool_Perm")
           );
 
 $title           = "Login accounts";
 require("login_accounts.php");
 
 if (is_readable("/etc/cdrtool/local/header.phtml")) {
     include("/etc/cdrtool/local/header.phtml");
 } else {
     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']
+    $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          = $_REQUEST['action'];
 $next            = $_REQUEST['next'];
 $PHP_SELF        = $_SERVER['PHP_SELF'];
 $search_text     = $_REQUEST['search_text'];
 
 $username        = $_REQUEST['username'];
 $password        = $_REQUEST['password'];
 $name            = $_REQUEST['name'];
 $organization    = $_REQUEST['organization'];
 $tel             = $_REQUEST['tel'];
 $email           = $_REQUEST['email'];
 $expire          = $_REQUEST['expire'];
 
 $gatewayFilter   = $_REQUEST['gatewayFilter'];
 $domainFilter    = $_REQUEST['domainFilter'];
 $serviceFilter   = $_REQUEST['serviceFilter'];
 $compidFilter    = $_REQUEST['compidFilter'];
 $aNumberFilter   = $_REQUEST['aNumberFilter'];
 $cscodeFilter    = $_REQUEST['cscodeFilter'];
 $afterDateFilter = $_REQUEST['afterDateFilter'];
 $aclFilter       = $_REQUEST['aclFilter'];
 $impersonate     = $_REQUEST['impersonate'];
 
 $perms           = $_REQUEST['perms'];
 $sources         = $_REQUEST['sources'];
 $delete          = $_REQUEST['delete'];
 
 $id              = $_REQUEST['id'];
 $uid             = $_REQUEST['uid'];
 $check           = $_REQUEST['check'];
 $mailsettings    = $_REQUEST['mailsettings'];
 
 $otp_yubikey     = $_REQUEST["yubikey"];
 $auth_method     = $_REQUEST["auth_method"];
 
-$db        		 = new DB_CDRTool;
+$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/library/login_accounts.php b/library/login_accounts.php
index fa74c7d..1086de2 100644
--- a/library/login_accounts.php
+++ b/library/login_accounts.php
@@ -1,643 +1,642 @@
 <?php
 function check_telephone($tel, $country)
 {
     global $err;
     if ($country == "NL") {
         if (preg_match("/^\+31\-\d{2}-\d{7}$/", $tel)
             || preg_match("/^\+31\-\d{3}-\d{6}$/", $tel)
         ) {
         } else {
             $err="NL numbers must be in format +31-DD-DDDDDDD or +31-DDD-DDDDDD";
             return 0;
         }
     }
     return 1;
 }
 # subscriber form
 $f = new form;
 
 $f->add_element(
     array(
         "name"=>"username",
         "type"=>"text",
         "size"=>"25",
         "length_e"=>"2",
         "minlength"=>"2",
         "maxlength"=>"25",
         "valid_regex"=>"^[-a-zA-Z0-9@_\.]{2,}$",
         "valid_e"=>"Username required: - mininum 2 chars (letters, digits, _, -, @, .)"
     )
 );
 
 $f->add_element(
     array(
         "name"=>"password",
         "type"=>"text",
         "size"=>"25",
         "minlength"=>"5",
         "maxlength"=>"25",
         "pass"=>1,
         //"valid_regex"=>"^.{5,}",
         //"valid_e"=>"Password: Letters, digits _ - only - minim 5 characters",
         "value"=>"$password"
     )
 );
 
 $f->add_element(
     array(
         "name"=>"name",
         "type"=>"text",
         "length_e"=>"3",
         "minlength"=>"3",
         "maxlength"=>"100",
         "size"=>"30",
         "valid_regex"=>"^[-a-zA-Z0-9|_|\.|\s ]*$",
         "valid_e"=>"Name required - min 1 chars (letters, digits _ - . spaces only)",
         "icase"=>1
     )
 );
 $f->add_element(
     array(
         "name"=>"organization",
         "type"=>"text",
         "length_e"=>"6",
         "maxlength"=>"100",
         "size"=>"30",
         "valid_regex"=>"^[-a-zA-Z0-9|_|\.|\s ]*$",
         "valid_e"=>"Organization required - min 6 chars (letters, digits _ - . spaces only)",
         "icase"=>1
     )
 );
 $f->add_element(
     array(
         "name"=>"email",
         "type"=>"text",
         "length_e"=>6,
         "minlength"=>"6",
         "maxlength"=>"100",
         "size"=>"30",
         "valid_e"=>"Syntax error in E-Mail address.",
         "valid_regex"=>"^([-a-zA-Z0-9._]+@[-a-zA-Z0-9_]+(\.[-a-zA-Z0-9_]+)+)*$"
     )
 );
 $f->add_element(
     array(
         "name"=>"aNumberFilter",
         "type"=>"text",
         "maxlength"=>"100",
         "size"=>"60"
     )
 );
 $f->add_element(
     array(
         "name"=>"domainFilter",
         "type"=>"text",
         "maxlength"=>"255",
         "size"=>"60"
     )
 );
 $f->add_element(
     array(
         "name"=>"impersonate",
         "type"=>"text",
         "maxlength"=>"255",
         "size"=>"11"
     )
 );
 $f->add_element(
     array(
         "name"=>"gatewayFilter",
         "type"=>"text",
         "maxlength"=>"255",
         "size"=>"60"
     )
 );
 $f->add_element(
     array(
         "name"=>"compidFilter",
         "type"=>"text",
         "maxlength"=>"255",
         "size"=>"60"
     )
 );
 $f->add_element(
     array(
         "name"=>"cscodeFilter",
         "type"=>"text",
         "maxlength"=>"255",
         "size"=>"60"
     )
 );
 $f->add_element(
     array(
         "name"=>"serviceFilter",
         "type"=>"text",
         "maxlength"=>"255",
         "size"=>"60"
     )
 );
 $f->add_element(
     array(
         "name"=>"afterDateFilter",
         "type"=>"text",
         "maxlength"=>"10",
         "size"=>"11"
     )
 );
 $f->add_element(
     array(
         "name"=>"aclFilter",
         "type"=>"text",
         "maxlength"=>"100",
         "size"=>"20"
     )
 );
 
 $f->add_element(
     array(
         "name"=>"tel",
         "type"=>"text",
         "size"=>"30"
     )
 );
 
 $f->add_element(
     array(
         "name"=>"expire",
         "type"=>"text",
         "size"=>"11"
     )
 );
 
 $use_yubikey=0;
 if (stream_resolve_include_path('Auth/Yubico.php')) {
     require_once 'Auth/Yubico.php';
     $use_yubikey=1;
 }
 
 if ($use_yubikey) {
     $f->add_element(
         array(
             "name"=>"yubikey",
             "type"=>"text",
             "size"=>"12",
             "minlength"=>"12",
             "maxlength"=>"12",
             "valid_regex"=>"^[a-zA-Z0-9|_|-]*$"
         )
     );
 }
 
 $blocked_els=array(
                 array("label"=>"","value"=>"0"),
                 array("label"=>gettext("Blocked"),"value"=>"1")
             );
 $f->add_element(
     array(
         "type"=>"select",
         "name"=>"blocked",
         "options"=>$blocked_els,
         "size"=>1,
         "value"=>""
     )
 );
 
 $f->add_element(
     array(
         "type"=>"submit",
         "name"=>"submit",
         "extrahtml"=>"class=btn",
         "value"=>"Submit"
     )
 );
 
 while (list($k,$v) = each($DATASOURCES)) {
     if ($k!="unknown") {
         $cdrSourcesEls[]=array("label"=>$v[name],"value"=>$k);
     }
 }
 
 $f->add_element(
     array(
         "type"=>"select",
         "name"=>"sources",
         "options"=>$cdrSourcesEls,
         "size"=>8,
         "multiple"=>"1",
         "value"=>""
     )
 );
 
 if ($use_yubikey) {
     $f->add_element(
         array(
             "type"=>"select",
             "name"=>"auth_method",
             "options"=> array(
                 array("label"=>"Username+Password+Yubikey","value"=>"7"),
                 array("label"=>"Username+Yubikey","value"=>"5"),
                 array("label"=>"Yubikey","value"=>"4"),
             ),
             "multiple"=>"0",
             "value"=>""
         )
     );
 }
 
 
 function showForm($id = "")
 {
     global $CDRTool, $verbose, $perm, $auth, $sess, $cdr, $f,
     $perms, $source, $sources, $action;
 
     $sources=explode(",", $sources);
 
     $use_yubikey=0;
     if (stream_resolve_include_path('Auth/Yubico.php')) {
         require_once 'Auth/Yubico.php';
         $use_yubikey=1;
     }
 
     global $afterDateFilter;
 
     if (preg_match("/^0000-00-00$/", $afterDateFilter)) {
         $afterDateFilter="";
     }
 
     $f->load_defaults();
     $f->start("", "GET", "", "", "", "form-horizontal");
 
     print "<input type=hidden name=check value=yes>";
     print "<input type=hidden name=action value=\"$action\">";
 
     if ($frzall) {
         $f->freeze();
     }
 
     if (!$perm->have_perm("admin")) {
         $ff=array(
             "sources",
             "gatewayFilter",
             "domainFilter",
             "aNumberFilter",
             "serviceFilter",
             "compidFilter",
             "cscodeFilter",
             "afterDateFilter",
             "aclFilter",
             "impersonate");
         $f->freeze($ff);
     }
 
 
     print "
     <div class=\"row-fluid\">
     <div class=\"span6\">
     <h3>Contact details</h3>
     <p>";
     print _("The fields marked with ");
     print " <font color=orange>*</font> ";
     print _("are mandatory");
     print ":</font>
     </p>
     ";
 
     $f->show_element("action", "");
 
     if ($id) {
             $f->add_element(array("type"=>"hidden",
                                   "name"=>"id",
                                   "value"=>"$id"
                             ));
     }
 
     print "
       <div class=\"control-group\">
       <label class='control-label'>
     ";
     print _("Name");
     print "<font color=orange> *</font></label>
     ";
     print "
     <div class='controls'>
     <font color=$formelcolor>
     ";
     $f->show_element("name", "");
     print "
     </font>
     </div>
     </div>
     ";
 
     print "
       <div class=\"control-group\">
       <label class='control-label'>
     ";
     print _("Organization");
     print "</label>
     <div class='controls'>
       <font color=$formelcolor>
     ";
     $f->show_element("organization", "");
     print "
     </div>
     </div>
     ";
 
     print "
       <div class=\"control-group\">
       <label class='control-label'>
     ";
     print _("E-mail");
     print "<font color=orange> *</font></label>
       <div class='controls'>
       <font color=$formelcolor>
     ";
     $f->show_element("email", "");
     print "
     </div>
     </div>
     ";
 
 
     print "
       <div class=\"control-group\">
       <label class='control-label'>
     ";
     print _("Telephone");
     print "</label>
       <div class='controls'>
       <font color=$labelcolor>
     ";
     $f->show_element("tel", "");
     print "
     </div>
     </div>
     ";
     print "
       <div class=\"control-group\">
       <label class='control-label'>
     ";
 
     print _("Username");
     print " <font color=orange>*</font></label>
       <div class='controls'><font color=$labelcolor>
     ";
 
     $f->show_element("username", "");
 
     print "
     </div>
     </div>
     ";
 
     print "
       <div class=\"control-group\">
       <label class='control-label'>
     ";
     print _("Password");
     print " <font color=orange>*</font></label>
       <div class='controls'><font color=$labelcolor>
     ";
     $f->show_element("password", "");
     print "</div>
     </div>
     ";
 
     if ($use_yubikey) {
         print "
           <div class=\"control-group\">
           <label class='control-label'>
         ";
         print _("Yubikey");
         print "</label>
         <div class='controls'>
           <font color=$formelcolor>
         ";
         $f->show_element("yubikey", "");
         print "
         </div>
         </div>
         ";
 
         print "
           <div class=\"control-group\">
           <label class='control-label'>
         ";
         print _("Yubikey usage");
         print "</label>
         <div class='controls'>
           <font color=$formelcolor>
         ";
         $f->show_element("auth_method", "");
         print "
         </div>
         </div>
         ";
     }
 
     print "
           <div class=\"control-group\">
             <label class='control-label'>
               <font color=$labelcolor>
            E-mail settings</label>
             <div class='controls'><font color=$labelcolor>
            ";
            print "<input type=checkbox name=mailsettings value=1> ";
            print "
            </div>
            </div>
            ";
 
     if ($perm->have_perm("admin")) {
         print "<hr>
                <div class=\"control-group\">
                <label class='control-label'>
                <font color=$labelcolor>
                Expire date </label>
                <div class='controls'>
                <font color=$labelcolor>
         ";
         $f->show_element("expire", "");
         print "
            </div>
            </div>
         ";
 
         print "
               <div class=\"control-group\">
               <label class='control-label'><font color=$labelcolor>
               Impersonate </label>
                <div class='controls'><font color=$labelcolor>
            ";
            $f->show_element("impersonate", "");
            print "
            </font>
            </div>
            </div>
            ";
            print "
               <div class=\"control-group\">
               <label class='control-label'><font color=$labelcolor>
            Delete </label>
            <div class='controls'><font color=$labelcolor>
            ";
            print "<input type=checkbox name=delete value=1>";
            print "
            </font>
            </div>
            </div>
            ";
 
            /*
            print "
            <tr>
            <td valign=top><font color=$labelcolor>
            Lock </td>
            <td colspan=2 valign=top><font color=$labelcolor>
            ";
                    $f->show_element("blocked","");
            print "
            </font>
            </td>
            </tr>
            ";
            */
            print "
             <hr>
            ";
     }
 
     print "
     </div>";
 
     print "<div class=span6>
     ";
 
     print "
      <h3>Permissions</h3>
      <div class='row-fluid'>";
     if ($perm->have_perm("admin")) {
         print "<div class='span6'>
         <p><b>Functions</b></p>";
         print $perm->perm_sel("perms", $perms);
         print "</div>";
     }
 
     print "<div class='span6'><p><strong>Data sources</strong></p>";
     $f->show_element("sources", "");
     print "
      </div></div>";
 
     print "
       <hr noshade size=1>
       <p>
       <strong>Filters</strong></p>
      ";
     print "<div class=\"control-group\">
             <label class='control-label'>IP ACL</label><div class='controls'>";
      $f->show_element("aclFilter", "");
     print "</div></div>";
     print "<div class=\"control-group\">
             <label class='control-label'>Trusted peers</label><div class='controls'>";
     $f->show_element("gatewayFilter", "");
     print "</div></div>";
     print "<div class=\"control-group\">
             <label class='control-label'>Domains</label><div class='controls'>";
     $f->show_element("domainFilter", "");
     print "</div></div>";
     print "<div class=\"control-group\">
             <label class='control-label'>Subscribers</label><div class='controls'>";
     $f->show_element("aNumberFilter", "");
     print "</div></div>";
     print "<div class=\"control-group\">
             <label class='control-label'>After date</label><div class='controls'>";
     $f->show_element("afterDateFilter", "");
     print "</div></div></div></div>";
 
     if (!$frzall) {
         print "<div class='form-actions'>";
         $f->show_element("submit", "", "btn");
         print "</div>";
     }
     $f->finish();                     // Finish form
 }
 
 function accountList()
 {
     global $auth, $perm, $verbose, $search_text;
     $uid = $auth->auth["uid"];
 
     $db        = new DB_CDRTool;
 
     $query="select * from auth_user";
     if (!$perm->have_perm("admin")) {
         $query.= sprintf(" where user_id = '%s'", addslashes($uid));
     }
     $query .= " order by name asc";
     $db->query($query);
     dprint_sql($query);
 
     $rows=$db->num_rows();
 
     print "
         <p>
         <center>
         <table class='table table-hover table-condensed table-striped' width=100%>
         <thead>
         <tr>
      ";
     print "<th class=h>";
     print _("Name");
     print "</th><th class=h>";
     print _("Organization");
     print "</th><th class=h>";
     print _("Username");
     print "</th><th class=h>";
     print _("E-mail");
     print "</th><th class=h>";
     print _("Tel");
     print "</th><th class=h>";
     print _("Sources");
     print "</th><th class=h>";
     print _("Expire");
     print "</th>
      </tr></thead>
     ";
     while ($db->next_record()) {
         $id_db          = $db->f('user_id');
         $name           = $db->f('name');
         $username       = $db->f('username');
         $email          = $db->f('email');
         $organization   = $db->f('organization');
         $password       = $db->f('password');
         $tel            = $db->f('tel');
         $domainFilter   = $db->f('domainFilter');
         $aNumberFilter  = $db->f('aNumberFilter');
         $expire         = $db->f('expire');
         $sources        = preg_replace("/,/", ", ", $db->f('sources'));
 
         $bgcolor = "";
         if (date('Y-m-d') > $expire) {
             $bgcolor="error";
         }
 
-        $location = htmlentities($_SERVER['PHP_SELF']);
         print "
         <tr class=$bgcolor>
-        <td> <a href=\"$location?id=$id_db&action=edit\">$name</a>
+        <td> <a href=\"$PHP_SELF?id=$id_db&action=edit\">$name</a>
         <td> $organization
         <td> $username
         <td> <nobr><a href=mailto:$email>$email</a></nobr>
         <td> <nobr>$tel</nobr>
         <td> $sources
         <td> $expire
         </tr>
         ";
     }
 
     print "</table>
     </center>
     ";
 }
 ?>