Shortlinks by Pretty Links – Best WordPress Link Tracking Plugin - Version 1.5.5

Version Description

  • Added the option to redirect on the template_redirect hook
  • Fixed an issue with the database upgrade process
  • Added Javascript redirection for pro users
  • Added Meta-Refresh redirection for pro users
  • Fixed issue where keywords were only being replaced on the first post of the post overview page for pro users
  • Fixed issue preventing the graph from appearing on the conversion reports page for pro users
  • Fixed issue with automatic tweeting when a post title contains a dollar sign for pro users
Download this release

Release Info

Developer supercleanse
Plugin Icon 128x128 Shortlinks by Pretty Links – Best WordPress Link Tracking Plugin
Version 1.5.5
Comparing to
See all releases

Code changes from version 1.5.4 to 1.5.5

Files changed (11) hide show
  1. classes/controllers/PrliAppController.php +22 -21
  2. classes/models/PrliOptions.php +5 -0
  3. classes/views/prli-links/form.php +2 -2
  4. classes/views/prli-links/list.php +6 -0
  5. classes/views/prli-options/form.php +14 -4
  6. i18n/pretty-link.pot +138 -79
  7. pretty-link.php +1 -1
  8. prli-config.php +5 -1
  9. prli-main.php +9 -2
  10. prli-options.php +2 -0
  11. readme.txt +21 -11
classes/controllers/PrliAppController.php CHANGED
@@ -12,24 +12,27 @@ class PrliAppController
12
 
13
  public function upgrade_database_headline()
14
  {
15
- global $prli_update, $prli_db_version, $prlipro_db_version, $prli_blogurl;
16
 
17
- $old_prli_db_version = get_option('prli_db_version');
18
- $show_db_upgrade_message = ( !$old_prli_db_version or ( intval($old_prli_db_version) < $prli_db_version ) );
19
-
20
- if( !$show_db_upgrade_message and
21
- $prli_update->pro_is_installed_and_authorized())
22
- {
23
- $old_prlipro_db_version = get_option('prlipro_db_version');
24
- $show_db_upgrade_message = ( !$old_prlipro_db_version or ( intval($old_prlipro_db_version) < $prlipro_db_version ) );
25
- }
26
-
27
- if( $show_db_upgrade_message )
28
- {
29
- $db_upgrade_url = wp_nonce_url("{$prli_blogurl}/index.php?plugin=pretty-link&controller=admin&action=db_upgrade", "prli-db-upgrade");
30
- ?>
31
- <div class="error" style="padding-top: 5px; padding-bottom: 5px;"><?php printf(__('Database Upgrade is required for Pretty Link to work properly<br/>%1$sAutomatically Upgrade your Database%2$s', 'pretty-link'), "<a href=\"{$db_upgrade_url}\">",'</a>'); ?></div>
32
- <?php
 
 
 
33
  }
34
  }
35
 
@@ -54,16 +57,14 @@ class PrliAppController
54
 
55
  public function db_upgrade()
56
  {
57
- global $prli_blogurl, $prli_update, $prli_db_version, $prlipro_db_version;
58
-
59
  if(!function_exists('wp_redirect'))
60
  require_once(ABSPATH . WPINC . '/pluggable.php');
61
 
62
  if( wp_verify_nonce( $_REQUEST['_wpnonce'], "prli-db-upgrade" ) and current_user_can( 'update_core' ) ) {
63
  prli_install();
64
- wp_redirect("{$prli_blogurl}/wp-admin/admin.php?page=pretty-link/prli-links.php&message=" . urlencode(__('Your Database Has Been Successfully Upgraded.', 'pretty-link')));
65
  }
66
  else
67
- wp_redirect($prli_blogurl);
68
  }
69
  }
12
 
13
  public function upgrade_database_headline()
14
  {
15
+ global $prli_update, $prli_db_version, $prlipro_db_version;
16
 
17
+ // Only show the message if the user can update core
18
+ if(current_user_can( 'update_core' )) {
19
+ $old_prli_db_version = get_option('prli_db_version');
20
+ $show_db_upgrade_message = ( !$old_prli_db_version or ( intval($old_prli_db_version) < $prli_db_version ) );
21
+
22
+ if( !$show_db_upgrade_message and
23
+ $prli_update->pro_is_installed_and_authorized())
24
+ {
25
+ $old_prlipro_db_version = get_option('prlipro_db_version');
26
+ $show_db_upgrade_message = ( !$old_prlipro_db_version or ( intval($old_prlipro_db_version) < $prlipro_db_version ) );
27
+ }
28
+
29
+ if( $show_db_upgrade_message )
30
+ {
31
+ $db_upgrade_url = wp_nonce_url(site_url("index.php?plugin=pretty-link&controller=admin&action=db_upgrade"), "prli-db-upgrade");
32
+ ?>
33
+ <div class="error" style="padding-top: 5px; padding-bottom: 5px;"><?php printf(__('Database Upgrade is required for Pretty Link to work properly<br/>%1$sAutomatically Upgrade your Database%2$s', 'pretty-link'), "<a href=\"{$db_upgrade_url}\">",'</a>'); ?></div>
34
+ <?php
35
+ }
36
  }
37
  }
38
 
57
 
58
  public function db_upgrade()
59
  {
 
 
60
  if(!function_exists('wp_redirect'))
61
  require_once(ABSPATH . WPINC . '/pluggable.php');
62
 
63
  if( wp_verify_nonce( $_REQUEST['_wpnonce'], "prli-db-upgrade" ) and current_user_can( 'update_core' ) ) {
64
  prli_install();
65
+ wp_redirect(admin_url("admin.php?page=pretty-link/prli-links.php&message=" . urlencode(__('Your Database Has Been Successfully Upgraded.', 'pretty-link'))));
66
  }
67
  else
68
+ wp_redirect(home_url());
69
  }
70
  }
classes/models/PrliOptions.php CHANGED
@@ -24,6 +24,7 @@ class PrliOptions
24
  var $prettybar_link_limit;
25
 
26
  var $link_redirect_type;
 
27
  var $link_prefix;
28
  var $link_track_me;
29
  var $link_nofollow;
@@ -60,6 +61,7 @@ class PrliOptions
60
  $link_track_as_pixel = 'prli_link_track_as_pixel';
61
  $link_nofollow = 'prli_link_nofollow';
62
  $link_redirect_type = 'prli_link_redirect_type';
 
63
 
64
 
65
  if(!isset($this->prettybar_show_title)) {
@@ -152,6 +154,9 @@ class PrliOptions
152
  $this->link_redirect_type = '307';
153
  }
154
 
 
 
 
155
  if(!isset($this->prli_exclude_ips))
