WP Photo Album Plus - Version 8.0.00.018

Version Description

= 7.7.07 =

This version addresses various minor bug fixes and feature requests.

Release Info

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

Code changes from version 8.0.00.017 to 8.0.00.018

Files changed (11) hide show

changelog.txt +1 -0
theme/wppa-style.css +9 -8
wppa-boxes-html.php +7 -7
wppa-defaults.php +2 -2
wppa-links.php +7 -7
wppa-photo-admin-autosave.php +10 -1
wppa-picture.php +51 -112
wppa-settings-autosave.php +32 -32
wppa-slideshow.php +5 -5
wppa-styles.php +4 -0
wppa.php +2 -2

changelog.txt CHANGED Viewed

	@@ -17,6 +17,7 @@ Ajax is always activated, because there can no longer be conflicts due to inacce
17	* The shortcode to display the most recently uploaded photo did not work when additionally the album was specified e.g.
18	[wppa type="photo" photo="#last,12"] or [wppa type="photo" album="12" photo="#last"]. Fixed. Works also for type="mphoto" and type="xphoto".
19	* Fixed a slideshow filmstrip layout issue for theme twentytwentyone.

20
21	= 7.7.07 =
22


17	* The shortcode to display the most recently uploaded photo did not work when additionally the album was specified e.g.
18	[wppa type="photo" photo="#last,12"] or [wppa type="photo" album="12" photo="#last"]. Fixed. Works also for type="mphoto" and type="xphoto".
19	* Fixed a slideshow filmstrip layout issue for theme twentytwentyone.
20	+ * The max simultaneous ajax requests during resequencing photos is now limited to 10. This prevents db errors due to too many open db instances.
21
22	= 7.7.07 =
23

theme/wppa-style.css CHANGED Viewed

	@@ -1,14 +1,9 @@
1	/* This is the standard wppa_style.css file.
2	- /* If you want to modify this file, make a copy of this file and place it in your theme's directory
3	- /* The copy in your theme's directory has precedense over the original version in wp-photo-album-pls/theme
4	- /* This assures that your version is not overwritten after an upgrade of the plugin.
5	/*
6	- /* ~~NOTE:~~ ~~Most~~ of ~~the~~ ~~settings~~ ~~you~~ ~~would~~ ~~like~~ to ~~change~~ ~~are~~ ~~configurable~~ in ~~the~~ ~~wppa~~ ~~admin~~ ~~settings screen.~~
7	- /* It is ~~strongly~~ ~~reccomended~~ that ~~you~~ ~~try~~ to ~~achieve~~ the ~~appearance~~ ~~you~~ ~~like~~ by ~~those~~ ~~settings~~ as ~~they~~ ~~will~~ be ~~independant~~ ~~of future updates.~~
8	/*
9	- /* ~~You~~ ~~may~~ ~~always look into a newer~~ version ~~of this file to see what new classes and id's come with an upgrade~~
10	- /*
11	- /* This is version 8.0.00.016
12	*/
13
14	.wppa-container, .wppa-cover-box, .wppa-thumb-area {
	@@ -102,6 +97,12 @@
102	text-decoration:none;
103	}
104






