Changeset 2376518

Timestamp:

09/07/2020 12:50:39 PM (5 years ago)

Author:

omnideveloper

Message:

Updated to version 1.0.5

Location:

ping-news/trunk

Files:

• pingnews.php (modified) (1 diff)
• push.php (modified) (54 diffs)
• readme.txt (modified) (3 diffs)

ping-news/trunk/pingnews.php

@@ -5 +5 @@
 /*
  Plugin Name: Ping News
- Description: The Ping! WordPress plugin allows hyperlocal journalists to submit their news stories to the Ping! system and recieve approval/feedback on their stories.
- Version: 1.0.4
+ Description: The Ping! WordPress plugin allows hyperlocal journalists to submit their news stories to the Ping! system and receive approval/feedback on their stories.
+ Version: 1.0.5
  License: GPLv2 or later
  */
 
-define("PINGNEWS_PLUGIN_VERSION", "1.0.4");
+define("PINGNEWS_PLUGIN_VERSION", "1.0.5");
 
 // Include all functions related to pushing packages to ingest
 include 'push.php';
-
-/**
- * Initialise the plugin
- *
- * @return void
- */
-function pingnews_initialise() {
-    // initialise the plugin here
-    // TODO remove this if it does not get used
-}
-
-register_activation_hook(__FILE__, "pingnews_initialise");
 
 add_action("init", "pingnews_pusher_role", 100);

ping-news/trunk/push.php

@@ -1 +1 @@
 <?php
+// One thing to consider is that we do not have control of the server environmental variables on
+// the WordPress instances used by real users, this means that if we can't find a variable with
+// `getenv` then we should set a defaults that uses the values we want to have in production
+
+// NOTE: All constants and function names should be prefixed with `PINGNEWS` or `pingnews`,
+// as applicable, as otherwise there could be conflicts with constants and functions in other
+// plugins as all of these are defined globally in php
+
 // Get vmn ingest url from environmental variable and if does not exist use default
 $pingnews_vmn_ingest_url = getenv("VMN_INGEST_URL");
@@ -5 +13 @@
     $pingnews_vmn_ingest_url = "https://ingest.vmn.production.omni-digital.co.uk";
 }
-// Get vmn ingest url from environmental variable and if does not exist use default
+// Get vmn central url from environmental variable and if does not exist use default
 $pingnews_vmn_central_url = getenv("VMN_CENTRAL_URL");
 if (!$pingnews_vmn_central_url) {
     $pingnews_vmn_central_url = "https://central.vmn.production.omni-digital.co.uk";
 }
-// This variable is used in push.php for JS error reporting
-define( "PINGNEWS_SENTRY_DSN", getenv("WP_SENTRY_DSN") );
+// This variable is used in `push.php` for JS error reporting
+define("PINGNEWS_SENTRY_DSN", getenv("WP_SENTRY_DSN"));
 define("PINGNEWS_VMN_INGEST_URL", $pingnews_vmn_ingest_url);
 define("PINGNEWS_VMN_CENTRAL_URL", $pingnews_vmn_central_url);
@@ -22 +30 @@
 // The interval for which package data from Ingest to polled (in milliseconds)
 define("PINGNEWS_POLL_INTERVAL", "5000");
-// constant for the key to store package token in a posts meta data
+// Constant for the key to store package token in a posts meta data
 define("PINGNEWS_PACKAGE_DATA", "pingnews_package_data");
-// constant for taxonomy select tags
+// Constant for taxonomy select tags
 define("PINGNEWS_LOCATION", "pingnews_location");
 define("PINGNEWS_STORY_FOCUS", "pingnews_story_focus");
-// constant for outer div around the package token html
+// Constant for outer div around the package token html
 define("PINGNEWS_PACKAGE_DATA_OUTER", "pingnews_package_data_outer");
-// constants for spans to display package data
+// Constants for spans to display package data
 define("PINGNEWS_PACKAGE_TOKEN", "pingnews_package_token");
 define("PINGNEWS_PACKAGE_DATE_CREATED", "pingnews_date_created");
@@ -36 +44 @@
 define("PINGNEWS_PACKAGE_FEEDBACK_OUTER", "pingnews_package_feedback_outer");
 define("PINGNEWS_PACKAGE_TAGS", "pingnews_package_tags");
-// constant for push to ping button anchor
+// Constant for push to ping button anchor
 define("PINGNEWS_PUSH_TO_PING_ANCHOR", "pingnews_push_to_ping_anchor");
-// boolean for whether Trends features are applied
+// Boolean for whether Trends features are applied
 // NOTE: We would usually set this from ansible but we do not have control of environmental
 // variables on external WordPress instances
 define("PINGNEWS_TRENDS_FEATURE_FLAG", true );
 define("PINGNEWS_EXISTING_TAGS", "pingnews_existing_tags");
