WP Photo Album Plus - Version 8.1.06.006

Version Description

= 8.1.06 =

  • This version addresses various bug fixes, feature requests and security fixes.
Download this release

Release Info

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

Code changes from version 8.1.06.005 to 8.1.06.006

Files changed (21) hide show
  1. changelog.txt +1 -0
  2. img/linkedin-black.png +0 -0
  3. img/pinterest-black.png +0 -0
  4. img/twitter-black.png +0 -0
  5. js/wppa-gutenberg-photo.js +47 -9
  6. js/wppa-gutenberg-wppa.js +28 -10
  7. readme.txt +1 -1
  8. theme/wppa-style.css +2 -2
  9. wppa-admin-styles.css +37 -1
  10. wppa-admin.php +6 -47
  11. wppa-ajax.php +5 -15
  12. wppa-boxes-html.php +2 -2
  13. wppa-defaults.php +2 -1
  14. wppa-gutenberg-photo.php +147 -214
  15. wppa-input.php +6 -2
  16. wppa-links.php +2 -2
  17. wppa-mailing.php +2 -2
  18. wppa-non-admin.php +1 -39
  19. wppa-scripts.php +2 -2
  20. wppa-settings-autosave.php +6 -4
  21. wppa.php +2 -2
changelog.txt CHANGED
@@ -7,6 +7,7 @@ WP Photo Album Plus Changelog
7
  * Fixed maintenances procs Custom album proc and Custom photo proc.
8
  * Improved behaviour of pan buttons on zoomable images. Improved touch moving of zoomed images.
9
  * Improved stability of displaying panorama and zoomable images.
 
10
 
11
  = 8.1.05 =
12
 
7
  * Fixed maintenances procs Custom album proc and Custom photo proc.
8
  * Improved behaviour of pan buttons on zoomable images. Improved touch moving of zoomed images.
9
  * Improved stability of displaying panorama and zoomable images.
10
+ * Extra checkbox on Ajax method selection ( Advanced settings -> System -> I -> Item 5: Ajax method ) to use home url rather than site url.
11
 
12
  = 8.1.05 =
13
 
img/linkedin-black.png ADDED
Binary file
img/pinterest-black.png ADDED
Binary file
img/twitter-black.png ADDED
Binary file
js/wppa-gutenberg-photo.js CHANGED
@@ -1,7 +1,7 @@
1
  /* wppa-gutenberg-photo.js
2
  * Pachkage: wp-photo-album-plus
3
  *
4
- * Version 7.5.10
5
  */
6
 
7
  // Global vars
@@ -53,10 +53,6 @@ jQuery(document).ready(function(){
53
  }, 100 );
54
  setTimeout( function() {
55
 
56
- // // Select the old value
57
- // jQuery( '#photo-104' ).prop( 'selected', true );
58
- // wppaGutenbergPhotoEvaluate();
59
-
60
  // Bind onchange handler to ready button
61
  jQuery( '#wppa-shortcode-photo-ready' ).on( 'click',
62
  function() {
@@ -65,7 +61,6 @@ jQuery(document).ready(function(){
65
  sc = res.shortcode,
66
  photo = res.photo;
67
 
68
- // alert(res.photo+', '+res.shortcode);
69
  if ( sc.length ) {
70
  props.setAttributes({
71
  shortcode: sc,
@@ -74,6 +69,52 @@ jQuery(document).ready(function(){
74
  return sc;
75
  }
76
  });
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
77
  }, 150 );
78
  return wppaPhotoDialog;
79
  }
@@ -85,9 +126,6 @@ jQuery(document).ready(function(){
85
  if ( shortcode.length ) {
86
  return shortcode;
87
  }
88
- // else {
89
- // return '[photo 104]';
90
- // }
91
  },
92
  } );
93
 
1
  /* wppa-gutenberg-photo.js
2
  * Pachkage: wp-photo-album-plus
3
  *
4
+ * Version 8.1.06.006
5
  */
6
 
7
  // Global vars
53
  }, 100 );
54
  setTimeout( function() {
55
 
 
 
 
 
56
  // Bind onchange handler to ready button
57
  jQuery( '#wppa-shortcode-photo-ready' ).on( 'click',
58
  function() {
61
  sc = res.shortcode,
62
  photo = res.photo;
63
 
 
64
  if ( sc.length ) {
65
  props.setAttributes({
66
  shortcode: sc,
69
  return sc;
70
  }
71
  });
72
+
73
+ // Make the upload form an ajax upload form
74
+ jQuery(function() {
75
+
76
+ var options = {
77
+ beforeSend: function() {
78
+ jQuery("#progress").show();
79
+ jQuery("#bar").width("0%");
80
+ jQuery("#message").html("");
81
+ jQuery("#percent").html("");
82
+ },
83
+ uploadProgress: function(event, position, total, percentComplete) {
84
+ jQuery("#bar").width(percentComplete+"%");
85
+ if ( percentComplete < 95 ) {
86
+ jQuery("#percent").html(percentComplete+"%");
87
+ }
88
+ else {
89
+ jQuery("#percent").html(wppaTxtProcessing);
90
+ }
91
+ },
92
+ success: function() {
93
+ jQuery("#bar").width("100%");
94
+ jQuery("#percent").html(wppaTxtDone);
95
+ },
96
+ complete: function(response) {
97
+ var resparr = response.responseText.split( "||" );
98
+ if ( resparr.length == 1 ) {
99
+ jQuery("#message").html( '<span style="font-size: 10px;" >'+resparr[0]+'</span>' );
100
+ }
101
+ else {
102
+ jQuery( "#wppaphoto-myphoto" ).html( wppaEntityDecode( resparr[2] ) );
103
+ }
104
+ wppaGutenbergPhotoEvaluate();
105
+ },
106
+ error: function(response) {
107
+ return;
108
+ jQuery("#message").html( '<span style="color: red;" >'+wppaTxtErrUnable+'</span>' );
109
+ wppaConsoleLog(response, 'force');
110
+ }
111
+ };
112
+ jQuery("#wppa-gutenberg-photo-uplform").ajaxForm(options);
113
+ });
114
+
115
+ // Initial evaluate
116
+ wppaGutenbergPhotoEvaluate();
117
+
118
  }, 150 );
119
  return wppaPhotoDialog;
120
  }
126
  if ( shortcode.length ) {
127
  return shortcode;
128
  }
 
 
 
129
  },
130
  } );
131
 
js/wppa-gutenberg-wppa.js CHANGED
@@ -1,7 +1,7 @@
1
  /* wppa-gutenberg-wppa.js
2
  * Pachkage: wp-photo-album-plus
3
  *
4
- * Version 8.1.05.002
5
  */
6
 
7
  // Global vars
@@ -58,10 +58,12 @@ jQuery(document).ready(function(){
58
  jQuery( '#wppa-shortcode-wppa-ready' ).on( 'click',
59
  function() {
60
  var sc = wppaGutenbergGalleryEvaluate();
 
 
61
 
62
  props.setAttributes({shortcode: sc});
63
 
64
- return sc.replace( /@/g, '#' );
65
  });
66
  }, 150 );