105	/* Wrapper for coverphoto background */
106	.coverphoto-frame, .thumbphoto-frame {
107	text-decoration: none;


1	/* This is the standard wppa_style.css file.



2	/*
3	+ /* It is strongly recommended not to modify this file because it will be overwritten by an update
4	+ /* Any modifications to styles that are not configurable on the settings page should be made in the standard wp customizer css tab
5	/*
6	+ /* This is version 8.0.00.018


7	*/
8
9	.wppa-container, .wppa-cover-box, .wppa-thumb-area {

97	text-decoration:none;
98	}
99
100	+ /* active pagelink item */
101	+ .wppa-active-pagelink {
102	+ font-weight: bold;
103	+ background-color: lightgray;
104	+ }
105	+
106	/* Wrapper for coverphoto background */
107	.coverphoto-frame, .thumbphoto-frame {
108	text-decoration: none;

wppa-boxes-html.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Various wppa boxes
6	- * Version 8.0.00.~~017~~
7	*
8	*/
9
	@@ -434,7 +434,7 @@ function wppa_search_box() {
434	$result .= '<div' .
435	' id="wppa-search-'.wppa( 'mocc' ) . '"' .
436	' class="wppa-box wppa-search"' .
437	- ' style="' . wppa_wcs( 'wppa-box' ) . ~~wppa_wcs(~~ '~~wppa-search' ) . '~~"' .
438	' >';
439
440	// The search html
	@@ -772,7 +772,7 @@ function wppa_supersearch_box() {
772	wppa_out( '<div' .
773	' id="wppa-search-' . wppa( 'mocc' ) . '"' .
774	' class="wppa-box wppa-search"' .
775	- ' style="' . wppa_wcs( 'wppa-box' ) . ~~wppa_wcs(~~ '~~wppa-search' ) . '~~"' .
776	' >' .
777	wppa_get_supersearch_html() .
778	'<div class="wppa-clear" style="'.wppa_wis( 'clear:both;' ).'" >' .
	@@ -1400,7 +1400,7 @@ function wppa_superview_box( $album_root = '0', $sort = true ) {
1400	'<div' .
1401	' id="wppa-superview-' . wppa( 'mocc' ) . '"' .
1402	' class="wppa-box wppa-superview"' .
1403	- ' style="' . wppa_wcs( 'wppa-box' ) . ~~wppa_wcs(~~ '~~wppa-superview' ) . '~~"' .
1404	' >' .
1405	wppa_get_superview_html( $album_root, $sort ) .
1406	'<div class="wppa-clear" style="'.wppa_wis( 'clear:both;' ).'" >' .
	@@ -1575,7 +1575,7 @@ function wppa_tagcloud_box( $seltags = '', $minsize = '8', $maxsize = '24' ) {
1575	'<div' .
1576	' id="wppa-tagcloud-' . wppa( 'mocc' ) . '"' .
1577	' class="wppa-box wppa-tagcloud"' .
1578	- ' style="'.wppa_wcs( 'wppa-box' ).~~wppa_wcs(~~ '~~wppa-tagcloud' ).'~~"' .
1579	' >' .
1580	wppa_get_tagcloud_html( $seltags, $minsize, $maxsize ) .
1581	'<div class="wppa-clear" style="'.wppa_wis( 'clear:both;' ).'" >' .
	@@ -1668,7 +1668,7 @@ function wppa_multitag_box( $nperline = '2', $seltags = '' ) {
1668	'<div' .
1669	' id="wppa-multitag-' . wppa( 'mocc' ) . '"' .
1670	' class="wppa-box wppa-multitag"' .
1671	- ' style="' . wppa_wcs( 'wppa-box' ) . ~~wppa_wcs(~~ '~~wppa-multitag' ) . '~~"' .
1672	' >' .
1673	wppa_get_multitag_html( $nperline, $seltags ) .
1674	'<div class="wppa-clear" style="' . wppa_wis( 'clear:both;' ) . '" >' .
	@@ -6455,7 +6455,7 @@ function wppa_stereo_box() {
6455	$result .= '<div' .
6456	' id="wppa-stereo-' . wppa( 'mocc' ) . '"' .
6457	' class="wppa-box wppa-stereo"' .
6458	- ' style="' . wppa_wcs( 'wppa-box' ) . ~~wppa_wcs(~~ '~~wppa-stereo' ) . '~~"' .
6459	' >';
6460
6461	// The search html


3	* Package: wp-photo-album-plus
4	*
5	* Various wppa boxes
6	+ * Version 8.0.00.018
7	*
8	*/
9

434	$result .= '<div' .
435	' id="wppa-search-'.wppa( 'mocc' ) . '"' .
436	' class="wppa-box wppa-search"' .
437	+ ' style="' . wppa_wcs( 'wppa-box' ) . '"' .
438	' >';
439
440	// The search html

772	wppa_out( '<div' .
773	' id="wppa-search-' . wppa( 'mocc' ) . '"' .
774	' class="wppa-box wppa-search"' .
775	+ ' style="' . wppa_wcs( 'wppa-box' ) . '"' .
776	' >' .
777	wppa_get_supersearch_html() .
778	'<div class="wppa-clear" style="'.wppa_wis( 'clear:both;' ).'" >' .

1400	'<div' .
1401	' id="wppa-superview-' . wppa( 'mocc' ) . '"' .
1402	' class="wppa-box wppa-superview"' .
1403	+ ' style="' . wppa_wcs( 'wppa-box' ) . '"' .
1404	' >' .
1405	wppa_get_superview_html( $album_root, $sort ) .
1406	'<div class="wppa-clear" style="'.wppa_wis( 'clear:both;' ).'" >' .

1575	'<div' .
1576	' id="wppa-tagcloud-' . wppa( 'mocc' ) . '"' .
1577	' class="wppa-box wppa-tagcloud"' .
1578	+ ' style="'.wppa_wcs( 'wppa-box' ).'"' .
1579	' >' .
1580	wppa_get_tagcloud_html( $seltags, $minsize, $maxsize ) .
1581	'<div class="wppa-clear" style="'.wppa_wis( 'clear:both;' ).'" >' .

1668	'<div' .
1669	' id="wppa-multitag-' . wppa( 'mocc' ) . '"' .
1670	' class="wppa-box wppa-multitag"' .
1671	+ ' style="' . wppa_wcs( 'wppa-box' ) . '"' .
1672	' >' .
1673	wppa_get_multitag_html( $nperline, $seltags ) .
1674	'<div class="wppa-clear" style="' . wppa_wis( 'clear:both;' ) . '" >' .

6455	$result .= '<div' .
6456	' id="wppa-stereo-' . wppa( 'mocc' ) . '"' .
6457	' class="wppa-box wppa-stereo"' .
6458	+ ' style="' . wppa_wcs( 'wppa-box' ) . '"' .
6459	' >';
6460
6461	// The search html

wppa-defaults.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains default settings
6	- * Version 8.0.00.~~014~~
7	*
8	*/
9
	@@ -71,7 +71,7 @@ horizrailenabled:false,";
71
72	$wppa_defaults = array ( 'wppa_revision' => '100',
73	'wppa_prevrev' => '100',
74	- 'wppa_max_users' => '~~1000~~',
75
76
77	// Table I: Sizes


3	* Package: wp-photo-album-plus
4	*
5	* Contains default settings
6	+ * Version 8.0.00.018
7	*
8	*/
9

71
72	$wppa_defaults = array ( 'wppa_revision' => '100',
73	'wppa_prevrev' => '100',
74	+ 'wppa_max_users' => '2500',
75
76
77	// Table I: Sizes

wppa-links.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Frontend links
6	- * Version 8.0.00.~~017~~
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
	@@ -1282,8 +1282,8 @@ global $previous_page_last_id;
1282	if ( $curpage == $i ) {
1283	$result .=
1284	'<div' .
1285	- ' class="wppa-mini-box wppa-alt wppa-black"' .
1286	- ' style="display:inline;text-align:center;' . wppa_wcs( 'wppa-mini-box' ) . wppa_wcs( 'wppa-~~alt' ) . wppa_wcs( 'wppa-~~black' ) .' text-decoration:none;cursor:default;~~font-weight:normal;~~"' .
1287	' >' .
1288	' ' . $i . ' ' .
1289	'</div>';
	@@ -1292,7 +1292,7 @@ global $previous_page_last_id;
1292	$result .=
1293	'<div' .
1294	' class="wppa-mini-box wppa-even"' .
1295	- ' style="display:inline;text-align:center;' . wppa_wcs( 'wppa-mini-box' ) . ~~wppa_wcs(~~ '~~wppa-even' ) .'~~"' .
1296	' >' .
1297
1298	'<a' .
	@@ -1392,8 +1392,8 @@ global $previous_page_last_id;
1392	if ( $curpage == $i ) {
1393	$result .= '
1394	<div
1395	- class="wppa-mini-box wppa-alt wppa-black"
1396	- style="display:inline; text-align:center; ' . wppa_wcs( 'wppa-mini-box' ) . wppa_wcs( 'wppa-~~alt' ) . wppa_wcs( 'wppa-~~black' ) . ' text-decoration: none; cursor: default; ~~font-weight:normal;~~ "
1397	> ' . $i . ' </div
1398	>';
1399	}
	@@ -1401,7 +1401,7 @@ global $previous_page_last_id;
1401	$result .= '
1402	<div
1403	class="wppa-mini-box wppa-even"
1404	- style="display:inline; text-align:center; ' . wppa_wcs( 'wppa-mini-box' ) . ~~wppa_wcs(~~ '~~wppa-even' ) . '~~"
1405	>
1406	<a
1407	id="wppa-pagelink-' . $mocc . '-' . $i . '"


3	* Package: wp-photo-album-plus
4	*
5	* Frontend links
6	+ * Version 8.0.00.018
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );

1282	if ( $curpage == $i ) {
1283	$result .=
1284	'<div' .
1285	+ ' class="wppa-mini-box wppa-alt wppa-black wppa-active-pagelink"' .
1286	+ ' style="display:inline;text-align:center;' . wppa_wcs( 'wppa-mini-box' ) . wppa_wcs( 'wppa-black' ) .' text-decoration:none;cursor:default;"' .
1287	' >' .
1288	' ' . $i . ' ' .
1289	'</div>';

1292	$result .=
1293	'<div' .
1294	' class="wppa-mini-box wppa-even"' .
1295	+ ' style="display:inline;text-align:center;' . wppa_wcs( 'wppa-mini-box' ) . '"' .
1296	' >' .
1297
1298	'<a' .

1392	if ( $curpage == $i ) {
1393	$result .= '
1394	<div
1395	+ class="wppa-mini-box wppa-alt wppa-black wppa-active-pagelink"
1396	+ style="display:inline; text-align:center; ' . wppa_wcs( 'wppa-mini-box' ) . wppa_wcs( 'wppa-black' ) . ' text-decoration: none; cursor: default;"
1397	> ' . $i . ' </div
1398	>';
1399	}

1401	$result .= '
1402	<div
1403	class="wppa-mini-box wppa-even"
1404	+ style="display:inline; text-align:center; ' . wppa_wcs( 'wppa-mini-box' ) . '"
1405	>
1406	<a
1407	id="wppa-pagelink-' . $mocc . '-' . $i . '"

wppa-photo-admin-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* edit and delete photos
6	- * Version 8.0.00.~~014~~
7	*
8	*/
9
	@@ -3272,7 +3272,12 @@ global $wpdb;
3272	}
3273	} );
3274	} );

3275	function wppaDoSeqUpdate( photo, seqno ) {




3276	var data = 'action=wppa&wppa-action=update-photo&photo-id='+photo+'&item=p_order&wppa-nonce='+document.getElementById( 'photo-nonce-'+photo ).value+'&value='+seqno;
3277	var xmlhttp = new XMLHttpRequest();
3278
	@@ -3293,11 +3298,15 @@ global $wpdb;
3293	jQuery( '#wppa-seqno-'+photo ).html( '<span style="color"red" >Err:'+ArrValues[1]+'</span>' );
3294	break;
3295	}


3296	}
3297	}
3298	xmlhttp.open( 'POST',wppaAjaxUrl,true );
3299	xmlhttp.setRequestHeader( "Content-type","application/x-www-form-urlencoded" );
3300	xmlhttp.send( data );


3301	jQuery( "#wppa-sort-seqn-"+photo ).val( seqno ); // set hidden value to new value to prevent duplicate action
3302	var spinnerhtml = '<img src="'+wppaImageDirectory+'spinner.gif" />';
3303	jQuery( '#wppa-seqno-'+photo ).html( spinnerhtml );


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

3272	}
3273	} );
3274	} );
3275	+ var wppaAjaxRequests = 0;
3276	function wppaDoSeqUpdate( photo, seqno ) {
3277	+ if ( wppaAjaxRequests >=10 ) {
3278	+ setTimeout(function(){wppaDoSeqUpdate( photo, seqno );},500);
3279	+ return;
3280	+ }
3281	var data = 'action=wppa&wppa-action=update-photo&photo-id='+photo+'&item=p_order&wppa-nonce='+document.getElementById( 'photo-nonce-'+photo ).value+'&value='+seqno;
3282	var xmlhttp = new XMLHttpRequest();
3283

3298	jQuery( '#wppa-seqno-'+photo ).html( '<span style="color"red" >Err:'+ArrValues[1]+'</span>' );
3299	break;
3300	}
3301	+ wppaAjaxRequests--;
3302	+ wppaConsoleLog('Pending ajax requests = '+wppaAjaxRequests, 'force');
3303	}
3304	}
3305	xmlhttp.open( 'POST',wppaAjaxUrl,true );
3306	xmlhttp.setRequestHeader( "Content-type","application/x-www-form-urlencoded" );
3307	xmlhttp.send( data );
3308	+ wppaAjaxRequests++;
3309	+ wppaConsoleLog('Pending ajax requests = '+wppaAjaxRequests, 'force');
3310	jQuery( "#wppa-sort-seqn-"+photo ).val( seqno ); // set hidden value to new value to prevent duplicate action
3311	var spinnerhtml = '<img src="'+wppaImageDirectory+'spinner.gif" />';
3312	jQuery( '#wppa-seqno-'+photo ).html( spinnerhtml );

