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

Version Description

  • Fixed the CSV export issues
  • Moved all Pretty Link images to Amazon CloudFront
  • Added TweetDeck & Twitter for iPhone support for Pro Users
Download this release

Release Info

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

Code changes from version 1.4.53 to 1.4.54

Files changed (57) hide show
  1. classes/models/PrliOptions.php +2 -2
  2. classes/models/PrliUtils.php +1 -1
  3. classes/views/prli-clicks/csv_download.php +1 -55
  4. classes/views/prli-clicks/list.php +9 -9
  5. classes/views/prli-dashboard-widget/widget.php +1 -1
  6. classes/views/prli-groups/edit.php +1 -1
  7. classes/views/prli-groups/list.php +4 -4
  8. classes/views/prli-groups/new.php +1 -1
  9. classes/views/prli-links/edit.php +1 -1
  10. classes/views/prli-links/list.php +17 -17
  11. classes/views/prli-links/new.php +1 -1
  12. classes/views/prli-tools/form.php +20 -11
  13. classes/views/shared/nav.php +3 -12
  14. images/arrow_down.png +0 -0
  15. images/arrow_up.png +0 -0
  16. images/bar_background.png +0 -0
  17. images/bar_map.png +0 -0
  18. images/bookmark.png +0 -0
  19. images/co.mments.gif +0 -0
  20. images/delicious_32.png +0 -0
  21. images/digg_32.png +0 -0
  22. images/email_32.png +0 -0
  23. images/facebook.png +0 -0
  24. images/facebook_32.png +0 -0
  25. images/forward_params.png +0 -0
  26. images/hyves_32.png +0 -0
  27. images/linkedin_32.png +0 -0
  28. images/mixx_32.png +0 -0
  29. images/newsvine_32.png +0 -0
  30. images/nofollow.png +0 -0
  31. images/not_tracking.png +0 -0
  32. images/pixel_track.png +0 -0
  33. images/pretty-link-48x48.png +0 -0
  34. images/pretty-link-add.png +0 -0
  35. images/pretty-link-med.png +0 -0
  36. images/pretty-link-small.png +0 -0
  37. images/prettylink_logo.jpg +0 -0
  38. images/prettylink_logo_med.jpg +0 -0
  39. images/prettylink_logo_small.jpg +0 -0
  40. images/reddit_32.png +0 -0
  41. images/sphinn_32.png +0 -0
  42. images/stumbleupon_32.png +0 -0
  43. images/technorati_32.png +0 -0
  44. images/tracking.png +0 -0
  45. images/twitter.png +0 -0
  46. images/twitter_32.png +0 -0
  47. images/ultra-cloak.png +0 -0
  48. images/url_icon.gif +0 -0
  49. images/whatever.txt +0 -13
  50. images/yahoobuzz_32.png +0 -0
  51. pretty-bar.php +2 -2
  52. pretty-link.php +2 -2
  53. prli-bookmarklet.php +12 -12
  54. prli-clicks.php +3 -167
  55. prli-config.php +1 -0
  56. prli-main.php +2 -17
  57. readme.txt +10 -2
classes/models/PrliOptions.php CHANGED
@@ -166,7 +166,7 @@ class PrliOptions
166
  delete_option( $prettybar_image_url );
167
  }
168
  else
169
- $this->prettybar_image_url = PRLI_URL . '/images/pretty-link-48x48.png';
170
  }
171
 
172
  if(!isset($this->prettybar_background_image_url))
@@ -176,7 +176,7 @@ class PrliOptions
176
  delete_option( $prettybar_background_image_url );
177
  }
178
  else
179
- $this->prettybar_background_image_url = PRLI_URL . '/images/bar_background.png';
180
  }
181
 
182
  if(!isset($this->prettybar_color))
166
  delete_option( $prettybar_image_url );
167
  }
168
  else
169
+ $this->prettybar_image_url = PRLI_IMAGES_URL . '/pretty-link-48x48.png';
170
  }
171
 
172
  if(!isset($this->prettybar_background_image_url))
176
  delete_option( $prettybar_background_image_url );
177
  }
178
  else
179
+ $this->prettybar_background_image_url = PRLI_IMAGES_URL . '/bar_background.png';
180
  }
181
 
182
  if(!isset($this->prettybar_color))
classes/models/PrliUtils.php CHANGED
@@ -243,7 +243,7 @@ class PrliUtils
243
  $visitor_cookie_expire_time = time()+60*60*24*365; // Expire in 1 year
244
 
245
  // Retrieve / Generate visitor id
246
- if($_COOKIE[$visitor_cookie] == null)
247
  {
248
  $visitor_uid = $prli_click->generateUniqueVisitorId();
249
  setcookie($visitor_cookie,$visitor_uid,$visitor_cookie_expire_time,'/');
243
  $visitor_cookie_expire_time = time()+60*60*24*365; // Expire in 1 year
244
 
245
  // Retrieve / Generate visitor id
246
+ if(!isset($_COOKIE[$visitor_cookie]))
247
  {
248
  $visitor_uid = $prli_click->generateUniqueVisitorId();
249
  setcookie($visitor_cookie,$visitor_uid,$visitor_cookie_expire_time,'/');
classes/views/prli-clicks/csv_download.php CHANGED
@@ -3,7 +3,7 @@
3
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
4
  ?>
5
 
6
- <h2><img src="<?php echo PRLI_URL.'/images/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: CSV Downloads</h2>
7
  <span style="font-size: 14px; font-weight: bold;">For <?php echo stripslashes($link_name); ?>: </span>
8
 
9
  <h3>Hit Reports:</h3>
@@ -32,58 +32,4 @@ for($i=$hit_page_count; $i>0; $i--)
32
  }
33
  ?>
34
  </ul>
35
- <br/>
36
- <h3>IP History Reports:</h3>
37
- <span class="description">Shows all of the pretty links that visitors in <?php echo stripslashes($link_name); ?> have visited identified by IP address and sorted in descending order by date.</span>
38
- <br/>
39
- <ul>
40
- <?php
41
- for($i=$history_page_count; $i>0; $i--)
42
- {
43
- $history_min = 0;
44
-
45
- if($i)
46
- $history_min = ($i - 1) * $max_rows_per_file;
47
-
48
- if($i==$history_page_count)
49
- $history_max = $history_record_count;
50
- else
51
- $history_max = ($i * $max_rows_per_file) - 1;
52
-
53
- $history_count = $history_max - $history_min + 1;
54
- $report_label = "Hits {$history_min}-{$history_max} ({$history_count} Records)";
55
- $history_param_delim = (preg_match('#\?#',$history_report_url)?'&':'?');
56
- ?>
57
- <li><a href="<?php echo $history_report_url . $history_param_delim; ?>prli_page=<?php echo $i; ?>"><?php echo $report_label; ?></a></li>
58
- <?php
59
- }
60
- ?>
61
- </ul>
62
- <br/>
63
- <h3>IP Origin Reports:</h3>
64
- <span class="description">Shows the first the pretty link that visitors in <?php echo stripslashes($link_name); ?> have visited identified by IP address and the hit(s) that got these visitors listed in <?php echo stripslashes($link_name); ?>.</span>
65
- <br/>
66
- <ul>
67
- <?php
68
- for($i=$origin_page_count; $i>0; $i--)
69
- {
70
- $origin_min = 0;
71
-
72
- if($i)
73
- $origin_min = ($i - 1) * $max_rows_per_file;
74
-
75
- if($i==$origin_page_count)
76
- $origin_max = $origin_record_count;
77
- else
78
- $origin_max = ($i * $max_rows_per_file) - 1;
79
-
80
- $origin_count = $origin_max - $origin_min + 1;
81
- $report_label = "Hits {$origin_min}-{$origin_max} ({$origin_count} Records)";
82
- $origin_param_delim = (preg_match('#\?#',$origin_report_url)?'&':'?');
83
- ?>
84
- <li><a href="<?php echo $origin_report_url . $origin_param_delim; ?>prli_page=<?php echo $i; ?>"><?php echo $report_label; ?></a></li>
85
- <?php
86
- }
87
- ?>
88
- </ul>
89
  </div>
3
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
4
  ?>
5
 
6
+ <h2><img src="<?php echo PRLI_IMAGES_URL.'/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: CSV Downloads</h2>
7
  <span style="font-size: 14px; font-weight: bold;">For <?php echo stripslashes($link_name); ?>: </span>
8
 
9
  <h3>Hit Reports:</h3>
32
  }