156
  {
157
  if($var = get_option( $prli_exclude_ips )) {
24
  var $prettybar_link_limit;
25
 
26
  var $link_redirect_type;
27
+ var $link_redirect_action;
28
  var $link_prefix;
29
  var $link_track_me;
30
  var $link_nofollow;
61
  $link_track_as_pixel = 'prli_link_track_as_pixel';
62
  $link_nofollow = 'prli_link_nofollow';
63
  $link_redirect_type = 'prli_link_redirect_type';
64
+ $link_redirect_action = 'prli_link_redirect_action';
65
 
66
 
67
  if(!isset($this->prettybar_show_title)) {
154
  $this->link_redirect_type = '307';
155
  }
156
 
157
+ if(!isset($this->link_redirect_action))
158
+ $this->link_redirect_action = 'init';
159
+
160
  if(!isset($this->prli_exclude_ips))
161
  {
162
  if($var = get_option( $prli_exclude_ips )) {
classes/views/prli-links/form.php CHANGED
@@ -48,8 +48,8 @@
48
  <h3>Redirection Type&nbsp;</h3>
49
  <div class="pane">
50
  <select id="redirect_type" name="redirect_type" style="padding: 0px; margin: 0px;">
51
- <option value="307"<?php echo esc_html($values['redirect_type']['307']); ?>>307 (Temporary)&nbsp;</option>
52
- <option value="301"<?php echo esc_html($values['redirect_type']['301']); ?>>301 (Permanent)&nbsp;</option>
53
  <?php do_action('prli_redirection_types', $values); ?>
54
  </select><a class="toggle">&nbsp;[?]</a>
55
  <div class="toggle_pane description"><strong>307 Redirection</strong> is the best option if your Target URL could possibly change or need accurate reporting for this link.<br/><br/><strong>301 Redirection</strong> is the best option if you're <strong>NOT</strong> planning on changing your Target URL. Traditionally this option is considered to be the best approach to use for your SEO/SEM efforts but since Pretty Link uses your domain name either way this notion isn't necessarily true for Pretty Links. Also, this option may not give you accurate reporting since proxy and caching servers may go directly to your Target URL once it's cached.<br/><br/><strong>Pretty Bar Redirection</strong> is the best option if you want to show the Pretty Bar at the top of the page when redirecting to the Target URL.<br/><br/><strong>Cloak Redirection</strong> is the best option if you don't want your Target URL to be visible even after the redirection. This way, if a Target URL doesn't redirect to a URL you want to show then this will mask it.<br/><br/><strong>Pixel Redirection</strong> is the option you should select if you want this link to behave like a tracking pixel instead of as a link. This option is useful if you want to track the number of times a page or email is opened. If you place your Pretty Link inside an img tag on the page (Example: <code>&lt;img src="<?php echo esc_html($prli_blogurl . "/yourslug"); ?>" /&gt;</code>) then the page load will be tracked as a click and then displayed. Note: If this option is selected your Target URL will simply be ignored if there's a value in it.</div>
48
  <h3>Redirection Type&nbsp;</h3>
49
  <div class="pane">
50
  <select id="redirect_type" name="redirect_type" style="padding: 0px; margin: 0px;">
51
+ <option value="307"<?php echo esc_html($values['redirect_type']['307']); ?>><?php _e("307 (Temporary)", 'pretty-link') ?>&nbsp;</option>
52
+ <option value="301"<?php echo esc_html($values['redirect_type']['301']); ?>><?php _e("301 (Permanent)", 'pretty-link') ?>&nbsp;</option>
53
  <?php do_action('prli_redirection_types', $values); ?>
54
  </select><a class="toggle">&nbsp;[?]</a>
55
  <div class="toggle_pane description"><strong>307 Redirection</strong> is the best option if your Target URL could possibly change or need accurate reporting for this link.<br/><br/><strong>301 Redirection</strong> is the best option if you're <strong>NOT</strong> planning on changing your Target URL. Traditionally this option is considered to be the best approach to use for your SEO/SEM efforts but since Pretty Link uses your domain name either way this notion isn't necessarily true for Pretty Links. Also, this option may not give you accurate reporting since proxy and caching servers may go directly to your Target URL once it's cached.<br/><br/><strong>Pretty Bar Redirection</strong> is the best option if you want to show the Pretty Bar at the top of the page when redirecting to the Target URL.<br/><br/><strong>Cloak Redirection</strong> is the best option if you don't want your Target URL to be visible even after the redirection. This way, if a Target URL doesn't redirect to a URL you want to show then this will mask it.<br/><br/><strong>Pixel Redirection</strong> is the option you should select if you want this link to behave like a tracking pixel instead of as a link. This option is useful if you want to track the number of times a page or email is opened. If you place your Pretty Link inside an img tag on the page (Example: <code>&lt;img src="<?php echo esc_html($prli_blogurl . "/yourslug"); ?>" /&gt;</code>) then the page load will be tracked as a click and then displayed. Note: If this option is selected your Target URL will simply be ignored if there's a value in it.</div>
classes/views/prli-links/list.php CHANGED
@@ -102,6 +102,12 @@ if(!defined('ABSPATH'))
102
  else if( $link->redirect_type == 'pixel' ) { ?>
103
  <img src="<?php echo PRLI_IMAGES_URL . '/pixel_track.png'; ?>" width="13px" height="13px" name="Pixel Tracking Enabled" alt="Pixel Tracking Enabled" title="Pixel Tracking Enabled"/>&nbsp;
104
  <?php }
 
 
 
 
 
 
105
  else if( $link->redirect_type == '307' ) { ?>
106
  <span title="Temporary Redirection (307)" style="font-size: 14px; line-height: 14px; padding: 0px; margin: 0px; color: green;"><strong>T</strong></span>&nbsp;
107
  <?php }
102
  else if( $link->redirect_type == 'pixel' ) { ?>
103
  <img src="<?php echo PRLI_IMAGES_URL . '/pixel_track.png'; ?>" width="13px" height="13px" name="Pixel Tracking Enabled" alt="Pixel Tracking Enabled" title="Pixel Tracking Enabled"/>&nbsp;
104
  <?php }
105
+ else if( $link->redirect_type == 'metarefresh' ) { ?>
106
+ <span title="<?php _e('Meta Refresh Redirection', 'pretty-link') ?>" style="font-size: 14px; line-height: 14px; padding: 0px; margin: 0px; color: green;"><strong>M</strong></span>&nbsp;
107
+ <?php }
108
+ else if( $link->redirect_type == 'javascript' ) { ?>
109
+ <span title="<?php _e('Javascript Redirection', 'pretty-link') ?>" style="font-size: 14px; line-height: 14px; padding: 0px; margin: 0px; color: green;"><strong>J</strong></span>&nbsp;
110
+ <?php }
111
  else if( $link->redirect_type == '307' ) { ?>
112
  <span title="Temporary Redirection (307)" style="font-size: 14px; line-height: 14px; padding: 0px; margin: 0px; color: green;"><strong>T</strong></span>&nbsp;
113
  <?php }
classes/views/prli-options/form.php CHANGED
@@ -23,9 +23,10 @@ if(!$permalink_structure or empty($permalink_structure))
23
  <input type="hidden" name="<?php echo $hidden_field_name; ?>" value="Y">
24
  <?php wp_nonce_field('update-options'); ?>
25
 
26
- <h3><a class="toggle link-toggle-button">Link Option Defaults <span class="link-expand" style="display: none;">[+]</span><span class="link-collapse">[-]</span></a></h3>
27
  <ul class="link-toggle-pane" style="list-style-type: none;">
28
  <li>
 
29
  <input type="checkbox" name="<?php echo $link_track_me; ?>" <?php echo (($prli_options->link_track_me != 0)?'checked="true"':''); ?>/>&nbsp; Track Link
30
  <br/><span class="description">Default all new links to be tracked.</span>
31
  </li>
@@ -38,14 +39,23 @@ if(!$permalink_structure or empty($permalink_structure))
38
  <br/><span class="description">This option should only be checked if you have elements in your permalink structure that must be present in any link on your site. For example, some WordPress installs don't have the benefit of full rewrite capabilities and in this case you'd need an index.php included in each link (http://example.com/index.php/mycoolslug instead of http://example.com/mycoolslug). If this is the case for you then check this option but the vast majority of users will want to keep this unchecked.</span>
39
  </li>
40
  <li>
41
- <h4>Default Link Redirection Type:</h4>
42
  <select name="<?php echo $link_redirect_type; ?>">
43
- <option value="307" <?php echo (($prli_options->link_redirect_type == '307')?' selected="selected"':''); ?>/>Temporary (307)</option>
44
- <option value="301" <?php echo (($prli_options->link_redirect_type == '301')?' selected="selected"':''); ?>/>Permanent (301)</option>
45
  <?php do_action('prli_default_redirection_types',$prli_options->link_redirect_type); ?>
46
  </select>
47
  <br/><span class="description">Select the type of redirection you want your newly created links to have.</span>
48
  </li>
 
 
 
 
 
 
 
 
 
49
  </ul>
50
  <?php do_action('prli_custom_option_pane'); ?>
51
  <h3><a class="toggle reporting-toggle-button">Reporting Options <span class="reporting-expand" style="display: none;">[+]</span><span class="reporting-collapse">[-]</span></a></h3>
23
  <input type="hidden" name="<?php echo $hidden_field_name; ?>" value="Y">
24
  <?php wp_nonce_field('update-options'); ?>
25
 
26
+ <h3><a class="toggle link-toggle-button"><?php _e('Link Options', 'pretty-link') ?> <span class="link-expand" style="display: none;">[+]</span><span class="link-collapse">[-]</span></a></h3>
27
  <ul class="link-toggle-pane" style="list-style-type: none;">
28
  <li>
29
+ <h3><?php _e('Link Defaults:', 'pretty-link') ?></h3>
30
  <input type="checkbox" name="<?php echo $link_track_me; ?>" <?php echo (($prli_options->link_track_me != 0)?'checked="true"':''); ?>/>&nbsp; Track Link
31
  <br/><span class="description">Default all new links to be tracked.</span>
32
  </li>
39
  <br/><span class="description">This option should only be checked if you have elements in your permalink structure that must be present in any link on your site. For example, some WordPress installs don't have the benefit of full rewrite capabilities and in this case you'd need an index.php included in each link (http://example.com/index.php/mycoolslug instead of http://example.com/mycoolslug). If this is the case for you then check this option but the vast majority of users will want to keep this unchecked.</span>
40
  </li>
41
  <li>
42
+ <span><strong><?php _e('Default Link Redirection Type:', 'pretty-link') ?> </strong></span>
43
  <select name="<?php echo $link_redirect_type; ?>">
44
+ <option value="307" <?php echo (($prli_options->link_redirect_type == '307')?' selected="selected"':''); ?>>Temporary (307)</option>
45
+ <option value="301" <?php echo (($prli_options->link_redirect_type == '301')?' selected="selected"':''); ?>>Permanent (301)</option>
46
  <?php do_action('prli_default_redirection_types',$prli_options->link_redirect_type); ?>
47
  </select>
48
  <br/><span class="description">Select the type of redirection you want your newly created links to have.</span>
49
  </li>
50
+ <li>
51
+ <h3><?php _e('Advanced', 'pretty-link') ?></h3>
52
+ <span><strong><?php _e('WordPress Redirection Action:', 'pretty-link') ?> </strong></span>
53
+ <select name="<?php echo $link_redirect_action; ?>">
54
+ <option value="init" <?php echo (($prli_options->link_redirect_action == 'init')?' selected="selected"':''); ?>><?php _e('WordPress \'init\' Action', 'pretty-link') ?></option>
55
+ <option value="template_redirect" <?php echo (($prli_options->link_redirect_action == 'template_redirect')?' selected="selected"':''); ?>><?php _e('WordPress \'template_redirect\' Action', 'pretty-link') ?></option>
56
+ </select>
57
+ <br/><span class="description"><?php _e('Defaults to use WordPress\' \'init\' action. Init works more reliably for many users but the better option for performance and compatibility is to use the \'template_redirect\' action.', 'pretty-link') ?></span>
58
+ </li>
59
  </ul>
60
  <?php do_action('prli_custom_option_pane'); ?>
61
  <h3><a class="toggle reporting-toggle-button">Reporting Options <span class="reporting-expand" style="display: none;">[+]</span><span class="reporting-collapse">[-]</span></a></h3>
i18n/pretty-link.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the Pretty Link Lite package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: Pretty Link Lite 1.5.4\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/pretty-link\n"
7
- "POT-Creation-Date: 2011-12-11 23:57:22+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -21,48 +21,83 @@ msgstr ""
21
  msgid "Pretty Link Pro Successfully Uninstalled."
22
  msgstr ""
23
 
24
- #: prli-options.php:58 pro/prlipro-options.php:192
25
  msgid "Options saved."
26
  msgstr ""
27
 
28
- #: prli-options.php:65
29
  msgid "Hit Database was Cleared."
30
  msgstr ""
31
 
32
- #: prli-options.php:74
33
  msgid "No hits older than 30 days were found, so nothing was deleted"
34
  msgstr ""
35
 
36
- #: prli-options.php:83
37
  msgid "No hits older than 90 days were found, so nothing was deleted"
38
  msgstr ""
39
 
40
- #: classes/controllers/PrliAppController.php:31
41
  msgid ""
42
  "Database Upgrade is required for Pretty Link to work properly<br/>%1"
43
  "$sAutomatically Upgrade your Database%2$s"
44
  msgstr ""
45
 
46
- #: classes/controllers/PrliAppController.php:64
47
  msgid "Your Database Has Been Successfully Upgraded."
48
  msgstr ""
49
 
50
- #: classes/views/prli-options/form.php:63
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
51
  msgid "Filter Robots"
52
  msgstr ""
53
 
54
- #: classes/views/prli-options/form.php:64
55
  msgid ""
56
  "Filter known Robots and unidentifiable browser clients from your hit data, "
57
  "stats and reports. <code>IMPORTANT: Any robot hits recorded with any version "
58
  "of Pretty Link before 1.4.22 won't be filtered by this setting.</code>"
59
  msgstr ""
60
 
61
- #: classes/views/prli-options/form.php:67
62
  msgid "Whitelist IP Addresses:"
63
  msgstr ""
64
 
65
- #: classes/views/prli-options/form.php:70
66
  msgid ""
67
  "Enter IP Addresses or IP Ranges you want to always include in your Hit data "
68
  "and Stats even if they are flagged as robots. Each IP Address should be "
@@ -70,32 +105,48 @@ msgid ""
70
  "192.168.*.*</code>"
71
  msgstr ""
72
 
73
- #: classes/views/prli-options/form.php:78
74
  msgid "Tracking Style:"
75
  msgstr ""
76
 
77
- #: classes/views/prli-options/form.php:78
78
  msgid ""
79
  "Note: Changing your tracking style can affect the accuracy of your existing "
80
  "statistics."
81
  msgstr ""
82
 
83
- #: classes/views/prli-options/form.php:82
84
  msgid "Normal Tracking"
85
  msgstr ""
86
 
87
- #: classes/views/prli-options/form.php:85
88
  msgid "Extended Tracking (more stats / slower performance)"
89
  msgstr ""
90
 
91
- #: classes/views/prli-options/form.php:88
92
  msgid "Simple Click Count Tracking (less stats / faster performance)"
93
  msgstr ""
94
 
95
- #: classes/views/prli-options/form.php:97
96
  msgid "Update Options"
97
  msgstr ""
98
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
99
  #: classes/views/prli-tools/form.php:21
100
  msgid "Show iPhone Bookmarklet Instructions"
101
  msgstr ""
@@ -214,7 +265,7 @@ msgstr ""
214
  msgid "There was an error fetching your Pretty Link URL"
215
  msgstr ""
216
 
217
- #: prli-main.php:355 prli-main.php:374
218
  msgid ""
219
  "Your Pretty Link Pro installation isn't quite complete yet.<br/>%1"
220
  "$sAutomatically Upgrade to Enable Pretty Link Pro%2$s"
@@ -254,162 +305,170 @@ msgstr ""
254
  msgid "Unauthorized"
255
  msgstr ""
256
 
257
- #: pro/pretty-link-pro.php:1581
258
  msgid "Alternate Pretty Bar Attribution URL:"
259
  msgstr ""
260
 
261
- #: pro/pretty-link-pro.php:1674
262
  msgid "End-Point URL:"
263
  msgstr ""
264
 
265
- #: pro/pretty-link-pro.php:1675
266
  msgid "This can be used to integrate with your twitter client."
267
  msgstr ""
268
 
269
- #: pro/pretty-link-pro.php:1678
270
  msgid "Show TweetDeck Integration Instructions"
271
  msgstr ""
272
 
273
- #: pro/pretty-link-pro.php:1680 pro/pretty-link-pro.php:1686
274
  msgid "Follow the"
275
  msgstr ""
276
 
277
- #: pro/pretty-link-pro.php:1680
278
  msgid "TweetDeck Custom URL Instructions"
279
  msgstr ""
280
 
281
- #: pro/pretty-link-pro.php:1680
282
  msgid " and add the following URL to TweetDeck"
283
  msgstr ""
284
 
285
- #: pro/pretty-link-pro.php:1684
286
  msgid "Show Twitter for iPhone Integration Instructions"
287
  msgstr ""
288
 
289
- #: pro/pretty-link-pro.php:1686
290
  msgid "Twitter for iPhone Custom URL Instructions"
291
  msgstr ""
292
 
293
- #: pro/pretty-link-pro.php:1686
294
  msgid " and add the following URL to Twitter for iPhone"
295
  msgstr ""
296
 
297
- #: pro/pretty-link-pro.php:1696
298
  msgid "Label:"
299
  msgstr ""
300
 
301
- #: pro/pretty-link-pro.php:1701 pro/prlipro-create-public-link-widget.php:46
302
  msgid "Redirection:"
303
  msgstr ""
304
 
305
- #: pro/pretty-link-pro.php:1712 pro/prlipro-create-public-link-widget.php:57
306
  msgid "Tracking Enabled:"
307
  msgstr ""
308
 
309
- #: pro/pretty-link-pro.php:1721 pro/prlipro-create-public-link-widget.php:66
310
  msgid "Group:"
311
  msgstr ""
312
 
313
- #: pro/pretty-link-pro.php:1823 pro/pretty-link-pro.php:1863
314
  msgid "There was an error saving your Twitter account."
315
  msgstr ""
316
 
317
- #: pro/pretty-link-pro.php:1859
318
  msgid "Your Twitter Account was successfully saved."
319
  msgstr ""
320
 
321
- #: pro/pretty-link-pro.php:1877 pro/pretty-link-pro.php:1915
322
  msgid "Pretty Bar"
323
  msgstr ""
324
 
325
- #: pro/pretty-link-pro.php:1878
326
  msgid "Cloaked"
327
  msgstr ""
328
 
329
- #: pro/pretty-link-pro.php:1879 pro/pretty-link-pro.php:1917
330
  msgid "Pixel"
331
  msgstr ""
332
 
333
- #: pro/pretty-link-pro.php:1916
 
 
 
 
 
 
 
 
334
  msgid "Cloak"
335
  msgstr ""
336
 
337
- #: pro/pretty-link-pro.php:1945
338
  msgid "Image URL:"
339
  msgstr ""
340
 
341
- #: pro/pretty-link-pro.php:1948
342
  msgid ""
343
  "If set, this will replace the logo image on the PrettyBar. The image that "
344
  "this URL references should be 48x48 Pixels to fit."
345
  msgstr ""
346
 
347
- #: pro/pretty-link-pro.php:1952
348
  msgid "Background Image URL:"
349
  msgstr ""
350
 
351
- #: pro/pretty-link-pro.php:1955
352
  msgid ""
353
  "If set, this will replace the background image on PrettyBar. The image that "
354
  "this URL references should be 65px tall - this image will be repeated "
355
  "horizontally across the bar."
356
  msgstr ""
357
 
358
- #: pro/pretty-link-pro.php:1959
359
  msgid "Background Color:"
360
  msgstr ""
361
 
362
- #: pro/pretty-link-pro.php:1962
363
  msgid ""
364
  "This will alter the background color of the PrettyBar if you haven't "
365
  "specified a PrettyBar background image."
366
  msgstr ""
367
 
368
- #: pro/pretty-link-pro.php:1966
369
  msgid "Text Color:"
370
  msgstr ""
371
 
372
- #: pro/pretty-link-pro.php:1969
373
  msgid ""
374
  "If not set, this defaults to black (RGB value <code>#000000</code>) but you "
375
  "can change it to whatever color you like."
376
  msgstr ""
377
 
378
- #: pro/pretty-link-pro.php:1973
379
  msgid "Link Color:"
380
  msgstr ""
381
 
382
- #: pro/pretty-link-pro.php:1976
383
  msgid ""
384
  "If not set, this defaults to blue (RGB value <code>#0000ee</code>) but you "
385
  "can change it to whatever color you like."
386
  msgstr ""
387
 
388
- #: pro/pretty-link-pro.php:1980
389
  msgid "Link Hover Color:"
390
  msgstr ""
391
 
392
- #: pro/pretty-link-pro.php:1983
393
  msgid ""
394
  "If not set, this defaults to RGB value <code>#ababab</code> but you can "
395
  "change it to whatever color you like."
396
  msgstr ""
397
 
398
- #: pro/pretty-link-pro.php:1987
399
  msgid "Visited Link Color:"
400
  msgstr ""
401
 
402
- #: pro/pretty-link-pro.php:1990
403
  msgid ""
404
  "If not set, this defaults to RGB value <code>#551a8b</code> but you can "
405
  "change it to whatever color you like."
406
  msgstr ""
407
 
408
- #: pro/pretty-link-pro.php:1994
409
  msgid "Title Char Limit*:"
410
  msgstr ""
411
 
412
- #: pro/pretty-link-pro.php:1997
413
  msgid ""
414
  "If your Website has a long title then you may need to adjust this value so "
415
  "that it will all fit on the PrettyBar. It is recommended that you keep this "
@@ -417,11 +476,11 @@ msgid ""
417
  "good across different browsers and screen resolutions."
418
  msgstr ""
419
 
420
- #: pro/pretty-link-pro.php:2001
421
  msgid "Description Char Limit*:"
422
  msgstr ""
423
 
424
- #: pro/pretty-link-pro.php:2004
425
  msgid ""
426
  "If your Website has a long Description (tagline) then you may need to adjust "
427
  "this value so that it will all fit on the PrettyBar. It is recommended that "
@@ -429,102 +488,102 @@ msgid ""
429
  "format looks good across different browsers and screen resolutions."
430
  msgstr ""
431
 
432
- #: pro/pretty-link-pro.php:2008
433
  msgid "Target URL Char Limit*:"
434
  msgstr ""
435
 
436
- #: pro/pretty-link-pro.php:2011
437
  msgid ""
438
  "If you link to a lot of large Target URLs you may want to adjust this value. "
439
  "It is recommended that you keep this value to <code>40</code> or below so "
440
  "the PrettyBar's format looks good across different browsers and URL sizes"
441
  msgstr ""
442
 
443
- #: pro/pretty-link-pro.php:2016
444
  msgid "Show Pretty Bar Title"
445
  msgstr ""
446
 
447
- #: pro/pretty-link-pro.php:2017
448
  msgid ""
449
  "Make sure this is checked if you want the title of your blog (and link) to "
450
  "show up on the PrettyBar."
451
  msgstr ""
452
 
453
- #: pro/pretty-link-pro.php:2022
454
  msgid "Show Pretty Bar Description"
455
  msgstr ""
456
 
457
- #: pro/pretty-link-pro.php:2023
458
  msgid ""
459
  "Make sure this is checked if you want your site description to show up on "
460
  "the PrettyBar."
461
  msgstr ""
462
 
463
- #: pro/pretty-link-pro.php:2028
464
  msgid "Show Pretty Bar Share Links"
465
  msgstr ""
466
 
467
- #: pro/pretty-link-pro.php:2029
468
  msgid ""
469
  "Make sure this is checked if you want \"share links\" to show up on the "
470
  "PrettyBar."
471
  msgstr ""
472
 
473
- #: pro/pretty-link-pro.php:2034
474
  msgid "Show Pretty Bar Target URL"
475
  msgstr ""
476
 
477
- #: pro/pretty-link-pro.php:2035
478
  msgid ""
479
  "Make sure this is checked if you want a link displaying the Target URL to "
480
  "show up on the PrettyBar."
481
  msgstr ""
482
 
483
- #: pro/pretty-link-pro.php:2065
484
  msgid "Logo Image URL must be a correctly formatted URL"
485
  msgstr ""
486
 
487
- #: pro/pretty-link-pro.php:2068
488
  msgid "Background Image URL must be a correctly formatted URL"
489
  msgstr ""
490
 
491
- #: pro/pretty-link-pro.php:2071
492
  msgid "PrettyBar Background Color must be an actual RGB Value"
493
  msgstr ""
494
 
495
- #: pro/pretty-link-pro.php:2074
496
  msgid "PrettyBar Text Color must be an actual RGB Value"
497
  msgstr ""
498
 
499
- #: pro/pretty-link-pro.php:2077
500
  msgid "PrettyBar Link Color must be an actual RGB Value"
501
  msgstr ""
502
 
503
- #: pro/pretty-link-pro.php:2080 pro/pretty-link-pro.php:2083
504
  msgid "PrettyBar Hover Color must be an actual RGB Value"
505
  msgstr ""
506
 
507
- #: pro/pretty-link-pro.php:2086
508
  msgid "PrettyBar Title Character Limit must not be blank"
509
  msgstr ""
510
 
511
- #: pro/pretty-link-pro.php:2089
512
  msgid "PrettyBar Description Character Limit must not be blank"
513
  msgstr ""
514
 
515
- #: pro/pretty-link-pro.php:2092
516
  msgid "PrettyBar Link Character Limit must not be blank"
517
  msgstr ""
518
 
519
- #: pro/pretty-link-pro.php:2095
520
  msgid "PrettyBar Title Character Limit must be a number"
521
  msgstr ""
522
 
523
- #: pro/pretty-link-pro.php:2098
524
  msgid "PrettyBar Description Character Limit must be a number"
525
  msgstr ""
526
 
527
- #: pro/pretty-link-pro.php:2101
528
  msgid "PrettyBar Link Character Limit must be a number"
529
  msgstr ""
530
 
2
  # This file is distributed under the same license as the Pretty Link Lite package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: Pretty Link Lite 1.5.5\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/pretty-link\n"
7
+ "POT-Creation-Date: 2012-01-01 19:35:37+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
21
  msgid "Pretty Link Pro Successfully Uninstalled."
22
  msgstr ""
23
 
24
+ #: prli-options.php:60 pro/prlipro-options.php:192
25
  msgid "Options saved."
26
  msgstr ""
27
 
28
+ #: prli-options.php:67
29
  msgid "Hit Database was Cleared."
30
  msgstr ""
31
 
32
+ #: prli-options.php:76
33
  msgid "No hits older than 30 days were found, so nothing was deleted"
34
  msgstr ""
35
 
36
+ #: prli-options.php:85
37
  msgid "No hits older than 90 days were found, so nothing was deleted"
38
  msgstr ""
39
 
40
+ #: classes/controllers/PrliAppController.php:33
41
  msgid ""
42
  "Database Upgrade is required for Pretty Link to work properly<br/>%1"
43
  "$sAutomatically Upgrade your Database%2$s"
44
  msgstr ""
45
 
46
+ #: classes/controllers/PrliAppController.php:65
47
  msgid "Your Database Has Been Successfully Upgraded."
48
  msgstr ""
49
 
50
+ #: classes/views/prli-options/form.php:26
51
+ msgid "Link Options"
52
+ msgstr ""
53
+
54
+ #: classes/views/prli-options/form.php:29
55
+ msgid "Link Defaults:"
56
+ msgstr ""
57
+
58
+ #: classes/views/prli-options/form.php:42
59
+ msgid "Default Link Redirection Type:"
60
+ msgstr ""
61
+
62
+ #: classes/views/prli-options/form.php:51
63
+ msgid "Advanced"
64
+ msgstr ""
65
+
66
+ #: classes/views/prli-options/form.php:52
67
+ msgid "WordPress Redirection Action:"
68
+ msgstr ""
69
+
70
+ #: classes/views/prli-options/form.php:54
71
+ msgid "WordPress 'init' Action"
72
+ msgstr ""
73
+
74
+ #: classes/views/prli-options/form.php:55
75
+ msgid "WordPress 'template_redirect' Action"
76
+ msgstr ""
77
+
78
+ #: classes/views/prli-options/form.php:57
79
+ msgid ""
80
+ "Defaults to use WordPress' 'init' action. Init works more reliably for many "
81
+ "users but the better option for performance and compatibility is to use the "
82
+ "'template_redirect' action."
83
+ msgstr ""
84
+
85
+ #: classes/views/prli-options/form.php:73
86
  msgid "Filter Robots"
87
  msgstr ""
88
 
89
+ #: classes/views/prli-options/form.php:74
90
  msgid ""
91
  "Filter known Robots and unidentifiable browser clients from your hit data, "
92
  "stats and reports. <code>IMPORTANT: Any robot hits recorded with any version "
93
  "of Pretty Link before 1.4.22 won't be filtered by this setting.</code>"
94
  msgstr ""
95
 
96
+ #: classes/views/prli-options/form.php:77
97
  msgid "Whitelist IP Addresses:"
98
  msgstr ""
99
 
100
+ #: classes/views/prli-options/form.php:80
101
  msgid ""
102
  "Enter IP Addresses or IP Ranges you want to always include in your Hit data "
103
  "and Stats even if they are flagged as robots. Each IP Address should be "
105
  "192.168.*.*</code>"
106
  msgstr ""
107
 
108
+ #: classes/views/prli-options/form.php:88
109
  msgid "Tracking Style:"
110
  msgstr ""
111
 
112
+ #: classes/views/prli-options/form.php:88
113
  msgid ""
114
  "Note: Changing your tracking style can affect the accuracy of your existing "
115
  "statistics."
116
  msgstr ""
117
 
118
+ #: classes/views/prli-options/form.php:92
119
  msgid "Normal Tracking"
120
  msgstr ""
121
 
122
+ #: classes/views/prli-options/form.php:95
123
  msgid "Extended Tracking (more stats / slower performance)"
124
  msgstr ""
125
 
126
+ #: classes/views/prli-options/form.php:98
127
  msgid "Simple Click Count Tracking (less stats / faster performance)"
128
  msgstr ""
129
 
130
+ #: classes/views/prli-options/form.php:107
131
  msgid "Update Options"
132
  msgstr ""
133
 
134
+ #: classes/views/prli-links/list.php:106
135
+ msgid "Meta Refresh Redirection"
136
+ msgstr ""
137
+
138
+ #: classes/views/prli-links/list.php:109
139
+ msgid "Javascript Redirection"
140
+ msgstr ""
141
+
142
+ #: classes/views/prli-links/form.php:51
143
+ msgid "307 (Temporary)"
144
+ msgstr ""
145
+
146
+ #: classes/views/prli-links/form.php:52
147
+ msgid "301 (Permanent)"
148
+ msgstr ""
149
+
150
  #: classes/views/prli-tools/form.php:21
151
  msgid "Show iPhone Bookmarklet Instructions"
152
  msgstr ""
265
  msgid "There was an error fetching your Pretty Link URL"
266
  msgstr ""
267
 
268
+ #: prli-main.php:362 prli-main.php:381
269
  msgid ""
270
  "Your Pretty Link Pro installation isn't quite complete yet.<br/>%1"
271
  "$sAutomatically Upgrade to Enable Pretty Link Pro%2$s"
305
  msgid "Unauthorized"
306
  msgstr ""
307
 
308
+ #: pro/pretty-link-pro.php:1584
309
  msgid "Alternate Pretty Bar Attribution URL:"
310
  msgstr ""
311
 
312
+ #: pro/pretty-link-pro.php:1677
313
  msgid "End-Point URL:"
314
  msgstr ""
315
 
316
+ #: pro/pretty-link-pro.php:1678
317
  msgid "This can be used to integrate with your twitter client."
318
  msgstr ""
319
 
320
+ #: pro/pretty-link-pro.php:1681
321
  msgid "Show TweetDeck Integration Instructions"
322
  msgstr ""
323
 
324
+ #: pro/pretty-link-pro.php:1683 pro/pretty-link-pro.php:1689
325
  msgid "Follow the"
326
  msgstr ""
327
 
328
+ #: pro/pretty-link-pro.php:1683
329
  msgid "TweetDeck Custom URL Instructions"
330
  msgstr ""
331
 
332
+ #: pro/pretty-link-pro.php:1683
333
  msgid " and add the following URL to TweetDeck"
334
  msgstr ""
335
 
336
+ #: pro/pretty-link-pro.php:1687
337
  msgid "Show Twitter for iPhone Integration Instructions"
338
  msgstr ""
339
 
340
+ #: pro/pretty-link-pro.php:1689
341
  msgid "Twitter for iPhone Custom URL Instructions"
342
  msgstr ""
343
 
344
+ #: pro/pretty-link-pro.php:1689
345
  msgid " and add the following URL to Twitter for iPhone"
346
  msgstr ""
347
 
348
+ #: pro/pretty-link-pro.php:1699
349
  msgid "Label:"
350
  msgstr ""
351
 
352
+ #: pro/pretty-link-pro.php:1704 pro/prlipro-create-public-link-widget.php:46
353
  msgid "Redirection:"
354
  msgstr ""
355
 
356
+ #: pro/pretty-link-pro.php:1715 pro/prlipro-create-public-link-widget.php:57
357
  msgid "Tracking Enabled:"
358
  msgstr ""
359
 
360
+ #: pro/pretty-link-pro.php:1724 pro/prlipro-create-public-link-widget.php:66
361
  msgid "Group:"
362
  msgstr ""
363
 
364
+ #: pro/pretty-link-pro.php:1826 pro/pretty-link-pro.php:1866
365
  msgid "There was an error saving your Twitter account."
366
  msgstr ""
367
 
368
+ #: pro/pretty-link-pro.php:1862
369
  msgid "Your Twitter Account was successfully saved."
370
  msgstr ""
371
 
372
+ #: pro/pretty-link-pro.php:1880 pro/pretty-link-pro.php:1928
373
  msgid "Pretty Bar"
374
  msgstr ""
375
 
376
+ #: pro/pretty-link-pro.php:1881
377
  msgid "Cloaked"
378
  msgstr ""
379
 
380
+ #: pro/pretty-link-pro.php:1882 pro/pretty-link-pro.php:1930
381
  msgid "Pixel"
382
  msgstr ""
383
 
384
+ #: pro/pretty-link-pro.php:1883 pro/pretty-link-pro.php:1931
385
+ msgid "Meta Refresh"
386
+ msgstr ""
387
+
388
+ #: pro/pretty-link-pro.php:1884 pro/pretty-link-pro.php:1932
389
+ msgid "Javascript"
390
+ msgstr ""
391
+
392
+ #: pro/pretty-link-pro.php:1929
393
  msgid "Cloak"
394
  msgstr ""
395
 
396
+ #: pro/pretty-link-pro.php:1960
397
  msgid "Image URL:"
398
  msgstr ""
399
 
400
+ #: pro/pretty-link-pro.php:1963
401
  msgid ""
402
  "If set, this will replace the logo image on the PrettyBar. The image that "
403
  "this URL references should be 48x48 Pixels to fit."
404
  msgstr ""
405
 
406
+ #: pro/pretty-link-pro.php:1967
407
  msgid "Background Image URL:"
408
  msgstr ""
409
 
410
+ #: pro/pretty-link-pro.php:1970
411
  msgid ""
412
  "If set, this will replace the background image on PrettyBar. The image that "
413
  "this URL references should be 65px tall - this image will be repeated "
414
  "horizontally across the bar."
415
  msgstr ""
416
 
417
+ #: pro/pretty-link-pro.php:1974
418
  msgid "Background Color:"
419
  msgstr ""
420
 
421
+ #: pro/pretty-link-pro.php:1977
422
  msgid ""
423
  "This will alter the background color of the PrettyBar if you haven't "
424
  "specified a PrettyBar background image."
425
  msgstr ""
426
 
427
+ #: pro/pretty-link-pro.php:1981
428
  msgid "Text Color:"
429
  msgstr ""
430
 
431
+ #: pro/pretty-link-pro.php:1984
432
  msgid ""
433
  "If not set, this defaults to black (RGB value <code>#000000</code>) but you "
434
  "can change it to whatever color you like."
435
  msgstr ""
436
 
437
+ #: pro/pretty-link-pro.php:1988
438
  msgid "Link Color:"
439
  msgstr ""
440
 
441
+ #: pro/pretty-link-pro.php:1991
442
  msgid ""
443
  "If not set, this defaults to blue (RGB value <code>#0000ee</code>) but you "
444
  "can change it to whatever color you like."
445
  msgstr ""
446
 
447
+ #: pro/pretty-link-pro.php:1995
448
  msgid "Link Hover Color:"
449
  msgstr ""
450
 
451
+ #: pro/pretty-link-pro.php:1998
452
  msgid ""
453
  "If not set, this defaults to RGB value <code>#ababab</code> but you can "
454
  "change it to whatever color you like."
455
  msgstr ""
456
 
457
+ #: pro/pretty-link-pro.php:2002
458
  msgid "Visited Link Color:"
459
  msgstr ""
460
 
461
+ #: pro/pretty-link-pro.php:2005
462
  msgid ""
463
  "If not set, this defaults to RGB value <code>#551a8b</code> but you can "
464
  "change it to whatever color you like."
465
  msgstr ""
466
 
467
+ #: pro/pretty-link-pro.php:2009
468
  msgid "Title Char Limit*:"
469
  msgstr ""
470
 
471
+ #: pro/pretty-link-pro.php:2012
472
  msgid ""
473
  "If your Website has a long title then you may need to adjust this value so "
474
  "that it will all fit on the PrettyBar. It is recommended that you keep this "
476
  "good across different browsers and screen resolutions."
477
  msgstr ""
478
 
479
+ #: pro/pretty-link-pro.php:2016
480
  msgid "Description Char Limit*:"
481
  msgstr ""
482
 
483
+ #: pro/pretty-link-pro.php:2019
484
  msgid ""
485
  "If your Website has a long Description (tagline) then you may need to adjust "
486
  "this value so that it will all fit on the PrettyBar. It is recommended that "
488
  "format looks good across different browsers and screen resolutions."
489
  msgstr ""
490
 
491
+ #: pro/pretty-link-pro.php:2023
492
  msgid "Target URL Char Limit*:"
493
  msgstr ""
494
 
495
+ #: pro/pretty-link-pro.php:2026
496
  msgid ""
497
  "If you link to a lot of large Target URLs you may want to adjust this value. "
498
  "It is recommended that you keep this value to <code>40</code> or below so "
499
  "the PrettyBar's format looks good across different browsers and URL sizes"
500
  msgstr ""
501
 
502
+ #: pro/pretty-link-pro.php:2031
503
  msgid "Show Pretty Bar Title"
504
  msgstr ""
505
 
506
+ #: pro/pretty-link-pro.php:2032
507
  msgid ""
508
  "Make sure this is checked if you want the title of your blog (and link) to "
509
  "show up on the PrettyBar."
510
  msgstr ""
511
 
512
+ #: pro/pretty-link-pro.php:2037
513
  msgid "Show Pretty Bar Description"
514
  msgstr ""
515
 
516
+ #: pro/pretty-link-pro.php:2038
517
  msgid ""
518
  "Make sure this is checked if you want your site description to show up on "
519
  "the PrettyBar."
520
  msgstr ""
521
 
522
+ #: pro/pretty-link-pro.php:2043
523
  msgid "Show Pretty Bar Share Links"
524
  msgstr ""
525
 
526
+ #: pro/pretty-link-pro.php:2044
527
  msgid ""
528
  "Make sure this is checked if you want \"share links\" to show up on the "
529
  "PrettyBar."
530
  msgstr ""
531
 
532
+ #: pro/pretty-link-pro.php:2049
533
  msgid "Show Pretty Bar Target URL"
534
  msgstr ""
535
 
536
+ #: pro/pretty-link-pro.php:2050
537
  msgid ""
538
  "Make sure this is checked if you want a link displaying the Target URL to "
539
  "show up on the PrettyBar."
540
  msgstr ""
541
 
542
+ #: pro/pretty-link-pro.php:2080
543
  msgid "Logo Image URL must be a correctly formatted URL"
544
  msgstr ""
545
 
546
+ #: pro/pretty-link-pro.php:2083
547
  msgid "Background Image URL must be a correctly formatted URL"
548
  msgstr ""
549
 
550
+ #: pro/pretty-link-pro.php:2086
551
  msgid "PrettyBar Background Color must be an actual RGB Value"
552
  msgstr ""
553
 
554
+ #: pro/pretty-link-pro.php:2089
555
  msgid "PrettyBar Text Color must be an actual RGB Value"
556
  msgstr ""
557
 
558
+ #: pro/pretty-link-pro.php:2092
559
  msgid "PrettyBar Link Color must be an actual RGB Value"
560
  msgstr ""
561
 
562
+ #: pro/pretty-link-pro.php:2095 pro/pretty-link-pro.php:2098
563
  msgid "PrettyBar Hover Color must be an actual RGB Value"
564
  msgstr ""
565
 
566
+ #: pro/pretty-link-pro.php:2101
567
  msgid "PrettyBar Title Character Limit must not be blank"
568
  msgstr ""
569
 
570
+ #: pro/pretty-link-pro.php:2104
571
  msgid "PrettyBar Description Character Limit must not be blank"
572
  msgstr ""
573
 
574
+ #: pro/pretty-link-pro.php:2107
575
  msgid "PrettyBar Link Character Limit must not be blank"
576
  msgstr ""
577
 
578
+ #: pro/pretty-link-pro.php:2110
579
  msgid "PrettyBar Title Character Limit must be a number"
580
  msgstr ""
581
 
582
+ #: pro/pretty-link-pro.php:2113
583
  msgid "PrettyBar Description Character Limit must be a number"
584
  msgstr ""
585
 
586
+ #: pro/pretty-link-pro.php:2116
587
  msgid "PrettyBar Link Character Limit must be a number"
588
  msgstr ""
589
 
pretty-link.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Pretty Link Lite
4
  Plugin URI: http://blairwilliams.com/pretty-link
5
  Description: Shrink, track and share any URL on the Internet from your WordPress website!
6
- Version: 1.5.4
7
  Author: Caseproof
8
  Author URI: http://caseproof.com
9
  Copyright: 2004-2012, Caseproof, LLC
3
  Plugin Name: Pretty Link Lite
4
  Plugin URI: http://blairwilliams.com/pretty-link
5
  Description: Shrink, track and share any URL on the Internet from your WordPress website!
6
+ Version: 1.5.5
7
  Author: Caseproof
8
  Author URI: http://caseproof.com
9
  Copyright: 2004-2012, Caseproof, LLC
prli-config.php CHANGED
@@ -2,7 +2,7 @@
2
  if(!defined('ABSPATH'))
3
  die('You are not allowed to call this page directly.');
4
 
5
- define('PRLI_PLUGIN_NAME',"pretty-link");
6
  define('PRLI_PATH',WP_PLUGIN_DIR.'/'.PRLI_PLUGIN_NAME);
7
  define('PRLI_MODELS_PATH',PRLI_PATH.'/classes/models');
8
  define('PRLI_CONTROLLERS_PATH',PRLI_PATH.'/classes/controllers');
@@ -78,6 +78,8 @@ function setup_new_vars($groups)
78
  $values['redirect_type']['prettybar'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'prettybar') or (!isset($_REQUEST['redirect_type']) and $prli_options->link_redirect_type == 'prettybar'))?'selected="selected"':'');
79
  $values['redirect_type']['cloak'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'cloak') or (!isset($_REQUEST['redirect_type']) and $prli_options->link_redirect_type == 'cloak'))?'selected="selected"':'');
80
  $values['redirect_type']['pixel'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'pixel') or (!isset($_REQUEST['redirect_type']) and $prli_options->link_redirect_type == 'pixel'))?'selected="selected"':'');
 
 