wppa-picture.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Make the picture html
6	- * Version 8.0.00.~~017~~
7	*
8	*/
9
	@@ -100,7 +100,6 @@ function wppa_get_picture_html( $args ) {
100	else {
101	$file = wppa_get_photo_path( $id );
102	}
103	- // $file = $isthumb ? wppa_get_thumb_path( $id ) : wppa_get_photo_path( $id );
104
105	if ( $args['width'] && $args['height'] ) {
106	$href = $isthumb ? wppa_get_thumb_url( $id, true, '', $args['width'], $args['height'] ) :
	@@ -458,8 +457,6 @@ function wppa_get_spheric_pan_html( $args ) {
458	}
459	if ( ! $ratio ) $ratio = 2;
460
461	-
462	-
463	$mocc = $args['mocc'] ? $args['mocc'] : wppa( 'mocc' );
464	$width = $args['width'] ? $args['width'] : wppa_get_container_width();
465	$height = $width / 2; // $args['height'] ? $args['height'] : round( $width / $ratio );
	@@ -616,7 +613,6 @@ function wppa_get_spheric_pan_html( $args ) {
616	}
617	}
618
619	-
620	$result .=
621	'</div>';
622	}
	@@ -640,44 +636,35 @@ function wppa_get_spheric_pan_html( $args ) {
640
641	$result .=
642
643	- '<script>~~' .~~
644	-
645	- // ~~Create~~ ~~image~~ ~~object~~ ~~and add the image url to it to preload it~~
646	- // '~~var~~ ~~image~~ = ~~new~~ ~~Image();~~' .
647	- ~~// 'image.src = "' . $url . '";' .~~
648	-
649	- '~~var~~ ~~data'~~ . $~~mocc~~ . ' =
650	- ~~{ mocc~~ :' . $~~mocc~~ . ',
651	- id :' . $id . ',
652	- ~~uId~~ :0,
653	- ~~isLightbox~~ :' . ( $~~lightbox~~ ~~? 'true' : 'false' )~~ . ',
654	- ~~height~~ :' . $~~height~~ . ',
655	- ~~width~~ :~~' . $width . '~~,
656	- ~~url~~ :"' . ~~$url~~ . '",
657	- '. ~~/* image :image, */~~ '
658	- ~~abort~~ :~~false~~,
659	- ~~autorun~~ :' . $~~run~~ . ',
660	- dX :~~' . $dX . '~~,
661	- dY :0,
662	- ~~fov~~ :' . wppa_opt( '~~panorama_fov~~' ) . ',
663	- ~~zoomsensitivity~~ :' . ~~$zoomsensitivity~~ . ',
664	- ~~borderWidth~~ :' . wppa_opt( 'ovl_border_width' ) . ',
665	- ~~controls~~ :' . ( $~~controls~~ ~~? 'true' : 'false' )~~ . ',
666	- ~~initialized~~ :~~false~~,
667	- ~~icsize :' . ( $lightbox ? wppa_opt( 'nav_icon_size_lightbox' ) : wppa_opt( 'nav_icon_size_panorama' ) ) . ',~~
668	- ~~backgroundColor~~ :"' . ~~wppa_opt(~~ '~~ovl_theme~~' ) . '",
669	- borderRadius :' . wppa_opt( 'ovl_border_radius' ) . ',
670	- padding :' . wppa_opt( 'ovl_border_width' ) . ',
671	- enableManual :' . $manual . ',
672	- vtime :0,
673	- };' .
674	-
675	- // 'wppaSphericData[' . $mocc . '] = data;' .
676	-
677	- // When document complete, run the main proc
678	- 'jQuery(document).ready(function(){wppaDoSphericPan(' . $mocc . ', data' . $mocc . ')});' .
679
680	'</script>' .

681	( $haslink ? '<a>' : '' ) . '';
682
683	$result = wppa_pan_min( $result );
	@@ -730,7 +717,7 @@ function wppa_get_flat_pan_html( $args ) {
730	$deltaX = '0';
731	}
732
733	- $url = esc_url( wppa_is_mobile() ? wppa_get_photo_url( $id ) : wppa_get_hires_url( $id ) );
734
735	$result = '';
736
	@@ -1041,18 +1028,6 @@ function wppa_get_flat_pan_html( $args ) {
1041	zoomout.on("mouseup", onButtonUp);'
1042	.
1043
1044	- // Common event handlers
1045	- /*
1046	- ( $lightbox ? '
1047	-
1048	- if (prev) {
1049	- prev.on("' . ( wppa_is_mobile() ? 'touchstart' : 'click' ) . '", panPrev);
1050	- next.on("' . ( wppa_is_mobile() ? 'touchstart' : 'click' ) . '", panNext);
1051	- }' :
1052	- ''
1053	- ) .
1054	- */
1055	-
1056	// Install Resize handler
1057	'$(window).off("DOMContentLoaded load resize orientationchange",onResize' . $mocc . ');' .
1058	'$(window).on("DOMContentLoaded load resize orientationchange",onResize' . $mocc . ');' .
	@@ -1129,58 +1104,30 @@ function wppa_get_flat_pan_html( $args ) {
1129	}' .
1130
1131	// Draw the image
1132	- 'var ctx = canvas.getContext("2d");~~' .~~
1133	- 'ctx.drawImage(image' . $mocc . ',fromX,fromY,fromWidth,fromHeight,0,0,canvas.width,canvas.height);' .
1134
1135	// Draw the preview image
1136	- 'var prevctx = prevCanvas.getContext("2d");~~' .~~
1137	- 'prevctx.clearRect(0, 0, prevCanvas.width, prevCanvas.height);~~' .~~
1138	- 'prevctx.drawImage(image' . $mocc . ',0,0,image' . $mocc . '.width,image' . $mocc . '.height,0,0,prevCanvas.width,prevCanvas.height);' .
1139
1140	// Draw viewport rect on preview image
1141	- 'var factor = prevCanvas.width / image' . $mocc . '.width;~~' .~~
1142	- 'prevctx.strokeRect(factorfromX,factorfromY,factorfromWidth,factorfromHeight);' .
1143
1144	// Re-render if needed
1145	- 'if (run>0) {~~' .~~
1146	- 'if (autorun){timer=setTimeout(function(){render()},25);}~~' .~~
1147	- 'else {timer=setTimeout(function(){render()},25);}~~' .~~
1148	- '}
1149	if(run<5)run--;' .
1150
1151	- ~~'setTimeout(function(){jQuery("#wppa-pctl-div-"+'~~ . ~~$mocc~~ ~~. ').css({visibility:"~~visible~~"});}, 100);' .~~
1152	- // '~~wppaAdjustControlbar~~();' .
1153
1154	- '}' .
1155	- /*
1156	- // Previous
1157	- 'function panPrev(e) {
1158	- e.preventDefault();
1159	- abort = true;
1160	- var stop;
1161	- if ( ! stop ) {
1162	- stop = true;
1163	- $(this).css({opacity:0.5});
1164	- $("#wppa-overlay-fpc").css({display:"none"});
1165	- $("#wppa-ovl-spin").show();
1166	- wppaOvlShowPrev();
1167	- }
1168	}' .
1169
1170	- // Next
1171	- 'function panNext(e) {
1172	- e.preventDefault();
1173	- abort = true;
1174	- var stop;
1175	- if ( ! stop ) {
1176	- stop = true;
1177	- $(this).css({opacity:0.5});
1178	- $("#wppa-overlay-fpc").css({display:"none"});
1179	- $("#wppa-ovl-spin").show();
1180	- wppaOvlShowNext();
1181	- }
1182	- }' .
1183	- */
1184	// Horizontal movement by button
1185	'function onRightMouseDown(e){
1186	e.preventDefault();
	@@ -1261,11 +1208,9 @@ function wppa_get_flat_pan_html( $args ) {
1261	}' .
1262
1263	// When a (responsive) resize is required, we resize the wppaScene
1264	- 'function onResize' . $mocc . '(e){~~' .~~
1265	-
1266	- 'if (abort) return;' .
1267
1268	- ~~// 'wppaConsoleLog~~(~~"onResize","force"~~);' .
1269
1270	( $lightbox ?
1271
	@@ -1313,13 +1258,13 @@ function wppa_get_flat_pan_html( $args ) {
1313	'if ( widthIsLim ) {
1314	newWidth = contWidth - extraX;
1315	newHeight = newWidth / 2;
1316	- topMarg = ( contHeight - newHeight - extraY ) / 2 + 20;~~' .~~
1317	- '}
1318	else {
1319	newWidth = 2 * ( contHeight - ' . ( $controls ? $icsiz : 0 ) . ' - 24 - 40 ) / ( 1 + 2 * ' . $height . ' / ' . $width . ' );
1320	newHeight = newWidth / 2;
1321	- topMarg = 20;~~' .~~
1322	- '}' .
1323
1324	// Set css common for all 4 situations
1325	'$("#wppa-ovl-flatpan-container").css({top:topMarg,marginTop:0});
	@@ -1727,13 +1672,11 @@ function wppa_get_zoom_pan_html( $args ) {
1727	backgroundColor :\'' . wppa_opt( 'ovl_theme' ) . '\',
1728	borderRadius :' . wppa_opt( 'ovl_border_radius' ) . ',
1729	padding :' . wppa_opt( 'ovl_border_width' ) . '
1730	- };~~' .~~
1731	- // 'wppaZoomData[' . $mocc . '] = data;' .
1732
1733	- // ~~When~~ ~~document~~ ~~complete~~, ~~run~~ ~~the~~ ~~main~~ ~~proc~~
1734	- 'jQuery(document).ready(function(){wppaDoZoomPan(' . $mocc . ', data' . $mocc . ');});' .
1735
1736	- '</script>
1737	' . ( $haslink ? '<a>' : '' ) . '';
1738
1739	return wppa_pan_min( $result );
	@@ -1741,8 +1684,6 @@ function wppa_get_zoom_pan_html( $args ) {
1741
1742	// Minimize inine mixed html / js code
1743	function wppa_pan_min( $result ) {
1744	- // return $result; // debug
1745	- // wppa_log('dbg','voor len='.strlen($result));
1746
1747	// Remove tabs
1748	$result = str_replace( "\t", '', $result );
	@@ -1772,7 +1713,5 @@ function wppa_pan_min( $result ) {
1772	// Remove space between html tags
1773	$result = str_replace( '> <', '><', $result );
1774
1775	- // wppa_log('dbg',' na len='.strlen($result));
1776	- // wppa_dump($result);
1777	return $result;
1778	}


3	* Package: wp-photo-album-plus
4	*
5	* Make the picture html
6	+ * Version 8.0.00.018
7	*
8	*/
9

100	else {
101	$file = wppa_get_photo_path( $id );
102	}

103
104	if ( $args['width'] && $args['height'] ) {
105	$href = $isthumb ? wppa_get_thumb_url( $id, true, '', $args['width'], $args['height'] ) :

457	}
458	if ( ! $ratio ) $ratio = 2;
459


460	$mocc = $args['mocc'] ? $args['mocc'] : wppa( 'mocc' );
461	$width = $args['width'] ? $args['width'] : wppa_get_container_width();
462	$height = $width / 2; // $args['height'] ? $args['height'] : round( $width / $ratio );

613	}
614	}
615

616	$result .=
617	'</div>';
618	}

636
637	$result .=
638
639	+ '<script>
640	+ var data' . $mocc . ' =
641	+ { mocc :' . $mocc . ',
642	+ id :' . $id . ',
643	+ uId :0,
644	+ isLightbox :' . ( $lightbox ? 'true' : 'false' ) . ',
645	+ height :' . $height . ',
646	+ width :' . $width . ',
647	+ url :"' . $url . '",
648	+ abort :false,
649	+ autorun :' . $run . ',
650	+ dX :' . $dX . ',
651	+ dY :0,
652	+ fov :' . wppa_opt( 'panorama_fov' ) . ',
653	+ zoomsensitivity :' . $zoomsensitivity . ',
654	+ borderWidth :' . wppa_opt( 'ovl_border_width' ) . ',
655	+ controls :' . ( $controls ? 'true' : 'false' ) . ',
656	+ initialized :false,
657	+ icsize :' . ( $lightbox ? wppa_opt( 'nav_icon_size_lightbox' ) : wppa_opt( 'nav_icon_size_panorama' ) ) . ',
658	+ backgroundColor :"' . wppa_opt( 'ovl_theme' ) . '",
659	+ borderRadius :' . wppa_opt( 'ovl_border_radius' ) . ',
660	+ padding :' . wppa_opt( 'ovl_border_width' ) . ',
661	+ enableManual :' . $manual . ',
662	+ vtime :0,
663	+ };
664	+ jQuery(document).ready(function(){wppaDoSphericPan(' . $mocc . ', data' . $mocc . ')});' .










665
666	'</script>' .
667	+
668	( $haslink ? '<a>' : '' ) . '';
669
670	$result = wppa_pan_min( $result );

717	$deltaX = '0';
718	}
719
720	+ $url = esc_url( wppa_is_mobile() ? wppa_get_photo_url( $id ) : wppa_get_hires_url( $id ) );
721
722	$result = '';
723

1028	zoomout.on("mouseup", onButtonUp);'
1029	.
1030












1031	// Install Resize handler
1032	'$(window).off("DOMContentLoaded load resize orientationchange",onResize' . $mocc . ');' .
1033	'$(window).on("DOMContentLoaded load resize orientationchange",onResize' . $mocc . ');' .

1104	}' .
1105
1106	// Draw the image
1107	+ 'var ctx = canvas.getContext("2d");
1108	+ ctx.drawImage(image' . $mocc . ',fromX,fromY,fromWidth,fromHeight,0,0,canvas.width,canvas.height);' .
1109
1110	// Draw the preview image
1111	+ 'var prevctx = prevCanvas.getContext("2d");
1112	+ prevctx.clearRect(0, 0, prevCanvas.width, prevCanvas.height);
1113	+ prevctx.drawImage(image' . $mocc . ',0,0,image' . $mocc . '.width,image' . $mocc . '.height,0,0,prevCanvas.width,prevCanvas.height);' .
1114
1115	// Draw viewport rect on preview image
1116	+ 'var factor = prevCanvas.width / image' . $mocc . '.width;
1117	+ prevctx.strokeRect(factorfromX,factorfromY,factorfromWidth,factorfromHeight);' .
1118
1119	// Re-render if needed
1120	+ 'if (run>0) {
1121	+ if (autorun){timer=setTimeout(function(){render()},25);}
1122	+ else {timer=setTimeout(function(){render()},25);}
1123	+ }
1124	if(run<5)run--;' .
1125
1126	+ // Make controlbar visible
1127	+ 'setTimeout(function(){jQuery("#wppa-pctl-div-"+' . $mocc . ').css({visibility:"visible"});}, 100);
1128














1129	}' .
1130














