WP Photo Album Plus - Version 6.6.20

Version Description

Release Info

Developer	opajaap
Plugin	WP Photo Album Plus
Version	6.6.20
Comparing to
See all releases

Code changes from version 6.6.19 to 6.6.20

Files changed (24) hide show

img/loader.svg +52 -0
js/wppa-ajax-front.js +5 -4
js/wppa-ajax-front.min.js +4 -3
js/wppa-lightbox.js +8 -10
js/wppa-lightbox.min.js +6 -5
js/wppa-slideshow.js +10 -2
js/wppa-slideshow.min.js +3 -5
js/wppa-utils.js +5 -3
js/wppa-utils.min.js +4 -3
js/wppa.js +14 -21
js/wppa.min.js +5 -5
readme.txt +14 -2
wppa-admin-functions.php +17 -3
wppa-album-admin-autosave.php +3 -3
wppa-boxes-html.php +6 -4
wppa-functions.php +25 -5
wppa-non-admin.php +64 -40
wppa-photo-admin-autosave.php +61 -56
wppa-photo-files.php +8 -5
wppa-qr-widget.php +3 -1
wppa-setup.php +3 -3
wppa-slideshow.php +44 -2
wppa-utils.php +25 -15
wppa.php +3 -3

img/loader.svg ADDED Viewed

	@@ -0,0 +1,52 @@


1	+ <svg width='120px' height='120px' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-default">
2	+ <rect x="0" y="0" width="100" height="100" fill="none" class="bk">
3	+ </rect>
4	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(0 50 50) translate(0 -32)'>
5	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0s' repeatCount='indefinite'/>
6	+ </rect>
7	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(22.5 50 50) translate(0 -32)'>
8	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.09375s' repeatCount='indefinite'/>
9	+ </rect>
10	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(45 50 50) translate(0 -32)'>
11	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.1875s' repeatCount='indefinite'/>
12	+ </rect>
13	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(67.5 50 50) translate(0 -32)'>
14	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.28125s' repeatCount='indefinite'/>
15	+ </rect>
16	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(90 50 50) translate(0 -32)'>
17	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.375s' repeatCount='indefinite'/>
18	+ </rect>
19	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(112.5 50 50) translate(0 -32)'>
20	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.46875s' repeatCount='indefinite'/>
21	+ </rect>
22	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(135 50 50) translate(0 -32)'>
23	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.5625s' repeatCount='indefinite'/>
24	+ </rect>
25	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(157.5 50 50) translate(0 -32)'>
26	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.65625s' repeatCount='indefinite'/>
27	+ </rect>
28	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(180 50 50) translate(0 -32)'>
29	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.75s' repeatCount='indefinite'/>
30	+ </rect>
31	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(202.5 50 50) translate(0 -32)'>
32	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.84375s' repeatCount='indefinite'/>
33	+ </rect>
34	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(225 50 50) translate(0 -32)'>
35	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='0.9375s' repeatCount='indefinite'/>
36	+ </rect>
37	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(247.5 50 50) translate(0 -32)'>
38	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='1.03125s' repeatCount='indefinite'/>
39	+ </rect>
40	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(270 50 50) translate(0 -32)'>
41	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='1.125s' repeatCount='indefinite'/>
42	+ </rect>
43	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(292.5 50 50) translate(0 -32)'>
44	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='1.21875s' repeatCount='indefinite'/>
45	+ </rect>
46	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(315 50 50) translate(0 -32)'>
47	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='1.3125s' repeatCount='indefinite'/>
48	+ </rect>
49	+ <rect class="wppa-ajaxspin" x='47' y='40' width='6' height='20' rx='3' ry='3' transform='rotate(337.5 50 50) translate(0 -32)'>
50	+ <animate attributeName='opacity' from='1' to='0' dur='1.5s' begin='1.40625s' repeatCount='indefinite'/>
51	+ </rect>
52	+ </svg>

js/wppa-ajax-front.js CHANGED Viewed

	@@ -36,7 +36,7 @@ function wppaDoAjaxRender( mocc, ajaxurl, newurl, add, waitfor, addHilite ) {
36	if ( _wppaSSRuns[mocc] ) _wppaStop( mocc );
37
38	// Display the spinner
39	- jQuery( '#wppa-ajax-spin-'+mocc ).~~css~~( ~~'display', ''~~ );
40	},
41	success: function( result, status, xhr ) {
42
	@@ -131,9 +131,6 @@ function wppaDoAjaxRender( mocc, ajaxurl, newurl, add, waitfor, addHilite ) {
131	wppaColWidth[mocc] = 0;
132	_wppaDoAutocol( mocc );
133
134	- // Remove spinner
135	- jQuery( '#wppa-ajax-spin-'+mocc ).css( 'display', 'none' );
136	-
137	// Report if scripts
138	var scriptPos = result.indexOf( '<script' );
139	var scriptPosLast = result.lastIndexOf( '<script' );
	@@ -163,6 +160,10 @@ function wppaDoAjaxRender( mocc, ajaxurl, newurl, add, waitfor, addHilite ) {
163	if ( ! wppaRenderModal ) {
164	jQuery('html, body').animate({ scrollTop: jQuery("#wppa-container-"+mocc).offset().top - 32 - wppaStickyHeaderHeight }, 1000);
165	}




166	}
167	} );
168	}


36	if ( _wppaSSRuns[mocc] ) _wppaStop( mocc );
37
38	// Display the spinner
39	+ jQuery( '#wppa-ajax-spin-'+mocc ).fadeIn();
40	},
41	success: function( result, status, xhr ) {
42

131	wppaColWidth[mocc] = 0;
132	_wppaDoAutocol( mocc );
133



134	// Report if scripts
135	var scriptPos = result.indexOf( '<script' );
136	var scriptPosLast = result.lastIndexOf( '<script' );

160	if ( ! wppaRenderModal ) {
161	jQuery('html, body').animate({ scrollTop: jQuery("#wppa-container-"+mocc).offset().top - 32 - wppaStickyHeaderHeight }, 1000);
162	}
163	+
164	+ // Remove spinner
165	+ jQuery( '#wppa-ajax-spin-'+mocc ).stop().fadeOut();
166	+
167	}
168	} );
169	}

js/wppa-ajax-front.min.js CHANGED Viewed

	@@ -5,15 +5,16 @@
5	//
6
7	var wppaJsAjaxVersion='6.6.19';var wppaRenderAdd=false;var wppaWaitForCounter=0;function wppaDoAjaxRender(mocc,ajaxurl,newurl,add,waitfor,addHilite){if(parseInt(waitfor)>0&&waitfor!=wppaWaitForCounter){setTimeout('wppaDoAjaxRender( '+mocc+', \''+ajaxurl+'\', \''+newurl+'\', \''+add+'\', '+waitfor+' )',100);return;}
8	- wppaRenderAdd=add;if(wppaLang!='')ajaxurl+='&lang='+wppaLang;if(wppaAutoColumnWidth[mocc])ajaxurl+='&resp=1';if(addHilite&&_wppaCurIdx[mocc]&&_wppaId[mocc][_wppaCurIdx[mocc]])ajaxurl+='&wppa-hilite='+_wppaId[mocc][_wppaCurIdx[mocc]];if(wppaCanAjaxRender){jQuery.ajax({url:ajaxurl,async:true,type:'GET',timeout:60000,beforeSend:function(xhr){if(_wppaSSRuns[mocc])_wppaStop(mocc);jQuery('#wppa-ajax-spin-'+mocc).~~css~~(~~'display',''~~);},success:function(result,status,xhr){if(wppaRenderAdd){jQuery(wppaRenderAdd+result).insertBefore('#wppa-container-'+mocc+'-end');}
9	else{if(wppaRenderModal){var opt={modal:true,resizable:true,width:wppaGetContainerWidth(mocc),show:{effect:"fadeIn",duration:400},closeText:"",};jQuery('#wppa-modal-container-'+mocc).html(result).dialog(opt).dialog("open");jQuery('.ui-dialog').css({boxShadow:'0px 0px 5px 5px #aaaaaa',borderRadius:wppaBoxRadius+'px',padding:'8px',backgroundColor:wppaModalBgColor,boxSizing:'content-box',zIndex:100000,});jQuery('.ui-dialog-titlebar').css({lineHeight:'0px',height:'32px',});jQuery('.ui-button').css({backgroundImage:wppaModalQuitImg,padding:0,position:'absolute',right:'8px',top:'8px',width:'16px',height:'16px',});jQuery('.ui-button').attr('title','Close');jQuery('.ui-button').on('click',function(){_wppaStop(mocc);});}
10	else{jQuery('#wppa-container-'+mocc).html(result);}}
11	if(wppaCanPushState&&wppaUpdateAddressLine){wppaHis++;try{history.pushState({page:wppaHis,occur:mocc,type:'html',html:result},"",newurl);wppaConsoleLog('Ajax rendering: History stack pushed','force');}
12	catch(err){try{history.replaceState({page:wppaHis,occur:mocc,type:'html'},"",newurl);wppaConsoleLog('Ajax rendering: History stack updated','force');}
13	catch(err){wppaConsoleLog('Ajax rendering: History stack update failed','force');}}
14	if(wppaFirstOccur==0)wppaFirstOccur=mocc;}
15	- wppaUpdateLightboxes();if(typeof(wppaQRUpdate)!='undefined')wppaQRUpdate(newurl);wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);~~jQuery('#wppa-ajax-spin-'+mocc).css('display','none');~~var scriptPos=result.indexOf('<script');var scriptPosLast=result.lastIndexOf('<script');if(scriptPos==-1){wppaConsoleLog('Ajax render did NOT contain a script tag','force');}
16	- else{wppaConsoleLog('Ajax render did contain a script tag at position '+scriptPos+' last at '+scriptPosLast,'force');}},error:function(xhr,status,error){wppaConsoleLog('wppaDoAjaxRender failed. Error = '+error+', status = '+status,'force');document.location.href=newurl;wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);},complete:function(xhr,status,newurl){wppaWaitForCounter++;wppaReplaceSvg();if(!wppaRenderModal){jQuery('html, body').animate({scrollTop:jQuery("#wppa-container-"+mocc).offset().top-32-wppaStickyHeaderHeight},1000);}~~}});}~~

17	else{document.location.href=newurl;wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);}}
18	function wppaAjaxApprovePhoto(photo){jQuery.ajax({url:wppaAjaxUrl,data:'action=wppa'+'&wppa-action=approve'+'&photo-id='+photo,async:true,type:'GET',timeout:60000,success:function(result,status,xhr){if(result=='OK'){jQuery('.wppa-approve-'+photo).css('display','none');}
19	else{alert(result);}},error:function(xhr,status,error){wppaConsoleLog('wppaAjaxApprovePhoto failed. Error = '+error+', status = '+status,'force');},});}


5	//
6
7	var wppaJsAjaxVersion='6.6.19';var wppaRenderAdd=false;var wppaWaitForCounter=0;function wppaDoAjaxRender(mocc,ajaxurl,newurl,add,waitfor,addHilite){if(parseInt(waitfor)>0&&waitfor!=wppaWaitForCounter){setTimeout('wppaDoAjaxRender( '+mocc+', \''+ajaxurl+'\', \''+newurl+'\', \''+add+'\', '+waitfor+' )',100);return;}
8	+ wppaRenderAdd=add;if(wppaLang!='')ajaxurl+='&lang='+wppaLang;if(wppaAutoColumnWidth[mocc])ajaxurl+='&resp=1';if(addHilite&&_wppaCurIdx[mocc]&&_wppaId[mocc][_wppaCurIdx[mocc]])ajaxurl+='&wppa-hilite='+_wppaId[mocc][_wppaCurIdx[mocc]];if(wppaCanAjaxRender){jQuery.ajax({url:ajaxurl,async:true,type:'GET',timeout:60000,beforeSend:function(xhr){if(_wppaSSRuns[mocc])_wppaStop(mocc);jQuery('#wppa-ajax-spin-'+mocc).fadeIn();},success:function(result,status,xhr){if(wppaRenderAdd){jQuery(wppaRenderAdd+result).insertBefore('#wppa-container-'+mocc+'-end');}
9	else{if(wppaRenderModal){var opt={modal:true,resizable:true,width:wppaGetContainerWidth(mocc),show:{effect:"fadeIn",duration:400},closeText:"",};jQuery('#wppa-modal-container-'+mocc).html(result).dialog(opt).dialog("open");jQuery('.ui-dialog').css({boxShadow:'0px 0px 5px 5px #aaaaaa',borderRadius:wppaBoxRadius+'px',padding:'8px',backgroundColor:wppaModalBgColor,boxSizing:'content-box',zIndex:100000,});jQuery('.ui-dialog-titlebar').css({lineHeight:'0px',height:'32px',});jQuery('.ui-button').css({backgroundImage:wppaModalQuitImg,padding:0,position:'absolute',right:'8px',top:'8px',width:'16px',height:'16px',});jQuery('.ui-button').attr('title','Close');jQuery('.ui-button').on('click',function(){_wppaStop(mocc);});}
10	else{jQuery('#wppa-container-'+mocc).html(result);}}
11	if(wppaCanPushState&&wppaUpdateAddressLine){wppaHis++;try{history.pushState({page:wppaHis,occur:mocc,type:'html',html:result},"",newurl);wppaConsoleLog('Ajax rendering: History stack pushed','force');}
12	catch(err){try{history.replaceState({page:wppaHis,occur:mocc,type:'html'},"",newurl);wppaConsoleLog('Ajax rendering: History stack updated','force');}
13	catch(err){wppaConsoleLog('Ajax rendering: History stack update failed','force');}}
14	if(wppaFirstOccur==0)wppaFirstOccur=mocc;}
15	+ wppaUpdateLightboxes();if(typeof(wppaQRUpdate)!='undefined')wppaQRUpdate(newurl);wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);var scriptPos=result.indexOf('<script');var scriptPosLast=result.lastIndexOf('<script');if(scriptPos==-1){wppaConsoleLog('Ajax render did NOT contain a script tag','force');}
16	+ else{wppaConsoleLog('Ajax render did contain a script tag at position '+scriptPos+' last at '+scriptPosLast,'force');}},error:function(xhr,status,error){wppaConsoleLog('wppaDoAjaxRender failed. Error = '+error+', status = '+status,'force');document.location.href=newurl;wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);},complete:function(xhr,status,newurl){wppaWaitForCounter++;wppaReplaceSvg();if(!wppaRenderModal){jQuery('html, body').animate({scrollTop:jQuery("#wppa-container-"+mocc).offset().top-32-wppaStickyHeaderHeight},1000);}
17	+ jQuery('#wppa-ajax-spin-'+mocc).stop().fadeOut();}});}
18	else{document.location.href=newurl;wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);}}
19	function wppaAjaxApprovePhoto(photo){jQuery.ajax({url:wppaAjaxUrl,data:'action=wppa'+'&wppa-action=approve'+'&photo-id='+photo,async:true,type:'GET',timeout:60000,success:function(result,status,xhr){if(result=='OK'){jQuery('.wppa-approve-'+photo).css('display','none');}
20	else{alert(result);}},error:function(xhr,status,error){wppaConsoleLog('wppaAjaxApprovePhoto failed. Error = '+error+', status = '+status,'force');},});}

js/wppa-lightbox.js CHANGED Viewed

	@@ -3,7 +3,7 @@
3	// Conatins lightbox modules
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6	- var wppaLightboxVersion = '6.6.15';
7
8	// Global inits
9	var wppaNormsBtnOpac = 0.75;
	@@ -324,7 +324,9 @@ wppaConsoleLog( '_wppaOvlShow, idx='+idx );
324	wppaOvlCurIdx = idx;
325
326	// Show spinner
327	- ~~jQuery~~( ~~'#wppa-overlay-sp'~~ )~~.css(~~ { ~~visibility: 'visible' } );~~


328
329	// Find handy switches
330	wppaIsVideo = wppaOvlVideoHtmls[idx] != '';
	@@ -753,7 +755,7 @@ wppaConsoleLog( '_wppaOvlShow, idx='+idx );
753	wppaOvlTitles[idx] +
754	'</div>';
755	'</div>';
756	-
757	// Insert the html
758	jQuery( '#wppa-overlay-ic' ).html( html );
759
	@@ -898,7 +900,7 @@ wppaConsoleLog( 'wppaOvlSize' );
898	else {
899
900	// Remove spinner
901	- jQuery( '#wppa-~~overlay~~-sp' ).~~css~~( ~~{ visibility: 'hidden' }~~ );
902	wppaConsoleLog( 'Done '+wppaOvlIdx );
903	wppaOvlFirst = false;
904	}
	@@ -1002,7 +1004,7 @@ wppaConsoleLog( 'wppaOvlFormatFull '+wppaOvlMode );
