HeadSpace2 SEO - Version 3.6.38

Version Description

  • Updated to AIOSEO importer, thanks to Joan
Download this release

Release Info

Developer johnny5
Plugin Icon wp plugin HeadSpace2 SEO
Version 3.6.38
Comparing to
See all releases

Code changes from version 3.6.37 to 3.6.38

Files changed (12) hide show
  1. headspace.php +1 -20
  2. modules/import/all-in-one-seo.php +8 -10
  3. modules/page/theme.php +2 -2
  4. readme.txt +5 -3
  5. view/admin/annoy.php +0 -13
  6. view/admin/import.php +1 -2
  7. view/admin/mass_edit.php +0 -2
  8. view/admin/options.php +0 -8
  9. view/admin/page-modules.php +0 -1
  10. view/admin/page-settings.php +0 -1
  11. view/admin/site-modules.php +1 -2
  12. view/admin/support.php +0 -31
headspace.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: HeadSpace2
4
  Plugin URI: http://urbangiraffe.com/plugins/headspace2/
5
  Description: Meta-data manager on steroids, allowing complete control over all SEO needs such as keywords/tags, titles, description, stylesheets, and many many other goodies.
6
- Version: 3.6.37
7
  Author: John Godley
8
  Author URI: http://urbangiraffe.com/
9
  ============================================================================================================
