WP Photo Album Plus - Version 8.2.02.002

Version Description

= 8.1.08 =

This version addresses various bug fixes, feature requests and security fixes.

Release Info

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

Code changes from version 8.2.02.001 to 8.2.02.002

Files changed (15) hide show

blocks/potd/block.js +1 -1
blocks/slideshow/block.js +1 -1
changelog.txt +2 -0
wppa-ajax.php +1 -1
wppa-album-admin-autosave.php +9 -9
wppa-album-covers.php +5 -5
wppa-boxes-html.php +3 -3
wppa-mailing.php +20 -10
wppa-settings-autosave.php +10 -10
wppa-slideshow-widget.php +2 -2
wppa-statistics.php +2 -2
wppa-topten-widget.php +3 -3
wppa-upldr-widget.php +2 -2
wppa-utils.php +2 -2
wppa.php +2 -2

blocks/potd/block.js CHANGED Viewed

	@@ -10,7 +10,7 @@
10	var useBlockProps = blockEditor.useBlockProps;
11
12	blocks.registerBlockType( 'wp-photo-album-plus/potd', {
13	- title: __('WPPA ~~potd~~', 'wp-photo-album-plus'),
14	icon: 'universal-access-alt',
15	category: 'layout',
16


10	var useBlockProps = blockEditor.useBlockProps;
11
12	blocks.registerBlockType( 'wp-photo-album-plus/potd', {
13	+ title: __('WPPA Potd', 'wp-photo-album-plus'),
14	icon: 'universal-access-alt',
15	category: 'layout',
16

blocks/slideshow/block.js CHANGED Viewed

	@@ -11,7 +11,7 @@
11	var useBlockProps = blockEditor.useBlockProps;
12
13	blocks.registerBlockType( 'wp-photo-album-plus/slideshow', {
14	- title: __('WPPA ~~slideshow~~', 'wp-photo-album-plus'),
15	icon: 'universal-access-alt',
16	category: 'layout',
17	attributes: {


11	var useBlockProps = blockEditor.useBlockProps;
12
13	blocks.registerBlockType( 'wp-photo-album-plus/slideshow', {
14	+ title: __('WPPA Slideshow', 'wp-photo-album-plus'),
15	icon: 'universal-access-alt',
16	category: 'layout',
17	attributes: {

changelog.txt CHANGED Viewed

	@@ -3,6 +3,8 @@ WP Photo Album Plus Changelog
3	= 8.2.02 =
4
5	* Introduction of native blocks: Photo of the day, upload and simple slideshow. Usable for posts/pages and widgets.


6
7	= 8.2.01 =
8


3	= 8.2.02 =
4
5	* Introduction of native blocks: Photo of the day, upload and simple slideshow. Usable for posts/pages and widgets.
6	+ * Textual corrections. The use of 'subalbum' is now consistent.
7	+ * Emai callback urls did not work when refuse unencrypted is enabled. Fixed.
8
9	= 8.2.01 =
10

wppa-ajax.php CHANGED Viewed

	@@ -1815,7 +1815,7 @@ case 'albumselect-html':
1815	$itemname = __( 'Categories' , 'wp-photo-album-plus' );
1816	break;
1817	case 'suba_order_by':
1818	- $itemname = __( '~~Sub~~ ~~albums~~ sort order' , 'wp-photo-album-plus' );
1819	break;
1820
1821	case 'year':


1815	$itemname = __( 'Categories' , 'wp-photo-album-plus' );
1816	break;
1817	case 'suba_order_by':
1818	+ $itemname = __( 'Subalbums sort order' , 'wp-photo-album-plus' );
1819	break;
1820
1821	case 'year':

wppa-album-admin-autosave.php CHANGED Viewed

	@@ -171,7 +171,7 @@ global $wppa_revno;
171	}
172	$id = wppa_nextkey( WPPA_ALBUMS );
173
174	- // Creating a ~~sub-album~~ of a given parent?
175	if ( wppa_get( 'parent_id' ) ) {
176	$parent = wppa_get( 'parent_id' );
177	$name = wppa_get_album_name( $parent ) . '-#' . $id;
	@@ -548,7 +548,7 @@ global $wppa_revno;
548	__( 'Photo views:', 'wp-photo-album-plus' ) . ' ' . $pviews . '. ';
549	if ( $nsub ) {
550	$result .=
551	- __( 'Photo views inc ~~sub albums~~:', 'wp-photo-album-plus' ) . ' ' . $tpviews . '. ' . $br;
552	}
553	}
554
	@@ -622,7 +622,7 @@ global $wppa_revno;
622	}
623
624	// Status
625	- $title = __( 'Set the frontend visibility of the album cover and items not including ~~sub-albums~~.', 'wp-photo-album-plus' ) . ' ' .
626	__( 'Publish: visible for all, Private: visible for logged in only, Hidden: visible for admin only', 'wp-photo-album-plus' );
627	$result .=
628	$br .
	@@ -746,7 +746,7 @@ global $wppa_revno;
746	</select>' . $br;
747	}
748
749	- // ~~Child~~ ~~album~~ order
750	$sel = ' selected';
751	$opts = array(
752	__( '--- default ---', 'wp-photo-album-plus' ),
	@@ -771,7 +771,7 @@ global $wppa_revno;
771	$title = sprintf( __( 'The default is set in %s and is currently set to %s', 'wp-photo-album-plus' ), wppa_setting_path( 'b', 'misc', 1, 1 ), $dflt );
772
773	$result .=
774	- __( '~~Sub~~ ~~album~~ sort order', 'wp-photo-album-plus' ) . ':
775	<select
776	onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'suba_order_by\', this )"
777	title="' . esc_attr( $title ) . '"
	@@ -1236,8 +1236,8 @@ global $wppa_revno;
1236	$lt = $cover_linktype;
1237	$result .= '
1238	<select onchange="wppaAjaxUpdateAlbum( '. $id . ', \'cover_linktype\', this )" >
1239	- <option value="content"' . ( $lt == 'content' ? $sel : '' ) . ' >' . __( 'the ~~sub-albums~~ and thumbnails', 'wp-photo-album-plus' ) . '</option>
1240	- <option value="albums"' . ( $lt == 'albums' ? $sel : '' ) . ' >' . __( 'the ~~sub-albums~~', 'wp-photo-album-plus' ) . '</option>
1241	<option value="thumbs"' . ( $lt == 'thumbs' ? $sel : '' ) . ' >' . __( 'the thumbnails', 'wp-photo-album-plus' ) . '</option>
1242	<option value="slide"' . ( $lt == 'slide' ? $sel : '' ) . ' >' . __( 'the album photos as slideshow', 'wp-photo-album-plus' ) . '</option>
1243	<option value="page"' . ( $lt == 'page' ? $sel : '' ) . ' >' . __( 'the link page with a clean url', 'wp-photo-album-plus' ) . '</option>
	@@ -2929,7 +2929,7 @@ global $wpdb;
2929	}
2930	}
2931
2932	- // Find accessable ~~child albums~~
2933	function wppa_have_accessible_children( $alb ) {
2934	global $wpdb;
2935
	@@ -3153,7 +3153,7 @@ global $wpdb;
3153	}
3154	else {
3155	$result =
3156	- esc_html__( 'You can edit ~~sub-album~~ sequence number here when you set the album sequence to "Order #" or "Order # desc" in the "~~Sub~~ ~~album~~ sort order:" selection box above.' );
3157	}
3158	$result .= '<br>';
3159


171	}
172	$id = wppa_nextkey( WPPA_ALBUMS );
173
174	+ // Creating a subalbum of a given parent?
175	if ( wppa_get( 'parent_id' ) ) {
176	$parent = wppa_get( 'parent_id' );
177	$name = wppa_get_album_name( $parent ) . '-#' . $id;

548	__( 'Photo views:', 'wp-photo-album-plus' ) . ' ' . $pviews . '. ';
549	if ( $nsub ) {
550	$result .=
551	+ __( 'Photo views inc subalbums:', 'wp-photo-album-plus' ) . ' ' . $tpviews . '. ' . $br;
552	}
553	}
554

622	}
623
624	// Status
625	+ $title = __( 'Set the frontend visibility of the album cover and items not including subalbums.', 'wp-photo-album-plus' ) . ' ' .
626	__( 'Publish: visible for all, Private: visible for logged in only, Hidden: visible for admin only', 'wp-photo-album-plus' );
627	$result .=
628	$br .

746	</select>' . $br;
747	}
748
749	+ // Subalbum order
750	$sel = ' selected';
751	$opts = array(
752	__( '--- default ---', 'wp-photo-album-plus' ),

771	$title = sprintf( __( 'The default is set in %s and is currently set to %s', 'wp-photo-album-plus' ), wppa_setting_path( 'b', 'misc', 1, 1 ), $dflt );
772
773	$result .=
774	+ __( 'Subalbum sort order', 'wp-photo-album-plus' ) . ':
775	<select
776	onchange="wppaAjaxUpdateAlbum( ' . $id . ', \'suba_order_by\', this )"
777	title="' . esc_attr( $title ) . '"

1236	$lt = $cover_linktype;
1237	$result .= '
1238	<select onchange="wppaAjaxUpdateAlbum( '. $id . ', \'cover_linktype\', this )" >
1239	+ <option value="content"' . ( $lt == 'content' ? $sel : '' ) . ' >' . __( 'the subalbums and thumbnails', 'wp-photo-album-plus' ) . '</option>
1240	+ <option value="albums"' . ( $lt == 'albums' ? $sel : '' ) . ' >' . __( 'the subalbums', 'wp-photo-album-plus' ) . '</option>
1241	<option value="thumbs"' . ( $lt == 'thumbs' ? $sel : '' ) . ' >' . __( 'the thumbnails', 'wp-photo-album-plus' ) . '</option>
1242	<option value="slide"' . ( $lt == 'slide' ? $sel : '' ) . ' >' . __( 'the album photos as slideshow', 'wp-photo-album-plus' ) . '</option>
1243	<option value="page"' . ( $lt == 'page' ? $sel : '' ) . ' >' . __( 'the link page with a clean url', 'wp-photo-album-plus' ) . '</option>

2929	}
2930	}
2931
2932	+ // Find accessable subalbums
2933	function wppa_have_accessible_children( $alb ) {
2934	global $wpdb;
2935

3153	}
3154	else {
3155	$result =
3156	+ esc_html__( 'You can edit subalbum sequence number here when you set the album sequence to "Order #" or "Order # desc" in the "Subalbum sort order:" selection box above.' );
3157	}
3158	$result .= '<br>';
3159

wppa-album-covers.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Functions for album covers
6	- * Version 8.1.09.~~003~~
7	*
8	*/
9
	@@ -1187,7 +1187,7 @@ global $wpdb;
1187	}
1188	else {
1189	$count = $treecounts['treephotoviews'];
1190	- $title = __( 'Number of photo views in this album and its ~~sub-albums~~', 'wp-photo-album-plus' );
1191	}
1192	wppa_out( '<div
1193	class="wppa-album-cover-viewcount"
	@@ -2023,7 +2023,7 @@ global $wpdb;
2023
2024	/**/
2025
2026	- // Only if there are ~~sub-albums~~
2027	if ( ! empty( $subs ) ) {
2028
2029	wppa_out( '<div class="wppa-cover-sublist-container" >' );
	@@ -2046,7 +2046,7 @@ global $wpdb;
2046	wppa_out( '<div style="clear:both"></div>' );
2047	}
2048
2049	- // Process the ~~sub-albums~~
2050	foreach( $subs as $album ) {
2051
2052	// What is the albums title linktype
	@@ -2061,7 +2061,7 @@ global $wpdb;
2061	$albumid = $album['id'];
2062	$photocount = wppa_get_photo_count( $albumid );
2063
2064	- // Thumbnails and covers, show ~~sub-album~~ covers
2065	// in case slideshow is requested on an empty album
2066	if ( wppa_opt( 'cover_sublinks' ) == 'content' \|\| ! $photocount ) {
2067	$href_content = wppa_get_album_url( array( 'album' => $albumid,


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

1187	}
1188	else {
1189	$count = $treecounts['treephotoviews'];
1190	+ $title = __( 'Number of photo views in this album and its subalbums', 'wp-photo-album-plus' );
1191	}
1192	wppa_out( '<div
1193	class="wppa-album-cover-viewcount"

2023
2024	/**/
2025
2026	+ // Only if there are subalbums
2027	if ( ! empty( $subs ) ) {
2028
2029	wppa_out( '<div class="wppa-cover-sublist-container" >' );

2046	wppa_out( '<div style="clear:both"></div>' );
2047	}
2048
2049	+ // Process the subalbums
2050	foreach( $subs as $album ) {
2051
2052	// What is the albums title linktype

2061	$albumid = $album['id'];
2062	$photocount = wppa_get_photo_count( $albumid );
2063
2064	+ // Thumbnails and covers, show subalbum covers
2065	// in case slideshow is requested on an empty album
2066	if ( wppa_opt( 'cover_sublinks' ) == 'content' \|\| ! $photocount ) {
2067	$href_content = wppa_get_album_url( array( 'album' => $albumid,

wppa-boxes-html.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Various wppa boxes
6	- * Version 8.2.01.~~005~~
7	*
8	*/
9
	@@ -2503,7 +2503,7 @@ function wppa_get_user_create_html( $alb, $width, $where = '', $mcr = false ) {
2503	return '';
2504	}
2505
2506	- // Basic users are not allowed to create ~~sub albums~~
2507	if ( wppa_user_is_basic() ) {
2508	return '';
2509	}
	@@ -2583,7 +2583,7 @@ function wppa_get_user_create_html( $alb, $width, $where = '', $mcr = false ) {
2583	jQuery( \'#_wppa-cr-'.$a.'-'.$mocc.'\' ).css( \'display\',\'block\' );
2584	window.dispatchEvent(new Event(\'resize\'))"
2585	style="float:left;cursor:pointer"> ' .
2586	- ( $alb ? __( 'Create ~~Sub Album~~', 'wp-photo-album-plus' ) : __( 'Create Album', 'wp-photo-album-plus' ) ) . '
2587	</a>
2588	<a id="_wppa-cr-' . $a . '-' . $mocc . '" class="wppa-create-' . $where . ' wppa-album-cover-link" onclick="
2589	jQuery( \'#wppa-create-'.$t.$a.'-'.$mocc.'\' ).css( \'display\',\'none\' );


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

2503	return '';
2504	}
2505
2506	+ // Basic users are not allowed to create subalbums
2507	if ( wppa_user_is_basic() ) {
2508	return '';
2509	}

2583	jQuery( \'#_wppa-cr-'.$a.'-'.$mocc.'\' ).css( \'display\',\'block\' );
2584	window.dispatchEvent(new Event(\'resize\'))"
2585	style="float:left;cursor:pointer"> ' .
2586	+ ( $alb ? __( 'Create Subalbum', 'wp-photo-album-plus' ) : __( 'Create Album', 'wp-photo-album-plus' ) ) . '
2587	</a>
2588	<a id="_wppa-cr-' . $a . '-' . $mocc . '" class="wppa-create-' . $where . ' wppa-album-cover-link" onclick="
2589	jQuery( \'#wppa-create-'.$t.$a.'-'.$mocc.'\' ).css( \'display\',\'none\' );

wppa-mailing.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* Contains mailing functions
6	*
7	- * Version 8.2.01.~~005~~
8	*
9	*/
10
	@@ -225,10 +225,12 @@ global $wpdb;
225	'</blockquote>';
226	}
227

228	if ( $link ) {

229	$content .=
230	'<br>' .
231	- sprintf( __( 'You can see the content %shere%s', 'wp-photo-album-plus' ), '<a href="' . $~~link~~ . '~~?album=' . $alb . '&cover=1&occur=1' . '~~" >', '</a>' );
232	}
233
234
	@@ -311,7 +313,8 @@ global $wpdb;
311
312	// Preview
313	if ( $link ) {
314	- $~~cont~~ .= ~~'<br>' . sprintf~~( ~~__( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' .~~ $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' ~~. '" >', '</a>'~~ );

315	}
316
317	// Process all subscribed users
	@@ -429,7 +432,8 @@ global $wpdb;
429
430	// Preview
431	if ( $link ) {
432	- $~~cont~~ .= ~~'<br>' . sprintf~~( ~~__( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' .~~ $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' ~~. '" >', '</a>'~~ );

433	}
434
435	// Process all subscribed users
	@@ -493,7 +497,8 @@ global $wpdb;
493
494	// Preview
495	if ( $link ) {
496	- $~~cont~~ .= ~~'<br>' . sprintf~~( ~~__( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' .~~ $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' ~~. '" >', '</a>'~~ );

497	}
498
499	if ( $user ) {
	@@ -559,7 +564,8 @@ global $wpdb;
559
560	// Preview
561	if ( $link ) {
562	- $~~cont~~ .= ~~'<br>' . sprintf~~( ~~__( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' .~~ $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' ~~. '" >', '</a>'~~ );

563	}
564
565	wppa_send_mail( array( 'to' => $user->user_email,
	@@ -586,7 +592,8 @@ global $wpdb;
586
587	// Preview
588	if ( $link ) {
589	- $~~cont~~ .= ~~'<br>' . sprintf~~( ~~__( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' .~~ $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' ~~. '" >', '</a>'~~ );

590	}
591
592	wppa_send_mail( array( 'to' => $author->user_email,
	@@ -652,7 +659,8 @@ global $wpdb;
652
653	// Preview
654	if ( $link ) {
655	- $~~cont~~ .= ~~'<br>' . sprintf~~( ~~__( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' .~~ $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' ~~. '" >', '</a>'~~ );

656	}
657
658	// Process users
	@@ -712,7 +720,8 @@ global $wpdb;
712
713	// Preview
714	if ( $link ) {
715	- $~~cont~~ .= ~~'<br>' . sprintf~~( ~~__( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' .~~ $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' ~~. '" >', '</a>'~~ );

716	}
717
718	// Moderate links
	@@ -791,7 +800,8 @@ global $wpdb;
791
792	// Preview
793	if ( $link ) {
794	- $~~cont~~ .= ~~'<br>' . sprintf~~( ~~__( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' .~~ $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' ~~. '" >', '</a>'~~ );

795	}
796
797	// Moderate links


4	*
5	* Contains mailing functions
6	*
7	+ * Version 8.2.02.002
8	*
9	*/
10

225	'</blockquote>';
226	}
227
228	+ // Preview
229	if ( $link ) {
230	+ $the_link = wppa_encrypt_url( $link . '?album=' . $alb . '&cover=1&occur=1' );
231	$content .=
232	'<br>' .
233	+ sprintf( __( 'You can see the content %shere%s', 'wp-photo-album-plus' ), '<a href="' . $the_link . '" >', '</a>' );
234	}
235
236

313
314	// Preview
315	if ( $link ) {
316	+ $the_link = wppa_encrypt_url( $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' );
317	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $the_link . '" >', '</a>' );
318	}
319
320	// Process all subscribed users

432
433	// Preview
434	if ( $link ) {
435	+ $the_link = wppa_encrypt_url( $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' );
436	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $the_link . '" >', '</a>' );
437	}
438
439	// Process all subscribed users

497
498	// Preview
499	if ( $link ) {
500	+ $the_link = wppa_encrypt_url( $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' );
501	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $the_link . '" >', '</a>' );
502	}
503
504	if ( $user ) {

564
565	// Preview
566	if ( $link ) {
567	+ $the_link = wppa_encrypt_url( $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' );
568	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $the_link . '" >', '</a>' );
569	}
570
571	wppa_send_mail( array( 'to' => $user->user_email,

592
593	// Preview
594	if ( $link ) {
595	+ $the_link = wppa_encrypt_url( $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' );
596	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $the_link . '" >', '</a>' );
597	}
598
599	wppa_send_mail( array( 'to' => $author->user_email,

659
660	// Preview
661	if ( $link ) {
662	+ $the_link = wppa_encrypt_url( $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' );
663	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $the_link . '" >', '</a>' );
664	}
665
666	// Process users

720
721	// Preview
722	if ( $link ) {
723	+ $the_link = wppa_encrypt_url( $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' );
724	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $the_link . '" >', '</a>' );
725	}
726
727	// Moderate links

800
801	// Preview
802	if ( $link ) {
803	+ $the_link = wppa_encrypt_url( $link . '?album=' . $alb . '&photo=' . $pho . '&occur=1' );
804	+ $cont .= '<br>' . sprintf( __( 'You can see the photo %shere%s', 'wp-photo-album-plus' ), '<a href="' . $the_link . '" >', '</a>' );
805	}
806
807	// Moderate links

wppa-settings-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	- * Version 8.2.01.~~008~~
7	*
8	*/
9
	@@ -1665,7 +1665,7 @@ global $wppa_subtab_names;
1665
1666	$name = __('Treecount', 'wp-photo-album-plus' );
1667	$desc = __('Display the total number of (sub)albums and photos in subalbums', 'wp-photo-album-plus' );
1668	- $help = __('Displays the total number of ~~sub~~ ~~albums~~ and photos in the entire album tree in parenthesis if the numbers differ from the direct content of the album.', 'wp-photo-album-plus' );
1669	$slug = 'wppa_show_treecount';
1670	$opts = array( __('none', 'wp-photo-album-plus' ), __('detailed', 'wp-photo-album-plus' ), __('totals only', 'wp-photo-album-plus' ));
1671	$vals = array( '-none-', 'detail', 'total' );
	@@ -1778,8 +1778,8 @@ global $wppa_subtab_names;
1778	wppa_setting_new($slug, '5', $name, $desc, $html, $help);
1779
1780	$name = __('Cats include subs', 'wp-photo-album-plus' );
1781	- $desc = __('~~Child~~ ~~albums~~ are included in Category based shortcodes.', 'wp-photo-album-plus' );
1782	- $help = __('When you use album="#cat,...", in a shortcode, the ~~child~~ ~~albums~~ will be included.', 'wp-photo-album-plus' );
1783	$slug = 'wppa_cats_inherit';
1784	$html = wppa_checkbox($slug);
1785	wppa_setting_new($slug, '6', $name, $desc, $html, $help);
	@@ -2107,7 +2107,7 @@ global $wppa_subtab_names;
2107
2108	if ( wppa_get_option( 'wppa_potd_album_type' ) == 'physical' ) {
2109	$name = __( 'Include (grand)children:', 'wp-photo-album-plus' );
2110	- $desc = __( 'Include the photos of all ~~sub albums~~?', 'wp-photo-album-plus' );
2111	$slug = 'wppa_potd_include_subs';
2112	$html = wppa_checkbox( $slug, 'wppaRefreshAfter();' );
2113	wppa_setting_new( $slug, '9', $name, $desc, $html );
	@@ -5636,7 +5636,7 @@ global $wppa_subtab_names;
5636	wppa_setting_new($slug, '11', $name, $desc, $html, $help);
5637
5638	$name = __('Album cover subalbums link', 'wp-photo-album-plus' );
5639	- $desc = __('Select the linktype and display type for ~~sub-albums~~ on parent album covers.', 'wp-photo-album-plus' );
5640	$help = '';
5641	$slug1 = 'wppa_cover_sublinks';
5642	$slug2 = 'wppa_cover_sublinks_display';
	@@ -7017,7 +7017,7 @@ global $wppa_subtab_names;
7017	case 'selectionbox':
7018	$name = __('Grant parent', 'wp-photo-album-plus' );
7019	$desc = __('The parent album(s) of the auto created albums.', 'wp-photo-album-plus' );
7020	- $help = (__('You may select multiple albums. All logged in visitors will get their own ~~sub-album~~ in each granted parent.', 'wp-photo-album-plus' ));
7021	$slug = 'wppa_grant_parent';
7022	$opts = array( __('--- none ---', 'wp-photo-album-plus' ), __('--- separate ---', 'wp-photo-album-plus' ) );
7023	$vals = array( 'zero', '-1');
	@@ -7152,8 +7152,8 @@ global $wppa_subtab_names;
7152	$desc = __('The album linktype for new albums', 'wp-photo-album-plus' );
7153	$help = '';
7154	$slug = 'wppa_default_album_linktype';
7155	- $opts = array( __('the ~~sub-albums~~ and thumbnails', 'wp-photo-album-plus' ),
7156	- __('the ~~sub-albums~~', 'wp-photo-album-plus' ),
7157	__('the thumbnails', 'wp-photo-album-plus' ),
7158	__('the album photos as slideshow', 'wp-photo-album-plus' ),
7159	__('no link at all', 'wp-photo-album-plus' )
	@@ -8549,7 +8549,7 @@ global $wppa_subtab_names;
8549
8550	$name = __('Remove empty albums', 'wp-photo-album-plus' );
8551	$desc = __('Removes albums that are not used.', 'wp-photo-album-plus' );
8552	- $help = __('Removes all albums that have no photos and no ~~sub~~ ~~albums~~ in it.', 'wp-photo-album-plus' );
8553	$slug2 = 'wppa_remove_empty_albums';
8554	$html1 = '';
8555	$html2 = wppa_maintenance_button( $slug2 );


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

1665
1666	$name = __('Treecount', 'wp-photo-album-plus' );
1667	$desc = __('Display the total number of (sub)albums and photos in subalbums', 'wp-photo-album-plus' );
1668	+ $help = __('Displays the total number of subalbums and photos in the entire album tree in parenthesis if the numbers differ from the direct content of the album.', 'wp-photo-album-plus' );
1669	$slug = 'wppa_show_treecount';
1670	$opts = array( __('none', 'wp-photo-album-plus' ), __('detailed', 'wp-photo-album-plus' ), __('totals only', 'wp-photo-album-plus' ));
1671	$vals = array( '-none-', 'detail', 'total' );

1778	wppa_setting_new($slug, '5', $name, $desc, $html, $help);
1779
1780	$name = __('Cats include subs', 'wp-photo-album-plus' );
1781	+ $desc = __('Subalbums are included in Category based shortcodes.', 'wp-photo-album-plus' );
1782	+ $help = __('When you use album="#cat,...", in a shortcode, the subalbums will be included.', 'wp-photo-album-plus' );
1783	$slug = 'wppa_cats_inherit';
1784	$html = wppa_checkbox($slug);
1785	wppa_setting_new($slug, '6', $name, $desc, $html, $help);

2107
2108	if ( wppa_get_option( 'wppa_potd_album_type' ) == 'physical' ) {
2109	$name = __( 'Include (grand)children:', 'wp-photo-album-plus' );
2110	+ $desc = __( 'Include the photos of all subalbums?', 'wp-photo-album-plus' );
2111	$slug = 'wppa_potd_include_subs';
2112	$html = wppa_checkbox( $slug, 'wppaRefreshAfter();' );
2113	wppa_setting_new( $slug, '9', $name, $desc, $html );

5636	wppa_setting_new($slug, '11', $name, $desc, $html, $help);
5637
5638	$name = __('Album cover subalbums link', 'wp-photo-album-plus' );
5639	+ $desc = __('Select the linktype and display type for subalbums on parent album covers.', 'wp-photo-album-plus' );
5640	$help = '';
5641	$slug1 = 'wppa_cover_sublinks';
5642	$slug2 = 'wppa_cover_sublinks_display';

7017	case 'selectionbox':
7018	$name = __('Grant parent', 'wp-photo-album-plus' );
7019	$desc = __('The parent album(s) of the auto created albums.', 'wp-photo-album-plus' );
7020	+ $help = (__('You may select multiple albums. All logged in visitors will get their own subalbum in each granted parent.', 'wp-photo-album-plus' ));
7021	$slug = 'wppa_grant_parent';
7022	$opts = array( __('--- none ---', 'wp-photo-album-plus' ), __('--- separate ---', 'wp-photo-album-plus' ) );
7023	$vals = array( 'zero', '-1');

7152	$desc = __('The album linktype for new albums', 'wp-photo-album-plus' );
7153	$help = '';
7154	$slug = 'wppa_default_album_linktype';
7155	+ $opts = array( __('the subalbums and thumbnails', 'wp-photo-album-plus' ),
7156	+ __('the subalbums', 'wp-photo-album-plus' ),
7157	__('the thumbnails', 'wp-photo-album-plus' ),
7158	__('the album photos as slideshow', 'wp-photo-album-plus' ),
7159	__('no link at all', 'wp-photo-album-plus' )

8549
8550	$name = __('Remove empty albums', 'wp-photo-album-plus' );
8551	$desc = __('Removes albums that are not used.', 'wp-photo-album-plus' );
8552	+ $help = __('Removes all albums that have no photos and no subalbums in it.', 'wp-photo-album-plus' );
8553	$slug2 = 'wppa_remove_empty_albums';
8554	$html1 = '';
8555	$html2 = wppa_maintenance_button( $slug2 );

wppa-slideshow-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display a slideshow in the sidebar
6	- * Version 8.2.01.002
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
	@@ -196,7 +196,7 @@ class SlideshowWidget extends WP_Widget {
196	wppa_widget_input( $this, 'album', $instance['album'], __( 'Album', 'wp-photo-album-plus' ) );
197	}
198
199	- // Including ~~sub albums~~?
200	wppa_widget_checkbox( $this, 'incsubs', $instance['incsubs'], __( 'Including subalbums', 'wp-photo-album-plus' ) );
201
202	// Max


3	* Package: wp-photo-album-plus
4	*
5	* display a slideshow in the sidebar
6	+ * Version 8.2.02.002
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );

196	wppa_widget_input( $this, 'album', $instance['album'], __( 'Album', 'wp-photo-album-plus' ) );
197	}
198
199	+ // Including subalbums?
200	wppa_widget_checkbox( $this, 'incsubs', $instance['incsubs'], __( 'Including subalbums', 'wp-photo-album-plus' ) );
201
202	// Max

wppa-statistics.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* Functions for counts etc
6	* Common use front and admin
7	- * Version 8.1.08.~~003~~
8	*
9	*/
10
	@@ -406,7 +406,7 @@ global $wpdb;
406	return $treecounts;
407	}
408
409	- // Get the ids of the ~~child albums~~
410	$child_ids = $wpdb->get_col( "SELECT id " .
411	"FROM $wpdb->wppa_albums " .
412	"WHERE a_parent = $alb"


4	*
5	* Functions for counts etc
6	* Common use front and admin
7	+ * Version 8.2.02.002
8	*
9	*/
10

406	return $treecounts;
407	}
408
409	+ // Get the ids of the subalbums
410	$child_ids = $wpdb->get_col( "SELECT id " .
411	"FROM $wpdb->wppa_albums " .
412	"WHERE a_parent = $alb"

wppa-topten-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display the top rated photos
6	- * Version 8.2.01.~~001~~
7	*/
8
9	class TopTenWidget extends WP_Widget {
	@@ -595,8 +595,8 @@ class TopTenWidget extends WP_Widget {
595
596	wppa_widget_selection( $this, 'sortby', $instance['sortby'], __( 'Sort by', 'wp-photo-album-plus' ), $options, $values );
597
598	- // Include ~~sub albums~~
599	- wppa_widget_checkbox( $this, 'includesubs', $instance['includesubs'], __( 'Include ~~sub albums~~', 'wp-photo-album-plus' ) );
600
601	// Medals only
602	wppa_widget_checkbox( $this, 'medalsonly', $instance['medalsonly'], __( 'Only with medals', 'wp-photo-album-plus' ) );


3	* Package: wp-photo-album-plus
4	*
5	* display the top rated photos
6	+ * Version 8.2.02.002
7	*/
8
9	class TopTenWidget extends WP_Widget {

595
596	wppa_widget_selection( $this, 'sortby', $instance['sortby'], __( 'Sort by', 'wp-photo-album-plus' ), $options, $values );
597
598	+ // Include subalbums
599	+ wppa_widget_checkbox( $this, 'includesubs', $instance['includesubs'], __( 'Include subalbums', 'wp-photo-album-plus' ) );
600
601	// Medals only
602	wppa_widget_checkbox( $this, 'medalsonly', $instance['medalsonly'], __( 'Only with medals', 'wp-photo-album-plus' ) );

wppa-upldr-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display a list of users linking to their photos
6	- * Version 8.2.01.~~001~~
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
	@@ -228,7 +228,7 @@ class UpldrWidget extends WP_Widget {
228	?>
229
230
231	- <p><label for="<?php echo $this->get_field_id('parent'); ?>"><?php _e('Look only in albums (including ~~sub-albums~~):', 'wp-photo-album-plus' ); ?></label>
232	<input type="hidden" id="<?php echo $this->get_field_id('parent'); ?>" name="<?php echo $this->get_field_name('parent'); ?>" value="<?php echo $instance['parent'] ?>" />
233	<?php if ( $instance['parent'] ) echo '<br/><small>( '.$instance['parent'].' )</small>' ?>
234	<select class="widefat" multiple onchange="wppaGetSelEnumToId( 'parentalbums-<?php echo $this->get_widget_id() ?>', '<?php echo $this->get_field_id('parent') ?>' )" id="<?php echo $this->get_field_id('parent-list'); ?>" name="<?php echo $this->get_field_name('parent-list'); ?>" >


3	* Package: wp-photo-album-plus
4	*
5	* display a list of users linking to their photos
6	+ * Version 8.2.02.002
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );

228	?>
229
230
231	+ <p><label for="<?php echo $this->get_field_id('parent'); ?>"><?php _e('Look only in albums (including subalbums):', 'wp-photo-album-plus' ); ?></label>
232	<input type="hidden" id="<?php echo $this->get_field_id('parent'); ?>" name="<?php echo $this->get_field_name('parent'); ?>" value="<?php echo $instance['parent'] ?>" />
233	<?php if ( $instance['parent'] ) echo '<br/><small>( '.$instance['parent'].' )</small>' ?>
234	<select class="widefat" multiple onchange="wppaGetSelEnumToId( 'parentalbums-<?php echo $this->get_widget_id() ?>', '<?php echo $this->get_field_id('parent') ?>' )" id="<?php echo $this->get_field_id('parent-list'); ?>" name="<?php echo $this->get_field_name('parent-list'); ?>" >

wppa-utils.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains low-level utility routines
6	- * Version 8.2.01.~~005~~
7	*
8	*/
9
	@@ -2534,7 +2534,7 @@ global $wpdb;
2534	}
2535	}
2536
2537	- // Retrieve the number of ~~child~~ ~~albums~~ ( if any )
2538	function wppa_has_children( $alb ) {
2539	global $wpdb;
2540	static $childcounts;


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

2534	}
2535	}
2536
2537	+ // Retrieve the number of subalbums ( if any )
2538	function wppa_has_children( $alb ) {
2539	global $wpdb;
2540	static $childcounts;

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.2.02.~~001~~
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.2.02.~~001~~'; // 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.2.02.002
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.2.02.002'; // WPPA software version
28	global $wppa_revno;
29	$wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30