67
 
@@ -73,7 +75,7 @@ jQuery(document).ready(function(){
73
  var shortcode = props.attributes.shortcode || '';
74
 
75
  if ( shortcode.length ) {
76
- return shortcode; //.replace( /@/g, '#' );
77
  }
78
  },
79
  } );
@@ -554,9 +556,9 @@ function wppaGutenbergGalleryEvaluate() {
554
  }
555
 
556
  // Size
557
- // var size = '0';
558
  // if ( document.getElementById('wppagallery-size') ) {
559
- size = document.getElementById('wppagallery-size').value;
560
  // }
561
 
562
  // See if auto with fixed max
@@ -598,7 +600,7 @@ function wppaGutenbergGalleryEvaluate() {
598
  }
599
 
600
  // Align
601
- align = jQuery('#wppagallery-align').val();
602
  if ( align != 'none' ) {
603
  shortcode += ' align="'+align+'"';
604
  }
@@ -676,9 +678,13 @@ function wppaGutenbergGalleryEvaluate() {
676
  }
677
 
678
  if ( shortcodeOk ) {
679
- result = shortcode.replace( /@/g, 'HASH' );
680
- result = result.replace( /"/g, 'QUOTE' );
681
- result = result.replace( /'/g, 'APOS' );
 
 
 
 
682
  }
683
  else {
684
  result = '';
@@ -688,12 +694,16 @@ function wppaGutenbergGalleryEvaluate() {
688
  }
689
 
690
 
691
-
692
  // Get the rendered shortcode by ajax
693
  function wppaGutenbergGetWppaShorcodeRendered( shortcode, divId ) {
694
 
695
  console.log('Fetching shortcode rendered '+shortcode);
696
 
 
 
 
 
697
  jQuery.ajax( {
698
 
699
  url: wppaAjaxUrl,
@@ -715,6 +725,14 @@ function wppaGutenbergGetWppaShorcodeRendered( shortcode, divId ) {
715
  },
716
  complete: function( xhr, status, newurl ) {
717
 
 
 
 
 
 
 
 
 
718
  }
719
  } );
720
  }
1
  /* wppa-gutenberg-wppa.js
2
  * Pachkage: wp-photo-album-plus
3
  *
4
+ * Version 8.1.06.006
5
  */
6
 
7
  // Global vars
58
  jQuery( '#wppa-shortcode-wppa-ready' ).on( 'click',
59
  function() {
60
  var sc = wppaGutenbergGalleryEvaluate();
61
+ // var sc = jQuery("#wppagallery-shortcode-preview").val();
62
+ // sc.replace(/"/g, 'QUOTE');
63
 
64
  props.setAttributes({shortcode: sc});
65
 
66
+ // return sc.replace( /#/g, '#' );
67
  });
68
  }, 150 );
69
 
75
  var shortcode = props.attributes.shortcode || '';
76
 
77
  if ( shortcode.length ) {
78
+ return shortcode; //.replace( /#/g, '#' );
79
  }
80
  },
81
  } );
556
  }
557
 
558
  // Size
559
+ var size = '0';
560
  // if ( document.getElementById('wppagallery-size') ) {
561
+ // size = document.getElementById('wppagallery-size').value;
562
  // }
563
 
564
  // See if auto with fixed max
600
  }
601
 
602
  // Align
603
+ align = jQuery('#wppagallery-align').val() || 'none';
604
  if ( align != 'none' ) {
605
  shortcode += ' align="'+align+'"';
606
  }
678
  }
679
 
680
  if ( shortcodeOk ) {
681
+ result = shortcode;
682
+ if ( result == '[wppa]' ) result = wppaSavedShortcode;
683
+ else wppaSavedShortcode = result;
684
+
685
+ // .replace( /#/g, 'HASH' );
686
+ // result = result.replace( /"/g, 'QUOTE' );
687
+ // result = result.replace( /'/g, 'APOS' );
688
  }
689
  else {
690
  result = '';
694
  }
695
 
696
 
697
+ var wppaSavedShortcode = '[wppa]';
698
  // Get the rendered shortcode by ajax
699
  function wppaGutenbergGetWppaShorcodeRendered( shortcode, divId ) {
700
 
701
  console.log('Fetching shortcode rendered '+shortcode);
702
 
703
+ if ( shortcode == '[wppa]' ) {
704
+ shortcode = wppaSavedShortcode;
705
+ }
706
+
707
  jQuery.ajax( {
708
 
709
  url: wppaAjaxUrl,
725
  },
726
  complete: function( xhr, status, newurl ) {
727
 
728
+ // Fix slideshow layout
729
+ jQuery(".filmwindow").each(function(){
730
+ var w = jQuery(this).parent().width();
731
+ jQuery(this).css({width:(w-84)});
732
+ var h = jQuery(this).height();
733
+ jQuery(this).parent().css({height:(h+8)});
734
+ });
735
+ setInterval(function(){_wppaSSRuns.forEach(function(currentValue, index){if(currentValue)wppaStopShow(index)})},1000);
736
  }
737
  } );
738
  }
readme.txt CHANGED
@@ -5,7 +5,7 @@ Tags: photo, album, slideshow, video, audio, lightbox, iptc, exif, cloudinary, f
5
  Requires at least: 3.9
6
  Tested up to: 5.9
7
  Requires PHP: 5.5
8
- Stable tag: 8.1.05.003
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
5
  Requires at least: 3.9
6
  Tested up to: 5.9
7
  Requires PHP: 5.5
8
+ Stable tag: 8.1.06.006
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
theme/wppa-style.css CHANGED
@@ -3,7 +3,7 @@
3
  /* It is strongly recommended not to modify this file because it will be overwritten by an update
4
  /* Any modifications to styles that are not configurable on the settings page should be made in the standard wp customizer css tab
5
  /*
6
- /* This is version 8.0.07.017
7
  */
8
 
