WP Photo Album Plus - Version 7.0.07.004

Version Description

= 7.0.07 =

  • This version addresses various security issues.
  • This version addresses various bug fixes

= 7.0.06 =

  • This version addresses various bug fixes
  • This version addresses various security issues.

= 7.0.05 =

  • This version addresses various minor bug fixes and feature requests.
  • This version addresses various security issues.

= 7.0.04 =

  • This version addresses various bug fixes
  • This version addresses various security issues.

= 7.0.03 =

  • This version addresses various minor bug fixes and feature requests.

= 7.0.02 =

  • This version addresses various bug fixes
  • This version addresses various security issues.

= 7.0.01 =

  • This version addresses various minor bug fixes and feature requests.

= 7.0.00 =

  • Shortcode generators for Gutenberg added.
  • This version addresses various minor bug fixes and feature requests.
  • This version addresses various security issues.
  • To prevent spamming and give the users the opportunity to decide when they want us to email them, the mailing system has been revised. Configure Table IX-M to enable various mailing lists, and use the WPPA+ Notify widget for full user flexibility.

= 6.9.21 =

  • This version addresses various bug fixes
  • This version addresses various security issues.

= 6.9.20 =

  • This version addresses various bug fixes

= 6.9.19 =

  • This version addresses various minor bug fixes

= 6.9.18 =

  • This version addresses various minor bug fixes

= 6.9.17 =

  • This version addresses various minor bug fixes and feature requests.
  • This version addresses various security issues.

= 6.9.16 =

  • This version addresses various minor bug fixes and feature requests.
  • This version addresses various security issues.

= 6.9.15 =

  • This version addresses various minor bug fixes and feature requests.
  • This version addresses various security issues.

= 6.9.14 =

  • This version addresses various minor bug fixes and feature requests.
  • This version addresses various security issues.

= 6.9.13 =

  • Security release.

= 6.9.12 =

  • This version addresses various minor bug fixes and performance improvements.

= 6.9.11 =

  • This version addresses various minor bug fixes and performance improvements.

= 6.9.10 =

  • This version addresses various minor bug fixes and performance improvements.

= 6.9.09 =

  • Panorama support phase III.

= 6.9.08 =

  • This version addresses various minor bug fixes and feature requests.
  • Panorama support phase II.

= 6.9.07 =

  • This version addresses various minor bug fixes and feature requests.
  • Panorama support phase I.

= 6.9.06 =

  • This version addresses various minor bug fixes and feature requests.

= 6.9.05 =

  • This version addresses various minor bug fixes and feature requests.

= 6.9.04 =

  • This version addresses various minor bug fixes and feature requests.
  • Local CDN functionality has been added.

= 6.9.03 =

  • This version addresses various minor bug fixes and feature requests.

= 6.9.02 =

  • This version addresses various minor bug fixes and feature requests.

= 6.9.01 =

  • This version addresses various minor bug fixes and feature requests.

= 6.9.00 =

  • This version includes the code for the privacy policy requirements.

= 6.8.09

  • This version addresses various bug fixes and code edits.

= 6.8.08 =

  • This version addresses various minor bug fixes and feature requests.
  • This version offers substantial performance improvements when the box in Table IV-A13: Defer Javascript is ticked. This setting is now recommended and set ticked as the default.
  • For more info on performance improvements and compatibility with optimizers: see the changelog.txt

= 6.8.07 =

  • This version addresses various minor bug fixes and enhancements, and a new widget: Statistics.

= 6.8.06 =

  • This version addresses various minor bug fixes and improved cache handling.

= 6.8.05 =

  • This version addresses various minor bug fixes and feture requests.

= 6.8.04 =

  • This version addresses various display issues and a few fixes of bugs that seldom affected the plugins behaviour.
Download this release

Release Info

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

Code changes from version 7.0.07.003 to 7.0.07.004

Files changed (12) hide show
  1. changelog.txt +0 -1
  2. wppa-admin-functions.php +1 -1
  3. wppa-boxes-html.php +14 -11
  4. wppa-common-functions.php +20 -19
  5. wppa-filter.php +12 -6
  6. wppa-functions.php +45 -45
  7. wppa-non-admin.php +14 -14
  8. wppa-photo-admin-autosave.php +3 -3
  9. wppa-picture.php +1 -1
  10. wppa-qr-widget.php +3 -2
  11. wppa-slideshow.php +15 -12
  12. wppa.php +2 -2
changelog.txt CHANGED
@@ -4,7 +4,6 @@ WP Photo Album Plus Changelog
4
 
5
  * Security fixes
6
  * Added class wppa-notify-check to checkboxes and wppa-notify-label to labels on the frontend of the notify widget.
7
- * jQuery lib is now always loaded in the header to fix a compatibility issue with theme twentynineteen.
8
 
9
  = 7.0.06 =
10
 
4
 
5
  * Security fixes
6
  * Added class wppa-notify-check to checkboxes and wppa-notify-label to labels on the frontend of the notify widget.
 
7
 
8
  = 7.0.06 =
9
 
