WP Photo Album Plus - Version 7.4.00.001

Version Description

= 7.4.00 =

This version addresses various bug fixes and feature requests.

Release Info

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

Code changes from version 7.3.13.010 to 7.4.00.001

Files changed (22) hide show

changelog.txt +5 -1
readme.txt +2 -2
wppa-admin-functions.php +1 -1
wppa-admins-choice-widget.php +3 -3
wppa-ajax.php +10 -5
wppa-album-admin-autosave.php +24 -22
wppa-album-covers.php +1 -1
wppa-boxes-html.php +85 -10
wppa-defaults.php +4 -1
wppa-exif-iptc-common.php +1 -1
wppa-filter.php +1 -1
wppa-functions.php +57 -20
wppa-import.php +1 -1
wppa-items.php +1 -1
wppa-links.php +4 -4
wppa-maintenance.php +1 -1
wppa-photo-admin-autosave.php +1 -1
wppa-settings-autosave.php +32 -5
wppa-setup.php +7 -1
wppa-thumbnails.php +5 -2
wppa-utils.php +1 -1
wppa.php +3 -3

changelog.txt CHANGED Viewed

	@@ -1,6 +1,6 @@
1	WP Photo Album Plus Changelog
2
3	- = 7.3.13 =
4
5	* Various security fixes.
6	* The nesting level on the album admin page will now only show up when you use the max level limitation in Table VII-B1.0, i.e. the value <> 99.
	@@ -14,6 +14,10 @@ This means that a table line like e.g.
14	* Added chackbox to Table IX-D5 to autmatically remove linebreaks and redundant space when new the photo description is updated.
15	* New setting: Table IX-D11.4: Iptc 025 keywords to tags. Convert IPTC025 keywords to tags during upload. Saving IPTC must be on.
16	* New maintenance proc Table VIII-B24: Re-init custom and tags.




17
18	= 7.3.12 =
19


1	WP Photo Album Plus Changelog
2
3	+ = 7.4.00 =
4
5	* Various security fixes.
6	* The nesting level on the album admin page will now only show up when you use the max level limitation in Table VII-B1.0, i.e. the value <> 99.

14	* Added chackbox to Table IX-D5 to autmatically remove linebreaks and redundant space when new the photo description is updated.
15	* New setting: Table IX-D11.4: Iptc 025 keywords to tags. Convert IPTC025 keywords to tags during upload. Saving IPTC must be on.
16	* New maintenance proc Table VIII-B24: Re-init custom and tags.
17	+ * The album table was not switcheable to Collapsable table for non admin users when 'owners only' is active. Fixed.
18	+ * Table IX-E21: Extended duplicate removal, now also works on calendars.
19	+ * Table IV-A27: Enable Admins choice, is now a selectionbox. You can select 'none', 'admin and superuser' and 'all loggedin'.
20	+ So the meaning of 'Admins Choice' can now be extended to 'Users Choice'
21
22	= 7.3.12 =
23

readme.txt CHANGED Viewed

	@@ -2,7 +2,7 @@
2	Contributors: opajaap
3	Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=OpaJaap@OpaJaap.nl&item_name=WP-Photo-Album-Plus&item_number=Support-Open-Source&currency_code=USD&lc=US
4	Tags: photo, album, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto, imagemagick, pdf
5	- Version: 7.3.13.~~010~~
6	Stable tag: 7.3.12.008
7	Author: J.N. Breetvelt
8	Author URI: http://www.opajaap.nl/
	@@ -137,7 +137,7 @@ See for the full changelog: <a href="http://www.wppa.nl/changelog/" >The documen
137
138	== Upgrade Notice ==
139
140	- = 7.3.13 =
141
142	* This version addresses various bug fixes and feature requests.
143


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

137
138	== Upgrade Notice ==
139
140	+ = 7.4.00 =
141
142	* This version addresses various bug fixes and feature requests.
143

wppa-admin-functions.php CHANGED Viewed

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


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

