webinterface.git

@@ -70,6 +70,7 @@ if (isset($_SERVER['REDIRECT_SSL_CLIENT_CERT']) &&

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

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

     setup_session($role, $uid);

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

     echo 'ok';

     die();

   }

@@ -125,6 +125,12 @@ function require_role($roles)

 function login_screen($why)

 {

+  if (have_module('index')) {

+    if (isset($_COOKIE['CLIENTCERT_AUTOLOGIN']) && $_COOKIE['CLIENTCERT_AUTOLOGIN'] == '1') {

+      require_once('modules/index/include/x509.php');

+      do_ajax_cert_login();

+    }

+  }

   require_once('inc/theme.php');

   if ($why) {

     warning($why);

@@ -14,24 +14,15 @@ http://creativecommons.org/publicdomain/zero/1.0/

 Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

 */

+require_once('x509.php');

+

 title('Login über SSL-Client-Zertifikat');

-$path = config('jquery_ui_path');

-html_header('

-<link rel="stylesheet" href="'.$path.'/themes/base/jquery-ui.css">

-<script type="text/javascript" src="'.$path.'/jquery-1.9.0.js" ></script>

-<script type="text/javascript" src="'.$path.'/ui/jquery-ui.js" ></script>

-<script>

-  function redirect(status) {

-    if (status == "ok") {

-      window.location.href="../../go/index/index";

+if ($_SESSION['role'] == ROLE_ANONYMOUS) {

+  do_ajax_cert_login();

 } else {

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

-    }

+  redirect('index');

 }

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

-</script>

-');

 output('<p>Sie werden nun über Ihr SSL-Client-Zertifikat eingeloggt. Möglicherweise werden Sie von Ihrem Browser zunächst gebeten, ein Zertifkkat auszuwählen.</p>');

@@ -16,6 +16,26 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 require_once('inc/security.php');

+function do_ajax_cert_login() {

+  global $prefix;

+  $path = config('jquery_ui_path');

+  html_header('

+<link rel="stylesheet" href="'.$path.'/themes/base/jquery-ui.css" />

+<script type="text/javascript" src="'.$path.'/jquery-1.9.0.js" ></script>

+<script type="text/javascript" src="'.$path.'/ui/jquery-ui.js" ></script>

+<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>

+');

+}

+

 function get_logins_by_cert($cert) 

 {

 	$cert = mysql_real_escape_string(str_replace(array('-----BEGIN CERTIFICATE-----', '-----END CERTIFICATE-----', ' ', "\n"), array(), $cert));

@@ -18,6 +18,9 @@ require_once('session/start.php');

 require_once('inc/error.php');

+if (isset($_COOKIE['CLIENTCERT_AUTOLOGIN'])) {

+  setcookie('CLIENTCERT_AUTOLOGIN', FALSE, 0, '/');

+}

 if (!session_destroy())

 {

   logger(LOG_INFO, "modules/index/logout", "logout", "session timed out.");

@@ -85,15 +85,15 @@ if ($debugmode)

 $path = config('jquery_ui_path');

 html_header('

-<link rel="stylesheet" href="'.$path.'/themes/base/jquery-ui.css">

+<link rel="stylesheet" href="'.$path.'/themes/base/jquery-ui.css" />

 <script type="text/javascript" src="'.$path.'/jquery-1.9.0.js" ></script>

 <script type="text/javascript" src="'.$path.'/ui/jquery-ui.js" ></script>

 ');

-output(html_form('su_su', '', '', '<label for="query"><strong>Suchtext:</strong></label> <input autocomplete="off" type="text" name="query" id="query" />

+output(html_form('su_su', '', '', '<p><label for="query"><strong>Suchtext:</strong></label> <input type="text" name="query" id="query" /> <input type="submit" value="Suchen" /></p>

 '));

 output('

-<script>

+<script type="text/javascript">

 $("#query").autocomplete({

     source: "su_ajax",

     select: function( event, ui ) {