Changeset 1137344

Timestamp:

04/17/2015 04:24:10 PM (11 years ago)

Author:

expresscurate

Message:

new version v2.0.11 with changes:

• New Setting: Open Original Article Link in a New Window/Tab.
• Next Content Feed update time now available.
• Pull the Content Feed manually feature now available.
• Other miscellaneous bug fixes and improvements.

Location:

expresscurate/trunk

Files:

• ExpressCurate.php (modified) (1 diff)
• ExpressCurate_API.php (modified) (1 diff)
• ExpressCurate_Actions.php (modified) (8 diffs)
• ExpressCurate_AjaxExportAPI.php (modified) (3 diffs)
• ExpressCurate_ContentManager.php (modified) (2 diffs)
• ExpressCurate_CronManager.php (modified) (1 diff)
• ExpressCurate_Date.php (modified) (1 diff)
• ExpressCurate_Email.php (modified) (2 diffs)
• ExpressCurate_FeedManager.php (modified) (17 diffs)
• ExpressCurate_GoogleAuth.php (modified) (1 diff)
• ExpressCurate_HtmlParser.php (modified) (3 diffs)
• ExpressCurate_Keywords.php (modified) (1 diff)
• ExpressCurate_Sitemap.php (modified) (1 diff)
• ExpressCurate_Tags.php (modified) (2 diffs)
• autoload.php (modified) (1 diff)
• css/dialog-style-3.9.css (modified) (8 diffs)
• css/expresscurate.css (modified) (16 diffs)
• js/Dialog.js (modified) (17 diffs)
• js/Utils.js (modified) (2 diffs)
• js/feed/contentFeed.js (modified) (2 diffs)
• js/keywords/SEOControlCenter.js (modified) (3 diffs)
• js/sourceCollection.js (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• templates/advanced_seo_widget.php (modified) (1 diff)
• templates/bookmarks.php (modified) (2 diffs)
• templates/dashboard.php (modified) (1 diff)
• templates/dialog.php (modified) (4 diffs)
• templates/feed_dashboard.php (modified) (3 diffs)
• templates/feed_list.php (modified) (7 diffs)
• templates/keywords.php (modified) (1 diff)
• templates/news.php (modified) (1 diff)
• templates/settings.php (modified) (4 diffs)
• templates/websites.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.0.10
+  Version: 2.0.11
   Author: ExpressCurate
   Author URI: http://www.expresscurate.com

expresscurate/trunk/ExpressCurate_API.php

@@ -4 +4 @@
 
 /*
- * Returnes source urls of all posts if $post_id is not defined
- * @param int $post_id 
- * @return array
+  Author: ExpressCurate
+  Author URI: http://www.expresscurate.com
+  License: GPLv3 or later
+  License URI: http://www.gnu.org/licenses/gpl.html
  */
 

expresscurate/trunk/ExpressCurate_Actions.php

@@ -1 +1 @@
 <?php
+
+require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
+
 /*
   Author: ExpressCurate
@@ -6 +9 @@
   License URI: http://www.gnu.org/licenses/gpl.html
  */
-require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
-
 
 class ExpressCurate_Actions
@@ -75 +76 @@
         add_action('manage_posts_custom_column', array(&$this, 'curated_column_display'), 10, 2);
         add_filter('manage_edit-post_sortable_columns', array(&$this, 'curated_column_register_sortable'));
-
 
         add_filter('request', array(&$this, 'curated_column_orderby'));
@@ -137 +137 @@
         add_action('wp_ajax_expresscurate_save_sitemap_google_status', array(&$this->sitemap, 'saveSitemapGoogleStatus'));
 
-
         add_action('wp_ajax_expresscurate_feed_add', array($this->feedManager, 'add_feed'));
         add_action('wp_ajax_expresscurate_feed_delete', array($this->feedManager, 'delete_feed'));
+        add_action('wp_ajax_expresscurate_show_content_feed_items', array($this->feedManager, 'show_content_feed_items'));
         add_action('wp_ajax_expresscurate_bookmarks_add', array($this->feedManager, 'add_bookmarks'));
         add_action('wp_ajax_expresscurate_bookmark_set', array($this->feedManager, 'set_bookmark'));
@@ -200 +200 @@
         register_setting('expresscurate-keywords-group', 'expresscurate_defined_tags');
         register_setting('expresscurate-group', 'expresscurate_curated_text');
+        register_setting('expresscurate-group', 'expresscurate_curated_link_target');
         register_setting('expresscurate-group', 'expresscurate_featured');
         register_setting('expresscurate-group', 'expresscurate_seo');
@@ -376 +377 @@
             return;
         $curated = get_post_meta($post_id, '_is_expresscurate', true);
-        if ($curated == 1) {
-            $curated = '<em>' . __('Yes', self::PLUGIN_FOLDER) . '</em>';
-        } else {
-            $curated = '<em>' . __('No', self::PLUGIN_FOLDER) . '</em>';
-        }
+        //$cloned = get_post_meta($post_id, '_expresscurate_advanced_seo_post_copy', true);
+        //if($cloned=='on'){
+           // $curated = '<em>' . __('Cloned', self::PLUGIN_FOLDER) . '</em>';
+       // }else{
+            if ($curated == 1) {
+                $curated = '<em>' . __('Yes', self::PLUGIN_FOLDER) . '</em>';
+            } else {
+                $curated = '<em>' . __('No', self::PLUGIN_FOLDER) . '</em>';
+            }
+       // }
         echo $curated;
     }
@@ -697 +703 @@
             $expresscurate_advanced_seo_nofollow = isset($_POST['expresscurate_advanced_seo_nofollow_value']) ? $_POST['expresscurate_advanced_seo_nofollow_value'] : 'on';
             $expresscurate_advanced_seo_noindex = isset($_POST['expresscurate_advanced_seo_noindex_value']) ? $_POST['expresscurate_advanced_seo_noindex_value'] : 'on';
+            $expresscurate_advanced_seo_post_copy = isset($_POST['expresscurate_advanced_seo_post_copy_value']) ? $_POST['expresscurate_advanced_seo_post_copy_value'] : 'off';
 
             update_post_meta($post_id, '_expresscurate_advanced_seo_title', esc_attr($expresscurate_advanced_seo_title));
@@ -702 +709 @@
             update_post_meta($post_id, '_expresscurate_advanced_seo_nofollow', esc_attr($expresscurate_advanced_seo_nofollow));
             update_post_meta($post_id, '_expresscurate_advanced_seo_noindex', esc_attr($expresscurate_advanced_seo_noindex));
+            update_post_meta($post_id, '_expresscurate_advanced_seo_post_copy', esc_attr($expresscurate_advanced_seo_post_copy));
 
             // social part

expresscurate/trunk/ExpressCurate_AjaxExportAPI.php

@@ -1 +1 @@
 <?php
+
 require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
 
@@ -37 +38 @@
         $data["smart_publishing"] = get_option('expresscurate_publish', '') == 'on' ? get_option('expresscurate_manually_approve_smart', 'off') : 'off';
         $data["curated_from_prefix"] = get_option("expresscurate_curated_text", 'See full story on');
+        $data["curated_link_target"] = get_option("expresscurate_curated_link_target", 'on');
         if (current_user_can('edit_posts')) {
             $categories = get_categories(array("hide_empty" => 0));
@@ -186 +188 @@
             $domain = parse_url($data['url']);
             $domain = $domain['host'];
-            $data['content'] .= '<div class="curated_from"><p>' . get_option('expresscurate_curated_text') . ' <a href = "' . $data['url'] . '">' . $domain . '</a><span class="expresscurated" data-curated-url="' . $data['url'] . '">&nbsp;</span></p></div>';
+            //$data['content'] .= '<div class="curated_from"><p>' . get_option('expresscurate_curated_text') . ' <a href = "' . $data['url'] . '">' . $domain . '</a><span class="expresscurated" data-curated-url="' . $data['url'] . '">&nbsp;</span></p></div>';
             if (isset($data['terms'])) {
                 foreach ($data['terms'] as $i => $term) {

expresscurate/trunk/ExpressCurate_ContentManager.php

@@ -1 +1 @@
 <?php
+
+require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
 
 /*
@@ -7 +9 @@
   License URI: http://www.gnu.org/licenses/gpl.html
  */
-require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
 
 class ExpressCurate_ContentManager {

expresscurate/trunk/ExpressCurate_CronManager.php

@@ -1 +1 @@
 <?php
 require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
+
+/*
+  Author: ExpressCurate
+  Author URI: http://www.expresscurate.com
+  License: GPLv3 or later
+  License URI: http://www.gnu.org/licenses/gpl.html
+ */
 
 class ExpressCurate_CronManager {

expresscurate/trunk/ExpressCurate_Date.php

@@ -1 +1 @@
 <?php
+
 require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
+
+/*
+  Author: ExpressCurate
+  Author URI: http://www.expresscurate.com
+  License: GPLv3 or later
+  License URI: http://www.gnu.org/licenses/gpl.html
+ */
+
 /**
  * Class responsible for date formatting

expresscurate/trunk/ExpressCurate_Email.php

@@ -1 +1 @@
 <?php
+
 require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
+
+/*
+  Author: ExpressCurate
+  Author URI: http://www.expresscurate.com
+  License: GPLv3 or later
+  License URI: http://www.gnu.org/licenses/gpl.html
+ */
 
 class ExpressCurate_Email
@@ -17 +25 @@
         $headers = 'Content-type: text/html; charset=utf-8' . "\r\n";
         foreach ($wpUsers as $user) {
+            // don't sent alerts to subscribers
+            if(in_array('subscriber', $user->roles)) {
+                continue;
+            }
             @wp_mail($user->user_email, 'ExpressCurate Content Alert', $email, $headers);
         }

expresscurate/trunk/ExpressCurate_FeedManager.php

@@ -11 +11 @@
 class ExpressCurate_FeedManager
 {
-
+    const CONTENT_FEED_MAX_SIZE = 500;
 
     private static $instance;
@@ -34 +34 @@
         if(!ExpressCurate_HtmlParser::supportsDownload()){
             $result = array("status"=>"You should activate either curl extension or allow_url_fopen setting.");
-        }else{
+        } else {
             $url = isset($url) ? $url : $_REQUEST['url'];
             $url = trim($url);
@@ -47 +47 @@
                 }
 
-                //$url = expresscurate_normalise_url($url, true);
-                $rssUrl = isset($rssUrl) ? $rssUrl : $this->getRssUrl($url);
-
-                if (!isset($curated_links_rss[$rssUrl])) {
+                $rssUrl = $this->getRssUrl($url);
+
+                if ($rssUrl === null) {
+                    $result['status'] = 'No RSS feed found at this URL.';
+                } else if (isset($curated_links_rss[$rssUrl])) {
+                    $result['status'] = 'URL already exists.';
+                } else {
                     if (filter_var($rssUrl, FILTER_VALIDATE_URL)) {
                         $result['status'] = 'success';
+                        
+                        // retrieve the feed title
+                        $feedMeta = $this->getFeedMeta($rssUrl);
+                        $link = $feedMeta['link'];
+                        $link = empty($link) ? $rssUrl : $link;
+                        
+                        // get the number of posts that are curated from this feed
                         $metas = $wpdb->get_results(
                             "SELECT post_id
-                   FROM $wpdb->postmeta
-                   WHERE meta_key LIKE  '%_expresscurate_link_%' AND meta_value LIKE '%" . $url . "%' GROUP BY post_id");
-
-
-                        $curated_links_rss[$rssUrl]['feed_url'] = $result['feed_url'] = $rssUrl;
-                        $curated_links_rss[$rssUrl]['post_count'] = $result['post_count'] = count($metas);
-                        //  var_dump($curated_links_rss);die;
-                        $curated_links_rss = json_encode($curated_links_rss);
-                        update_option('expresscurate_links_rss', $curated_links_rss);
-                    } elseif ($rssUrl === null) {
-                        $result['status'] = 'No RSS feed found at this URL.';
+                             FROM $wpdb->postmeta
+                             WHERE meta_key LIKE  '%_expresscurate_link_%' AND meta_value LIKE '%" . $link . "%' GROUP BY post_id");
+
+                        // construct the rss data
+                        $curated_links_rss[$link]['feed_url'] = $result['feed_url'] = $rssUrl;
+                        $curated_links_rss[$link]['link'] = $result['link'] = $link;
+                        $curated_links_rss[$link]['post_count'] = $result['post_count'] = count($metas);
+                        $curated_links_rss[$link]['feed_title'] = $result['feed_title'] = $feedMeta['title'];
+                        
+                        // save
+                        update_option('expresscurate_links_rss', json_encode($curated_links_rss));
                     } else {
                         $result['status'] = 'Invalid RSS URL.';
                     }
-                } else {
-                    $result['status'] = 'URL already exists.';
                 }
             } else {
@@ -79 +87 @@
 
         die;
+    }
+    
+    private function getFeedMeta($feedURL) {
+        $loadURL = "http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&q=" . urlencode($feedURL);
+        $htmlparser = new ExpressCurate_HtmlParser($loadURL);
+        $res = $htmlparser->download();
+        $result = json_decode($res, true);
+        
+        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'];
+            return $meta;
+        } else {
+            return null;
+        }
     }
 
@@ -96 +121 @@
             } else {
                 unset($curated_links_rss[$data['url']]);
-                $curated_links_rss = json_encode($curated_links_rss);
-                update_option('expresscurate_links_rss', $curated_links_rss);
+                update_option('expresscurate_links_rss', json_encode($curated_links_rss));
                 $result['status'] = 'success';
             }
@@ -127 +151 @@
         if ($curated_links_rss) {
             $curated_links_rss = json_decode($curated_links_rss, true);
+            
+            $links = array();
+            foreach($curated_links_rss as $link => $data) {
+                $url = $data['feed_url'];
+                $links[$url] = 1;
+            }
+            $curated_links_rss = $links;
         } else {
             $curated_links_rss = array();
@@ -133 +164 @@
 
         if ($top_sources_rss) {
-            $top_sources_rss = json_decode($top_sources_rss, true);
-            $date_after = strtotime($top_sources_rss['date']) . "&";
+            // check if migrated
+            $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();
+            $date_after = $migrated1 ? strtotime($top_sources_rss['date']) . "&" : '';
         } else {
             $top_sources_rss = array();
             $top_sources_rss['links'] = array();
         }
+        $top_sources_rss['migrated'] = 1;
 
         $curated_posts_query = new WP_Query("meta_key=_is_expresscurate&meta_value=1&posts_per_page=-1&" . $date_after . "order=DESC");
@@ -151 +186 @@
                     if (preg_match('/_expresscurate_link_\d/', $key)) {
                         if ($meta_values[$key][0]) {
-                            $normalised_url = expresscurate_normalise_url($meta_values[$key][0]);
-                            $domain = parse_url($normalised_url);
-                            if (preg_match('/(?P<subdomain>.<domain>[a-z0-9][a-z0-9\-]{1,63}\.[a-z\.]{2,6})$/i', $domain['host'], $regs)) {
-                                $curated_links[$i]['link'] = expresscurate_normalise_url($regs['domain']);
-                            } else {
-                                $curated_links[$i]['link'] = $normalised_url;
+                            // parse the host
+                            $url = parse_url($meta_values[$key][0]);
+                            $host = $url['host'];
+                            
+                            // get only the main domain
+                            preg_match('/([a-z0-9\-_]{1,63})\.([a-z]{2,6})$/i', $host, $regs);
+                            $link = $regs[1] . '.' . $regs[2];
+                            
+                            // filter
+                            if(empty($link) || $link == '.') {
+                                continue;
                             }
+                            
+                            // add
+                            $curated_links[$i]['host'] = $host;
+                            $curated_links[$i]['link'] = $link;
                             $curated_links[$i]['post_id'] = get_the_ID();
+                            $i++;
                         }
-                        $i++;
                     }
                 }
@@ -166 +210 @@
         }
         wp_reset_postdata();
-        if(ExpressCurate_HtmlParser::supportsDownload()){
+        
+        $rssLinks = array();
+        
+        if(ExpressCurate_HtmlParser::supportsDownload()) {
             foreach ($curated_links as $key => $top_link) {
-                $websiteUrl = $top_link['link'];
-                $rssUrl = $this->getRssUrl($websiteUrl);
+                $websiteHost = $top_link['host'];
+                $website = $top_link['link'];
+                
+                if(isset($rssLinks[$websiteHost])) {
+                    $rssUrl = $rssLinks[$websiteHost];
+                } else {
+                    $rssUrl = $this->getRssUrl($websiteHost);
+                    $rssLinks[$websiteHost] = $rssUrl;
+                }
+                
                 if ($rssUrl && isset($curated_links_rss[$rssUrl])) {
                     $feed_status = 'rssStatusYes';
@@ -179 +234 @@
                     }
                 }
-                $top_sources_rss['links'][$websiteUrl] = array(
+                
+                $top_sources_rss['links'][$website] = array(
                     'post_ids' => array($top_link['post_id']),
                     'feed_options' => array(
@@ -186 +242 @@
                         'type' => 'feed')
                 );
-                $top_sources_rss['links'][$websiteUrl]['post_ids'] = array_unique($top_sources_rss['links'][$websiteUrl]['post_ids']);
-                $top_sources_rss['links'][$websiteUrl]['post_count'] = count($top_sources_rss['links'][$websiteUrl]['post_ids']);
+                $top_sources_rss['links'][$website]['post_ids'] = array_unique($top_sources_rss['links'][$website]['post_ids']);
+                $top_sources_rss['links'][$website]['post_count'] = count($top_sources_rss['links'][$website]['post_ids']);
             }
 
@@ -211 +267 @@
     public function get_rss_list()
     {
+        global $wpdb;
+        
         $curated_links_rss = get_option('expresscurate_links_rss', '');
         if ($curated_links_rss) {
             $curated_links_rss = json_decode($curated_links_rss, true);
+            
+            $save = false;
+            foreach($curated_links_rss as $rss => $data) {
+                if(isset($data['feed_title']) && strlen(trim($data['feed_title'])) > 0) {
+                    continue;
+                }
+                
+                // correct the url and get the meta data
+                $rssUrl = $this->getRssUrl($rss);
+                $feedMeta = $this->getFeedMeta($rssUrl);
+                $link = $feedMeta['link'];
+                $link = empty($link) ? $rssUrl : $link;
+                
+                $data = array();
+                $data['feed_title'] = $feedMeta['title'];
+                $data['feed_url'] = $rssUrl;
+                $data['link'] = $link;
+                
+                // remove the old row and add the new one
+                unset($curated_links_rss[$rss]);
+                $curated_links_rss[$link] = $data;
+                
+                // make sure to save in the end
+                $save = true;
+            }
+            
+            // update the post count
+            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
+                             FROM $wpdb->postmeta
+                             WHERE meta_key LIKE  '%_expresscurate_link_%' AND meta_value LIKE '%" . $link . "%' GROUP BY post_id");
+                
+                $curated_links_rss[$link]['post_count'] = count($posts);
+            }
+            
+            // save
+            update_option('expresscurate_links_rss', json_encode($curated_links_rss));
         } else {
             $curated_links_rss = array();
         }
+        
+        unset($curated_links_rss['']);
         return $curated_links_rss;
     }
@@ -253 +352 @@
 
         $lookup_url = "http://ajax.googleapis.com/ajax/services/feed/lookup?v=1.0&q=" . urlencode($url);
-        /*$options = array('http' => array('user_agent' => USER_AGENT,'request_fulluri '=>TRUE));
-        if(preg_match("/(^https:\/\/)/i", $url)!=false){
-            $options['ssl']=array('verify_peer'=> false,"verify_peer_name"=>false);
-        }
-        $context = stream_context_create($options);
-        $res = file_get_contents($lookup_url,false,$context);*/
         $htmlparser = new ExpressCurate_HtmlParser($lookup_url);
         $res = $htmlparser->download();
@@ -269 +362 @@
         return false;
     }
+    
+    
 
     public function get_feed_content()
     {
-        $feed_array = array();
+        // read the existing feed to modify below
+        $feedContent = get_option('expresscurate_feed_content');
+        if (empty($feedContent)) {
+            $feed_array = array();
+        } else {
+            $feedContent = json_decode($feedContent, true);
+            $feed_array = $feedContent['content'];
+        }
+
+        // blabla
         $data = $_REQUEST;
-        $date = urldecode($date["date"]);
+        $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"));
         $curated_links_rss = get_option('expresscurate_links_rss', '');
         if ($curated_links_rss) {
+            // get the deleted suggestions
+            $deleted_urls = array();
+            $feed_content_deleted = get_option('expresscurate_feed_content_deleted', '');
+            if (empty($feed_content_deleted)) {
+                $feed_content_deleted = array();
+            } else {
+                $feed_content_deleted = json_decode($feed_content_deleted, true);
+            }
+            if (is_array($feed_content_deleted)) {
+                foreach ($feed_content_deleted as $deletet_item) {
+                    $deleted_urls[] = $deletet_item;
+                }
+            }
+            
+            // go over the feeds and try to pull
             $curated_links_rss = json_decode($curated_links_rss, true);
-            $deleted_urls = array();
-            if (!isset($date)) {
-                $feed_content_deleted = get_option('expresscurate_feed_content_deleted', '');
-                if ($feed_content_deleted) {
-                    $feed_content_deleted = json_decode($feed_content_deleted, true);
-                }
-                if (is_array($feed_content_deleted)) {
-                    foreach ($feed_content_deleted as $deletet_item) {
-                        $deleted_urls[] = $deletet_item['link'];
-                    }
-                }
-            }
             if (count($curated_links_rss)) {
                 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']);
-                    //$result= json_decode(file_get_contents($lookup_url), true);
                     $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);
@@ -301 +410 @@
             }
 
-            @uasort($feed_array, array($this, "feedSortByDate"));
-
+            // check if the feed is empty and sort
+            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) {
+                    // remove the last elements
+                    $feed_array = array_slice($feed_array,0,self::CONTENT_FEED_MAX_SIZE);
+                    // TODO implement
+
+                }
+            }
+            
+            // save the latest feed
             $feed_content = json_encode(array('date' => date('Y-m-d H:i:s'), 'content' => $feed_array));
-            update_option('expresscurate_feed_content', $feed_content);
+           // update_option('expresscurate_feed_content', $feed_content);
             return $feed_content;
         }
-
-
-    }
-
-    public function manual_pull_feed(){
-        $feeds = json_decode($this->get_feed_content(),true);
-        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());
-        }
-        echo json_encode($feeds);
-        die;
-    }
-
-    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){
-                    $filtered_feeds[$link] = $feed;
-                }
-            }
-        }
-        return $filtered_feeds;
-    }
-
-    public function send_content_alert()
-    {
-
-        if (get_option('expresscurate_enable_content_alert') == 'on') {
-            $feed_content = json_decode(get_option('expresscurate_feed_content', ''), true);
-
-            if ($this->date_diff(date('Y-m-d H:i:s'), get_option('expresscurate_content_alert_lastDate', true)) > get_option('expresscurate_content_alert_frequency', true)
-                && isset($feed_content['content']) && $feed_content['content'] !== NULL
-            ) {
-
-                $emailStories = array();
-                foreach ($feed_content['content'] as $link => $story) {
-                    if (isset($story['keywords'])) {
-                        if ($this->date_diff(get_option('expresscurate_content_alert_lastDate', true), $story['date'], false) < 0) {
-                            $emailStories[$link] = $story;
-                        }
-                    }
-                }
-                if (!empty($emailStories)) {
-                    $expressCurateEmail = new ExpressCurate_Email();
-                    $expressCurateEmail->sendContentAlertEmail($emailStories);
-
-                }
-
-            }
-        }
-
-    }
-
-    public 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)
     {
         $feeds = array();
@@ -377 +441 @@
         }
         foreach ($feeds as $story) {
-            if ((isset($story['link']) && !in_array($story['link'], $deleted_urls)) || (isset($story['address']) && !in_array($story['address'], $deleted_urls))) {
-                $link = isset($story['link']) ? $story['link'] : $story['address'];
+            // get the post url
+            $link = isset($story['link']) ? $story['link'] : $story['address'];
+            if(empty($link) || isset($deleted_urls[$link])) {
+                continue;
+            }
+            
+            // parse the post url
+            $parsedLink = parse_url($link);
+            
+            // google alerts support
+            // check for google redirect urls and pick up the original post link
+            $protocol = $parsedLink['scheme'];
+            if (strpos($protocol . "://www.google.com/url", $url) == 0) {
+                $url_query = explode("&", $query);
+                foreach ($url_query as $param) {
+                    if (strpos($param, 'url=') === 0) {
+                        $link = str_replace("url=", "", $param);
+                        $link = urldecode($link);
+                        $parsedLink = parse_url($link);
+                        break;
+                    }
+                }
+            }
+            
+            // check if this link is already in the feed
+            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', $domain['host'], $regs)) {
+                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;
+                }
+                
                 $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' => $story['title'],
@@ -416 +517 @@
                     $feed_array[$link] = $story_array;
                 }
