[Fusionforge-commits] r12881 - in trunk/src: debian plugins/authopenid/include plugins/authopenid/www

[Olivier Berger]

Author: olberger
Date: 2011-03-21 19:15:12 +0100 (Mon, 21 Mar 2011)
New Revision: 12881

Modified:
   trunk/src/debian/control
   trunk/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
   trunk/src/plugins/authopenid/www/post-login.php
Log:
OK this time

Modified: trunk/src/debian/control
===================================================================
--- trunk/src/debian/control	2011-03-21 18:15:02 UTC (rev 12880)
+++ trunk/src/debian/control	2011-03-21 18:15:12 UTC (rev 12881)
@@ -271,6 +271,20 @@
  directory, and syncs some of their personal information from LDAP
  into the FusionForge database.
 
+Package: fusionforge-plugin-authopenid
+Architecture: all
+Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, ${misc:Depends}
+Description: collaborative development tool - OpenID consumer authentication plugin
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains an OpenID consumer authentication mechanism for
+ FusionForge. It allows users to authenticate against external OpenID
+ providers.
+
 Package: fusionforge-plugin-blocks
 Architecture: all
 Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, php5-cli, ${misc:Depends}

Modified: trunk/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
===================================================================
--- trunk/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php	2011-03-21 18:15:02 UTC (rev 12880)
+++ trunk/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php	2011-03-21 18:15:12 UTC (rev 12881)
@@ -143,7 +143,7 @@
 		if($res) {
 			$row = db_fetch_array_by_row($res, 0);
 			if($row) {
-				$user_id = $row['user_name'];
+				$user_name = $row['user_name'];
 			}
 		}
 		return $user_name;

Modified: trunk/src/plugins/authopenid/www/post-login.php
===================================================================
--- trunk/src/plugins/authopenid/www/post-login.php	2011-03-21 18:15:02 UTC (rev 12880)
+++ trunk/src/plugins/authopenid/www/post-login.php	2011-03-21 18:15:12 UTC (rev 12881)
@@ -80,9 +80,11 @@
     		
     		// initiate session
 	    	if ($plugin->isSufficient()) {
+	    		$user = False;
+	    		
 	    		$username = $plugin->getUserNameFromOpenIDIdentity($plugin->openid->identity);
 				if ($username) {
-					$user = $this->startSession($username);
+					$user = $plugin->startSession($username);
 				}
 			
 				if($user) {