Changeset 1679807
- Timestamp:
- 06/16/2017 10:57:42 AM (9 years ago)
- Location:
- ider-login
- Files:
-
- 5 edited
- 26 copied
-
tags/1.5.4 (copied) (copied from ider-login/trunk)
-
tags/1.5.4/LICENSE.txt (copied) (copied from ider-login/trunk/LICENSE.txt)
-
tags/1.5.4/assets (copied) (copied from ider-login/trunk/assets)
-
tags/1.5.4/assets/css/admin.css (copied) (copied from ider-login/trunk/assets/css/admin.css)
-
tags/1.5.4/assets/css/general.css (copied) (copied from ider-login/trunk/assets/css/general.css)
-
tags/1.5.4/assets/images/ider_logo_white_32.png (copied) (copied from ider-login/trunk/assets/images/ider_logo_white_32.png)
-
tags/1.5.4/assets/js/admin.js (copied) (copied from ider-login/trunk/assets/js/admin.js)
-
tags/1.5.4/composer.json (copied) (copied from ider-login/trunk/composer.json)
-
tags/1.5.4/composer.lock (copied) (copied from ider-login/trunk/composer.lock)
-
tags/1.5.4/includes (copied) (copied from ider-login/trunk/includes)
-
tags/1.5.4/includes/IDER_Admin.php (copied) (copied from ider-login/trunk/includes/IDER_Admin.php) (5 diffs)
-
tags/1.5.4/includes/IDER_Callback.php (copied) (copied from ider-login/trunk/includes/IDER_Callback.php) (1 diff)
-
tags/1.5.4/includes/IDER_Rewrites.php (copied) (copied from ider-login/trunk/includes/IDER_Rewrites.php)
-
tags/1.5.4/includes/IDER_Server.php (copied) (copied from ider-login/trunk/includes/IDER_Server.php) (2 diffs)
-
tags/1.5.4/includes/IDER_Shortcodes.php (copied) (copied from ider-login/trunk/includes/IDER_Shortcodes.php)
-
tags/1.5.4/includes/IDER_UserInfoManager.php (copied) (copied from ider-login/trunk/includes/IDER_UserInfoManager.php)
-
tags/1.5.4/includes/IDER_Widget.php (copied) (copied from ider-login/trunk/includes/IDER_Widget.php)
-
tags/1.5.4/log (copied) (copied from ider-login/trunk/log)
-
tags/1.5.4/log/ider-connect.log (copied) (copied from ider-login/trunk/log/ider-connect.log)
-
tags/1.5.4/readme.md (copied) (copied from ider-login/trunk/readme.md) (1 diff)
-
tags/1.5.4/vendor (copied) (copied from ider-login/trunk/vendor)
-
tags/1.5.4/vendor/autoload.php (copied) (copied from ider-login/trunk/vendor/autoload.php)
-
tags/1.5.4/vendor/composer/autoload_real.php (copied) (copied from ider-login/trunk/vendor/composer/autoload_real.php)
-
tags/1.5.4/vendor/composer/autoload_static.php (copied) (copied from ider-login/trunk/vendor/composer/autoload_static.php)
-
tags/1.5.4/vendor/jlmsrl/ider-openid-client-php/src/IDEROpenIDClient.php (copied) (copied from ider-login/trunk/vendor/jlmsrl/ider-openid-client-php/src/IDEROpenIDClient.php)
-
tags/1.5.4/wp-ider-login-client.php (copied) (copied from ider-login/trunk/wp-ider-login-client.php) (2 diffs)
-
trunk/includes/IDER_Admin.php (modified) (5 diffs)
-
trunk/includes/IDER_Callback.php (modified) (1 diff)
-
trunk/includes/IDER_Server.php (modified) (2 diffs)
-
trunk/readme.md (modified) (1 diff)
-
trunk/wp-ider-login-client.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ider-login/tags/1.5.4/includes/IDER_Admin.php
r1673502 r1679807 88 88 <li>Set the campaign id to retrieve the user data you chose.</li> 89 89 <li>If you open a custom campaign and want your customer to land on a specific page, please configure it in the advanced setting "Campaigns Landing pages" using the format <strong><Campaign id>=<Landing Page></strong> 90 <li>You can place the IDer button everywhere using widget, the classic form or the shortcode [ider_login_button]</li> 90 91 </li> 91 92 </ol> … … 112 113 113 114 <tr valign="top"> 114 <th scope="row"> Login button scope</th>115 <th scope="row">Scope Name</th> 115 116 <td> 116 117 <input type="text" name="<?php echo $this->option_name ?>[extra_scopes]" min="10" … … 128 129 </tr> 129 130 130 131 <tr valign="top">132 <th scope="row">Redirect to the IDer welcome page</th>133 <td>134 <input type="checkbox" name="<?php echo $this->option_name ?>[redirect_to_page]"135 value="1" <?php echo $options['redirect_to_page'] == 1 ? 'checked="checked"' : ''; ?> />136 </td>137 </tr>138 139 140 131 <tr valign="top"> 141 132 <th scope="row">Welcome page</th> … … 144 135 name="<?php echo $this->option_name ?>[welcome_page]" 145 136 min="10" 146 value="<?php echo $options["welcome_page"]; ?>"/>137 value="<?php echo preg_replace('/^(\/)*/i','',str_replace(site_url(), '' ,$options["welcome_page"])); ?>"/> 147 138 </td> 148 139 </tr> … … 197 188 public function validate($input) 198 189 { 199 $input['redirect_to_page'] = isset($input['redirect_to_page']) ? $input['redirect_to_page'] : 0; 190 191 $input['client_id'] = trim($input['client_id']); 192 $input['client_secret'] = trim($input['client_secret']); 193 $input['extra_scopes'] = trim($input['extra_scopes']); 194 $input['welcome_page'] = site_url(trim($input['welcome_page'])); 200 195 201 196 return $input; -
ider-login/tags/1.5.4/includes/IDER_Callback.php
r1664624 r1679807 63 63 apply_filters('after_callback_handler', $user_info, $_SESSION['openid_connect_scope']); 64 64 65 if (true == IDER_Server::get_option('redirect_to_page')) { 66 wp_redirect(IDER_Server::get_option('welcome_page')); 67 } else { 68 wp_redirect(home_url()); 69 } 65 wp_redirect(IDER_Server::get_option('welcome_page')); 66 70 67 exit; 71 68 } -
ider-login/tags/1.5.4/includes/IDER_Server.php
r1664624 r1679807 23 23 'client_secret' => '', 24 24 'extra_scopes' => '', 25 'redirect_to_page' => true,26 25 'login_form_button' => true, 27 26 'welcome_page' => 'my-account/ider-profile', … … 181 180 public function setup() 182 181 { 183 $options = get_option("wposso_options"); 184 if (!isset($options["server_url"])) { 185 update_option("wposso_options", self::$default_settings); 186 } 182 183 $options = self::$default_settings; 184 185 // if woocommerce then set the welcome page to user profile 186 if (class_exists('WooCommerce')) { 187 $options['welcome_page'] = site_url('my-account/ider-profile'); 188 } else { 189 $options['welcome_page'] = home_url(); 190 } 191 192 update_option("wposso_options", $options); 193 194 } 195 196 197 /** 198 * Plugin Setup 199 */ 200 public function upgrade() 201 { 202 187 203 } 188 204 -
ider-login/tags/1.5.4/readme.md
r1673502 r1679807 3 3 Requires at least: 4.6 4 4 Tested up to: 4.7.3 5 Stable tag: 1.5. 35 Stable tag: 1.5.4 6 6 License: Apache License, Version 2.0 or later 7 7 License URI: http://directory.fsf.org/wiki/License:Apache2.0 -
ider-login/tags/1.5.4/wp-ider-login-client.php
r1673502 r1679807 3 3 * Plugin Name: IDer Login 4 4 * Plugin URI: https://www.ider.com 5 * Version: 1.5. 35 * Version: 1.5.4 6 6 * Description: Provides Single Sign On via IDer Identity Server 7 7 * Author: JLM srl … … 34 34 35 35 if (!defined('IDER_CLIENT_VERSION')) { 36 define('IDER_CLIENT_VERSION', ' 0.8.0');36 define('IDER_CLIENT_VERSION', '1.5.4'); 37 37 } 38 38 -
ider-login/trunk/includes/IDER_Admin.php
r1673502 r1679807 88 88 <li>Set the campaign id to retrieve the user data you chose.</li> 89 89 <li>If you open a custom campaign and want your customer to land on a specific page, please configure it in the advanced setting "Campaigns Landing pages" using the format <strong><Campaign id>=<Landing Page></strong> 90 <li>You can place the IDer button everywhere using widget, the classic form or the shortcode [ider_login_button]</li> 90 91 </li> 91 92 </ol> … … 112 113 113 114 <tr valign="top"> 114 <th scope="row"> Login button scope</th>115 <th scope="row">Scope Name</th> 115 116 <td> 116 117 <input type="text" name="<?php echo $this->option_name ?>[extra_scopes]" min="10" … … 128 129 </tr> 129 130 130 131 <tr valign="top">132 <th scope="row">Redirect to the IDer welcome page</th>133 <td>134 <input type="checkbox" name="<?php echo $this->option_name ?>[redirect_to_page]"135 value="1" <?php echo $options['redirect_to_page'] == 1 ? 'checked="checked"' : ''; ?> />136 </td>137 </tr>138 139 140 131 <tr valign="top"> 141 132 <th scope="row">Welcome page</th> … … 144 135 name="<?php echo $this->option_name ?>[welcome_page]" 145 136 min="10" 146 value="<?php echo $options["welcome_page"]; ?>"/>137 value="<?php echo preg_replace('/^(\/)*/i','',str_replace(site_url(), '' ,$options["welcome_page"])); ?>"/> 147 138 </td> 148 139 </tr> … … 197 188 public function validate($input) 198 189 { 199 $input['redirect_to_page'] = isset($input['redirect_to_page']) ? $input['redirect_to_page'] : 0; 190 191 $input['client_id'] = trim($input['client_id']); 192 $input['client_secret'] = trim($input['client_secret']); 193 $input['extra_scopes'] = trim($input['extra_scopes']); 194 $input['welcome_page'] = site_url(trim($input['welcome_page'])); 200 195 201 196 return $input; -
ider-login/trunk/includes/IDER_Callback.php
r1664624 r1679807 63 63 apply_filters('after_callback_handler', $user_info, $_SESSION['openid_connect_scope']); 64 64 65 if (true == IDER_Server::get_option('redirect_to_page')) { 66 wp_redirect(IDER_Server::get_option('welcome_page')); 67 } else { 68 wp_redirect(home_url()); 69 } 65 wp_redirect(IDER_Server::get_option('welcome_page')); 66 70 67 exit; 71 68 } -
ider-login/trunk/includes/IDER_Server.php
r1664624 r1679807 23 23 'client_secret' => '', 24 24 'extra_scopes' => '', 25 'redirect_to_page' => true,26 25 'login_form_button' => true, 27 26 'welcome_page' => 'my-account/ider-profile', … … 181 180 public function setup() 182 181 { 183 $options = get_option("wposso_options"); 184 if (!isset($options["server_url"])) { 185 update_option("wposso_options", self::$default_settings); 186 } 182 183 $options = self::$default_settings; 184 185 // if woocommerce then set the welcome page to user profile 186 if (class_exists('WooCommerce')) { 187 $options['welcome_page'] = site_url('my-account/ider-profile'); 188 } else { 189 $options['welcome_page'] = home_url(); 190 } 191 192 update_option("wposso_options", $options); 193 194 } 195 196 197 /** 198 * Plugin Setup 199 */ 200 public function upgrade() 201 { 202 187 203 } 188 204 -
ider-login/trunk/readme.md
r1673502 r1679807 3 3 Requires at least: 4.6 4 4 Tested up to: 4.7.3 5 Stable tag: 1.5. 35 Stable tag: 1.5.4 6 6 License: Apache License, Version 2.0 or later 7 7 License URI: http://directory.fsf.org/wiki/License:Apache2.0 -
ider-login/trunk/wp-ider-login-client.php
r1673502 r1679807 3 3 * Plugin Name: IDer Login 4 4 * Plugin URI: https://www.ider.com 5 * Version: 1.5. 35 * Version: 1.5.4 6 6 * Description: Provides Single Sign On via IDer Identity Server 7 7 * Author: JLM srl … … 34 34 35 35 if (!defined('IDER_CLIENT_VERSION')) { 36 define('IDER_CLIENT_VERSION', ' 0.8.0');36 define('IDER_CLIENT_VERSION', '1.5.4'); 37 37 } 38 38
Note: See TracChangeset
for help on using the changeset viewer.