81
 
82
  $values['groups'] = array();
83
 
@@ -131,6 +133,8 @@ function setup_edit_vars($groups,$record)
131
  $values['redirect_type']['prettybar'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'prettybar') or (isset($record->redirect_type) and $record->redirect_type == 'prettybar'))?' selected="selected"':'');
132
  $values['redirect_type']['cloak'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'cloak') or (isset($record->redirect_type) and $record->redirect_type == 'cloak'))?' selected="selected"':'');
133
  $values['redirect_type']['pixel'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'pixel') or (isset($record->redirect_type) and $record->redirect_type == 'pixel'))?' selected="selected"':'');
 
 
134
 
135
  return $values;
136
  }
2
  if(!defined('ABSPATH'))
3
  die('You are not allowed to call this page directly.');
4
 
5
+ define('PRLI_PLUGIN_NAME',dirname(plugin_basename(__FILE__)));
6
  define('PRLI_PATH',WP_PLUGIN_DIR.'/'.PRLI_PLUGIN_NAME);
7
  define('PRLI_MODELS_PATH',PRLI_PATH.'/classes/models');
8
  define('PRLI_CONTROLLERS_PATH',PRLI_PATH.'/classes/controllers');
78
  $values['redirect_type']['prettybar'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'prettybar') or (!isset($_REQUEST['redirect_type']) and $prli_options->link_redirect_type == 'prettybar'))?'selected="selected"':'');
