WP Photo Album Plus - Version 8.1.10.004

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.1.10.004
Comparing to
See all releases

Code changes from version 8.1.10.003 to 8.1.10.004

Files changed (8) hide show

wppa-ajax.php +25 -7
wppa-photo-files.php +2 -2
wppa-scripts.php +12 -7
wppa-setting-functions.php +7 -7
wppa-settings-autosave.php +23 -23
wppa-utils.php +5 -1
wppa-wrappers.php +4 -2
wppa.php +2 -2

wppa-ajax.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-ajax.php
3	*
4	* Functions used in ajax requests
5	- * Version 8.1.10.~~003~~
6	*
7	*/
8
	@@ -1491,14 +1491,32 @@ global $wppa;
1491
1492	// Render
1493	$result = wppa_albums();


1494	$result = wppa_make_relative( $result );
1495	- $result = wppa_compress_html( $result );
1496	- $result .= wppa_print_psjs( true );
1497
1498	- ~~$result_a~~ = ~~wppa_split_html_js(~~ ~~$result );~~
1499	- $~~result~~ = ~~wp_json_encode~~( ~~['html'~~ ~~=> $result_a['html'], 'js' => $result_a['js']]~~ );

















1500
1501	- ~~echo(~~ ~~$result );~~

1502
1503	$tim_2 = microtime( true );
1504	$nq_2 = get_num_queries();
	@@ -4139,7 +4157,7 @@ function wppa_json_photo_update( $id, $txt, $err = '0', $thumbmod = false, $phot
4139	// Convert html with script tags to json format like {html:html-text,js:jstext-without-script-tags}
4140	function wppa_split_html_js( $text ) {
4141
4142	- $text = preg_replace( '/<script~~(.*)>/~~i', '<script>', $text );
4143	$workarr = explode( '<script>', $text );
4144
4145	// Any js present?


2	/* wppa-ajax.php
3	*
4	* Functions used in ajax requests
5	+ * Version 8.1.10.004
6	*
7	*/
8

1491
1492	// Render
1493	$result = wppa_albums();
1494	+
1495	+ // Make relative urls if configured
1496	$result = wppa_make_relative( $result );


1497
1498	+ // Get the JS
1499	+ $js = wppa_print_psjs( true );
1500	+
1501	+ // Split result into HTML and JS (if any, it should not contain js)
1502	+ $result = wppa_split_html_js( $result );
1503	+
1504	+ // Combine standard js and optional js found during split
1505	+ if ( $result['js'] ) {
1506	+ $js .= $result['js'];
1507	+
1508	+ // Issue warning message
1509	+ wppa_log( 'war', 'Unexpected js found in ajax render: ' . esc_hrml( $result['js'] ), true );
1510	+ }
1511	+
1512	+ // Compress html
1513	+ $html = wppa_compress_html( $result['html'] );
1514	+
1515	+ // Compress js
1516	+ $js = wppa_compress_js( $js );
1517
1518	+ // Output
1519	+ echo wp_json_encode( ['html' => $html, 'js' => $js] );
1520
1521	$tim_2 = microtime( true );
1522	$nq_2 = get_num_queries();

4157	// Convert html with script tags to json format like {html:html-text,js:jstext-without-script-tags}
4158	function wppa_split_html_js( $text ) {
4159
4160	+ $text = preg_replace( '/<script[^>]*?>/i', '<script>', $text );
4161	$workarr = explode( '<script>', $text );
4162
4163	// Any js present?

wppa-photo-files.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-photo-files.php
3	*
4	* Functions used to create/manipulate photofiles
5	- * Version 8.1.09.~~001~~
6	*
7	*/
8
	@@ -144,7 +144,7 @@ function wppa_orientate_image_file( $file, $ori ) {
144	// The id and extension must be supplied.
145	function wppa_make_the_photo_files( $file, $id, $ext, $do_thumb = true ) {
146	global $wpdb;
147	- wppa_log('dbg', 'make called with'.$file.' '.$id.' '.$ext.' '.$do_thumb. ' exists=' . is_file($file), true);
148	$thumb = wppa_cache_thumb( $id );
149
150	$documentstub = WPPA_UPLOAD_PATH . '/documentstub.png';


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

144	// The id and extension must be supplied.
145	function wppa_make_the_photo_files( $file, $id, $ext, $do_thumb = true ) {
146	global $wpdb;
147	+ // wppa_log('dbg', 'make called with'.$file.' '.$id.' '.$ext.' '.$do_thumb. ' exists=' . is_file($file), true);
148	$thumb = wppa_cache_thumb( $id );
149
150	$documentstub = WPPA_UPLOAD_PATH . '/documentstub.png';

wppa-scripts.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* This file contains all functions for activating javascript
6	*
7	- * Version 8.1.09.~~003~~
8	*/
9
10	// Place all wppa related js declarations in the header, both admin and frontend
	@@ -696,20 +696,25 @@ global $wppa_js_page_data;
696	global $wppa_script_open;
697
698	if ( $wppa_js_page_data ) {
699	- $result = '
700	- <!-- WPPA Page specific js -->
701	- <script>' . wppa_compress_js( $wppa_js_page_data ) . '</script>';
702	-
703	- $wppa_js_page_data = '';
704	- $wppa_script_open = false;
705
706	if ( $return ) {

707	return $result;
708	}
709	else {







710	echo $result;
711	}
712	}



713	}
714
715	// Compress javascript


4	*
5	* This file contains all functions for activating javascript
6	*
7	+ * Version 8.1.10.004
8	*/
9
10	// Place all wppa related js declarations in the header, both admin and frontend

696	global $wppa_script_open;
697
698	if ( $wppa_js_page_data ) {






699
700	if ( $return ) {
701	+ $result = wppa_compress_js( $wppa_js_page_data );
702	return $result;
703	}
704	else {
705	+ $result = '
706	+ <!-- WPPA Page specific js -->
707	+ <script>' . wppa_compress_js( $wppa_js_page_data ) . '</script>';
708	+
709	+ $wppa_js_page_data = '';
710	+ $wppa_script_open = false;
711	+
712	echo $result;
713	}
714	}
715	+ elseif ( $return ) {
716	+ return false;
717	+ }
718	}
719
720	// Compress javascript

wppa-setting-functions.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	- * Version 8.1.~~09.004~~
7	*
8	*/
9
	@@ -24,7 +24,7 @@ global $wppa_opt;
24	esc_attr( $onchange ) . ';
25	wppaAjaxUpdateOptionValue(\'' . $slug . '\', this);"
26	placeholder="' . $placeholder . '"
27	- value="' . $val . '"
28	/>
29	<img
30	id="img_' . $slug . '"
	@@ -753,11 +753,11 @@ global $wppa_setting_error;
753	if ( $help ) {
754	$is_dflt = true;
755
756	- $helptext = $help;
757
758	if ( ! $no_default ) {
759	if ( $slugs && wppa_dflt($slugs[0]) ) {
760	- $helptext .= '<br>' . __( 'The default for this setting is:', 'wp-photo-album-plus' );
761	if ( count($slugs) == 1) {
762	if ( $slugs[0] != '' ) {
763	$helptext .= ' '.htmlspecialchars(wppa_dflt($slugs[0]));
	@@ -789,10 +789,10 @@ global $wppa_setting_error;
789	'">' .
790
791	// The item number
792	- '<td>' . $xnum . '</td>' .
793
794	// The Item name
795	- '<td>' . $name . '</td>' .
796
797	// The item description
798	'<td><small>' . $desc . '</small></td>';
	@@ -885,7 +885,7 @@ global $wppa_cur_subtab_id;
885	<h3>' .
886	$greek[$wppa_cur_subtab_id] .
887	': ' .
888	- $desc .
889	'</h3>
890	<span
891	id="' . $wppa_cur_subtab . '-cm"


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

24	esc_attr( $onchange ) . ';
25	wppaAjaxUpdateOptionValue(\'' . $slug . '\', this);"
26	placeholder="' . $placeholder . '"
27	+ value="' . esc_attr( $val ) . '"
28	/>
29	<img
30	id="img_' . $slug . '"

753	if ( $help ) {
754	$is_dflt = true;
755
756	+ $helptext = esc_html( $help );
757
758	if ( ! $no_default ) {
759	if ( $slugs && wppa_dflt($slugs[0]) ) {
760	+ $helptext .= '<br>' . esc_html__( 'The default for this setting is:', 'wp-photo-album-plus' );
761	if ( count($slugs) == 1) {
762	if ( $slugs[0] != '' ) {
763	$helptext .= ' '.htmlspecialchars(wppa_dflt($slugs[0]));

789	'">' .
790
791	// The item number
792	+ '<td>' . esc_html( $xnum ) . '</td>' .
793
794	// The Item name
795	+ '<td>' . esc_html( $name ) . '</td>' .
796
797	// The item description
798	'<td><small>' . $desc . '</small></td>';

885	<h3>' .
886	$greek[$wppa_cur_subtab_id] .
887	': ' .
888	+ esc_html( $desc ) .
889	'</h3>
890	<span
891	id="' . $wppa_cur_subtab . '-cm"

wppa-settings-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	- * Version 8.1.10.~~001~~
7	*
8	*/
9
	@@ -1554,7 +1554,7 @@ global $wppa_subtab_names;
1554	$desc = __('The minimal height of the album description text frame.', 'wp-photo-album-plus' );
1555	$help = __('The minimal height of the description field in an album cover display.', 'wp-photo-album-plus' );
1556	$help .= '<br>'.__('This setting enables you to give the album covers the same height provided that the cover images are equally sized and the titles fit on one line.', 'wp-photo-album-plus' );
1557	- $help .= '<br>'.__('To force the coverphotos have equal heights, tick the box in ~~<b>~~Albums -> I -> Size is height~~</b>~~', 'wp-photo-album-plus' );
1558	$help .= '<br>'.__('You may need this setting if changing the previous setting is not sufficient to line-up the covers.', 'wp-photo-album-plus' );
1559	$slug = 'wppa_text_frame_height';
1560	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus' ));
	@@ -1605,7 +1605,7 @@ global $wppa_subtab_names;
1605	$name = __('Size is height', 'wp-photo-album-plus' );
1606	$desc = __('The size of the coverphoto is the height of it.', 'wp-photo-album-plus' );
1607	$help = __('If set: the previous setting is the height, if unset: the largest of width and height.', 'wp-photo-album-plus' );
1608	- $help .= '<br>'.__('This setting applies for coverphoto position top or bottom only (~~<b>~~Albums -> III -> Placement~~</b>~~).', 'wp-photo-album-plus' );
1609	$help .= '<br>'.__('This makes it easyer to make the covers of equal height.', 'wp-photo-album-plus' );
1610	$slug = 'wppa_coversize_is_height';
1611	$html = wppa_checkbox($slug);
	@@ -1723,7 +1723,7 @@ global $wppa_subtab_names;
1723
1724	$name = __('Placement', 'wp-photo-album-plus' );
1725	$desc = __('Cover image position.', 'wp-photo-album-plus' );
1726	- $help = __('Enter the position that you want to be used for the default album cover selected in ~~<b>~~Albums -> III -> Cover type~~</b>~~', 'wp-photo-album-plus' );
1727	$help .= '<br>'.__('For covertype Image Factory: left will be treated as top and right will be treted as bottom.', 'wp-photo-album-plus' );
1728	$help .= '<br>'.__('For covertype Long Descriptions: top will be treated as left and bottom will be treted as right.', 'wp-photo-album-plus' );
1729	$slug = 'wppa_coverphoto_pos';
	@@ -1749,7 +1749,7 @@ global $wppa_subtab_names;
1749	$name = __('Cover type', 'wp-photo-album-plus' );
1750	$desc = __('Select the default cover type.', 'wp-photo-album-plus' );
1751	$help = __('Types with the addition mcr are suitable for Multi Column in a Responsive theme', 'wp-photo-album-plus' );
1752	- $help .= '<br>'.__("Type 'Grid with images only' is always responsive and requires a fixed aspect ratio selected for thumbnails in ~~<b>~~Thumbnails -> I -> Thumbnail Aspect~~</b>~~", 'wp-photo-album-plus' );
1753	$slug = 'wppa_cover_type';
1754	$opts = array( __('Standard', 'wp-photo-album-plus' ),
1755	__('Long Descriptions', 'wp-photo-album-plus' ),
	@@ -1771,7 +1771,7 @@ global $wppa_subtab_names;
1771	wppa_setting_new($slug, '4', $name, $desc, $html, $help);
1772
1773	$name = __('Number of coverphotos', 'wp-photo-album-plus' );
1774	- $desc = __('The ~~umber~~ of coverphotos. Must be > 1 and < 25.', 'wp-photo-album-plus' );
1775	$help = '';
1776	$slug = 'wppa_imgfact_count';
1777	$html = wppa_input($slug, '50px', '', __('photos', 'wp-photo-album-plus' ));
	@@ -2566,7 +2566,7 @@ global $wppa_subtab_names;
2566	$help = __('Enter the size of the popup images. This size should be larger than the thumbnail size.', 'wp-photo-album-plus' );
2567	$help .= '<br>'.__('This size should also be at least the cover image size.', 'wp-photo-album-plus' );
2568	$help .= '<br>'.__('Changing the popup size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus' );
2569	- $help .= '<br>'.__('Although this setting has only visual effect if "Thumb popup" (~~<b>~~Thumbnails -> III -> Thumb popup~~</b>~~) is checked,', 'wp-photo-album-plus' );
2570	$help .= ' '.__('the value must be right as it is the physical size of the thumbnail and coverphoto images.', 'wp-photo-album-plus' );
2571	$slug = 'wppa_popupsize';
2572	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus' ));
	@@ -2575,7 +2575,7 @@ global $wppa_subtab_names;
2575	$name = __('Use thumbs if fit', 'wp-photo-album-plus' );
2576	$desc = __('Use the thumbnail image files if they are large enough.', 'wp-photo-album-plus' );
2577	$help = __('This setting speeds up page loading for small photos.', 'wp-photo-album-plus' );
2578	- $help .= '<br>'.__('Do NOT use this when your thumbnails have a forced aspect ratio (when ~~<b>~~Thumbnails -> I -> Thumbnail Aspect~~</b>~~ is set to anything different from --- same as fullsize ---)', 'wp-photo-album-plus' );
2579	$slug = 'wppa_use_thumbs_if_fit';
2580	$html = wppa_checkbox($slug);
2581	wppa_setting_new($slug, '13', $name, $desc, $html, $help);
	@@ -3910,7 +3910,7 @@ global $wppa_subtab_names;
3910
3911	$name = __('Avatar size', 'wp-photo-album-plus' );
3912	$desc = __('Size of Avatar images.', 'wp-photo-album-plus' );
3913	- $help = __('The size of the square avatar; must be > 0 and < 256', 'wp-photo-album-plus' );
3914	$slug = 'wppa_gravatar_size';
3915	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus' ));
3916	wppa_setting_new($slug, '15', $name, $desc, $html, $help);
	@@ -4075,8 +4075,8 @@ global $wppa_subtab_names;
4075
4076	$name = __('Dislike value', 'wp-photo-album-plus' );
4077	$desc = __('This value counts dislike rating.', 'wp-photo-album-plus' );
4078	- $help = (__('This value will be used for a dislike rating on calculation of avarage ratings.', 'wp-photo-album-plus' ));
4079	- $help .= '<br>'.(__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus' ));
4080	$slug = 'wppa_dislike_value';
4081	$html = wppa_input($slug, '50px', '', __('points', 'wp-photo-album-plus' ));
4082	wppa_setting_new($slug, '18', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );
	@@ -4290,7 +4290,7 @@ global $wppa_subtab_names;
4290	$slug2 = 'wppa_search_oc';
4291	$opts2 = array('1','2','3','4','5');
4292	$vals2 = array('1','2','3','4','5');
4293	- $html2 = '<div style="float:right"><div style="font-size:9px;~~foat~~:left;" class="" >'.__('Occur', 'wp-photo-album-plus' ).'</div>'.wppa_select($slug2, $opts2, $vals2).'</div>';
4294
4295	$html = $html1 . $html2;
4296	wppa_setting_new(false, '1', $name, $desc, $html, $help);
	@@ -4426,7 +4426,7 @@ global $wppa_subtab_names;
4426	$desc = __('Exclude these words from search index.', 'wp-photo-album-plus' );
4427	$help = __('Enter words separated by commas (,)', 'wp-photo-album-plus' );
4428	$slug = 'wppa_search_user_void';
4429	- $html = wppa_input($slug, '90%;');
4430	wppa_setting_new($slug, '19', $name, $desc, $html, $help);
4431
4432	$name = __('Exclude numbers', 'wp-photo-album-plus' );
	@@ -4602,7 +4602,7 @@ global $wppa_subtab_names;
4602
4603	$name = __('Thumbnail count', 'wp-photo-album-plus' );
4604	$desc = __('Number of photos in Thumbnail widget.', 'wp-photo-album-plus' );
4605	- $help = (__('Enter the maximum number of rated photos in the Thumbnail widget.', 'wp-photo-album-plus' ));
4606	$slug = 'wppa_thumbnail_widget_count';
4607	$html = wppa_input($slug, '40px', '', __('photos', 'wp-photo-album-plus' ));
4608	wppa_setting_new($slug, '6', $name, $desc, $html, $help);
	@@ -5410,7 +5410,7 @@ global $wppa_subtab_names;
5410	$vals[] = '-1';
5411	$html2 = wppa_select($slug2, $opts, $vals, 'wppaRefreshAfter();');
5412	$html3 = wppa_checkbox($slug3);
5413	- $html4 = '<div style="font-size:9px;~~foat~~:left;" class="'.$clas.'" >'.__('Occur', 'wp-photo-album-plus' ).'</div>'.wppa_select($slug4, $opts4, $vals4);
5414	$html = array($html1, $html2, $html3, $html4);
5415	wppa_setting_new($slug, '11', $name, $desc, $html, $help);
5416
	@@ -5441,7 +5441,7 @@ global $wppa_subtab_names;
5441	$vals[] = '-1';
5442	$html2 = wppa_select($slug2, $opts, $vals);
5443	$html3 = wppa_checkbox($slug3);
5444	- $html4 = '<div style="font-size:9px;~~foat~~:left;" class="" >'.__('Occur', 'wp-photo-album-plus' ).'</div>'.wppa_select($slug4, $opts4, $vals4);
5445	$html = array($html1, $html2, $html3, $html4);
5446	wppa_setting_new($slug, '12', $name, $desc, $html, $help);
5447
	@@ -5485,7 +5485,7 @@ global $wppa_subtab_names;
5485	$html3 = '';
5486	$opts4 = array('1','2','3','4','5');
5487	$vals4 = array('1','2','3','4','5');
5488	- $html4 = '<div style="font-size:9px;~~foat~~:left;" class="" >'.__('Occur', 'wp-photo-album-plus' ).'</div>'.wppa_select($slug4, $opts4, $vals4);
5489	$html = array($html1, $html2, $html3, $html4);
5490	wppa_setting_new($slug, '14', $name, $desc, $html, $help);
5491
	@@ -5703,7 +5703,7 @@ global $wppa_subtab_names;
5703
5704	$name = __('Album id on cover is link', 'wp-photo-album-plus' );
5705	$desc = __('The album number on the cover links to the album admin page of the album', 'wp-photo-album-plus' );
5706	- $help = __('~~<b>~~Album id on cover~~</b>~~ must be enabled. The ids are only links when the user has edit album acces to the album', 'wp-photo-album-plus' );
5707	$slug1 = 'wppa_fe_albid_edit';
5708	$slug2 = '';
5709	$slug3 = '';
	@@ -6000,7 +6000,7 @@ global $wppa_subtab_names;
6000
6001	$name = __('Mail on upload', 'wp-photo-album-plus' );
6002	$desc = __('Enable mailing users when a frontend upload has been done', 'wp-photo-album-plus' );
6003	- $help = (__('When moderation is required, the mails will be sent after approval', 'wp-photo-album-plus' ));
6004	$slug1 = 'wppa_feuploadnotify';
6005	$slug2 = 'wppa_beuploadnotify';
6006	$slug3 = 'wppa_show_email_thumbs';
	@@ -6103,7 +6103,7 @@ global $wppa_subtab_names;
6103
6104	$name = __('Retry failed mails', 'wp-photo-album-plus' );
6105	$desc = __('Select number of retries for failed mails', 'wp-photo-album-plus' );
6106	- $help = (__('Retries occur at the background every hour', 'wp-photo-album-plus' ));
6107	$slug = 'wppa_retry_mails';
6108	$html = wppa_number($slug, '1', '24');
6109	wppa_setting_new($slug, '14', $name, $desc, $html, $help);
	@@ -7155,14 +7155,14 @@ global $wppa_subtab_names;
7155
7156	$name = __('Default coverphoto', 'wp-photo-album-plus' );
7157	$desc = __('Name of photofile to become cover image', 'wp-photo-album-plus' );
7158	- $help = (__('If you name a photofile like this setting before upload, it will become the coverimage automatically.', 'wp-photo-album-plus' ));
7159	$slug = 'wppa_default_coverimage_name';
7160	$html = wppa_input($slug, '150px');
7161	wppa_setting_new($slug, '30', $name, $desc, $html, $help);
7162
7163	$name = __('Copy Timestamp', 'wp-photo-album-plus' );
7164	$desc = __('Copy timestamp when copying photo.', 'wp-photo-album-plus' );
7165	- $help = (__('If checked, the copied photo is not "new"', 'wp-photo-album-plus' ));
7166	$slug = 'wppa_copy_timestamp';
7167	$html = wppa_checkbox($slug);
7168	wppa_setting_new($slug, '31', $name, $desc, $html, $help);
	@@ -8033,7 +8033,7 @@ global $wppa_subtab_names;
8033	wppa_setting_new($slug, '4', $name, $desc, $html, $help);
8034
8035	$name = __('Photo admin page size', 'wp-photo-album-plus' );
8036	- $desc = __('The number of photos per page on the ~~<br/>~~Edit Album -> Manage photos and Edit Photos admin pages.', 'wp-photo-album-plus' );
8037	$help = '';
8038	$slug = 'wppa_photo_admin_pagesize';
8039	$opts = array( '10', '20', '50', '100', '200', '500', '700', '1000' );


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

1554	$desc = __('The minimal height of the album description text frame.', 'wp-photo-album-plus' );
1555	$help = __('The minimal height of the description field in an album cover display.', 'wp-photo-album-plus' );
1556	$help .= '<br>'.__('This setting enables you to give the album covers the same height provided that the cover images are equally sized and the titles fit on one line.', 'wp-photo-album-plus' );
1557	+ $help .= '<br>'.__('To force the coverphotos have equal heights, tick the box in Albums -> I -> Size is height', 'wp-photo-album-plus' );
1558	$help .= '<br>'.__('You may need this setting if changing the previous setting is not sufficient to line-up the covers.', 'wp-photo-album-plus' );
1559	$slug = 'wppa_text_frame_height';
1560	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus' ));

1605	$name = __('Size is height', 'wp-photo-album-plus' );
1606	$desc = __('The size of the coverphoto is the height of it.', 'wp-photo-album-plus' );
1607	$help = __('If set: the previous setting is the height, if unset: the largest of width and height.', 'wp-photo-album-plus' );
1608	+ $help .= '<br>'.__('This setting applies for coverphoto position top or bottom only (Albums -> III -> Placement).', 'wp-photo-album-plus' );
1609	$help .= '<br>'.__('This makes it easyer to make the covers of equal height.', 'wp-photo-album-plus' );
1610	$slug = 'wppa_coversize_is_height';
1611	$html = wppa_checkbox($slug);

1723
1724	$name = __('Placement', 'wp-photo-album-plus' );
1725	$desc = __('Cover image position.', 'wp-photo-album-plus' );
1726	+ $help = __('Enter the position that you want to be used for the default album cover selected in Albums -> III -> Cover type', 'wp-photo-album-plus' );
1727	$help .= '<br>'.__('For covertype Image Factory: left will be treated as top and right will be treted as bottom.', 'wp-photo-album-plus' );
1728	$help .= '<br>'.__('For covertype Long Descriptions: top will be treated as left and bottom will be treted as right.', 'wp-photo-album-plus' );
1729	$slug = 'wppa_coverphoto_pos';

1749	$name = __('Cover type', 'wp-photo-album-plus' );
1750	$desc = __('Select the default cover type.', 'wp-photo-album-plus' );
1751	$help = __('Types with the addition mcr are suitable for Multi Column in a Responsive theme', 'wp-photo-album-plus' );
1752	+ $help .= '<br>'.__("Type 'Grid with images only' is always responsive and requires a fixed aspect ratio selected for thumbnails in Thumbnails -> I -> Thumbnail Aspect", 'wp-photo-album-plus' );
1753	$slug = 'wppa_cover_type';
1754	$opts = array( __('Standard', 'wp-photo-album-plus' ),
1755	__('Long Descriptions', 'wp-photo-album-plus' ),

1771	wppa_setting_new($slug, '4', $name, $desc, $html, $help);
1772
1773	$name = __('Number of coverphotos', 'wp-photo-album-plus' );
1774	+ $desc = __('The number of coverphotos. Must be > 1 and < 25.', 'wp-photo-album-plus' );
1775	$help = '';
1776	$slug = 'wppa_imgfact_count';
1777	$html = wppa_input($slug, '50px', '', __('photos', 'wp-photo-album-plus' ));

2566	$help = __('Enter the size of the popup images. This size should be larger than the thumbnail size.', 'wp-photo-album-plus' );
2567	$help .= '<br>'.__('This size should also be at least the cover image size.', 'wp-photo-album-plus' );
2568	$help .= '<br>'.__('Changing the popup size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus' );
2569	+ $help .= '<br>'.__('Although this setting has only visual effect if "Thumb popup" (Thumbnails -> III -> Thumb popup) is checked,', 'wp-photo-album-plus' );
2570	$help .= ' '.__('the value must be right as it is the physical size of the thumbnail and coverphoto images.', 'wp-photo-album-plus' );
2571	$slug = 'wppa_popupsize';
2572	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus' ));

2575	$name = __('Use thumbs if fit', 'wp-photo-album-plus' );
2576	$desc = __('Use the thumbnail image files if they are large enough.', 'wp-photo-album-plus' );
2577	$help = __('This setting speeds up page loading for small photos.', 'wp-photo-album-plus' );
2578	+ $help .= '<br>'.__('Do NOT use this when your thumbnails have a forced aspect ratio (when Thumbnails -> I -> Thumbnail Aspect is set to anything different from --- same as fullsize ---)', 'wp-photo-album-plus' );
2579	$slug = 'wppa_use_thumbs_if_fit';
2580	$html = wppa_checkbox($slug);
2581	wppa_setting_new($slug, '13', $name, $desc, $html, $help);

3910
3911	$name = __('Avatar size', 'wp-photo-album-plus' );
3912	$desc = __('Size of Avatar images.', 'wp-photo-album-plus' );
3913	+ $help = __('The size of the square avatar must be > 0 and < 256', 'wp-photo-album-plus' );
3914	$slug = 'wppa_gravatar_size';
3915	$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus' ));
3916	wppa_setting_new($slug, '15', $name, $desc, $html, $help);

4075
4076	$name = __('Dislike value', 'wp-photo-album-plus' );
4077	$desc = __('This value counts dislike rating.', 'wp-photo-album-plus' );
4078	+ $help = __('This value will be used for a dislike rating on calculation of avarage ratings.', 'wp-photo-album-plus' );
4079	+ $help .= '<br>'.__('If "One button vote" is selected in item 5, this setting has no meaning', 'wp-photo-album-plus' );
4080	$slug = 'wppa_dislike_value';
4081	$html = wppa_input($slug, '50px', '', __('points', 'wp-photo-album-plus' ));
4082	wppa_setting_new($slug, '18', $name, $desc, $html, $help, wppa_opt( 'rating_max' ) != '1' );

4290	$slug2 = 'wppa_search_oc';
4291	$opts2 = array('1','2','3','4','5');
4292	$vals2 = array('1','2','3','4','5');
4293	+ $html2 = '<div style="float:right"><div style="font-size:9px;float:left;" class="" >'.__('Occur', 'wp-photo-album-plus' ).'</div>'.wppa_select($slug2, $opts2, $vals2).'</div>';
4294
4295	$html = $html1 . $html2;
4296	wppa_setting_new(false, '1', $name, $desc, $html, $help);

4426	$desc = __('Exclude these words from search index.', 'wp-photo-album-plus' );
4427	$help = __('Enter words separated by commas (,)', 'wp-photo-album-plus' );
4428	$slug = 'wppa_search_user_void';
4429	+ $html = wppa_input($slug, '60%;');
4430	wppa_setting_new($slug, '19', $name, $desc, $html, $help);
4431
4432	$name = __('Exclude numbers', 'wp-photo-album-plus' );

4602
4603	$name = __('Thumbnail count', 'wp-photo-album-plus' );
4604	$desc = __('Number of photos in Thumbnail widget.', 'wp-photo-album-plus' );
4605	+ $help = __('Enter the maximum number of rated photos in the Thumbnail widget.', 'wp-photo-album-plus' );
4606	$slug = 'wppa_thumbnail_widget_count';
4607	$html = wppa_input($slug, '40px', '', __('photos', 'wp-photo-album-plus' ));
4608	wppa_setting_new($slug, '6', $name, $desc, $html, $help);

5410	$vals[] = '-1';
5411	$html2 = wppa_select($slug2, $opts, $vals, 'wppaRefreshAfter();');
5412	$html3 = wppa_checkbox($slug3);
5413	+ $html4 = '<div style="font-size:9px;float:left;" class="'.$clas.'" >'.__('Occur', 'wp-photo-album-plus' ).'</div>'.wppa_select($slug4, $opts4, $vals4);
5414	$html = array($html1, $html2, $html3, $html4);
5415	wppa_setting_new($slug, '11', $name, $desc, $html, $help);
5416

5441	$vals[] = '-1';
5442	$html2 = wppa_select($slug2, $opts, $vals);
5443	$html3 = wppa_checkbox($slug3);
5444	+ $html4 = '<div style="font-size:9px;float:left;" class="" >'.__('Occur', 'wp-photo-album-plus' ).'</div>'.wppa_select($slug4, $opts4, $vals4);
5445	$html = array($html1, $html2, $html3, $html4);
5446	wppa_setting_new($slug, '12', $name, $desc, $html, $help);
5447

5485	$html3 = '';
5486	$opts4 = array('1','2','3','4','5');
5487	$vals4 = array('1','2','3','4','5');
5488	+ $html4 = '<div style="font-size:9px;float:left;" class="" >'.__('Occur', 'wp-photo-album-plus' ).'</div>'.wppa_select($slug4, $opts4, $vals4);
5489	$html = array($html1, $html2, $html3, $html4);
5490	wppa_setting_new($slug, '14', $name, $desc, $html, $help);
5491

5703
5704	$name = __('Album id on cover is link', 'wp-photo-album-plus' );
5705	$desc = __('The album number on the cover links to the album admin page of the album', 'wp-photo-album-plus' );
5706	+ $help = __('Album id on cover must be enabled. The ids are only links when the user has edit album acces to the album', 'wp-photo-album-plus' );
5707	$slug1 = 'wppa_fe_albid_edit';
5708	$slug2 = '';
5709	$slug3 = '';

6000
6001	$name = __('Mail on upload', 'wp-photo-album-plus' );
6002	$desc = __('Enable mailing users when a frontend upload has been done', 'wp-photo-album-plus' );
6003	+ $help = __('When moderation is required, the mails will be sent after approval', 'wp-photo-album-plus' );
6004	$slug1 = 'wppa_feuploadnotify';
6005	$slug2 = 'wppa_beuploadnotify';
6006	$slug3 = 'wppa_show_email_thumbs';

6103
6104	$name = __('Retry failed mails', 'wp-photo-album-plus' );
6105	$desc = __('Select number of retries for failed mails', 'wp-photo-album-plus' );
6106	+ $help = __('Retries occur at the background every hour', 'wp-photo-album-plus' );
6107	$slug = 'wppa_retry_mails';
6108	$html = wppa_number($slug, '1', '24');
6109	wppa_setting_new($slug, '14', $name, $desc, $html, $help);

7155
7156	$name = __('Default coverphoto', 'wp-photo-album-plus' );
7157	$desc = __('Name of photofile to become cover image', 'wp-photo-album-plus' );
7158	+ $help = __('If you name a photofile like this setting before upload, it will become the coverimage automatically.', 'wp-photo-album-plus' );
7159	$slug = 'wppa_default_coverimage_name';
7160	$html = wppa_input($slug, '150px');
7161	wppa_setting_new($slug, '30', $name, $desc, $html, $help);
7162
7163	$name = __('Copy Timestamp', 'wp-photo-album-plus' );
7164	$desc = __('Copy timestamp when copying photo.', 'wp-photo-album-plus' );
7165	+ $help = __('If checked, the copied photo is not "new"', 'wp-photo-album-plus' );
7166	$slug = 'wppa_copy_timestamp';
7167	$html = wppa_checkbox($slug);
7168	wppa_setting_new($slug, '31', $name, $desc, $html, $help);

8033	wppa_setting_new($slug, '4', $name, $desc, $html, $help);
8034
8035	$name = __('Photo admin page size', 'wp-photo-album-plus' );
8036	+ $desc = __('The number of photos per page on the Edit Album -> Manage photos and Edit Photos admin pages.', 'wp-photo-album-plus' );
8037	$help = '';
8038	$slug = 'wppa_photo_admin_pagesize';
8039	$opts = array( '10', '20', '50', '100', '200', '500', '700', '1000' );

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.1.10.~~001~~
7	*
8	*/
9
	@@ -1661,6 +1661,10 @@ static $repeat_count;
1661	$u = strtolower( substr( $xtype, 1, 1 ) );
1662	switch ( $t ) {
1663	case 'a':




1664	$type = '{span style="color:blue;" }Ajax{/span}';
1665	break;
1666	case 'c':


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

1661	$u = strtolower( substr( $xtype, 1, 1 ) );
1662	switch ( $t ) {
1663	case 'a':
1664	+ if ( wppa_get_option( 'wppa_log_ajax' ) == 'no' ) {
1665	+ $busy = false;
1666	+ return;
1667	+ }
1668	$type = '{span style="color:blue;" }Ajax{/span}';
1669	break;
1670	case 'c':

wppa-wrappers.php CHANGED Viewed

	@@ -5,7 +5,7 @@
5	* Contains wrappers for standard php functions
6	* For security and bug reasons
7	*
8	- * Version 8.1.10.~~003~~
9	*
10	*/
11
	@@ -796,6 +796,7 @@ static $allowed_tags;
796	'onchange' => true,
797	'checked' => true,
798	'min' => true,

799	'multiple' => true,
800	'onkeyup' => true,
801	'disabled' => true,
	@@ -832,6 +833,7 @@ static $allowed_tags;
832	'onwheel' => true,
833	'onscroll' => true,
834	'onfocus' => true,

835	) ),
836	'small' => $sa,
837	'span' => $sa,
	@@ -941,7 +943,7 @@ static $allowed_tags;
941	$html = $temp['html'];
942	$js = $temp['js'];
943
944	- /* Start debugging ~~//~~
945	$before = $html;
946	$before = str_replace( ['" >',';"','; ', '&', 'style=" ', '"/>', ' style=""', ';;'], ['">','"',';', '&', 'style="', '" />', '', ';'], $before );
947	$after = wp_kses( $before, $t, $p );


5	* Contains wrappers for standard php functions
6	* For security and bug reasons
7	*
8	+ * Version 8.1.10.004
9	*
10	*/
11

796	'onchange' => true,
797	'checked' => true,
798	'min' => true,
799	+ 'max' => true,
800	'multiple' => true,
801	'onkeyup' => true,
802	'disabled' => true,

833	'onwheel' => true,
834	'onscroll' => true,
835	'onfocus' => true,
836	+ 'size' => true,
837	) ),
838	'small' => $sa,
839	'span' => $sa,

943	$html = $temp['html'];
944	$js = $temp['js'];
945
946	+ /* Start debugging */
947	$before = $html;
948	$before = str_replace( ['" >',';"','; ', '&', 'style=" ', '"/>', ' style=""', ';;'], ['">','"',';', '&', 'style="', '" />', '', ';'], $before );
949	$after = wp_kses( $before, $t, $p );

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