33
  ?>
34
  </ul>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
35
  </div>
classes/views/prli-clicks/list.php CHANGED
@@ -2,7 +2,7 @@
2
  <?php
3
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
4
  ?>
5
- <h2><img src="<?php echo PRLI_URL.'/images/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Hits</h2>
6
  <span style="font-size: 14px; font-weight: bold;">For <?php echo stripslashes($link_name); ?>: </span>
7
  <?php
8
  // Don't show this sheesh if we're displaying the vuid or ip grouping
@@ -75,33 +75,33 @@
75
  <thead>
76
  <tr>
77
  <?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
78
- <th class="manage-column" width="5%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=btype<?php echo (($sort_str == 'btype' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Browser<?php echo (($sort_str == 'btype')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
79
  </th>
80
  <?php } ?>
81
  <th class="manage-column" width="12%">
82
- <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=ip<?php echo (($sort_str == 'ip' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">IP<?php echo (($sort_str == 'ip')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
83
  </th>
84
  <?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
85
  <th class="manage-column" width="12%">
86
- <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=vuid<?php echo (($sort_str == 'vuid' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Visitor<?php echo (($sort_str == 'vuid')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
87
  </th>
88
  <?php } ?>
89
  <th class="manage-column" width="13%">
90
- <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=created_at<?php echo (($sort_str == 'created_at' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Timestamp<?php echo ((empty($sort_str) or $sort_str == 'created_at')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.((empty($sort_str) or $sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
91
  </th>
92
  <?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
93
  <th class="manage-column" width="16%">
94
- <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=host<?php echo (($sort_str == 'host' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Host<?php echo (($sort_str == 'host')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
95
  </th>
96
  <?php } ?>
97
  <th class="manage-column" width="16%">
98
- <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=uri<?php echo (($sort_str == 'uri' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">URI<?php echo (($sort_str == 'uri')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
99
  </th>
100
  <th class="manage-column" width="16%">
101
- <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=referer<?php echo (($sort_str == 'referer' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Referrer<?php echo (($sort_str == 'referer')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
102
  </th>
103
  <th class="manage-column" width="13%">
104
- <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=link<?php echo (($sort_str == 'link' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Link<?php echo (($sort_str == 'link')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
105
  </th>
106
  </tr>
107
  </thead>
2
  <?php
3
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
4
  ?>
5
+ <h2><img src="<?php echo PRLI_IMAGES_URL.'/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Hits</h2>
6
  <span style="font-size: 14px; font-weight: bold;">For <?php echo stripslashes($link_name); ?>: </span>
7
  <?php
8
  // Don't show this sheesh if we're displaying the vuid or ip grouping
75
  <thead>
76
  <tr>
77
  <?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
78
+ <th class="manage-column" width="5%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=btype<?php echo (($sort_str == 'btype' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Browser<?php echo (($sort_str == 'btype')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
79
  </th>
80
  <?php } ?>
81
  <th class="manage-column" width="12%">
82
+ <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=ip<?php echo (($sort_str == 'ip' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">IP<?php echo (($sort_str == 'ip')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
83
  </th>
84
  <?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
85
  <th class="manage-column" width="12%">
86
+ <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=vuid<?php echo (($sort_str == 'vuid' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Visitor<?php echo (($sort_str == 'vuid')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
87
  </th>
88
  <?php } ?>
89
  <th class="manage-column" width="13%">
90
+ <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=created_at<?php echo (($sort_str == 'created_at' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Timestamp<?php echo ((empty($sort_str) or $sort_str == 'created_at')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.((empty($sort_str) or $sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
91
  </th>
92
  <?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
93
  <th class="manage-column" width="16%">
94
+ <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=host<?php echo (($sort_str == 'host' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Host<?php echo (($sort_str == 'host')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
95
  </th>
96
  <?php } ?>
97
  <th class="manage-column" width="16%">
98
+ <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=uri<?php echo (($sort_str == 'uri' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">URI<?php echo (($sort_str == 'uri')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
99
  </th>
100
  <th class="manage-column" width="16%">
101
+ <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=referer<?php echo (($sort_str == 'referer' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Referrer<?php echo (($sort_str == 'referer')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
102
  </th>
103
  <th class="manage-column" width="13%">
104
+ <a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php<?php echo $sort_params; ?>&sort=link<?php echo (($sort_str == 'link' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Link<?php echo (($sort_str == 'link')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a>
105
  </th>
106
  </tr>
107
  </thead>
classes/views/prli-dashboard-widget/widget.php CHANGED
@@ -1,5 +1,5 @@
1
  <div class="wrap">
2
- <a href="http://blairwilliams.com/pretty-link"><img style="float: left; border: 0px;" src="<?php echo PRLI_URL.'/images/prettylink_logo_small.jpg'; ?>"/></a><div style="min-height: 48px;"><div style="min-height: 18px; margin-left: 137px; margin-top: 0px; padding-top: 0px; border: 1px solid #e5e597; background-color: #ffffa0; display: block;"><p style="font-size: 11px; margin:0px; padding: 0px; padding-left: 10px;"><?php echo $message; ?></p></div></div>
3
 
4
  <form name="form1" method="post" action="?page=<?php echo PRLI_PLUGIN_NAME ?>/prli-links.php">
5
  <input type="hidden" name="action" value="quick-create">
1
  <div class="wrap">
2
+ <a href="http://blairwilliams.com/pretty-link"><img style="float: left; border: 0px;" src="<?php echo PRLI_IMAGES_URL . '/prettylink_logo_small.jpg'; ?>"/></a><div style="min-height: 48px;"><div style="min-height: 18px; margin-left: 137px; margin-top: 0px; padding-top: 0px; border: 1px solid #e5e597; background-color: #ffffa0; display: block;"><p style="font-size: 11px; margin:0px; padding: 0px; padding-left: 10px;"><?php echo $message; ?></p></div></div>
3
 
4
  <form name="form1" method="post" action="?page=<?php echo PRLI_PLUGIN_NAME ?>/prli-links.php">
5
  <input type="hidden" name="action" value="quick-create">
classes/views/prli-groups/edit.php CHANGED
@@ -1,5 +1,5 @@
1
  <div class="wrap">
2
- <h2><img src="<?php echo PRLI_URL.'/images/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Edit Group</h2>
3
 
4
  <?php
5
  require(PRLI_VIEWS_PATH.'/shared/errors.php');
1
  <div class="wrap">
2
+ <h2><img src="<?php echo PRLI_IMAGES_URL.'/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Edit Group</h2>
3
 
4
  <?php
5
  require(PRLI_VIEWS_PATH.'/shared/errors.php');
classes/views/prli-groups/list.php CHANGED
@@ -2,7 +2,7 @@
2
  <?php
3
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
4
  ?>
5
- <h2><img src="<?php echo PRLI_URL.'/images/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Groups</h2>
6
  <div id="message" class="updated fade" style="padding:5px;"><?php echo $prli_message; ?></div>
7
  <div id="search_pane" style="float: right;">
8
  <form class="form-fields" name="group_form" method="post" action="">
@@ -32,9 +32,9 @@
32
  <table class="widefat post fixed" cellspacing="0">
33
  <thead>
34
  <tr>
35
- <th class="manage-column" width="50%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&sort=name<?php echo (($sort_str == 'name' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Name<?php echo (($sort_str == 'name')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
36
- <th class="manage-column" width="20%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&sort=link_count<?php echo (($sort_str == 'link_count' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Links<?php echo (($sort_str == 'link_count')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
37
- <th class="manage-column" width="30%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&sort=created_at<?php echo (($sort_str == 'created_at' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Created<?php echo ((empty($sort_str) or $sort_str == 'created_at')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.((empty($sort_str) or $sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
38
  </tr>
39
  </thead>
40
  <?php
2
  <?php
3
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
4
  ?>
5
+ <h2><img src="<?php echo PRLI_IMAGES_URL.'/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Groups</h2>
6
  <div id="message" class="updated fade" style="padding:5px;"><?php echo $prli_message; ?></div>
7
  <div id="search_pane" style="float: right;">
8
  <form class="form-fields" name="group_form" method="post" action="">
32
  <table class="widefat post fixed" cellspacing="0">
33
  <thead>
34
  <tr>
35
+ <th class="manage-column" width="50%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&sort=name<?php echo (($sort_str == 'name' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Name<?php echo (($sort_str == 'name')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
36
+ <th class="manage-column" width="20%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&sort=link_count<?php echo (($sort_str == 'link_count' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Links<?php echo (($sort_str == 'link_count')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
37
+ <th class="manage-column" width="30%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&sort=created_at<?php echo (($sort_str == 'created_at' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Created<?php echo ((empty($sort_str) or $sort_str == 'created_at')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL.'/'.((empty($sort_str) or $sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
38
  </tr>
39
  </thead>
40
  <?php
classes/views/prli-groups/new.php CHANGED
@@ -1,5 +1,5 @@
1
  <div class="wrap">
2
- <h2><img src="<?php echo PRLI_URL.'/images/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Add Group</h2>
3
 
4
  <?php
5
  require(PRLI_VIEWS_PATH.'/shared/errors.php');
1
  <div class="wrap">
2
+ <h2><img src="<?php echo PRLI_IMAGES_URL.'/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Add Group</h2>
3
 
4
  <?php
5
  require(PRLI_VIEWS_PATH.'/shared/errors.php');
classes/views/prli-links/edit.php CHANGED
@@ -1,5 +1,5 @@
1
  <div class="wrap">
2
- <h2><img src="<?php echo PRLI_URL.'/images/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Edit Link</h2>
3
 
4
  <?php
5
  require(PRLI_VIEWS_PATH.'/shared/errors.php');
1
  <div class="wrap">
2
+ <h2><img src="<?php echo PRLI_IMAGES_URL.'/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Edit Link</h2>
3
 
4
  <?php
5
  require(PRLI_VIEWS_PATH.'/shared/errors.php');
classes/views/prli-links/list.php CHANGED
@@ -2,7 +2,7 @@
2
  <?php
3
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
4
  ?>
5
- <h2><img src="<?php echo PRLI_URL.'/images/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Links</h2>
6
  <?php
7
  if(empty($params['group']))
8
  {
@@ -35,7 +35,7 @@
35
  </form>
36
  </div>
37
  <div id="button_bar">
38
- <p><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-add-link.php"><img src="<?php echo PRLI_URL.'/images/pretty-link-add.png'; ?>"/> Add a Pretty Link</a>
39
  &nbsp;|&nbsp;<a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-options.php">Options</a>
40
  &nbsp;|&nbsp;<a href="http://blairwilliams.com/plintro">Watch Pretty Link Intro Video</a>
41
  <?php do_action('prli-link-nav'); ?>
@@ -58,12 +58,12 @@
58
  <table class="widefat post fixed" cellspacing="0">
59
  <thead>
60
  <tr>
61
- <th class="manage-column" width="30%"><?php do_action('prli-list-header-icon'); ?><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=name<?php echo (($sort_str == 'name' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Name<?php echo (($sort_str == 'name')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
62
  <?php do_action('prli_link_column_header'); ?>
63
- <th class="manage-column" width="10%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=clicks<?php echo (($sort_str == 'clicks' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Hits / Uniq<?php echo (($sort_str == 'clicks')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
64
- <th class="manage-column" width="5%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=group_name<?php echo (($sort_str == 'group_name' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Group<?php echo (($sort_str == 'group_name')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
65
- <th class="manage-column" width="12%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=created_at<?php echo (($sort_str == 'created_at' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Created<?php echo ((empty($sort_str) or $sort_str == 'created_at')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.((empty($sort_str) or $sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
66
- <th class="manage-column" width="20%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=slug<?php echo (($sort_str == 'slug' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Links<?php echo (($sort_str == 'slug')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_URL.'/images/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
67
  </tr>
68
  </thead>
69
  <?php
@@ -89,13 +89,13 @@
89
 
90
  <?php do_action('prli_list_icon',$link->id); ?>
91
  <?php if( $link->redirect_type == 'prettybar' ) { ?>
92
- <img src="<?php echo PRLI_URL.'/images/pretty-link-small.png'; ?>" title="Using PrettyBar" width="13px" height="13px" />
93
  <?php }
94
  else if( $link->redirect_type == 'cloak' ) { ?>
95
- <img src="<?php echo PRLI_URL.'/images/ultra-cloak.png'; ?>" title="Using Ultra Cloak" width="13px" height="13px" />
96
  <?php }
97
  else if( $link->redirect_type == 'pixel' ) { ?>
98
- <img src="<?php echo PRLI_URL.'/images/pixel_track.png'; ?>" width="13px" height="13px" name="Pixel Tracking Enabled" alt="Pixel Tracking Enabled" title="Pixel Tracking Enabled"/>&nbsp;
99
  <?php }
100
  else if( $link->redirect_type == '307' ) { ?>
101
  <span title="Temporary Redirection (307)" style="font-size: 14px; line-height: 14px; padding: 0px; margin: 0px; color: green;"><strong>T</strong></span>&nbsp;
@@ -105,19 +105,19 @@
105
  <?php } ?>
106
 
107
  <?php if( $link->nofollow ) { ?>
108
- <img src="<?php echo PRLI_URL.'/images/nofollow.png'; ?>" title="nofollow" width="13px" height="13px" />
109
  <?php }
110
 
111
  if($link->param_forwarding == 'on')
112
  {
113
  ?>
114
- <img src="<?php echo PRLI_URL.'/images/forward_params.png'; ?>" width="13px" height="13px" name="Standard Parameter Forwarding Enabled" alt="Standard Parameter Forwarding Enabled" title="Standard Parameter Forwarding Enabled"/>&nbsp;
115
  <?php
116
  }
117
  else if($link->param_forwarding == 'custom')
118
  {
119
  ?>
120
- <img src="<?php echo PRLI_URL.'/images/forward_params.png'; ?>" width="13px" height="13px" name="Custom Parameter Forwarding Enabled" alt="Custom Parameter Forwarding Enabled" title="Custom Parameter Forwarding Enabled"/>&nbsp;
121
  <?php
122
  }
123
  ?>
@@ -125,8 +125,8 @@
125
  <?php if( $link->redirect_type != 'pixel' )
126
  {
127
  ?>
128
- <a href="<?php echo $link->url; ?>" target="_blank" title="Visit Target URL: <?php echo $link->url; ?> in a New Window"><img src="<?php echo PRLI_URL.'/images/url_icon.gif'; ?>" width="13px" height="13px" name="Visit" alt="Visit"/></a>&nbsp;
129
- <a href="<?php echo $pretty_link_url; ?>" target="_blank" title="Visit Pretty Link: <?php echo $pretty_link_url; ?> in a New Window"><img src="<?php echo PRLI_URL.'/images/url_icon.gif'; ?>" width="13px" height="13px" name="Visit" alt="Visit"/></a>&nbsp;
130
  <?php
131
  }
132
  ?>
@@ -153,9 +153,9 @@
153
  <?php do_action('prli_link_column_row',$link->id); ?>
154
  <td>
155
  <?php if($prli_options->extended_tracking!='count')
156
- echo (($link->track_me)?"<a href=\"?page=".PRLI_PLUGIN_NAME."/prli-clicks.php&l=$link->id\" title=\"View clicks for $link->slug\">" . (empty($link->clicks)?0:$link->clicks) . "/" . (empty($link->uniques)?0:$link->uniques) . "</a>":"<img src=\"".PRLI_URL."/images/not_tracking.png\" title=\"This link isn't being tracked\"/>");
157
  else
158
- echo (($link->track_me)?(empty($link->clicks)?0:$link->clicks) . "/" . (empty($link->uniques)?0:$link->uniques):"<img src=\"".PRLI_URL."/images/not_tracking.png\" title=\"This link isn't being tracked\"/>");
159
  ?>
160
  </td>
161
  <td><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&group=<?php echo $link->group_id; ?>"><?php echo $link->group_name; ?></a></td>
2
  <?php
3
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
4
  ?>
5
+ <h2><img src="<?php echo PRLI_IMAGES_URL . '/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Links</h2>
6
  <?php
7
  if(empty($params['group']))
8
  {
35
  </form>
36
  </div>
37
  <div id="button_bar">
38
+ <p><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-add-link.php"><img src="<?php echo PRLI_IMAGES_URL . '/pretty-link-add.png'; ?>"/> Add a Pretty Link</a>
39
  &nbsp;|&nbsp;<a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-options.php">Options</a>
40
  &nbsp;|&nbsp;<a href="http://blairwilliams.com/plintro">Watch Pretty Link Intro Video</a>
41
  <?php do_action('prli-link-nav'); ?>
58
  <table class="widefat post fixed" cellspacing="0">
59
  <thead>
60
  <tr>
61
+ <th class="manage-column" width="30%"><?php do_action('prli-list-header-icon'); ?><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=name<?php echo (($sort_str == 'name' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Name<?php echo (($sort_str == 'name')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
62
  <?php do_action('prli_link_column_header'); ?>
63
+ <th class="manage-column" width="10%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=clicks<?php echo (($sort_str == 'clicks' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Hits / Uniq<?php echo (($sort_str == 'clicks')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
64
+ <th class="manage-column" width="5%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=group_name<?php echo (($sort_str == 'group_name' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Group<?php echo (($sort_str == 'group_name')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
65
+ <th class="manage-column" width="12%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=created_at<?php echo (($sort_str == 'created_at' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Created<?php echo ((empty($sort_str) or $sort_str == 'created_at')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL . '/'.((empty($sort_str) or $sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
66
+ <th class="manage-column" width="20%"><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&sort=slug<?php echo (($sort_str == 'slug' and $sdir_str == 'asc')?'&sdir=desc':''); ?>">Links<?php echo (($sort_str == 'slug')?'&nbsp;&nbsp;&nbsp;<img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
67
  </tr>
68
  </thead>
69
  <?php
89
 
90
  <?php do_action('prli_list_icon',$link->id); ?>
91
  <?php if( $link->redirect_type == 'prettybar' ) { ?>
92
+ <img src="<?php echo PRLI_IMAGES_URL . '/pretty-link-small.png'; ?>" title="Using PrettyBar" width="13px" height="13px" />
93
  <?php }
94
  else if( $link->redirect_type == 'cloak' ) { ?>
95
+ <img src="<?php echo PRLI_IMAGES_URL . '/ultra-cloak.png'; ?>" title="Using Ultra Cloak" width="13px" height="13px" />
96
  <?php }
97
  else if( $link->redirect_type == 'pixel' ) { ?>
98
+ <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;
99
  <?php }
100
  else if( $link->redirect_type == '307' ) { ?>
101
  <span title="Temporary Redirection (307)" style="font-size: 14px; line-height: 14px; padding: 0px; margin: 0px; color: green;"><strong>T</strong></span>&nbsp;
105
  <?php } ?>
106
 
107
  <?php if( $link->nofollow ) { ?>
108
+ <img src="<?php echo PRLI_IMAGES_URL . '/nofollow.png'; ?>" title="nofollow" width="13px" height="13px" />
109
  <?php }
110
 
111
  if($link->param_forwarding == 'on')
112
  {
113
  ?>
114
+ <img src="<?php echo PRLI_IMAGES_URL . '/forward_params.png'; ?>" width="13px" height="13px" name="Standard Parameter Forwarding Enabled" alt="Standard Parameter Forwarding Enabled" title="Standard Parameter Forwarding Enabled"/>&nbsp;
115
  <?php
116
  }
117
  else if($link->param_forwarding == 'custom')
118
  {
119
  ?>
120
+ <img src="<?php echo PRLI_IMAGES_URL . '/forward_params.png'; ?>" width="13px" height="13px" name="Custom Parameter Forwarding Enabled" alt="Custom Parameter Forwarding Enabled" title="Custom Parameter Forwarding Enabled"/>&nbsp;
121
  <?php
122
  }
123
  ?>
125
  <?php if( $link->redirect_type != 'pixel' )
126
  {
127
  ?>
128
+ <a href="<?php echo $link->url; ?>" target="_blank" title="Visit Target URL: <?php echo $link->url; ?> in a New Window"><img src="<?php echo PRLI_IMAGES_URL . '/url_icon.gif'; ?>" width="13px" height="13px" name="Visit" alt="Visit"/></a>&nbsp;
129
+ <a href="<?php echo $pretty_link_url; ?>" target="_blank" title="Visit Pretty Link: <?php echo $pretty_link_url; ?> in a New Window"><img src="<?php echo PRLI_IMAGES_URL . '/url_icon.gif'; ?>" width="13px" height="13px" name="Visit" alt="Visit"/></a>&nbsp;
130
  <?php
131
  }
132
  ?>
153
  <?php do_action('prli_link_column_row',$link->id); ?>
154
  <td>
155
  <?php if($prli_options->extended_tracking!='count')
156
+ echo (($link->track_me)?"<a href=\"?page=".PRLI_PLUGIN_NAME."/prli-clicks.php&l=$link->id\" title=\"View clicks for $link->slug\">" . (empty($link->clicks)?0:$link->clicks) . "/" . (empty($link->uniques)?0:$link->uniques) . "</a>":"<img src=\"".PRLI_IMAGES_URL."/not_tracking.png\" title=\"This link isn't being tracked\"/>");
157
  else
158
+ echo (($link->track_me)?(empty($link->clicks)?0:$link->clicks) . "/" . (empty($link->uniques)?0:$link->uniques):"<img src=\"".PRLI_IMAGES_URL."/not_tracking.png\" title=\"This link isn't being tracked\"/>");
159
  ?>
160
  </td>
161
  <td><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-links.php&group=<?php echo $link->group_id; ?>"><?php echo $link->group_name; ?></a></td>
classes/views/prli-links/new.php CHANGED
@@ -1,5 +1,5 @@
1
  <div class="wrap">
2
- <h2><img src="<?php echo PRLI_URL.'/images/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Add Link</h2>
3
 
4
  <?php
5
  require(PRLI_VIEWS_PATH.'/shared/errors.php');
1
  <div class="wrap">
2
+ <h2><img src="<?php echo PRLI_IMAGES_URL . '/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Add Link</h2>
3
 
4
  <?php
5
  require(PRLI_VIEWS_PATH.'/shared/errors.php');
classes/views/prli-tools/form.php CHANGED
@@ -1,20 +1,29 @@
1
  <div class="wrap">
 
 
 
 
 
 
 
2
  <?php
3
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
4
  ?>
5
- <h2><img src="<?php echo PRLI_URL.'/images/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Tools</h2>
6
  <h3>Bookmarklet: </h3>
7
  <p><strong><a href="javascript:location.href='<?php echo PRLI_URL; ?>/prli-bookmarklet.php?k=<?php echo $prli_options->bookmarklet_auth; ?>&target_url='+escape(location.href);">Get PrettyLink</a></strong><br/>
8
  <span class="description">Just drag this "Get PrettyLink" link to your toolbar to install the bookmarklet. As you browse the web, you can just click this bookmarklet to create a pretty link from the current url you're looking at.&nbsp;&nbsp;<a href="http://blairwilliams.com/pretty-link-bookmarklet/">(more help)</a></span>
9
- <p><strong>Note:</strong> iPhone users can install this bookmarklet in their Safari to create Pretty Links with the following steps:<br/>
10
- <ol>
11
- <li>Copy this text:<br/><code>javascript:location.href='<?php echo PRLI_URL; ?>/prli-bookmarklet.php?k=<?php echo $prli_options->bookmarklet_auth; ?>&target_url='+escape(location.href);</code></li>
12
- <li>Tap the + button at the bottom of the screen</li>
13
- <li>Choose "Add Bookmark", rename your bookmark to "Get PrettyLink" (or whatever you want) and then "Save"</li>
14
- <li>Navigate through your Bookmarks folders until you find the new bookmark and click "Edit"</li>
15
- <li>Delete all the text from the address</li>
16
- <li>Paste the text you copied in Step 1 into the address field</li>
17
- <li>To save the changes hit "Bookmarks" and <strong>you're done!</strong> Now when you find a page you want to save off as a Pretty Link, just click the "Bookmarks" icon at the bottom of the screen and select your link.</li>
18
- </ol>
 
 
19
  <?php do_action('prli-add-tools'); ?>
20
  </div>
1
  <div class="wrap">
2
+ <script type="text/javascript">
3
+ function toggle_iphone_instructions()
4
+ {
5
+ jQuery('.iphone_instructions').slideToggle();
6
+ }
7
+
8
+ </script>
9
  <?php
10
  require(PRLI_VIEWS_PATH.'/shared/nav.php');
11
  ?>
12
+ <h2><img src="<?php echo PRLI_IMAGES_URL.'/pretty-link-med.png'; ?>"/>&nbsp;Pretty Link: Tools</h2>
13
  <h3>Bookmarklet: </h3>
14
  <p><strong><a href="javascript:location.href='<?php echo PRLI_URL; ?>/prli-bookmarklet.php?k=<?php echo $prli_options->bookmarklet_auth; ?>&target_url='+escape(location.href);">Get PrettyLink</a></strong><br/>
15
  <span class="description">Just drag this "Get PrettyLink" link to your toolbar to install the bookmarklet. As you browse the web, you can just click this bookmarklet to create a pretty link from the current url you're looking at.&nbsp;&nbsp;<a href="http://blairwilliams.com/pretty-link-bookmarklet/">(more help)</a></span>
16
+ <br/><br/><a href="javascript:toggle_iphone_instructions()"><strong><?php _e('Show iPhone Bookmarklet Instructions'); ?></strong></a>
17
+ <div class="iphone_instructions" style="display: none"><strong>Note:</strong> iPhone users can install this bookmarklet in their Safari to create Pretty Links with the following steps:<br/>
18
+ <ol>
19
+ <li>Copy this text:<br/><code>javascript:location.href='<?php echo PRLI_URL; ?>/prli-bookmarklet.php?k=<?php echo $prli_options->bookmarklet_auth; ?>&target_url='+escape(location.href);</code></li>
20
+ <li>Tap the + button at the bottom of the screen</li>
21
+ <li>Choose "Add Bookmark", rename your bookmark to "Get PrettyLink" (or whatever you want) and then "Save"</li>
22
+ <li>Navigate through your Bookmarks folders until you find the new bookmark and click "Edit"</li>
23
+ <li>Delete all the text from the address</li>
24
+ <li>Paste the text you copied in Step 1 into the address field</li>
25
+ <li>To save the changes hit "Bookmarks" and <strong>you're done!</strong> Now when you find a page you want to save off as a Pretty Link, just click the "Bookmarks" icon at the bottom of the screen and select your link.</li>
26
+ </ol>
27
+ </div>
28
  <?php do_action('prli-add-tools'); ?>
29
  </div>
classes/views/shared/nav.php CHANGED
@@ -2,17 +2,8 @@
2
  global $prli_update;
3
 
4
  if($prli_update->pro_is_installed_and_authorized())
5
- {
6
- $support_link =<<<SUPPORT_LINK
7
- &nbsp;|&nbsp;<a href="http://prettylinkpro.com/user-manual">Pro Manual</a>&nbsp;|&nbsp;<a href="http://prettylinkpro.com/forum">Pro Forums</a>
8
- SUPPORT_LINK;
9
- }
10
  else
11
- {
12
- $support_link =<<<SUPPORT_LINK
13
- &nbsp;|&nbsp;<a href="http://prettylinkpro.com">Premium Support</a>
14
- SUPPORT_LINK;
15
- }
16
-
17
  ?>
18
- <p style="font-size: 14px; font-weight: bold; float: right; text-align: right; padding-top: 0px; padding-right: 10px;">Connect with Pretty Link:&nbsp;&nbsp;<a href="http://twitter.com/blairwilli"><img src="<?php echo PRLI_URL; ?>/images/twitter_32.png" style="width: 24px; height: 24px;" /></a>&nbsp;<a href="http://www.facebook.com/pages/Pretty-Link/283252860401"><img src="<?php echo PRLI_URL; ?>/images/facebook_32.png" style="width: 24px; height: 24px;" /></a><br/>Get Help:&nbsp;&nbsp;<a href="http://blairwilliams.com/xba" target="_blank">Tutorials (UPDATED!)</a><?php echo $support_link; ?>&nbsp;|&nbsp;<a href="http://blairwilliams.com/work">One on One</a></p>
2
  global $prli_update;
3
 
4
  if($prli_update->pro_is_installed_and_authorized())
5
+ $support_link = "&nbsp;|&nbsp;<a href=\"http://prettylinkpro.com/user-manual\">" . __('Pro Manual') . '</a>';
 
 
 
 
6
  else
7
+ $support_link = "&nbsp;|&nbsp;<a href=\"http://prettylinkpro.com\">" . __('Upgrade to Pro') . '</a>';
 
 
 
 
 
8
  ?>
9
+ <p style="font-size: 14px; font-weight: bold; float: right; text-align: right; padding-top: 0px; padding-right: 10px;"><?php _e('Connect'); ?>:&nbsp;&nbsp;<a href="http://twitter.com/blairwilli"><img src="<?php echo PRLI_IMAGES_URL; ?>/twitter_32.png" style="width: 24px; height: 24px;" /></a>&nbsp;<a href="http://www.facebook.com/pages/Pretty-Link/283252860401"><img src="<?php echo PRLI_IMAGES_URL; ?>/facebook_32.png" style="width: 24px; height: 24px;" /></a><br/><?php _e('Get Help'); ?>:&nbsp;&nbsp;<a href="http://blairwilliams.com/xba" target="_blank"><?php _e('Tutorials'); ?></a><?php echo $support_link; ?>&nbsp;|&nbsp;<a href="http://blairwilliams.com/work"><?php _e('One on One'); ?></a></p>
images/arrow_down.png DELETED
Binary file
images/arrow_up.png DELETED
Binary file
images/bar_background.png DELETED
Binary file
images/bar_map.png DELETED
Binary file
images/bookmark.png DELETED
Binary file
images/co.mments.gif DELETED
Binary file
images/delicious_32.png DELETED
Binary file
images/digg_32.png DELETED
Binary file
images/email_32.png DELETED
Binary file
images/facebook.png DELETED
Binary file
images/facebook_32.png DELETED
Binary file
images/forward_params.png DELETED
Binary file
images/hyves_32.png DELETED
Binary file
images/linkedin_32.png DELETED
Binary file
images/mixx_32.png DELETED
Binary file
images/newsvine_32.png DELETED
Binary file
images/nofollow.png DELETED
Binary file
images/not_tracking.png DELETED
Binary file
images/pixel_track.png DELETED
Binary file
images/pretty-link-48x48.png DELETED
Binary file
images/pretty-link-add.png DELETED
Binary file
images/pretty-link-med.png DELETED
Binary file
images/pretty-link-small.png DELETED
Binary file
images/prettylink_logo.jpg DELETED
Binary file
images/prettylink_logo_med.jpg DELETED
Binary file
images/prettylink_logo_small.jpg DELETED
Binary file
images/reddit_32.png DELETED
Binary file
images/sphinn_32.png DELETED
Binary file
images/stumbleupon_32.png DELETED
Binary file
images/technorati_32.png DELETED
Binary file
images/tracking.png DELETED
Binary file
images/twitter.png DELETED
Binary file
images/twitter_32.png DELETED
Binary file
images/ultra-cloak.png DELETED
Binary file
images/url_icon.gif DELETED
Binary file
images/whatever.txt DELETED
@@ -1,13 +0,0 @@
1
- wget http://speckyboy.com/wp-content/plugins/sociable/images/delicious_32.png
2
- wget http://speckyboy.com/wp-content/plugins/sociable/images/stumbleupon_32.png
3
- wget http://speckyboy.com/wp-content/plugins/sociable/images/digg_32.png
4
- wget http://speckyboy.com/wp-content/plugins/sociable/images/twitter_32.png
5
- wget http://speckyboy.com/wp-content/plugins/sociable/images/mixx_32.png
6
- wget http://speckyboy.com/wp-content/plugins/sociable/images/technorati_32.png
7
- wget http://speckyboy.com/wp-content/plugins/sociable/images/facebook_32.png
8
- wget http://speckyboy.com/wp-content/plugins/sociable/images/newsvine_32.png
9
- wget http://speckyboy.com/wp-content/plugins/sociable/images/reddit_32.png
10
- wget http://speckyboy.com/wp-content/plugins/sociable/images/linkedin_32.png
11
- wget http://speckyboy.com/wp-content/plugins/sociable/images/co.mments.gif
12
- wget http://speckyboy.com/wp-content/plugins/sociable/images/yahoobuzz_32.png
13
- wget http://speckyboy.com/wp-content/plugins/sociable/images/email_32.png
 
 
 
 
 
 
 
 
 
 
 
 
 
images/yahoobuzz_32.png DELETED
Binary file
pretty-bar.php CHANGED
@@ -110,7 +110,7 @@ a:hover {
110
  }
111
 
112
  .map {
113
- background-image: url(./images/bar_map.png);
114
  background-repeat: no-repeat;
115
  }
116
 
@@ -226,7 +226,7 @@ td {
226
  <td>
227
  <?php
228
  $link_html =<<<LINKHTML
229
- <p class="powered-by small-text">Powered by <a href="http://blairwilliams.com/pl" target="_top"><img src="images/pretty-link-small.png" width="12px" height="12px" border="0"/> Pretty Link</a></p>
230
  LINKHTML;
231
  echo apply_filters('prli-display-attrib-link',$link_html);
232
  ?>
110
  }
111
 
112
  .map {
113
+ background-image: url(http://d14715w921jdje.cloudfront.net/images/bar_map.png);
114
  background-repeat: no-repeat;
115
  }
116
 
226
  <td>
227
  <?php
228
  $link_html =<<<LINKHTML
229
+ <p class="powered-by small-text">Powered by <a href="http://blairwilliams.com/pl" target="_top"><img src="<?php echo PRLI_IMAGES_URL; ?>/pretty-link-small.png" width="12px" height="12px" border="0"/> Pretty Link</a></p>
230
  LINKHTML;
231
  echo apply_filters('prli-display-attrib-link',$link_html);
232
  ?>
pretty-link.php CHANGED
@@ -3,10 +3,10 @@
3
  Plugin Name: Pretty Link (Lite Version)
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.4.53
7
  Author: Caseproof
8
  Author URI: http://caseproof.com
9
- Copyright: 2009-2010, Caseproof, LLC
10
 
11
  GNU General Public License, Free Software Foundation <http://creativecommons.org/licenses/GPL/2.0/>
12
  This program is free software; you can redistribute it and/or modify
3
  Plugin Name: Pretty Link (Lite Version)
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.4.54
7
  Author: Caseproof
8
  Author URI: http://caseproof.com
9
+ Copyright: 2009-2011, Caseproof, LLC
10
 
11
  GNU General Public License, Free Software Foundation <http://creativecommons.org/licenses/GPL/2.0/>
12
  This program is free software; you can redistribute it and/or modify
prli-bookmarklet.php CHANGED
@@ -60,21 +60,21 @@ if(isset($_GET['k']))
60
  </style>
61
  </head>
62
  <body>
63
- <p><img src="<?php echo PRLI_URL; ?>/images/prettylink_logo.jpg" /></p>
64
  <h4><em>here's your pretty link for:</em><br/><?php echo $target_url_title; ?><br/>(<span title="<?php echo $target_url; ?>"><?php echo substr($target_url,0,50) . ((strlen($target_url)>50)?"...":''); ?></span>)</h4>
65
  <h2><a href="<?php echo $pretty_link; ?>"><?php echo $pretty_link; ?></a></h2>
66
  <p>send this link to:<br/>
67
- <a href="http://del.icio.us/post?url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/delicious_32.png" title="delicious" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
68
- <a href="http://www.stumbleupon.com/submit?url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/stumbleupon_32.png" title="stumbleupon" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
69
- <a href="http://digg.com/submit?phase=2&url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/digg_32.png" title="digg" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
70
- <a href="http://twitter.com/home?status=<?php echo urlencode($twitter_status); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/twitter_32.png" title="twitter" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
71
- <a href="http://www.mixx.com/submit?page_url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/mixx_32.png" title="mixx" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
72
- <a href="http://technorati.com/faves?add=<?php echo urlencode($pretty_link) ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/technorati_32.png" title="technorati" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
73
- <a href="http://www.facebook.com/sharer.php?u=<?php echo urlencode($pretty_link) ?>&t=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/facebook_32.png" title="facebook" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
74
- <a href="http://www.newsvine.com/_tools/seed&save?u=<?php echo urlencode($pretty_link) ?>&h=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/newsvine_32.png" title="news vine" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
75
- <a href="http://reddit.com/submit?url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/reddit_32.png" title="reddit" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
76
- <a href="http://www.linkedin.com/sharearticle?mini=true&url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/linkedin_32.png" title="linkedin" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
77
- <a href="http://myweb2.search.yahoo.com/myresults/bookmarklet?u=<?php echo urlencode($pretty_link) ?>&=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_URL; ?>/images/yahoobuzz_32.png" title="yahoo! bookmarks" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
78
  <p><a href="<?php echo $_GET['target_url']; ?>">&laquo; back</a></p>
79
  </body>
80
  </html>
60
  </style>
61
  </head>
62
  <body>
63
+ <p><img src="<?php echo PRLI_IMAGES_URL; ?>/prettylink_logo.jpg" /></p>
64
  <h4><em>here's your pretty link for:</em><br/><?php echo $target_url_title; ?><br/>(<span title="<?php echo $target_url; ?>"><?php echo substr($target_url,0,50) . ((strlen($target_url)>50)?"...":''); ?></span>)</h4>
65
  <h2><a href="<?php echo $pretty_link; ?>"><?php echo $pretty_link; ?></a></h2>
66
  <p>send this link to:<br/>
67
+ <a href="http://del.icio.us/post?url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/delicious_32.png" title="delicious" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
68
+ <a href="http://www.stumbleupon.com/submit?url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/stumbleupon_32.png" title="stumbleupon" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
69
+ <a href="http://digg.com/submit?phase=2&url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/digg_32.png" title="digg" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
70
+ <a href="http://twitter.com/home?status=<?php echo urlencode($twitter_status); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/twitter_32.png" title="twitter" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
71
+ <a href="http://www.mixx.com/submit?page_url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/mixx_32.png" title="mixx" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
72
+ <a href="http://technorati.com/faves?add=<?php echo urlencode($pretty_link) ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/technorati_32.png" title="technorati" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
73
+ <a href="http://www.facebook.com/sharer.php?u=<?php echo urlencode($pretty_link) ?>&t=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/facebook_32.png" title="facebook" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
74
+ <a href="http://www.newsvine.com/_tools/seed&save?u=<?php echo urlencode($pretty_link) ?>&h=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/newsvine_32.png" title="news vine" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
75
+ <a href="http://reddit.com/submit?url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/reddit_32.png" title="reddit" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
76
+ <a href="http://www.linkedin.com/sharearticle?mini=true&url=<?php echo urlencode($pretty_link) ?>&title=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/linkedin_32.png" title="linkedin" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
77
+ <a href="http://myweb2.search.yahoo.com/myresults/bookmarklet?u=<?php echo urlencode($pretty_link) ?>&=<?php echo urlencode($target_url_title); ?>" target="_blank"><img src="<?php echo PRLI_IMAGES_URL; ?>/yahoobuzz_32.png" title="yahoo! bookmarks" width="32px" height="32px" border="0" /></a>&nbsp;&nbsp;
78
  <p><a href="<?php echo $_GET['target_url']; ?>">&laquo; back</a></p>
79
  </body>
80
  </html>
prli-clicks.php CHANGED
@@ -135,46 +135,12 @@ else if(isset($_REQUEST['action']) and $_REQUEST['action'] == 'csv')
135
  $hit_record_count = $prli_click->getRecordCount($where_clause);
136
  $hit_page_count = (int)ceil($hit_record_count / $max_rows_per_file);
137
 
138
- $history_where_clause = '';
139
- if(!empty($where_clause))
140
- {
141
- $ips = $wpdb->get_col( "SELECT DISTINCT ip FROM {$prli_click->table_name} cl WHERE{$where_clause}" );
142
- if(!empty($ips) and count($ips) > 1)
143
- {
144
- $ips_str = implode("','",$ips);
145
- $history_where_clause = " (cl.ip IN ('{$ips_str}'))";
146
- }
147
- else if(!empty($ips))
148
- $history_where_clause = " cl.ip='".$ips[0]."'";
149
- }
150
-
151
- $history_record_count = $prli_click->getRecordCount($history_where_clause);
152
- $history_page_count = ceil($history_record_count / $max_rows_per_file);
153
-
154
- $query = "SELECT cl.link_id, cl.ip, MIN(cl.created_at) FROM {$prli_click->table_name} cl WHERE{$history_where_clause} GROUP BY cl.ip";
155
- $link_ids = $wpdb->get_col($query,0);
156
-
157
- $origin_record_count = count($link_ids);
158
- $origin_page_count = ceil($origin_record_count / $max_rows_per_file);
159
-
160
- if( PrliUtils::rewriting_on() )
161
- {
162
- $param_string = (empty($param_string)?'':"?{$param_string}");
163
- $hit_report_url = "{$prli_blogurl}/prli_download_csv_hit_report{$param_string}";
164
- $history_report_url = "{$prli_blogurl}/prli_download_csv_history_report{$param_string}";
165
- $origin_report_url = "{$prli_blogurl}/prli_download_csv_origin_report{$param_string}";
166
- }
167
- else
168
- {
169
- $param_string = (empty($param_string)?'':"&{$param_string}");
170
- $hit_report_url = "{$prli_blogurl}/index.php?action=prli_download_csv_hit_report{$param_string}";
171
- $history_report_url = "{$prli_blogurl}/index.php?action=prli_download_csv_history_report{$param_string}";
172
- $origin_report_url = "{$prli_blogurl}/index.php?action=prli_download_csv_origin_report{$param_string}";
173
- }
174
 
175
  require_once 'classes/views/prli-clicks/csv_download.php';
176
  }
177
- else if(isset($_REQUEST['action']) and $_REQUEST['action'] == 'download_csv_hit_report')
178
  {
179
  if(isset($_GET['l']))
180
  {
@@ -224,136 +190,6 @@ else if(isset($_REQUEST['action']) and $_REQUEST['action'] == 'download_csv_hit_
224
  $clicks = $prli_click->getAll($where_clause,'',false,$hlimit);
225
  require_once 'classes/views/prli-clicks/csv.php';
226
  }
227
- else if(isset($_REQUEST['action']) and $_REQUEST['action'] == 'download_csv_origin_report')
228
- {
229
- if(isset($_GET['l']))
230
- {
231
- $where_clause = " link_id=".$_GET['l'];
232
- $link_name = $wpdb->get_var("SELECT name FROM ".$wpdb->prefix."prli_links WHERE id=".$_GET['l']);
233
- $link_slug = $wpdb->get_var("SELECT slug FROM ".$wpdb->prefix."prli_links WHERE id=".$_GET['l']);
234
- }
235
- else if(isset($_GET['ip']))
236
- {
237
- $link_name = "ip_addr_" . $_GET['ip'];
238
- $where_clause = " cl2.ip='".$_GET['ip']."'";
239
- }
240
- else if(isset($_GET['vuid']))
241
- {
242
- $link_name = "visitor_" . $_GET['vuid'];
243
- $where_clause = " cl2.vuid='".$_GET['vuid']."'";
244
- }
245
- else if(isset($_GET['group']))
246
- {
247
- $group = $prli_group->getOne($_GET['group']);
248
- $link_name = "group_" . $group->name;
249
- $where_clause .= " cl2.link_id IN (SELECT id FROM " . $prli_link->table_name . " WHERE group_id=".$_GET['group'].")";
250
- }
251
- else
252
- {
253
- $link_name = "all_links";
254
- $where_clause = "";
255
- }
256
-
257
- if(!empty($where_clause))
258
- {
259
- $ips = $wpdb->get_col( "SELECT DISTINCT ip FROM {$prli_click->table_name} WHERE{$where_clause}" );
260
- if(!empty($ips) and count($ips) > 1)
261
- {
262
- $ips_str = implode("','",$ips);
263
- $origin_clause = " (cl.ip IN ('{$ips_str}'))";
264
- }
265
- else if(!empty($ips))
266
- $origin_clause = " cl.ip='".$ips[0]."'";
267
- }
268
-
269
- $link_name = stripslashes($link_name);
270
- $link_name = preg_replace("#[ ,]#",'',$link_name);
271
- $link_name = $link_name . "_origin";
272
- $record_count = $prli_click->getRecordCount($where_clause);
273
- $page_count = (int)ceil($record_count / $max_rows_per_file);
274
- $prli_page = $_GET['prli_page'];
275
- $hmin = 0;
276
-
277
- if($prli_page)
278
- $hmin = ($prli_page - 1) * $max_rows_per_file;
279
-
280
- if($prli_page==$page_count)
281
- $hmax = $record_count;
282
- else
283
- $hmax = ($prli_page * $max_rows_per_file) - 1;
284
-
285
- $hlimit = "{$hmin},{$max_rows_per_file}";
286
- $horder = " ORDER BY cl.ip, cl.created_at DESC";
287
- //$clicks = $prli_click->getAll($where_clause,$horder,false,$hlimit);
288
-
289
- $query = "SELECT cl.*, MIN(cl.created_at) as min_created_at, li.name as link_name FROM {$prli_click->table_name} cl, {$prli_link->table_name} li WHERE li.id = cl.link_id AND{$origin_clause} GROUP BY cl.ip LIMIT {$hlimit}";
290
- $clicks = $wpdb->get_results($query);
291
-
292
- require_once 'classes/views/prli-clicks/csv.php';
293
- }
294
- else if($_GET['action'] == 'download_csv_history_report' or $_POST['action'] == 'download_csv_history_report')
295
- {
296
- if(isset($_GET['l']))
297
- {
298
- $where_clause = " link_id=".$_GET['l'];
299
- $link_name = $wpdb->get_var("SELECT name FROM ".$wpdb->prefix."prli_links WHERE id=".$_GET['l']);
300
- $link_slug = $wpdb->get_var("SELECT slug FROM ".$wpdb->prefix."prli_links WHERE id=".$_GET['l']);
301
- }
302
- else if(isset($_GET['ip']))
303
- {
304
- $link_name = "ip_addr_" . $_GET['ip'];
305
- $where_clause = " cl2.ip='".$_GET['ip']."'";
306
- }
307
- else if(isset($_GET['vuid']))
308
- {
309
- $link_name = "visitor_" . $_GET['vuid'];
310
- $where_clause = " cl2.vuid='".$_GET['vuid']."'";
311
- }
312
- else if(isset($_GET['group']))
313
- {
314
- $group = $prli_group->getOne($_GET['group']);
315
- $link_name = "group_" . $group->name;
316
- $where_clause .= " cl2.link_id IN (SELECT id FROM " . $prli_link->table_name . " WHERE group_id=".$_GET['group'].")";
317
- }
318
- else
319
- {
320
- $link_name = "all_links";
321
- $where_clause = "";
322
- }
323
-
324
- if(!empty($where_clause))
325
- {
326
- $ips = $wpdb->get_col( "SELECT DISTINCT ip FROM {$prli_click->table_name} WHERE{$where_clause}" );
327
- if(!empty($ips) and count($ips) > 1)
328
- {
329
- $ips_str = implode("','",$ips);
330
- $where_clause = " (cl.ip IN ('{$ips_str}'))";
331
- }
332
- else if(!empty($ips))
333
- $where_clause = " (cl.ip='".$ips[0]."'";
334
- }
335
-
336
- $link_name = stripslashes($link_name);
337
- $link_name = preg_replace("#[ ,]#",'',$link_name);
338
- $link_name = $link_name . "_history";
339
- $record_count = $prli_click->getRecordCount($where_clause);
340
- $page_count = (int)ceil($record_count / $max_rows_per_file);
341
- $prli_page = $_GET['prli_page'];
342
- $hmin = 0;
343
-
344
- if($prli_page)
345
- $hmin = ($prli_page - 1) * $max_rows_per_file;
346
-
347
- if($prli_page==$page_count)
348
- $hmax = $record_count;
349
- else
350
- $hmax = ($prli_page * $max_rows_per_file) - 1;
351
-
352
- $hlimit = "{$hmin},{$max_rows_per_file}";
353
- $horder = " ORDER BY cl.ip, cl.created_at DESC";
354
- $clicks = $prli_click->getAll($where_clause,$horder,false,$hlimit);
355
- require_once 'classes/views/prli-clicks/csv.php';
356
- }
357
 
358
  // Helpers
359
  function prli_get_click_sort_vars($params,$where_clause = '')
135
  $hit_record_count = $prli_click->getRecordCount($where_clause);
136
  $hit_page_count = (int)ceil($hit_record_count / $max_rows_per_file);
137
 
138
+ $param_string = (empty($param_string)?'':"&{$param_string}");
139
+ $hit_report_url = "{$prli_blogurl}/index.php?action=prli_download_csv_hit_report{$param_string}";
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
140
 
141
  require_once 'classes/views/prli-clicks/csv_download.php';
142
  }
143
+ else if(isset($_REQUEST['action']) and $_REQUEST['action'] == 'prli_download_csv_hit_report')
144
  {
145
  if(isset($_GET['l']))
146
  {
190
  $clicks = $prli_click->getAll($where_clause,'',false,$hlimit);
191
  require_once 'classes/views/prli-clicks/csv.php';
192
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
193
 
194
  // Helpers
195
  function prli_get_click_sort_vars($params,$where_clause = '')
prli-config.php CHANGED
@@ -5,6 +5,7 @@ define('PRLI_MODELS_PATH',PRLI_PATH.'/classes/models');
5
  define('PRLI_VIEWS_PATH',PRLI_PATH.'/classes/views');
6
  //define(PRLI_URL,WP_PLUGIN_URL.'/'.PRLI_PLUGIN_NAME);
7
  define('PRLI_URL',plugins_url($path = '/'.PRLI_PLUGIN_NAME));
 
8
 
9
  require_once(PRLI_MODELS_PATH.'/PrliOptions.php');
10
 
5
  define('PRLI_VIEWS_PATH',PRLI_PATH.'/classes/views');
6
  //define(PRLI_URL,WP_PLUGIN_URL.'/'.PRLI_PLUGIN_NAME);
7
  define('PRLI_URL',plugins_url($path = '/'.PRLI_PLUGIN_NAME));
8
+ define('PRLI_IMAGES_URL','https://d14715w921jdje.cloudfront.net/images');
9
 
10
  require_once(PRLI_MODELS_PATH.'/PrliOptions.php');
11
 
prli-main.php CHANGED
@@ -11,7 +11,7 @@ function prli_menu()
11
  {
12
  global $prli_options;
13
 
14
- add_menu_page('Pretty Link', 'Pretty Link', 'administrator', PRLI_PATH.'/prli-links.php','',PRLI_URL.'/images/pretty-link-small.png');
15
  add_submenu_page(PRLI_PATH.'/prli-links.php', 'Pretty Link | Add New Link', 'Add New Link', 'administrator', PRLI_PATH.'/prli-add-link.php');
16
  add_submenu_page(PRLI_PATH.'/prli-links.php', 'Pretty Link | Groups', 'Groups', 'administrator', PRLI_PATH.'/prli-groups.php');
17
 
@@ -126,24 +126,9 @@ add_action('init', 'prli_redirect'); //Redirect
126
 
127
  function prli_route_scripts()
128
  {
129
- if( ( isset($_GET['action']) and $_GET['action'] == 'prli_download_csv_hit_report' ) or ( PrliUtils::rewriting_on() and preg_match( "#^/prli_download_csv_hit_report#", $_SERVER['REQUEST_URI'] ) ) )
130
  {
131
  global $wpdb, $prli_click, $prli_group, $prli_link;
132
- $_GET['action'] = "download_csv_hit_report";
133
- require_once( PRLI_PATH . "/prli-clicks.php" );
134
- exit;
135
- }
136
- else if( ( isset($_GET['action']) and $_GET['action'] == 'prli_download_csv_history_report') or ( PrliUtils::rewriting_on() and preg_match( "#^/prli_download_csv_history_report#", $_SERVER['REQUEST_URI'] ) ) )
137
- {
138
- global $wpdb, $prli_click, $prli_group, $prli_link;
139
- $_GET['action'] = "download_csv_history_report";
140
- require_once( PRLI_PATH . "/prli-clicks.php" );
141
- exit;
142
- }
143
- else if( ( isset($_GET['action']) and $_GET['action'] == 'prli_download_csv_origin_report') or ( PrliUtils::rewriting_on() and preg_match( "#^/prli_download_csv_origin_report#", $_SERVER['REQUEST_URI'] ) ) )
144
- {
145
- global $wpdb, $prli_click, $prli_group, $prli_link;
146
- $_GET['action'] = "download_csv_origin_report";
147
  require_once( PRLI_PATH . "/prli-clicks.php" );
148
  exit;
149
  }
11
  {
12
  global $prli_options;
13
 
14
+ add_menu_page('Pretty Link', 'Pretty Link', 'administrator', PRLI_PATH.'/prli-links.php','',PRLI_IMAGES_URL.'/pretty-link-small.png');
15
  add_submenu_page(PRLI_PATH.'/prli-links.php', 'Pretty Link | Add New Link', 'Add New Link', 'administrator', PRLI_PATH.'/prli-add-link.php');
16
  add_submenu_page(PRLI_PATH.'/prli-links.php', 'Pretty Link | Groups', 'Groups', 'administrator', PRLI_PATH.'/prli-groups.php');
17
 
126
 
127
  function prli_route_scripts()
128
  {
129
+ if( isset($_GET['action']) and $_GET['action'] == 'prli_download_csv_hit_report' )
130
  {
131
  global $wpdb, $prli_click, $prli_group, $prli_link;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
132
  require_once( PRLI_PATH . "/prli-clicks.php" );
133
  exit;
134
  }
readme.txt CHANGED
@@ -3,8 +3,8 @@ 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: 2.9
6
- Tested up to: 3.0.1
7
- Stable tag: 1.4.53
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
 
@@ -67,6 +67,11 @@ http://blairwilliams.com/w7a
67
 
68
  == Changelog ==
69
 
 
 
 
 
 
70
  = 1.4.53 =
71
  * Added the ability to change the pretty link tracking mode to simple, normal and extended
72
  * Fixed numerous debug issues
@@ -276,6 +281,9 @@ http://blairwilliams.com/w7a
276
  * Fixed some issues surrounding keyword content caching in Pro
277
 
278
  == Upgrade Notice ==
 
 
 
279
  = 1.4.53 =
280
  * Everyone should upgrade to this version. It fixes numerous bugs for all users -- including a memory_limit issue and some click tracking algorithm issues. In addition to the upgrade, users who have had performance issues with click tracking should also switch to simple click count tracking in "Pretty Link" -> "Options" -> "Reporting Options" ...
281
 
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: 2.9
6
+ Tested up to: 3.0.4
7
+ Stable tag: 1.4.54
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
 
67
 
68
  == Changelog ==
69
 
70
+ = 1.4.54 =
71
+ * Fixed the CSV export issues
72
+ * Moved all Pretty Link images to Amazon CloudFront
73
+ * Added TweetDeck & Twitter for iPhone support for Pro Users
74
+
75
  = 1.4.53 =
76
  * Added the ability to change the pretty link tracking mode to simple, normal and extended
77
  * Fixed numerous debug issues
281
  * Fixed some issues surrounding keyword content caching in Pro
282
 
283
  == Upgrade Notice ==
284
+ = 1.4.54 =
285
+ * Everyone should upgrade -- this fixes the CSV export issue with hits.
286
+
287
  = 1.4.53 =
288
  * Everyone should upgrade to this version. It fixes numerous bugs for all users -- including a memory_limit issue and some click tracking algorithm issues. In addition to the upgrade, users who have had performance issues with click tracking should also switch to simple click count tracking in "Pretty Link" -> "Options" -> "Reporting Options" ...
289