Version Description
= 7.0.10 =
- This version addresses various bug fixes
= 7.0.09 =
- This version addresses various security issues.
- This version addresses various bug fixes and feature requests.
= 7.0.08 =
- This version addresses various security issues.
- This version addresses various bug fixes
= 7.0.07 =
- This version addresses various security issues.
- This version addresses various bug fixes
= 7.0.06 =
- This version addresses various bug fixes
- This version addresses various security issues.
= 7.0.05 =
- This version addresses various minor bug fixes and feature requests.
- This version addresses various security issues.
= 7.0.04 =
- This version addresses various bug fixes
- This version addresses various security issues.
= 7.0.03 =
- This version addresses various minor bug fixes and feature requests.
= 7.0.02 =
- This version addresses various bug fixes
- This version addresses various security issues.
= 7.0.01 =
- This version addresses various minor bug fixes and feature requests.
= 7.0.00 =
- Shortcode generators for Gutenberg added.
- This version addresses various minor bug fixes and feature requests.
- This version addresses various security issues.
- To prevent spamming and give the users the opportunity to decide when they want us to email them, the mailing system has been revised. Configure Table IX-M to enable various mailing lists, and use the WPPA+ Notify widget for full user flexibility.
= 6.9.21 =
- This version addresses various bug fixes
- This version addresses various security issues.
= 6.9.20 =
- This version addresses various bug fixes
= 6.9.19 =
- This version addresses various minor bug fixes
= 6.9.18 =
- This version addresses various minor bug fixes
= 6.9.17 =
- This version addresses various minor bug fixes and feature requests.
- This version addresses various security issues.
= 6.9.16 =
- This version addresses various minor bug fixes and feature requests.
- This version addresses various security issues.
= 6.9.15 =
- This version addresses various minor bug fixes and feature requests.
- This version addresses various security issues.
= 6.9.14 =
- This version addresses various minor bug fixes and feature requests.
- This version addresses various security issues.
= 6.9.13 =
- Security release.
= 6.9.12 =
- This version addresses various minor bug fixes and performance improvements.
= 6.9.11 =
- This version addresses various minor bug fixes and performance improvements.
= 6.9.10 =
- This version addresses various minor bug fixes and performance improvements.
= 6.9.09 =
- Panorama support phase III.
= 6.9.08 =
- This version addresses various minor bug fixes and feature requests.
- Panorama support phase II.
= 6.9.07 =
- This version addresses various minor bug fixes and feature requests.
- Panorama support phase I.
= 6.9.06 =
- This version addresses various minor bug fixes and feature requests.
= 6.9.05 =
- This version addresses various minor bug fixes and feature requests.
= 6.9.04 =
- This version addresses various minor bug fixes and feature requests.
- Local CDN functionality has been added.
= 6.9.03 =
- This version addresses various minor bug fixes and feature requests.
= 6.9.02 =
- This version addresses various minor bug fixes and feature requests.
= 6.9.01 =
- This version addresses various minor bug fixes and feature requests.
= 6.9.00 =
- This version includes the code for the privacy policy requirements.
= 6.8.09
- This version addresses various bug fixes and code edits.
= 6.8.08 =
- This version addresses various minor bug fixes and feature requests.
- This version offers substantial performance improvements when the box in Table IV-A13: Defer Javascript is ticked. This setting is now recommended and set ticked as the default.
- For more info on performance improvements and compatibility with optimizers: see the changelog.txt
= 6.8.07 =
- This version addresses various minor bug fixes and enhancements, and a new widget: Statistics.
= 6.8.06 =
- This version addresses various minor bug fixes and improved cache handling.
= 6.8.05 =
- This version addresses various minor bug fixes and feture requests.
= 6.8.04 =
- This version addresses various display issues and a few fixes of bugs that seldom affected the plugins behaviour.
Download this release
Release Info
Developer | opajaap |
Plugin | WP Photo Album Plus |
Version | 7.0.10.005 |
Comparing to | |
See all releases |
Code changes from version 7.0.10.004 to 7.0.10.005
- wppa-comment-admin.php +15 -2
- wppa-functions.php +0 -143
- wppa-mailing.php +9 -3
- wppa.php +2 -2
wppa-comment-admin.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* manage all comments
|
6 |
-
* Version 7.0.
|
7 |
*
|
8 |
*/
|
9 |
|
@@ -177,11 +177,24 @@ class WPPA_Comment_table extends WP_List_Table {
|
|
177 |
}
|
178 |
|
179 |
function get_columns() {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
180 |
$columns = array(
|
181 |
'cb' => '<input type="checkbox" />', //Render a checkbox instead of text
|
182 |
'photo' => __( 'Photo', 'wp-photo-album-plus' ),
|
183 |
'user' => __( 'User', 'wp-photo-album-plus' ),
|
184 |
-
'email' =>
|
185 |
'timestamp' => __( 'Timestamp', 'wp-photo-album-plus' ),
|
186 |
'status' => __( 'Status', 'wp-photo-album-plus' ),
|
187 |
'commenttext' => __( 'Comment', 'wp-photo-album-plus' ),
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* manage all comments
|
6 |
+
* Version 7.0.10
|
7 |
*
|
8 |
*/
|
9 |
|
177 |
}
|
178 |
|
179 |
function get_columns() {
|
180 |
+
|
181 |
+
switch ( wppa_opt( 'comment_email_required' ) ) {
|
182 |
+
case 'required':
|
183 |
+
$email_header = __( 'User email', 'wp-photo-album-plus' );
|
184 |
+
break;
|
185 |
+
case 'optional':
|
186 |
+
$email_header = __( 'User email / IP', 'wp-photo-album-plus' );
|
187 |
+
break;
|
188 |
+
default: // case 'none':
|
189 |
+
$email_header = __( 'User login / IP', 'wp-photo-album-plus' );
|
190 |
+
break;
|
191 |
+
}
|
192 |
+
|
193 |
$columns = array(
|
194 |
'cb' => '<input type="checkbox" />', //Render a checkbox instead of text
|
195 |
'photo' => __( 'Photo', 'wp-photo-album-plus' ),
|
196 |
'user' => __( 'User', 'wp-photo-album-plus' ),
|
197 |
+
'email' => $email_header,
|
198 |
'timestamp' => __( 'Timestamp', 'wp-photo-album-plus' ),
|
199 |
'status' => __( 'Status', 'wp-photo-album-plus' ),
|
200 |
'commenttext' => __( 'Comment', 'wp-photo-album-plus' ),
|
wppa-functions.php
CHANGED
@@ -2539,149 +2539,6 @@ global $wppa_done;
|
|
2539 |
// SEND EMAILS
|
2540 |
wppa_schedule_mailinglist( 'commentnotify', 0, $photo, $key, wppa_get_post( 'returnurl' ) );
|
2541 |
|
2542 |
-
/*
|
2543 |
-
|
2544 |
-
// Initialize
|
2545 |
-
$subj = __( 'Comment on photo:' , 'wp-photo-album-plus').' '.wppa_get_photo_name( $id );
|
2546 |
-
$usr = $user;
|
2547 |
-
if ( is_user_logged_in() ) {
|
2548 |
-
global $current_user;
|
2549 |
-
$current_user = wp_get_current_user();
|
2550 |
-
$usr = $current_user->display_name;
|
2551 |
-
}
|
2552 |
-
$returnurl = wppa_get_post('returnurl');
|
2553 |
-
$sentto = array();
|
2554 |
-
|
2555 |
-
// Setup standard content
|
2556 |
-
$the_comment = stripslashes( $comment );
|
2557 |
-
if ( wppa_switch( 'comment_clickable' ) ) {
|
2558 |
-
$the_comment = make_clickable( $the_comment );
|
2559 |
-
}
|
2560 |
-
$cont['0'] = $usr.' '.__( 'wrote on photo' , 'wp-photo-album-plus').' '.wppa_get_photo_name( $id ).':';
|
2561 |
-
$cont['1'] = '<blockquote style="color:#000077; background-color: #dddddd; border:1px solid black; padding: 6px; border-radius 4px;" ><em> '.$the_comment.'</em></blockquote>';
|
2562 |
-
$cont['2'] = $returnurl ? '<a href="'.$returnurl.'" >'.__( 'Reply' , 'wp-photo-album-plus').'</a>' : '';
|
2563 |
-
$cont2 = '<a href="'.get_admin_url().'admin.php?page=wppa_manage_comments&commentid='.$key.'" >' .
|
2564 |
-
__( 'Moderate comment admin' , 'wp-photo-album-plus') .
|
2565 |
-
'</a>';
|
2566 |
-
$cont3 = '<a href="'.get_admin_url().'admin.php?page=wppa_admin_menu&tab=cmod&photo='.$id.'" >' .
|
2567 |
-
__( 'Moderate manage photo' , 'wp-photo-album-plus') .
|
2568 |
-
'</a>';
|
2569 |
-
$cont3a = '<a href="'.get_admin_url().'admin.php?page=wppa_edit_photo&photo='.$id.'" >' .
|
2570 |
-
__( 'Edit photo' , 'wp-photo-album-plus') .
|
2571 |
-
'</a>';
|
2572 |
-
|
2573 |
-
// Process various types of emails
|
2574 |
-
if ( is_numeric( wppa_opt( 'commentnotify' ) ) ) {
|
2575 |
-
|
2576 |
-
// Mail specific user
|
2577 |
-
$moduser = get_userdata( wppa_opt( 'commentnotify' ) );
|
2578 |
-
$to = $moduser->user_email;
|
2579 |
-
if ( user_can( $moduser, 'wppa_comments' ) ) $cont['3'] = $cont2; else $cont['3'] = '';
|
2580 |
-
if ( user_can( $moduser, 'wppa_admin' ) ) $cont['4'] = $cont3; else $cont['4'] = '';
|
2581 |
-
$cont['5'] = __( 'You receive this email as you are assigned to moderate' , 'wp-photo-album-plus');
|
2582 |
-
|
2583 |
-
// Send, but not to the commenter himself
|
2584 |
-
if ( $to != $email ) {
|
2585 |
-
w ppa_send_mail( $to, $subj, $cont, $photo, ( wppa_switch( 'mail_upl_email' ) ? $email : 'void' ), 'moderatecomment' );
|
2586 |
-
}
|
2587 |
-
|
2588 |
-
// Remember if we sent him or skipped him because its his own comment
|
2589 |
-
$sentto[] = $moduser->user_login;
|
2590 |
-
}
|
2591 |
-
if ( wppa_opt( 'commentnotify' ) == 'admin' || wppa_opt( 'commentnotify' ) == 'both' || wppa_opt( 'commentnotify' ) == 'upadmin' ) {
|
2592 |
-
|
2593 |
-
// Mail admin
|
2594 |
-
$moduser = wppa_get_user_by( 'id', '1' );
|
2595 |
-
if ( ! in_array( $moduser->user_login, $sentto ) ) { // Already sent him?
|
2596 |
-
$to = get_bloginfo( 'admin_email' );
|
2597 |
-
|
2598 |
-
// only when he is not the commenter himself
|
2599 |
-
if ( $to != $email ) {
|
2600 |
-
$cont['3'] = $cont2;
|
2601 |
-
$cont['4'] = $cont3;
|
2602 |
-
$cont['5'] = __( 'You receive this email as administrator of the site' , 'wp-photo-album-plus');
|
2603 |
-
|
2604 |
-
// Send!
|
2605 |
-
w ppa_send_mail( $to, $subj, $cont, $photo, $email, $returnurl );
|
2606 |
-
}
|
2607 |
-
|
2608 |
-
// Remember if we sent him or skipped him because its his own comment
|
2609 |
-
$sentto[] = $moduser->user_login;
|
2610 |
-
}
|
2611 |
-
}
|
2612 |
-
if ( wppa_opt( 'commentnotify' ) == 'upload' || wppa_opt( 'commentnotify' ) == 'upadmin' || wppa_opt( 'commentnotify' ) == 'upowner' ) {
|
2613 |
-
|
2614 |
-
// Mail uploader
|
2615 |
-
$uploader = $wpdb->get_var( $wpdb->prepare( "SELECT owner FROM $wpdb->wppa_photos WHERE id = %d", $id ) );
|
2616 |
-
$moduser = wppa_get_user_by( 'login', $uploader );
|
2617 |
-
if ( $moduser ) { // else it's an ip address ( anonymus uploader )
|
2618 |
-
if ( ! in_array( $moduser->user_login, $sentto ) ) { // Already sent him?
|
2619 |
-
$to = $moduser->user_email;
|
2620 |
-
$cont['3'] = user_can( $moduser, 'wppa_comments' ) ? $cont2 : '';
|
2621 |
-
if ( user_can( $moduser, 'wppa_admin' ) ) $cont['4'] = $cont3;
|
2622 |
-
elseif ( wppa_may_user_fe_edit( $photo ) ) $cont['4'] = $cont3a;
|
2623 |
-
else $cont['4'] = '';
|
2624 |
-
$cont['5'] = __( 'You receive this email as uploader of the photo' , 'wp-photo-album-plus');
|
2625 |
-
|
2626 |
-
// Send!
|
2627 |
-
if ( $to != $email ) {
|
2628 |
-
w ppa_send_mail( $to, $subj, $cont, $photo, ( wppa_switch( 'mail_upl_email' ) ? $email : 'void' ), $returnurl );
|
2629 |
-
}
|
2630 |
-
$sentto[] = $moduser->user_login;
|
2631 |
-
}
|
2632 |
-
}
|
2633 |
-
}
|
2634 |
-
if ( wppa_opt( 'commentnotify' ) == 'owner' || wppa_opt( 'commentnotify' ) == 'both' || wppa_opt( 'commentnotify' ) == 'upowner' ) {
|
2635 |
-
// Mail album owner
|
2636 |
-
$alb = $wpdb->get_var( $wpdb->prepare( "SELECT album FROM $wpdb->wppa_photos WHERE id = %d", $id ) );
|
2637 |
-
$owner = $wpdb->get_var( $wpdb->prepare( "SELECT owner FROM $wpdb->wppa_albums WHERE id = %d", $alb ) );
|
2638 |
-
if ( $owner == '--- public ---' ) $owner = 'admin';
|
2639 |
-
$moduser = wppa_get_user_by( 'login', $owner );
|
2640 |
-
if ( ! in_array( $moduser->user_login, $sentto ) ) { // Already sent him?
|
2641 |
-
$to = $moduser->user_email;
|
2642 |
-
if ( user_can( $moduser, 'wppa_comments' ) ) $cont['3'] = $cont2; else $cont['3'] = '';
|
2643 |
-
if ( user_can( $moduser, 'wppa_admin' ) ) $cont['4'] = $cont3; else $cont['4'] = '';
|
2644 |
-
$cont['5'] = __( 'You receive this email as owner of the album' , 'wp-photo-album-plus');
|
2645 |
-
|
2646 |
-
// Send!
|
2647 |
-
if ( $to != $email ) {
|
2648 |
-
w ppa_send_mail( $to, $subj, $cont, $photo, ( wppa_switch( 'mail_upl_email' ) ? $email : 'void' ), $returnurl );
|
2649 |
-
}
|
2650 |
-
$sentto[] = $moduser->user_login;
|
2651 |
-
}
|
2652 |
-
}
|
2653 |
-
if ( wppa_switch( 'commentprevious' ) ) {
|
2654 |
-
// Mail users already commented on this photo
|
2655 |
-
$cmnts = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->wppa_comments WHERE photo = %d", $photo ), ARRAY_A );
|
2656 |
-
if ( $cmnts ) foreach( $cmnts as $cmnt ) {
|
2657 |
-
$user = $cmnt['user'];
|
2658 |
-
if ( ! in_array( $user, $sentto ) ) {
|
2659 |
-
$cmuser = wppa_get_user_by( 'login', $user );
|
2660 |
-
if ( $cmuser ) { // Not to an ip
|
2661 |
-
$to = $cmuser->user_email;
|
2662 |
-
$cont['3'] = '';
|
2663 |
-
$cont['4'] = '';
|
2664 |
-
$cont['5'] = __( 'You receive this email because you commented this photo earlier.' , 'wp-photo-album-plus');
|
2665 |
-
|
2666 |
-
// Send!
|
2667 |
-
if ( $to != $email ) {
|
2668 |
-
w ppa_send_mail( $to, $subj, $cont, $photo, ( wppa_switch( 'mail_upl_email' ) ? $email : 'void' ), $returnurl );
|
2669 |
-
}
|
2670 |
-
$sentto[] = $to;
|
2671 |
-
}
|
2672 |
-
}
|
2673 |
-
}
|
2674 |
-
}
|
2675 |
-
/* to do
|
2676 |
-
if ( wppa_switch( 'wppa_mail_ats' ) ) {
|
2677 |
-
// Mail to @dest
|
2678 |
-
// Find @dest in $comment
|
2679 |
-
|
2680 |
-
// Mail them
|
2681 |
-
|
2682 |
-
}
|
2683 |
-
*/
|
2684 |
-
|
2685 |
// Process any pending votes of this user for this photo if rating needs comment, do it anyway, feature may have been on but now off
|
2686 |
// if ( wppa_switch( 'vote_needs_comment' ) ) {
|
2687 |
$iret = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->wppa_rating
|
2539 |
// SEND EMAILS
|
2540 |
wppa_schedule_mailinglist( 'commentnotify', 0, $photo, $key, wppa_get_post( 'returnurl' ) );
|
2541 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2542 |
// Process any pending votes of this user for this photo if rating needs comment, do it anyway, feature may have been on but now off
|
2543 |
// if ( wppa_switch( 'vote_needs_comment' ) ) {
|
2544 |
$iret = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->wppa_rating
|
wppa-mailing.php
CHANGED
@@ -238,11 +238,17 @@ global $wpdb;
|
|
238 |
|
239 |
// Get the photo owner
|
240 |
$owner = wppa_get_photo_item( $pho, 'owner' );
|
241 |
-
|
242 |
-
wppa_log('Eml', 'P Owner login = '.$owner.', user id = '.$owuser->ID);
|
243 |
|
244 |
-
// The author
|
245 |
$author = get_user_by( 'email', $comment['email'] );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
246 |
if ( $author ) {
|
247 |
$aut = $author->display_name;
|
248 |
}
|
238 |
|
239 |
// Get the photo owner
|
240 |
$owner = wppa_get_photo_item( $pho, 'owner' );
|
241 |
+
$owuser = get_user_by('login',$owner);
|
|
|
242 |
|
243 |
+
// The author by email
|
244 |
$author = get_user_by( 'email', $comment['email'] );
|
245 |
+
|
246 |
+
if ( ! $author ) {
|
247 |
+
|
248 |
+
// Try the author by login
|
249 |
+
$author = get_user_by( 'login', $comment['email'] );
|
250 |
+
}
|
251 |
+
|
252 |
if ( $author ) {
|
253 |
$aut = $author->display_name;
|
254 |
}
|
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: 7.0.10.
|
6 |
* Author: J.N. Breetvelt a.k.a. OpaJaap
|
7 |
* Author URI: http://wppa.opajaap.nl/
|
8 |
* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
|
@@ -23,7 +23,7 @@ global $wp_version;
|
|
23 |
|
24 |
/* WPPA GLOBALS */
|
25 |
global $wppa_revno; $wppa_revno = '7010'; // WPPA db version
|
26 |
-
global $wppa_api_version; $wppa_api_version = '7.0.10.
|
27 |
|
28 |
/* start timers */
|
29 |
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: 7.0.10.005
|
6 |
* Author: J.N. Breetvelt a.k.a. OpaJaap
|
7 |
* Author URI: http://wppa.opajaap.nl/
|
8 |
* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
|
23 |
|
24 |
/* WPPA GLOBALS */
|
25 |
global $wppa_revno; $wppa_revno = '7010'; // WPPA db version
|
26 |
+
global $wppa_api_version; $wppa_api_version = '7.0.10.005'; // WPPA software version
|
27 |
|
28 |
/* start timers */
|
29 |
global $wppa_starttime; $wppa_starttime = microtime( true );
|