@@ -64,7 +64,6 @@ class HeadSpace2_Admin extends HeadSpace_Plugin {
64
  $this->add_action( 'admin_head', 'wp_print_styles' );
65
  $this->add_filter( 'print_scripts_array' );
66
  $this->add_action( 'admin_print_styles', 'wp_print_styles' );
67
- $this->add_filter( 'contextual_help', 'contextual_help', 10, 2 );
68
  $this->register_plugin_settings( __FILE__ );
69
 
70
  // Ajax functions
@@ -336,8 +335,6 @@ class HeadSpace2_Admin extends HeadSpace_Plugin {
336
  $this->admin_mass_edit ();
337
  else if ($sub == 'modules')
338
  $this->admin_modules ();
339
- else if ($sub == 'support')
340
- $this->render_admin( 'support' );
341
  }
342
 
343
  function get_options() {
@@ -350,7 +347,6 @@ class HeadSpace2_Admin extends HeadSpace_Plugin {
350
  'inherit' => true,
351
  'excerpt' => true,
352
  'debug' => false,
353
- 'support' => false
354
  );
355
 
356
  foreach ($defaults AS $key => $value) {
@@ -411,7 +407,6 @@ class HeadSpace2_Admin extends HeadSpace_Plugin {
411
  $options = $this->get_options ();
412
  $options['inherit'] = isset ($_POST['inherit']) ? true : false;
413
  $options['debug'] = isset ($_POST['debug']) ? true : false;
414
- $options['support'] = isset ($_POST['support']) ? true : false;
415
  $options['excerpt'] = isset ($_POST['excerpt']) ? true : false;
416
 
417
  update_option( 'headspace_options', $options);
@@ -544,20 +539,6 @@ class HeadSpace2_Admin extends HeadSpace_Plugin {
544
  return trim ($version[1]);
545
  return '';
546
  }
547
-
548
- function contextual_help($help, $screen) {
549
- if ($screen == 'settings_page_headspace') {
550
- $help .= '<h5>' . __('HeadSpace Help', 'headspace') . '</h5><div class="metabox-prefs">';
551
- $help .= '<a href="http://urbangiraffe.com/plugins/headspace2/">'.__ ('HeadSpace Documentation', 'headspace').'</a><br/>';
552
- $help .= '<a href="http://urbangiraffe.com/support/forum/headspace">'.__ ('HeadSpace Support Forum', 'headspace').'</a><br/>';
553
- $help .= '<a href="http://urbangiraffe.com/tracker/projects/headspace/issues?set_filter=1&amp;tracker_id=1">'.__ ('HeadSpace Bug Tracker', 'headspace').'</a><br/>';
554
- $help .= '<a href="http://urbangiraffe.com/plugins/headspace/faq/">'.__ ('HeadSpace FAQ', 'headspace').'</a><br/>';
555
- $help .= __ ('Please read the documentation and FAQ, and check the bug tracker, before asking a question.', 'headspace' );
556
- $help .= '</div>';
557
- }
558
-
559
- return $help;
560
- }
561
  }
562
 
563
  // Thematic compat
3
  Plugin Name: HeadSpace2
4
  Plugin URI: http://urbangiraffe.com/plugins/headspace2/
5
  Description: Meta-data manager on steroids, allowing complete control over all SEO needs such as keywords/tags, titles, description, stylesheets, and many many other goodies.
6
+ Version: 3.6.38
7
  Author: John Godley
8
  Author URI: http://urbangiraffe.com/
9
  ============================================================================================================
64
  $this->add_action( 'admin_head', 'wp_print_styles' );
65
  $this->add_filter( 'print_scripts_array' );
66
  $this->add_action( 'admin_print_styles', 'wp_print_styles' );
 
67
  $this->register_plugin_settings( __FILE__ );
68
 
69
  // Ajax functions
335
  $this->admin_mass_edit ();
336
  else if ($sub == 'modules')
337
  $this->admin_modules ();
 
 
338
  }
339
 
340
  function get_options() {
347
  'inherit' => true,
348
  'excerpt' => true,
349
  'debug' => false,
 
350
  );
351
 
352
  foreach ($defaults AS $key => $value) {
407
  $options = $this->get_options ();
408
  $options['inherit'] = isset ($_POST['inherit']) ? true : false;
409
  $options['debug'] = isset ($_POST['debug']) ? true : false;
 
410
  $options['excerpt'] = isset ($_POST['excerpt']) ? true : false;
411
 
412
  update_option( 'headspace_options', $options);
539
  return trim ($version[1]);
540
  return '';
541
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
542
  }
543
 
544
  // Thematic compat
modules/import/all-in-one-seo.php CHANGED
@@ -33,30 +33,28 @@ class ImportAllInOne extends HS_Importer
33
  $count = 0;
34
 
35
  global $wpdb;
36
- $values = $wpdb->get_results ("SELECT * FROM {$wpdb->postmeta} WHERE meta_key='keywords'");
 
37
  if ($values)
38
  {
39
  foreach ($values AS $meta)
40
- MetaData::add_tags ($meta->post_id, stripslashes ($meta->meta_value));
41
-
42
  $count += count ($values);
43
  }
44
 
45
- $values = $wpdb->get_results ("SELECT * FROM {$wpdb->postmeta} WHERE meta_key='title'");
46
  if ($values)
47
  {
48
  foreach ($values AS $meta)
49
  MetaData::add_page_title ($meta->post_id, stripslashes ($meta->meta_value));
50
-
51
  $count += count ($values);
52
  }
53
 
54
- $values = $wpdb->get_results ("SELECT * FROM {$wpdb->postmeta} WHERE meta_key='description'");
55
  if ($values)
56
  {
57
  foreach ($values AS $meta)
58
  MetaData::add_description ($meta->post_id, stripslashes ($meta->meta_value));
59
-
60
  $count += count ($values);
61
  }
62
 
@@ -66,8 +64,8 @@ class ImportAllInOne extends HS_Importer
66
  function cleanup ()
67
  {
68
  global $wpdb;
69
- $wpdb->query ("DELETE FROM {$wpdb->postmeta} WHERE meta_key='keywords'");
70
- $wpdb->query ("DELETE FROM {$wpdb->postmeta} WHERE meta_key='title'");
71
- $wpdb->query ("DELETE FROM {$wpdb->postmeta} WHERE meta_key='description'");
72
  }
73
  }
33
  $count = 0;
34
 
35
  global $wpdb;
36
+ $values = $wpdb->get_results ("SELECT * FROM {$wpdb->postmeta} WHERE meta_key='_aioseop_keywords'");
37
+
38
  if ($values)
39
  {
40
  foreach ($values AS $meta)
41
+ MetaData::add_tags ($meta->post_id, stripslashes ($meta->meta_value));
 
42
  $count += count ($values);
43
  }
44
 
45
+ $values = $wpdb->get_results ("SELECT * FROM {$wpdb->postmeta} WHERE meta_key='_aioseop_title'");
46
  if ($values)
47
  {
48
  foreach ($values AS $meta)
49
  MetaData::add_page_title ($meta->post_id, stripslashes ($meta->meta_value));
 
50
  $count += count ($values);
51
  }
52
 
53
+ $values = $wpdb->get_results ("SELECT * FROM {$wpdb->postmeta} WHERE meta_key='_aioseop_description'");
54
  if ($values)
55
  {
56
  foreach ($values AS $meta)
57
  MetaData::add_description ($meta->post_id, stripslashes ($meta->meta_value));
 
58
  $count += count ($values);
59
  }
60
 
64
  function cleanup ()
65
  {
66
  global $wpdb;
67
+ $wpdb->query ("DELETE FROM {$wpdb->postmeta} WHERE meta_key='_aioseop_keywords'");
68
+ $wpdb->query ("DELETE FROM {$wpdb->postmeta} WHERE meta_key='_aioseop_title'");
69
+ $wpdb->query ("DELETE FROM {$wpdb->postmeta} WHERE meta_key='_aioseop_description'");
70
  }
71
  }