1002	jQuery( '#wppa-ovl-full-bg' ).css({overflow:Overflow});
1003	jQuery( '#wppa-ovl-full-bg' ).scrollTop( scrollTop );
1004	jQuery( '#wppa-ovl-full-bg' ).scrollLeft( scrollLeft );
1005	- jQuery( '#wppa-~~overlay~~-sp' ).~~css~~(~~{visibility:'hidden'}~~);
1006
1007	return true; // Done!
1008	}
	@@ -1182,12 +1184,8 @@ wppaConsoleLog( 'wppaOvlHide' );
1182	wppaOvlRunning = false;
1183	wppaOvlMode = wppaOvlModeInitial;
1184	wppaNormsBtnOpac = 0.75;
1185	- jQuery( '#wppa-~~overlay~~-sp' ).~~css~~(~~{ visibility: 'hidden' }~~);
1186
1187	- // Remove orientationchange handler if mobile
1188	- // if ( wppaIsMobile ) {
1189	- // window.removeEventListener( 'orientationchange', wppaDoOnOrientationChange );
1190	- // }
1191	}
1192
1193	// Perform onclick action


3	// Conatins lightbox modules
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6	+ var wppaLightboxVersion = '6.6.20';
7
8	// Global inits
9	var wppaNormsBtnOpac = 0.75;

324	wppaOvlCurIdx = idx;
325
326	// Show spinner
327	+ if ( wppaOvlFirst ) {
328	+ jQuery( "#wppa-ovl-spin" ).fadeIn( 1500 );
329	+ }
330
331	// Find handy switches
332	wppaIsVideo = wppaOvlVideoHtmls[idx] != '';

755	wppaOvlTitles[idx] +
756	'</div>';
757	'</div>';
758	+ alert(html);
759	// Insert the html
760	jQuery( '#wppa-overlay-ic' ).html( html );
761

900	else {
901
902	// Remove spinner
903	+ jQuery( '#wppa-ovl-spin' ).stop().fadeOut();
904	wppaConsoleLog( 'Done '+wppaOvlIdx );
905	wppaOvlFirst = false;
906	}

1004	jQuery( '#wppa-ovl-full-bg' ).css({overflow:Overflow});
1005	jQuery( '#wppa-ovl-full-bg' ).scrollTop( scrollTop );
1006	jQuery( '#wppa-ovl-full-bg' ).scrollLeft( scrollLeft );
1007	+ jQuery( '#wppa-ovl-spin' ).stop().fadeOut();
1008
1009	return true; // Done!
1010	}

1184	wppaOvlRunning = false;
1185	wppaOvlMode = wppaOvlModeInitial;
1186	wppaNormsBtnOpac = 0.75;
1187	+ jQuery( '#wppa-ovl-spin' ).stop().fadeOut();
1188




1189	}
1190
1191	// Perform onclick action

