Version Description
Download this release
Release Info
Developer | opajaap |
Plugin | WP Photo Album Plus |
Version | 6.7.11 |
Comparing to | |
See all releases |
Code changes from version 6.7.10 to 6.7.11
- js/wppa-tinymce-photo-front.js +9 -50
- js/wppa-tinymce-photo-front.min.js +1 -1
- js/wppa-tinymce-photo.js +0 -45
- js/wppa-tinymce-photo.min.js +1 -1
- readme.txt +11 -3
- wppa-non-admin.php +1 -1
- wppa-picture.php +1 -1
- wppa-tinymce-common.php +53 -4
- wppa-tinymce-photo-front.php +7 -1
- wppa.php +3 -3
js/wppa-tinymce-photo-front.js
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
* Pachkage: wp-photo-album-plus
|
3 |
*
|
4 |
*
|
5 |
-
* Version 6.7.
|
6 |
*
|
7 |
*/
|
8 |
|
@@ -42,7 +42,7 @@ tinymce.PluginManager.add('wppaphoto', function(editor, url) {
|
|
42 |
jQuery( '.ui-widget-header' ).css( {
|
43 |
background: 'none',
|
44 |
});
|
45 |
-
|
46 |
jQuery( '.ui-dialog' ).css( {
|
47 |
boxShadow: '0px 0px 5px 5px #aaaaaa',
|
48 |
borderRadius: wppaBoxRadius+'px',
|
@@ -56,7 +56,7 @@ tinymce.PluginManager.add('wppaphoto', function(editor, url) {
|
|
56 |
lineHeight: '0px',
|
57 |
height: '24px',
|
58 |
});
|
59 |
-
|
60 |
jQuery( '.ui-dialog-title' ).css( {
|
61 |
position: 'absolute',
|
62 |
top: '15px',
|
@@ -67,13 +67,17 @@ tinymce.PluginManager.add('wppaphoto', function(editor, url) {
|
|
67 |
padding: 0,
|
68 |
position: 'absolute',
|
69 |
right: '8px',
|
70 |
-
top: '
|
71 |
width: '16px',
|
72 |
height: '16px',
|
73 |
});
|
74 |
|
|
|
|
|
|
|
|
|
75 |
jQuery( '.ui-button' ).attr( 'title', 'Close' );
|
76 |
-
|
77 |
jQuery( '.ui-icon-closethick' ).css( {
|
78 |
display: 'none',
|
79 |
});
|
@@ -284,48 +288,3 @@ function wppaDisplaySelectedFile(filetagid, displaytagid) {
|
|
284 |
jQuery('#'+displaytagid).val('Upload '+result);
|
285 |
}
|
286 |
|
287 |
-
// Ajax upload script
|
288 |
-
jQuery(function() {
|
289 |
-
|
290 |
-
var options = {
|
291 |
-
beforeSend: function() {
|
292 |
-
jQuery("#progress").show();
|
293 |
-
jQuery("#bar").width('0%');
|
294 |
-
jQuery("#message").html("");
|
295 |
-
jQuery("#percent").html("");
|
296 |
-
},
|
297 |
-
uploadProgress: function(event, position, total, percentComplete) {
|
298 |
-
jQuery("#bar").width(percentComplete+'%');
|
299 |
-
if ( percentComplete < 95 ) {
|
300 |
-
jQuery("#percent").html(percentComplete+'%');
|
301 |
-
}
|
302 |
-
else {
|
303 |
-
jQuery("#percent").html(wppaTxtProcessing);
|
304 |
-
}
|
305 |
-
},
|
306 |
-
success: function() {
|
307 |
-
jQuery("#bar").width('100%');
|
308 |
-
jQuery("#percent").html(wppaTxtDone);
|
309 |
-
},
|
310 |
-
complete: function(response) {
|
311 |
-
|
312 |
-
var resparr = response.responseText.split( '||' );
|
313 |
-
|
314 |
-
// Non fatal error uploading?
|
315 |
-
if ( resparr.length == 1 ) {
|
316 |
-
jQuery("#message").html( '<span style="font-size: 10px;" >'+resparr[0]+'</span>' );
|
317 |
-
}
|
318 |
-
else {
|
319 |
-
jQuery( '#wppaphoto-myphoto' ).html( resparr[2] );
|
320 |
-
}
|
321 |
-
wppaPhotoEvaluate();
|
322 |
-
|
323 |
-
},
|
324 |
-
error: function() {
|
325 |
-
jQuery("#message").html( '<span style="color: red;" >'+wppaTxtErrUnable+'</span>' );
|
326 |
-
}
|
327 |
-
};
|
328 |
-
|
329 |
-
setTimeout(function(){jQuery("#wppa-uplform").ajaxForm(options);}, 1000);
|
330 |
-
|
331 |
-
});
|
2 |
* Pachkage: wp-photo-album-plus
|
3 |
*
|
4 |
*
|
5 |
+
* Version 6.7.11
|
6 |
*
|
7 |
*/
|
8 |
|
42 |
jQuery( '.ui-widget-header' ).css( {
|
43 |
background: 'none',
|
44 |
});
|
45 |
+
|
46 |
jQuery( '.ui-dialog' ).css( {
|
47 |
boxShadow: '0px 0px 5px 5px #aaaaaa',
|
48 |
borderRadius: wppaBoxRadius+'px',
|
56 |
lineHeight: '0px',
|
57 |
height: '24px',
|
58 |
});
|
59 |
+
|
60 |
jQuery( '.ui-dialog-title' ).css( {
|
61 |
position: 'absolute',
|
62 |
top: '15px',
|
67 |
padding: 0,
|
68 |
position: 'absolute',
|
69 |
right: '8px',
|
70 |
+
top: '20px',
|
71 |
width: '16px',
|
72 |
height: '16px',
|
73 |
});
|
74 |
|
75 |
+
jQuery( '.ui-widget-overlay' ).css( {
|
76 |
+
background: 'none',
|
77 |
+
});
|
78 |
+
|
79 |
jQuery( '.ui-button' ).attr( 'title', 'Close' );
|
80 |
+
|
81 |
jQuery( '.ui-icon-closethick' ).css( {
|
82 |
display: 'none',
|
83 |
});
|
288 |
jQuery('#'+displaytagid).val('Upload '+result);
|
289 |
}
|
290 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
js/wppa-tinymce-photo-front.min.js
CHANGED
@@ -1 +1 @@
|
|
1 |
-
function wppaPhotoEvaluate(){var o,e;if(e=wppaMyPhotoSelection?"my":"all",photo=jQuery("#wppaphoto-"+e+"photo").val(),wppaIsEmpty(photo))jQuery("#wppaphoto-"+e+"photo").css("color","#700"),o="";else{switch(wppaOutputType){case"shortcode":id=photo.replace(/\//g,""),id=id.split("."),id=id[0],o="[photo "+id+"]";break;case"html":if(-1!=photo.indexOf("xxx"))o="Videos are not supported here";else{var p=wppaShortcodeTemplateId;o=wppaShortcodeTemplate.split(p).join(photo)}break;case"img":if(-1!=photo.indexOf("xxx")){var t=photo.replace("xxx","");o='<video preload="metadata" style="width:100%;height:auto;" controls ><source src="'+wppaPhotoDirectory+t+'mp4" type="video/mp4"><source src="'+wppaPhotoDirectory+t+'ogg" type="video/ogg"><source src="'+wppaPhotoDirectory+t+'ogv" type="video/ogg"><source src="'+wppaPhotoDirectory+t+'webm" type="video/webm"></video>'}else o='<img src="'+wppaPhotoDirectory+photo+'" />';break;default:o="Unimplemented output type"}jQuery("#wppaphoto-"+e+"photo").css("color","#070"),o=o.replace(/"/g,"""),jQuery("#wppaphoto-photo-preview-tr").show(),wppaTinyMceBasicPhotoPreview(photo)}var
|
1 |
+
function wppaPhotoEvaluate(){var o,e;if(e=wppaMyPhotoSelection?"my":"all",photo=jQuery("#wppaphoto-"+e+"photo").val(),wppaIsEmpty(photo))jQuery("#wppaphoto-"+e+"photo").css("color","#700"),o="";else{switch(wppaOutputType){case"shortcode":id=photo.replace(/\//g,""),id=id.split("."),id=id[0],o="[photo "+id+"]";break;case"html":if(-1!=photo.indexOf("xxx"))o="Videos are not supported here";else{var p=wppaShortcodeTemplateId;o=wppaShortcodeTemplate.split(p).join(photo)}break;case"img":if(-1!=photo.indexOf("xxx")){var t=photo.replace("xxx","");o='<video preload="metadata" style="width:100%;height:auto;" controls ><source src="'+wppaPhotoDirectory+t+'mp4" type="video/mp4"><source src="'+wppaPhotoDirectory+t+'ogg" type="video/ogg"><source src="'+wppaPhotoDirectory+t+'ogv" type="video/ogg"><source src="'+wppaPhotoDirectory+t+'webm" type="video/webm"></video>'}else o='<img src="'+wppaPhotoDirectory+photo+'" />';break;default:o="Unimplemented output type"}jQuery("#wppaphoto-"+e+"photo").css("color","#070"),o=o.replace(/"/g,"""),jQuery("#wppaphoto-photo-preview-tr").show(),wppaTinyMceBasicPhotoPreview(photo)}var a='<input type="text" id="wppaphoto-shortcode-preview" style="background-color:#ddd; width:100%; height:26px;" value="'+o+'" />';jQuery("#wppaphoto-shortcode-preview-container").html(a),!wppaIsEmpty(photo)?(jQuery("#wppaphoto-submit").show(),jQuery("#wppaphoto-submit-notok").hide()):(jQuery("#wppaphoto-submit").hide(),jQuery("#wppaphoto-submit-notok").show())}function wppaTinyMceBasicPhotoPreview(o){if(jQuery("#wppaphoto-photo-preview").html(""),"#potd"==o)jQuery("#wppaphoto-photo-preview").html(wppaNoPreview);else if(-1!=o.indexOf("xxx")){var e=o.replace("xxx","");jQuery("#wppaphoto-photo-preview").html('<video preload="metadata" style="max-width:400px; max-height:300px; margin-top:3px;" controls><source src="'+wppaPhotoDirectory+e+'mp4" type="video/mp4"><source src="'+wppaPhotoDirectory+e+'ogg" type="video/ogg"><source src="'+wppaPhotoDirectory+e+'ogv" type="video/ogg"><source src="'+wppaPhotoDirectory+e+'webm" type="video/webm"></video>')}else jQuery("#wppaphoto-photo-preview").html('<img src="'+wppaPhotoDirectory+o+'" style="max-width:400px; max-height:300px;" />')}function wppaDisplaySelectedFile(o,e){var p=jQuery("#"+o)[0].files[0].name;jQuery("#"+e).val("Upload "+p)}tinymce.PluginManager.add("wppaphoto",function(o,e){o.addButton("wppa_photo_button",{image:wppaImageDirectory+"camera32.png",tooltip:"WPPA+ Insert photo",onclick:function(){var o={modal:!0,resizable:!0,width:720,show:{effect:"fadeIn",duration:400},closeText:"",close:function(o,e){wppaMyPhotoSelection||(wppaMyPhotoSelection=!0,jQuery("#wppaphoto-allphoto-tr").hide(),jQuery("#wppaphoto-myphoto-tr").show(),jQuery("#wppaphoto-photo-preview").html(""),jQuery(".wppa-photo-select-item").prop("selected",!1),jQuery(".wppa-photo-select-item-first").prop("selected",!0))},open:function(o,e){wppaPhotoEvaluate()}};jQuery("#wppaphoto-form").dialog(o).dialog("open"),jQuery(".ui-widget-header").css({background:"none"}),jQuery(".ui-dialog").css({boxShadow:"0px 0px 5px 5px #aaaaaa",borderRadius:wppaBoxRadius+"px",padding:"8px",backgroundColor:wppaModalBgColor,boxSizing:"content-box",zIndex:1e5}),jQuery(".ui-dialog-titlebar").css({lineHeight:"0px",height:"24px"}),jQuery(".ui-dialog-title").css({position:"absolute",top:"15px"}),jQuery(".ui-button").css({backgroundImage:wppaModalQuitImg,padding:0,position:"absolute",right:"8px",top:"20px",width:"16px",height:"16px"}),jQuery(".ui-widget-overlay").css({background:"none"}),jQuery(".ui-button").attr("title","Close"),jQuery(".ui-icon-closethick").css({display:"none"})}})}),jQuery(function(){var o;o=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP");var e=wppaAjaxUrl+"?action=wppa&wppa-action=tinymcephotodialogfront";o.onreadystatechange=function(){if(4==o.readyState&&404!=o.status){var e=o.responseText,p=jQuery(e);p.find("table");p.appendTo("body").hide(),p.find("#wppaphoto-submit").click(function(){newShortcode=jQuery("#wppaphoto-shortcode-preview").val(),newShortcode=newShortcode.replace(/"/g,'"'),tinyMCE.activeEditor.execCommand("mceInsertContent",0,newShortcode),wppaMyPhotoSelection||(wppaMyPhotoSelection=!0,jQuery("#wppaphoto-allphoto-tr").hide(),jQuery("#wppaphoto-myphoto-tr").show(),jQuery("#wppaphoto-photo-preview").html(""),jQuery(".wppa-photo-select-item").prop("selected",!1),jQuery(".wppa-photo-select-item-first").prop("selected",!0),jQuery("#wppaphoto-myphoto").val("")),jQuery("#wppaphoto-form").dialog("close")})}},o.open("GET",e,!0),o.send()});var wppaMyPhotoSelection=!0;
|
js/wppa-tinymce-photo.js
CHANGED
@@ -155,48 +155,3 @@ function wppaDisplaySelectedFile(filetagid, displaytagid) {
|
|
155 |
jQuery('#'+displaytagid).val('Upload '+result);
|
156 |
}
|
157 |
|
158 |
-
// Ajax upload script
|
159 |
-
jQuery(function() {
|
160 |
-
|
161 |
-
var options = {
|
162 |
-
beforeSend: function() {
|
163 |
-
jQuery("#progress").show();
|
164 |
-
jQuery("#bar").width('0%');
|
165 |
-
jQuery("#message").html("");
|
166 |
-
jQuery("#percent").html("");
|
167 |
-
},
|
168 |
-
uploadProgress: function(event, position, total, percentComplete) {
|
169 |
-
jQuery("#bar").width(percentComplete+'%');
|
170 |
-
if ( percentComplete < 95 ) {
|
171 |
-
jQuery("#percent").html(percentComplete+'%');
|
172 |
-
}
|
173 |
-
else {
|
174 |
-
jQuery("#percent").html(wppaTxtProcessing);
|
175 |
-
}
|
176 |
-
},
|
177 |
-
success: function() {
|
178 |
-
jQuery("#bar").width('100%');
|
179 |
-
jQuery("#percent").html(wppaTxtDone);
|
180 |
-
},
|
181 |
-
complete: function(response) {
|
182 |
-
|
183 |
-
var resparr = response.responseText.split( '||' );
|
184 |
-
|
185 |
-
// Non fatal error uploading?
|
186 |
-
if ( resparr.length == 1 ) {
|
187 |
-
jQuery("#message").html( '<span style="font-size: 10px;" >'+resparr[0]+'</span>' );
|
188 |
-
}
|
189 |
-
else {
|
190 |
-
jQuery( '#wppaphoto-myphoto' ).html( resparr[2] );
|
191 |
-
}
|
192 |
-
wppaPhotoEvaluate();
|
193 |
-
|
194 |
-
},
|
195 |
-
error: function() {
|
196 |
-
jQuery("#message").html( '<span style="color: red;" >'+wppaTxtErrUnable+'</span>' );
|
197 |
-
}
|
198 |
-
};
|
199 |
-
|
200 |
-
setTimeout(function(){jQuery("#wppa-uplform").ajaxForm(options);}, 1000);
|
201 |
-
|
202 |
-
});
|
155 |
jQuery('#'+displaytagid).val('Upload '+result);
|
156 |
}
|
157 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
js/wppa-tinymce-photo.min.js
CHANGED
@@ -1 +1 @@
|
|
1 |
-
function wppaPhotoEvaluate(){var o,e;e=wppaMyPhotoSelection?"my":"all",photo=jQuery("#wppaphoto-"+e+"photo").val(),wppaIsEmpty(photo)?(jQuery("#wppaphoto-"+e+"photo").css("color","#700"),o=""):(id=photo.replace(/\//g,""),id=id.split("."),id=id[0],jQuery("#wppaphoto-photo-preview-tr").show(),wppaTinyMceBasicPhotoPreview(photo),jQuery("#wppaphoto-"+e+"photo").css("color","#070"),o="[photo "+id+"]");var
|
1 |
+
function wppaPhotoEvaluate(){var o,e;e=wppaMyPhotoSelection?"my":"all",photo=jQuery("#wppaphoto-"+e+"photo").val(),wppaIsEmpty(photo)?(jQuery("#wppaphoto-"+e+"photo").css("color","#700"),o=""):(id=photo.replace(/\//g,""),id=id.split("."),id=id[0],jQuery("#wppaphoto-photo-preview-tr").show(),wppaTinyMceBasicPhotoPreview(photo),jQuery("#wppaphoto-"+e+"photo").css("color","#070"),o="[photo "+id+"]");var p='<input type="text" id="wppaphoto-shortcode-preview" style="background-color:#ddd; width:100%; height:26px;" value="'+(o=o.replace(/"/g,"""))+'" />';jQuery("#wppaphoto-shortcode-preview-container").html(p),!wppaIsEmpty(photo)?(jQuery("#wppaphoto-submit").show(),jQuery("#wppaphoto-submit-notok").hide()):(jQuery("#wppaphoto-submit").hide(),jQuery("#wppaphoto-submit-notok").show())}function wppaTinyMceBasicPhotoPreview(o){if("#potd"==o)jQuery("#wppaphoto-photo-preview").html(wppaNoPreview);else if(-1!=o.indexOf("xxx")){var e=o.replace("xxx","");jQuery("#wppaphoto-photo-preview").html('<video preload="metadata" style="max-width:400px; max-height:300px; margin-top:3px;" controls><source src="'+wppaPhotoDirectory+e+'mp4" type="video/mp4"><source src="'+wppaPhotoDirectory+e+'ogg" type="video/ogg"><source src="'+wppaPhotoDirectory+e+'ogv" type="video/ogg"><source src="'+wppaPhotoDirectory+e+'webm" type="video/webm"></video>')}else jQuery("#wppaphoto-photo-preview").html('<img src="'+wppaPhotoDirectory+o+'" style="max-width:400px; max-height:300px;" />')}function wppaDisplaySelectedFile(o,e){var p=jQuery("#"+o)[0].files[0].name;jQuery("#"+e).val("Upload "+p)}tinymce.PluginManager.add("wppaphoto",function(o,e){o.addButton("wppa_photo_button",{image:wppaImageDirectory+"camera32.png",tooltip:"WPPA+ Insert photo",onclick:function(){var o=jQuery(window).width(),e=jQuery(window).height(),p=720<o?720:o;p-=80,e=jQuery(window).height(),e-=120,tb_show("WPPA+ Insert photo","#TB_inline?width="+p+"&height="+e+"&inlineId=wppaphoto-form"),wppaPhotoEvaluate()}})}),jQuery(function(){var o;o=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP");var e=wppaAjaxUrl+"?action=wppa&wppa-action=tinymcephotodialog";o.open("GET",e,!0),o.send(),o.onreadystatechange=function(){if(4==o.readyState&&404!=o.status){var e=o.responseText,p=jQuery(e);p.find("table");p.appendTo("body").hide(),p.find("#wppaphoto-submit").click(function(){newShortcode=jQuery("#wppaphoto-shortcode-preview").val(),newShortcode=newShortcode.replace(/"/g,'"'),tinyMCE.activeEditor.execCommand("mceInsertContent",0,newShortcode),wppaMyPhotoSelection=!0,jQuery("#wppaphoto-allphoto-tr").hide(),jQuery("#wppaphoto-myphoto-tr").show(),jQuery("#wppaphoto-photo-preview").html(""),tb_remove()})}}});var wppaMyPhotoSelection=!0;
|
readme.txt
CHANGED
@@ -2,8 +2,8 @@
|
|
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¤cy_code=USD&lc=US
|
4 |
Tags: photo, album, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto, imagemagick, pdf
|
5 |
-
Version: 6.7.
|
6 |
-
Stable tag: 6.7.
|
7 |
Author: J.N. Breetvelt
|
8 |
Author URI: http://www.opajaap.nl/
|
9 |
Requires at least: 3.9
|
@@ -127,6 +127,14 @@ If this happens, make sure (ask your hosting provider) that you have all the rig
|
|
127 |
|
128 |
See for additional information: <a href="http://www.wppa.nl/changelog/" >The documentation website</a>
|
129 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
130 |
= 6.7.10 =
|
131 |
|
132 |
= Bug Fixes =
|
@@ -135,7 +143,7 @@ See for additional information: <a href="http://www.wppa.nl/changelog/" >The doc
|
|
135 |
|
136 |
= New Features =
|
137 |
|
138 |
-
* The
|
139 |
See https://wppa.nl/docs-by-subject/advanced-topics/shortcode-photo/ for an explanation.
|
140 |
|
141 |
= 6.7.09 =
|
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¤cy_code=USD&lc=US
|
4 |
Tags: photo, album, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto, imagemagick, pdf
|
5 |
+
Version: 6.7.11
|
6 |
+
Stable tag: 6.7.10
|
7 |
Author: J.N. Breetvelt
|
8 |
Author URI: http://www.opajaap.nl/
|
9 |
Requires at least: 3.9
|
127 |
|
128 |
See for additional information: <a href="http://www.wppa.nl/changelog/" >The documentation website</a>
|
129 |
|
130 |
+
= 6.7.11 =
|
131 |
+
|
132 |
+
= Bug Fixes =
|
133 |
+
|
134 |
+
* Fixed a typo in bbpress compatibility code.
|
135 |
+
* Uploads on the [photo] shortcode generator dialog box now work as expected.
|
136 |
+
* Certain links did not work due to an internal counter bug. Fixed.
|
137 |
+
|
138 |
= 6.7.10 =
|
139 |
|
140 |
= Bug Fixes =
|
143 |
|
144 |
= New Features =
|
145 |
|
146 |
+
* The shortcode generator for shortcode [photo xxx] is now also available for front-end tinymce editors.
|
147 |
See https://wppa.nl/docs-by-subject/advanced-topics/shortcode-photo/ for an explanation.
|
148 |
|
149 |
= 6.7.09 =
|
wppa-non-admin.php
CHANGED
@@ -997,7 +997,7 @@ function wppa_remove_image_button_in_bbpress( $buttons ) {
|
|
997 |
}
|
998 |
return $buttons ;
|
999 |
}
|
1000 |
-
add_filter( 'bbp_get_teeny_mce_buttons', '
|
1001 |
|
1002 |
// enable processing shortcodes
|
1003 |
function wppa_enable_shortcodes_in_bbpress( $content ) {
|
997 |
}
|
998 |
return $buttons ;
|
999 |
}
|
1000 |
+
add_filter( 'bbp_get_teeny_mce_buttons', 'wppa_remove_image_button_in_bbpress' );
|
1001 |
|
1002 |
// enable processing shortcodes
|
1003 |
function wppa_enable_shortcodes_in_bbpress( $content ) {
|
wppa-picture.php
CHANGED
@@ -42,7 +42,7 @@ function wppa_get_picture_html( $args ) {
|
|
42 |
// Check existance of required args
|
43 |
foreach( array( 'id', 'type' ) as $item ) {
|
44 |
if ( ! $args[$item] ) {
|
45 |
-
wppa_dbg_msg( 'Missing ' . $item . ' in call to wppa_get_picture_html()', 'red', 'force' );
|
46 |
return false;
|
47 |
}
|
48 |
}
|
42 |
// Check existance of required args
|
43 |
foreach( array( 'id', 'type' ) as $item ) {
|
44 |
if ( ! $args[$item] ) {
|
45 |
+
// wppa_dbg_msg( 'Missing ' . $item . ' in call to wppa_get_picture_html()', 'red', 'force' );
|
46 |
return false;
|
47 |
}
|
48 |
}
|
wppa-tinymce-common.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
/* wppa-tinymce-common.php
|
3 |
* Pachkage: wp-photo-album-plus
|
4 |
*
|
5 |
-
* Version 6.7.
|
6 |
*
|
7 |
*/
|
8 |
|
@@ -147,10 +147,11 @@ global $wpdb;
|
|
147 |
'</th>'.
|
148 |
'<td id="wppaphoto-photo-preview" style="text-align:center;" >' .
|
149 |
'</td>' .
|
150 |
-
'</tr>'
|
151 |
|
152 |
// Upload new photo dialog
|
153 |
-
( count( $albums ) > 0
|
|
|
154 |
'
|
155 |
<tr id="wppa-tinymce-upload-tr" >' .
|
156 |
'<th>' .
|
@@ -240,10 +241,58 @@ global $wpdb;
|
|
240 |
|
241 |
// Form complete
|
242 |
'</form>' .
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
243 |
'</td>' .
|
244 |
-
'</tr>'
|
|
|
245 |
|
246 |
// Shortcode preview
|
|
|
247 |
'
|
248 |
<tr>' .
|
249 |
'<th>' .
|
2 |
/* wppa-tinymce-common.php
|
3 |
* Pachkage: wp-photo-album-plus
|
4 |
*
|
5 |
+
* Version 6.7.11
|
6 |
*
|
7 |
*/
|
8 |
|
147 |
'</th>'.
|
148 |
'<td id="wppaphoto-photo-preview" style="text-align:center;" >' .
|
149 |
'</td>' .
|
150 |
+
'</tr>';
|
151 |
|
152 |
// Upload new photo dialog
|
153 |
+
if ( count( $albums ) > 0 ) {
|
154 |
+
$result .=
|
155 |
'
|
156 |
<tr id="wppa-tinymce-upload-tr" >' .
|
157 |
'<th>' .
|
241 |
|
242 |
// Form complete
|
243 |
'</form>' .
|
244 |
+
|
245 |
+
// Upload script
|
246 |
+
'<script type="text/javascript" >' .
|
247 |
+
'jQuery(function() {
|
248 |
+
|
249 |
+
var options = {
|
250 |
+
beforeSend: function() {
|
251 |
+
jQuery("#progress").show();
|
252 |
+
jQuery("#bar").width("0%");
|
253 |
+
jQuery("#message").html("");
|
254 |
+
jQuery("#percent").html("");
|
255 |
+
},
|
256 |
+
uploadProgress: function(event, position, total, percentComplete) {
|
257 |
+
jQuery("#bar").width(percentComplete+"%");
|
258 |
+
if ( percentComplete < 95 ) {
|
259 |
+
jQuery("#percent").html(percentComplete+"%");
|
260 |
+
}
|
261 |
+
else {
|
262 |
+
jQuery("#percent").html(wppaTxtProcessing);
|
263 |
+
}
|
264 |
+
},
|
265 |
+
success: function() {
|
266 |
+
jQuery("#bar").width("100%");
|
267 |
+
jQuery("#percent").html(wppaTxtDone);
|
268 |
+
},
|
269 |
+
complete: function(response) {
|
270 |
+
|
271 |
+
var resparr = response.responseText.split( "||" );
|
272 |
+
|
273 |
+
// Non fatal error uploading?
|
274 |
+
if ( resparr.length == 1 ) {
|
275 |
+
jQuery("#message").html( \'<span style="font-size: 10px;" >\'+resparr[0]+\'</span>\' );
|
276 |
+
}
|
277 |
+
else {
|
278 |
+
jQuery( "#wppaphoto-myphoto" ).html( resparr[2] );
|
279 |
+
}
|
280 |
+
wppaPhotoEvaluate();
|
281 |
+
|
282 |
+
},
|
283 |
+
error: function() {
|
284 |
+
jQuery("#message").html( \'<span style="color: red;" >\'+wppaTxtErrUnable+\'</span>\' );
|
285 |
+
}
|
286 |
+
};
|
287 |
+
jQuery("#wppa-uplform").ajaxForm(options);
|
288 |
+
});' .
|
289 |
+
'</script>' .
|
290 |
'</td>' .
|
291 |
+
'</tr>';
|
292 |
+
}
|
293 |
|
294 |
// Shortcode preview
|
295 |
+
$result .=
|
296 |
'
|
297 |
<tr>' .
|
298 |
'<th>' .
|
wppa-tinymce-photo-front.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
/* wppa-tinymce-photo-front.php
|
3 |
* Pachkage: wp-photo-album-plus
|
4 |
*
|
5 |
-
* Version 6.7.
|
6 |
*
|
7 |
*/
|
8 |
|
@@ -52,6 +52,9 @@ global $wpdb;
|
|
52 |
// Find an existing photo
|
53 |
$id = $wpdb->get_var( "SELECT `id` FROM " . WPPA_PHOTOS . " WHERE `ext` <> 'xxx' ORDER BY `timestamp` DESC LIMIT 1" );
|
54 |
|
|
|
|
|
|
|
55 |
// Things that wppa-tinymce.js AND OTHER MODULES!!! need to know
|
56 |
echo
|
57 |
'<script type="text/javascript">
|
@@ -70,6 +73,9 @@ global $wpdb;
|
|
70 |
</script>';
|
71 |
|
72 |
$done = true;
|
|
|
|
|
|
|
73 |
}
|
74 |
}
|
75 |
|
2 |
/* wppa-tinymce-photo-front.php
|
3 |
* Pachkage: wp-photo-album-plus
|
4 |
*
|
5 |
+
* Version 6.7.11
|
6 |
*
|
7 |
*/
|
8 |
|
52 |
// Find an existing photo
|
53 |
$id = $wpdb->get_var( "SELECT `id` FROM " . WPPA_PHOTOS . " WHERE `ext` <> 'xxx' ORDER BY `timestamp` DESC LIMIT 1" );
|
54 |
|
55 |
+
// do_shortcode( '[photo ' . $id . ']' ) increments occur, save value for later
|
56 |
+
$o = wppa( 'occur' );
|
57 |
+
|
58 |
// Things that wppa-tinymce.js AND OTHER MODULES!!! need to know
|
59 |
echo
|
60 |
'<script type="text/javascript">
|
73 |
</script>';
|
74 |
|
75 |
$done = true;
|
76 |
+
|
77 |
+
// Reset occur
|
78 |
+
wppa( 'occur', $o );
|
79 |
}
|
80 |
}
|
81 |
|
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.7.
|
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/
|
@@ -22,8 +22,8 @@ global $wpdb;
|
|
22 |
global $wp_version;
|
23 |
|
24 |
/* WPPA GLOBALS */
|
25 |
-
global $wppa_revno; $wppa_revno = '
|
26 |
-
global $wppa_api_version; $wppa_api_version = '6-7-
|
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: 6.7.11
|
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/
|
22 |
global $wp_version;
|
23 |
|
24 |
/* WPPA GLOBALS */
|
25 |
+
global $wppa_revno; $wppa_revno = '6711'; // WPPA db version
|
26 |
+
global $wppa_api_version; $wppa_api_version = '6-7-011-002'; // WPPA software version
|
27 |
|
28 |
/* start timers */
|
29 |
global $wppa_starttime; $wppa_starttime = microtime( true );
|