79
  $values['redirect_type']['cloak'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'cloak') or (!isset($_REQUEST['redirect_type']) and $prli_options->link_redirect_type == 'cloak'))?'selected="selected"':'');
80
  $values['redirect_type']['pixel'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'pixel') or (!isset($_REQUEST['redirect_type']) and $prli_options->link_redirect_type == 'pixel'))?'selected="selected"':'');
81
+ $values['redirect_type']['metarefresh'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'metarefresh') or (!isset($_REQUEST['redirect_type']) and $prli_options->link_redirect_type == 'metarefresh'))?'selected="selected"':'');
82
+ $values['redirect_type']['javascript'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'javascript') or (!isset($_REQUEST['redirect_type']) and $prli_options->link_redirect_type == 'javascript'))?'selected="selected"':'');
83
 
84
  $values['groups'] = array();
85
 
133
  $values['redirect_type']['prettybar'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'prettybar') or (isset($record->redirect_type) and $record->redirect_type == 'prettybar'))?' selected="selected"':'');
134
  $values['redirect_type']['cloak'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'cloak') or (isset($record->redirect_type) and $record->redirect_type == 'cloak'))?' selected="selected"':'');
135
  $values['redirect_type']['pixel'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'pixel') or (isset($record->redirect_type) and $record->redirect_type == 'pixel'))?' selected="selected"':'');
