Changeset 2474908

Timestamp:

02/15/2021 02:20:37 PM (5 years ago)

Author:

cip

Message:

1.1.0

Location:

wise-notifications/trunk

Files:

• readme.txt (modified) (3 diffs)
• settingsPage.php (modified) (3 diffs)
• wiseNotifications.php (modified) (8 diffs)

wise-notifications/trunk/readme.txt

@@ -3 +3 @@
 Tags: push notifications, browser notifications, web notitications, iOS web notifications, web push notifications, push, safari, chrome, iOS, iPhone, user engagement
 Requires at least: 4.0.1
-Tested up to: 5.1
+Tested up to: 5.6.1
 Requires PHP: 5.6
-Stable tag: 1.0.0
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -53 +53 @@
 
 1. Download the plugin archive.
-2. Upload and uncompress it in "/wp-content/plugins/" directory, or install the plugin through the WordPress plugins screen directly.
+2. Upload and uncompress it in "/wp-content/plugins/" directory.
 3. Activate the plugin through the "Plugins" menu in WordPress.
 4. Subscribe to plan and add your domain in your [Wise Notifications](https://wisenotifications.com) account.
-5. Set **Site ID**, **API Key** and **Subscribe URL** in your WordPress Wise Notifications settings page, i.e Settings -> Wise Notifications.
+5. Set **Site ID**, **API Key** and **Subscribe URL** in your WordPress Wise Notifications settings page, e.g. yourdomain.com/wp-admin/options-general.php?page=wise-notifications-admin.
 6. Enjoy and profit!
 
@@ -63 +63 @@
 = 1.0.0 =
 * Initial release.
+
+= 1.1.0 =
+* Configure for what post types to send notifications automatically.
+* Improvements in UI and small bug fixes

wise-notifications/trunk/settingsPage.php

@@ -99 +99 @@
             'setting_section_id'
         );
+
+        $post_types = get_post_types_by_support(['title', 'thumbnail']);
+
+        add_settings_field(
+            'postTypes',
+            'Post Types',
+            [ $this, 'wisePostTypes_callback' ],
+            'wise-notifications-admin',
+            'setting_section_id',
+            [
+                'label_for' => 'postTypes',
+                'post_types' => $post_types,
+            ]
+        );
     }
 
@@ -120 +134 @@
         if (isset($input['subscribeLink'])) {
             $new_input['subscribeLink'] = sanitize_text_field($input['subscribeLink']);
+        }
+
+        if (isset($input['postTypes'])) {
+            $new_input['postTypes'] = $input['postTypes'];
         }
 
@@ -156 +174 @@
         );
     }
+    
+    public function wisePostTypes_callback($args) {
+        echo '<fieldset>';
+        echo '<legend>Select the post types you want to automatically send notifications when published.<br>You can override these settings on each post before publishing.</legend>';
+        
+        foreach ($args['post_types'] as $post_type) {
+            echo "<label for='".$post_type."'><input type='checkbox' id='postTypes[]' value='".$post_type."' name='wise_notifications_name[postTypes][]'";
+            if ( isset($this->options['postTypes']) && in_array($post_type, $this->options['postTypes']) ) {
+                echo ' checked';
+            }
+            echo '/> '.ucfirst($post_type).'</label><br />';
+        }
+        echo '</fieldset>';
+    }
 }
 

wise-notifications/trunk/wiseNotifications.php

@@ -2 +2 @@
 /**
  * @package Wise Notifications - web push notifications for iOS
- * @version 1.0.0
+ * @version 1.1.0
  */
 /*
@@ -8 +8 @@
 Description: Send updates using push notifications to your iOS website visitors.
 Author: Ciprian Amariei, Diana Amitroaei
-Version: 1.0.0
+Version: 1.1.0
 Author URI: https://wisenotifications.com
 */
@@ -43 +43 @@
 if (is_admin()) {
     include $wiseNotifications_pluginPath . 'settingsPage.php';
+    include $wiseNotifications_pluginPath . 'metaBox.php';
     wiseNotifications_log('check OneSignal exists', class_exists('OneSignal_Admin'));
 
@@ -66 +67 @@
     {
         wiseNotifications_log('wiseNotifications_postPublishedNotification started', ['new_status' => $new_status, 'old_status' => $old_status ]);
-
         // Check if someone published a post for the first time.
-        if (( $new_status == 'publish' ) /*&& ( $old_status != 'publish' )*/) {
+        if ($new_status == 'publish') {
             // TODO make sure the post is new and not updated (maybe check revisions?)
             try {
@@ -81 +81 @@
     {
 
+        // do not resend of already sent
+        $wasNotificationSentAlready = get_post_meta ( $post->ID, 'wisenotifications_notification_sent', true );
+
+        if ($wasNotificationSentAlready) {
+            wiseNotifications_log('notification was already sent', ['post' => $post]);
+            return;
+        }
+
         $title = $post->post_title;
         $permalink = get_permalink($post->ID);
@@ -89 +97 @@
             wiseNotifications_log('config data is missing', $pluginSettings, 'error');
             // TODO https://premium.wpmudev.org/blog/adding-admin-notices/
+            return;
+        }
+
+        // check if the post type has enabled notifications
+        if (empty($pluginSettings['postTypes']) || !in_array($post->post_type, $pluginSettings['postTypes'])) {
+            wiseNotifications_log('post type not included for notifications', $pluginSettings, 'error');
+            return;
+        }
+
+        // check if the checkbox was checked for this post to send notification
+        if (!isset($_POST['wiseNotifications-checkbox']) || (isset($_POST['wiseNotifications-checkbox']) && $_POST['wiseNotifications-checkbox'] != 1)) {
+            wiseNotifications_log('post should not have notifications sent from checkbox', $pluginSettings, 'error');
             return;
         }
@@ -112 +132 @@
         // $url = 'https://skdlxfssth.execute-api.eu-central-1.amazonaws.com/dev/';
         $url = 'https://api.wisenotifications.com/v1/';
-        wiseNotifications_postData($url, $data, $pluginSettings['apiKey']);
+        $isNotificationSent = wiseNotifications_postData($url, $data, $pluginSettings['apiKey']);
+
+        if ($isNotificationSent) {
+            update_post_meta( $post->ID, 'wisenotifications_notification_sent', true );
+        }
     }
 
@@ -134 +158 @@
         wiseNotifications_log('notification sending received headers', $result);
 
-        return $result;
+        return 1|| $result['http_response']->get_response_object()->success;
     }
 }