+
 /**
  * Define a custom role for pushing to VMN
@@ -56 +65 @@
         ]
     );
-    // add the capability to the administrator role as well
+
+    // Add the capability to the administrator role as well
     $admin_role = get_role("administrator");
     $admin_role->add_cap(PINGNEWS_PUSH_CAP, true);
 }
+
 /**
  * Function which returns whether the current user has the push to ping capability
@@ -66 +77 @@
  */
 function pingnews_has_push_caps() {
-  $current_user = wp_get_current_user();
-  return user_can($current_user, PINGNEWS_PUSH_CAP);
-}
+    $current_user = wp_get_current_user();
+    return user_can($current_user, PINGNEWS_PUSH_CAP);
+}
+
 /**
  * Renders the HTML page for the Ping News push interface
@@ -78 +90 @@
         return;
     } ?>
+
     <style type="text/css">
         .vmn_ping__ping_logo {
@@ -187 +200 @@
             <script type="text/javascript">
                 document.getElementById("submit").addEventListener("click", function(){
-                  document.getElementById("submit").value = "Saved!";
+                    document.getElementById("submit").value = "Saved!";
                 });
             </script>
@@ -194 +207 @@
     <?php
 }
+
+/**
+ * Saves `PINGNEWS_AUTH_TOKEN` to Ping News settings
+ *
+ * @return void
+ */
 function pingnews_update_auth_token() {
-  register_setting( PINGNEWS_AUTH_TOKEN_SETTINGS, PINGNEWS_AUTH_TOKEN );
-}
+  register_setting(PINGNEWS_AUTH_TOKEN_SETTINGS, PINGNEWS_AUTH_TOKEN);
+}
+
 /**
  * Adds the menu button if the user has push capability
@@ -211 +231 @@
     );
 }
+
 /**
  * The html to render in metabox and send AJAX request on clicking button
@@ -219 +240 @@
     // Add thickbox for claiming access rights to photos
     add_thickbox();
+
     $post_id = get_the_id();
     $package_data = False;
@@ -224 +246 @@
         $package_data = end(get_post_meta($post_id, PINGNEWS_PACKAGE_DATA));
     }
-    // TODO When it comes to applying css use class toggling rather than inline styles
+
+    // TODO: When it comes to applying css use class toggling rather than inline styles
     $display = "none";
     $display_feedback = "none";
@@ -235 +258 @@
         }
     }
+
     try {
         $taxonomies = pingnews_get_taxonomies();
@@ -242 +266 @@
         return;
     }
+
     if ( PINGNEWS_TRENDS_FEATURE_FLAG ) {
         $existing_tags = pingnews_get_existing_tags();
     }
-    // Display package data if package already pushed to ingest
+
     ?>
     <style type="text/css">
@@ -377 +402 @@
         }
         .vmn_ping__button.vmn_ping__button--reductive_action {
-          -webkit-box-shadow: inset 0 -3px 0 #ffebec;
-          box-shadow: inset 0 -3px 0 #ffebec;
-          border-color: #fb0e16;
-          background-color: #fff;
-          text-shadow: none;
-          color: #fb0e16;
+            -webkit-box-shadow: inset 0 -3px 0 #ffebec;
+            box-shadow: inset 0 -3px 0 #ffebec;
+            border-color: #fb0e16;
+            background-color: #fff;
+            text-shadow: none;
+            color: #fb0e16;
         }
         .vmn_ping__button.vmn_ping__button--reductive_action:active,
         .vmn_ping__button.vmn_ping__button--reductive_action:focus,
         .vmn_ping__button.vmn_ping__button--reductive_action:hover {
-          -webkit-box-shadow: inset 0 -1px 0 #ffebec;
-          box-shadow: inset 0 -1px 0 #ffebec;
-          border-color: #d3030a;
-          color: #d3030a;
+            -webkit-box-shadow: inset 0 -1px 0 #ffebec;
+            box-shadow: inset 0 -1px 0 #ffebec;
+            border-color: #d3030a;
+            color: #d3030a;
         }
         #TB_ajaxContent p:first-of-type {
@@ -396 +421 @@
         }
         .chosen-container {
-          position: relative;
-          z-index: 10;
-          display: inline-block;
-          vertical-align: middle;
-          -webkit-user-select: none;
-          -moz-user-select: none;
-          -ms-user-select: none;
-          user-select: none;
-          padding-bottom: 2px;
+            position: relative;
+            z-index: 10;
+            display: inline-block;
+            vertical-align: middle;
+            -webkit-user-select: none;
+            -moz-user-select: none;
+            -ms-user-select: none;
+            user-select: none;
+            padding-bottom: 2px;
         }
         * + .chosen-container {
-          margin-top: .8em;
+            margin-top: .8em;
         }
         .chosen-container .chosen-drop {
-          clip: rect(0, 0, 0, 0);
-          -webkit-clip-path: inset(100% 100%);
-          clip-path: inset(100% 100%);
-          position: absolute;
-          z-index: auto;
-          top: 100%;
-          left: 0;
-          border: 1px solid #650df2;
-          border-radius: 0 0 3px 3px;
-          width: 100%;
-          background-color: #fff;
+            clip: rect(0, 0, 0, 0);
+            -webkit-clip-path: inset(100% 100%);
+            clip-path: inset(100% 100%);
+            position: absolute;
+            z-index: auto;
+            top: 100%;
+            left: 0;
+            border: 1px solid #650df2;
+            border-radius: 0 0 3px 3px;
+            width: 100%;
+            background-color: #fff;
         }
         .chosen-container.chosen-with-drop .chosen-drop {
-          clip: auto;
-          -webkit-clip-path: none;
-          clip-path: none;
+            clip: auto;
+            -webkit-clip-path: none;
+            clip-path: none;
         }
         .chosen-container .chosen-results {
-          position: relative;
-          overflow-x: hidden;
-          overflow-y: auto;
-          max-height: 14rem;
-          background-color: #fff;
+            position: relative;
+            overflow-x: hidden;
+            overflow-y: auto;
+            max-height: 14rem;
+            background-color: #fff;
         }
         .chosen-container .chosen-results li {
-          will-change: background-color, color;
-          -webkit-transition-property: background-color, color;
-          transition-property: background-color, color;
-          -webkit-transition-duration: 0.14s;
-          transition-duration: 0.14s;
-          -webkit-transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
-          transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
-          display: none;
-          word-wrap: break-word;
-          padding: 0.539333333333333rem 2.427rem 0.539333333333333rem 0.6472rem;
+            will-change: background-color, color;
+            -webkit-transition-property: background-color, color;
+            transition-property: background-color, color;
+            -webkit-transition-duration: 0.14s;
+            transition-duration: 0.14s;
+            -webkit-transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
+            transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
+            display: none;
+            word-wrap: break-word;
+            padding: 0.539333333333333rem 2.427rem 0.539333333333333rem 0.6472rem;
         }
         .chosen-container .chosen-results li.active-result,.chosen-container .chosen-results li.disabled-result,.chosen-container .chosen-results li.no-results {
-          display: list-item;
+            display: list-item;
         }
         .chosen-container .chosen-results li.disabled-result {
-          color: #cccace;
+            color: #cccace;
         }
         .chosen-container .chosen-results li.no-results {
-          color: #fc4046;
+            color: #fc4046;
         }
         .chosen-container .chosen-results li.active-result {
-          cursor: pointer;
+            cursor: pointer;
         }
         .chosen-container .chosen-results li.disabled-result {
-          cursor: default;
-          color: #e5e4e7;
+            cursor: default;
+             color: #e5e4e7;
         }
         .chosen-container .chosen-results li.highlighted {
-          background-color: #e9e0ff;
-          color: #19191a;
+            background-color: #e9e0ff;
+            color: #19191a;
         }
         .chosen-container-multi .chosen-choices-outer {
-          overflow-x: hidden;
-          overflow-y: auto;
-          height: 100%;
+            overflow-x: hidden;
+            overflow-y: auto;
+            height: 100%;
         }
         .chosen-container-multi .chosen-choices {
-          cursor: text;
-          position: relative;
-          display: -webkit-box;
-          display: -ms-flexbox;
-          display: flex;
-          -webkit-box-orient: horizontal;
-          -webkit-box-direction: normal;
-          -ms-flex-direction: row;
-          flex-direction: row;
-          -ms-flex-wrap: wrap;
-          flex-wrap: wrap;
-          -webkit-box-align: center;
-          -ms-flex-align: center;
-          align-items: center;
-          -webkit-box-pack: start;
-          -ms-flex-pack: start;
-          justify-content: flex-start;
-          margin: 0;
-          width: 100%;
-          border-radius: 3px 3px 0 0;
-          background-color: #fff;
-          padding: 1em;
+            cursor: text;
+            position: relative;
+            display: -webkit-box;
+            display: -ms-flexbox;
+            display: flex;
+            -webkit-box-orient: horizontal;
+            -webkit-box-direction: normal;
+            -ms-flex-direction: row;
+            flex-direction: row;
+            -ms-flex-wrap: wrap;
+            flex-wrap: wrap;
+            -webkit-box-align: center;
+            -ms-flex-align: center;
+            align-items: center;
+            -webkit-box-pack: start;
+            -ms-flex-pack: start;
+            justify-content: flex-start;
+            margin: 0;
+            width: 100%;
+            border-radius: 3px 3px 0 0;
+            background-color: #fff;
+            padding: 1em;
         }
         .chosen-container-multi .chosen-choices li.search-field:not(:first-child),
         .chosen-container-multi .chosen-choices li.search-field:not(:first-child) input {
-          -webkit-box-flex: 0;
-          -ms-flex: 0 0 1px;
-          flex: 0 0 1px;
+            -webkit-box-flex: 0;
+            -ms-flex: 0 0 1px;
+            flex: 0 0 1px;
         }
         .chosen-container-multi .chosen-choices li.search-field {
-          display: -webkit-box;
-          display: -ms-flexbox;
-          display: flex;
-          margin: 0.3236rem 0 0;
-          padding: 0;
-          white-space: nowrap;
+            display: -webkit-box;
+            display: -ms-flexbox;
+            display: flex;
+            margin: 0.3236rem 0 0;
+            padding: 0;
+            white-space: nowrap;
         }
         .chosen-container-multi .chosen-choices li.search-field input {
-          padding: 0;
+            padding: 0;
         }
         .chosen-container-multi .chosen-choices li.search-choice {
-          cursor: default;
-          -webkit-box-flex: 0;
-          -ms-flex: 0 0 auto;
-          flex: 0 0 auto;
-          position: relative;
-          display: -webkit-box;
-          display: -ms-flexbox;
-          display: flex;
-          -webkit-box-align: center;
-          -ms-flex-align: center;
-          align-items: center;
-          -webkit-box-pack: center;
-          -ms-flex-pack: center;
-          justify-content: center;
-          margin: 0.3236rem 0.3236rem 0 0;
-          border: 1px solid #00ffb7;
-          max-width: 100%;
-          background-color: #fff;
-          padding: .25rem .5em .25rem .375rem;
-          line-height: 1.4;
-          font-size: 14px;
+            cursor: default;
+            -webkit-box-flex: 0;
+            -ms-flex: 0 0 auto;
+            flex: 0 0 auto;
+            position: relative;
+            display: -webkit-box;
+            display: -ms-flexbox;
+            display: flex;
+            -webkit-box-align: center;
+            -ms-flex-align: center;
+            align-items: center;
+            -webkit-box-pack: center;
+            -ms-flex-pack: center;
+            justify-content: center;
+            margin: 0.3236rem 0.3236rem 0 0;
+            border: 1px solid #00ffb7;
+            max-width: 100%;
+            background-color: #fff;
+            padding: .25rem .5em .25rem .375rem;
+            line-height: 1.4;
+            font-size: 14px;
         }
         .chosen-container-multi .chosen-choices li.search-choice span {
-          display: inline-block;
-          word-wrap: break-word;
+            display: inline-block;
+            word-wrap: break-word;
         }
         .chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
-          display: inline-block;
-          margin-left: 0.3236rem;
-          height: 1.25em;
-          width: 0.539333333333333rem;
-          background-image: url("<?php echo plugin_dir_url( __FILE__ ) . "images/chosen_cross.svg"; ?>");
-          background-position: center;
-          background-repeat: no-repeat;
-          background-size: contain;
+            display: inline-block;
+            margin-left: 0.3236rem;
+            height: 1.25em;
+            width: 0.539333333333333rem;
+            background-image: url("<?php echo plugin_dir_url( __FILE__ ) . "images/chosen_cross.svg"; ?>");
+            background-position: center;
+            background-repeat: no-repeat;
+            background-size: contain;
         }
         .edit-post-sidebar input.chosen-search-input[type="text"] {
@@ -555 +580 @@
         }
         .chosen-container-multi .chosen-results {
-          margin: 0;
-          padding: 0;
+            margin: 0;
+            padding: 0;
         }
         .chosen-container-multi .chosen-drop .result-selected {
-          display: list-item;
-          cursor: default;
-          color: #b2afb6;
+            display: list-item;
+            cursor: default;
+            color: #b2afb6;
         }
         .chosen-container {
-          will-change: border-color, box-shadow;
-          -webkit-transition-property: border-color, -webkit-box-shadow;
-          transition-property: border-color, -webkit-box-shadow;
-          transition-property: border-color, box-shadow;
-          transition-property: border-color, box-shadow, -webkit-box-shadow;
-          -webkit-transition-duration: 0.14s;
-          transition-duration: 0.14s;
-          -webkit-transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
-          transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
-          cursor: pointer;
-          -webkit-appearance: none;
-          -moz-appearance: none;
-          appearance: none;
-          width: 100%;
-          border-radius: 3px;
-          border: 1px solid #650df2;
-          border-left-width: 3px;
-          background-color: #fff;
-          background-position: right 0.809rem top 50%;
-          background-repeat: no-repeat;
-          background-size: 1.2135rem;
-          color: #3a393c;
+            will-change: border-color, box-shadow;
+            -webkit-transition-property: border-color, -webkit-box-shadow;
+            transition-property: border-color, -webkit-box-shadow;
+            transition-property: border-color, box-shadow;
+            transition-property: border-color, box-shadow, -webkit-box-shadow;
+            -webkit-transition-duration: 0.14s;
+            transition-duration: 0.14s;
+            -webkit-transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
+            transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
+            cursor: pointer;
+            -webkit-appearance: none;
+            -moz-appearance: none;
+            appearance: none;
+            width: 100%;
+            border-radius: 3px;
+            border: 1px solid #650df2;
+            border-left-width: 3px;
+            background-color: #fff;
+            background-position: right 0.809rem top 50%;
+            background-repeat: no-repeat;
+            background-size: 1.2135rem;
+            color: #3a393c;
         }
         .chosen-container:active,
@@ -591 +616 @@
         .vmn_ping__form_component__select:hover,
         .chosen-container:hover {
-          outline: 0;
-          -webkit-box-shadow: inset 0 -1px 0 #e9e0ff;
-          box-shadow: inset 0 -1px 0 #e9e0ff;
-          border-color: #520ab8;
+            outline: 0;
+            -webkit-box-shadow: inset 0 -1px 0 #e9e0ff;
+            box-shadow: inset 0 -1px 0 #e9e0ff;
+            border-color: #520ab8;
         }
         .chosen-container {
-          -webkit-box-shadow: inset 0 -2px 0 #e9e0ff;
-          box-shadow: inset 0 -2px 0 #e9e0ff;
+            -webkit-box-shadow: inset 0 -2px 0 #e9e0ff;
+            box-shadow: inset 0 -2px 0 #e9e0ff;
         }
         .vmn_ping__form_options .vmn_ping__form_component .vmn_ping__form_component__text {
-          will-change: border-color, box-shadow;
-          -webkit-transition-property: border-color, -webkit-box-shadow;
-          transition-property: border-color, -webkit-box-shadow;
-          transition-property: border-color, box-shadow;
-          transition-property: border-color, box-shadow, -webkit-box-shadow;
-          -webkit-transition-duration: 0.14s;
-          transition-duration: 0.14s;
-          -webkit-transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
-          transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
-          width: 100%;
-          max-width: 100%;
-          -webkit-box-shadow: inset 0 -3px 0 #e9e0ff;
-          box-shadow: inset 0 -3px 0 #e9e0ff;
-          border-radius: 3px;
-          border: 1px solid #650df2;
-          border-left-width: 3px;
-          background-color: #fff;
-          padding: 1em;
-          line-height: 1.5em;
-          font-size: 14px;
+            will-change: border-color, box-shadow;
+            -webkit-transition-property: border-color, -webkit-box-shadow;
+            transition-property: border-color, -webkit-box-shadow;
+            transition-property: border-color, box-shadow;
+            transition-property: border-color, box-shadow, -webkit-box-shadow;
+            -webkit-transition-duration: 0.14s;
+            transition-duration: 0.14s;
+            -webkit-transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
+            transition-timing-function: cubic-bezier(0.25, 0.25, 0.75, 0.75);
+            width: 100%;
+            max-width: 100%;
+            -webkit-box-shadow: inset 0 -3px 0 #e9e0ff;
+            box-shadow: inset 0 -3px 0 #e9e0ff;
+            border-radius: 3px;
+            border: 1px solid #650df2;
+            border-left-width: 3px;
+            background-color: #fff;
+            padding: 1em;
+            line-height: 1.5em;
+            font-size: 14px;
         }
         .vmn_ping__form_options .vmn_ping__form_component .vmn_ping__form_component__text::-webkit-input-placeholder {
-          color: #b2afb6;
-          opacity: 1;
+            color: #b2afb6;
+            opacity: 1;
         }
         .vmn_ping__form_options .vmn_ping__form_component .vmn_ping__form_component__text:-moz-placeholder {
-          color: #b2afb6;
-          opacity: 1;
+            color: #b2afb6;
+            opacity: 1;
         }
         .vmn_ping__form_options .vmn_ping__form_component .vmn_ping__form_component__text::-moz-placeholder {
-          color: #b2afb6;
-          opacity: 1;
+            color: #b2afb6;
+            opacity: 1;
         }
         .vmn_ping__form_options .vmn_ping__form_component .vmn_ping__form_component__text:-ms-input-placeholder {
-          color: #b2afb6;
-          opacity: 1;
+            color: #b2afb6;
+            opacity: 1;
         }
         .vmn_ping__form_options .vmn_ping__form_component .vmn_ping__form_component__text:active,
         .vmn_ping__form_options .vmn_ping__form_component .vmn_ping__form_component__text:focus,
         .vmn_ping__form_options .vmn_ping__form_component .vmn_ping__form_component__text:hover {
-          outline: 0;
-          -webkit-box-shadow: inset 0 -1px 0 #e9e0ff;
-          box-shadow: inset 0 -1px 0 #e9e0ff;
-          border-color: #520ab8;
+            outline: 0;
+            -webkit-box-shadow: inset 0 -1px 0 #e9e0ff;
+            box-shadow: inset 0 -1px 0 #e9e0ff;
+            border-color: #520ab8;
         }
         label + .vmn_ping__form_component__text,
         * + .vmn_ping__form_component__help_text {
-          margin-top: .8em;
+            margin-top: .8em;
         }
         .vmn_ping__form_component__help_text {
-          display: block;
+            display: block;
         }
     </style>
@@ -749 +774 @@
     class="vmn_ping__button thickbox"
     href="#TB_inline?width=600&height=550&inlineId=pingnews-thickbox"><?php if ( $package_json ): ?>Push again!<?php else: ?>Push to Ping!<?php endif; ?></a>
+
     <?php if ( PINGNEWS_SENTRY_DSN ) : ?>
         <script src="https://browser.sentry-cdn.com/5.11.1/bundle.min.js" integrity="sha384-r7/ZcDRYpWjCNXLUKk3iuyyyEcDJ+o+3M5CqXP5GUGODYbolXewNHAZLYSJ3ZHcV" crossorigin="anonymous"></script>
     <?php endif; ?>
+
     <?php if ( PINGNEWS_TRENDS_FEATURE_FLAG ) : ?>
         <script src="https://cdn.jsdelivr.net/npm/[email protected]/chosen.jquery.min.js"></script>
         <script>jQuery(".chosen-select").chosen({width: "100%"});</script>
     <?php endif; ?>
+
     <script type="text/javascript">
         <?php if ( PINGNEWS_SENTRY_DSN ) : ?>
@@ -767 +795 @@
                 document.getElementById("<?php echo PINGNEWS_PUSH_TO_PING_ANCHOR; ?>").innerHTML = "Push again!";
             }
+
             feedback_outer_element = document.getElementById("<?php echo PINGNEWS_PACKAGE_FEEDBACK_OUTER; ?>");
             if ( package_data["feedback"] ) {
@@ -774 +803 @@
                 feedback_outer_element.style.display = "none";
             }
+
             if (<?php echo PINGNEWS_TRENDS_FEATURE_FLAG; ?>) {
                 tags_element = document.getElementById("<?php echo PINGNEWS_PACKAGE_TAGS; ?>")
@@ -779 +809 @@
                 if ( tags && update_tags) {
                     let existing_tags_element = document.getElementById("<?php echo PINGNEWS_EXISTING_TAGS; ?>");
+
                     if (existing_tags_element) {
                         tags = tags.split(", ");
                         let existing_tags = [];
+
                         // Remove items from tags array if they appear in existing_tags array
                         for (let i = 0; i < existing_tags_element.options.length; i++) {
@@ -791 +823 @@
                             }
                         }
+
                         // Populate contents of tags text area
                         tags_element.value = tags.join(", ");
@@ -812 +845 @@
                 'nonce': '<?php echo wp_create_nonce('pingnews_post_package'); ?>',
             };
+
             if (<?php echo PINGNEWS_TRENDS_FEATURE_FLAG; ?>) {
                 let existing_tags_element = document.getElementById("<?php echo PINGNEWS_EXISTING_TAGS; ?>");
@@ -825 +859 @@
                 }
             }
+
             jQuery.ajax({
                 type: 'POST',
@@ -835 +870 @@
                         package_data = response["package_data"];
                         document.getElementById("<?php echo PINGNEWS_PACKAGE_DATA_OUTER; ?>").style.display = "inline";
+
                         if ( package_data["package_token"] ) {
                             document.getElementById("<?php echo PINGNEWS_PACKAGE_TOKEN; ?>").innerHTML = package_data["package_token"];
                         }
+
                         if ( package_data["date_created"] ) {
                             document.getElementById("<?php echo PINGNEWS_PACKAGE_DATE_CREATED; ?>").innerHTML = package_data["date_created"];
                         }
+
                         updateDynamicInfo(package_data, true);
                     }
@@ -848 +886 @@
             });
         }
+
         function pollIngest(update_tags) {
             jQuery.ajax({
@@ -865 +904 @@
                 }
             });
+
             setTimeout(pollIngest.bind(null, false), <?php echo PINGNEWS_POLL_INTERVAL; ?>);
         }
+    
         pollIngest(true);
     </script>
     <?php
 }
+
 /**
  * Function to echo option tags of the available taxonomy items
@@ -879 +921 @@
     foreach ($taxonomy_list as $taxonomy_item) {
         $selected = "";
-        // Set the initially selected taxonomy  by adding `selected` to option tag
+        // Set the initially selected taxonomy by adding `selected` to option tag
         if ($taxonomy_item[0] == $selected_taxonomy) {
             $selected = "selected";
@@ -886 +928 @@
     }
 }
+
 /**
  * Function to echo option tags of the available taxonomy items
@@ -893 +936 @@
 function pingnews_get_tag_options($tag_list, $selected_tags_string) {
     $selected_tags_list = explode(", ", $selected_tags_string);
+
     foreach ($tag_list as $key => $tag_item) {
         $selected = "";
@@ -902 +946 @@
     }
 }
+
 /**
  * The html to show when user has not entered authorization token in ping settings
@@ -908 +953 @@
  */
 function pingnews_metabox_no_auth_token_html() {
-  ?>
-    <p>Please enter your authorization token <a href="<?php menu_page_url(PINGNEWS_SETTINGS); ?>">here</a></p>
-  <?php
-}
+    ?>
+        <p>Please enter your authorization token <a href="<?php menu_page_url(PINGNEWS_SETTINGS); ?>">here</a></p>
+    <?php
+}
+
 /**
  * The php to render the pingnews metabox
@@ -919 +965 @@
 function pingnews_metabox_php() {
     $auth_token = get_option( PINGNEWS_AUTH_TOKEN );
+
     // Refer user to settings page if authorization token not set
     if ( $auth_token ) {
@@ -926 +973 @@
     }
 }
+
 /**
  * Function which adds a metabox to all screen types defined in  $screens
@@ -934 +982 @@
     if ( pingnews_has_push_caps() ) {
         $screens = ['post'];
+
         foreach ($screens as $screen) {
             add_meta_box(
@@ -945 +994 @@
     }
 }
+
 /**
  * Function to return an array of the categories associated with the post
@@ -951 +1001 @@
  */
 function pingnews_get_categories_array($id) {
-  $categories = get_the_category($id);
-  $categories_array = [];
-  foreach ($categories as $category) {
-      array_push($categories_array, $category->name);
-  }
-  return $categories_array;
-}
+    $categories = get_the_category($id);
+    $categories_array = [];
+
+    foreach ($categories as $category) {
+        array_push($categories_array, $category->name);
+    }
+
+    return $categories_array;
+}
+
 /**
  * Function to send a post request using WordPress HTTP API
@@ -964 +1017 @@
  */
 function pingnews_post_request($url, $body) {
-  $args = array(
-    "body" => $body,
-    "timeout" => "5",
-    "redirection" => "5",
-    "httpversion" => "1.0",
-    "headers" => array(
-      "Authorization" => "Token " . get_option( PINGNEWS_AUTH_TOKEN ),
-      "Content-Type" => "application/json",
-      "Content-Length" => strlen($body)
-    ),
-  );
-  // Send post request
-  $response = wp_remote_post($url, $args);
-  // Get http status from response
-  $http_status = wp_remote_retrieve_response_code($response);
-  // Get body content of response
-  $body = wp_remote_retrieve_body($response);
-  return [$body, $http_status];
-}
+    $args = array(
+        "body" => $body,
+        "timeout" => "5",
+        "redirection" => "5",
+        "httpversion" => "1.0",
+        "headers" => array(
+            "Authorization" => "Token " . get_option( PINGNEWS_AUTH_TOKEN ),
+            "Content-Type" => "application/json",
+            "Content-Length" => strlen($body)
+        ),
+    );
+
+    // Send post request
+    $response = wp_remote_post($url, $args);
+    // Get http status from response
+    $http_status = wp_remote_retrieve_response_code($response);
+    // Get body content of response
+    $body = wp_remote_retrieve_body($response);
+
+    return [$body, $http_status];
+}
+
 /**
  * Function to send a get request using WordPress HTTP API
@@ -989 +1045 @@
  */
 function pingnews_get_request($url, $package_token) {
-  $http_headers = array(
-    "Authorization" => "Token " . get_option( PINGNEWS_AUTH_TOKEN ),
-  );
-  if ( $package_token ) {
-      $http_headers["X-Package-Token"] = $package_token;
-  }
-  $args = array(
-    "timeout" => "5",
-    "redirection" => "5",
-    "httpversion" => "1.0",
-    "headers" => $http_headers,
-  );
-  // Send get request
-  $response = wp_remote_get($url, $args);
-  // Get http status from response
-  $http_status = wp_remote_retrieve_response_code($response);
-  // Get body content of response
-  $body = wp_remote_retrieve_body($response);
-  return [$body, $http_status];
-}
+    $http_headers = array(
+        "Authorization" => "Token " . get_option( PINGNEWS_AUTH_TOKEN ),
+    );
+
+    if ( $package_token ) {
+        $http_headers["X-Package-Token"] = $package_token;
+    }
+
+    $args = array(
+        "timeout" => "5",
+        "redirection" => "5",
+        "httpversion" => "1.0",
+        "headers" => $http_headers,
+    );
+
+    // Send get request
+    $response = wp_remote_get($url, $args);
+    // Get http status from response
+    $http_status = wp_remote_retrieve_response_code($response);
+    // Get body content of response
+    $body = wp_remote_retrieve_body($response);
+
+    return [$body, $http_status];
+}
+
 /**
  * Function to return which a http_status code is considered valid
@@ -1015 +1076 @@
  */
 function pingnews_is_http_status_valid($http_status) {
-    // Check if http status code is succesful (2xx)
+    // Check if http status code is successful (2xx)
     return strval($http_status)[0] == '2';
 }
