WordPress.org
Get WordPress

Plugin Directory

Changeset 394795


Ignore:
Timestamp:
06/08/2011 10:17:21 PM (15 years ago)
Author:
jaredharbour
Message:

version 2.0

Location:
whipplehill-integration/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • whipplehill-integration/trunk/classes/cap.class.php

    r304204 r394795  
    4747            switch ( $cap ) {
    4848                case 'manage_network':
    49                     $caps[] = 'do_not_allow';
     49                    //$caps[] = 'do_not_allow';
    5050                break;
    5151               
    … …  
    6565                case 'install_plugins':
    6666                    $caps[] = 'do_not_allow';
     67               
    6768                break;
    6869               
    … …  
    8081                    $caps[] = 'do_not_allow';
    8182                break;
     83                /*
    8284                case 'install_themes':
    8385                    $caps[] = 'do_not_allow';
    8486                break;
     87                */
    8588                case 'edit_users':
    8689                    $caps[] = 'do_now_allow';

  • whipplehill-integration/trunk/classes/extend.class.php

    r304204 r394795  
    3030       
    3131        add_filter('wpmu_users_columns',array( &$this , 'edit_users_columns' ));
    32         add_filter('manage_users_custom_column', array( &$this , 'custom_columns' ),5, 2);
     32        add_filter('manage_users_custom_column', array( &$this , 'custom_columns' ),0, 2);
    3333       
    3434        //Remove Items that should only for Full Super Admins
    … …  
    122122    function edit_users_columns($columns){
    123123        $users_columns = array(
    124             'id'           => __( 'ID' ),
    125             'login'      => __( 'Username' ),
     124            //'id'           => __( 'ID' ),
     125            'username'      => __( 'Username' ),
    126126            'name'       => __( 'Name' ),
    127127            'email'      => __( 'E-mail' ),
    128128            'registered' => _x( 'Registered', 'user' ),
    129             'pid'       => 'WH ID',
    130             'whwpadmin' => 'WPM',   
     129            'pid'       => __( 'WH ID'),
     130            'whwpadmin' => __( 'WPM' ),
    131131            'blogs'      => __( 'Sites' )
    132132        );
    … …  
    135135
    136136   
    137     function custom_columns( $column ,$id){
     137    function custom_columns( $column , $id){
    138138        switch($column):
    139139        case 'pid':
    140             echo $this->get_podium_id_for_user($id);   
     140            echo $this->get_podium_id_for_user($id).'234'; 
    141141        break;
    142142        case 'whwpadmin':
    … …  
    151151   
    152152    }
    153 
    154 
    155    
    156 
    157    
    158    
    159153    function get_blog_list( $start = 0, $num = 10 ) {
    160154        global $wpdb;
    … …  
    205199       
    206200        $user = new WP_User( $user_id );
     201       
     202        //updated for wordpress 3.1 - allows super admin access to the network sites.
     203        $user->for_blog( 1 );
     204        $user->add_role( "subscriber" );   
     205                   
    207206        grant_super_admin( $user_id );
    208207        if ( ! in_array( $user->user_login, $wh_super_admins ) ) {
    … …  
    343342                $this->update_wh_super_admin($userinfo ,$network_admin);
    344343            }
    345             return $userinfo;
    346    
    347            
     344            return $userinfo;       
    348345        }
    349346       

  • whipplehill-integration/trunk/classes/rpc.class.php

    r304204 r394795  
    2323    function add_hooks()
    2424    {
    25         add_filter( 'xmlrpc_methods', array( &$this, 'xmlrpc_methods') );
     25       
     26        WH_Integration_Helper::log('add hooks loaded in xml rpc');
     27        add_filter( 'xmlrpc_methods', array( &$this, 'xmlrpc_methods'));
    2628    }
    2729    //END ADD FILTERS
    … …  
    2931
    3032    function xmlrpc_methods( $methods )
    31     {
     33   
     34    {
     35   
     36        WH_Integration_Helper::log('methods loaded in xml rpc');
    3237        //GET PLUGIN VERSION
    3338        $methods['wh.version'] = array(&$this,'version');   

  • whipplehill-integration/trunk/classes/sso.class.php

    r304204 r394795  
    4646    {
    4747       
    48         $sso_get = ( $_GET['sso'] ) ? $_GET['sso'] : 0; 
     48        $sso_get = isset( $_GET['sso'] ) ? $_GET['sso'] : 0; 
    4949               
    5050        if ( !is_user_logged_in() && WH_Integration_Helper::bool_val($sso_get) ) {
    5151            wp_redirect(get_option('home') . "/wp-login.php?redirect_to=" . urlencode($_SERVER['REQUEST_URI']));
    5252        }
    53             $no_sso = ($_GET['wplogin']) ? $_GET['wplogin']: 0;
    54             $no_sso_user = ($_GET['user']) ? $_GET['user'] : '';
     53            $no_sso = isset($_GET['wplogin']) ? $_GET['wplogin']: 0;
     54            $no_sso_user = isset($_GET['user']) ? $_GET['user'] : '';
    5555           
    56             if( WH_Integration_Helper::bool_val(  $no_sso ) ){
     56            if( WH_Integration_Helper::bool_val( $no_sso ) ){
    5757                $user_via_username = get_user_by('login', $no_sso_user );
    58                
     58                //wp_die("suadmin: ".$user_via_username->ID);
    5959                if( is_super_admin($user_via_username->ID) && !$this->extend_obj->wh_super_admin($user_via_username->ID)   ){
     60                   
    6061                    remove_filter( 'authenticate', array( &$this, 'sso_login_from_podium' ),10, 3);
    6162                }

  • whipplehill-integration/trunk/classes/wh-int.class.php

    r304204 r394795  
    2121        $this->sso_obj = WH_Integration::get_instance('WH_Integration_SSO');
    2222        $this->cap_obj = WH_Integration::get_instance('WH_Integration_Capabilities');
    23        
     23        WH_Integration_Helper::log('add hooks loaded in xml rpc');
    2424               
    2525        $this->add_filters_and_actions();

  • whipplehill-integration/trunk/config.php

    r304204 r394795  
    55    'plugin_name' => 'whipplehill-integration',
    66    'plugin_path' => '/' . PLUGINDIR . '/whipplehill-integration/',
    7     'plugin_version' => '1.2',
     7    'plugin_version' => '1.2.1',
    88    'plugin_url' => 'http://www.whipplehill.com/ecosystem/software/detail.aspx?id=551627'
    99);

  • whipplehill-integration/trunk/readme.txt

    r394605 r394795  
    11=== WhippleHill Integration ===
    22Contributors: WhippleHill Communications
    3 Tags: whipplehill, podium
    4 Requires at least: 3.0
    5 Tested up to: 3.0.1
    6 Stable tag: 1.2
     3Tags: whipplehill 
     4Requires at least: 3.1
     5Tested up to: 3.1.3
     6Stable tag: 2.0
    77
    88Creates a fully integrated solution between a WordPress MultiSite installation and WhippleHill's Podium Platform.
    … …  
    2424*  Multisite enabled
    2525*  The Mcrypt PHP library
    26 We canÕt test every possible environment but if you can run WordPress and have the above installed the plugin should run without any trouble.
     26
     27We can't test every possible environment but if you can run WordPress and have the above installed the plugin should run without any trouble.
    2728
    2829= Plugin Conflicts =
    … …  
    8990== Changelog ==
    9091
     92= 2.0 =
     93Added support for WordPress 3.1+ (This version of the plugin WILL NOT WORK for WordPress 3.0, please continue to use version 1.2.)
     94
    9195= 1.2 =
    9296Added support for Sub-domain installs.
     97
    9398Added checks for conflicting Plugins.
     99
    94100Fixed install issue for new installs, Podium url was not being saved.
    95101
    … …  
    134140== Upgrade Notice ==
    135141
     142= 1.2 =
     143Update for Sub-domain installs and SSO Links.
     144
    136145= 1.1.9 =
    137146Security patch for user access controls

  • whipplehill-integration/trunk/wh_integration.php

    r304204 r394795  
    44Plugin URI: http://wordpress.org/extend/plugins/whipplehill-integration/
    55Description: Connects a MultiSite WordPress installation to a school's Podium software. Requires the Integraton to be activated in Podium by WhippleHill.
    6 Version: 1.2
     6Version: 2.0
    77Author: WhippleHill Communications
    88Author URI: http://www.whipplehill.com
    … …  
    3434//define('WH_WPM_AS_SUPER_ADMIN',true);
    3535
    36 $wh_integration = new WH_integration();
     36
     37
     38add_action( 'set_current_user', 'testfuncwh' );
     39function testfuncwh(){
     40    $wh_integration = new WH_integration();
     41}
     42
     43add_filter('wp_xmlrpc_server_class','testfunctionrpc');
     44
     45function testfunctionrpc($stuff){
     46    $wh_integration = new WH_integration();
     47    return $stuff;
     48}
Note: See TracChangeset for help on using the changeset viewer.