1131	// Horizontal movement by button
1132	'function onRightMouseDown(e){
1133	e.preventDefault();

1208	}' .
1209
1210	// When a (responsive) resize is required, we resize the wppaScene
1211	+ 'function onResize' . $mocc . '(e){


1212
1213	+ if (abort) return;' .
1214
1215	( $lightbox ?
1216

1258	'if ( widthIsLim ) {
1259	newWidth = contWidth - extraX;
1260	newHeight = newWidth / 2;
1261	+ topMarg = ( contHeight - newHeight - extraY ) / 2 + 20;
1262	+ }
1263	else {
1264	newWidth = 2 * ( contHeight - ' . ( $controls ? $icsiz : 0 ) . ' - 24 - 40 ) / ( 1 + 2 * ' . $height . ' / ' . $width . ' );
1265	newHeight = newWidth / 2;
1266	+ topMarg = 20;
1267	+ }' .
1268
1269	// Set css common for all 4 situations
1270	'$("#wppa-ovl-flatpan-container").css({top:topMarg,marginTop:0});

1672	backgroundColor :\'' . wppa_opt( 'ovl_theme' ) . '\',
1673	borderRadius :' . wppa_opt( 'ovl_border_radius' ) . ',
1674	padding :' . wppa_opt( 'ovl_border_width' ) . '
1675	+ };