-
-            }
-        }
+        }
+    }
+
+    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;
+    }
+
+    public function show_content_feed_items()
+    {
+        include(sprintf("%s/templates/feed_list.php", dirname(__FILE__)));
+        die;
+    }
+    
+    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){
+                    $filtered_feeds[$link] = $feed;
+                }
+            }
+        }
+        return $filtered_feeds;
+    }
+
+    public function send_content_alert()
+    {
+
+        if (get_option('expresscurate_enable_content_alert') == 'on') {
+            $feed_content = json_decode(get_option('expresscurate_feed_content', ''), true);
+
+            if ($this->date_diff(date('Y-m-d H:i:s'), get_option('expresscurate_content_alert_lastDate', true)) > get_option('expresscurate_content_alert_frequency', true)
+                && isset($feed_content['content']) && $feed_content['content'] !== NULL
+            ) {
+
+                $emailStories = array();
+                foreach ($feed_content['content'] as $link => $story) {
+                    if (!empty($story['keywords'])) {
+                        if ($this->date_diff(get_option('expresscurate_content_alert_lastDate', true), $story['date'], false) < 0) {
+                            $emailStories[$link] = $story;
+                        }
+                    }
+                }
+                if (!empty($emailStories)) {
+                    $expressCurateEmail = new ExpressCurate_Email();
+                    $expressCurateEmail->sendContentAlertEmail($emailStories);
+
+                }
+
+            }
+        }
+
     }
 

expresscurate/trunk/ExpressCurate_GoogleAuth.php

@@ -1 +1 @@
 <?php
+
 require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
+
+/*
+  Author: ExpressCurate
+  Author URI: http://www.expresscurate.com
+  License: GPLv3 or later
+  License URI: http://www.gnu.org/licenses/gpl.html
+ */
 
 class ExpressCurate_GoogleAuth

expresscurate/trunk/ExpressCurate_HtmlParser.php

@@ -1 +1 @@
 <?php
+
 require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
 
@@ -9 +10 @@
  */
 
-class ExpressCurate_HtmlParser {
-  // resource details
-  private $url;
-  private $domain;
-  private $fragment;
-  private $protocol;
-  private $path;
-  private $raw;
-  private $referer;
-  
-  // may be an html or a raw data (used for images, etc)
-  private $data = null;
-  private $dataHTTPStatus = null;
-  private $dataUTF8 = null;
-  
-  // html dom details
-  private $dom = null;
-  private $article = null;
-  private $xpath = null;
-  
-  // article details
-  private $title = null;
-  private $keywords = null;
-  private $description = null;
-  
-  // asynch download settings
-  private $asynchHandle = null;
-  private static $ASYNC_SUPPORT_CURL_MULTI_HANDLER = null;
-  private static $REQUEST_TIMEOUT = 10;
-
-  public static function supportsAsynch() {
+class ExpressCurate_HtmlParser
+{
+    // resource details
+    private $url;
+    private $domain;
+    private $fragment;
+    private $protocol;
+    private $path;
+    private $raw;
+    private $referer;
+
+    // may be an html or a raw data (used for images, etc)
+    private $data = null;
+    private $dataHTTPStatus = null;
+    private $dataUTF8 = null;
+
+    // html dom details
+    private $dom = null;
+    private $article = null;
+    private $xpath = null;
+
+    // article details
+    private $title = null;
+    private $keywords = null;
+    private $description = null;
+
+    // asynch download settings
+    private $asynchHandle = null;
+    private static $ASYNC_SUPPORT_CURL_MULTI_HANDLER = null;
+    private static $REQUEST_TIMEOUT = 10;
+
+    public static function supportsAsynch()
+    {
         return is_callable('curl_init');
-  }
-  
-  public static function supportsDownload() {
-      return is_callable('curl_init') || preg_match('/1|yes|on|true/i', ini_get('allow_url_fopen'));
-  }
-
-  public function __construct($url, $raw = false, $referer = null) {
-    if($url) {
-        $parsedURL = parse_url($url);
-        
-        $path = $parsedURL['path'];
-        $lastof = strrpos($path, "/");
-        $path = substr($path, 0, $lastof);
-        
-        $this->domain = 'http://' . $parsedURL['host'];
-        $this->path = 'http://' . $parsedURL['host'] . "/" . $path . "/";
-        $this->fragment = $parsedURL['fragment'];
-        $this->protocol = $parsedURL['scheme'];
-        $query = $parsedURL['query'];
-        
-        // google redirection fix
-        if(strpos($this->protocol . "://www.google.com/url", $url)==0) {
-            $url_query = explode("&", $query);
-            foreach($url_query as $param) {
-                if(strpos($param, 'url=') === 0) {
-                    $url = str_replace("url=", "", $param);
-                    $url = urldecode($url);
-                    break;
-                }
-            }
-         }
-         $this->url = html_entity_decode($url);
-    }
-    $this->raw = $raw;
-    $this->referer = $referer;
-  }
-  
-  public function getFile() {
-      if(self::supportsAsynch()) {
-          $this->downloadAsynch();
-          self::ensureAsynchData();
-          return $this->getAsynchData();
-      } else {
-          return $this->download();
-      }
-  }
-  
-  public function getHTTPStatus() {
-      return $this->dataHTTPStatus;
-  }
-  
-  public function isHTTPStatusOK() {
-      if ((is_array($this->dataHTTPStatus) && ($this->dataHTTPStatus[0] == "HTTP/1.1 200 OK" || strpos($this->dataHTTPStatus[0], '200'))) || $this->dataHTTPStatus == "HTTP/1.1 200 OK" || $this->dataHTTPStatus == 200 || $this->dataHTTPStatus == 'HTTP\/1.1 200 OK') {
-          return true;
-      }
-      return false;
-  }
-  
-  public function getHTTPStatusCode() {
-      if($this->isHTTPStatusOK()) {
-          return 200;
-      }
-      
-      if ((is_array($this->dataHTTPStatus) && ($this->dataHTTPStatus[0] == "HTTP/1.1 403 Forbidden" || strpos($this->dataHTTPStatus[0], '403'))) || $this->dataHTTPStatus == "HTTP/1.1 403 Forbidden" || $this->dataHTTPStatus == 403) {
-          return 403;
-      }
-      
-      return $http_response_header[0];
-  }
-  
-  public function downloadAsynch() {
-      if($this->data != null) {
-          return;
-      }
-      
-      if(self::supportsAsynch() == false) {
-          return $this->download();
-      }
-      
-      if(self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER == null) {
-          $mh = curl_multi_init();
-          set_time_limit(0);
-          
-          self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER = $mh;
-      }
-      
-      // setup the single curl
-      $ch = $this->createCURL($this->url);
-      
-      // add the single handle to the multi handle
-      curl_multi_add_handle(self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER, $ch);
-      // start the download
-      curl_multi_exec(self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER, $running);
-      
-      // keep the handle for later
-      $this->asynchHandle = $ch;
-  }
-  
-  private function createCURL($url) {
-      $ch = curl_init();
-      curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-      curl_setopt($ch, CURLOPT_URL, $url);
-      curl_setopt($ch, CURLOPT_USERAGENT, ExpressCurate_Actions::USER_AGENT);
-      if($this->referer) {
-          curl_setopt($ch, CURLOPT_REFERER, $this->referer);
-      }
-      curl_setopt($ch, CURLOPT_HTTPHEADER, array("Accept: application/xhtml+xml, application/xml", "Accept-Charset: utf-8"));
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-      curl_setopt($ch, CURLOPT_TIMEOUT, self::$REQUEST_TIMEOUT);
-      curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-      curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
-      curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-  }
-  
-  private static function ensureAsynchData() {
-      do {
-          curl_multi_exec(self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER, $running);
-      } while($running > 0);
-  }
-  
-  private function getAsyncData() {
-      $content = curl_multi_getcontent($this->asynchHandle);
-      $this->dataHTTPStatus = curl_getinfo($this->asynchHandle, CURLINFO_HTTP_CODE);
-      $contentType = curl_getinfo($this->asynchHandle, CURLINFO_CONTENT_TYPE);
-      
-      curl_multi_remove_handle(self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER, $this->asynchHandle);
-      
-      if(!$this->raw) {
-          $content = self::sanitizeContent($content);
-      
-          if($contentType) {
-              list($charset, $encoding) = explode("=", $contentType);
-              $encoding = strtoupper(trim($encoding));
-                              
-              $supportedEncoding = array_search($encoding, mb_list_encodings()) !== false;
-                              
-              if(!$supportedEncoding) {
-                  $encoding = mb_detect_encoding($content);
-              }
-              
-              $content = mb_convert_encoding($content, 'UTF-8', $encoding);  
-              $content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
-          }
-      }
-      
-      $this->data = $content;
-      
-      return $this->data;
-  }
-  
-  public function download() {
-      if($this->data != null) {
-          return;
-      }
-      
+    }
+
+    public static function supportsDownload()
+    {
+        return is_callable('curl_init') || preg_match('/1|yes|on|true/i', ini_get('allow_url_fopen'));
+    }
+
+    public function __construct($url, $raw = false, $referer = null)
+    {
+        if ($url) {
+            $parsedURL = parse_url($url);
+
+            $path = $parsedURL['path'];
+            $lastof = strrpos($path, "/");
+            $path = substr($path, 0, $lastof);
+
+            $this->domain = 'http://' . $parsedURL['host'];
+            $this->path = 'http://' . $parsedURL['host'] . "/" . $path . "/";
+            $this->fragment = $parsedURL['fragment'];
+            $this->protocol = $parsedURL['scheme'];
+            $query = $parsedURL['query'];
+
+            // google redirection fix
+            if (strpos($this->protocol . "://www.google.com/url", $url) == 0) {
+                $url_query = explode("&", $query);
+                foreach ($url_query as $param) {
+                    if (strpos($param, 'url=') === 0) {
+                        $url = str_replace("url=", "", $param);
+                        $url = urldecode($url);
+                        break;
+                    }
+                }
+            }
+            $this->url = html_entity_decode($url);
+        }
+        $this->raw = $raw;
+        $this->referer = $referer;
+    }
+
+    public function getFile()
+    {
+        if (self::supportsAsynch()) {
+            $this->downloadAsynch();
+            self::ensureAsynchData();
+            return $this->getAsynchData();
+        } else {
+            return $this->download();
+        }
+    }
+
+    public function getHTTPStatus()
+    {
+        return $this->dataHTTPStatus;
+    }
+
+    public function isHTTPStatusOK()
+    {
+        if ((is_array($this->dataHTTPStatus) && ($this->dataHTTPStatus[0] == "HTTP/1.1 200 OK" || strpos($this->dataHTTPStatus[0], '200'))) || $this->dataHTTPStatus == "HTTP/1.1 200 OK" || $this->dataHTTPStatus == 200 || $this->dataHTTPStatus == 'HTTP\/1.1 200 OK') {
+            return true;
+        }
+        if (is_array($this->dataHTTPStatus) && ($this->dataHTTPStatus[0] == "HTTP/1.1 301 Moved Permantenly" || strpos($this->dataHTTPStatus[0], '301')) || ($this->dataHTTPStatus[0] == "HTTP/1.1 302 Found" || strpos($this->dataHTTPStatus[0], '302')) || ($this->dataHTTPStatus[0] == "HTTP/1.1 303 See Other" || strpos($this->dataHTTPStatus[0], '303')) || ($this->dataHTTPStatus[0] == "HTTP/1.1 307 Temporary Redirect" || strpos($this->dataHTTPStatus[0], '307')) || ($this->dataHTTPStatus[0] == "HTTP/1.1 308 Permanent Redirect" || strpos($this->dataHTTPStatus[0], '308'))){
+            return true;
+        }
+        return false;
+    }
+
+    public function getHTTPStatusCode()
+    {
+        if ($this->isHTTPStatusOK()) {
+            return 200;
+        }
+
+        if ((is_array($this->dataHTTPStatus) && ($this->dataHTTPStatus[0] == "HTTP/1.1 403 Forbidden" || strpos($this->dataHTTPStatus[0], '403'))) || $this->dataHTTPStatus == "HTTP/1.1 403 Forbidden" || $this->dataHTTPStatus == 403) {
+            return 403;
+        }
+
+        return $http_response_header[0];
+    }
+
+    public function downloadAsynch()
+    {
+        if ($this->data != null) {
+            return;
+        }
+
+        if (self::supportsAsynch() == false) {
+            return $this->download();
+        }
+
+        if (self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER == null) {
+            $mh = curl_multi_init();
+            set_time_limit(0);
+
+            self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER = $mh;
+        }
+
+        // setup the single curl
+        $ch = $this->createCURL($this->url);
+
+        // add the single handle to the multi handle
+        curl_multi_add_handle(self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER, $ch);
+        // start the download
+        curl_multi_exec(self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER, $running);
+
+        // keep the handle for later
+        $this->asynchHandle = $ch;
+    }
+
+    private function createCURL($url)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_USERAGENT, ExpressCurate_Actions::USER_AGENT);
+        if ($this->referer) {
+            curl_setopt($ch, CURLOPT_REFERER, $this->referer);
+        }
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array("Accept: application/xhtml+xml, application/xml", "Accept-Charset: utf-8"));
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, self::$REQUEST_TIMEOUT);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+    }
+
+    private static function ensureAsynchData()
+    {
+        do {
+            curl_multi_exec(self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER, $running);
+        } while ($running > 0);
+    }
+
+    private function getAsyncData()
+    {
+        $content = curl_multi_getcontent($this->asynchHandle);
+        $this->dataHTTPStatus = curl_getinfo($this->asynchHandle, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($this->asynchHandle, CURLINFO_CONTENT_TYPE);
+
+        curl_multi_remove_handle(self::$ASYNC_SUPPORT_CURL_MULTI_HANDLER, $this->asynchHandle);
+
+        if (!$this->raw) {
+            $content = self::sanitizeContent($content);
+
+            if ($contentType) {
+                list($charset, $encoding) = explode("=", $contentType);
+                $encoding = strtoupper(trim($encoding));
+
+                $supportedEncoding = array_search($encoding, mb_list_encodings()) !== false;
+
+                if (!$supportedEncoding) {
+                    $encoding = mb_detect_encoding($content);
+                }
+
+                $content = mb_convert_encoding($content, 'UTF-8', $encoding);
+                $content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
+            }
+        }
+
+        $this->data = $content;
+
+        return $this->data;
+    }
+
+
+    public function getRealURL(){
+        foreach(get_headers($this->url) as $header) {
+            if (strpos($header, "Location:") === 0) {
+                $this->url = trim(substr($header, 9));
+            }
+        }
+        return $this->url;
+    }
+
+    public function download()
+    {
+        if ($this->data != null) {
+            return;
+        }
+
 //      if (self::supportsAsynch()) {
 //          // setup the single curl
@@ -204 +231 @@
 //          curl_close($ch);
 //      } else {
-          $header = '';
-          if($this->referer) {
-              $header .= 'Referer: ' . $this->referer . '\r\n';
-          }
-          if(!$this->raw) {
-              $header .= 'Accept: application/xhtml+xml, application/xml, text/html\r\n';
-              $header .= 'Accept-Charset: UTF-8';
-          }
-          $options = array('http' => array(
-                'user_agent' => ExpressCurate_Actions::USER_AGENT,
-                'follow_location' => 1,
-                'max_redirects' => 5,
-                'request_fulluri '=> TRUE,
-                'timeout' => self::$REQUEST_TIMEOUT,
-                'header' => $header));
-          if(strpos($this->url, 'https://') === 0) {
-             $options['ssl'] = array('verify_peer' => false, 'verify_peer_name' => false);
-          }
-          $context = stream_context_create($options);
-          $content = file_get_contents($this->url, false, $context);
-          // $http_response_header gets loaded once file get contents is called, php native stuff
-          $this->dataHTTPStatus = $http_response_header;
-          
-          // try to resolve the content encoding if text/html content
-          if(!$this->raw) {
-              if(!empty($http_response_header)) {
-                  foreach ($http_response_header as $header) {
-                      if (substr(strtolower($header), 0, 13) == "content-type:") {
-                          $contentTypeData = explode(";", $header);
-                          if (count($contentTypeData) == 2) {
-                              list($contentTypeKey, $contentType) = $contentTypeData;
-                          }
-                      }
-                  }
-              }
-          }
+        set_time_limit(0);
+        $header = '';
+        if ($this->referer) {
+            $header .= 'Referer: ' . $this->referer . '\r\n';
+        }
+        if (!$this->raw) {
+            $header .= 'Accept: application/xhtml+xml, application/xml, text/html\r\n';
+            $header .= 'Accept-Charset: UTF-8';
+        }
+        $options = array('http' => array(
+            'user_agent' => ExpressCurate_Actions::USER_AGENT,
+            'follow_location' => 1,
+            'max_redirects' => 5,
+            'request_fulluri ' => TRUE,
+            'timeout' => self::$REQUEST_TIMEOUT,
+            'header' => $header));
+        if (strpos($this->url, 'https://') === 0) {
+            $options['ssl'] = array('verify_peer' => false, 'verify_peer_name' => false);
+        }
+        $context = stream_context_create($options);
+        $content = @file_get_contents($this->url, false, $context);
+
+        // $http_response_header gets loaded once file get contents is called, php native stuff
+        $this->dataHTTPStatus = $http_response_header;
+
+        // try to resolve the content encoding if text/html content
+        if (!$this->raw) {
+            if (!empty($http_response_header)) {
+                foreach ($http_response_header as $header) {
+                    if (substr(strtolower($header), 0, 13) == "content-type:") {
+                        $contentTypeData = explode(";", $header);
+                        if (count($contentTypeData) == 2) {
+                            list($contentTypeKey, $contentType) = $contentTypeData;
+                        }
+                    }
+                }
+            }
+        }
 //      }
 
-      // make sure if there is a response at all
-      if($this->isHTTPStatusOK() === false) {
-          // terminate
-          $this->data = null;
-          return null;
-      }
-      
-      // there is data with OK code, process if required
-      if(!$this->raw) {
-          $content = self::sanitizeContent($content);
-      
-          if($contentType) {
-              list($charset, $encoding) = explode("=", $contentType);
-              $encoding = strtoupper(trim($encoding));
-                              
-              $supportedEncoding = array_search($encoding, mb_list_encodings()) !== false;
-                              
-              if(!$supportedEncoding) {
-                  $encoding = mb_detect_encoding($content);
-              }
-              
-              $content = mb_convert_encoding($content, 'UTF-8', $encoding);  
-              $content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
-          }
-      }
-      
-      // save and return
-      $this->data = $content;
-      return $this->data;
-  }
-  
-  private static function sanitizeContent($content) {
-      $content = preg_replace('#<script(.*?)>(.*?)</script>#is', '', $content);
-      $content = preg_replace('/<--[\S\s]*?-->/msi', '', $content);
-      $content = preg_replace('/(<noscript[^>]*>|<\/noscript>)/msi', '', $content);
-      $content = preg_replace('~>\s+<~', '><', $content);
-      $content = preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $content);
-      
-      $content = preg_replace('/^.*(?=<html>)/i', '', $content);
-      $content = str_replace("\0", " ", $content);
+        // make sure if there is a response at all
+        if ($this->isHTTPStatusOK() === false) {
+            // terminate
+            $this->data = null;
+            return null;
+        }
+
+        // there is data with OK code, process if required
+        if (!$this->raw) {
+            $content = self::sanitizeContent($content);
+
+            if ($contentType) {
+                list($charset, $encoding) = explode("=", $contentType);
+                $encoding = strtoupper(trim($encoding));
+
+                $supportedEncoding = array_search($encoding, mb_list_encodings()) !== false;
+
+                if (!$supportedEncoding) {
+                    $encoding = mb_detect_encoding($content);
+                }
+
+                $content = mb_convert_encoding($content, 'UTF-8', $encoding);
+                $content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
+            }
+        }
+
+        // save and return
+        $this->data = $content;
+        return $this->data;
+    }
+
+    private static function sanitizeContent($content)
+    {
+        $content = preg_replace('#<script(.*?)>(.*?)</script>#is', '', $content);
+        $content = preg_replace('/<--[\S\s]*?-->/msi', '', $content);
+        $content = preg_replace('/(<noscript[^>]*>|<\/noscript>)/msi', '', $content);
+        $content = preg_replace('~>\s+<~', '><', $content);
+        $content = preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $content);
+
+        $content = preg_replace('/^.*(?=<html>)/i', '', $content);
+        $content = str_replace("\0", " ", $content);
+
+        return $content;
+    }
+
+    private function parseDom()
+    {
+        if ($this->dom == null) {
+            // initialize
+            $dom = new DOMDocument('1.0', 'UTF-8');
+            @$dom->loadHTML($this->data);
+
+            // cleanup
+            $this->removeElementsByTagName('script', $dom);
+            $this->removeElementsByTagName('style', $dom);
+            $this->removeElementsByTagName('link', $dom);
+
+            // assign
+            $this->dom = $dom;
+            $this->xpath = new DomXPath($dom);
+        }
+    }
+
+    private function removeElementsByTagName($tagName, $document)
+    {
+        $nodeList = $document->getElementsByTagName($tagName);
+        for ($nodeIdx = $nodeList->length; --$nodeIdx >= 0;) {
+            $node = $nodeList->item($nodeIdx);
+            $node->parentNode->removeChild($node);
+        }
+    }
+
+    private function parseArticle()
+    {
+        if ($this->article == null) {
+            // TODO check the xpath object problem, the final article shall support the same query method
+
+            $article = $this->dom->getElementsByTagName('article')->item(0);
+
+            if (empty($article)) {
+                $article = $this->xpath->query("//*[contains(@class, 'hentry')]")->item(0);
+            }
+
+            if (empty($article)) {
+                $article = $this->xpath->query("//*[contains(@itemtype, 'http://schema.org/Article')]")->item(0);
+            }
+
+            if (empty($article)) {
+                $article = $this->xpath->query("//*[contains(@itemtype, 'http://schema.org/TechArticle')]")->item(0);
+            }
+
+            if (empty($article)) {
+                $article = $this->xpath->query("//*[contains(@itemtype, 'http://schema.org/ScholarlyArticle')]")->item(0);
+            }
+
+            if (empty($article)) {
+                $article = $this->dom->getElementsByTagName('body')->item(0);
+            }
+
+            $this->article = $article;
+        }
+    }
+
+    public function file_get_contents_utf8($url, $get_http_status = false, $set_utf8 = true)
+    {
+        $content = '';
+        $charset = '';
+        $utf8 = false;
+        $timeout = 10;
+        set_time_limit(0);
+        $user_agent = ExpressCurate_Actions::USER_AGENT;
+        $file_get_enabled = preg_match('/1|yes|on|true/i', ini_get('allow_url_fopen'));
+        if (strpos(parse_url($url, PHP_URL_SCHEME) . "://www.google.com/url", $url) == 0) {
+            $url_query = explode("&", parse_url($url, PHP_URL_QUERY));
+            foreach ($url_query as $param) {
+                if (strpos($param, 'url=') === 0) {
+                    $url = str_replace("url=", "", $param);
+                    $url = urldecode($url);
+                    break;
+                }
+            }
+        }
+        $normalized_url = html_entity_decode($url);
+        if (self::supportsAsynch()) {
+            $ch = curl_init();
+            //curl_setopt($ch, CURLOPT_HEADER, 1);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+            curl_setopt($ch, CURLOPT_URL, $normalized_url);
+            curl_setopt($ch, CURLOPT_USERAGENT, $user_agent);
+
+            // TODO fix the accepts header
+            curl_setopt($ch, CURLOPT_HTTPHEADER, array("Content-type: text/xml;charset=\"utf-8\""));
+
+            // TODO configure the return transfer based on asynch choice
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+            curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+            $content = curl_exec($ch);
+
+            // TODO check if the content shall be transformed to UTF8
+
+            $http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            curl_close($ch);
+        } elseif ($file_get_enabled) {
+            /*$options = (preg_match("/(^https:\/\/)/i", $url, $options)!=false)?array('ssl' => array('verify_peer'=> false,"verify_peer_name"=>false)):array('http' => array('user_agent' => $user_agent));*/
+            $options = array('http' => array('user_agent' => $user_agent, ' follow_location' => 1, 'max_redirects' => 5, 'request_fulluri ' => TRUE, 'timeout' => $timeout));
+            if (preg_match("/(^https:\/\/)/i", $url) != false) {
+                $options['ssl'] = array('verify_peer' => false, "verify_peer_name" => false);
+            }
+            $context = stream_context_create($options);
+            $content = file_get_contents($normalized_url, false, $context);
+            // $content = mb_convert_encoding($content, 'HTML-ENTITIES', "UTF-8");
+            $http_status = $http_response_header;
+
+            if (!empty($http_response_header)) {
+                foreach ($http_response_header as $header) {
+                    if (substr(strtolower($header), 0, 13) == "content-type:") {
+                        if (count(explode(";", $header)) > 1) {
+                            list($contentType, $charset) = explode(";", $header);
+                        }
+                    }
+                }
+            }
+
+            $headers = headers_list();
+            // get the content type header
+            foreach ($headers as $header) {
+                if (substr(strtolower($header), 0, 13) == "content-type:") {
+                    list($contentType, $charset) = explode(";", trim(substr($header, 14), 2));
+                    if (strtolower(trim($charset)) == "charset=utf-8") {
+                        $utf8 = true;
+                    }
+                }
+            }
+            if ($charset && strpos(strtolower($charset), 'utf-8')) {
+                $utf8 = true;
+            } else {
+                $charset = mb_detect_encoding($content);
+                if (strpos(strtolower($charset), 'utf-8')) {
+                    $utf8 = true;
+                }
+            }
+            if (!$utf8 && $set_utf8) {
+                $content = utf8_encode($content);
+            }
+        } else {
+            $data = array('status' => 'warning', 'msg' => 'Content from this page cannot be loaded.  Please enable \"allow_url_open\" in php.ini.');
+            echo json_encode($data);
+            die();
+        }
+        if (!$get_http_status) {
+            return $content;
+        } else {
+            return array('content' => $content, 'http_status' => $http_status);
+        }
+    }
+
+    public function getContents()
+    {
+        $this->download();
+
+        if (strlen($this->data) > 3) {
+            // prepare some data before getting contents
+            $this->title = $this->getTitle();
+            $this->keywords = $this->getKeywords();
+            $this->description = $this->getDescription();
+
+            // get the contents
+            return $this->getElementsByTags();
+        } else {
+            return false;
+        }
+    }
     
