WordPress.org
Get WordPress

Plugin Directory

Changeset 2641481


Ignore:
Timestamp:
12/08/2021 08:15:31 PM (4 years ago)
Author:
planetshaker
Message:

fix errors
fix test email
remove mp
new version

Location:
emergencywp
Files:
129 added
6 edited

Legend:

Unmodified
Added
Removed

  • emergencywp/trunk/Readme.txt

    r2641350 r2641481  
    1 === EmergencyWP - Dead Man's switch & legacy deliverance ===
     1=== EmergencyWP - Dead Man's switch & legacy deliverance ===
    22Contributors: EmergencyWP
    33Author URI: https://emergencywp.net/
    … …  
    77Requires at least: 4.9
    88Tested up to: 5.8.2
    9 Stable tag: 1.3.5
     9Stable tag: 1.3.6
    1010License: GNU Version 2 or Any Later Version
    1111License URI: http://www.gnu.org/licenses/gpl-3.0.txt
    … …  
    5151== Changelog ==
    5252
     53= 1.3.6, 2021/11/08 =
     54* Fix Test email function
     55
     56= 1.3.5, 2021/11/08 =
     57* Fix compatibility with our addons
     58
    5359= 1.3.2, 2021/11/01 =
    5460* Public Release in WordPress Repository

  • emergencywp/trunk/assets/js/emergencyWP.js

    r2639152 r2641481  
    2525        var jqxhr = jQuery.ajax({
    2626            method: 'POST',
    27             type: 'html',
    28             url: emergencywp.EMERGENCY_WP_PLUGIN_URL + 'ajax/SendTestEmailToClient.php',
     27            type: 'post',
     28            url: emergencywp.ajaxurl + '?action=emergencywp_send_test_email',
    2929            data: {blogId: blogId},
    3030            error: function (res) {

  • emergencywp/trunk/emergencywp.php

    r2641350 r2641481  
    44Plugin URI: https://emergencyWP.net/
    55Description: 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.
    6 Version: 1.3.5
     6Version: 1.3.6
    77Author: EmergencyWP Team, Albert Brückmann
    88Author URI: https://emergencywp.net/
    … …  
    1515define('EMERGENCY_WP_PLUGIN_PATH', 'emergencywp/emergencywp.php');
    1616define('EMERGENCY_WP_PLUGIN_NAME', 'emergencywp');
    17 define('EMERGENCY_WP_VERSION', '1.3.5');
     17define('EMERGENCY_WP_VERSION', '1.3.6');
    1818define('EMERGENCY_WP_PLUGIN_URL', plugin_dir_url(__FILE__));
    1919define('EMERGENCY_WP_PLUGIN_DIR', plugin_dir_path(__FILE__));
    … …  
    240240$emergencyWP = new emergencyWPAdmin();
    241241
    242 if(ewp_isCurl()) {
    243     add_action('init', array(&$emergencyWP, 'initTracking'));
    244 }
    245242$emergencyWP->getSystemGmtOffset();
    246243$emergencyWP->admin_menu();

  • emergencywp/trunk/lib/class.emergencyWPAdmin.php

    r2641350 r2641481  
    9595    }
    9696
    97     public function initTracking()
    98     {
    99         global $wpdb;
    100 
    101         $mandatorReactionOptions = emergencyWPAdmin::$mandatorReactionOptions;
    102         $mandatorReactionOptions = apply_filters('wpEmergency_life_check_frequency', $mandatorReactionOptions);
    103 
    104         $reminderOptions = emergencyWPAdmin::$reminderOptions;
    105         $reminderOptions = apply_filters('wpEmergency_reminder_options', $reminderOptions);
    106 
    107         $jobSettings = get_option('emergencyWP_job_settings');
    108 
    109         $query = "SELECT * FROM $wpdb->posts WHERE post_type = 'emergencywp_contacts' ";
    110         $contactsCount = $wpdb->query($query); //return the total number of affected rows
    111 
    112         $query = "SELECT * FROM $wpdb->posts WHERE post_type = 'emergencywp_messages' ";
    113         $messagesCount = $wpdb->query($query); //return the total number of affected rows
    114 
    115         $responseUserTimes = get_option(UserStatus::RESPONSE_TIME_USER);
    116         if (is_array($responseUserTimes)) {
    117             $responseUserTimes = implode(', ', $responseUserTimes);
    118         }
    119         $responseTrusteesTimes = get_option(UserStatus::RESPONSE_TIME_TRUSTEE);
    120         if (is_array($responseTrusteesTimes)) {
    121             $responseTrusteesTimes = implode(', ', $responseTrusteesTimes);
    122         }
    123 
    124         $mandator = emergencyWPAdmin::getMandatorData();
    125         if ($this->trackingStatus == EWPSettingsData::TRACKING_ENABLED) {
    126             $current_user = wp_get_current_user();
    127             $cron = emergencywp_option('cron_service');
    128             $cronInterval = emergencywp_option('interval');
    129 
    130             if ($current_user->ID != 0) {
    131                 $domainSlug = self::getSiteDomainSlug();
    132                 $this->mp->people->set($domainSlug, array(
    133                     '$first_name' => $mandator['firstName'],
    134                     '$last_name' => $mandator['lastName'],
    135                     '$email' => $mandator['email'],
    136                     "Wordpress Version" => get_bloginfo('version', 'display'),
    137                     "EmergencyWP Version" => EMERGENCY_WP_VERSION,
    138                     "Cron System" => $cron,
    139                     "Cron Interval" => $cronInterval,
    140                     "Nr. Messages" => $messagesCount,
    141                     "Nr. Contacts" => $contactsCount,
    142                     "User Response Times" => $responseUserTimes,
    143                     "Trustee Response Times" => $responseTrusteesTimes
    144                 ));
    145 
    146                 $this->mp->identify($domainSlug);
    147 
    148                 $mandator = emergencyWPAdmin::getMandatorData();
    149                 $this->mp->people->set($domainSlug, array(
    150                     'Life Check Email' => $mandator['email']
    151                 ));
    152                 $addOns = array();
    153 
    154                 if (did_action('emergencywp-trustees/loaded')) {
    155                     array_push($addOns, 'trustees');
    156                 }
    157 
    158                 if (did_action('emergencywp-pro/loaded')) {
    159                     array_push($addOns, 'pro');
    160                 }
    161                 if (did_action('emergencyWPDeliveryConditions/loaded')) {
    162                     array_push($addOns, 'delivery-condition');
    163                 }
    164                 if (count($addOns) > 0) {
    165                     $this->mp->people->set($domainSlug, array(
    166                         'Add-ons' => implode(', ', $addOns)
    167                     ));
    168                 }
    169 
    170                 foreach ($mandatorReactionOptions as $sec => $option) {
    171                     if ($sec == $jobSettings['live_status_holdA_noFeedbackTime']) {
    172                         $this->mp->people->set($domainSlug, array(
    173                             'Frequency Time' => $option
    174                         ));
    175                     }
    176                 }
    177                 foreach ($reminderOptions as $sec => $option) {
    178                     if ($sec == $jobSettings['live_status_finalHoldA_reminderTime']) {
    179                         $this->mp->people->set($domainSlug, array(
    180                             'Reaction Time' => $option
    181                         ));
    182                     }
    183                 }
    184                 $extraArrayValues = array();
    185                 $extraArrayValues = apply_filters('wpEmergency_user_tracking_info', $extraArrayValues);
    186 
    187                 if (count($extraArrayValues) > 0) {
    188                     $this->mp->people->set($domainSlug, $extraArrayValues);
    189                 }
    190             }
    191         }
    192     }
    19397
    19498    public static function getSiteDomainSlug()
    … …  
    332236
    333237        add_action('wp_ajax_emergencywp_cron', array('emergencyWPAdmin', 'life_check_cron_job'));
     238
    334239        add_filter('display_post_states', array('emergencyWPAdmin', 'emergencywp_custom_post_states'), 10, 2);
    335240        if (class_exists('EmergencyWPPro')) {
    … …  
    342247        add_action( "wp_ajax_resetAliveStatus", array('emergencyWPAdmin', "ewp_ajax_resetAliveStatus" ));
    343248        add_action( "wp_ajax_nopriv_resetAliveStatus", array('emergencyWPAdmin', "ewp_ajax_resetAliveStatus" ));
     249
     250        add_action('wp_ajax_emergencywp_send_test_email', array('emergencyWPAdmin', 'emergencywp_send_test_email'));
     251        //add_action("wp_ajax_my_user_vote", "my_user_vote");
     252        //add_action("wp_ajax_nopriv_my_user_vote", "my_must_login");
    344253    }
    345254
    … …  
    19391848        exit();
    19401849    }
     1850
     1851    public static function emergencywp_send_test_email(){
     1852        include(EMERGENCY_WP_PLUGIN_DIR . 'cron/cron_config.php');
     1853        emergencyWPJobController::sendTestEmailToClient(intval($_POST['blogId']));
     1854        exit();
     1855    }
    19411856}
    19421857

  • emergencywp/trunk/pages/emergencywp/setting_tabs/settings_main.php

    r2639152 r2641481  
    279279        echo '          <option value="' . esc_attr($sec) . '"' . esc_attr($selected) . '>' . esc_html($option) . '</option>';
    280280    }
    281     echo '          </select><p class="emergencywp_settings-field_description">' . __('How often do you want to receive a life check?', 'emergencywp') . '</p>' .
    282         '       </div>' .
    283         '   </div>';
     281
     282    if (defined('EWP_PRO_SL_ITEM_ID')) {
     283        echo '          </select>
     284                        <p class="emergencywp_settings-field_description">' . __('How often do you want to receive a life check?',
     285                'emergencywp') .'</p>' .
     286            '       </div>' .
     287            '   </div>';
     288    } else {
     289        echo '          </select>
     290            <p class="emergencywp_settings-field_description">' . __('How often do you want to receive a life check?',
     291                'emergencywp') . ' ' . __('Need more options?', 'emergencywp') . ' <a target="_blank" href="https://emergencywp.net/features/add-ons-overview/">'.__('Get EmergencyWP PRO', 'emergencywp').'</a></p>' .
     292        '       </div>' .
     293        '   </div>';
     294
     295    }
    284296
    285297    echo '  <div class="half">' .

  • emergencywp/trunk/views/contacts/overview.php

    r2639152 r2641481  
    1515            <a href="admin.php?post_type=emergencywp_contacts&page=emergencywp_contacts&new"
    1616               class="add-new-h2"><?php esc_html_e('Add New', 'emergencywp'); ?></a>
    17         <?php } ?>
     17        <?php } else {
     18            echo '<p class="emergencywp_settings-field_description">'. __('Need more contacts?', 'emergencywp') . ' <a target="_blank" href="https://emergencywp.net/features/add-ons-overview/">'.__('Get EmergencyWP PRO', 'emergencywp') . '</a></p>';
     19        } ?>
    1820
    1921        <?php if (isset($_GET['s']) && !empty($_GET['s'])) : ?>
Note: See TracChangeset for help on using the changeset viewer.