webinterface.git

@@ -114,6 +114,7 @@ else

       $uid = $ret[0]['username'];

       $role = find_role($uid, '', True);

       setup_session($role, $uid);

+      setcookie('CLIENTCERT_AUTOLOGIN', '1', time()+3600*24*365, '/');

       $destination = 'go/index/index';

       if (check_path($ret[0]['startpage']))

         $destination = $ret[0]['startpage'];

@@ -42,6 +42,7 @@ class DB extends PDO {

       if (config("enable_debug")) {

         foreach (array_values($params) as $p) {

           if ($p === '') {

+            DEBUG("Potential bug, empty string found in database parameters");

             warning("Potential bug, empty string found in database parameters");

           }

         }

@@ -71,7 +72,7 @@ function db_escape_string($string)

 {

   if (config("enable_debug")) {

     $backtrace = debug_backtrace();

-    warning("call to db_escape_string() in {$backtrace[1]['file']} line {$backtrace[1]['line']}");

+    warning("call to db_escape_string() in {$backtrace[0]['file']} line {$backtrace[0]['line']}");

   }

   global $_db;

   __ensure_connected();

@@ -60,9 +60,9 @@ function create_dyndns_account($handle, $password_http, $sshkey)

   $handle = filter_input_username($handle);

   $sshkey = filter_input_general($sshkey);

-  $pwhash = 'NULL';

+  $pwhash = NULL;

   if ($password_http)

-    $pwhash = "'{SHA}".base64_encode(sha1($password_http, true))."'";

+    $pwhash = "{SHA}".base64_encode(sha1($password_http, true));

   db_query("INSERT INTO dns.dyndns (uid, handle, password, sshkey) VALUES ".

            "(:uid, :handle, :pwhash, :sshkey)",

@@ -335,7 +335,7 @@ function save_vmail_account($account)

   }  

   if ($account['quota_threshold'] == -1) {

-    $account['quota_threshold'] = 'NULL';

+    $account['quota_threshold'] = NULL;

   }

   else {

     $account['quota_threshold'] = min( (int) $account['quota_threshold'], (int) $account['quota'] );

@@ -19,18 +19,7 @@ require_once('inc/security.php');

 function do_ajax_cert_login() {

   global $prefix;

   require_once('inc/jquery.php');

-  html_header('

-<script type="text/javascript">

-  function redirect(status) {

-    if (status == "ok") {

-      window.location.reload();

-    } else {

-      window.location.href="../../certlogin/";

-    }

-  }

-  $.get("'.$prefix.'certlogin/ajax.php", redirect);

-</script>

-');

+  javascript('certlogin.js');

 }

 function get_logins_by_cert($cert) 

@@ -176,7 +176,7 @@ function create_mysql_database($dbname, $description = '', $server = NULL)

     return NULL;

   }

   if (! in_array($server, additional_servers()) || ($server == my_server_id())) {

-    $server = 'NULL';

+    $server = NULL;

   }

   $args = array(":dbname" => $dbname,

                 ":uid" => $_SESSION['userinfo']['uid'],

@@ -36,7 +36,7 @@ function find_role($login, $password, $i_am_admin = False)

   // System-User?

   $uid = (int) $login;

   if ($uid == 0)

-    $uid = 'NULL';

+    $uid = NULL;

   $result = db_query("SELECT username, passwort AS password, kundenaccount AS `primary`, status, ((SELECT acc.uid FROM system.v_useraccounts AS acc LEFT JOIN system.gruppenzugehoerigkeit USING (uid) LEFT JOIN system.gruppen AS g ON (g.gid=gruppenzugehoerigkeit.gid) WHERE g.name='admin' AND acc.uid=u.uid) IS NOT NULL) AS admin FROM system.v_useraccounts AS u LEFT JOIN system.passwoerter USING(uid) WHERE u.uid=:uid OR username=:login LIMIT 1;", array(":uid" => $uid, ":login" => $login));

   if (@$result->rowCount() > 0)

   {