-      return $content;
-  }
-  
-  private function parseDom() {
-      if($this->dom == null) {
-          // initialize
-          $dom = new DOMDocument('1.0', 'UTF-8');
-          @$dom->loadHTML($this->data);
-      
-          // cleanup
-          $this->removeElementsByTagName('script', $dom);
-          $this->removeElementsByTagName('style', $dom);
-          $this->removeElementsByTagName('link', $dom);
-          
-          // assign
-          $this->dom = $dom;
-          $this->xpath = new DomXPath($dom);
-      }
-  }
-  
-  private function removeElementsByTagName($tagName, $document) {
-      $nodeList = $document->getElementsByTagName($tagName);
-      for ($nodeIdx = $nodeList->length; --$nodeIdx >= 0;) {
-          $node = $nodeList->item($nodeIdx);
-          $node->parentNode->removeChild($node);
-      }
-  }
-  
-  private function parseArticle() {
-      if($this->article == null) {
-          // TODO check the xpath object problem, the final article shall support the same query method
-      
-          $article = $this->dom->getElementsByTagName('article')->item(0);
-          
-          if(empty($article)) {
-              $article = $this->xpath->query("//*[contains(@class, 'hentry')]")->item(0);
-          }
-
-          if(empty($article)) {
-              $article = $this->xpath->query("//*[contains(@itemtype, 'http://schema.org/Article')]")->item(0);
-          }
-
-          if(empty($article)) {
-              $article = $this->xpath->query("//*[contains(@itemtype, 'http://schema.org/TechArticle')]")->item(0);
-          }
-
-          if(empty($article)) {
-              $article = $this->xpath->query("//*[contains(@itemtype, 'http://schema.org/ScholarlyArticle')]")->item(0);
-          }
-
-          if(empty($article)) {
-              $article = $this->dom->getElementsByTagName('body')->item(0);
-          }
-          
-          $this->article = $article;
-      }
-  }
-  
-  public function file_get_contents_utf8($url, $get_http_status = false, $set_utf8 = true) {
-      $content = '';
-      $charset = '';
-      $utf8 = false;
-      $timeout=10;
-      set_time_limit(0);
-      $user_agent = ExpressCurate_Actions::USER_AGENT;
-      $file_get_enabled = preg_match('/1|yes|on|true/i', ini_get('allow_url_fopen'));
-      if(strpos(parse_url($url,PHP_URL_SCHEME)."://www.google.com/url",$url)==0) {
-          $url_query = explode("&",parse_url($url,PHP_URL_QUERY));
-          foreach($url_query as $param) {
-              if(strpos($param, 'url=') === 0) {
-                  $url = str_replace("url=", "", $param);
-                  $url = urldecode($url);
-                  break;
-              }
-          }
-      }
-      $normalized_url = html_entity_decode($url);
-      if (self::supportsAsynch()) {
-          $ch = curl_init();
-          //curl_setopt($ch, CURLOPT_HEADER, 1);
-          curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-          curl_setopt($ch, CURLOPT_URL, $normalized_url);
-          curl_setopt($ch, CURLOPT_USERAGENT, $user_agent);
-          
-          // TODO fix the accepts header
-          curl_setopt($ch, CURLOPT_HTTPHEADER, array("Content-type: text/xml;charset=\"utf-8\""));
-          
-          // TODO configure the return transfer based on asynch choice
-          curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-          curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-          curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-          curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
-          curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-          $content = curl_exec($ch);
-          
-          // TODO check if the content shall be transformed to UTF8
-          
-          $http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-          curl_close($ch);
-      } elseif($file_get_enabled) {
-          /*$options = (preg_match("/(^https:\/\/)/i", $url, $options)!=false)?array('ssl' => array('verify_peer'=> false,"verify_peer_name"=>false)):array('http' => array('user_agent' => $user_agent));*/
-          $options = array('http' => array('user_agent' => $user_agent,' follow_location'=>1,'max_redirects'=>5,'request_fulluri '=>TRUE,'timeout' => $timeout));
-          if(preg_match("/(^https:\/\/)/i", $url)!=false){
-             $options['ssl']=array('verify_peer'=> false,"verify_peer_name"=>false);
-          }
-          $context = stream_context_create($options);
-          $content = file_get_contents($normalized_url, false, $context);
-          // $content = mb_convert_encoding($content, 'HTML-ENTITIES', "UTF-8");
-          $http_status = $http_response_header;
-
-          if(!empty($http_response_header)) {
-              foreach ($http_response_header as $header) {
-                  if (substr(strtolower($header), 0, 13) == "content-type:") {
-                      if (count(explode(";", $header)) > 1) {
-                          list($contentType, $charset) = explode(";", $header);
-                      }
-                  }
-              }
-          }
-
-          $headers = headers_list();
-          // get the content type header
-          foreach ($headers as $header) {
-            if (substr(strtolower($header), 0, 13) == "content-type:") {
-              list($contentType, $charset) = explode(";", trim(substr($header, 14), 2));
-              if (strtolower(trim($charset)) == "charset=utf-8") {
-                $utf8 = true;
-              }
-            }
-          }
-          if ($charset && strpos(strtolower($charset), 'utf-8')) {
-            $utf8 = true;
-          } else {
-            $charset = mb_detect_encoding($content);
-            if (strpos(strtolower($charset), 'utf-8')) {
-              $utf8 = true;
-            }
-          }
-          if (!$utf8 && $set_utf8) {
-            $content = utf8_encode($content);
-          }
-      } else {
-          $data = array('status' => 'warning', 'msg' => 'Content from this page cannot be loaded.  Please enable \"allow_url_open\" in php.ini.');
-          echo json_encode($data);
-          die();
-      }
-      if (!$get_http_status) {
-         return $content;
-      } else {
-         return array('content' => $content, 'http_status' => $http_status);
-      }
-  }
-
-  public function getContents() {
-    $this->download();
+    public function getCloneContents()
+    {
+        $this->download();
+
+        if (strlen($this->data) > 3) {
+            // prepare some data before getting contents
+            $this->title = $this->getTitle();
+            $this->keywords = $this->getKeywords();
+
+            // get the contents
+            return $this->cloneElements();
+        } else {
+            return false;
+        }
+    }
+
+    private function getTitle()
+    {
+        $this->parseDom();
+
+        $title = $this->xpath->query('//title')->item(0)->nodeValue;
+
+        return $title;
+    }
+
+    private function getKeywords()
+    {
+        // Get the 'content' attribute value in a <meta name="keywords" ... />
+        $matches = array();
+        $max_count = get_option("expresscurate_max_tags", 3);
+        // Search for <meta name="keywords" content="keyword1, keword2" />
+        preg_match('/<meta.*?name=("|\')keywords("|\').*?content=("|\')(.*?)("|\')/i', $this->data, $matches);
+        if (count($matches) > 4) {
+            return array_filter(explode(",", trim($matches[4])));
+        }
+
+        // Order of attributes could be swapped around: <meta content="keyword1, keword2" name="keywords" />
+        preg_match('/<meta.*?content=("|\')(.*?)("|\').*?name=("|\')keywords("|\')/i', $this->data, $matches);
+        if (count($matches) > 2) {
+            return array_filter(explode(",", trim($matches[2])));
+        }
+
+        // No match
+        return null;
+    }
+
+    private function getDescription()
+    {
+        // Get the 'content' attribute value in a <meta name="description" ... />
+        $matches = array();
+
+        // Search for <meta name="description" content="Buy my stuff" />
+        preg_match('/<meta.*?name=("|\')description("|\').*?content=("|\')(.*?)("|\')/i', $this->data, $matches);
+        if (count($matches) > 4) {
+            return $matches[4];
+        }
+
+        // Order of attributes could be swapped around: <meta content="Buy my stuff" name="description" />
+        preg_match('/<meta.*?content=("|\')(.*?)("|\').*?name=("|\')description("|\')/i', $this->data, $matches);
+        if (count($matches) > 2) {
+            return $matches[2];
+        }
+
+        // No match
+        return null;
+    }
+
+    private function getElementsByTags()
+    {
+        $this->parseDom();
+        $this->parseArticle();
+
+        // TODO make sure this cleanup can be done earlier or later, or maybe shall not affect the base dom with original html at all
+
+        $result_images = array();
+        $result_paragraphs = array();
+        $result_h1 = '';
+        $result_h2 = '';
+        $result_h3 = '';
+
+
+        // TODO this is a new xpath with the new modified dom, not sure if this is required if dom is passed with a reference
+        $imgTags = $this->xpath->query(".//img",$this->article);
+        $i = 0;
+        foreach ($imgTags as $t) {
+            $src = $t->getAttribute('src');
+            if (strlen($src) > 3) {
+                if (strpos($src, 'http://') !== false || strpos($src, 'https://') !== false) {
+                    $src = $src;
+                } else if (strpos($src, '//') === 0) {
+                    if (isset($this->fragment)) {
+                        $src = $this->fragment . $src;
+                    } else {
+                        $src = $this->protocol . ":" . $src;
+                    }
+                } elseif (strpos($src, '/') === 0) {
+                    $src = $this->domain . $src;
+                } else {
+                    $src = $this->path . $src;
+                }
+
+                $src = preg_replace('%([^:])([/]{2,})%', '\\1/', $src);
+
+                if (!in_array($src, $result_images)) {
+                    $result_images[] = ($src);
+                }
+                $i++;
+            }
+            $t->parentNode->removeChild($t);
+        }
+        //get H1
+        $h1Tag = $this->xpath->query(".//h1",$this->article);
+        foreach ($h1Tag as $h1) {
+            if (strlen($h1->nodeValue) > 3) {
+                $result_h1 .= $h1->nodeValue . "\n";
+            }
+            $h1->parentNode->removeChild($h1);
+        }
+        //get H2
+        $h2Tag = $this->xpath->query(".//h2",$this->article);
+        foreach ($h2Tag as $h2) {
+            if (strlen($h2->nodeValue) > 3) {
+                $result_h2 .= $h2->nodeValue . "\n";
+            }
+            $h2->parentNode->removeChild($h2);
+        }
+        //get H3
+        $h3Tag = $this->xpath->query(".//h3",$this->article);
+        foreach ($h3Tag as $h3) {
+            if (strlen($h3->nodeValue) > 3) {
+                $result_h3 .= $h3->nodeValue . "\n";
+            }
+            $h3->parentNode->removeChild($h3);
+        }
+        //get text
+        /*$i = 0;
+        $articleTags = $this->xpath->query('/html/body/article');
+        foreach ($articleTags as $t) {
+            $result_paragraphs[$i]['value'] = strip_tags(trim($t->nodeValue));
+            $result_paragraphs[$i]['tag'] = 'article';
+            $t->parentNode->removeChild($t);
+            $i++;
+        }*/
+
+
+        $textTags = $this->xpath->query('//text()',$this->article);
+        foreach ($textTags as $t) {
+            if ($t->length > 15 && $t->parentNode->tagName != 'a' && $t->parentNode->tagName != 'h1' && $t->parentNode->tagName != 'h2' && $t->parentNode->tagName != 'h3') {
+                if ($t->parentNode->nodeName == "blockquote" || $t->parentNode->parentNode->nodeName == "blockquote" || $t->parentNode->parentNode->parentNode->nodeName == "blockquote") {
+                    if ($t->parentNode->nodeName == "blockquote") {
+                        $result_paragraphs[$i]['value'] = strip_tags($t->parentNode->nodeValue);
+                    } elseif ($t->parentNode->parentNode && $t->parentNode->parentNode->nodeName == "blockquote") {
+                        $result_paragraphs[$i]['value'] = strip_tags($t->parentNode->parentNode->nodeValue);
+                    } elseif ($t->parentNode->parentNode->parentNode && $t->parentNode->parentNode->parentNode->nodeName == "blockquote") {
+                        $result_paragraphs[$i]['value'] = strip_tags($t->parentNode->parentNode->parentNode->nodeValue);
+                    }
+                    $result_paragraphs[$i]['tag'] = "blockquote";
+                } else {
+                    $result_paragraphs[$i]['value'] = strip_tags($t->nodeValue);
+                    $result_paragraphs[$i]['tag'] = $t->parentNode->nodeName;
+                }
+                $i++;
+            }
+        }
+
+        //author
+        $article_author = '';
+        $author = $this->xpath->query('.//*[@rel="author"][1]',$this->article)->item(0);
+        if ($author) {
+            $article_author = $author->nodeValue;
+        }
+        //date
+        $article_date = '';
+        $date = $this->xpath->query('.//*[@datetime][1]',$this->article)->item(0);
+        if ($date) {
+            $article_date = $date->nodeValue;
+        }
+
+
+        //smart tags
+        $max_count = get_option("expresscurate_max_tags", 3);
+        $smart_tags = array();
+
+        $defined_tags = get_option("expresscurate_defined_tags", '');
+        if ($defined_tags) {
+            $defined_tags = explode(",", $defined_tags);
+            foreach ($defined_tags as $tag) {
+                $tag = trim($tag);
+                $count = $this->countMatches($tag);
+                if ($count > 0) {
+                    $smart_tags[$tag] = $count;
+                }
+            }
+        }
+
+        if (count($this->keywords)) {
+            foreach ($this->keywords as $key => $keyword) {
+                $count = $this->countMatches($key);
+                if ($count > 0) {
+                    $smart_tags[$keyword] = $count;
+                }
+            }
+        }
+
+        if (count($smart_tags) > 0) {
+            arsort($smart_tags);
+            $smart_tags = array_slice(array_keys(array_reverse($smart_tags)), 0, $max_count);
+        }
+
+        $result_paragraphs_unique = $this->arrayUnique($result_paragraphs);
+        $media = $this->containsMedia();
+
+        $result = array(
+            'title' => $this->title,
+            'headings' => array('h1' => $result_h1, 'h2' => $result_h2, 'h3' => $result_h3),
+            'metas' => array('description' => $this->description, 'keywords' => $smart_tags),
+            'images' => $result_images,
+            'media' => $media,
+            'paragraphs' => $result_paragraphs_unique,
+            'author' => $article_author,
+            'date' => $article_date,
+            'domain' => $this->domain);
+        $data = array('status' => 'success', 'result' => $result);
+        return $data;
+    }
     
-    if (strlen($this->data) > 3) {
-      // prepare some data before getting contents
-      $this->title = $this->getTitle();
-      $this->keywords = $this->getKeywords();
-      $this->description = $this->getDescription();
-      
-      // get the contents
-      return $this->getElementsByTags();
-    } else {
-      return false;
-    }
-  }
-  
-  private function getTitle() {
-    $this->parseDom();
-    
-    $title = $this->xpath->query('//title')->item(0)->nodeValue;
-    
-    return $title;
-  }
-  
-  private function getKeywords() {
-    // Get the 'content' attribute value in a <meta name="keywords" ... />
-    $matches = array();
-    $max_count = get_option("expresscurate_max_tags", 3);
-    // Search for <meta name="keywords" content="keyword1, keword2" />
-    preg_match('/<meta.*?name=("|\')keywords("|\').*?content=("|\')(.*?)("|\')/i', $this->data, $matches);
-    if (count($matches) > 4) {
-      return array_filter(explode(",", trim($matches[4])));
-    }
-
-    // Order of attributes could be swapped around: <meta content="keyword1, keword2" name="keywords" />
-    preg_match('/<meta.*?content=("|\')(.*?)("|\').*?name=("|\')keywords("|\')/i', $this->data, $matches);
-    if (count($matches) > 2) {
-        return array_filter(explode(",", trim($matches[2])));
-    }
-
-    // No match
-    return null;
-  }
-  
-  private function getDescription() {
-    // Get the 'content' attribute value in a <meta name="description" ... />
-    $matches = array();
-
-    // Search for <meta name="description" content="Buy my stuff" />
-    preg_match('/<meta.*?name=("|\')description("|\').*?content=("|\')(.*?)("|\')/i', $this->data, $matches);
-    if (count($matches) > 4) {
-      return $matches[4];
-    }
-
-    // Order of attributes could be swapped around: <meta content="Buy my stuff" name="description" />
-    preg_match('/<meta.*?content=("|\')(.*?)("|\').*?name=("|\')description("|\')/i', $this->data, $matches);
-    if (count($matches) > 2) {
-      return $matches[2];
-    }
-
-    // No match
-    return null;
-  }
-
-  private function getElementsByTags() {
-    $this->parseDom();
-
-    // TODO make sure this cleanup can be done earlier or later, or maybe shall not affect the base dom with original html at all
-    
-    $result_images = array();
-    $result_paragraphs = array();
-    $result_h1 = '';
-    $result_h2 = '';
-    $result_h3 = '';
-    
-    // TODO this is a new xpath with the new modified dom, not sure if this is required if dom is passed with a reference
-    $imgTags = $this->xpath->query("//img");
-    $i = 0;
-    foreach ($imgTags as $t) {
-      $src = $t->getAttribute('src');
-      if (strlen($src) > 3) {
-        if (strpos($src, 'http://') !== false || strpos($src, 'https://') !== false) {
-          $src = $src;
-        } else if (strpos($src, '//') === 0) {
-          if(isset($this->fragment)) {
-              $src = $this->fragment . $src;
-          }
-          else{
-              $src = $this->protocol . ":" . $src;
-          }
-        } elseif (strpos($src, '/') === 0) {
-          $src = $this->domain . $src;
-        } else {
-          $src = $this->path . $src;
-        }
-
-        $src = preg_replace('%([^:])([/]{2,})%', '\\1/', $src);
-
-        if (!in_array($src, $result_images)) {
-          $result_images[] = ($src);
-        }
-        $i++;
-      }
-      $t->parentNode->removeChild($t);
-    }
-    //get H1
-    $h1Tag = $this->xpath->query('//h1');
-    foreach ($h1Tag as $h1) {
-      if (strlen($h1->nodeValue) > 3) {
-        $result_h1 .= $h1->nodeValue . "\n";
-      }
-      $h1->parentNode->removeChild($h1);
-    }
-    //get H2
-    $h2Tag = $this->xpath->query('//h2');
-    foreach ($h2Tag as $h2) {
-      if (strlen($h2->nodeValue) > 3) {
-        $result_h2 .= $h2->nodeValue . "\n";
-      }
-      $h2->parentNode->removeChild($h2);
-    }
-    //get H3
-    $h3Tag = $this->xpath->query('//h3');
-    foreach ($h3Tag as $h3) {
-      if (strlen($h3->nodeValue) > 3) {
-        $result_h3 .= $h3->nodeValue . "\n";
-      }
-      $h3->parentNode->removeChild($h3);
-    }
-    //get text
-    $i = 0;
-    $articleTags = $this->xpath->query('/html/body/article');
-    foreach ($articleTags as $t) {
-      $result_paragraphs[$i]['value'] = strip_tags(trim($t->nodeValue));
-      $result_paragraphs[$i]['tag'] = 'article';
-      $t->parentNode->removeChild($t);
-      $i++;
-    }
-
-
-    $textTags = $this->xpath->query('/html/body//text()');
-
-    foreach ($textTags as $t) {
-      if ($t->length > 15 && $t->parentNode->tagName != 'a' && $t->parentNode->tagName != 'h1' && $t->parentNode->tagName != 'h2' && $t->parentNode->tagName != 'h3') {
-        if ($t->parentNode->nodeName == "blockquote" || $t->parentNode->parentNode->nodeName == "blockquote" || $t->parentNode->parentNode->parentNode->nodeName == "blockquote") {
-          if ($t->parentNode->nodeName == "blockquote") {
-            $result_paragraphs[$i]['value'] = strip_tags($t->parentNode->nodeValue);
-          } elseif ($t->parentNode->parentNode && $t->parentNode->parentNode->nodeName == "blockquote") {
-            $result_paragraphs[$i]['value'] = strip_tags($t->parentNode->parentNode->nodeValue);
-          } elseif ($t->parentNode->parentNode->parentNode && $t->parentNode->parentNode->parentNode->nodeName == "blockquote") {
-            $result_paragraphs[$i]['value'] = strip_tags($t->parentNode->parentNode->parentNode->nodeValue);
-          }
-          $result_paragraphs[$i]['tag'] = "blockquote";
-        } else {
-          $result_paragraphs[$i]['value'] = strip_tags($t->nodeValue);
-          $result_paragraphs[$i]['tag'] = $t->parentNode->nodeName;
-        }
-        $i++;
-      }
-    }
-    //author
-    $article_author = '';
-    $author = $this->xpath->query('//*[@rel="author"][1]')->item(0);
-    if ($author) {
-      $article_author = $author->nodeValue;
-    }
-    //date
-    $article_date = '';
-    $date = $this->xpath->query('//*[@datetime][1]')->item(0);
-    if ($date) {
-      $article_date = $date->nodeValue;
-    }
-
-
-    //smart tags
-    $max_count = get_option("expresscurate_max_tags", 3);
-    $smart_tags = array();
-
-    $defined_tags = get_option("expresscurate_defined_tags", '');
-    if ($defined_tags) {
-      $defined_tags = explode(",", $defined_tags);
-      foreach ($defined_tags as $tag) {
-        $tag = trim($tag);
-        $count = $this->countMatches($tag);
-        if ($count > 0) {
-          $smart_tags[$tag] = $count;
-        }
-      }
-    }
-
-    if (count($this->keywords)) {
-      foreach ($this->keywords as $key => $keyword) {
-        $count = $this->countMatches($key);
-        if ($count > 0) {
-          $smart_tags[$keyword] = $count;
-        }
-      }
-    }
-
-    if (count($smart_tags) > 0) {
-      arsort($smart_tags);
-      $smart_tags = array_slice(array_keys(array_reverse($smart_tags)), 0, $max_count);
-    }
-    
-    $result_paragraphs_unique = $this->arrayUnique($result_paragraphs);
-    $media = $this->containsMedia();
-    
-    $result = array(
-        'title'      => $this->title,
-        'headings'   => array('h1' => $result_h1, 'h2' => $result_h2, 'h3' => $result_h3),
-        'metas'      => array('description' => $this->description, 'keywords' => $smart_tags),
-        'images'     => $result_images,
-        'media'      => $media,
-        'paragraphs' => $result_paragraphs_unique,
-        'author'     => $article_author,
-        'date'       => $article_date,
-        'domain'     => $this->domain);
-    $data = array('status' => 'success', 'result' => $result);
-    return $data;
-  }
-
-  private function countMatches($keyword) {
-      $total_occurrence = 0;
-      $tag_in_title = array();
-      $tag_in_content = array();
-      preg_match_all("/(?<!\w)(?=[^>]*(<|$))" . $keyword . "/i", $this->title, $tag_in_title);
-      preg_match_all("/(?<!\w)(?=[^>]*(<|$))" . $keyword . "/i", $this->data, $tag_in_content);
-      $total_occurrence = count($tag_in_title[0]) + count($tag_in_content[0]);
-      return $total_occurrence;
-  }
-
-  private function arrayUnique($array, $preserveKeys = false) {
-    // Unique Array for return
-    $arrayRewrite = array();
-    // Array with the md5 hashes
-    $arrayHashes = array();
-    foreach ($array as $key => $item) {
-      // Serialize the current element and create a md5 hash
-      $hash = md5(serialize($item));
-      // If the md5 didn't come up yet, add the element to
-      // to arrayRewrite, otherwise drop it
-      if (!isset($arrayHashes[$hash])) {
-        // Save the current element hash
-        $arrayHashes[$hash] = $hash;
-        // Add element to the unique Array
-        if ($preserveKeys) {
-          $arrayRewrite[$key] = $item;
-        } else {
-          $arrayRewrite[] = $item;
-        }
-      }
-    }
-    return $arrayRewrite;
-  }
-
-  public function analyzeKeywords() {
-      $keywordsString =  get_option('expresscurate_defined_tags');
-      $blogKeywords = !empty($keywordsString) ? explode(', ', $keywordsString) : array();
-      
-      $this->download();
-      $this->parseDom();
-      $this->parseArticle();
-      
-      $title = $this->dom->getElementsByTagName('h1')->item(0)->nodeValue;
-      $titleArray = preg_split('/\s+/u', $title);
-
-      $article = strip_tags($this->article->nodeValue);
-      $articleFiltered = preg_replace('/\b(a|able|about|above|abroad|according|accordingly|across|actually|adj|after|afterwards|again|against|ago|ahead|ain\'t|all|allow|allows|almost|alone|along|alongside|already|also|although|always|am|amid|amidst|among|amongst|an|and|another|any|anybody|anyhow|anyone|anything|anyway|anyways|anywhere|apart|appear|appreciate|appropriate|are|aren\'t|around|as|a\'s|aside|ask|asking|associated|at|available|away|awfully|b|back|backward|backwards|be|became|because|become|becomes|becoming|been|before|beforehand|begin|behind|being|believe|below|beside|besides|best|better|between|beyond|both|brief|but|by|c|came|can|cannot|cant|can\'t|caption|cause|causes|certain|certainly|changes|clearly|c\'mon|co|co.|com|come|comes|concerning|consequently|consider|considering|contain|containing|contains|corresponding|could|couldn\'t|course|c\'s|currently|d|dare|daren\'t|definitely|described|despite|did|didn\'t|different|directly|do|does|doesn\'t|doing|done|don\'t|down|downwards|during|e|each|edu|eg|eight|eighty|either|else|elsewhere|end|ending|enough|entirely|especially|et|etc|even|ever|evermore|every|everybody|everyone|everything|everywhere|ex|exactly|example|except|f|fairly|far|farther|few|fewer|fifth|first|five|followed|following|follows|for|forever|former|formerly|forth|forward|found|four|from|further|furthermore|g|get|gets|getting|given|gives|go|goes|going|gone|got|gotten|greetings|h|had|hadn\'t|half|happens|hardly|has|hasn\'t|have|haven\'t|having|he|he\'d|he\'ll|hello|help|hence|her|here|hereafter|hereby|herein|here\'s|hereupon|hers|herself|he\'s|hi|him|himself|his|hither|hopefully|how|howbeit|however|hundred|i|i\'d|ie|if|ignored|i\'ll|i\'m|immediate|in|inasmuch|inc|inc.|indeed|indicate|indicated|indicates|inner|inside|insofar|instead|into|inward|is|isn\'t|it|it\'d|it\'ll|its|it\'s|itself|i\'ve|j|just|k|keep|keeps|kept|know|known|knows|l|last|lately|later|latter|latterly|least|less|lest|let|let\'s|like|liked|likely|likewise|little|look|looking|looks|low|lower|ltd|m|made|mainly|make|makes|many|may|maybe|mayn\'t|me|mean|meantime|meanwhile|merely|might|mightn\'t|mine|minus|miss|more|moreover|most|mostly|mr|mrs|much|must|mustn\'t|my|myself|n|name|namely|nd|near|nearly|necessary|need|needn\'t|needs|neither|never|neverf|neverless|nevertheless|new|next|nine|ninety|no|nobody|non|none|nonetheless|noone|no-one|nor|normally|not|nothing|notwithstanding|novel|now|nowhere|o|obviously|of|off|often|oh|ok|okay|old|on|once|one|ones|one\'s|only|onto|opposite|or|other|others|otherwise|ought|oughtn\'t|our|ours|ourselves|out|outside|over|overall|own|p|particular|particularly|past|per|perhaps|placed|please|plus|possible|presumably|probably|provided|provides|q|que|quite|qv|r|rather|rd|re|really|reasonably|recent|recently|regarding|regardless|regards|relatively|respectively|right|round|s|said|same|saw|say|saying|says|second|secondly|see|seeing|seem|seemed|seeming|seems|seen|self|selves|sensible|sent|serious|seriously|seven|several|shall|shan\'t|she|she\'d|she\'ll|she\'s|should|shouldn\'t|since|six|so|some|somebody|someday|somehow|someone|something|sometime|sometimes|somewhat|somewhere|soon|sorry|specified|specify|specifying|still|sub|such|sup|sure|t|take|taken|taking|tell|tends|th|than|thank|thanks|thanx|that|that\'ll|thats|that\'s|that\'ve|the|their|theirs|them|themselves|then|thence|there|thereafter|thereby|there\'d|therefore|therein|there\'ll|there\'re|theres|there\'s|thereupon|there\'ve|these|they|they\'d|they\'ll|they\'re|they\'ve|thing|things|think|third|thirty|this|thorough|thoroughly|those|though|three|through|throughout|thru|thus|till|to|together|too|took|toward|towards|tried|tries|truly|try|trying|t\'s|twice|two|u|un|under|underneath|undoing|unfortunately|unless|unlike|unlikely|until|unto|up|upon|upwards|us|use|used|useful|uses|using|usually|v|value|various|versus|very|via|viz|vs|w|want|wants|was|wasn\'t|way|we|we\'d|welcome|well|we\'ll|went|were|we\'re|weren\'t|we\'ve|what|whatever|what\'ll|what\'s|what\'ve|when|whence|whenever|where|whereafter|whereas|whereby|wherein|where\'s|whereupon|wherever|whether|which|whichever|while|whilst|whither|who|who\'d|whoever|whole|who\'ll|whom|whomever|who\'s|whose|why|will|willing|wish|with|within|without|wonder|won\'t|would|wouldn\'t|x|y|yes|yet|you|you\'d|you\'ll|your|you\'re|yours|yourself|yourselves|you\'ve|z|zero, replacement)\\b/','', $article);
-      $articleFiltered = preg_replace('/\p{P}+/u',' ',$articleFiltered);
-      $articleArray = preg_split('/\s+/u', $articleFiltered);
-      $articleWordsCount = count($articleArray);
-
-      $result = array();
-
-      foreach($blogKeywords as $keyword) {
-          $count = 0;
-          $inTitle = 'No';
-
-          if (in_array(mb_strtolower($keyword), $articleArray)) {
-              $count++;
-          }
-          foreach($titleArray as $titleWord) {
-              if (mb_strtolower($titleWord) == mb_strtolower($keyword)) {
-                  $inTitle = 'Yes';
-                  break;
-              }
-          }
-          if($count !== 0) {
-              $result[$keyword] = array('percent' => round($count/$articleWordsCount, 4), 'title' => $inTitle);
-          }
-      }
-
-      return $result;
-  }
-
-   public function containsMedia() {
-       $this->parseDom();
-       
-       $imgTags = $this->xpath->query("//img");
-       $img_array = array();
-       foreach ($imgTags as $t) {
-           $src = $t->getAttribute('src');
-           $img_array[] = $src;
-       }
-       $obj = $this->xpath->query("//node()[(name()='iframe' or name()='video' or name()='source' or name()= 'object' or name()='embed') and (contains(@src,'youtube.com') or contains(@src ,'vimeo.com') or contains(@src,'youtu.be'))]");
-       $videoArrays = array();
-       foreach($obj as $objs) {
-           array_push($videoArrays,$objs->getAttribute('src'));
-       }
-       $mediaTags = array("images"=>count($img_array),"videos"=>count($videoArrays));
-       return $mediaTags;
-   }
+    private function cloneElements()
+    {
+        $this->parseDom();
+        $this->parseArticle();
+
+        // TODO make sure this cleanup can be done earlier or later, or maybe shall not affect the base dom with original html at all
+
+        $result_images = array();
+        $imgTags = $this->xpath->query(".//img", $this->article);
+        $i = 0;
+        foreach ($imgTags as $t) {
+            $src = $t->getAttribute('src');
+            if (strlen($src) > 3) {
+                if (strpos($src, 'http://') !== false || strpos($src, 'https://') !== false) {
+                    $src = $src;
+                } else if (strpos($src, '//') === 0) {
+                    if (isset($this->fragment)) {
+                        $src = $this->fragment . $src;
+                    } else {
+                        $src = $this->protocol . ":" . $src;
+                    }
+                } elseif (strpos($src, '/') === 0) {
+                    $src = $this->domain . $src;
+                } else {
+                    $src = $this->path . $src;
+                }
+
+                $src = preg_replace('%([^:])([/]{2,})%', '\\1/', $src);
+
+                if (!in_array($src, $result_images)) {
+                    $result_images[] = ($src);
+                }
+                $i++;
+            }
+            $t->parentNode->removeChild($t);
+        }
+        
+        //smart tags
+        $max_count = get_option("expresscurate_max_tags", 3);
+        $smart_tags = array();
+
+        $defined_tags = get_option("expresscurate_defined_tags", '');
+        if ($defined_tags) {
+            $defined_tags = explode(",", $defined_tags);
+            foreach ($defined_tags as $tag) {
+                $tag = trim($tag);
+                $count = $this->countMatches($tag);
+                if ($count > 0) {
+                    $smart_tags[$tag] = $count;
+                }
+            }
+        }
+
+        if (count($this->keywords)) {
+            foreach ($this->keywords as $key => $keyword) {
+                $count = $this->countMatches($key);
+                if ($count > 0) {
+                    $smart_tags[$keyword] = $count;
+                }
+            }
+        }
+
+        if (count($smart_tags) > 0) {
+            arsort($smart_tags);
+            $smart_tags = array_slice(array_keys(array_reverse($smart_tags)), 0, $max_count);
+        }
+
+        $comments = $this->xpath->query(".//comment()",$this->article);
+        foreach($comments as $cmnt){
+            $cmnt->parentNode->removeChild($cmnt);
+        }
+        $h1Tag = $this->xpath->query(".//h1",$this->article);
+        foreach ($h1Tag as $h1) {
+            $h1->parentNode->removeChild($h1);
+        }
+        $input = $this->xpath->query(".//node()[name()='iframe' or name()='input' or name()='button' or name='textarea' or name()='form']",$this->article);
+        foreach ($input as $inp) {
+            $inp->parentNode->removeChild($inp);
+        }
+
+
+        $articleContent = $this->dom->saveXML($this->article);
+        $result = array(
+            'title' => $this->title,
+            'content'=> $articleContent,
+            'metas' => array('keywords' => $smart_tags),
+            'images' => $result_images,
+            'domain' => $this->domain);
+        $data = array('status' => 'success', 'result' => $result);
+        return $data;
+    }
+
+    private function countMatches($keyword)
+    {
+        $total_occurrence = 0;
+        $tag_in_title = array();
+        $tag_in_content = array();
+        preg_match_all("/(?<!\w)(?=[^>]*(<|$))" . $keyword . "/i", $this->title, $tag_in_title);
+        preg_match_all("/(?<!\w)(?=[^>]*(<|$))" . $keyword . "/i", $this->data, $tag_in_content);
+        $total_occurrence = count($tag_in_title[0]) + count($tag_in_content[0]);
+        return $total_occurrence;
+    }
+
+    private function arrayUnique($array, $preserveKeys = false)
+    {
+        // Unique Array for return
+        $arrayRewrite = array();
+        // Array with the md5 hashes
+        $arrayHashes = array();
+        foreach ($array as $key => $item) {
+            // Serialize the current element and create a md5 hash
+            $hash = md5(serialize($item));
+            // If the md5 didn't come up yet, add the element to
+            // to arrayRewrite, otherwise drop it
+            if (!isset($arrayHashes[$hash])) {
+                // Save the current element hash
+                $arrayHashes[$hash] = $hash;
+                // Add element to the unique Array
+                if ($preserveKeys) {
+                    $arrayRewrite[$key] = $item;
+                } else {
+                    $arrayRewrite[] = $item;
+                }
+            }
+        }
+        return $arrayRewrite;
+    }
+
+    public function analyzeKeywords()
+    {
+        $keywordsString = get_option('expresscurate_defined_tags');
+        $blogKeywords = !empty($keywordsString) ? explode(', ', $keywordsString) : array();
+
+        $this->download();
+        $this->parseDom();
+        $this->parseArticle();
+
+        $title = $this->dom->getElementsByTagName('h1')->item(0)->nodeValue;
+        $titleArray = preg_split('/\s+/u', $title);
+
+        $article = strip_tags($this->article->nodeValue);
+        $articleFiltered = preg_replace('/\b(a|able|about|above|abroad|according|accordingly|across|actually|adj|after|afterwards|again|against|ago|ahead|ain\'t|all|allow|allows|almost|alone|along|alongside|already|also|although|always|am|amid|amidst|among|amongst|an|and|another|any|anybody|anyhow|anyone|anything|anyway|anyways|anywhere|apart|appear|appreciate|appropriate|are|aren\'t|around|as|a\'s|aside|ask|asking|associated|at|available|away|awfully|b|back|backward|backwards|be|became|because|become|becomes|becoming|been|before|beforehand|begin|behind|being|believe|below|beside|besides|best|better|between|beyond|both|brief|but|by|c|came|can|cannot|cant|can\'t|caption|cause|causes|certain|certainly|changes|clearly|c\'mon|co|co.|com|come|comes|concerning|consequently|consider|considering|contain|containing|contains|corresponding|could|couldn\'t|course|c\'s|currently|d|dare|daren\'t|definitely|described|despite|did|didn\'t|different|directly|do|does|doesn\'t|doing|done|don\'t|down|downwards|during|e|each|edu|eg|eight|eighty|either|else|elsewhere|end|ending|enough|entirely|especially|et|etc|even|ever|evermore|every|everybody|everyone|everything|everywhere|ex|exactly|example|except|f|fairly|far|farther|few|fewer|fifth|first|five|followed|following|follows|for|forever|former|formerly|forth|forward|found|four|from|further|furthermore|g|get|gets|getting|given|gives|go|goes|going|gone|got|gotten|greetings|h|had|hadn\'t|half|happens|hardly|has|hasn\'t|have|haven\'t|having|he|he\'d|he\'ll|hello|help|hence|her|here|hereafter|hereby|herein|here\'s|hereupon|hers|herself|he\'s|hi|him|himself|his|hither|hopefully|how|howbeit|however|hundred|i|i\'d|ie|if|ignored|i\'ll|i\'m|immediate|in|inasmuch|inc|inc.|indeed|indicate|indicated|indicates|inner|inside|insofar|instead|into|inward|is|isn\'t|it|it\'d|it\'ll|its|it\'s|itself|i\'ve|j|just|k|keep|keeps|kept|know|known|knows|l|last|lately|later|latter|latterly|least|less|lest|let|let\'s|like|liked|likely|likewise|little|look|looking|looks|low|lower|ltd|m|made|mainly|make|makes|many|may|maybe|mayn\'t|me|mean|meantime|meanwhile|merely|might|mightn\'t|mine|minus|miss|more|moreover|most|mostly|mr|mrs|much|must|mustn\'t|my|myself|n|name|namely|nd|near|nearly|necessary|need|needn\'t|needs|neither|never|neverf|neverless|nevertheless|new|next|nine|ninety|no|nobody|non|none|nonetheless|noone|no-one|nor|normally|not|nothing|notwithstanding|novel|now|nowhere|o|obviously|of|off|often|oh|ok|okay|old|on|once|one|ones|one\'s|only|onto|opposite|or|other|others|otherwise|ought|oughtn\'t|our|ours|ourselves|out|outside|over|overall|own|p|particular|particularly|past|per|perhaps|placed|please|plus|possible|presumably|probably|provided|provides|q|que|quite|qv|r|rather|rd|re|really|reasonably|recent|recently|regarding|regardless|regards|relatively|respectively|right|round|s|said|same|saw|say|saying|says|second|secondly|see|seeing|seem|seemed|seeming|seems|seen|self|selves|sensible|sent|serious|seriously|seven|several|shall|shan\'t|she|she\'d|she\'ll|she\'s|should|shouldn\'t|since|six|so|some|somebody|someday|somehow|someone|something|sometime|sometimes|somewhat|somewhere|soon|sorry|specified|specify|specifying|still|sub|such|sup|sure|t|take|taken|taking|tell|tends|th|than|thank|thanks|thanx|that|that\'ll|thats|that\'s|that\'ve|the|their|theirs|them|themselves|then|thence|there|thereafter|thereby|there\'d|therefore|therein|there\'ll|there\'re|theres|there\'s|thereupon|there\'ve|these|they|they\'d|they\'ll|they\'re|they\'ve|thing|things|think|third|thirty|this|thorough|thoroughly|those|though|three|through|throughout|thru|thus|till|to|together|too|took|toward|towards|tried|tries|truly|try|trying|t\'s|twice|two|u|un|under|underneath|undoing|unfortunately|unless|unlike|unlikely|until|unto|up|upon|upwards|us|use|used|useful|uses|using|usually|v|value|various|versus|very|via|viz|vs|w|want|wants|was|wasn\'t|way|we|we\'d|welcome|well|we\'ll|went|were|we\'re|weren\'t|we\'ve|what|whatever|what\'ll|what\'s|what\'ve|when|whence|whenever|where|whereafter|whereas|whereby|wherein|where\'s|whereupon|wherever|whether|which|whichever|while|whilst|whither|who|who\'d|whoever|whole|who\'ll|whom|whomever|who\'s|whose|why|will|willing|wish|with|within|without|wonder|won\'t|would|wouldn\'t|x|y|yes|yet|you|you\'d|you\'ll|your|you\'re|yours|yourself|yourselves|you\'ve|z|zero, replacement)\\b/', '', $article);
+        $articleFiltered = preg_replace('/\p{P}+/u', ' ', $articleFiltered);
+        $articleArray = preg_split('/\s+/u', $articleFiltered);
+        $articleWordsCount = count($articleArray);
+
+        $result = array();
+
+        foreach ($blogKeywords as $keyword) {
+            $count = 0;
+            $inTitle = 'No';
+
+            if (in_array(mb_strtolower($keyword), $articleArray)) {
+                $count++;
+            }
+            foreach ($titleArray as $titleWord) {
+                if (mb_strtolower($titleWord) == mb_strtolower($keyword)) {
+                    $inTitle = 'Yes';
+                    break;
+                }
+            }
+            if ($count !== 0) {
+                $result[$keyword] = array('percent' => round($count / $articleWordsCount, 4), 'title' => $inTitle);
+            }
+        }
+
+        return $result;
+    }
+
+    public function containsMedia()
+    {
+        $this->parseDom();
+
+        $imgTags = $this->xpath->query("//img");
+        $img_array = array();
+        foreach ($imgTags as $t) {
+            $src = $t->getAttribute('src');
+            $img_array[] = $src;
+        }
+        $obj = $this->xpath->query("//node()[(name()='iframe' or name()='video' or name()='source' or name()= 'object' or name()='embed') and (contains(@src,'youtube.com') or contains(@src ,'vimeo.com') or contains(@src,'youtu.be'))]");
+        $videoArrays = array();
+        foreach ($obj as $objs) {
+            array_push($videoArrays, $objs->getAttribute('src'));
+        }
+        $mediaTags = array("images" => count($img_array), "videos" => count($videoArrays));
+        return $mediaTags;
+    }
 }
 

