Changeset 1252098

Timestamp:

09/23/2015 03:07:45 PM (11 years ago)

Author:

expresscurate

Message:

new version v2.1.4 with changes:

• Wordpress 4.3 supported now.
• Miscellaneous bug fixes and improvements.

Location:

expresscurate/trunk

Files:

• ExpressCurate.php (modified) (1 diff)
• ExpressCurate_Actions.php (modified) (16 diffs)
• ExpressCurate_FeedManager.php (modified) (32 diffs)
• ExpressCurate_HtmlParser.php (modified) (4 diffs)
• ExpressCurate_Sitemap.php (modified) (11 diffs)
• ExpressCurate_SocialManager.php (modified) (4 diffs)
• css/expresscurate.css (modified) (13 diffs)
• css/theme-styles.css (modified) (1 diff)
• images/feed_icons.svg (modified) (1 diff)
• js/Settings.js (modified) (1 diff)
• js/bookmarks.js (modified) (2 diffs)
• js/feed/contentFeed.js (modified) (7 diffs)
• js/socialPostWidget.js (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• templates/bookmarks.php (modified) (2 diffs)
• templates/content_feed_archive.php (added)
• templates/dashboard/welcome_widget.php (modified) (1 diff)
• templates/feed_dashboard.php (modified) (1 diff)
• templates/feed_list.php (modified) (3 diffs)
• templates/settings.php (modified) (1 diff)
• templates/sitemap.php (modified) (1 diff)

expresscurate/trunk/ExpressCurate.php

@@ -5 +5 @@
   Plugin URI: http://www.expresscurate.com/products
   Description: ExpressCurate plugin is a content curation tool for WordPress. It enables you to create and publish high quality content within minutes.
-  Version: 2.1.3
+  Version: 2.1.4
   Author: ExpressCurate
   Author URI: http://www.expresscurate.com

expresscurate/trunk/ExpressCurate_Actions.php

@@ -99 +99 @@
         add_action('wp_head', array(&$this, 'advanced_seo_update_canonical_url'));
         add_filter('wp_title', array(&$this, 'advanced_seo_update_title'));
-    }
-
+        if($_GET['page'] == "expresscurate_feed_list"){
+            update_option('unseen_feeds_count',0);
+            update_option('feedpage_last_time_opened',date('Y-m-d H:i:s',time()));
+        }
+
+    }
 
     /**
@@ -130 +134 @@
 
         add_action('admin_footer', array(&$this, 'add_inline_popup_content'));
+        if ($_GET['page'] == "expresscurate_bookmarks" || $_GET['page'] == "expresscurate_feed_list") {
+            add_action('admin_footer', array(&$this, 'add_confirm_dialogs'));
+        }
         add_action('admin_footer', array(&$this, 'anonymous_tracking'));
 
@@ -162 +169 @@
         add_action('wp_ajax_expresscurate_bookmarks_delete', array($this->feedManager, 'delete_bookmarks'));
         add_action('wp_ajax_expresscurate_delete_feed_content_items', array($this->feedManager, 'delete_feed_content_items'));
+        add_action('wp_ajax_expresscurate_remove_feed_archive_items', array($this->feedManager, 'remove_feed_archive_items'));
+        add_action('wp_ajax_expresscurate_restore_deleted_items', array($this->feedManager, 'restore_deleted_items'));
         add_action('wp_ajax_expresscurate_add_post_source', array($this->feedManager, 'add_post_source'));
         add_action('wp_ajax_expresscurate_delete_post_source', array($this->feedManager, 'delete_post_source'));
@@ -190 +199 @@
         add_action('wp_dashboard_setup', array(&$this, 'add_dashboard_widgets'));
         add_filter('user_contactmethods', array(&$this, 'add_user_profile_metas'));
+
         if ($pagenow == 'post.php' || $pagenow == 'post-new.php') {
             add_action('media_buttons_context', array(&$this, 'add_custom_button'), 11);
@@ -198 +208 @@
         add_action('transition_post_status', array(&$this, 'status_changes'), 10, 3);
         add_action('update_option_permalink_structure', array(&$this, 'permalink_changes'), 10, 2);
+        if ($pagenow == 'post.php') {
+            add_action('admin_head', array(&$this, 'edit_post_permalink'));
+        }
         if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'expresscurate_settings') {
             $this->cronManager->schedule_events();
@@ -225 +238 @@
         register_setting('expresscurate-group', 'expresscurate_publisher');
         register_setting('expresscurate-group', 'expresscurate_publisher_twitter');
+        register_setting('expresscurate-group', 'expresscurate_publisher_facebook');
         register_setting('expresscurate-group', 'expresscurate_autosummary');
         register_setting('expresscurate-group', 'expresscurate_share');
@@ -249 +263 @@
         register_setting('expresscurate-sitemap-group', 'expresscurate_sitemap_priority_manual_value');
         register_setting('expresscurate-sitemap-group', 'expresscurate_sitemap_archiving');
+        register_setting('expresscurate-sitemap-group', 'expresscurate_sitemap_domain');
         register_setting('expresscurate-changed-post-status', 'expresscurate_changed_post_status');
         register_setting('expresscurate-sitemap-generation-group', 'expresscurate_sitemap_generation_last_date');
@@ -378 +393 @@
     }
 
+    public function edit_post_permalink(){
+        global $post;
+        ?>
+        <script>
+            jQuery(document).ready(function() {
+                jQuery('#titlediv').append('<input type="hidden" name="post_old_permalink" value="<?php echo (get_permalink($post->ID)?get_permalink($post->ID):''); ?>">');
+            });
+        </script>
+        <?php
+    }
+
+
     public function add_custom_button($context)
     {
@@ -431 +458 @@
         <?php
         }
+    }
+
+    public function add_confirm_dialogs(){
+        ?>
+            <div id="expresscurate_delete_dialog" class="expresscurate_dialog" title="Confirm Delete"></div>
+            <!-- <div id="expresscurate_remove_dialog" class="expresscurate_dialog" title="Confirm Permanent Remove"></div>-->
+            <!--<div id="expresscurate_restore_dialog" class="expresscurate_dialog" title="Confirm Restore"></div>-->
+        <?php
     }
 
@@ -795 +830 @@
             $post_content = $tags_obj->removeTagLinks($post_content);
         }
+        $old_permalink = $_POST['post_old_permalink'];
+        $new_permalink = get_permalink($post->ID);
+        $this->permalink_changes($old_permalink, $new_permalink);
 
         //Smart publishing
@@ -1127 +1165 @@
             self::PLUGIN_NAME . ' Settings', self::PLUGIN_NAME, 'manage_options', 'expresscurate_settings', array(&$this, 'plugin_settings_page')
         );
+        $unseen_feeds_count =  get_option('unseen_feeds_count')?get_option('unseen_feeds_count'):0;
+        $content_feed_label = sprintf( __( 'Content Feed %s' ),"<span class='awaiting-mod count-$unseen_feeds_count'><span class='$unseen_feeds_count'>$unseen_feeds_count </span></span>");
         add_menu_page(self::PLUGIN_NAME, self::PLUGIN_NAME, 'edit_posts', 'expresscurate', array(&$this, 'show_dashboard'), '', '9.95458');
-        add_submenu_page('expresscurate', 'Content Feed', 'Content Feed', 'edit_posts', 'expresscurate_feed_list', array(&$this, 'show_feed_list'), '');
+        add_submenu_page('expresscurate', 'Content Feed', $content_feed_label, 'edit_posts', 'expresscurate_feed_list', array(&$this, 'show_feed_list'), '');
+        add_submenu_page(null, 'Content Feed Archive', 'Content Feed Archive', 'edit_posts', 'expresscurate_content_feed_archive', array(&$this, 'show_deleted_feeds'), '');
         add_submenu_page('expresscurate', 'Bookmarks', 'Bookmarks', 'edit_posts', 'expresscurate_bookmarks', array(&$this, 'show_bookmarks'), '');
         add_submenu_page('expresscurate', 'Top Sources', 'Top Sources', 'edit_posts', 'expresscurate_websites', array(&$this, 'show_websites'), '');
@@ -1355 +1396 @@
         $featuredImageID = get_post_thumbnail_id($post_id);
         if ($featuredImageID) {
-            $featuredImage = wp_get_attachment_url(featuredImageID);
+            $featuredImage = wp_get_attachment_url($featuredImageID);
             $featuredImage = $featuredImage ? esc_url($featuredImage) : null;
         }
@@ -1509 +1550 @@
     }
 
+    public function show_deleted_feeds()
+    {
+        if (!current_user_can('edit_posts')) {
+            wp_die(__('You do not have sufficient permissions to access this page.'));
+        }
+        include(sprintf("%s/templates/content_feed_archive.php", dirname(__FILE__)));
+
+        // init page tracking
+        global $expresscurate_track_page;
+        $expresscurate_track_page = 'rss-feeds';
+    }
+
     public function show_bookmarks()
     {
@@ -1595 +1648 @@
 
         wp_enqueue_script('expresscurate_keyword_utils', $pluginUrl . 'js/keywords/KeywordUtils.js', array('jquery'));
-        wp_enqueue_script('expresscurate_keywords', $pluginUrl . 'js/keywords/Keywords.js', array('jquery', 'jquery-ui-core', 'jquery-ui-datepicker'));
+        wp_enqueue_script('expresscurate_keywords', $pluginUrl . 'js/keywords/Keywords.js', array('jquery', 'jquery-ui-core'));
         wp_enqueue_script('expresscurate_seo_control_center', $pluginUrl . 'js/keywords/SEOControlCenter.js', array('jquery', 'jquery-ui-draggable', 'jquery-ui-droppable'));
         //
@@ -1640 +1693 @@
         // Add new fields
         $profile_fields['expresscurate_twitter'] = 'Twitter Username';
+        $profile_fields['expresscurate_twitter_url'] = 'Twitter  URL';
         $profile_fields['expresscurate_facebook'] = 'Facebook URL';
         $profile_fields['expresscurate_gplus'] = 'Google+ URL';
         return $profile_fields;
-    }
-
-    private function get_match($regex, $content)
-    {
-        preg_match($regex, $content, $matches);
-        return $matches[1];
-    }
-
-    private function pluginUrl()
-    {
-        return plugin_dir_url(__FILE__);
     }
 
@@ -1803 +1846 @@
         if (!ExpressCurate_HtmlParser::supportsDownload()) {
             echo '<div class="update-nag">You should activate either curl extension or allow_url_fopen setting.</div>';
+        }
+
+
+
+        if (!ExpressCurate_HtmlParser::isNotSafeMode() || strlen(ini_get('open_basedir'))!=0) {
+            echo '<div class="update-nag">
+                      For the plugin to perform properly make sure those settings on your server in the following states.</br>
+                      <ol>
+                          <li> cUrl extension is enabled </li>
+                          <li> Safe mode is off(only for below php5.4)</li>
+                          <li>"Open_basedir" option is disabled  </li>
+                      </ol>
+                      Otherwise enable "allow_url_fopen" setting
+                  </div>';
         }
 

expresscurate/trunk/ExpressCurate_FeedManager.php

@@ -32 +32 @@
     {
         global $wpdb;
-        if(!ExpressCurate_HtmlParser::supportsDownload()){
-            $result = array("status"=>"You should activate either curl extension or allow_url_fopen setting.");
+        if (!ExpressCurate_HtmlParser::supportsDownload()) {
+            $result = array("status" => "You should activate either curl extension or allow_url_fopen setting.");
         } else {
             $url = isset($url) ? $url : $_REQUEST['url'];
@@ -48 +48 @@
 
                 $rssUrl = $this->getRssUrl($url);
-                $existed_rss="";
+                $existed_rss = "";
                 $rssLinks = array_values($curated_links_rss);
-                foreach($rssLinks as $link) {
-                    if($link['feed_url']==$rssUrl)
-                    {
+                foreach ($rssLinks as $link) {
+                    if ($link['feed_url'] == $rssUrl) {
                         $existed_rss = $link['feed_url'];
                         break;
                     }
                 }
-                if ($rssUrl === null || $rssUrl=="") {
+                if ($rssUrl === null || $rssUrl == "") {
                     $result['status'] = 'No RSS feed found at this URL.';
                 } else if (!empty($existed_rss)) {
@@ -97 +96 @@
     }
 
-    private function getFeedMeta($feedURL) {
-        $loadURL = "http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&q=" . urlencode($feedURL);
+    private function getFeedMeta($feedURL)
+    {
+        $loadURL = "http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&q=" . urlencode($feedURL) . "&num=-1";
         $htmlparser = new ExpressCurate_HtmlParser($loadURL);
         $res = $htmlparser->download();
         $result = json_decode($res, true);
 
-        if(isset($result['responseData']) && isset($result['responseData']['feed'])) {
+        if (isset($result['responseData']) && isset($result['responseData']['feed'])) {
             $meta = array();
             $meta['title'] = $result['responseData']['feed']['title'];
-            $meta['feed']  = $result['responseData']['feed']['feedUrl'];
-            $meta['link']  = $result['responseData']['feed']['link'];
+            $meta['feed'] = $result['responseData']['feed']['feedUrl'];
+            $meta['link'] = $result['responseData']['feed']['link'];
             return $meta;
         } else {
@@ -119 +119 @@
         $data = $_REQUEST;
         if ($data['url']) {
+            $data['url'] = htmlentities($data['url'], ENT_COMPAT);
             $curated_links_rss = get_option('expresscurate_links_rss', '');
             if ($curated_links_rss) {
@@ -161 +162 @@
 
             $links = array();
-            foreach($curated_links_rss as $link => $data) {
+            foreach ($curated_links_rss as $link => $data) {
                 $url = $data['feed_url'];
                 $links[$url] = 1;
@@ -173 +174 @@
         if ($top_sources_rss) {
             // check if migrated
-            $migrated1 = (isset($top_sources_rss['migrated']) && $top_sources_rss['migrated']== 1);
+            $migrated1 = (isset($top_sources_rss['migrated']) && $top_sources_rss['migrated'] == 1);
             // if not migrated, clean the data up, calculate stats from scratch
             $top_sources_rss = $migrated1 ? json_decode($top_sources_rss, true) : array();
@@ -203 +204 @@
 
                             // filter
-                            if(empty($link) || $link == '.') {
+                            if (empty($link) || $link == '.') {
                                 continue;
                             }
@@ -221 +222 @@
         $rssLinks = array();
 
-        if(ExpressCurate_HtmlParser::supportsDownload()) {
+        if (ExpressCurate_HtmlParser::supportsDownload()) {
             foreach ($curated_links as $key => $top_link) {
                 $websiteHost = $top_link['host'];
                 $website = $top_link['link'];
 
-                if(isset($rssLinks[$websiteHost])) {
+                if (isset($rssLinks[$websiteHost])) {
                     $rssUrl = $rssLinks[$websiteHost];
                 } else {
@@ -273 +274 @@
     }
 
+    public function get_deleted_feeds()
+    {
+        $deleted_feeds = get_option('expresscurate_feed_content_deleted', '');
+        if ($deleted_feeds) {
+            $deleted_feeds = json_decode($deleted_feeds, true);
+        } else {
+            $deleted_feeds = array();
+        }
+        return $deleted_feeds;
+    }
+
     public function get_rss_list()
     {
@@ -282 +294 @@
 
             $save = false;
-            foreach($curated_links_rss as $rss => $data) {
-                if(isset($data['feed_title']) && strlen(trim($data['feed_title'])) > 0) {
+            foreach ($curated_links_rss as $rss => $data) {
+                if (isset($data['feed_title']) && strlen(trim($data['feed_title'])) > 0) {
                     continue;
                 }
@@ -307 +319 @@
 
             // update the post count
-            foreach($curated_links_rss as $link => $data) {
+            foreach ($curated_links_rss as $link => $data) {
                 // get the number of posts that are curated from this feed
                 $posts = $wpdb->get_results(
-                            "SELECT post_id
+                    "SELECT post_id
                              FROM $wpdb->postmeta
-                             WHERE meta_key LIKE  '%_expresscurate_link_%' AND meta_value LIKE '%" . $link . "%' GROUP BY post_id");
+                             WHERE meta_key LIKE  '%_expresscurate_link_%' AND meta_value LIKE '%" . $data['link'] . "%' GROUP BY post_id");
 
                 $curated_links_rss[$link]['post_count'] = count($posts);
@@ -334 +346 @@
      * @return mixed|null JSON response or null if $url or $result is not set
      * */