modules/page/theme.php CHANGED
@@ -42,7 +42,7 @@ class HSM_Theme extends HSM_Module
42
  elseif (isset ($_GET['p']))
43
  $url = '/?p='.intval ($_GET['p']);
44
  else
45
- $url = str_replace( get_bloginfo( 'home' ), '', 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
46
 
47
  if (isset ($pages[$_SERVER['REQUEST_URI']]) || isset ($pages[$url])) {
48
  if (isset ($pages[$_SERVER['REQUEST_URI']]))
@@ -130,7 +130,7 @@ class HSM_Theme extends HSM_Module
130
 
131
  function link ($id) {
132
  $url = get_permalink ($id);
133
- $url = str_replace (get_bloginfo ('home'), '', $url);
134
  return $url;
135
  }
136
 
42
  elseif (isset ($_GET['p']))
43
  $url = '/?p='.intval ($_GET['p']);
44
  else
45
+ $url = str_replace( get_bloginfo( 'url' ), '', 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
46
 
47
  if (isset ($pages[$_SERVER['REQUEST_URI']]) || isset ($pages[$url])) {
48
  if (isset ($pages[$_SERVER['REQUEST_URI']]))
130
 
131
  function link ($id) {
132
  $url = get_permalink ($id);
133
+ $url = str_replace (get_bloginfo ('url'), '', $url);
134
  return $url;
135
  }
136
 
readme.txt CHANGED
@@ -1,10 +1,9 @@
1
  === HeadSpace2 SEO ===
2
  Contributors: johnny5
3
- Donate link: http://urbangiraffe.com/about/support/
4
  Tags: seo, post, page, meta-data, title, keywords, tags, tagging, google, head, meta, crazyegg, piwik, awstats, analytics, webmaster, feedburner
5
  Requires at least: 3.0
6
- Tested up to: 3.2.1
7
- Stable tag: 3.6.37
8
 
9
  Controls almost every aspect of your site's meta-data, including advanced tagging, Analytics, and dozens of plugins. The best WordPress SEO solution!
10
 
@@ -123,6 +122,9 @@ Full documentation can be found on the [HeadSpace2](http://urbangiraffe.com/plug
123
 
124
  == Changelog ==
125
 
 
 
 
126
  = 3.6.37 =
127
  * Fix bug with site modules not saving
128
 
1
  === HeadSpace2 SEO ===
2
  Contributors: johnny5
 
3
  Tags: seo, post, page, meta-data, title, keywords, tags, tagging, google, head, meta, crazyegg, piwik, awstats, analytics, webmaster, feedburner
4
  Requires at least: 3.0
5
+ Tested up to: 3.4
6
+ Stable tag: 3.6.38
7
 
8
  Controls almost every aspect of your site's meta-data, including advanced tagging, Analytics, and dozens of plugins. The best WordPress SEO solution!
9
 
122
 
123
  == Changelog ==
124
 
125
+ = 3.6.38 =
126
+ * Updated to AIOSEO importer, thanks to Joan
127
+
128
  = 3.6.37 =
129
  * Fix bug with site modules not saving
130
 
view/admin/annoy.php DELETED
@@ -1,13 +0,0 @@
1
- <?php
2
- if (!defined ('ABSPATH')) die ('No direct access allowed');
3
-
4
- $options = $this->get_options ();
5
- $sub = isset ($_GET['sub']) ? $_GET['sub'] : '';
6
- $url = explode ('&', $_SERVER['REQUEST_URI']);
7
- $url = $url[0];
8
-
9
- if (!$options['support']) :?>
10
- <div style="text-align: center; width: 80px; height: 50px; float: right; margin: 5px 15px 1px 0; padding: 4px 3px 0px 3px;-moz-border-radius: 5px; -webkit-border-radius: 5px;" id="support-annoy">
11
- <a href="<?php echo $this->base(); ?>?page=headspace.php&amp;sub=support"><img src="<?php echo $this->url () ?>/images/donate.gif" alt="support" width="73" height="44" /></a>
12
- </div>
13
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
view/admin/import.php CHANGED
@@ -1,6 +1,5 @@
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
  <div class="wrap">
3
- <?php $this->render_admin ('annoy'); ?>
4
  <?php screen_icon(); ?>
5
 
6
  <h2><?php printf (__ ('%s | Import', 'headspace'), HEADSPACE_MENU); ?></h2>
@@ -23,4 +22,4 @@
23
  </form>
24
 
25
  <p><?php _e ('As with anything else that modifies your database you should <strong>backup your data before running an import</strong>. No responsibility is accepted for any kittens that may be killed in the process.', 'headspace'); ?></p>
26
- </div>
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
  <div class="wrap">
 
3
  <?php screen_icon(); ?>
4
 
5
  <h2><?php printf (__ ('%s | Import', 'headspace'), HEADSPACE_MENU); ?></h2>
22
  </form>
23
 
24
  <p><?php _e ('As with anything else that modifies your database you should <strong>backup your data before running an import</strong>. No responsibility is accepted for any kittens that may be killed in the process.', 'headspace'); ?></p>
25
+ </div>
view/admin/mass_edit.php CHANGED
@@ -1,7 +1,5 @@
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
  <div class="wrap">
3
- <?php $this->render_admin ('annoy'); ?>
4
-
5
  <?php screen_icon(); ?>
6
 
7
  <h2><?php echo HEADSPACE_META; ?></h2>
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
  <div class="wrap">
 
 
3
  <?php screen_icon(); ?>
4
 
5
  <h2><?php echo HEADSPACE_META; ?></h2>
view/admin/options.php CHANGED
@@ -1,7 +1,6 @@
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
 
3
  <div class="wrap">
4
- <?php $this->render_admin ('annoy'); ?>
5
  <?php screen_icon(); ?>
6
 
7
  <h2><?php printf (__ ('%s | General Options', 'headspace'), HEADSPACE_MENU); ?></h2>
@@ -28,13 +27,6 @@
28
  <span class="sub"><?php _e ('Will allow plugins to modify generated excerpts', 'headspace'); ?></span>
29
  </td>
30
  </tr>
31
- <tr>
32
- <th align="right"><?php _e ('Plugin Support', 'headspace'); ?>:</th>
33
- <td>
34
- <input type="checkbox" name="support" <?php echo $this->checked ($options['support']) ?> id="support"/>
35
- <label for="support"><span class="sub"><?php _e ('I\'m a nice person and I have helped support the author of this plugin', 'headspace'); ?></span></label>
36
- </td>
37
- </tr>
38
  <tr>
39
  <th valign="top" align="right"><label for="debug"><?php _e ('Debug', 'headspace') ?></label>
40
  </th>
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
 
3
  <div class="wrap">
 
4
  <?php screen_icon(); ?>
5
 
6
  <h2><?php printf (__ ('%s | General Options', 'headspace'), HEADSPACE_MENU); ?></h2>
27
  <span class="sub"><?php _e ('Will allow plugins to modify generated excerpts', 'headspace'); ?></span>
28
  </td>
29
  </tr>
 
 
 
 
 
 
 
30
  <tr>
31
  <th valign="top" align="right"><label for="debug"><?php _e ('Debug', 'headspace') ?></label>
32
  </th>
view/admin/page-modules.php CHANGED
@@ -1,7 +1,6 @@
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
 
3
  <div class="wrap">
4
- <?php $this->render_admin ('annoy'); ?>
5
  <?php screen_icon(); ?>
6
 
7
  <h2><?php printf (__ ('%s | Page Modules', 'headspace'), HEADSPACE_MENU); ?></h2>
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
 
3
  <div class="wrap">
 
4
  <?php screen_icon(); ?>
5
 
6
  <h2><?php printf (__ ('%s | Page Modules', 'headspace'), HEADSPACE_MENU); ?></h2>
view/admin/page-settings.php CHANGED
@@ -1,7 +1,6 @@
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
 
3
  <div class="wrap">
4
- <?php $this->render_admin ('annoy'); ?>
5
  <?php screen_icon(); ?>
6
 
7
  <h2><?php printf (__ ('%s | Page Settings', 'headspace'), HEADSPACE_MENU); ?></h2>
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
 
3
  <div class="wrap">
 
4
  <?php screen_icon(); ?>
5
 
6
  <h2><?php printf (__ ('%s | Page Settings', 'headspace'), HEADSPACE_MENU); ?></h2>
view/admin/site-modules.php CHANGED
@@ -1,6 +1,5 @@
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
  <div class="wrap">
3
- <?php $this->render_admin ('annoy'); ?>
4
  <?php screen_icon(); ?>
5
 
6
  <h2><?php printf (__ ('%s | Site Modules', 'headspace'), HEADSPACE_MENU); ?></h2>
@@ -25,4 +24,4 @@ jQuery(document).ready( function() {
25
  var hs = new HeadSpace( { ajaxurl: '<?php echo admin_url( 'admin-ajax.php' ); ?>', nonce: '<?php echo wp_create_nonce ('headspace-site_module')?>' });
26
  hs.site_modules();
27
  });
28
- </script>
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
  <div class="wrap">
 
3
  <?php screen_icon(); ?>
4
 
5
  <h2><?php printf (__ ('%s | Site Modules', 'headspace'), HEADSPACE_MENU); ?></h2>
24
  var hs = new HeadSpace( { ajaxurl: '<?php echo admin_url( 'admin-ajax.php' ); ?>', nonce: '<?php echo wp_create_nonce ('headspace-site_module')?>' });
25
  hs.site_modules();
26
  });
27
+ </script>
view/admin/support.php DELETED
@@ -1,31 +0,0 @@
1
- <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
- <div class="wrap">
3
- <?php screen_icon(); ?>
4
-
5
- <h2><?php _e ('HeadSpace | Support', 'headspace'); ?></h2>
6
- <?php $this->submenu (true); ?>
7
- <p><?php _e ('HeadSpace has required a great deal of time and effort to develop. If it\'s been useful to you then you can support this development by <strong>making a small donation of $12</strong>. This will act as an incentive for me to carry on developing it, providing countless hours of support, and including any enhancements that are suggested.', 'headspace'); ?></p>
8
-
9
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
10
- <input type="hidden" name="cmd" value="_xclick"/>
11
- <input type="hidden" name="business" value="admin@urbangiraffe.com"/>
12
- <input type="hidden" name="item_name" value="HeadSpace"/>
13
- <input type="hidden" name="amount" value="12.00"/>
14
- <input type="hidden" name="buyer_credit_promo_code" value=""/>
15
- <input type="hidden" name="buyer_credit_product_category" value=""/>
16
- <input type="hidden" name="buyer_credit_shipping_method" value=""/>
17
- <input type="hidden" name="buyer_credit_user_address_change" value=""/>
18
- <input type="hidden" name="no_shipping" value="1"/>
19
- <input type="hidden" name="return" value="http://urbangiraffe.com/plugins/headspace2/"/>
20
- <input type="hidden" name="no_note" value="1"/>
21
- <input type="hidden" name="currency_code" value="USD"/>
22
- <input type="hidden" name="tax" value="0"/>
23
- <input type="hidden" name="lc" value="US"/>
24
- <input type="hidden" name="bn" value="PP-DonationsBF"/>
25
- <input type="image" style="border: none; margin: 0 auto; text-align: center; display: block" src="<?php echo $this->url () ?>/images/donate.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/>
26
- </form>
27
-
28
- <p><?php _e ('Alternatively, if you are multi-lingual, do consider translating this into another language. All the necessary localisation files are included and I\'ve written a <a href="http://urbangiraffe.com/articles/translating-wordpress-themes-and-plugins/">full guide to the translation process</a>.', 'headspace'); ?></p>
29
-
30
- <p><?php _e ('The support message can be disabled at any time from the options page', 'headspace'); ?>
31
- </div>