expresscurate/trunk/ExpressCurate_Keywords.php

@@ -1 +1 @@
 <?php
+
 require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
 

expresscurate/trunk/ExpressCurate_Sitemap.php

@@ -1 +1 @@
 <?php
+
 require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
-/**
- * Created by PhpStorm.
- * User: armen
- * Date: 10/9/14
- * Time: 2:39 PM
+
+/*
+  Author: ExpressCurate
+  Author URI: http://www.expresscurate.com
+  License: GPLv3 or later
+  License URI: http://www.gnu.org/licenses/gpl.html
  */
+ 
 class ExpressCurate_Sitemap
 {

expresscurate/trunk/ExpressCurate_Tags.php

@@ -3 +3 @@
 require_once(sprintf("%s/autoload.php", dirname(__FILE__)));
 
+/*
+  Author: ExpressCurate
+  Author URI: http://www.expresscurate.com
+  License: GPLv3 or later
+  License URI: http://www.gnu.org/licenses/gpl.html
+ */
+
 class Expresscurate_Tags
 {
-
     private function checkOpenTag($matches)
     {
@@ -47 +53 @@
         return preg_replace($spans, '$1', $html);
     }
-
-
 }

expresscurate/trunk/autoload.php

@@ -1 +1 @@
 <?php
+
+/*
+  Author: ExpressCurate
+  Author URI: http://www.expresscurate.com
+  License: GPLv3 or later
+  License URI: http://www.gnu.org/licenses/gpl.html
+ */
+
 function expresscurate_autoload($className) {
     $classFile =  sprintf("%s/$className", dirname(__FILE__));

expresscurate/trunk/css/dialog-style-3.9.css

@@ +1 @@
+div[aria-describedby="expresscurate_clone_dialog"],
 div[aria-describedby="expresscurate_dialog"]{
     padding: 0 !important;
@@ -12 +13 @@
     z-index: 100090;
 }
+div[aria-describedby="expresscurate_clone_dialog"] .ui-dialog-titlebar,
 div[aria-describedby="expresscurate_dialog"] .ui-dialog-titlebar{
     padding: 0;
@@ -22 +24 @@
     background-color: #222222;
 }
+div[aria-describedby="expresscurate_clone_dialog"] .ui-dialog-title,
 div[aria-describedby="expresscurate_dialog"] .ui-dialog-title{
     display: block;
@@ -35 +38 @@
 }
 
+div[aria-describedby="expresscurate_clone_dialog"] .ui-button-icon-primary,
+div[aria-describedby="expresscurate_clone_dialog"] .ui-dialog-titlebar-close span,
 div[aria-describedby="expresscurate_dialog"] .ui-button-icon-primary,
 div[aria-describedby="expresscurate_dialog"] .ui-dialog-titlebar-close span{
@@ -40 +45 @@
 }
 
+div[aria-describedby="expresscurate_clone_dialog"] .ui-dialog-titlebar-close:before,
 div[aria-describedby="expresscurate_dialog"] .ui-dialog-titlebar-close:before{
     line-height: 13px;
 }
+div[aria-describedby="expresscurate_clone_dialog"] .ui-button.ui-dialog-titlebar-close,
 div[aria-describedby="expresscurate_dialog"] .ui-button.ui-dialog-titlebar-close{
     padding: 0;
@@ -53 +60 @@
     margin: 0 !important;
 }
+div[aria-describedby="expresscurate_clone_dialog"] .ui-dialog-titlebar-close:before,
 div[aria-describedby="expresscurate_dialog"] .ui-dialog-titlebar-close:before{
     line-height: 20px !important;
@@ -58 +66 @@
     height: 30px !important;
 }
+div[aria-describedby="expresscurate_clone_dialog"] .ui-button.ui-dialog-titlebar-close:hover,
 div[aria-describedby="expresscurate_dialog"] .ui-button.ui-dialog-titlebar-close:hover{
     color: #9d9d9d;
 }
 
-#expresscurate_dialog {
+.expresscurate_dialog {
     padding: 0;
     border:none;
@@ -76 +85 @@
     display: none;
 }
+#expresscurate_dialog_content_clone_editor{
+    height: 190px;
+    resize: none;
+    max-height: 190px;
+    overflow-y: scroll;
+}

expresscurate/trunk/css/expresscurate.css

@@ -801 +801 @@
         color:#303030;
         position: relative;
-
         box-sizing: border-box;
         -moz-box-sizing: border-box;
@@ -807 +806 @@
         width: 100%;
     }