+
 /**
  * Function to return the most recently saved post information and send this to Ingest in a
@@ -1026 +1088 @@
 function pingnews_post_package_ajax_handler() {
    $unsuccessful_message = "Unfortunately your push to ping was unsuccessful, please try again!";
+
    if ( pingnews_has_push_caps() &&
         isset($_POST["action"]) &&
@@ -1036 +1099 @@
      // verify there is a post with such a number
      $post = get_post((int)$post_id);
+
      if (empty($post)) {
          echo json_encode([
@@ -1043 +1107 @@
          wp_die();
      }
+
      global $wp_version;
      // Find all urls for oEmbeds and replace with generated iframe
@@ -1048 +1113 @@
      // Remove newlines otherwise regex does not match
      $striped_content = str_replace(array("\n", "\r"), '', $content);
-     // Find all occurances of strings between div's with class "wp-block-embed__wrapper"
+     // Find all occurrences of strings between div's with class "wp-block-embed__wrapper"
      preg_match_all('/<div class="wp-block-embed__wrapper">(.*?)<\/div>/', $striped_content, $matches);
+
      foreach ($matches[1] as $url) {
          // Generate oEmbed url
@@ -1055 +1121 @@
          $content = str_replace("\n".$url."\n", $iframe_embed, $content);
      }
+
      // Construct data to send in post request to ingest
      $post_data = [
@@ -1075 +1142 @@
          "tags" => sanitize_text_field($_POST["tags"]),
      ];
+
      $post_json = json_encode($post_data);
      list($package_data, $http_status) = pingnews_post_request(PINGNEWS_VMN_INGEST_URL . "/api/v1/package/", $post_json);
+
      if (pingnews_is_http_status_valid($http_status) && $package_data) {
-         // When posting new story feedback can be cleared if recieved for a previous version of the post
+         // When posting new story feedback can be cleared if received for a previous version of the post
          $package_data["feedback"] = "";
          add_post_meta($post_id, PINGNEWS_PACKAGE_DATA, $package_data);
          $message = "You have successfully pushed to Ping!";
          $package_json = json_decode($package_data);
+
          // Convert date times to UTC and r format
          $date_provider_published = new DateTime($package_json->package_data->date_provider_published, new DateTimeZone("UTC"));
@@ -1097 +1167 @@
          $package_json = False;
      }
+
      echo json_encode([
          "message" => $message,
          "package_data" => $package_json
      ]);
+
      wp_die();
    }
@@ -1109 +1181 @@
    wp_die();
 }
+
 /**
  * Function to get most recent version of the last sent package to Ingest, to be able to e.g.
@@ -1125 +1198 @@
      if ( $post_id ) {
          $last_package_data = end(get_post_meta($post_id, PINGNEWS_PACKAGE_DATA));
+
          if ( $last_package_data ) {
              $last_package_json = json_decode($last_package_data);
@@ -1130 +1204 @@
              list($package_data, $http_status) = pingnews_get_request(PINGNEWS_VMN_INGEST_URL . "/api/v1/package/", $last_package_json->package_token);
              $package_json = json_decode($package_data);
+
              // Check whether data has changed since the last time the metadata was saved to WordPress
              // Otherwise can duplicate data needlessly
@@ -1143 +1218 @@
    wp_die();
 }
+
 /**
  * Function to get the lists of possible taxonomies
@@ -1150 +1226 @@
 function pingnews_get_taxonomies() {
    list($taxonomies, $http_status) = pingnews_get_request(PINGNEWS_VMN_INGEST_URL . "/api/v1/taxonomies/", False);
+
    // Raise exception if failed to get taxonomies
    if (!pingnews_is_http_status_valid($http_status) || !$taxonomies) {
        throw new Exception("Unable to reach Ping! please refresh the page to try again or check your authorization token is correct.");
    }
+
    return json_decode($taxonomies);
 }
+
 /**
  * Function to get the lists of current tags
@@ -1163 +1242 @@
 function pingnews_get_existing_tags() {
    list($tags, $http_status) = pingnews_get_request(PINGNEWS_VMN_CENTRAL_URL . "/api/v1/tags/", False);
+
    if (!$tags) {
        $tags = False;
    }
+
    return json_decode($tags);
 }

ping-news/trunk/readme.txt

@@ -3 +3 @@
 Tags: Ping!, News, Ping News, ValueMyNews, Hyperlocal journalism, Journalism
 Requires at least: 4.0
-Stable tag: 1.0.4
+Stable tag: 1.0.5
 Tested up to: 5.2.6
 License: GPLv2 or later
@@ -19 +19 @@
 
 == Changelog ==
+
+= 1.0.5 =
+*Release Date - 7 September 2020*
+
+* Fix minor bug where red cross isn't visible in selected tags list
 
 = 1.0.4 =
@@ -53 +58 @@
 * Fix bug causing undefined variable error to show in plugin
 * Fix bug where stories could not be pushed to Ping! system in WordPress 5.3
-* Provide feedback when user saves authentication token by showing 'Saved!'
+* Provide feedback when user saves authorization token by showing 'Saved!'
 
 = 0.1.5 =