Google Apps Login - Version 2.10.4

Version Description

Ensures plugin options are not loaded until 'plugins_loaded' stage. This makes it easier to use the gal_options hook more reliably.

Added language files for be_BY. Added filters 'gal_options' and 'gal_sa_options' so you can configure settings using PHP code.

Changed the way Google client library is included to avoid conflicts with other Google-related plugins that set the include path in a way that doesn't allow for other plugins.

Download this release

Release Info

Developer danlester
Plugin Icon 128x128 Google Apps Login
Version 2.10.4
Comparing to
See all releases

Code changes from version 2.9.7 to 2.10.4

Files changed (3) hide show
  1. core/core_google_apps_login.php +15 -19
  2. google_apps_login.php +2 -2
  3. readme.txt +11 -1
core/core_google_apps_login.php CHANGED
@@ -43,7 +43,7 @@ class core_google_apps_login {
43
  private $doneIncludePath = false;
44
  private function setIncludePath() {
45
  if (!$this->doneIncludePath) {
46
- set_include_path(get_include_path() . PATH_SEPARATOR . plugin_dir_path(__FILE__));
47
  $this->doneIncludePath = true;
48
  }
49
  }
@@ -546,25 +546,21 @@ class core_google_apps_login {
546
  $this->set_other_admin_notices();
547
  }
548
 
549
- add_action('show_user_profile', Array($this, 'ga_personal_options'));
550
  }
551
 
552
- public function ga_personal_options($wp_user) {
553
- if (is_object($wp_user)) {
554
- // Display avatar in profile
555
- $purchase_url = 'http://wp-glogin.com/avatars/?utm_source=Profile%20Page&utm_medium=freemium&utm_campaign=Avatars';
556
- $source_text = 'Install <a href="'.$purchase_url.'">Google Profile Avatars</a> to use your Google account\'s profile photo here automatically.';
557
- ?>
558
- <table class="form-table">
559
- <tbody><tr>
560
- <th>Profile Photo</th>
561
- <td><?php echo get_avatar($wp_user->ID, '48'); ?></td>
562
- <td><?php echo apply_filters('gal_avatar_source_desc', $source_text, $wp_user); ?></td>
563
- </tr>
564
- </tbody>
565
- </table>
566
- <?php
567
  }
 
 
568
  }
569
 
570
  // Has content in Basic
@@ -1030,7 +1026,7 @@ class core_google_apps_login {
1030
  }
1031
  }
1032
 
1033
- $this->ga_options = $option;
1034
  return $this->ga_options;
1035
  }
1036
 
@@ -1074,7 +1070,7 @@ class core_google_apps_login {
1074
  }
1075
  }
1076
 
1077
- $this->ga_sa_options = $ga_sa_options;
1078
  return $this->ga_sa_options;
1079
  }
1080
 
43
  private $doneIncludePath = false;
44
  private function setIncludePath() {
45
  if (!$this->doneIncludePath) {
46
+ set_include_path(plugin_dir_path(__FILE__) . PATH_SEPARATOR . get_include_path());
47
  $this->doneIncludePath = true;
48
  }
49
  }
546
  $this->set_other_admin_notices();
547
  }
548
 
549
+ add_action('user_profile_picture_description', Array($this, 'gal_user_profile_picture_description'));
550
  }
551
 
552
+ public function gal_user_profile_picture_description($description) {
553
+ if ($description != '') {
554
+
555
+ // Display avatar in profile
556
+ $purchase_url = 'http://wp-glogin.com/avatars/?utm_source=Profile%20Page&utm_medium=freemium&utm_campaign=Avatars';
557
+ $source_text = '<b>Install <a href="'.$purchase_url.'">Google Profile Avatars</a> to use your Google account\'s profile photo here automatically.</b>';
558
+
559
+ $wp_user = wp_get_current_user();
560
+ $description = apply_filters('gal_avatar_source_desc', $description.' <br /> '.$source_text, $wp_user);
 
 
 
 
 
 
561
  }
562
+
563
+ return $description;
564
  }
565
 
566
  // Has content in Basic
1026
  }
1027
  }
1028
 
1029
+ $this->ga_options = apply_filters( 'gal_options', $option );
1030
  return $this->ga_options;
1031
  }
1032
 
1070
  }
1071
  }
1072
 
1073
+ $this->ga_sa_options = apply_filters('gal_sa_options', $ga_sa_options );
1074
  return $this->ga_sa_options;
1075
  }
1076
 
google_apps_login.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin Name: Google Apps Login
5
  * Plugin URI: http://wp-glogin.com/
6
  * Description: Simple secure login for Wordpress through users' Google Apps accounts (uses secure OAuth2, and MFA if enabled)
7
- * Version: 2.9.7
8
  * Author: Dan Lester
9
  * Author URI: http://wp-glogin.com/
10
  * License: GPL3
@@ -23,7 +23,7 @@ else {
23
 
24
  class basic_google_apps_login extends core_google_apps_login {
25
 
26
- protected $PLUGIN_VERSION = '2.9.7';
27
 
28
  // Singleton
29
  private static $instance = null;
4
  * Plugin Name: Google Apps Login
5
  * Plugin URI: http://wp-glogin.com/
6
  * Description: Simple secure login for Wordpress through users' Google Apps accounts (uses secure OAuth2, and MFA if enabled)
7
+ * Version: 2.10.4
8
  * Author: Dan Lester
9
  * Author URI: http://wp-glogin.com/
10
  * License: GPL3
23
 
24
  class basic_google_apps_login extends core_google_apps_login {
25
 
26
+ protected $PLUGIN_VERSION = '2.10.4';
27
 
28
  // Singleton
29
  private static $instance = null;
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: danlester
3
  Tags: login, google, authentication, oauth2, oauth, google login, google apps, sso, single-sign-on, auth, intranet
4
  Requires at least: 3.7
5
  Tested up to: 4.6
6
- Stable tag: 2.9.7
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
9
 
@@ -226,6 +226,16 @@ please [click here](http://wp-glogin.com/installing-google-apps-login/basic-setu
226
 
227
  == Changelog ==
228
 
 
 
 
 
 
 
 
 
 
 
229
  = 2.9.7 =
230
 
231
  Added gal_set_login_cookie filter so you can prevent Google Apps Login from setting its wordpress_google_apps_login cookie under
3
  Tags: login, google, authentication, oauth2, oauth, google login, google apps, sso, single-sign-on, auth, intranet
4
  Requires at least: 3.7
5
  Tested up to: 4.6
6
+ Stable tag: 2.10.4
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
9
 
226
 
227
  == Changelog ==
228
 
229
+ = 2.10.4 =
230
+
231
+ Ensures plugin options are not loaded until 'plugins_loaded' stage. This makes it easier to use the gal_options hook more reliably.
232
+
233
+ Added language files for be_BY.
234
+ Added filters 'gal_options' and 'gal_sa_options' so you can configure settings using PHP code.
235
+
236
+ Changed the way Google client library is included to avoid conflicts with other Google-related plugins that set the include path
237
+ in a way that doesn't allow for other plugins.
238
+
239
  = 2.9.7 =
240
 
241
  Added gal_set_login_cookie filter so you can prevent Google Apps Login from setting its wordpress_google_apps_login cookie under