Sociable - Version 2.6

Version Description

Download this release

Release Info

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

Code changes from version 2.5.4 to 2.6

Files changed (4) hide show
  1. images/linkarena.gif +0 -0
  2. readme.txt +2 -2
  3. sociable-admin.css +10 -14
  4. sociable.php +101 -80
images/linkarena.gif ADDED
Binary file
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: joostdevalk
3
  Donate link: http://www.joostdevalk.nl/donate/
4
  Tags: social, bookmark, bookmarks, bookmarking, social bookmarking, social bookmarks
5
  Requires at least: 2.2
6
- Tested up to: 2.3.2
7
- stable tag: 2.5.4
8
 
9
  Automatically add links on your posts to popular social bookmarking sites.
10
 
3
  Donate link: http://www.joostdevalk.nl/donate/
4
  Tags: social, bookmark, bookmarks, bookmarking, social bookmarking, social bookmarks
5
  Requires at least: 2.2
6
+ Tested up to: 2.5
7
+ stable tag: 2.6
8
 
9
  Automatically add links on your posts to popular social bookmarking sites.
10
 
sociable-admin.css CHANGED
@@ -1,31 +1,31 @@
1
- #sociable_options fieldset {
2
- margin: 1em;
3
- }
4
-
5
  #sociable_site_list {
6
  list-style-type: none;
7
- margin: 0;
8
  padding: 0;
9
- font-size: 80%;
10
  }
11
  #sociable_site_list li {
12
  cursor: move;
13
  float: left;
14
  margin: 2px 2px 0 0;
15
- width: 12em;
16
  height: 20px;
17
  text-align: left;
18
  padding: 4px;
19
  -moz-border-radius: 5px;
20
  border-radius: 5px;
21
  }
22
- #sociable_site_list li.active { background-color: #6da6d1; }
 
 
23
  #sociable_site_list li.active img {
24
  opacity: 1;
25
  -moz-opacity: 1;
26
  filter:alpha(opacity=100);
27
  }
28
- #sociable_site_list li.inactive { background-color: #dddddd; }
 
 
29
  #sociable_site_list li.inactive img {
30
  opacity: .4;
31
  -moz-opacity: .4;
@@ -33,8 +33,4 @@
33
  }
34
  #sociable_site_list li input {
35
  margin: 2px;
36
- }
37
-
38
- #sociable_tagline input {
39
- width: 30em;
40
- }
 
 
 
 
1
  #sociable_site_list {
2
  list-style-type: none;
3
+ margin: 0 auto;
4
  padding: 0;
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;
17
  }
18
+ #sociable_site_list li.active {
19
+ background-color: #6da6d1;
20
+ }
21
  #sociable_site_list li.active img {
22
  opacity: 1;
23
  -moz-opacity: 1;
24
  filter:alpha(opacity=100);
25
  }
26
+ #sociable_site_list li.inactive {
27
+ background-color: #dddddd;
28
+ }
29
  #sociable_site_list li.inactive img {
30
  opacity: .4;
31
  -moz-opacity: .4;
33
  }
34
  #sociable_site_list li input {
35
  margin: 2px;
36
+ }
 
 
 
 
sociable.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Sociable
4
  Plugin URI: http://www.joostdevalk.nl/wordpress/sociable/
5
  Description: Automatically add links on your posts to popular <a href="http://www.maxpower.ca/bookmarking">social bookmarking sites</a>. Go to Options -> Sociable for setup.
6
- Version: 2.5.4
7
  Author: Joost de Valk
8
  Author URI: http://www.joostdevalk.nl/
9
  */
@@ -227,6 +227,11 @@ $sociable_known_sites = Array(
227
  'favicon' => 'laaikit.png',
228
  'url' => 'http://laaik.it/NewStoryCompact.aspx?uri=PERMALINK&amp;headline=TITLE&amp;cat=5e082fcc-8a3b-47e2-acec-fdf64ff19d12',
229
  ),
 
 
 
 
 
230
 