136
+ $values['redirect_type']['metarefresh'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'metarefresh') or (isset($record->redirect_type) and $record->redirect_type == 'metarefresh'))?' selected="selected"':'');
137
+ $values['redirect_type']['javascript'] = (((isset($_REQUEST['redirect_type']) and $_REQUEST['redirect_type'] == 'javascript') or (isset($record->redirect_type) and $record->redirect_type == 'javascript'))?' selected="selected"':'');
138
 
139
  return $values;
140
  }
prli-main.php CHANGED
@@ -89,6 +89,11 @@ function prli_groups_admin_header()
89
  require_once 'classes/views/prli-groups/head.php';
90
  }
91
 
 
 
 
 
 
92
  /********* ADD REDIRECTS FOR STANDARD MODE ***********/
93
  function prli_redirect()
94
  {
@@ -123,8 +128,10 @@ function prli_link_redirect_from_slug($slug,$param_str)
123
  }
124
  }
125
 
126
- add_action('init', 'prli_redirect'); //Redirect
127
- //add_action('template_redirect', 'prli_redirect',0); //Redirect
 
 
128
 
129
  function prli_route_scripts()
130
  {
89
  require_once 'classes/views/prli-groups/head.php';
90
  }
91
 
92
+ function prli_template_redirect() {
93
+ if( is_404() )
94
+ prli_redirect();
95
+ }
96
+
97
  /********* ADD REDIRECTS FOR STANDARD MODE ***********/