9
  .wppa-container, .wppa-cover-box, .wppa-thumb-area {
@@ -459,7 +459,7 @@ display:none;
459
  .wppa-bar {
460
  background-color: #7f7;
461
  width:0%;
462
- height:18px;
463
  border-radius: 3px;
464
  line-height: 18px;
465
  margin: 0;
3
  /* It is strongly recommended not to modify this file because it will be overwritten by an update
4
  /* Any modifications to styles that are not configurable on the settings page should be made in the standard wp customizer css tab
5
  /*
6
+ /* This is version 8.1.06.006
7
  */
8
 
9
  .wppa-container, .wppa-cover-box, .wppa-thumb-area {
459
  .wppa-bar {
460
  background-color: #7f7;
461
  width:0%;
462
+ height:15px;
463
  border-radius: 3px;
464
  line-height: 18px;
465
  margin: 0;
wppa-admin-styles.css CHANGED
@@ -1,7 +1,7 @@
1
  /* admin-styles.css
2
  *
3
  * wp-photo-album-plus
4
- * version 8.1.03.001
5
  */
6
  #files_list, #files_list2
7
  {
@@ -506,3 +506,39 @@ border:1px solid black;
506
  margin-top:-33px;
507
  z-index:9999999;
508
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  /* admin-styles.css
2
  *
3
  * wp-photo-album-plus
4
+ * version 8.1.06.006
5
  */
6
  #files_list, #files_list2
7
  {
506
  margin-top:-33px;
507
  z-index:9999999;
508
  }
509
+
510
+ /* Editors Admin styles */
511
+ #TB_ajaxContent {
512
+ box-sizing:border-box; width:100% !important;
513
+ }
514
+ #wppagallery-table select {
515
+ max-width:540px;
516
+ }
517
+ #wppagallery-table option {
518
+ color: #070;
519
+ }
520
+ #wppagallery-table tr, #wppagallery-table th, #wppagallery-table td {
521
+ padding: 2px 0;
522
+ }
523
+ .wppa-bar {
524
+ background-color: #7f7;
525
+ width:0%;
526
+ height:15px;
527
+ border-radius: 3px;
528
+ line-height: 18px;
529
+ margin: 0;
530
+ }
531
+ .wppa-percent {
532
+ position:relative;
533
+ display:inline-block;
534
+ top:-19px;
535
+ font-size: 12px;
536
+ line-height: 18px;
537
+ margin: 0;
538
+ }
539
+ .wppa-message {
540
+ clear: both;
541
+ }
542
+ #wppaphoto-table tr, #wppaphoto-table th, #wppaphoto-table td {
543
+ padding: 2px; 0;
544
+ }
wppa-admin.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains the admin menu and startups the admin pages
6
- * Version 8.1.05.002
7
  *
8
  */
9
 
@@ -97,12 +97,6 @@ add_action( 'admin_init', 'wppa_admin_styles' );
97
  function wppa_admin_styles() {
98
  global $wppa_api_version;
99
 
100
- // Load styles only when on a wppa page
101
- // $page = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
102
- // if ( substr( $page, 0, 4 ) !== 'wppa' ) {
103
- // return;
104
- // }
105
-
106
  $ver = filemtime( WPPA_PATH . '/wppa-admin-styles.css' );
107
  wp_register_style( 'wppa_admin_style', WPPA_URL.'/wppa-admin-styles.css', '', $ver );
108
  wp_enqueue_style( 'wppa_admin_style' );
@@ -117,43 +111,6 @@ global $wppa_api_version;
117
  wp_enqueue_style('wppa_style');
118
 
119
  $the_css = wppa_create_wppa_dynamic_css();
120
- $the_css .= '
121
- /* WPPA Admin styles */
122
- #TB_ajaxContent {
123
- box-sizing:border-box; width:100% !important;
124
- }
125
- #wppagallery-table select {
126
- max-width:540px;
127
- }
128
- #wppagallery-table option {
129
- color: #070;
130
- }
131
- #wppagallery-table tr, #wppagallery-table th, #wppagallery-table td {
132
- padding: 2px; 0;
133
- }
134
-
135
- .wppa-bar {
136
- background-color: #7f7;
137
- width:0%;
138
- height:18px;
139
- border-radius: 3px;
140
- line-height: 18px;
141
- margin: 0;
142
- }
143
- .wppa-percent {
144
- position:relative;
145
- display:inline-block;
146
- top:-19px;
147
- font-size: 12px;
148
- line-height: 18px;
149
- margin: 0;
150
- }
151
- .wppa-message {
152
- clear: both;
153
- }
154
- #wppaphoto-table tr, #wppaphoto-table th, #wppaphoto-table td {
155
- padding: 2px; 0;
156
- }';
157
  wp_add_inline_style( 'wppa_style', $the_css );
158
 
159
  }
@@ -173,10 +130,12 @@ global $wppa_api_version;
173
  );
174
 
175
  if ( wppa_is_file( WPPA_PATH.'/js/wppa-admin-scripts.min.js' ) ) {
176
- wp_enqueue_script( 'wppa-admin', WPPA_URL.'/js/wppa-admin-scripts.min.js', $depts, $wppa_api_version, true );
 
177
  }
178
  else {
179
- wp_enqueue_script( 'wppa-admin', WPPA_URL.'/js/wppa-admin-scripts.js', $depts, $wppa_api_version, true );
 
180
  }
181
  wp_enqueue_script( 'wppa-upload', WPPA_URL.'/js/wppa-multifile-compressed.js', '', $wppa_api_version, true );
182
  wp_enqueue_script( 'wppa-utils', WPPA_URL . '/js/wppa-utils.js',$depts, $wppa_api_version );