-    public function doRssLookup($url) {
-        if(isset($url)) {
+    public function doRssLookup($url)
+    {
+        if (isset($url)) {
             $lookup_url = "http://ajax.googleapis.com/ajax/services/feed/lookup?v=1.0&q=" . urlencode($url);
             //$result = file_get_contents($lookup_url);
@@ -372 +385 @@
 
 
-
     public function get_feed_content()
     {
@@ -383 +395 @@
             $feed_array = $feedContent['content'];
         }
-
+        $unseen_feeds = get_option('unseen_feeds_count') ? intval(get_option('unseen_feeds_count')) : 0;
         // blabla
         $data = $_REQUEST;
         $pull_feed_interval = (get_option('expresscurate_pull_hours_interval')) ? get_option('expresscurate_pull_hours_interval') : 1;
-            $date = ($data["date"]) ? urldecode($data["date"]) : date('Y-m-d H:i:s', strtotime("-" . $pull_feed_interval . " hour"));
+        $date = ($data["date"]) ? urldecode($data["date"]) : date('Y-m-d H:i:s', strtotime("-" . $pull_feed_interval . " hour"));
         $curated_links_rss = get_option('expresscurate_links_rss', '');
         if ($curated_links_rss) {
@@ -399 +411 @@
             }
             if (is_array($feed_content_deleted)) {
-                foreach ($feed_content_deleted as $deletet_item) {
-                    $deleted_urls[] = $deletet_item;
+                foreach ($feed_content_deleted as $deleted_item) {
+                    $deleted_urls[] = $deleted_item;
                 }
             }
@@ -409 +421 @@
                 foreach ($curated_links_rss as $url => $feed_url) {
                     // pull content
-                    $lookup_url = "http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&q=" . urlencode($feed_url['feed_url']);
+                    $lookup_url = "http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&q=" . urlencode($feed_url['feed_url']) . "&num=-1";
                     $htmlparser = new ExpressCurate_HtmlParser($lookup_url);
                     $res = $htmlparser->download();
                     // decode and collect
                     $result = json_decode($res, true);
-
-                    $this->collect_feed($result, $deleted_urls, $feed_array, 'feed', $date);
-                }
+                    $this->collect_feed($result, $deleted_urls, $feed_array, 'feed', $date, $unseen_feeds);
+                }
+                update_option('unseen_feeds_count', $unseen_feeds);
             }
             // check if the feed is empty and sort
-            if(!empty($feed_array)) {
+            if (!empty($feed_array)) {
                 @uasort($feed_array, array($this, "feedSortByDate"));
 
                 // check if the feed is full or not
-                if(count($feed_array) > self::CONTENT_FEED_MAX_SIZE) {
+                if (count($feed_array) > self::CONTENT_FEED_MAX_SIZE) {
                     // remove the last elements
-                    $feed_array = array_slice($feed_array,0,self::CONTENT_FEED_MAX_SIZE);
+                    $feed_array = array_slice($feed_array, 0, self::CONTENT_FEED_MAX_SIZE);
                     // TODO implement
 
@@ -438 +450 @@
     }
 
-    private function collect_feed($result, $deleted_urls, &$feed_array, $type = 'feed', $date = false)
+    private function collect_feed($result, $deleted_urls, &$feed_array, $type = 'feed', $date = false, &$unseen_feeds)
     {
         $feeds = array();
@@ -448 +460 @@
             }
         }
-        
-        $blockWords = split(', ', trim(get_option('expresscurate_content_stop_keywords', '')));
+        $blockWords = preg_split('/[,]+/iu', trim(get_option('expresscurate_content_stop_keywords', '')));
         $blockWords = empty($blockWords) ? false : $blockWords;
-        
+
         foreach ($feeds as $story) {
+
             // get the post url
             $link = isset($story['link']) ? $story['link'] : $story['address'];
-            if(empty($link) || isset($deleted_urls[$link])) {
+            if (empty($link) || isset($deleted_urls[$link])) {
                 continue;
             }
@@ -479 +491 @@
 
             // check if this link is already in the feed
-            if(isset($feed_array[$link])) {
+            if (isset($feed_array[$link])) {
                 continue;
             }
 
-                $domain = parse_url($link);
-                if (preg_match('/(?P<subdomain>.<domain>[a-z0-9][a-z0-9\-]{1,63}\.[a-z\.]{2,6})$/i', $parsedLink['host'], $regs)) {
-                    $domain = $regs['domain'];
+            $domain = parse_url($link);
+            if (preg_match('/(?P<subdomain>.<domain>[a-z0-9][a-z0-9\-]{1,63}\.[a-z\.]{2,6})$/i', $parsedLink['host'], $regs)) {
+                $domain = $regs['domain'];
+            } else {
+                $domain = $domain['host'];
+            }
+
+            // download and analyze
+            $html_parser = new ExpressCurate_HtmlParser($link);
+            $link = $html_parser->getRealURL();
+            // check if the final page (initial or redirected address) is already in feed
+            if (isset($feed_array[$link])) {
+                continue;
+            }
+
+            if ($blockWords) {
+                $blocked = $html_parser->contains($blockWords);
+                if ($blocked) {
+                    continue;
+                }
+            }
+
+            $keywords = $html_parser->analyzeKeywords();
+            $media = $html_parser->containsMedia();
+
+            $publishDate = isset($story['publishedDate']) ? $story['publishedDate'] : $story['date'];
+            $expressCurateDate = new ExpressCurate_Date();
+            $publishDate = $expressCurateDate->dateWithTimeUtc(strtotime($publishDate));
+
+            $story_array = array(
+                'title' => str_replace("&quot;", "'", $story['title']),
+                'desc' => isset($story['contentSnippet']) ? str_replace("&quot;", "'", $story['contentSnippet']) : '',
+                'link' => $link,
+                'date' => $publishDate,
+                'domain' => $domain,
+                'author' => $story['author'],
+                'curated' => 0,
+                'keywords' => $keywords,
+                'media' => $media
+            );
+
+            if ($date) {
+                $starting_date = strtotime($date);
+                $story_date = strtotime($story_array['date']);
+                $diff = $story_date - $starting_date;
+            }
+            if (!$date || ($date && $diff >= 0)) {
+                if ($type = 'wall') {
+                    $story_array['type'] = $story['channel'];
                 } else {
-                    $domain = $domain['host'];
-                }
-
-                // download and analyze
-                $html_parser = new ExpressCurate_HtmlParser($link);
-                $link = $html_parser->getRealURL();
-                // check if the final page (initial or redirected address) is already in feed
-                if(isset($feed_array[$link])) {
-                    continue;
-                }
-
-                if($blockWords) {
-                    $blocked = $html_parser->contains($blockWords);
-                    if($blocked) {
-                        continue;
-                    }
-                }
-                
-                $keywords = $html_parser->analyzeKeywords();
-                $media = $html_parser->containsMedia();
-
-                $publishDate = isset($story['publishedDate']) ? $story['publishedDate'] : $story['date'];
-                $expressCurateDate = new ExpressCurate_Date();
-                $publishDate = $expressCurateDate->dateWithTimeUtc(strtotime($publishDate));
-
-                $story_array = array(
-                    'title' => str_replace("&quot;","'",$story['title']),
-                    'desc' => isset($story['contentSnippet']) ? str_replace("&quot;","'",$story['contentSnippet']) : '',
-                    'link' => $link,
-                    'date' => $publishDate,
-                    'domain' => $domain,
-                    'author' => $story['author'],
-                    'curated' => 0,
-                    'keywords' => $keywords,
-                    'media' => $media
-                );
-
-                if ($date) {
-                    $starting_date = strtotime($date);
-                    $story_date = strtotime($story_array['date']);
-                    $diff = $story_date - $starting_date;
-                }
-                if (!$date || ($date && $diff >= 0)) {
-                    if ($type = 'wall') {
-                        $story_array['type'] = $story['channel'];
-                    } else {
-                        $story_array['type'] = 'feed';
-                    }
-                    $feed_array[$link] = $story_array;
-                }
-        }
-    }
-
-    public function manual_pull_feed() {
+                    $story_array['type'] = 'feed';
+                }
+                $feed_array[$link] = $story_array;
+                $unseen_feeds++;
+            } else {
+                break;
+            }
+        }
+    }
+
+    public function manual_pull_feed()
+    {
         // get feed data
         $feeds = json_decode($this->get_feed_content(), true);
 
         // reschedule the cronjob
-        //if(!empty($feeds['content'])) {
         wp_clear_scheduled_hook('expresscurate_pull_feeds');
         $pull_feed_interval = (get_option('expresscurate_pull_hours_interval')) ? get_option('expresscurate_pull_hours_interval') : 1;
         wp_schedule_event(strtotime("+" . $pull_feed_interval . " hour"), 'hourly', 'expresscurate_pull_feeds');
         $feeds["minutes_to_next_pull"] = human_time_diff(wp_next_scheduled('expresscurate_pull_feeds'), time());
-        //}
-
-        // return
         echo json_encode($feeds);
         die;
@@ -563 +575 @@
     }
 
-    public function filter_feeds_by_date() {
+    public function filter_feeds_by_date()
+    {
         $data = $_REQUEST;
         $feed_content = json_decode(get_option('expresscurate_feed_content', ''), true);
         $filtered_feeds = array();
-        if(isset($data['date']) && !empty($feed_content['content'])){
-            foreach($feed_content['content'] as $link => $feed){
-                if((strtotime($feed['date']) - $data['date']) >= 0){
+        if (isset($data['date']) && !empty($feed_content['content'])) {
+            foreach ($feed_content['content'] as $link => $feed) {
+                if ((strtotime($feed['date']) - $data['date']) >= 0) {
                     $filtered_feeds[$link] = $feed;
                 }
@@ -582 +595 @@
         if (get_option('expresscurate_enable_content_alert') == 'on') {
             $expressCurateEmail = new ExpressCurate_Email();
-            
+
             $alertAddresses = trim(get_option('expresscurate_content_alert_users', ''));
-            if(!$expressCurateEmail->hasContentAlertRecipients()) {
+            if (!$expressCurateEmail->hasContentAlertRecipients()) {
                 return;
             }
-        
+
             $feed_content = json_decode(get_option('expresscurate_feed_content', ''), true);
 
@@ -622 +635 @@
             if ($feed_contents) {
                 $feed_contents = json_decode($feed_contents, true);
-                $exists_url = array();
-                foreach ($feed_contents['content'] as $content) {
+                //$exists_url = array();
+                /*foreach ($feed_contents['content'] as $content) {
                     $exists_url[] = $content['link'];
-                }
+                }*/
                 foreach ($items as $item) {
-                    if (in_array($item, $exists_url)) {
-                        $feed_content_deleted[$item] = $item;
-                        unset($feed_contents['content'][$item]);
+                    $item = json_decode(stripslashes($item), true);
+                    if (isset($feed_contents['content'][$item['link']])) {
+                        $feed_content_deleted[$item['link']] = $item;
+                        unset($feed_contents['content'][$item['link']]);
                     }
                 }
@@ -648 +662 @@
     }
 
+    public function remove_feed_archive_items()
+    {
+        $data = $_REQUEST;
+        if (isset($data['items'])) {
+            $items = $data['items'];
+            $result = array();
+            $feed_content_deleted = get_option('expresscurate_feed_content_deleted', '');
+            if ($feed_content_deleted) {
+                $feed_content_deleted = json_decode($feed_content_deleted, true);
+                foreach ($items as $item) {
+                    if (isset($feed_content_deleted[$item])) {
+                        unset($feed_content_deleted[$item]);
+                    }
+                }
+                $feed_content_deleted = json_encode($feed_content_deleted);
+                update_option('expresscurate_feed_content_deleted', $feed_content_deleted);
+
+                $result['status'] = 'success';
+            } else {
+                $result['status'] = 'warning';
+            }
+        } else {
+            $result['status'] = 'error';
+        }
+        echo json_encode($result);
+        die;
+    }
+
+    public function restore_deleted_items()
+    {
+        $data = $_REQUEST;
+        if (isset($data['items'])) {
+            $items = $data['items'];
+            $result = array();
+            $feed_contents = get_option('expresscurate_feed_content', '');
+            $feed_content_deleted = get_option('expresscurate_feed_content_deleted', '');
+            if ($feed_content_deleted) {
+                $feed_content_deleted = json_decode($feed_content_deleted, true);
+            }
+            if ($feed_contents) {
+                $feed_contents = json_decode($feed_contents, true);
+
+                foreach ($items as $item) {
+                    $item = json_decode(stripslashes($item), true);
+                    if (isset($feed_content_deleted[$item['link']])) {
+                        $item['date'] = date("Y-m-d H:i:s", time());
+                        $feed_contents['content'][$item['link']] = $item;
+                        unset($feed_content_deleted[$item['link']]);
+                    }
+                }
+                $feed_contents = array_slice($feed_contents, 0, self::CONTENT_FEED_MAX_SIZE);
+                $feed_contents = json_encode($feed_contents);
+                $feed_content_deleted = json_encode($feed_content_deleted);
+                update_option('expresscurate_feed_content', $feed_contents);
+                update_option('expresscurate_feed_content_deleted', $feed_content_deleted);
+
+                $result['status'] = 'success';
+            } else {
+                $result['status'] = 'warning';
+            }
+        } else {
+            $result['status'] = 'error';
+        }
+        echo json_encode($result);
+        die;
+    }
+
     public function add_bookmarks()
     {
@@ -653 +734 @@
         $data = $_REQUEST;
         if (isset($data['items'])) {
-            $items = json_decode(stripslashes($data['items']), true);
-
+            $items = $data['items'];
             $bookmarks = get_option('expresscurate_bookmarks', '');
             if ($bookmarks) {
@@ -663 +743 @@
 
             foreach ($items as $item) {
+                $item = json_decode(stripslashes($item), true);
                 $bookmarkURL = $item['link'];
                 if (isset($bookmarks[$bookmarkURL])) {
-                        $result[$bookmarkURL]['status'] = 'warning';
-                }else {
+                    $result[$bookmarkURL]['status'] = 'warning';
+                } else {
                     $current_user = wp_get_current_user();
                     $item['user'] = $current_user->display_name;
@@ -672 +753 @@
                     $this->collectBookmark($bookmarks, $item);
 
-                    $result[$bookmarkURL]['status'] = 'success';
+                    // $result[$bookmarkURL]['status'] = 'success';
                 }
             }
@@ -689 +770 @@
         $data = $_REQUEST;
         $result = array();
-        if(!ExpressCurate_HtmlParser::supportsDownload()) {
+        if (!ExpressCurate_HtmlParser::supportsDownload()) {
             $result['status'] = 'error';
             $result['msg'] = 'You should activate either curl extension or allow_url_fopen setting.';
@@ -788 +869 @@
     }
 
-    private function collectBookmark(&$bookmarks, $item, $url = null, $comment = '') {
+    private function collectBookmark(&$bookmarks, $item, $url = null, $comment = '')
+    {
         if ($url) {
             if (isset($item['result']) && isset($item['result']['title'])) {
@@ -849 +931 @@
             $result['msg'] = 'Url is empty';
         }
-        echo json_encode($result,JSON_UNESCAPED_SLASHES);
+        echo json_encode($result, JSON_UNESCAPED_SLASHES);
         die;
     }
@@ -862 +944 @@
             if ($bookmarks) {
                 $bookmarks = json_decode($bookmarks, true);
-                $exists_url = array();
-                foreach ($bookmarks as $bookmark) {
-                    $exists_url[] = $bookmark['link'];
-                }
+                /*                $exists_url = array();
+                                foreach ($bookmarks as $bookmark) {
+                                    $exists_url[] = $bookmark['link'];
+                                }*/
                 foreach ($items as $item) {
-                    if (in_array($item['link'], $exists_url)) {
+                    if (array_key_exists($item['link'], $bookmarks)) {
                         unset($bookmarks[$item['link']]);
                     }
@@ -915 +997 @@
                 $feeds = array();
             }
-            if(!empty($bookmarks)){
+            if (!empty($bookmarks)) {
                 $hayStack = array_merge($bookmarks, $feeds);
             }
         }
 
-        if(!empty($hayStack)){
+        if (!empty($hayStack)) {
             foreach ($hayStack as $content) {
                 if (mb_stripos($content['title'], $needle) != false) {
@@ -940 +1022 @@
             foreach ($bookmarks as $key => $bookmark) {
                 $date_array = date_parse($bookmark['bookmark_date']);
-                $bookmark_date = strtotime(date('Y-m-d', mktime(0,0,0,$date_array['month'], $date_array['day'], $date_array['year'])));
+                $bookmark_date = strtotime(date('Y-m-d', mktime(0, 0, 0, $date_array['month'], $date_array['day'], $date_array['year'])));
                 if ($bookmark_date >= $start && $bookmark_date <= $end) {
                     $count++;

expresscurate/trunk/ExpressCurate_HtmlParser.php

@@ -50 +50 @@
     {
         $safeMode = ini_get('safe_mode');
-        if($safeMode && version_compare(PHP_VERSION, '5.4.0') < 0) {
+        if(!empty($safeMode) && version_compare(PHP_VERSION, '5.4.0') < 0) {
             return false;
         } else {
@@ -247 +247 @@
             return;
         }
-        set_time_limit(0);
-        if (self::supportsAsynch()&& self::isNotSafeMode() && strlen(ini_get('open_basedir'))==0) {
-
+        $curlDownload = true;
+        if(!self::isNotSafeMode()){
+            $curlDownload = false;
+        } else if(strlen(ini_get('open_basedir'))!=0){
+            $curlDownload = false;
+        } else if(self::supportsAsynch())   {
+            $curlDownload = true;
+        } else {
+            $curlDownload = false;
+        }
+
+        if ($curlDownload) {
+            ini_set('max_execution_time',0);
             // setup the single curl
             $ch = $this->createCURL($this->url);
@@ -258 +268 @@
             curl_close($ch);
         } else {
+            set_time_limit(0);
             $header = '';
             if ($this->referer) {
@@ -352 +363 @@
             }
         }
-
         // save and return
         $this->data = $content;

expresscurate/trunk/ExpressCurate_Sitemap.php

@@ -9 +9 @@
   License URI: http://www.gnu.org/licenses/gpl.html
  */
- 
+
 class ExpressCurate_Sitemap
 {
@@ -15 +15 @@
     private static $instance;
 
-    function __construct() {
+    function __construct()
+    {
         // action shall be added from actions controller
     }
 
-    public static function getInstance() {
-        if ( ! ( self::$instance instanceof self ) ) {
+    public static function getInstance()
+    {
+        if (!(self::$instance instanceof self)) {
             self::$instance = new self();
         }
@@ -27 +29 @@
     }
 
-    public function generateSitemapScheduled(){
+    public function generateSitemapScheduled()
+    {
         $intervalInDays = null;
         //$lastGenerationDate = 0;
-        switch(get_option('expresscurate_sitemap_generation_interval')) {
-            case 'daily': $intervalInDays = 1;
-                break;
-            case 'weekly': $intervalInDays = 7;
-                break;
-            case 'monthly': $intervalInDays = 30;
+        switch (get_option('expresscurate_sitemap_generation_interval')) {
+            case 'daily':
+                $intervalInDays = 1;
+                break;
+            case 'weekly':
+                $intervalInDays = 7;
+                break;
+            case 'monthly':
+                $intervalInDays = 30;
         };
 
@@ -42 +48 @@
         }
         $lastGenerationDate = get_option('expresscurate_sitemap_generation_last_date');
-        if (floor(date('Y-m-d H:i:s') - strtotime($lastGenerationDate)/(60*60*24) ) >= $intervalInDays) {
+        if (floor(date('Y-m-d H:i:s') - strtotime($lastGenerationDate) / (60 * 60 * 24)) >= $intervalInDays) {
             $this->generateSitemap();
         }
     }
 
-    public function pushSitemapScheduled(){
+    public function pushSitemapScheduled()
+    {
         $intervalInDays = null;
         $lastGenerationDate = 0;
-        switch(get_option('expresscurate_sitemap_submit_frequency')) {
-            case 'daily': $intervalInDays = 1;
-                break;
-            case 'weekly': $intervalInDays = 7;
-                break;
-            case 'monthly': $intervalInDays = 30;
+        switch (get_option('expresscurate_sitemap_submit_frequency')) {
+            case 'daily':
+                $intervalInDays = 1;
+                break;
+            case 'weekly':
+                $intervalInDays = 7;
+                break;
+            case 'monthly':
+                $intervalInDays = 30;
         };
 
@@ -62 +72 @@
         }
         $lastGenerationDate = get_option('expresscurate_sitemap_submit_lastDate');
-        if (floor(date('Y-m-d H:i:s') - strtotime($lastGenerationDate)/(60*60*24) ) >= $intervalInDays) {
+        if (floor(date('Y-m-d H:i:s') - strtotime($lastGenerationDate) / (60 * 60 * 24)) >= $intervalInDays) {
             $this->submitToGoogle();
         }
@@ -71 +81 @@
         $homePath = get_home_path();
         $sitemmapPath = $homePath . 'sitemap.xml';
-        $expresscurateSitemapUpdatePermission = get_option('expresscurate_sitemap_update_permission',false);
-        if($expresscurateSitemapUpdatePermission !='seen' && $expresscurateSitemapUpdatePermission != 'error') {
-            if (is_writable($sitemmapPath)) {
+        $expresscurateSitemapUpdatePermission = get_option('expresscurate_sitemap_update_permission', false);
+        if ($expresscurateSitemapUpdatePermission != 'seen' && $expresscurateSitemapUpdatePermission != 'error') {
+            $file = fopen($sitemmapPath, 'w');
+            if ($file) {
                 $header = '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">';
                 $body = '';
-                $footer = '</urlset>';
+                $footer = '
+                            </urlset>';
 
                 $posts_and_pages = array();
@@ -101 +113 @@
                         }
                         $lastMod = gmdate('Y-m-d', strtotime($item['modified']));
-                        $body .= '<url>
-                            <loc>' . get_permalink($item['ID']) . '</loc>
-                            <lastmod>' . $lastMod . '</lastmod>
-                            <changefreq>' . $changeFrequency . '</changefreq>
-                            <priority>' . $priority . '</priority>
-                          </url>';
+                        $body .= '
+                                  <url>
+                                        <loc>' . get_permalink($item['ID']) . '</loc>
+                                        <lastmod>' . $lastMod . '</lastmod>
+                                        <changefreq>' . $changeFrequency . '</changefreq>
+                                        <priority>' . $priority . '</priority>
+                                  </url>';
 
                     }
 
                 }
-                $path = get_home_path();
-
-                $file = fopen($path . 'sitemap.xml', 'w');
-                if ($file) {
-                    fwrite($file, $header . $body . $footer);
-                    fclose($file);
-                    $this->addToRobots();
-                    update_option('expresscurate_sitemap_generation_last_date', date('Y-m-d H:i:s'));
-                    return true;
-                }
+                fwrite($file, $header . $body . $footer);
+                fclose($file);
+                $this->addToRobots();
+                update_option('expresscurate_sitemap_generation_last_date', date('Y-m-d H:i:s'));
+                return true;
             }
         }
@@ -127 +135 @@
     }
 
-    public function isExists(){
+    public function isExists()
+    {
         $path = get_home_path();
         $file = file_exists($path . 'sitemap.xml');
-        if($file){
+        if ($file) {
             return true;
         }
@@ -136 +145 @@
     }
 
-    public function saveSitemapGoogleStatus() {
+    public function saveSitemapGoogleStatus()
+    {
         $data = $_REQUEST;
         $status = $data['status'];
-        if($status == 'off'){
+        if ($status == 'off') {
             update_option('expresscurate_google_refresh_token', '');
         }
@@ -153 +163 @@
             $response = $googleAuth->accessToken();
             if ($response) {
-                $response = $googleAuth->submitSitemap(get_site_url(), get_site_url() . '/sitemap.xml');
-                echo json_encode($response);
-                die;
+                $sitemapDomain = get_option('expresscurate_sitemap_domain', '');
+                $response = $googleAuth->submitSitemap(strlen($sitemapDomain) > 2 ? $sitemapDomain : get_site_url(), get_site_url() . '/sitemap.xml');
             } else {
-                $response = array('status'=> 3,'message' => 'ExpressCurate shall be authorized to access to Google Search Console (aka Webmaster Tools).');
+                $response = array('status' => 3, 'message' => 'ExpressCurate shall be authorized to access to Google Search Console (aka Webmaster Tools).');
             }
-       }
-    }
-
-    public function errorMessage(){
+            echo json_encode($response);
+            die;
+        }
+    }
+
+    public function errorMessage()
+    {
         $homeUrl = get_site_url();
         $sitemmapPath = $homeUrl . '/sitemap.xml';
         $message = '<div class="update-nag">';
-        $message .=  '
+        $message .= '
                           ExpressCurate tries to generate sitemap but it was not able to write sitemap. Please, grant write access to file
-                    <p style="text-indent: 20px;font-weight: bolder">'.$sitemmapPath.'</p>
-                    <a class="expresscurateLink"  href="'.$homeUrl.'/wp-admin/admin.php?page=expresscurate_settings"  > Sitemap settings</a>
+                    <p style="text-indent: 20px;font-weight: bolder">' . $sitemmapPath . '</p>
+                    <a class="expresscurateLink"  href="' . $homeUrl . '/wp-admin/admin.php?page=expresscurate_settings"  > Sitemap settings</a>
                     ';
         $message .= '</div>';
@@ -175 +187 @@
     }
 
-    public function set_permission_status() {
+    public function set_permission_status()
+    {
         $status = $_REQUEST['status'];
         update_option('expresscurate_sitemap_update_permission', $status);
-        $result = array('status'=>'success');
-        echo json_encode($result);die;
-    }
-
-    public function getSitemapFrequencyTagArray(){
-        return array('always'=>'Always',
-            'hourly'=>'Hourly',
-            'daily'=>'Daily',
-            'weekly'=>'Weekly',
-            'monthly'=>'Monthly',
-            'yearly'=>'Yearly',
-            'never'=>'Never'
+        $result = array('status' => 'success');
+        echo json_encode($result);
+        die;
+    }
+
+    public function getSitemapFrequencyTagArray()
+    {
+        return array('always' => 'Always',
+            'hourly' => 'Hourly',
+            'daily' => 'Daily',
+            'weekly' => 'Weekly',
+            'monthly' => 'Monthly',
+            'yearly' => 'Yearly',
+            'never' => 'Never'
         );
     }
 
-    private function addToRobots(){
+    private function addToRobots()
+    {
         $path = get_home_path();
-        $file = fopen($path.'robots.txt','w');
-        fwrite($file,'Sitemap: '.get_site_url().'/sitemap.xml');
+        $file = fopen($path . 'robots.txt', 'w');
+        fwrite($file, 'Sitemap: ' . get_site_url() . '/sitemap.xml');
         fclose($file);
     }

expresscurate/trunk/ExpressCurate_SocialManager.php

@@ -23 +23 @@
     const PROFILE = 'profile_ids';
     const MESSAGE = 'message';
+    const PERMALINK = 'permalink';
 
     private static $instance;
@@ -115 +116 @@
         $allMessages = array();
         foreach ($messages as $messageId => $message) {
-            /*if (!isset($message[self::MESSAGE_ID])) {
-                $messageId = uniqid('', true);
-                $message[self::MESSAGE_ID] = $messageId;
-            }*/
-
-            $messageId=$message[self::MESSAGE_ID];
+            $messageId = $message[self::MESSAGE_ID];
             if (isset($message[self::APPROVED]) && $message[self::APPROVED] === true) {
                 $approved[$messageId] = $message;
@@ -133 +129 @@
         update_post_meta($post_id, self::SOCIAL_APPROVED_POST_MESSAGES_META, $approved);
         update_post_meta($post_id, self::SOCIAL_POST_MESSAGES_META, $allMessages);
-        update_post_meta($post_id, self::SOCIAL_POST_COUNTER, count($approved)+count($publishedPostMessages));
+        update_post_meta($post_id, self::SOCIAL_POST_COUNTER, count($approved) + count($publishedPostMessages));
     }
 
@@ -146 +142 @@
         foreach ($approvedPostMessages as $messageId => $message) {
             $data = array();
+            if(isset($message[self::PERMALINK])) {
+                $permalink = $message[self::PERMALINK];
+            }
             $data[ExpressCurate_BufferClient::POST_FIELD_TEXT] = $message[self::MESSAGE] . $permalink;
             $data[ExpressCurate_BufferClient::POST_FIELD_PROFILE] = $message[self::PROFILE];

expresscurate/trunk/css/expresscurate.css

@@ -3052 +3052 @@
 .expresscurate_cat[type=radio]:checked + label:after,
 .expresscurate_post_type[type=radio]:checked + label:after {
-    background: url("../images/feed_icons.svg") no-repeat -79px -24px;
+    background: url("../images/feed_icons.svg") no-repeat -72px -24px;
     background-size: auto 68px;
     visibility: visible;
@@ -3830 +3830 @@
             background-size: 13px auto;
             background-position: 150px -17px;
-            padding: 0px 20px 0 5px;
+            padding: 0 20px 0 5px;
         }
             .expresscurate_controls select option.expresscurate_filterOption{
@@ -3850 +3850 @@
             background-color: transparent;
             background-size: 50px auto;
-            margin: 0 10px 0 0;
+            margin: 0 5px 0 0;
             cursor: pointer !important;
         }
@@ -3866 +3866 @@
                 background-color: transparent;
                 background-size: auto 100px;
-                background-position: -104px -35px;
+                background-position: -100px -35px;
                 cursor: pointer;
                 border: solid 1px #25bfa1;
             }
+.confirm_post_title{
+    padding: 5px 0;
+    color: #303030;
+    font-size: 16px;
+    display: inline-block;
+    font-family: OpenSans-Regular, Verdana, Geneva, sans-serif;
+}
+
+.expresscurate_controls li.restore {
+    border-right: none;
+}
+.expresscurate_controls li.deletedFeedsPage{
+    display: inline-block;
+    height: 30px;
+    margin: 0;
+    background: none;
+    background-repeat: no-repeat;
+    background-size: auto 82px;
+    cursor: default;
+    position: relative;
+    border: solid 1px #dddddd;
+}
+.expresscurate_confirmbox .ui-dialog-buttonset button{
+    border-radius: 3px;
+    font-size: 14px;
+    text-align: center;
+    height: 35px;
+    margin-left: 10px;
+    cursor: pointer;
+    border: 1px solid #27cfae;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+.expresscurate_confirmbox .ui-dialog-buttonset button.expresscurate_confirm{
+    background: #27cfae;
+    color: #ffffff;
+}
+.expresscurate_confirmbox .ui-dialog-buttonset button.expresscurate_cancel {
+    background-color: #F7FFFD;
+    color: #0A0A0A;
+}
+.expresscurate_confirmbox .expresscurate_dialog{
+    min-height: 55px !important;
+}
+.expresscurate_confirmbox .expresscurate_dialog  p.dialog_text{
+    width: 93%;
+    margin: 1.4em auto;
+
+}
+.expresscurate_confirmbox .ui-dialog-buttonpane {
+    padding: 10px 16px;
+}
+
 .expresscurate_controls .check.disabled{
     background-position: -104px 6px;
@@ -3876 +3929 @@
 }
 .expresscurate_controls .check.active{
-    background-position: -104px -75px;
+    background-position: -100px -75px;
     background-color: #1cbb9f;
 }
@@ -3891 +3944 @@
 }
 .expresscurate_controls .remove{
-    background-position: -52px 7px;
     border-left: none;
 }
+.expresscurate_controls li.removePermanently{
+    background-position: -46px 7px;
+    border-left: none;
+}
+.expresscurate_controls li.removePermanently.active{
+    background-position: -46px -26px;
+}
+.expresscurate_controls li.removePermanently.active:hover{
+    background-position: -46px -59px;
+    background-color: #1cbb9f;
+    border-color: #1cbb9f;
+}
+.expresscurate_controls li.restore{
+    background-size: auto 100px;
+    background-position: -206px 4px;
+}
+.expresscurate_controls li.restore.active{
+    background-position: -206px -35px;
+}
+.expresscurate_controls li.restore.active:hover{
+    background-position: -206px -74px;
+    background-color: #1cbb9f;
+    border-color: #1cbb9f;
+}
+.expresscurate_controls li.linkToDeletedPosts{
+    background-position: -174px -35px;
+    background-size: auto 100px;
+    margin: 0 5px 0 0;
+    border-color: #1cbb9f;
+    cursor: pointer;
+}
+.expresscurate_controls li.linkToDeletedPosts:hover{
+    background-position: -172px -74px;
+    background-color: #1cbb9f;
+}
+
 
             .expresscurate_controls .quotes{
@@ -3899 +3987 @@
             }
             .expresscurate_controls .bookmark{
-                background-position: -15px 7px;
+                background-position: -14px 7px;
             }
             .expresscurate_controls .remove{
-                background-position: -50px 8px;
+                background-position: -46px 8px;
             }
             .expresscurate_feed_list .feedListControls .pull.disabled:hover,
@@ -3910 +3998 @@
             .expresscurate_feed_list .feedListControls .pull{
                 /*background-position: -144px 6px;*/
-                background-size: auto 99px;
+                background-size: auto 101px;
                 margin-right: 10px;
             }
@@ -3980 +4068 @@
             }
             .expresscurate_controls .quotes.active:hover{
-                background-position: 19px -59px;
+                background-position: 19px -57px;
                 background-color: #1cbb9f;
                 border-color: #1cbb9f;
             }
             .expresscurate_controls .bookmark.active:hover{
-                background-position: -15px -60px;
+                background-position: -14px -58px;
                 background-color: #1cbb9f;
                 border-color: #1cbb9f;
             }
             .expresscurate_controls .remove.active:hover{
-                background-position: -50px -59px;
+                background-position: -46px -57px;
                 background-color: #1cbb9f;
                 border-color: #1cbb9f;
             }
             .expresscurate_feed_list .feedListControls .pull:hover{
-                background-position: -144px -74px;
+                background-position: -142px -74px;
                 background-color: #1cbb9f;
             }
@@ -4003 +4091 @@
             }
             .expresscurate_controls .bookmark.active{
-                background-position: -15px -26px;
+                background-position: -14px -26px;
             }
             .expresscurate_controls .remove.active{
-                background-position: -50px -25px;
+                background-position: -46px -25px;
             }
             .expresscurate_feed_list .feedListControls .pull{
-                background-position: -144px -33px;
+                background-position: -142px -33px;
                 border-color: #1cbb9f;
             }
@@ -4146 +4234 @@
     border-bottom-color: #000;
     border-width: 5px;
+}
+
+.expresscurate_controls li.linkToDeletedPosts  .tooltip:before{
+    left: 70px
+}
+.expresscurate_controls li.linkToDeletedPosts  .tooltip{
+    width: 130px;
+    left: -55px;
 }
 
@@ -4220 +4316 @@
         .expresscurate_bookmarkBoxes .checkInput[type=checkbox]:checked + label,
         .expresscurate_feedBoxes .checkInput[type=checkbox]:checked + label{
-            background: url("../images/feed_icons.svg") no-repeat -86px 1px;
-            background-size: auto 72px;
+            background: url("../images/feed_icons.svg") no-repeat -75px -3px;
+            background-size: auto 73px;
         }
         .expresscurate_bookmarkBoxes li input[type=checkbox],
@@ -5465 +5561 @@
 .expresscurate_SettingsError{
     font-size: 11px;
+    line-height: 13px;
     color: #e85e50;
     margin: 0;

expresscurate/trunk/css/theme-styles.css

@@ -74 +74 @@
     overflow: hidden;
     background-color:#F3F3F3;
-    word-break: break-all;
     text-align:justify;
     color: #A39E9E;
+    word-break: break-word;
 }
 .expresscurate_fl_text_box , .expresscurate_fr_text_box{

expresscurate/trunk/images/feed_icons.svg

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generator: Adobe Illustrator 19.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     width="782.447px" height="440.846px" viewBox="0 0 782.447 440.846" enable-background="new 0 0 782.447 440.846"
-     xml:space="preserve">
+     viewBox="500 -175.8 1089.8 440.8" style="enable-background:new 500 -175.8 1089.8 440.8;" xml:space="preserve">
+<style type="text/css">
+    .st0{fill:#23B99E;}
+    .st1{fill:#FFFFFF;}
+    .st2{fill:#B5B6B6;}
+    .st3{fill:#B4B4B5;}
+    .st4{fill:#20B89D;}
+    .st5{fill:#B3B3B4;}
+</style>
 <g>
-    <g>
-        <g>
-            <path fill="#B5B6B6" d="M42.204,5.059h32.79v31.68c0,0,1.258,30.607-32.54,39.045V62.112c0,0,16.9-4.048,19.321-24.364H42.204
-                V5.059z"/>
-            <path fill="#B5B6B6" d="M0,5.059h32.79v31.68c0,0,1.262,30.607-32.538,39.045V62.112c0,0,16.899-4.048,19.321-24.364H0V5.059z"/>
-        </g>
-        <polygon id="star-2-icon_5_" fill="#B5B6B6" points="217.502,0 230.496,26.804 260.002,30.879 238.527,51.518 243.768,80.841 
-            217.502,66.793 191.235,80.841 196.479,51.518 175.002,30.879 204.508,26.804      "/>
-        <polygon id="plus-2-icon_5_" fill="#B5B6B6" points="435.001,64.118 411.307,40.422 435.001,16.724 421.197,2.921 397.502,26.618 
-            373.805,2.921 360.004,16.724 383.698,40.422 360.004,64.118 373.805,77.921 397.502,54.225 421.197,77.921         "/>
-        <polygon id="check-mark-icon_2_" fill="#B5B6B6" points="604.207,9.81 566.936,47.083 550.79,30.935 538.817,42.91 
-            566.936,71.035 616.188,21.78        "/>
-        <g>
-            <path fill="#23B99E" d="M42.205,185.062h32.79v31.68c0,0,1.258,30.606-32.54,39.045v-13.671c0,0,16.9-4.049,19.321-24.364H42.205
-                V185.062z"/>
-            <path fill="#23B99E" d="M0.001,185.062h32.79v31.68c0,0,1.262,30.606-32.538,39.045v-13.671c0,0,16.899-4.049,19.321-24.364
-                H0.001V185.062z"/>
-        </g>
-        <polygon id="star-2-icon_2_" fill="#23B99E" points="217.503,180.003 230.497,206.807 260.003,210.882 238.528,231.521 
-            243.769,260.844 217.503,246.796 191.236,260.844 196.479,231.521 175.003,210.882 204.509,206.807         "/>
-        <polygon id="plus-2-icon_2_" fill="#23B99E" points="435.002,244.121 411.308,220.425 435.002,196.727 421.198,182.924 
-            397.503,206.621 373.806,182.924 360.005,196.727 383.699,220.425 360.005,244.121 373.806,257.924 397.503,234.228 
-            421.198,257.924         "/>
-        <polygon id="check-mark-icon_3_" fill="#23B99E" points="604.208,189.813 566.936,227.085 550.791,210.938 538.818,222.913 
-            566.936,251.038 616.188,201.783         "/>
-        <g>
-            <path fill="#FFFFFF" d="M42.205,365.063h32.79v31.68c0,0,1.258,30.606-32.54,39.045v-13.671c0,0,16.9-4.049,19.321-24.364H42.205
-                V365.063z"/>
-            <path fill="#FFFFFF" d="M0.001,365.063h32.79v31.68c0,0,1.262,30.606-32.538,39.045v-13.671c0,0,16.899-4.049,19.321-24.364
-                H0.001V365.063z"/>
-        </g>
-        <polygon id="star-2-icon_7_" fill="#FFFFFF" points="217.503,360.004 230.497,386.81 260.003,390.883 238.528,411.521 
-            243.769,440.846 217.503,426.797 191.236,440.846 196.479,411.521 175.003,390.883 204.509,386.81      "/>
-        <polygon id="plus-2-icon_7_" fill="#FFFFFF" points="435.002,424.124 411.308,400.426 435.002,376.729 421.198,362.926 
-            397.503,386.623 373.806,362.926 360.005,376.729 383.699,400.426 360.005,424.124 373.806,437.926 397.503,414.23 
-            421.198,437.926         "/>
-        <polygon id="check-mark-icon_5_" fill="#FFFFFF" points="604.208,369.815 566.936,407.087 550.791,390.94 538.818,402.915 
-            566.936,431.04 616.188,381.785      "/>
-    </g>
-    <path fill="#B4B4B5" d="M771.418,27.365c0-9.069,1.785-14.295,9.413-16.757c-5.917-2.493-36.867-8.496-36.867,19.76
-        c0,9.49,0,17.368,0,17.368h-11.027l24.755,24.797l24.756-24.797h-11.029C771.418,47.736,771.418,35.292,771.418,27.365z"/>
-    <path fill="#20B89D" d="M771.418,207.368c0-9.069,1.785-14.295,9.413-16.757c-5.917-2.493-36.867-8.496-36.867,19.76
-        c0,9.49,0,17.368,0,17.368h-11.027l24.755,24.798l24.756-24.798h-11.029C771.418,227.739,771.418,215.295,771.418,207.368z"/>
-    <path fill="#FFFFFF" d="M771.418,387.37c0-9.069,1.785-14.295,9.413-16.757c-5.917-2.493-36.867-8.496-36.867,19.76
-        c0,9.49,0,17.368,0,17.368h-11.027l24.755,24.798l24.756-24.798h-11.029C771.418,407.741,771.418,395.297,771.418,387.37z"/>
+    <path class="st0" d="M542.1,9.2h32.8v31.7c0,0,1.3,30.6-32.5,39V66.3c0,0,16.9-4,19.3-24.4h-19.6V9.2L542.1,9.2z"/>
+    <path class="st0" d="M499.9,9.2h32.8v31.7c0,0,1.3,30.6-32.5,39V66.3c0,0,16.9-4,19.3-24.4h-19.6V9.2z"/>
+</g>
+<polygon id="star-2-icon_2_" class="st0" points="717.4,4.2 730.4,31 759.9,35 738.4,55.7 743.7,85 717.4,70.9 691.1,85 696.4,55.7 
+    674.9,35 704.4,31 "/>
+<polygon id="plus-2-icon_2_" class="st0" points="934.9,68.3 911.2,44.6 934.9,20.9 921.1,7.1 897.4,30.8 873.7,7.1 859.9,20.9 
+    883.6,44.6 859.9,68.3 873.7,82.1 897.4,58.4 921.1,82.1 "/>
+<polygon id="check-mark-icon_3_" class="st0" points="1104.1,14 1066.8,51.2 1050.7,35.1 1038.7,47.1 1066.8,75.2 1116.1,25.9 "/>
+<g>
+    <path class="st1" d="M542.1,189.2h32.8v31.7c0,0,1.3,30.6-32.5,39v-13.7c0,0,16.9-4,19.3-24.4h-19.6V189.2L542.1,189.2z"/>
+    <path class="st1" d="M499.9,189.2h32.8v31.7c0,0,1.3,30.6-32.5,39v-13.7c0,0,16.9-4,19.3-24.4h-19.6V189.2z"/>
+</g>
+<polygon id="star-2-icon_7_" class="st1" points="717.4,184.2 730.4,211 759.9,215 738.4,235.7 743.7,265 717.4,251 691.1,265 
+    696.4,235.7 674.9,215 704.4,211 "/>
+<polygon id="plus-2-icon_7_" class="st1" points="934.9,248.3 911.2,224.6 934.9,200.9 921.1,187.1 897.4,210.8 873.7,187.1 
+    859.9,200.9 883.6,224.6 859.9,248.3 873.7,262.1 897.4,238.4 921.1,262.1 "/>
+<polygon id="check-mark-icon_5_" class="st1" points="1104.1,194 1066.8,231.2 1050.7,215.1 1038.7,227.1 1066.8,255.2 
+    1116.1,205.9 "/>
+<g>
+    <path class="st2" d="M542.1-170.8h32.8v31.7c0,0,1.3,30.6-32.5,39v-13.7c0,0,16.9-4,19.3-24.4h-19.6V-170.8L542.1-170.8z"/>
+    <path class="st2" d="M499.9-170.8h32.8v31.7c0,0,1.3,30.6-32.5,39v-13.7c0,0,16.9-4,19.3-24.4h-19.6V-170.8z"/>
+</g>
+<polygon id="star-2-icon_5_" class="st2" points="717.4,-175.8 730.4,-149 759.9,-145 738.4,-124.3 743.7,-95 717.4,-109.1 
+    691.1,-95 696.4,-124.3 674.9,-145 704.4,-149 "/>
+<polygon id="plus-2-icon_5_" class="st2" points="934.9,-111.7 911.2,-135.4 934.9,-159.1 921.1,-172.9 897.4,-149.2 873.7,-172.9 
+    859.9,-159.1 883.6,-135.4 859.9,-111.7 873.7,-97.9 897.4,-121.6 921.1,-97.9 "/>
+<polygon id="check-mark-icon_2_" class="st2" points="1104.1,-166 1066.8,-128.8 1050.7,-144.9 1038.7,-132.9 1066.8,-104.8 
+    1116.1,-154.1 "/>
+<path class="st3" d="M1271.3-148.5c0-9.1,1.8-14.3,9.4-16.8c-5.9-2.5-36.9-8.5-36.9,19.8c0,9.5,0,17.4,0,17.4h-11l24.8,24.8
+    l24.8-24.8h-11C1271.3-128.1,1271.3-140.6,1271.3-148.5z"/>
+<path class="st4" d="M1271.3,31.5c0-9.1,1.8-14.3,9.4-16.8c-5.9-2.5-36.9-8.5-36.9,19.8c0,9.5,0,17.4,0,17.4h-11l24.8,24.8
+    l24.8-24.8h-11C1271.3,51.9,1271.3,39.4,1271.3,31.5z"/>
+<path class="st1" d="M1271.3,211.5c0-9.1,1.8-14.3,9.4-16.8c-5.9-2.5-36.9-8.5-36.9,19.8c0,9.5,0,17.4,0,17.4h-11l24.8,24.8
+    l24.8-24.8h-11C1271.3,231.9,1271.3,219.5,1271.3,211.5z"/>
+<g>
+    <path class="st5" d="M1569.1-113h-33.2v-33.2h19.4l9-9h-37.4v51.2h51.2v-37.4l-9,9V-113z"/>
+    <path class="st5" d="M1589.5-166.6c-0.2-0.2-0.5-0.3-0.8-0.3l-24.9,4.3c-0.3,0.1-0.6,0.3-0.7,0.6c-0.1,0.3,0,0.7,0.2,1l5.9,5.9
+        l-15.1,15.1c-0.4,0.4-0.4,1,0,1.3l7.5,7.5c0.2,0.2,0.4,0.3,0.7,0.3s0.5-0.1,0.7-0.3l15.1-15.1l5.9,5.9c0.3,0.3,0.6,0.3,1,0.2
+        c0.3-0.1,0.6-0.4,0.6-0.7l4.3-24.9C1589.8-166,1589.7-166.3,1589.5-166.6z"/>
+</g>
+<g>
+    <path class="st4" d="M1569.1,67h-33.2V33.8h19.4l9-9h-36.4c-0.5,0-0.9,0.4-0.9,0.9V75c0,0.5,0.4,0.9,0.9,0.9h49.3
+        c0.5,0,0.9-0.4,0.9-0.9V38.6l-9,9V67L1569.1,67z"/>
+    <path class="st4" d="M1589.5,13.4c-0.2-0.2-0.5-0.3-0.8-0.3l-24.9,4.3c-0.3,0.1-0.6,0.3-0.7,0.6c-0.1,0.3,0,0.7,0.2,1l5.9,5.9
+        L1554.1,40c-0.4,0.4-0.4,1,0,1.3l7.5,7.5c0.2,0.2,0.4,0.3,0.7,0.3s0.5-0.1,0.7-0.3l15.1-15.1l5.9,5.9c0.3,0.3,0.6,0.3,1,0.2
+        c0.3-0.1,0.6-0.4,0.6-0.7l4.3-24.9C1589.8,14,1589.7,13.7,1589.5,13.4z"/>
+</g>
+<g>
+    <path class="st1" d="M1569.1,247h-33.2v-33.2h19.4l9-9h-36.4c-0.5,0-0.9,0.4-0.9,0.9V255c0,0.5,0.4,0.9,0.9,0.9h49.3
+        c0.5,0,0.9-0.4,0.9-0.9v-36.4l-9,9V247L1569.1,247z"/>
+    <path class="st1" d="M1589.5,193.4c-0.2-0.2-0.5-0.3-0.8-0.3l-24.9,4.3c-0.3,0.1-0.6,0.3-0.7,0.6c-0.1,0.3,0,0.7,0.2,1l5.9,5.9
+        l-15.1,15.1c-0.4,0.4-0.4,1,0,1.3l7.5,7.5c0.2,0.2,0.4,0.3,0.7,0.3s0.5-0.1,0.7-0.3l15.1-15.1l5.9,5.9c0.3,0.3,0.6,0.3,1,0.2
+        c0.3-0.1,0.6-0.4,0.6-0.7l4.3-24.9C1589.8,194,1589.7,193.7,1589.5,193.4z"/>
+</g>
+<g>
+    <rect x="1380.9" y="-144.2" class="st5" width="51.1" height="40.5"/>
+    <rect x="1374.6" y="-167.2" class="st5" width="63.8" height="14.2"/>
+</g>
+<g>
+    <rect x="1380.9" y="35.8" class="st4" width="51.1" height="40.5"/>
+    <rect x="1374.6" y="12.8" class="st4" width="63.8" height="14.2"/>
+</g>
+<g>
+    <rect x="1380.9" y="215.8" class="st1" width="51.1" height="40.5"/>
+    <rect x="1374.6" y="192.8" class="st1" width="63.8" height="14.2"/>
 </g>
 </svg>

expresscurate/trunk/js/Settings.js

@@ -217 +217 @@
                 } else {
                     className = 'expresscurate_SettingsError';
+                    var webmasterResponse = data.message.message;
+                    message = webmasterResponse ? webmasterResponse : data.message;
                     if (data.status === 1) {
-                        message = data.message;
                         $autorize.removeClass('expresscurate_displayNone');
-                    } else if (data.status === 2 || data.status === 3) {
-                        message = data.message;
                     }
                 }

expresscurate/trunk/js/bookmarks.js

@@ -143 +143 @@
     }
 
+    function openDeleteBookmark(items,itemChoose){
+        var $deleteDialog = $("#expresscurate_delete_dialog");
+        $deleteDialog.dialog({
+            'dialogClass': 'wp-dialog expresscurate_confirmbox',
+            'modal': true,
+            'autoOpen': false,
+            'closeOnEscape': true,
+            'width': '500px',
+            'height': 'auto',
+            'resizable': false,
+            'buttons': {
+                'Confirm': function () {
+                    bookmarkDelete(items);
+                    $(this).dialog("close");
+                },
+                'Cancel': function () {
+                    $(this).dialog("close");
+                }
+            },
+            'open' : function(){
+                var text = "";
+                if(itemChoose == "clicked"){
+                    var title = $(items).find('a.postTitle').text();
+                    text = "<p class='dialog_text'>" +
+                                "This bookmark will be deleted: " +
+                                "<span class='confirm_post_title'>"+title+"</span>"
+                            "</p>";
+                }
+                else if(items.length == 1 && itemChoose == "checked"){
+                    text = "<p class='dialog_text'>1 bookmark will be deleted</p>";
+                }else if (items.length > 1) {
+                    text = "<p class='dialog_text'>"+items.length+" bookmarks will be deleted</p>";
+                }
+                $(this).html(text);
+                $('.ui-dialog-buttonpane').find('button:contains("Cancel")').addClass('expresscurate_cancel');
+                $('.ui-dialog-buttonpane').find('button:contains("Confirm")').addClass('expresscurate_confirm');
+            }
+        });
+        $deleteDialog.dialog('open');
+    }
+
     function setupBookmarks() {
         $input = $('.addBookmark input');
@@ -252 +293 @@
         });
 
-        /*delete*/
+        //delete bookmark
         $('.expresscurate_bookmarks .remove').on('click', function () {
-            var $checked = $bookmarkBoxes.find('li input:checkbox:checked');
-            bookmarkDelete($checked.parents('.expresscurate_bookmarkBoxes > li'));
+            var $checked = $bookmarkBoxes.find('li input:checkbox:checked').parents('.expresscurate_bookmarkBoxes > li');
+            openDeleteBookmark($checked,"checked");
         });
         $bookmarkBoxes.on('click', '.controls .hide', function () {
             var $elem = $(this).parents('.expresscurate_bookmarkBoxes > li');
-            bookmarkDelete($elem);
-        });
-
+            openDeleteBookmark($elem,"clicked");
+            //bookmarkDelete($elem);
+        });
         /*add*/
+
         $input.on("keyup", function (e) {
             if (e.keyCode === 13) {

expresscurate/trunk/js/feed/contentFeed.js

@@ -1 +1 @@
 var ExpressCurateFeedWall = (function ($) {
-    var $notDefFeed, $feedControls, $masonryWrap, $feedBoxes;
+    var $notDefFeed, $feedControls, $masonryWrap, $feedBoxes, $deleteDialog, $removeDialog, $restoreDialog;
 
     function bookmarkAdd(els) {
@@ -8 +8 @@
 
         $.each(els, function (index, el) {
-            items.push(JSON.parse($(el).find('.expresscurate_feedData').text()));
+            items.push($(el).find('.expresscurate_feedData').text());
         });
         $.ajax({
             type: 'POST',
             url: 'admin-ajax.php?action=expresscurate_bookmarks_add',
-            data: {items: JSON.stringify(items)}
+            data: {items: items}
         });
     }
@@ -45 +45 @@
         ExpressCurateUtils.track('/content-feed/delete');
 
-        var items = [];
-
+        var items = [],
+            page = location.search.replace('?page=',''),
+            url,
+            item;
+        if(page == "expresscurate_content_feed_archive"){
+            url = 'admin-ajax.php?action=expresscurate_remove_feed_archive_items';
+        } else if(page == "expresscurate_feed_list"){
+            url = 'admin-ajax.php?action=expresscurate_delete_feed_content_items';
+        }
         $.each(els, function (index, el) {
-            var item = $(el).find('a.postTitle').data('link');
+            if(page == "expresscurate_content_feed_archive"){
+                item = $(el).find('a.postTitle').data('link');
+            } else { item = $(el).find('textarea').val(); }
             items.push(item);
         });
         $.ajax({
             type: 'POST',
-            url: 'admin-ajax.php?action=expresscurate_delete_feed_content_items',
+            url: url,
+            data: {items: items}
+        }).done(function (res) {
+            var data = $.parseJSON(res);
+
+            if (data.status === 'success') {
+                $(els).addClass('expresscurate_transparent');
+                setTimeout(function () {
+                    $(els).remove();
+                    $masonryWrap.masonry();
+                    ExpressCurateUtils.checkControls($feedControls);
+                    ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
+                }, 700);
+            }
+        });
+    }
+
+    function restoreFeedItems(els) {
+        ExpressCurateUtils.track('/content-feed/restore');
+
+        var items = [];
+
+        $.each(els, function (index, el) {
+            var item = $(el).find('textarea').val();
+            items.push(item);
+        });
+        $.ajax({
+            type: 'POST',
+            url: 'admin-ajax.php?action=expresscurate_restore_deleted_items',
             data: {items: items}
         }).done(function (res) {
@@ -145 +182 @@
     }
 
+    // Confirm dialog for feeds' permanent remove
+    /*function openRemoveConfirm(items,itemChoose){
+        var $removeDialog = $("#expresscurate_remove_dialog");
+        $removeDialog.dialog({
+            'dialogClass': 'wp-dialog expresscurate_confirmbox',
+            'modal': true,
+            'autoOpen': false,
+            'closeOnEscape': true,
+            'width': '500px',
+            'height': 'auto',
+            'resizable': false,
+            'buttons': {
+                'Confirm': function () {
+                    deleteFeedItems(items, true);
+                    ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
+                    $(this).dialog("close");
+                },
+                'Cancel': function () {
+                    $(this).dialog("close");
+                }
+            },
+            'open' : function(){
+                var text = "";
+                if(itemChoose == "clicked"){
+                    var title = $(items).find('a.postTitle').text();
+                    text = "<p class='dialog_text'>" +
+                                "This post will be deleted permanently: " +
+                                 "<span class='confirm_post_title'>"+title+"</span>"
+                            "</p>";
+                }
+                else if(items.length == 1 && itemChoose == "checked"){
+                    text = "<p class='dialog_text'>1 post will be deleted permanently?</p>";
+                }else if (items.length > 1) {
+                    text = " <p class='dialog_text'>"+items.length+" posts will be deleted permanently</p>";
+                }
+                $(this).html(text);
+                $('.ui-dialog-buttonpane').find('button:contains("Cancel")').addClass('expresscurate_cancel');
+                $('.ui-dialog-buttonpane').find('button:contains("Confirm")').addClass('expresscurate_confirm');
+            }
+        });
+        $removeDialog.dialog('open');
+    }
+    // Restore feeds confirm dialog
+    function openRestoreConfirm(items,itemChoose){
+        var $restoreDialog = $("#expresscurate_restore_dialog");
+        $restoreDialog.dialog({
+            'dialogClass': 'wp-dialog expresscurate_confirmbox',
+            'modal': true,
+            'autoOpen': false,
+            'closeOnEscape': true,
+            'width': '500px',
+            'height': 'auto',
+            'resizable': false,
+            'buttons': {
+                'Confirm': function () {
+                    restoreFeedItems(items);
+                    ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
+                    $(this).dialog("close");
+                },
+                'Cancel': function () {
+                    $(this).dialog("close");
+                }
+            },
+            'open' : function(){
+                var text = "";
+                if(itemChoose == "clicked"){
+                    var title = $(items).find('a.postTitle').text();
+                    text = "<p class='dialog_text'>" +
+                                "This post will be restored: " +
+                                "<span class='confirm_post_title'>"+title+"</span>"+
+                           "</p>";
+                }
+                else if(items.length == 1 && itemChoose == "checked"){
+                    text = "<p class='dialog_text'>1 post will be restored</p>";
+                }else if (items.length > 1) {
+                    text = "<p class='dialog_text'>"+items.length+" posts will be restored</p>";
+                }
+                $(this).html(text);
+                $('.ui-dialog-buttonpane').find('button:contains("Cancel")').addClass('expresscurate_cancel');
+                $('.ui-dialog-buttonpane').find('button:contains("Confirm")').addClass('expresscurate_confirm');
+            }
+        });
+        $restoreDialog.dialog('open');
+    }*/
+    // Delete feeds(from content feed) confirm dialog
+    function openDeleteConfirm(items,itemChoose){
+        var $deleteDialog = $("#expresscurate_delete_dialog");
+        $deleteDialog.dialog({
+            'dialogClass': 'wp-dialog expresscurate_confirmbox',
+            'modal': true,
+            'autoOpen': false,
+            'closeOnEscape': true,
+            'width': '500px',
+            'height': 'auto',
+            'resizable': false,
+            'buttons': {
+                'Confirm': function () {
+                    deleteFeedItems(items);
+                    ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
+                    $(this).dialog("close");
+                },
+                'Cancel': function () {
+                    $(this).dialog("close");
+                }
+            },
+            'open' : function(){
+                var text = "";
+                if(itemChoose == "clicked"){
+                    var title = $(items).find('a.postTitle').text();
+                    text = "<p class='dialog_text'>" +
+                                "This post will be deleted: " +
+                                "<span class='confirm_post_title'>"+title+"</span>"
+                            "</p>";
+                }
+                else if(items.length == 1 && itemChoose == "checked"){
+                    text = "<p class='dialog_text'>1 post will be deleted</p>";
+                }else if (items.length > 1) {
+                    text = "<p class='dialog_text'>"+items.length+" posts will be deleted</p>";
+                }
+                $(this).html(text);
+                $('.ui-dialog-buttonpane').find('button:contains("Cancel")').addClass('expresscurate_cancel');
+                $('.ui-dialog-buttonpane').find('button:contains("Confirm")').addClass('expresscurate_confirm');
+            }
+        });
+        $deleteDialog.dialog('open');
+    }
+
     function setupFeed() {
         var $blogFilter = $('#expresscurate_blogFilter'),
@@ -151 +315 @@
         $feedControls = $('.feedListControls li');
         $masonryWrap = $('.expresscurate_masonryWrap');
-        $feedBoxes = $('.expresscurate_feedBoxes');
+        $feedBoxes = $('.expresscurate_feedBoxes'),
+        $removeDialog = $("#expresscurate_remove_dialog");
+        $restoreDialog = $("#expresscurate_restore_dialog");
+        $deleteDialog = $("#expresscurate_delete_dialog");
         $masonryWrap.masonry({
             itemSelector: '.expresscurate_masonryItem',
@@ -187 +354 @@
         /*delete*/
         $('.expresscurate_feed_list .remove').on('click', function () {
-            var $checked = $feedBoxes.find('li input:checkbox:checked');
-            deleteFeedItems($checked.parents('.expresscurate_feedBoxes > li'));
-            ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
-
+            var $checked = $feedBoxes.find('li input:checkbox:checked').parents('.expresscurate_feedBoxes > li');
+            openDeleteConfirm($checked,"checked");
         });
         $feedBoxes.on('click', '.controls .hide', function () {
-            var $elem = $(this).parents('.expresscurate_feedBoxes > li');
-            deleteFeedItems($elem);
-            ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
+             var $checked = $(this).parents('.expresscurate_feedBoxes > li');
+            openDeleteConfirm($checked,"clicked");
         });
 
@@ -214 +378 @@
             bookmarkAdd($elems);
             deleteFeedItems($elems);
+        });
+
+        $feedBoxes.on('click', '.permanent_remove', function () {
+            var $elem = $(this).parents('.expresscurate_feedBoxes > li');
+            //openRemoveConfirm($elem,"clicked");
+            deleteFeedItems($elem);
+            ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
+        });
+        // confirm feeds' permanent delete
+        $('.expresscurate_feed_list').on('click','.controlsWrap .removePermanently.active', function () {
+            var elems = $feedBoxes.find('input:checkbox:checked').parent();
+            //openRemoveConfirm(elems,"checked");
+            deleteFeedItems(elems, true);
+            ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
+        });
+        // restore feeds
+        $('.expresscurate_feed_list').on('click','.controlsWrap .restore.active', function () {
+            var elems = $feedBoxes.find('input:checkbox:checked').parent();
+            //openRestoreConfirm(items,"checked");
+            restoreFeedItems(elems);
+            ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
+        });
+
+        $feedBoxes.on('click', '.controls .restore', function () {
+            var $elem = $(this).parents('.expresscurate_feedBoxes > li');
+            //openRestoreConfirm($elem,"clicked");
+            restoreFeedItems($elem);
+            ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
         });
 

expresscurate/trunk/js/socialPostWidget.js

@@ -151 +151 @@
 
         if ($metaTag.length) {
-            var savedPosts = $metaTag.val();
-            var data = (savedPosts.length > 1) ? $.parseJSON(savedPosts) : [];
+            var savedPosts = $.parseJSON($metaTag.val());
+            var data = (savedPosts.length > 1) ? savedPosts : [];
             $.each(data, function (index, value) {
                 posts.push(value);

expresscurate/trunk/readme.txt

@@ -4 +4 @@
 Donate link: https://bit.ly/expresscuratedonate
 Requires at least: 3.9
-Tested up to: 4.2.2
-Stable tag: 2.1.3
+Tested up to: 4.3.1
+Stable tag: 2.1.4
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl.html
@@ -132 +132 @@
 == Changelog ==
 
+= 2.1.4 =
+* Wordpress 4.3 supported now.
+* Miscellaneous bug fixes and improvements.
+
 = 2.1.3 =
 * Welcome to ExpressCurate! widget with useful getting started links and resources.

expresscurate/trunk/templates/bookmarks.php

@@ -119 +119 @@
                         </li>
                         <li class="separator">-</li>
-                        <li class="share">Share </li>
-                        <li class="separator">-</li>
+                        <?php
+                            if (get_option('expresscurate_social_publishing', '') == "on" && strlen(get_option('expresscurate_buffer_access_token')) > 2) {
+                        ?>
+                            <li class="share">Share </li>
+                            <li class="separator">-</li>
+                        <?php } ?>
                         <li class="copyURL">Copy URL</li>
                         <li class="separator">-</li>
@@ -168 +172 @@
                 <li><a class="curate" href="post-new.php?expresscurate_load_source={{data.curateLink}}">Curate</a></li>
                 <li class="separator">-</li>
-                <li class="share">Share</li>
-                <li class="separator">-</li>
+                <?php
+                    if (get_option('expresscurate_social_publishing', '') == "on" && strlen(get_option('expresscurate_buffer_access_token')) > 2) {
+                ?>
+                    <li class="share">Share </li>
+                    <li class="separator">-</li>
+                <?php } ?>
                 <li class="copyURL">Copy URL</li>
                 <li class="separator">-</li>

expresscurate/trunk/templates/dashboard/welcome_widget.php

@@ -3 +3 @@
         <p>Here are a couple of useful links to help you get started:</p>
         <ul>
-            <li><a href="http://www.expresscurate.com/p/guide/configure-rss-feed" target="_blank">Bring in your RSS feeds</a> to get a content creation starting point</li>
-            <li><a href="http://www.expresscurate.com/p/guide/post-from-feed" target="_blank">Curate an article</a> using URLs</li>
-            <li><a href="http://www.expresscurate.com/p/guide/define-keyword" target="_blank">Add keywords</a> and see how they are optimized</li>
-            <li><a href="http://www.expresscurate.com/p/guide/post-enhancement" target="_blank">Enable SEO</a> to start using ExpressCurate SEO features</li>
+            <li><a href="http://www.expresscurate.com/p/guide/getting-started/configure-rss-feed" target="_blank">Bring in your RSS feeds</a> to get a content creation starting point</li>
+            <li><a href="http://www.expresscurate.com/p/guide/getting-started/post-from-feed" target="_blank">Curate an article</a> using URLs</li>
+            <li><a href="http://www.expresscurate.com/p/guide/getting-started/define-keyword" target="_blank">Add keywords</a> and see how they are optimized</li>
+            <li><a href="http://www.expresscurate.com/p/guide/getting-started/post-enhancement" target="_blank">Enable SEO</a> to start using ExpressCurate SEO features</li>
         </ul>
     </div>

expresscurate/trunk/templates/feed_dashboard.php

@@ -2 +2 @@
 $feedManager = new ExpressCurate_FeedManager();
 $feed_list = $feedManager->get_rss_list();
+$nextPullTime = human_time_diff(time(),wp_next_scheduled('expresscurate_pull_feeds'));
 ?>
 

expresscurate/trunk/templates/feed_list.php

@@ -39 +39 @@
 }
 
-$nextPullTime = human_time_diff(wp_next_scheduled('expresscurate_pull_feeds'), time());
+$nextPullTime = human_time_diff(time(),wp_next_scheduled('expresscurate_pull_feeds'));
 ?>
 <input id="adminUrl" type="hidden" value="<?php echo get_admin_url(); ?>"/>
@@ -96 +96 @@
                     </li>
                 <?php } ?>
+                <br class="second"/>
+                <a href="?page=expresscurate_content_feed_archive">
+                    <li class="linkToDeletedPosts expresscurate_floatRight">
+                        <span class="tooltip">Content Feed Archive</span>
+                    </li>
+                </a>
+                <br class="second"/>
                 <li class="layout expresscurate_floatRight">
                     <span class="tooltip"><?php if (get_option('expresscurate_bookmark_layout', '') == 'single') {
@@ -165 +172 @@
                     </li>
                     <li class="separator">-</li>
-                    <li class="share">Share</li>
-                    <li class="separator">-</li>
+                    <?php
+                        if (get_option('expresscurate_social_publishing', '') == "on" && strlen(get_option('expresscurate_buffer_access_token')) > 2) {
+                    ?>
+                        <li class="share">Share </li>
+                        <li class="separator">-</li>
+                    <?php } ?>
                     <li class="bookmark">Bookmark</li>
                     <li class="separator">-</li>

expresscurate/trunk/templates/settings.php

@@ -180 +180 @@
                                        echo '';
                                    }
-                                   ?>" name="expresscurate_publisher_twitter" placeholder="@publisher_handle"/>
+                                   ?>" name="expresscurate_publisher_twitter" /><!--placeholder="@publisher_handle"-->
+
+                            <br/>
+                            <label for="expresscurate_publisher_facebook" class="title">Publisher (Facebook)<span
+                                    class="description  ">You can link content you publish on this blog to your company or personal Facebook profile.
+                <a href="https://plus.google.com/authorship" target="_blank">More Info</a>.</label></span>
+
+                            <input class="controls" type="text" id="expresscurate_publisher_facebook" size="50"
+                                   value="<?php
+                                   if (get_option('expresscurate_publisher_facebook')) {
+                                       echo get_option('expresscurate_publisher_facebook');
+                                   } else {
+                                       echo '';
+                                   }
+                                   ?>" name="expresscurate_publisher_facebook" placeholder=""/>
                         </div>
                     </li>

expresscurate/trunk/templates/sitemap.php

@@ -1 +1 @@
 <h2 class="expresscurate_displayNone">Sitemap.xml</h2>
 <form class="expresscurate_marginTop20" method="post" action="options.php">
-<?php @settings_fields('expresscurate-sitemap-group'); ?>
-<?php @do_settings_fields('expresscurate-sitemap-group'); ?>
-
-<?php //do_settings_sections('expresscurate');?>
+    <?php @settings_fields('expresscurate-sitemap-group'); ?>
+    <?php @do_settings_fields('expresscurate-sitemap-group'); ?>
+
+    <?php //do_settings_sections('expresscurate');?>
 
     <ul>
-<li>
-    <div class="title submitSitemapWrap">
-            <a class="generate <?php if (strlen(get_option('expresscurate_google_refresh_token')) < 3) {echo 'expresscurate_displayNone'; }else {echo 'generated';}?>"  id="submitSiteMap" href="#">Submit Sitemap<span class="loading"></span></a>
+        <li>
+            <div class="title submitSitemapWrap">
+                <a class="generate <?php if (strlen(get_option('expresscurate_google_refresh_token')) < 3) {
+                    echo 'expresscurate_displayNone';
+                } else {
+                    echo 'generated';
+                } ?>" id="submitSiteMap" href="#">Submit Sitemap<span class="loading"></span></a>
+            </div>
+            <a class="generate" id="generateSiteMap" href="#">Generate Sitemap</a>
+        </li>
+        <br/>
+        <li>
+            <p class="title">Sitemap update frequency<span
+                    class="description ">How often should the sitemap be updated?</span></p>
+            <select class="controls" name="expresscurate_sitemap_generation_interval">
+                <option value="always" <?php
+                if (get_option('expresscurate_sitemap_generation_interval') == 'always') {
+                    echo 'selected="selected"';
+                }
+                ?>>On every Post
+                </option>
+                <option value="daily" <?php
+                if (get_option('expresscurate_sitemap_generation_interval') == 'daily') {
+                    echo 'selected="selected"';
+                }
+                ?>>Daily
+                </option>
+                <option value="weekly" <?php
+                if (get_option('expresscurate_sitemap_generation_interval') == 'weekly') {
+                    echo 'selected="selected"';
+                }
+                ?>>Weekly
+                </option>
+                <option value="monthly" <?php
+                if (get_option('expresscurate_sitemap_generation_interval') == 'monthly') {
+                    echo 'selected="selected"';
+                }
+                ?>>Monthly
+                </option>
+            </select>
+        </li>
+
+        <li>
+            <p class="title">Include all new posts in sitemap?<span class="description ">All new posts will be included in your sitemap if this option is enabled</span>
+            </p>
+            <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_sitemap_include_new_posts"
+                   name="expresscurate_sitemap_include_new_posts" <?php if (get_option('expresscurate_sitemap_include_new_posts') == 'on') echo 'checked'; ?>>
+            <label class="controls checkboxLabel" for="expresscurate_sitemap_include_new_posts"></label>
+        </li>
+        <li>
+            <p class="title">Include all new pages in sitemap?<span class="description ">All new pages will be included in your sitemap if this option is enabled</span>
+            </p>
+            <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_sitemap_include_new_pages"
+                   name="expresscurate_sitemap_include_new_pages" <?php if (get_option('expresscurate_sitemap_include_new_pages') == 'on') echo 'checked'; ?>>
+            <label class="controls checkboxLabel" for="expresscurate_sitemap_include_new_pages"></label>
+        </li>
+        <!--<li>-->
+        <!--    <p class="title">New entry default priority<span class="description ">Please select the priority of new pages and posts in the sitemap</span></p>-->
+        <!--    <select class="controls" name="expresscurate_sitemap_default_priority">-->
+        <!--        <option value="manual" --><?php
+        //        if (get_option('expresscurate_sitemap_default_priority') == 'manual') {
+        //            echo 'selected="selected"';
+        //        }
+        //        ?>
+        <!--manual-->
+        <!--        </option>-->
+        <!---->
+        <!--        <option value="automatic" --><?php
+        //        if (get_option('expresscurate_sitemap_default_priority') == 'automatic') {
+        //            echo 'selected="selected"';
+        //        }
+        //        ?>
+        <!--automatic-->
+        <!--        </option>-->
+        <!--    </select>-->
+        <!--</li>-->
+        <?php
+        $sitemap = new ExpressCurate_Sitemap();
+        $sitemapFrequencyArray = $sitemap->getSitemapFrequencyTagArray();
+        $priority = (get_option('expresscurate_sitemap_priority_manual_value')) ? get_option('expresscurate_sitemap_priority_manual_value') : "0.8";
+        $frequency = (get_option('expresscurate_sitemap_default_changefreq')) ? get_option('expresscurate_sitemap_default_changefreq') : "never";
+        ?>
+        <li>
+            <p class="title">Sitemap manual priority value<span class="description ">Please select the priority for new posts in your sitemap</span>
+            </p>
+            <select class="controls" id="expresscurate_sitemap_priority_manual_value"
+                    name="expresscurate_sitemap_priority_manual_value">
+                <?php for ($i = 0.1; $i <= 1; $i = $i + 0.1) {
+                    echo '<option value="' . $i . '" ';
+                    if ((string)$i == $priority) {
+                        echo ' selected="selected"';
+                    }
+                    echo '>' . $i . '</option>';
+                } ?>
+            </select>
+        </li>
+        <li>
+            <p class="title">Sitemap default changefreq<span class="description ">Please select the sitemap changefreq value for your new posts</span>
+            </p>
+            <select class="controls" name="expresscurate_sitemap_default_changefreq">
+                <?php foreach ($sitemapFrequencyArray as $key => $val) {
+                    echo '<option value="' . $key . '"';
+                    if ($key == $frequency) {
+                        echo ' selected="selected"';
+                    }
+                    echo '>' . $val . '</option>';
+                } ?>
+            </select>
+        </li>
+        <li>
+            <p class="title">Sitemap archiving frequency<span class="description ">Please select the frequency of archiving old post definitions in the sitemap</span>
+            </p>
+            <select class="controls" name="expresscurate_sitemap_archiving">
+                <option value="week" <?php
+                if (get_option('expresscurate_sitemap_archiving') == 'week') {
+                    echo 'selected="selected"';
+                }
+                ?>>1 week
+                </option>
+
+                <option value="month" <?php
+                if (get_option('expresscurate_sitemap_archiving') == 'month') {
+                    echo 'selected="selected"';
+                }
+                ?>>1 month
+                </option>
+
+                <option value="year" <?php
+                if (get_option('expresscurate_sitemap_archiving') == 'year') {
+                    echo 'selected="selected"';
+                }
+                ?>>1 year
+                </option>
+            </select>
+        </li>
+        <li class="expresscurate_sitemap_webmasters">
+            <p class="title">Submit sitemap automatically?<span class="description ">If this option is enabled, sitemap will be submitted to webmaster tools of search engines automatically.</span>
+            </p>
+            <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_sitemap_submit"
+                   name="expresscurate_sitemap_submit" <?php if (get_option('expresscurate_sitemap_submit') == 'on') echo 'checked'; ?>/>
+            <label class="controls checkboxLabel" for="expresscurate_sitemap_submit"></label>
+        </li>
+
+        <li>
+            <div class="sitemapUpdateFrequency <?php if (get_option('expresscurate_sitemap_submit') != 'on') {
+                echo 'expresscurate_displayNone';
+            } ?> />">
+                <p class="title">Registered domain in Google Search Console (aka Webmaster Tools)<span
+                        class="description">Specify if different from blog address</span></p>
+                <input class="controls" type="text" name="expresscurate_sitemap_domain" id="expresscurate_sitemap_domain"
+                       value="<?php echo get_option('expresscurate_sitemap_domain',''); ?>" placeholder="<?php echo get_site_url(); ?>">
+                <br>
+                <p class="title">Sitemap submission frequency<span class="description ">How often should sitemap be submitted to search engines?</span>
+                </p>
+                <select class="controls" name="expresscurate_sitemap_submit_frequency">
+                    <option value="always" <?php
+                    if (get_option('expresscurate_sitemap_submit_frequency') == 'always') {
+                        echo 'selected="selected"';
+                    }
+                    ?>>On every Post
+                    </option>
+                    <option value="daily" <?php
+                    if (get_option('expresscurate_sitemap_submit_frequency') == 'daily') {
+                        echo 'selected="selected"';
+                    }
+                    ?>>Daily
+                    </option>
+                    <option value="weekly" <?php
+                    if (get_option('expresscurate_sitemap_submit_frequency') == 'weekly') {
+                        echo 'selected="selected"';
+                    }
+                    ?>>Weekly
+                    </option>
+                    <option value="monthly" <?php
+                    if (get_option('expresscurate_sitemap_submit_frequency') == 'monthly') {
+                        echo 'selected="selected"';
+                    }
+                    ?>>Monthly
+                    </option>
+                </select>
+                <?php
+                $blogName = urlencode(urlencode(get_bloginfo('url')));
+                ?>
+                <a class="getApiKey  <?php if (strlen(get_option('expresscurate_google_refresh_token')) > 2) {
+                    echo 'expresscurate_displayNone';
+                } ?>"
+                   href="https://www.expresscurate.com/api/connector/google/webmasters/refreshtoken/<?= $blogName ?>">Authorize
+                    access to Google Search Console (aka Webmaster Tools)</a>
+            </div>
+        </li>
+    </ul>
+    <div class="centerSave">
+        <?php @submit_button(); ?>
     </div>
-        <a class="generate" id="generateSiteMap" href="#">Generate Sitemap</a>
-</li>
-<br/>
-<li>
-    <p class="title">Sitemap update frequency<span class="description ">How often should the sitemap be updated?</span></p>
-    <select class="controls" name="expresscurate_sitemap_generation_interval">
-        <option value="always" <?php
-        if (get_option('expresscurate_sitemap_generation_interval') == 'always') {
-            echo 'selected="selected"';
-        }
-        ?>>On every Post
-        </option>
-        <option value="daily" <?php
-        if (get_option('expresscurate_sitemap_generation_interval') == 'daily') {
-            echo 'selected="selected"';
-        }
-        ?>>Daily
-        </option>
-        <option value="weekly" <?php
-        if (get_option('expresscurate_sitemap_generation_interval') == 'weekly') {
-            echo 'selected="selected"';
-        }
-        ?>>Weekly
-        </option>
-        <option value="monthly" <?php
-        if (get_option('expresscurate_sitemap_generation_interval') == 'monthly') {
-            echo 'selected="selected"';
-        }
-        ?>>Monthly
-        </option>
-    </select>
-</li>
-
-<li>
-    <p class="title">Include all new posts in sitemap?<span class="description ">All new posts will be included in your sitemap if this option is enabled</span></p>
-    <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_sitemap_include_new_posts"
-           name="expresscurate_sitemap_include_new_posts" <?php if (get_option('expresscurate_sitemap_include_new_posts') == 'on') echo 'checked'; ?>>
-    <label class="controls checkboxLabel" for="expresscurate_sitemap_include_new_posts"></label>
-</li>
-<li>
-    <p class="title">Include all new pages in sitemap?<span class="description ">All new pages will be included in your sitemap if this option is enabled</span></p>
-    <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_sitemap_include_new_pages"
-           name="expresscurate_sitemap_include_new_pages" <?php if (get_option('expresscurate_sitemap_include_new_pages') == 'on') echo 'checked'; ?>>
-    <label class="controls checkboxLabel" for="expresscurate_sitemap_include_new_pages"></label>
-</li>
-<!--<li>-->
-<!--    <p class="title">New entry default priority<span class="description ">Please select the priority of new pages and posts in the sitemap</span></p>-->
-<!--    <select class="controls" name="expresscurate_sitemap_default_priority">-->
-<!--        <option value="manual" --><?php
-//        if (get_option('expresscurate_sitemap_default_priority') == 'manual') {
-//            echo 'selected="selected"';
-//        }
-//        ?>
-<!--manual-->
-<!--        </option>-->
-<!---->
-<!--        <option value="automatic" --><?php
-//        if (get_option('expresscurate_sitemap_default_priority') == 'automatic') {
-//            echo 'selected="selected"';
-//        }
-//        ?>
-<!--automatic-->
-<!--        </option>-->
-<!--    </select>-->
-<!--</li>-->
-<?php
-    $sitemap = new ExpressCurate_Sitemap();
-    $sitemapFrequencyArray =$sitemap->getSitemapFrequencyTagArray();
-    $priority = (get_option('expresscurate_sitemap_priority_manual_value'))?get_option('expresscurate_sitemap_priority_manual_value'):"0.8";
-    $frequency = (get_option('expresscurate_sitemap_default_changefreq'))?get_option('expresscurate_sitemap_default_changefreq'):"never";
-?>
-<li>
-    <p class="title">Sitemap manual priority value<span class="description ">Please select the priority for new posts in your sitemap</span></p>
-    <select class="controls" id="expresscurate_sitemap_priority_manual_value" name="expresscurate_sitemap_priority_manual_value">
-        <?php for($i=0.1; $i<=1; $i=$i+0.1) {
-            echo '<option value="'.$i.'" ';
-            if ((string)$i == $priority) {
-                echo ' selected="selected"';
-            }
-            echo '>'.$i.'</option>';
-        }?>
-    </select>
-</li>
-<li>
-    <p class="title">Sitemap default changefreq<span class="description ">Please select the sitemap changefreq value for your new posts</span></p>
-    <select class="controls" name="expresscurate_sitemap_default_changefreq">
-            <?php foreach($sitemapFrequencyArray as $key=>$val) {
-                echo '<option value="' . $key . '"';
-                if ($key == $frequency) {
-                    echo ' selected="selected"';
-                }
-                echo '>' . $val . '</option>';
-            }?>
-    </select>
-</li>
-<li>
-    <p class="title">Sitemap archiving frequency<span class="description ">Please select the frequency of archiving old post definitions in the sitemap</span></p>
-    <select class="controls" name="expresscurate_sitemap_archiving">
-        <option value="week" <?php
-        if (get_option('expresscurate_sitemap_archiving') == 'week') {
-            echo 'selected="selected"';
-        }
-        ?>>1 week
-        </option>
-
-        <option value="month" <?php
-        if (get_option('expresscurate_sitemap_archiving') == 'month') {
-            echo 'selected="selected"';
-        }
-        ?>>1 month
-        </option>
-
-        <option value="year" <?php
-        if (get_option('expresscurate_sitemap_archiving') == 'year') {
-            echo 'selected="selected"';
-        }
-        ?>>1 year
-        </option>
-    </select>
-</li>
-<li class="expresscurate_sitemap_webmasters">
-    <p class="title">Submit sitemap automatically?<span class="description ">If this option is enabled, sitemap will be submitted to webmaster tools of search engines automatically.</span></p>
-    <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_sitemap_submit"
-           name="expresscurate_sitemap_submit" <?php if (get_option('expresscurate_sitemap_submit') == 'on') echo 'checked'; ?>/>
-    <label class="controls checkboxLabel" for="expresscurate_sitemap_submit"></label>
-</li>
-<li>
-    <div class="sitemapUpdateFrequency <?php if (get_option('expresscurate_sitemap_submit') != 'on') { echo 'expresscurate_displayNone';}?> />">
-        <p class="title">Sitemap submission frequency<span class="description ">How often should sitemap be submitted to search engines?</span></p>
-        <select class="controls" name="expresscurate_sitemap_submit_frequency">
-            <option value="always" <?php
-            if (get_option('expresscurate_sitemap_submit_frequency') == 'always') {
-                echo 'selected="selected"';
-            }
-            ?>>On every Post
-            </option>
-            <option value="daily" <?php
-            if (get_option('expresscurate_sitemap_submit_frequency') == 'daily') {
-                echo 'selected="selected"';
-            }
-            ?>>Daily
-            </option>
-            <option value="weekly" <?php
-            if (get_option('expresscurate_sitemap_submit_frequency') == 'weekly') {
-                echo 'selected="selected"';
-            }
-            ?>>Weekly
-            </option>
-            <option value="monthly" <?php
-            if (get_option('expresscurate_sitemap_submit_frequency') == 'monthly') {
-                echo 'selected="selected"';
-            }
-            ?>>Monthly
-            </option>
-        </select>
-        <?php
-        $blogName = urlencode(urlencode(get_bloginfo('url')));
-        ?>
-            <a class="getApiKey  <?php if (strlen(get_option('expresscurate_google_refresh_token')) > 2) {echo 'expresscurate_displayNone';}?>" href="https://www.expresscurate.com/api/connector/google/webmasters/refreshtoken/<?=$blogName?>">Authorize access to Google Search Console (aka Webmaster Tools)</a>
-    </div>
-</li>
-</ul>
-<div class="centerSave">
-    <?php @submit_button(); ?>
-</div>
 </form>