+    .expresscurate_feedSettingsList li{
+        line-height: 16px;
+        height: 45px;
+    }
+
     .expresscurate_feedSettingsList li:hover,
     .expresscurate_URL li:hover,
@@ -828 +832 @@
 .expresscurate_feedSettingsList a{
     width: 65%;
+    margin-top: 5px;
+    font-family: OpenSans-Regular, Verdana, Geneva, sans-serif;
+}
+.expresscurate_feedSettingsList a small {
+    font-family: OpenSans-Light, Verdana, Geneva, sans-serif;
 }
         @media (max-width: 720px){
@@ -852 +861 @@
             width: 150px;
             text-align: center;
+            margin-top: 2px;
         }
         .expresscurate_URL .rssStatus{
@@ -1597 +1607 @@
 }
 
-#expresscurate_dialog {
+.expresscurate_dialog {
     display: none;
 }
@@ -1856 +1866 @@
 }
 
-#expresscurate_dialog div.mce-toolbar-grp {
+.expresscurate_dialog div.mce-toolbar-grp {
     background-color: #dbdbdb !important;
 }
@@ -1917 +1927 @@
 }
 .expresscurate_dialog .footer button.curate {
-    margin-top: 10px;
     border: 1px solid #27cfae;
     border-radius: 3px;
@@ -2616 +2625 @@
     content: ' index';
     margin-left: 25px;
+}
+.expresscurate_advancedSEO_widget input[id="expresscurate_advanced_seo_post_copy"] +label:after{
+    content: ' no';
+    margin-left: 59px;
+}
+.expresscurate_advancedSEO_widget input[id="expresscurate_advanced_seo_post_copy"]:checked +label:after{
+    content: ' yes';
+    margin-left: 33px;
 }
 .expresscurate_advancedSEO_widget input[type="checkbox"]:checked+label{
@@ -3554 +3571 @@
                 display: none;
                 right: 25px;
+                margin-top: 9px;
             }
         .expresscurate_feed_dashboard .expresscurate_feedSettingsList li:hover .close{
@@ -3690 +3708 @@
                 border: solid 1px #25bfa1;
             }
+.expresscurate_controls .check.disabled{
+    background-position: -104px 6px;
+    cursor: default;
+    border: solid 1px #dddddd;
+}
 .expresscurate_controls .check.active{
     background-position: -104px -75px;
@@ -3719 +3742 @@
                 background-position: -50px 8px;
             }
+            .expresscurate_feed_list .feedListControls .pull.disabled:hover,
+            .expresscurate_feed_list .feedListControls .pull.disabled{
+                background: transparent !important;
+            }
             .expresscurate_feed_list .feedListControls .pull{
-                background-position: -144px 6px;
+                /*background-position: -144px 6px;*/
                 background-size: auto 99px;
                 margin-right: 10px;
             }
+                .expresscurate_feed_list .feedListControls .pull .loading.expresscurate_startRotate{
+                    background: url("../images/refresh.svg") no-repeat transparent center;
+                    height: 100%;
+                    width: 100%;
+                    display: block;
+                    -webkit-animation: rotate 1.2s infinite linear;
+                    -moz-animation: rotate 1.2s infinite linear;
+                    -o-animation: rotate 1.2s infinite linear;
+                    animation: rotate 1.2s infinite linear;
+                }
+                @-webkit-keyframes rotate{
+                    from {-webkit-transform: rotate(0deg);}
+                    to   {-webkit-transform: rotate(-359deg);}
+                }
+                @-moz-keyframes rotate{
+                    from {-moz-transform: rotate(0deg);}
+                    to   {-moz-transform: rotate(-359deg);}
+                }
+                @-o-keyframes rotate{
+                    from {-o-transform: rotate(0deg);}
+                    to   {-o-transform: rotate(-359deg);}
+                }
+                @keyframes rotate{
+                    from {transform: rotate(0deg);}
+                    to   {transform: rotate(-359deg);}
+                }
             .expresscurate_feed_list .feedListControls .pullTime{
                 background-image: none;
@@ -3738 +3791 @@
                 -webkit-box-sizing: border-box;
                 cursor: default;
+                border-color: #1cbb9f;
             }
                 .expresscurate_feed_list .feedListControls .pullTime p{
@@ -3749 +3803 @@
                 background: transparent;
                 cursor: default;
+                border-color: #1cbb9f;
             }
             .expresscurate_controls .quotes.active:hover{
@@ -3765 +3820 @@
                 border-color: #1cbb9f;
             }
-            .expresscurate_feed_list .feedListControls .pull.active:hover{
+            .expresscurate_feed_list .feedListControls .pull:hover{
                 background-position: -144px -74px;
                 background-color: #1cbb9f;
-                border-color: #1cbb9f;
             }
 
@@ -3780 +3834 @@
                 background-position: -50px -25px;
             }
-            .expresscurate_feed_list .feedListControls .pull.active{
+            .expresscurate_feed_list .feedListControls .pull{
                 background-position: -144px -33px;
+                border-color: #1cbb9f;
             }
 
@@ -4905 +4960 @@
     display: block;
 }
-#wp-expresscurate_content_editor-editor-container .mce-container.mce-edit-area {
+#wp-expresscurate_dialog_content_clone_editor-editor-container .mce-container.mce-edit-area ,
+#wp-expresscurate_dialog_content_editor-editor-container .mce-container.mce-edit-area {
     max-height: 140px;
     overflow-y: auto;