wppa-admin-functions.php CHANGED
@@ -917,7 +917,7 @@ function wppa_admin_spinner() {
917
  ' />' .
918
  '<script type="text/javascript" >' .
919
  /* 'jQuery( "#wppa-admin-spinner" ).css( { left:(screen.width/2-33),top:(screen.height/2-33) } );' . */
920
- 'jQuery( document ).ready( function() { ' .
921
  'setTimeout( "wppaTestAdminReady()", 200 ); ' .
922
  '} );' .
923
  'function wppaTestAdminReady() { ' .
917
  ' />' .
918
  '<script type="text/javascript" >' .
919
  /* 'jQuery( "#wppa-admin-spinner" ).css( { left:(screen.width/2-33),top:(screen.height/2-33) } );' . */
920
+ 'jQuery(document).ready( function() { ' .
921
  'setTimeout( "wppaTestAdminReady()", 200 ); ' .
922
  '} );' .
923
  'function wppaTestAdminReady() { ' .
wppa-boxes-html.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various wppa boxes
6
- * Version 7.0.05
7
  *
8
  */
9
 
@@ -17,7 +17,7 @@ function wppa_thumb_area( $action ) {
17
  $mocc = wppa( 'mocc' );
18
  $alt = wppa( 'alt' );
19
  $maxh = wppa_opt( 'thumb_area_size' );
20
- $nice = false;
21
 
22
  // Open thumbnail area box
23
  if ( $action == 'open' ) {
@@ -52,7 +52,7 @@ function wppa_thumb_area( $action ) {
52
  }
53
 
54
  // Use nicescroller?
55
- if ( wppa_switch( 'nicescroll' ) ) {
56
  $result .= '<div class="wppa-nicewrap" >';
57
  }
58
 
@@ -84,14 +84,15 @@ function wppa_thumb_area( $action ) {
84
  $result .= '<div class="wppa-clear" style="' . wppa_wis( 'clear:both;' ) . '" ></div>';
85
 
86
  // Nicescroller
87
- if ( wppa_switch( 'nicescroll' ) ) {
88
  $result .=
 
89
  '<script type="text/javascript" >' .
90
  'jQuery(document).ready(function(){' .
91
  'jQuery(".wppa-thumb-area").niceScroll(".wppa-nicewrap",{' . wppa_opt( 'nicescroll_opts' ) . '});' .
92
  '});' .
93
- '</script>' .
94
- '</div>';
95
  }
96
 
97
  // Close the thumbnail box
@@ -3069,7 +3070,7 @@ static $albums_granted;
3069
 
3070
  '</span>' .
3071
 
3072
- ( $yalb ? '' : '<script type="text/javascript" >jQuery( document ).ready(function() {'.$onc.'})</script>' );
3073
 
3074
  $result .= wppa_get_dlg_item( $head, $body, $big );
3075
  }
@@ -3248,11 +3249,12 @@ static $albums_granted;
3248
  // Ajax upload script
3249
  if ( $ajax_upload ) {
3250
  $result .=
3251
- '<script>
 
3252
  jQuery(document).ready(function() {
3253
  jQuery("#wppa-uplform-'.$yalb.'-'.$mocc.'").ajaxForm(wppaGetUploadOptions( '.$yalb.', '.$mocc.', "'.$where.'", "'.$on_complete.'" ));
3254
  });
3255
- </script>';
3256
  }
3257
 
3258
  // Close wrapper
@@ -4803,9 +4805,10 @@ global $wpdb;
4803
  break;
4804
  }
4805
 
4806
- $result .= '<script type="text/javascript" >' .
 
4807
  'jQuery(document).ready(function(){ wppaWaitForCounter = 1; });' .
4808
- '</script>';
4809
 
4810
  $result .= '</div>';
4811
 
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various wppa boxes
6
+ * Version 7.0.07
7
  *
8
  */
9
 
17
  $mocc = wppa( 'mocc' );
18
  $alt = wppa( 'alt' );
19
  $maxh = wppa_opt( 'thumb_area_size' );
20
+ $nice = wppa_switch( 'nicescroll' );
21
 
22
  // Open thumbnail area box
23
  if ( $action == 'open' ) {
52
  }
53
 
54
  // Use nicescroller?
55
+ if ( $nice ) {
56
  $result .= '<div class="wppa-nicewrap" >';
57
  }
58
 
84
  $result .= '<div class="wppa-clear" style="' . wppa_wis( 'clear:both;' ) . '" ></div>';
85
 
86
  // Nicescroller
87
+ if ( $nice ) {
88
  $result .=
89
+ wppa_js(
90
  '<script type="text/javascript" >' .
91
  'jQuery(document).ready(function(){' .
92
  'jQuery(".wppa-thumb-area").niceScroll(".wppa-nicewrap",{' . wppa_opt( 'nicescroll_opts' ) . '});' .
93
  '});' .
94
+ '</script>', true ) .
95
+ '</div>'; // close .wppa-nicewrap div
96
  }
97
 
98
  // Close the thumbnail box
3070
 
3071
  '</span>' .
3072
 
3073
+ ( $yalb ? '' : wppa_js( '<script type="text/javascript" >jQuery(document).ready(function() {'.$onc.'})</script>' ) );
3074
 
3075
  $result .= wppa_get_dlg_item( $head, $body, $big );
3076
  }
3249
  // Ajax upload script
3250
  if ( $ajax_upload ) {
3251
  $result .=
3252
+ wppa_js(
3253
+ '<script type="text/javascript" >
3254
  jQuery(document).ready(function() {
3255
  jQuery("#wppa-uplform-'.$yalb.'-'.$mocc.'").ajaxForm(wppaGetUploadOptions( '.$yalb.', '.$mocc.', "'.$where.'", "'.$on_complete.'" ));
3256
  });
3257
+ </script>' );
3258
  }
3259
 
3260
  // Close wrapper
4805
  break;
4806
  }
4807
 
4808
+ $result .= wppa_js(
4809
+ '<script type="text/javascript" >' .
4810
  'jQuery(document).ready(function(){ wppaWaitForCounter = 1; });' .
4811
+ '</script>' );
4812
 
4813
  $result .= '</div>';
4814
 
wppa-common-functions.php CHANGED
@@ -1157,21 +1157,24 @@ global $wppa;
1157
  }
1158
 
1159
  if ( ! $reload && $msg ) {
1160
- wppa_add_js_page_data( '<script type="text/javascript" >alert( \'' . $msg . '\' );jQuery( "#wppaer" ).html( "" );</script>' );
 
1161
  }
1162
  elseif ( $reload == 'home' ) {
1163
- echo '<script id="wppaer" type="text/javascript" >' .
1164
- ( $msg ? 'alert( \'' . $msg . '\' );' : '' ) .
1165
- 'jQuery( "#wppaer" ).html( "" );' .
1166
- 'document.location.href="' . home_url() . '";' .
1167
- '</script>';
 
1168
  }
1169
  else {
1170
- echo '<script id="wppaer" type="text/javascript" >' .
1171
- ( $msg ? 'alert( \'' . $msg . '\' );' : '' ) .
1172
- 'jQuery( "#wppaer" ).html( "" );' .
1173
- 'document.location.reload( true );' .
1174
- '</script>';
 
1175
  }
1176
  }
1177
 
@@ -2021,13 +2024,14 @@ global $wpdb;
2021
  }
2022
  }
2023
 
2024
- function wppa_add_js_page_data( $txt, $echo_if_no_file = false ) {
 
 
2025
  global $wppa_js_page_data_file;
2026
  global $wppa;
2027
 
2028
  if ( is_admin() && ! $wppa['ajax'] ) {
2029
- echo $txt;
2030
- return;
2031
  }
2032
 
2033
  if ( $wppa_js_page_data_file && ! $wppa['ajax'] ) {
@@ -2041,16 +2045,13 @@ global $wppa;
2041
  $txt = str_replace( '<script type="text/javascript" >', '', $txt );
2042
  $txt = str_replace( '</script>', '', $txt );
2043
  $txt = str_replace( "\t", '', $txt );
2044
- // $txt = str_replace( "\n", '', $txt );
2045
  $txt = trim( $txt );
2046
  if ( $txt ) fwrite( $handle, "\n".$txt );
2047
  fclose( $handle );
2048
- }
2049
- elseif ( $echo_if_no_file ) {
2050
- echo $txt;
2051
  }
2052
  else {
2053
- $wppa['out'] .= $txt;
2054
  }
2055
  }
2056
 
1157
  }
1158
 
1159
  if ( ! $reload && $msg ) {
1160
+ echo
1161
+ wppa_js( "\n" . '<script type="text/javascript" >alert( \'' . $msg . '\' );jQuery( "#wppaer" ).html( "" );</script>' );
1162
  }
1163
  elseif ( $reload == 'home' ) {
1164
+ echo
1165
+ '<script id="wppaer" type="text/javascript" >' .
1166
+ ( $msg ? 'alert( \'' . $msg . '\' );' : '' ) .
1167
+ 'jQuery( "#wppaer" ).html( "" );' .
1168
+ 'document.location.href="' . home_url() . '";' .
1169
+ '</script>';
1170
  }
1171
  else {
1172
+ echo
1173
+ '<script id="wppaer" type="text/javascript" >' .
1174
+ ( $msg ? 'alert( \'' . $msg . '\' );' : '' ) .
1175
+ 'jQuery( "#wppaer" ).html( "" );' .
1176
+ 'document.location.reload( true );' .
1177
+ '</script>';
1178
  }
1179
  }
1180
 
2024
  }
2025
  }
2026
 
