WP Photo Album Plus - Version 8.0.07.014

Version Description

= 8.0.07 =

This version addresses various bug fixes and security fixes.

Release Info

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

Code changes from version 8.0.07.013 to 8.0.07.014

Files changed (14) hide show

wppa-ajax.php +2 -2
wppa-boxes-html.php +11 -11
wppa-breadcrumb.php +43 -43
wppa-common-functions.php +2 -11
wppa-filter.php +3 -3
wppa-functions.php +29 -53
wppa-import.php +1 -1
wppa-init.php +7 -7
wppa-input.php +4 -11
wppa-links.php +46 -260
wppa-potd-widget.php +3 -3
wppa-topten-widget.php +3 -3
wppa-watermark.php +7 -7
wppa.php +2 -2

wppa-ajax.php CHANGED Viewed

	@@ -65,7 +65,7 @@ global $wppa;
65	$wppa_session['page']--;
66	$wppa_session['ajax']++;
67
68	- $wppa_action = wppa_get( '~~wppa-~~action' );
69
70	if ( wppa_switch( 'log_ajax' ) && wppa_get( 'action' ) != 'heartbeat' && wppa_get( 'option' ) != 'heartbeat' ) {
71	$args = '';
	@@ -3915,7 +3915,7 @@ global $wppa;
3915
3916	// Get args
3917	$slug = wppa_get( 'slug' );
3918	- $nonce = wppa_get( '~~wppa-~~nonce' );
3919	$cron = wppa_get( 'cron' );
3920
3921	// Security check


65	$wppa_session['page']--;
66	$wppa_session['ajax']++;
67
68	+ $wppa_action = wppa_get( 'action' );
69
70	if ( wppa_switch( 'log_ajax' ) && wppa_get( 'action' ) != 'heartbeat' && wppa_get( 'option' ) != 'heartbeat' ) {
71	$args = '';

3915
3916	// Get args
3917	$slug = wppa_get( 'slug' );
3918	+ $nonce = wppa_get( 'nonce' );
3919	$cron = wppa_get( 'cron' );
3920
3921	// Security check

wppa-boxes-html.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Various wppa boxes
6	- * Version 8.0.07.~~013~~
7	*
8	*/
9
	@@ -533,7 +533,7 @@ global $wppa_session;
533	for ( $sb = 0; $sb < $selboxes; $sb++ ) {
534	$opts[$sb] = array_merge( array( '' ), explode( "\n", wppa_opt( 'search_selbox_' . $sb ) ) );
535	$vals[$sb] = $opts[$sb];
536	- $current = wppa_get( '~~wppa-~~searchselbox-' . $sb );
537
538	// Item wrapper
539	$result .= '
	@@ -2527,7 +2527,7 @@ function wppa_get_user_create_html( $alb, $width, $where = '', $mcr = false ) {
2527	// Init
2528	$result = '';
2529	$mocc = wppa( 'mocc' );
2530	- $occur = wppa( '~~occur~~' );
2531	if ( $alb < '0' ) {
2532	$alb = '0';
2533	}
	@@ -2802,7 +2802,7 @@ static $albums_granted;
2802
2803	// Init
2804	$mocc = wppa( 'mocc');
2805	- $occur = wppa( '~~occur~~' );
2806	$yalb = str_replace( '.', '', $xalb );
2807
2808	// Open wrapper
	@@ -3635,8 +3635,8 @@ static $albums_granted;
3635
3636	// If ajax upload and from cover or thumbnail area, go display the thumbnails after upload
3637	if ( $where == 'cover' \|\| $where == 'thumb' ) {
3638	- $url_after_ajax_upload = wppa_get_permalink() . 'wppa-occur=' . wppa( '~~occur~~' ) . '&wppa-cover=0&wppa-album=' . ( is_array( $alb ) ? implode( '.', $alb ) : $alb );
3639	- $ajax_url_after_upload = str_replace( '&', '&', wppa_get_ajaxlink() ) . 'wppa-occur=' . wppa( '~~occur~~' ) . '&wppa-cover=0&wppa-album=' . ( is_array( $alb ) ? implode( '.', $alb ) : $alb );
3640	$on_complete = 'wppaDoAjaxRender( ' . $occur . ', \'' . $ajax_url_after_upload . '\', \'' . $url_after_ajax_upload . '\' )';
3641	}
3642	else {
	@@ -3703,10 +3703,10 @@ function wppa_user_albumedit_html( $alb, $width, $where = '', $mcr = false ) {
3703	// Create the return url
3704	$returnurl = wppa_get_permalink();
3705	if ( $where == 'cover' ) {
3706	- $returnurl .= 'wppa-album=' . $alb . '&wppa-cover=1&wppa-occur=' . wppa( '~~occur~~' );
3707	}
3708	elseif ( $where == 'thumb' ) {
3709	- $returnurl .= 'wppa-album=' . $alb . '&wppa-cover=0&wppa-occur=' . wppa( '~~occur~~' );
3710	}
3711	// elseif ( $where == 'widget' \|\| $where == 'uploadbox' ) {
3712	// }
	@@ -4230,7 +4230,7 @@ global $wpdb;
4230	' name="wppa-comment-edit"' .
4231	' value="' . wppa( 'comment_id' ) . '"' .
4232	' />' : '' ) .
4233	- '<input type="hidden" name="wppa-occur" value="'.wppa( '~~occur~~' ).'" />' .
4234
4235	// Table start
4236	'<table id="wppacommenttable-'.$mocc.'" style="margin:0;">' .
	@@ -5277,7 +5277,7 @@ function wppa_calendar_box() {
5277	wppa_container( 'close' );
5278
5279	// Bump occurrances
5280	- wppa( '~~occur~~', wppa( '~~occur~~' ) + '1' );
5281	wppa( 'mocc', wppa( 'mocc' ) + '1' );
5282
5283	// The Display container.
	@@ -5606,7 +5606,7 @@ function wppa_real_calendar_box() {
5606	if ( wppa_opt( 'real_calendar_linktype' ) == 'slide' ) {
5607
5608	// Bump occurrances.
5609	- wppa( '~~occur~~', wppa( '~~occur~~' ) + '1' );
5610	wppa( 'mocc', wppa( 'mocc' ) + '1' );
5611
5612	// The box


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

533	for ( $sb = 0; $sb < $selboxes; $sb++ ) {
534	$opts[$sb] = array_merge( array( '' ), explode( "\n", wppa_opt( 'search_selbox_' . $sb ) ) );
535	$vals[$sb] = $opts[$sb];
536	+ $current = wppa_get( 'searchselbox-' . $sb );
537
538	// Item wrapper
539	$result .= '

2527	// Init
2528	$result = '';
2529	$mocc = wppa( 'mocc' );
2530	+ $occur = wppa( 'mocc' );
2531	if ( $alb < '0' ) {
2532	$alb = '0';
2533	}

2802
2803	// Init
2804	$mocc = wppa( 'mocc');
2805	+ $occur = wppa( 'mocc' );
2806	$yalb = str_replace( '.', '', $xalb );
2807
2808	// Open wrapper

3635
3636	// If ajax upload and from cover or thumbnail area, go display the thumbnails after upload
3637	if ( $where == 'cover' \|\| $where == 'thumb' ) {
3638	+ $url_after_ajax_upload = wppa_get_permalink() . 'wppa-occur=' . wppa( 'mocc' ) . '&wppa-cover=0&wppa-album=' . ( is_array( $alb ) ? implode( '.', $alb ) : $alb );
3639	+ $ajax_url_after_upload = str_replace( '&', '&', wppa_get_ajaxlink() ) . 'wppa-occur=' . wppa( 'mocc' ) . '&wppa-cover=0&wppa-album=' . ( is_array( $alb ) ? implode( '.', $alb ) : $alb );
3640	$on_complete = 'wppaDoAjaxRender( ' . $occur . ', \'' . $ajax_url_after_upload . '\', \'' . $url_after_ajax_upload . '\' )';
3641	}
3642	else {

3703	// Create the return url
3704	$returnurl = wppa_get_permalink();
3705	if ( $where == 'cover' ) {
3706	+ $returnurl .= 'wppa-album=' . $alb . '&wppa-cover=1&wppa-occur=' . wppa( 'mocc' );
3707	}
3708	elseif ( $where == 'thumb' ) {
3709	+ $returnurl .= 'wppa-album=' . $alb . '&wppa-cover=0&wppa-occur=' . wppa( 'mocc' );
3710	}
3711	// elseif ( $where == 'widget' \|\| $where == 'uploadbox' ) {
3712	// }

4230	' name="wppa-comment-edit"' .
4231	' value="' . wppa( 'comment_id' ) . '"' .
4232	' />' : '' ) .
4233	+ '<input type="hidden" name="wppa-occur" value="'.wppa( 'mocc' ).'" />' .
4234
4235	// Table start
4236	'<table id="wppacommenttable-'.$mocc.'" style="margin:0;">' .

5277	wppa_container( 'close' );
5278
5279	// Bump occurrances
5280	+ wppa( 'mocc', wppa( 'mocc' ) + '1' );
5281	wppa( 'mocc', wppa( 'mocc' ) + '1' );
5282
5283	// The Display container.

5606	if ( wppa_opt( 'real_calendar_linktype' ) == 'slide' ) {
5607
5608	// Bump occurrances.
5609	+ wppa( 'mocc', wppa( 'mocc' ) + '1' );
5610	wppa( 'mocc', wppa( 'mocc' ) + '1' );
5611
5612	// The box

wppa-breadcrumb.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Functions for breadcrumbs
6	- * Version 8.0.07.~~013~~
7	*
8	*/
9
	@@ -225,8 +225,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
225	}
226
227	if ( wppa( 'is_slide' ) ) {
228	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-supersearch='.stripslashes( wppa( 'supersearch' ) );
229	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-supersearch='.stripslashes( wppa( 'supersearch' ) );
230	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
231	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
232	}
	@@ -266,8 +266,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
266	$value .= $albtxt;
267
268	if ( wppa( 'is_slide' ) ) {
269	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-searchstring='.stripslashes( str_replace( ' ', '+', $wppa_session['use_searchstring'] ) );
270	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-searchstring='.stripslashes( str_replace( ' ', '+', $wppa_session['use_searchstring'] ) );
271	if ( wppa( 'catbox' ) ) {
272	$thumbhref .= '&wppa-catbox=' . trim( wppa( 'catbox' ), ',' );
273	$thumbajax .= '&wppa-catbox=' . trim( wppa( 'catbox' ), ',' );
	@@ -330,12 +330,12 @@ if ( wppa( 'ajax') ) wppa_out('a');
330	if ( wppa( 'is_slide' ) ) {
331	$value = sprintf( __( 'Photos by %s' , 'wp-photo-album-plus'), $user );
332	if ( wppa( 'start_album' ) ) {
333	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-upldr='.wppa( 'is_upldr' ).'&wppa-album='.wppa( 'start_album' );
334	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-upldr='.wppa( 'is_upldr' ).'&wppa-album='.wppa( 'start_album' );
335	}
336	else {
337	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-upldr='.wppa( 'is_upldr' );
338	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-upldr='.wppa( 'is_upldr' );
339	}
340	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
341	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
	@@ -348,15 +348,15 @@ if ( wppa( 'ajax') ) wppa_out('a');
348	elseif ( wppa( 'is_topten' ) ) { // TopTen
349	if ( wppa( 'start_album' ) ) {
350	$value = $is_albenum ? __( 'Various albums' , 'wp-photo-album-plus') : wppa_get_album_name( $alb );
351	- $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
352	- $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
353	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
354	wppa_bcitem( $value, $href, $title, 'b7', $ajax );
355	}
356	if ( wppa( 'is_slide' ) ) {
357	$value = __( 'Top rated photos' , 'wp-photo-album-plus');
358	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-topten='.wppa( 'topten_count' ).'&wppa-album='.wppa( 'start_album' );
359	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-topten='.wppa( 'topten_count' ).'&wppa-album='.wppa( 'start_album' );
360	if ( wppa( 'medals_only' ) ) {
361	$thumbhref .= '&wppa-medals-only=1';
362	$thumbajax .= '&wppa-medals-only=1';
	@@ -372,8 +372,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
372	elseif ( wppa( 'is_lasten' ) ) { // Lasten
373	if ( wppa( 'start_album' ) ) {
374	$value = $is_albenum ? __( 'Various albums' , 'wp-photo-album-plus') : wppa_get_album_name( $alb );
375	- $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
376	- $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
377	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
378	wppa_bcitem( $value, $href, $title, 'b7', $ajax );
379	}
	@@ -384,8 +384,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
384	else {
385	$value = __( 'Recently uploaded photos' , 'wp-photo-album-plus');
386	}
387	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-lasten='.wppa( 'lasten_count' ).'&wppa-album='.wppa( 'start_album' );
388	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-lasten='.wppa( 'lasten_count' ).'&wppa-album='.wppa( 'start_album' );
389	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
390	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
391	}
	@@ -402,15 +402,15 @@ if ( wppa( 'ajax') ) wppa_out('a');
402	elseif ( wppa( 'is_comten' ) ) { // Comten
403	if ( wppa( 'start_album' ) ) {
404	$value = $is_albenum ? __( 'Various albums' , 'wp-photo-album-plus') : wppa_get_album_name( $alb );
405	- $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
406	- $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
407	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
408	wppa_bcitem( $value, $href, $title, 'b7', $ajax );
409	}
410	if ( wppa( 'is_slide' ) ) {
411	$value = __( 'Recently commented photos' , 'wp-photo-album-plus');
412	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-comten='.wppa( 'comten_count' ).'&wppa-album='.wppa( 'start_album' );
413	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-comten='.wppa( 'comten_count' ).'&wppa-album='.wppa( 'start_album' );
414	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
415	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
416	}
	@@ -422,15 +422,15 @@ if ( wppa( 'ajax') ) wppa_out('a');
422	elseif ( wppa( 'is_featen' ) ) { // Featen
423	if ( wppa( 'start_album' ) ) {
424	$value = $is_albenum ? __( 'Various albums' , 'wp-photo-album-plus') : wppa_get_album_name( $alb );
425	- $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
426	- $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
427	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
428	wppa_bcitem( $value, $href, $title, 'b7', $ajax );
429	}
430	if ( wppa( 'is_slide' ) ) {
431	$value = __( 'Featured photos' , 'wp-photo-album-plus');
432	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-featen='.wppa( 'featen_count' ).'&wppa-album='.wppa( 'start_album' );
433	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-featen='.wppa( 'featen_count' ).'&wppa-album='.wppa( 'start_album' );
434	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
435	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
436	}
	@@ -442,8 +442,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
442	elseif ( wppa( 'is_related' ) ) { // Related photos
443	if ( wppa( 'is_slide' ) ) {
444	$value = __( 'Related photos' , 'wp-photo-album-plus');
445	- $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
446	- $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
447	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
448	wppa_bcitem( $value, $href, $title, 'b8', $ajax, true );
449	}
	@@ -455,8 +455,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
455	elseif ( wppa( 'is_potdhis' ) ) {
456	if ( wppa( 'is_slide' ) ) {
457	$value = __( 'Photo of the day history' , 'wp-photo-album-plus');
458	- $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&potdhis=1';
459	- $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&potdhis=1';
460	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
461	wppa_bcitem( $value, $href, $title, 'b8', $ajax, true );
462	}
	@@ -470,8 +470,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
470	$value = __( 'Tagged photos:' , 'wp-photo-album-plus').' '.str_replace( ';', ' '.__( 'or' , 'wp-photo-album-plus').' ', str_replace( ',', ' '.__( 'and' , 'wp-photo-album-plus').' ', trim( wppa( 'is_tag' ), ',;' ) ) );
471	$value .= ' ' . __( 'From albums with', 'wp-photo-album-plus' ) . ' ';
472	$value .= __( 'Category:' , 'wp-photo-album-plus').' '.str_replace( ';', ' '.__( 'or', 'wp-photo-album-plus' ).' ', str_replace( ',', ' '.__( 'and', 'wp-photo-album-plus' ).' ', trim( wppa( 'is_cat' ), ',;' ) ) );
473	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
474	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
475	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
476	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
477	}
	@@ -492,8 +492,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
492	if ( wppa_get( 'inv' ) ) {
493	$value .= ' (' . __( 'Inverted', 'wp-photo-album-plus' ) . ')';
494	}
495	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
496	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
497	if ( wppa( 'is_inverse' ) ) {
498	$thumbhref .= '&wppa-inv=1';
499	$thumbajax .= '&wppa-inv=1';
	@@ -515,8 +515,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
515	elseif ( wppa( 'is_cat' ) ) { // Categorized albums
516	if ( wppa( 'is_slide' ) ) {
517	$value = __( 'Category:' , 'wp-photo-album-plus').' '.str_replace( ';', ' '.__( 'or', 'wp-photo-album-plus' ).' ', str_replace( ',', ' '.__( 'and', 'wp-photo-album-plus' ).' ', trim( wppa( 'is_cat' ), ',;' ) ) );
518	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
519	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
520	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
521	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
522	}
	@@ -529,15 +529,15 @@ if ( wppa( 'ajax') ) wppa_out('a');
529	elseif ( wppa( 'last_albums' ) ) { // Recently modified albums( s )
530	if ( wppa( 'last_albums_parent' ) ) {
531	$value = wppa_get_album_name( $alb );
532	- $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
533	- $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
534	$title = __( 'Album:' , 'wp-photo-album-plus').' '.$value;
535	wppa_bcitem( $value, $href, $title, 'b7', $ajax, true );
536	}
537	if ( wppa( 'is_slide' ) ) {
538	$value = __( 'Recently updated albums' , 'wp-photo-album-plus');
539	- $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
540	- $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
541	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
542	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
543	}
	@@ -556,8 +556,8 @@ if ( wppa( 'ajax') ) wppa_out('a');
556	else $various = __( 'Various albums' , 'wp-photo-album-plus');
557	if ( wppa( 'is_slide' ) ) {
558	$value = $is_albenum ? $various : wppa_get_album_name( $alb );
559	- $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
560	- $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
561	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
562	wppa_bcitem( $value, $href, $title, 'b7', $ajax, true );
563	}
	@@ -742,11 +742,11 @@ global $wpdb;
742	$href =
743	wppa_get_permalink( $pagid ) .
744	'wppa-album=' . $parent . '&wppa-cover=' . $to_cover . $slide .
745	- '&wppa-occur=' . wppa( '~~occur~~' );
746	$ajax =
747	wppa_get_ajaxlink() .
748	'wppa-album=' . $parent . '&wppa-cover=' . $to_cover . $slide .
749	- '&wppa-occur=' . wppa( '~~occur~~' );
750
751	$title = __( 'Album:' , 'wp-photo-album-plus') . ' ' . wppa_get_album_name( $parent );
752	$class = 'b20';


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

225	}
226
227	if ( wppa( 'is_slide' ) ) {
228	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-supersearch='.stripslashes( wppa( 'supersearch' ) );
229	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-supersearch='.stripslashes( wppa( 'supersearch' ) );
230	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
231	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
232	}

266	$value .= $albtxt;
267
268	if ( wppa( 'is_slide' ) ) {
269	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-searchstring='.stripslashes( str_replace( ' ', '+', $wppa_session['use_searchstring'] ) );
270	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-searchstring='.stripslashes( str_replace( ' ', '+', $wppa_session['use_searchstring'] ) );
271	if ( wppa( 'catbox' ) ) {
272	$thumbhref .= '&wppa-catbox=' . trim( wppa( 'catbox' ), ',' );
273	$thumbajax .= '&wppa-catbox=' . trim( wppa( 'catbox' ), ',' );

330	if ( wppa( 'is_slide' ) ) {
331	$value = sprintf( __( 'Photos by %s' , 'wp-photo-album-plus'), $user );
332	if ( wppa( 'start_album' ) ) {
333	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-upldr='.wppa( 'is_upldr' ).'&wppa-album='.wppa( 'start_album' );
334	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-upldr='.wppa( 'is_upldr' ).'&wppa-album='.wppa( 'start_album' );
335	}
336	else {
337	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-upldr='.wppa( 'is_upldr' );
338	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-upldr='.wppa( 'is_upldr' );
339	}
340	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
341	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );

348	elseif ( wppa( 'is_topten' ) ) { // TopTen
349	if ( wppa( 'start_album' ) ) {
350	$value = $is_albenum ? __( 'Various albums' , 'wp-photo-album-plus') : wppa_get_album_name( $alb );
351	+ $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
352	+ $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
353	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
354	wppa_bcitem( $value, $href, $title, 'b7', $ajax );
355	}
356	if ( wppa( 'is_slide' ) ) {
357	$value = __( 'Top rated photos' , 'wp-photo-album-plus');
358	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-topten='.wppa( 'topten_count' ).'&wppa-album='.wppa( 'start_album' );
359	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-topten='.wppa( 'topten_count' ).'&wppa-album='.wppa( 'start_album' );
360	if ( wppa( 'medals_only' ) ) {
361	$thumbhref .= '&wppa-medals-only=1';
362	$thumbajax .= '&wppa-medals-only=1';

372	elseif ( wppa( 'is_lasten' ) ) { // Lasten
373	if ( wppa( 'start_album' ) ) {
374	$value = $is_albenum ? __( 'Various albums' , 'wp-photo-album-plus') : wppa_get_album_name( $alb );
375	+ $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
376	+ $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
377	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
378	wppa_bcitem( $value, $href, $title, 'b7', $ajax );
379	}

384	else {
385	$value = __( 'Recently uploaded photos' , 'wp-photo-album-plus');
386	}
387	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-lasten='.wppa( 'lasten_count' ).'&wppa-album='.wppa( 'start_album' );
388	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-lasten='.wppa( 'lasten_count' ).'&wppa-album='.wppa( 'start_album' );
389	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
390	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
391	}

402	elseif ( wppa( 'is_comten' ) ) { // Comten
403	if ( wppa( 'start_album' ) ) {
404	$value = $is_albenum ? __( 'Various albums' , 'wp-photo-album-plus') : wppa_get_album_name( $alb );
405	+ $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
406	+ $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
407	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
408	wppa_bcitem( $value, $href, $title, 'b7', $ajax );
409	}
410	if ( wppa( 'is_slide' ) ) {
411	$value = __( 'Recently commented photos' , 'wp-photo-album-plus');
412	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-comten='.wppa( 'comten_count' ).'&wppa-album='.wppa( 'start_album' );
413	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-comten='.wppa( 'comten_count' ).'&wppa-album='.wppa( 'start_album' );
414	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
415	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
416	}

422	elseif ( wppa( 'is_featen' ) ) { // Featen
423	if ( wppa( 'start_album' ) ) {
424	$value = $is_albenum ? __( 'Various albums' , 'wp-photo-album-plus') : wppa_get_album_name( $alb );
425	+ $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
426	+ $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
427	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
428	wppa_bcitem( $value, $href, $title, 'b7', $ajax );
429	}
430	if ( wppa( 'is_slide' ) ) {
431	$value = __( 'Featured photos' , 'wp-photo-album-plus');
432	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-featen='.wppa( 'featen_count' ).'&wppa-album='.wppa( 'start_album' );
433	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-featen='.wppa( 'featen_count' ).'&wppa-album='.wppa( 'start_album' );
434	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
435	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
436	}

442	elseif ( wppa( 'is_related' ) ) { // Related photos
443	if ( wppa( 'is_slide' ) ) {
444	$value = __( 'Related photos' , 'wp-photo-album-plus');
445	+ $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
446	+ $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
447	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
448	wppa_bcitem( $value, $href, $title, 'b8', $ajax, true );
449	}

455	elseif ( wppa( 'is_potdhis' ) ) {
456	if ( wppa( 'is_slide' ) ) {
457	$value = __( 'Photo of the day history' , 'wp-photo-album-plus');
458	+ $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&potdhis=1';
459	+ $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&potdhis=1';
460	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
461	wppa_bcitem( $value, $href, $title, 'b8', $ajax, true );
462	}

470	$value = __( 'Tagged photos:' , 'wp-photo-album-plus').' '.str_replace( ';', ' '.__( 'or' , 'wp-photo-album-plus').' ', str_replace( ',', ' '.__( 'and' , 'wp-photo-album-plus').' ', trim( wppa( 'is_tag' ), ',;' ) ) );
471	$value .= ' ' . __( 'From albums with', 'wp-photo-album-plus' ) . ' ';
472	$value .= __( 'Category:' , 'wp-photo-album-plus').' '.str_replace( ';', ' '.__( 'or', 'wp-photo-album-plus' ).' ', str_replace( ',', ' '.__( 'and', 'wp-photo-album-plus' ).' ', trim( wppa( 'is_cat' ), ',;' ) ) );
473	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
474	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
475	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
476	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
477	}

492	if ( wppa_get( 'inv' ) ) {
493	$value .= ' (' . __( 'Inverted', 'wp-photo-album-plus' ) . ')';
494	}
495	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
496	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
497	if ( wppa( 'is_inverse' ) ) {
498	$thumbhref .= '&wppa-inv=1';
499	$thumbajax .= '&wppa-inv=1';

515	elseif ( wppa( 'is_cat' ) ) { // Categorized albums
516	if ( wppa( 'is_slide' ) ) {
517	$value = __( 'Category:' , 'wp-photo-album-plus').' '.str_replace( ';', ' '.__( 'or', 'wp-photo-album-plus' ).' ', str_replace( ',', ' '.__( 'and', 'wp-photo-album-plus' ).' ', trim( wppa( 'is_cat' ), ',;' ) ) );
518	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
519	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
520	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
521	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
522	}

529	elseif ( wppa( 'last_albums' ) ) { // Recently modified albums( s )
530	if ( wppa( 'last_albums_parent' ) ) {
531	$value = wppa_get_album_name( $alb );
532	+ $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
533	+ $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
534	$title = __( 'Album:' , 'wp-photo-album-plus').' '.$value;
535	wppa_bcitem( $value, $href, $title, 'b7', $ajax, true );
536	}
537	if ( wppa( 'is_slide' ) ) {
538	$value = __( 'Recently updated albums' , 'wp-photo-album-plus');
539	+ $thumbhref = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
540	+ $thumbajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
541	$title = __( 'View the thumbnails' , 'wp-photo-album-plus');
542	wppa_bcitem( $value, $thumbhref, $title, 'b8', $thumbajax, true );
543	}

556	else $various = __( 'Various albums' , 'wp-photo-album-plus');
557	if ( wppa( 'is_slide' ) ) {
558	$value = $is_albenum ? $various : wppa_get_album_name( $alb );
559	+ $href = wppa_get_permalink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
560	+ $ajax = wppa_get_ajaxlink().'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
561	$title = $is_albenum ? __( 'Albums:' , 'wp-photo-album-plus').' '.wppa( 'start_album' ) : __( 'Album:' , 'wp-photo-album-plus').' '.$value;
562	wppa_bcitem( $value, $href, $title, 'b7', $ajax, true );
563	}

742	$href =
743	wppa_get_permalink( $pagid ) .
744	'wppa-album=' . $parent . '&wppa-cover=' . $to_cover . $slide .
745	+ '&wppa-occur=' . wppa( 'mocc' );
746	$ajax =
747	wppa_get_ajaxlink() .
748	'wppa-album=' . $parent . '&wppa-cover=' . $to_cover . $slide .
749	+ '&wppa-occur=' . wppa( 'mocc' );
750
751	$title = __( 'Album:' , 'wp-photo-album-plus') . ' ' . wppa_get_album_name( $parent );
752	$class = 'b20';

wppa-common-functions.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/* wppa-common-functions.php
3	*
4	* Functions used in admin and in themes
5	- * Version 8.0.07.~~013~~
6	*
7	*/
8
	@@ -101,9 +101,7 @@ global $wppa_current_shortcode_atts;
101	wppa_cache_album( 'invalidate' );
102
103	$mocc = isset( $wppa['mocc'] ) ? $wppa['mocc'] : '0';
104	- $occ = isset( $wppa['occur'] ) ? $wppa['occur'] : '0';
105
106	- $wocc = isset( $wppa['widget_occur'] ) ? $wppa['widget_occur'] : '0';
107	$rend = isset( $wppa['rendering_enabled'] ) ? $wppa['rendering_enabled'] : false;
108	$debug = isset( $wppa['debug'] ) ? $wppa['debug'] : false;
109	$pano = isset( $wppa['has_panorama'] ) ? $wppa['has_panorama'] : false;
	@@ -116,8 +114,6 @@ global $wppa_current_shortcode_atts;
116	if ( $first_pla ) {
117	$first_pla = false;
118	$mocc = isset( $_REQUEST['page'] ) ? $_REQUEST['page'] : '4711'; // ; wppa_get( 'page', '4711', 'int' ); // Kind of random
119	-
120	- wppa_log('obs', 'Mocc is nu '.$mocc);
121	}
122	}
123
	@@ -129,18 +125,13 @@ wppa_log('obs', 'Mocc is nu '.$mocc);
129	}
130	}
131
132	- $occ = $mocc;
133	-
134	-
135	$wppa = array (
136	'debug' => $debug,
137	'revno' => $wppa_revno, // set in wppa.php
138	'api_version' => $wppa_api_version, // set in wppa.php
139	'fullsize' => '',
140	'enlarge' => false,
141	- 'occur' => $occ,
142	'mocc' => $mocc,
143	- 'widget_occur' => $wocc,
144	'in_widget' => false,
145	'is_cover' => '0',
146	'is_slide' => '0',
	@@ -1039,7 +1030,7 @@ global $wppa_session;
1039	// Did we do wppa_initialize_runtime() ?
1040	if ( is_array( $wppa ) && ! $at_session_start ) {
1041	$wppa['searchstring'] = $str;
1042	- if ( $wppa['searchstring'] && $wppa['~~occur~~'] == wppa_opt( 'search_oc' ) && ! wppa_in_widget() ) $wppa['src'] = true;
1043	else $wppa['src'] = false;
1044	if ( wppa_get( 's' ) ) {
1045	$wppa['src'] = true;


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

101	wppa_cache_album( 'invalidate' );
102
103	$mocc = isset( $wppa['mocc'] ) ? $wppa['mocc'] : '0';

104

105	$rend = isset( $wppa['rendering_enabled'] ) ? $wppa['rendering_enabled'] : false;
106	$debug = isset( $wppa['debug'] ) ? $wppa['debug'] : false;
107	$pano = isset( $wppa['has_panorama'] ) ? $wppa['has_panorama'] : false;

114	if ( $first_pla ) {
115	$first_pla = false;
116	$mocc = isset( $_REQUEST['page'] ) ? $_REQUEST['page'] : '4711'; // ; wppa_get( 'page', '4711', 'int' ); // Kind of random


117	}
118	}
119

125	}
126	}
127



128	$wppa = array (
129	'debug' => $debug,
130	'revno' => $wppa_revno, // set in wppa.php
131	'api_version' => $wppa_api_version, // set in wppa.php
132	'fullsize' => '',
133	'enlarge' => false,

134	'mocc' => $mocc,

135	'in_widget' => false,
136	'is_cover' => '0',
137	'is_slide' => '0',

1030	// Did we do wppa_initialize_runtime() ?
1031	if ( is_array( $wppa ) && ! $at_session_start ) {
1032	$wppa['searchstring'] = $str;
1033	+ if ( $wppa['searchstring'] && $wppa['mocc'] == wppa_opt( 'search_oc' ) && ! wppa_in_widget() ) $wppa['src'] = true;
1034	else $wppa['src'] = false;
1035	if ( wppa_get( 's' ) ) {
1036	$wppa['src'] = true;

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 8.0.07.~~003~~
7	*
8	*/
9
	@@ -183,7 +183,7 @@ global $wppa_current_shortcode_atts;
183
184	// Find occur
185	if ( wppa_get_the_ID() != $wppa_postid ) { // New post
186	- $wppa['~~occur~~'] = '0'; // Init this occurance
187	$wppa['fullsize'] = ''; // Reset at each post
188	$wppa_postid = wppa_get_the_ID(); // Remember the post id
189	}
	@@ -663,7 +663,7 @@ global $wppa_current_shortcode_atts;
663
664	// Find occur
665	if ( wppa_get_the_ID() != $wppa_postid ) { // New post
666	- $wppa['~~occur~~'] = '0'; // Init this occurance
667	$wppa['fullsize'] = ''; // Reset at each post
668	$wppa_postid = wppa_get_the_ID(); // Remember the post id
669	}


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

183
184	// Find occur
185	if ( wppa_get_the_ID() != $wppa_postid ) { // New post
186	+ $wppa['mocc'] = '0'; // Init this occurance
187	$wppa['fullsize'] = ''; // Reset at each post
188	$wppa_postid = wppa_get_the_ID(); // Remember the post id
189	}

663
664	// Find occur
665	if ( wppa_get_the_ID() != $wppa_postid ) { // New post
666	+ $wppa['mocc'] = '0'; // Init this occurance
667	$wppa['fullsize'] = ''; // Reset at each post
668	$wppa_postid = wppa_get_the_ID(); // Remember the post id
669	}

wppa-functions.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Various functions
6	- * Version 8.0.07.~~013~~
7	*
8	*/
9
	@@ -41,26 +41,9 @@ global $wppa_current_shortcode_atts;
41	else {
42	wppa_bump_mocc();
43	}
44	-
45	- // wppa( 'fullsize', wppa_get( 'size', wppa_get_container_width() ) );
46	-
47	- if ( wppa_get( 'occur' ) ) {
48	- wppa( 'occur', wppa_get( 'occur' ) );
49	- }
50	-
51	- if ( wppa_get( 'woccur' ) ) {
52	- wppa( 'widget_occur', wppa_get( 'woccur' ) );
53	- wppa( 'in_widget', true );
54	- }
55	}
56	else {
57	wppa_bump_mocc();
58	- if ( wppa_in_widget() ) {
59	- wppa( 'widget_occur', wppa( 'widget_occur' ) + '1' );
60	- }
61	- else {
62	- wppa( 'occur', wppa( 'occur' ) + '1' );
63	- }
64	}
65
66	// Set wppa( 'src' ) = true and wppa( 'searchstring' ) if this occurrance processes a search request.
	@@ -82,10 +65,8 @@ global $wppa_current_shortcode_atts;
82	// in order of priority:
83	// 1. The given query string applies to this invocation ( occurrance )
84	// This invocation requires the ignorance of the filter results and the interpretation of the querystring.
85	- if ( ~~( ( wppa_get( '~~occur' ) ~~\|\| wppa_get( 'woccur' ) )~~ && // ~~There~~ ~~IS a query string. For bw compat, occur is required ...~~
86	- ( ( ~~wppa_in_widget~~() && ~~wppa~~( '~~widget_occur~~' ) == ~~wppa_get~~( '~~woccur~~' ) ) ~~\|\| //~~ ~~and~~ it ~~applies~~ to ~~...~~
87	- ( ! wppa_in_widget() && wppa( 'occur' ) == wppa_get( 'occur' ) ) ) // this occurrance
88	- ) && ! wppa( 'is_autopage' ) ) {
89
90	// Process query string
91	wppa_out( wppa_dbg_msg( 'Querystring applied', 'brown', false, true ) );
	@@ -825,7 +806,7 @@ global $wppa_current_shortcode_atts;
825	}
826
827	// Subsearch or rootsearch?
828	- if ( wppa( '~~occur~~' ) == wppa_opt( 'search_oc' ) &&
829	! wppa( 'in_widget' ) &&
830	( ( isset( $wppa_session['has_searchbox'] ) && $wppa_session['has_searchbox'] ) \|\|
831	wppa_get( 'forceroot' )
	@@ -1067,21 +1048,17 @@ global $wpdb;
1067	// Determine in wich theme page we are, Album covers, Thumbnails or slideshow
1068	function wppa_page( $page ) {
1069
1070	- if ( wppa_in_widget() ) {
1071	- $occur = wppa_get( 'woccur' );
1072	- }
1073	- else {
1074	- $occur = wppa_get( 'occur' );
1075	- }
1076	-
1077	- $ref_occur = wppa_in_widget() ? wppa( 'widget_occur' ) : wppa( 'occur' );
1078	-
1079	if ( wppa( 'is_slide' ) ) $cur_page = 'slide'; // Do slide or single when explixitly on
1080	elseif ( wppa( 'is_slideonly' ) ) $cur_page = 'slide'; // Slideonly is a subset of slide
1081	elseif ( is_numeric( wppa( 'single_photo' ) ) ) $cur_page = 'oneofone';
1082	else $cur_page = 'albums';
1083
1084	- if ( $cur_page == $page ) ~~return true; else return false;~~





1085	}
1086
1087	// loop album
	@@ -3354,7 +3331,7 @@ function wppa_make_captcha( $id ) {
3354
3355	// Check the comment security answer
3356	function wppa_check_captcha( $id ) {
3357	- $answer = wppa_get( '~~wppa-~~captcha' );
3358	$capt = wppa_ll_captcha( $id );
3359	return $capt['ans'] == $answer;
3360	}
	@@ -3837,19 +3814,18 @@ function wppa_get_container_style() {
3837
3838	function wppa_get_curpage() {
3839
3840	- if ( ~~wppa_get(~~ ~~'page'~~ ) ) {
3841	- if ( ~~wppa_in_widget~~() ) {
3842	- ~~$oc = wppa_get( 'woccur' );~~
3843	- if ( ! ~~$oc~~ ) ~~$oc = '1';~~
3844	- $curpage = ~~wppa~~( '~~widget_occur~~' ) ~~== $oc ? wppa_get(~~ '~~page~~' ) ~~: '1'~~;
3845	- }
3846	- else {
3847	- $oc = wppa_get( 'occur' );
3848	- if ( ! $oc ) $oc = '1';
3849	- $curpage = wppa( 'occur' ) == $oc ? wppa_get( 'page' ) : '1';
3850	- }
3851	}
3852	- else ~~$curpage = '1';~~





3853	return $curpage;
3854	}
3855
	@@ -5001,7 +4977,7 @@ global $wppa_upload_succes_id;
5001	if ( wppa_get( 'fe-create' ) ) { // Create album
5002	$nonce = wppa_get( 'nonce' );
5003	if ( wppa_get( 'album-name' ) ) {
5004	- $albumname = trim( strip_tags( wppa_get( '~~wppa-~~album-name' ) ) );
5005	}
5006	if ( ! wppa_sanitize_file_name( $albumname ) ) {
5007	$albumname = __('New Album', 'wp-photo-album-plus');
	@@ -5020,12 +4996,12 @@ global $wppa_upload_succes_id;
5020	}
5021	}
5022
5023	- $parent = strval( intval( wppa_get( '~~wppa-~~album-parent' ) ) );
5024	if ( ! wppa_user_is( 'administrator' ) && wppa_switch( 'default_parent_always' ) ) {
5025	$parent = wppa_opt( 'default_parent' );
5026	}
5027	$album = wppa_create_album_entry( array( 'name' => $albumname,
5028	- 'description' => strip_tags( wppa_get( '~~wppa-~~album-desc' ) ),
5029	'a_parent' => $parent,
5030	'owner' => wppa_switch( 'frontend_album_public' ) ? '--- public ---' : wppa_get_user()
5031	) );
	@@ -5047,14 +5023,14 @@ global $wppa_upload_succes_id;
5047	if ( $may_upload ) {
5048	$upload_message = '';
5049	$blogged = false;
5050	- if ( wppa_get( '~~wppa-~~upload-album' ) ) { // Upload photo
5051	$nonce = wppa_get( 'nonce' );
5052	$ok = wp_verify_nonce( $nonce, 'wppa-check' );
5053	if ( ! $ok ) {
5054	die( '<b>' . __( 'ERROR: Illegal attempt to upload a file.', 'wp-photo-album-plus') . '</b>');
5055	}
5056
5057	- $alb = wppa_get( '~~wppa-~~upload-album' );
5058	$alb = strval( intval( $alb ) ); // Force numeric
5059	if ( ! wppa_album_exists( $alb ) ) {
5060	$alert = esc_js( sprintf( __( 'Album %s does not exist', 'wp-photo-album-plus' ), $alb ) );
	@@ -6093,7 +6069,7 @@ global $wppa_lang;
6093	}
6094
6095	// Querystring not for this occur?
6096	- elseif ( ! wppa_in_widget() && wppa( '~~occur~~' ) != wppa_get( 'occur' ) ) {
6097	$caching = true;
6098	}
6099
	@@ -6104,7 +6080,7 @@ global $wppa_lang;
6104
6105	if ( $caching ) {
6106
6107	- $cache_id = str_replace( '/', '.', get_permalink() ) . '-' . wppa( '~~occur~~' );
6108	if ( wppa( 'ajax' ) ) {
6109	$cache_id .= $_SERVER['QUERY_STRING'];
6110	}


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

41	else {
42	wppa_bump_mocc();
43	}











44	}
45	else {
46	wppa_bump_mocc();






47	}
48
49	// Set wppa( 'src' ) = true and wppa( 'searchstring' ) if this occurrance processes a search request.

65	// in order of priority:
66	// 1. The given query string applies to this invocation ( occurrance )
67	// This invocation requires the ignorance of the filter results and the interpretation of the querystring.
68	+ // if occur in qstring && occur == currrent mocc && ! autopage
69	+ if ( ( wppa_get( 'occur' ) && wppa_get( 'occur' ) == wppa( 'mocc' ) ) && ! wppa( 'is_autopage' ) ) {


70
71	// Process query string
72	wppa_out( wppa_dbg_msg( 'Querystring applied', 'brown', false, true ) );

806	}
807
808	// Subsearch or rootsearch?
809	+ if ( wppa( 'mocc' ) == wppa_opt( 'search_oc' ) &&
810	! wppa( 'in_widget' ) &&
811	( ( isset( $wppa_session['has_searchbox'] ) && $wppa_session['has_searchbox'] ) \|\|
812	wppa_get( 'forceroot' )

1048	// Determine in wich theme page we are, Album covers, Thumbnails or slideshow
1049	function wppa_page( $page ) {
1050









1051	if ( wppa( 'is_slide' ) ) $cur_page = 'slide'; // Do slide or single when explixitly on
1052	elseif ( wppa( 'is_slideonly' ) ) $cur_page = 'slide'; // Slideonly is a subset of slide
1053	elseif ( is_numeric( wppa( 'single_photo' ) ) ) $cur_page = 'oneofone';
1054	else $cur_page = 'albums';
1055
1056	+ if ( $cur_page == $page ) {
1057	+ return true;
1058	+ }
1059	+ else {
1060	+ return false;
1061	+ }
1062	}
1063
1064	// loop album

3331
3332	// Check the comment security answer
3333	function wppa_check_captcha( $id ) {
3334	+ $answer = wppa_get( 'captcha' );
3335	$capt = wppa_ll_captcha( $id );
3336	return $capt['ans'] == $answer;
3337	}

3814
3815	function wppa_get_curpage() {
3816
3817	+ // If current occ is qstring occ
3818	+ if ( wppa( 'mocc' ) == wppa_get( 'occur', '1' ) ) {
3819	+
3820	+ // page may be in qstring
3821	+ $curpage = wppa_get( 'page', '1', 'int' );






3822	}
3823	+ else {
3824	+
3825	+ // Page is 1
3826	+ $curpage = '1';
3827	+ }
3828	+
3829	return $curpage;
3830	}
3831

4977	if ( wppa_get( 'fe-create' ) ) { // Create album
4978	$nonce = wppa_get( 'nonce' );
4979	if ( wppa_get( 'album-name' ) ) {
4980	+ $albumname = trim( strip_tags( wppa_get( 'album-name' ) ) );
4981	}
4982	if ( ! wppa_sanitize_file_name( $albumname ) ) {
4983	$albumname = __('New Album', 'wp-photo-album-plus');

4996	}
4997	}
4998
4999	+ $parent = strval( intval( wppa_get( 'album-parent' ) ) );
5000	if ( ! wppa_user_is( 'administrator' ) && wppa_switch( 'default_parent_always' ) ) {
5001	$parent = wppa_opt( 'default_parent' );
5002	}
5003	$album = wppa_create_album_entry( array( 'name' => $albumname,
5004	+ 'description' => strip_tags( wppa_get( 'album-desc' ) ),
5005	'a_parent' => $parent,
5006	'owner' => wppa_switch( 'frontend_album_public' ) ? '--- public ---' : wppa_get_user()
5007	) );

5023	if ( $may_upload ) {
5024	$upload_message = '';
5025	$blogged = false;
5026	+ if ( wppa_get( 'upload-album' ) ) { // Upload photo
5027	$nonce = wppa_get( 'nonce' );
5028	$ok = wp_verify_nonce( $nonce, 'wppa-check' );
5029	if ( ! $ok ) {
5030	die( '<b>' . __( 'ERROR: Illegal attempt to upload a file.', 'wp-photo-album-plus') . '</b>');
5031	}
5032
5033	+ $alb = wppa_get( 'upload-album' );
5034	$alb = strval( intval( $alb ) ); // Force numeric
5035	if ( ! wppa_album_exists( $alb ) ) {
5036	$alert = esc_js( sprintf( __( 'Album %s does not exist', 'wp-photo-album-plus' ), $alb ) );

6069	}
6070
6071	// Querystring not for this occur?
6072	+ elseif ( ! wppa_in_widget() && wppa( 'mocc' ) != wppa_get( 'occur' ) ) {
6073	$caching = true;
6074	}
6075

6080
6081	if ( $caching ) {
6082
6083	+ $cache_id = str_replace( '/', '.', get_permalink() ) . '-' . wppa( 'mocc' );
6084	if ( wppa( 'ajax' ) ) {
6085	$cache_id .= $_SERVER['QUERY_STRING'];
6086	}

wppa-import.php CHANGED Viewed

	@@ -2067,7 +2067,7 @@ global $wppa_session;
2067	}
2068
2069	// Update the photo ?
2070	- elseif ( wppa_get( '~~wppa-~~update' ) ) {
2071
2072	if ( wppa( 'is_wppa_tree' ) ) {
2073	$tmp = explode( '/wppa/', $file );


2067	}
2068
2069	// Update the photo ?
2070	+ elseif ( wppa_get( 'update' ) ) {
2071
2072	if ( wppa( 'is_wppa_tree' ) ) {
2073	$tmp = explode( '/wppa/', $file );

wppa-init.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* This file loads required php files and contains all functions used in init actions.
6	*
7	- * Version 8.0.07.~~001~~
8	*/
9
10	/* LOAD SIDEBAR WIDGETS */
	@@ -496,13 +496,13 @@ global $wppa;
496	// wppa_log( 'obs', 'AIOSEO tampered mocc to ' . $wppa['mocc'] );
497	$wppa['mocc'] = '0';
498	}
499	- if ( $wppa['~~occur~~'] ) {
500	- // wppa_log( 'obs', 'AIOSEO tampered occur to ' . $wppa['~~occur~~'] );
501	- $wppa['~~occur~~'] = '0';
502	}
503	- if ( $wppa['~~widget_occur~~'] ) {
504	- // wppa_log( 'obs', 'AIOSEO tampered widget_occur to ' . $wppa['~~widget_occur~~'] );
505	- $wppa['~~widget_occur~~'] = '0';
506	}
507	}
508	add_action( 'wp_head', 'wppa_fix_aioseo', '99' );


4	*
5	* This file loads required php files and contains all functions used in init actions.
6	*
7	+ * Version 8.0.07.014
8	*/
9
10	/* LOAD SIDEBAR WIDGETS */

496	// wppa_log( 'obs', 'AIOSEO tampered mocc to ' . $wppa['mocc'] );
497	$wppa['mocc'] = '0';
498	}
499	+ if ( $wppa['mocc'] ) {
500	+ // wppa_log( 'obs', 'AIOSEO tampered occur to ' . $wppa['mocc'] );
501	+ $wppa['mocc'] = '0';
502	}
503	+ if ( $wppa['mocc'] ) {
504	+ // wppa_log( 'obs', 'AIOSEO tampered widget_occur to ' . $wppa['mocc'] );
505	+ $wppa['mocc'] = '0';
506	}
507	}
508	add_action( 'wp_head', 'wppa_fix_aioseo', '99' );

wppa-input.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains functions for sanitizing and formatting user input
6	- * Version 8.0.07.~~013~~
7	*
8	*/
9
	@@ -53,7 +53,6 @@ function wppa_get_get_filter( $name ) {
53
54	// Integer
55	case 'occur':
56	- case 'woccur':
57	case 'topten':
58	case 'lasten':
59	case 'comten':
	@@ -239,7 +238,6 @@ function wppa_get_get_filter( $name ) {
239	default:
240	$result = 'raw';
241	break;
242	-
243	}
244
245	return $result;
	@@ -253,16 +251,11 @@ global $wpdb;
253	$oxname = $xname;
254
255	// Ajax call?
256	- if ( $xname == '~~wppa-~~action' ) {
257	if ( isset( $_REQUEST['wppa-action'] ) ) {
258	return sanitize_text_field( $_REQUEST['wppa-action'] );
259	}
260	}
261	- elseif ( $xname == 'action' ) {
262	- if ( isset( $_REQUEST['action'] ) ) {
263	- return sanitize_text_field( $_REQUEST['action'] );
264	- }
265	- }
266
267	// Normalize $name and $xname
268	if ( substr( $xname, 0, 5 ) == 'wppa-' ) {
	@@ -367,12 +360,12 @@ global $wpdb;
367
368	case 'raw':
369	$result = $value;
370	- wppa_dump( 'Unfiltered (raw) querystring arg ' . $name . ', value= ' . $value );
371	break;
372
373	default:
374	$result = $value;
375	- wppa_dump( 'Unknown filter for querystring arg ' . $name . ', value= ' . $value );
376	break;
377	}
378


3	* Package: wp-photo-album-plus
4	*
5	* Contains functions for sanitizing and formatting user input
6	+ * Version 8.0.07.014
7	*
8	*/
9

53
54	// Integer
55	case 'occur':

56	case 'topten':
57	case 'lasten':
58	case 'comten':

238	default:
239	$result = 'raw';
240	break;

241	}
242
243	return $result;

251	$oxname = $xname;
252
253	// Ajax call?
254	+ if ( $xname == 'action' ) {
255	if ( isset( $_REQUEST['wppa-action'] ) ) {
256	return sanitize_text_field( $_REQUEST['wppa-action'] );
257	}
258	}





259
260	// Normalize $name and $xname
261	if ( substr( $xname, 0, 5 ) == 'wppa-' ) {

360
361	case 'raw':
362	$result = $value;
363	+ wppa_dump( 'Unfiltered (raw) querystring arg= ' . $name . ', value= ' . $value );
364	break;
365
366	default:
367	$result = $value;
368	+ wppa_dump( 'Unknown filter for querystring arg= ' . $name . ', value= ' . $value );
369	break;
370	}
371

wppa-links.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	*
5	* Frontend links
6
7	- * Version 8.0.07.~~013~~
8	*/
9
10	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
	@@ -203,16 +203,17 @@ function wppa_get_image_page_url_by_id( $id, $single = false, $alb = false, $pag
203
204	$thumb = wppa_cache_thumb( $id );
205
206	- ~~$occur~~ ~~= wppa_in_widget~~() ? ~~wppa(~~ ~~'widget_occur'~~ ) ~~: wppa( 'occur' );~~
207	- $w = ~~wppa_in_widget() && !~~ $~~page ?~~ 'w' ~~: ''~~;
208	-
209	- if ( ! $alb ) $alb = $thumb['album'];
210	-
211	- if ( ! $occur ) $occur = '1';
212
213	- $result = wppa_get_permalink($page).'wppa-album='.$alb.'&wppa-photo='.$thumb['id'].'&wppa-cover=0&wppa-'~~.$w~~.'~~occur=~~'~~.$occur~~;
214	- if ( $single ) ~~$result .= '&wppa-single=1';~~
215	- ~~if ( wppa( 'is_potdhis' ) )~~ $result .= '&wppa-~~potdhis~~=1';




216
217	return wppa_encrypt_url( $result );
218	}
	@@ -222,12 +223,11 @@ function wppa_get_image_url_ajax_by_id($id) {
222
223	if ( ! is_numeric($id) \|\| $id < '1' ) wppa_dbg_msg('Invalid arg wppa_get_image_url_ajax_by_id('.$id.')', 'red');
224
225	- $thumb = wppa_cache_thumb($id);
226
227	- $~~occur~~ = ~~wppa_in_widget~~() ? wppa( '~~widget_occur~~' ~~) :~~ wppa( 'mocc' );
228	- $w = wppa_in_widget() ? 'w' : '';
229
230	- return wppa_encrypt_url( ~~wppa_get_ajaxlink().'wppa-album='.$thumb['album'].'&wppa-photo='.$thumb['id'].'&wppa-cover=0&wppa-'.$w.'occur='.$occur~~ );
231	}
232
233	// get link to album by id or in loop
	@@ -236,14 +236,12 @@ function wppa_get_album_url( $args ) { //$id, $pag = '', $type = 'content', $occ
236	$defaults = array( 'album' => '',
237	'page' => '',
238	'type' => 'content',
239	- '~~occur~~' => ~~wppa_in_widget() ?~~ wppa( '~~widget_occur~~' ) ~~: wppa( 'occur' )~~,
240	);
241	$args = wppa_parse_args( $args, $defaults );
242
243	- $w = wppa_in_widget() ? 'w' : '';
244	-
245	if ( $args['album'] ) {
246	- $link = wppa_get_permalink( $args['page'] ) . 'wppa-album=' . $args['album'] . '&wppa-cover=0&wppa-~~' . $w . '~~occur=' . $args['~~occur~~'];
247	if ( $args['type'] == 'thumbs' ) {
248	$link .= '&wppa-photos-only=1';
249	}
	@@ -261,14 +259,12 @@ function wppa_get_album_url_ajax( $args ) { //$id, $pag = '', $type = 'content'
261	$defaults = array( 'album' => '',
262	'page' => '',
263	'type' => 'content',
264	- '~~occur~~' => ~~wppa_in_widget() ?~~ wppa( '~~widget_occur~~' ) ~~: wppa( 'occur' )~~,
265	);
266	$args = wppa_parse_args( $args, $defaults );
267
268	- $w = wppa_in_widget() ? 'w' : '';
269	-
270	if ( $args['album'] ) {
271	- $link = wppa_get_ajaxlink( $args['page'] ) . 'wppa-album=' . $args['album'] . '&wppa-cover=0&wppa-~~' . $w . '~~occur=' . $args['~~occur~~'];
272	if ( $args['type'] == 'thumbs' ) {
273	$link .= '&wppa-photos-only=1';
274	}
	@@ -287,14 +283,13 @@ function wppa_get_slideshow_url( $args ) { //$id, $page = '', $pid = '', $occ =
287	'album' => '',
288	'page' => '',
289	'photo' => '',
290	- '~~occur~~' => ~~wppa_in_widget() ?~~ wppa( '~~widget_occur~~' ) ~~: wppa( 'occur' )~~,
291	);
292	$args = wppa_parse_args( $args, $defaults );
293
294	if ( $args['album'] ) {
295	- $w = wppa_in_widget() ? 'w' : '';
296
297	- $link = wppa_get_permalink( $args['page'] ) . 'wppa-album=' . $args['album'] . '&wppa-slide=1&wppa-~~' . $w . '~~occur=' . $args['~~occur~~'];
298	if ( $args['photo'] ) $link .= '&wppa-photo=' . $args['photo'];
299	if ( wppa( 'is_upldr' ) ) $link .= '&wppa-upldr=' . wppa( 'is_upldr' );
300	// can be extended for other special cases, see wppa_thumb_default() in wppa-functions.php
	@@ -315,14 +310,13 @@ function wppa_get_slideshow_url_ajax( $args ) {
315	$defaults = array( 'album' => '',
316	'page' => '',
317	'photo' => '',
318	- '~~occur~~' => ~~wppa_in_widget() ?~~ wppa( '~~widget_occur~~' ) ~~: wppa( 'occur' )~~,
319	);
320	$args = wppa_parse_args( $args, $defaults );
321
322	if ( $args[ 'album' ] ) {
323	- $w = wppa_in_widget() ? 'w' : '';
324
325	- $link = wppa_get_ajaxlink( $args['page'] ) . 'wppa-album=' . $args['album'] . '&wppa-slide=1&wppa-~~' . $w . '~~occur=' . $args['~~occur~~'];
326	if ( $args['photo'] ) $link .= '&wppa-photo=' . $args['photo'];
327	if ( wppa( 'is_upldr' ) ) $link .= '&wppa-upldr='.wppa( 'is_upldr' );
328	// can be extended for other special cases, see wppa_thumb_default() in wppa-functions.php
	@@ -350,11 +344,6 @@ function wppa_get_slideshow_url_ajax( $args ) {
350	// Pretty links decode
351	function wppa_convert_from_pretty( $uri ) {
352
353	- // Is it a compressed pretty link?
354	- if ( strpos( $uri, '-' ) !== false ) {
355	- $uri = wppa_decompress_pretty( $uri );
356	- }
357	-
358	// Is a pretty link given?
359	$wppapos = stripos( $uri, '/wppaspec/' );
360	if ( $wppapos === false ) return $uri;
	@@ -393,9 +382,6 @@ function wppa_convert_from_pretty( $uri ) {
393	case 'oc':
394	$deltauri = 'wppa-occur=';
395	break;
396	- case 'wo':
397	- $deltauri = 'wppa-woccur=';
398	- break;
399	case 'pg':
400	$deltauri = 'wppa-page=';
401	break;
	@@ -543,7 +529,7 @@ function wppa_convert_to_pretty( $xuri, $no_names = false, $overrule = false ) {
543	}
544	$parts = explode( '?', $uri );
545	$args = explode( '&', $parts[1] );
546	- $order = array( 'occur', ~~'woccur',~~
547	'searchstring',
548	'supersearch',
549	'topten', 'lasten', 'comten', 'featen',
	@@ -630,7 +616,6 @@ function wppa_convert_to_pretty( $xuri, $no_names = false, $overrule = false ) {
630	'slide',
631	'cover',
632	'occur',
633	- 'woccur',
634	'page',
635	'searchstring',
636	'supersearch',
	@@ -672,7 +657,6 @@ function wppa_convert_to_pretty( $xuri, $no_names = false, $overrule = false ) {
672	case 'slide': $newuri .= 'sd'; break;
673	case 'cover': $newuri .= 'cv'; break;
674	case 'occur': $newuri .= 'oc'; break;
675	- case 'woccur': $newuri .= 'wo'; break;
676	case 'page': $newuri .= 'pg'; break;
677	case 'searchstring': $newuri .= 'ss'; break;
678	case 'supersearch': $newuri .= 'su'; break;
	@@ -710,197 +694,9 @@ function wppa_convert_to_pretty( $xuri, $no_names = false, $overrule = false ) {
710	}
711	}
712
713	- // if ( wppa_opt( 'use_pretty_links' ) == 'compressed' ) {
714	- // $newuri = wppa_compress_pretty( $newuri );
715	- // }
716	return $newuri;
717	}
718
719	- // Decompress a compressed pretty url
720	- function wppa_decompress_pretty( $uri ) {
721	-
722	- // Is it a compressed pretty url?
723	- if ( strpos( $uri, '/-/' ) === false ) {
724	- return $uri;
725	- }
726	-
727	- // Split uri in: before - body - after
728	- $temp = explode( '/-/', $uri );
729	- $before = $temp[0];
730	- if ( strpos( $temp[1], '?' ) ) {
731	- $parts = explode( '?', $temp[1] );
732	- $body = $parts[0];
733	- $after = $parts[1];
734	- }
735	- else {
736	- $body = $temp[1];
737	- $after = '';
738	- }
739	-
740	- // DO NOT CHANGE THE SEQUENCE OF THIS ARRAY !!!!!
741	- $support = array( 'ln',
742	- 'oc',
743	- 'ab',
744	- 'pt',
745	- 'sd',
746	- 'cv',
747	- 'wo',
748	- 'pg',
749	- 'ss',
750	- 'su',
751	- 'tt',
752	- 'lt',
753	- 'ct',
754	- 'ft',
755	- 'si',
756	- 'tg',
757	- 'po',
758	- 'ao',
759	- 'mo',
760	- 'db',
761	- 'rl',
762	- 'rc',
763	- 'ul',
764	- 'ow',
765	- 'rt',
766	- 'hl',
767	- 'ca',
768	- 'cd',
769	- 'in',
770	- 'vt',
771	- 'cb',
772	- 'ph',
773	- );
774	-
775	- $splitbody = explode( '/', $body );
776	-
777	- $body = '';
778	- $i = 0;
779	- $c = count( $support );
780	- while ( $i < $c ) {
781	-
782	- if ( isset( $splitbody[$i] ) && $splitbody[$i] != '' ) {
783	- $body .= $support[$i] . $splitbody[$i] . '/';
784	- }
785	- $i++;
786	- }
787	-
788	- $result = rtrim( $before . '/wppaspec/' . $body . $after, '/' );
789	- //wppa_log( 'dbg', $result );
790	- return $result;
791	- }
792	-
793	- // Post process pretty url to compressed pretty uri
794	- function wppa_compress_pretty( $uri ) {
795	-
796	- // Anything to compress?
797	- if ( strpos( $uri, '/wppaspec/' ) === false ) {
798	- return $uri;
799	- }
800	-
801	- // Split uri in: before - body - after
802	- $temp = explode( '/wppaspec/', $uri );
803	- $before = $temp[0];
804	- if ( strpos( $temp[1], '?' ) ) {
805	- $parts = explode( '?', $temp[1] );
806	- $body = $parts[0];
807	- $after = $parts[1];
808	- }
809	- else {
810	- $body = $temp[1];
811	- $after = '';
812	- }
813	-
814	- // DO NOT CHANGE THE SEQUENCE OF THIS ARRAY !!!!!
815	- $support = array( 'lang' => '',
816	- 'occur' => '',
817	- 'album' => '',
818	- 'photo' => '',
819	- 'slide' => '',
820	- 'cover' => '',
821	- 'woccur' => '',
822	- 'page' => '',
823	- 'searchstring' => '',
824	- 'supersearch' => '',
825	- 'topten' => '',
826	- 'lasten' => '',
827	- 'comten' => '',
828	- 'featen' => '',
829	- 'single' => '',
830	- 'tag' => '',
831	- 'photos-only' => '',
832	- 'albums-only' => '',
833	- 'medals-only' => '',
834	- 'debug' => '',
835	- 'rel' => '',
836	- 'relcount' => '',
837	- 'upldr' => '',
838	- 'owner' => '',
839	- 'rootsearch' => '',
840	- 'hilite' => '',
841	- 'calendar' => '',
842	- 'caldate' => '',
843	- 'inv' => '',
844	- 'vt' => '',
845	- 'catbox' => '',
846	- 'potdhis' => '',
847	- );
848	-
849	- $splitbody = explode( '/', $body );
850	-
851	- foreach ( $splitbody as $item ) {
852	- $prefix = substr( $item, 0, 2 );
853	- $data = substr( $item, 2 );
854	- switch( $prefix ) {
855	- case 'ln': $support['lang'] = $data; break;
856	- case 'oc': $support['occur'] = $data; break;
857	- case 'ab': $support['album'] = $data; break;
858	- case 'pt': $support['photo'] = $data; break;
859	- case 'sd': $support['slide'] = $data; break;
860	- case 'cv': $support['cover'] = $data; break;
861	- case 'wo': $support['woccur'] = $data; break;
862	- case 'pg': $support['page'] = $data; break;
863	- case 'ss': $support['searchstring'] = $data; break;
864	- case 'su': $support['supersearch'] = $data; break;
865	- case 'tt': $support['topten'] = $data; break;
866	- case 'lt': $support['lasten'] = $data; break;
867	- case 'ct': $support['comten'] = $data; break;
868	- case 'ft': $support['featen'] = $data; break;
869	- case 'si': $support['single'] = $data; break;
870	- case 'tg': $support['tag'] = $data; break;
871	- case 'po': $support['photos-only'] = $data; break;
872	- case 'ao': $support['albums-only'] = $data; break;
873	- case 'mo': $support['medals-only'] = $data; break;
874	- case 'db': $support['debug'] = $data; break;
875	- case 'rl': $support['rel'] = $data; break;
876	- case 'rc': $support['relcount'] = $data; break;
877	- case 'ul': $support['upldr'] = $data; break;
878	- case 'ow': $support['owner'] = $data; break;
879	- case 'rt': $support['rootsearch'] = $data; break;
880	- case 'hl': $support['hilite'] = $data; break;
881	- case 'ca': $support['calendar'] = $data; break;
882	- case 'cd': $support['caldate'] = $data; break;
883	- case 'in': $support['inv'] = $data; break;
884	- case 'vt': $support['vt'] = $data; break;
885	- case 'cb': $support['catbox'] = $data; break;
886	- case 'ph': $support['potdhis'] = $data; break;
887	- default: break;
888	- }
889	- }
890	-
891	- // Remake body
892	- $body = implode( '/', $support );
893	- $body = rtrim( $body, '/' );
894	-
895	- // Re-combine
896	- $result = $before . '/-/' . $body;
897	- if ( $after ) {
898	- $result .= '?' . $after;
899	- }
900	-
901	- return $result;
902	- }
903	-
904	// Repalace numbers to names in uri
905	function wppa_numbers_to_names_in_uri( $xuri ) {
906
	@@ -1121,8 +917,7 @@ function wppa_get_slide_callback_url( $id ) {
1121	$url .= 'wppa-cover=0&';
1122	$url .= 'wppa-slide=1&';
1123	if ( wppa( 'is_single' ) ) $url .= 'wppa-single=1&';
1124	- ~~if ( wppa_in_widget() )~~ $url .= 'wppa-~~woccur~~=' . wppa( '~~widget_occur~~' ) . '&';
1125	- else $url .= 'wppa-occur=' . wppa( 'occur' ) . '&';
1126	if ( wppa( 'is_topten' ) ) $url .= 'wppa-topten=' . wppa( 'topten_count' ) . '&';
1127	if ( wppa( 'is_lasten' ) ) $url .= 'wppa-lasten=' . wppa( 'lasten_count' ) . '&';
1128	if ( wppa( 'is_comten' ) ) $url .= 'wppa-comten=' . wppa( 'comten_count' ) . '&';
	@@ -1142,8 +937,7 @@ function wppa_get_thumb_callback_url() {
1142	else $url .= 'wppa-album=0&';
1143	$url .= 'wppa-cover=0&';
1144	if ( wppa( 'is_single' ) ) $url .= 'wppa-single=1&';
1145	- ~~if ( wppa_in_widget() )~~ $url .= 'wppa-~~woccur~~=' . wppa( '~~widget_occur~~' ) . '&';
1146	- else $url .= 'wppa-occur=' . wppa( 'occur' ) . '&';
1147	if ( wppa( 'is_topten' ) ) $url .= 'wppa-topten=' . wppa( 'topten_count' ) . '&';
1148	if ( wppa( 'is_lasten' ) ) $url .= 'wppa-lasten=' . wppa( 'lasten_count' ) . '&';
1149	if ( wppa( 'is_comten' ) ) $url .= 'wppa-comten=' . wppa( 'comten_count' ) . '&';
	@@ -1195,8 +989,8 @@ global $previous_page_last_id;
1195	$extra_url = 'wppa-cover='.$ic;
1196
1197	// occur
1198	- $occur = ~~wppa_in_widget() ?~~ wppa_get('~~woccur') : wppa_get('~~occur');
1199	- $ref_occur = ~~wppa_in_widget() ?~~ wppa( '~~widget_occur~~' ) ~~: wppa( 'occur' )~~;
1200
1201	// album
1202	if ( ( $occur == $ref_occur \|\| wppa( 'ajax' ) ) && wppa_get('album') ) {
	@@ -1220,18 +1014,13 @@ global $previous_page_last_id;
1220
1221	// occur
1222	if ( ! wppa( 'ajax' ) ) {
1223	- $occur = ~~wppa_in_widget() ?~~ wppa( '~~widget_occur~~' ) ~~: wppa( 'occur' )~~;
1224	- $w = ~~wppa_in_widget() ?~~ 'w' : '';
1225	- $extra_url .= '&wppa-' . $w . 'occur=' . $occur;
1226	}
1227	else {
1228	if ( wppa_get( 'occur' ) ) {
1229	$occur = wppa_get( 'occur' );
1230	- $extra_url .= '&wppa-occur=' . ~~strval( intval(~~ $occur ~~) )~~;
1231	- }
1232	- elseif ( wppa_get( 'woccur' ) ) {
1233	- $occur = wppa_get( 'woccur' );
1234	- $extra_url .= '&wppa-woccur=' . strval( intval( $occur ) );
1235	}
1236	else {
1237	$extra_url .= '&wppa-occur=' . wppa( 'mocc' ); // Should never get here?
	@@ -1768,14 +1557,14 @@ global $wpdb;
1768	return $result;
1769	}
1770	if ( $type == 'slide' ) { // Extension for Johnnymosaic
1771	- $t = wppa( '~~occur~~' );
1772	if ( $page != '0' ) {
1773	- wppa( '~~occur~~', '1' );
1774	}
1775	$result['url'] = wppa_get_slideshow_url( array( 'album' => wppa( 'start_album' ),
1776	'page' => $page,
1777	'photo' => $id ) );
1778	- wppa( '~~occur~~', $t );
1779	$result['title'] = __('View fullsize slideshow', 'wp-photo-album-plus');
1780	$result['is_url'] = true;
1781	$result['is_lightbox'] = false;
	@@ -2215,13 +2004,11 @@ global $wpdb;
2215
2216	if ( $page != '0' ) { // on a different page
2217	$occur = '1';
2218	- $w = '';
2219	}
2220	else { // on the same page, post or widget
2221	- $occur = ~~wppa_in_widget() ?~~ wppa( '~~widget_occur~~' ) ~~: wppa( 'occur' )~~;
2222	- $w = wppa_in_widget() ? 'w' : '';
2223	}
2224	- $result['url'] .= '&wppa-~~' . $w . '~~occur=' . $occur;
2225	$result['url'] = wppa_encrypt_url( $result['url'] );
2226	$result['url'] = wppa_convert_to_pretty( $result['url'] );
2227
	@@ -2240,7 +2027,6 @@ static $trimmable;
2240	'slide',
2241	'cover',
2242	'occur',
2243	- 'woccur',
2244	'searchstring',
2245	'topten',
2246	'lasten',
	@@ -2278,32 +2064,32 @@ global $thumbs_ids;
2278
2279	// Search ?
2280	if ( wppa( 'src' ) && wppa( 'mocc' ) == '1' && ! wppa( 'is_related' ) ) {
2281	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-searchstring='.stripslashes( wppa( 'searchstring' ) );
2282	}
2283	// Uploader ?
2284	elseif ( wppa( 'is_upldr' ) ) {
2285	if ( wppa( 'start_album' ) ) {
2286	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-upldr='.wppa( 'is_upldr' ).'&wppa-album='.wppa( 'start_album' );
2287	}
2288	else {
2289	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-upldr='.wppa( 'is_upldr' );
2290	}
2291	}
2292	// Topten ?
2293	elseif ( wppa( 'is_topten' ) ) {
2294	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-topten='.wppa( 'topten_count' ).'&wppa-album='.wppa( 'start_album' );
2295	}
2296	// Lasten ?
2297	elseif ( wppa( 'is_lasten' ) ) {
2298	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-lasten='.wppa( 'lasten_count' ).'&wppa-album='.wppa( 'start_album' );
2299	}
2300	// Comten ?
2301	elseif ( wppa( 'is_comten' ) ) {
2302	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-comten='.wppa( 'comten_count' ).'&wppa-album='.wppa( 'start_album' );
2303	}
2304	// Featen ?
2305	elseif ( wppa( 'is_featen' ) ) {
2306	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-featen='.wppa( 'featen_count' ).'&wppa-album='.wppa( 'start_album' );
2307	}
2308	// Related ?
2309	// elseif ( wppa( 'is_related' ) ) {
	@@ -2311,19 +2097,19 @@ global $thumbs_ids;
2311	// }
2312	// Tag ?
2313	elseif ( wppa( 'is_tag' ) ) {
2314	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
2315	}
2316	// Cat ?
2317	elseif ( wppa( 'is_cat' ) ) {
2318	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
2319	}
2320	// Last ?
2321	// elseif ( wppa( 'last_albums' ) ) {
2322	- // $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
2323	// }
2324	// Default ?
2325	else {
2326	- $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( '~~occur~~' ).'&wppa-album='.wppa( 'start_album' );
2327	}
2328
2329	// $id is the id. See to what page we have to go


4	*
5	* Frontend links
6
7	+ * Version 8.0.07.014
8	*/
9
10	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );

203
204	$thumb = wppa_cache_thumb( $id );
205
206	+ if ( ! $alb ) {
207	+ $alb = $thumb['album'];
208	+ }



209
210	+ $result = wppa_get_permalink($page).'wppa-album='.$alb.'&wppa-photo='.$thumb['id'].'&wppa-cover=0&wppa-occur='.wppa('mocc');
211	+ if ( $single ) {
212	+ $result .= '&wppa-single=1';
213	+ }
214	+ if ( wppa( 'is_potdhis' ) ) {
215	+ $result .= '&wppa-potdhis=1';
216	+ }
217
218	return wppa_encrypt_url( $result );
219	}

223
224	if ( ! is_numeric($id) \|\| $id < '1' ) wppa_dbg_msg('Invalid arg wppa_get_image_url_ajax_by_id('.$id.')', 'red');
225
226	+ $thumb = wppa_cache_thumb( $id );
227
228	+ $result = wppa_get_ajaxlink().'wppa-album='.$thumb['album'].'&wppa-photo='.$thumb['id'].'&wppa-cover=0&wppa-occur='.wppa('mocc');

229
230	+ return wppa_encrypt_url( $result );
231	}
232
233	// get link to album by id or in loop

236	$defaults = array( 'album' => '',
237	'page' => '',
238	'type' => 'content',
239	+ 'mocc' => wppa( 'mocc' ),
240	);
241	$args = wppa_parse_args( $args, $defaults );
242


243	if ( $args['album'] ) {
244	+ $link = wppa_get_permalink( $args['page'] ) . 'wppa-album=' . $args['album'] . '&wppa-cover=0&wppa-occur=' . $args['mocc'];
245	if ( $args['type'] == 'thumbs' ) {
246	$link .= '&wppa-photos-only=1';
247	}

259	$defaults = array( 'album' => '',
260	'page' => '',
261	'type' => 'content',
262	+ 'mocc' => wppa( 'mocc' ),
263	);
264	$args = wppa_parse_args( $args, $defaults );
265


266	if ( $args['album'] ) {
267	+ $link = wppa_get_ajaxlink( $args['page'] ) . 'wppa-album=' . $args['album'] . '&wppa-cover=0&wppa-occur=' . $args['mocc'];
268	if ( $args['type'] == 'thumbs' ) {
269	$link .= '&wppa-photos-only=1';
270	}

283	'album' => '',
284	'page' => '',
285	'photo' => '',
286	+ 'mocc' => wppa( 'mocc' ),
287	);
288	$args = wppa_parse_args( $args, $defaults );
289
290	if ( $args['album'] ) {

291
292	+ $link = wppa_get_permalink( $args['page'] ) . 'wppa-album=' . $args['album'] . '&wppa-slide=1&wppa-occur=' . $args['mocc'];
293	if ( $args['photo'] ) $link .= '&wppa-photo=' . $args['photo'];
294	if ( wppa( 'is_upldr' ) ) $link .= '&wppa-upldr=' . wppa( 'is_upldr' );
295	// can be extended for other special cases, see wppa_thumb_default() in wppa-functions.php

310	$defaults = array( 'album' => '',
311	'page' => '',
312	'photo' => '',
313	+ 'mocc' => wppa( 'mocc' ),
314	);
315	$args = wppa_parse_args( $args, $defaults );
316
317	if ( $args[ 'album' ] ) {

318
319	+ $link = wppa_get_ajaxlink( $args['page'] ) . 'wppa-album=' . $args['album'] . '&wppa-slide=1&wppa-occur=' . $args['mocc'];
320	if ( $args['photo'] ) $link .= '&wppa-photo=' . $args['photo'];
321	if ( wppa( 'is_upldr' ) ) $link .= '&wppa-upldr='.wppa( 'is_upldr' );
322	// can be extended for other special cases, see wppa_thumb_default() in wppa-functions.php

344	// Pretty links decode
345	function wppa_convert_from_pretty( $uri ) {
346





347	// Is a pretty link given?
348	$wppapos = stripos( $uri, '/wppaspec/' );
349	if ( $wppapos === false ) return $uri;

382	case 'oc':
383	$deltauri = 'wppa-occur=';
384	break;



385	case 'pg':
386	$deltauri = 'wppa-page=';
387	break;

529	}
530	$parts = explode( '?', $uri );
531	$args = explode( '&', $parts[1] );
532	+ $order = array( 'occur',
533	'searchstring',
534	'supersearch',
535	'topten', 'lasten', 'comten', 'featen',

616	'slide',
617	'cover',
618	'occur',

619	'page',
620	'searchstring',
621	'supersearch',

657	case 'slide': $newuri .= 'sd'; break;
658	case 'cover': $newuri .= 'cv'; break;
659	case 'occur': $newuri .= 'oc'; break;

660	case 'page': $newuri .= 'pg'; break;
661	case 'searchstring': $newuri .= 'ss'; break;
662	case 'supersearch': $newuri .= 'su'; break;

694	}
695	}
696



697	return $newuri;
698	}
699

























































































































































































700	// Repalace numbers to names in uri
701	function wppa_numbers_to_names_in_uri( $xuri ) {
702

917	$url .= 'wppa-cover=0&';
918	$url .= 'wppa-slide=1&';
919	if ( wppa( 'is_single' ) ) $url .= 'wppa-single=1&';
920	+ $url .= 'wppa-occur=' . wppa( 'mocc' ) . '&';

921	if ( wppa( 'is_topten' ) ) $url .= 'wppa-topten=' . wppa( 'topten_count' ) . '&';
922	if ( wppa( 'is_lasten' ) ) $url .= 'wppa-lasten=' . wppa( 'lasten_count' ) . '&';
923	if ( wppa( 'is_comten' ) ) $url .= 'wppa-comten=' . wppa( 'comten_count' ) . '&';

937	else $url .= 'wppa-album=0&';
938	$url .= 'wppa-cover=0&';
939	if ( wppa( 'is_single' ) ) $url .= 'wppa-single=1&';
940	+ $url .= 'wppa-occur=' . wppa( 'mocc' ) . '&';

941	if ( wppa( 'is_topten' ) ) $url .= 'wppa-topten=' . wppa( 'topten_count' ) . '&';
942	if ( wppa( 'is_lasten' ) ) $url .= 'wppa-lasten=' . wppa( 'lasten_count' ) . '&';
943	if ( wppa( 'is_comten' ) ) $url .= 'wppa-comten=' . wppa( 'comten_count' ) . '&';

989	$extra_url = 'wppa-cover='.$ic;
990
991	// occur
992	+ $occur = wppa_get('occur');
993	+ $ref_occur = wppa( 'mocc' );
994
995	// album
996	if ( ( $occur == $ref_occur \|\| wppa( 'ajax' ) ) && wppa_get('album') ) {

1014
1015	// occur
1016	if ( ! wppa( 'ajax' ) ) {
1017	+ $occur = wppa( 'mocc' );
1018	+ $extra_url .= '&wppa-occur=' . $occur;

1019	}
1020	else {
1021	if ( wppa_get( 'occur' ) ) {
1022	$occur = wppa_get( 'occur' );
1023	+ $extra_url .= '&wppa-occur=' . $occur;




1024	}
1025	else {
1026	$extra_url .= '&wppa-occur=' . wppa( 'mocc' ); // Should never get here?

1557	return $result;
1558	}
1559	if ( $type == 'slide' ) { // Extension for Johnnymosaic
1560	+ $t = wppa( 'mocc' );
1561	if ( $page != '0' ) {
1562	+ wppa( 'mocc', '1' );
1563	}
1564	$result['url'] = wppa_get_slideshow_url( array( 'album' => wppa( 'start_album' ),
1565	'page' => $page,
1566	'photo' => $id ) );
1567	+ wppa( 'mocc', $t );
1568	$result['title'] = __('View fullsize slideshow', 'wp-photo-album-plus');
1569	$result['is_url'] = true;
1570	$result['is_lightbox'] = false;

2004
2005	if ( $page != '0' ) { // on a different page
2006	$occur = '1';

2007	}
2008	else { // on the same page, post or widget
2009	+ $occur = wppa( 'mocc' );

2010	}
2011	+ $result['url'] .= '&wppa-occur=' . $occur;
2012	$result['url'] = wppa_encrypt_url( $result['url'] );
2013	$result['url'] = wppa_convert_to_pretty( $result['url'] );
2014

2027	'slide',
2028	'cover',
2029	'occur',

2030	'searchstring',
2031	'topten',
2032	'lasten',

2064
2065	// Search ?
2066	if ( wppa( 'src' ) && wppa( 'mocc' ) == '1' && ! wppa( 'is_related' ) ) {
2067	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-searchstring='.stripslashes( wppa( 'searchstring' ) );
2068	}
2069	// Uploader ?
2070	elseif ( wppa( 'is_upldr' ) ) {
2071	if ( wppa( 'start_album' ) ) {
2072	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-upldr='.wppa( 'is_upldr' ).'&wppa-album='.wppa( 'start_album' );
2073	}
2074	else {
2075	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-upldr='.wppa( 'is_upldr' );
2076	}
2077	}
2078	// Topten ?
2079	elseif ( wppa( 'is_topten' ) ) {
2080	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-topten='.wppa( 'topten_count' ).'&wppa-album='.wppa( 'start_album' );
2081	}
2082	// Lasten ?
2083	elseif ( wppa( 'is_lasten' ) ) {
2084	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-lasten='.wppa( 'lasten_count' ).'&wppa-album='.wppa( 'start_album' );
2085	}
2086	// Comten ?
2087	elseif ( wppa( 'is_comten' ) ) {
2088	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-comten='.wppa( 'comten_count' ).'&wppa-album='.wppa( 'start_album' );
2089	}
2090	// Featen ?
2091	elseif ( wppa( 'is_featen' ) ) {
2092	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-featen='.wppa( 'featen_count' ).'&wppa-album='.wppa( 'start_album' );
2093	}
2094	// Related ?
2095	// elseif ( wppa( 'is_related' ) ) {

2097	// }
2098	// Tag ?
2099	elseif ( wppa( 'is_tag' ) ) {
2100	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-tag='.wppa( 'is_tag' ).'&wppa-album='.wppa( 'start_album' );
2101	}
2102	// Cat ?
2103	elseif ( wppa( 'is_cat' ) ) {
2104	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-cat='.wppa( 'is_cat' ).'&wppa-album='.wppa( 'start_album' );
2105	}
2106	// Last ?
2107	// elseif ( wppa( 'last_albums' ) ) {
2108	+ // $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
2109	// }
2110	// Default ?
2111	else {
2112	+ $thumbhref = wppa_get_permalink( $page ).'wppa-cover=0&wppa-occur='.wppa( 'mocc' ).'&wppa-album='.wppa( 'start_album' );
2113	}
2114
2115	// $id is the id. See to what page we have to go

wppa-potd-widget.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* display the photo of the day widget
6	- * Version 8.0.07.~~004~~
7	*/
8
9	if ( ! defined( 'ABSPATH' ) ) die( "Can't load this file directly" );
	@@ -145,13 +145,13 @@ class PhotoOfTheDay extends WP_Widget {
145	$lnk = wppa_get_album_url( array( 'album' => $alb,
146	'page' => $page,
147	'type' => 'thumbs',
148	- '~~occur~~' => '1' ) );
149	}
150	elseif ( wppa_opt( 'potd_counter_link' ) == 'slide' ) {
151	$lnk = wppa_get_slideshow_url( array( 'album' => $alb,
152	'page' => $page,
153	'photo' => $id,
154	- '~~occur~~' => '1' ) );
155	}
156	elseif ( wppa_opt( 'potd_counter_link' ) == 'single' ) {
157	$lnk = wppa_encrypt_url( get_permalink( $page ) . '?occur=1&photo=' . $id );


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

145	$lnk = wppa_get_album_url( array( 'album' => $alb,
146	'page' => $page,
147	'type' => 'thumbs',
148	+ 'mocc' => '1' ) );
149	}
150	elseif ( wppa_opt( 'potd_counter_link' ) == 'slide' ) {
151	$lnk = wppa_get_slideshow_url( array( 'album' => $alb,
152	'page' => $page,
153	'photo' => $id,
154	+ 'mocc' => '1' ) );
155	}
156	elseif ( wppa_opt( 'potd_counter_link' ) == 'single' ) {
157	$lnk = wppa_encrypt_url( get_permalink( $page ) . '?occur=1&photo=' . $id );

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.0.07.~~007~~
7	*/
8
9	class TopTenWidget extends WP_Widget {
	@@ -123,7 +123,7 @@ class TopTenWidget extends WP_Widget {
123	if ( $includesubs ) {
124	$albenum = wppa_expand_enum( $album );
125	$albenum = wppa_alb_to_enum_children( $albenum );
126	-
127	$album = str_replace( '.', ',', $albenum );
128	}
129
	@@ -373,7 +373,7 @@ class TopTenWidget extends WP_Widget {
373	$href = wppa_get_album_url( array( 'album' => $image['album'],
374	'page' => $albumlinkpage,
375	'type' => 'content',
376	- '~~occur~~' => '1' ) );
377	$widget_content .= '<div>(<a href="' . $href . '" >' . wppa_get_album_name( $image['album'] ) . '</a>)</div>';
378	}
379


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

123	if ( $includesubs ) {
124	$albenum = wppa_expand_enum( $album );
125	$albenum = wppa_alb_to_enum_children( $albenum );
126	+
127	$album = str_replace( '.', ',', $albenum );
128	}
129

373	$href = wppa_get_album_url( array( 'album' => $image['album'],
374	'page' => $albumlinkpage,
375	'type' => 'content',
376	+ 'mocc' => '1' ) );
377	$widget_content .= '<div>(<a href="' . $href . '" >' . wppa_get_album_name( $image['album'] ) . '</a>)</div>';
378	}
379

wppa-watermark.php CHANGED Viewed

	@@ -348,18 +348,18 @@ function wppa_get_water_file_and_pos( $id ) {
348	}
349
350	// User overrule?
351	- if ( wppa_switch( 'watermark_user' ) \|\| wppa_get( '~~wppa-~~watermark-file' ) ) {
352	$user = wppa_get_user();
353	- if ( wppa_get( '~~wppa-~~watermark-file' ) ) {
354	- $result['file'] = wppa_get( '~~wppa-~~watermark-file' );
355	- update_option( 'wppa_watermark_file_' . $user, wppa_get( '~~wppa-~~watermark-file' ) );
356	}
357	elseif ( wppa_get_option( 'wppa_watermark_file_' . $user, 'nil' ) != 'nil' ) {
358	$result['file'] = wppa_get_option( 'wppa_watermark_file_' . $user );
359	}
360	- if ( wppa_get( '~~wppa-~~watermark-pos' ) ) {
361	- $result['pos'] = wppa_get( '~~wppa-~~watermark-pos' );
362	- update_option( 'wppa_watermark_pos_' . $user, wppa_get( '~~wppa-~~watermark-pos' ) );
363	}
364	elseif ( wppa_get_option( 'wppa_watermark_pos_' . $user, 'nil' ) != 'nil' ) {
365	$result['pos'] = wppa_get_option( 'wppa_watermark_pos_' . $user );


348	}
349
350	// User overrule?
351	+ if ( wppa_switch( 'watermark_user' ) \|\| wppa_get( 'watermark-file' ) ) {
352	$user = wppa_get_user();
353	+ if ( wppa_get( 'watermark-file' ) ) {
354	+ $result['file'] = wppa_get( 'watermark-file' );
355	+ update_option( 'wppa_watermark_file_' . $user, wppa_get( 'watermark-file' ) );
356	}
357	elseif ( wppa_get_option( 'wppa_watermark_file_' . $user, 'nil' ) != 'nil' ) {
358	$result['file'] = wppa_get_option( 'wppa_watermark_file_' . $user );
359	}
360	+ if ( wppa_get( 'watermark-pos' ) ) {
361	+ $result['pos'] = wppa_get( 'watermark-pos' );
362	+ update_option( 'wppa_watermark_pos_' . $user, wppa_get( 'watermark-pos' ) );
363	}
364	elseif ( wppa_get_option( 'wppa_watermark_pos_' . $user, 'nil' ) != 'nil' ) {
365	$result['pos'] = wppa_get_option( 'wppa_watermark_pos_' . $user );

wppa.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/*
3	* Plugin Name: WP Photo Album Plus
4	* Description: Easily manage and display your photo albums and slideshows within your WordPress site.
5	- * Version: 8.0.07.~~013~~
6	* Author: J.N. Breetvelt a.k.a. OpaJaap
7	* Author URI: http://wppa.opajaap.nl/
8	* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
	@@ -24,7 +24,7 @@ global $wp_version;
24
25	/* WPPA GLOBALS */
26	global $wppa_api_version;
27	- $wppa_api_version = '8.0.07.~~013~~'; // WPPA software version
28	global $wppa_revno;
29	$wppa_revno = str_replace( '.', '', $wppa_api_version ); // WPPA db version
30


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

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