diff -r f507feede89a -r 09a1c134465b web/wp-content/plugins/network-publisher/networkpub.php --- a/web/wp-content/plugins/network-publisher/networkpub.php Wed Dec 19 12:35:13 2012 -0800 +++ b/web/wp-content/plugins/network-publisher/networkpub.php Wed Dec 19 17:46:52 2012 -0800 @@ -3,7 +3,7 @@ Plugin Name: Network Publisher Plugin URI: http://wordpress.org/extend/plugins/network-publisher/ Description: Automatically publish your blog posts to multiple Social Networks including Twitter, Facebook Profile, Facebook Pages, LinkedIn, MySpace, Yammer, Yahoo, Identi.ca, and more. Click here for instructions. Email us at post@linksalpha.com if you have any queries. - Version: 5.6 + Version: 5.7.1 Author: linksalpha Author URI: http://www.linksalpha.com */ @@ -41,7 +41,7 @@ define('NETWORKPUB_CURRENTLY_PUBLISHING', __('You are currently Publishing your Blog to')); define('NETWORKPUB_SOCIAL_NETWORKS', __('Social Networks')); define('NETWORKPUB_SOCIAL_NETWORK', __('Social Network')); -define('NETWORKPUB_PLUGIN_VERSION', '5.6'); +define('NETWORKPUB_PLUGIN_VERSION', '5.7.1'); $networkpub_settings['api_key'] = array('label' => 'API Key:', 'type' => 'text', 'default' => ''); $networkpub_settings['id'] = array('label' => 'id', 'type' => 'text', 'default' => ''); @@ -50,7 +50,6 @@ /** * This is the intialization function */ - function networkpub_init() { networkpub_options(); //Following will run only if the user is admin of wordpress @@ -100,6 +99,7 @@ add_action('wp_head', 'networkpub_add_metatags'); add_filter('language_attributes', 'networkpub_html_schema'); + function networkpub_options() { $options = get_option(NETWORKPUB_WIDGET_NAME_INTERNAL); if (!array_key_exists('networkpub_auth_error_show', $options)) { @@ -141,6 +141,9 @@ if (!array_key_exists('networkpub_post_image_video', $options)) { $options['networkpub_post_image_video'] = 'image'; } + if (!array_key_exists('networkpub_install_extension_alert_show', $options)) { + $options['networkpub_install_extension_alert_show'] = 1; + } update_option(NETWORKPUB_WIDGET_NAME_INTERNAL, $options); } @@ -182,12 +185,30 @@ } //HTML $html = ''; + //Extension download + $networkpub_install_extension_alert_show = $options['networkpub_install_extension_alert_show']; + if($networkpub_install_extension_alert_show) { + global $is_gecko, $is_safari, $is_chrome; + $html .= ''; + $html .= ''; + $html .= ''; + if($is_gecko) { + $browser = 'firefox'; + } elseif($is_chrome) { + $browser = 'chrome'; + } elseif($is_safari) { + $browser = 'safari'; + } else { + $browser = ''; + } + $html .= ''; + } //Publish $curr_val_publish = get_post_meta($object->ID, '_networkpub_meta_publish', true); if ($curr_val_publish == '') { $curr_val_publish = 1; } - $html .= '
'; + $html .= '
'; $html_label = ' '; $html_label_type_disabled = ' '; if ($curr_val_publish) { @@ -219,6 +240,12 @@ $html .= '
'; $html .= ''; $html .= '
'; + //Summary + $curr_val_summary = get_post_meta($object->ID, 'networkpub_postsummary', true); + $html .= '
'; + $html .= '
'; + $html .= ''; + $html .= '
'; //Twitter handle $curr_val_twitterhandle = get_post_meta($object->ID, 'networkpub_twitterhandle', true); $html .= '
'; @@ -278,7 +305,7 @@ } else { $html .= '
'; } - $html .= '
'; + $html .= '
'; if ($curr_val_content) { $html .= ''; } else { @@ -289,12 +316,20 @@ $html .= '
'; //Content Sent successfully if ($networkpub_meta_published == 'failed') { - $html .= '
'; - $html .= '
 ' . __('Post to social networks failed.') . '
'; + $html .= '
'; + $html .= '
 ' . __('Post to social networks failed.') . '
'; $html .= '
'; } elseif ($networkpub_meta_published == 'done') { + $html .= '
'; + $html .= '
 
'; + $html .= '
'; + } + if(in_array($networkpub_meta_published, array('failed', 'done'))) { $html .= '
'; - $html .= '
 
