Google Apps Login - Version 2.8.14

Version Description

Updated some URLs pointing to information about Premium/Enterprise upgrades. Readme updated.

Download this release

Release Info

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

Code changes from version 2.8.13 to 2.8.14

Files changed (4) hide show
  1. core/core_google_apps_login.php +1 -1
  2. google_apps_login.php +9 -9
  3. lang/google-apps-login.pot +1 -1
  4. readme.txt +25 -23
core/core_google_apps_login.php CHANGED
@@ -902,7 +902,7 @@ class core_google_apps_login {
902
 
903
  // Service account settings
904
  $newinput['ga_domainadmin'] = isset($input['ga_domainadmin']) ? trim($input['ga_domainadmin']) : '';
905
- if (!preg_match('/^([A-Za-z0-9._%+-]+@([0-9a-z-]+\.)?[0-9a-z-]+\.[a-z]{2,7})?$/', $newinput['ga_domainadmin'])) {
906
  add_settings_error(
907
  'ga_domainadmin',
908
  'invalid_email',
902
 
903
  // Service account settings
904
  $newinput['ga_domainadmin'] = isset($input['ga_domainadmin']) ? trim($input['ga_domainadmin']) : '';
905
+ if (!preg_match('/^([A-Za-z0-9._%+-]+@([0-9a-z-]+\.)*[0-9a-z-]+\.[a-z]{2,7})?$/', $newinput['ga_domainadmin'])) {
906
  add_settings_error(
907
  'ga_domainadmin',
908
  'invalid_email',
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.8.13
8
  * Author: Dan Lester
9
  * Author URI: http://wp-glogin.com/
10
  * License: GPL3
@@ -17,7 +17,7 @@ require_once( plugin_dir_path(__FILE__).'/core/core_google_apps_login.php' );
17
 
18
  class basic_google_apps_login extends core_google_apps_login {
19
 
20
- protected $PLUGIN_VERSION = '2.8.13';
21
 
22
  // Singleton
23
  private static $instance = null;
@@ -50,16 +50,16 @@ class basic_google_apps_login extends core_google_apps_login {
50
  protected function ga_section_text_end() {
51
  ?>
52
  <p><b><?php _e( 'For full support, and premium features that greatly simplify WordPress user management for admins, please visit:' , 'google-apps-login'); ?>
53
- <a href="http://wp-glogin.com/google-apps-login-premium/?utm_source=Admin%20Promo&utm_medium=freemium&utm_campaign=Freemium" target="_blank">http://wp-glogin.com/</a></b>
54
  </p>
55
  <?php
56
  }
57
 
58
  protected function ga_options_do_sidebar() {
59
  $drivelink = "http://wp-glogin.com/drive/?utm_source=Admin%20Sidebar&utm_medium=freemium&utm_campaign=Drive";
60
- $upgradelink = "http://wp-glogin.com/google-apps-login-premium/?utm_source=Admin%20Sidebar&utm_medium=freemium&utm_campaign=Freemium";
61
  $avatarslink = "http://wp-glogin.com/avatars/?utm_source=Admin%20Sidebar&utm_medium=freemium&utm_campaign=Avatars";
62
- $aioilink = "http://wp-glogin.com/all-in-one-intranet/?utm_source=Admin%20Sidebar&utm_medium=freemium&utm_campaign=AIOI";
63
 
64
  $adverts = Array();
65
 
@@ -179,7 +179,7 @@ class basic_google_apps_login extends core_google_apps_login {
179
  protected function set_other_admin_notices() {
180
  global $pagenow;
181
  if (in_array($pagenow, array('users.php', 'user-new.php')) ) {
182
- $no_thanks = get_site_option($this->get_options_name().'_no_thanks', false);
183
  if (!$no_thanks) {
184
  if (isset($_REQUEST['google_apps_login_action']) && $_REQUEST['google_apps_login_action']=='no_thanks') {
185
  $this->ga_said_no_thanks(null);
@@ -194,16 +194,16 @@ class basic_google_apps_login extends core_google_apps_login {
194
  }
195
 
196
  public function ga_said_no_thanks( $data ) {
197
- update_site_option($this->get_options_name().'_no_thanks', true);
198
  wp_redirect( remove_query_arg( 'google_apps_login_action' ) );
199
  exit;
200
  }
201
 
202
  public function ga_user_screen_upgrade_message() {
203
- $purchase_url = 'http://wp-glogin.com/google-apps-login-premium/?utm_source=User%20Pages&utm_medium=freemium&utm_campaign=Freemium';
204
  $nothanks_url = add_query_arg( 'google_apps_login_action', 'no_thanks' );
205
  echo '<div class="updated"><p>';
206
- echo sprintf( __('Completely forget about WordPress user management - upgrade to <a href="%s">Google Apps Login premium</a> to automatically sync users from your Google Apps domain', 'google-apps-login'),
207
  $purchase_url );
208
  echo ' &nbsp; <a href="'.$purchase_url.'" class="button-secondary">' . __( 'Find out more', 'google-apps-login' ) . '</a>';
209
  echo '&nbsp;<a href="' . esc_url( $nothanks_url ) . '" class="button-secondary">' . __( 'No Thanks', 'google-apps-login' ) . '</a>';
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.8.14
8
  * Author: Dan Lester
9
  * Author URI: http://wp-glogin.com/
10
  * License: GPL3
17
 
18
  class basic_google_apps_login extends core_google_apps_login {
19
 
20
+ protected $PLUGIN_VERSION = '2.8.14';
21
 
22
  // Singleton
23
  private static $instance = null;
50
  protected function ga_section_text_end() {
51
  ?>
52
  <p><b><?php _e( 'For full support, and premium features that greatly simplify WordPress user management for admins, please visit:' , 'google-apps-login'); ?>
53
+ <a href="http://wp-glogin.com/glogin/?utm_source=Admin%20Promo&utm_medium=freemium&utm_campaign=Freemium" target="_blank">http://wp-glogin.com/</a></b>
54
  </p>
55
  <?php
56
  }
57
 
58
  protected function ga_options_do_sidebar() {
59
  $drivelink = "http://wp-glogin.com/drive/?utm_source=Admin%20Sidebar&utm_medium=freemium&utm_campaign=Drive";
60
+ $upgradelink = "http://wp-glogin.com/glogin/?utm_source=Admin%20Sidebar&utm_medium=freemium&utm_campaign=Freemium";
61
  $avatarslink = "http://wp-glogin.com/avatars/?utm_source=Admin%20Sidebar&utm_medium=freemium&utm_campaign=Avatars";
62
+ $aioilink = "http://wp-glogin.com/intranet/?utm_source=Admin%20Sidebar&utm_medium=freemium&utm_campaign=AIOI";
63
 
64
  $adverts = Array();
65
 
179
  protected function set_other_admin_notices() {
180
  global $pagenow;
181
  if (in_array($pagenow, array('users.php', 'user-new.php')) ) {
182
+ $no_thanks = get_user_meta(get_current_user_id(), $this->get_options_name().'_no_thanks', true);
183
  if (!$no_thanks) {
184
  if (isset($_REQUEST['google_apps_login_action']) && $_REQUEST['google_apps_login_action']=='no_thanks') {
185
  $this->ga_said_no_thanks(null);
194
  }
195
 
196
  public function ga_said_no_thanks( $data ) {
197
+ update_user_meta(get_current_user_id(), $this->get_options_name().'_no_thanks', true);
198
  wp_redirect( remove_query_arg( 'google_apps_login_action' ) );
199
  exit;
200
  }
201
 
202
  public function ga_user_screen_upgrade_message() {
203
+ $purchase_url = 'http://wp-glogin.com/glogin/?utm_source=User%20Pages&utm_medium=freemium&utm_campaign=Freemium';
204
  $nothanks_url = add_query_arg( 'google_apps_login_action', 'no_thanks' );
205
  echo '<div class="updated"><p>';
206
+ echo sprintf( __('Completely forget about WordPress user management - upgrade to <a href="%s">Google Apps Login Premium or Enterprise</a> to automatically sync users from your Google Apps domain', 'google-apps-login'),
207
  $purchase_url );
208
  echo ' &nbsp; <a href="'.$purchase_url.'" class="button-secondary">' . __( 'Find out more', 'google-apps-login' ) . '</a>';
209
  echo '&nbsp;<a href="' . esc_url( $nothanks_url ) . '" class="button-secondary">' . __( 'No Thanks', 'google-apps-login' ) . '</a>';
lang/google-apps-login.pot CHANGED
@@ -25,7 +25,7 @@ msgid "In this basic version of the plugin, any <i>existing</i> WordPress accoun
25
  msgstr ""
26
 
27
  #: basic_google_apps_login.php:206
28
- msgid "Completely forget about WordPress user management - upgrade to <a href=\"%s\">Google Apps Login premium</a> to automatically sync users from your Google Apps domain"
29
  msgstr ""
30
 
31
  #: basic_google_apps_login.php:208
25
  msgstr ""
26
 
27
  #: basic_google_apps_login.php:206
28
+ msgid "Completely forget about WordPress user management - upgrade to <a href=\"%s\">Google Apps Login Premium or Enterprise</a> to automatically sync users from your Google Apps domain"
29
  msgstr ""
30
 
31
  #: basic_google_apps_login.php:208
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.4
6
- Stable tag: 2.8.13
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
9
 
@@ -22,10 +22,16 @@ Plugin setup requires you to have admin access to any Google Apps domain, or a r
22
 
23
  Full support and premium features are also available for purchase:
24
 
25
- Eliminate the need for Google Apps domain admins to separately manage WordPress user accounts, and get peace
26
- of mind that only authorized employees have access to the organizations's websites and intranet.
 
 
 
 
 
 
 
27
 
28
- See [http://wp-glogin.com/google-apps-login-premium/](http://wp-glogin.com/google-apps-login-premium/?utm_source=Login%20Readme%20Top&utm_medium=freemium&utm_campaign=Freemium)
29
 
30
  [youtube http://www.youtube.com/watch?v=wz9aN_4WaM8]
31
 
@@ -79,17 +85,18 @@ This plugin currently operates in the following languages:
79
  * Italian (it_IT) translated by Giorgio Draghetti of [tipinoncomuni](http://tipinoncomuni.it/)
80
 
81
  We are looking for volunteers to translate into their own language. If you would like to contribute a translation, please
82
- use the template POT file in the 'lang' folder, then email PO and MO files to contact@wp-glogin.com.
83
- Please ask if you need instructions on how to produce those files.
84
 
85
- = Website =
86
 
87
  Please see our website [http://wp-glogin.com/](http://wp-glogin.com/?utm_source=Login%20Readme%20Website&utm_medium=freemium&utm_campaign=Freemium) for more information about this free plugin
88
- and extra features available in our Premium upgrade, plus support details, other plugins, and useful guides for admins of
89
  WordPress sites and Google Apps.
90
 
 
 
91
  If you are building your organization's intranet on WordPress, try out our
92
- [All-In-One Intranet plugin](http://wp-glogin.com/all-in-one-intranet/?utm_source=Login%20Readme%20AIOI&utm_medium=freemium&utm_campaign=Freemium).
93
 
94
  == Screenshots ==
95
 
@@ -101,9 +108,9 @@ If you are building your organization's intranet on WordPress, try out our
101
  = How can I obtain support for this product? =
102
 
103
  Full support is available if you purchase the appropriate license from the author via:
104
- [http://wp-glogin.com/google-apps-login-premium/](http://wp-glogin.com/google-apps-login-premium/?utm_source=Login%20Readme%20Premium&utm_medium=freemium&utm_campaign=Freemium)
105
 
106
- Please feel free to email [support@wp-glogin.com](mailto:support@wp-glogin.com) with any questions,
107
  as we may be able to help, but you may be required to purchase a support license if the problem
108
  is specific to your installation or requirements.
109
 
@@ -116,7 +123,7 @@ No, once you set up the plugin, any WordPress accounts whose email address corre
116
  whether on a different Google Apps domain or even a personal gmail.com account, will be able to use 'Login with
117
  Google' to easily connect to your WordPress site.
118
 
119
- However, our [premium plugin](http://wp-glogin.com/google-apps-login-premium/?utm_source=Login%20Readme%20FAQ&utm_medium=freemium&utm_campaign=Freemium) has features that greatly simplify
120
  your WordPress user management if your WordPress users are mostly on the same Google Apps domain(s).
121
 
122
  = Does the plugin work with HTTP or HTTPS login pages? =
@@ -161,7 +168,7 @@ may render your site insecure.
161
 
162
  = Does it conflict with any other plugins? =
163
 
164
- Yes, sometimes conflicts can arise. We have built workarounds for some problems, and would always appreciate your feedback
165
  to resolve any issues you might encounter yourself.
166
 
167
  One known issue is with iThemes Security: the settings 'filter suspicious query strings' and 'filter long URL strings' can
@@ -190,19 +197,9 @@ your emails and other data.
190
 
191
  * PHP 5.2.x or higher with JSON extensions
192
  * Wordpress 3.3 or above
193
- * Should no longer require CURL extension
194
 
195
  And you will need a Google account to set up the plugin.
196
 
197
- = I install the plugin, and my wp-login.php page is just blank =
198
-
199
- The only time we've seen users experience a blank screen has been because they don't have CURL enabled on their server.
200
-
201
- Read [this article](https://codex.wordpress.org/Debugging_in_WordPress) describing how you can debug and (hopefully) get
202
- an error message to see if that is the problem.
203
-
204
- Or, since most often the problem is that CURL needs installing, it may be easier for you to jump straight to finding out
205
- whether CURL is installed, and enabling it if not. If that doesn't solve the problem, you may need to debug as above.
206
 
207
  == Installation ==
208
 
@@ -229,6 +226,11 @@ please [click here](http://wp-glogin.com/installing-google-apps-login/basic-setu
229
 
230
  == Changelog ==
231
 
 
 
 
 
 
232
  = 2.8.13 =
233
 
234
  Ready for WordPress 4.4.
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.4
6
+ Stable tag: 2.8.14
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
9
 
22
 
23
  Full support and premium features are also available for purchase:
24
 
25
+ Eliminate the need for Google Apps domain admins to separately manage WordPress user accounts, and get peace
26
+ of mind that only authorized employees have access to your organizations's websites and intranet.
27
+
28
+ **See [our website at wp-glogin.com](http://wp-glogin.com/glogin/?utm_source=Login%20Readme%20Top&utm_medium=freemium&utm_campaign=Freemium) for more details.**
29
+
30
+ The Premium version allows everyone in your Google Apps domain to login to WordPress - an account will be automatically created in WordPress if one doesn't already exist.
31
+
32
+ Our Enterprise version goes further, allowing you to specify granular access and role controls based on Google Group membership.
33
+ You can also see logs of accounts created and roles changed by the plugin.
34
 
 
35
 
36
  [youtube http://www.youtube.com/watch?v=wz9aN_4WaM8]
37
 
85
  * Italian (it_IT) translated by Giorgio Draghetti of [tipinoncomuni](http://tipinoncomuni.it/)
86
 
87
  We are looking for volunteers to translate into their own language. If you would like to contribute a translation, please
88
+ get in touch: contact@wp-glogin.com.
 
89
 
90
+ = Website and Upgrades =
91
 
92
  Please see our website [http://wp-glogin.com/](http://wp-glogin.com/?utm_source=Login%20Readme%20Website&utm_medium=freemium&utm_campaign=Freemium) for more information about this free plugin
93
+ and extra features available in our Premium and Enterprise upgrades, plus support details, other plugins, and useful guides for admins of
94
  WordPress sites and Google Apps.
95
 
96
+ The [Premium and Enterprise versions](http://wp-glogin.com/glogin/?utm_source=Login%20Readme%20PremEnt&utm_medium=freemium&utm_campaign=Freemium) eliminate the need to manage user accounts in your WordPress site - everything is synced from Google Apps instead.
97
+
98
  If you are building your organization's intranet on WordPress, try out our
99
+ [All-In-One Intranet plugin](http://wp-glogin.com/intranet/?utm_source=Login%20Readme%20AIOI&utm_medium=freemium&utm_campaign=Freemium).
100
 
101
  == Screenshots ==
102
 
108
  = How can I obtain support for this product? =
109
 
110
  Full support is available if you purchase the appropriate license from the author via:
111
+ [http://wp-glogin.com/glogin/](http://wp-glogin.com/glogin/?utm_source=Login%20Readme%20Premium&utm_medium=freemium&utm_campaign=Freemium)
112
 
113
+ Please feel free to email [contact@wp-glogin.com](mailto:contact@wp-glogin.com) with any questions,
114
  as we may be able to help, but you may be required to purchase a support license if the problem
115
  is specific to your installation or requirements.
116
 
123
  whether on a different Google Apps domain or even a personal gmail.com account, will be able to use 'Login with
124
  Google' to easily connect to your WordPress site.
125
 
126
+ However, our [premium plugin](http://wp-glogin.com/glogin/?utm_source=Login%20Readme%20FAQ&utm_medium=freemium&utm_campaign=Freemium) has features that greatly simplify
127
  your WordPress user management if your WordPress users are mostly on the same Google Apps domain(s).
128
 
129
  = Does the plugin work with HTTP or HTTPS login pages? =
168
 
169
  = Does it conflict with any other plugins? =
170
 
171
+ Sometimes conflicts can arise. We have built workarounds for some problems, and would always appreciate your feedback
172
  to resolve any issues you might encounter yourself.
173
 
174
  One known issue is with iThemes Security: the settings 'filter suspicious query strings' and 'filter long URL strings' can
197
 
198
  * PHP 5.2.x or higher with JSON extensions
199
  * Wordpress 3.3 or above
 
200
 
201
  And you will need a Google account to set up the plugin.
202
 
 
 
 
 
 
 
 
 
 
203
 
204
  == Installation ==
205
 
226
 
227
  == Changelog ==
228
 
229
+ = 2.8.14 =
230
+
231
+ Updated some URLs pointing to information about Premium/Enterprise upgrades.
232
+ Readme updated.
233
+
234
  = 2.8.13 =
235
 
236
  Ready for WordPress 4.4.