Version Description
Download this release
Release Info
Developer | opajaap |
Plugin | WP Photo Album Plus |
Version | 6.4.04 |
Comparing to | |
See all releases |
Code changes from version 6.4.03 to 6.4.04
- readme.txt +12 -2
- wppa-ajax.php +5 -1
- wppa-common-functions.php +3 -2
- wppa-functions.php +23 -10
- wppa-settings-autosave.php +12 -2
- wppa-setup.php +7 -2
- wppa-slideshow.php +7 -7
- wppa-thumbnails.php +2 -2
- wppa-users.php +5 -18
- wppa.php +3 -3
readme.txt
CHANGED
@@ -2,8 +2,8 @@
|
|
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¤cy_code=USD&lc=US
|
4 |
Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
|
5 |
-
Version: 6.4.
|
6 |
-
Stable tag: 6.4.
|
7 |
Author: J.N. Breetvelt
|
8 |
Author URI: http://www.opajaap.nl/
|
9 |
Requires at least: 3.9
|
@@ -180,6 +180,16 @@ Oh, just Google on 'picture resizer' and you will find a bunch of free programs
|
|
180 |
|
181 |
See for additional information: http://wppa.opajaap.nl/changelog/
|
182 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
183 |
= 6.4.03 =
|
184 |
|
185 |
= Bug Fixes =
|
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¤cy_code=USD&lc=US
|
4 |
Tags: photo, album, gallery, slideshow, video, audio, lightbox, iptc, exif, cloudinary, fotomoto
|
5 |
+
Version: 6.4.04
|
6 |
+
Stable tag: 6.4.03
|
7 |
Author: J.N. Breetvelt
|
8 |
Author URI: http://www.opajaap.nl/
|
9 |
Requires at least: 3.9
|
180 |
|
181 |
See for additional information: http://wppa.opajaap.nl/changelog/
|
182 |
|
183 |
+
= 6.4.04 =
|
184 |
+
|
185 |
+
= Bug Fixes =
|
186 |
+
|
187 |
+
* Fixed a bug in the rights system.
|
188 |
+
|
189 |
+
= New Features =
|
190 |
+
|
191 |
+
* Table I-B9: Filmstrip Thumbnail Size. The size of the filmstrip images can now be set independantly.
|
192 |
+
|
193 |
= 6.4.03 =
|
194 |
|
195 |
= Bug Fixes =
|
wppa-ajax.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
/* wppa-ajax.php
|
3 |
*
|
4 |
* Functions used in ajax requests
|
5 |
-
* Version 6.4.
|
6 |
*
|
7 |
*/
|
8 |
|
@@ -1553,13 +1553,17 @@ global $wppa_session;
|
|
1553 |
case 'wppa_maxheight':
|
1554 |
wppa_ajax_check_range( $value, false, '100', false, __( 'Max height.' , 'wp-photo-album-plus') );
|
1555 |
break;
|
|
|
1556 |
case 'wppa_thumbsize':
|
|
|
1557 |
wppa_ajax_check_range( $value, false, '50', false, __( 'Thumbnail size.' , 'wp-photo-album-plus') );
|
1558 |
break;
|
1559 |
case 'wppa_tf_width':
|
|
|
1560 |
wppa_ajax_check_range( $value, false, '50', false, __( 'Thumbnail frame width' , 'wp-photo-album-plus') );
|
1561 |
break;
|
1562 |
case 'wppa_tf_height':
|
|
|
1563 |
wppa_ajax_check_range( $value, false, '50',false, __( 'Thumbnail frame height' , 'wp-photo-album-plus') );
|
1564 |
break;
|
1565 |
case 'wppa_tn_margin':
|
2 |
/* wppa-ajax.php
|
3 |
*
|
4 |
* Functions used in ajax requests
|
5 |
+
* Version 6.4.04
|
6 |
*
|
7 |
*/
|
8 |
|
1553 |
case 'wppa_maxheight':
|
1554 |
wppa_ajax_check_range( $value, false, '100', false, __( 'Max height.' , 'wp-photo-album-plus') );
|
1555 |
break;
|
1556 |
+
case 'wppa_film_thumbsize':
|
1557 |
case 'wppa_thumbsize':
|
1558 |
+
case 'wppa_thumbsize_alt':
|
1559 |
wppa_ajax_check_range( $value, false, '50', false, __( 'Thumbnail size.' , 'wp-photo-album-plus') );
|
1560 |
break;
|
1561 |
case 'wppa_tf_width':
|
1562 |
+
case 'wppa_tf_width_alt':
|
1563 |
wppa_ajax_check_range( $value, false, '50', false, __( 'Thumbnail frame width' , 'wp-photo-album-plus') );
|
1564 |
break;
|
1565 |
case 'wppa_tf_height':
|
1566 |
+
case 'wppa_tf_height_alt':
|
1567 |
wppa_ajax_check_range( $value, false, '50',false, __( 'Thumbnail frame height' , 'wp-photo-album-plus') );
|
1568 |
break;
|
1569 |
case 'wppa_tn_margin':
|
wppa-common-functions.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
/* wppa-common-functions.php
|
3 |
*
|
4 |
* Functions used in admin and in themes
|
5 |
-
* Version 6.4.
|
6 |
*
|
7 |
*/
|
8 |
|
@@ -941,7 +941,8 @@ function wppa_get_minisize() {
|
|
941 |
'wppa_album_widget_size',
|
942 |
'wppa_featen_size',
|
943 |
'wppa_popupsize',
|
944 |
-
'wppa_smallsize'
|
|
|
945 |
);
|
946 |
foreach ( $things as $thing ) {
|
947 |
$tmp = wppa_opt( $thing );
|
2 |
/* wppa-common-functions.php
|
3 |
*
|
4 |
* Functions used in admin and in themes
|
5 |
+
* Version 6.4.04
|
6 |
*
|
7 |
*/
|
8 |
|
941 |
'wppa_album_widget_size',
|
942 |
'wppa_featen_size',
|
943 |
'wppa_popupsize',
|
944 |
+
'wppa_smallsize',
|
945 |
+
'wppa_film_thumbsize',
|
946 |
);
|
947 |
foreach ( $things as $thing ) {
|
948 |
$tmp = wppa_opt( $thing );
|
wppa-functions.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* Various funcions
|
6 |
-
* Version 6.4.
|
7 |
*
|
8 |
*/
|
9 |
|
@@ -2564,26 +2564,38 @@ function wppa_get_thumb_frame_style( $glue = false, $film = '' ) {
|
|
2564 |
function wppa_get_thumb_frame_style_a( $glue = false, $film = '' ) {
|
2565 |
static $wppaerrmsgxxx;
|
2566 |
|
|
|
2567 |
$album = wppa( 'current_album' ) ? wppa_cache_album( wppa( 'current_album' ) ) : false;
|
2568 |
-
|
2569 |
$result = array( 'style'=> '', 'width' => '', 'height' => '' );
|
2570 |
|
2571 |
// Comten alt display?
|
2572 |
$com_alt = wppa( 'is_comten' ) && wppa_switch( 'comten_alt_display' ) && ! wppa_in_widget() && ! $film;
|
2573 |
|
2574 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2575 |
|
2576 |
-
|
2577 |
-
$tfh = wppa_opt( 'tf_height'.$alt );
|
2578 |
-
if ( $film == 'film' ) $tfh = wppa_opt( 'thumbsize'.$alt );
|
2579 |
$mgl = wppa_opt( 'tn_margin' );
|
2580 |
-
|
|
|
|
|
2581 |
$tfw /= 2;
|
2582 |
$tfh /= 2;
|
2583 |
$mgl /= 2;
|
2584 |
}
|
|
|
|
|
2585 |
$mgl2 = floor( $mgl / '2' );
|
2586 |
-
|
|
|
2587 |
$area = wppa_get_box_width() + $tfw; // Area for n+1 thumbs
|
2588 |
$n_1 = floor( $area / ( $tfw + $mgl ) );
|
2589 |
if ( $n_1 == '0' ) {
|
@@ -2593,6 +2605,7 @@ static $wppaerrmsgxxx;
|
|
2593 |
}
|
2594 |
$mgl = floor( $area / $n_1 ) - $tfw;
|
2595 |
}
|
|
|
2596 |
if ( is_numeric( $tfw ) && is_numeric( $tfh ) ) {
|
2597 |
$result['style'] = 'width: '.$tfw.'px; height: '.$tfh.'px; margin-left: '.$mgl.'px; margin-top: '.$mgl2.'px; margin-bottom: '.$mgl2.'px;';
|
2598 |
if ( $glue && wppa_switch( 'film_show_glue' ) && wppa_switch( 'slide_wrap' ) ) {
|
@@ -2896,7 +2909,7 @@ global $blog_id;
|
|
2896 |
wppa_add_js_page_data( "\n" . 'wppaFilmStripLength['.wppa( 'mocc' ).'] = '.$temp.';' );
|
2897 |
|
2898 |
// last minute change: filmstrip sizes and related stuff. In widget: half size.
|
2899 |
-
$temp = wppa_opt( '
|
2900 |
if ( wppa_in_widget() ) $temp /= 2;
|
2901 |
wppa_add_js_page_data( "\n" . 'wppaThumbnailPitch['.wppa( 'mocc' ).'] = '.$temp.';' );
|
2902 |
$temp = wppa_opt( 'tn_margin' ) / 2;
|
@@ -3134,7 +3147,7 @@ global $thumbs;
|
|
3134 |
|
3135 |
wppa_add_js_page_data( "\n" . '</script>' );
|
3136 |
$t += microtime( true );
|
3137 |
-
wppa_dbg_msg( 'SlideInfo took '
|
3138 |
}
|
3139 |
|
3140 |
wppa_add_js_page_data( "\n" . '<script type="text/javascript">' );
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* Various funcions
|
6 |
+
* Version 6.4.04
|
7 |
*
|
8 |
*/
|
9 |
|
2564 |
function wppa_get_thumb_frame_style_a( $glue = false, $film = '' ) {
|
2565 |
static $wppaerrmsgxxx;
|
2566 |
|
2567 |
+
// Init
|
2568 |
$album = wppa( 'current_album' ) ? wppa_cache_album( wppa( 'current_album' ) ) : false;
|
|
|
2569 |
$result = array( 'style'=> '', 'width' => '', 'height' => '' );
|
2570 |
|
2571 |
// Comten alt display?
|
2572 |
$com_alt = wppa( 'is_comten' ) && wppa_switch( 'comten_alt_display' ) && ! wppa_in_widget() && ! $film;
|
2573 |
|
2574 |
+
// Film, normal or alt?
|
2575 |
+
if ( $film ) {
|
2576 |
+
$tfw = wppa_opt( 'film_thumbsize' );
|
2577 |
+
$tfh = $tfw;
|
2578 |
+
}
|
2579 |
+
else {
|
2580 |
+
$alt = is_array( $album ) && $album['alt_thumbsize'] == 'yes' ? '_alt' : '';
|
2581 |
+
$tfw = wppa_opt( 'tf_width'.$alt );
|
2582 |
+
$tfh = wppa_opt( 'tf_height'.$alt );
|
2583 |
+
}
|
2584 |
|
2585 |
+
// Margin
|
|
|
|
|
2586 |
$mgl = wppa_opt( 'tn_margin' );
|
2587 |
+
|
2588 |
+
// Film in widget
|
2589 |
+
if ( $film && wppa_in_widget() ) {
|
2590 |
$tfw /= 2;
|
2591 |
$tfh /= 2;
|
2592 |
$mgl /= 2;
|
2593 |
}
|
2594 |
+
|
2595 |
+
// Half margin
|
2596 |
$mgl2 = floor( $mgl / '2' );
|
2597 |
+
|
2598 |
+
if ( ! $film && wppa_switch( 'thumb_auto' ) ) {
|
2599 |
$area = wppa_get_box_width() + $tfw; // Area for n+1 thumbs
|
2600 |
$n_1 = floor( $area / ( $tfw + $mgl ) );
|
2601 |
if ( $n_1 == '0' ) {
|
2605 |
}
|
2606 |
$mgl = floor( $area / $n_1 ) - $tfw;
|
2607 |
}
|
2608 |
+
|
2609 |
if ( is_numeric( $tfw ) && is_numeric( $tfh ) ) {
|
2610 |
$result['style'] = 'width: '.$tfw.'px; height: '.$tfh.'px; margin-left: '.$mgl.'px; margin-top: '.$mgl2.'px; margin-bottom: '.$mgl2.'px;';
|
2611 |
if ( $glue && wppa_switch( 'film_show_glue' ) && wppa_switch( 'slide_wrap' ) ) {
|
2909 |
wppa_add_js_page_data( "\n" . 'wppaFilmStripLength['.wppa( 'mocc' ).'] = '.$temp.';' );
|
2910 |
|
2911 |
// last minute change: filmstrip sizes and related stuff. In widget: half size.
|
2912 |
+
$temp = wppa_opt( 'film_thumbsize' ) + wppa_opt( 'tn_margin' );
|
2913 |
if ( wppa_in_widget() ) $temp /= 2;
|
2914 |
wppa_add_js_page_data( "\n" . 'wppaThumbnailPitch['.wppa( 'mocc' ).'] = '.$temp.';' );
|
2915 |
$temp = wppa_opt( 'tn_margin' ) / 2;
|
3147 |
|
3148 |
wppa_add_js_page_data( "\n" . '</script>' );
|
3149 |
$t += microtime( true );
|
3150 |
+
wppa_dbg_msg( 'SlideInfo took ' . $t . ' seconds.' );
|
3151 |
}
|
3152 |
|
3153 |
wppa_add_js_page_data( "\n" . '<script type="text/javascript">' );
|
wppa-settings-autosave.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* manage all options
|
6 |
-
* Version 6.4.
|
7 |
*
|
8 |
*/
|
9 |
|
@@ -849,6 +849,16 @@ global $wppa_tags;
|
|
849 |
$clas = '';
|
850 |
$tags = 'count,page,slide';
|
851 |
wppa_setting($slug, '8', $name, $desc, $html, $help, $clas, $tags);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
852 |
}
|
853 |
wppa_setting_subheader( 'C', '1', __( 'Thumbnail photos related size settings' , 'wp-photo-album-plus') );
|
854 |
{
|
@@ -3517,7 +3527,7 @@ global $wppa_tags;
|
|
3517 |
$clas = '';
|
3518 |
$tags = 'system,meta';
|
3519 |
wppa_setting($slug, '26', $name, $desc, $html, $help, $clas, $tags);
|
3520 |
-
|
3521 |
}
|
3522 |
wppa_setting_subheader( 'B', '1', __( 'Slideshow related settings' , 'wp-photo-album-plus') );
|
3523 |
{
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* manage all options
|
6 |
+
* Version 6.4.04
|
7 |
*
|
8 |
*/
|
9 |
|
849 |
$clas = '';
|
850 |
$tags = 'count,page,slide';
|
851 |
wppa_setting($slug, '8', $name, $desc, $html, $help, $clas, $tags);
|
852 |
+
|
853 |
+
$name = __('Filmstrip Thumbnail Size', 'wp-photo-album-plus');
|
854 |
+
$desc = __('The size of the filmstrip images.', 'wp-photo-album-plus');
|
855 |
+
$help = esc_js(__('This size applies to the width or height, whichever is the largest.', 'wp-photo-album-plus'));
|
856 |
+
$help .= '\n'.esc_js(__('Changing the thumbnail size may result in all thumbnails being regenerated. this may take a while.', 'wp-photo-album-plus'));
|
857 |
+
$slug = 'wppa_film_thumbsize';
|
858 |
+
$html = wppa_input($slug, '40px', '', __('pixels', 'wp-photo-album-plus'));
|
859 |
+
$clas = '';
|
860 |
+
$tags = 'size,slide,layout';
|
861 |
+
wppa_setting($slug, '9', $name, $desc, $html, $help, $clas, $tags);
|
862 |
}
|
863 |
wppa_setting_subheader( 'C', '1', __( 'Thumbnail photos related size settings' , 'wp-photo-album-plus') );
|
864 |
{
|
3527 |
$clas = '';
|
3528 |
$tags = 'system,meta';
|
3529 |
wppa_setting($slug, '26', $name, $desc, $html, $help, $clas, $tags);
|
3530 |
+
|
3531 |
}
|
3532 |
wppa_setting_subheader( 'B', '1', __( 'Slideshow related settings' , 'wp-photo-album-plus') );
|
3533 |
{
|
wppa-setup.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* Contains all the setup stuff
|
6 |
-
* Version 6.4.
|
7 |
*
|
8 |
*/
|
9 |
|
@@ -394,6 +394,10 @@ global $silent;
|
|
394 |
}
|
395 |
}
|
396 |
|
|
|
|
|
|
|
|
|
397 |
}
|
398 |
|
399 |
// Set Defaults
|
@@ -597,6 +601,7 @@ Hide Camera info
|
|
597 |
'wppa_share_size' => '32',
|
598 |
'wppa_mini_treshold' => '500',
|
599 |
'wppa_slideshow_pagesize' => '0',
|
|
|
600 |
|
601 |
// C Thumbnails
|
602 |
'wppa_thumbsize' => '100', // 1
|
@@ -935,7 +940,7 @@ Hide Camera info
|
|
935 |
'wppa_enable_video' => 'yes',
|
936 |
'wppa_enable_audio' => 'yes',
|
937 |
'wppa_enable_stereo' => 'no',
|
938 |
-
|
939 |
'wppa_capitalize_tags' => 'yes',
|
940 |
|
941 |
// B Full size and Slideshow
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* Contains all the setup stuff
|
6 |
+
* Version 6.4.04
|
7 |
*
|
8 |
*/
|
9 |
|
394 |
}
|
395 |
}
|
396 |
|
397 |
+
if ( $old_rev <= '6403' ) {
|
398 |
+
wppa_copy_setting( 'wppa_thumbsize', 'wppa_film_thumbsize' );
|
399 |
+
}
|
400 |
+
|
401 |
}
|
402 |
|
403 |
// Set Defaults
|
601 |
'wppa_share_size' => '32',
|
602 |
'wppa_mini_treshold' => '500',
|
603 |
'wppa_slideshow_pagesize' => '0',
|
604 |
+
'wppa_film_thumbsize' => '100', // 9
|
605 |
|
606 |
// C Thumbnails
|
607 |
'wppa_thumbsize' => '100', // 1
|
940 |
'wppa_enable_video' => 'yes',
|
941 |
'wppa_enable_audio' => 'yes',
|
942 |
'wppa_enable_stereo' => 'no',
|
943 |
+
|
944 |
'wppa_capitalize_tags' => 'yes',
|
945 |
|
946 |
// B Full size and Slideshow
|
wppa-slideshow.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* Contains all the slideshow high level functions
|
6 |
-
* Version 6.4.
|
7 |
*
|
8 |
*/
|
9 |
|
@@ -919,11 +919,11 @@ function wppa_slide_filmstrip( $opt = '' ) {
|
|
919 |
|
920 |
$preambule = wppa_get_preambule();
|
921 |
|
922 |
-
$width = ( wppa_opt( '
|
923 |
$width += wppa_opt( 'tn_margin' ) + 2;
|
924 |
-
$topmarg = wppa_opt( '
|
925 |
-
$height = wppa_opt( '
|
926 |
-
$height1 = wppa_opt( '
|
927 |
$marg = '42'; // 32
|
928 |
$fs = '24';
|
929 |
$fw = '42';
|
@@ -943,8 +943,8 @@ function wppa_slide_filmstrip( $opt = '' ) {
|
|
943 |
$w = $conw - ( 2*6 + 2*42 + 2*wppa_opt( 'bwidth' ) ); /* 2*padding + 2*arrows + 2*border */
|
944 |
if ( wppa_in_widget() ) $w = $conw - ( 2*6 + 2*21 + 2*wppa_opt( 'bwidth' ) ); /* 2*padding + 2*arrow + 2*border */
|
945 |
$IE6 = 'width: '.$w.'px;';
|
946 |
-
$pagsiz = round( $w / ( wppa_opt( '
|
947 |
-
if ( wppa_in_widget() ) $pagsiz = round( $w / ( wppa_opt( '
|
948 |
|
949 |
wppa_add_js_page_data( '<script type="text/javascript">' );
|
950 |
wppa_add_js_page_data( 'wppaFilmPageSize['.wppa( 'mocc' ).'] = '.$pagsiz.';' );
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* Contains all the slideshow high level functions
|
6 |
+
* Version 6.4.04
|
7 |
*
|
8 |
*/
|
9 |
|
919 |
|
920 |
$preambule = wppa_get_preambule();
|
921 |
|
922 |
+
$width = ( wppa_opt( 'film_thumbsize' ) + wppa_opt( 'tn_margin' ) ) * ( count( $thumbs ) + 2 * $preambule );
|
923 |
$width += wppa_opt( 'tn_margin' ) + 2;
|
924 |
+
$topmarg = wppa_opt( 'film_thumbsize' ) / 2 - 16;
|
925 |
+
$height = wppa_opt( 'film_thumbsize' ) + wppa_opt( 'tn_margin' );
|
926 |
+
$height1 = wppa_opt( 'film_thumbsize' );
|
927 |
$marg = '42'; // 32
|
928 |
$fs = '24';
|
929 |
$fw = '42';
|
943 |
$w = $conw - ( 2*6 + 2*42 + 2*wppa_opt( 'bwidth' ) ); /* 2*padding + 2*arrows + 2*border */
|
944 |
if ( wppa_in_widget() ) $w = $conw - ( 2*6 + 2*21 + 2*wppa_opt( 'bwidth' ) ); /* 2*padding + 2*arrow + 2*border */
|
945 |
$IE6 = 'width: '.$w.'px;';
|
946 |
+
$pagsiz = round( $w / ( wppa_opt( 'film_thumbsize' ) + wppa_opt( 'tn_margin' ) ) );
|
947 |
+
if ( wppa_in_widget() ) $pagsiz = round( $w / ( wppa_opt( 'film_thumbsize' ) / 2 + wppa_opt( 'tn_margin' ) / 2 ) );
|
948 |
|
949 |
wppa_add_js_page_data( '<script type="text/javascript">' );
|
950 |
wppa_add_js_page_data( 'wppaFilmPageSize['.wppa( 'mocc' ).'] = '.$pagsiz.';' );
|
wppa-thumbnails.php
CHANGED
@@ -5,7 +5,7 @@
|
|
5 |
* Various funcions to display a thumbnail image
|
6 |
* Contains all possible frontend thumbnail types
|
7 |
*
|
8 |
-
* Version 6.4.
|
9 |
*
|
10 |
*/
|
11 |
|
@@ -1667,7 +1667,7 @@ function wppa_do_filmthumb( $id, $idx, $do_for_feed = false, $glue = false ) {
|
|
1667 |
|
1668 |
$result = '';
|
1669 |
$src = wppa_fix_poster_ext( wppa_get_thumb_path( $thumb['id'] ), $thumb['id'] );
|
1670 |
-
$max_size = wppa_opt( '
|
1671 |
if ( wppa_in_widget() ) $max_size /= 2;
|
1672 |
$com_alt = wppa( 'is_comten' ) && wppa_switch( 'comten_alt_display' ) && ! wppa_in_widget();
|
1673 |
|
5 |
* Various funcions to display a thumbnail image
|
6 |
* Contains all possible frontend thumbnail types
|
7 |
*
|
8 |
+
* Version 6.4.04
|
9 |
*
|
10 |
*/
|
11 |
|
1667 |
|
1668 |
$result = '';
|
1669 |
$src = wppa_fix_poster_ext( wppa_get_thumb_path( $thumb['id'] ), $thumb['id'] );
|
1670 |
+
$max_size = wppa_opt( 'film_thumbsize' );
|
1671 |
if ( wppa_in_widget() ) $max_size /= 2;
|
1672 |
$com_alt = wppa( 'is_comten' ) && wppa_switch( 'comten_alt_display' ) && ! wppa_in_widget();
|
1673 |
|
wppa-users.php
CHANGED
@@ -76,26 +76,13 @@ function wppa_user_is( $role, $user_id = null ) {
|
|
76 |
return true;
|
77 |
}
|
78 |
|
79 |
-
|
80 |
-
|
|
|
81 |
}
|
82 |
-
|
83 |
-
|
84 |
-
}
|
85 |
-
|
86 |
-
if ( empty( $user ) ) {
|
87 |
-
return false;
|
88 |
-
}
|
89 |
-
|
90 |
-
if ( in_array( $role, ( array ) $user->roles ) ) {
|
91 |
-
return true;
|
92 |
-
}
|
93 |
-
|
94 |
-
if ( in_array( $role, ( array ) $user->allcaps ) ) {
|
95 |
-
return true;
|
96 |
}
|
97 |
-
|
98 |
-
return false;
|
99 |
}
|
100 |
|
101 |
// Test if current user has extended access
|
76 |
return true;
|
77 |
}
|
78 |
|
79 |
+
// WP itsself mixes roles and capabilities ( on multisites administrator is a cap of the superadmin )
|
80 |
+
if ( $user_id ) {
|
81 |
+
return user_can( $user_id, $role );
|
82 |
}
|
83 |
+
else {
|
84 |
+
return current_user_can( $role );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
85 |
}
|
|
|
|
|
86 |
}
|
87 |
|
88 |
// Test if current user has extended access
|
wppa.php
CHANGED
@@ -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: 6.4.
|
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/
|
@@ -29,12 +29,12 @@ global $wpdb;
|
|
29 |
/* when new options are added and when the wppa_setup() routine
|
30 |
/* must be called right after update for any other reason.
|
31 |
*/
|
32 |
-
global $wppa_revno; $wppa_revno = '
|
33 |
|
34 |
/* This is the api interface version number
|
35 |
/* It is incremented at any code change.
|
36 |
*/
|
37 |
-
global $wppa_api_version; $wppa_api_version = '6-4-
|
38 |
|
39 |
/* start timers */
|
40 |
global $wppa_starttime; $wppa_starttime = microtime(true);
|
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: 6.4.04
|
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/
|
29 |
/* when new options are added and when the wppa_setup() routine
|
30 |
/* must be called right after update for any other reason.
|
31 |
*/
|
32 |
+
global $wppa_revno; $wppa_revno = '6404';
|
33 |
|
34 |
/* This is the api interface version number
|
35 |
/* It is incremented at any code change.
|
36 |
*/
|
37 |
+
global $wppa_api_version; $wppa_api_version = '6-4-04-000';
|
38 |
|
39 |
/* start timers */
|
40 |
global $wppa_starttime; $wppa_starttime = microtime(true);
|