231
  'LinkaGoGo' => Array(
232
  'favicon' => 'linkagogo.png',
@@ -463,7 +468,6 @@ $sociable_files = Array(
463
  'sociable-admin.css',
464
  'sociable.css',
465
  'sociable.php',
466
- 'sociable.css',
467
  'sociable-admin.css',
468
  'wists.js',
469
  'images/',
@@ -502,6 +506,7 @@ $sociable_files = Array(
502
  'images/kickit.png',
503
  'images/laaikit.png',
504
  'images/linkagogo.png',
 
505
  'images/linkter.png',
506
  'images/linkter.png',
507
  'images/live.png',
@@ -553,7 +558,6 @@ $sociable_files = Array(
553
  'tool-man/events.js',
554
  );
555
 
556
-
557
  function sociable_html($display=Array()) {
558
  global $sociable_known_sites;
559
  $active_sites = get_option('sociable_active_sites');
@@ -609,7 +613,7 @@ function sociable_html($display=Array()) {
609
 
610
  $html .= "</ul>\n</div>\n";
611
 
612
- return $html;
613
  }
614
 
615
  // Hook the_content to output html if we should display on any page
@@ -636,9 +640,12 @@ if (is_array($sociable_contitionals) and in_array(true, $sociable_contitionals))
636
  // Hook wp_head to add css
637
  add_action('wp_head', 'sociable_wp_head');
638
  function sociable_wp_head() {
639
- if (in_array('Wists', get_option('sociable_active_sites')))
640
  echo '<script language="JavaScript" type="text/javascript" src="' . get_bloginfo('wpurl') . '/wp-content/plugins/sociable/wists.js"></script>'."\n";
641
- echo '<link rel="stylesheet" type="text/css" media="screen" href="' . get_bloginfo('wpurl') . '/wp-content/plugins/sociable/sociable.css" />'."\n";
 
 
 
642
  }
643
 
644
  // load wp rss functions for update checking.
@@ -664,11 +671,6 @@ function sociable_restore_config($force=False) {
664
  // Load defaults, taking care not to smash already-set options
665
  global $sociable_known_sites;
666
 
667
- // Used to store sites in the db with the idea users would
668
- // add sites, but nobody will so I dropped the feature.
669
- // This should clean up any old installs.
670
- delete_option('sociable_known_sites');
671
-
672
  if ($force or !is_array(get_option('sociable_active_sites')))
673
  update_option('sociable_active_sites', array(
674
  'Digg',
@@ -694,10 +696,8 @@ function sociable_restore_config($force=False) {
694
  'is_search' => False,
695
  ));
696
 
697
- // last-updated date defaults to 0000-00-00
698
- // this is to trigger the update check on first run
699
- if ($force or !get_option('sociable_updated'))
700
- update_option('sociable_updated', '0000-00-00');
701
  }
702
 
703
  // Hook the admin_menu display to add admin page
@@ -790,7 +790,7 @@ function sociable_submenu() {
790
  // update options in db if requested
791
  if ($_REQUEST['restore']) {
792
  sociable_restore_config(True);
793
- sociable_message(__("Restored all settings to defaults.", 'sociable'));
794
  } else if ($_REQUEST['save']) {
795
  // update active sites
796
  $active_sites = Array();
@@ -816,6 +816,12 @@ function sociable_submenu() {
816
  if (!$_REQUEST['tagline'])
817
  $_REQUEST['tagline'] = "";
818
  update_option('sociable_tagline', $_REQUEST['tagline']);
 
 
 
 
 
 
819
 
820
  sociable_message(__("Saved changes.", 'sociable'));
821
  }
@@ -841,71 +847,86 @@ function sociable_submenu() {
841
  ?>
842
  <form action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
843
 
844
- <div class="wrap" id="sociable_options">
845
- <fieldset id="sociable_sites">
846
-
847
- <h3><?php _e("Sociable Options", 'sociable'); ?></h3>
848
-
849
- <p><?php _e("Drag and drop sites to reorder them. Only the sites you check will appear publicly.", 'sociable'); ?></p>
850
-
851
- <ul id="sociable_site_list">
852
- <?php foreach (array_merge($active, $disabled) as $sitename=>$site) { ?>
853
- <li
854
- id="<?php echo $sitename; ?>"
855
- class="sociable_site <?php echo (in_array($sitename, $active_sites)) ? "active" : "inactive"; ?>"
856
- onmouseup="javascript:save_reorder('cb_<?php echo $sitename; ?>');"
857
- >
858
- <input
859
- type="checkbox"
860
- id="cb_<?php echo $sitename; ?>"
861
- class="checkbox"
862
- name="active_sites[<?php echo $sitename; ?>]"
863
- onclick="javascript:toggle_checkbox('cb_<?php echo $sitename; ?>');"
864
- <?php echo (in_array($sitename, $active_sites)) ? ' checked="checked"' : ''; ?>
865
- />
866
- <img src="../wp-content/plugins/sociable/images/<?php echo $site['favicon']?>" width="16" height="16" alt="" />
867
- <?php print $sitename; ?>
868
- </li>
869
- <?php } ?>
870
- </ul>
871
- <input type="hidden" id="site_order" name="site_order" value="<?php echo join('|', array_keys($sociable_known_sites)) ?>" />
872
- <script language="JavaScript" type="text/javascript"><!--
873
- dragsort.makeListSortable(document.getElementById("sociable_site_list"));
874
- --></script>
875
-
876
- </fieldset>
877
- <div style="clear: left; display: none;"><br/></div>
878
-
879
- <fieldset id="sociable_tagline">
880
- <p>
881
- <?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'); ?>
882
- </p>
883
- <input type="text" name="tagline" value="<?php echo htmlspecialchars($tagline); ?>" />
884
- </fieldset>
885
-
886
-
887
- <fieldset id="sociable_conditionals">
888
- <p><?php _e("The icons appear at the end of each blog post, and posts may show on many different types of pages. Depending on your theme and audience, it may be tacky to display icons on all types of pages.", 'sociable'); ?></p>
889
-
890
- <ul style="list-style-type: none">
891
- <li><input type="checkbox" name="conditionals[is_home]"<?php echo ($conditionals['is_home']) ? ' checked="checked"' : ''; ?> /> <?php _e("Front page of the blog", 'sociable'); ?></li>
892
- <li><input type="checkbox" name="conditionals[is_single]"<?php echo ($conditionals['is_single']) ? ' checked="checked"' : ''; ?> /> <?php _e("Individual blog posts", 'sociable'); ?></li>
893
- <li><input type="checkbox" name="conditionals[is_page]"<?php echo ($conditionals['is_page']) ? ' checked="checked"' : ''; ?> /> <?php _e('Individual WordPress "Pages"', 'sociable'); ?></li>
894
- <li><input type="checkbox" name="conditionals[is_category]"<?php echo ($conditionals['is_category']) ? ' checked="checked"' : ''; ?> /> <?php _e("Category archives", 'sociable'); ?></li>
895
- <li><input type="checkbox" name="conditionals[is_date]"<?php echo ($conditionals['is_date']) ? ' checked="checked"' : ''; ?> /> <?php _e("Date-based archives", 'sociable'); ?></li>
896
- <li><input type="checkbox" name="conditionals[is_search]"<?php echo ($conditionals['is_search']) ? ' checked="checked"' : ''; ?> /> <?php _e("Search results", 'sociable'); ?></li>
897
- </ul>
898
- </fieldset>
899
-
900
- <p class="submit"><input name="save" id="save" tabindex="3" value="<?php _e("Save Changes", 'sociable'); ?>" type="submit" /></p>
901
- <p class="submit"><input name="restore" id="restore" tabindex="3" value="<?php _e("Restore Built-in Defaults", 'sociable'); ?>" type="submit" style="border: 2px solid #e00;" /></p>
902
-
903
- </div>
904
-
905
  <div class="wrap">
906
- <p>
907
- <?php _e('<a href="http://www.joostdevalk.nl/wordpress/sociable/">Sociable</a> is copyright 2006 by <a href="http://push.cx/">Peter Harkins</a> and update to version 2.5 and thus copyright 2008 by <a href="http://www.joostdevalk.nl/">Joost de Valk</a>, released under the GNU GPL version 2 or later. If you like Sociable, please send a link my way so other folks can find out about it. If you have any problems or good ideas, <a href="http://www.joostdevalk.nl/contact/">contact me</a>.', 'sociable'); ?>
908
- </p>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
909
  </div>
910
 
911
  </form>
3
  Plugin Name: Sociable
4
  Plugin URI: http://www.joostdevalk.nl/wordpress/sociable/
5
  Description: Automatically add links on your posts to popular <a href="http://www.maxpower.ca/bookmarking">social bookmarking sites</a>. Go to Options -> Sociable for setup.
6
+ Version: 2.6
7
  Author: Joost de Valk
8
  Author URI: http://www.joostdevalk.nl/
9
  */
227
  'favicon' => 'laaikit.png',
228
  'url' => 'http://laaik.it/NewStoryCompact.aspx?uri=PERMALINK&amp;headline=TITLE&amp;cat=5e082fcc-8a3b-47e2-acec-fdf64ff19d12',
229
  ),
230
+
231
+ 'LinkArena' => Array(
232
+ 'favicon' => 'linkarena.gif',
233
+ 'url' => 'http://linkarena.com/bookmarks/addlink/?url=PERMALINK&amp;title=TITLE',
234
+ ),
235
 
236
  'LinkaGoGo' => Array(
237
  'favicon' => 'linkagogo.png',
468
  'sociable-admin.css',
469
  'sociable.css',
470
  'sociable.php',
 
471
  'sociable-admin.css',
472
  'wists.js',
473
  'images/',
506
  'images/kickit.png',
507
  'images/laaikit.png',
508
  'images/linkagogo.png',
509
+ 'images/linkarena.gif',
510
  'images/linkter.png',
511
  'images/linkter.png',
512
  'images/live.png',
558
  'tool-man/events.js',
559
  );
560
 
 
561
  function sociable_html($display=Array()) {
562
  global $sociable_known_sites;
563
  $active_sites = get_option('sociable_active_sites');
613
 
614
  $html .= "</ul>\n</div>\n";
615
 
616
+ return apply_filters('sociable_link',$html);
617
  }
618
 
619
  // Hook the_content to output html if we should display on any page
640
  // Hook wp_head to add css
641
  add_action('wp_head', 'sociable_wp_head');
642
  function sociable_wp_head() {
643
+ if (in_array('Wists', get_option('sociable_active_sites'))) {
644
  echo '<script language="JavaScript" type="text/javascript" src="' . get_bloginfo('wpurl') . '/wp-content/plugins/sociable/wists.js"></script>'."\n";
645
+ }
646
+ if (get_option('sociable_usecss') == true) {
647
+ echo '<link rel="stylesheet" type="text/css" media="screen" href="' . get_bloginfo('wpurl') . '/wp-content/plugins/sociable/sociable.css" />'."\n";
648
+ }
649
  }
650
 
651
  // load wp rss functions for update checking.
671
  // Load defaults, taking care not to smash already-set options
672
  global $sociable_known_sites;
673
 
 
 
 
 
 
674
  if ($force or !is_array(get_option('sociable_active_sites')))
675
  update_option('sociable_active_sites', array(
676
  'Digg',
696
  'is_search' => False,
697
  ));
698
 
699
+ if ($force or !is_bool(get_option('usecss')))
700
+ update_option('sociable_usecss', true);
 
 
701
  }
702
 
703
  // Hook the admin_menu display to add admin page
790
  // update options in db if requested
791
  if ($_REQUEST['restore']) {
792
  sociable_restore_config(True);
793
+ sociable_message(__("Restored all settings to defaults.", 'sociable'));
794
  } else if ($_REQUEST['save']) {
795
  // update active sites
796
  $active_sites = Array();
816
  if (!$_REQUEST['tagline'])
817
  $_REQUEST['tagline'] = "";
818
  update_option('sociable_tagline', $_REQUEST['tagline']);
819
+
820
+ if (!$_REQUEST['usecss'])
821
+ $usecss = false;
822
+ else
823
+ $usecss = true;
824
+ update_option('sociable_usecss', $usecss);
825
 
826
  sociable_message(__("Saved changes.", 'sociable'));
827
  }
847
  ?>
848
  <form action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
849
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
850
  <div class="wrap">
851
+ <h2><?php _e("Sociable Options", 'sociable'); ?></h2>
852
+ <table class="form-table">
853
+ <tr>
854
+ <th style="margin-bottom:0; border-bottom-width:0;"><?php _e("Sites", "sociable"); ?></th>
855
+ <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>
856
+ </tr>
857
+ <tr>
858
+ <td colspan="2">
859
+ <ul id="sociable_site_list">
860
+ <?php foreach (array_merge($active, $disabled) as $sitename=>$site) { ?>
861
+ <li style="font-size:10px;"
862
+ id="<?php echo $sitename; ?>"
863
+ class="sociable_site <?php echo (in_array($sitename, $active_sites)) ? "active" : "inactive"; ?>"
864
+ onmouseup="javascript:save_reorder('cb_<?php echo $sitename; ?>');"
865
+ >
866
+ <input
867
+ type="checkbox"
868
+ id="cb_<?php echo $sitename; ?>"
869
+ class="checkbox"
870
+ name="active_sites[<?php echo $sitename; ?>]"
871
+ onclick="javascript:toggle_checkbox('cb_<?php echo $sitename; ?>');"
872
+ <?php echo (in_array($sitename, $active_sites)) ? ' checked="checked"' : ''; ?>
873
+ />
874
+ <img src="../wp-content/plugins/sociable/images/<?php echo $site['favicon']?>" width="16" height="16" alt="" />
875
+ <?php print $sitename; ?>
876
+ </li>
877
+ <?php } ?>
878
+ </ul>
879
+ <input type="hidden" id="site_order" name="site_order" value="<?php echo join('|', array_keys($sociable_known_sites)) ?>" />
880
+ <script language="JavaScript" type="text/javascript"><!--
881
+ dragsort.makeListSortable(document.getElementById("sociable_site_list"));
882
+ --></script>
883
+ </td>
884
+ </tr>
885
+ <tr>
886
+ <th scope="row" valign="top">
887
+ Tagline:
888
+ </th>
889
+ <td>
890
+ <?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/>
891
+ <input type="text" name="tagline" value="<?php echo htmlspecialchars($tagline); ?>" />
892
+ </td>
893
+ </tr>
894
+ <tr>
895
+ <th scope="row" valign="top">
896
+ <?php _e("Position:", "sociable"); ?>
897
+ </th>
898
+ <td>
899
+ <?php _e("The icons appear at the end of each blog post, and posts may show on many different types of pages. Depending on your theme and audience, it may be tacky to display icons on all types of pages.", 'sociable'); ?><br/>
900
+ <br/>
901
+ <input type="checkbox" name="conditionals[is_home]"<?php echo ($conditionals['is_home']) ? ' checked="checked"' : ''; ?> /> <?php _e("Front page of the blog", 'sociable'); ?><br/>
902
+ <input type="checkbox" name="conditionals[is_single]"<?php echo ($conditionals['is_single']) ? ' checked="checked"' : ''; ?> /> <?php _e("Individual blog posts", 'sociable'); ?><br/>
903
+ <input type="checkbox" name="conditionals[is_page]"<?php echo ($conditionals['is_page']) ? ' checked="checked"' : ''; ?> /> <?php _e('Individual WordPress "Pages"', 'sociable'); ?><br/>
904
+ <input type="checkbox" name="conditionals[is_category]"<?php echo ($conditionals['is_category']) ? ' checked="checked"' : ''; ?> /> <?php _e("Category archives", 'sociable'); ?><br/>
905
+ <input type="checkbox" name="conditionals[is_date]"<?php echo ($conditionals['is_date']) ? ' checked="checked"' : ''; ?> /> <?php _e("Date-based archives", 'sociable'); ?><br/>
906
+ <input type="checkbox" name="conditionals[is_search]"<?php echo ($conditionals['is_search']) ? ' checked="checked"' : ''; ?> /> <?php _e("Search results", 'sociable'); ?><br/>
907
+ </td>
908
+ </tr>
909
+ <tr>
910
+ <th scope="row" valign="top">
911
+ <?php _e("Use CSS:", "sociable"); ?>
912
+ </th>
913
+ <td>
914
+ <input type="checkbox" name="usecss" <?php echo (get_option('sociable_usecss')) ? ' checked="checked"' : ''; ?> /> <?php _e("Use the sociable stylesheet?", "sociable"); ?>
915
+ </td>
916
+ </tr>
917
+ <tr>
918
+ <td>&nbsp;</td>
919
+ <td>
920
+ <span class="submit"><input name="save" value="<?php _e("Save Changes", 'sociable'); ?>" type="submit" /></span>
921
+ <span class="submit"><input name="restore" value="<?php _e("Restore Built-in Defaults", 'sociable'); ?>" type="submit"/></span>
922
+ </td>
923
+ </tr>
924
+ <tr>
925
+ <th colspan="2">
926
+ <?php _e('<a href="http://www.joostdevalk.nl/wordpress/sociable/">Sociable</a> is copyright 2006 by <a href="http://push.cx/">Peter Harkins</a> and has been maintained by <a href="http://www.joostdevalk.nl/">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://www.joostdevalk.nl/donate/">donate a token of your appreciation</a>. If you have any problems or good ideas, <a href="http://www.joostdevalk.nl/contact/">contact me</a>.', 'sociable'); ?>
927
+ </th>
928
+ </tr>
929
+ </table>
930
  </div>
931
 
932
  </form>