expresscurate/trunk/js/Dialog.js

@@ -100 +100 @@
                 if (index < count && !shortPar) {
                     generateTags(value);
-                    tinyMCE.get('expresscurate_content_editor').execCommand('mceInsertContent', false, "<p>" + value + "<p>");
+                    tinyMCE.get('expresscurate_dialog_content_editor').execCommand('mceInsertContent', false, "<p>" + value + "<p>");
                 }
             }
@@ -223 +223 @@
         }
         generateTags(paragraph);
-        tinyMCE.get('expresscurate_content_editor').execCommand('mceInsertContent', false, paragraph);
+        tinyMCE.get('expresscurate_dialog_content_editor').execCommand('mceInsertContent', false, paragraph);
     }
 
@@ -232 +232 @@
 
     function clearExpresscurateForm() {
-        var $dialog = $('#expresscurate_dialog');
+        var $dialog = $('#expresscurate_dialog'),
+            $imageCounter = $dialog.find('.imageCount');
         $dialog.find('div.error').remove();
         $dialog.find('div.updated').remove();
         $dialog.find('ul').html('');
-        $("#expresscurate_content_editor").val('');
+        $dialog.find('#curated_title').val('');
+        $imageCounter.text('0/0');
         $('.content .img').attr('style', '').addClass("noimage");
         $('.controls').hide();
         $("#curated_paragraphs").empty();
-        if (typeof(tinyMCE) === "object" && typeof(tinyMCE.execCommand) === "function" && tinyMCE.get('expresscurate_content_editor')) {
-            tinyMCE.get('expresscurate_content_editor').setContent('');
+        if (typeof(tinyMCE) === "object" && typeof(tinyMCE.execCommand) === "function" && tinyMCE.get('expresscurate_dialog_content_editor')) {
+            tinyMCE.get('expresscurate_dialog_content_editor').setContent('');
+            tinyMCE.get('expresscurate_dialog_content_clone_editor').setContent('');
         }
         $('#expresscurate_source').focus();
@@ -311 +314 @@
     }
 
-    function submitExpresscurateForm() {
-        ExpressCurateUtils.track('/post/content-dialog/loadpage');
-
+    function submitExpresscurateForm(clone) {
         var $dialog = $('#expresscurate_dialog');
         //remove autoComplete
@@ -323 +324 @@
         var errorHTML = '',
             notifHTML = '',
-            $url = $('#expresscurate_post_form').find('input');
+            $url = clone ? $('#expresscurate_post_form').find('#expresscurate_clone_source') : $('#expresscurate_post_form').find('#expresscurate_source');
         $.ajax({
             type: 'POST',
@@ -340 +341 @@
             data: $url.serialize()
         }).done(function (res) {
-
-            var data = $.parseJSON(res);
-            if (data) {
-                if (data.status === 'error') {
-                    errorHTML = '<div class="error">' + data.error + '</div>';
+                var data = $.parseJSON(res);
+                if (data) {
+                    if (data.status === 'error') {
+                        errorHTML = '<div class="error">' + data.error + '</div>';
+                        $('#expresscurate_post_form').before(errorHTML);
+                        $("#expresscurate_loading").fadeOut('fast');
+                    } else if (data.status === 'success') {
+                        clearExpresscurateForm();
+                        if (data.result.title && data.result.title.length > 0) {
+                            $("#curated_title").val(data.result.title);
+                        }
+                        if (data.result.images.length > 0) {
+                            errorHTML = exportAPICheckImages(data.result.images);
+                        } else {
+                            $("#expresscurate_loading").fadeOut('fast');
+                        }
+                        keywords = data.result.metas.keywords;
+                        if (data.result.metas.keywords && data.result.metas.keywords.length > 0) {
+                            displayCuratedTags(data.result.metas.keywords);
+                        }
+                        if (clone) {
+                            if (data.result.paragraphs.length > 0) {
+                                tinyMCE.get('expresscurate_dialog_content_clone_editor').execCommand('mceInsertContent', false, data.result.content);
+                            }
+                            ExpressCurateUtils.track('/post/content-dialog/clonepage');
+                        } else {
+                            $(".controls").show();
+                            displaySpecials(data.result);
+                            if (data.result.paragraphs.length > 0) {
+                                $curatedParagraphs = data.result.paragraphs;
+                                displayCuratedParagraphs(data.result.paragraphs, $("#expresscurate_autosummary").val(), false);
+                            }
+                            ExpressCurateUtils.track('/post/content-dialog/loadpage');
+                        }
+                        $('#expresscurate_source').focus();
+                    }
+                }
+                else {
+                    errorHTML = '<div class="error">Can\'t curate from this page</div>';
                     $('#expresscurate_post_form').before(errorHTML);
                     $("#expresscurate_loading").fadeOut('fast');
-                } else if (data.status === 'success') {
-                    clearExpresscurateForm();
-                    $(".controls").show();
-                    if (data.result.title && data.result.title.length > 0) {
-                        $("#curated_title").val(data.result.title);
-                    }
-                    if (data.result.images.length > 0) {
-                        errorHTML = exportAPICheckImages(data.result.images);
-                    } else {
-                        $("#expresscurate_loading").fadeOut('fast');
-                    }
-                    if (data.result.metas.keywords && data.result.metas.keywords.length > 0) {
-                        displayCuratedTags(data.result.metas.keywords);
-                    }
-                    keywords = data.result.metas.keywords;
-                    displaySpecials(data.result);
-
-                    if (data.result.paragraphs.length > 0) {
-                        $curatedParagraphs = data.result.paragraphs;
-                        displayCuratedParagraphs(data.result.paragraphs, $("#expresscurate_autosummary").val(), false);
-                    }
-                    $('#expresscurate_source').focus();
-                }
-            } else {
-                errorHTML = '<div class="error">Can\'t curate from this page</div>';
-                $('#expresscurate_post_form').before(errorHTML);
-                $("#expresscurate_loading").fadeOut('fast');
-            }
-
-        });
+                }
+
+            }
+        );
     }
 
@@ -402 +411 @@
         });
         $dialog.on('click', function (e) {
-            if(!$(e.target).is('.autoComplete li')){
+            if (!$(e.target).is('.autoComplete li')) {
                 $dialog.find('.autoComplete').remove();
             }
@@ -482 +491 @@
             }
 
-            $("#expresscurate_content_editor").addClass("mceEditor");
+            $("#expresscurate_dialog_content_editor").addClass("mceEditor");
 
             var currentImage = 0;
@@ -523 +532 @@
                 openDialog();
             });
-            $("#expresscurate_insert").click(function () {
-                var ed = tinyMCE.activeEditor,
+            $("#expresscurate_open-modal-clone").click(function (event) {
+                event.preventDefault();
+                openDialog(false, true);
+            });
+            $dialog.on('click', '#expresscurate_insert , #expresscurate_cloneInsert', function () {
+                var clone = $(this).is('#expresscurate_cloneInsert') ? true : false,
+                    ed = tinyMCE.activeEditor,
                     highlightedElems = $(ed.getBody()).find('span.expresscurate_keywordsHighlight');
+                if (clone) {
+                    ExpressCurateUtils.track('/post/content-dialog/cloneintopost', true);
+                } else {
+                    ExpressCurateUtils.track('/post/content-dialog/curateintopost', true);
+                }
                 if (highlightedElems.length > 0) {
                     highlightedElems.each(function (index, val) {
@@ -543 +562 @@
                 ExpressCurateSourceCollection.addNew();
                 var html = "",
-                    insiteHTML = '',
                     bg = $('.img').css('background-image');
 
@@ -550 +568 @@
                     html += '<img class="' + alignImg + ' ' + imgSize + '" src="' + bg + '" data-img-curated-from="' + sourceVal + '">'
                 }
-                if (tinyMCE.get('expresscurate_content_editor').getContent().length > 0) {
-                    html += '<blockquote cite = "' + sourceVal + '">' + tinyMCE.get('expresscurate_content_editor').getContent() + '<br />';
-                }
-                html += insiteHTML;
+
+                if (clone) {
+                    html += tinyMCE.get('expresscurate_dialog_content_clone_editor').getContent() + '<br />';
+                } else {
+                    html += '<blockquote cite = "' + sourceVal + '">' + tinyMCE.get('expresscurate_dialog_content_editor').getContent() + '<br />';
+                }
+
                 if (html.length > 0) {
                     if (sourceVal.length > 0) {
@@ -562 +583 @@
                         var title = $("#curated_title").val();
                         domain = domain.match(/^(http|https)/) ? domain : 'http://' + domain;
+
                         if (domain) {
-                            html += '<footer><p class="expresscurate_source">' + $("#expresscurate_from").val() + ' <cite><a class="expresscurated" rel="nofollow" data-curated-url="' + domain + '"  href = "' + domain + '">' + title + '</a></cite></p></footer><br/>';
+                            if (clone) {
+                                html += '<footer><p class="expresscurate_source">Originally published at <cite><a class="expresscurated" rel="nofollow" data-cloned-url="' +
+                                domain + '"  href = "' + domain +
+                                '"' + ($("#expresscurate_from_target").val() == 'on' ? ' target="_blank"' : '') + '>' +
+                                title + '</a></cite></p></footer><br/>';
+                            } else {
+                                html += '<footer><p class="expresscurate_source">' + $("#expresscurate_from").val() +
+                                ' <cite><a class="expresscurated" rel="nofollow" data-curated-url="' + domain + '"  href = "' + domain +
+                                '"' + ($("#expresscurate_from_target").val() == 'on' ? ' target="_blank"' : '') + '>' +
+                                title + '</a></cite></p></footer><br/>';
+                            }
                         }
                     }
-                    html += '</blockquote><br />';
+
+                    if (clone) {
+                        var $canonicalURL = $('#expresscurate_advanced_seo_canonical_url'),
+                            $noFollow = $('#expresscurate_advanced_seo_nofollow'),
+                            $noIndex = $('#expresscurate_advanced_seo_noindex'),
+                            $copyCheck = $('#expresscurate_advanced_seo_post_copy'),
+                            $copyCheckVal = $('#expresscurate_advanced_seo_post_copy_value'),
+                            $noIndexVal = $('#expresscurate_advanced_seo_noindex_value'),
+                            $noFollowVal = $('#expresscurate_advanced_seo_nofollow_value'),
+                            $copyControlWrap = $('#expresscurate_ClonePostWrap');
+                        if ($canonicalURL.length) {
+                            $copyControlWrap.removeClass('expresscurate_displayNone');
+                            $copyCheckVal.val('on');
+                            $canonicalURL.attr('value', domain).attr('readonly', true);
+                            $noFollow.add($noIndex).attr('checked', false).attr('disabled', true);
+                            $noFollowVal.add($noIndexVal).val('off');
+                            $copyCheck.attr('checked', true).attr('disabled', false);
+                        }
+                    } else {
+                        html += '</blockquote><br />';
+                    }
                     var $title = $('#titlewrap').find('#title');
                     if ($title.val().length === 0) {
@@ -577 +629 @@
                     return false;
                 }
-                ExpressCurateUtils.track('/post/content-dialog/curateintopost', true);
             });
         }
@@ -583 +634 @@
         $('#expresscurate_submit').click(function () {
             $("#expresscurate_loading").show();
-            submitExpresscurateForm();
+            submitExpresscurateForm(false);
         });
         $('#expresscurate_source').keypress(function (e) {
             if (e.keyCode === 13 || e.keyCode === 40) {
                 $("#expresscurate_loading").show();
-                submitExpresscurateForm();
+                submitExpresscurateForm(false);
+                return false;
+            }
+        });
+        $dialog.on('click', '#expresscurate_clone', function () {
+            $("#expresscurate_loading").show();
+            submitExpresscurateForm(true);
+        });
+        $('#expresscurate_clone_source').keypress(function (e) {
+            if (e.keyCode === 13 || e.keyCode === 40) {
+                $("#expresscurate_loading").show();
+                submitExpresscurateForm(true);
                 return false;
             }
@@ -666 +728 @@
     }
 
-    function openDialog(source) {
-        var $dialog = $("#expresscurate_dialog");
+    function openDialog(source, clone) {
+        var $dialog = $("#expresscurate_dialog"),
+            $load = $dialog.find('#expresscurate_submit'),
+            $clone = $dialog.find('#expresscurate_clone'),
+            $insert = $dialog.find('#expresscurate_insert'),
+            $insertClone = $dialog.find('#expresscurate_cloneInsert'),
+            $contenttextarea = $dialog.find('#expresscurate_dialog_content_editor_container'),
+            $cloneContentTextarea = $dialog.find('#expresscurate_dialog_content_clone_editor_container'),
+            $source = $dialog.find('#expresscurate_source'),
+            $cloneSource = $dialog.find('#expresscurate_clone_source');
         $dialog.dialog({
             'dialogClass': 'wp-dialog',
@@ -684 +754 @@
             'close': clearExpresscurateForm
         });
+        if (clone) {
+            $load.add($insert).add($contenttextarea).add($source).addClass('expresscurate_displayNone');
+            $clone.add($insertClone).add($cloneContentTextarea).add($cloneSource).removeClass('expresscurate_displayNone');
+            tinyMCE.get('expresscurate_dialog_content_clone_editor').getBody().setAttribute('contenteditable', false);
+            ExpressCurateUtils.track('/post/content-dialog/startclone');
+        } else {
+            $load.add($insert).add($contenttextarea).add($source).removeClass('expresscurate_displayNone');
+            $clone.add($insertClone).add($cloneContentTextarea).add($cloneSource).addClass('expresscurate_displayNone');
+            ExpressCurateUtils.track('/post/content-dialog/startcurate');
+        }
         $dialog.dialog('open');
-
-        ExpressCurateUtils.track('/post/content-dialog/startcurate');
     }
 
@@ -710 +788 @@
         delCuratedTag: delCuratedTag
     }
-})(window.jQuery);
+})
+(window.jQuery);
 
 ExpresscurateDialog.setup();

expresscurate/trunk/js/Utils.js

@@ -19 +19 @@
             message.addClass('expresscurate_displayNone');
             if (pageWithControls) {
-                $controls.removeClass('expresscurate_displayNone');
+                $('.expresscurate_controls li.check').removeClass('disabled');
+                //$('.expresscurate_controls li.layout').removeClass('expresscurate_displayNone');
                 ExpressCurateBookmarks.fixedMenu();
             }
@@ -25 +26 @@
             message.removeClass('expresscurate_displayNone');
             if (pageWithControls) {
-                $('.expresscurate_controls li.check').removeClass('active');
-                $controls.addClass('expresscurate_displayNone');
+                $controls.removeClass('active');
+                //$('.expresscurate_controls li.layout').addClass('expresscurate_displayNone');
+                $('.expresscurate_controls li.check').addClass('disabled');
+                $('.expresscurate_controls li.pull').add($('.expresscurate_controls li.pullTime')).addClass('active');
             }
         }

expresscurate/trunk/js/feed/contentFeed.js

@@ -71 +71 @@
 
     function pullFeedManualy() {
+        var $loading = $feedControls.find('.loading'),
+            $control = $('.feedListControls li.pull');
+        $loading.addClass('expresscurate_startRotate');
+        $control.addClass('disabled');
         $.ajax({
             type: 'POST',
             url: 'admin-ajax.php?action=expresscurate_manual_pull_feed'
         }).done(function (res) {
-            //console.log(res);
+            var data = $.parseJSON(res);
+            if (data) {
+                $.each(data.content, function (index, value) {
+                    $("#expresscurate_feedBoxes").load("admin-ajax.php?action=expresscurate_show_content_feed_items #expresscurate_feedBoxes > li", function () {
+                        $('.pullTime p').text('in ' + data.minutes_to_next_pull);
+                        $masonryWrap.masonry('destroy').masonry({
+                            itemSelector: '.expresscurate_masonryItem',
+                            isResizable: true,
+                            isAnimated: true,
+                            columnWidth: '.expresscurate_masonryItem',
+                            gutter: 10
+                        });
+                        ExpressCurateUtils.notDefinedMessage($notDefFeed, $feedBoxes.find(' > li'));
+                    });
+                });
+            }
+        }).always(function () {
+            $loading.removeClass('expresscurate_startRotate');
+            $control.removeClass('disabled');
         });
     }
@@ -114 +136 @@
         });
         /*pull*/
