Changeset 510851
- Timestamp:
- 02/26/2012 11:08:59 PM (14 years ago)
- Location:
- share-and-follow/trunk
- Files:
-
- 5 edited
-
allsites.php (modified) (2 diffs)
-
create-styles.php (modified) (2 diffs)
-
defaults.php (modified) (7 diffs)
-
readme.txt (modified) (8 diffs)
-
share-and-follow.php (modified) (21 diffs)
Legend:
- Unmodified
- Added
- Removed
-
share-and-follow/trunk/allsites.php
r508555 r510851 272 272 'google_buzz' => array 273 273 ( 274 'service' => ' share,follow',275 'share_url' => "http://www.google.com/buzz/post?url=URI&title=TITLE",274 'service' => 'follow', 275 276 276 'sprites' => array 277 277 ( … … 452 452 ), 453 453 454 'mixx' => array455 (456 'service' => 'share',457 'share_url' => "http://www.mixx.com/submit?page_url=URI",458 'sprites' => array459 (460 '16' =>'-612 0',461 '24' =>'-900 0',462 '32' =>'-1188 0',463 '48' =>'-1764 0',464 '60' =>'-183 -61',465 )466 467 ),454 // 'mixx' => array 455 // ( 456 // 'service' => 'share', 457 // 'share_url' => "http://www.mixx.com/submit?page_url=URI", 458 // 'sprites' => array 459 // ( 460 // '16' =>'-612 0', 461 // '24' =>'-900 0', 462 // '32' =>'-1188 0', 463 // '48' =>'-1764 0', 464 // '60' =>'-183 -61', 465 // ) 466 // 467 // ), 468 468 469 469 'moddb' => array -
share-and-follow/trunk/create-styles.php
r497044 r510851 348 348 // finish add icons 349 349 $buildCss .=".share {margin:0 ".$c->_options['spacing']."px ".$c->_options['spacing']."px 0;}\n"; 350 $buildCss .=".phat span {display:inline;}\n"; 351 $buildCss .="ul.row li {float:left;list-style-type:none;}\n"; 350 $buildCss .="ul.row li {float:left;list-style-type:none;list-style:none;}\n"; 352 351 $buildCss .="li.iconOnly a span.head {display:none}\n"; 353 352 $buildCss .="#follow.left ul.size16 li.follow{margin:0px auto !important}\n"; … … 374 373 $buildCss .="div.clean {clear:left;}\n"; 375 374 $buildCss .="div.display_none {display:none;}\n"; 376 $buildCss .=".button_holder_left{margin-right:5px;display:inline}.button_holder_right{margin-left:5px;display:inline}"; 377 $buildCss .=".button_holder_show_interactive{display:inline}"; 375 $buildCss .=".button_holder_bottom,.button_holder_left{margin-right:5px;display:inline}.button_holder_right{margin-left:5px;display:inline}"; 376 $buildCss .=".button_holder_show_interactive {display:inline;margin-right:5px;}.button_holder_bottom iframe,.button_holder_left iframe,.button_holder_right iframe,.button_holder_show_interactive iframe{vertical-align:top}"; 377 $buildCss .=".tall *[id*='___plusone']{position:relative;top:-12px}"; 378 378 379 // 379 380 // end of standard CSS style setup -
share-and-follow/trunk/defaults.php
r508555 r510851 14 14 'post_rss'=>'yes', 'facebook' => 'yes', 'twitter'=>'yes', 'stumble' => 'yes', 15 15 'digg'=> 'yes', 'reddit'=> 'yes', 'hyves' => '', 'delicious'=>'yes', 16 'print'=>'', 'orkut'=>'', 'myspace'=>'', 'google_buzz'=>'',17 'yahoo_buzz'=>'', 'yahoo_buzz_link'=>'', 'google_buzz_link'=>'','youtube'=>'',16 'print'=>'', 'orkut'=>'', 'myspace'=>'', 17 'yahoo_buzz'=>'', 'yahoo_buzz_link'=>'', 'youtube'=>'', 18 18 'linkedin'=>'', 'dailymotion_link'=>'', 'soundcloud_link'=>'', 'foursquare_link'=>'', 19 19 'vkontakte_link'=>'', 'plaxo_link'=>'', 'coconex_link'=>'', 'gowalla_link'=>'', 20 20 'xing_link'=>'', 'twitter_suffix'=>'', 'vimeo_link'=>'', 'distance_from_top'=>'100', 21 'follow_list_spacing' =>'10', 'vkontakte'=>'', 'mixx'=>'','email'=>'',21 'follow_list_spacing' =>'10', 'vkontakte'=>'', 'email'=>'', 22 22 'tumblr_link'=>'', 'tumblr'=>'', 'email_link'=>'', 'email_body'=>'', 23 23 'facebook_link' => '', 'twitter_link'=>'', 'stumble_link' => '', 'digg_link'=> '', … … 97 97 'excluded_follow_pages'=>'','follow_page'=>'yes','follow_post'=>'yes','follow_archive'=>'yes','follow_home'=>'yes','follow_author'=>'yes', 98 98 'vkontakte_share_text'=>__('Share on vkontakte','share-and-follow'), 99 'mixx_share_text' =>__('Mixx it up','share-and-follow'),99 // 'mixx_share_text' =>__('Mixx it up','share-and-follow'), 100 100 'linkedin_share_text' =>__('Share on Linkedin','share-and-follow'), 101 101 'facebook_share_text' =>__('Recommend on Facebook','share-and-follow'), … … 140 140 'dailymotion_link_text'=>__('Tune to my channel','share-and-follow'), 141 141 'yahoo_buzz_share_text'=>__('Buzz it up','share-and-follow'), 142 'google_buzz_share_text'=>__('Buzz it up','share-and-follow'),142 // 'google_buzz_share_text'=>__('Buzz it up','share-and-follow'), 143 143 'yahoo_buzz_link_text'=>__('Follow me','share-and-follow'), 144 144 'lastfm_link_text'=>__('Check my tunes','share-and-follow'), … … 154 154 'post_rss_share_text'=>__('Subscribe to the comments on this post','share-and-follow'), 155 155 'print_share_text'=>__('Print for later','share-and-follow'), 156 'mixx_popup_text' => __('Share this BLOG : TITLE on Mixx','share-and-follow'),156 // 'mixx_popup_text' => __('Share this BLOG : TITLE on Mixx','share-and-follow'), 157 157 'linkedin_popup_text' => __('Share this BLOG : TITLE on Linkedin','share-and-follow'), 158 158 'facebook_popup_text' => __('Recommend this BLOG : TITLE on Facebook','share-and-follow'), … … 170 170 'print_popup_text'=>__('Print this BLOG : TITLE for reading later','share-and-follow'), 171 171 'email_popup_text'=>__('Tell a friend about this BLOG : TITLE ','share-and-follow'), 172 'google_buzz_popup_text'=>__('Buzz up this BLOG : TITLE ','share-and-follow'),172 // 'google_buzz_popup_text'=>__('Buzz up this BLOG : TITLE ','share-and-follow'), 173 173 'yahoo_buzz_popup_text'=>__('Buzz up this BLOG : TITLE ','share-and-follow'), 174 174 … … 176 176 177 177 178 'like_topleft'=>'no','like_topright'=>'no','like_bottom'=>'no','like_style'=>'box_count','like_width'=>__(' 65','share-and-follow'),'like_faces'=>'false','like_verb'=>'like',178 'like_topleft'=>'no','like_topright'=>'no','like_bottom'=>'no','like_style'=>'box_count','like_width'=>__('50','share-and-follow'),'like_faces'=>'false','like_verb'=>'like', 179 179 'like_color'=>'light','like_font'=>'arial','bit_ly_domain'=>'','tweet_topleft'=>'no','tweet_topright'=>'no','tweet_bottom'=>'no','tweet_width'=>'55','tweet_style'=>'vertical', 180 180 'tweet_wpsc_top_of_products_page'=>'', 'tweet_wpsc_product_before_description'=>'', 'tweet_wpsc_product_addon_after_descr'=>'', … … 184 184 'stumble_style'=>'5','stumble_topleft'=>'','stumble_topright'=>'','stumble_bottom'=>'','stumble_wpsc_top_of_products_page'=>'', 'stumble_wpsc_product_before_description'=>'', 'stumble_wpsc_product_addon_after_descr'=>'', 185 185 186 'googleplus_lang'=>'en-US', 'googleplus_style'=>'inline','googleplus_size'=>' ','googleplus_topleft'=>'','googleplus_topright'=>'','googleplus_bottom'=>'','googleplus_wpsc_top_of_products_page'=>'', 'googleplus_wpsc_product_before_description'=>'', 'googleplus_wpsc_product_addon_after_descr'=>'',186 'googleplus_lang'=>'en-US', 'googleplus_style'=>'inline','googleplus_size'=>'tall','googleplus_topleft'=>'','googleplus_topright'=>'','googleplus_bottom'=>'','googleplus_wpsc_top_of_products_page'=>'', 'googleplus_wpsc_product_before_description'=>'', 'googleplus_wpsc_product_addon_after_descr'=>'', 187 187 188 188 -
share-and-follow/trunk/readme.txt
r508555 r510851 6 6 Requires at least: 3.2 7 7 Tested up to: 3.3.1 8 Stable tag: 1.70. 28 Stable tag: 1.70.3 9 9 10 10 Add Share Icons, Follow Links, Facebook Like, Twitter Tweet and other buttons in the way you want. Simple & adaptable social networking. … … 45 45 * Plugin Support for WP e-Commerce, so you can easily add share links or retweet/like button and on product pages 46 46 * Choice between CSS sprites for faster loading times, or CSS single images so you can have your own icon replacements 47 * Optional subscription to different icon sets via a content del every network (CDN), for choice of icon sets and improved website speed. Currently 47 icon sets to choose from48 49 People time and again have said how much they enjoy using this plugin and how it does exactl ly what they want with the minimum of fuss or difficult configuration. A very simple bookmarking solution that offers a discrete clean layout that does not brand your website in it's image.47 * Optional subscription to different icon sets via a content delivery network (CDN), for choice of icon sets and improved website speed. Currently 47 icon sets to choose from 48 49 People time and again have said how much they enjoy using this plugin and how it does exactly what they want with the minimum of fuss or difficult configuration. A very simple bookmarking solution that offers a discrete clean layout that does not brand your website in it's image. 50 50 51 51 Online demo and support site here [example link](http://share-and-follow.com/wordpress-plugin/). Currently icons from either the default set, or from the shiny circle set of icons. … … 56 56 [vimeo http://vimeo.com/16185599] 57 57 58 Currently supports these social networks : digg, twitter, faceook, stumble, reddit, delicious, hyves, myspace, linkedin, rss, mixx, email, print, google buzz, yahoo buzz, tumblr, orkut, vkontakte, sphinn, nujij, bookmark, picasa, bandcamp, moddb, imdb, deviantart, youtube, yelp, flickr, feedback, lastfm, newsletter, xfire, foursquare, vimeo, dailymotion, plaxo, coconex, soundcloud, xing, gowalla, itunes, posterous, ya, slideshare, feedburner, ning, plurk, identica, linkagogo,fark, faves, getglue, wordpress, bebo, blogger, freindfeed.58 Currently supports these social networks : google plus, digg, twitter, faceook, stumble, reddit, delicious, hyves, myspace, linkedin, rss, email, print, google buzz, yahoo buzz, tumblr, orkut, vkontakte, sphinn, nujij, bookmark, picasa, bandcamp, moddb, imdb, deviantart, youtube, yelp, flickr, feedback, lastfm, newsletter, xfire, foursquare, vimeo, dailymotion, plaxo, coconex, soundcloud, xing, gowalla, itunes, posterous, ya, slideshare, feedburner, ning, plurk, identica, linkagogo,fark, faves, getglue, wordpress, bebo, blogger, friendfeed. 59 59 60 60 we are growing all the time. … … 134 134 Facebook caches all images and shares for 24 hours. Just wait and it will update. There is NOTHING ELSE that can be done. 135 135 136 = The facebook share count does not change until I click like, why? = 137 138 Facebook does not have the most reliable system for share count. It's their official button, so please direct your upset at them. 139 136 140 = I want personal support from the maker = 137 141 … … 144 148 = Is it true that you will extend the subscription to be a lifetime subscription if enough people sign up? = 145 149 146 YES, 100% true. If just 1 in 10 users signup, their subscriptions will be made lifetime. No more yearly charging.150 YES, 100% true. If just 1 in 100 users signup, their subscriptions will be made lifetime. No more yearly charging. 147 151 148 152 … … 212 216 213 217 #follow {z-index:5000} 214 215 218 216 219 … … 311 314 312 315 == Changelog == 316 317 = 1.70.3 = 318 deleted google buzz for sharing (kept for following for now), mixx for sharing, fixed show_interactive_links() for stumble, improved bottom interactive buttons 313 319 314 320 = 1.70.2 = … … 867 873 == Upgrade Notice == 868 874 875 = 1.70.3 = 876 deleted google buzz for sharing (kept for following for now), mixx for sharing, fixed show_interactive_links() for stumble, improved bottom interactive buttons 877 869 878 870 879 = 1.70.2 = -
share-and-follow/trunk/share-and-follow.php
r508555 r510851 3 3 Plugin Name: Share and Follow 4 4 Plugin URI: http://share-and-follow.com/wordpress-plugin/ 5 Version: 1.70. 25 Version: 1.70.3 6 6 Author: Andy Killen 7 7 Author URI: http://phat-reaction.com … … 64 64 $this->_options['cssid']=1; 65 65 66 $this->update_plugin_settings(); 67 66 68 $this->update_plugin_options(); 67 69 } 70 71 72 protected function update_plugin_settings(){ 73 // remove google buzz auto add google + share 74 if($this->_options['google_buzz']=='yes'){ 75 $this->_options['gplus'] == 'yes'; 76 } 77 $to_delete = array('mixx','google_buzz'); 78 foreach($to_delete as $delete_me){ 79 unset($this->_options[$delete_me]); 80 unset($this->_options[$delete_me . '_share_text']); 81 unset($this->_options[$delete_me . '_popup_text']); 82 83 } 84 85 } 86 68 87 69 88 public function get_sites(){ … … 602 621 } 603 622 function doStumbleScript($postid, $url = '', $title = '', $via='',$style='', $size=''){ 604 605 if ($url==''){$url = urlencode(get_permalink($postid));}623 add_action('wp_footer', array( &$this, 'stumble_footer_code'), 100); 624 if ($url==''){$url = get_permalink($postid);} 606 625 if ($style==''){$style=$this->_options['stumble_style'];} 607 return "<s cript src=\"http://www.stumbleupon.com/hostedbadge.php?s=".$style."&r=".$url."\"></script>";626 return "<su:badge layout='" .$style. "' location='". $url ."'></su:badge>"; 608 627 } 609 628 610 629 function doGooglePlusButton($postid, $url = '', $style = '', $size = ''){ 630 add_action('wp_footer', array( &$this, 'google_plus_footer_code'), 100); 611 631 if ($url==''){$url = get_permalink($postid);} 612 632 if ($style==''){$style=$this->_options['googleplus_style'];} … … 653 673 } 654 674 if($this->_options['googleplus_topleft']=='yes'){ 655 $buildspace .= $this->interactive_holder($this->doGooglePlusButton($postid), 'left'); 675 $google_style = ''; 676 if($this->_options['googleplus_size']=='tall' && $this->_options['googleplus_style']=='bubble'){ 677 $google_style = 'tall'; 678 } 679 680 $buildspace .= $this->interactive_holder($this->doGooglePlusButton($postid), 'left ' . $google_style); 656 681 } 657 682 $content = $buildspace."</div>".$content; … … 669 694 } 670 695 if($this->_options['googleplus_topright']=='yes'){ 671 $buildspace .= $this->interactive_holder($this->doGooglePlusButton($postid), 'right'); 696 $google_style = ''; 697 698 if($this->_options['googleplus_size']=='tall' && $this->_options['googleplus_style']=='bubble'){ 699 $google_style = 'tall'; 700 } 701 702 $buildspace .= $this->interactive_holder($this->doGooglePlusButton($postid), 'right ' . $google_style ); 672 703 } 673 704 $content = $buildspace."</div>".$content; … … 729 760 } 730 761 if($this->_options['googleplus_bottom']=='yes'){ 731 $buildspace .= $this->interactive_holder($this->doGooglePlusButton($postid), 'left'); 762 $google_style = ''; 763 764 if($this->_options['googleplus_size']=='tall' && $this->_options['googleplus_style']=='bubble'){ 765 $google_style = 'tall'; 766 } 767 768 $buildspace .= $this->interactive_holder($this->doGooglePlusButton($postid), 'left ' . $google_style); 732 769 } 733 770 $content .= $buildspace."</div>"; … … 840 877 $postid=get_the_ID(); 841 878 $title=get_the_title(); 842 $perma= urlencode(get_permalink($postid));879 $perma=get_permalink($postid); 843 880 $buildup =''; 844 881 $faces='false'; … … 864 901 865 902 if($tweet=='yes'){ 866 $buildup.= $this->doTweetiFrame($postid, $perma, '', $title, $tweet_look, $tweet_size, $faces);903 $buildup.= $this->doTweetiFrame($postid, urlencode($perma), '', $title, $tweet_look, $tweet_size, $faces); 867 904 } 868 905 if($like=="yes"){ 869 $buildup.= $this->doLikeiFrame($postid, $perma, $like_look,$facebook_size);906 $buildup.= $this->doLikeiFrame($postid, urlencode($perma), $like_look,$facebook_size); 870 907 } 871 908 if($stumble=='yes'){ … … 879 916 // replace keywords in URL so that it shares properly, check for php4 as html_entity_decode is a bug on there. 880 917 // 881 protectedfunction replaceKeyWordsInURL($share_url,$page_link, $page_title, $page_excerpt ){918 function replaceKeyWordsInURL($share_url,$page_link, $page_title, $page_excerpt ){ 882 919 $share_url = str_replace('EXCERPT' ,urlencode($page_excerpt), $share_url ); 883 920 $share_url = str_replace('TITLE' ,urlencode(html_entity_decode(str_replace('&','and',$page_title), ENT_QUOTES, 'UTF-8')), $share_url ); … … 888 925 // replace keywords in popup text 889 926 // 890 protectedfunction replaceKeyWordsInPopup ($page_id, $page_title, $popup_text){927 function replaceKeyWordsInPopup ($page_id, $page_title, $popup_text){ 891 928 $popup_text = str_replace('TITLE',strip_tags($page_title),$popup_text); 892 929 $popup_text = str_replace('BLOG',strip_tags($this->pagepost($page_id)),$popup_text); … … 1156 1193 1157 1194 if($this->_options['cdn']['status_txt']!='OK'){ 1158 $directory = "".WP_PLUGIN_URL."/share-and-follow/default/".$size."/".$image.".png";1195 $directory = WP_PLUGIN_URL."/share-and-follow/default/".$size."/".$image.".png"; 1159 1196 } 1160 1197 else if(PASSCODE== ""||PASSPHRASE==""||PASSTOKEN==""||CDNEXPIRE==""||CDNDIRECTORY==""||CDNSERVER==""){ 1161 $directory = "".WP_PLUGIN_URL."/share-and-follow/default/".$size."/".$image.".png";1198 $directory = WP_PLUGIN_URL."/share-and-follow/default/".$size."/".$image.".png"; 1162 1199 } 1163 1200 else { … … 1173 1210 // warning, without the correct passcode or passphrase there is no way into the CDN 1174 1211 if($this->_options['cdn']['status_txt']!='OK'){ 1175 $directory = "".WP_PLUGIN_URL."/share-and-follow/default/".$size."/sprite-feb-".$size.".png";1212 $directory = WP_PLUGIN_URL."/share-and-follow/default/".$size."/sprite-feb-".$size.".png"; 1176 1213 } 1177 1214 else if(PASSCODE== ""||PASSPHRASE==""||PASSTOKEN==""||CDNEXPIRE==""||CDNDIRECTORY==""||CDNSERVER==""){ 1178 $directory = "".WP_PLUGIN_URL."/share-and-follow/default/".$size."/sprite-".$size.".png";1215 $directory = WP_PLUGIN_URL."/share-and-follow/default/".$size."/sprite-".$size.".png"; 1179 1216 } 1180 1217 else { … … 1213 1250 1214 1251 function getCDNcodes(){ 1215 1216 1252 // check key 1217 1253 if ((strlen($this->_options['cdn-key']) == 40)&&!empty($this->_options['cdn'])){ 1218 1254 // get saved data 1219 1255 $result = get_transient('cdnrep'); 1220 1221 1256 // check values 1222 1257 if($this->_options['cdn']['status_txt']=="FAIL" || $result === false ){ 1223 1258 // make call 1224 1259 require_once('RemoteConnector.php'); 1225 1260 $url = "http://api.share-and-follow.com/v1/getCodes.php?url=". … … 1230 1265 $result = $control->__toString(); 1231 1266 if($result != false){ 1267 // save for 14 days 1232 1268 set_transient('cdnrep', $result, 60*60*24*14); 1233 1269 } … … 1608 1644 'word_value'=>'follow', 1609 1645 'word_text'=>__('follow:','share-and-follow'), 1610 'phat'=>'',1646 1611 1647 'page_title'=>'', 1612 1648 'page_link'=>'', … … 1712 1748 'googleplus'=>'yes', 1713 1749 'style'=>'box_count', 1714 'facebook_size'=>' 65',1750 'facebook_size'=>'50', 1715 1751 'twitter_size'=>'65', 1716 1752 'stumble_size'=>'65', … … 1738 1774 } 1739 1775 $html = ''; 1740 add_action('wp_footer', array( &$this, 'google_plus_footer_code'), 100); 1741 1776 1742 1777 if($twitter=='yes'){ 1743 1778 $html.= $this->interactive_holder($this->doTweetiFrame($postid, $perma, '', $title, $tweet_look, $tweet_size, $faces=''), 'show_interactive'); … … 1747 1782 } 1748 1783 if($stumble=='yes'){ 1749 $html.= $this->interactive_holder($this->doStumbleScript($postid, $perma, $stumble_look, $size ,$stumble_size), 'show_interactive');1784 $html.= $this->interactive_holder($this->doStumbleScript($postid, $perma, $stumble_look, $size), 'show_interactive'); 1750 1785 } 1751 1786 if($googleplus=='yes'){ 1752 $html.= $this->interactive_holder($this->doGooglePlusButton($postid, $perma, $google_style, $google_size), 'show_interactive');1787 $html.= $this->interactive_holder($this->doGooglePlusButton($postid, $perma, $google_style, $google_size), 'show_interactive ' . $google_size); 1753 1788 } 1754 1789 echo $html; … … 1803 1838 // end admin pages 1804 1839 1805 function check_for_gooogle(){1806 if( $this->_options['googleplus_topleft'] == 'yes' || $this->_options['googleplus_topright'] == 'yes' || $this->_options['googleplus_bottom'] == 'yes' ){1807 $this->google_plus_footer_code();1808 }1809 }1810 1840 1811 1841 function google_plus_footer_code(){ … … 1822 1852 } 1823 1853 1854 function stumble_footer_code(){ 1855 echo " <script type='text/javascript'> 1856 (function() { 1857 var li = document.createElement('script'); li.type = 'text/javascript'; li.async = true; 1858 li.src = 'https://platform.stumbleupon.com/1/widgets.js'; 1859 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(li, s); 1860 })(); 1861 </script>"; 1862 } 1824 1863 1825 1864 … … 1860 1899 //Actions 1861 1900 add_action('admin_menu', 'shareFollow_ap',1); //admin page 1862 add_action(' wp_head', array(&$cons_shareFollow, 'getCDNcodes'),1); // adds items into head section1901 add_action('init', array(&$cons_shareFollow, 'getCDNcodes'),1); // adds items into head section 1863 1902 add_action('wp_head', array(&$cons_shareFollow, 'addHeaderCode'),1); // adds items into head section 1864 1903 add_action('wp_head', array(&$cons_shareFollow, 'addHeaderCodeEndBlock'),10); // adds items into head section 1865 1904 add_action('wp_footer',array(&$cons_shareFollow, 'show_follow_links'),1); // adds follow links 1866 add_action('wp_footer',array(&$cons_shareFollow, 'check_for_gooogle'),100); // adds google plus code when needed 1867 1905 1868 1906 add_action('widgets_init',array(&$cons_shareFollow, 'load_widgets'),1); // loads widgets 1869 1907 add_action('activate_share-and-follow/share-and-follow.php', array(&$cons_shareFollow, 'init'),1); // plugin activation (meeds to be tested)
Note: See TracChangeset
for help on using the changeset viewer.