summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2011-07-27 01:03:24 +0200
committerMichael Tänzer <neo@nhng.de>2011-07-27 01:03:24 +0200
commitb2c1b55f1be7930dadcdb656e929b9e9e0b54aa2 (patch)
tree76b1d1ee6cb0c84945085b521dc18147725ebcdf /www
parentb5ee07271aea9e0722a7ed58e52f80b495d190d0 (diff)
downloadcacert-devel-b2c1b55f1be7930dadcdb656e929b9e9e0b54aa2.tar.gz
cacert-devel-b2c1b55f1be7930dadcdb656e929b9e9e0b54aa2.tar.xz
cacert-devel-b2c1b55f1be7930dadcdb656e929b9e9e0b54aa2.zip
bug 841: extract the whole cert-login into a function
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'www')
-rw-r--r--www/index.php18
1 files changed, 8 insertions, 10 deletions
diff --git a/www/index.php b/www/index.php
index ddfa610..109689a 100644
--- a/www/index.php
+++ b/www/index.php
@@ -149,17 +149,15 @@
if($id == 4 && $_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'])
{
include_once("../includes/lib/general.php");
- /* identify unique certs serial number related to root or subroot */
- $query = "select * from `emailcerts` where
- `serial`='".$_SERVER['SSL_CLIENT_M_SERIAL']."' and
- `rootcert`='".rootcertid($_SERVER['SSL_CLIENT_I_DN_CN'])."' and
- `revoked`=0 and disablelogin=0 and
- UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() > 0";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0)
+ $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;