Only verify WebID if the URI doesn't match the one in the session.

deiu · deiu · commit cdae89c0169d · 2014-03-17T14:10:57.000-04:00
diff --git a/www/inc/runtime.inc.php b/www/inc/runtime.inc.php
@@ -77,21 +77,26 @@ function librdf_php_last_log_message(){}
 
 if (isset($_SERVER['SSL_CLIENT_CERT'])) {
     require_once('webid.lib.php');
-    $_user = webid_verify();
-    
-    $_webid = webid_getinfo($_user);
-    
-    if (DEBUG) {
-        openlog('RWW.IO', LOG_PID | LOG_ODELAY,LOG_LOCAL4);
-        syslog(LOG_INFO, 'Authenticated: '.$_user.' / '.$_webid['name']);
-        closelog();
+    $q = webid_claim();
+    if (isset($q['uri']) && $q['uri'] != $_user) {        
+        $_user = webid_verify();
+        
+        $_webid = webid_getinfo($_user);
+        
+        if (DEBUG) {
+            openlog('RWW.IO', LOG_PID | LOG_ODELAY,LOG_LOCAL4);
+            syslog(LOG_INFO, 'Authenticated: '.$_user.' / '.$_webid['name']);
+            closelog();
+        }
+
+        //if (!isSess('u:name')) 
+        sess('u:name', $_webid['name']);
+        //if (!isSess('u:pic'))
+        sess('u:pic', $_webid['pic']);
+
+        if (strlen($_user) && isset($_SERVER['SSL_CLIENT_S_DN_CN']))
+            $_user_name = $_SERVER['SSL_CLIENT_S_DN_CN'];
     }
-    // overwrite the name and pic
-    sess('u:name', $_webid['name']);
-    sess('u:pic', $_webid['pic']);
-
-    if (strlen($_user) && isset($_SERVER['SSL_CLIENT_S_DN_CN']))
-        $_user_name = $_SERVER['SSL_CLIENT_S_DN_CN'];
 }
 
 # proper Emails