1676
1677	+ jQuery(document).ready(function(){wppaDoZoomPan(' . $mocc . ', data' . $mocc . ');});

1678
1679	+ </script>
1680	' . ( $haslink ? '<a>' : '' ) . '';
1681
1682	return wppa_pan_min( $result );

1684
1685	// Minimize inine mixed html / js code
1686	function wppa_pan_min( $result ) {


1687
1688	// Remove tabs
1689	$result = str_replace( "\t", '', $result );

1713	// Remove space between html tags
1714	$result = str_replace( '> <', '><', $result );
1715


1716	return $result;
1717	}

wppa-settings-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	- * Version 8.0.00.~~014~~
7	*
8	*/
9
	@@ -3013,13 +3013,6 @@ global $wppa_subtab_names;
3013	$tags = 'size,slide,layout';
3014	wppa_setting_new($slug, '4', $name, $desc, $html, $help);
3015
3016	- $name = __('Numbar Max', 'wp-photo-album-plus');
3017	- $desc = __('Maximum numbers to display.', 'wp-photo-album-plus');
3018	- $help = __('In order to attempt to fit on one line, the numbers will be replaced by dots - except the current - when there are more than this number of photos in a slideshow.', 'wp-photo-album-plus');
3019	- $slug = 'wppa_numbar_max';
3020	- $html = wppa_input($slug, '40px', '', __('numbers', 'wp-photo-album-plus'));
3021	- wppa_setting_new($slug, '5', $name, $desc, $html, $help);
3022	-
3023	$name = __('Share button size', 'wp-photo-album-plus');
3024	$desc = __('The size of the social media icons in the Share box', 'wp-photo-album-plus');
3025	$help = '';
	@@ -3027,7 +3020,7 @@ global $wppa_subtab_names;
3027	$opts = array('16 x 16', '20 x 20', '32 x 32');
3028	$vals = array('16', '20', '32');
3029	$html = wppa_select($slug, $opts, $vals) . __('pixels', 'wp-photo-album-plus');
3030	- wppa_setting_new($slug, '6', $name, $desc, $html, $help);
3031
3032	$name = __('Mini Threshold', 'wp-photo-album-plus');
3033	$desc = __('Show mini text at slideshow smaller than.', 'wp-photo-album-plus');
	@@ -3035,14 +3028,14 @@ global $wppa_subtab_names;
3035	$help .= '<br />'.__('Special use in responsive themes.', 'wp-photo-album-plus');
3036	$slug = 'wppa_mini_treshold';
3037	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
3038	- wppa_setting_new($slug, '7', $name, $desc, $html, $help);
3039
3040	$name = __('Slideshow pagesize', 'wp-photo-album-plus');
3041	$desc = __('The maximum number of slides in a certain view. 0 means no pagination', 'wp-photo-album-plus');
3042	$help = '';
3043	$slug = 'wppa_slideshow_pagesize';
3044	$html = wppa_input($slug, '40px', '', __('slides', 'wp-photo-album-plus'));
3045	- wppa_setting_new($slug, '8', $name, $desc, $html, $help);
3046
3047	$name = __('Filmstrip Thumbnail Size', 'wp-photo-album-plus');
3048	$desc = __('The size of the filmstrip images.', 'wp-photo-album-plus');
	@@ -3050,14 +3043,14 @@ global $wppa_subtab_names;