wppa-admins-choice-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display the admins-choice widget
6	- * Version 7.3.03
7	*
8	*/
9
	@@ -58,7 +58,7 @@ class AdminsChoice extends WP_Widget {
58	// Other inits
59
60	// Make the widget content
61	- if ( ! ~~wppa_switch~~( '~~enable_admins_choice~~' ) ) {
62	$widget_content = __( 'This feature is not enabled', 'wp-photo-album-plus' );
63	}
64	else {
	@@ -106,7 +106,7 @@ class AdminsChoice extends WP_Widget {
106	function form( $instance ) {
107
108	// Make sure the feature is enabled
109	- if ( ~~! wppa_switch~~( '~~enable_admins_choice~~' ) ) {
110	echo
111	'<p style="color:red;" >' .
112	__( 'Please enable this feature in Table IV-A27', 'wp-photo-album-plus' ) .


3	* Package: wp-photo-album-plus
4	*
5	* display the admins-choice widget
6	+ * Version 7.4.00
7	*
8	*/
9

58	// Other inits
59
60	// Make the widget content
61	+ if ( ! wppa_opt( 'admins_choice' ) == 'none' ) {
62	$widget_content = __( 'This feature is not enabled', 'wp-photo-album-plus' );
63	}
64	else {

106	function form( $instance ) {
107
108	// Make sure the feature is enabled
109	+ if ( wppa_opt( 'admins_choice' ) == 'none' ) {
110	echo
111	'<p style="color:red;" >' .
112	__( 'Please enable this feature in Table IV-A27', 'wp-photo-album-plus' ) .

wppa-ajax.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-ajax.php
3	*
4	* Functions used in ajax requests
5	- * Version 7.3.13
6	*
7	*/
8
	@@ -699,10 +699,15 @@ global $wppa_log_file;
699	case 'addtozip':
700
701	// Check if the user is allowed to do this
702	- $photo = wppa_decrypt_photo( $_REQUEST['photo-id'], false, true );
703	- $photo = strval( intval( $photo ) );
704	- if ( ~~! wppa_user_is~~( '~~administrator~~' ) ~~) {~~
705	- ~~echo~~ '~~ER\|\|Security~~ ~~check~~ ~~failure~~';





706	wppa_exit();
707	}
708


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

699	case 'addtozip':
700
701	// Check if the user is allowed to do this
702	+ $photo = wppa_decrypt_photo( $_REQUEST['photo-id'], false, true );
703	+ $photo = strval( intval( $photo ) );
704	+ $choice = wppa_opt( 'admins_choice' );
705	+ if ( ( wppa_user_is( 'administrator' ) && $choice != 'none' ) \|\|
706	+ ( is_user_logged_in() && $choice == 'login' ) ) {
707	+ // Its ok
708	+ }
709	+ else {
710	+ echo 'ER\|\|You are not allowed to do this';
711	wppa_exit();
712	}
713

wppa-album-admin-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* create, edit and delete albums
6	- * Version 7.3.13
7	*
8	*/
9
	@@ -1374,13 +1374,13 @@ global $wppa_revno;
1374	}
1375	}
1376
1377	- if ( wppa_extended_access() ) {
1378	if ( isset($_REQUEST['switchto'] ) ) {
1379	update_option( 'wppa_album_table_'.wppa_get_user(), $_REQUEST['switchto'] );
1380	}
1381	$style = wppa_get_option('wppa_album_table_'.wppa_get_user(), 'flat');
1382	- }
1383	- else $style = 'flat';
1384	// The Manage Album page
1385	?>
1386	<div class="wrap">
	@@ -1617,7 +1617,7 @@ global $wpdb;
1617	<thead>
1618	<tr>
1619	<?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&order_by='; ?>
1620	- <td style="min-width: 50px;" title="<?php $show_nl ?
1621	esc_attr( _e( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
1622	esc_attr( _e( 'The album id', 'wp-photo-album-plus' ) ) ?>" >
1623	<a href="<?php echo wppa_dbg_url($url.'id') ?>">
	@@ -2073,12 +2073,12 @@ global $wpdb;
2073	<table class="widefat wppa-table wppa-setting-table" style="margin-top:12px;" >
2074	<thead>
2075	<tr>
2076	- <td ~~style~~="~~min-width:20px;~~" >
2077	<img src="<?php echo wppa_get_imgdir().'backarrow.gif' ?>" style="height:16px;" title="<?php _e('Collapse subalbums', 'wp-photo-album-plus') ?>" />
2078	<img src="<?php echo wppa_get_imgdir().'arrow.gif' ?>" style="height:16px;" title="<?php _e('Expand subalbums', 'wp-photo-album-plus') ?>" />
2079	</td>
2080	<?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&order_by='; ?>
2081	- <td style="min-width: 50px;" title="<?php $show_nl ?
2082	esc_attr( _e( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
2083	esc_attr( _e( 'The album id', 'wp-photo-album-plus' ) ) ?>" >
2084	<a href="<?php echo wppa_dbg_url($url.'id') ?>">
	@@ -2184,12 +2184,14 @@ global $wpdb;
2184	</tbody>
2185	<tfoot>
2186	<tr>
2187	- <td>
2188	- <img src="<?php echo wppa_get_imgdir().'backarrow.gif' ?>" style="height:16px;" />
2189	- <img src="<?php echo wppa_get_imgdir().'arrow.gif' ?>" style="height:16px;" />
2190	</td>
2191	<?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&order_by='; ?>
2192	- <td ~~colspan~~="6" >


2193	<a href="<?php echo wppa_dbg_url($url.'id') ?>">
2194	<?php $show_nl ? _e( 'ID(nl)', 'wp-photo-album-plus' ) : _e( 'ID', 'wp-photo-album-plus' );
2195	if ($order == 'id') {
	@@ -2200,7 +2202,7 @@ global $wpdb;
2200	</a>
2201	</td>
2202
2203	- <td style="width: 120px;">
2204	<a href="<?php echo wppa_dbg_url($url.'name') ?>">
2205	<?php _e('Name', 'wp-photo-album-plus');
2206	if ($order == 'name') {
	@@ -2221,7 +2223,7 @@ global $wpdb;
2221	</a>
2222	</td>
2223	<?php if (current_user_can('administrator')) { ?>
2224	- <td style="width: 100px;">
2225	<a href="<?php echo wppa_dbg_url($url.'owner') ?>">
2226	<?php _e('Owner', 'wp-photo-album-plus');
2227	if ($order == 'owner') {
	@@ -2232,7 +2234,7 @@ global $wpdb;
2232	</a>
2233	</td>
2234	<?php } ?>
2235	- <td >
2236	<a href="<?php echo wppa_dbg_url($url.'a_order') ?>">
2237	<?php _e('Order', 'wp-photo-album-plus');
2238	if ($order == 'a_order') {
	@@ -2311,7 +2313,7 @@ function wppa_search_edit( $collapsible = false ) {
2311
2312	$result =
2313	'<tr>' .
2314	- '<td colspan="' . ( ( $collapsible ? '19' : '13' ) + ( current_user_can( 'wppa_upload' ) ? '1' : '0' ) + ( current_user_can( 'wppa_import' ) ? '1' : '0' ) ) . '" >' .
2315	'<em>' .
2316	__( 'Search for photos to edit', 'wp-photo-album-plus' ) .
2317	'</em>' .
	@@ -2362,7 +2364,7 @@ function wppa_search_edit( $collapsible = false ) {
2362	'</a>' .
2363	'</td>' .
2364	'<td></td><td></td><td></td>' .
2365	- '<td colspan="' . ( ( current_user_can( 'wppa_upload' ) ? '1' : '0' ) + ( current_user_can( 'wppa_import' ) ? '1' : '0' ) ) . '"></td>' .
2366	'</tr>';
2367
2368	echo $result;
	@@ -2471,16 +2473,16 @@ global $wpdb;
2471	function wppa_do_albumlist( $parent, $nestinglevel, $albums, $seq ) {
2472	global $wpdb;
2473
2474	- // ~~IUnit~~
2475	$show_nl = wppa_opt( 'user_create_max_level' ) != '99';
2476	-
2477	$alt = true;
2478
2479	foreach ( array_keys( $seq ) as $s ) { // Obey the global sequence
2480	$album = $albums[$s];
2481	$id = $album['id'];
2482	if ( $album['a_parent'] == $parent ) {
2483	- if ( wppa_have_access( $album ) ) {
2484
2485	$counts = wppa_get_treecounts_a( $id, true );
2486	$pendcount = $counts['pendselfphotos'];
	@@ -2601,7 +2603,7 @@ global $wpdb;
2601	<?php $ns = $counts['scheduledselfphotos']; ?>
2602	<td><?php echo $na.'/'.$np.'/'.$nm.'/'.$ns; ?></td>
2603
2604	- <?php if ( $album['owner'] != ~~'---~~ ~~public ---'~~ \|\| wppa_user_is('administrator') ) { ?>
2605	<?php $url = wppa_ea_url($id) ?>
2606	<td><a href="<?php echo($url) ?>" class="wppaedit"><?php _e('Edit', 'wp-photo-album-plus'); ?></a></td>
2607	<td><a href="<?php echo($url.'&quick') ?>" class="wppaedit"><?php _e('Quick', 'wp-photo-album-plus'); ?></a></td>
	@@ -2640,14 +2642,14 @@ global $wpdb;
2640	if ( wppa_can_create_album() ) echo '<td></td>';
2641	if ( current_user_can( 'wppa_upload' ) ) echo '<td></td>';
2642	if ( current_user_can( 'wppa_import' ) ) echo '<td></td>';
2643	- echo '<td></td><td></td><td></td><td></td><td></td>';
2644	} ?>
2645
2646	</tr>
2647	<?php if ($alt == '') { $alt = ' class="alternate" '; } else { $alt = '';}
2648	if ( $haschildren ) wppa_do_albumlist($id, $nestinglevel+'1', $albums, $seq);
2649	}
2650	- }
2651	}
2652	}
2653


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

1374	}
1375	}
1376
1377	+ // if ( wppa_extended_access() ) {
1378	if ( isset($_REQUEST['switchto'] ) ) {
1379	update_option( 'wppa_album_table_'.wppa_get_user(), $_REQUEST['switchto'] );
1380	}
1381	$style = wppa_get_option('wppa_album_table_'.wppa_get_user(), 'flat');
1382	+ // }
1383	+ // else $style = 'flat';
1384	// The Manage Album page
1385	?>
1386	<div class="wrap">

1617	<thead>
1618	<tr>
1619	<?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&order_by='; ?>
1620	+ <td style="min-width: 50px;" title="<?php $show_nl ?
1621	esc_attr( _e( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
1622	esc_attr( _e( 'The album id', 'wp-photo-album-plus' ) ) ?>" >
1623	<a href="<?php echo wppa_dbg_url($url.'id') ?>">

2073	<table class="widefat wppa-table wppa-setting-table" style="margin-top:12px;" >
2074	<thead>
2075	<tr>
2076	+ <td colspan="6" >
2077	<img src="<?php echo wppa_get_imgdir().'backarrow.gif' ?>" style="height:16px;" title="<?php _e('Collapse subalbums', 'wp-photo-album-plus') ?>" />
2078	<img src="<?php echo wppa_get_imgdir().'arrow.gif' ?>" style="height:16px;" title="<?php _e('Expand subalbums', 'wp-photo-album-plus') ?>" />
2079	</td>
2080	<?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&order_by='; ?>
2081	+ <td style="min-width: 50px;" title="<?php $show_nl ?
2082	esc_attr( _e( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
2083	esc_attr( _e( 'The album id', 'wp-photo-album-plus' ) ) ?>" >
2084	<a href="<?php echo wppa_dbg_url($url.'id') ?>">

2184	</tbody>
2185	<tfoot>
2186	<tr>
2187	+ <td colspan="6" >
2188	+ <img src="<?php echo wppa_get_imgdir().'backarrow.gif' ?>" style="height:16px;" title="<?php _e('Collapse subalbums', 'wp-photo-album-plus') ?>" />
2189	+ <img src="<?php echo wppa_get_imgdir().'arrow.gif' ?>" style="height:16px;" title="<?php _e('Expand subalbums', 'wp-photo-album-plus') ?>" />
2190	</td>
2191	<?php $url = get_admin_url().'admin.php?page=wppa_admin_menu&order_by='; ?>
2192	+ <td style="min-width: 50px;" title="<?php $show_nl ?
2193	+ esc_attr( _e( 'The album id (the nesting level)', 'wp-photo-album-plus' ) ) :
2194	+ esc_attr( _e( 'The album id', 'wp-photo-album-plus' ) ) ?>" >
2195	<a href="<?php echo wppa_dbg_url($url.'id') ?>">
2196	<?php $show_nl ? _e( 'ID(nl)', 'wp-photo-album-plus' ) : _e( 'ID', 'wp-photo-album-plus' );
2197	if ($order == 'id') {

2202	</a>
2203	</td>
2204
2205	+ <td style="min-width: 120px;">
2206	<a href="<?php echo wppa_dbg_url($url.'name') ?>">
2207	<?php _e('Name', 'wp-photo-album-plus');
2208	if ($order == 'name') {

2223	</a>
2224	</td>
2225	<?php if (current_user_can('administrator')) { ?>
2226	+ <td style="min-width: 100px;">
2227	<a href="<?php echo wppa_dbg_url($url.'owner') ?>">
2228	<?php _e('Owner', 'wp-photo-album-plus');
2229	if ($order == 'owner') {

2234	</a>
2235	</td>
2236	<?php } ?>
2237	+ <td style="min-width: 100px;" >
2238	<a href="<?php echo wppa_dbg_url($url.'a_order') ?>">
2239	<?php _e('Order', 'wp-photo-album-plus');
2240	if ($order == 'a_order') {

2313
2314	$result =
2315	'<tr>' .
2316	+ '<td colspan="' . ( ( $collapsible ? '20' : '14' ) + ( current_user_can( 'wppa_upload' ) ? '1' : '0' ) + ( current_user_can( 'wppa_import' ) ? '1' : '0' ) ) . '" >' .
2317	'<em>' .
2318	__( 'Search for photos to edit', 'wp-photo-album-plus' ) .
2319	'</em>' .

2364	'</a>' .
2365	'</td>' .
2366	'<td></td><td></td><td></td>' .
2367	+ '<td colspan="' . strval( 1 + ( current_user_can( 'wppa_upload' ) ? 1 : 0 ) + ( current_user_can( 'wppa_import' ) ? 1 : 0 ) ) . '"></td>' .
2368	'</tr>';
2369
2370	echo $result;

2473	function wppa_do_albumlist( $parent, $nestinglevel, $albums, $seq ) {
2474	global $wpdb;
2475
2476	+ // Init
2477	$show_nl = wppa_opt( 'user_create_max_level' ) != '99';
2478	+
2479	$alt = true;
2480
2481	foreach ( array_keys( $seq ) as $s ) { // Obey the global sequence
2482	$album = $albums[$s];
2483	$id = $album['id'];
2484	if ( $album['a_parent'] == $parent ) {
2485	+ // if ( wppa_have_access( $album ) ) {
2486
2487	$counts = wppa_get_treecounts_a( $id, true );
2488	$pendcount = $counts['pendselfphotos'];

2603	<?php $ns = $counts['scheduledselfphotos']; ?>
2604	<td><?php echo $na.'/'.$np.'/'.$nm.'/'.$ns; ?></td>
2605
2606	+ <?php if ( $album['owner'] == wppa_get_user() \|\| wppa_user_is('administrator') ) { ?>
2607	<?php $url = wppa_ea_url($id) ?>
2608	<td><a href="<?php echo($url) ?>" class="wppaedit"><?php _e('Edit', 'wp-photo-album-plus'); ?></a></td>
2609	<td><a href="<?php echo($url.'&quick') ?>" class="wppaedit"><?php _e('Quick', 'wp-photo-album-plus'); ?></a></td>

2642	if ( wppa_can_create_album() ) echo '<td></td>';
2643	if ( current_user_can( 'wppa_upload' ) ) echo '<td></td>';
2644	if ( current_user_can( 'wppa_import' ) ) echo '<td></td>';
2645	+ echo '<td></td><td></td><td></td><td></td><td></td><td></td>';
2646	} ?>
2647
2648	</tr>
2649	<?php if ($alt == '') { $alt = ' class="alternate" '; } else { $alt = '';}
2650	if ( $haschildren ) wppa_do_albumlist($id, $nestinglevel+'1', $albums, $seq);
2651	}
2652	+ // }
2653	}
2654	}
2655

wppa-album-covers.php CHANGED Viewed

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


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

wppa-boxes-html.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Various wppa boxes
6	- * Version 7.3.12
7	*
8	*/
9
	@@ -1167,6 +1167,8 @@ function wppa_get_admins_choice_html( $admins ) {
1167
1168	// Find zipfiles user
1169	$user = wppa_strip_ext( basename( $zipfile ) );


1170
1171	// Do we need this one?
1172	if ( ! $admin_arr \|\| in_array( $user, $admin_arr ) ) {
	@@ -4997,12 +4999,41 @@ function wppa_calendar_box() {
4997
4998	// The calendar container
4999	wppa_container( 'open' );




























5000	wppa_out( '<div' .
5001	' id="wppa-calendar-' . wppa( 'mocc' ) . '"' .
5002	' class="wppa-box wppa-calendar"' .
5003	' style="' .
5004	- 'font-size:~~10px~~;' .
5005	- '~~line~~-~~height~~:~~12px~~;' .

5006	wppa_wcs( 'wppa-box' ) .
5007	wppa_wcs( 'wppa-calendar' ) .
5008	'"' .
	@@ -5044,6 +5075,31 @@ global $wpdb;
5044	$from = 0;
5045	$to = 0;
5046

























5047	// Get todays daynumber and range
5048	$today = floor( time() / $secinday );
5049
	@@ -5065,6 +5121,12 @@ global $wpdb;
5065	$alb_clause . "
5066	ORDER BY exifdtm", ARRAY_A );
5067	}






5068	$dates = array();
5069	foreach ( $photos as $photo ) {
5070	$date = substr( $photo['exifdtm'], 0, 10 );
	@@ -5077,6 +5139,7 @@ global $wpdb;
5077	}
5078	}
5079	}

5080	$from = 0;
5081	$to = count( $dates );
5082	break;
	@@ -5101,6 +5164,12 @@ global $wpdb;
5101	$alb_clause . "
5102	ORDER BY " . $calendar_type, ARRAY_A );
5103	}






5104	$dates = array();
5105	foreach ( $photos as $photo ) {
5106	$date = floor( $photo[$calendar_type] / $secinday );
	@@ -5124,7 +5193,7 @@ global $wpdb;
5124	// Display minicovers
5125	$result .= '<div' .
5126	' style="' .
5127	- 'width:' . ( 33 * ( $to - $from ) ) . 'px;' .
5128	'position:relative;' .
5129	'"' .
5130	' >';
	@@ -5170,16 +5239,17 @@ global $wpdb;
5170	' class="wppa-minicover"' .
5171	' style="' .
5172	'border:1px solid gray;' .
5173	- 'margin-right:1px;' .
5174	'float:left;' .
5175	'text-align:center;' .
5176	- '~~width~~:~~30px~~;"' .

5177	' >' .
5178	$date->format( 'M' ) . '<br />' .
5179	$date->format( 'd' ) . '<br />' .
5180	$date->format( 'D' ) . '<br />' .
5181	$date->format( 'Y' ) . '<br />' .
5182	- '(' . $dates[$keys[$day]] . ')' .
5183	'</div>' .
5184	'</a>';
5185
	@@ -5234,16 +5304,17 @@ global $wpdb;
5234	' class="wppa-minicover"' .
5235	' style="' .
5236	'border:1px solid gray;' .
5237	- 'margin-right:1px;' .
5238	'float:left;' .
5239	'text-align:center;' .
5240	- '~~width~~:~~30px~~;"' .

5241	' >' .
5242	date( 'M', $date * $secinday ) . '<br />' .
5243	date( 'd', $date * $secinday ) . '<br />' .
5244	date( 'D', $date * $secinday ) . '<br />' .
5245	date( 'Y', $date * $secinday ) . '<br />' .
5246	- '(' . $dates[$keys[$day]] . ')' .
5247	'</div>' .
5248	'</a>';
5249
	@@ -5643,6 +5714,10 @@ global $wpdb;
5643	$query .= " " . $order;
5644	$thumbs = $wpdb->get_results( $query, ARRAY_A );
5645




5646	// There are count($thumbs) items this day
5647	if ( count( $thumbs ) ) {
5648


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

1167
1168	// Find zipfiles user
1169	$user = wppa_strip_ext( basename( $zipfile ) );
1170	+ $full_user = wppa_get_user_by( 'login', $user );
1171	+ $user = $full_user->display_name;
1172
1173	// Do we need this one?
1174	if ( ! $admin_arr \|\| in_array( $user, $admin_arr ) ) {

4999
5000	// The calendar container
5001	wppa_container( 'open' );
5002	+
5003	+ // Get the selected fontsize-lineheight. small = 10-12, medium = 14-17, large = 18-22, xlarge = 22-24
5004	+ $fontsize = wppa_opt('font_calendar_by');
5005	+ $bold = wppa_switch( 'font_calendar_by_bold' );
5006	+
5007	+ switch ( $fontsize ) {
5008	+ case 'xlarge':
5009	+ $fs = 22;
5010	+ $lh = 26;
5011	+ $cw = 60;
5012	+ break;
5013	+ case 'large':
5014	+ $fs = 18;
5015	+ $lh = 22;
5016	+ $cw = 50;
5017	+ break;
5018	+ case 'medium':
5019	+ $fs = 14;
5020	+ $lh = 17;
5021	+ $cw = 40;
5022	+ break;
5023	+ default: // small
5024	+ $fs = 10;
5025	+ $lh = 12;
5026	+ $cw = 30;
5027	+ break;
5028	+ }
5029	+
5030	wppa_out( '<div' .
5031	' id="wppa-calendar-' . wppa( 'mocc' ) . '"' .
5032	' class="wppa-box wppa-calendar"' .
5033	' style="' .
5034	+ 'font-size:'.$fs.'px;' .
5035	+ ( $bold ? 'font-weight:bold;' : '' ) .
5036	+ 'line-height:'.$lh.'px;' .
5037	wppa_wcs( 'wppa-box' ) .
5038	wppa_wcs( 'wppa-calendar' ) .
5039	'"' .

5075	$from = 0;
5076	$to = 0;
5077
5078	+ // Get the selected fontsize-lineheight. small = 10-12, medium = 14-17, large = 18-22, xlarge = 22-24
5079	+ $fontsize = wppa_opt( 'font_calendar_by' );
5080	+ switch ( $fontsize ) {
5081	+ case 'xlarge':
5082	+ $fs = 22;
5083	+ $lh = 26;
5084	+ $cw = 60;
5085	+ break;
5086	+ case 'large':
5087	+ $fs = 18;
5088	+ $lh = 22;
5089	+ $cw = 50;
5090	+ break;
5091	+ case 'medium':
5092	+ $fs = 14;
5093	+ $lh = 17;
5094	+ $cw = 40;
5095	+ break;
5096	+ default: // small
5097	+ $fs = 10;
5098	+ $lh = 12;
5099	+ $cw = 30;
5100	+ break;
5101	+ }
5102	+
5103	// Get todays daynumber and range
5104	$today = floor( time() / $secinday );
5105

5121	$alb_clause . "
5122	ORDER BY exifdtm", ARRAY_A );
5123	}
5124	+
5125	+ // Remove duplicates
5126	+ // if ( wppa_switch( 'extended_duplicate_remove' ) ) {
5127	+ // wppa_extended_duplicate_remove( $photos );
5128	+ // }
5129	+
5130	$dates = array();
5131	foreach ( $photos as $photo ) {
5132	$date = substr( $photo['exifdtm'], 0, 10 );

5139	}
5140	}
5141	}
5142	+
5143	$from = 0;
5144	$to = count( $dates );
5145	break;

5164	$alb_clause . "
5165	ORDER BY " . $calendar_type, ARRAY_A );
5166	}
5167	+
5168	+ // Remove duplicates
5169	+ // if ( wppa_switch( 'extended_duplicate_remove' ) ) {
5170	+ // wppa_extended_duplicate_remove( $photos );
5171	+ // }
5172	+
5173	$dates = array();
5174	foreach ( $photos as $photo ) {
5175	$date = floor( $photo[$calendar_type] / $secinday );

5193	// Display minicovers
5194	$result .= '<div' .
5195	' style="' .
5196	+ 'width:' . ( ( $cw + 2 ) * ( $to - $from ) ) . 'px;' .
5197	'position:relative;' .
5198	'"' .
5199	' >';

5239	' class="wppa-minicover"' .
5240	' style="' .
5241	'border:1px solid gray;' .
5242	+ // 'margin-right:1px;' .
5243	'float:left;' .
5244	'text-align:center;' .
5245	+ 'cursor:pointer;' .
5246	+ 'width:'.$cw.'px;"' .
5247	' >' .
5248	$date->format( 'M' ) . '<br />' .
5249	$date->format( 'd' ) . '<br />' .
5250	$date->format( 'D' ) . '<br />' .
5251	$date->format( 'Y' ) . '<br />' .
5252	+ ( wppa_switch( 'extended_duplicate_remove' ) ? '' : '(' . $dates[$keys[$day]] . ')' ) .
5253	'</div>' .
5254	'</a>';
5255

5304	' class="wppa-minicover"' .
5305	' style="' .
5306	'border:1px solid gray;' .
5307	+ // 'margin-right:1px;' .
5308	'float:left;' .
5309	'text-align:center;' .
5310	+ 'cursor:pointer;' .
5311	+ 'width:'.$cw.'px;"' .
5312	' >' .
5313	date( 'M', $date * $secinday ) . '<br />' .
5314	date( 'd', $date * $secinday ) . '<br />' .
5315	date( 'D', $date * $secinday ) . '<br />' .
5316	date( 'Y', $date * $secinday ) . '<br />' .
5317	+ ( wppa_switch( 'extended_duplicate_remove' ) ? '' : '(' . $dates[$keys[$day]] . ')' ) .
5318	'</div>' .
5319	'</a>';
5320

5714	$query .= " " . $order;
5715	$thumbs = $wpdb->get_results( $query, ARRAY_A );
5716
5717	+ if ( wppa_switch( 'extended_duplicate_remove' ) ) {
5718	+ wppa_extended_duplicate_remove( $thumbs );
5719	+ }
5720	+
5721	// There are count($thumbs) items this day
5722	if ( count( $thumbs ) ) {
5723

wppa-defaults.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains default settings
6	- * Version 7.3.13
7	*
8	*/
9
	@@ -553,6 +553,7 @@ horizrailenabled:false,";
553
554	'wppa_capitalize_tags' => 'yes',
555	'wppa_enable_admins_choice' => 'no',

556	'wppa_owner_to_name' => 'no',
557
558	'wppa_nicescroll_window' => 'no',
	@@ -705,6 +706,8 @@ horizrailenabled:false,";
705	'wppa_fontcolor_lightbox' => '',
706	'wppa_fontweight_lightbox' => 'bold',
707	'wppa_fontsize_widget_thumb' => '9',


708
709	// Table VI: Links
710	'wppa_sphoto_linktype' => 'photo',


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

553
554	'wppa_capitalize_tags' => 'yes',
555	'wppa_enable_admins_choice' => 'no',
556	+ 'wppa_admins_choice' => 'none',
557	'wppa_owner_to_name' => 'no',
558
559	'wppa_nicescroll_window' => 'no',

706	'wppa_fontcolor_lightbox' => '',
707	'wppa_fontweight_lightbox' => 'bold',
708	'wppa_fontsize_widget_thumb' => '9',
709	+ 'wppa_font_calendar_by' => 'small',
710	+ 'wppa_font_calendar_by_bold' => 'no',
711
712	// Table VI: Links
713	'wppa_sphoto_linktype' => 'photo',

wppa-exif-iptc-common.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* exif and iptc common functions
6	- * Version 7.3.13
7	*
8	*
9	*/


3	* Package: wp-photo-album-plus
4	*
5	* exif and iptc common functions
6	+ * Version 7.4.00
7	*
8	*
9	*/

wppa-filter.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* get the albums via shortcode handler
6	- * Version 7.3.13
7	*
8	*/
9


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

wppa-functions.php CHANGED Viewed

@@ -3,7 +3,7 @@
             * Package: wp-photo-album-plus
+            *
             * Various functions
-            -
            * Version 7.3.13
+            *
             */
@@ -2158,7 +2158,11 @@ global $wpdb;
             	// Extended dups removal?
             	$exduprem = wppa_switch( 'extended_duplicate_remove' ) &&
-            -
            				( wppa( 'src' ) || wppa( 'is_tag' ) || wppa( 'supersearch' ) );
             	// Do we need to get the count first to decide if we get the full data and probably cache it ?
             	if ( $count_first || $invers || $exduprem ) {
@@ -2276,37 +2280,68 @@ function wppa_extended_duplicate_remove( &$thumbs ) {
             // Compare two items for equality
             function wppa_are_items_equal( $xit1, $xit2 ) {
             global $wpdb;
-            -
            	$it1 = wppa_cache_photo( $xit1['id'] );
-            -
            	$it2 = wppa_cache_photo( $xit2['id'] );
             	$score = 0;
-            -
            	// Name
-            -
            	if ( wppa_looks_equal( $it1['name'], $it2['name'] ) && $it1['name'] ) $score++; 						// equal and not empty
-            -
-            -
            	// Description
-            -
            	if ( wppa_looks_equal( $it1['description'], $it2['description'] ) && $it1['description'] ) $score++; 	// equal and not empty
-            -
-            -
            	// Filename
-            -
            	if ( wppa_looks_equal( $it1['filename'], $it2['filename'] ) && $it1['filename'] ) $score++; 			// equal and not empty
-            -
             	// If one of these item is equal, the items are the same
             	// EXIF ImageUniqueID
-            -
            	$E1 = $wpdb->get_var( $wpdb->prepare( "SELECT description FROM $wpdb->wppa_exif WHERE photo=%s AND tag=%s", $it1['id'], 'E#A420' ) );
-            -
            	$E2 = $wpdb->get_var( $wpdb->prepare( "SELECT description FROM $wpdb->wppa_exif WHERE photo=%s AND tag=%s", $it2['id'], 'E#A420' ) );
             	if ( $E1 && $E2 && $E1 == $E2 ) {
-            -
            		$score+=4;;
+            	}
             	// EXIF date/time
             	$E1 = $it1['exifdtm'];
             	$E2 = $it2['exifdtm'];
             	if ( $E1 && $E2 && $E1 == $E2 ) {
-            -
            		$score+=4;
+            	}
-            -
            	// So far so good.
-            -
            	if ( $score >= 4 ) return true;
             	// Equal source filesize?
             	$s1 = wppa_get_source_path( $it1['id'] );
@@ -2651,7 +2686,9 @@ static $user;
             					' value="' . __( 'Delete' , 'wp-photo-album-plus' ) . '"' .
             				' />';
+            		}
-            -
            		if ( wppa_user_is( 'administrator' ) && wppa_switch( 'enable_admins_choice' ) ) {
             			if ( wppa_is_photo_in_zip( $thumb['id'] ) ) {
             				$choicelink =


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

2158
2159	// Extended dups removal?
2160	$exduprem = wppa_switch( 'extended_duplicate_remove' ) &&
2161	+ ( wppa( 'src' ) \|\|
2162	+ wppa( 'is_tag' ) \|\|
2163	+ wppa( 'supersearch' ) \|\|
2164	+ wppa( 'calendar' )
2165	+ );
2166
2167	// Do we need to get the count first to decide if we get the full data and probably cache it ?
2168	if ( $count_first \|\| $invers \|\| $exduprem ) {

2280	// Compare two items for equality
2281	function wppa_are_items_equal( $xit1, $xit2 ) {
2282	global $wpdb;
2283	+ static $unique_ids;
2284
2285	+ // Init
2286	+ if ( ! $unique_ids ) {
2287	+ $unique_ids = array();
2288	+ }
2289	+ $id1 = $xit1['id'];
2290	+ $it1 = wppa_cache_photo( $id1 );
2291	+ $id2 = $xit2['id'];
2292	+ $it2 = wppa_cache_photo( $id2 );
2293
2294	$score = 0;
2295









2296	// If one of these item is equal, the items are the same
2297	// EXIF ImageUniqueID
2298	+ if ( isset( $unique_ids[$id1] ) ) {
2299	+ $E1 = $unique_ids[$id1];
2300	+ if ( $E1 == 'none' ) {
2301	+ $E1 = false;
2302	+ }
2303	+ }
2304	+ else {
2305	+ $E1 = $wpdb->get_var( $wpdb->prepare( "SELECT description FROM $wpdb->wppa_exif WHERE photo=%s AND tag=%s", $it1['id'], 'E#A420' ) );
2306	+ $unique_ids[$id1] = ( $E1 ? $E1 : 'none' );
2307	+ }
2308	+
2309	+ if ( isset( $unique_ids[$id2] ) ) {
2310	+ $E2 = $unique_ids[$id2];
2311	+ if ( $E2 == 'none' ) {
2312	+ $E2 = false;
2313	+ }
2314	+ }
2315	+ else {
2316	+ $E2 = $wpdb->get_var( $wpdb->prepare( "SELECT description FROM $wpdb->wppa_exif WHERE photo=%s AND tag=%s", $it2['id'], 'E#A420' ) );
2317	+ $unique_ids[$id2] = ( $E2 ? $E2 : 'none' );
2318	+ }
2319	+
2320	if ( $E1 && $E2 && $E1 == $E2 ) {
2321	+ return true;
2322	+ }
2323	+ if ( $E1 && $E2 && $E1 != $E2 ) {
2324	+ return false;
2325	}
2326	+
2327	// EXIF date/time
2328	$E1 = $it1['exifdtm'];
2329	$E2 = $it2['exifdtm'];
2330	if ( $E1 && $E2 && $E1 == $E2 ) {
2331	+ return true;
2332	+ }
2333	+ if ( $E1 && $E2 && $E1 != $E2 ) {
2334	+ return false;
2335	}
2336
2337	+ // Name
2338	+ if ( wppa_looks_equal( $it1['name'], $it2['name'] ) && $it1['name'] ) $score++; // equal and not empty
2339	+
2340	+ // Description
2341	+ if ( wppa_looks_equal( $it1['description'], $it2['description'] ) && $it1['description'] ) $score++; // equal and not empty
2342	+
2343	+ // Filename
2344	+ if ( wppa_looks_equal( $it1['filename'], $it2['filename'] ) && $it1['filename'] ) $score++; // equal and not empty
2345
2346	// Equal source filesize?
2347	$s1 = wppa_get_source_path( $it1['id'] );

2686	' value="' . __( 'Delete' , 'wp-photo-album-plus' ) . '"' .
2687	' />';
2688	}
2689	+ $choice = wppa_opt( 'admins_choice' );
2690	+ if ( ( wppa_user_is( 'administrator' ) && $choice != 'none' ) \|\|
2691	+ ( is_user_logged_in() && $choice == 'login' ) ) {
2692
2693	if ( wppa_is_photo_in_zip( $thumb['id'] ) ) {
2694	$choicelink =

wppa-import.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains all the import pages and functions
6	- * Version 7.3.13
7	*
8	*/
9


3	* Package: wp-photo-album-plus
4	*
5	* Contains all the import pages and functions
6	+ * Version 7.4.00
7	*
8	*/
9

wppa-items.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains functions to retrieve album and photo items
6	- * Version 7.3.13
7	*
8	*/
9


3	* Package: wp-photo-album-plus
4	*
5	* Contains functions to retrieve album and photo items
6	+ * Version 7.4.00
7	*
8	*/
9

wppa-links.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Frontend links
6	- * Version 7.3.13
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
	@@ -169,7 +169,7 @@ global $wppa_locale;
169	$al .= '&debug=' . wppa( 'debug' );
170	}
171
172	- if ( ~~wppa_opt~~( 'add_locale' ) ) {
173	if ( $key == 'js' ) $al .= '&wppalocale=' . $wppa_locale;
174	else $al .= '&wppalocale=' . $wppa_locale;
175	}
	@@ -1595,7 +1595,7 @@ global $wpdb;
1595	case 'albwidget':
1596	case 'albnavwidget':
1597	$n = ( $wich == 'albnavwidget' );
1598	- if ( ~~wppa_opt~~( 'album_' . ( $n ? 'navigator_' : '' ) . 'widget_overrule' ) ) {
1599	$aid = $album ? $album : wppa_get_photo_item( $id, 'album' );
1600	$pid = wppa_get_album_item( $aid, 'cover_linkpage' );
1601	if ( $pid ) {
	@@ -1627,7 +1627,7 @@ global $wpdb;
1627	$page = wppa_opt( 'album_' . ( $n ? 'navigator_' : '' ) . 'widget_linkpage' );
1628	if ( $page == '0' ) $page = '-1';
1629	}
1630	- if ( wppa_switch( '~~album_widget_~~' . ( $n ? 'navigator_' : '' ) . '~~blank~~' ) ) $result['target'] = '_blank';
1631	break;
1632	default:
1633	return false;


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

169	$al .= '&debug=' . wppa( 'debug' );
170	}
171
172	+ if ( wppa_switch( 'add_locale' ) ) {
173	if ( $key == 'js' ) $al .= '&wppalocale=' . $wppa_locale;
174	else $al .= '&wppalocale=' . $wppa_locale;
175	}

1595	case 'albwidget':
1596	case 'albnavwidget':
1597	$n = ( $wich == 'albnavwidget' );
1598	+ if ( wppa_switch( 'album_' . ( $n ? 'navigator_' : '' ) . 'widget_overrule' ) ) {
1599	$aid = $album ? $album : wppa_get_photo_item( $id, 'album' );
1600	$pid = wppa_get_album_item( $aid, 'cover_linkpage' );
1601	if ( $pid ) {

1627	$page = wppa_opt( 'album_' . ( $n ? 'navigator_' : '' ) . 'widget_linkpage' );
1628	if ( $page == '0' ) $page = '-1';
1629	}
1630	+ if ( wppa_switch( 'album_' . ( $n ? 'navigator_' : '' ) . 'widget_blank' ) ) $result['target'] = '_blank';
1631	break;
1632	default:
1633	return false;

wppa-maintenance.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains (not yet, but in the future maybe) all the maintenance routines
6	- * Version 7.3.13
7	*
8	*/
9


3	* Package: wp-photo-album-plus
4	*
5	* Contains (not yet, but in the future maybe) all the maintenance routines
6	+ * Version 7.4.00
7	*
8	*/
9

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 7.3.13
7	*
8	*/
9


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

wppa-settings-autosave.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* manage all options
6	- * Version 7.3.13
7	*
8	*/
9
	@@ -4431,9 +4431,14 @@ global $wppa_supported_camara_brands;
4431
4432	$name = __('Enable Admins Choice', 'wp-photo-album-plus');
4433	$desc = __('Enable the creation of zipfiles with selected photos.', 'wp-photo-album-plus');
4434	- $help = (__('Activate the Admins Choice widget to make the zipfiles downloadable.', 'wp-photo-album-plus'));
4435	- $slug = '~~wppa_enable_admins_choice~~';
4436	- $~~html~~ = ~~wppa_checkbox~~(~~$slug~~);





4437	$clas = '';
4438	$tags = 'system';
4439	wppa_setting($slug, '27', $name, $desc, $html, $help, $clas, $tags);
	@@ -5876,6 +5881,28 @@ global $wppa_supported_camara_brands;
5876	$tags = 'thumb,widget,size,layout';
5877	wppa_setting($slug, '10b', $name, $desc, $html, $help, $clas, $tags);
5878






















5879	?>
5880	</tbody>
5881	<tfoot style="font-weight: bold;" class="wppa_table_5">
	@@ -8682,7 +8709,7 @@ global $wppa_supported_camara_brands;
8682	$clas = '';
8683	$tags = 'system,rating,comment';
8684	wppa_setting(false, '23', $name, $desc, $html, $help, $clas, $tags);
8685	-
8686	$name = __('Re-init custom and tags', 'wp-photo-album-plus');
8687	$desc = __('Re-initialize custom photo fields and default tags', 'wp-photo-album-plus');
8688	$help = '';


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

4431
4432	$name = __('Enable Admins Choice', 'wp-photo-album-plus');
4433	$desc = __('Enable the creation of zipfiles with selected photos.', 'wp-photo-album-plus');
4434	+ $help = __('Activate the Admins Choice widget to make the zipfiles downloadable.', 'wp-photo-album-plus');
4435	+ $slug = 'wppa_admins_choice';
4436	+ $opts = array( __( '--- none ---', 'wp-photo-album-plus' ),
4437	+ __( 'Admins and superusers', 'wp-photo-album-plus' ),
4438	+ __( 'All loggedin users', 'wp-photo-album-plus' )
4439	+ );
4440	+ $vals = array( 'none', 'admin', 'login' );
4441	+ $html = wppa_select($slug, $opts, $vals);
4442	$clas = '';
4443	$tags = 'system';
4444	wppa_setting($slug, '27', $name, $desc, $html, $help, $clas, $tags);

5881	$tags = 'thumb,widget,size,layout';
5882	wppa_setting($slug, '10b', $name, $desc, $html, $help, $clas, $tags);
5883
5884	+ $name = __('Calendar fontsize', 'wp-photo-album-plus');
5885	+ $desc = __('Old style calendar fontstyle', 'wp-photo-album-plus');
5886	+ $help = '';
5887	+ $slug1 = '';
5888	+ $slug2 = 'wppa_font_calendar_by';
5889	+ $slug3 = '';
5890	+ $slug4 = 'wppa_font_calendar_by_bold';
5891	+ $slug = $slug2;
5892	+ $html1 = '';
5893	+ $opts = array( __('Small', 'wp-photo-album-plus'),
5894	+ __('Medium', 'wp-photo-album-plus'),
5895	+ __('Large', 'wp-photo-album-plus'),
5896	+ __('Extra large', 'wp-photo-album-plus'));
5897	+ $vals = array( 'small', 'medium', 'large', 'xlarge');
5898	+ $html2 = wppa_select($slug2, $opts, $vals);
5899	+ $html3 = '';
5900	+ $html4 = wppa_checkbox($slug4) . ' ' . __('Bold', 'wp-photo-album-plus');
5901	+ $html = '</td><td>' . $html2 . '</td><td></td><td>' . $html4;
5902	+ $clas = '';
5903	+ $tags = 'size,layout';
5904	+ wppa_setting($slug, '11', $name, $desc, $html, $help, $clas, $tags);
5905	+
5906	?>
5907	</tbody>
5908	<tfoot style="font-weight: bold;" class="wppa_table_5">

8709	$clas = '';
8710	$tags = 'system,rating,comment';
8711	wppa_setting(false, '23', $name, $desc, $html, $help, $clas, $tags);
8712	+
8713	$name = __('Re-init custom and tags', 'wp-photo-album-plus');
8714	$desc = __('Re-initialize custom photo fields and default tags', 'wp-photo-album-plus');
8715	$help = '';

wppa-setup.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains all the setup stuff
6	- * Version 7.3.09
7	*
8	*/
9
	@@ -633,6 +633,12 @@ global $wppa_error;
633	if ( $old_rev <= '7300' ) {
634	wppa_schedule_maintenance_proc( 'wppa_fix_userids' );
635	}






636	}
637
638	// Set Defaults


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

633	if ( $old_rev <= '7300' ) {
634	wppa_schedule_maintenance_proc( 'wppa_fix_userids' );
635	}
636	+
637	+ if ( $old_rev <= '7400' ) {
638	+ if ( get_option( 'wppa_enable_admins_choice', 'no' ) == 'yes' ) {
639	+ update_option( 'wppa_admins_choice', 'admin' );
640	+ }
641	+ }
642	}
643
644	// Set Defaults

wppa-thumbnails.php CHANGED Viewed

	@@ -5,7 +5,7 @@
5	* Various funcions to display a thumbnail image
6	* Contains all possible frontend thumbnail types
7	*
8	- * Version 7.3.11
9	*
10	*/
11
	@@ -657,7 +657,10 @@ global $wpdb;
657	' >';
658
659	// The admins choice link
660	- if ( ~~wppa_user_is~~( '~~administrator~~' ) ~~&& wppa_switch( 'enable_admins_choice' ) ) {~~



661	$result .=
662	'<span' .
663	' id="admin-choice-' . wppa_encrypt_photo($thumb['id']) . '-' . $mocc . '"' .


5	* Various funcions to display a thumbnail image
6	* Contains all possible frontend thumbnail types
7	*
8	+ * Version 7.4.00
9	*
10	*/
11

657	' >';
658
659	// The admins choice link
660	+ $choice = wppa_opt( 'admins_choice' );
661	+ if ( ( wppa_user_is( 'administrator' ) && $choice != 'none' ) \|\|
662	+ ( is_user_logged_in() && $choice == 'login' ) ) {
663	+
664	$result .=
665	'<span' .
666	' id="admin-choice-' . wppa_encrypt_photo($thumb['id']) . '-' . $mocc . '"' .

wppa-utils.php CHANGED Viewed

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


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

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: 7.3.13.~~010~~
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/
	@@ -23,8 +23,8 @@ global $wpdb;
23	global $wp_version;
24
25	/* WPPA GLOBALS */
26	- global $wppa_revno; $wppa_revno = '~~7313~~'; // WPPA db version
27	- global $wppa_api_version; $wppa_api_version = '7.3.13.~~010~~'; // WPPA software version
28
29	/* Init page js data */
30	global $wppa_js_page_data; $wppa_js_page_data = '';


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: 7.4.00.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/

23	global $wp_version;
24
25	/* WPPA GLOBALS */
26	+ global $wppa_revno; $wppa_revno = '7400'; // WPPA db version
27	+ global $wppa_api_version; $wppa_api_version = '7.4.00.001'; // WPPA software version
28
29	/* Init page js data */
30	global $wppa_js_page_data; $wppa_js_page_data = '';