Merge lp:~ubuntuforums-devel/vbulletin-launchpad-integration/version4-fixes into lp:vbulletin-launchpad-integration

[kyleabaker]

vBulletin 4 fixes

Unmerged revisions

2. By kyleabaker on 2012-10-11

vBulletin 4 fixes

=== modified file 'install.txt'
--- install.txt	2012-07-23 16:23:56 +0000
+++ install.txt	2012-11-01 18:26:19 +0000
@@ -4,6 +4,7 @@
 # -----------------------------------------------------------------------------#
 #
 # Copyright 2009 Anthony Lenton
+# Copyright 2012 Kyle Baker
 # Copyright 2012 Canonical
 # 
 # This file is part of vbulletin-launchpad-integration.
@@ -21,14 +22,30 @@
 # You should have received a copy of the GNU Lesser Public License
 # along with vbulletin-launchpad-integration.  If not, see <http://www.gnu.org/licenses/>.
 
-1- Install the OpenID product.  Follow the instructions from its install.txt,
+1) Install the vBulletin OpenID product. Follow the instructions from its install.txt,
    except for any modifications to the templates. (It's not necessary to
    manually modify the templates as this product takes care of that
    automatically).
 
-2- install product-launchpad.xml using the admin Product Manager insterface
-
-3- Go to the OpenID settings group in the vBulletin options section and
-   check that you have a couple of new options ther.  Configure apropriately.
-
-
+2) Install product-launchpad.xml using the vBulletin Product Manager:
+	- Log in to the Admin Control Panel in vBulletin 4.x.
+	- In the left panel, find 'Plugins & Products' near the bottom
+	  and click the arrow to expand.
+	- Once expanded, click 'Manage Products'.
+	- From this page, find '[Add/Import Product]' at the bottom of
+	  the Installed Products section and click it.
+	- Under 'Import Product', select 'Choose File' and browse through
+	  the vBulletin Launchpad Integration installation files for
+	  'product-launchpad.xml' and open it.
+	- Click 'Import'.
+
+3) Upload vBulletin Launchpad Integration files:
+	- From the installation vBulletin Launchpad Integration files, find
+	  the directory labeled 'upload'.
+	- Upload the contents of the 'upload' directory to the base directory
+	  of your vBulletin 4.x installation.
+
+3) Go to the OpenID settings group in the vBulletin options section and
+   check that you have a couple of new options there. Configure apropriately.
+
+Congratulations! Installation is complete!

=== modified file 'product-launchpad.xml'
--- product-launchpad.xml	2012-07-23 16:23:56 +0000
+++ product-launchpad.xml	2012-11-01 18:26:19 +0000
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+
 <!--
 Copyright 2009 Anthony Lenton
+Copyright 2012 Kyle Baker
 Copyright 2012 Canonical
 
 This file is part of vbulletin-launchpad-integration.
@@ -18,82 +20,78 @@
 You should have received a copy of the GNU Lesser Public License
 along with vbulletin-launchpad-integration.  If not, see <http://www.gnu.org/licenses/>.
 -->
+
 <product productid="launchpad" active="1">
