WP Photo Album Plus - Version 6.3.16

Version Description

Release Info

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

Code changes from version 6.3.15 to 6.3.16

Files changed (12) hide show

js/wppa-lightbox.js +20 -3
js/wppa-lightbox.min.js +8 -6
readme.txt +11 -3
wppa-admin-functions.php +2 -2
wppa-breadcrumb.php +2 -2
wppa-common-functions.php +22 -3
wppa-filter.php +2 -4
wppa-non-admin.php +20 -12
wppa-settings-autosave.php +14 -4
wppa-setup.php +10 -4
wppa-utils.php +2 -5
wppa.php +21 -7

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.2.15';
7
8	// Global inits
9	var wppaNormsBtnOpac = 1;
	@@ -37,7 +37,7 @@ jQuery( window ).resize(function() {
37	// Keyboard handler
38	function wppaOvlKeyboardHandler( e ) {
39
40	- e.preventDefault();
41
42	var keycode;
43	var escapeKey;
	@@ -55,6 +55,9 @@ function wppaOvlKeyboardHandler( e ) {
55	switch ( keycode ) {
56	case escapeKey:
57	wppaStopVideo( mocc );



58	wppaOvlHide();
59	break;
60	case 37:
	@@ -83,6 +86,15 @@ function wppaOvlKeyboardHandler( e ) {
83	case 'f':
84	wppaOvlFull();
85	break;









86	}
87
88	return false;
	@@ -119,7 +131,7 @@ wppaConsoleLog( 'wppaOvlFull' );
119	}
120
121	// Switch to normal screen mode
122	- function wppaOvlNorm() {
123	wppaConsoleLog( 'wppaOvlNorm' );
124
125	wppaOvlMode = 'normal';
	@@ -130,6 +142,8 @@ wppaConsoleLog( 'wppaOvlNorm' );
130	} else if (document.webkitCancelFullScreen) {
131	document.webkitCancelFullScreen();
132	}


133	setTimeout( 'wppaOvlShow( '+wppaOvlIdx+' )', 1000 );
134	}
135
	@@ -271,6 +285,9 @@ wppaConsoleLog( 'wppaOvlShow arg='+arg );
271	function _wppaOvlShow( idx ) {
272	wppaConsoleLog( '_wppaOvlShow, idx='+idx );
273



274	// Preload current image
275	if ( wppaOvlUrls[idx].length > 0 ) { // Not an empty url
276	wppaOvlImgs[idx] = new Image();


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

37	// Keyboard handler
38	function wppaOvlKeyboardHandler( e ) {
39
40	+ // e.preventDefault();
41
42	var keycode;
43	var escapeKey;

55	switch ( keycode ) {
56	case escapeKey:
57	wppaStopVideo( mocc );
58	+ if ( wppaOvlMode != 'normal' ) {
59	+ wppaOvlNorm( true );
60	+ }
61	wppaOvlHide();
62	break;
63	case 37:

86	case 'f':
87	wppaOvlFull();
88	break;
89	+ case 'q':
90	+ case 'x':
91	+ wppaStopVideo( mocc );
92	+ if ( wppaOvlMode != 'normal' ) {
93	+ wppaOvlNorm( true );
94	+ }
95	+ wppaOvlHide();
96	+ break;
97	+
98	}
99
100	return false;

131	}
132
133	// Switch to normal screen mode
134	+ function wppaOvlNorm( exit ) {
135	wppaConsoleLog( 'wppaOvlNorm' );
136
137	wppaOvlMode = 'normal';

142	} else if (document.webkitCancelFullScreen) {
143	document.webkitCancelFullScreen();
144	}
145	+ if ( exit ) return;
146	+
147	setTimeout( 'wppaOvlShow( '+wppaOvlIdx+' )', 1000 );
148	}
149

285	function _wppaOvlShow( idx ) {
286	wppaConsoleLog( '_wppaOvlShow, idx='+idx );
287
288	+ // Show spinner
289	+ jQuery( '#wppa-overlay-sp' ).css( { visibility: 'visible' } );
290	+
291	// Preload current image
292	if ( wppaOvlUrls[idx].length > 0 ) { // Not an empty url
293	wppaOvlImgs[idx] = new Image();

js/wppa-lightbox.min.js CHANGED Viewed

	@@ -4,16 +4,18 @@
4	// Dependancies: wppa.js and default wp jQuery library
5	//
6
7	- var wppaLightboxVersion='6.2.15';var wppaNormsBtnOpac=1;var wppaIsVideo=false;var wppaHasAudio=false;var wppaOvlImgs=[];var wppaKbHandlerInstalled=false;var wppaSavedContainerWidth;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(10);});function wppaOvlKeyboardHandler(e){~~e.preventDefault();~~var keycode;var escapeKey;if(e==null){keycode=event.keyCode;escapeKey=27;}else{keycode=e.keyCode;escapeKey=27;}
8	- var key=String.fromCharCode(keycode).toLowerCase();switch(keycode){case escapeKey:wppaStopVideo(mocc);~~wppaOvlHide~~()~~;break;case 37:wppaOvlShowPrev~~();~~break;case 39:wppaOvlShowNext();break;~~}
9	- ~~switch~~(~~key~~)~~{case'p':wppaOvlShowPrev()~~;break;case~~'n'~~:~~wppaOvlShowNext~~();break;case~~'s'~~:~~wppaOvlStartStop~~();break;~~case'd':jQuery('#wppa-ovl-legenda-1').css('visibility','hidden');jQuery('#wppa-ovl-legenda-2').css('visibility','hidden');wppaShowLegenda='hidden';break;case'f':wppaOvlFull();break;~~}


10	return false;}
11	function wppaOvlFull(){wppaConsoleLog('wppaOvlFull');var oldMode=wppaOvlMode;wppaOvlStepMode();var elem=document.getElementById('wppa-overlay-ic');if(!elem)return;if(oldMode=='normal'){if(elem.requestFullscreen){elem.requestFullscreen();}else if(elem.mozRequestFullScreen){elem.mozRequestFullScreen();}else if(elem.webkitRequestFullscreen){elem.webkitRequestFullscreen();}
12	setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',1000);}
13	if(wppaOvlMode=='normal'){if(document.cancelFullScreen){document.cancelFullScreen();}else if(document.mozCancelFullScreen){document.mozCancelFullScreen();}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen();}}
14	jQuery('#wppa-ovl-legenda-1').html('');}
15	- function wppaOvlNorm(){wppaConsoleLog('wppaOvlNorm');wppaOvlMode='normal';if(document.cancelFullScreen){document.cancelFullScreen();}else if(document.mozCancelFullScreen){document.mozCancelFullScreen();}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen();}
16	- setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',1000);}
17	function wppaOvlShow(arg){wppaConsoleLog('wppaOvlShow arg='+arg);if(wppaOvlFirst){jQuery('#weaver-final').removeClass('wvr-hide-bang');jQuery('#wppa-overlay-bg').fadeTo(3,wppaOvlOpacity);if(!wppaKbHandlerInstalled){jQuery(document).on('keydown',wppaOvlKeyboardHandler);wppaKbHandlerInstalled=true;}
18	var occ=0;while(occ<wppaTopMoc){occ++;wppaStopShow(occ);}
19	jQuery('#wppa-overlay-bg').css({width:window.innerWidth,height:window.innerHeight,});}
	@@ -32,7 +34,7 @@ wppaOvlVideoHtmls[0]=jQuery(arg).attr('data-videohtml')?decodeURI(jQuery(arg).at
32	wppaOvlIdx=0;}}
33	else{wppaOvlIdx=arg;}
34	setTimeout(function(){_wppaOvlShow(wppaOvlIdx)},100);}
35	- function _wppaOvlShow(idx){wppaConsoleLog('_wppaOvlShow, idx='+idx);if(wppaOvlUrls[idx].length>0){wppaOvlImgs[idx]=new Image();wppaOvlImgs[idx].src=wppaOvlUrls[idx];wppaConsoleLog('Preloading '+(idx+1)+'/'+wppaOvlUrls.length+' (current)');if(!wppaOvlImgs[idx].complete){wppaConsoleLog('Retrying');setTimeout('_wppaOvlShow('+idx+')',100);return;}}
36	var next;var prev;if(wppaOvlIdx==(wppaOvlUrls.length-1)){next=0;}
37	else{next=wppaOvlIdx+1;}
38	wppaOvlImgs[next]=new Image();wppaOvlImgs[next].src=wppaOvlUrls[next];wppaConsoleLog('Preloading > '+(next+1));if(!wppaOvlRunning){if(wppaOvlIdx==0){prev=wppaOvlUrls.length-1;}


4	// Dependancies: wppa.js and default wp jQuery library
5	//
6
7	+ var wppaLightboxVersion='6.2.15.003';var wppaNormsBtnOpac=1;var wppaIsVideo=false;var wppaHasAudio=false;var wppaOvlImgs=[];var wppaKbHandlerInstalled=false;var wppaSavedContainerWidth;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(10);});function wppaOvlKeyboardHandler(e){var keycode;var escapeKey;if(e==null){keycode=event.keyCode;escapeKey=27;}else{keycode=e.keyCode;escapeKey=27;}
8	+ var key=String.fromCharCode(keycode).toLowerCase();switch(keycode){case escapeKey:wppaStopVideo(mocc);if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
9	+ wppaOvlHide();break;case 37:wppaOvlShowPrev();break;case 39:wppaOvlShowNext();break;}
10	+ switch(key){case'p':wppaOvlShowPrev();break;case'n':wppaOvlShowNext();break;case's':wppaOvlStartStop();break;case'd':jQuery('#wppa-ovl-legenda-1').css('visibility','hidden');jQuery('#wppa-ovl-legenda-2').css('visibility','hidden');wppaShowLegenda='hidden';break;case'f':wppaOvlFull();break;case'q':case'x':wppaStopVideo(mocc);if(wppaOvlMode!='normal'){wppaOvlNorm(true);}
11	+ wppaOvlHide();break;}
12	return false;}
13	function wppaOvlFull(){wppaConsoleLog('wppaOvlFull');var oldMode=wppaOvlMode;wppaOvlStepMode();var elem=document.getElementById('wppa-overlay-ic');if(!elem)return;if(oldMode=='normal'){if(elem.requestFullscreen){elem.requestFullscreen();}else if(elem.mozRequestFullScreen){elem.mozRequestFullScreen();}else if(elem.webkitRequestFullscreen){elem.webkitRequestFullscreen();}
14	setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',1000);}
15	if(wppaOvlMode=='normal'){if(document.cancelFullScreen){document.cancelFullScreen();}else if(document.mozCancelFullScreen){document.mozCancelFullScreen();}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen();}}
16	jQuery('#wppa-ovl-legenda-1').html('');}
17	+ function wppaOvlNorm(exit){wppaConsoleLog('wppaOvlNorm');wppaOvlMode='normal';if(document.cancelFullScreen){document.cancelFullScreen();}else if(document.mozCancelFullScreen){document.mozCancelFullScreen();}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen();}
18	+ if(exit)return;setTimeout('wppaOvlShow( '+wppaOvlIdx+' )',1000);}
19	function wppaOvlShow(arg){wppaConsoleLog('wppaOvlShow arg='+arg);if(wppaOvlFirst){jQuery('#weaver-final').removeClass('wvr-hide-bang');jQuery('#wppa-overlay-bg').fadeTo(3,wppaOvlOpacity);if(!wppaKbHandlerInstalled){jQuery(document).on('keydown',wppaOvlKeyboardHandler);wppaKbHandlerInstalled=true;}
20	var occ=0;while(occ<wppaTopMoc){occ++;wppaStopShow(occ);}
21	jQuery('#wppa-overlay-bg').css({width:window.innerWidth,height:window.innerHeight,});}

34	wppaOvlIdx=0;}}
35	else{wppaOvlIdx=arg;}
36	setTimeout(function(){_wppaOvlShow(wppaOvlIdx)},100);}
37	+ function _wppaOvlShow(idx){wppaConsoleLog('_wppaOvlShow, idx='+idx);jQuery('#wppa-overlay-sp').css({visibility:'visible'});if(wppaOvlUrls[idx].length>0){wppaOvlImgs[idx]=new Image();wppaOvlImgs[idx].src=wppaOvlUrls[idx];wppaConsoleLog('Preloading '+(idx+1)+'/'+wppaOvlUrls.length+' (current)');if(!wppaOvlImgs[idx].complete){wppaConsoleLog('Retrying');setTimeout('_wppaOvlShow('+idx+')',100);return;}}
38	var next;var prev;if(wppaOvlIdx==(wppaOvlUrls.length-1)){next=0;}
39	else{next=wppaOvlIdx+1;}
40	wppaOvlImgs[next]=new Image();wppaOvlImgs[next].src=wppaOvlUrls[next];wppaConsoleLog('Preloading > '+(next+1));if(!wppaOvlRunning){if(wppaOvlIdx==0){prev=wppaOvlUrls.length-1;}

readme.txt CHANGED Viewed

	@@ -2,12 +2,12 @@
2	Contributors: opajaap
3	Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4	Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
5	- Version: 6.3.15
6	- Stable tag: 6.3.14
7	Author: J.N. Breetvelt
8	Author URI: http://www.opajaap.nl/
9	Requires at least: 3.9
10	- Tested up to: 4.3
11	License: GPLv2 or later
12	License URI: http://www.gnu.org/licenses/gpl-2.0.html
13
	@@ -189,6 +189,14 @@ Oh, just Google on 'picture resizer' and you will find a bunch of free programs
189
190	See for additional information: http://wppa.opajaap.nl/changelog/
191








192	= 6.3.15 =
193
194	= Bug Fixes =


2	Contributors: opajaap
3	Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4	Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
5	+ Version: 6.3.16
6	+ Stable tag: 6.3.15
7	Author: J.N. Breetvelt
8	Author URI: http://www.opajaap.nl/
9	Requires at least: 3.9
10	+ Tested up to: 4.5
11	License: GPLv2 or later
12	License URI: http://www.gnu.org/licenses/gpl-2.0.html
13

189
190	See for additional information: http://wppa.opajaap.nl/changelog/
191
192	+ = 6.3.16 =
193	+
194	+ = Bug Fixes =
195	+
196	+ * Fixed a possible devide by zero error in wppa-breadcrumb.php
197	+ * Minor fixes to lightbox. Added 'q' and 'x' to quit(exit) lightbox from all modes.
198	+ * In some sites relative urls for lightbox navigation symbols did not work. Fixed.
199	+
200	= 6.3.15 =
201
202	= Bug Fixes =

wppa-admin-functions.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* gp admin functions
6	- * Version 6.3.12
7	*
8	*/
9
	@@ -587,7 +587,7 @@ global $wpdb;
587	$any_error = true;
588	}
589	// Check directories
590	- $dn = array( ~~WPPA_ABSPATH.WPPA_UPLOAD~~, WPPA_UPLOAD_PATH, WPPA_UPLOAD_PATH.'/thumbs', WPPA_UPLOAD_PATH.'/temp', WPPA_UPLOAD_PATH.'/fonts', WPPA_DEPOT_PATH );
591	$idx = 0;
592	while ( $idx < 6 ) {
593	if ( ! file_exists( $dn[$idx] ) ) { // First try to repair


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

587	$any_error = true;
588	}
589	// Check directories
590	+ $dn = array( dirname(WPPA_DEPOT_PATH), WPPA_UPLOAD_PATH, WPPA_UPLOAD_PATH.'/thumbs', WPPA_UPLOAD_PATH.'/temp', WPPA_UPLOAD_PATH.'/fonts', WPPA_DEPOT_PATH );
591	$idx = 0;
592	while ( $idx < 6 ) {
593	if ( ! file_exists( $dn[$idx] ) ) { // First try to repair

wppa-breadcrumb.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Functions for breadcrumbs
6	- * Version 6.3.12
7	*
8	*/
9
	@@ -522,7 +522,7 @@ static $sep;
522	if ( $size == '' ) $size = '12';
523	$style = 'height:' . $size . 'px;';
524	$sep = ' ' .
525	- '<img' /
526	' src="' . wppa_opt( 'bc_url' ) . '"' .
527	' class="no-shadow"' .
528	' style="' . $style . '"' .


3	* Package: wp-photo-album-plus
4	*
5	* Functions for breadcrumbs
6	+ * Version 6.3.16
7	*
8	*/
9

522	if ( $size == '' ) $size = '12';
523	$style = 'height:' . $size . 'px;';
524	$sep = ' ' .
525	+ '<img' .
526	' src="' . wppa_opt( 'bc_url' ) . '"' .
527	' class="no-shadow"' .
528	' style="' . $style . '"' .

wppa-common-functions.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-common-functions.php
3	*
4	* Functions used in admin and in themes
5	- * Version 6.3.14
6	*
7	*/
8
	@@ -341,10 +341,29 @@ function wppa_get_imgdir( $file = '', $rel = false ) {
341	if ( is_ssl() ) $result = str_replace( 'http://', 'https://', $result );
342	$result .= $file;
343









344	// Can not use wppa_opt(). $wppa_opt is not initialized when called from wppa_set_defaults
345	- if ( ~~get_option(~~ '~~wppa_relative_urls~~' ) == ~~'yes'~~ \|\| ~~$rel~~ ) {
346	- ~~$result~~ = ~~str_replace~~( ~~site_url(~~), '', $~~result~~ );









347	}

348	return $result;
349	}
350


2	/* wppa-common-functions.php
3	*
4	* Functions used in admin and in themes
5	+ * Version 6.3.16
6	*
7	*/
8

341	if ( is_ssl() ) $result = str_replace( 'http://', 'https://', $result );
342	$result .= $file;
343
344	+ $result = wppa_make_relative( $result, $rel );
345	+ return $result;
346	+ }
347	+
348	+ function wppa_make_relative( $url, $rel = '' ) {
349	+
350	+ // Init
351	+ $result = $url;
352	+
353	// Can not use wppa_opt(). $wppa_opt is not initialized when called from wppa_set_defaults
354	+ if ( $rel != 'abs' ) { // Not if absulute is explicitly requested
355	+ if ( get_option( 'wppa_relative_urls' ) == 'yes' \|\| $rel == 'rel' ) {
356	+ if ( isset( $_ENV['HTTP_HOST'] ) ) {
357	+ if ( is_ssl() ) {
358	+ $result = str_replace( 'https://' . $_ENV['HTTP_HOST'], '', $result );
359	+ }
360	+ else {
361	+ $result = str_replace( 'http://' . $_ENV['HTTP_HOST'], '', $result );
362	+ }
363	+ }
364	+ }
365	}
366	+
367	return $result;
368	}
369

wppa-filter.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* get the albums via filter
6	- * Version 6.3.11
7	*
8	*/
9
	@@ -453,9 +453,7 @@ global $wppa_postid;
453	$wppa['is_single'] = false; // Is a one image slideshow
454
455	// Relative urls?
456	- if ( ~~wppa_switch~~( ~~'relative_urls'~~ ) ~~) {~~
457	- $result = str_replace( site_url(), '', $result );
458	- }
459
460	// In widget
461	if ( wppa_in_widget() ) {


3	* Package: wp-photo-album-plus
4	*
5	* get the albums via filter
6	+ * Version 6.3.16
7	*
8	*/
9

453	$wppa['is_single'] = false; // Is a one image slideshow
454
455	// Relative urls?
456	+ $result = wppa_make_relative( $result );


457
458	// In widget
459	if ( wppa_in_widget() ) {

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.3.14
7	*
8	*/
9
	@@ -387,7 +387,17 @@ global $wppa_session;
387	<img' .
388	' id="wppa-overlay-sp"' .
389	' alt="spinner"' .
390	- ' style="~~position:fixed; top:200px; left:200px; z-index:100100; opacity:1; visibility:hidden; box-shadow:none;"~~' .










391	' src="'.wppa_get_imgdir().'loading.gif"' .
392	' />';
393
	@@ -409,8 +419,8 @@ global $wppa_session;
409	'.( wppa_opt( 'fontcolor_lightbox' ) ? 'wppaOvlFontColor = "'.wppa_opt( 'fontcolor_lightbox' ).'"' : '').'
410	'.( wppa_opt( 'fontweight_lightbox' ) ? 'wppaOvlFontWeight = "'.wppa_opt( 'fontweight_lightbox' ).'"' : '').'
411	'.( wppa_opt( 'fontsize_lightbox' ) ? 'wppaOvlLineHeight = "'.(wppa_opt( 'fontsize_lightbox' ) + '2').'"' : '').'
412	- wppaOvlFullLegenda = "'.__('Keys: f = next mode; ~~escape~~ = exit; p = previous, n = next, s = start/stop, d = dismiss this notice.', 'wp-photo-album-plus').'";
413	- wppaOvlFullLegendaSingle = "'.__('Keys: f = next mode; ~~escape~~ = exit; d = dismiss this notice.', 'wp-photo-album-plus').'";
414	wppaOvlVideoStart = '.( wppa_switch( 'ovl_video_start' ) ? 'true' : 'false' ).';
415	wppaOvlAudioStart = '.( wppa_switch( 'ovl_audio_start' ) ? 'true' : 'false' ).';
416	wppaOvlShowLegenda = '.( wppa_switch( 'ovl_show_legenda' ) && ! wppa( 'is_mobile' ) ? 'true' : 'false' ).';
	@@ -528,9 +538,7 @@ function wppa_add_page_specific_urls() {
528	<!-- WPPA+ END Page specific urls -->';
529
530	// Relative urls?
531	- if ( ~~wppa_switch~~( ~~'relative_urls'~~ ) ~~) {~~
532	- $result = str_replace( site_url(), '', $result );
533	- }
534
535	echo $result;
536
	@@ -730,17 +738,17 @@ global $wppa_init_js_data;
730	wppaSlideAudioStart = '.( wppa_switch( 'start_slide_audio' ) ? 'true' : 'false' ).';
731	wppaAudioHeight = '.wppa_get_audio_control_height().';
732	wppaRel = "'.( wppa_opt( 'lightbox_name' ) == 'wppa' ? 'data-rel' : 'rel' ).'";
733	- wppaStartSymbolUrl = "' . wppa_opt('start_symbol_url') . '";
734	- wppaPauseSymbolUrl = "' . wppa_opt('pause_symbol_url') . '";
735	- wppaStopSymbolUrl = "' . wppa_opt('stop_symbol_url') . '";
736	wppaStartPauseSymbolSize = "' . wppa_opt('start_pause_symbol_size') . '";
737	wppaStartPauseSymbolBradius = "' . wppa_opt('start_pause_symbol_bradius') . '";
738	wppaStopSymbolSize = "' . wppa_opt('stop_symbol_size') . '";
739	wppaStopSumbolBradius = "' . wppa_opt('stop_symbol_bradius') . '";
740	wppaOvlRadius = '.wppa_opt( 'ovl_border_radius' ).';
741	wppaOvlBorderWidth = '.wppa_opt( 'ovl_border_width' ).';
742	- wppaOvlLeftSymbolUrl = "'.(wppa_opt('left_symbol_url') ? wppa_opt('left_symbol_url') : wppa_get_imgdir( 'prev-'.wppa_opt('ovl_theme').'.gif', ~~true~~ )).'";
743	- wppaOvlRightSymbolUrl = "'.(wppa_opt('right_symbol_url') ? wppa_opt('right_symbol_url') : wppa_get_imgdir( 'next-'.wppa_opt('ovl_theme').'.gif', ~~true~~ )).'";
744	wppaLeftRightSymbolSize = '.wppa_opt('left_right_symbol_size').';
745	wppaLeftRightSymbolBradius = '.wppa_opt('left_right_symbol_bradius').';
746	';


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

387	<img' .
388	' id="wppa-overlay-sp"' .
389	' alt="spinner"' .
390	+ ' style="' .
391	+ 'position:fixed;' .
392	+ 'top:50%;' .
393	+ 'margin-top:-16px;' .
394	+ 'left:50%;' .
395	+ 'margin-left:-16px;' .
396	+ 'z-index:100100;' .
397	+ 'opacity:1;' .
398	+ 'visibility:hidden;' .
399	+ 'box-shadow:none;' .
400	+ '"' .
401	' src="'.wppa_get_imgdir().'loading.gif"' .
402	' />';
403

419	'.( wppa_opt( 'fontcolor_lightbox' ) ? 'wppaOvlFontColor = "'.wppa_opt( 'fontcolor_lightbox' ).'"' : '').'
420	'.( wppa_opt( 'fontweight_lightbox' ) ? 'wppaOvlFontWeight = "'.wppa_opt( 'fontweight_lightbox' ).'"' : '').'
421	'.( wppa_opt( 'fontsize_lightbox' ) ? 'wppaOvlLineHeight = "'.(wppa_opt( 'fontsize_lightbox' ) + '2').'"' : '').'
422	+ wppaOvlFullLegenda = "'.__('Keys: f = next mode; q,x = exit; p = previous, n = next, s = start/stop, d = dismiss this notice.', 'wp-photo-album-plus').'";
423	+ wppaOvlFullLegendaSingle = "'.__('Keys: f = next mode; q,x = exit; d = dismiss this notice.', 'wp-photo-album-plus').'";
424	wppaOvlVideoStart = '.( wppa_switch( 'ovl_video_start' ) ? 'true' : 'false' ).';
425	wppaOvlAudioStart = '.( wppa_switch( 'ovl_audio_start' ) ? 'true' : 'false' ).';
426	wppaOvlShowLegenda = '.( wppa_switch( 'ovl_show_legenda' ) && ! wppa( 'is_mobile' ) ? 'true' : 'false' ).';

538	<!-- WPPA+ END Page specific urls -->';
539
540	// Relative urls?
541	+ $result = wppa_make_relative( $result );


542
543	echo $result;
544

738	wppaSlideAudioStart = '.( wppa_switch( 'start_slide_audio' ) ? 'true' : 'false' ).';
739	wppaAudioHeight = '.wppa_get_audio_control_height().';
740	wppaRel = "'.( wppa_opt( 'lightbox_name' ) == 'wppa' ? 'data-rel' : 'rel' ).'";
741	+ wppaStartSymbolUrl = "' . wppa_make_relative( wppa_opt('start_symbol_url') ) . '";
742	+ wppaPauseSymbolUrl = "' . wppa_make_relative( wppa_opt('pause_symbol_url') ) . '";
743	+ wppaStopSymbolUrl = "' . wppa_make_relative( wppa_opt('stop_symbol_url') ) . '";
744	wppaStartPauseSymbolSize = "' . wppa_opt('start_pause_symbol_size') . '";
745	wppaStartPauseSymbolBradius = "' . wppa_opt('start_pause_symbol_bradius') . '";
746	wppaStopSymbolSize = "' . wppa_opt('stop_symbol_size') . '";
747	wppaStopSumbolBradius = "' . wppa_opt('stop_symbol_bradius') . '";
748	wppaOvlRadius = '.wppa_opt( 'ovl_border_radius' ).';
749	wppaOvlBorderWidth = '.wppa_opt( 'ovl_border_width' ).';
750	+ wppaOvlLeftSymbolUrl = "'.(wppa_opt('left_symbol_url') ? wppa_opt('left_symbol_url') : wppa_get_imgdir( 'prev-'.wppa_opt('ovl_theme').'.gif' )).'";
751	+ wppaOvlRightSymbolUrl = "'.(wppa_opt('right_symbol_url') ? wppa_opt('right_symbol_url') : wppa_get_imgdir( 'next-'.wppa_opt('ovl_theme').'.gif' )).'";
752	wppaLeftRightSymbolSize = '.wppa_opt('left_right_symbol_size').';
753	wppaLeftRightSymbolBradius = '.wppa_opt('left_right_symbol_bradius').';
754	';

wppa-settings-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	- * Version 6.3.14
7	*
8	*/
9
	@@ -8655,6 +8655,11 @@ global $wppa_tags;
8655	<td><small><?php _e('Plugins main file name.', 'wp-photo-album-plus') ?></small></td>
8656	<td><?php echo(WPPA_FILE) ?></td>
8657	</tr>





8658	<tr style="color:#333;">
8659	<td>WPPA_PATH</td>
8660	<td><small><?php _e('Path to plugins directory.', 'wp-photo-album-plus') ?></small></td>
	@@ -8712,9 +8717,14 @@ global $wppa_tags;
8712	echo $wp_uploaddir['basedir']; ?></td>
8713	</tr>
8714	<tr style="color:#333;">
8715	- <td>~~WPPA_ABSPATH~~</td>
8716	- <td><small><?php _e('~~ABSPATH~~ ~~windows~~ ~~proof~~', 'wp-photo-album-plus') ?></small></td>
8717	- <td><?php echo ~~WPPA_ABSPATH~~ ?></td>





8718	</tr>
8719	</tbody>
8720	</table>


3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	+ * Version 6.3.16
7	*
8	*/
9

8655	<td><small><?php _e('Plugins main file name.', 'wp-photo-album-plus') ?></small></td>
8656	<td><?php echo(WPPA_FILE) ?></td>
8657	</tr>
8658	+ <tr style="color:#333;">
8659	+ <td>WPPA_ABSPATH</td>
8660	+ <td><small><?php _e('ABSPATH windows proof', 'wp-photo-album-plus') ?></small></td>
8661	+ <td><?php echo WPPA_ABSPATH ?></td>
8662	+ </tr>
8663	<tr style="color:#333;">
8664	<td>WPPA_PATH</td>
8665	<td><small><?php _e('Path to plugins directory.', 'wp-photo-album-plus') ?></small></td>

8717	echo $wp_uploaddir['basedir']; ?></td>
8718	</tr>
8719	<tr style="color:#333;">
8720	+ <td>content_url()</td>
8721	+ <td><small><?php _e('WP Content url.', 'wp-photo-album-plus') ?></small></td>
8722	+ <td><?php echo(content_url()) ?></td>
8723	+ </tr>
8724	+ <tr style="color:#333;">
8725	+ <td>$_SERVER['HTTP_HOST']</td>
8726	+ <td><small><?php ?></small></td>
8727	+ <td><?php echo $_SERVER['HTTP_HOST'] ?></td>
8728	</tr>
8729	</tbody>
8730	</table>

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.3.14
7	*
8	*/
9
	@@ -376,6 +376,12 @@ global $silent;
376	wppa_copy_setting( 'wppa_max_album_newtime', 'wppa_max_album_modtime' );
377	wppa_copy_setting( 'wppa_max_photo_newtime', 'wppa_max_photo_modtime' );
378	}






379
380	}
381
	@@ -823,9 +829,9 @@ Hide Camera info
823	'wppa_custom_visible_9' => 'no',
824
825	// Lightbox/slideshow symbols and borders
826	- 'wppa_start_symbol_url' => wppa_get_imgdir( 'start.png', ~~true~~ ),
827	- 'wppa_pause_symbol_url' => wppa_get_imgdir( 'pause.png', ~~true~~ ),
828	- 'wppa_stop_symbol_url' => wppa_get_imgdir( 'stop.png', ~~true~~ ),
829	'wppa_left_symbol_url' => '',
830	'wppa_right_symbol_url' => '',
831	'wppa_start_pause_symbol_size' => '48',


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

376	wppa_copy_setting( 'wppa_max_album_newtime', 'wppa_max_album_modtime' );
377	wppa_copy_setting( 'wppa_max_photo_newtime', 'wppa_max_photo_modtime' );
378	}
379	+
380	+ if ( $old_rev <= '6316' ) {
381	+ wppa_remove_setting( 'wppa_start_symbol_url' );
382	+ wppa_remove_setting( 'wppa_pause_symbol_url' );
383	+ wppa_remove_setting( 'wppa_stop_symbol_url' );
384	+ }
385
386	}
387

829	'wppa_custom_visible_9' => 'no',
830
831	// Lightbox/slideshow symbols and borders
832	+ 'wppa_start_symbol_url' => wppa_get_imgdir( 'start.png', 'abs' ),
833	+ 'wppa_pause_symbol_url' => wppa_get_imgdir( 'pause.png', 'abs' ),
834	+ 'wppa_stop_symbol_url' => wppa_get_imgdir( 'stop.png', 'abs' ),
835	'wppa_left_symbol_url' => '',
836	'wppa_right_symbol_url' => '',
837	'wppa_start_pause_symbol_size' => '48',

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.3.14
7	*
8	*/
9
	@@ -749,12 +749,9 @@ global $wppa_opt;
749	'wppa_ovl_border_radius',
750	'wppa_ovl_anim',
751	'wppa_ovl_slide',

752
753
754	-
755	-
756	-
757	-
758	);
759	if ( in_array( $option, $init_js_critical ) ) {
760	$files = glob( WPPA_PATH.'/wppa-init.*.js' );


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

749	'wppa_ovl_border_radius',
750	'wppa_ovl_anim',
751	'wppa_ovl_slide',
752	+ 'wppa_relative_urls',
753
754




755	);
756	if ( in_array( $option, $init_js_critical ) ) {
757	$files = glob( WPPA_PATH.'/wppa-init.*.js' );

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.3.15
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/
	@@ -29,12 +29,12 @@ global $wpdb;
29	/* when new options are added and when the wppa_setup() routine
30	/* must be called right after update for any other reason.
31	*/
32	- global $wppa_revno; $wppa_revno = '~~6315~~';
33
34	/* This is the api interface version number
35	/* It is incremented at any code change.
36	*/
37	- global $wppa_api_version; $wppa_api_version = '6-3-15-000';
38
39	/* start timers */
40	global $wppa_starttime; $wppa_starttime = microtime(true);
	@@ -202,12 +202,26 @@ global $blog_id;
202	}
203	else { // Single site or multisite global
204	define( 'WPPA_UPLOAD', $rel_uploads_path );
205	- ~~define~~( 'WPPA_UPLOAD_PATH', ~~WPPA_ABSPATH~~ . ~~WPPA_UPLOAD~~ ~~. '/wppa' );~~
206	- define( '~~WPPA_UPLOAD_URL~~', ~~site_url()~~ . ~~'/' .~~ WPPA_UPLOAD . '/wppa' );




207	$user = is_user_logged_in() ? '/' . wppa_get_user() : '';
208	define( 'WPPA_DEPOT', wppa_trims( $rel_depot_path . '/wppa-depot' . $user ) );
209	- ~~define~~( '~~WPPA_DEPOT_PATH~~', ~~WPPA_ABSPATH~~ . ~~WPPA_DEPOT );~~
210	- define( '~~WPPA_DEPOT_URL~~', ~~site_url()~~ . ~~'/' .~~ WPPA_DEPOT );










211	}
212
213	wppa_mktree( WPPA_UPLOAD_PATH ); // Whatever (faulty) path has been calculated, it will be


2	/*
3	* Plugin Name: WP Photo Album Plus
4	* Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5	+ * Version: 6.3.16
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/

29	/* when new options are added and when the wppa_setup() routine
30	/* must be called right after update for any other reason.
31	*/
32	+ global $wppa_revno; $wppa_revno = '6316';
33
34	/* This is the api interface version number
35	/* It is incremented at any code change.
36	*/
37	+ global $wppa_api_version; $wppa_api_version = '6-3-16-000';
38
39	/* start timers */
40	global $wppa_starttime; $wppa_starttime = microtime(true);

202	}
203	else { // Single site or multisite global
204	define( 'WPPA_UPLOAD', $rel_uploads_path );
205	+ if ( ! defined( 'WPPA_UPLOAD_PATH' ) ) {
206	+ define( 'WPPA_UPLOAD_PATH', WPPA_ABSPATH . WPPA_UPLOAD . '/wppa' );
207	+ }
208	+ if ( ! defined( 'WPPA_UPLOAD_URL' ) ) {
209	+ define( 'WPPA_UPLOAD_URL', site_url() . '/' . WPPA_UPLOAD . '/wppa' );
210	+ }
211	$user = is_user_logged_in() ? '/' . wppa_get_user() : '';
212	define( 'WPPA_DEPOT', wppa_trims( $rel_depot_path . '/wppa-depot' . $user ) );
213	+ if ( ! defined( '_WPPA_DEPOT_PATH' ) ) {
214	+ define( 'WPPA_DEPOT_PATH', WPPA_ABSPATH . WPPA_DEPOT );
215	+ }
216	+ else {
217	+ define( 'WPPA_DEPOT_PATH', _WPPA_DEPOT_PATH . WPPA_DEPOT );
218	+ }
219	+ if ( ! defined( '_WPPA_DEPOT_URL' ) ) {
220	+ define( 'WPPA_DEPOT_URL', site_url() . '/' . WPPA_DEPOT );
221	+ }
222	+ else {
223	+ define( 'WPPA_DEPOT_URL', _WPPA_DEPOT_URL . WPPA_DEPOT );
224	+ }
225	}
226
227	wppa_mktree( WPPA_UPLOAD_PATH ); // Whatever (faulty) path has been calculated, it will be