Changeset 834602

Timestamp:

01/07/2014 10:27:00 PM (12 years ago)

Author:

VanillaForums

Message:

Added the full role names to the list of roles sent with sso.

Location:

vanilla-forums/trunk

Files:

• functions.php (modified) (16 diffs)
• plugin.php (modified) (2 diffs)

vanilla-forums/trunk/functions.php

@@ -36 +36 @@
     if (!is_array($options))
         $options = array();
-        
+
     $options[$option_name] = $option_value;
     $return = update_option(VF_OPTIONS_NAME, $options);
@@ -55 +55 @@
         $Result = $Collection->$Key;
     }
-        
+
     return $Result;
 }
@@ -68 +68 @@
     if (is_wp_error($Response))
         return $Response->get_error_message();
-    
+
     return wp_remote_retrieve_body($Response);
 }
@@ -80 +80 @@
  * array('/path', 'to', 'vanilla', 'applications', 'dashboard')
  * array('/path/', '/to/', '/vanilla/', '/applications/', '/dashboard')
- * 
+ *
  * @param array $paths The array of paths to concatenate.
  * @param string $delimiter The delimiter to use when concatenating. Defaults to system-defined directory separator.
@@ -130 +130 @@
     if (!is_array($alloptions))
         $alloptions = array();
-        
+
     switch ($formname) {
         case 'url-form':
@@ -170 +170 @@
             break;
     }
-    
+
     return $options;
 }
@@ -216 +216 @@
    if (isset($Activity->Headline))
       return $Activity->Headline;
-   
+
     $ProfileUserID = -1;
     $ViewingUserID = -1;
     $GenderSuffixCode = 'First';
     $GenderSuffixGender = $Activity->ActivityGender;
-    
+
     if ($ViewingUserID == $Activity->ActivityUserID) {
         $ActivityName = $ActivityNameP = 'You';
@@ -286 +286 @@
     $ProfileHeadline = $Activity->ProfileHeadline;
     $MessageFormat = ($ProfileUserID == $Activity->ActivityUserID || $ProfileUserID == '' ? $FullHeadline : $ProfileHeadline);
-    
+
     return sprintf($MessageFormat, $ActivityName, $ActivityNameP, $RegardingName, $RegardingNameP, $RegardingWall, $Gender, $Gender2, $Route, $GenderSuffix);
 }
@@ -317 +317 @@
 
 function vf_get_user() {
-   global $current_user;
-   
+   global $current_user, $wp_roles;
+
    if (!function_exists('get_currentuserinfo'))
       require_once ABSPATH . WPINC . '/pluggable.php';
    get_currentuserinfo();
-   
+
    $user = array();
    if ($current_user->ID != '') {
@@ -330 +330 @@
       $user['photourl'] = ''; //
       $user['wp_nonce'] = wp_create_nonce('log-out');
-      
+
       // Do some fudgery to grab the photo url.
       try {
@@ -338 +338 @@
       } catch (Exception $Ex) {
       }
-      
+
       // Add the user's roles to the SSO.
       if (isset($current_user->roles)) {
-         $user['roles'] = implode(',', $current_user->roles);
+         if (!isset( $wp_roles ) )
+            $wp_roles = new WP_Roles();
+
+         $role_names = $wp_roles->role_names;
+
+         $roles = array();
+         foreach ((array)$current_user->roles as $role_slug) {
+            // Add the role slug.
+            $roles[] = $role_slug;
+
+            // Add the role name if it's different from the slug.
+            if (isset($role_names[$role_slug])) {
+               $role_name = $role_names[$role_slug];
+               if (strcasecmp($role_name, $role_slug) !== 0) {
+                  $roles[] = str_replace(',', ' ', $role_name);
+               }
+            }
+         }
+
+         $user['roles'] = implode(',', array_unique($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;
 }
@@ -356 +375 @@
 function vf_get_sso_string() {
    $user = vf_get_user();
-   
+
    if (empty($user))
       return '';
-   
+
    $options = get_option(VF_OPTIONS_NAME);
    $clientID = vf_get_value('sso-clientid', $options, '');
@@ -365 +384 @@
    if (!$clientID || !$secret)
       return '';
-   
+
    $user['client_id'] = $clientID;
-   
+
    $string = base64_encode(json_encode($user));
    $timestamp = time();
    $hash = hash_hmac('sha1', "$string $timestamp", $secret);
-   
+
    $result = "$string $hash $timestamp hmacsha1";
    return $result;
@@ -379 +398 @@
     if ($User->Photo == '')
         $User->Photo = vf_combine_paths(array($Url, 'applications/dashboard/design/images/usericon.gif'), '/');
-    
+
     $CssClass = $CssClass == '' ? '' : ' class="'.$CssClass.'"';
-    $IsFullPath = strtolower(substr($User->Photo, 0, 7)) == 'http://' || strtolower(substr($User->Photo, 0, 8)) == 'https://'; 
+    $IsFullPath = strtolower(substr($User->Photo, 0, 7)) == 'http://' || strtolower(substr($User->Photo, 0, 8)) == 'https://';
     $PhotoUrl = ($IsFullPath) ? $User->Photo : vf_combine_paths(array($Url, 'uploads/'.vf_change_basename($User->Photo, 'n%s')), '/');
     return '<a href="'.vf_combine_paths(array($Url, '/profile/'.$User->UserID.'/'.urlencode($User->Name)), '/').'"'.$CssClass.' style="display: inline-block; margin: 0 2px 2px 0">'
@@ -415 +434 @@
 }
 
-/** 
+/**
  * Place the Vanilla Forum on the external domain redirect whitelist.
  */
@@ -423 +442 @@
    if ($ix !== FALSE)
       $path = substr($path, 0, $ix);
-   
+
    if (!in_array($path, $allowed_hosts))
         $allowed_hosts[] = $path;
-   
+
     return $allowed_hosts;
 }

vanilla-forums/trunk/plugin.php

@@ -58 +58 @@
 1.1.14
 - Added a check for forum embedding so that the forum and comments don't get embedded at the same time.
+1.1.15
+- Added the full role names to the list of roles sent on sso.
 
 Copyright 2010 Vanilla Forums Inc
@@ -71 +73 @@
 define('VF_PLUGIN_URL', WP_PLUGIN_URL.'/'.plugin_basename(dirname(__FILE__)));
 
-include_once(VF_PLUGIN_PATH.'/functions.php'); 
+include_once(VF_PLUGIN_PATH.'/functions.php');
 include_once(VF_PLUGIN_PATH.'/admin.php');
 include_once(VF_PLUGIN_PATH.'/embed.php');