Sociable - Version 3.0

Version Description

Download this release

Release Info

Developer joostdevalk
Plugin Icon wp plugin Sociable
Version 3.0
Comparing to
See all releases

Code changes from version 2.9.15 to 3.0

Files changed (5) hide show
  1. images/wykop.gif +0 -0
  2. readme.txt +2 -1
  3. sociable-admin.css +12 -1
  4. sociable.css +1 -1
  5. sociable.php +29 -54
images/wykop.gif CHANGED
Binary file
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://yoast.com/donate/
4
  Tags: social, bookmark, bookmarks, bookmarking, social bookmarking, social bookmarks
5
  Requires at least: 2.2
6
  Tested up to: 2.7
7
- stable tag: 2.9.15
8
 
9
  Automatically add links on your posts, pages and RSS feed to your favorite social bookmarking sites.
10
 
@@ -19,6 +19,7 @@ More info:
19
 
20
  **Changelog**
21
 
 
22
  * 2.9.15 Added a fallback for strip_shortcodes to maintain backwards compatibility with WordPress 2.3 and below.
23
  * 2.9.14 Make sure there are no tags or shortcodes in the excerpt, added ping.fm, removed indiagram (shut down).
24
  * 2.9.13 Changed Facebook link from sharer.php (meant for a popup window) to share.php (which has the actual menu on it etc.)
4
  Tags: social, bookmark, bookmarks, bookmarking, social bookmarking, social bookmarks
5
  Requires at least: 2.2
6
  Tested up to: 2.7
7
+ stable tag: 3.0
8
 
9
  Automatically add links on your posts, pages and RSS feed to your favorite social bookmarking sites.
10
 
19
 
20
  **Changelog**
21
 
22
+ * 3.0 Fixed IE bug in admin. Cleaned up Admin Area and changed support messages. Removed directory checking for all images (speeds up incredibly). Made display: inline !important to prevent vertical icon display. Updated Wykop icon.
23
  * 2.9.15 Added a fallback for strip_shortcodes to maintain backwards compatibility with WordPress 2.3 and below.
24
  * 2.9.14 Make sure there are no tags or shortcodes in the excerpt, added ping.fm, removed indiagram (shut down).
25
  * 2.9.13 Changed Facebook link from sharer.php (meant for a popup window) to share.php (which has the actual menu on it etc.)
sociable-admin.css CHANGED
@@ -1,3 +1,8 @@
 
 
 
 
 
1
  #sociable_site_list {
2
  list-style-type: none;
3
  margin: 0 auto;
@@ -5,12 +10,14 @@
5
  font-size: 80%;
6
  }
7
  #sociable_site_list li {
 
8
  cursor: move;
9
  float: left;
10
  margin: 2px 2px 0 0;
11
  width: 12.7em;
12
  height: 20px;
13
  text-align: left;
 
14
  padding: 4px;
15
  -moz-border-radius: 5px;
16
  border-radius: 5px;
@@ -32,5 +39,9 @@
32
  filter:alpha(opacity=40);
33
  }
34
  #sociable_site_list li input {
35
- margin: 2px;
 
 
 
 
36
  }
1
+ li {
2
+ list-style-type: square;
3
+ margin-left: 20px;
4
+ padding-left: 5px;
5
+ }
6
  #sociable_site_list {
7
  list-style-type: none;
8
  margin: 0 auto;
10
  font-size: 80%;
11
  }
12
  #sociable_site_list li {
13
+ list-style-type: none;
14
  cursor: move;
15
  float: left;
16
  margin: 2px 2px 0 0;
17
  width: 12.7em;
18
  height: 20px;
19
  text-align: left;
20
+ font-size: 10px;
21
  padding: 4px;
22
  -moz-border-radius: 5px;
23
  border-radius: 5px;
39
  filter:alpha(opacity=40);
40
  }
41
  #sociable_site_list li input {
42
+ height: 12px;
43
+ margin: 0 5px 0 0;
44
+ padding: 0;
45
+ background: transparent;
46
+ border: none;
47
  }