-    <title>Launchpad Login</title>
-    <description>Launchpad integration product</description>
-    <version>1.0.0</version>
-    <url>https://code.launchpad.net/~sfi-team/canonical-bis-openid/vbulletin-openid</url>
-    <versioncheckurl />
-    <dependencies>
-        <dependency dependencytype="product" parentproductid="openid"
-                    minversion="1.0.0" maxversion="" />
-    </dependencies>
-    <codes>
-        <code version="1.0.0">
-            <installcode><![CDATA[
-
-]]></installcode>
-        </code>
-    </codes>
-    <templates>
-        <template name="launchpad_profile_fieldset" templatetype="template" username="achuni" version="1.0.0"><![CDATA[
-<fieldset class="fieldset">
-    <legend>Launchpad OpenID</legend>
-    <table cellpadding="0" cellspacing="3" border="0" width="100%">
-        <tr><td>
-        <if condition="$current_openid_url">Your current Launchpad OpenID url is:
-        <pre style="background-color:#ddd;padding:5px">$current_openid_url</pre></if>
-        </td></tr>
-        <tr><td><a href="launchpad_login.php?do=editprofile">Click here</a>
-                to update your Launchpad OpenID</td></tr>
-    </table>
-</fieldset>
-]]></template>
-    </templates>
-    <plugins>
-        <plugin active="1">
-            <title>Edit Launchpad OpenID</title>
-            <hookname>profile_complete</hookname>
-            <phpcode><![CDATA[include('launchpad_editprofile.php');]]></phpcode>
-        </plugin>
-
-        <plugin active="1">
-            <title>Add Launchpad signin link</title>
-            <hookname>global_setup_complete</hookname>
-            <phpcode><![CDATA[include('launchpad_add_signin_link.php');]]></phpcode>
-        </plugin>
-
-        <plugin active="1">
-            <title>Sync Launchpad User Info</title>
-            <hookname>login_process</hookname>
-            <phpcode><![CDATA[include('launchpad_sync_userinfo.php');]]></phpcode>
-        </plugin>
-    </plugins>
-    <phrases>
-        <phrasetype name="vBulletin Settings" fieldname="vbsettings">
-            <phrase name="setting_launchpad_sync_desc"><![CDATA[Keep usernames and emails in sync with Launchpad]]></phrase>
-            <phrase name="setting_launchpad_sync_title"><![CDATA[Keep in sync with Launchpad]]></phrase>
-            <phrase name="setting_launchpad_provider_title"><![CDATA[Launchpad OpenID Provider]]></phrase>
-            <phrase name="setting_launchpad_provider_desc"><![CDATA[The URL of Launchpad's OpenID provider.  This should only be changed for testing.]]></phrase>
-        </phrasetype>
-    </phrases>
-    <options>
-        <settinggroup name="openid" displayorder="999">
-            <setting varname="launchpad_sync" displayorder="1">
-                <datatype>boolean</datatype>
-                <optioncode>yesno</optioncode>
-                <defaultvalue>1</defaultvalue>
-            </setting>
-            <setting varname="launchpad_provider" displayorder="2">
-                <datatype>free</datatype>
-                <defaultvalue>https://login.launchpad.net</defaultvalue>
-            </setting>
-        </settinggroup>
-    </options>
-    <helptopics>
-    </helptopics>
-    <cronentries>
-    </cronentries>
-    <faqentries>
-    </faqentries>
+	<title>Launchpad Login</title>
+	<description>Launchpad Integration</description>
+	<version>1.0.0</version>
+	<url>https://code.launchpad.net/~sfi-team/canonical-bis-openid/vbulletin-openid</url>
+	<versioncheckurl/>
+	<dependencies>
+		<dependency dependencytype="vbulletin" minversion="4.2.0" maxversion=""/>
+		<dependency dependencytype="product" parentproductid="openid" minversion="1.0.0" maxversion=""/>
+	</dependencies>
+	<codes>
+		<code version="1.0.0">
+			<installcode><![CDATA[
+
+			]]></installcode>
+		</code>
+	</codes>
+	<templates>
+		<template name="launchpad_profile_fieldset" templatetype="template" username="achuni" version="1.0.0">
+			<![CDATA[
+<div class="blockrow">
+	<label>Launchpad OpenID:</label>
+	<div class="rightcol">
+		<vb:if condition="$current_openid_url"><input type="text" class="primary textbox" name="userfield[field{vb:raw userfield_number}]" id="cfield_{vb:raw userfield_number}" value="{vb:raw current_openid_url}" maxlength="100" tabindex="1" /></vb:if>
+		<p class="description"><vb:if condition="$current_openid_url">Your<vb:else />You've not setup your</vb:if> Launchpad OpenID (<a href="launchpad_login.php?do=editprofile">Click here</a> to update)</p>
+		<input type="hidden" name="userfield[field{vb:raw userfield_number}_set]" value="1" />
+	</div>
+</div>
+		]]></template>
+	</templates>
+	<plugins>
+		<plugin active="1">
+			<title>Edit Launchpad OpenID</title>
+			<hookname>profile_fetch_profilefields</hookname>
+			<phpcode><![CDATA[include('launchpad_editprofile.php');]]></phpcode>
+		</plugin>
+
+		<plugin active="1">
+			<title>Add Launchpad signin link</title>
+			<hookname>global_setup_complete</hookname>
+			<phpcode><![CDATA[include('launchpad_add_signin_link.php');]]></phpcode>
+		</plugin>
+
+		<plugin active="1">
+			<title>Sync Launchpad User Info</title>
+			<hookname>login_process</hookname>
+			<phpcode><![CDATA[include('launchpad_sync_userinfo.php');]]></phpcode>
+		</plugin>
+	</plugins>
+	<phrases>
+		<phrasetype name="vBulletin Settings" fieldname="vbsettings">
+			<phrase name="setting_launchpad_sync_desc"><![CDATA[Keep usernames and emails in sync with Launchpad]]></phrase>
+			<phrase name="setting_launchpad_sync_title"><![CDATA[Keep in sync with Launchpad]]></phrase>
+			<phrase name="setting_launchpad_provider_title"><![CDATA[Launchpad OpenID Provider]]></phrase>
+			<phrase name="setting_launchpad_provider_desc"><![CDATA[The URL of Launchpad's OpenID provider. This should only be changed for testing.]]></phrase>
+		</phrasetype>
+	</phrases>
+	<options>
+		<settinggroup name="openid" displayorder="999">
+			<setting varname="launchpad_sync" displayorder="1">
+				<datatype>boolean</datatype>
+				<optioncode>yesno</optioncode>
+				<defaultvalue>1</defaultvalue>
+			</setting>
+			<setting varname="launchpad_provider" displayorder="2">
+				<datatype>free</datatype>
+				<defaultvalue>https://login.launchpad.net</defaultvalue>
+			</setting>
+		</settinggroup>
+	</options>
+	<!-- <helptopics/> -->
+	<!-- <cronentries/> -->
+	<!-- <faqentries/> -->
 </product>

=== modified file 'upload/launchpad_add_signin_link.php'
--- upload/launchpad_add_signin_link.php	2012-07-23 16:23:56 +0000
+++ upload/launchpad_add_signin_link.php	2012-11-01 18:26:19 +0000
@@ -1,5 +1,7 @@
-<!--
+<?php
+/**
 Copyright 2009 Anthony Lenton
+Copyright 2012 Kyle Baker
 Copyright 2012 Canonical
 
 This file is part of vbulletin-launchpad-integration.
@@ -16,12 +18,13 @@
 
 You should have received a copy of the GNU Lesser Public License
 along with vbulletin-launchpad-integration.  If not, see <http://www.gnu.org/licenses/>.
--->
-<?php
-if (!$show['member'] &&
-    (THIS_SCRIPT != 'login' || $_GET['do'] == 'logout' || ($_GET['do'] == 'login' && !$_GET['janrain_nonce'])) &&
-    (THIS_SCRIPT != 'register')) {
-    $header .= '<div style="float:right;margin-top:20px" id="launchpad_login"><small>Or,
-    <a href="launchpad_login.php">Sign in using your Launchpad ID</a></small></div>';
-}
+*/
+
+	if (!$show['member'] &&
+		(THIS_SCRIPT != 'login' || $_GET['do'] == 'logout' || ($_GET['do'] == 'login' && !$_GET['janrain_nonce'])) &&
+		(THIS_SCRIPT != 'register'))
+	{
+		$header .= '<div style="float:right;margin-top:20px" id="launchpad_login"><small>Or,
+		<a href="launchpad_login.php">Sign in using your Launchpad ID</a></small></div>';
+	}
 ?>

=== modified file 'upload/launchpad_editprofile.php'
--- upload/launchpad_editprofile.php	2012-07-23 16:23:56 +0000
+++ upload/launchpad_editprofile.php	2012-11-01 18:26:19 +0000
@@ -1,5 +1,7 @@
-<!--
+<?php
+/**
 Copyright 2009 Anthony Lenton
+Copyright 2012 Kyle Baker
 Copyright 2012 Canonical
 
 This file is part of vbulletin-launchpad-integration.
@@ -16,54 +18,75 @@
 
 You should have received a copy of the GNU Lesser Public License
 along with vbulletin-launchpad-integration.  If not, see <http://www.gnu.org/licenses/>.
--->
-<?php
-/*
- * This file is called from the 'profile_complete' hook.
- * It adds the 'Update your Launchpad OpenID' field to the profile edition form,
- * and handles Launchpad's response
- */
-
-require_once 'openid_utils.php';
-
-$vbulletin->input->clean_array_gpc('r', array(
-    'openid' => TYPE_STR,
-    'openid_mode' => TYPE_STR,
-));
-
-if ($vbulletin->GPC['openid_mode'] == 'id_res') {
-    // Coming back from the provider
-    vBOpenID_init ($vbulletin);
-
-    require_once 'Auth/OpenID.php';
-    require_once 'Auth/OpenID/Consumer.php';
-    require_once 'Auth/OpenID/SReg.php';
-
-    require_once 'openid_store.php';
-    session_name('vbulletin-openid');
-    session_start();
-    $dbStore = new vBulletin_OpenID_OptionStore($vbulletin);
-    $auth = new Auth_OpenID_Consumer($dbStore);
-    $return_to = $vbulletin->options['bburl'] . '/profile.php?do=editprofile';
-
-    $return = $auth->complete($return_to);
-    $openid = $return->getDisplayIdentifier();
-
-    if ($return->status == Auth_OpenID_SUCCESS) {
-        $openid = $return->getDisplayIdentifier();
-        $openid_userid = $vbulletin->userinfo['userid'];
-        vBOpenID_setOpenID ($openid_userid, $openid, $vbulletin);
-        session_destroy();
-        $vbulletin->userinfo[find_openid_fieldname($vbulletin)] = $openid;
-    }
-    else {
-        session_destroy();
-    }
-}
-
-$current_openid_url = $vbulletin->userinfo[find_openid_fieldname($vbulletin)];
-eval('$fieldset = "' . fetch_template('launchpad_profile_fieldset') . '";');
-$customfields[regular] .= $fieldset;
-
-
+*/
+
+	/*
+	* This file is called from the 'profile_complete' hook.
+	* It adds the 'Update your Launchpad OpenID' field to the profile edition form,
+	* and handles Launchpad's response
+	*/
+
+	require_once 'vbopenid/openid_utils.php';
+
+	$vbulletin->input->clean_array_gpc('r', array(
+		'openid' => TYPE_STR,
+		'openid_mode' => TYPE_STR,
+	));
+
+	if ($vbulletin->GPC['openid_mode'] == 'id_res')
+	{
+		// Coming back from the provider
+		vBOpenID_init ($vbulletin);
+
+		require_once 'Auth/OpenID.php';
+		require_once 'Auth/OpenID/Consumer.php';
+		require_once 'Auth/OpenID/SReg.php';
+
+		require_once 'vbopenid/openid_store.php';
+		session_name('vbulletin-openid');
+		session_start();
+		$dbStore = new vBulletin_OpenID_OptionStore($vbulletin);
+		$auth = new Auth_OpenID_Consumer($dbStore);
+		$return_to = $vbulletin->options['bburl'] . '/profile.php?do=editprofile';
+
+		$return = $auth->complete($return_to);
+		$openid = $return->getDisplayIdentifier();
+
+		if ($return->status == Auth_OpenID_SUCCESS)
+		{
+			$openid = $return->getDisplayIdentifier();
+			$openid_userid = $vbulletin->userinfo['userid'];
+			vBOpenID_setOpenID ($openid_userid, $openid, $vbulletin);
+			session_destroy();
+			$vbulletin->userinfo[find_openid_fieldname($vbulletin)] = $openid;
+		}
+		else
+		{
+			session_destroy();
+		}
+	}
+
+	if ($_GET['do'] == "editprofile")
+	{
+		$current_openid_url = $vbulletin->userinfo[find_openid_fieldname($vbulletin)];
+
+		// Let's create our fieldset from our template
+		$templater = vB_Template::create('launchpad_profile_fieldset');
+		$templater->register('current_openid_url', $current_openid_url);
+		$template = $templater->render();
+
+		// This fieldset is our profile field for the user's
+		// Launchpad OpenID url.
+		$fieldset = $template;
+
+		// If our fieldset already exists then it was added in
+		// a previous loop so we'll skip adding it again. Otherwise
+		// we'll add it here.
+		if (!strpos($customfields['regular'], "Launchpad"))
+		{
+			$temp = $customfields['regular'];
+			$customfields['regular'] .= $fieldset;
+			$foo = $customfields['regular'];
+		}
+	}
 ?>

=== modified file 'upload/launchpad_login.php'
--- upload/launchpad_login.php	2012-07-23 16:23:56 +0000
+++ upload/launchpad_login.php	2012-11-01 18:26:19 +0000
@@ -1,5 +1,7 @@
-<!--
+<?php
+/**
 Copyright 2009 Anthony Lenton
+Copyright 2012 Kyle Baker
 Copyright 2012 Canonical
 
 This file is part of vbulletin-launchpad-integration.
@@ -16,64 +18,69 @@
 
 You should have received a copy of the GNU Lesser Public License
 along with vbulletin-launchpad-integration.  If not, see <http://www.gnu.org/licenses/>.
--->
-<?php
-// ####################### SET PHP ENVIRONMENT ###########################
-error_reporting(E_ALL & ~E_NOTICE);
-
-// #################### DEFINE IMPORTANT CONSTANTS #######################
-define('THIS_SCRIPT', 'launchpad_login');
-define('CSRF_PROTECTION', true);
-define('CSRF_SKIP_LIST', 'launchpad_login');
-
-// ################### PRE-CACHE TEMPLATES AND DATA ######################
-// get special phrase groups
-$phrasegroups = array();
-
-// get special data templates from the datastore
-$specialtemplates = array();
-
-// pre-cache templates used by all actions
-$globaltemplates = array();
-
-// pre-cache templates used by specific actions
-$actiontemplates = array();
-
-// ######################### REQUIRE BACK-END ############################
-require_once './global.php';
-
-require_once 'openid_utils.php';
-vBOpenID_init ($vbulletin);
-
-require_once 'Auth/OpenID.php';
-require_once 'Auth/OpenID/Consumer.php';
-require_once 'Auth/OpenID/SReg.php';
-
-require_once 'openid_store.php';
-session_name('vbulletin-openid');
-session_start();
-
-$dbStore = new vBulletin_OpenID_OptionStore($vbulletin);
-$auth = new Auth_OpenID_Consumer($dbStore);
-
-
-$authRequest = $auth->begin($vbulletin->options['launchpad_provider']);
-
-if ($authRequest === Null) {
-    // Couldn't contact Launchpad, or some other ugly error
-    eval(standard_error(fetch_error('openid_server_not_allowed', $vbulletin->options['launchpad_provider'])));
-}
-
-$endpoint = $authRequest->endpoint->server_url;
-
-if ($_GET['do'] == 'editprofile') {
-    $return_to = $vbulletin->options['bburl'] . '/profile.php?do=editprofile';
-}
-else {
-    $return_to = $vbulletin->options['bburl'] . '/login.php?do=login';
-}
-$error = vBOpenID_sendRequest ($vbulletin, $authRequest, $return_to);
-if ($error !== False) {
-    eval(standard_error($error));
-}
-
+*/
+
+	// ####################### SET PHP ENVIRONMENT ###########################
+	error_reporting(E_ALL & ~E_NOTICE);
+
+	// #################### DEFINE IMPORTANT CONSTANTS #######################
+	define('THIS_SCRIPT', 'launchpad_login');
+	define('CSRF_PROTECTION', true);
+	define('CSRF_SKIP_LIST', 'launchpad_login');
+
+	// ################### PRE-CACHE TEMPLATES AND DATA ######################
+	// get special phrase groups
+	$phrasegroups = array();
+
+	// get special data templates from the datastore
+	$specialtemplates = array();
+
+	// pre-cache templates used by all actions
+	$globaltemplates = array();
+
+	// pre-cache templates used by specific actions
+	$actiontemplates = array();
+
+	// ######################### REQUIRE BACK-END ############################
+	require_once 'global.php';
+
+	require_once 'vbopenid/openid_utils.php';
+	vBOpenID_init ($vbulletin);
+
+	require_once 'Auth/OpenID.php';
+	require_once 'Auth/OpenID/Consumer.php';
+	require_once 'Auth/OpenID/SReg.php';
+
+	require_once 'vbopenid/openid_store.php';
+	session_name('vbulletin-openid');
+	session_start();
+
+	$dbStore = new vBulletin_OpenID_OptionStore($vbulletin);
+	$auth = new Auth_OpenID_Consumer($dbStore);
+
+	$authRequest = $auth->begin($vbulletin->options['launchpad_provider']);
+	//$authRequest = $auth->begin($vbulletin->GPC['openid']);
+
+	if ($authRequest === null)
+	{
+		// Couldn't contact Launchpad, or some other ugly error
+		eval(standard_error(fetch_error('openid_server_not_allowed', $vbulletin->options['launchpad_provider'])));
+	}
+
+	$endpoint = $authRequest->endpoint->server_url;
+
+	if ($_GET['do'] == 'editprofile')
+	{
+		$return_to = $vbulletin->options['bburl'] . '/profile.php?do=editprofile';
+	}
+	else
+	{
+		$return_to = $vbulletin->options['bburl'] . '/login.php?do=login';
+	}
+
+	$error = vBOpenID_sendRequest ($vbulletin, $authRequest, $return_to);
+	if ($error !== false)
+	{
+		eval(standard_error($error));
+	}
+?>

=== modified file 'upload/launchpad_sync_userinfo.php'
--- upload/launchpad_sync_userinfo.php	2012-07-23 16:23:56 +0000
+++ upload/launchpad_sync_userinfo.php	2012-11-01 18:26:19 +0000
@@ -1,5 +1,7 @@
-<!--
+<?php
+/**
 Copyright 2009 Anthony Lenton
+Copyright 2012 Kyle Baker
 Copyright 2012 Canonical
 
 This file is part of vbulletin-launchpad-integration.
@@ -16,40 +18,46 @@
 
 You should have received a copy of the GNU Lesser Public License
 along with vbulletin-launchpad-integration.  If not, see <http://www.gnu.org/licenses/>.
--->
-<?php
-
-if ($vbulletin->options['launchpad_sync']) {
-    $vbulletin->input->clean_array_gpc('r', array(
-        'openid_mode' => TYPE_STR,
-        'openid_sreg_nickname' => TYPE_STR,
-        'openid_sreg_email' => TYPE_STR,
-    ));
-
-    if ($vbulletin->GPC['openid_mode'] == 'id_res') {
-        $nickname = $vbulletin->GPC['openid_sreg_nickname'];
-        $email    = $vbulletin->GPC['openid_sreg_email'];
-
-        if ($nickname  && $nickname != $vbulletin->userinfo['username']) {
-            $data1 =& datamanager_init('User', $vbulletin, ERRTYPE_ARRAY);
-            $data1->set_existing($vbulletin->userinfo);
-            $data1->set('username', $nickname);
-            $data1->pre_save();
-            if (count($data1->errors) == 0) {
-                $data1->save();
-            }
-        }
-
-        if ($email && $email != $vbulletin->userinfo['email']) {
-            $data2 =& datamanager_init('User', $vbulletin, ERRTYPE_ARRAY);
-            $data2->set_existing($vbulletin->userinfo);
-            $data2->set('email', $email);
-            $data2->pre_save();
-            if (count($data2->errors) == 0) {
-                $data2->save();
-            }
-        }
-    }
-}
-
+*/
+
+	if ($vbulletin->options['launchpad_sync'])
+	{
+		$vbulletin->input->clean_array_gpc('r', array(
+			'openid_mode' => TYPE_STR,
+			'openid_sreg_nickname' => TYPE_STR,
+			'openid_sreg_email' => TYPE_STR,
+		));
+
+		if ($vbulletin->GPC['openid_mode'] == 'id_res')
+		{
+			$nickname = $vbulletin->GPC['openid_sreg_nickname'];
+			$email    = $vbulletin->GPC['openid_sreg_email'];
+
+			if ($nickname && $nickname != $vbulletin->userinfo['username'])
+			{
+				$data1 =& datamanager_init('User', $vbulletin, ERRTYPE_ARRAY);
+				$data1->set_existing($vbulletin->userinfo);
+				$data1->set('username', $nickname);
+				$data1->pre_save();
+
+				if (count($data1->errors) == 0)
+				{
+					$data1->save();
+				}
+			}
+
+			if ($email && $email != $vbulletin->userinfo['email'])
+			{
+				$data2 =& datamanager_init('User', $vbulletin, ERRTYPE_ARRAY);
+				$data2->set_existing($vbulletin->userinfo);
+				$data2->set('email', $email);
+				$data2->pre_save();
+
+				if (count($data2->errors) == 0)
+				{
+					$data2->save();
+				}
+			}
+		}
+	}
 ?>