WordPress.org
Get WordPress

Plugin Directory

Changeset 1822354


Ignore:
Timestamp:
02/14/2018 09:37:29 PM (8 years ago)
Author:
MVR
Message:

tagging version 1.0.17

Location:
userecho
Files:
2 edited
3 copied

Legend:

Unmodified
Added
Removed

  • userecho/tags/1.0.17/readme.txt

    r1822337 r1822354  
    55Requires at least: 2.8
    66Tested up to: 4.9.4
    7 Stable tag: 1.0.16
     7Stable tag: 1.0.17
    88
    99Integrate UserEcho - customer feedback and helpdesk system into your blog. Using widget or link. Support SSO.
    … …  
    4545== Changelog ==
    4646
    47 = 1.0.16 =
     47= 1.0.17 =
    4848* bug fixes
    4949= 1.0.12 =

  • userecho/tags/1.0.17/userecho.php

    r1822337 r1822354  
    22/*
    33Plugin Name: UserEcho for Wordpress - collect feedback for your blog
    4 Version: 1.0.16
     4Version: 1.0.17
    55Plugin URI: https://userecho.com
    66Author: UserEcho
    … …  
    331331            return $ue_sso_cipher->encrypt($options['api_key'], $params);
    332332        } catch (Exception $e) {
    333             return 'exception:'.$e->getMessage();
     333            return 'exception_in_wp_encrypt';
    334334        }
    335335    }
    … …  
    409409                return;
    410410            }
    411             $return_url = $_REQUEST['return'];
    412             $current_user = $this->get_current_user();
    413             #if ( !empty( $this->get_current_user()->ID) ) {
    414             if ( is_a( $current_user, 'WP_User' ) && !empty( $current_user->user_login ) ) {               
    415                 // If user is logged into WP, generate SSO and redirect him back to UE
    416                 header( 'Location: '.$this->get_sso_redirect_url($return_url) ) ;
    417                 die();
    418             }
    419             else{
    420                 if (isset($return_url)){
    421                     header( "Location: " .wp_login_url()."?redirect_to=ue_sso_redirect_to=".$return_url );
     411   
     412            try {
     413
     414                $return_url = $_REQUEST['return'];
     415                $current_user = $this->get_current_user();
     416                #if ( !empty( $this->get_current_user()->ID) ) {
     417                if ( is_a( $current_user, 'WP_User' ) && !empty( $current_user->user_login ) ) {               
     418                    // If user is logged into WP, generate SSO and redirect him back to UE
     419                    header( 'Location: '.$this->get_sso_redirect_url($return_url) ) ;
    422420                    die();
    423421                }
    424             }
     422                else{
     423                    if (isset($return_url)){
     424                        header( "Location: " .wp_login_url()."?redirect_to=ue_sso_redirect_to=".$return_url );
     425                        die();
     426                    }
     427                }
     428            } catch (Exception $e) {
     429                header( "Location: " .wp_login_url()."?redirect_to=exception_in_check_if_sso_login" );
     430                die();
     431            }
     432
    425433        }
    426434    }

  • userecho/trunk/readme.txt

    r1822337 r1822354  
    55Requires at least: 2.8
    66Tested up to: 4.9.4
    7 Stable tag: 1.0.16
     7Stable tag: 1.0.17
    88
    99Integrate UserEcho - customer feedback and helpdesk system into your blog. Using widget or link. Support SSO.
    … …  
    4545== Changelog ==
    4646
    47 = 1.0.16 =
     47= 1.0.17 =
    4848* bug fixes
    4949= 1.0.12 =

  • userecho/trunk/userecho.php

    r1822337 r1822354  
    22/*
    33Plugin Name: UserEcho for Wordpress - collect feedback for your blog
    4 Version: 1.0.16
     4Version: 1.0.17
    55Plugin URI: https://userecho.com
    66Author: UserEcho
    … …  
    331331            return $ue_sso_cipher->encrypt($options['api_key'], $params);
    332332        } catch (Exception $e) {
    333             return 'exception:'.$e->getMessage();
     333            return 'exception_in_wp_encrypt';
    334334        }
    335335    }
    … …  
    409409                return;
    410410            }
    411             $return_url = $_REQUEST['return'];
    412             $current_user = $this->get_current_user();
    413             #if ( !empty( $this->get_current_user()->ID) ) {
    414             if ( is_a( $current_user, 'WP_User' ) && !empty( $current_user->user_login ) ) {               
    415                 // If user is logged into WP, generate SSO and redirect him back to UE
    416                 header( 'Location: '.$this->get_sso_redirect_url($return_url) ) ;
    417                 die();
    418             }
    419             else{
    420                 if (isset($return_url)){
    421                     header( "Location: " .wp_login_url()."?redirect_to=ue_sso_redirect_to=".$return_url );
     411   
     412            try {
     413
     414                $return_url = $_REQUEST['return'];
     415                $current_user = $this->get_current_user();
     416                #if ( !empty( $this->get_current_user()->ID) ) {
     417                if ( is_a( $current_user, 'WP_User' ) && !empty( $current_user->user_login ) ) {               
     418                    // If user is logged into WP, generate SSO and redirect him back to UE
     419                    header( 'Location: '.$this->get_sso_redirect_url($return_url) ) ;
    422420                    die();
    423421                }
    424             }
     422                else{
     423                    if (isset($return_url)){
     424                        header( "Location: " .wp_login_url()."?redirect_to=ue_sso_redirect_to=".$return_url );
     425                        die();
     426                    }
     427                }
     428            } catch (Exception $e) {
     429                header( "Location: " .wp_login_url()."?redirect_to=exception_in_check_if_sso_login" );
     430                die();
     431            }
     432
    425433        }
    426434    }
Note: See TracChangeset for help on using the changeset viewer.