3050	$help .= '<br />'.__('Changing the thumbnail size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
3051	$slug = 'wppa_film_thumbsize';
3052	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
3053	- wppa_setting_new($slug, '9', $name, $desc, $html, $help);
3054
3055	$name = __('Slideonly max', 'wp-photo-album-plus');
3056	$desc = __('The max number of slides in a slideonly or filmonly display', 'wp-photo-album-plus');
3057	$help = '';
3058	$slug = 'wppa_slideonly_max';
3059	$html = wppa_input($slug, '40px', '', __('slides', 'wp-photo-album-plus'));
3060	- wppa_setting_new($slug, '10', $name, $desc, $html, $help);
3061
3062	$name = __('Show Share Box', 'wp-photo-album-plus');
3063	$desc = __('Display the share social media buttons box.', 'wp-photo-album-plus');
	@@ -3065,84 +3058,84 @@ global $wppa_subtab_names;
3065	$slug = 'wppa_share_on';
3066	$onch = '';
3067	$html = wppa_checkbox($slug);
3068	- wppa_setting_new($slug, '11', $name, $desc, $html, $help);
3069
3070	$name = __('Start/stop', 'wp-photo-album-plus');
3071	$desc = __('Show the Start/Stop slideshow bar.', 'wp-photo-album-plus');
3072	$help = __('If checked: display the start/stop slideshow navigation bar above the full-size images and slideshow', 'wp-photo-album-plus');
3073	$slug = 'wppa_show_startstop_navigation';
3074	$html = wppa_checkbox($slug);
3075	- wppa_setting_new($slug, '12', $name, $desc, $html, $help);
3076
3077	$name = __('Start/stop on Filmonly');
3078	$desc = __('Show the Start/Stop slideshow bar on filmonly displays.', 'wp-photo-album-plus');
3079	$help = '';
3080	$slug = 'wppa_show_startstop_filmonly';
3081	$html = wppa_checkbox($slug);
3082	- wppa_setting_new($slug, '13', $name, $desc, $html, $help);
3083
3084	$name = __('Renew on Filmonly', 'wp-photo-album-plus');
3085	$desc = __('Show renew link on filmonly displays.', 'wp-photo-album-plus');
3086	$help = '';
3087	$slug = 'wppa_show_renew_filmonly';
3088	$html = wppa_checkbox($slug);
3089	- wppa_setting_new($slug, '14', $name, $desc, $html, $help);
3090
3091	$name = __('Browse bar', 'wp-photo-album-plus');
3092	$desc = __('Show Browse photos bar.', 'wp-photo-album-plus');
3093	$help = __('If checked: display the preveous/next navigation bar under the full-size images and slideshow', 'wp-photo-album-plus');
3094	$slug = 'wppa_show_browse_navigation';
3095	$html = wppa_checkbox($slug);
3096	- wppa_setting_new($slug, '15', $name, $desc, $html, $help);
3097
3098	$name = __('Filmstrip', 'wp-photo-album-plus');
3099	$desc = __('Show Filmstrip navigation bar.', 'wp-photo-album-plus');
3100	$help = __('If checked: display the filmstrip navigation bar under the full_size images and slideshow', 'wp-photo-album-plus');
3101	$slug = 'wppa_filmstrip';
3102	$html = wppa_checkbox($slug);
3103	- wppa_setting_new($slug, '16', $name, $desc, $html, $help);
3104
3105	$name = __('Film seam', 'wp-photo-album-plus');
3106	$desc = __('Show seam between end and start of film.', 'wp-photo-album-plus');
3107	$help = __('If checked: display the wrap-around point in the filmstrip', 'wp-photo-album-plus');
3108	$slug = 'wppa_film_show_glue';
3109	$html = wppa_checkbox($slug);
3110	- wppa_setting_new($slug, '17', $name, $desc, $html, $help);
3111
3112	$name = __('Photo name', 'wp-photo-album-plus');
3113	$desc = __('Display photo name.', 'wp-photo-album-plus');
3114	$help = __('If checked: display the name of the photo under the slideshow image.', 'wp-photo-album-plus');
3115	$slug = 'wppa_show_full_name';
3116	$html = wppa_checkbox($slug);
3117	- wppa_setting_new($slug, '18', $name, $desc, $html, $help);
3118
3119	$name = __('Add (Owner)', 'wp-photo-album-plus');
3120	$desc = __('Add the uploaders display name in parenthesis to the name.', 'wp-photo-album-plus');
3121	$help = '';
3122	$slug = 'wppa_show_full_owner';
3123	$html = wppa_checkbox($slug);
3124	- wppa_setting_new($slug, '19', $name, $desc, $html, $help);
3125
3126	$name = __('Owner on new line', 'wp-photo-album-plus');
3127	$desc = __('Place the (owner) text on a new line.', 'wp-photo-album-plus');
3128	$help = '';
3129	$slug = 'wppa_owner_on_new_line';
3130	$html = wppa_checkbox($slug);
3131	- wppa_setting_new($slug, '20', $name, $desc, $html, $help);
3132
3133	$name = __('Photo desc', 'wp-photo-album-plus');
3134	$desc = __('Display Photo description.', 'wp-photo-album-plus');
3135	$help = __('If checked: display the description of the photo under the slideshow image.', 'wp-photo-album-plus');
3136	$slug = 'wppa_show_full_desc';
3137	$html = wppa_checkbox($slug);
3138	- wppa_setting_new($slug, '21', $name, $desc, $html, $help);
3139
3140	$name = __('Hide when empty', 'wp-photo-album-plus');
3141	$desc = __('Hide the descriptionbox when empty.', 'wp-photo-album-plus');
3142	$help = '';
3143	$slug = 'wppa_hide_when_empty';
3144	$html = wppa_checkbox($slug);
3145	- wppa_setting_new($slug, '22', $name, $desc, $html, $help);
3146
3147	$name = __('Big Browse Buttons', 'wp-photo-album-plus');
3148	$desc = __('Enable invisible browsing buttons.', 'wp-photo-album-plus');
	@@ -3151,21 +3144,21 @@ global $wppa_subtab_names;
3151	$help .= '<br />'.wppa_see_also( 'slide', '1', '2' );
3152	$slug = 'wppa_show_bbb';
3153	$html = wppa_checkbox($slug);
3154	- wppa_setting_new($slug, '23', $name, $desc, $html, $help);
3155
3156	$name = __('Ugly Browse Buttons', 'wp-photo-album-plus');
3157	$desc = __('Enable the ugly browsing buttons.', 'wp-photo-album-plus');
3158	$help = __('If checked, the fullsize image is covered by two browse buttons.', 'wp-photo-album-plus');
3159	$slug = 'wppa_show_ubb';
3160	$html = wppa_checkbox($slug);
3161	- wppa_setting_new($slug, '24', $name, $desc, $html, $help);
3162
3163	$name = __('Start/stop icons', 'wp-photo-album-plus');
3164	$desc = __('Show start and stop icons at the center of the slide', 'wp-photo-album-plus');
3165	$help = '';
3166	$slug = 'wppa_show_start_stop_icons';
3167	$html = wppa_checkbox($slug);
3168	- wppa_setting_new($slug, '25', $name, $desc, $html, $help);
3169
3170	$name = __('Show custom box', 'wp-photo-album-plus');
3171	$desc = __('Display the custom box in the slideshow', 'wp-photo-album-plus');
	@@ -3173,7 +3166,7 @@ global $wppa_subtab_names;
3173	$help .= '<br />'.wppa_see_also( 'slide', '2' );
3174	$slug = 'wppa_custom_on';
3175	$html = wppa_checkbox($slug);
3176	- wppa_setting_new($slug, '26', $name, $desc, $html, $help);
3177
3178	$name = __('Custom content', 'wp-photo-album-plus');
3179	$desc = __('The content (html) of the custom box.', 'wp-photo-album-plus');
	@@ -3181,14 +3174,21 @@ global $wppa_subtab_names;
3181	$help .= '<br />'.wppa_see_also( 'slide', '2' );
3182	$slug = 'wppa_custom_content';
3183	$html = wppa_textarea($slug, $name);
3184	- wppa_setting_new(false, '27', $name, $desc, $html, $help);
3185
3186	$name = __('Slideshow/Number bar', 'wp-photo-album-plus');
3187	$desc = __('Display the Slideshow / Number bar.', 'wp-photo-album-plus');
3188	$help = __('If checked: display the number boxes on slideshow', 'wp-photo-album-plus');
3189	$slug = 'wppa_show_slideshownumbar';
3190	$html = wppa_checkbox($slug, 'wppaRefreshAfter();');
3191	- wppa_setting_new($slug, '28', $name, $desc, $html, $help);







3192
3193	$name = __('Numbar', 'wp-photo-album-plus');
3194	$desc = __('Number bar box background.', 'wp-photo-album-plus');
	@@ -10119,7 +10119,7 @@ global $wppa_subtab_names;
10119	$help .= '<br />'.__('Note: Do NOT Disable the Custom box in the Slideshow component specification.', 'wp-photo-album-plus');
10120	$help .= '<br />'.__('Do NOT remove the text w#fotomoto from the Custombox content.', 'wp-photo-album-plus');
10121	$slug = 'wppa_fotomoto_on';
10122	- $html = wppa_checkbox($slug, 'wppaRefreshAfter();') . wppa_see_also( 'slide', '1', '26~~.27~~' );
10123	wppa_setting_new($slug, '9', $name, $desc, $html, $help);
10124
10125	if ( wppa_switch( 'fotomoto_on' ) ) {


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

3013	$tags = 'size,slide,layout';
3014	wppa_setting_new($slug, '4', $name, $desc, $html, $help);
3015







3016	$name = __('Share button size', 'wp-photo-album-plus');
3017	$desc = __('The size of the social media icons in the Share box', 'wp-photo-album-plus');
3018	$help = '';

3020	$opts = array('16 x 16', '20 x 20', '32 x 32');
3021	$vals = array('16', '20', '32');
3022	$html = wppa_select($slug, $opts, $vals) . __('pixels', 'wp-photo-album-plus');
3023	+ wppa_setting_new($slug, '5', $name, $desc, $html, $help);
3024
3025	$name = __('Mini Threshold', 'wp-photo-album-plus');
3026	$desc = __('Show mini text at slideshow smaller than.', 'wp-photo-album-plus');

3028	$help .= '<br />'.__('Special use in responsive themes.', 'wp-photo-album-plus');
3029	$slug = 'wppa_mini_treshold';
3030	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
3031	+ wppa_setting_new($slug, '6', $name, $desc, $html, $help);
3032
3033	$name = __('Slideshow pagesize', 'wp-photo-album-plus');
3034	$desc = __('The maximum number of slides in a certain view. 0 means no pagination', 'wp-photo-album-plus');
3035	$help = '';
3036	$slug = 'wppa_slideshow_pagesize';
3037	$html = wppa_input($slug, '40px', '', __('slides', 'wp-photo-album-plus'));
3038	+ wppa_setting_new($slug, '7', $name, $desc, $html, $help);
3039
3040	$name = __('Filmstrip Thumbnail Size', 'wp-photo-album-plus');
3041	$desc = __('The size of the filmstrip images.', 'wp-photo-album-plus');

3043	$help .= '<br />'.__('Changing the thumbnail size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus');
3044	$slug = 'wppa_film_thumbsize';
3045	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
3046	+ wppa_setting_new($slug, '8', $name, $desc, $html, $help);
3047
3048	$name = __('Slideonly max', 'wp-photo-album-plus');
3049	$desc = __('The max number of slides in a slideonly or filmonly display', 'wp-photo-album-plus');
3050	$help = '';
3051	$slug = 'wppa_slideonly_max';
3052	$html = wppa_input($slug, '40px', '', __('slides', 'wp-photo-album-plus'));
3053	+ wppa_setting_new($slug, '9', $name, $desc, $html, $help);
3054
3055	$name = __('Show Share Box', 'wp-photo-album-plus');
3056	$desc = __('Display the share social media buttons box.', 'wp-photo-album-plus');

3058	$slug = 'wppa_share_on';
3059	$onch = '';
3060	$html = wppa_checkbox($slug);
3061	+ wppa_setting_new($slug, '10', $name, $desc, $html, $help);
3062
3063	$name = __('Start/stop', 'wp-photo-album-plus');
3064	$desc = __('Show the Start/Stop slideshow bar.', 'wp-photo-album-plus');
3065	$help = __('If checked: display the start/stop slideshow navigation bar above the full-size images and slideshow', 'wp-photo-album-plus');
3066	$slug = 'wppa_show_startstop_navigation';
3067	$html = wppa_checkbox($slug);
3068	+ wppa_setting_new($slug, '11', $name, $desc, $html, $help);
3069
3070	$name = __('Start/stop on Filmonly');
3071	$desc = __('Show the Start/Stop slideshow bar on filmonly displays.', 'wp-photo-album-plus');
3072	$help = '';
3073	$slug = 'wppa_show_startstop_filmonly';
3074	$html = wppa_checkbox($slug);
3075	+ wppa_setting_new($slug, '12', $name, $desc, $html, $help);
3076
3077	$name = __('Renew on Filmonly', 'wp-photo-album-plus');
3078	$desc = __('Show renew link on filmonly displays.', 'wp-photo-album-plus');
3079	$help = '';
3080	$slug = 'wppa_show_renew_filmonly';
3081	$html = wppa_checkbox($slug);
3082	+ wppa_setting_new($slug, '13', $name, $desc, $html, $help);
3083
3084	$name = __('Browse bar', 'wp-photo-album-plus');
3085	$desc = __('Show Browse photos bar.', 'wp-photo-album-plus');
3086	$help = __('If checked: display the preveous/next navigation bar under the full-size images and slideshow', 'wp-photo-album-plus');
3087	$slug = 'wppa_show_browse_navigation';
3088	$html = wppa_checkbox($slug);
3089	+ wppa_setting_new($slug, '14', $name, $desc, $html, $help);
3090
3091	$name = __('Filmstrip', 'wp-photo-album-plus');
3092	$desc = __('Show Filmstrip navigation bar.', 'wp-photo-album-plus');
3093	$help = __('If checked: display the filmstrip navigation bar under the full_size images and slideshow', 'wp-photo-album-plus');
3094	$slug = 'wppa_filmstrip';
3095	$html = wppa_checkbox($slug);
3096	+ wppa_setting_new($slug, '15', $name, $desc, $html, $help);
3097
3098	$name = __('Film seam', 'wp-photo-album-plus');
3099	$desc = __('Show seam between end and start of film.', 'wp-photo-album-plus');
3100	$help = __('If checked: display the wrap-around point in the filmstrip', 'wp-photo-album-plus');
3101	$slug = 'wppa_film_show_glue';
3102	$html = wppa_checkbox($slug);
3103	+ wppa_setting_new($slug, '16', $name, $desc, $html, $help);
3104
3105	$name = __('Photo name', 'wp-photo-album-plus');
3106	$desc = __('Display photo name.', 'wp-photo-album-plus');
3107	$help = __('If checked: display the name of the photo under the slideshow image.', 'wp-photo-album-plus');
3108	$slug = 'wppa_show_full_name';
3109	$html = wppa_checkbox($slug);
3110	+ wppa_setting_new($slug, '17', $name, $desc, $html, $help);
3111
3112	$name = __('Add (Owner)', 'wp-photo-album-plus');
3113	$desc = __('Add the uploaders display name in parenthesis to the name.', 'wp-photo-album-plus');
3114	$help = '';
3115	$slug = 'wppa_show_full_owner';
3116	$html = wppa_checkbox($slug);
3117	+ wppa_setting_new($slug, '18', $name, $desc, $html, $help);
3118
3119	$name = __('Owner on new line', 'wp-photo-album-plus');
3120	$desc = __('Place the (owner) text on a new line.', 'wp-photo-album-plus');
3121	$help = '';
3122	$slug = 'wppa_owner_on_new_line';
3123	$html = wppa_checkbox($slug);
3124	+ wppa_setting_new($slug, '19', $name, $desc, $html, $help);
3125
3126	$name = __('Photo desc', 'wp-photo-album-plus');
3127	$desc = __('Display Photo description.', 'wp-photo-album-plus');
3128	$help = __('If checked: display the description of the photo under the slideshow image.', 'wp-photo-album-plus');
3129	$slug = 'wppa_show_full_desc';
3130	$html = wppa_checkbox($slug);
3131	+ wppa_setting_new($slug, '20', $name, $desc, $html, $help);
3132
3133	$name = __('Hide when empty', 'wp-photo-album-plus');
3134	$desc = __('Hide the descriptionbox when empty.', 'wp-photo-album-plus');
3135	$help = '';
3136	$slug = 'wppa_hide_when_empty';
3137	$html = wppa_checkbox($slug);
3138	+ wppa_setting_new($slug, '21', $name, $desc, $html, $help);
3139
3140	$name = __('Big Browse Buttons', 'wp-photo-album-plus');
3141	$desc = __('Enable invisible browsing buttons.', 'wp-photo-album-plus');

3144	$help .= '<br />'.wppa_see_also( 'slide', '1', '2' );
3145	$slug = 'wppa_show_bbb';
3146	$html = wppa_checkbox($slug);
3147	+ wppa_setting_new($slug, '22', $name, $desc, $html, $help);
3148
3149	$name = __('Ugly Browse Buttons', 'wp-photo-album-plus');
3150	$desc = __('Enable the ugly browsing buttons.', 'wp-photo-album-plus');
3151	$help = __('If checked, the fullsize image is covered by two browse buttons.', 'wp-photo-album-plus');
3152	$slug = 'wppa_show_ubb';
3153	$html = wppa_checkbox($slug);
3154	+ wppa_setting_new($slug, '23', $name, $desc, $html, $help);
3155
3156	$name = __('Start/stop icons', 'wp-photo-album-plus');
3157	$desc = __('Show start and stop icons at the center of the slide', 'wp-photo-album-plus');
3158	$help = '';
3159	$slug = 'wppa_show_start_stop_icons';
3160	$html = wppa_checkbox($slug);
3161	+ wppa_setting_new($slug, '24', $name, $desc, $html, $help);
3162
3163	$name = __('Show custom box', 'wp-photo-album-plus');
3164	$desc = __('Display the custom box in the slideshow', 'wp-photo-album-plus');

3166	$help .= '<br />'.wppa_see_also( 'slide', '2' );
3167	$slug = 'wppa_custom_on';
3168	$html = wppa_checkbox($slug);
3169	+ wppa_setting_new($slug, '25', $name, $desc, $html, $help);
3170
3171	$name = __('Custom content', 'wp-photo-album-plus');
3172	$desc = __('The content (html) of the custom box.', 'wp-photo-album-plus');

3174	$help .= '<br />'.wppa_see_also( 'slide', '2' );
3175	$slug = 'wppa_custom_content';
3176	$html = wppa_textarea($slug, $name);
3177	+ wppa_setting_new(false, '26', $name, $desc, $html, $help);
3178
3179	$name = __('Slideshow/Number bar', 'wp-photo-album-plus');
3180	$desc = __('Display the Slideshow / Number bar.', 'wp-photo-album-plus');
3181	$help = __('If checked: display the number boxes on slideshow', 'wp-photo-album-plus');
3182	$slug = 'wppa_show_slideshownumbar';
3183	$html = wppa_checkbox($slug, 'wppaRefreshAfter();');
3184	+ wppa_setting_new($slug, '27', $name, $desc, $html, $help);
3185	+
3186	+ $name = __('Numbar Max', 'wp-photo-album-plus');
3187	+ $desc = __('Maximum numbers to display.', 'wp-photo-album-plus');
3188	+ $help = __('In order to attempt to fit on one line, the numbers will be replaced by dots - except the current - when there are more than this number of photos in a slideshow.', 'wp-photo-album-plus');
3189	+ $slug = 'wppa_numbar_max';
3190	+ $html = wppa_input($slug, '40px', '', __('numbers', 'wp-photo-album-plus'));
3191	+ wppa_setting_new($slug, '28', $name, $desc, $html, $help, wppa_opt( 'show_slideshownumbar' ) );
3192
3193	$name = __('Numbar', 'wp-photo-album-plus');
3194	$desc = __('Number bar box background.', 'wp-photo-album-plus');

10119	$help .= '<br />'.__('Note: Do NOT Disable the Custom box in the Slideshow component specification.', 'wp-photo-album-plus');
10120	$help .= '<br />'.__('Do NOT remove the text w#fotomoto from the Custombox content.', 'wp-photo-album-plus');
10121	$slug = 'wppa_fotomoto_on';
10122	+ $html = wppa_checkbox($slug, 'wppaRefreshAfter();') . wppa_see_also( 'slide', '1', '25.26' );
10123	wppa_setting_new($slug, '9', $name, $desc, $html, $help);
10124
10125	if ( wppa_switch( 'fotomoto_on' ) ) {

wppa-slideshow.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains all the slideshow high level functions
6	- * Version 8.0.00.~~017~~
7	*
8	*/
9
	@@ -782,7 +782,7 @@ function wppa_slide_custom( $opt = '' ) {
782	wppa_out( '<div' .
783	' id="wppa-custom-'.wppa( 'mocc' ).'"' .
784	' class="wppa-box wppa-custom"' .
785	- ' style="'.wppa_wcs('wppa-box').~~wppa_wcs(~~'~~wppa-custom').'~~"' .
786	' >' .
787	$content .
788	'</div>'
	@@ -1731,7 +1731,7 @@ function wppa_iptc( $opt = '' ) {
1731	wppa_out( '<div' .
1732	' id="iptc-'.wppa( 'mocc' ).'"' .
1733	' class="wppa-box wppa-box-text wppa-iptc"' .
1734	- ' style="text-align: center; '.wppa_wcs('wppa-box').wppa_wcs('wppa-box-text').~~wppa_wcs(~~'~~wppa-iptc').'~~"' .
1735	' >' .
1736	'</div>'
1737	);
	@@ -1755,7 +1755,7 @@ function wppa_exif( $opt = '' ) {
1755	wppa_out( '<div' .
1756	' id="exif-'.wppa( 'mocc' ).'"' .
1757	' class="wppa-box wppa-box-text wppa-exif"' .
1758	- ' style="text-align: center; '.wppa_wcs('wppa-box').wppa_wcs('wppa-box-text').~~wppa_wcs(~~'~~wppa-exif').'~~"' .
1759	' >' .
1760	'</div>'
1761	);
	@@ -1779,7 +1779,7 @@ function wppa_share( $opt = '' ) {
1779	wppa_out( '<div' .
1780	' id="wppa-share-'.wppa( 'mocc' ).'"' .
1781	' class="wppa-box wppa-box-text wppa-share"' .
1782	- ' style="text-align: center; '.wppa_wcs('wppa-box').wppa_wcs('wppa-box-text').~~wppa_wcs(~~'~~wppa-share').'~~"' .
1783	' >' .
1784	'</div>'
1785	);


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

782	wppa_out( '<div' .
783	' id="wppa-custom-'.wppa( 'mocc' ).'"' .
784	' class="wppa-box wppa-custom"' .
785	+ ' style="'.wppa_wcs('wppa-box').'"' .
786	' >' .
787	$content .
788	'</div>'

1731	wppa_out( '<div' .
1732	' id="iptc-'.wppa( 'mocc' ).'"' .
1733	' class="wppa-box wppa-box-text wppa-iptc"' .
1734	+ ' style="text-align: center; '.wppa_wcs('wppa-box').wppa_wcs('wppa-box-text').'"' .
1735	' >' .
1736	'</div>'
1737	);

1755	wppa_out( '<div' .
1756	' id="exif-'.wppa( 'mocc' ).'"' .
1757	' class="wppa-box wppa-box-text wppa-exif"' .
1758	+ ' style="text-align: center; '.wppa_wcs('wppa-box').wppa_wcs('wppa-box-text').'"' .
1759	' >' .
1760	'</div>'
1761	);

1779	wppa_out( '<div' .
1780	' id="wppa-share-'.wppa( 'mocc' ).'"' .
1781	' class="wppa-box wppa-box-text wppa-share"' .
1782	+ ' style="text-align: center; '.wppa_wcs('wppa-box').wppa_wcs('wppa-box-text').'"' .
1783	' >' .
1784	'</div>'
1785	);

wppa-styles.php CHANGED Viewed

	@@ -602,6 +602,10 @@ function wppa_wcs( $class ) {
602	$opt = floor( ( $opt + 2 ) / 3 );
603	$result .= 'border-radius:' . $opt . 'px; ';
604	}




605	break;
606	case 'wppa-cover-box':
607	$opt = wppa_opt( 'cover_minheight' );


602	$opt = floor( ( $opt + 2 ) / 3 );
603	$result .= 'border-radius:' . $opt . 'px; ';
604	}
605	+ $opt = wppa_opt( 'bcolor' );
606	+ if ( $opt ) {
607	+ $result .= 'border-color:' . $opt . '; ';
608	+ }
609	break;
610	case 'wppa-cover-box':
611	$opt = wppa_opt( 'cover_minheight' );

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: 8.0.00.~~017~~
6	* Author: J.N. Breetvelt a.k.a. OpaJaap
7	* Author URI: http://wppa.opajaap.nl/
8	* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
	@@ -24,7 +24,7 @@ global $wp_version;
24
25	/* WPPA GLOBALS */
26	global $wppa_api_version;
27	- $wppa_api_version = '8.0.00.~~017~~'; // WPPA software version
28	global $wppa_revno;
29	$wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30


2	/*
3	* Plugin Name: WP Photo Album Plus
4	* Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5	+ * Version: 8.0.00.018
6	* Author: J.N. Breetvelt a.k.a. OpaJaap
7	* Author URI: http://wppa.opajaap.nl/
8	* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/

24
25	/* WPPA GLOBALS */
26	global $wppa_api_version;
27	+ $wppa_api_version = '8.0.00.018'; // WPPA software version
28	global $wppa_revno;
29	$wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30