sociable.css CHANGED
@@ -21,7 +21,7 @@ span.sociable_tagline:hover span {
21
  }
22
  .sociable ul li {
23
  background: none;
24
- display: inline;
25
  list-style-type: none;
26
  margin: 0;
27
  padding: 1px;
21
  }
22
  .sociable ul li {
23
  background: none;
24
+ display: inline !important;
25
  list-style-type: none;
26
  margin: 0;
27
  padding: 1px;
sociable.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Sociable
4
  Plugin URI: http://yoast.com/wordpress/sociable/
5
  Description: Automatically add links on your posts, pages and RSS feed to your favorite social bookmarking sites. Go to <a href="options-general.php?page=Sociable">Settings -> Sociable</a> for setup.
6
- Version: 2.9.15
7
  Author: Joost de Valk
8
  Author URI: http://yoast.com/
9
 
@@ -782,6 +782,7 @@ if (is_array($sociable_contitionals) and in_array(true, $sociable_contitionals))
782
  (is_category() and $conditionals['is_category']) or
783
  (is_tag() and $conditionals['is_tag']) or
784
  (is_date() and $conditionals['is_date']) or
 
785
  (is_search() and $conditionals['is_search'])) {
786
  $content .= sociable_html();
787
  } elseif ((is_feed() and $conditionals['is_feed'])) {
@@ -806,11 +807,6 @@ function sociable_wp_head() {
806
  }
807
  }
808
 
809
- // load wp rss functions for update checking.
810
- if (!function_exists('parse_w3cdtf')) {
811
- require_once(ABSPATH . WPINC . '/rss-functions.php');
812
- }
813
-
814
  // Plugin config/data setup
815
  register_activation_hook(__FILE__, 'sociable_activation_hook');
816
 
@@ -847,6 +843,7 @@ function sociable_restore_config($force=False) {
847
  'is_tag' => False,
848
  'is_date' => False,
849
  'is_search' => False,
 
850
  'is_feed' => False,
851
  ));
852
 
@@ -897,35 +894,6 @@ function sociable_message($message) {
897
  echo "<div id=\"message\" class=\"updated fade\"><p>$message</p></div>\n";
898
  }
899
 
