Google Apps Login - Version 2.4.4

Version Description

Readme updates and tidied settings page.

Download this release

Release Info

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

Code changes from version 2.4.3 to 2.4.4

Files changed (3) hide show
  1. core/core_google_apps_login.php +27 -2
  2. google_apps_login.php +3 -3
  3. readme.txt +12 -4
core/core_google_apps_login.php CHANGED
@@ -114,6 +114,14 @@ class core_google_apps_login {
114
  text-align: right;
115
  }
116
 
 
 
 
 
 
 
 
 
117
  </style>
118
  <?php }
119
 
@@ -154,7 +162,7 @@ class core_google_apps_login {
154
  $do_autologin = true;
155
  }
156
  }
157
-
158
  if ($do_autologin && $options['ga_clientid'] != '' && $options['ga_clientsecret'] != '') {
159
  if (!headers_sent()) {
160
  wp_redirect($authUrl);
@@ -171,7 +179,7 @@ class core_google_apps_login {
171
 
172
  ?>
173
  <p class="galogin">
174
- <a href="<?php echo $authUrl; ?>"><?php _e( 'Login with Google' , 'google-apps-login'); ?></a>
175
  </p>
176
 
177
  <?php if ($options['ga_poweredby']) { ?>
@@ -180,6 +188,8 @@ class core_google_apps_login {
180
 
181
  <script>
182
  jQuery(document).ready(function(){
 
 
183
  var loginform = jQuery('#loginform,#front-login-form');
184
  var googlelink = jQuery('p.galogin');
185
  var poweredby = jQuery('p.galogin-powered');
@@ -196,11 +206,20 @@ class core_google_apps_login {
196
  loginform.prepend(poweredby);
197
  }
198
  loginform.prepend(googlelink);
 
 
 
 
 
199
  });
200
  </script>
201
  <?php
202
  }
203
 
 
 
 
 
204
  protected function should_hidewplogin($options) {
205
  return false;
206
  }
@@ -641,6 +660,8 @@ class core_google_apps_login {
641
  _e( 'Display \'Powered By wp-glogin.com\' on Login form' , 'google-apps-login' );
642
  echo '</label>';
643
 
 
 
644
  echo '<br class="clear" />';
645
 
646
  if (is_multisite()) {
@@ -660,6 +681,10 @@ class core_google_apps_login {
660
 
661
  echo '</div>';
662
  }
 
 
 
 
663
 
664
  public function ga_options_validate($input) {
665
  $newinput = Array();
114
  text-align: right;
115
  }
116
 
117
+ p.galogin-logout {
118
+ background-color: #FFFFFF;
119
+ border: 4px solid #CCCCCC;
120
+ box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
121
+ padding: 12px;
122
+ margin: 12px 0px;
123
+ }
124
+
125
  </style>
126
  <?php }
127
 
162
  $do_autologin = true;
163
  }
164
  }
165
+
166
  if ($do_autologin && $options['ga_clientid'] != '' && $options['ga_clientsecret'] != '') {
167
  if (!headers_sent()) {
168
  wp_redirect($authUrl);
179
 
180
  ?>
181
  <p class="galogin">
182
+ <a href="<?php echo $authUrl; ?>"><?php echo esc_html($this->get_login_button_text()); ?></a>
183
  </p>
184
 
185
  <?php if ($options['ga_poweredby']) { ?>
188
 
189
  <script>
190
  jQuery(document).ready(function(){
191
+ <?php ob_start(); /* Buffer javascript contents so we can run it through a filter */ ?>
192
+
193
  var loginform = jQuery('#loginform,#front-login-form');
194
  var googlelink = jQuery('p.galogin');
195
  var poweredby = jQuery('p.galogin-powered');
206
  loginform.prepend(poweredby);
207
  }
208
  loginform.prepend(googlelink);
209
+
210
+ <?php
211
+ $fntxt = ob_get_clean();
212
+ echo apply_filters('gal_login_form_readyjs', $fntxt);
213
+ ?>
214
  });
215
  </script>
216
  <?php
217
  }
218
 
219
+ protected function get_login_button_text() {
220
+ return __( 'Login with Google' , 'google-apps-login');
221
+ }
222
+
223
  protected function should_hidewplogin($options) {
224
  return false;
225
  }
660
  _e( 'Display \'Powered By wp-glogin.com\' on Login form' , 'google-apps-login' );
661
  echo '</label>';
662
 
663
+ $this->ga_advancedsection_extra();
664
+
665
  echo '<br class="clear" />';
666
 
667
  if (is_multisite()) {
681
 
682
  echo '</div>';
683
  }
684
+
685
+ // Overridden in Commercial
686
+ protected function ga_advancedsection_extra() {
687
+ }
688
 
689
  public function ga_options_validate($input) {
690
  $newinput = Array();
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.4.3
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.4.3';
21
 
22
  // Singleton
23
  private static $instance = null;
@@ -82,7 +82,7 @@ class basic_google_apps_login extends core_google_apps_login {
82
 
83
  echo '<div id="gal-tableright" class="gal-tablecell">';
84
 
85
- for ($i=0 ; $i<3 ; $i++) {
86
  echo $adverts[($startnum+$i) % 3];
87
  }
88
 
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.4.4
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.4.4';
21
 
22
  // Singleton
23
  private static $instance = null;
82
 
83
  echo '<div id="gal-tableright" class="gal-tablecell">';
84
 
85
+ for ($i=0 ; $i<2 ; $i++) {
86
  echo $adverts[($startnum+$i) % 3];
87
  }
88
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: danlester
3
  Tags: login, google, authentication, oauth2, oauth, admin, google apps, sso, single-sign-on, auth, intranet
4
  Requires at least: 3.3
5
  Tested up to: 3.9
6
- Stable tag: 2.4.3
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
9
 
@@ -25,7 +25,8 @@ Full support and premium features are also available for purchase:
25
  Eliminate the need for Google Apps domain admins to separately manage WordPress user accounts, and get piece
26
  of mind that only authorized employees have access to the organizations's websites and intranet.
27
 
28
- See [http://wp-glogin.com/](http://wp-glogin.com/?utm_source=Login%20Readme%20Top&utm_medium=freemium&utm_campaign=Freemium)
 
29
 
30
  = Extensible Platform =
31
 
@@ -39,6 +40,9 @@ and easier to manage.
39
  [Google Drive Embedder](http://wp-glogin.com/wpgoogledriveembedder) is our free extension plugin allowing
40
  users to browse for Google Drive documents to embed directly in their posts or pages.
41
 
 
 
 
42
  Google Apps Login works on single or multisite WordPress websites or private intranets.
43
 
44
  = Requirements =
@@ -69,8 +73,8 @@ Please ask if you need instructions on how to produce those files.
69
  = Website =
70
 
71
  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
72
- and extra features available in our Premium upgrade, plus support details and useful guides for admins of WordPress
73
- sites and Google Apps.
74
 
75
  == Screenshots ==
76
 
@@ -210,6 +214,10 @@ please [click here](http://wp-glogin.com/installing-google-apps-login/basic-setu
210
 
211
  == Changelog ==
212
 
 
 
 
 
213
  = 2.4.3 =
214
 
215
  New hooks for profile photos. Updated Google client library.
3
  Tags: login, google, authentication, oauth2, oauth, admin, google apps, sso, single-sign-on, auth, intranet
4
  Requires at least: 3.3
5
  Tested up to: 3.9
6
+ Stable tag: 2.4.4
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
9
 
25
  Eliminate the need for Google Apps domain admins to separately manage WordPress user accounts, and get piece
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
 
31
  = Extensible Platform =
32
 
40
  [Google Drive Embedder](http://wp-glogin.com/wpgoogledriveembedder) is our free extension plugin allowing
41
  users to browse for Google Drive documents to embed directly in their posts or pages.
42
 
43
+ [Google Profile Avatars](http://wp-glogin.com/avatars/?utm_source=Login%20Readme%20Avatars&utm_medium=freemium&utm_campaign=Freemium)
44
+ is available on our website. It displays users' Google profile photos in place of their avatars throughout your site.
45
+
46
  Google Apps Login works on single or multisite WordPress websites or private intranets.
47
 
48
  = Requirements =
73
  = Website =
74
 
75
  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
76
+ and extra features available in our Premium upgrade, plus support details, other plugins, and useful guides for admins of
77
+ WordPress sites and Google Apps.
78
 
79
  == Screenshots ==
80
 
214
 
215
  == Changelog ==
216
 
217
+ = 2.4.4 =
218
+
219
+ Readme updates and tidied settings page.
220
+
221
  = 2.4.3 =
222
 
223
  New hooks for profile photos. Updated Google client library.