From 4e63a9a6793583c7f7f4959724be2653ddc85f49 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Wed, 4 May 2011 17:08:25 +0200
Subject: part of request #3163623: add support to login via ssl client
 certificate. web interface to register certificates is still missing

---
 data/schema/6.sql              | 10 ++++++++++
 data/tables.sql                | 10 ++++++++++
 data/templates/toolbar.inc.php |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/schema/6.sql b/data/schema/6.sql
index 4ae7cb9..bc85ffd 100644
--- a/data/schema/6.sql
+++ b/data/schema/6.sql
@@ -2,3 +2,13 @@ CREATE TABLE `sc_version` (
   `schema_version` int(11) NOT NULL
 ) DEFAULT CHARSET=utf8;
 INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
+
+CREATE TABLE `sc_users_sslclientcerts` (
+  `id` INT NOT NULL AUTO_INCREMENT ,
+  `uId` INT NOT NULL ,
+  `sslSerial` VARCHAR( 32 ) NOT NULL ,
+  `sslName` VARCHAR( 64 ) NOT NULL ,
+  `sslEmail` VARCHAR( 64 ) NOT NULL ,
+  PRIMARY KEY ( `id` ) ,
+  UNIQUE (`id`)
+) CHARACTER SET utf8 COLLATE utf8_general_ci;
diff --git a/data/tables.sql b/data/tables.sql
index 7a9c5bd..af0c81b 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -77,6 +77,16 @@ CREATE TABLE `sc_users` (
 
 -- --------------------------------------------------------
 
+CREATE TABLE `sc_users_sslclientcerts` (
+  `id` INT NOT NULL AUTO_INCREMENT ,
+  `uId` INT NOT NULL ,
+  `sslSerial` VARCHAR( 32 ) NOT NULL ,
+  `sslName` VARCHAR( 64 ) NOT NULL ,
+  `sslEmail` VARCHAR( 64 ) NOT NULL ,
+  PRIMARY KEY ( `id` ) ,
+  UNIQUE (`id`)
+) CHARACTER SET utf8 COLLATE utf8_general_ci;
+
 -- 
 -- Table structure for table `sc_watched`
 -- 
diff --git a/data/templates/toolbar.inc.php b/data/templates/toolbar.inc.php
index 0d9bf49..fb6638d 100644
--- a/data/templates/toolbar.inc.php
+++ b/data/templates/toolbar.inc.php
@@ -1,5 +1,5 @@
 <?php
-if ($userservice->isLoggedOn()) {
+if ($userservice->isLoggedOn() && is_object($currentUser)) {
     $cUserId = $userservice->getCurrentUserId();
     $cUsername = $currentUser->getUsername();
 ?>
-- 
cgit v1.2.3-54-g00ecf