900
- // Sanity check the upload worked
901
- function sociable_upload_errors() {
902
- global $sociable_files;
903
-
904
- $cwd = getcwd(); // store current dir for restoration
905
- if (!@chdir('../wp-content/plugins'))
906
- return __("Couldn't find wp-content/plugins folder. Please make sure WordPress is installed correctly.", 'sociable');
907
- if (!is_dir('sociable'))
908
- return __("Can't find sociable folder.", 'sociable');
909
- chdir('sociable');
910
-
911
- foreach($sociable_files as $file) {
912
- if (substr($file, -1) == '/') {
913
- if (!is_dir(substr($file, 0, strlen($file) - 1)))
914
- return __("Can't find folder:", 'sociable') . " <kbd>$file</kbd>";
915
- } else if (!is_file($file))
916
- return __("Can't find file:", 'sociable') . " <kbd>$file</kbd>";
917
- }
918
-
919
-
920
- $header_filename = '../../themes/' . get_option('template') . '/header.php';
921
- if (!file_exists($header_filename) or strpos(@file_get_contents($header_filename), 'wp_head()') === false)
922
- return __("Your theme isn't set up for Sociable to load its style. Please edit <kbd>header.php</kbd> and add a line reading <kbd>&lt?php wp_head(); ?&gt;</kbd> before <kbd>&lt;/head&gt;</kbd> to fix this.", 'sociable');
923
-
924
- chdir($cwd); // restore cwd
925
-
926
- return false;
927
- }
928
-
929
  function sociable_meta() {
930
  global $post;
931
  $sociableoff = false;
@@ -1030,9 +998,6 @@ function sociable_submenu() {
1030
 
1031
  sociable_message(__("Saved changes.", 'sociable'));
1032
  }
1033
-
1034
- if ($str = sociable_upload_errors())
1035
- sociable_message("$str</p><p>" . __("In your plugins/sociable folder, you must have these files:", 'sociable') . ' <pre>' . implode("\n", $sociable_files) );
1036
 
1037
  // show active sites first and in order
1038
  $active_sites = get_option('sociable_active_sites');
@@ -1060,15 +1025,15 @@ function sociable_submenu() {
1060
  <h2><?php _e("Sociable Options", 'sociable'); ?></h2>
1061
  <table class="form-table">
1062
  <tr>
1063
- <th style="margin-bottom:0; border-bottom-width:0;"><?php _e("Sites", "sociable"); ?></th>
1064
- <td style="margin-bottom:0; border-bottom-width:0;"><?php _e("Drag and drop sites to reorder them. Only the sites you check will appear publicly.", 'sociable'); ?></td>
1065
- </tr>
1066
- <tr>
1067
- <td colspan="2">
 
1068
  <ul id="sociable_site_list">
1069
  <?php foreach (array_merge($active, $disabled) as $sitename=>$site) { ?>
1070
- <li style="font-size:10px;"
1071
- id="<?php echo $sitename; ?>"
1072
  class="sociable_site <?php echo (in_array($sitename, $active_sites)) ? "active" : "inactive"; ?>">
1073
  <input
1074
  type="checkbox"
@@ -1079,19 +1044,20 @@ function sociable_submenu() {
1079
  <?php echo (in_array($sitename, $active_sites)) ? ' checked="checked"' : ''; ?>
1080
  />
1081
  <img src="<?php echo $sociablepluginpath.'images/'.$site['favicon']; ?>" width="16" height="16" alt="" />
1082
- <?php print $sitename; ?>
1083
  </li>
1084
  <?php } ?>
1085
  </ul>
 
1086
  <input type="hidden" id="site_order" name="site_order" value="<?php echo join('|', array_keys($sociable_known_sites)) ?>" />
1087
  </td>
1088
  </tr>
1089
  <tr>
1090
  <th scope="row" valign="top">
1091
- Tagline:
1092
  </th>
1093
  <td>
1094
- <?php _e("Change the text displayed in front of the icons below. For complete customization, edit <kbd>sociable.css</kbd> in the Sociable plugin directory.", 'sociable'); ?><br/>
1095
  <input size="80" type="text" name="tagline" value="<?php echo htmlspecialchars($tagline); ?>" />
1096
  </td>
1097
  </tr>
@@ -1108,6 +1074,7 @@ function sociable_submenu() {
1108
  <input type="checkbox" name="conditionals[is_category]"<?php echo ($conditionals['is_category']) ? ' checked="checked"' : ''; ?> /> <?php _e("Category archives", 'sociable'); ?><br/>
1109
  <input type="checkbox" name="conditionals[is_tag]"<?php echo ($conditionals['is_tag']) ? ' checked="checked"' : ''; ?> /> <?php _e("Tag listings", 'sociable'); ?><br/>
1110
  <input type="checkbox" name="conditionals[is_date]"<?php echo ($conditionals['is_date']) ? ' checked="checked"' : ''; ?> /> <?php _e("Date-based archives", 'sociable'); ?><br/>
 
1111
  <input type="checkbox" name="conditionals[is_search]"<?php echo ($conditionals['is_search']) ? ' checked="checked"' : ''; ?> /> <?php _e("Search results", 'sociable'); ?><br/>
1112
  <input type="checkbox" name="conditionals[is_feed]"<?php echo ($conditionals['is_feed']) ? ' checked="checked"' : ''; ?> /> <?php _e("RSS feed items", 'sociable'); ?><br/>
1113
  </td>
@@ -1135,12 +1102,21 @@ function sociable_submenu() {
1135
  <span class="submit"><input name="restore" value="<?php _e("Restore Built-in Defaults", 'sociable'); ?>" type="submit"/></span>
1136
  </td>
1137
  </tr>
1138
- <tr>
1139
- <th colspan="2">
1140
- <?php _e('<a href="http://yoast.com/wordpress/sociable/">Sociable</a> is copyright 2006 by <a href="http://push.cx/">Peter Harkins</a> and has been maintained by <a href="http://yoast.com/">Joost de Valk</a> since 2008. It\'s released under the GNU GPL version 2. If you like Sociable, please send a link my way so other folks can find out about it, or <a href="http://yoast.com/donate/">donate a token of your appreciation</a>. If you have any problems or good ideas, <a href="http://yoast.com/contact/">contact me</a>.', 'sociable'); ?>
1141
- </th>
1142
- </tr>
1143
  </table>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1144
  </div>
1145
 
1146
  </form>
@@ -1172,7 +1148,6 @@ function sociable_filter_plugin_actions( $links, $file ){
1172
  add_filter( 'plugin_action_links', 'sociable_filter_plugin_actions', 10, 2 );
1173
  add_filter( 'ozh_adminmenu_icon', 'sociable_add_ozh_adminmenu_icon' );
1174
 
1175
-
1176
  if (get_option('sociable_usecss_set_once') != true) {
1177
  update_option('sociable_usecss', true);
1178
  update_option('sociable_usecss_set_once', true);
3
  Plugin Name: Sociable
4
  Plugin URI: http://yoast.com/wordpress/sociable/
5
  Description: Automatically add links on your posts, pages and RSS feed to your favorite social bookmarking sites. Go to <a href="options-general.php?page=Sociable">Settings -> Sociable</a> for setup.
6
+ Version: 3.0
7
  Author: Joost de Valk
8
  Author URI: http://yoast.com/
9
 
782
  (is_category() and $conditionals['is_category']) or
783
  (is_tag() and $conditionals['is_tag']) or
784
  (is_date() and $conditionals['is_date']) or
785
+ (is_author() and $conditionals['is_author']) or
786
  (is_search() and $conditionals['is_search'])) {
787
  $content .= sociable_html();
788
  } elseif ((is_feed() and $conditionals['is_feed'])) {
807
  }
808
  }
809
 
 
 
 
 
 
810
  // Plugin config/data setup
811
  register_activation_hook(__FILE__, 'sociable_activation_hook');
812
 
843
  'is_tag' => False,
844
  'is_date' => False,
845
  'is_search' => False,
846
+ 'is_author' => False,
847
  'is_feed' => False,
848
  ));
849
 
894
  echo "<div id=\"message\" class=\"updated fade\"><p>$message</p></div>\n";
895
  }
896
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
897
  function sociable_meta() {
898
  global $post;
899
  $sociableoff = false;
998
 
999
  sociable_message(__("Saved changes.", 'sociable'));
1000
  }
 
 
 
1001
 
1002
  // show active sites first and in order
1003
  $active_sites = get_option('sociable_active_sites');
1025
  <h2><?php _e("Sociable Options", 'sociable'); ?></h2>
1026
  <table class="form-table">
1027
  <tr>
1028
+ <th>
1029
+ <?php _e("Sites", "sociable"); ?>:<br/>
1030
+ <small><?php _e("Check the sites you want to appear on your site. Drag and drop sites to reorder them.", 'sociable'); ?></small>
1031
+ </th>
1032
+ <td>
1033
+ <div style="width: 100%; height: 100%">
1034
  <ul id="sociable_site_list">
1035
  <?php foreach (array_merge($active, $disabled) as $sitename=>$site) { ?>
1036
+ <li id="<?php echo $sitename; ?>"
 
1037
  class="sociable_site <?php echo (in_array($sitename, $active_sites)) ? "active" : "inactive"; ?>">
1038
  <input
1039
  type="checkbox"
1044
  <?php echo (in_array($sitename, $active_sites)) ? ' checked="checked"' : ''; ?>
1045
  />
1046
  <img src="<?php echo $sociablepluginpath.'images/'.$site['favicon']; ?>" width="16" height="16" alt="" />
1047
+ <?php echo $sitename; ?>
1048
  </li>
1049
  <?php } ?>
1050
  </ul>
1051
+ </div>
1052
  <input type="hidden" id="site_order" name="site_order" value="<?php echo join('|', array_keys($sociable_known_sites)) ?>" />
1053
  </td>
1054
  </tr>
1055
  <tr>
1056
  <th scope="row" valign="top">
1057
+ <?php _e("Tagline", "sociable"); ?>
1058
  </th>
1059
  <td>
1060
+ <?php _e("Change the text displayed in front of the icons below. For complete customization, copy the contents of <em>sociable.css</em> in the Sociable plugin directory to your theme's <em>style.css</em> and disable the use of the sociable stylesheet below.", 'sociable'); ?><br/>
1061
  <input size="80" type="text" name="tagline" value="<?php echo htmlspecialchars($tagline); ?>" />
1062
  </td>
1063
  </tr>
1074
  <input type="checkbox" name="conditionals[is_category]"<?php echo ($conditionals['is_category']) ? ' checked="checked"' : ''; ?> /> <?php _e("Category archives", 'sociable'); ?><br/>
1075
  <input type="checkbox" name="conditionals[is_tag]"<?php echo ($conditionals['is_tag']) ? ' checked="checked"' : ''; ?> /> <?php _e("Tag listings", 'sociable'); ?><br/>
1076
  <input type="checkbox" name="conditionals[is_date]"<?php echo ($conditionals['is_date']) ? ' checked="checked"' : ''; ?> /> <?php _e("Date-based archives", 'sociable'); ?><br/>
1077
+ <input type="checkbox" name="conditionals[is_author]"<?php echo ($conditionals['is_author']) ? ' checked="checked"' : ''; ?> /> <?php _e("Author archives", 'sociable'); ?><br/>
1078
  <input type="checkbox" name="conditionals[is_search]"<?php echo ($conditionals['is_search']) ? ' checked="checked"' : ''; ?> /> <?php _e("Search results", 'sociable'); ?><br/>
1079
  <input type="checkbox" name="conditionals[is_feed]"<?php echo ($conditionals['is_feed']) ? ' checked="checked"' : ''; ?> /> <?php _e("RSS feed items", 'sociable'); ?><br/>
1080
  </td>
1102
  <span class="submit"><input name="restore" value="<?php _e("Restore Built-in Defaults", 'sociable'); ?>" type="submit"/></span>
1103
  </td>
1104
  </tr>
 
 
 
 
 
1105
  </table>
1106
+
1107
+ <h2>Like this plugin?</h2>
1108
+ <p><?php _e('Why not do any of the following:','sociable'); ?></p>
1109
+ <ul>
1110
+ <li><?php _e('Link to it so other folks can find out about it.','sociable'); ?></li>
1111
+ <li><?php _e('<a href="http://wordpress.org/extend/plugins/sociable/">Give it a good rating</a> on WordPress.org.','sociable'); ?></li>
1112
+ <li><?php _e('<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2017947">Donate a token of your appreciation</a>.','sociable'); ?></li>
1113
+ </ul>
1114
+ <h2>Need support?</h2>
1115
+ <p><?php _e(' If you have any problems or good ideas, please talk about them in the <a href="http://wordpress.org/tags/sociable">Support forums</a>.', 'sociable'); ?></p>
1116
+
1117
+ <h2>Credits</h2>
1118
+ <p><?php _e('<a href="http://yoast.com/wordpress/sociable/">Sociable</a> was originally developed by <a href="http://push.cx/">Peter Harkins</a> and has been maintained by <a href="http://yoast.com/">Joost de Valk</a> since the beginning of 2008. It\'s released under the GNU GPL version 2.','Sociable'); ?></p>
1119
+
1120
  </div>
1121
 
1122
  </form>
1148
  add_filter( 'plugin_action_links', 'sociable_filter_plugin_actions', 10, 2 );
1149
  add_filter( 'ozh_adminmenu_icon', 'sociable_add_ozh_adminmenu_icon' );
1150
 
 
1151
  if (get_option('sociable_usecss_set_once') != true) {
1152
  update_option('sociable_usecss', true);
1153
  update_option('sociable_usecss_set_once', true);