@@ -390,7 +349,7 @@ function wppa_fix_gutenberg_shortcodes( $id, $post, $update ) {
390
  if ( is_array( $temp ) ) {
391
  foreach( array_keys( $temp ) as $key ) {
392
  $t = explode( ']', $temp[$key] );
393
- $t[0] = str_replace( ['HASH', 'QUOTE', 'APOS'], ['#', '"', "'"], $t[0] );
394
  $temp[$key] = implode( ']', $t );
395
  }
396
  $new_content = implode( '[wppa ', $temp );
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains the admin menu and startups the admin pages
6
+ * Version 8.1.06.006
7
  *
8
  */
9
 
97
  function wppa_admin_styles() {
98
  global $wppa_api_version;
99
 
 
 
 
 
 
 
100
  $ver = filemtime( WPPA_PATH . '/wppa-admin-styles.css' );
101
  wp_register_style( 'wppa_admin_style', WPPA_URL.'/wppa-admin-styles.css', '', $ver );
102
  wp_enqueue_style( 'wppa_admin_style' );
111
  wp_enqueue_style('wppa_style');
112
 
113
  $the_css = wppa_create_wppa_dynamic_css();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
114
  wp_add_inline_style( 'wppa_style', $the_css );
115
 
116
  }
130
  );
131
 
132
  if ( wppa_is_file( WPPA_PATH.'/js/wppa-admin-scripts.min.js' ) ) {
133
+ $js_ver = date( "ymd-Gis", filemtime( WPPA_PATH.'/js/wppa-admin-scripts.min.js' ) );
134
+ wp_enqueue_script( 'wppa-admin', WPPA_URL.'/js/wppa-admin-scripts.min.js', $depts, $js_ver, true );
135
  }
136
  else {
137
+ $js_ver = date( "ymd-Gis", filemtime( WPPA_PATH.'/js/wppa-admin-scripts.js' ) );
138
+ wp_enqueue_script( 'wppa-admin', WPPA_URL.'/js/wppa-admin-scripts.js', $depts, $js_ver, true );
139
  }
140
  wp_enqueue_script( 'wppa-upload', WPPA_URL.'/js/wppa-multifile-compressed.js', '', $wppa_api_version, true );
141
  wp_enqueue_script( 'wppa-utils', WPPA_URL . '/js/wppa-utils.js',$depts, $wppa_api_version );
349
  if ( is_array( $temp ) ) {
350
  foreach( array_keys( $temp ) as $key ) {
351
  $t = explode( ']', $temp[$key] );
352
+ $t[0] = str_replace( '@', '#', $t[0] );
353
  $temp[$key] = implode( ']', $t );
354
  }
355
  $new_content = implode( '[wppa ', $temp );
wppa-ajax.php CHANGED
@@ -1064,10 +1064,11 @@ global $wppa;
1064
  break;
1065
 
1066
  case 'getshortcodedrendered':
1067
- if ( isset( $_REQUEST['shortcode'] ) )
1068
- $_REQUEST['shortcode'] = str_replace( ['HASH', 'QUOTE', 'APOS'], ['#', '"', "'"], $_REQUEST['shortcode'] );
 
1069
 
1070
- $shortcode = wppa_get( 'shortcode' );
1071
  wppa_load_theme();
1072
 
1073
  $wppa['mocc'] = wppa_get( 'occur' ) - '1'; // Will be inc'd back by do_shortcode content
@@ -1078,17 +1079,6 @@ global $wppa;
1078
  $result = str_replace( 'href=', 'data-href=', $result );
1079
  $result = str_replace( 'onclick="', 'onclick="return false;', $result );
1080
 
1081
- // Layout correction
1082
- $the_js = '<script>
1083
- jQuery(".filmwindow").each(function(){
1084
- var w = jQuery(this).parent().width();
1085
- jQuery(this).css({width:(w-84)});
1086
- var h = jQuery(this).height();
1087
- jQuery(this).parent().css({height:(h+8)});
1088
- });
1089
- setInterval(function(){_wppaSSRuns.forEach(function(currentValue, index){if(currentValue)wppaStopShow(index)})},1000);
1090
- </script>';
1091
-
1092
  echo ( '
1093
  <div
1094
  id="wppa-gutenberg-div-' . $wppa['mocc'] . '"
@@ -1096,7 +1086,7 @@ global $wppa;
1096
  <div style="font-size:12px;color:green;margin-bottom:2px;width:100%;text-align:center;" >
1097
  <i>(' . esc_html( __('Links and buttons will not work in this preview', 'wp-photo-album-plus') ) . ')</i>
1098
  </div>' .
1099
- $result . $the_js . '
1100
  </div>' );
1101
 
1102
  wppa_exit();
1064
  break;
1065
 
1066
  case 'getshortcodedrendered':
1067
+ // if ( isset( $_REQUEST['shortcode'] ) ) {
1068
+ // $_REQUEST['shortcode'] = str_replace( '@', '#', stripslashes( $_REQUEST['shortcode'] ) );
1069
+ // }
1070
 
1071
+ $shortcode = wppa_get( 'shortcode', '', 'gutsc' );
1072
  wppa_load_theme();
1073
 
1074
  $wppa['mocc'] = wppa_get( 'occur' ) - '1'; // Will be inc'd back by do_shortcode content
1079
  $result = str_replace( 'href=', 'data-href=', $result );
1080
  $result = str_replace( 'onclick="', 'onclick="return false;', $result );
1081
 
 
 
 
 
 
 
 
 
 
 
 
1082
  echo ( '
1083
  <div
1084
  id="wppa-gutenberg-div-' . $wppa['mocc'] . '"
1086
  <div style="font-size:12px;color:green;margin-bottom:2px;width:100%;text-align:center;" >
1087
  <i>(' . esc_html( __('Links and buttons will not work in this preview', 'wp-photo-album-plus') ) . ')</i>
1088
  </div>' .
1089
+ $result . '
1090
  </div>' );
1091
 
1092
  wppa_exit();
wppa-boxes-html.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various wppa boxes
6
- * Version 8.1.06.001
7
  *
8
  */
9
 
@@ -6249,7 +6249,7 @@ global $wppa_lang;
6249
  $result = '';
6250
 
6251
  // The standard Ajax link
6252
- $al = site_url() . '/wppaajax/?action=wppa&wppa-action=render';
6253
  $al .= '&wppa-size=' . wppa_get_container_width();
6254
  $al .= '&wppa-occur=' . $mocc;
6255
  if ( wppa_get( 'p' ) ) {
3
  * Package: wp-photo-album-plus
4
  *
5
  * Various wppa boxes
6
+ * Version 8.1.06.006
7
  *
8
  */
9
 
6249
  $result = '';
6250
 
6251
  // The standard Ajax link
6252
+ $al = ( wppa_switch( 'ajax_home' ) ? home_url() : site_url() ) . '/wppaajax/?action=wppa&wppa-action=render';
6253
  $al .= '&wppa-size=' . wppa_get_container_width();
6254
  $al .= '&wppa-occur=' . $mocc;
6255
  if ( wppa_get( 'p' ) ) {
wppa-defaults.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains default settings
6
- * Version 8.1.05.001
7
  *
8
  */
9
 
@@ -476,6 +476,7 @@ horizrailenabled:false,";
476
  'wppa_refuse_unencrypted' => 'no',
477
  'wppa_update_addressline' => 'yes',
478
  'wppa_ajax_method' => 'normal',
 
479
  'wppa_track_viewcounts' => 'yes',
480
  'wppa_track_clickcounts' => 'no',
481
  'wppa_auto_page' => 'no',
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains default settings
6
+ * Version 8.1.06.006
7
  *
8
  */
9
 
476
  'wppa_refuse_unencrypted' => 'no',
477
  'wppa_update_addressline' => 'yes',
478
  'wppa_ajax_method' => 'normal',
479
+ 'wppa_ajax_home' => 'no',
480
  'wppa_track_viewcounts' => 'yes',
481
  'wppa_track_clickcounts' => 'no',
482
  'wppa_auto_page' => 'no',
wppa-gutenberg-photo.php CHANGED
@@ -2,7 +2,7 @@
2
  /* wppa-gutenberg-photo.php
3
  * Pachkage: wp-photo-album-plus
4
  *
5
- * Version 8.1.00.009
6
  */
7
 
8
  function wppa_gutenberg_photo_block() {
@@ -41,244 +41,177 @@ global $wpdb;
41
 
42
  // Make the html
43
  // Open wrapper
44
- $result =
45
- '<div id="wppaphoto-form" >';
46
-
47
- // Open table
48
- $result .=
49
- '
50
- <table id="wppaphoto-table" class="wppaphoto-table form-table" >' .
51
- '<tbody>' .
52
 
53
  // My photos selection
54
- '
55
- <tr id="wppaphoto-myphoto-tr" >' .
56
- '<th><label for="wppaphoto-myphoto" class="wppaphoto-myphoto" >'.__('My Photo to be used', 'wp-photo-album-plus').':</label></th>'.
57
- '<td>'.
58
- '<select id="wppaphoto-myphoto" name="photo" class="wppaphoto-myphoto" onchange="wppaGutenbergPhotoEvaluate()" >' .
59
- wppa_get_myphotos_selection_body_for_gutenberg() .
60
- '</select>'.
61
- '<input' .
62
- ' type="button"' .
63
- ' value="' . esc_attr( __( 'All photos', 'wp-photo-album-plus' ) ) . '"' .
64
- ' onclick="jQuery(\'#wppaphoto-myphoto-tr\').hide();jQuery(\'#wppaphoto-allphoto-tr\').show();wppaMyPhotoSelection=false;jQuery(\'#wppaphoto-photo-preview\').html(\'\');wppaGutenbergPhotoEvaluate();"' .
65
- ' />' .
66
- '<br />'.
67
- '<small class="wppamyphoto-photo" >'.
68
- __('Specify the photo to be used', 'wp-photo-album-plus').'<br />'.
69
- __('You can select one of your photos from a maximum of 100 most recently added', 'wp-photo-album-plus').'<br />'.
70
- '</small>'.
71
- '</td>'.
72
- '</tr>' .
73
 
74
  // Photo selection max 100 of all photos
75
- '
76
- <tr id="wppaphoto-allphoto-tr" style="display:none;" >'.
77
- '<th><label for="wppaphoto-allphoto" class="wppaphoto-allphoto" >'.__('The Photo to be used', 'wp-photo-album-plus').':</label></th>'.
78
- '<td>'.
79
- '<select id="wppaphoto-allphoto" name="photo" class="wppaphoto-allphoto" onchange="wppaGutenbergPhotoEvaluate()" >' .
80
- wppa_get_allphotos_selection_body_for_gutenberg() .
81
- '</select>' .
82
- '<br />' .
83
- '<small class="wppaphoto-allphoto" >'.
84
- __('Specify the photo to be used', 'wp-photo-album-plus').'<br />'.
85
- __('You can select from a maximum of 100 most recently added photos', 'wp-photo-album-plus').'<br />'.
86
- '</small>'.
87
- '</td>'.
88
- '</tr>'.
 
 
 
 
89
 
90
  // Photo preview
91
- '
92
- <tr id="wppaphoto-photo-preview-tr" >'.
93
- '<th>' .
94
- __( 'Preview image', 'wp-photo-album-plus').':' .
95
- '</th>'.
96
- '<td id="wppaphoto-photo-preview" style="text-align:center;" >' .
97
- '</td>' .
98
- '</tr>';
99
 
100
  // Upload new photo dialog
101
  if ( count( $albums ) > 0 ) {
102
- $result .=
103
- '
104
- <tr id="wppa-gutenberg-upload-tr" >' .
105
- '<th>' .
106
- '<a' .
107
- ' style="cursor:pointer;"' .
108
- ' onclick="jQuery(\'#upload-td\').show();jQuery( \'#wppa-user-upload\' ).click();"' .
109
- ' >' .
110
- __( 'Upload new photo', 'wp-photo-album-plus' ) . ':' .
111
- '</a>' .
112
- '</th>'.
113
- '<td id="upload-td" style="display:none;" >' .
114
-
115
- // Open form
116
- '<form' .
117
- ' id="wppa-uplform"' .
118
- ' action="' . site_url() . '/wp-admin/admin-ajax.php?action=wppa&amp;wppa-action=do-fe-upload&amp;fromgutenberg=1"' .
119
- ' method="post"' .
120
- ' enctype="multipart/form-data"' .
121
- ' >' .
122
- wppa_nonce_field( 'wppa-check' , 'wppa-nonce', false ) .
123
 
124
  // Single album
125
- ( ( count( $albums ) == 1 ) ?
126
-
127
- '<input' .
128
- ' type="hidden"' .
129
- ' id="wppa-upload-album"' .
130
- ' name="wppa-upload-album"' .
131
- ' value="' . $albums[0]['id'] . '"' .
132
- ' />' .
133
-
134
- __( 'Upload to album', 'wp-photo-album-plus' ) . ': <b>' . wppa_get_album_name( $albums[0]['id'] ) . '</b>' :
135
-
136
-
137
- // Multiple albums
 
 
138
  __( 'Upload to album', 'wp-photo-album-plus' ) . ':' .
139
  wppa_album_select_a( array( 'tagid' => 'wppa-upload-album',
140
  'tagname' => 'wppa-upload-album',
141
- 'tagopen' => '<select' .
142
- ' id="wppa-upload-album"' .
143
- ' name="wppa-upload-album"' .
144
- ' style="max-width:300px;"' .
145
- ' >' ,
146
  'addpleaseselect' => true,
147
  'checkupload' => true,
148
  'checkowner' => true,
149
-
150
- ) ) ) .
151
 
152
  // The (hidden) functional button
153
- '
154
- <input' .
155
- ' type="file"' .
156
- ' style="' .
157
- 'display:none;' .
158
- '"' .
159
- ' id="wppa-user-upload"' .
160
- ' name="wppa-user-upload"' .
161
- ' onchange="jQuery( \'#wppa-user-upload-submit\' ).css( \'display\', \'block\' );wppaDisplaySelectedFile(\'wppa-user-upload\', \'wppa-user-upload-submit\');"' .
162
- ' />' .
163
 
164
  // The upload submit button
165
- '
166
- <input' .
167
- ' type="submit"' .
168
- ' id="wppa-user-upload-submit"' .
169
- ' onclick="if ( document.getElementById( \'wppa-upload-album\' ).value == 0 )' .
170
- ' {alert( \''.esc_js( __( 'Please select an album and try again', 'wp-photo-album-plus' ) ).'\' );return false;}"' .
171
- ' style="display:none;margin: 6px 0;"' .
172
- ' class="wppa-user-upload-submit"' .
173
- ' name="wppa-user-upload-submit"' .
174
- ' value=""' .
175
- ' />' .
176
 
177
  // The progression bar
178
- '
179
- <div' .
180
- ' id="progress"' .
181
- ' class="wppa-progress "' .
182
- ' style="clear:both;width:70%;border-color:#777;height:18px;border:1px solid;padding:1px;border-radius:3px;line-height: 18px;text-align: center;"' .
183
- ' >' .
184
- '<div id="bar" class="wppa-bar" ></div>' .
185
- '<div id="percent" class="wppa-percent" >0%</div >' .
186
- '</div>' .
187
- '<div id="message" class="wppa-message" ></div>' .
188
-
189
-
190
- // Form complete
191
- '</form>' .
192
-
193
- // Upload script
194
- '<script type="text/javascript" >' .
195
- 'jQuery(function() {
196
-
197
- var options = {
198
- beforeSend: function() {
199
- jQuery("#progress").show();
200
- jQuery("#bar").width("0%");
201
- jQuery("#message").html("");
202
- jQuery("#percent").html("");
203
- },
204
- uploadProgress: function(event, position, total, percentComplete) {
205
- jQuery("#bar").width(percentComplete+"%");
206
- if ( percentComplete < 95 ) {
207
- jQuery("#percent").html(percentComplete+"%");
208
- }
209
- else {
210
- jQuery("#percent").html(wppaTxtProcessing);
211
- }
212
- },
213
- success: function() {
214
- jQuery("#bar").width("100%");
215
- jQuery("#percent").html(wppaTxtDone);
216
- },
217
- complete: function(response) {
218
-
219
- var resparr = response.responseText.split( "||" );
220
-
221
- // Non fatal error uploading?
222
- if ( resparr.length == 1 ) {
223
- jQuery("#message").html( \'<span style="font-size: 10px;" >\'+resparr[0]+\'</span>\' );
224
- }
225
- else {
226
- jQuery( "#wppaphoto-myphoto" ).html( wppaEntityDecode( resparr[2] ) );
227
- }
228
- wppaGutenbergPhotoEvaluate();
229
-
230
- },
231
- error: function(response) {
232
- return;
233
-
234
- jQuery("#message").html( \'<span style="color: red;" >\'+wppaTxtErrUnable+\'</span>\' );
235
- wppaConsoleLog(response, \'force\');
236
- }
237
- };
238
- jQuery("#wppa-uplform").ajaxForm(options);
239
- });' .
240
- '</script>' .
241
- '</td>' .
242
- '</tr>';
243
  }
244
 
245
  // Cache
246
- $result .=
247
- '<tr id="wppaphoto-cache-tr" >
248
- <th><label for="wppaphoto-cache" >'.__('Cache:', 'wp-photo-album-plus').'</label></th>
249
  <td>
250
- <input type="checkbox" id="wppaphoto-cache" onchange="wppaGutenbergPhotoEvaluate()" />'.__('Cache this shortcode', 'wp-photo-album-plus').'
251
  </td>
252
  </tr>';
253
 
254
-
255
  // Shortcode preview
256
- $result .=
257
- '
258
- <tr>' .
259
- '<th>' .
260
- __( 'Shortcode', 'wp-photo-album-plus' ) . ':' .
261
- '</th>' .
262
- '<td id="wppaphoto-shortcode-preview-container" >' .
263
- '<input type="text" id="wppaphoto-shortcode-preview" style="background-color:#ddd; width:500px; height:26px;" value="[photo]" />' .
264
- '</td>' .
265
- '</tr>' .
266
-
267
- '</tbody>' .
268
-
269
- '</table>' .
270
-
271
- '<input
272
  id="wppa-shortcode-photo-ready"
273
  type="button"
274
  value="' . __( 'Ready', 'wp-photo-album-plus' ) . '"
275
- / >' .
276
-
277
- // Initial evaluate
278
- '<script type="text/javascript" >wppaGutenbergPhotoEvaluate()</script>' .
279
-
280
- // Close main wrapper
281
- '
282
  </div>';
283
 
284
  return $result;
@@ -300,15 +233,15 @@ global $wpdb;
300
  if ( $my_photos ) {
301
 
302
  // Please select
303
- $result .= '<option' .
304
- ' class="wppa-photo-select-item-first"' .
305
- ' value=""' .
306
- ' disabled="disabled"' .
307
- ( $selected ? '' : ' selected="selected"' ) .
308
- ' style="color:#700"' .
309
- ' >' .
310
- '-- ' . __( 'Please select a photo', 'wp-photo-album-plus' ) . ' --' .
311
- '</option>';
312
 
313
  // Most recent 100 photos of this owner
314
  foreach ( $my_photos as $photo ) {
2
  /* wppa-gutenberg-photo.php
3
  * Pachkage: wp-photo-album-plus
4
  *
5
+ * Version 8.1.06.006
6
  */
7
 
8
  function wppa_gutenberg_photo_block() {
41
 
42
  // Make the html
43
  // Open wrapper
44
+ $result = '
45
+ <div id="wppaphoto-form" >
46
+ <table id="wppaphoto-table" class="wppaphoto-table form-table" >
47
+ <tbody>' .
 
 
 
 
48
 
49
  // My photos selection
50
+ '<tr id="wppaphoto-myphoto-tr" >
51
+ <th><label for="wppaphoto-myphoto" class="wppaphoto-myphoto" >' . __( 'My Photo to be used', 'wp-photo-album-plus' ) . ':</label></th>
52
+ <td>
53
+ <select id="wppaphoto-myphoto" name="photo" class="wppaphoto-myphoto" onchange="wppaGutenbergPhotoEvaluate()" >' .
54
+ wppa_get_myphotos_selection_body_for_gutenberg() . '
55
+ </select>
56
+ <input
57
+ type="button"
58
+ value="' . esc_attr( __( 'All photos', 'wp-photo-album-plus' ) ) . '"
59
+ onclick="jQuery(\'#wppaphoto-myphoto-tr\').hide();jQuery(\'#wppaphoto-allphoto-tr\').show();wppaMyPhotoSelection=false;jQuery(\'#wppaphoto-photo-preview\').html(\'\');wppaGutenbergPhotoEvaluate();"
60
+ />
61
+ <br />
62
+ <small class="wppamyphoto-photo" >' .
63
+ __( 'Specify the photo to be used', 'wp-photo-album-plus' ) . '<br />'.
64
+ __( 'You can select one of your photos from a maximum of 100 most recently added', 'wp-photo-album-plus' ) . '<br />
65
+ </small>
66
+ </td>
67
+ </tr>' .
 
68
 
69
  // Photo selection max 100 of all photos
70
+ '<tr id="wppaphoto-allphoto-tr" style="display:none;" >
71
+ <th>
72
+ <label for="wppaphoto-allphoto" class="wppaphoto-allphoto" >' .
73
+ __( 'The Photo to be used', 'wp-photo-album-plus' ) . ':
74
+ </label>
75
+ </th>
76
+ <td>
77
+ <select id="wppaphoto-allphoto" name="photo" class="wppaphoto-allphoto" onchange="wppaGutenbergPhotoEvaluate()" >' .
78
+ wppa_get_allphotos_selection_body_for_gutenberg() . '
79
+ </select>
80
+ <br>
81
+ <small class="wppaphoto-allphoto" >' .
82
+ __( 'Specify the photo to be used', 'wp-photo-album-plus' ) . '<br>' .
83
+ __( 'You can select from a maximum of 100 most recently added photos', 'wp-photo-album-plus' ) . '
84
+ <br>
85
+ </small>
86
+ </td>
87
+ </tr>' .
88
 
89
  // Photo preview
90
+ '<tr id="wppaphoto-photo-preview-tr" >
91
+ <th>' .
92
+ __( 'Preview image', 'wp-photo-album-plus' ) . ':
93
+ </th>
94
+ <td id="wppaphoto-photo-preview" style="text-align:center;" >
95
+ </td>
96
+ </tr>';
 
97
 
98
  // Upload new photo dialog
99
  if ( count( $albums ) > 0 ) {
100
+ $result .= '
101
+ <tr id="wppa-gutenberg-upload-tr" >
102
+ <th>
103
+ <a
104
+ style="cursor:pointer;"
105
+ onclick="jQuery(\'#upload-td\').show();jQuery( \'#wppa-user-upload\' ).click();"
106
+ >' .
107
+ __( 'Upload new photo', 'wp-photo-album-plus' ) . ':
108
+ </a>
109
+ </th>
110
+ <td id="upload-td" style="display:none;" >
111
+
112
+ <form
113
+ id="wppa-gutenberg-photo-uplform"
114
+ action="' . site_url() . '/wp-admin/admin-ajax.php?action=wppa&amp;wppa-action=do-fe-upload&amp;fromgutenberg=1"
115
+ method="post"
116
+ enctype="multipart/form-data"
117
+ >' .
118
+ wppa_nonce_field( 'wppa-check' , 'wppa-nonce', false );
 
 
119
 
120
  // Single album
121
+ if ( count( $albums ) == 1 ) {
122
+ $result .= '
123
+ <input
124
+ type="hidden"
125
+ id="wppa-upload-album"
126
+ name="wppa-upload-album"
127
+ value="' . $albums[0]['id'] . '"
128
+ />' .
129
+
130
+ __( 'Upload to album', 'wp-photo-album-plus' ) . ': <b>' . wppa_get_album_name( $albums[0]['id'] ) . '</b>';
131
+ }
132
+
133
+ // Multiple albums
134
+ else {
135
+ $result .=
136
  __( 'Upload to album', 'wp-photo-album-plus' ) . ':' .
137
  wppa_album_select_a( array( 'tagid' => 'wppa-upload-album',
138
  'tagname' => 'wppa-upload-album',
139
+ 'tagopen' => '<select
140
+ id="wppa-upload-album"
141
+ name="wppa-upload-album"
142
+ style="max-width:300px;"
143
+ >',
144
  'addpleaseselect' => true,
145
  'checkupload' => true,
146
  'checkowner' => true,
147
+ ) );
148
+ }
149
 
150
  // The (hidden) functional button
151
+ $result .= '
152
+ <input
153
+ type="file"
154
+ style="display:none;"
155
+ id="wppa-user-upload"
156
+ name="wppa-user-upload"
157
+ onchange="jQuery( \'#wppa-user-upload-submit\' ).css( \'display\', \'block\' );wppaDisplaySelectedFile(\'wppa-user-upload\', \'wppa-user-upload-submit\');"
158
+ >' .
 
 
159
 
160
  // The upload submit button
161
+ '<input
162
+ type="submit"
163
+ id="wppa-user-upload-submit"
164
+ onclick="if ( document.getElementById( \'wppa-upload-album\' ).value == 0 ){
165
+ alert( \'' . esc_js( __( 'Please select an album and try again', 'wp-photo-album-plus' ) ) . '\' );return false;
166
+ }"
167
+ style="display:none;margin: 6px 0;"
168
+ class="wppa-user-upload-submit"
169
+ name="wppa-user-upload-submit"
170
+ value=""
171
+ />' .
172
 
173
  // The progression bar
174
+ '<div
175
+ id="progress"
176
+ class="wppa-progress "
177
+ style="clear:both;width:70%;border-color:#777;height:18px;border:1px solid;padding:1px;border-radius:3px;line-height:18px;text-align:center;"
178
+ >
179
+ <div id="bar" class="wppa-bar" ></div>
180
+ <div id="percent" class="wppa-percent" >0%</div >
181
+ </div>
182
+ <div id="message" class="wppa-message" ></div>
183
+ </form>
184
+ </td>
185
+ </tr>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
186
  }
187
 
188
  // Cache
189
+ $result .= '
190
+ <tr id="wppaphoto-cache-tr" >
191
+ <th><label for="wppaphoto-cache" >' . __( 'Cache:', 'wp-photo-album-plus' ) . '</label></th>
192
  <td>
193
+ <input type="checkbox" id="wppaphoto-cache" onchange="wppaGutenbergPhotoEvaluate()" />' . __( 'Cache this shortcode', 'wp-photo-album-plus' ) . '
194
  </td>
195
  </tr>';
196
 
 
197
  // Shortcode preview
198
+ $result .= '
199
+ <tr>
200
+ <th>' .
201
+ __( 'Shortcode', 'wp-photo-album-plus' ) . ':
202
+ </th>
203
+ <td id="wppaphoto-shortcode-preview-container" >
204
+ <input type="text" id="wppaphoto-shortcode-preview" style="background-color:#ddd; width:500px; height:26px;" value="[photo]" />
205
+ </td>
206
+ </tr>
207
+ </tbody>
208
+ </table>
209
+
210
+ <input
 
 
 
211
  id="wppa-shortcode-photo-ready"
212
  type="button"
213
  value="' . __( 'Ready', 'wp-photo-album-plus' ) . '"
214
+ / >
 
 
 
 
 
 
215
  </div>';
216
 
217
  return $result;
233
  if ( $my_photos ) {
234
 
235
  // Please select
236
+ $result .= '
237
+ <option
238
+ class="wppa-photo-select-item-first"
239
+ value=""
240
+ disabled="disabled"' .
241
+ ( $selected ? '' : ' selected="selected"' ) . '
242
+ style="color:#700"
243
+ > -- ' . __( 'Please select a photo', 'wp-photo-album-plus' ) . ' --
244
+ </option>';
245
 
246
  // Most recent 100 photos of this owner
247
  foreach ( $my_photos as $photo ) {
wppa-input.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains functions for sanitizing and formatting user input
6
- * Version 8.1.06.001
7
  *
8
  */
9
 
@@ -419,7 +419,11 @@ global $wpdb;
419
  break;
420
 
421
  case 'php':
422
- $result = str_replace( ['||AMP||', '||HASH||', '||PLUS||', '\\'], ['&', '#', '+', ''], $_REQUEST['value'] );
 
 
 
 
423
  break;
424
 
425
  case 'raw':
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains functions for sanitizing and formatting user input
6
+ * Version 8.1.06.006
7
  *
8
  */
9
 
419
  break;
420
 
421
  case 'php':
422
+ $result = str_replace( ['||AMP||', '||HASH||', '||PLUS||', '\\', '<?php'], ['&', '#', '+', '', ''], $_REQUEST['value'] );
423
+ break;
424
+
425
+ case 'gutsc':
426
+ $result = str_replace( '@', '#', stripslashes( $_REQUEST['shortcode'] ) );
427
  break;
428
 
429
  case 'raw':
wppa-links.php CHANGED
@@ -4,7 +4,7 @@
4
  *
5
  * Frontend links
6
 
7
- * Version 8.1.04.002
8
  */
9
 
10
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
@@ -129,7 +129,7 @@ global $wppa_runtime_settings;
129
  break;
130
  default: // 'normal'
131
  if ( is_admin() ) $al = site_url() . '/wp-admin/admin-ajax.php?action=wppa';
132
- else $al = site_url() . '/wppaajax?action=wppa';
133
  break;
134
  }
135
 
4
  *
5
  * Frontend links
6
 
7
+ * Version 8.1.06.006
8
  */
9
 
10
  if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
129
  break;
130
  default: // 'normal'
131
  if ( is_admin() ) $al = site_url() . '/wp-admin/admin-ajax.php?action=wppa';
132
+ else $al = ( wppa_switch( 'ajax_home' ) ? home_url() : site_url() ) . '/wppaajax?action=wppa';
133
  break;
134
  }
135
 
wppa-mailing.php CHANGED
@@ -4,7 +4,7 @@
4
  *
5
  * Contains mailing functions
6
  *
7
- * Version 8.1.05.001
8
  *
9
  */
10
 
@@ -929,7 +929,7 @@ function wppa_unsubscribe_link( $user_id, $listtype ) {
929
  // $url = WPPA_URL . '/wppa-ajax-front.php';
930
  // break;
931
  // default:
932
- $url = site_url() . '/wppaajax';
933
  // break;
934
  // }
935
  $url .= '?action=wppa&wppa-action=mailinglist&list=' . $listtype . '&onoff=off&user=' . $user_id . '&crypt=' . $crypt;
4
  *
5
  * Contains mailing functions
6
  *
7
+ * Version 8.1.06.006
8
  *
9
  */
10
 
929
  // $url = WPPA_URL . '/wppa-ajax-front.php';
930
  // break;
931
  // default:
932
+ $url = ( wppa_switch( 'ajax_home' ) ? home_url() : site_url() ) . '/wppaajax';
933
  // break;
934
  // }
935
  $url .= '?action=wppa&wppa-action=mailinglist&list=' . $listtype . '&onoff=off&user=' . $user_id . '&crypt=' . $crypt;
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 8.1.06.003
7
  *
8
  */
9
 
@@ -58,44 +58,6 @@ global $wppa_api_version;
58
  wp_enqueue_style('wppa_style');
59
 
60
  $the_css = wppa_create_wppa_dynamic_css();
61
- $the_css .= '
62
- #wppaphoto-table {
63
- box-sizing:border-box; width:100% !important;
64
- }
65
- .wppa-bar {
66
- background-color: #7f7;
67
- width:0%;
68
- height:18px;
69
- border-radius: 3px;
70
- line-height: 18px;
71
- margin: 0;
72
- }
73
- .wppa-percent {
74
- position:relative;
75
- display:inline-block;
76
- top:-19px;
77
- font-size: 12px;
78
- line-height: 18px;
79
- margin: 0;
80
- }
81
- .wppa-message {
82
- clear: both;
83
- }
84
- #wppaphoto-table tr, #wppaphoto-table th, #wppaphoto-table td {
85
- padding: 2px; 0;
86
- }
87
- #wppaphoto-table th {
88
- width:200px;
89
- }
90
- #wppaphoto-table input {
91
- padding:4px;
92
- }
93
- #wppaphoto-table th, #wppaphoto-table td {
94
- border:none;
95
- }
96
- #wppaphoto-shortcode-preview-container {
97
- width:500px !important;
98
- }';
99
  wp_add_inline_style( 'wppa_style', $the_css );
100
  }
101
 
3
  * Package: wp-photo-album-plus
4
  *
5
  * Contains all the non admin stuff
6
+ * Version 8.1.06.006
7
  *
8
  */
9
 
58
  wp_enqueue_style('wppa_style');
59
 
60
  $the_css = wppa_create_wppa_dynamic_css();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
61
  wp_add_inline_style( 'wppa_style', $the_css );
62
  }
63
 
wppa-scripts.php CHANGED
@@ -4,7 +4,7 @@
4
  *
5
  * This file contains all functions for activating javascript
6
  *
7
- * Version 8.1.06.003
8
  */
9
 
10
  // Place all wppa related js declarations in the header, both admin and frontend
@@ -255,7 +255,7 @@ global $wpdb;
255
  break;
256
  default: // 'normal', and possibly 'extern' when file does not exist
257
  if ( is_admin() ) $al = site_url() . '/wp-admin/admin-ajax.php';
258
- else $al = site_url() . '/wppaajax';
259
  break;
260
  }
261
  $ajax_url = $al;
4
  *
5
  * This file contains all functions for activating javascript
6
  *
7
+ * Version 8.1.06.006
8
  */
9
 
10
  // Place all wppa related js declarations in the header, both admin and frontend
255
  break;
256
  default: // 'normal', and possibly 'extern' when file does not exist
257
  if ( is_admin() ) $al = site_url() . '/wp-admin/admin-ajax.php';
258
+ else $al = ( wppa_switch( 'ajax_home' ) ? home_url() : site_url() ) . '/wppaajax';
259
  break;
260
  }
261
  $ajax_url = $al;
wppa-settings-autosave.php CHANGED
@@ -3,7 +3,7 @@
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
- * Version 8.1.05.001
7
  *
8
  */
9
 
@@ -6403,7 +6403,8 @@ global $wppa_subtab_names;
6403
  $name = __('Ajax method', 'wp-photo-album-plus');
6404
  $desc = __('The method Ajax will use', 'wp-photo-album-plus');
6405
  $help = __('Only change this setting when there are links that do not work', 'wp-photo-album-plus');
6406
- $slug = 'wppa_ajax_method';
 
6407
  $opts = array( __('Normal', 'wp-photo-album-plus'),
6408
  __('Frontend and Backend: Backend method', 'wp-photo-album-plus'),
6409
  __('Frontend: none, Backend: Backend method', 'wp-photo-album-plus'),
@@ -6416,8 +6417,9 @@ global $wppa_subtab_names;
6416
  );
6417
  if ( wppa_is_file( dirname( __FILE__ ) . '/wppa-ajax-front.php' ) ) $vals[] = 'extern';
6418
 
6419
- $html = wppa_select($slug, $opts, $vals);
6420
- wppa_setting_new($slug, '5', $name, $desc, $html, $help);
 
6421
 
6422
  $name = __('Track viewcounts', 'wp-photo-album-plus');
6423
  $desc = __('Register number of views of albums and photos.', 'wp-photo-album-plus');
3
  * Package: wp-photo-album-plus
4
  *
5
  * manage all options
6
+ * Version 8.1.06.006
7
  *
8
  */
9
 
6403
  $name = __('Ajax method', 'wp-photo-album-plus');
6404
  $desc = __('The method Ajax will use', 'wp-photo-album-plus');
6405
  $help = __('Only change this setting when there are links that do not work', 'wp-photo-album-plus');
6406
+ $slug1 = 'wppa_ajax_method';
6407
+ $slug2 = 'wppa_ajax_home';
6408
  $opts = array( __('Normal', 'wp-photo-album-plus'),
6409
  __('Frontend and Backend: Backend method', 'wp-photo-album-plus'),
6410
  __('Frontend: none, Backend: Backend method', 'wp-photo-album-plus'),
6417
  );
6418
  if ( wppa_is_file( dirname( __FILE__ ) . '/wppa-ajax-front.php' ) ) $vals[] = 'extern';
6419
 
6420
+ $html1 = wppa_select($slug1, $opts, $vals);
6421
+ $html2 = '<span style="float:left">' . __('Use home url rather than site url', 'wp-photo-album-plus') . wppa_checkbox($slug2);
6422
+ wppa_setting_new($slug, '5', $name, $desc, $html1.$html2, $help);
6423
 
6424
  $name = __('Track viewcounts', 'wp-photo-album-plus');
6425
  $desc = __('Register number of views of albums and photos.', 'wp-photo-album-plus');
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: 8.1.06.005
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/
@@ -24,7 +24,7 @@ global $wp_version;
24
 
25
  /* WPPA GLOBALS */
26
  global $wppa_api_version;
27
- $wppa_api_version = '8.1.06.005'; // WPPA software version
28
  global $wppa_revno;
29
  $wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30
 
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: 8.1.06.006
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/
24
 
25
  /* WPPA GLOBALS */
26
  global $wppa_api_version;
27
+ $wppa_api_version = '8.1.06.006'; // WPPA software version
28
  global $wppa_revno;
29
  $wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30