Google Apps Login - Version 3.4.4

Version Description

Updated compatibility with the WordPress 5.7 release. Login with the google button removed static images generated same button using HTML code and use google svg icon Bug fixed for header already sent

Download this release

Release Info

Developer levertechadmin
Plugin Icon 128x128 Google Apps Login
Version 3.4.4
Comparing to
See all releases

Code changes from version 3.4.3 to 3.4.4

core/core_google_apps_login.php CHANGED
@@ -136,6 +136,7 @@ class core_google_apps_login {
136
  line-height: 27px;
137
  font-weight: bold;
138
  width: 100%;
 
139
  }
140
 
141
  form#loginform p.galogin a:hover {
@@ -189,11 +190,97 @@ class core_google_apps_login {
189
  vertical-align: middle;
190
  }
191
  span.icon {
192
- background: url(<?php echo $this->my_plugin_url().'img/g-normal.png'?>) transparent 5px 50% no-repeat;
193
  display: inline-block;
194
  vertical-align: middle;
195
  width: 42px;
196
  height: 42px;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
197
  }
198
 
199
  <?php if ($this->should_hidewplogin($options)) { ?>
@@ -278,14 +365,20 @@ class core_google_apps_login {
278
  <?php
279
  if(isset($options['btn_google_signin_image']) && !empty($options['btn_google_signin_image']) && $options['btn_google_signin_image'] != 'custom_text'){
280
  $loginWithGoogleImage = $options['btn_google_signin_image'];
281
- $LoginWithGoogleButton = '<a href="'.$authUrl.'"><img alt="Login With Google" src="'.$this->my_plugin_url().'img/'.$loginWithGoogleImage.'.png"/></a>';
 
 
 
 
 
 
282
  }elseif (isset($options['btn_google_signin_image']) && !empty($options['btn_google_signin_image']) && $options['btn_google_signin_image'] == 'custom_text') {
283
  if (isset($options['ga_loginbuttontext']) && !empty($options['ga_loginbuttontext'])) {
284
  $buttonCutomText = $options['ga_loginbuttontext'];
285
  }else{
286
  $buttonCutomText = 'Login With Google';
287
  }
288
- $LoginWithGoogleButton = '<a href="'.$authUrl.'" id="customBtn"><span class="icon"></span><span class="buttonText">'.$buttonCutomText.'</span></a>';
289
  }
290
  else{
291
  $loginWithGoogleImage = 'btn_google_signin_dark_normal_web';
@@ -524,8 +617,10 @@ class core_google_apps_login {
524
  }
525
  }
526
  if (!isset($_COOKIE[self::$gal_cookie_name]) && apply_filters('gal_set_login_cookie', true)) {
527
- $secure = ( 'https' === parse_url( $this->get_login_url(), PHP_URL_SCHEME ) );
 
528
  setcookie(self::$gal_cookie_name, $this->get_cookie_value(), 0, '/', defined('COOKIE_DOMAIN') ? COOKIE_DOMAIN : '', $secure, true );
 
529
  }
530
  }
531
 
@@ -708,6 +803,7 @@ class core_google_apps_login {
708
 
709
  wp_enqueue_script( 'gal_admin_js', $this->my_plugin_url().'js/gal-admin.js', array('jquery') );
710
  wp_enqueue_style( 'gal_admin_css', $this->my_plugin_url().'css/gal-admin.css' );
 
711
 
712
  $submit_page = is_multisite() ? 'edit.php?action='.$this->get_options_menuname() : 'options.php';
713
 
@@ -751,11 +847,13 @@ class core_google_apps_login {
751
  $this->ga_advancedsection_text();
752
  $this->ga_moresection_text();
753
  ?>
754
-
755
- <p class="submit">
756
  <input type="submit" value="<?php esc_attr_e( 'Save Changes' , 'google-apps-login'); ?>" class="button button-primary" id="submit" name="submit">
757
- </p>
 
758
  </form>
 
759
  </div>
760
 
761
  <?php $this->ga_options_do_sidebar(); ?>
@@ -998,39 +1096,69 @@ class core_google_apps_login {
998
 
999
  echo '<fieldset class="block">
1000
  <legend class="blocktitle">Login With Google Button Styles</legend>';
1001
- echo "<input id='btn_google_signin_image1' name='".$this->get_options_name()."[btn_google_signin_image]' value='btn_google_signin_dark_focus_web' type='radio' ".($options['btn_google_signin_image'] == 'btn_google_signin_dark_focus_web' ? 'checked' : '')." class='checkbox' />";
1002
 
1003
- echo '<img alt="Login With Google Dark" src="'.$this->my_plugin_url().'img/btn_google_signin_dark_focus_web.png" />';
 
 
 
 
 
1004
 
1005
  echo '<br class="clear" />';
1006
 
1007
- echo "<input id='btn_google_signin_image2' name='".$this->get_options_name()."[btn_google_signin_image]' value='btn_google_signin_dark_normal_web' ".($options['btn_google_signin_image'] == 'btn_google_signin_dark_normal_web' ? 'checked' : '')." type='radio' class='checkbox' />";
1008
 
1009
- echo '<img alt="Login With Google Normal" src="'.$this->my_plugin_url().'img/btn_google_signin_dark_normal_web.png" />';
 
 
 
 
 
1010
 
1011
  echo '<br class="clear" />';
1012
 
1013
- echo "<input id='btn_google_signin_image3' name='".$this->get_options_name()."[btn_google_signin_image]' value='btn_google_signin_dark_pressed_web' ".($options['btn_google_signin_image'] == 'btn_google_signin_dark_pressed_web' ? 'checked' : '')." type='radio' class='checkbox' />";
1014
 
1015
- echo '<img alt="Login With Google Dark Pressed" src="'.$this->my_plugin_url().'img/btn_google_signin_dark_pressed_web.png" />';
 
 
 
 
 
1016
 
1017
  echo '<br class="clear" />';
1018
 
1019
- echo "<input id='btn_google_signin_image4' name='".$this->get_options_name()."[btn_google_signin_image]' value='btn_google_signin_light_focus_web' ".($options['btn_google_signin_image'] == 'btn_google_signin_light_focus_web' ? 'checked' : '')." type='radio' class='checkbox' />";
1020
 
1021
- echo '<img alt="Login With Google Light" src="'.$this->my_plugin_url().'img/btn_google_signin_light_focus_web.png" />';
 
 
 
 
 
1022
 
1023
  echo '<br class="clear" />';
1024
 
1025
- echo "<input id='btn_google_signin_image5' name='".$this->get_options_name()."[btn_google_signin_image]' value='btn_google_signin_light_normal_web' ".($options['btn_google_signin_image'] == 'btn_google_signin_light_normal_web' ? 'checked' : '')." type='radio' class='checkbox' />";
1026
 
1027
- echo '<img alt="Login With Google Light Normal" src="'.$this->my_plugin_url().'img/btn_google_signin_light_normal_web.png" />';
 
 
 
 
 
1028
 
1029
  echo '<br class="clear" />';
1030
 
1031
- echo "<input id='btn_google_signin_image6' name='".$this->get_options_name()."[btn_google_signin_image]' value='btn_google_signin_light_pressed_web' ".($options['btn_google_signin_image'] == 'btn_google_signin_light_pressed_web' ? 'checked' : '')." type='radio' class='checkbox' />";
1032
 
1033
- echo '<img alt="Login With Google Light Pressed" src="'.$this->my_plugin_url().'img/btn_google_signin_light_pressed_web.png" />';
 
 
 
 
 
1034
 
1035
  echo '<br class="clear" />';
1036
 
@@ -1381,6 +1509,8 @@ class core_google_apps_login {
1381
 
1382
  add_filter('gal_get_clientid', Array($this, 'gal_get_clientid') );
1383
 
 
 
1384
  if (is_multisite()) {
1385
  add_filter('network_admin_plugin_action_links', array($this, 'ga_plugin_action_links'), 10, 2 );
1386
  add_action('network_admin_edit_'.$this->get_options_menuname(), array($this, 'ga_save_network_options'));
@@ -1390,6 +1520,33 @@ class core_google_apps_login {
1390
  }
1391
  }
1392
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1393
  // Abstract
1394
 
1395
  protected function my_plugin_basename() {
136
  line-height: 27px;
137
  font-weight: bold;
138
  width: 100%;
139
+ text-decoration: none;
140
  }
141
 
142
  form#loginform p.galogin a:hover {
190
  vertical-align: middle;
191
  }
192
  span.icon {
193
+ background-image: url(<?php echo $this->my_plugin_url().'/img/google.svg'?>);
194
  display: inline-block;
195
  vertical-align: middle;
196
  width: 42px;
197
  height: 42px;
198
+ float: left;
199
+ }
200
+ .images img {
201
+ height: 46px;
202
+ }
203
+ .google-apps-header {
204
+ height: 46px;
205
+ min-width: 191px;
206
+ display: inline-block;
207
+ align-items: center;
208
+ justify-content: center;
209
+ /*font-family: 'Roboto' !important;*/
210
+ font-size: 0.875rem;
211
+ letter-spacing: 0.1px;
212
+ }
213
+ .inner {
214
+ height: 40px;
215
+ min-width: 185px;
216
+ display: flex;
217
+ align-items: center;
218
+ border-radius: 2px;
219
+ overflow: hidden;
220
+ box-shadow: 0px 1px 2px 0px #0000004d;
221
+ }
222
+
223
+ .inner {
224
+ background: #4285f4;
225
+ color: #fff;
226
+ }
227
+ .dark-pressed .inner {
228
+ background-color: #3367d6;
229
+ box-shadow: 0px 2px 2px 0px #0000003d;
230
+ }
231
+ .light .inner {
232
+ background: #fff;
233
+ color: #757575;
234
+ }
235
+ .google-apps-header.dark-focus {
236
+ background: #c6dafb;
237
+ width: 198px;
238
+ padding: 5px 5px 0px 5px;
239
+ }
240
+ .icon {
241
+ height: 40px;
242
+ width: 40px;
243
+ display: block;
244
+ background-repeat: no-repeat;
245
+ background-size: auto;
246
+ background-position: center;
247
+ background-image: url(<?php echo $this->my_plugin_url().'/img/google.svg'?>);
248
+ background-color: #fff;
249
+ /*border: 1px solid #4285f4;
250
+ border-radius: 2px;*/
251
+ overflow: hidden;
252
+ }
253
+ .icon.dark-focus {border-color: #4285f4;}
254
+ .inner span {
255
+ font-weight: 600;
256
+ vertical-align: middle;
257
+ }
258
+ .light .icon.dark-focus {
259
+ border-color: #fff;
260
+ }
261
+ .light .icon.dark-normal {
262
+ border-color: #fff;
263
+ }
264
+ .dark-pressed.light .inner {
265
+ background: #eee;
266
+ }
267
+
268
+ .light .icon.dark-pressed {
269
+ border-color: #eee;
270
+ background-color: #eee;
271
+ }
272
+ .icon.dark-disabled {
273
+ background-image: url('../img/google-disabled.svg');
274
+ border-color: #ebebeb;
275
+ background-color: #ebebeb;
276
+ }
277
+ .dark-disabled .inner {
278
+ background: #ebebeb;
279
+ color: #8d8d8d;
280
+ box-shadow: none;
281
+ }
282
+ .google-apps-header.dark-normal a {
283
+ text-decoration: none !important;
284
  }
285
 
286
  <?php if ($this->should_hidewplogin($options)) { ?>
365
  <?php
366
  if(isset($options['btn_google_signin_image']) && !empty($options['btn_google_signin_image']) && $options['btn_google_signin_image'] != 'custom_text'){
367
  $loginWithGoogleImage = $options['btn_google_signin_image'];
368
+ $LoginWithGoogleButton = '<a href="'.$authUrl.'">
369
+ <span class="google-apps-header '.$loginWithGoogleImage.'">
370
+ <span class="inner">
371
+ <span class="icon '.$loginWithGoogleImage.'"></span>
372
+ <span style="margin-left:10px;">Sign in with Google</span>
373
+ </span>
374
+ </span></a>';
375
  }elseif (isset($options['btn_google_signin_image']) && !empty($options['btn_google_signin_image']) && $options['btn_google_signin_image'] == 'custom_text') {
376
  if (isset($options['ga_loginbuttontext']) && !empty($options['ga_loginbuttontext'])) {
377
  $buttonCutomText = $options['ga_loginbuttontext'];
378
  }else{
379
  $buttonCutomText = 'Login With Google';
380
  }
381
+ $LoginWithGoogleButton = '<a href="'.$authUrl.'" id="customBtn"><span class="icon" style="float:none;"></span><span class="buttonText">'.$buttonCutomText.'</span></a>';
382
  }
383
  else{
384
  $loginWithGoogleImage = 'btn_google_signin_dark_normal_web';
617
  }
618
  }
619
  if (!isset($_COOKIE[self::$gal_cookie_name]) && apply_filters('gal_set_login_cookie', true)) {
620
+ if (!headers_sent()) {
621
+ $secure = ( 'https' === parse_url( $this->get_login_url(), PHP_URL_SCHEME ) );
622
  setcookie(self::$gal_cookie_name, $this->get_cookie_value(), 0, '/', defined('COOKIE_DOMAIN') ? COOKIE_DOMAIN : '', $secure, true );
623
+ }
624
  }
625
  }
626
 
803
 
804
  wp_enqueue_script( 'gal_admin_js', $this->my_plugin_url().'js/gal-admin.js', array('jquery') );
805
  wp_enqueue_style( 'gal_admin_css', $this->my_plugin_url().'css/gal-admin.css' );
806
+ wp_enqueue_style( 'gal_admin_css', $this->my_plugin_url().'css/roboto-medium.css' );
807
 
808
  $submit_page = is_multisite() ? 'edit.php?action='.$this->get_options_menuname() : 'options.php';
809
 
847
  $this->ga_advancedsection_text();
848
  $this->ga_moresection_text();
849
  ?>
850
+ <br/>
851
+ <div class="submit">
852
  <input type="submit" value="<?php esc_attr_e( 'Save Changes' , 'google-apps-login'); ?>" class="button button-primary" id="submit" name="submit">
853
+
854
+ </div>
855
  </form>
856
+
857
  </div>
858
 
859
  <?php $this->ga_options_do_sidebar(); ?>
1096
 
1097
  echo '<fieldset class="block">
1098
  <legend class="blocktitle">Login With Google Button Styles</legend>';
1099
+ echo "<input id='btn_google_signin_image1' name='".$this->get_options_name()."[btn_google_signin_image]' value='dark-focus' type='radio' ".($options['btn_google_signin_image'] == 'dark-focus' ? 'checked' : '')." class='checkbox' />";
1100
 
1101
+ echo '<div class="google-apps-header dark-focus">
1102
+ <div class="inner">
1103
+ <div class="icon dark-focus"></div>
1104
+ <span>Sign in with Google</span>
1105
+ </div>
1106
+ </div>';
1107
 
1108
  echo '<br class="clear" />';
1109
 
1110
+ echo "<input id='btn_google_signin_image2' name='".$this->get_options_name()."[btn_google_signin_image]' value='dark-normal' ".($options['btn_google_signin_image'] == 'dark-normal' ? 'checked' : '')." type='radio' class='checkbox' />";
1111
 
1112
+ echo '<div class="google-apps-header dark-normal">
1113
+ <div class="inner">
1114
+ <div class="icon dark-normal"></div>
1115
+ <span>Sign in with Google</span>
1116
+ </div>
1117
+ </div>';
1118
 
1119
  echo '<br class="clear" />';
1120
 
1121
+ echo "<input id='btn_google_signin_image3' name='".$this->get_options_name()."[btn_google_signin_image]' value='dark-pressed' ".($options['btn_google_signin_image'] == 'dark-pressed' ? 'checked' : '')." type='radio' class='checkbox' />";
1122
 
1123
+ echo '<div class="google-apps-header dark-pressed">
1124
+ <div class="inner">
1125
+ <div class="icon dark-pressed"></div>
1126
+ <span>Sign in with Google</span>
1127
+ </div>
1128
+ </div>';
1129
 
1130
  echo '<br class="clear" />';
1131
 
1132
+ echo "<input id='btn_google_signin_image4' name='".$this->get_options_name()."[btn_google_signin_image]' value='dark-focus light' ".($options['btn_google_signin_image'] == 'dark-focus light' ? 'checked' : '')." type='radio' class='checkbox' />";
1133
 
1134
+ echo '<div class="google-apps-header dark-focus light">
1135
+ <div class="inner">
1136
+ <div class="icon dark-focus"></div>
1137
+ <span>Sign in with Google</span>
1138
+ </div>
1139
+ </div>';
1140
 
1141
  echo '<br class="clear" />';
1142
 
1143
+ echo "<input id='btn_google_signin_image5' name='".$this->get_options_name()."[btn_google_signin_image]' value='dark-normal light' ".($options['btn_google_signin_image'] == 'dark-normal light' ? 'checked' : '')." type='radio' class='checkbox' />";
1144
 
1145
+ echo '<div class="google-apps-header dark-normal light">
1146
+ <div class="inner">
1147
+ <div class="icon dark-normal"></div>
1148
+ <span>Sign in with Google</span>
1149
+ </div>
1150
+ </div>';
1151
 
1152
  echo '<br class="clear" />';
1153
 
1154
+ echo "<input id='btn_google_signin_image6' name='".$this->get_options_name()."[btn_google_signin_image]' value='dark-pressed light' ".($options['btn_google_signin_image'] == 'dark-pressed light' ? 'checked' : '')." type='radio' class='checkbox' />";
1155
 
1156
+ echo '<div class="google-apps-header dark-pressed light">
1157
+ <div class="inner">
1158
+ <div class="icon dark-pressed light"></div>
1159
+ <span>Sign in with Google</span>
1160
+ </div>
1161
+ </div>';
1162
 
1163
  echo '<br class="clear" />';
1164
 
1509
 
1510
  add_filter('gal_get_clientid', Array($this, 'gal_get_clientid') );
1511
 
1512
+ add_action( 'upgrader_process_complete', array($this, 'my_upgrade_function'),10, 2);
1513
+
1514
  if (is_multisite()) {
1515
  add_filter('network_admin_plugin_action_links', array($this, 'ga_plugin_action_links'), 10, 2 );
1516
  add_action('network_admin_edit_'.$this->get_options_menuname(), array($this, 'ga_save_network_options'));
1520
  }
1521
  }
1522
 
1523
+
1524
+
1525
+ public function my_upgrade_function( $upgrader_object, $options ) {
1526
+ $current_plugin_path_name = plugin_basename( __FILE__ );
1527
+
1528
+ if ($options['action'] == 'update' && $options['type'] == 'plugin' ) {
1529
+ if (isset($options['btn_google_signin_image'])) {
1530
+ if ($options['btn_google_signin_image'] == 'btn_google_signin_dark_focus_web') {
1531
+ $options['btn_google_signin_image'] = 'dark-focus';
1532
+ }elseif ($options['btn_google_signin_image'] == 'btn_google_signin_dark_normal_web') {
1533
+ $options['btn_google_signin_image'] = 'dark-normal';
1534
+ }elseif ($options['btn_google_signin_image'] == 'btn_google_signin_dark_pressed_web') {
1535
+ $options['btn_google_signin_image'] = 'dark-pressed';
1536
+ }elseif ($options['btn_google_signin_image'] == 'btn_google_signin_light_focus_web') {
1537
+ $options['btn_google_signin_image'] = 'dark-focus light';
1538
+ }elseif ($options['btn_google_signin_image'] == 'btn_google_signin_light_normal_web') {
1539
+ $options['btn_google_signin_image'] = 'dark-normal light';
1540
+ }elseif ($options['btn_google_signin_image'] == 'btn_google_signin_light_pressed_web') {
1541
+ $options['btn_google_signin_image'] = 'dark-pressed light';
1542
+ }
1543
+
1544
+ }else{
1545
+ $options['btn_google_signin_image'] = 'dark-focus';
1546
+ }
1547
+ }
1548
+ }
1549
+
1550
  // Abstract
1551
 
1552
  protected function my_plugin_basename() {
css/gal-admin.css CHANGED
@@ -198,4 +198,85 @@ fieldset.block legend.blocktitle {
198
  border-radius: 5px!important;
199
  box-shadow: 0 0 0 5px #ddd!important;
200
  margin-left: 20px!important;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
201
  }
198
  border-radius: 5px!important;
199
  box-shadow: 0 0 0 5px #ddd!important;
200
  margin-left: 20px!important;
201
+ }
202
+ .images img {
203
+ height: 46px;
204
+ }
205
+ .google-apps-header {
206
+ height: 46px;
207
+ min-width: 191px;
208
+ display: flex;
209
+ align-items: center;
210
+ /*justify-content: center;*/
211
+ /*font-family: 'Roboto' !important;*/
212
+ font-size: 0.875rem;
213
+ letter-spacing: 0.1px;
214
+ }
215
+ .inner {
216
+ height: 40px;
217
+ min-width: 185px;
218
+ display: flex;
219
+ align-items: center;
220
+ border-radius: 2px;
221
+ overflow: hidden;
222
+ box-shadow: 0px 1px 2px 0px #0000004d;
223
+ }
224
+
225
+ .inner {
226
+ background: #4285f4;
227
+ color: #fff;
228
+ }
229
+ .dark-pressed .inner {
230
+ background-color: #3367d6;
231
+ box-shadow: 0px 2px 2px 0px #0000003d;
232
+ }
233
+ .light .inner {
234
+ background: #fff;
235
+ color: #757575;
236
+ }
237
+ .google-apps-header.dark-focus {
238
+ background: #c6dafb;
239
+ width: 198px;
240
+ }
241
+ .icon {
242
+ height: 40px;
243
+ width: 40px;
244
+ display: block;
245
+ background-repeat: no-repeat;
246
+ background-size: auto;
247
+ background-position: center;
248
+ background-image: url(../img/google.svg);
249
+ background-color: #fff;
250
+ border: 1px solid #4285f4;
251
+ border-radius: 2px;
252
+ overflow: hidden;
253
+ }
254
+ .icon.dark-focus {border-color: #4285f4;}
255
+ .inner span {
256
+ margin: 10px 10px;
257
+ font-weight: 600;
258
+ }
259
+ .light .icon.dark-focus {
260
+ border-color: #fff;
261
+ }
262
+ .light .icon.dark-normal {
263
+ border-color: #fff;
264
+ }
265
+ .dark-pressed.light .inner {
266
+ background: #eee;
267
+ }
268
+
269
+ .light .icon.dark-pressed {
270
+ border-color: #eee;
271
+ background-color: #eee;
272
+ }
273
+ .icon.dark-disabled {
274
+ background-image: url('../img/google-disabled.svg');
275
+ border-color: #ebebeb;
276
+ background-color: #ebebeb;
277
+ }
278
+ .dark-disabled .inner {
279
+ background: #ebebeb;
280
+ color: #8d8d8d;
281
+ box-shadow: none;
282
  }
css/roboto-medium.css ADDED
@@ -0,0 +1,13 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ @font-face {
2
+ font-family: 'Roboto';
3
+ src: url('../fonts/Roboto-Medium/Roboto-Medium.eot');
4
+ src: url('../fonts/Roboto-Medium/?#iefix') format('embedded-opentype'),
5
+ url('../fonts/Roboto-Medium/Roboto-Medium.woff2') format('woff2'),
6
+ url('../fonts/Roboto-Medium/Roboto-Medium.woff') format('woff'),
7
+ url('../fonts/Roboto-Medium/Roboto-Medium.ttf') format('truetype'),
8
+ url('../fonts/Roboto-Medium/Roboto-Medium.svg#Roboto-Medium') format('svg');
9
+ font-weight: 500;
10
+ font-style: normal;
11
+ font-display: swap;
12
+ }
13
+
fonts/Roboto-Medium/Roboto-Medium.eot ADDED
Binary file
fonts/Roboto-Medium/Roboto-Medium.svg ADDED
@@ -0,0 +1,11531 @@