'; + $html .= ''; + $post_data = networkpub_get_post_data_republish($object); + $post_data_string = http_build_query($post_data); + $html .= ''; $html .= '
'; } //nonce @@ -325,6 +360,14 @@ } } update_post_meta($post_id, 'networkpub_postmessage', $new_meta_value_postmessage); + #Summary + $new_meta_value_postsummary = ''; + if (!empty($_POST['networkpub_postsummary'])) { + if ($_POST['networkpub_postsummary']) { + $new_meta_value_postsummary = strip_tags($_POST['networkpub_postsummary']); + } + } + update_post_meta($post_id, 'networkpub_postsummary', $new_meta_value_postsummary); #Twitter Handle $new_meta_value_twitterhandle = ''; if (!empty($_POST['networkpub_twitterhandle'])) { @@ -383,7 +426,7 @@ echo '
' . NETWORKPUB_WIDGET_NAME . ' ' . __('plugin is almost ready.') . '
-
' . __('You must') . ' ' . __('enter API key') . ' ' . __(' on the settings page for plugin') . ' ' . NETWORKPUB_WIDGET_NAME . ' ' . __('for automatic posting of your blog articles to 20+ Social Networks including Twitter, Facebook Profile, Facebook Pages, LinkedIn, MySpace, Yammer, Yahoo, Identi.ca, and more to work') . '
+
' . __('You must') . ' ' . __('enter API key') . ' ' . __(' on the settings page for plugin') . ' ' . NETWORKPUB_WIDGET_NAME . ' ' . __('for automatic posting of your blog articles to 20+ Social Networks including Twitter, Facebook Profile, Facebook Pages, LinkedIn, MySpace, Yammer, Yahoo, Identi.ca, and more.') . '
'; } } @@ -575,6 +618,7 @@ return; } $post_message = get_post_meta($post_id, 'networkpub_postmessage', true); + $post_summary = get_post_meta($post_id, 'networkpub_postsummary', true); $post_twitterhandle = get_post_meta($post_id, 'networkpub_twitterhandle', true); $post_twitterhash = get_post_meta($post_id, 'networkpub_twitterhash', true); $post_ogtypefacebook = get_post_meta($post_id, 'networkpub_ogtype_facebook', true); @@ -635,6 +679,7 @@ 'twitterhandle' => $post_twitterhandle, 'hashtag' => $post_twitterhash, 'content_message' => $post_message, + 'content_summary' => $post_summary, 'post_image_video' => $networkpub_post_image_video, ); $post_image = networkpub_thumbnail_link($post_id, $post_data['post_content']); @@ -774,6 +819,13 @@ $networkpub_thumbnail_size = 'medium'; } networkpub_update_option('networkpub_thumbnail_size', $networkpub_thumbnail_size); + } elseif ($_POST['networkpub_form_type'] == 'networkpub_install_extension_alert_show') { + if (array_key_exists('networkpub_install_extension_alert_show', $_POST)) { + $networkpub_install_extension_alert_show = 1; + } else { + $networkpub_install_extension_alert_show = 0; + } + networkpub_update_option('networkpub_install_extension_alert_show', $networkpub_install_extension_alert_show); } } } @@ -871,6 +923,16 @@ } else { $networkpub_thumbnail_size = 'medium'; } + if (array_key_exists('networkpub_install_extension_alert_show', $options)) { + $networkpub_install_extension_alert_show = $options['networkpub_install_extension_alert_show']; + if ($networkpub_install_extension_alert_show) { + $networkpub_install_extension_alert_show = 'checked'; + } else { + $networkpub_install_extension_alert_show = ''; + } + } else { + $networkpub_install_extension_alert_show = 'checked'; + } } else { $networkpub_enable = 'checked'; $networkpub_auth_error_show = 'checked'; @@ -884,6 +946,7 @@ $networkpub_custom_field_image = ''; $networkpub_custom_field_image_url = ''; $networkpub_thumbnail_size = 'medium'; + $networkpub_install_extension_alert_show = 'checked'; } $fb_langs = networkpub_fb_langs(); $fb_langs_options = ''; @@ -934,25 +997,39 @@
- -
- ' . __('Postbox') . '  |  ' . __('Share') . ' + + Install Browser Extension  +  Chrome +  Firefox +  Safari -
- + 		+ + + + +
+ +
+ + + ' . __('Share') . '   +
-
-
+
'; + if (empty($options['api_key'])) { + $html .= '
' . __('Network Publisher') . ' ' . __('makes it easy to Publish your Blog Posts to Social Networks. To configure:') . '
1. ' . __('Connect to your Social Networks at') . ' ' . __('LinksAlpha.com') . '
2. ' . __('Get your') . ' ' . __('User API Key') . ' ' . __('or') . ' ' . __('Network API Key') . ' ' . __('and enter it below.') . '
' . __('Once setup, your Blog posts content appears on the social networks as soon as you hit the Publish button.') . '
-
-
+
'; + } + $html .= '
' . __('Setup') . '
@@ -972,9 +1049,12 @@ -
+
+
+ ' . __('Click here').''.__(' to read getting started document.').' +
@@ -1231,6 +1311,24 @@
+
+
+ ' . __('Show/Hide message to Install Browser Extension') . ' +
+
+
+
+
+ +
+
+ + +
+
+
+
+
' . __('Note') . ' @@ -1243,15 +1341,10 @@
-
-
' . __('Supported Networks') . '
+
' . __('Supported Networks') . '
-
+
' . networkpub_supported_networks() . '
@@ -1757,7 +1850,6 @@ } function networkpub_get_plugin_dir() { - global $wp_version; if (version_compare($wp_version, '2.8', '<')) { $path = dirname(plugin_basename(__FILE__)); @@ -2166,7 +2258,7 @@ if ($xml) { $images = $xml -> xpath('//img'); if (!empty($images)) { - return $images[0]['src']; + return (string)$images[0]['src']; } } else { return False; @@ -2201,5 +2293,21 @@ return; } +function networkpub_get_post_data_republish($p) { + $post_data = array(); + $post_data['page_url'] = get_permalink($p); + if($p->post_title) { + $post_data['page_title'] = networkpub_prepare_text($p->post_title); + } + if($p->post_content) { + $post_data['page_text'] = networkpub_prepare_text($p->post_content); + } + $page_url_image = networkpub_thumbnail_link($p->ID, $p->post_content); + if($page_url_image) { + $post_data['page_url_image'] = $page_url_image; + } + return $post_data; +} + register_deactivation_hook(__FILE__, 'networkpub_deactivate'); ?> \ No newline at end of file