summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2011-09-06 17:23:19 +0200
committerMichael Tänzer <neo@nhng.de>2011-09-06 17:23:19 +0200
commit12e0f5032caadb166eaa8a1cd1a5ea6136d662f2 (patch)
treebbb3d19e5cc8bbec4060fc33d0fc1236677b70a6 /www
parenta7b28f722eacc63fdb0b1e521962a9125a03ebdb (diff)
parent6887dac19180455ca325755d5d4e1087814cf374 (diff)
downloadcacert-devel-12e0f5032caadb166eaa8a1cd1a5ea6136d662f2.tar.gz
cacert-devel-12e0f5032caadb166eaa8a1cd1a5ea6136d662f2.tar.xz
cacert-devel-12e0f5032caadb166eaa8a1cd1a5ea6136d662f2.zip
Merge remote-tracking branch 'origin/bug-841' into release
Diffstat (limited to 'www')
-rw-r--r--www/index.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/www/index.php b/www/index.php
index 7330877..a4c50fc 100644
--- a/www/index.php
+++ b/www/index.php
@@ -148,13 +148,16 @@
if($id == 4 && $_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'])
{
- $query = "select * from `emailcerts` where `serial`='$_SERVER[SSL_CLIENT_M_SERIAL]' and `revoked`=0 and disablelogin=0 and
- UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() > 0";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0)
+ include_once("../includes/lib/general.php");
+ $user_id = get_user_id_from_cert($_SERVER['SSL_CLIENT_M_SERIAL'],
+ $_SERVER['SSL_CLIENT_I_DN_CN']);
+
+ if($user_id >= 0)
{
- $row = mysql_fetch_assoc($res);
- $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$row[memid]' and `deleted`=0 and `locked`=0"));
+ $_SESSION['profile'] = mysql_fetch_assoc(mysql_query(
+ "select * from `users` where
+ `id`='$user_id' and `deleted`=0 and `locked`=0"));
+
if($_SESSION['profile']['id'] != 0)
{
$_SESSION['profile']['loggedin'] = 1;