2027
+ // Add script to the page specific temp js file, stripped from <script> tags.
2028
+ // If admin or no file (i.e. no defer js) return untouched
2029
+ function wppa_js( $txt ) {
2030
  global $wppa_js_page_data_file;
2031
  global $wppa;
2032
 
2033
  if ( is_admin() && ! $wppa['ajax'] ) {
2034
+ return $txt;
 
2035
  }
2036
 
2037
  if ( $wppa_js_page_data_file && ! $wppa['ajax'] ) {
2045
  $txt = str_replace( '<script type="text/javascript" >', '', $txt );
2046
  $txt = str_replace( '</script>', '', $txt );
2047
  $txt = str_replace( "\t", '', $txt );
 
2048
  $txt = trim( $txt );
2049
  if ( $txt ) fwrite( $handle, "\n".$txt );
2050
  fclose( $handle );
2051
+ return '';
 
 
2052
  }
2053
  else {
2054
+ return $txt;
2055
  }
2056
  }
2057
 
wppa-filter.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * get the albums via shortcode handler
6
- * Version 7.0.06
7
  *
8
  */
9
 
@@ -34,6 +34,10 @@ function wppa_add_shortcode_to_post( $post ) {
34
 
35
  // Shortcode [wppa_div style="{style specs}"][/wppa_div]
36
  function wppa_shortcode_div( $xatts, $content = '' ) {
 
 
 
 
37
 
38
  $atts = shortcode_atts( array(
39
  'class' => '',
@@ -69,19 +73,21 @@ function wppa_shortcode_div( $xatts, $content = '' ) {
69
  }
70
  $class = trim( $class );
71
 
72
- $result = '<div style="' . esc_attr( $style ) . '"
 
 
73
  class="' . esc_attr( $class ) . '" ' .
74
  $data_maxheight .
75
  ' >' .
76
  ( $nices ? '<div class="wppa-divnicewrap" >' : '' ) .
77
  do_shortcode( $content ) .
78
  ( $nices ? '</div>': '' ) .
79
- ( $nices ?
80
- '<script>
81
  jQuery(document).ready(function(){
82
- jQuery(".wppa-div").niceScroll(".wppa-divnicewrap",{' . wppa_opt( 'nicescroll_opts' ) . '});' .
83
  '});
84
- </script>' : '' ) .
85
  '</div>';
86
 
87
  return $result;
3
  * Package: wp-photo-album-plus
4
  *
5
  * get the albums via shortcode handler
6
+ * Version 7.0.07
7
  *
8
  */
9
 
34
 
35
  // Shortcode [wppa_div style="{style specs}"][/wppa_div]
36
  function wppa_shortcode_div( $xatts, $content = '' ) {
37
+ static $seqno;
38
+
39
+ if ( ! $seqno ) $seqno = 0;
40
+ $seqno++;
41
 
42
  $atts = shortcode_atts( array(
43
  'class' => '',
73
  }
74
  $class = trim( $class );
75
 
76
+ $result = '<div
77
+ id="wppa-div-' . $seqno . '"
78
+ style="' . esc_attr( $style ) . '"
79
  class="' . esc_attr( $class ) . '" ' .
80
  $data_maxheight .
81
  ' >' .
82
  ( $nices ? '<div class="wppa-divnicewrap" >' : '' ) .
83
  do_shortcode( $content ) .
84
  ( $nices ? '</div>': '' ) .
85
+ ( $nices ? wppa_js(
86
+ '<script type="text/javascript" >
87
  jQuery(document).ready(function(){
88
+ jQuery("#wppa-div-' . $seqno . '").niceScroll(".wppa-divnicewrap",{' . wppa_opt( 'nicescroll_opts' ) . '});' .
89
  '});
90
+ </script>' ) : '' ) .
91
  '</div>';
92
 
93
  return $result;
wppa-functions.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various functions
6
- * Version 7.0.06
7
  *
8
  */
9
 
@@ -3336,8 +3336,8 @@ global $blog_id;
3336
  wppa( 'alt', 'alt' );
3337
 
3338
  // Javascript occurrence dependant stuff
3339
- wppa_add_js_page_data( "\n" . '<script type="text/javascript" >' );
3340
- wppa_add_js_page_data( "\n /* START OCCURRANCE " . wppa( 'mocc' ) . " */" );
3341
  // wppa( 'auto_colwidth' ) is set by the filter or by wppa_albums in case called directly
3342
  // wppa_opt( 'colwidth' ) is the option setting
3343
  // script or call has precedence over option setting
@@ -3359,29 +3359,29 @@ global $blog_id;
3359
  }
3360
 
3361
  if ( $auto ) {
3362
- wppa_add_js_page_data( "\n" . 'wppaAutoColumnWidth['.wppa( 'mocc' ).'] = true;' );
3363
  if ( $contw > 0 && $contw <= 1.0 ) {
3364
- wppa_add_js_page_data( "\n" . 'wppaAutoColumnFrac['.wppa( 'mocc' ).'] = '.$contw.';' );
3365
  }
3366
  else {
3367
- wppa_add_js_page_data( "\n" . 'wppaAutoColumnFrac['.wppa( 'mocc' ).'] = 1.0;' );
3368
  }
3369
- wppa_add_js_page_data( "\n" . 'wppaColWidth['.wppa( 'mocc' ).'] = 0;' );
3370
  }
3371
  else {
3372
- wppa_add_js_page_data( "\n" . 'wppaAutoColumnWidth['.wppa( 'mocc' ).'] = false;' );
3373
- wppa_add_js_page_data( "\n" . 'wppaColWidth['.wppa( 'mocc' ).'] = '.wppa_get_container_width().';' );
3374
  }
3375
- wppa_add_js_page_data( "\n" . 'wppaTopMoc = '.wppa( 'mocc' ).';' );
3376
  if ( wppa_opt( 'thumbtype' ) == 'masonry-v' ) {
3377
- wppa_add_js_page_data( "\n" . 'wppaMasonryCols['.wppa( 'mocc' ).'] = '.ceil( wppa_get_container_width() / wppa_opt( 'thumbsize' ) ).';' );
3378
  } else {
3379
- wppa_add_js_page_data( "\n" . 'wppaMasonryCols['.wppa( 'mocc' ).'] = 0;' );
3380
  }
3381
  if ( wppa( 'src_script' ) ) {
3382
- wppa_add_js_page_data( "\n" . wppa( 'src_script' ) );
3383
  }
3384
- wppa_add_js_page_data( "\n" . ( wppa_switch( 'coverphoto_responsive' ) ? 'wppaCoverImageResponsive['.wppa( 'mocc' ).'] = true;' : 'wppaCoverImageResponsive['.wppa( 'mocc' ).'] = false;' ) );
3385
 
3386
  // Aspect ratio and fullsize
3387
  if ( wppa_in_widget() == 'ss' && is_numeric( wppa( 'in_widget_frame_width' ) ) && wppa( 'in_widget_frame_width' ) > '0' ) {
@@ -3393,52 +3393,52 @@ global $blog_id;
3393
  $fls = wppa_opt( 'fullsize' );
3394
  }
3395
  $asp = str_replace( ',', '.', $asp ); // Fix decimal comma to point
3396
- wppa_add_js_page_data( "\n" . 'wppaAspectRatio['.wppa( 'mocc' ).'] = '.$asp.';' );
3397
- wppa_add_js_page_data( "\n" . 'wppaFullSize['.wppa( 'mocc' ).'] = '.$fls.';' );
3398
 
3399
  // last minute change: fullvalign with border needs a height correction in slideframe
3400
  if ( wppa_opt( 'fullimage_border_width' ) != '' && ! wppa_in_widget() ) {
3401
  $delta = ( 1 + wppa_opt( 'fullimage_border_width' ) ) * 2;
3402
  } else $delta = 0;
3403
- wppa_add_js_page_data( "\n" . 'wppaFullFrameDelta['.wppa( 'mocc' ).'] = '.$delta.';' );
3404
 
3405
  // last minute change: script %%size != default colwidth
3406
  $temp = wppa_get_container_width() - ( 2*6 + 2*36 + ( wppa_opt( 'bwidth' ) ? 2*wppa_opt( 'bwidth' ) : 0 ) );
3407
  if ( wppa_in_widget() ) $temp = wppa_get_container_width() - ( 2*6 + 2*18 + 2*wppa_opt( 'bwidth' ) );
3408
- wppa_add_js_page_data( "\n" . 'wppaFilmStripLength['.wppa( 'mocc' ).'] = '.$temp.';' );
3409
 
3410
  // last minute change: filmstrip sizes and related stuff. In widget: half size.
3411
  $temp = wppa_opt( 'film_thumbsize' ) + wppa_opt( 'tn_margin' );
3412
  if ( wppa_in_widget() ) $temp /= 2;
3413
- wppa_add_js_page_data( "\n" . 'wppaThumbnailPitch['.wppa( 'mocc' ).'] = '.$temp.';' );
3414
  $temp = wppa_opt( 'tn_margin' ) / 2;
3415
  if ( wppa_in_widget() ) $temp /= 2;
3416
- wppa_add_js_page_data( "\n" . 'wppaFilmStripMargin['.wppa( 'mocc' ).'] = '.$temp.';' );
3417
  $temp = 2*6 + 2*42 + ( wppa_opt( 'bwidth' ) ? 2*wppa_opt( 'bwidth' ) : 0 );
3418
  if ( wppa_in_widget() ) $temp = 2*6 + 2*21 + ( wppa_opt( 'bwidth' ) ? 2*wppa_opt( 'bwidth' ) : 0 );
3419
- wppa_add_js_page_data( "\n" . 'wppaFilmStripAreaDelta['.wppa( 'mocc' ).'] = '.$temp.';' );
3420
  $temp = wppa_get_preambule();
3421
- wppa_add_js_page_data( "\n" . 'wppaPreambule['.wppa( 'mocc' ).'] = '.$temp.';' );
3422
  if ( wppa_in_widget() ) {
3423
- wppa_add_js_page_data( "\n" . 'wppaIsMini['.wppa( 'mocc' ).'] = true;' );
3424
  }
3425
  else {
3426
- wppa_add_js_page_data( "\n" . 'wppaIsMini['.wppa( 'mocc' ).'] = false;' );
3427
  }
3428
 
3429
  $target = false;
3430
  if ( wppa_in_widget() == 'ss' && wppa_switch( 'sswidget_blank' ) ) $target = true;
3431
  if ( ! wppa_in_widget() && wppa_switch( 'slideshow_blank' ) ) $target = true;
3432
  if ( $target ) {
3433
- wppa_add_js_page_data( "\n" . 'wppaSlideBlank['.wppa( 'mocc' ).'] = true;' );
3434
  }
3435
  else {
3436
- wppa_add_js_page_data( "\n" . 'wppaSlideBlank['.wppa( 'mocc' ).'] = false;' );
3437
  }
3438
  // Slideshow widget always wraps around
3439
- wppa_add_js_page_data( "\n" . 'wppaSlideWrap['.wppa( 'mocc' ).'] = ' . ( wppa_switch( 'slide_wrap' ) || wppa_in_widget() == 'ss' ? 'true;' : 'false;' ) );
3440
 
3441
- wppa_add_js_page_data( "\n" . 'wppaLightBox['.wppa( 'mocc' ).'] = "xxx";' );
3442
 
3443
  // If this occur is a slideshow, determine if its link is to lightbox. This may differ between normal slideshow or ss widget
3444
  $is_slphoto = wppa( 'is_slide' ) && wppa( 'start_photo' ) && wppa( 'is_single' );
@@ -3456,13 +3456,13 @@ global $blog_id;
3456
  $lbkey = ''; // results in omitting the anchor tag
3457
  break;
3458
  }
3459
- wppa_add_js_page_data( "\n" . 'wppaLightBox[' . wppa( 'mocc' ) . '] = "' . $lbkey . '";' .
3460
- "\n" . 'wppaConsoleLog("mocc:' . wppa( 'mocc' ) . ' lbkey:"+wppaLightBox[' . wppa( 'mocc' ) . '] );' );
3461
 
3462
- wppa_add_js_page_data( "\n" . 'wppaLightboxSingle[' . wppa( 'mocc' ) . '] = ' . ( wppa_opt( 'slideshow_linktype' ) == 'lightboxsingle' ? 'true': 'false' ) . ';' );
3463
  }
3464
- wppa_add_js_page_data( "\n" . 'wppaSearchBoxSelItems[' . wppa( 'mocc' ) . '] = ' . ( ( wppa_switch( 'search_catbox' ) ? 1 : 0 ) + wppa_opt( 'search_selboxes' ) + 1 ) . ';' );
3465
- wppa_add_js_page_data( "\n" . '</script>' );
3466
 
3467
  }
3468
  elseif ( $action == 'close' ) {
@@ -3684,25 +3684,25 @@ global $thumbs;
3684
  $index = 0;
3685
  if ( $thumbs ) {
3686
  $t = -microtime( true );
3687
- wppa_add_js_page_data( "\n" . '<script type="text/javascript" >' );
3688
 
3689
  foreach ( $thumbs as $thumb ) {
3690
  if ( wppa_switch( 'next_on_callback' ) ) {
3691
- wppa_add_js_page_data( "\n" . 'wppaStoreSlideInfo( ' . wppa_get_slide_info( $index, strval( intval( $thumb['id'] ) ), strval( intval( $thumb['next_id'] ) ) ) . ' );' );
3692
  }
3693
  else {
3694
- wppa_add_js_page_data( "\n" . 'wppaStoreSlideInfo( ' . wppa_get_slide_info( $index, strval( intval( $thumb['id'] ) ) ) . ' );' );
3695
  }
3696
  if ( $startid == $thumb['id'] ) $startindex = $index; // Found the requested id, put the corresponding index in $startindex
3697
  $index++;
3698
  }
3699
 
3700
- wppa_add_js_page_data( "\n" . '</script>' );
3701
  $t += microtime( true );
3702
  wppa_dbg_msg( 'SlideInfo took ' . $t . ' seconds.' );
3703
  }
3704
 
3705
- wppa_add_js_page_data( "\n" . '<script type="text/javascript" >' );
3706
 
3707
  // How to start if slideonly
3708
  if ( wppa( 'is_slideonly' ) ) {
@@ -3717,30 +3717,30 @@ global $thumbs;
3717
  // Vertical align
3718
  if ( wppa( 'is_slideonly' ) ) {
3719
  $ali = wppa( 'ss_widget_valign' ) ? wppa( 'ss_widget_valign' ) : $ali = 'fit';
3720
- wppa_add_js_page_data( "\n" . 'wppaFullValign['.wppa( 'mocc' ).'] = "'.$ali.'";' );
3721
  }
3722
  else {
3723
- wppa_add_js_page_data( "\n" . 'wppaFullValign['.wppa( 'mocc' ).'] = "'.wppa_opt( 'fullvalign' ).'";' );
3724
  }
3725
 
3726
  // Horizontal align
3727
- wppa_add_js_page_data( "\n" . 'wppaFullHalign['.wppa( 'mocc' ).'] = "'.wppa_opt( 'fullhalign' ).'";' );
3728
 
3729
  // Portrait only ?
3730
  if ( wppa( 'portrait_only' ) ) {
3731
- wppa_add_js_page_data( "\n" . 'wppaPortraitOnly['.wppa( 'mocc' ).'] = true;' );
3732
  }
3733
 
3734
  // Start command with appropriate $startindex: -2 = at norate, -1 run from first, >=0 still at index
3735
  // If we use lightbox on slideshow, wait for documen.ready, if we do not use lightbox, go immediately.
3736
  if ( wppa_opt( 'slideshow_linktype' ) == 'lightbox' || wppa_opt( 'slideshow_linktype' ) == 'lightboxsingle' || wppa_opt( 'film_linktype' ) == 'lightbox' ) {
3737
- wppa_add_js_page_data( "\n" . 'jQuery( document ).ready( function() { wppaStartStop( '.wppa( 'mocc' ).', '.$startindex.' ); } );' );
3738
  }
3739
  else {
3740
- wppa_add_js_page_data( "\n" . 'wppaStartStop( '.wppa( 'mocc' ).', '.$startindex.' );' );
3741
  }
3742
 
3743
- wppa_add_js_page_data( "\n" . '</script>' );
3744
 
3745
  }
3746
  else {
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various functions
6
+ * Version 7.0.07
7
  *
8
  */
9
 
3336
  wppa( 'alt', 'alt' );
3337
 
3338
  // Javascript occurrence dependant stuff
3339
+ wppa_out( wppa_js( "\n" . '<script type="text/javascript" >' ) );
3340
+ wppa_out( wppa_js( "\n /* START OCCURRANCE " . wppa( 'mocc' ) . " */" ) );
3341
  // wppa( 'auto_colwidth' ) is set by the filter or by wppa_albums in case called directly
3342
  // wppa_opt( 'colwidth' ) is the option setting
3343
  // script or call has precedence over option setting
3359
  }
3360
 
3361
  if ( $auto ) {
3362
+ wppa_out( wppa_js( "\n" . 'wppaAutoColumnWidth['.wppa( 'mocc' ).'] = true;' ) );
3363
  if ( $contw > 0 && $contw <= 1.0 ) {
3364
+ wppa_out( wppa_js( "\n" . 'wppaAutoColumnFrac['.wppa( 'mocc' ).'] = '.$contw.';' ) );
3365
  }
3366
  else {
3367
+ wppa_out( wppa_js( "\n" . 'wppaAutoColumnFrac['.wppa( 'mocc' ).'] = 1.0;' ) );
3368
  }
3369
+ wppa_out( wppa_js( "\n" . 'wppaColWidth['.wppa( 'mocc' ).'] = 0;' ) );
3370
  }
3371
  else {
3372
+ wppa_out( wppa_js( "\n" . 'wppaAutoColumnWidth['.wppa( 'mocc' ).'] = false;' ) );
3373
+ wppa_out( wppa_js( "\n" . 'wppaColWidth['.wppa( 'mocc' ).'] = '.wppa_get_container_width().';' ) );
3374
  }
3375
+ wppa_out( wppa_js( "\n" . 'wppaTopMoc = '.wppa( 'mocc' ).';' ) );
3376
  if ( wppa_opt( 'thumbtype' ) == 'masonry-v' ) {
3377
+ wppa_out( wppa_js( "\n" . 'wppaMasonryCols['.wppa( 'mocc' ).'] = '.ceil( wppa_get_container_width() / wppa_opt( 'thumbsize' ) ).';' ) );
3378
  } else {
3379
+ wppa_out( wppa_js( "\n" . 'wppaMasonryCols['.wppa( 'mocc' ).'] = 0;' ) );
3380
  }
3381
  if ( wppa( 'src_script' ) ) {
3382
+ wppa_out( wppa_js( "\n" . wppa( 'src_script' ) ) );
3383
  }
3384
+ wppa_out( wppa_js( "\n" . ( wppa_switch( 'coverphoto_responsive' ) ? 'wppaCoverImageResponsive['.wppa( 'mocc' ).'] = true;' : 'wppaCoverImageResponsive['.wppa( 'mocc' ).'] = false;' ) ) );
3385
 
3386
  // Aspect ratio and fullsize
3387
  if ( wppa_in_widget() == 'ss' && is_numeric( wppa( 'in_widget_frame_width' ) ) && wppa( 'in_widget_frame_width' ) > '0' ) {
3393
  $fls = wppa_opt( 'fullsize' );
3394
  }
3395
  $asp = str_replace( ',', '.', $asp ); // Fix decimal comma to point
3396
+ wppa_out( wppa_js( "\n" . 'wppaAspectRatio['.wppa( 'mocc' ).'] = '.$asp.';' ) );
3397
+ wppa_out( wppa_js( "\n" . 'wppaFullSize['.wppa( 'mocc' ).'] = '.$fls.';' ) );
3398
 
3399
  // last minute change: fullvalign with border needs a height correction in slideframe
3400
  if ( wppa_opt( 'fullimage_border_width' ) != '' && ! wppa_in_widget() ) {
3401
  $delta = ( 1 + wppa_opt( 'fullimage_border_width' ) ) * 2;
3402
  } else $delta = 0;
3403
+ wppa_out( wppa_js( "\n" . 'wppaFullFrameDelta['.wppa( 'mocc' ).'] = '.$delta.';' ) );
3404
 
3405
  // last minute change: script %%size != default colwidth
3406
  $temp = wppa_get_container_width() - ( 2*6 + 2*36 + ( wppa_opt( 'bwidth' ) ? 2*wppa_opt( 'bwidth' ) : 0 ) );
3407
  if ( wppa_in_widget() ) $temp = wppa_get_container_width() - ( 2*6 + 2*18 + 2*wppa_opt( 'bwidth' ) );
3408
+ wppa_out( wppa_js( "\n" . 'wppaFilmStripLength['.wppa( 'mocc' ).'] = '.$temp.';' ) );
3409
 
3410
  // last minute change: filmstrip sizes and related stuff. In widget: half size.
3411
  $temp = wppa_opt( 'film_thumbsize' ) + wppa_opt( 'tn_margin' );
3412
  if ( wppa_in_widget() ) $temp /= 2;
3413
+ wppa_out( wppa_js( "\n" . 'wppaThumbnailPitch['.wppa( 'mocc' ).'] = '.$temp.';' ) );
3414
  $temp = wppa_opt( 'tn_margin' ) / 2;
3415
  if ( wppa_in_widget() ) $temp /= 2;
3416
+ wppa_out( wppa_js( "\n" . 'wppaFilmStripMargin['.wppa( 'mocc' ).'] = '.$temp.';' ) );
3417
  $temp = 2*6 + 2*42 + ( wppa_opt( 'bwidth' ) ? 2*wppa_opt( 'bwidth' ) : 0 );
3418
  if ( wppa_in_widget() ) $temp = 2*6 + 2*21 + ( wppa_opt( 'bwidth' ) ? 2*wppa_opt( 'bwidth' ) : 0 );
3419
+ wppa_out( wppa_js( "\n" . 'wppaFilmStripAreaDelta['.wppa( 'mocc' ).'] = '.$temp.';' ) );
3420
  $temp = wppa_get_preambule();
3421
+ wppa_out( wppa_js( "\n" . 'wppaPreambule['.wppa( 'mocc' ).'] = '.$temp.';' ) );
3422
  if ( wppa_in_widget() ) {
3423
+ wppa_out( wppa_js( "\n" . 'wppaIsMini['.wppa( 'mocc' ).'] = true;' ) );
3424
  }
3425
  else {
3426
+ wppa_out( wppa_js( "\n" . 'wppaIsMini['.wppa( 'mocc' ).'] = false;' ) );
3427
  }
3428
 
3429
  $target = false;
3430
  if ( wppa_in_widget() == 'ss' && wppa_switch( 'sswidget_blank' ) ) $target = true;
3431
  if ( ! wppa_in_widget() && wppa_switch( 'slideshow_blank' ) ) $target = true;
3432
  if ( $target ) {
3433
+ wppa_out( wppa_js( "\n" . 'wppaSlideBlank['.wppa( 'mocc' ).'] = true;' ) );
3434
  }
3435
  else {
3436
+ wppa_out( wppa_js( "\n" . 'wppaSlideBlank['.wppa( 'mocc' ).'] = false;' ) );
3437
  }
3438
  // Slideshow widget always wraps around
3439
+ wppa_out( wppa_js( "\n" . 'wppaSlideWrap['.wppa( 'mocc' ).'] = ' . ( wppa_switch( 'slide_wrap' ) || wppa_in_widget() == 'ss' ? 'true;' : 'false;' ) ) );
3440
 
3441
+ wppa_out( wppa_js( "\n" . 'wppaLightBox['.wppa( 'mocc' ).'] = "xxx";' ) );
3442
 
3443
  // If this occur is a slideshow, determine if its link is to lightbox. This may differ between normal slideshow or ss widget
3444
  $is_slphoto = wppa( 'is_slide' ) && wppa( 'start_photo' ) && wppa( 'is_single' );
3456
  $lbkey = ''; // results in omitting the anchor tag
3457
  break;
3458
  }
3459
+ wppa_out( wppa_js( "\n" . 'wppaLightBox[' . wppa( 'mocc' ) . '] = "' . $lbkey . '";' .
3460
+ "\n" . 'wppaConsoleLog("mocc:' . wppa( 'mocc' ) . ' lbkey:"+wppaLightBox[' . wppa( 'mocc' ) . '] );' ) );
3461
 
3462
+ wppa_out( wppa_js( "\n" . 'wppaLightboxSingle[' . wppa( 'mocc' ) . '] = ' . ( wppa_opt( 'slideshow_linktype' ) == 'lightboxsingle' ? 'true': 'false' ) . ';' ) );
3463
  }
3464
+ wppa_out( wppa_js( "\n" . 'wppaSearchBoxSelItems[' . wppa( 'mocc' ) . '] = ' . ( ( wppa_switch( 'search_catbox' ) ? 1 : 0 ) + wppa_opt( 'search_selboxes' ) + 1 ) . ';' ) );
3465
+ wppa_out( wppa_js( "\n" . '</script>' ) );
3466
 
3467
  }
3468
  elseif ( $action == 'close' ) {
3684
  $index = 0;
3685
  if ( $thumbs ) {
3686
  $t = -microtime( true );
3687
+ wppa_out( wppa_js( "\n" . '<script type="text/javascript" >' ) );
3688
 
3689
  foreach ( $thumbs as $thumb ) {
3690
  if ( wppa_switch( 'next_on_callback' ) ) {
3691
+ wppa_out( wppa_js( "\n" . 'wppaStoreSlideInfo( ' . wppa_get_slide_info( $index, strval( intval( $thumb['id'] ) ), strval( intval( $thumb['next_id'] ) ) ) . ' );' ) );
3692
  }
3693
  else {
3694
+ wppa_out( wppa_js( "\n" . 'wppaStoreSlideInfo( ' . wppa_get_slide_info( $index, strval( intval( $thumb['id'] ) ) ) . ' );' ) );
3695
  }
3696
  if ( $startid == $thumb['id'] ) $startindex = $index; // Found the requested id, put the corresponding index in $startindex
3697
  $index++;
3698
  }
3699
 
3700
+ wppa_out( wppa_js( "\n" . '</script>' ) );
3701
  $t += microtime( true );
3702
  wppa_dbg_msg( 'SlideInfo took ' . $t . ' seconds.' );
3703
  }
3704
 
3705
+ wppa_out( wppa_js( "\n" . '<script type="text/javascript" >' ) );
3706
 
3707
  // How to start if slideonly
3708
  if ( wppa( 'is_slideonly' ) ) {
3717
  // Vertical align
3718
  if ( wppa( 'is_slideonly' ) ) {
3719
  $ali = wppa( 'ss_widget_valign' ) ? wppa( 'ss_widget_valign' ) : $ali = 'fit';
3720
+ wppa_out( wppa_js( "\n" . 'wppaFullValign['.wppa( 'mocc' ).'] = "'.$ali.'";' ) );
3721
  }
3722
  else {
3723
+ wppa_out( wppa_js( "\n" . 'wppaFullValign['.wppa( 'mocc' ).'] = "'.wppa_opt( 'fullvalign' ).'";' ) );
3724
  }
3725
 
3726
  // Horizontal align
3727
+ wppa_out( wppa_js( "\n" . 'wppaFullHalign['.wppa( 'mocc' ).'] = "'.wppa_opt( 'fullhalign' ).'";' ) );
3728
 
3729
  // Portrait only ?
3730
  if ( wppa( 'portrait_only' ) ) {
3731
+ wppa_out( wppa_js( "\n" . 'wppaPortraitOnly['.wppa( 'mocc' ).'] = true;' ) );
3732
  }
3733
 
3734
  // Start command with appropriate $startindex: -2 = at norate, -1 run from first, >=0 still at index
3735
  // If we use lightbox on slideshow, wait for documen.ready, if we do not use lightbox, go immediately.
3736
  if ( wppa_opt( 'slideshow_linktype' ) == 'lightbox' || wppa_opt( 'slideshow_linktype' ) == 'lightboxsingle' || wppa_opt( 'film_linktype' ) == 'lightbox' ) {
3737
+ wppa_out( wppa_js( "\n" . 'jQuery(document).ready( function() { wppaStartStop( '.wppa( 'mocc' ).', '.$startindex.' ); } );' ) );
3738
  }
3739
  else {
3740
+ wppa_out( wppa_js( "\n" . 'wppaStartStop( '.wppa( 'mocc' ).', '.$startindex.' );' ) );
3741
  }
3742
 
3743
+ wppa_out( wppa_js( "\n" . '</script>' ) );
3744
 
3745
  }
3746
  else {
wppa-non-admin.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the non admin stuff
6
- * Version 7.0.06
7
  *
8
  */
9
 
@@ -273,8 +273,8 @@ echo '
273
  }
274
 
275
  /* LOAD JAVASCRIPT */
276
- add_action( 'init', 'wppa_add_js', 12 );
277
- function wppa_add_js() {
278
  global $wppa_js_page_data_file;
279
 
280
  $in_footer = wppa_switch( 'defer_javascript' ) && ! wppa( 'ajax' ) && ! is_admin();
@@ -306,9 +306,6 @@ global $wppa_js_page_data_file;
306
  // If still in footer...
307
  if ( $in_footer ) {
308
  add_action( 'wp_footer', 'wppa_add_javascripts' );
309
-
310
- // At least load jQuery, to enable inline jQuery(document).ready()
311
- wp_enqueue_script( 'jquery' );
312
  }
313
  else {
314
  add_action( 'wp_enqueue_scripts', 'wppa_add_javascripts' );
@@ -580,10 +577,11 @@ global $wppa_js_page_data_file;
580
  ' >' .
581
  wppa_get_svghtml( 'Exit', wppa_opt( 'ovl_fsx_btn_size' ) . 'px', true, true, '0', '0', '0', '0' ) .
582
  '</div>' .
583
- '<script>' .
 
584
  'jQuery(\'#wppa-exit-btn\').on(\'touchstart\',function(){jQuery(\'#wppa-exit-btn\').stop().fadeTo(300,1);});' .
585
  'jQuery(\'#wppa-exit-btn\').on(\'touchend\',function(){jQuery(\'#wppa-exit-btn\').stop().fadeTo(300,' . $dark . ');});' .
586
- '</script>';
587
 
588
  // The 'fullscreen' icon
589
  echo
@@ -596,10 +594,11 @@ global $wppa_js_page_data_file;
596
  ' >' .
597
  wppa_get_svghtml( 'Full-Screen', wppa_opt( 'ovl_fsx_btn_size' ) . 'px', true, true, '0', '0', '0', '0' ) .
598
  '</div>' .
599
- '<script>' .
 
600
  'jQuery(\'#wppa-fulls-btn\').on(\'touchstart\',function(){jQuery(\'#wppa-fulls-btn\').stop().fadeTo(300,1);});' .
601
  'jQuery(\'#wppa-fulls-btn\').on(\'touchend\',function(){jQuery(\'#wppa-fulls-btn\').stop().fadeTo(300,' . $dark . ');});' .
602
- '</script>';
603
 
604
  // The Spinner image
605
  echo wppa_get_spinner_svg_html( array( 'id' => 'wppa-ovl-spin',
@@ -642,7 +641,7 @@ global $wppa_js_page_data_file;
642
  /* END Lightbox vars */
643
  </script>
644
  ';
645
- wppa_add_js_page_data( $data, 'echo_when_no_file' );
646
  }
647
 
648
  // The photo views cache
@@ -659,7 +658,7 @@ global $wppa_js_page_data_file;
659
  $data .= '
660
  /* END Vieuwcounts */
661
  </script>';
662
- wppa_add_js_page_data( $data, 'echo_when_no_file' );
663
 
664
  // Debugging, show queries
665
  wppa_dbg_cachecounts('print');
@@ -693,11 +692,12 @@ global $wppa_js_page_data_file;
693
  if ( wppa_switch( 'nicescroll_window' ) ) {
694
  echo '
695
  <!-- Nice scroller on window, by wppa -->
696
- <script type="text/javascript" >
 
697
  jQuery("document").ready(function(){
698
  jQuery("body").niceScroll({' . wppa_opt( 'nicescroll_opts' ) . '});
699
  });
700
- </script>';
701
  }
702
  }
703
 
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the non admin stuff
6
+ * Version 7.0.07
7
  *
8
  */
9
 
273
  }
274
 
275
  /* LOAD JAVASCRIPT */
276
+ add_action( 'init', 'wppa_add_javascript', 12 );
277
+ function wppa_add_javascript() {
278
  global $wppa_js_page_data_file;
279
 
280
  $in_footer = wppa_switch( 'defer_javascript' ) && ! wppa( 'ajax' ) && ! is_admin();
306
  // If still in footer...
307
  if ( $in_footer ) {
308
  add_action( 'wp_footer', 'wppa_add_javascripts' );
 
 
 
309
  }
310
  else {
311
  add_action( 'wp_enqueue_scripts', 'wppa_add_javascripts' );
577
  ' >' .
578
  wppa_get_svghtml( 'Exit', wppa_opt( 'ovl_fsx_btn_size' ) . 'px', true, true, '0', '0', '0', '0' ) .
579
  '</div>' .
580
+ wppa_js(
581
+ '<script type="text/javascript" >' .
582
  'jQuery(\'#wppa-exit-btn\').on(\'touchstart\',function(){jQuery(\'#wppa-exit-btn\').stop().fadeTo(300,1);});' .
583
  'jQuery(\'#wppa-exit-btn\').on(\'touchend\',function(){jQuery(\'#wppa-exit-btn\').stop().fadeTo(300,' . $dark . ');});' .
584
+ '</script>' );
585
 
586
  // The 'fullscreen' icon
587
  echo
594
  ' >' .
595
  wppa_get_svghtml( 'Full-Screen', wppa_opt( 'ovl_fsx_btn_size' ) . 'px', true, true, '0', '0', '0', '0' ) .
596
  '</div>' .
597
+ wppa_js(
598
+ '<script type="text/javascript" >' .
599
  'jQuery(\'#wppa-fulls-btn\').on(\'touchstart\',function(){jQuery(\'#wppa-fulls-btn\').stop().fadeTo(300,1);});' .
600
  'jQuery(\'#wppa-fulls-btn\').on(\'touchend\',function(){jQuery(\'#wppa-fulls-btn\').stop().fadeTo(300,' . $dark . ');});' .
601
+ '</script>' );
602
 
603
  // The Spinner image
604
  echo wppa_get_spinner_svg_html( array( 'id' => 'wppa-ovl-spin',
641
  /* END Lightbox vars */
642
  </script>
643
  ';
644
+ echo wppa_js( $data );
645
  }
646
 
647
  // The photo views cache
658
  $data .= '
659
  /* END Vieuwcounts */
660
  </script>';
661
+ echo wppa_js( $data );
662
 
663
  // Debugging, show queries
664
  wppa_dbg_cachecounts('print');
692
  if ( wppa_switch( 'nicescroll_window' ) ) {
693
  echo '
694
  <!-- Nice scroller on window, by wppa -->
695
+ ' . wppa_js(
696
+ '<script type="text/javascript" >
697
  jQuery("document").ready(function(){
698
  jQuery("body").niceScroll({' . wppa_opt( 'nicescroll_opts' ) . '});
699
  });
700
+ </script>' );
701
  }
702
  }
703
 
wppa-photo-admin-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * edit and delete photos
6
- * Version 7.0.06
7
  *
8
  */
9
 
@@ -2485,7 +2485,7 @@ function wppa_album_photos_bulk( $album ) {
2485
  jQuery( '.wppa-bulk-thumb' ).css( 'max-height', ( thumbsize/2 )+'px' );
2486
  jQuery( '.wppa-bulk-dec' ).css( 'height', ( thumbsize/2 )+'px' );
2487
  }
2488
- jQuery( document ).ready( function() {
2489
  var action = wppa_getCookie( 'wppa_bulk_action' );
2490
  document.getElementById( 'wppa-bulk-action' ).value = action;
2491
  if ( action == 'wppa-bulk-move-to' || action == 'wppa-bulk-copy-to' ) {
@@ -2664,7 +2664,7 @@ function wppaSetConfirmMove( id ) {
2664
 
2665
  <?php echo '<small style="float:right;" > (' . count( $photos ) . ')</small>'; ?>
2666
  <script>
2667
- jQuery( document ).ready( function() {
2668
  wppaSetConfirmDelete( 'confirm-delete' );
2669
  wppaSetConfirmMove( 'confirm-move' );
2670
  });
3
  * Package: wp-photo-album-plus
4
  *
5
  * edit and delete photos
6
+ * Version 7.0.07
7
  *
8
  */
9
 
2485
  jQuery( '.wppa-bulk-thumb' ).css( 'max-height', ( thumbsize/2 )+'px' );
2486
  jQuery( '.wppa-bulk-dec' ).css( 'height', ( thumbsize/2 )+'px' );
2487
  }
2488
+ jQuery(document).ready( function() {
2489
  var action = wppa_getCookie( 'wppa_bulk_action' );
2490
  document.getElementById( 'wppa-bulk-action' ).value = action;
2491
  if ( action == 'wppa-bulk-move-to' || action == 'wppa-bulk-copy-to' ) {
2664
 
2665
  <?php echo '<small style="float:right;" > (' . count( $photos ) . ')</small>'; ?>
2666
  <script>
2667
+ jQuery(document).ready( function() {
2668
  wppaSetConfirmDelete( 'confirm-delete' );
2669
  wppaSetConfirmMove( 'confirm-move' );
2670
  });
wppa-picture.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Make the picture html
6
- * Version 6.9.12
7
  *
8
  */
9
 
3
  * Package: wp-photo-album-plus
4
  *
5
  * Make the picture html
6
+ * Version 7.0.07
7
  *
8
  */
9
 
wppa-qr-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * display qr code
6
- * Version 6.8.09
7
  */
8
 
9
  class wppaQRWidget extends WP_Widget {
@@ -59,9 +59,10 @@ class wppaQRWidget extends WP_Widget {
59
  document.getElementById( "wppa-qr-img" ).title = wppaQRUrl;
60
  return;
61
  }
 
62
  jQuery(document).ready(function(){
63
  wppaQRUpdate();
64
- });
65
  </script>';
66
 
67
  echo $before_widget . $before_title . $title . $after_title . $widget_content . $after_widget;
3
  * Package: wp-photo-album-plus
4
  *
5
  * display qr code
6
+ * Version 7.0.07
7
  */
8
 
9
  class wppaQRWidget extends WP_Widget {
59
  document.getElementById( "wppa-qr-img" ).title = wppaQRUrl;
60
  return;
61
  }
62
+ ' . wppa_js( '
63
  jQuery(document).ready(function(){
64
  wppaQRUpdate();
65
+ });' ) . '
66
  </script>';
67
 
68
  echo $before_widget . $before_title . $title . $after_title . $widget_content . $after_widget;
wppa-slideshow.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the slideshow high level functions
6
- * Version 6.9.21
7
  *
8
  */
9
 
@@ -241,10 +241,11 @@ function wppa_start_stop_icons( $opt = '' ) {
241
  if ( wppa_switch( 'show_startstop_navigation' ) && ! wppa( 'is_slideonly' ) ) $hide = ''; // we want it
242
 
243
  if ( wppa_opt( 'start_slide' ) || wppa_in_widget() ) {
244
- wppa_add_js_page_data( "\n" . '<script type="text/javascript" >' );
245
- wppa_add_js_page_data( "\n" . 'wppaSlideInitRunning['.wppa( 'mocc' ).'] = true;' );
246
- wppa_add_js_page_data( "\n" . 'wppaMaxOccur = '.wppa( 'mocc' ).';' );
247
- wppa_add_js_page_data( "\n" . '</script>' );
 
248
  }
249
 
250
  if ( ! $hide ) {
@@ -301,10 +302,11 @@ function wppa_start_stop_text( $opt = '' ) {
301
  if ( wppa_switch( 'show_startstop_navigation' ) && ! wppa( 'is_slideonly' ) ) $hide = ''; // we want it
302
 
303
  if ( wppa_opt( 'start_slide' ) || wppa_in_widget() ) {
304
- wppa_add_js_page_data( "\n" . '<script type="text/javascript" >' );
305
- wppa_add_js_page_data( "\n" . 'wppaSlideInitRunning['.wppa( 'mocc' ).'] = true;' );
306
- wppa_add_js_page_data( "\n" . 'wppaMaxOccur = '.wppa( 'mocc' ).';' );
307
- wppa_add_js_page_data( "\n" . '</script>' );
 
308
  }
309
 
310
  if ( ! $hide ) {
@@ -1248,9 +1250,10 @@ function wppa_slide_filmstrip( $opt = '' ) {
1248
  $pagsiz = round( $w / ( wppa_opt( 'film_thumbsize' ) + wppa_opt( 'tn_margin' ) ) );
1249
  if ( wppa_in_widget() ) $pagsiz = round( $w / ( wppa_opt( 'film_thumbsize' ) / 2 + wppa_opt( 'tn_margin' ) / 2 ) );
1250
 
1251
- wppa_add_js_page_data( '<script type="text/javascript" >' );
1252
- wppa_add_js_page_data( 'wppaFilmPageSize['.wppa( 'mocc' ).'] = '.$pagsiz.';' );
1253
- wppa_add_js_page_data( '</script>' );
 
1254
 
1255
  if ( is_feed() ) {
1256
  wppa_out( '<div style="'.wppa_wcs('wppa-box').wppa_wcs('wppa-nav').'">' );
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the slideshow high level functions
6
+ * Version 7.0.07
7
  *
8
  */
9
 
241
  if ( wppa_switch( 'show_startstop_navigation' ) && ! wppa( 'is_slideonly' ) ) $hide = ''; // we want it
242
 
243
  if ( wppa_opt( 'start_slide' ) || wppa_in_widget() ) {
244
+ wppa_out( wppa_js( '
245
+ <script type="text/javascript" >
246
+ wppaSlideInitRunning[' . wppa( 'mocc' ) . '] = true;
247
+ wppaMaxOccur = ' . wppa( 'mocc' ) . ';
248
+ </script>' ) );
249
  }
250
 
251
  if ( ! $hide ) {
302
  if ( wppa_switch( 'show_startstop_navigation' ) && ! wppa( 'is_slideonly' ) ) $hide = ''; // we want it
303
 
304
  if ( wppa_opt( 'start_slide' ) || wppa_in_widget() ) {
305
+ wppa_out( wppa_js( '
306
+ <script type="text/javascript" >
307
+ wppaSlideInitRunning[' . wppa( 'mocc' ) . '] = true;
308
+ wppaMaxOccur = ' . wppa( 'mocc' ) . ';
309
+ </script>' ) );
310
  }
311
 
312
  if ( ! $hide ) {
1250
  $pagsiz = round( $w / ( wppa_opt( 'film_thumbsize' ) + wppa_opt( 'tn_margin' ) ) );
1251
  if ( wppa_in_widget() ) $pagsiz = round( $w / ( wppa_opt( 'film_thumbsize' ) / 2 + wppa_opt( 'tn_margin' ) / 2 ) );
1252
 
1253
+ wppa_out( wppa_js( '
1254
+ <script type="text/javascript" >
1255
+ wppaFilmPageSize[' . wppa( 'mocc' ) . '] = ' . $pagsiz . ';
1256
+ </script>' ) );
1257
 
1258
  if ( is_feed() ) {
1259
  wppa_out( '<div style="'.wppa_wcs('wppa-box').wppa_wcs('wppa-nav').'">' );
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: 7.0.07.003
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/
@@ -23,7 +23,7 @@ global $wp_version;
23
 
24
  /* WPPA GLOBALS */
25
  global $wppa_revno; $wppa_revno = '7006'; // WPPA db version
26
- global $wppa_api_version; $wppa_api_version = '7.0.07.003'; // WPPA software version
27
 
28
  /* start timers */
29
  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: 7.0.07.004
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/
23
 
24
  /* WPPA GLOBALS */
25
  global $wppa_revno; $wppa_revno = '7006'; // WPPA db version
26
+ global $wppa_api_version; $wppa_api_version = '7.0.07.004'; // WPPA software version
27
 
28
  /* start timers */
29
  global $wppa_starttime; $wppa_starttime = microtime( true );