98
  function prli_redirect()
99
  {
128
  }
129
  }
130
 
131
+ if($prli_options->link_redirect_action=='template_redirect')
132
+ add_action('template_redirect', 'prli_template_redirect',1); //Redirect
133
+ else // We just default to 'init'
134
+ add_action('init', 'prli_redirect'); // Redirect
135
 
136
  function prli_route_scripts()
137
  {
prli-options.php CHANGED
@@ -17,6 +17,7 @@ $link_track_me = 'prli_link_track_me';
17
  $link_prefix = 'prli_link_prefix';
18
  $link_nofollow = 'prli_link_nofollow';
19
  $link_redirect_type = 'prli_link_redirect_type';
 
20
  $hidden_field_name = 'prli_update_options';
21
 
22
  $update_message = false;
@@ -43,6 +44,7 @@ if( isset($_REQUEST[ $hidden_field_name ]) and $_REQUEST[ $hidden_field_name ] =
43
  $prli_options->link_prefix = (int)isset($_POST[ $link_prefix ]);
44
  $prli_options->link_nofollow = (int)isset($_POST[ $link_nofollow ]);
45
  $prli_options->link_redirect_type = $_POST[ $link_redirect_type ];
 
46
 
47
  do_action('prli-store-options');
48
 
17
  $link_prefix = 'prli_link_prefix';
18
  $link_nofollow = 'prli_link_nofollow';
19
  $link_redirect_type = 'prli_link_redirect_type';
20
+ $link_redirect_action = 'prli_link_redirect_action';
21
  $hidden_field_name = 'prli_update_options';
22
 
23
  $update_message = false;
44
  $prli_options->link_prefix = (int)isset($_POST[ $link_prefix ]);
45
  $prli_options->link_nofollow = (int)isset($_POST[ $link_nofollow ]);
46
  $prli_options->link_redirect_type = $_POST[ $link_redirect_type ];
47
+ $prli_options->link_redirect_action = $_POST[ $link_redirect_action ];
48
 
49
  do_action('prli-store-options');
50
 
readme.txt CHANGED
@@ -3,22 +3,21 @@ Contributors: supercleanse
3
  Donate link: http://prettylinkpro.com
4
  Tags: links, link, url, urls, affiliate, affiliates, pretty, marketing, redirect, forward, plugin, twitter, tweet, rewrite, shorturl, hoplink, hop, shortlink, short, shorten, click, clicks, track, tracking, tiny, tinyurl, budurl, shrinking, domain, shrink, mask, masking, cloak, cloaking, slug, slugs, admin, administration, stats, statistics, stat, statistic, email, ajax, javascript, ui, csv, download, page, post, pages, posts, shortcode, seo, automation, widget, widgets, dashboard
5
  Requires at least: 3.0
6
- Tested up to: 3.3
7
- Stable tag: 1.5.4
8
 
9
- Shrink, track and share any URL on the Internet from your WordPress website. Create short links suitable for Twitter using your own domain name!
10
 
11
  == Description ==
12
 
13
- Shrink, track and share any URL on the Internet from your WordPress website. Create short links suitable for Twitter using your own domain name!
14
 
15
- = Upgrade to Pretty Link Pro =
16
 
17
- Pretty Link Pro is an upgrade to Pretty Link that adds the capability to automate your pretty link creation, cloak links, auto-tweet them, replace keywords thoughout your blog and much more. You can learn more about it here:
 
18
 
19
- http://prettylinkpro.com
20
-
21
- = Detail =
22
 
23
  Pretty Link enables you to shorten links using your own domain name (as opposed to using tinyurl.com, bit.ly, or any other link shrinking service)! In addition to creating clean links, Pretty Link tracks each hit on your URL and provides a full, detailed report of where the hit came from, the browser, os and host. Pretty Link is a killer plugin for people who want to clean up their affiliate links, track clicks from emails, their links on Twitter to come from their own domain, or generally increase the reach of their website by spreading these links on forums or comments on other blogs.
24
 
@@ -32,7 +31,7 @@ Here's a named Pretty Link (I used the slug 'aweber') that does a 307 redirect t
32
 
33
  http://blairwilliams.com/aweber
34
 
35
- Here's a link that Pretty Link generated a random slug for (similar to how bit.ly or tinyurl would do):
36
 
37
  http://blairwilliams.com/w7a
38
 
@@ -48,7 +47,6 @@ http://blairwilliams.com/w7a
48
  * Intuitive Javascript / AJAX Admin User Interface
49
  * Pass custom parameters to your scripts through pretty link and still have full tracking ability
50
  * Exclude IP Addresses from Stats
51
- * Enables you to post your Pretty Links to Twitter directly from your WordPress admin
52
  * Enables you to send your Pretty Links via Email directly from your WordPress admin
53
  * Select Temporary (307) or Permanent (301) redirection for your Pretty Links
54
  * Cookie based system for tracking visitor activity across hits
@@ -67,6 +65,15 @@ http://blairwilliams.com/w7a
67
 
68
  == Changelog ==
69
 
 
 
 
 
 
 
 
 
 
70
  = 1.5.4 =
71
  * Fixed XSS Vulnerability
72
  * Fixed an activation issue
@@ -316,6 +323,9 @@ http://blairwilliams.com/w7a
316
 
317
  == Upgrade Notice ==
318
 
 
 
 
319
  = 1.5.4 =
320
  * Everyone should upgrade to this new release as it fixes an XSS vulnerability
321
 
3
  Donate link: http://prettylinkpro.com
4
  Tags: links, link, url, urls, affiliate, affiliates, pretty, marketing, redirect, forward, plugin, twitter, tweet, rewrite, shorturl, hoplink, hop, shortlink, short, shorten, click, clicks, track, tracking, tiny, tinyurl, budurl, shrinking, domain, shrink, mask, masking, cloak, cloaking, slug, slugs, admin, administration, stats, statistics, stat, statistic, email, ajax, javascript, ui, csv, download, page, post, pages, posts, shortcode, seo, automation, widget, widgets, dashboard
5
  Requires at least: 3.0
6
+ Tested up to: 3.3.1
7
+ Stable tag: 1.5.5
8
 
9
+ Shrink, track, manage and share any URL from your WordPress website. Create links that look however you want using your own domain name!
10
 
11
  == Description ==
12
 
13
+ Use *Pretty Link Lite* **or** [Upgrade to Pretty Link Pro](http://prettylinkpro.com "Upgrade to Pretty Link Pro")
14
 
15
+ *Pretty Link Pro* is a **significant upgrade** to *Pretty Link Lite* that adds many tools that will automate your pretty link creation, cloak links, auto-tweet them, replace keywords thoughout your blog with them and much more.
16
 
17
+ You can learn more about *Pretty Link Pro* here:
18
+ [About](http://prettylinkpro.com/about "About") | [Features](http://prettylinkpro.com/features "Features") | [Pricing](http://prettylinkpro.com/pricing "Pricing")
19
 
20
+ = Pretty Link Detail =
 
 
21
 
22
  Pretty Link enables you to shorten links using your own domain name (as opposed to using tinyurl.com, bit.ly, or any other link shrinking service)! In addition to creating clean links, Pretty Link tracks each hit on your URL and provides a full, detailed report of where the hit came from, the browser, os and host. Pretty Link is a killer plugin for people who want to clean up their affiliate links, track clicks from emails, their links on Twitter to come from their own domain, or generally increase the reach of their website by spreading these links on forums or comments on other blogs.
23
 
31
 
32
  http://blairwilliams.com/aweber
33
 
34
+ Here's a link that Pretty Link generated a random slug for (similar to what bit.ly or tinyurl would do):
35
 
36
  http://blairwilliams.com/w7a
37
 
47
  * Intuitive Javascript / AJAX Admin User Interface
48
  * Pass custom parameters to your scripts through pretty link and still have full tracking ability
49
  * Exclude IP Addresses from Stats
 
50
  * Enables you to send your Pretty Links via Email directly from your WordPress admin
51
  * Select Temporary (307) or Permanent (301) redirection for your Pretty Links
52
  * Cookie based system for tracking visitor activity across hits
65
 
66
  == Changelog ==
67
 
68
+ = 1.5.5 =
69
+ * Added the option to redirect on the template_redirect hook
70
+ * Fixed an issue with the database upgrade process
71
+ * Added Javascript redirection for pro users
72
+ * Added Meta-Refresh redirection for pro users
73
+ * Fixed issue where keywords were only being replaced on the first post of the post overview page for pro users
74
+ * Fixed issue preventing the graph from appearing on the conversion reports page for pro users
75
+ * Fixed issue with automatic tweeting when a post title contains a dollar sign for pro users
76
+
77
  = 1.5.4 =
78
  * Fixed XSS Vulnerability
79
  * Fixed an activation issue
323
 
324
  == Upgrade Notice ==
325
 
326
+ = 1.5.5 =
327
+ * Adds some new functionality that could be important for many users. Also fixed some minor issues affecting some users.
328
+
329
  = 1.5.4 =
330
  * Everyone should upgrade to this new release as it fixes an XSS vulnerability
331