-        $('.expresscurate_feed_list .pull').on('click',function(){
+        $('.expresscurate_feed_list .pull').on('click', function () {
             pullFeedManualy();
         });

expresscurate/trunk/js/keywords/SEOControlCenter.js

@@ -120 +120 @@
         $('html').on('click', function (e) {
             if ($widgetWraper.length) {
-                var $suggestions=$widgetWraper.find('.suggestion li');
+                var $suggestions = $widgetWraper.find('.suggestion li');
                 if ($(e.target).is('.suggestion li')) {
                     var newKeyword = $(e.target).text();
@@ -250 +250 @@
         });
         $('#expresscurate_widget_wrapper .mark').on('click', function (e) {
-                ExpressCurateKeywords.markEditorKeywords();
+            ExpressCurateKeywords.markEditorKeywords();
         });
 
@@ -269 +269 @@
             }
         });
-        $('.expresscurate_moveToAdvanced').on('click',function(){
+        $('#expresscurate_advanced_seo_post_copy').on('change', function () {
+            var $this = $(this),
+                $hiddenInput = $this.parent().find('input[type=hidden]'),
+                $canonicalURL = $('#expresscurate_advanced_seo_canonical_url'),
+                $noFollow = $('#expresscurate_advanced_seo_nofollow'),
+                $noIndex = $('#expresscurate_advanced_seo_noindex');
+            if ($this.is(':checked')) {
+                $hiddenInput.val('on');
+                $canonicalURL.attr('readonly',true);
+                $noFollow.add($noIndex).attr('disabled',true);
+            } else {
+                $hiddenInput.val('off');
+                $canonicalURL.attr('readonly',false);
+                $noFollow.add($noIndex).attr('disabled',false);
+            }
+        });
+        $('.expresscurate_moveToAdvanced').on('click', function () {
             $('html, body').animate({
                 scrollTop: $("#expresscurate_advanced_seo").offset().top - 40

expresscurate/trunk/js/sourceCollection.js

@@ -89 +89 @@
                 content = (($contentWrap.css("display") === "block") ? $contentWrap.val() : tinyMCE.get("content").getContent()),
             /*find curated post's url*/
-                myRegExp = new RegExp('((cite=)|(data-curated-url=))["\']' + url + '["\' ]', 'gmi');
+                myRegExp = new RegExp('((cite=)|(data-curated-url=)|(data-cloned-url=))["\']' + url + '["\' ]', 'gmi');
 
             if (content.match(myRegExp)) {

expresscurate/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.9
 Tested up to: 4.1
-Stable tag: 2.0.10
+Stable tag: 2.0.11
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl.html
@@ -81 +81 @@
 
 = How To Get Started =
-[Download ExpressCurate plugin](http://downloads.wordpress.org/plugin/expresscurate.2.0.10.zip "Your favorite content marketing tools") for WordPress.  
+[Download ExpressCurate plugin](http://downloads.wordpress.org/plugin/expresscurate.2.0.11.zip "Your favorite content marketing tools") for WordPress.  
 You can also [download](http://www.expresscurate.com/p/products/wordpress-theme "Your favorite WordPress Theme") a **free** [ExpressCurate WordPress theme](http://www.expresscurate.com/p/products/wordpress-theme "Your favorite WordPress Theme"). It will give your curated content a modern online news look.
 
@@ -129 +129 @@
 == Changelog ==
 
+= 2.0.11 =
+* New Setting: Open Original Article Link in a New Window/Tab.
+* Next Content Feed update time now available.
+* Pull the Content Feed manually feature now available.
+* Other miscellaneous bug fixes and improvements.
+
 = 2.0.10 =
 * Embed function: you can now embed Facebook, Twitter, YouTube, and Vimeo. Use the "Embed" button, paste the embed code and get the social post in your article.

expresscurate/trunk/templates/advanced_seo_widget.php

@@ -2 +2 @@
 global $post;
 $sitemap = new ExpressCurate_Sitemap();
-$sitemapFrequencyArray =$sitemap->getSitemapFrequencyTagArray();
+$sitemapFrequencyArray = $sitemap->getSitemapFrequencyTagArray();
+
+$postCopy = (get_post_meta($post->ID, '_expresscurate_advanced_seo_post_copy', true) == 'on') ? true : false;
 ?>
 
 <div class="container expresscurate_Styles expresscurate_advancedSEO_widget">
-    <input type="hidden" name="expresscurate_post_analysis_notification" value="0" id="expresscurate_post_analysis_notification"/>
-<ul class="tabs">
-    <li class="tab-link expresscurate_preventTextSelection green current" data-tab="tab-1">General</li>
-    <li class="tab-link expresscurate_preventTextSelection red <?php if(get_option('expresscurate_sitemap_update_permission') == 'error') echo 'disabled';?>" data-tab="tab-2">Sitemap</li>
-    <li class="tab-link expresscurate_preventTextSelection blue" data-tab="tab-3">Social</li>
-    <li class="tab-link postAnalysisLink expresscurate_preventTextSelection yellow" data-tab="tab-4">Post Analysis</li>
-</ul>
-
-<div id="tab-1" class="tab-content current">
-    <a name="expresscurate" id="expresscurate" xmlns="http://www.w3.org/1999/html"></a>
-
-    <div id="expresscurate_advancedSEO_widget">
-        <div class="info">
-            <label for="expresscurate_advanced_seo_title" class="label">SEO Title</label>
-        </div>
-        <div class="value">
-            <input id="expresscurate_advanced_seo_title" class="expresscurate_disableInputStyle" type="text"
-                   name='expresscurate_advanced_seo_title'
-                   value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_title', true); ?>">
-        </div>
-        <div class="expresscurate_clear"></div>
-        <div class="info">
-            <label for="expresscurate_advanced_seo_canonical_url" class="label">Cannonical URL</label>
-        </div>
-        <div class="value">
-            <input id="expresscurate_advanced_seo_canonical_url" class="expresscurate_disableInputStyle" type="text"
-                   name='expresscurate_advanced_seo_canonical_url'
-                   value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_canonical_url', true); ?>">
-        </div>
-        <div class="expresscurate_clear"></div>
-        <div class="info">
-            <label class="robotsLabel">Robots must follow links </label>
-        </div>
-        <div class="value">
-            <input class="expresscurate_displayNone" id="expresscurate_advanced_seo_nofollow" type='checkbox'
-                   name='expresscurate_advanced_seo_nofollow'
-                <?php echo (get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true) == 'on' || !get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true)) ? 'checked' : '' ?>>
-            <label class="expresscurate_preventTextSelection" for="expresscurate_advanced_seo_nofollow"></label>
-            <input type="hidden" id="expresscurate_advanced_seo_nofollow_value" name="expresscurate_advanced_seo_nofollow_value"  value="<?php echo (get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true))?get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true):"on"; ?>">
-        </div>
-        <div class="expresscurate_clear"></div>
-        <div class="info">
-            <label class="robotsLabel">Robots must index this page </label>
-        </div>
-        <div class="value">
-            <input class="expresscurate_displayNone" id="expresscurate_advanced_seo_noindex" type='checkbox'
-                   name='expresscurate_advanced_seo_noindex'
-                <?php echo (get_post_meta($post->ID, '_expresscurate_advanced_seo_noindex', true) == 'on' || !get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true)) ? 'checked' : '' ?>>
-            <label class="expresscurate_preventTextSelection" for="expresscurate_advanced_seo_noindex"></label>
-            <input type="hidden" id="expresscurate_advanced_seo_noindex_value" name="expresscurate_advanced_seo_noindex_value" value="<?php echo (get_post_meta($post->ID, '_expresscurate_advanced_seo_noindex', true))?get_post_meta($post->ID, '_expresscurate_advanced_seo_noindex', true):"on"; ?>">
-        </div>
-        <div class="expresscurate_clear"></div>
-    </div>
-</div>
-<div id="tab-2" class="tab-content">
-    <div id="expresscurate_sitemap_widget">
-        <ul class="expresscurate_sitemap_widget">
-            <li>
+    <input type="hidden" name="expresscurate_post_analysis_notification" value="0"
+           id="expresscurate_post_analysis_notification"/>
+    <ul class="tabs">
+        <li class="tab-link expresscurate_preventTextSelection green current" data-tab="tab-1">General</li>
+        <li class="tab-link expresscurate_preventTextSelection red <?php if (get_option('expresscurate_sitemap_update_permission') == 'error') echo 'disabled'; ?>"
+            data-tab="tab-2">Sitemap
+        </li>
+        <li class="tab-link expresscurate_preventTextSelection blue" data-tab="tab-3">Social</li>
+        <li class="tab-link postAnalysisLink expresscurate_preventTextSelection yellow" data-tab="tab-4">Post Analysis
+        </li>
+    </ul>
+
+    <div id="tab-1" class="tab-content current">
+        <a name="expresscurate" id="expresscurate" xmlns="http://www.w3.org/1999/html"></a>
+
+        <div id="expresscurate_advancedSEO_widget">
+            <div id="expresscurate_ClonePostWrap" class="<?php if(!$postCopy) {echo 'expresscurate_displayNone';} ?>">
                 <div class="info">
-                    <span class="label">Configure Sitemap Manually</span>
+                    <label for="expresscurate_advanced_seo_canonical_url" class="label">Content cloned</label>
                 </div>
                 <div class="value">
-                    <input class="expresscurate_displayNone" type="checkbox"
-                           id="expresscurate_sitemap_post_configure_manually"
-                           name="expresscurate_sitemap_post_configure_manually" <?php if (get_post_meta($post->ID, '_expresscurate_sitemap_post_configure_manually', true) == 'on') echo 'checked'; ?>>
-                    <label for="expresscurate_sitemap_post_configure_manually"></label>
+                    <input class="expresscurate_displayNone" id="expresscurate_advanced_seo_post_copy"
+                           type='checkbox' <?php if(!$postCopy) {
+                        echo 'disabled="disabled"';
+                    } ?>
+                           name='expresscurate_advanced_seo_post_copy'
+                        <?php echo ($postCopy) ? 'checked' : '' ?>>
+                    <label class="expresscurate_preventTextSelection" for="expresscurate_advanced_seo_post_copy"></label>
+                    <input type="hidden" id="expresscurate_advanced_seo_post_copy_value"
+                           name="expresscurate_advanced_seo_post_copy_value"
+                           value="<?php echo ($postCopy) ? "on" : "off"; ?>">
                 </div>
-                <div class="expresscurate_clear"></div>
-            </li>
-            <li class="hiddenOptions <?php if (get_post_meta($post->ID, '_expresscurate_sitemap_post_configure_manually', true) != 'on') echo 'expresscurate_displayNone'; ?>">
-                <ul>
-                    <li>
-                        <div class="info">
-                            <span class="label">Exclude from sitemap</span>
-                        </div>
-                        <div class="value">
-                            <input class="expresscurate_displayNone" type="checkbox"
-                                   id="expresscurate_sitemap_post_exclude_from_sitemap"
-                                   name="expresscurate_sitemap_post_exclude_from_sitemap"  <?php if (get_post_meta($post->ID, '_expresscurate_sitemap_post_exclude_from_sitemap', true) == 'on') echo 'checked'; ?>>
-                            <label for="expresscurate_sitemap_post_exclude_from_sitemap"></label>
-                        </div>
-                        <div class="expresscurate_clear"></div>
-                    </li>
-
-                    <ul class="sitemapOption <?php if (get_post_meta($post->ID, '_expresscurate_sitemap_post_exclude_from_sitemap', true) == 'on') echo 'expresscurate_displayNone'; ?>">
+            </div>
+            <div class="info">
+                <label for="expresscurate_advanced_seo_title" class="label">SEO Title</label>
+            </div>
+            <div class="value">
+                <input id="expresscurate_advanced_seo_title" class="expresscurate_disableInputStyle" type="text"
+                       name='expresscurate_advanced_seo_title'
+                       value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_title', true); ?>">
+            </div>
+            <div class="expresscurate_clear"></div>
+            <div class="info">
+                <label for="expresscurate_advanced_seo_canonical_url" class="label">Canonical URL</label>
+            </div>
+            <div class="value">
+                <input id="expresscurate_advanced_seo_canonical_url" class="expresscurate_disableInputStyle" type="text"
+                    <?php if ($postCopy) {
+                        echo 'readonly="true"';
+                    } ?>
+                       name='expresscurate_advanced_seo_canonical_url'
+                       value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_canonical_url', true); ?>">
+            </div>
+            <div class="expresscurate_clear"></div>
+            <div class="info">
+                <label class="robotsLabel">Robots must follow links </label>
+            </div>
+            <div class="value">
+                <input class="expresscurate_displayNone" id="expresscurate_advanced_seo_nofollow" type='checkbox'
+                    <?php if ($postCopy) {
+                        echo 'disabled="disabled"';
+                    } ?>
+                       name='expresscurate_advanced_seo_nofollow'
+                    <?php echo (get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true) == 'on' || !get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true)) ? 'checked' : '' ?>>
+                <label class="expresscurate_preventTextSelection" for="expresscurate_advanced_seo_nofollow"></label>
+                <input type="hidden" id="expresscurate_advanced_seo_nofollow_value"
+                       name="expresscurate_advanced_seo_nofollow_value"
+                       value="<?php echo (get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true)) ? get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true) : "on"; ?>">
+            </div>
+            <div class="expresscurate_clear"></div>
+            <div class="info">
+                <label class="robotsLabel">Robots must index this page </label>
+            </div>
+            <div class="value">
+                <input class="expresscurate_displayNone" id="expresscurate_advanced_seo_noindex" type='checkbox'
+                    <?php if ($postCopy) {
+                        echo 'disabled="disabled"';
+                    } ?>
+                       name='expresscurate_advanced_seo_noindex'
+                    <?php echo (get_post_meta($post->ID, '_expresscurate_advanced_seo_noindex', true) == 'on' || !get_post_meta($post->ID, '_expresscurate_advanced_seo_nofollow', true)) ? 'checked' : '' ?>>
+                <label class="expresscurate_preventTextSelection" for="expresscurate_advanced_seo_noindex"></label>
+                <input type="hidden" id="expresscurate_advanced_seo_noindex_value"
+                       name="expresscurate_advanced_seo_noindex_value"
+                       value="<?php echo (get_post_meta($post->ID, '_expresscurate_advanced_seo_noindex', true)) ? get_post_meta($post->ID, '_expresscurate_advanced_seo_noindex', true) : "on"; ?>">
+            </div>
+            <div class="expresscurate_clear"></div>
+        </div>
+    </div>
+    <div id="tab-2" class="tab-content">
+        <div id="expresscurate_sitemap_widget">
+            <ul class="expresscurate_sitemap_widget">
+                <li>
+                    <div class="info">
+                        <span class="label">Configure Sitemap Manually</span>
+                    </div>
+                    <div class="value">
+                        <input class="expresscurate_displayNone" type="checkbox"
+                               id="expresscurate_sitemap_post_configure_manually"
+                               name="expresscurate_sitemap_post_configure_manually" <?php if (get_post_meta($post->ID, '_expresscurate_sitemap_post_configure_manually', true) == 'on') echo 'checked'; ?>>
+                        <label for="expresscurate_sitemap_post_configure_manually"></label>
+                    </div>
+                    <div class="expresscurate_clear"></div>
+                </li>
+                <li class="hiddenOptions <?php if (get_post_meta($post->ID, '_expresscurate_sitemap_post_configure_manually', true) != 'on') echo 'expresscurate_displayNone'; ?>">
+                    <ul>
                         <li>
                             <div class="info">
-                                <span class="label">Sitemap frequency</span>
-                                <span class="gray-italic desc">Please select frequency for posts in sitemap</span>
+                                <span class="label">Exclude from sitemap</span>
                             </div>
                             <div class="value">
-                                <?php $expresscurate_sitemap_post_frequency = get_post_meta($post->ID, '_expresscurate_sitemap_post_frequency', true) ?>
-                                <select name="expresscurate_sitemap_post_frequency"
-                                        id="expresscurate_sitemap_post_frequency">
-                                    <?php foreach($sitemapFrequencyArray as $key=>$val) {
-                                        echo '<option value="' . $key . '"';
-                                        if ($key == $expresscurate_sitemap_post_frequency) {
-                                            echo ' selected="selected"';
-                                        }
-                                        echo '>' . $val . '</option>';
-                                    }?>
-                                </select>
+                                <input class="expresscurate_displayNone" type="checkbox"
+                                       id="expresscurate_sitemap_post_exclude_from_sitemap"
+                                       name="expresscurate_sitemap_post_exclude_from_sitemap"  <?php if (get_post_meta($post->ID, '_expresscurate_sitemap_post_exclude_from_sitemap', true) == 'on') echo 'checked'; ?>>
+                                <label for="expresscurate_sitemap_post_exclude_from_sitemap"></label>
                             </div>
                             <div class="expresscurate_clear"></div>
                         </li>
-                        <li>
-                            <div class="info">
-                                <span class="label">Sitemap priority</span>
-                                <span class="gray-italic desc">Please select priority for posts in sitemap</span>
-                            </div>
-                            <div class="value">
-                                <?php $expresscurate_sitemap_post_priority = get_post_meta($post->ID, '_expresscurate_sitemap_post_priority', true) ?>
-                                <select name="expresscurate_sitemap_post_priority"
-                                        id="expresscurate_sitemap_post_priority">
-                                    <?php for($i=0.1; $i<=1; $i=$i+0.1) {
-                                        echo '<option value="'.$i.'"';
-                                        if ($i == $expresscurate_sitemap_post_priority) {
-                                            echo ' selected="selected"';
-                                        }
-                                        echo '>'.$i.'</option>';
-                                    }?>
-                                </select>
-                            </div>
-                            <div class="expresscurate_clear"></div>
-                        </li>
+
+                        <ul class="sitemapOption <?php if (get_post_meta($post->ID, '_expresscurate_sitemap_post_exclude_from_sitemap', true) == 'on') echo 'expresscurate_displayNone'; ?>">
+                            <li>
+                                <div class="info">
+                                    <span class="label">Sitemap frequency</span>
+                                    <span class="gray-italic desc">Please select frequency for posts in sitemap</span>
+                                </div>
+                                <div class="value">
+                                    <?php $expresscurate_sitemap_post_frequency = get_post_meta($post->ID, '_expresscurate_sitemap_post_frequency', true) ?>
+                                    <select name="expresscurate_sitemap_post_frequency"
+                                            id="expresscurate_sitemap_post_frequency">
+                                        <?php foreach ($sitemapFrequencyArray as $key => $val) {
+                                            echo '<option value="' . $key . '"';
+                                            if ($key == $expresscurate_sitemap_post_frequency) {
+                                                echo ' selected="selected"';
+                                            }
+                                            echo '>' . $val . '</option>';
+                                        } ?>
+                                    </select>
+                                </div>
+                                <div class="expresscurate_clear"></div>
+                            </li>
+                            <li>
+                                <div class="info">
+                                    <span class="label">Sitemap priority</span>
+                                    <span class="gray-italic desc">Please select priority for posts in sitemap</span>
+                                </div>
+                                <div class="value">
+                                    <?php $expresscurate_sitemap_post_priority = get_post_meta($post->ID, '_expresscurate_sitemap_post_priority', true) ?>
+                                    <select name="expresscurate_sitemap_post_priority"
+                                            id="expresscurate_sitemap_post_priority">
+                                        <?php for ($i = 0.1; $i <= 1; $i = $i + 0.1) {
+                                            echo '<option value="' . $i . '"';
+                                            if ($i == $expresscurate_sitemap_post_priority) {
+                                                echo ' selected="selected"';
+                                            }
+                                            echo '>' . $i . '</option>';
+                                        } ?>
+                                    </select>
+                                </div>
+                                <div class="expresscurate_clear"></div>
+                            </li>
+                        </ul>
                     </ul>
-                </ul>
-            </li>
-        </ul>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div id="tab-3" class="tab-content">
+        <div id="expresscurate_social_widget">
+            <div class="info">
+                <label for="expresscurate_advanced_seo_social_title" class="label">Title</label>
+            </div>
+            <div class="value">
+                <input id="expresscurate_advanced_seo_social_title" class="expresscurate_disableInputStyle" type="text"
+                       name='expresscurate_advanced_seo_social_title'
+                       value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_social_title', true); ?>">
+            </div>
+            <div class="expresscurate_clear"></div>
+            <div class="info">
+                <label for="expresscurate_advanced_seo_social_shortdesc" class="label">Short Description</label>
+            </div>
+            <div class="value">
+                <input id="expresscurate_advanced_seo_social_shortdesc" class="expresscurate_disableInputStyle"
+                       type="text"
+                       name='expresscurate_advanced_seo_social_shortdesc'
+                       value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_social_shortdesc', true); ?>">
+            </div>
+            <div class="expresscurate_clear"></div>
+            <div class="info">
+                <label for="expresscurate_advanced_seo_social_desc" class="label">Description</label>
+            </div>
+            <div class="value">
+                <input id="expresscurate_advanced_seo_social_desc" class="expresscurate_disableInputStyle" type="text"
+                       name='expresscurate_advanced_seo_social_desc'
+                       value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_social_desc', true); ?>">
+            </div>
+            <div class="expresscurate_clear"></div>
+        </div>
+    </div>
+    <div id="tab-4" class="tab-content postAnalysisTab">
+
     </div>
 </div>
-<div id="tab-3" class="tab-content">
-    <div id="expresscurate_social_widget">
-        <div class="info">
-            <label for="expresscurate_advanced_seo_social_title" class="label">Title</label>
-        </div>
-        <div class="value">
-            <input id="expresscurate_advanced_seo_social_title" class="expresscurate_disableInputStyle" type="text"
-                   name='expresscurate_advanced_seo_social_title'
-                   value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_social_title', true); ?>">
-        </div>
-        <div class="expresscurate_clear"></div>
-        <div class="info">
-            <label for="expresscurate_advanced_seo_social_shortdesc" class="label">Short Description</label>
-        </div>
-        <div class="value">
-            <input id="expresscurate_advanced_seo_social_shortdesc" class="expresscurate_disableInputStyle" type="text"
-                   name='expresscurate_advanced_seo_social_shortdesc'
-                   value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_social_shortdesc', true); ?>">
-        </div>
-        <div class="expresscurate_clear"></div>
-        <div class="info">
-            <label for="expresscurate_advanced_seo_social_desc" class="label">Description</label>
-        </div>
-        <div class="value">
-            <input id="expresscurate_advanced_seo_social_desc" class="expresscurate_disableInputStyle" type="text"
-                   name='expresscurate_advanced_seo_social_desc'
-                   value="<?php echo get_post_meta($post->ID, '_expresscurate_advanced_seo_social_desc', true); ?>">
-        </div>
-        <div class="expresscurate_clear"></div>
-    </div>
-</div>
-<div id="tab-4" class="tab-content postAnalysisTab">
-
-</div>
-</div>
-
+

expresscurate/trunk/templates/bookmarks.php

@@ -12 +12 @@
     } ?>">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate&type=keywords" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
 
         <h2>Bookmarks</h2>
@@ -21 +21 @@
         </div>
         <div class="controlsWrap">
-            <ul class="bookmarkListControls expresscurate_preventTextSelection expresscurate_controls expresscurate_displayNone">
+            <ul class="bookmarkListControls expresscurate_preventTextSelection expresscurate_controls">
                 <li class="check">
                     <span class="tooltip">select / deselect</span>

expresscurate/trunk/templates/dashboard.php

@@ -20 +20 @@
 <div class="expresscurate_blocks expresscurate_Styles wrap">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate&type=keywords" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
 
         <h2>ExpressCurate</h2>

expresscurate/trunk/templates/dialog.php

@@ -1 +1 @@
 <?php
 $settings = array('wpautop' => false, 'media_buttons' => false, 'teeny' => true, 'tinymce' => true, 'quicktags' => false);
+$settingsClone = array('wpautop' => false, 'media_buttons' => false, 'teeny' => true, 'tinymce' => true, 'quicktags' => false );
 ?>
 <div>
-  <div class="content_editor expresscurate_Styles" id ="expresscurate_post_form">
-    <div class="main">
-      <div class="header">
-        <div class="addressbar">
-          <input type="text" placeholder="<?php echo __('Insert source URL to start', ExpressCurate_Actions::PLUGIN_FOLDER) ?>" id="expresscurate_source" name="expresscurate_source" value="<?php echo @get_post_meta($post->ID, 'expresscurate_source', true); ?>">
-          <button class="load"  id="expresscurate_submit">Load</button>
-        </div>
-        <div class="title">
-          <input type="text" value="" id="curated_title">
-        </div>
-      </div>
-      <div class="content">
-        <div class="hidden">
-          <ul id="curated_images">
-          </ul>
-        </div>
-        <div class="left imgContainer">
-            <div class="imgIcons">
-                <div class="sizeX active">
-                    <div class="tooltipWrap">
-                        <span>Large size</span>
+    <div class="content_editor expresscurate_Styles" id="expresscurate_post_form">
+        <div class="main">
+            <div class="header">
+                <div class="addressbar">
+                    <input type="text" class="expresscurate_load"
+                           placeholder="<?php echo __('Insert source URL to start', ExpressCurate_Actions::PLUGIN_FOLDER) ?>"
+                           id="expresscurate_source" name="expresscurate_source"
+                           value="<?php echo @get_post_meta($post->ID, 'expresscurate_source', true); ?>">
+                    <input type="text" class="expresscurate_load"
+                           placeholder="<?php echo __('Insert source URL to start', ExpressCurate_Actions::PLUGIN_FOLDER) ?>"
+                           id="expresscurate_clone_source" name="expresscurate_source"
+                           value="<?php echo @get_post_meta($post->ID, 'expresscurate_source', true); ?>">
+                    <button class="load" id="expresscurate_submit">Load</button>
+                    <button class="load expresscurate_displayNone" id="expresscurate_clone">Clone</button>
+                </div>
+                <div class="title">
+                    <input type="text" value="" id="curated_title">
+                </div>
+            </div>
+            <div class="content">
+                <div class="hidden">
+                    <ul id="curated_images">
+                    </ul>
+                </div>
+                <div class="left imgContainer">
+                    <div class="imgIcons">
+                        <div class="sizeX active">
+                            <div class="tooltipWrap">
+                                <span>Large size</span>
+                            </div>
+                        </div>
+                        <div class="sizeM">
+                            <div class="tooltipWrap">
+                                <span>Middle size</span>
+                            </div>
+                        </div>
+                        <div class="sizeS">
+                            <div class="tooltipWrap">
+                                <span>Small size</span>
+                            </div>
+                        </div>
+
+                        <div class="prevImg prev">
+                            <div class="tooltipWrap">
+                                <span>Previous</span>
+                            </div>
+                        </div>
+                        <div class="nextImg next">
+                            <div class="tooltipWrap">
+                                <span>Next</span>
+                            </div>
+                        </div>
+
+                        <div class="alignleft imgAlign">
+                            <div class="tooltipWrap">
+                                <span>Align left</span>
+                            </div>
+                        </div>
+                        <div class="alignnone active imgAlign">
+                            <div class="tooltipWrap">
+                                <span>Fit to center</span>
+                            </div>
+                        </div>
+                        <div class="alignright imgAlign">
+                            <div class="tooltipWrap">
+                                <span>Align right</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="img noimage">
+                        <span class="imageCount expresscurate_displayNone"></span>
                     </div>
                 </div>
-                <div class="sizeM">
-                    <div class="tooltipWrap">
-                        <span>Middle size</span>
+                <div class="editor right">
+                    <div id="expresscurate_dialog_content_editor_container">
+                        <?php wp_editor('', 'expresscurate_dialog_content_editor', $settings); ?>
                     </div>
-                </div>
-                <div class="sizeS">
-                    <div class="tooltipWrap">
-                        <span>Small size</span>
+                    <div id="expresscurate_dialog_content_clone_editor_container" class="expresscurate_displayNone">
+                        <?php wp_editor('', 'expresscurate_dialog_content_clone_editor', $settingsClone); ?>
                     </div>
-                </div>
-
-                <div class="prevImg prev">
-                    <div class="tooltipWrap">
-                        <span>Previous</span>
-                    </div>
-                </div>
-                <div class="nextImg next">
-                    <div class="tooltipWrap">
-                        <span>Next</span>
-                    </div>
-                </div>
-
-                <div class="alignleft imgAlign">
-                    <div class="tooltipWrap">
-                        <span>Align left</span>
-                    </div>
-                </div>
-                <div class="alignnone active imgAlign">
-                    <div class="tooltipWrap">
-                        <span>Fit to center</span>
-                    </div>
-                </div>
-                <div class="alignright imgAlign">
-                    <div class="tooltipWrap">
-                        <span>Align right</span>
-                    </div>
+                    <div class="clear"></div>
                 </div>
             </div>
-            <div class="img noimage">
-                <span class="imageCount expresscurate_displayNone"></span>
+            <div class="clear"></div>
+            <div class="controls hidden">
+                <ul class="expresscurate_preventTextSelection tags" id="expresscurate_special">
+
+                </ul>
+                <div class="clear"></div>
+                <div id="expresscurate_slider" class="slide_container">
+                    <div class="slider">
+                        <ul class="paragraphs_preview" id="curated_paragraphs">
+                        </ul>
+                    </div>
+                    <div class="prevSlide inactiveButton"></div>
+                    <div class="nextSlide inactiveButton"></div>
+                </div>
+                <div class="clear"></div>
             </div>
         </div>
-        <div class="editor right">
-          <?php wp_editor('', 'expresscurate_content_editor', $settings); ?>
-
-          <div class="clear"></div>
+        <div class="footer">
+            <input type="hidden" value="<?php echo get_option('expresscurate_curated_text', 'Curated from'); ?>"
+                   id="expresscurate_from" name="expresscurate_from"/>
+            <input type="hidden" value="<?php echo get_option('expresscurate_curated_link_target', 'on'); ?>"
+                   id="expresscurate_from_target" name="expresscurate_from_target"/>
+            <input type="hidden" value="<?php echo get_option('expresscurate_autosummary', 5); ?>"
+                   id="expresscurate_autosummary" name="expresscurate_autosummary"/>
+            <ul class="labels" id="curated_tags">
+                <li class="markButton expresscurate_displayNone expresscurate_preventTextSelection">
+                    <span>mark keywords</span></li>
+            </ul>
+            <div class="clear"></div>
+            <button class="curate right" id="expresscurate_insert"
+                    onclick="return false;"><?php echo __('Curate into post', ExpressCurate_Actions::PLUGIN_FOLDER) ?></button>
+            <button class="curate right expresscurate_displayNone" id="expresscurate_cloneInsert"
+                    onclick="return false;"><?php echo __('Clone Post', ExpressCurate_Actions::PLUGIN_FOLDER) ?></button>
+            <div class="clear"></div>
         </div>
-      </div>
-      <div class="clear"></div>
-      <div class="controls hidden">
-        <ul class="expresscurate_preventTextSelection tags" id="expresscurate_special">
-
-        </ul>
-        <div class="clear"></div>
-          <div id="expresscurate_slider" class="slide_container">
-              <div class="slider">
-                  <ul class="paragraphs_preview" id="curated_paragraphs">
-                  </ul>
-              </div>
-              <div class="prevSlide inactiveButton"></div>
-              <div class="nextSlide inactiveButton"></div>
-          </div>
-        <div class="clear"></div>
-      </div>
     </div>
-    <div class="footer">
-      <input type="hidden" value="<?php echo get_option('expresscurate_curated_text', 'Curated from'); ?>" id="expresscurate_from" name="expresscurate_from"/>
-      <input type="hidden" value="<?php echo get_option('expresscurate_autosummary', 5); ?>" id="expresscurate_autosummary" name="expresscurate_autosummary"/>
-      <ul class="labels" id="curated_tags">
-          <li class="markButton expresscurate_displayNone expresscurate_preventTextSelection"><span>mark keywords</span></li>
-      </ul>
-      <div class="clear"></div>
-      <button class="curate right" id="expresscurate_insert" onclick="return false;"><?php echo __('Curate into post', ExpressCurate_Actions::PLUGIN_FOLDER) ?></button>
-      <div class="clear"></div>
-    </div>
-  </div>
 </div>
 <div id="expresscurate_loading">
-  <img src="<?php echo plugin_dir_url(__FILE__); ?>../images/loading.gif" id="img-load" />
+    <img src="<?php echo plugin_dir_url(__FILE__); ?>../images/loading.gif" id="img-load"/>
 </div>
 
 <script type="text/html" id="tmpl-dialogCuratedImage">
-    <li id="tcurated_image_{{data.index}}" class="tcurated_image" data-id="{{data.index}}" style="background-image: url({{data.url}})"></li>
+    <li id="tcurated_image_{{data.index}}" class="tcurated_image" data-id="{{data.index}}"
+        style="background-image: url({{data.url}})"></li>
 </script>
 <script type="text/html" id="tmpl-dialogCuratedParagraphs">
-    <li id="tcurated_text_{{data.index}}" title="{{data.title}}" class="tcurated_text expresscurate_tag_{{data.tag}}" data-id="{{data.index}}">{{data.title}}</li>
+    <li id="tcurated_text_{{data.index}}" title="{{data.title}}" class="tcurated_text expresscurate_tag_{{data.tag}}"
+        data-id="{{data.index}}">{{data.title}}
+    </li>
 </script>
 <script type="text/html" id="tmpl-dialogCuratedtags">
-    <li class="curated_post_tag"  id="curated_post_tag_{{data.index}}"><span class="tag">{{data.tag}}</span><a href="#" class="remove" data-id="{{data.index}}"></a></li>
+    <li class="curated_post_tag" id="curated_post_tag_{{data.index}}"><span class="tag">{{data.tag}}</span><a href="#"
+                                                                                                              class="remove"
+                                                                                                              data-id="{{data.index}}"></a>
+    </li>
 </script>
 <script type="text/html" id="tmpl-dialogMarkButton">
@@ -120 +147 @@
 </script>
 <script type="text/html" id="tmpl-dialogInsertTags">
-    <li class="curated_post_tag" id="curated_post_tag_{{data.index}}"><a href="#" data-id="{{data.index}}">X</a><span>{{data.tag}}</span></li>
+    <li class="curated_post_tag" id="curated_post_tag_{{data.index}}"><a href="#" data-id="{{data.index}}">X</a><span>{{data.tag}}</span>
+    </li>
 </script>
 <script type="text/html" id="tmpl-dialogSearchParagraphs">
@@ -134 +162 @@
 </script>
 <script type="text/html" id="tmpl-dialogCuratedHeadings">
-    <li class="curated_heading" id="curated_heading_{{data.index}}"  data-tag="{{data.index}}" title="{{data.content}}">{{data.index}}</li>
+    <li class="curated_heading" id="curated_heading_{{data.index}}" data-tag="{{data.index}}" title="{{data.content}}">
+        {{data.index}}
+    </li>
 </script>
 <script type="text/html" id="tmpl-dialogCuratedDescription">
@@ -148 +178 @@
         </ul>
         <div id="" class="tab-content">
-            <textarea id="expresscurate_socialEmbed" placeholder="Embed code" class="expresscurate_disableInputStyle"></textarea>
+            <textarea id="expresscurate_socialEmbed" placeholder="Embed code"
+                      class="expresscurate_disableInputStyle"></textarea>
             <span class="expresscurate_errorMessage"></span>
         </div>

expresscurate/trunk/templates/feed_dashboard.php

@@ -6 +6 @@
 <div class="expresscurate_feed_dashboard expresscurate_Styles wrap">
     <div class="expresscurate_headBorderBottom expresscurate_headerPart expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate&type=keywords" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
 
         <h2>RSS Feeds</h2>
@@ -26 +26 @@
                         <li>
                             <a href="<?php echo $feed_url['feed_url'] ?>"
-                               target="_newtab"><?php echo $feed_url['feed_url']; ?></a>
+                               target="_newtab"><?php echo $feed_url['feed_title']; ?><br /><small><?php echo $url; ?></small></a>
                             <span class="postsCount expresscurate_floatRight">
                                 <?php echo $feed_url['post_count']; ?>
@@ -50 +50 @@
     <script type="text/html" id="tmpl-rssfeedItem">
         <li>
-            <a target="_newtab" href="{{data.feed_url}}">{{data.feed_url}}</a>
+            <a target="_newtab" href="{{data.feed_url}}">{{data.feed_title}}<br/><small>{{data.link}}</small></a>
                         <span class="postsCount expresscurate_floatRight">{{data.post_count}}
                         <input type="hidden" name="expresscurate_feed_url" value="{{data.feed_url}}"/>

expresscurate/trunk/templates/feed_list.php

@@ -14 +14 @@
 
 if (!empty($contentList)) {
-    foreach ($contentList as $key => $row) {
-        if (is_array($row) && count($row) > 0) {
-            foreach ($row as $content) {
-                $content['fullLink'] = $content['link'];
-                $extracted_url = extract_google_feed_url($content['link'], $row);
-                if ($extracted_url) {
-                    $url = $extracted_url;
-                } else {
-                    $url = $content['link'];
-                }
-                $content['link'] = $url;
-                $content['domain'] = parse_url($url, PHP_URL_SCHEME) . "://" . parse_url($url, PHP_URL_HOST);
-                array_push($sorted_feeds, $content);
+    $feed_content = $contentList['content'];
+    if (is_array($feed_content) && count($feed_content) > 0) {
+        foreach ($feed_content as $content) {
+            $content['fullLink'] = $content['link'];
+            $extracted_url = extract_google_feed_url($content['link'], $feed_content);
+            if ($extracted_url) {
+                $url = $extracted_url;
+            } else {
+                $url = $content['link'];
             }
+            $content['link'] = $url;
+            $content['domain'] = parse_url($url, PHP_URL_SCHEME) . "://" . parse_url($url, PHP_URL_HOST);
+            array_push($sorted_feeds, $content);
         }
     }
@@ -33 +32 @@
 }
 
-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');
 $nextPullTime = human_time_diff(wp_next_scheduled('expresscurate_pull_feeds'), time());
-
 ?>
 <input id="adminUrl" type="hidden" value="<?php echo get_admin_url(); ?>"/>
@@ -45 +40 @@
     } ?>">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate&type=keywords" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
 
         <h2>Content Feed</h2>
@@ -56 +51 @@
         </div>
         <div class="controlsWrap">
-            <ul class="feedListControls expresscurate_preventTextSelection expresscurate_controls expresscurate_displayNone">
+            <ul class="feedListControls expresscurate_preventTextSelection expresscurate_controls ">
                 <li class="check">
                     <span class="tooltip">select / deselect</span>
@@ -69 +64 @@
                     <span class="tooltip">curate</span>
                 </li>
-                <!--<li class="pull active expresscurate_floatRight">
-                    <span class="tooltip">pull</span>
-                </li>
-                <li class="pullTime active expresscurate_floatRight">
-                    next update:
-                    <p>in <?php /*echo $nextPullTime; */?></p>
-                </li>-->
+                <?php if (strlen(get_option('expresscurate_links_rss', '')) > 2) { ?>
+                    <li class="pull active expresscurate_floatRight">
+                        <span class="tooltip">pull</span>
+                        <span class="loading"></span>
+                    </li>
+                    <li class="pullTime active expresscurate_floatRight">
+                        next update:
+                        <p>in <?php echo $nextPullTime; ?></p>
+                    </li>
+                <?php } ?>
                 <li class="layout expresscurate_floatRight">
                     <span class="tooltip"><?php if (get_option('expresscurate_bookmark_layout', '') == 'single') {
@@ -93 +91 @@
         $i = 0;
         ?>
-        <ul class="expresscurate_feedBoxes expresscurate_masonryWrap"><?php
+        <ul id="expresscurate_feedBoxes" class="expresscurate_feedBoxes expresscurate_masonryWrap"><?php
         foreach ($sorted_feeds as $key => $item) {
             ?>
@@ -157 +155 @@
         ?></ul><?php
     } ?>
-    <label class="expresscurate_notDefined expresscurate_displayNone">Your content feed is empty. Configure <a
+    <label class="expresscurate_notDefined expresscurate_displayNone">Your content feed is
+        empty. <?php echo (strlen(get_option('expresscurate_links_rss', '')) > 2) ? '' : 'Configure <a
             href="admin.php?page=expresscurate_feeds">RSS feeds</a> to
-        start.</label>
+        start.'; ?></label>
 
     <form method="POST" action="<?php echo get_admin_url() ?>post-new.php#expresscurate_sources_collection"

expresscurate/trunk/templates/keywords.php

@@ -8 +8 @@
     <input type="hidden" id="expresscurate_plugin_dir" value="<?php echo plugin_dir_url(__FILE__); ?>"/>
     <label>Keywords Dashboard</label>
-    <a href="admin.php?page=expresscurate&type=keywords" class="expresscurate_writeUs">Suggestions?
+    <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions?
         <span>Submit here!</span></a>
     <br/>

expresscurate/trunk/templates/news.php

@@ -1 +1 @@
 <div class="expresscurate_Styles wrap ">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate&type=keywords" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
         <h2>News</h2>
     </div>

expresscurate/trunk/templates/settings.php

@@ -1 +1 @@
 <div class="expresscurate expresscurate_Styles expresscurate_settings wrap">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate&type=keywords" class="expresscurate_writeUs">Suggestions?
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions?
             <span>Submit here!</span></a>
 
@@ -79 +79 @@
                         ?>" name="expresscurate_curated_text" size="50"/>
                     </li>
+                    <li>                       
+                        <p class="title">Open Original Article Link in a New Window/Tab<span scope="row" class="description  ">
+            Select "Yes" if you want the original article link to be opened in a New Window/Tab. Select "No" if you want the link to be opened in the Same Window/Tab (default behavior).
+          </span></p>
+
+                        <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_curated_link_target"
+                               name="expresscurate_curated_link_target" <?php
+                        if (get_option('expresscurate_curated_link_target', 'on') == "on") {
+                            echo 'checked';
+                        }
+                        ?> />
+                        <label class="controls checkboxLabel" for="expresscurate_curated_link_target"></label>
+                        
+                    </li>
                     <li>
                         <label for="expresscurate_max_tags" class="title">Max Number of Auto-suggested Tags<span
@@ -414 +428 @@
                     <li>
                         <div class="title">
+                            Content Pull Frequency
+                            <div class="description">
+                                How frequently should ExpressCurate pull content (from RSS feeds, Alerts, etc) into your
+                                <a href="#">Content Feed</a>?
+                            </div>
+                        </div>
+                        <select class="controls" id="expresscurate_pull_hours_interval"
+                                name="expresscurate_pull_hours_interval">
+                            <?php
+                            for ($i = 1; $i < 14; $i++) {
+                                ?>
+                                <?php if ($i == 1) { ?>
+                                    <option value="<?php echo $i; ?>" <?php
+                                    if (get_option('expresscurate_pull_hours_interval') == $i) {
+                                        echo 'selected="selected"';
+                                    }
+                                    ?>>Every hour
+                                    </option>
+
+                                <?php } elseif ($i == 13) { ?>
+                                    <option value="<?php echo $i; ?>" <?php
+                                    if (get_option('expresscurate_pull_hours_interval') == $i) {
+                                        echo 'selected="selected"';
+                                    }
+                                    ?>>Once a day
+                                    </option>
+
+                                <?php } else { ?>
+                                    <option value="<?php echo $i; ?>" <?php
+                                    if (get_option('expresscurate_pull_hours_interval') == $i) {
+                                        echo 'selected="selected"';
+                                    }
+                                    ?>>Every <?php echo $i; ?> hours
+                                    </option>
+
+                                <?php
+                                }
+                            }
+                            ?>
+                        </select>
+                    </li>
+                    <li>
+                        <div class="title">
                             Keyword Match Email Alerts
                             <div class="description">
@@ -467 +524 @@
                         </select>
                     </li>
-                    <li>
-                        <div class="title">
-                            Content Pull Frequency
-                            <div class="description">
-                                How frequently should ExpressCurate pull content (from RSS feeds, Alerts, etc) into your
-                                <a href="#">Content Feed</a>?
-                            </div>
-                        </div>
-                        <select class="controls" id="expresscurate_pull_hours_interval"
-                                name="expresscurate_pull_hours_interval">
-                            <?php
-                            for ($i = 1; $i < 14; $i++) {
-                                ?>
-                                <?php if ($i == 1) { ?>
-                                    <option value="<?php echo $i; ?>" <?php
-                                    if (get_option('expresscurate_pull_hours_interval') == $i) {
-                                        echo 'selected="selected"';
-                                    }
-                                    ?>>Every hour
-                                    </option>
-
-                                <?php } elseif ($i == 13) { ?>
-                                    <option value="<?php echo $i; ?>" <?php
-                                    if (get_option('expresscurate_pull_hours_interval') == $i) {
-                                        echo 'selected="selected"';
-                                    }
-                                    ?>>Once a day
-                                    </option>
-
-                                <?php } else { ?>
-                                    <option value="<?php echo $i; ?>" <?php
-                                    if (get_option('expresscurate_pull_hours_interval') == $i) {
-                                        echo 'selected="selected"';
-                                    }
-                                    ?>>Every <?php echo $i; ?> hours
-                                    </option>
-
-                                <?php
-                                }
-                            }
-                            ?>
-                        </select>
-                    </li>
                 </ul>
                 <div class="centerSave">

expresscurate/trunk/templates/websites.php

@@ -5 +5 @@
 <div class="expresscurate_topSources expresscurate_Styles wrap">
   <div class="expresscurate_headBorderBottom expresscurate_headerPart expresscurate_OpenSansRegular">
-    <a href="admin.php?page=expresscurate&type=keywords" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+    <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
     <h2>Top Sources</h2>
       <label class="pageDesc">Top sources where you have curated from.</label>