Changeset 2769404

Timestamp:

08/11/2022 03:16:34 PM (3 years ago)

Author:

planetshaker

Message:

fix issues with trustees

Location:

emergencywp/trunk

Files:

• ajax/loadSystemEmail.php (modified) (2 diffs)
• cron/cron_config.php (modified) (1 diff)
• cron/jobController.php (modified) (3 diffs)
• emergencywp.php (modified) (2 diffs)
• pages/emergencywp/setting_tabs/email_logs.php (modified) (1 diff)

emergencywp/trunk/ajax/loadSystemEmail.php

@@ -1 +1 @@
 <?php
+
+require_once("../../../../wp-load.php");
 require_once "../cron/cron_config.php";
 
-$email = sanitize_text_field(get_post(intval($_GET['pid'])));
+$email = get_post(intval($_GET['pid']));
 
 $content = html_entity_decode($email->post_content);
@@ -9 +11 @@
 <div class="modal-header" rel="2">
     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-    <h4 class="modal-title" id="myModalLabel"><?php echo esc_html($email->post_title); ?></h4>
+    <h4 class="modal-title" id="myModalLabel"><?php echo $email->post_title; ?></h4>
 </div>
 <div class="modal-body" rel="2">
-    <?php echo esc_html_e($content); ?>
+    <?php echo $content; ?>
 </div>
 <div class="modal-footer">

emergencywp/trunk/cron/cron_config.php

@@ -1 +1 @@
 <?php
 
-if( !defined('EMERGENCY_WP_PLUGIN_URL') ) define( 'EMERGENCY_WP_PLUGIN_URL', str_replace( 'cron/', '', plugin_dir_url( __FILE__ ) ) );
-if( !defined('EMERGENCY_WP_PLUGIN_DIR') ) define( 'EMERGENCY_WP_PLUGIN_DIR', str_replace( 'cron/', '', plugin_dir_path( __FILE__ ) ) );
+if( !defined('EMERGENCY_WP_PLUGIN_URL') ) define( 'EMERGENCY_WP_PLUGIN_URL', str_replace( '/cron', '/', dirname( __FILE__ ) ) );
+if( !defined('EMERGENCY_WP_PLUGIN_DIR') ) define( 'EMERGENCY_WP_PLUGIN_DIR', str_replace( '/cron', '/', dirname( __FILE__ ) ) );
 
 require_once EMERGENCY_WP_PLUGIN_DIR . 'lib/class.emergencyWPConfig.php';

emergencywp/trunk/cron/jobController.php

@@ -1 +1 @@
 <?php
+require_once("./wp-load.php");
+
+if( !defined('EMERGENCY_WP_PLUGIN_URL') ) define( 'EMERGENCY_WP_PLUGIN_URL', str_replace( '/cron', '/', dirname( __FILE__ ) ) );
+if( !defined('EMERGENCY_WP_PLUGIN_DIR') ) define( 'EMERGENCY_WP_PLUGIN_DIR', str_replace( '/cron', '/', dirname( __FILE__ ) ) );
+require_once EMERGENCY_WP_PLUGIN_DIR ."main.functions.php";
+
 $debugMode = 1;
 $secret = emergencywp_option('cron_secret', '', true);
@@ -221 +227 @@
                     $trustees_email_verification_date = new DateTime($trusty['postMeta']['emergencywp_trustees_approved']);
                     if (is_object($trustees_email_verification_date)) {
-                        if ($trustees_email_verification_date->getTimestamp() <= time() - $jobSettings['trustees_email_verification_interval']) {
+                        if ($trustees_email_verification_date->getTimestamp() + $jobSettings['trustees_email_verification_interval'] <= time() ) {
                             //Trustee send confirmation email
                             $hasEmailConfirmationSent = get_post_meta($trusty['post']->ID, 'emergencywp_trustees_confirm_email_sent');
                             if($hasEmailConfirmationSent == false) {
                                 update_post_meta($trusty['post']->ID, 'emergencywp_trustees_confirm_email_sent', date('Y-m-d H:i:s', time()));
+                                //EmergencyWPTrusteesSystemEmails::setEmail($trustees_email_verification_date);
                                 EmergencyWPTrusteesSystemEmails::verifyTrusteeEmailLink($trusty['post']->ID);
                             } else {
@@ -243 +250 @@
                     }
                 }
+
                 if(isset($trusty['postMeta']['emergencywp_trustees_confirm_email_sent'])) {
                     $trustees_email_verification_date = new DateTime($trusty['postMeta']['emergencywp_trustees_confirm_email_sent']);
                     if (is_object($trustees_email_verification_date)) {
-                        if ($trustees_email_verification_date->getTimestamp() <= time() - $jobSettings['live_status_finalHoldB_reactionTimeTrustees']) {
+                        if ($trustees_email_verification_date->getTimestamp() + $jobSettings['live_status_finalHoldB_reactionTimeTrustees'] <= time() ) {
                             //Trustee didn't confirm his email
                             $hasEmailNotificationSent = get_post_meta($trusty['post']->ID, 'emergencywp_trustees_email_changed_notification_sent');
+                            //$hasEmailConfirmationSent = false;
                             if($hasEmailNotificationSent == false) {
                                 update_post_meta($trusty['post']->ID, 'emergencywp_trustees_email_changed_notification_sent', date('Y-m-d H:i:s', time()));
-                                EmergencyWPTrusteesSystemEmails::notifyTrusteeEmailChanged($trusty['post']->ID);
+                                EmergencyWPTrusteesSystemEmails::notifyMandatoryAboutPossibleTrusteeEmailChanged($trusty['post']->ID);
                             }else {
                                 echo "<pre>";

emergencywp/trunk/emergencywp.php

@@ -4 +4 @@
 Plugin URI: https://emergencyWP.net/
 Description: EmergencyWP helps you plan processes for the case of personal emergencies right from your WordPress Dashboard. Pass over information to coworkers or clients automatically if you can't do it manually anymore (e.g. accidants, death, etc.). Plan life checks, setup contacts and messages and more. See our addons for more functionalities.
-Version: 1.3.8
+Version: 1.3.10
 Author: EmergencyWP Team, Albert Brückmann
 Author URI: https://emergencywp.net/
@@ -15 +15 @@
 define('EMERGENCY_WP_PLUGIN_PATH', 'emergencywp/emergencywp.php');
 define('EMERGENCY_WP_PLUGIN_NAME', 'emergencywp');
-define('EMERGENCY_WP_VERSION', '1.3.8');
+define('EMERGENCY_WP_VERSION', '1.3.10');
 define('EMERGENCY_WP_PLUGIN_URL', plugin_dir_url(__FILE__));
 define('EMERGENCY_WP_PLUGIN_DIR', plugin_dir_path(__FILE__));

emergencywp/trunk/pages/emergencywp/setting_tabs/email_logs.php

@@ -79 +79 @@
                 case 'live_status_hold_b':
                 case 'emergency_user_email':
+                case 'trustee_email_change':
                     // Mandator emails
                     $mandatorData = emergencyWPAdmin::getMandatorData(get_current_blog_id());