WP Photo Album Plus - Version 6.3.4

Version Description

Download this release

Release Info

Developer opajaap
Plugin Icon wp plugin WP Photo Album Plus
Version 6.3.4
Comparing to
See all releases

Code changes from version 6.3.3 to 6.3.4

Files changed (9) hide show
  1. js/wppa-admin-scripts.js +10 -56
  2. readme.txt +12 -1
  3. wppa-album-admin-autosave.php +5 -4
  4. wppa-filter.php +3 -2
  5. wppa-photo-admin-autosave.php +5 -4
  6. wppa-settings-autosave.php +10 -1
  7. wppa-setup.php +2 -1
  8. wppa-utils.php +6 -1
  9. wppa.php +3 -3
js/wppa-admin-scripts.js CHANGED
@@ -1,7 +1,7 @@
1
  /* admin-scripts.js */
2
  /* Package: wp-photo-album-plus
3
  /*
4
- /* Version 6.2.10
5
  /* Various js routines used in admin pages
6
  */
7
 
@@ -1013,60 +1013,6 @@ function checkAll(name, clas) {
1013
  }
1014
  }
1015
 
1016
- /*
1017
- function checkOrg(name, clas) {
1018
- var elm = document.getElementById(name);
1019
- if (elm) {
1020
- var all = jQuery(clas);
1021
- var idx = 0;
1022
- var checkboxid;
1023
- var photoname;
1024
- var lastdash;
1025
- var isorig;
1026
- var sizespec;
1027
- var pointpos;
1028
- var temparr;
1029
- while ( idx < all.length ) {
1030
- isorig = false;
1031
- checkboxid = jQuery(all[idx]).attr('id');
1032
- photoname = jQuery('#name-'+checkboxid).html();
1033
- photoname = photoname.replace(/&nbsp;/g, '');
1034
- photoname = photoname.replace(' ', '');
1035
- lastdash = photoname.lastIndexOf('-');
1036
- if ( lastdash == -1 ) {
1037
- isorig = true;
1038
- }
1039
- else {
1040
- sizespec = photoname.substr(lastdash+1);
1041
- pointpos = sizespec.indexOf('.');
1042
- if ( pointpos > 0 ) sizespec = sizespec.substr(0, pointpos);
1043
- temparr = sizespec.split('x');
1044
- if ( temparr.length != 2 || parseInt(temparr[0]) == 0 || parseInt(temparr[1]) == 0 ) {
1045
- isorig = true;
1046
- }
1047
- }
1048
- if ( isorig ) {
1049
- if ( elm.checked ) {
1050
- jQuery('#'+checkboxid).prop('checked', 'checked');
1051
- }
1052
- else {
1053
- jQuery('#'+checkboxid).prop('checked', '');
1054
- }
1055
- }
1056
- else { // NOT orig
1057
- if ( elm.checked ) {
1058
- jQuery('#td-'+checkboxid).css('visibility', 'hidden');
1059
- }
1060
- else {
1061
- jQuery('#td-'+checkboxid).css('visibility', 'visible');
1062
- }
1063
- }
1064
- idx++;
1065
- }
1066
- }
1067
- }
1068
- */
1069
-
1070
  function impUpd(elm, id) {
1071
  if ( elm.checked ) {
1072
  jQuery(id).prop('value', wppa_update);
@@ -1183,7 +1129,12 @@ function wppaAjaxApplyWatermark(photo, file, pos) {
1183
  var wppaAjaxPhotoCount = new Array();
1184
  var wppaPhotoUpdateMatrix = new Array();
1185
 
1186
- function wppaAjaxUpdatePhoto(photo, actionslug, elem, refresh) {
 
 
 
 
 
1187
 
1188
  var count = wppaPhotoUpdateMatrix.length;
1189
  var i = 0;
@@ -1326,6 +1277,8 @@ var wppaAlbumUpdateMatrix = new Array();
1326
 
1327
  function wppaAjaxUpdateAlbum(album, actionslug, elem) {
1328
 
 
 
1329
  // Links
1330
  if ( actionslug == 'set_deftags' || actionslug == 'add_deftags' ) {
1331
  _wppaAjaxUpdateAlbum(album, actionslug, elem.value);
@@ -1367,6 +1320,7 @@ function wppaAjaxUpdateAlbumMonitor() {
1367
  }
1368
  i++;
1369
  }
 
1370
  }
1371
 
1372
  var _wppaRefreshAfter = false;
1
  /* admin-scripts.js */
2
  /* Package: wp-photo-album-plus
3
  /*
4
+ /* Version 6.3.4
5
  /* Various js routines used in admin pages
6
  */
7
 
1013
  }
1014
  }
1015
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1016
  function impUpd(elm, id) {
1017
  if ( elm.checked ) {
1018
  jQuery(id).prop('value', wppa_update);
1129
  var wppaAjaxPhotoCount = new Array();
1130
  var wppaPhotoUpdateMatrix = new Array();
1131
 
1132
+ function wppaAjaxUpdatePhoto(photo, actionslug, elem, refresh, photoAlfaid ) {
1133
+
1134
+ if ( photoAlfaid ) {
1135
+ jQuery( "#wppaphotodesc"+photoAlfaid+"-html" ).click();
1136
+ jQuery( "#wppaphotodesc"+photoAlfaid+"-tmce" ).click();
1137
+ }
1138
 
1139
  var count = wppaPhotoUpdateMatrix.length;
1140
  var i = 0;
1277
 
1278
  function wppaAjaxUpdateAlbum(album, actionslug, elem) {
1279
 
1280
+ jQuery( "#wppaalbumdesc-html" ).click();
1281
+
1282
  // Links
1283
  if ( actionslug == 'set_deftags' || actionslug == 'add_deftags' ) {
1284
  _wppaAjaxUpdateAlbum(album, actionslug, elem.value);
1320
  }
1321
  i++;
1322
  }
1323
+ jQuery( "#wppaalbumdesc-tmce" ).click();
1324
  }
1325
 
1326
  var _wppaRefreshAfter = false;
readme.txt CHANGED
@@ -2,7 +2,7 @@
2
  Contributors: opajaap
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4
  Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
5
- Version: 6.3.2
6
  Stable tag: trunk
7
  Author: J.N. Breetvelt
8
  Author URI: http://www.opajaap.nl/
@@ -189,6 +189,17 @@ Oh, just Google on 'picture resizer' and you will find a bunch of free programs
189
 
190
  See for additional information: http://wppa.opajaap.nl/?page_id=1459
191
 
 
 
 
 
 
 
 
 
 
 
 
192
  = 6.3.3 =
193
 
194
  = Bug Fixes =
2
  Contributors: opajaap
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4
  Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
5
+ Version: 6.3.4
6
  Stable tag: trunk
7
  Author: J.N. Breetvelt
8
  Author URI: http://www.opajaap.nl/
189
 
190
  See for additional information: http://wppa.opajaap.nl/?page_id=1459
191
 
192
+ = 6.3.4 =
193
+
194
+ = Bug Fixes =
195
+
196
+ * Smiley picker will no longer break ssl.
197
+
198
+ = Other Changes =
199
+
200
+ * You now switch off the recently implemented feature to run wppa shortcodes on wppa filter priority in Table IX-A1.3
201
+ * Use WP editor ( Table IX-B3 ) Now uses tinyMce. Tanx to xdanaskos.
202
+
203
  = 6.3.3 =
204
 
205
  = Bug Fixes =
wppa-album-admin-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * create, edit and delete albums
6
- * version 6.3.0
7
  *
8
  */
9
 
@@ -213,9 +213,10 @@ function _wppa_admin() {
213
  <td colspan="2" >
214
 
215
  <?php
216
- $quicktags_settings = array( 'buttons' => 'strong,em,link,block,ins,ul,ol,li,code,close' );
217
- wp_editor(stripslashes($albuminfo['description']), 'wppaalbumdesc', array('wpautop' => false, 'media_buttons' => false, 'textarea_rows' => '6', 'tinymce' => false, 'quicktags' => $quicktags_settings ));
218
- ?>
 
219
 
220
  <input type="button" class="button-secundary" value="<?php _e('Update Album description', 'wp-photo-album-plus') ?>" onclick="wppaAjaxUpdateAlbum(<?php echo $edit_id ?>, 'description', document.getElementById('wppaalbumdesc') )" />
221
  <img id="wppa-album-spin" src="<?php echo wppa_get_imgdir().'wpspin.gif' ?>" style="visibility:hidden" />
3
  * Package: wp-photo-album-plus
4
  *
5
  * create, edit and delete albums
6
+ * version 6.3.4
7
  *
8
  */
9
 
213
  <td colspan="2" >
214
 
215
  <?php
216
+ // $quicktags_settings = array( 'buttons' => 'strong,em,link,block,ins,ul,ol,li,code,close' );
217
+ // wp_editor(stripslashes($albuminfo['description']), 'wppaalbumdesc', array('wpautop' => false, 'media_buttons' => false, 'textarea_rows' => '6', 'tinymce' => false, 'quicktags' => $quicktags_settings ));
218
+ wp_editor(stripslashes($albuminfo['description']), 'wppaalbumdesc', array('wpautop' => true, 'media_buttons' => false, 'textarea_rows' => '6', 'tinymce' => true ));
219
+ ?>
220
 
221
  <input type="button" class="button-secundary" value="<?php _e('Update Album description', 'wp-photo-album-plus') ?>" onclick="wppaAjaxUpdateAlbum(<?php echo $edit_id ?>, 'description', document.getElementById('wppaalbumdesc') )" />
222
  <img id="wppa-album-spin" src="<?php echo wppa_get_imgdir().'wpspin.gif' ?>" style="visibility:hidden" />
wppa-filter.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * get the albums via filter
6
- * version 6.3.2
7
  *
8
  */
9
 
@@ -448,7 +448,7 @@ global $wppa_opt;
448
  }
449
 
450
  // Classic way for shortcodes in widgets
451
- if ( wppa( 'in_widget' ) ) {
452
  return $result;
453
  }
454
 
@@ -500,6 +500,7 @@ global $wppa_shortcode_results;
500
 
501
  // Declare the filter to replace the placeholders by the shortcode process output
502
  add_filter( 'the_content', 'wppa_insert_shortcode_output', wppa_opt( 'filter_priority' ) );
 
503
 
504
  function wppa_set_shortcodes( $xatts, $content = '' ) {
505
  global $wppa;
3
  * Package: wp-photo-album-plus
4
  *
5
  * get the albums via filter
6
+ * version 6.3.4
7
  *
8
  */
9
 
448
  }
449
 
450
  // Classic way for shortcodes in widgets
451
+ if ( wppa( 'in_widget' ) || ! wppa_switch( 'wppa_shortcode_at_priority' ) ) {
452
  return $result;
453
  }
454
 
500
 
501
  // Declare the filter to replace the placeholders by the shortcode process output
502
  add_filter( 'the_content', 'wppa_insert_shortcode_output', wppa_opt( 'filter_priority' ) );
503
+ add_filter( 'widget_content', 'wppa_insert_shortcode_output', wppa_opt( 'filter_priority' ) );
504
 
505
  function wppa_set_shortcodes( $xatts, $content = '' ) {
506
  global $wppa;
wppa-photo-admin-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * edit and delete photos
6
- * version 6.3.0
7
  *
8
  */
9
 
@@ -689,11 +689,12 @@ global $wppa;
689
 
690
  <?php
691
  $alfaid = wppa_alfa_id( $photo['id'] );
692
- $quicktags_settings = array( 'buttons' => 'strong,em,link,block,ins,ul,ol,li,code,close' );
693
- wp_editor( stripslashes( $photo['description'] ), 'wppaphotodesc'.$alfaid, array( 'wpautop' => false, 'media_buttons' => false, 'textarea_rows' => '6', 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
694
  ?>
695
 
696
- <input type="button" class="button-secundary" value="<?php _e( 'Update Photo description' , 'wp-photo-album-plus') ?>" onclick="wppaAjaxUpdatePhoto( <?php echo $photo['id'] ?>, 'description', document.getElementById( 'wppaphotodesc'+'<?php echo $alfaid ?>' ) )" />
 
697
  <img id="wppa-photo-spin-<?php echo $photo['id'] ?>" src="<?php echo wppa_get_imgdir().'wpspin.gif' ?>" style="visibility:hidden" />
698
  </td>
699
  <?php }
3
  * Package: wp-photo-album-plus
4
  *
5
  * edit and delete photos
6
+ * version 6.3.4
7
  *
8
  */
9
 
689
 
690
  <?php
691
  $alfaid = wppa_alfa_id( $photo['id'] );
692
+ // $quicktags_settings = array( 'buttons' => 'strong,em,link,block,ins,ul,ol,li,code,close' );
693
+ wp_editor( stripslashes( $photo['description'] ), 'wppaphotodesc'.$alfaid, array( 'wpautop' => true, 'media_buttons' => false, 'textarea_rows' => '6', 'tinymce' => true ));//, 'quicktags' => $quicktags_settings ) );
694
  ?>
695
 
696
+ <input
697
+ type="button" class="button-secundary" value="<?php _e( 'Update Photo description' , 'wp-photo-album-plus') ?>" onclick="wppaAjaxUpdatePhoto( <?php echo $photo['id'] ?>, 'description', document.getElementById( 'wppaphotodesc'+'<?php echo $alfaid ?>' ), false, '<?php echo $alfaid ?>' )" />
698
  <img id="wppa-photo-spin-<?php echo $photo['id'] ?>" src="<?php echo wppa_get_imgdir().'wpspin.gif' ?>" style="visibility:hidden" />
699
  </td>
700
  <?php }
wppa-settings-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
- * Version 6.3.2
7
  *
8
  */
9
 
@@ -6654,6 +6654,15 @@ global $wppa_tags;
6654
  $clas = '';
6655
  $tags = 'system';
6656
  wppa_setting($slug, '1.2', $name, $desc, $html, $help, $clas, $tags);
 
 
 
 
 
 
 
 
 
6657
 
6658
  $name = __('JPG image quality', 'wp-photo-album-plus');
6659
  $desc = __('The jpg quality when photos are downsized', 'wp-photo-album-plus');
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
+ * Version 6.3.4
7
  *
8
  */
9
 
6654
  $clas = '';
6655
  $tags = 'system';
6656
  wppa_setting($slug, '1.2', $name, $desc, $html, $help, $clas, $tags);
6657
+
6658
+ $name = __('WPPA shortcode at Filter priority', 'wp-photo-album-plus');
6659
+ $desc = __('Execute shortcode expansion on filter priority.', 'wp-photo-album-plus');
6660
+ $help = esc_js(__('Use to fix certain layout problems', 'wp-photo-album-plus'));
6661
+ $slug = 'wppa_shortcode_at_priority';
6662
+ $html = wppa_checkbox($slug);
6663
+ $clas = '';
6664
+ $tags = 'system';
6665
+ wppa_setting($slug, '1.3', $name, $desc, $html, $help, $clas, $tags);
6666
 
6667
  $name = __('JPG image quality', 'wp-photo-album-plus');
6668
  $desc = __('The jpg quality when photos are downsized', 'wp-photo-album-plus');
wppa-setup.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the setup stuff
6
- * Version 6.3.2
7
  *
8
  */
9
 
@@ -1190,6 +1190,7 @@ Hide Camera info
1190
 
1191
  'wppa_filter_priority' => '32767', // 5
1192
  'wppa_shortcode_priority' => '11',
 
1193
  'wppa_lightbox_name' => 'wppa', // 6
1194
  'wppa_allow_foreign_shortcodes_general' => 'no',
1195
  'wppa_allow_foreign_shortcodes' => 'no', // 7
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the setup stuff
6
+ * Version 6.3.4
7
  *
8
  */
9
 
1190
 
1191
  'wppa_filter_priority' => '32767', // 5
1192
  'wppa_shortcode_priority' => '11',
1193
+ 'wppa_shortcode_at_priority' => 'yes',
1194
  'wppa_lightbox_name' => 'wppa', // 6
1195
  'wppa_allow_foreign_shortcodes_general' => 'no',
1196
  'wppa_allow_foreign_shortcodes' => 'no', // 7
wppa-utils.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains low-level utility routines
6
- * Version 6.3.2
7
  *
8
  */
9
 
@@ -2711,6 +2711,11 @@ static $smilies;
2711
 
2712
  // Convert non-emoji's
2713
  $result = convert_smilies( $result );
 
 
 
 
 
2714
 
2715
  // Done
2716
  return $result;
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains low-level utility routines
6
+ * Version 6.3.4
7
  *
8
  */
9
 
2711
 
2712
  // Convert non-emoji's
2713
  $result = convert_smilies( $result );
2714
+
2715
+ // SSL?
2716
+ if ( is_ssl() ) {
2717
+ $result = str_replace( 'http://', 'https://', $result );
2718
+ }
2719
 
2720
  // Done
2721
  return $result;
wppa.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  * Plugin Name: WP Photo Album Plus
4
  * Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5
- * Version: 6.3.3
6
  * Author: J.N. Breetvelt a.k.a. OpaJaap
7
  * Author URI: http://wppa.opajaap.nl/
8
  * Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
@@ -26,12 +26,12 @@ global $wpdb;
26
  /* when new options are added and when the wppa_setup() routine
27
  /* must be called right after update for any other reason.
28
  */
29
- global $wppa_revno; $wppa_revno = '6303';
30
 
31
  /* This is the api interface version number
32
  /* It is incremented at any code change.
33
  */
34
- global $wppa_api_version; $wppa_api_version = '6-3-03-000';
35
 
36
  /* start timers */
37
  global $wppa_starttime; $wppa_starttime = microtime(true);
2
  /*
3
  * Plugin Name: WP Photo Album Plus
4
  * Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5
+ * Version: 6.3.4
6
  * Author: J.N. Breetvelt a.k.a. OpaJaap
7
  * Author URI: http://wppa.opajaap.nl/
8
  * Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
26
  /* when new options are added and when the wppa_setup() routine
27
  /* must be called right after update for any other reason.
28
  */
29
+ global $wppa_revno; $wppa_revno = '6304';
30
 
31
  /* This is the api interface version number
32
  /* It is incremented at any code change.
33
  */
34
+ global $wppa_api_version; $wppa_api_version = '6-3-04-000';
35
 
36
  /* start timers */
37
  global $wppa_starttime; $wppa_starttime = microtime(true);