js/wppa-lightbox.min.js CHANGED Viewed

	@@ -4,7 +4,7 @@
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6
7	- var wppaLightboxVersion='6.6.15';var wppaNormsBtnOpac=0.75;var wppaIsVideo=false;var wppaHasAudio=false;var wppaOvlImgs=[];var wppaKbHandlerInstalled=false;var wppaOvlMode='';var wppaOvlCurIdx=0;var wppaOvlSvgInverse=false;var wppaSavedContainerWidth=0;var wppaSavedContainerHeight;var wppaSavedMarginLeft;var wppaSavedMarginTop;var wppaSavedImageWidth;var wppaSavedImageHeight;jQuery(document).ready(function(e){wppaInitOverlay();});jQuery(window).resize(function(){jQuery("#wppa-overlay-bg").css({height:window.innerHeight,width:window.innerWidth,});wppaOvlResize();});function wppaDoOnOrientationChange(e){if(wppaOvlMode!='normal'&&document.getElementById('wppa-overlay-img')){setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',100);return;}}
8	function wppaOvlKeyboardHandler(e){var keycode;var escapeKey;if(e==null){keycode=event.keyCode;escapeKey=27;}else{keycode=e.keyCode;escapeKey=27;}
9	var key=String.fromCharCode(keycode).toLowerCase();switch(keycode){case escapeKey:wppaStopVideo(mocc);if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
10	wppaOvlHide();break;case 37:wppaOvlShowPrev();break;case 39:wppaOvlShowNext();break;}
	@@ -35,7 +35,8 @@ else{wppaOvlTitles[0]=wppaRepairScriptTags(arg.title);}
35	wppaOvlAlts[0]=jQuery(arg).attr('data-alt')?jQuery(arg).attr('data-alt'):'';wppaOvlVideoHtmls[0]=jQuery(arg).attr('data-videohtml')?decodeURI(jQuery(arg).attr('data-videohtml')):'';wppaOvlAudioHtmls[0]=jQuery(arg).attr('data-audiohtml')?decodeURI(jQuery(arg).attr('data-audiohtml')):'';wppaOvlVideoNaturalWidths[0]=jQuery(arg).attr('data-videonatwidth')?jQuery(arg).attr('data-videonatwidth'):'';wppaOvlVideoNaturalHeights[0]=jQuery(arg).attr('data-videonatheight')?jQuery(arg).attr('data-videonatheight'):'';wppaOvlIdx=0;}}
36	else{wppaOvlIdx=arg;}
37	setTimeout(function(){_wppaOvlShow(wppaOvlIdx)},100);}
38	- function _wppaOvlShow(idx){wppaConsoleLog('_wppaOvlShow, idx='+idx);wppaOvlCurIdx=idx;jQuery('#wppa-~~overlay~~-~~sp'~~).~~css~~(~~{visibility:'visible'}~~);wppaIsVideo=wppaOvlVideoHtmls[idx]!='';wppaHasAudio=wppaOvlAudioHtmls[idx]!='';if(wppaOvlUrls[idx].length>0&&!wppaIsVideo){wppaOvlImgs[idx]=new Image();wppaOvlImgs[idx].src=wppaOvlUrls[idx];wppaConsoleLog('Preloading '+(idx+1)+'/'+wppaOvlUrls.length+' (current)');if(!wppaOvlImgs[idx].complete){wppaConsoleLog('Retrying preload current image');setTimeout('_wppaOvlShow('+idx+')',100);return;}}

39	var next;var prev;if(wppaOvlIdx==(wppaOvlUrls.length-1)){next=0;}
40	else{next=wppaOvlIdx+1;}
41	if(wppaOvlVideoHtmls[next]==''){wppaOvlImgs[next]=new Image();wppaOvlImgs[next].src=wppaOvlUrls[next];wppaConsoleLog('Preloading > '+(next+1));}
	@@ -88,7 +89,7 @@ else{mh=ih-wppaOvlTxtHeight-20-2*wppaOvlBorderWidth;}
88	var mw=parseInt(mh*nw/nh);var pt=wppaOvlPadTop;var lft=parseInt((iw-mw)/2);var wid=mw;if(nh<mh){pt=wppaOvlPadTop+(mh-nh)/2;lft=parseInt((iw-nw)/2);wid=nw;}
89	var done=(wppaSavedImageWidth-wid<3&&wid-wppaSavedImageWidth<3);if(wid<=10){wid=240;nh=180;nw=240;done=false;}
90	wid=parseInt(wid);wppaSavedImageWidth=parseInt(wid);wppaSavedImageHeight=parseInt(widnh/nw);wppaSavedMarginLeft=-parseInt((wid/2+wppaOvlBorderWidth));wppaSavedContainerWidth=parseInt(wid+2wppaOvlBorderWidth);wppaSavedContainerHeight=parseInt(wppaSavedImageHeight+wppaOvlBorderWidth+jQuery('#wppa-overlay-txt-container').height()+20);wppaSavedMarginTop=-parseInt(wppaSavedContainerHeight/2);jQuery('#wppa-overlay-img').animate({width:wppaSavedImageWidth,height:wppaSavedImageHeight,},speed);jQuery('#wppa-overlay-ic').animate({width:wppaSavedContainerWidth,marginLeft:wppaSavedMarginLeft,marginTop:wppaSavedMarginTop,},speed);if(!done){setTimeout(function(){wppaOvlSize(wppaOvlAnimSpeed)},speed+100);wppaConsoleLog('Not done '+wppaOvlIdx+' saved='+wppaSavedImageWidth+', wid='+wid+', cw='+cw+', nw='+nw+', img complete='+document.getElementById('wppa-overlay-img').complete);}
91	- else{jQuery('#wppa-~~overlay~~-sp').~~css~~(~~{visibility:'hidden'}~~);wppaConsoleLog('Done '+wppaOvlIdx);wppaOvlFirst=false;}
92	return true;}
93	function wppaOvlFormatFull(){wppaConsoleLog('wppaOvlFormatFull '+wppaOvlMode);var img;var natWidth;var natHeight;if(wppaOvlIsVideo){img=document.getElementById('wppa-overlay-img');natWidth=wppaOvlVideoNaturalWidths[wppaOvlIdx];natHeight=wppaOvlVideoNaturalHeights[wppaOvlIdx];}
94	else{img=document.getElementById('wppa-overlay-img');if(!img\|\|!img.complete){setTimeout('wppaOvlFormatFull()',100);return;}
	@@ -100,7 +101,7 @@ else{margLeft=(jQuery(window).width()-jQuery(window).height()*imageRatio)/2;marg
100	break;case'realsize':margLeft=(jQuery(window).width()-natWidth)/2;if(margLeft<0){scrollLeft=parseInt(-margLeft);margLeft=0;}
101	margTop=(jQuery(window).height()-natHeight)/2;if(margTop<0){scrollTop=parseInt(-margTop);margTop=0;}
102	imgHeight=natHeight;imgWidth=natWidth;Overflow='auto';break;}
103	- margLeft=parseInt(margLeft);margTop=parseInt(margTop);imgHeight=parseInt(imgHeight);imgWidth=parseInt(imgWidth);jQuery(img).css({height:imgHeight,width:imgWidth,marginLeft:margLeft,marginTop:margTop,left:0,top:0,maxWidth:10000});jQuery(img).css({visibility:'visible'});jQuery('#wppa-ovl-full-bg').css({overflow:Overflow});jQuery('#wppa-ovl-full-bg').scrollTop(scrollTop);jQuery('#wppa-ovl-full-bg').scrollLeft(scrollLeft);jQuery('#wppa-~~overlay~~-sp').~~css~~(~~{visibility:'hidden'}~~);return true;}
104	function wppaOvlUpdateFsId(){wppaConsoleLog('wppaOvlUpdateFsId');wppaOvlFsPhotoId=wppaPhotoId;}
105	function wppaOvlStartAudio(){wppaConsoleLog('wppaOvlStartAudio');var elm=document.getElementById('wppa-overlay-audio');if(elm){if(typeof(elm.play)=='function'){elm.play();wppaConsoleLog('Audio play '+'wppa-overlay-audio');}}}
106	function wppaOvlStepMode(){wppaConsoleLog('wppaOvlStepMode from '+wppaOvlMode);var modes=new Array('normal','padded','stretched','clipped','realsize','padded');var i=0;while(i<modes.length){if(wppaOvlMode==modes[i]){wppaOvlMode=modes[i+1];wppaOvlShow(wppaOvlIdx);return;}
	@@ -116,7 +117,7 @@ wppaOvlShow(wppaOvlIdx-1);return false;}
116	function wppaOvlShowNext(){wppaConsoleLog('wppaOvlShowNext');wppaOvlFsPhotoId=0;wppaPhotoId=0;if(wppaOvlIsSingle)return false;if(wppaOvlIdx>=(wppaOvlUrls.length-1)){wppaOvlIdx=-1;}
117	wppaOvlShow(wppaOvlIdx+1);return false;}
118	function wppaOvlHide(){wppaConsoleLog('wppaOvlHide');wppaStopAudio();if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
119	- jQuery('#wppa-overlay-ic').html('');jQuery('#wppa-overlay-bg').fadeOut(300);jQuery(document).off('keydown',wppaOvlKeyboardHandler);wppaKbHandlerInstalled=false;wppaOvlFirst=true;wppaOvlRunning=false;wppaOvlMode=wppaOvlModeInitial;wppaNormsBtnOpac=0.75;jQuery('#wppa-~~overlay~~-sp').~~css~~(~~{visibility:'hidden'}~~);}
120	function wppaOvlOnclick(event){wppaConsoleLog('wppaOvlOnClick');switch(wppaOvlOnclickType){case'none':break;case'close':if(wppaOvlMode=='normal'){wppaOvlHide();}
121	break;case'browse':var x=event.screenX-window.screenX;var y=event.clientY;if(y>48){if(x<jQuery(window).width()/2)wppaOvlShowPrev();else wppaOvlShowNext();}
122	break;default:alert('Unimplemented action: '+wppaOvlOnclickType);break;}


4	// Dependancies: wppa.js and default wp jQuery library
5	//
6
7	+ var wppaLightboxVersion='6.6.20';var wppaNormsBtnOpac=0.75;var wppaIsVideo=false;var wppaHasAudio=false;var wppaOvlImgs=[];var wppaKbHandlerInstalled=false;var wppaOvlMode='';var wppaOvlCurIdx=0;var wppaOvlSvgInverse=false;var wppaSavedContainerWidth=0;var wppaSavedContainerHeight;var wppaSavedMarginLeft;var wppaSavedMarginTop;var wppaSavedImageWidth;var wppaSavedImageHeight;jQuery(document).ready(function(e){wppaInitOverlay();});jQuery(window).resize(function(){jQuery("#wppa-overlay-bg").css({height:window.innerHeight,width:window.innerWidth,});wppaOvlResize();});function wppaDoOnOrientationChange(e){if(wppaOvlMode!='normal'&&document.getElementById('wppa-overlay-img')){setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',100);return;}}
8	function wppaOvlKeyboardHandler(e){var keycode;var escapeKey;if(e==null){keycode=event.keyCode;escapeKey=27;}else{keycode=e.keyCode;escapeKey=27;}
9	var key=String.fromCharCode(keycode).toLowerCase();switch(keycode){case escapeKey:wppaStopVideo(mocc);if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
10	wppaOvlHide();break;case 37:wppaOvlShowPrev();break;case 39:wppaOvlShowNext();break;}

35	wppaOvlAlts[0]=jQuery(arg).attr('data-alt')?jQuery(arg).attr('data-alt'):'';wppaOvlVideoHtmls[0]=jQuery(arg).attr('data-videohtml')?decodeURI(jQuery(arg).attr('data-videohtml')):'';wppaOvlAudioHtmls[0]=jQuery(arg).attr('data-audiohtml')?decodeURI(jQuery(arg).attr('data-audiohtml')):'';wppaOvlVideoNaturalWidths[0]=jQuery(arg).attr('data-videonatwidth')?jQuery(arg).attr('data-videonatwidth'):'';wppaOvlVideoNaturalHeights[0]=jQuery(arg).attr('data-videonatheight')?jQuery(arg).attr('data-videonatheight'):'';wppaOvlIdx=0;}}
36	else{wppaOvlIdx=arg;}
37	setTimeout(function(){_wppaOvlShow(wppaOvlIdx)},100);}
38	+ function _wppaOvlShow(idx){wppaConsoleLog('_wppaOvlShow, idx='+idx);wppaOvlCurIdx=idx;if(wppaOvlFirst){jQuery("#wppa-ovl-spin").fadeIn(1500);}
39	+ wppaIsVideo=wppaOvlVideoHtmls[idx]!='';wppaHasAudio=wppaOvlAudioHtmls[idx]!='';if(wppaOvlUrls[idx].length>0&&!wppaIsVideo){wppaOvlImgs[idx]=new Image();wppaOvlImgs[idx].src=wppaOvlUrls[idx];wppaConsoleLog('Preloading '+(idx+1)+'/'+wppaOvlUrls.length+' (current)');if(!wppaOvlImgs[idx].complete){wppaConsoleLog('Retrying preload current image');setTimeout('_wppaOvlShow('+idx+')',100);return;}}
40	var next;var prev;if(wppaOvlIdx==(wppaOvlUrls.length-1)){next=0;}
41	else{next=wppaOvlIdx+1;}
42	if(wppaOvlVideoHtmls[next]==''){wppaOvlImgs[next]=new Image();wppaOvlImgs[next].src=wppaOvlUrls[next];wppaConsoleLog('Preloading > '+(next+1));}

89	var mw=parseInt(mh*nw/nh);var pt=wppaOvlPadTop;var lft=parseInt((iw-mw)/2);var wid=mw;if(nh<mh){pt=wppaOvlPadTop+(mh-nh)/2;lft=parseInt((iw-nw)/2);wid=nw;}
90	var done=(wppaSavedImageWidth-wid<3&&wid-wppaSavedImageWidth<3);if(wid<=10){wid=240;nh=180;nw=240;done=false;}
91	wid=parseInt(wid);wppaSavedImageWidth=parseInt(wid);wppaSavedImageHeight=parseInt(widnh/nw);wppaSavedMarginLeft=-parseInt((wid/2+wppaOvlBorderWidth));wppaSavedContainerWidth=parseInt(wid+2wppaOvlBorderWidth);wppaSavedContainerHeight=parseInt(wppaSavedImageHeight+wppaOvlBorderWidth+jQuery('#wppa-overlay-txt-container').height()+20);wppaSavedMarginTop=-parseInt(wppaSavedContainerHeight/2);jQuery('#wppa-overlay-img').animate({width:wppaSavedImageWidth,height:wppaSavedImageHeight,},speed);jQuery('#wppa-overlay-ic').animate({width:wppaSavedContainerWidth,marginLeft:wppaSavedMarginLeft,marginTop:wppaSavedMarginTop,},speed);if(!done){setTimeout(function(){wppaOvlSize(wppaOvlAnimSpeed)},speed+100);wppaConsoleLog('Not done '+wppaOvlIdx+' saved='+wppaSavedImageWidth+', wid='+wid+', cw='+cw+', nw='+nw+', img complete='+document.getElementById('wppa-overlay-img').complete);}
92	+ else{jQuery('#wppa-ovl-spin').stop().fadeOut();wppaConsoleLog('Done '+wppaOvlIdx);wppaOvlFirst=false;}
93	return true;}
94	function wppaOvlFormatFull(){wppaConsoleLog('wppaOvlFormatFull '+wppaOvlMode);var img;var natWidth;var natHeight;if(wppaOvlIsVideo){img=document.getElementById('wppa-overlay-img');natWidth=wppaOvlVideoNaturalWidths[wppaOvlIdx];natHeight=wppaOvlVideoNaturalHeights[wppaOvlIdx];}
95	else{img=document.getElementById('wppa-overlay-img');if(!img\|\|!img.complete){setTimeout('wppaOvlFormatFull()',100);return;}

101	break;case'realsize':margLeft=(jQuery(window).width()-natWidth)/2;if(margLeft<0){scrollLeft=parseInt(-margLeft);margLeft=0;}
102	margTop=(jQuery(window).height()-natHeight)/2;if(margTop<0){scrollTop=parseInt(-margTop);margTop=0;}
103	imgHeight=natHeight;imgWidth=natWidth;Overflow='auto';break;}
104	+ margLeft=parseInt(margLeft);margTop=parseInt(margTop);imgHeight=parseInt(imgHeight);imgWidth=parseInt(imgWidth);jQuery(img).css({height:imgHeight,width:imgWidth,marginLeft:margLeft,marginTop:margTop,left:0,top:0,maxWidth:10000});jQuery(img).css({visibility:'visible'});jQuery('#wppa-ovl-full-bg').css({overflow:Overflow});jQuery('#wppa-ovl-full-bg').scrollTop(scrollTop);jQuery('#wppa-ovl-full-bg').scrollLeft(scrollLeft);jQuery('#wppa-ovl-spin').stop().fadeOut();return true;}
105	function wppaOvlUpdateFsId(){wppaConsoleLog('wppaOvlUpdateFsId');wppaOvlFsPhotoId=wppaPhotoId;}
106	function wppaOvlStartAudio(){wppaConsoleLog('wppaOvlStartAudio');var elm=document.getElementById('wppa-overlay-audio');if(elm){if(typeof(elm.play)=='function'){elm.play();wppaConsoleLog('Audio play '+'wppa-overlay-audio');}}}
107	function wppaOvlStepMode(){wppaConsoleLog('wppaOvlStepMode from '+wppaOvlMode);var modes=new Array('normal','padded','stretched','clipped','realsize','padded');var i=0;while(i<modes.length){if(wppaOvlMode==modes[i]){wppaOvlMode=modes[i+1];wppaOvlShow(wppaOvlIdx);return;}

117	function wppaOvlShowNext(){wppaConsoleLog('wppaOvlShowNext');wppaOvlFsPhotoId=0;wppaPhotoId=0;if(wppaOvlIsSingle)return false;if(wppaOvlIdx>=(wppaOvlUrls.length-1)){wppaOvlIdx=-1;}
118	wppaOvlShow(wppaOvlIdx+1);return false;}
119	function wppaOvlHide(){wppaConsoleLog('wppaOvlHide');wppaStopAudio();if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
120	+ jQuery('#wppa-overlay-ic').html('');jQuery('#wppa-overlay-bg').fadeOut(300);jQuery(document).off('keydown',wppaOvlKeyboardHandler);wppaKbHandlerInstalled=false;wppaOvlFirst=true;wppaOvlRunning=false;wppaOvlMode=wppaOvlModeInitial;wppaNormsBtnOpac=0.75;jQuery('#wppa-ovl-spin').stop().fadeOut();}
121	function wppaOvlOnclick(event){wppaConsoleLog('wppaOvlOnClick');switch(wppaOvlOnclickType){case'none':break;case'close':if(wppaOvlMode=='normal'){wppaOvlHide();}
122	break;case'browse':var x=event.screenX-window.screenX;var y=event.clientY;if(y>48){if(x<jQuery(window).width()/2)wppaOvlShowPrev();else wppaOvlShowNext();}
123	break;default:alert('Unimplemented action: '+wppaOvlOnclickType);break;}

js/wppa-slideshow.js CHANGED Viewed

	@@ -3,7 +3,7 @@
3	// Contains slideshow modules
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6	- var wppaJsSlideshowVersion = '6.6.19';
7
8	// This is an entrypoint to load the slide data
9	function wppaStoreSlideInfo(
	@@ -1480,9 +1480,13 @@ function _wppaSpeed( mocc, faster ) {
1480	}
1481
1482	function _wppaLoadSpinner( mocc ) {

1483
1484	if ( ! document.getElementById( 'slide_frame-'+mocc ) ) return; // filmonly
1485



1486	var top;
1487	var lft;
1488	var elm;
	@@ -1502,11 +1506,15 @@ function _wppaLoadSpinner( mocc ) {
1502	jQuery( '#spinner-'+mocc ).css( 'top',top );
1503	jQuery( '#spinner-'+mocc ).css( 'left',lft );
1504	jQuery( '#spinner-'+mocc ).html( '<img id="spinnerimg-'+mocc+'" src="'+wppaImageDirectory+'loading.gif" style="box-shadow: none" />' );

1505	}
1506
1507	function _wppaUnloadSpinner( mocc ) {
1508
1509	- jQuery( '#~~spinner~~-'+mocc ).~~html~~( '' );



1510	}
1511
1512	function _wppaCheckRewind( mocc ) {


3	// Contains slideshow modules
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6	+ var wppaJsSlideshowVersion = '6.6.20';
7
8	// This is an entrypoint to load the slide data
9	function wppaStoreSlideInfo(

1480	}
1481
1482	function _wppaLoadSpinner( mocc ) {
1483	+ return;
1484
1485	if ( ! document.getElementById( 'slide_frame-'+mocc ) ) return; // filmonly
1486
1487	+ jQuery( "#wppa-ajax-spin-" + mocc ).fadeIn( 3000 );
1488	+ // jQuery( "#wppa-ajax-spin-" + mocc ).fadeIn(); //css( 'display', '' );
1489	+ /*
1490	var top;
1491	var lft;
1492	var elm;

1506	jQuery( '#spinner-'+mocc ).css( 'top',top );
1507	jQuery( '#spinner-'+mocc ).css( 'left',lft );
1508	jQuery( '#spinner-'+mocc ).html( '<img id="spinnerimg-'+mocc+'" src="'+wppaImageDirectory+'loading.gif" style="box-shadow: none" />' );
1509	+ */
1510	}
1511
1512	function _wppaUnloadSpinner( mocc ) {
1513
1514	+ // jQuery( "#wppa-ajax-spin-" + mocc ).stop().fadeOut(); //css( 'display', 'none' );
1515	+
1516	+ jQuery( '#wppa-slide-spin-' + mocc ).stop().fadeOut();
1517	+
1518	}
1519
1520	function _wppaCheckRewind( mocc ) {

js/wppa-slideshow.min.js CHANGED Viewed

	@@ -4,7 +4,7 @@
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6
7	- var wppaJsSlideshowVersion='6.6.19';function wppaStoreSlideInfo(mocc,id,url,size,width,height,fullname,name,desc,photoid,avgrat,discount,myrat,rateurl,linkurl,linktitle,linktarget,iwtimeout,commenthtml,iptchtml,exifhtml,lbtitle,shareurl,smhtml,ogdsc,hiresurl,videohtml,audiohtml,waittext,imagealt,posterurl){var cursor;desc=wppaRepairScriptTags(desc);if(!_wppaSlides[mocc]\|\|'0'==id){_wppaSlides[mocc]=[];_wppaNames[mocc]=[];_wppaFullNames[mocc]=[];_wppaDsc[mocc]=[];_wppaOgDsc[mocc]=[];_wppaCurIdx[mocc]=-1;_wppaNxtIdx[mocc]=0;if(parseInt(iwtimeout)>0)_wppaTimeOut[mocc]=parseInt(iwtimeout);else _wppaTimeOut[mocc]=wppaSlideShowTimeOut;_wppaSSRuns[mocc]=false;_wppaTP[mocc]=-2;_wppaFg[mocc]=0;_wppaIsBusy[mocc]=false;_wppaFirst[mocc]=true;_wppaId[mocc]=[];_wppaAvg[mocc]=[];_wppaDisc[mocc]=[];_wppaMyr[mocc]=[];_wppaVRU[mocc]=[];_wppaLinkUrl[mocc]=[];_wppaLinkTitle[mocc]=[];_wppaLinkTarget[mocc]=[];_wppaCommentHtml[mocc]=[];_wppaIptcHtml[mocc]=[];_wppaExifHtml[mocc]=[];_wppaUrl[mocc]=[];_wppaSkipRated[mocc]=false;_wppaLbTitle[mocc]=[];_wppaDidGoto[mocc]=false;wppaSlidePause[mocc]=false;_wppaShareUrl[mocc]=[];_wppaShareHtml[mocc]=[];_wppaFilmNoMove[mocc]=false;_wppaHiresUrl[mocc]=[];_wppaIsVideo[mocc]=[];_wppaVideoHtml[mocc]=[];_wppaAudioHtml[mocc]=[];_wppaVideoNatWidth[mocc]=[];_wppaVideoNatHeight[mocc]=[];wppaVideoPlaying[mocc]=false;wppaAudioPlaying[mocc]=false;_wppaWaitTexts[mocc]=[];_wppaImageAlt[mocc]=[];}
8	cursor='default';if(linkurl!=''){cursor='pointer';}
9	else if(wppaLightBox[mocc]!=''){cursor='url( '+wppaImageDirectory+wppaMagnifierCursor+' ),pointer';}
10	_wppaIsVideo[mocc][id]=(''!=videohtml);if(_wppaIsVideo[mocc][id]){_wppaSlides[mocc][id]=' alt="'+imagealt+'" class="theimg theimg-'+mocc+' big" ';if(wppaSlideVideoStart&&wppaLightBox[mocc]==''){_wppaSlides[mocc][id]+=' autoplay ';}
	@@ -166,10 +166,8 @@ else{jQuery('#bc-pname-'+mocc).html(_wppaNames[mocc][_wppaCurIdx[mocc]]);}}
166	function _wppaSpeed(mocc,faster){if(_wppaTimeOut[mocc]=='random'){return;}
167	if(faster){if(_wppaTimeOut[mocc]>500)_wppaTimeOut[mocc]/=1.5;}
168	else{if(_wppaTimeOut[mocc]<60000)_wppaTimeOut[mocc]*=1.5;}}
169	- function _wppaLoadSpinner(mocc){if(!document.getElementById('slide_frame-'+mocc))return;~~var top;var lft;var elm;var flag=true;if~~(~~document.getElementById('theimg0~~-'+mocc)~~){if(document~~.~~getElementById~~(~~'theimg0-'+mocc~~)~~.complete)flag=false~~;}
170	- if(~~document.getElementById('theimg1-'+~~mocc)){if(~~document.getElementById(~~'~~theimg1~~-'+mocc).~~complete~~)~~flag=false~~;}
171	- top=parseInt(document.getElementById('slide_frame-'+mocc).clientHeight/2)-16;lft=parseInt(document.getElementById('slide_frame-'+mocc).clientWidth/2)-16;jQuery('#spinner-'+mocc).css('top',top);jQuery('#spinner-'+mocc).css('left',lft);jQuery('#spinner-'+mocc).html('<img id="spinnerimg-'+mocc+'" src="'+wppaImageDirectory+'loading.gif" style="box-shadow: none" />');}
172	- function _wppaUnloadSpinner(mocc){jQuery('#spinner-'+mocc).html('');}
173	function _wppaCheckRewind(mocc){var n_images;var n_diff;var l_substrate;var x_marg;if(!document.getElementById('wppa-filmstrip-'+mocc))return;n_diff=Math.abs(_wppaCurIdx[mocc]-_wppaNxtIdx[mocc]);if(n_diff<=wppaFilmPageSize[mocc])return;var n_images=wppaFilmStripLength[mocc]/wppaThumbnailPitch[mocc];if(n_diff>=((n_images+1)/2)){l_substrate=wppaThumbnailPitch[mocc]_wppaSlides[mocc].length;if(wppaFilmShowGlue)l_substrate+=(2+2wppaFilmStripMargin[mocc]);x_marg=parseInt(jQuery('#wppa-filmstrip-'+mocc).css('margin-left'));if(_wppaNxtIdx[mocc]>_wppaCurIdx[mocc]){x_marg-=l_substrate;}
174	else{x_marg+=l_substrate;}
175	jQuery('#wppa-filmstrip-'+mocc).css('margin-left',x_marg+'px');}}


4	// Dependancies: wppa.js and default wp jQuery library
5	//
6
7	+ var wppaJsSlideshowVersion='6.6.20';function wppaStoreSlideInfo(mocc,id,url,size,width,height,fullname,name,desc,photoid,avgrat,discount,myrat,rateurl,linkurl,linktitle,linktarget,iwtimeout,commenthtml,iptchtml,exifhtml,lbtitle,shareurl,smhtml,ogdsc,hiresurl,videohtml,audiohtml,waittext,imagealt,posterurl){var cursor;desc=wppaRepairScriptTags(desc);if(!_wppaSlides[mocc]\|\|'0'==id){_wppaSlides[mocc]=[];_wppaNames[mocc]=[];_wppaFullNames[mocc]=[];_wppaDsc[mocc]=[];_wppaOgDsc[mocc]=[];_wppaCurIdx[mocc]=-1;_wppaNxtIdx[mocc]=0;if(parseInt(iwtimeout)>0)_wppaTimeOut[mocc]=parseInt(iwtimeout);else _wppaTimeOut[mocc]=wppaSlideShowTimeOut;_wppaSSRuns[mocc]=false;_wppaTP[mocc]=-2;_wppaFg[mocc]=0;_wppaIsBusy[mocc]=false;_wppaFirst[mocc]=true;_wppaId[mocc]=[];_wppaAvg[mocc]=[];_wppaDisc[mocc]=[];_wppaMyr[mocc]=[];_wppaVRU[mocc]=[];_wppaLinkUrl[mocc]=[];_wppaLinkTitle[mocc]=[];_wppaLinkTarget[mocc]=[];_wppaCommentHtml[mocc]=[];_wppaIptcHtml[mocc]=[];_wppaExifHtml[mocc]=[];_wppaUrl[mocc]=[];_wppaSkipRated[mocc]=false;_wppaLbTitle[mocc]=[];_wppaDidGoto[mocc]=false;wppaSlidePause[mocc]=false;_wppaShareUrl[mocc]=[];_wppaShareHtml[mocc]=[];_wppaFilmNoMove[mocc]=false;_wppaHiresUrl[mocc]=[];_wppaIsVideo[mocc]=[];_wppaVideoHtml[mocc]=[];_wppaAudioHtml[mocc]=[];_wppaVideoNatWidth[mocc]=[];_wppaVideoNatHeight[mocc]=[];wppaVideoPlaying[mocc]=false;wppaAudioPlaying[mocc]=false;_wppaWaitTexts[mocc]=[];_wppaImageAlt[mocc]=[];}
8	cursor='default';if(linkurl!=''){cursor='pointer';}
9	else if(wppaLightBox[mocc]!=''){cursor='url( '+wppaImageDirectory+wppaMagnifierCursor+' ),pointer';}
10	_wppaIsVideo[mocc][id]=(''!=videohtml);if(_wppaIsVideo[mocc][id]){_wppaSlides[mocc][id]=' alt="'+imagealt+'" class="theimg theimg-'+mocc+' big" ';if(wppaSlideVideoStart&&wppaLightBox[mocc]==''){_wppaSlides[mocc][id]+=' autoplay ';}

166	function _wppaSpeed(mocc,faster){if(_wppaTimeOut[mocc]=='random'){return;}
167	if(faster){if(_wppaTimeOut[mocc]>500)_wppaTimeOut[mocc]/=1.5;}
168	else{if(_wppaTimeOut[mocc]<60000)_wppaTimeOut[mocc]*=1.5;}}
169	+ function _wppaLoadSpinner(mocc){return;if(!document.getElementById('slide_frame-'+mocc))return;jQuery("#wppa-ajax-spin-"+mocc).fadeIn(3000);}
170	+ function _wppaUnloadSpinner(mocc){jQuery('#wppa-slide-spin-'+mocc).stop().fadeOut();}


171	function _wppaCheckRewind(mocc){var n_images;var n_diff;var l_substrate;var x_marg;if(!document.getElementById('wppa-filmstrip-'+mocc))return;n_diff=Math.abs(_wppaCurIdx[mocc]-_wppaNxtIdx[mocc]);if(n_diff<=wppaFilmPageSize[mocc])return;var n_images=wppaFilmStripLength[mocc]/wppaThumbnailPitch[mocc];if(n_diff>=((n_images+1)/2)){l_substrate=wppaThumbnailPitch[mocc]_wppaSlides[mocc].length;if(wppaFilmShowGlue)l_substrate+=(2+2wppaFilmStripMargin[mocc]);x_marg=parseInt(jQuery('#wppa-filmstrip-'+mocc).css('margin-left'));if(_wppaNxtIdx[mocc]>_wppaCurIdx[mocc]){x_marg-=l_substrate;}
172	else{x_marg+=l_substrate;}
173	jQuery('#wppa-filmstrip-'+mocc).css('margin-left',x_marg+'px');}}

js/wppa-utils.js CHANGED Viewed

	@@ -2,7 +2,7 @@
2	//
3	// conatins common vars and functions
4	//
5	- var wppaJsUtilsVersion = '6.6.09';
6	var wppaDebug;
7
8	// Trim
	@@ -347,7 +347,6 @@ wppaConsoleLog('Doing ReplaceSvg', 'force');
347	var imgURL = $img.attr('src');
348	var imgStyle = $img.attr('style');
349
350	- imgStyle = imgStyle.replace( 'display:none', 'display:inline' );
351
352	jQuery.get(imgURL, function(data) {
353	// Get the SVG tag, ignore the rest
	@@ -361,8 +360,11 @@ wppaConsoleLog('Doing ReplaceSvg', 'force');
361	if(typeof imgClass !== 'undefined') {
362	$svg = $svg.attr('class', imgClass+' replaced-svg');
363	}
364	- // Add replaces image's style to the ~~nes~~ SVG
365	if ( typeof imgStyle !== 'undefined' ) {



366	$svg = $svg.attr('style', imgStyle);
367	}
368


2	//
3	// conatins common vars and functions
4	//
5	+ var wppaJsUtilsVersion = '6.6.20';
6	var wppaDebug;
7
8	// Trim

347	var imgURL = $img.attr('src');
348	var imgStyle = $img.attr('style');
349

350
351	jQuery.get(imgURL, function(data) {
352	// Get the SVG tag, ignore the rest

360	if(typeof imgClass !== 'undefined') {
361	$svg = $svg.attr('class', imgClass+' replaced-svg');
362	}
363	+ // Add replaces image's style to the new SVG
364	if ( typeof imgStyle !== 'undefined' ) {
365	+ if ( typeof( imgID ) == 'undefined' \|\| ( imgID.substr( 0, 15 ) != 'wppa-ajax-spin-' && imgID.substr( 0, 15 ) != 'wppa-ovl-spin' ) ) {
366	+ imgStyle = imgStyle.replace( 'display:none', 'display:inline' );
367	+ }
368	$svg = $svg.attr('style', imgStyle);
369	}
370

js/wppa-utils.min.js CHANGED Viewed

	@@ -3,7 +3,7 @@
3	// conatins common vars and functions
4	//
5
6	- var wppaJsUtilsVersion='6.6.09';var wppaDebug;function wppaTrim(str,arg){var result;result=wppaTrimLeft(str,arg);result=wppaTrimRight(result,arg);return result;}
7	function wppaTrimLeft(str,arg){var result;var strlen;var arglen;var argcount;var i;var done;var oldStr,newStr;switch(typeof(arg)){case'string':result=str;strlen=str.length;arglen=arg.length;while(strlen>=arglen&&result.substr(0,arglen)==arg){result=result.substr(arglen);strlen=result.length;}
8	break;case'object':done=false;newStr=str;while(!done){i=0;oldStr=newStr;while(i<arg.length){newStr=wppaTrimLeft(newStr,arg[i]);i++;}
9	done=(oldStr==newStr);}
	@@ -42,8 +42,9 @@ var result='<img'+' src="'+src+'"'+
42	(radius?'border-radius:'+radius+'%;':'')+
43	(border?'border:2px solid '+bc+';box-sizing:border-box;':'')+
44	(wppaIsIe?'':'display:none;')+'text-decoration:none !important;'+'vertical-align:middle;'+'"'+' onload="wppaReplaceSvg()"'+' />';setTimeout(function(){wppaReplaceSvg();},100);return result;}
45	- function wppaReplaceSvg(){wppaConsoleLog('Doing ReplaceSvg','force');jQuery('img.wppa-svg').each(function(){var $img=jQuery(this);var imgID=$img.attr('id');var imgClass=$img.attr('class');var imgURL=$img.attr('src');var imgStyle=$img.attr('style');~~imgStyle=imgStyle.replace('display:none','display:inline');~~jQuery.get(imgURL,function(data){var $svg=jQuery(data).find('svg');if(typeof imgID!=='undefined'){$svg=$svg.attr('id',imgID);}
46	if(typeof imgClass!=='undefined'){$svg=$svg.attr('class',imgClass+' replaced-svg');}
47	- if(typeof imgStyle!=='undefined'){~~$svg=$svg~~.~~attr~~('~~style~~',imgStyle);}

48	$svg=$svg.removeAttr('xmlns:a');$img.replaceWith($svg);},'xml');});}
49	wppaConsoleLog('wppa-utils.js version '+wppaJsUtilsVersion+' loaded.','force');


3	// conatins common vars and functions
4	//
5
6	+ var wppaJsUtilsVersion='6.6.20';var wppaDebug;function wppaTrim(str,arg){var result;result=wppaTrimLeft(str,arg);result=wppaTrimRight(result,arg);return result;}
7	function wppaTrimLeft(str,arg){var result;var strlen;var arglen;var argcount;var i;var done;var oldStr,newStr;switch(typeof(arg)){case'string':result=str;strlen=str.length;arglen=arg.length;while(strlen>=arglen&&result.substr(0,arglen)==arg){result=result.substr(arglen);strlen=result.length;}
8	break;case'object':done=false;newStr=str;while(!done){i=0;oldStr=newStr;while(i<arg.length){newStr=wppaTrimLeft(newStr,arg[i]);i++;}
9	done=(oldStr==newStr);}

42	(radius?'border-radius:'+radius+'%;':'')+
43	(border?'border:2px solid '+bc+';box-sizing:border-box;':'')+
44	(wppaIsIe?'':'display:none;')+'text-decoration:none !important;'+'vertical-align:middle;'+'"'+' onload="wppaReplaceSvg()"'+' />';setTimeout(function(){wppaReplaceSvg();},100);return result;}
45	+ function wppaReplaceSvg(){wppaConsoleLog('Doing ReplaceSvg','force');jQuery('img.wppa-svg').each(function(){var $img=jQuery(this);var imgID=$img.attr('id');var imgClass=$img.attr('class');var imgURL=$img.attr('src');var imgStyle=$img.attr('style');jQuery.get(imgURL,function(data){var $svg=jQuery(data).find('svg');if(typeof imgID!=='undefined'){$svg=$svg.attr('id',imgID);}
46	if(typeof imgClass!=='undefined'){$svg=$svg.attr('class',imgClass+' replaced-svg');}
47	+ if(typeof imgStyle!=='undefined'){if(typeof(imgID)=='undefined'\|\|(imgID.substr(0,15)!='wppa-ajax-spin-'&&imgID.substr(0,15)!='wppa-ovl-spin')){imgStyle=imgStyle.replace('display:none','display:inline');}
48	+ $svg=$svg.attr('style',imgStyle);}
49	$svg=$svg.removeAttr('xmlns:a');$img.replaceWith($svg);},'xml');});}
50	wppaConsoleLog('wppa-utils.js version '+wppaJsUtilsVersion+' loaded.','force');

js/wppa.js CHANGED Viewed

	@@ -2,7 +2,7 @@
2	//
3	// conatins common vars and functions
4	//
5	- var wppaJsVersion = '6.6.10';
6
7	// Important notice:
8	// All external vars that may be given a value in wppa-non-admin.php must be declared here and not in other front-end js files!!
	@@ -290,6 +290,12 @@ function wppaDoInit( autoOnly ) {
290	// Looks redundant, but some installations do not execute
291	// onload="wppaReplaceSvg()" for unknown reasons
292	wppaReplaceSvg();






293	}
294
295	// Initialize Ajax render partial page content with history update
	@@ -482,7 +488,7 @@ function _wppaDoAutocol( mocc ) {
482	}
483	idx++;
484	}
485	-
486	if ( wppaCoverImageResponsive[mocc] ) {
487	}
488	else {
	@@ -798,28 +804,15 @@ var newtext;
798	// Just to be sure we do not run into undefined error
799	if ( typeof( text ) == 'undefined' ) return '';
800
801	- ~~temp~~ = text.~~split~~( '[script' );
802	- if ( ~~temp~~.~~length~~ == 1 ) ~~return text~~;
803	-
804	- newtext = temp[0];
805	- var idx = 0;
806	- while ( temp.length > idx ) {
807	- newtext += '<script';
808	- idx++;
809	- newtext += temp[idx];
810	}
811	-
812	- ~~temp~~ = ~~newtext~~.~~split~~( '[/script' );
813	-
814	- newtext = temp[0];
815	- idx = 0;
816	- while ( temp.length > idx ) {
817	- newtext += '</script';
818	- idx++;
819	- newtext += temp[idx];
820	}
821
822	- return ~~newtext~~;

823	}
824
825	// Filter enables the use of a <br> tag while they are removed with strip_tags


2	//
3	// conatins common vars and functions
4	//
5	+ var wppaJsVersion = '6.6.20';
6
7	// Important notice:
8	// All external vars that may be given a value in wppa-non-admin.php must be declared here and not in other front-end js files!!

290	// Looks redundant, but some installations do not execute
291	// onload="wppaReplaceSvg()" for unknown reasons
292	wppaReplaceSvg();
293	+
294	+ // Make sure ajax spinners dies
295	+ jQuery( '.wppa-ajax-spin' ).stop().fadeOut();
296	+
297	+ // Make sure ovl spinner dies
298	+ jQuery( '.wppa-ovl-spin' ).stop().fadeOut();
299	}
300
301	// Initialize Ajax render partial page content with history update

488	}
489	idx++;
490	}
491	+
492	if ( wppaCoverImageResponsive[mocc] ) {
493	}
494	else {

804	// Just to be sure we do not run into undefined error
805	if ( typeof( text ) == 'undefined' ) return '';
806
807	+ while ( text.indexOf( '[script' ) != -1 ) {
808	+ text = text.replace( '[script', '<script' );







809	}
810	+ while ( text.indexOf( '[/script' ) != -1 ) {
811	+ text = text.replace( '[/script', '</script' );







812	}
813
814	+ return text;
815	+
816	}
817
818	// Filter enables the use of a <br> tag while they are removed with strip_tags

js/wppa.min.js CHANGED Viewed

	@@ -3,9 +3,9 @@
3	// conatins common vars and functions
4	//
5
6	- var wppaJsVersion='6.6.10';var wppaVersion='0';var wppaIsIe=false;var wppaDebug;var wppaFullValign=[];var wppaFullHalign=[];var wppaFullFrameDelta=[];var wppaAnimationSpeed;var wppaImageDirectory;var wppaAutoColumnWidth=[];var wppaAutoColumnFrac=[];var wppaThumbnailAreaDelta;var wppaSlideShowTimeOut=2500;var wppaFadeInAfterFadeOut=false;var wppaTextFrameDelta=0;var wppaBoxDelta=0;var wppaPreambule;var wppaHideWhenEmpty=false;var wppaThumbnailPitch=[];var wppaFilmStripLength=[];var wppaFilmStripMargin=[];var wppaFilmStripAreaDelta=[];var wppaFilmShowGlue=false;var wppaIsMini=[];var wppaPortraitOnly=[];var wppaSlideShow;var wppaPhoto;var wppaOf;var wppaNextPhoto;var wppaPreviousPhoto;var wppaNextP;var wppaPrevP;var wppaAvgRating;var wppaMyRating;var wppaAvgRat;var wppaMyRat;var wppaDislikeMsg;var wppaMiniTreshold=300;var wppaStart='Start';var wppaStop='Stop';var wppaPleaseName;var wppaPleaseEmail;var wppaPleaseComment;var wppaRatingOnce=true;var wppaBGcolorNumbar='transparent';var wppaBcolorNumbar='transparent';var wppaBGcolorNumbarActive='transparent';var wppaBcolorNumbarActive='transparent';var wppaFontFamilyNumbar='';var wppaFontSizeNumbar='';var wppaFontColorNumbar='';var wppaFontWeightNumbar='';var wppaFontFamilyNumbarActive='';var wppaFontSizeNumbarActive='';var wppaFontColorNumbarActive='';var wppaFontWeightNumbarActive='';var wppaNumbarMax='10';var wppaAjaxUrl='';var wppaLang='';var wppaNextOnCallback=false;var wppaStarOpacity=0.2;var wppaSlideWrap=true;var wppaLightBox=[];var wppaEmailRequired='required';var wppaSlideBorderWidth=0;var wppaSlideInitRunning=[];var wppaAnimationType='fadeover';var wppaSlidePause=[];var wppaSlideBlank=[];var wppaRatingMax=5;var wppaRatingDisplayType='graphic';var wppaRatingPrec=2;var wppaFilmPageSize=[];var wppaAspectRatio=[];var wppaFullSize=[];var wppaStretch=false;var wppaThumbSpaceAuto=false;var wppaMinThumbSpace=4;var wppaMagnifierCursor='';var wppaArtMonkyLink='none';var wppaAutoOpenComments=false;var wppaUpdateAddressLine=false;var wppaFilmThumbTitle='';var wppaClickToView='';var wppaUploadUrl='';var wppaVoteForMe='';var wppaVotedForMe='';var wppaSlideSwipe=true;var wppaLightboxSingle=[];var wppaMaxCoverWidth=300;var wppaDownLoad='Download';var wppaSiteUrl='';var wppaWppaUrl='';var wppaIncludeUrl='';var wppaSlideToFullpopup=false;var wppaComAltSize=75;var wppaBumpViewCount=true;var wppaBumpClickCount=false;var wppaFotomoto=false;var wppaArtMonkeyButton=true;var wppaShortQargs=false;var wppaOvlHires=false;var wppaMasonryCols=[];var wppaVideoPlaying=[];var wppaAudioPlaying=[];var wppaSlideVideoStart=false;var wppaSlideAudioStart=false;var wppaAudioHeight=28;var wppaHis=0;var wppaStartHtml=[];var wppaCanAjaxRender=false;var wppaCanPushState=false;var wppaAllowAjax=true;var wppaMaxOccur=0;var wppaFirstOccur=0;var wppaUsePhotoNamesInUrls=false;var wppaShareHideWhenRunning=false;var wppaCommentRequiredAfterVote=true;var wppaTopMoc=0;var wppaColWidth=[];var wppaFotomotoHideWhenRunning=false;var wppaFotomotoMinWidth=400;var wppaPhotoView=[];var wppaBackgroundColorImage='';var wppaPopupLinkType='';var wppaPopupOnclick=[];var wppaThumbTargetBlank=false;var wppaRel='rel';var wppaEditPhotoWidth='960';var wppaThemeStyles='';var wppaStickyHeaderHeight=0;var wppaRenderModal=false;var wppaModalBgColor='#ffffff';var wppaBoxRadius=0;var wppaModalQuitImg;var wppaUploadEdit='none';var wppaPageArg='';var wppaSlideshowNavigationType='icons';var wppaCoverImageResponsive=[];var _wppaId=[];var _wppaAvg=[];var _wppaDisc=[];var _wppaMyr=[];var _wppaVRU=[];var _wppaLinkUrl=[];var _wppaLinkTitle=[];var _wppaLinkTarget=[];var _wppaCommentHtml=[];var _wppaIptcHtml=[];var _wppaExifHtml=[];var _wppaToTheSame=false;var _wppaSlides=[];var _wppaNames=[];var _wppaFullNames=[];var _wppaDsc=[];var _wppaOgDsc=[];var _wppaCurIdx=[];var _wppaNxtIdx=[];var _wppaTimeOut=[];var _wppaSSRuns=[];var _wppaFg=[];var _wppaTP=[];var _wppaIsBusy=[];var _wppaFirst=[];var _wppaVoteInProgress=false;var _wppaTextDelay;var _wppaUrl=[];var _wppaSkipRated=[];var _wppaLbTitle=[];var _wppaStateCount=0;var _wppaDidGoto=[];var _wppaShareUrl=[];var _wppaShareHtml=[];var _wppaFilmNoMove=[];var _wppaHiresUrl=[];var _wppaIsVideo=[];var _wppaVideoHtml=[];var _wppaAudioHtml=[];var _wppaVideoNatWidth=[];var _wppaVideoNatHeight=[];var _wppaWaitTexts=[];var _wppaImageAlt=[];var __wppaOverruleRun=false;var wppaOvlUrls;var wppaOvlTitles;var wppaOvlAlts;var wppaOvlIdx=0;var wppaOvlFirst=true;var wppaOvlKbHandler='';var wppaOvlSizeHandler='';var wppaOvlPadTop=5;var wppaOvlIsSingle;var wppaOvlRunning=false;var wppaOvlVideoHtmls;var wppaOvlAudioHtmls;var wppaOvlVideoNaturalWidths;var wppaOvlVideoNaturalHeights;var wppaOvlModeInitial='normal';var wppaOvlVideoPlaying=false;var wppaOvlAudioPlaying=false;var wppaOvlShowLegenda=true;var wppaOvlShowStartStop=true;var wppaOvlRadius=0;var wppaOvlBorderWidth=16;var wppaOvlTxtHeight=36;var wppaOvlOpacity=0.8;var wppaOvlOnclickType='none';var wppaOvlTheme='black';var wppaOvlAnimSpeed=300;var wppaOvlSlideSpeed=3000;var wppaVer4WindowWidth=800;var wppaVer4WindowHeight=600;var wppaOvlFontFamily='Helvetica';var wppaOvlFontSize='10';var wppaOvlFontColor='';var wppaOvlFontWeight='bold';var wppaOvlLineHeight='12';var wppaOvlShowCounter=true;var wppaOvlIsVideo=false;var wppaShowLegenda='';var wppaOvlFsPhotoId=0;var wppaPhotoId=0;var wppaOvlVideoStart=false;var wppaOvlAudioStart=false;var wppaLastIptc='';var wppaLastExif='';var wppaIsMobile=false;var wppaSvgFillcolor='gray';var wppaSvgBgcolor='transparent';var wppaSvgCornerStyle='light';jQuery(document).ready(function(){wppaDoInit(false);setTimeout(function(){wppaDoInit(true);},1000);});function wppaDoInit(autoOnly){var anyAutocol=false;for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);anyAutocol=true;}}
7	if(!autoOnly){_wppaTextDelay=wppaAnimationSpeed;if(wppaFadeInAfterFadeOut)_wppaTextDelay*=2;if(anyAutocol){jQuery(window).resize(function(){for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);}}});}}
8	- wppaReplaceSvg();}
9	jQuery(document).ready(function(e){if(wppaAllowAjax&&jQuery.ajax){wppaCanAjaxRender=true;}
10	if(typeof(history.pushState)!='undefined'){var i=1;while(i<=wppaMaxOccur){wppaStartHtml[i]=jQuery('#wppa-container-'+i).html();i++;}
11	wppaCanPushState=true;}});function wppaUpdateLightboxes(){if(typeof(wppaInitOverlay)=='function'){wppaInitOverlay();}
	@@ -64,9 +64,9 @@ if(idx<_wppaId[occ].length)_wppaGoto(occ,idx);}}
64	if(document.getElementById('theslide0-'+occ)){_wppaStop(occ);}}
65	if(typeof(wppaQRUpdate)!='undefined')wppaQRUpdate(document.location.href);};function wppaPushStateSlide(mocc,slide,url){if(!wppaIsMini[mocc]){if(wppaCanPushState&&wppaUpdateAddressLine){if(url!=''){try{history.pushState({page:wppaHis,occur:mocc,type:'slide',slide:slide},"---",url);wppaConsoleLog('Slide history stack updated');}
66	catch(err){wppaConsoleLog('Slide history stack update failed');}}}}}
67	- function wppaRepairScriptTags(text){var temp;var newtext;if(typeof(text)=='undefined')return'';~~temp=~~text.~~split~~('[script')~~;if(temp.length==~~1)~~return~~ text~~;newtext~~=~~temp[0];var idx=0;while~~(~~temp.length>idx){newtext+=~~'<script';~~idx++;newtext+=temp[idx];~~}
68	- ~~temp=newtext~~.~~split~~('[/script')~~;newtext~~=~~temp[0];idx=0;while~~(~~temp.length>idx){newtext+=~~'</script';~~idx++;newtext+=temp[idx];~~}
69	- return ~~newtext~~;}
70	function wppaRepairBrTags(text){var newtext;if(typeof(text)=='undefined')return'';newtext=text.replace('[br /]','<br />');return newtext;}
71	function wppaTrimAlt(text){var newtext;if(typeof(text)=='undefined')return'';if(text.length>13){newtext=text.substr(0,10)+'...';}
72	else newtext=text;return newtext;}


3	// conatins common vars and functions
4	//
5
6	+ var wppaJsVersion='6.6.20';var wppaVersion='0';var wppaIsIe=false;var wppaDebug;var wppaFullValign=[];var wppaFullHalign=[];var wppaFullFrameDelta=[];var wppaAnimationSpeed;var wppaImageDirectory;var wppaAutoColumnWidth=[];var wppaAutoColumnFrac=[];var wppaThumbnailAreaDelta;var wppaSlideShowTimeOut=2500;var wppaFadeInAfterFadeOut=false;var wppaTextFrameDelta=0;var wppaBoxDelta=0;var wppaPreambule;var wppaHideWhenEmpty=false;var wppaThumbnailPitch=[];var wppaFilmStripLength=[];var wppaFilmStripMargin=[];var wppaFilmStripAreaDelta=[];var wppaFilmShowGlue=false;var wppaIsMini=[];var wppaPortraitOnly=[];var wppaSlideShow;var wppaPhoto;var wppaOf;var wppaNextPhoto;var wppaPreviousPhoto;var wppaNextP;var wppaPrevP;var wppaAvgRating;var wppaMyRating;var wppaAvgRat;var wppaMyRat;var wppaDislikeMsg;var wppaMiniTreshold=300;var wppaStart='Start';var wppaStop='Stop';var wppaPleaseName;var wppaPleaseEmail;var wppaPleaseComment;var wppaRatingOnce=true;var wppaBGcolorNumbar='transparent';var wppaBcolorNumbar='transparent';var wppaBGcolorNumbarActive='transparent';var wppaBcolorNumbarActive='transparent';var wppaFontFamilyNumbar='';var wppaFontSizeNumbar='';var wppaFontColorNumbar='';var wppaFontWeightNumbar='';var wppaFontFamilyNumbarActive='';var wppaFontSizeNumbarActive='';var wppaFontColorNumbarActive='';var wppaFontWeightNumbarActive='';var wppaNumbarMax='10';var wppaAjaxUrl='';var wppaLang='';var wppaNextOnCallback=false;var wppaStarOpacity=0.2;var wppaSlideWrap=true;var wppaLightBox=[];var wppaEmailRequired='required';var wppaSlideBorderWidth=0;var wppaSlideInitRunning=[];var wppaAnimationType='fadeover';var wppaSlidePause=[];var wppaSlideBlank=[];var wppaRatingMax=5;var wppaRatingDisplayType='graphic';var wppaRatingPrec=2;var wppaFilmPageSize=[];var wppaAspectRatio=[];var wppaFullSize=[];var wppaStretch=false;var wppaThumbSpaceAuto=false;var wppaMinThumbSpace=4;var wppaMagnifierCursor='';var wppaArtMonkyLink='none';var wppaAutoOpenComments=false;var wppaUpdateAddressLine=false;var wppaFilmThumbTitle='';var wppaClickToView='';var wppaUploadUrl='';var wppaVoteForMe='';var wppaVotedForMe='';var wppaSlideSwipe=true;var wppaLightboxSingle=[];var wppaMaxCoverWidth=300;var wppaDownLoad='Download';var wppaSiteUrl='';var wppaWppaUrl='';var wppaIncludeUrl='';var wppaSlideToFullpopup=false;var wppaComAltSize=75;var wppaBumpViewCount=true;var wppaBumpClickCount=false;var wppaFotomoto=false;var wppaArtMonkeyButton=true;var wppaShortQargs=false;var wppaOvlHires=false;var wppaMasonryCols=[];var wppaVideoPlaying=[];var wppaAudioPlaying=[];var wppaSlideVideoStart=false;var wppaSlideAudioStart=false;var wppaAudioHeight=28;var wppaHis=0;var wppaStartHtml=[];var wppaCanAjaxRender=false;var wppaCanPushState=false;var wppaAllowAjax=true;var wppaMaxOccur=0;var wppaFirstOccur=0;var wppaUsePhotoNamesInUrls=false;var wppaShareHideWhenRunning=false;var wppaCommentRequiredAfterVote=true;var wppaTopMoc=0;var wppaColWidth=[];var wppaFotomotoHideWhenRunning=false;var wppaFotomotoMinWidth=400;var wppaPhotoView=[];var wppaBackgroundColorImage='';var wppaPopupLinkType='';var wppaPopupOnclick=[];var wppaThumbTargetBlank=false;var wppaRel='rel';var wppaEditPhotoWidth='960';var wppaThemeStyles='';var wppaStickyHeaderHeight=0;var wppaRenderModal=false;var wppaModalBgColor='#ffffff';var wppaBoxRadius=0;var wppaModalQuitImg;var wppaUploadEdit='none';var wppaPageArg='';var wppaSlideshowNavigationType='icons';var wppaCoverImageResponsive=[];var _wppaId=[];var _wppaAvg=[];var _wppaDisc=[];var _wppaMyr=[];var _wppaVRU=[];var _wppaLinkUrl=[];var _wppaLinkTitle=[];var _wppaLinkTarget=[];var _wppaCommentHtml=[];var _wppaIptcHtml=[];var _wppaExifHtml=[];var _wppaToTheSame=false;var _wppaSlides=[];var _wppaNames=[];var _wppaFullNames=[];var _wppaDsc=[];var _wppaOgDsc=[];var _wppaCurIdx=[];var _wppaNxtIdx=[];var _wppaTimeOut=[];var _wppaSSRuns=[];var _wppaFg=[];var _wppaTP=[];var _wppaIsBusy=[];var _wppaFirst=[];var _wppaVoteInProgress=false;var _wppaTextDelay;var _wppaUrl=[];var _wppaSkipRated=[];var _wppaLbTitle=[];var _wppaStateCount=0;var _wppaDidGoto=[];var _wppaShareUrl=[];var _wppaShareHtml=[];var _wppaFilmNoMove=[];var _wppaHiresUrl=[];var _wppaIsVideo=[];var _wppaVideoHtml=[];var _wppaAudioHtml=[];var _wppaVideoNatWidth=[];var _wppaVideoNatHeight=[];var _wppaWaitTexts=[];var _wppaImageAlt=[];var __wppaOverruleRun=false;var wppaOvlUrls;var wppaOvlTitles;var wppaOvlAlts;var wppaOvlIdx=0;var wppaOvlFirst=true;var wppaOvlKbHandler='';var wppaOvlSizeHandler='';var wppaOvlPadTop=5;var wppaOvlIsSingle;var wppaOvlRunning=false;var wppaOvlVideoHtmls;var wppaOvlAudioHtmls;var wppaOvlVideoNaturalWidths;var wppaOvlVideoNaturalHeights;var wppaOvlModeInitial='normal';var wppaOvlVideoPlaying=false;var wppaOvlAudioPlaying=false;var wppaOvlShowLegenda=true;var wppaOvlShowStartStop=true;var wppaOvlRadius=0;var wppaOvlBorderWidth=16;var wppaOvlTxtHeight=36;var wppaOvlOpacity=0.8;var wppaOvlOnclickType='none';var wppaOvlTheme='black';var wppaOvlAnimSpeed=300;var wppaOvlSlideSpeed=3000;var wppaVer4WindowWidth=800;var wppaVer4WindowHeight=600;var wppaOvlFontFamily='Helvetica';var wppaOvlFontSize='10';var wppaOvlFontColor='';var wppaOvlFontWeight='bold';var wppaOvlLineHeight='12';var wppaOvlShowCounter=true;var wppaOvlIsVideo=false;var wppaShowLegenda='';var wppaOvlFsPhotoId=0;var wppaPhotoId=0;var wppaOvlVideoStart=false;var wppaOvlAudioStart=false;var wppaLastIptc='';var wppaLastExif='';var wppaIsMobile=false;var wppaSvgFillcolor='gray';var wppaSvgBgcolor='transparent';var wppaSvgCornerStyle='light';jQuery(document).ready(function(){wppaDoInit(false);setTimeout(function(){wppaDoInit(true);},1000);});function wppaDoInit(autoOnly){var anyAutocol=false;for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);anyAutocol=true;}}
7	if(!autoOnly){_wppaTextDelay=wppaAnimationSpeed;if(wppaFadeInAfterFadeOut)_wppaTextDelay*=2;if(anyAutocol){jQuery(window).resize(function(){for(mocc=1;mocc<=wppaTopMoc;mocc++){if(wppaAutoColumnWidth[mocc]){wppaColWidth[mocc]=0;_wppaDoAutocol(mocc);}}});}}
8	+ wppaReplaceSvg();jQuery('.wppa-ajax-spin').stop().fadeOut();jQuery('.wppa-ovl-spin').stop().fadeOut();}
9	jQuery(document).ready(function(e){if(wppaAllowAjax&&jQuery.ajax){wppaCanAjaxRender=true;}
10	if(typeof(history.pushState)!='undefined'){var i=1;while(i<=wppaMaxOccur){wppaStartHtml[i]=jQuery('#wppa-container-'+i).html();i++;}
11	wppaCanPushState=true;}});function wppaUpdateLightboxes(){if(typeof(wppaInitOverlay)=='function'){wppaInitOverlay();}

64	if(document.getElementById('theslide0-'+occ)){_wppaStop(occ);}}
65	if(typeof(wppaQRUpdate)!='undefined')wppaQRUpdate(document.location.href);};function wppaPushStateSlide(mocc,slide,url){if(!wppaIsMini[mocc]){if(wppaCanPushState&&wppaUpdateAddressLine){if(url!=''){try{history.pushState({page:wppaHis,occur:mocc,type:'slide',slide:slide},"---",url);wppaConsoleLog('Slide history stack updated');}
66	catch(err){wppaConsoleLog('Slide history stack update failed');}}}}}
67	+ function wppaRepairScriptTags(text){var temp;var newtext;if(typeof(text)=='undefined')return'';while(text.indexOf('[script')!=-1){text=text.replace('[script','<script');}
68	+ while(text.indexOf('[/script')!=-1){text=text.replace('[/script','</script');}
69	+ return text;}
70	function wppaRepairBrTags(text){var newtext;if(typeof(text)=='undefined')return'';newtext=text.replace('[br /]','<br />');return newtext;}
71	function wppaTrimAlt(text){var newtext;if(typeof(text)=='undefined')return'';if(text.length>13){newtext=text.substr(0,10)+'...';}
72	else newtext=text;return newtext;}

readme.txt CHANGED Viewed

	@@ -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&currency_code=USD&lc=US
4	Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto, imagemagick
5	- Version: 6.6.19
6	- Stable tag: 6.6.19
7	Author: J.N. Breetvelt
8	Author URI: http://www.opajaap.nl/
9	Requires at least: 3.9
	@@ -180,6 +180,18 @@ Oh, just Google on 'picture resizer' and you will find a bunch of free programs
180
181	See for additional information: <a href="http://www.wppa.nl/changelog/" >The documentation website</a>
182












183	= 6.6.19 =
184
185	= New Features =


2	Contributors: opajaap
3	Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4	Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto, imagemagick
5	+ Version: 6.6.20
6	+ Stable tag: 6.6.20
7	Author: J.N. Breetvelt
8	Author URI: http://www.opajaap.nl/
9	Requires at least: 3.9

180
181	See for additional information: <a href="http://www.wppa.nl/changelog/" >The documentation website</a>
182
183	+ = 6.6.20 =
184	+
185	+ = Bug Fixes =
186	+
187	+ * Fixed a Qr code display issue.
188	+
189	+ = Other Changes =
190	+
191	+ * Spinners are now .svg images (except in IE) and have the same color as the navigation symbols as listed in Table II-B14 and 15, and the corner rounding is like the setting in Table II-J11.
192	+ * Added charset=utf8 to the headers in mails sent by wppa.
193	+ * Share text to Twitter is shortened.
194	+
195	= 6.6.19 =
196
197	= New Features =

wppa-admin-functions.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* gp admin functions
6	- * Version 6.6.18
7	*
8	*/
9
	@@ -714,6 +714,9 @@ function wppa_admin_page_links( $curpage, $pagesize, $count, $link, $extra = ''
714	$nexturl = $link.'&wppa-page='.$nextpage.$extra;
715	$npages = ceil( $count / $pagesize );
716	$lastpagecount = $count % $pagesize;



717
718	if ( $npages > '1' ) {
719	echo '<div style="line-height:1.5em" >';
	@@ -1054,7 +1057,7 @@ function wppa_admin_spinner() {
1054
1055	$result = '<img' .
1056	' id="wppa-admin-spinner"' .
1057	- ' src="' . wppa_get_imgdir( 'loader.gif' ).'"' .
1058	' alt="Spinner"' .
1059	' style="' .
1060	'position:fixed;' .
	@@ -1166,9 +1169,20 @@ global $wpdb;
1166	$lastalbum = $wpdb->get_row( "SELECT `id`, `name` FROM `".WPPA_ALBUMS."` ORDER BY `id` DESC LIMIT 1", ARRAY_A );
1167	if ( $lastalbum ) echo '<br />'.sprintf(__('The most recently added album is <strong>%s</strong> (%d).', 'wp-photo-album-plus'), __(stripslashes($lastalbum['name']), 'wp-photo-album-plus'), $lastalbum['id']);
1168	$lastphoto = $wpdb->get_row( "SELECT `id`, `name`, `album` FROM `".WPPA_PHOTOS."` ORDER BY `timestamp` DESC LIMIT 1", ARRAY_A );
1169	- ~~$lastphotoalbum~~ ~~= $wpdb->get_row~~(~~$wpdb->prepare(~~ ~~"SELECT `id`, `name` FROM `".WPPA_ALBUMS."` WHERE `id` = %s",~~ $lastphoto['album']), ~~ARRAY_A~~ );








1170	if ( $lastphoto ) {
1171	echo '<br />'.sprintf(__('The most recently added photo is <strong>%s</strong> (%d)', 'wp-photo-album-plus'), __(stripslashes($lastphoto['name']), 'wp-photo-album-plus'), $lastphoto['id']);
1172	echo ' '.sprintf(__('in album <strong>%s</strong> (%d).', 'wp-photo-album-plus'), __(stripslashes($lastphotoalbum['name']), 'wp-photo-album-plus'), $lastphotoalbum['id']);



1173	}
1174	}


3	* Package: wp-photo-album-plus
4	*
5	* gp admin functions
6	+ * Version 6.6.20
7	*
8	*/
9

714	$nexturl = $link.'&wppa-page='.$nextpage.$extra;
715	$npages = ceil( $count / $pagesize );
716	$lastpagecount = $count % $pagesize;
717	+ if ( ! $lastpagecount ) {
718	+ $lastpagecount = $pagesize;
719	+ }
720
721	if ( $npages > '1' ) {
722	echo '<div style="line-height:1.5em" >';

1057
1058	$result = '<img' .
1059	' id="wppa-admin-spinner"' .
1060	+ ' src="' . wppa_get_imgdir( wppa_is_ie() ? 'loader.gif' : 'loader.svg' ) . '"' .
1061	' alt="Spinner"' .
1062	' style="' .
1063	'position:fixed;' .

1169	$lastalbum = $wpdb->get_row( "SELECT `id`, `name` FROM `".WPPA_ALBUMS."` ORDER BY `id` DESC LIMIT 1", ARRAY_A );
1170	if ( $lastalbum ) echo '<br />'.sprintf(__('The most recently added album is <strong>%s</strong> (%d).', 'wp-photo-album-plus'), __(stripslashes($lastalbum['name']), 'wp-photo-album-plus'), $lastalbum['id']);
1171	$lastphoto = $wpdb->get_row( "SELECT `id`, `name`, `album` FROM `".WPPA_PHOTOS."` ORDER BY `timestamp` DESC LIMIT 1", ARRAY_A );
1172	+ if ( $lastphoto['album'] < '1' ) {
1173	+ $trashed = true;
1174	+ $album = - ( $lastphoto['album'] + '9' );
1175	+ }
1176	+ else {
1177	+ $trashed = false;
1178	+ $album = $lastphoto['album'];
1179	+ }
1180	+ $lastphotoalbum = $wpdb->get_row($wpdb->prepare( "SELECT `id`, `name` FROM `".WPPA_ALBUMS."` WHERE `id` = %s", $album), ARRAY_A );
1181	if ( $lastphoto ) {
1182	echo '<br />'.sprintf(__('The most recently added photo is <strong>%s</strong> (%d)', 'wp-photo-album-plus'), __(stripslashes($lastphoto['name']), 'wp-photo-album-plus'), $lastphoto['id']);
1183	echo ' '.sprintf(__('in album <strong>%s</strong> (%d).', 'wp-photo-album-plus'), __(stripslashes($lastphotoalbum['name']), 'wp-photo-album-plus'), $lastphotoalbum['id']);
1184	+ if ( $trashed ) {
1185	+ echo ' <span style="color:red" >' . __('Deleted', 'wp-photo-album-plus' ) . '</span>';
1186	+ }
1187	}
1188	}

wppa-album-admin-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* create, edit and delete albums
6	- * Version 6.6.19
7	*
8	*/
9
	@@ -709,7 +709,7 @@ function wppaTryScheduleAll( id ) {
709	' />' .
710	'<img' .
711	' id="wppa-album-spin"' .
712	- ' src="' . wppa_get_imgdir().'spinner.gif' . '"' .
713	' alt="Spin"' .
714	' style="visibility:hidden"' .
715	' />' .
	@@ -2632,7 +2632,7 @@ global $wpdb;
2632	wppaAjaxInProgress++;
2633
2634	jQuery( "#wppa-sort-seqn-albums-" + album ).attr( 'value', seqno ); // set hidden value to new value to prevent duplicate action
2635	- var spinnerhtml = '<img src="' + wppaImageDirectory + 'spinner.gif' + '" />';
2636	jQuery( '#wppa-album-seqno-' + album ).html( spinnerhtml );
2637	}
2638	</script>


3	* Package: wp-photo-album-plus
4	*
5	* create, edit and delete albums
6	+ * Version 6.6.20
7	*
8	*/
9

709	' />' .
710	'<img' .
711	' id="wppa-album-spin"' .
712	+ ' src="' . wppa_get_imgdir() . 'spinner.' . ( wppa_is_ie() ? 'gif' : 'svg' ) . '"' .
713	' alt="Spin"' .
714	' style="visibility:hidden"' .
715	' />' .

2632	wppaAjaxInProgress++;
2633
2634	jQuery( "#wppa-sort-seqn-albums-" + album ).attr( 'value', seqno ); // set hidden value to new value to prevent duplicate action
2635	+ var spinnerhtml = '<img src="' + wppaImageDirectory + 'spinner.' + <?php echo ( wppa_is_ie() ? 'gif' : 'svg' ) ?> + '" />';
2636	jQuery( '#wppa-album-seqno-' + album ).html( spinnerhtml );
2637	}
2638	</script>

wppa-boxes-html.php CHANGED Viewed

	@@ -1298,7 +1298,7 @@ global $wppa_locale;
1298
1299	// qr code
1300	if ( wppa_switch( 'share_qr' ) && $key != 'thumb' ) {
1301	- $src = 'http://api.qrserver.com/v1/create-qr-code/' .
1302	'?format=svg' .
1303	'&size=80x80' .
1304	'&color=' . trim( wppa_opt( 'qr_color' ), '#' ) .
	@@ -1603,11 +1603,13 @@ global $wpdb;
1603
1604	// qr code
1605	if ( wppa_switch( 'share_qr' ) ) {
1606	- $src = 'http://api.qrserver.com/v1/create-qr-code/' .
1607	- '?~~data~~=' . ~~urlencode( $share_url ) .~~
1608	'&size=80x80' .
1609	'&color=' . trim( wppa_opt( 'qr_color' ), '#' ) .
1610	- '&bgcolor=' . trim( wppa_opt( 'qr_bgcolor' ), '#' );


1611	$qr = '<div style="float:left; padding:2px;" >' .
1612	'<img' .
1613	' src="' . $src . '"' .


1298
1299	// qr code
1300	if ( wppa_switch( 'share_qr' ) && $key != 'thumb' ) {
1301	+ $src = 'http' . ( is_ssl() ? 's' : '' ) . '://api.qrserver.com/v1/create-qr-code/' .
1302	'?format=svg' .
1303	'&size=80x80' .
1304	'&color=' . trim( wppa_opt( 'qr_color' ), '#' ) .

1603
1604	// qr code
1605	if ( wppa_switch( 'share_qr' ) ) {
1606	+ $src = 'http' . ( is_ssl() ? 's' : '' ) . '://api.qrserver.com/v1/create-qr-code/' .
1607	+ '?format=svg' .
1608	'&size=80x80' .
1609	'&color=' . trim( wppa_opt( 'qr_color' ), '#' ) .
1610	+ '&bgcolor=' . trim( wppa_opt( 'qr_bgcolor' ), '#' ) .
1611	+ '&data=' . urlencode( $share_url );
1612	+ $src = wppa_create_qrcode_cache( $src );
1613	$qr = '<div style="float:left; padding:2px;" >' .
1614	'<img' .
1615	' src="' . $src . '"' .

wppa-functions.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Various functions
6	- * Version 6.6.19
7	*
8	*/
9
	@@ -2152,7 +2152,7 @@ static $user;
2152	' onclick="' .
2153	'_wppaStop( ' . wppa( 'mocc' ) . ' );' .
2154	esc_attr( 'if ( confirm( "' . __( 'Are you sure you want to add this photo to your zip?' , 'wp-photo-album-plus') . '" ) ) ' .
2155	- 'wppaAjaxAddPhotoToZip( '.wppa( 'mocc' ).', '.esc_js('\''.wppa_encrypt_photo($thumb['id']).'\'').', ~~true~~ ); return false;' ).'"' .
2156	'>' .
2157	__( 'MyChoice' , 'wp-photo-album-plus') .
2158	'</a>';
	@@ -3073,19 +3073,39 @@ global $blog_id;
3073	// Spinner for Ajax
3074	if ( wppa_switch( 'allow_ajax' ) ) {
3075	if ( ! wppa_in_widget() ) {















3076	wppa_out( '<img' .
3077	' id="wppa-ajax-spin-' . wppa( 'mocc' ) . '"' .
3078	- ' src="'.wppa_get_imgdir().'loader.gif"' .

3079	' alt="spinner"' .
3080	' style="' .
3081	'box-shadow:none;' .
3082	'z-index:1010;' .
3083	'position:fixed;' .
3084	'top:50%;' .
3085	- 'margin-top:-~~32px~~;' .
3086	'left:50%;' .
3087	- 'margin-left:-~~32px~~;' .
3088	'display:none;' .




3089	'"' .
3090	' />'
3091	);


3	* Package: wp-photo-album-plus
4	*
5	* Various functions
6	+ * Version 6.6.20
7	*
8	*/
9

2152	' onclick="' .
2153	'_wppaStop( ' . wppa( 'mocc' ) . ' );' .
2154	esc_attr( 'if ( confirm( "' . __( 'Are you sure you want to add this photo to your zip?' , 'wp-photo-album-plus') . '" ) ) ' .
2155	+ 'wppaAjaxAddPhotoToZip( '.wppa( 'mocc' ).', '.esc_js('\''.wppa_encrypt_photo($thumb['id']).'\'').', false ); return false;' ).'"' .
2156	'>' .
2157	__( 'MyChoice' , 'wp-photo-album-plus') .
2158	'</a>';

3073	// Spinner for Ajax
3074	if ( wppa_switch( 'allow_ajax' ) ) {
3075	if ( ! wppa_in_widget() ) {
3076	+ switch( wppa_opt( 'icon_corner_style' ) ) {
3077	+ case 'none':
3078	+ $bradius = '0';
3079	+ break;
3080	+ case 'light':
3081	+ $bradius = '12';
3082	+ break;
3083	+ case 'medium':
3084	+ $bradius = '24';
3085	+ break;
3086	+ case 'heavy':
3087	+ $bradius = '60';
3088	+ break;
3089	+ }
3090	+
3091	wppa_out( '<img' .
3092	' id="wppa-ajax-spin-' . wppa( 'mocc' ) . '"' .
3093	+ ' src="'.wppa_get_imgdir().'loader.' . ( wppa_is_ie() ? 'gif' : 'svg' ) . '"' .
3094	+ ( wppa_is_ie() ? ' class="wppa-ajax-spin"' : ' class="wppa-svg wppa-ajax-spin"' ) .
3095	' alt="spinner"' .
3096	' style="' .
3097	'box-shadow:none;' .
3098	'z-index:1010;' .
3099	'position:fixed;' .
3100	'top:50%;' .
3101	+ 'margin-top:-60px;' .
3102	'left:50%;' .
3103	+ 'margin-left:-60px;' .
3104	'display:none;' .
3105	+ 'fill:' . wppa_opt( 'svg_color' ) . ';' .
3106	+ 'background-color:' . wppa_opt( 'svg_bg_color' ) . ';' .
3107	+ 'border-radius:' . $bradius . 'px;' .
3108	+ 'box-shadow:none;' .
3109	'"' .
3110	' />'
3111	);

wppa-non-admin.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains all the non admin stuff
6	- * Version 6.6.19
7	*
8	*/
9
	@@ -89,36 +89,7 @@ global $wpdb;
89	$imgurl = '';
90	}
91	if ( $id ) {
92	- ~~if ( wppa_switch( 'og_tags_on' ) ) {~~
93	- $thumb = wppa_cache_thumb( $id );
94	- if ( $thumb ) {
95	- $title = wppa_get_photo_name( $id );
96	- $desc = wppa_get_og_desc( $id );
97	- $url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
98	- $site = get_bloginfo('name');
99	- $mime = wppa_get_mime_type( $id );
100	- echo '
101	- <!-- WPPA+ Og Share data -->
102	- <meta property="og:site_name" content="' . esc_attr( sanitize_text_field( $site ) ) . '" />
103	- <meta property="og:type" content="article" />
104	- <meta property="og:url" content="' . $url . '" />
105	- <meta property="og:title" content="' . esc_attr( sanitize_text_field( $title ) ) . '" />';
106	- if ( $mime ) {
107	- echo '
108	- <meta property="og:image" content="' . esc_url( sanitize_text_field( $imgurl ) ) . '" />
109	- <meta property="og:image:type" content="' . $mime . '" />
110	- <meta property="og:image:width" content="' . wppa_get_photox( $id ) . '" />
111	- <meta property="og:image:height" content="' . wppa_get_photoy( $id ) . '" />';
112	- }
113	- if ( $desc ) {
114	- echo '
115	- <meta property="og:description" content="' . esc_attr( sanitize_text_field( $desc ) ) . '" />';
116	- }
117	- echo '
118	- <!-- WPPA+ End Og Share data -->
119	- ';
120	- }
121	- }
122	if ( wppa_switch( 'share_twitter' ) && wppa_opt( 'twitter_account' ) ) {
123	$thumb = wppa_cache_thumb( $id );
124
	@@ -129,7 +100,7 @@ echo '
129	}
130	if ( $thumb && $x >= 280 && $y >= 150 ) {
131	$title = wppa_get_photo_name( $id );
132	- $desc = wppa_get_og_desc( $id );
133	$url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
134	$site = get_bloginfo('name');
135
	@@ -139,14 +110,14 @@ echo '
139	<meta name="twitter:site" content="' . wppa_opt( 'twitter_account' ) . '">
140	<meta name="twitter:creator" content="' . wppa_opt( 'twitter_account' ) . '">
141	<meta name="twitter:title" content="' . esc_attr( sanitize_text_field( $title ) ) . '">
142	- <meta name="twitter:description" content="' . esc_attr( sanitize_text_field( $desc ) ) . '">
143	<meta name="twitter:image" content="' . esc_url( sanitize_text_field( $imgurl ) ) . '">
144	<!-- WPPA+ End Twitter Share data -->
145	';
146	}
147	elseif ( $thumb && $x >= 120 && $y >= 120 ) {
148	$title = wppa_get_photo_name( $id );
149	- $desc = wppa_get_og_desc( $id );
150	$url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
151	$site = get_bloginfo('name');
152
	@@ -155,13 +126,45 @@ echo '
155	<meta name="twitter:card" content="summary">
156	<meta name="twitter:site" content="' . wppa_opt( 'twitter_account' ) . '">
157	<meta name="twitter:title" content="' . esc_attr( sanitize_text_field( $title ) ) . '">
158	- <meta name="twitter:description" content="' . esc_attr( sanitize_text_field( $desc ) ) . '">
159	<meta name="twitter:image" content="' . esc_url( sanitize_text_field( $imgurl ) ) . '">
160	<!-- WPPA+ End Twitter Share data -->
161	';
162
163	}
164	}
































165	}
166
167	// To make sure we are on a page that contains at least [wppa] we check for Get var 'wppa-album'.
	@@ -485,22 +488,43 @@ global $wppa_session;
485	'</div>';
486
487	// The Spinner image















488	echo
489	'<img' .
490	- ' id="wppa-~~overlay~~-sp"' .
491	' alt="spinner"' .

492	' style="' .


493	'position:fixed;' .
494	'top:50%;' .
495	- 'margin-top:-~~16px~~;' .
496	'left:50%;' .
497	- 'margin-left:-~~16px~~;' .
498	'z-index:100100;' .
499	'opacity:1;' .
500	- '~~visibility~~:~~hidden~~;' .


501	'box-shadow:none;' .

502	'"' .
503	- ' src="'.wppa_get_imgdir().'loading.gif"' .
504	' />';
505
506	// The init vars


3	* Package: wp-photo-album-plus
4	*
5	* Contains all the non admin stuff
6	+ * Version 6.6.20
7	*
8	*/
9

89	$imgurl = '';
90	}
91	if ( $id ) {
92	+





























93	if ( wppa_switch( 'share_twitter' ) && wppa_opt( 'twitter_account' ) ) {
94	$thumb = wppa_cache_thumb( $id );
95

100	}
101	if ( $thumb && $x >= 280 && $y >= 150 ) {
102	$title = wppa_get_photo_name( $id );
103	+ $desc = wppa_get_og_desc( $id, 'short' );
104	$url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
105	$site = get_bloginfo('name');
106

110	<meta name="twitter:site" content="' . wppa_opt( 'twitter_account' ) . '">
111	<meta name="twitter:creator" content="' . wppa_opt( 'twitter_account' ) . '">
112	<meta name="twitter:title" content="' . esc_attr( sanitize_text_field( $title ) ) . '">
113	+ <meta name="twitter:text:description" content="' . esc_attr( sanitize_text_field( $desc ) ) . '">
114	<meta name="twitter:image" content="' . esc_url( sanitize_text_field( $imgurl ) ) . '">
115	<!-- WPPA+ End Twitter Share data -->
116	';
117	}
118	elseif ( $thumb && $x >= 120 && $y >= 120 ) {
119	$title = wppa_get_photo_name( $id );
120	+ $desc = wppa_get_og_desc( $id, 'short' );
121	$url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
122	$site = get_bloginfo('name');
123

126	<meta name="twitter:card" content="summary">
127	<meta name="twitter:site" content="' . wppa_opt( 'twitter_account' ) . '">
128	<meta name="twitter:title" content="' . esc_attr( sanitize_text_field( $title ) ) . '">
129	+ <meta name="twitter:text:description" content="' . esc_attr( sanitize_text_field( $desc ) ) . '">
130	<meta name="twitter:image" content="' . esc_url( sanitize_text_field( $imgurl ) ) . '">
131	<!-- WPPA+ End Twitter Share data -->
132	';
133
134	}
135	}
136	+
137	+ if ( wppa_switch( 'og_tags_on' ) ) {
138	+ $thumb = wppa_cache_thumb( $id );
139	+ if ( $thumb ) {
140	+ $title = wppa_get_photo_name( $id );
141	+ $desc = wppa_get_og_desc( $id );
142	+ $url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
143	+ $site = get_bloginfo('name');
144	+ $mime = wppa_get_mime_type( $id );
145	+ echo '
146	+ <!-- WPPA+ Og Share data -->
147	+ <meta property="og:site_name" content="' . esc_attr( sanitize_text_field( $site ) ) . '" />
148	+ <meta property="og:type" content="article" />
149	+ <meta property="og:url" content="' . $url . '" />
150	+ <meta property="og:title" content="' . esc_attr( sanitize_text_field( $title ) ) . '" />';
151	+ if ( $mime ) {
152	+ echo '
153	+ <meta property="og:image" content="' . esc_url( sanitize_text_field( $imgurl ) ) . '" />
154	+ <meta property="og:image:type" content="' . $mime . '" />
155	+ <meta property="og:image:width" content="' . wppa_get_photox( $id ) . '" />
156	+ <meta property="og:image:height" content="' . wppa_get_photoy( $id ) . '" />';
157	+ }
158	+ if ( $desc ) {
159	+ echo '
160	+ <meta property="og:description" content="' . esc_attr( sanitize_text_field( $desc ) ) . '" />';
161	+ }
162	+ echo '
163	+ <!-- WPPA+ End Og Share data -->
164	+ ';
165	+ }
166	+ }
167	+
168	}
169
170	// To make sure we are on a page that contains at least [wppa] we check for Get var 'wppa-album'.

488	'</div>';
489
490	// The Spinner image
491	+ switch( wppa_opt( 'icon_corner_style' ) ) {
492	+ case 'none':
493	+ $bradius = '0';
494	+ break;
495	+ case 'light':
496	+ $bradius = '12';
497	+ break;
498	+ case 'medium':
499	+ $bradius = '24';
500	+ break;
501	+ case 'heavy':
502	+ $bradius = '60';
503	+ break;
504	+ }
505	+
506	echo
507	'<img' .
508	+ ' id="wppa-ovl-spin"' .
509	' alt="spinner"' .
510	+ ( wppa_is_ie() ? '' : ' class="wppa-svg"' ) .
511	' style="' .
512	+ 'width:120px;' .
513	+ 'height:120px;' .
514	'position:fixed;' .
515	'top:50%;' .
516	+ 'margin-top:-60px;' .
517	'left:50%;' .
518	+ 'margin-left:-60px;' .
519	'z-index:100100;' .
520	'opacity:1;' .
521	+ 'display:none;' .
522	+ 'fill:' . wppa_opt( 'ovl_svg_color' ) . ';' .
523	+ 'background-color:' . wppa_opt( 'ovl_svg_bg_color' ) . ';' .
524	'box-shadow:none;' .
525	+ 'border-radius:' . $bradius . 'px;' .
526	'"' .
527	+ ' src="' . wppa_get_imgdir() . ( wppa_is_ie() ? 'loading.gif' : 'loader.svg' ) . '"' .
528	' />';
529
530	// The init vars

wppa-photo-admin-autosave.php CHANGED Viewed

@@ -3,7 +3,7 @@
             * Package: wp-photo-album-plus
+            *
             * edit and delete photos
-            -
            * Version 6.6.19
+            *
             */
@@ -1077,7 +1077,7 @@ function wppaToggleHorizon() {
             												echo
             												'<img' .
             													' id="wppa-water-spin-' . $id . '"' .
-            -
            													' src="' . wppa_get_imgdir() . 'spinner.gif' . '"' .
             													' alt="Spin"' .
             													' style="visibility:hidden"' .
             												' />';
@@ -1630,7 +1630,7 @@ function wppaToggleHorizon() {
             										' />' .
             										'<img' .
             											' id="wppa-photo-spin-' . $id . '"' .
-            -
            											' src="' . wppa_get_imgdir() . 'spinner.gif"' .
             											' style="visibility:hidden"' .
             										' />' .
             									'</td>';
@@ -2692,7 +2692,7 @@ global $wpdb;
             					xmlhttp.setRequestHeader( "Content-type","application/x-www-form-urlencoded" );
             					xmlhttp.send( data );
             					jQuery( "#wppa-sort-seqn-"+photo ).attr( 'value', seqno );	// set hidden value to new value to prevent duplicate action
-            -
            					var spinnerhtml = '<img src="'+wppaImageDirectory+'spinner.gif'+'" />';
             					jQuery( '#wppa-seqno-'+photo ).html( spinnerhtml );
+            				}
             			</script>
@@ -2783,7 +2783,7 @@ global $wpdb;
             global $wppa_search_stats;
             	$doit = false;
-            -
            //	if ( wppa_user_is( 'administrator' ) ) $doit = true;
             	if ( current_user_can( 'wppa_admin' ) && current_user_can( 'wppa_moderate' ) ) $doit = true;
             	if ( wppa_opt( 'upload_edit' ) != 'none' ) $doit = true;
             	if ( ! $doit ) {	// Should never get here. Only when url is manipulted manually.
@@ -2795,71 +2795,76 @@ global $wppa_search_stats;
             	$wppa_search_stats = array();
             	$first = true;
-            -
            	if ( wppa_user_is( 'administrator' ) && wppa_is_int( $_REQUEST['wppa-searchstring'] ) ) {
-            -
            		$photo_array = array( $_REQUEST['wppa-searchstring'] );
+            	}
-            -
            	else foreach( $words as $word ) {
-            -
            		// Find lines in index db table
-            -
            		if ( wppa_switch( 'wild_front' ) ) {
-            -
            			$pidxs = $wpdb->get_results( "SELECT `slug`, `photos` FROM `".WPPA_INDEX."` WHERE `slug` LIKE '%".$word."%'", ARRAY_A );
-            -
            		}
-            -
            		else {
-            -
            			$pidxs = $wpdb->get_results( "SELECT `slug`, `photos` FROM `".WPPA_INDEX."` WHERE `slug` LIKE '".$word."%'", ARRAY_A );
-            -
            		}
-            -
            		$photos = '';
-            -
            		foreach ( $pidxs as $pi ) {
-            -
            			$photos .= $pi['photos'].',';
-            -
            		}
-            -
            		if ( $first ) {
-            -
            			$photo_array 	= wppa_index_array_remove_dups( wppa_index_string_to_array( trim( $photos, ',' ) ) );
-            -
            			$count 			= empty( $photo_array ) ? '0' : count( $photo_array );
-            -
            			$list 			= implode( ',', $photo_array );
-            -
            			if ( ! $list ) {
-            -
            				$list = '0';
+            			}
-            -
            //			if ( wppa_user_is( 'administrator' ) ) {
-            -
            			if ( current_user_can( 'wppa_admin' ) && current_user_can( 'wppa_moderate' ) ) {
-            -
            				$real_count = $wpdb->get_var( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `id` IN (".$list.") " );
-            -
            				if ( $count != $real_count ) {
-            -
            					update_option( 'wppa_remake_index_photos_status', __('Required', 'wp-photo-album-plus') );
-            -
            // 					echo 'realcount mismatch:1';
-            -
            //					echo ' count='.$count.', realcount='.$real_count.'<br/>';
+            				}
-            -
            			}
-            -
            			else { // Not admin, can edit own photos only
-            -
            				$real_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `id` IN (".$list.") AND `owner` = %s", wppa_get_user() ) );
-            -
            			}
-            -
            			$wppa_search_stats[] 	= array( 'word' => $word, 'count' => $real_count );
-            -
            			$first = false;
-            -
            		}
-            -
            		else {
-            -
            			$temp_array 	= wppa_index_array_remove_dups( wppa_index_string_to_array( trim( $photos, ',' ) ) );
-            -
            			$count 			= empty( $temp_array ) ? '0' : count( $temp_array );
-            -
            			$list 			= implode( ',', $temp_array );
-            -
-            -
            //			if ( wppa_user_is( 'administrator' ) ) {
-            -
            			if ( current_user_can( 'wppa_admin' ) && current_user_can( 'wppa_moderate' ) ) {
-            -
            				$real_count = $wpdb->get_var( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `id` IN (".$list.") " );
-            -
            				if ( $count != $real_count ) {
-            -
            					update_option( 'wppa_remake_index_photos_status', __('Required', 'wp-photo-album-plus') );
-            -
            //					echo 'realcount mismatch:2';
-            -
            //					echo ' count='.$count.', realcount='.$real_count.'<br/>';
+            				}
+            			}
-            -
            			else { // Not admin, can edit own photos only
-            -
            				$real_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `id` IN (".$list.") AND `owner` = %s", wppa_get_user() ) );
-            -
            			}
-            -
            			$wppa_search_stats[] 	= array( 'word' => $word, 'count' => $real_count );
-            -
            			$photo_array 			= array_intersect( $photo_array, $temp_array );
+            		}
+            	}


3	* Package: wp-photo-album-plus
4	*
5	* edit and delete photos
6	+ * Version 6.6.20
7	*
8	*/
9

1077	echo
1078	'<img' .
1079	' id="wppa-water-spin-' . $id . '"' .
1080	+ ' src="' . wppa_get_imgdir() . 'spinner.' . ( wppa_is_ie() ? 'gif' : 'svg' ) . '"' .
1081	' alt="Spin"' .
1082	' style="visibility:hidden"' .
1083	' />';

1630	' />' .
1631	'<img' .
1632	' id="wppa-photo-spin-' . $id . '"' .
1633	+ ' src="' . wppa_get_imgdir() . 'spinner.' . ( wppa_is_ie() ? 'gif' : 'svg' ) . '"' .
1634	' style="visibility:hidden"' .
1635	' />' .
1636	'</td>';

2692	xmlhttp.setRequestHeader( "Content-type","application/x-www-form-urlencoded" );
2693	xmlhttp.send( data );
2694	jQuery( "#wppa-sort-seqn-"+photo ).attr( 'value', seqno ); // set hidden value to new value to prevent duplicate action
2695	+ var spinnerhtml = '<img src="'+wppaImageDirectory+'spinner.'+<?php echo ( wppa_is_ie() ? 'gif' : 'svg' ) ?>+'" />';
2696	jQuery( '#wppa-seqno-'+photo ).html( spinnerhtml );
2697	}
2698	</script>

2783	global $wppa_search_stats;
2784
2785	$doit = false;
2786	+
2787	if ( current_user_can( 'wppa_admin' ) && current_user_can( 'wppa_moderate' ) ) $doit = true;
2788	if ( wppa_opt( 'upload_edit' ) != 'none' ) $doit = true;
2789	if ( ! $doit ) { // Should never get here. Only when url is manipulted manually.

2795	$wppa_search_stats = array();
2796
2797	$first = true;
2798	+ $photo_array = array();
2799
2800	+ // See if only ids given
2801	+ if ( wppa_user_is( 'administrator' ) ) {
2802	+ foreach ( $words as $word ) {
2803	+ if ( wppa_is_int( $word ) ) {
2804	+ $photo_array[] = $word;
2805	+ }
2806	+ }
2807	+ asort( $photo_array );
2808	}
2809
2810	+ // Nothing? Process normal serch
2811	+ if ( ! count( $photo_array ) ) {
2812
2813	+ foreach( $words as $word ) {






2814
2815	+ // Find lines in index db table
2816	+ if ( wppa_switch( 'wild_front' ) ) {
2817	+ $pidxs = $wpdb->get_results( "SELECT `slug`, `photos` FROM `".WPPA_INDEX."` WHERE `slug` LIKE '%".$word."%'", ARRAY_A );
2818	+ }
2819	+ else {
2820	+ $pidxs = $wpdb->get_results( "SELECT `slug`, `photos` FROM `".WPPA_INDEX."` WHERE `slug` LIKE '".$word."%'", ARRAY_A );
2821	+ }
2822
2823	+ $photos = '';


2824
2825	+ foreach ( $pidxs as $pi ) {
2826	+ $photos .= $pi['photos'].',';




2827	}
2828
2829	+ if ( $first ) {
2830	+ $photo_array = wppa_index_array_remove_dups( wppa_index_string_to_array( trim( $photos, ',' ) ) );
2831	+ $count = empty( $photo_array ) ? '0' : count( $photo_array );
2832	+ $list = implode( ',', $photo_array );
2833	+ if ( ! $list ) {
2834	+ $list = '0';

2835	}




2836
2837	+ if ( current_user_can( 'wppa_admin' ) && current_user_can( 'wppa_moderate' ) ) {
2838	+ $real_count = $wpdb->get_var( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `id` IN (".$list.") " );
2839	+ if ( $count != $real_count ) {
2840	+ update_option( 'wppa_remake_index_photos_status', __('Required', 'wp-photo-album-plus') );
2841	+ }










2842	}
2843	+ else { // Not admin, can edit own photos only
2844	+ $real_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `id` IN (".$list.") AND `owner` = %s", wppa_get_user() ) );
2845	+ }
2846	+
2847	+ $wppa_search_stats[] = array( 'word' => $word, 'count' => $real_count );
2848	+ $first = false;
2849	}
2850	+ else {
2851	+ $temp_array = wppa_index_array_remove_dups( wppa_index_string_to_array( trim( $photos, ',' ) ) );
2852	+ $count = empty( $temp_array ) ? '0' : count( $temp_array );
2853	+ $list = implode( ',', $temp_array );
2854	+
2855	+ if ( current_user_can( 'wppa_admin' ) && current_user_can( 'wppa_moderate' ) ) {
2856	+ $real_count = $wpdb->get_var( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `id` IN (".$list.") " );
2857	+ if ( $count != $real_count ) {
2858	+ update_option( 'wppa_remake_index_photos_status', __('Required', 'wp-photo-album-plus') );
2859	+ }
2860	+ }
2861	+ else { // Not admin, can edit own photos only
2862	+ $real_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM `".WPPA_PHOTOS."` WHERE `id` IN (".$list.") AND `owner` = %s", wppa_get_user() ) );
2863	+ }
2864
2865	+ $wppa_search_stats[] = array( 'word' => $word, 'count' => $real_count );
2866	+ $photo_array = array_intersect( $photo_array, $temp_array );
2867	+ }
2868	}
2869	}
2870

wppa-photo-files.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-photo-files.php
3	*
4	* Functions used to create/manipulate photofiles
5	- * Version 6.6.18
6	*
7	*/
8
	@@ -663,14 +663,17 @@ function wppa_image_magick( $command ) {
663	$out = array();
664	$err = 0;
665	$run = exec( $path . $command, $out, $err );
666	- $key = $err ? 'Err' : 'Dbg';
667
668	$logcom = $command;
669	$logcom = str_replace( ABSPATH, '...', $logcom );
670	$logcom = str_replace( wppa_opt( 'image_magick' ), '...', $logcom );
671	- ~~wppa_log( $key, 'Exec ' . $logcom . ' returned ' . $err ); //, true );~~
672	- ~~foreach~~( $~~out~~ ~~as $line~~ ) {
673	- ~~wppa_log(~~ '~~OBS~~', ~~$line~~ );




674	}
675
676	return $err;


2	/* wppa-photo-files.php
3	*
4	* Functions used to create/manipulate photofiles
5	+ * Version 6.6.20
6	*
7	*/
8

663	$out = array();
664	$err = 0;
665	$run = exec( $path . $command, $out, $err );

666
667	$logcom = $command;
668	$logcom = str_replace( ABSPATH, '...', $logcom );
669	$logcom = str_replace( wppa_opt( 'image_magick' ), '...', $logcom );
670	+
671	+ if ( $err ) {
672	+ $key = $err ? 'Err' : 'Dbg';
673	+ wppa_log( $key, 'Exec ' . $logcom . ' returned ' . $err ); //, true );
674	+ foreach( $out as $line ) {
675	+ wppa_log( 'OBS', $line );
676	+ }
677	}
678
679	return $err;

wppa-qr-widget.php CHANGED Viewed

	@@ -35,11 +35,13 @@ class wppaQRWidget extends WP_Widget {
35	'?format=svg' .
36	'&size='. wppa_opt( 'qr_size' ).'x'.wppa_opt( 'qr_size' ) .
37	'&color='.trim( wppa_opt( 'qr_color' ), '#' ) .
38	- '&bgcolor='.trim( wppa_opt( 'qr_bgcolor' ) ) .
39	'&data=' . site_url();
40
41	// Get the qrcode
42	$qrsrc = wppa_create_qrcode_cache( $qrsrc );


43	$widget_content =
44	'<div style="text-align:center;" >' .
45	'<img id="wppa-qr-img" src="' . $qrsrc . '" title="" alt="' . __('QR code', 'wp-photo-album-plus') . '" />' .


35	'?format=svg' .
36	'&size='. wppa_opt( 'qr_size' ).'x'.wppa_opt( 'qr_size' ) .
37	'&color='.trim( wppa_opt( 'qr_color' ), '#' ) .
38	+ '&bgcolor='.trim( wppa_opt( 'qr_bgcolor' ), '#' ) .
39	'&data=' . site_url();
40
41	// Get the qrcode
42	$qrsrc = wppa_create_qrcode_cache( $qrsrc );
43	+
44	+ // Make the html
45	$widget_content =
46	'<div style="text-align:center;" >' .
47	'<img id="wppa-qr-img" src="' . $qrsrc . '" title="" alt="' . __('QR code', 'wp-photo-album-plus') . '" />' .

wppa-setup.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains all the setup stuff
6	- * Version 6.6.19
7	*
8	*/
9
	@@ -1093,9 +1093,9 @@ Hide Camera info
1093	'wppa_bgcolor_modal' => '#ffffff',
1094	'wppa_bcolor_modal' => '#ffffff',
1095	'wppa_svg_color' => '#666666',
1096	- 'wppa_svg_bg_color' => '~~#dddddd~~',
1097	'wppa_ovl_svg_color' => '#999999',
1098	- 'wppa_ovl_svg_bg_color' => '~~#ffffff~~',
1099
1100	// Table IV: Behaviour
1101	// A System


3	* Package: wp-photo-album-plus
4	*
5	* Contains all the setup stuff
6	+ * Version 6.6.20
7	*
8	*/
9

1093	'wppa_bgcolor_modal' => '#ffffff',
1094	'wppa_bcolor_modal' => '#ffffff',
1095	'wppa_svg_color' => '#666666',
1096	+ 'wppa_svg_bg_color' => 'transparent',
1097	'wppa_ovl_svg_color' => '#999999',
1098	+ 'wppa_ovl_svg_bg_color' => 'transparent',
1099
1100	// Table IV: Behaviour
1101	// A System

wppa-slideshow.php CHANGED Viewed

@@ -3,7 +3,7 @@
             * Package: wp-photo-album-plus
+            *
             * Contains all the slideshow high level functions
-            -
            * Version 6.6.19
+            *
             */
@@ -386,12 +386,54 @@ function wppa_slide_frame() {
             				'</div>'
             			);
-            -
            	wppa_out( 	'<div' .
             					' id="spinner-' . wppa( 'mocc' ) . '"' .
             					' class="spinner"' .
             					' >' .
             				'</div>'
             			);
             	if ( ! wppa_page( 'oneofone' ) ) {


3	* Package: wp-photo-album-plus
4	*
5	* Contains all the slideshow high level functions
6	+ * Version 6.6.20
7	*
8	*/
9

386	'</div>'
387	);
388
389	+ switch( wppa_opt( 'icon_corner_style' ) ) {
390	+ case 'none':
391	+ $bradius = '0';
392	+ break;
393	+ case 'light':
394	+ $bradius = '12';
395	+ break;
396	+ case 'medium':
397	+ $bradius = '24';
398	+ break;
399	+ case 'heavy':
400	+ $bradius = '60';
401	+ break;
402	+ }
403	+
404	+ wppa_out( '<img' .
405	+ ' id="wppa-slide-spin-' . wppa( 'mocc' ) . '"' .
406	+ ' alt="spinner"' .
407	+ ( wppa_is_ie() ? '' : ' class="wppa-svg"' ) .
408	+ ' style="' .
409	+ 'width:120px;' .
410	+ 'height:120px;' .
411	+ 'position:absolute;' .
412	+ 'top:50%;' .
413	+ 'margin-top:-60px;' .
414	+ 'left:50%;' .
415	+ 'margin-left:-60px;' .
416	+ 'z-index:100100;' .
417	+ 'opacity:1;' .
418	+ 'display:block;' .
419	+ 'fill:' . wppa_opt( 'svg_color' ) . ';' .
420	+ 'background-color:' . wppa_opt( 'svg_bg_color' ) . ';' .
421	+ 'box-shadow:none;' .
422	+ 'border-radius:' . $bradius .'px;' .
423	+ '"' .
424	+ ' src="' . wppa_get_imgdir() . ( wppa_is_ie() ? 'loading.gif' : 'loader.svg' ) . '"' .
425	+ ' />'
426	+ );
427	+
428	+
429	+
430	+ /*'<div' .
431	' id="spinner-' . wppa( 'mocc' ) . '"' .
432	' class="spinner"' .
433	' >' .
434	'</div>'
435	);
436	+ */
437
438	if ( ! wppa_page( 'oneofone' ) ) {
439

wppa-utils.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains low-level utility routines
6	- * Version 6.6.19
7	*
8	*/
9
	@@ -912,7 +912,7 @@ global $wpdb;
912	$iret = wp_mail( $user->user_email,
913	$subject,
914	$content,
915	- array( 'Content-Type: text/html' ),
916	'' );
917	if ( $iret ) return;
918
	@@ -923,7 +923,7 @@ global $wpdb;
923	wppa_process_failed_mail( $user->user_email,
924	$subject,
925	$content,
926	- array( 'Content-Type: text/html' ),
927	'' );
928	}
929
	@@ -967,7 +967,7 @@ function wppa_send_mail( $to, $subj, $cont, $photo, $email = '' ) {
967	}
968
969	$headers = array( 'From: noreply@' . $site,
970	- 'Content-Type: text/html'
971	);
972
973	$message_part_1 .=
	@@ -1545,11 +1545,19 @@ function wppa_stx_err($msg) {
1545	}
1546
1547
1548	- function wppa_get_og_desc( $id ) {
1549
1550	- ~~$result~~ ~~= sprintf~~( ~~__('See~~ ~~this image on %s', 'wp-photo-album-plus'~~), ~~str_replace( '&', __( 'and' , 'wp-photo-album-plus'), get_bloginfo( 'name' ) ) ) .~~
1551	- ': ' .
1552	- ~~strip_shortcodes(~~ ~~wppa_strip_tags~~( ~~wppa_html(~~ ~~wppa_get_photo_desc(~~ $id ) ~~), 'all' ) );~~








1553
1554	$result = apply_filters( 'wppa_get_og_desc', $result );
1555
	@@ -3581,10 +3589,10 @@ function wppa_create_qrcode_cache( $qrsrc ) {
3581	if ( ! is_dir( WPPA_UPLOAD_PATH . '/qr' ) ) {
3582	mkdir( WPPA_UPLOAD_PATH . '/qr' );
3583	}
3584	-
3585	// In cache already?
3586	if ( is_file( WPPA_UPLOAD_PATH . '/qr/' . $key . '.svg' ) ) {
3587	-
3588	// Bump cache found counter
3589	update_option( 'wppa_qr_cache_hits', get_option( 'wppa_qr_cache_hits', 0 ) + 1 );
3590	return WPPA_UPLOAD_URL . '/qr/' . $key . '.svg';
	@@ -3592,7 +3600,7 @@ function wppa_create_qrcode_cache( $qrsrc ) {
3592
3593	// Bump cache miss counter
3594	update_option( 'wppa_qr_cache_miss', get_option( 'wppa_qr_cache_miss', 0 ) + 1 );
3595	-
3596	// Catch the qr image
3597	$curl = curl_init();
3598	curl_setopt( $curl, CURLOPT_RETURNTRANSFER, 1 );
	@@ -3601,10 +3609,12 @@ function wppa_create_qrcode_cache( $qrsrc ) {
3601	curl_close( $curl );
3602
3603	// Save the image
3604	- ~~$file~~ = ~~fopen~~( ~~WPPA_UPLOAD_PATH . '/qr/' .~~ $~~key~~ . ~~'.svg',~~ ~~'w'~~ );
3605	- if ( $~~file~~ ) {
3606	- ~~fwrite~~( $file, ~~$contents, strlen( $contents~~ ) );
3607	- ~~fclose~~( $file );


3608	}
3609
3610	if ( is_file( WPPA_UPLOAD_PATH . '/qr/' . $key . '.svg' ) ) {


3	* Package: wp-photo-album-plus
4	*
5	* Contains low-level utility routines
6	+ * Version 6.6.20
7	*
8	*/
9

912	$iret = wp_mail( $user->user_email,
913	$subject,
914	$content,
915	+ array( 'Content-Type: text/html; charset=UTF-8' ),
916	'' );
917	if ( $iret ) return;
918

923	wppa_process_failed_mail( $user->user_email,
924	$subject,
925	$content,
926	+ array( 'Content-Type: text/html; charset=UTF-8' ),
927	'' );
928	}
929

967	}
968
969	$headers = array( 'From: noreply@' . $site,
970	+ 'Content-Type: text/html; charset=UTF-8'
971	);
972
973	$message_part_1 .=

1545	}
1546
1547
1548	+ function wppa_get_og_desc( $id, $short = false ) {
1549
1550	+ if ( $short ) {
1551	+ $result = strip_shortcodes( wppa_strip_tags( wppa_html( wppa_get_photo_desc( $id ) ), 'all' ) );
1552	+ if ( ! $result ) {
1553	+ $result = str_replace( '&', __( 'and' , 'wp-photo-album-plus'), get_bloginfo( 'name' ) );
1554	+ }
1555	+ }
1556	+ else {
1557	+ $result = sprintf( __('See this image on %s', 'wp-photo-album-plus'), str_replace( '&', __( 'and' , 'wp-photo-album-plus'), get_bloginfo( 'name' ) ) ) .
1558	+ ': ' .
1559	+ strip_shortcodes( wppa_strip_tags( wppa_html( wppa_get_photo_desc( $id ) ), 'all' ) );
1560	+ }
1561
1562	$result = apply_filters( 'wppa_get_og_desc', $result );
1563

3589	if ( ! is_dir( WPPA_UPLOAD_PATH . '/qr' ) ) {
3590	mkdir( WPPA_UPLOAD_PATH . '/qr' );
3591	}
3592	+
3593	// In cache already?
3594	if ( is_file( WPPA_UPLOAD_PATH . '/qr/' . $key . '.svg' ) ) {
3595	+
3596	// Bump cache found counter
3597	update_option( 'wppa_qr_cache_hits', get_option( 'wppa_qr_cache_hits', 0 ) + 1 );
3598	return WPPA_UPLOAD_URL . '/qr/' . $key . '.svg';

3600
3601	// Bump cache miss counter
3602	update_option( 'wppa_qr_cache_miss', get_option( 'wppa_qr_cache_miss', 0 ) + 1 );
3603	+
3604	// Catch the qr image
3605	$curl = curl_init();
3606	curl_setopt( $curl, CURLOPT_RETURNTRANSFER, 1 );

3609	curl_close( $curl );
3610
3611	// Save the image
3612	+ if ( strlen( $contents ) > 1000 ) {
3613	+ $file = fopen( WPPA_UPLOAD_PATH . '/qr/' . $key . '.svg', 'w' );
3614	+ if ( $file ) {
3615	+ fwrite( $file, $contents, strlen( $contents ) );
3616	+ fclose( $file );
3617	+ }
3618	}
3619
3620	if ( is_file( WPPA_UPLOAD_PATH . '/qr/' . $key . '.svg' ) ) {

wppa.php CHANGED Viewed

	@@ -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.6.19
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 = '~~6619~~'; // WPPA db version
26	- global $wppa_api_version; $wppa_api_version = '6-6-19-006'; // 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: 6.6.20
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 = '6620'; // WPPA db version
26	+ global $wppa_api_version; $wppa_api_version = '6-6-20-006'; // WPPA software version
27
28	/* start timers */
29	global $wppa_starttime; $wppa_starttime = microtime(true);