Changeset 538201

Timestamp:

04/30/2012 03:33:35 PM (14 years ago)

Author:

VanillaForums

Message:

Added current roles to the SSO manifest. Added the vf_get_user filter to allow other plugins to modify SSO.

Location:

vanilla-forums/trunk

Files:

• functions.php (modified) (4 diffs)
• hooks.php (modified) (1 diff)
• plugin.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)

vanilla-forums/trunk/functions.php

@@ -3 +3 @@
  * Utility & hook functions.
  */
+
+function vf_check_request() {
+   if (isset($_GET['VFRequest'])) {
+      require dirname(__FILE__).'/sso.php';
+   }
+}
 
 
@@ -300 +306 @@
    
    if (!function_exists('get_currentuserinfo'))
-      require (ABSPATH . WPINC . '/pluggable.php');
+      require_once ABSPATH . WPINC . '/pluggable.php';
    get_currentuserinfo();
-        
+   
    $user = array();
    if ($current_user->ID != '') {
@@ -311 +317 @@
       $user['wp_nonce'] = wp_create_nonce('log-out');
       
+      // Do some fudgery to grab the photo url.
       try {
          $avatar = new SimpleXMLElement(get_avatar($current_user->ID));
@@ -317 +324 @@
       } catch (Exception $Ex) {
       }
-   }
+      
+      // Add the user's roles to the SSO.
+      if (isset($current_user->roles)) {
+         $user['roles'] = implode(',', $current_user->roles);
+      } else {
+         $user['roles'] = null;
+      }
+//      $user['_user'] = $current_user;
+   }   
+   
+   // Allow other plugins to modify the user.
+   $user = apply_filters('vf_get_user', $user);
    
    return $user;

vanilla-forums/trunk/hooks.php

@@ -35 +35 @@
 // Add our js to update the comment count
 add_action('wp_footer', 'vf_comment_count_js');
+add_action('wp_loaded', 'vf_check_request');

vanilla-forums/trunk/plugin.php

@@ -4 +4 @@
 Plugin URI: http://vanillaforums.org/addons/
 Description: Integrates Vanilla Forums with Wordpress: embedded blog comments, embedded forum, single sign on, and Wordpress widgets.
-Version: 1.1.8
+Version: 1.1.9
 Author: Mark O'Sullivan
 Author URI: http://www.vanillaforums.org/
@@ -46 +46 @@
 1.1.8
 - Fixed sso photourl.
+1.1.9
+- Made the sso pluggable.
 
 Copyright 2010 Vanilla Forums Inc
@@ -63 +65 @@
 include_once(VF_PLUGIN_PATH.'/embed.php');
 include_once(VF_PLUGIN_PATH.'/widgets.php');
-include_once(VF_PLUGIN_PATH.'/sso.php');
+//include_once(VF_PLUGIN_PATH.'/sso.php');
 include_once(VF_PLUGIN_PATH.'/hooks.php');

vanilla-forums/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3
 Tested up to: 3.3.1
-Stable tag: 1.1.8
+Stable tag: 1.1.9
 
 == Description ==