Shortlinks by Pretty Links – Best WordPress Link Tracking Plugin -

Version Description

Feature Added Bulk Actions for Pretty Link Management page
Feature Added the ability to change the number of rows displayed in the Pretty Link Management page (no longer limited to 10)
Feature Added 1-click copy for pretty links in the Pretty Link management page and bookmarklet
Feature Added the ability to click on the referrer links in the pretty link hits table
Fix Fixed the permission issue when clicking on some links in the pretty link admin interface
Fix Fixed the timestamp issue in hits that some people were experiencing

Release Info

Developer	supercleanse
Plugin	Shortlinks by Pretty Links – Best WordPress Link Tracking Plugin
Version	1.5.9
Comparing to
See all releases

Code changes from version 1.5.7 to 1.5.9

Files changed (30) hide show

classes/controllers/PrliGroupsController.php +2 -2
classes/controllers/PrliLinksController.php +77 -14
classes/helpers/PrliLinksHelper.php +69 -0
classes/models/PrliGroup.php +2 -2
classes/models/PrliLink.php +43 -1
classes/models/PrliLinkMeta.php +10 -2
classes/models/PrliUrlUtils.php +0 -166
classes/models/models.inc.php +3 -0
classes/views/prli-clicks/list.php +4 -4
classes/views/prli-dashboard-widget/widget.php +4 -4
classes/views/prli-groups/list.php +3 -3
classes/views/prli-links/bar.php +0 -18
classes/views/prli-links/form.php +26 -26
classes/views/prli-links/head.php +0 -96
classes/views/prli-links/list.php +46 -6
classes/views/prli-links/ultra-cloak.php +0 -17
classes/views/prli-options/form.php +2 -2
classes/views/shared/jsredirect.php +7 -0
classes/views/shared/link-table-nav.php +26 -7
css/prli-admin-links.css +38 -1
i18n/pretty-link.pot +200 -110
js/clippy.swf +0 -0
js/jquery.clippy.js +85 -0
js/prli-admin-links.js +148 -75
pretty-bar.php +0 -243
pretty-link.php +1 -1
prli-bookmarklet.php +14 -3
prli-links.php +0 -238
prli-main.php +2 -0
readme.txt +13 -2

classes/controllers/PrliGroupsController.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	if(!defined('ABSPATH'))
3	- die(~~__(~~'You are not allowed to call this page directly.'~~, 'pretty-link'~~));
4
5	// We'll do a full refactor later -- for now we'll just implement the add group ajax method
6	class PrliGroupsController
	@@ -40,4 +40,4 @@ class PrliGroupsController
40
41	exit;
42	}
43	- }


1	<?php
2	if(!defined('ABSPATH'))
3	+ die('You are not allowed to call this page directly.');
4
5	// We'll do a full refactor later -- for now we'll just implement the add group ajax method
6	class PrliGroupsController

40
41	exit;
42	}
43	+ }

classes/controllers/PrliLinksController.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	if(!defined('ABSPATH'))
3	- die(~~__(~~'You are not allowed to call this page directly.'~~, 'pretty-link'~~));
4
5	class PrliLinksController
6	{
	@@ -21,13 +21,15 @@ class PrliLinksController
21	else if($action == 'edit')
22	return self::edit_link($params);
23	else if($action == 'bulk-update')
24	- return self::~~bulk_edit_links~~($params);
25	else if($action == 'update')
26	return self::update_link($params);
27	else if($action == 'reset')
28	return self::reset_link($params);
29	else if($action == 'destroy')
30	return self::destroy_link($params);


31	else
32	return self::list_links($params);
33	}
	@@ -37,7 +39,19 @@ class PrliLinksController
37	}
38
39	public static function load_scripts() {
40	- wp_enqueue_script( '~~prli~~-~~admin-links~~', PRLI_JS_URL . '/~~prli-admin-links~~.js', array('jquery') );












41	}
42
43	public static function list_links($params) {
	@@ -131,14 +145,6 @@ class PrliLinksController
131	require_once PRLI_VIEWS_PATH . '/prli-links/edit.php';
132	}
133
134	- public static function bulk_update_links($params) {
135	- if(apply_filters('prli-bulk-link-update', true))
136	- {
137	- $prli_message = __("Your Pretty Links were Successfully Updated", 'pretty-link');
138	- self::display_links_list($params, $prli_message, '', 1);
139	- }
140	- }
141	-
142	public static function update_link($params) {
143	global $prli_link, $prli_group;
144	$errors = $prli_link->validate($_POST);
	@@ -164,20 +170,75 @@ class PrliLinksController
164	}
165	}
166






























167	public static function reset_link($params) {
168	- global $prli_link;
169	$prli_link->reset( $params['id'] );
170	$prli_message = __("Your Pretty Link was Successfully Reset", 'pretty-link');
171	self::display_links_list($params, $prli_message, '', 1);
172	}
173
174	public static function destroy_link($params) {
175	- global $prli_link;
176	$prli_link->destroy( $params['id'] );
177	$prli_message = __("Your Pretty Link was Successfully Destroyed", 'pretty-link');
178	self::display_links_list($params, $prli_message, '', 1);
179	}
180

























181	public static function display_links_list($params, $prli_message, $page_params_ov = false, $current_page_ov = false)
182	{
183	global $wpdb, $prli_utils, $prli_click, $prli_group, $prli_link, $page_size, $prli_options;
	@@ -186,6 +247,8 @@ class PrliLinksController
186
187	$where_clause = '';
188	$page_params = '';


189
190	if(!empty($params['group']))
191	{
	@@ -297,4 +360,4 @@ class PrliLinksController
297	'message' => (isset($_REQUEST['message'])?$_REQUEST['message']:'')
298	);
299	}
300	- }


1	<?php
2	if(!defined('ABSPATH'))
3	+ die('You are not allowed to call this page directly.');
4
5	class PrliLinksController
6	{

21	else if($action == 'edit')
22	return self::edit_link($params);
23	else if($action == 'bulk-update')
24	+ return self::bulk_update_links($params);
25	else if($action == 'update')
26	return self::update_link($params);
27	else if($action == 'reset')
28	return self::reset_link($params);
29	else if($action == 'destroy')
30	return self::destroy_link($params);
31	+ else if($action == 'bulk-destroy')
32	+ return self::bulk_destroy_links($params);
33	else
34	return self::list_links($params);
35	}

39	}
40
41	public static function load_scripts() {
42	+ wp_enqueue_script( 'jquery-clippy', PRLI_JS_URL . '/jquery.clippy.js', array('jquery') );
43	+ wp_enqueue_script( 'prli-admin-links', PRLI_JS_URL . '/prli-admin-links.js', array('jquery','jquery-clippy') );
44	+ }
45	+
46	+ public static function load_dynamic_scripts() {
47	+ ?>
48	+ <script type="text/javascript">
49	+ jQuery(document).ready(function() {
50	+ /* Set up the clippies! */
51	+ jQuery('.list-clippy').clippy({clippy_path: '<?php echo PRLI_JS_URL; ?>/clippy.swf', width: '100px', color: '#F9F9F9'});
52	+ });
53	+ </script>
54	+ <?php
55	}
56
57	public static function list_links($params) {

145	require_once PRLI_VIEWS_PATH . '/prli-links/edit.php';
146	}
147








148	public static function update_link($params) {
149	global $prli_link, $prli_group;
150	$errors = $prli_link->validate($_POST);

170	}
171	}
172
173	+ public static function bulk_update_links() {
174	+ global $prli_link;
175	+ if(wp_verify_nonce($_REQUEST['_wpnonce'],'prli_bulk_update') and isset($_REQUEST['ids'])) {
176	+
177	+ $ids = $_REQUEST['ids'];
178	+ $params = $_REQUEST['bu'];
179	+
180	+ $prli_link->bulk_update( $ids, $params );
181	+ do_action('prli-bulk-action-update',$ids,$params);
182	+
183	+ $message = __('Your links were updated successfully', 'pretty-link');
184	+
185	+ //self::display_links_list(self::get_params_array(),$message);
186	+
187	+ // We're going to redirect here to avoid having a big nasty url that
188	+ // can cause problems when doing several activities in a row.
189	+
190	+ // Scrub message, action, _wpnonce, ids & bu vars from the arguments and redirect
191	+ $request_uri = preg_replace( '#\&(message\|action\|_wpnonce\|ids\|bu\[[^\]]?\])=[^\&]#', '', $_SERVER['REQUEST_URI'] );
192	+
193	+ // we assume here that some arguments are set ... if not this value is meaningless anyway
194	+ $request_uri .= '&message=' . urlencode($message);
195	+ $redirect_url = 'http' . (empty($_SERVER['HTTPS'])?'':'s') . '://' . $_SERVER['HTTP_HOST'] . $request_uri;
196	+
197	+ require PRLI_VIEWS_PATH . '/shared/jsredirect.php';
198	+ }
199	+ else
200	+ wp_die(__('You are unauthorized to view this page.', 'pretty-link'));
201	+ }
202	+
203	public static function reset_link($params) {
204	+ global $prli_link;
205	$prli_link->reset( $params['id'] );
206	$prli_message = __("Your Pretty Link was Successfully Reset", 'pretty-link');
207	self::display_links_list($params, $prli_message, '', 1);
208	}
209
210	public static function destroy_link($params) {
211	+ global $prli_link;
212	$prli_link->destroy( $params['id'] );
213	$prli_message = __("Your Pretty Link was Successfully Destroyed", 'pretty-link');
214	self::display_links_list($params, $prli_message, '', 1);
215	}
216
217	+ public static function bulk_destroy_links($params) {
218	+ global $prli_link;
219	+ if(wp_verify_nonce($_REQUEST['_wpnonce'],'prli_bulk_update') and isset($_REQUEST['ids'])) {
220	+ $ids = explode(',', $_REQUEST['ids']);
221	+
222	+ foreach($ids as $id) {
223	+ $prli_link->destroy( $id );
224	+ }
225	+
226	+ $message = __('Your links were deleted successfully', 'pretty-link');
227	+
228	+ //self::display_links_list($params,$message);
229	+ // Scrub message, action, _wpnonce, ids & bu vars from the arguments and redirect
230	+ $request_uri = preg_replace( '#\&(message\|action\|_wpnonce\|ids\|bu\[[^\]]?\])=[^\&]#', '', $_SERVER['REQUEST_URI'] );
231	+
232	+ // we assume here that some arguments are set ... if not this value is meaningless anyway
233	+ $request_uri .= '&message=' . urlencode($message);
234	+ $redirect_url = 'http' . (empty($_SERVER['HTTPS'])?'':'s') . '://' . $_SERVER['HTTP_HOST'] . $request_uri;
235	+
236	+ require PRLI_VIEWS_PATH . '/shared/jsredirect.php';
237	+ }
238	+ else
239	+ wp_die(__('You are unauthorized to view this page.', 'pretty-link'));
240	+ }
241	+
242	public static function display_links_list($params, $prli_message, $page_params_ov = false, $current_page_ov = false)
243	{
244	global $wpdb, $prli_utils, $prli_click, $prli_group, $prli_link, $page_size, $prli_options;

247
248	$where_clause = '';
249	$page_params = '';
250	+
251	+ $page_size = (isset($_REQUEST['size']) && is_numeric($_REQUEST['size']) && !empty($_REQUEST['size']))?$_REQUEST['size']:10;
252
253	if(!empty($params['group']))
254	{

360	'message' => (isset($_REQUEST['message'])?$_REQUEST['message']:'')
361	);
362	}
363	+ }

classes/helpers/PrliLinksHelper.php ADDED Viewed

	@@ -0,0 +1,69 @@


1	+ <?php
2	+
3	+ class PrliLinksHelper {
4	+
5	+ public static function groups_dropdown($fieldname, $value='', $extra_options=array(), $classes='') {
6	+ global $prli_group;
7	+ $groups = $prli_group->getAll();
8	+
9	+ $idname = preg_match('#^.\[(.?)\]$#',$fieldname,$matches)?$matches[1]:$fieldname;
10	+
11	+ ?>
12	+ <select id="<?php echo esc_html($idname); ?>" name="<?php echo esc_html($fieldname); ?>" class="<?php echo $classes; ?>">
13	+ <?php if( empty($extra_options) ): ?>
14	+ <option><?php _e('None', 'pretty-link'); ?> </option>
15	+ <?php else:
16	+ foreach($extra_options as $exoptkey => $exoptval): ?>
17	+ <option value="<?php echo $exoptval; ?>"><?php echo $exoptkey; ?> </option>
18	+ <?php endforeach;
19	+ endif; ?>
20	+ <?php foreach($groups as $group): ?>
21	+ <?php $selected = ($value==$group->id)?' selected="selected"':''; ?>
22	+ <option value="<?php echo $group->id; ?>"<?php echo $selected; ?>><?php echo $group->name; ?> </option>
23	+ <?php endforeach; ?>
24	+ </select>
25	+ <?php
26	+ }
27	+
28	+ public static function redirect_type_dropdown($fieldname, $value='', $extra_options=array(), $classes='') {
29	+ $selected = ' selected="selected"';
30	+ $idname = preg_match('#^.\[(.?)\]$#',$fieldname,$matches)?$matches[1]:$fieldname;
31	+ ?>
32	+ <select id="<?php echo $idname; ?>" name="<?php echo $fieldname; ?>" class="<?php echo $classes; ?>">
33	+ <?php if( !empty($extra_options) ):
34	+ foreach($extra_options as $exoptkey => $exoptval): ?>
35	+ <option value="<?php echo $exoptval; ?>"><?php echo $exoptkey; ?> </option>
36	+ <?php endforeach;
37	+ endif; ?>
38	+ <option value="307"<?php echo ($value==307)?$selected:''; ?>><?php _e("307 (Temporary)", 'pretty-link') ?> </option>
39	+ <option value="301"<?php echo ($value==301)?$selected:''; ?>><?php _e("301 (Permanent)", 'pretty-link') ?> </option>
40	+ <?php do_action('prli_redirection_types', array()); ?>
41	+ </select>
42	+ <?php
43	+ }
44	+
45	+ public static function bulk_action_dropdown() {
46	+ ?>
47	+ <div class="prli_bulk_action_dropdown">
48	+ <select class="prli_bulk_action">
49	+ <option value="-1"><?php _e('Bulk Actions', 'pretty-link'); ?> </option>
50	+ <option value="edit"><?php _e('Edit', 'pretty-link'); ?> </option>
51	+ <option value="delete"><?php _e('Delete', 'pretty-link'); ?> </option>
52	+ </select>
53	+ <a href="javascript:" class="prli_bulk_action_apply button" data-confmsg="<?php _e('Are you sure you want to delete the selected links?', 'pretty-link'); ?>" data-url="<?php echo admin_url('admin.php'); ?>" data-wpnonce="<?php echo wp_create_nonce('prli_bulk_update'); ?>" ><?php _e('Apply', 'pretty-link'); ?></a>
54	+ </div>
55	+ <?php
56	+ }
57	+
58	+ public static function bulk_action_checkbox_dropdown($input_name, $input_title, $classes='') {
59	+ $idname = preg_match('#^.\[(.?)\]$#',$input_name,$matches)?$matches[1]:$input_name;
60	+ ?>
61	+ <div class="bacheck-title"><?php echo $input_title; ?></div>
62	+ <select name="<?php echo $input_name; ?>" class="<?php echo $classes; ?>" id="<?php echo $idname; ?>">
63	+ <option value="##nochange##"><?php _e('- No Change -', 'pretty-link'); ?> </option>
64	+ <option value="off"><?php _e('Off', 'pretty-link'); ?> </option>
65	+ <option value="on"><?php _e('On', 'pretty-link'); ?> </option>
66	+ </select>
67	+ <?php
68	+ }
69	+ }

classes/models/PrliGroup.php CHANGED Viewed

	@@ -6,7 +6,7 @@ class PrliGroup
6	{
7	var $table_name;
8
9	- function ~~PrliGroup~~()
10	{
11	global $wpdb;
12	$this->table_name = "{$wpdb->prefix}prli_groups";
	@@ -120,4 +120,4 @@ class PrliGroup
120
121	return $errors;
122	}
123	- }


6	{
7	var $table_name;
8
9	+ function __construct()
10	{
11	global $wpdb;
12	$this->table_name = "{$wpdb->prefix}prli_groups";

120
121	return $errors;
122	}
123	+ }

classes/models/PrliLink.php CHANGED Viewed

@@ -6,7 +6,7 @@ class PrliLink
+            {
                 var $table_name;
-            -
                function PrliLink()
+                {
                   global $wpdb;
                   $this->table_name = "{$wpdb->prefix}prli_links";
@@ -97,6 +97,48 @@ class PrliLink
                   return $query_results;
+                }
                 function update_group( $id, $value, $group_id )
+                {
                   global $wpdb;


6	{
7	var $table_name;
8
9	+ function __construct()
10	{
11	global $wpdb;
12	$this->table_name = "{$wpdb->prefix}prli_links";

97	return $query_results;
98	}
99
100	+ function bulk_update( $ids, $values ) {
101	+ if( !empty($ids) and is_array($values) and !empty($values) ) {
102	+ global $wpdb;
103	+ $query = "UPDATE {$this->table_name} SET ";
104	+
105	+ $link_columns = array( 'name',
106	+ 'description',
107	+ 'url',
108	+ 'slug',
109	+ 'nofollow',
110	+ 'track_me',
111	+ 'param_forwarding',
112	+ 'param_struct',
113	+ 'redirect_type',
114	+ 'group_id' );
115	+
116	+ $sets = array();
117	+ foreach($values as $lnkkey => $lnkval) {
118	+ // make sure this is an option contained in the links table
119	+ if(in_array($lnkkey, $link_columns)) {
120	+ // check to see if this is a checkbox
121	+ if(in_array(strtolower($lnkval), array('on','off')))
122	+ $sets[] = $wpdb->prepare("{$lnkkey}=%d", (strtolower($lnkval)=='on'));
123	+ else
124	+ $sets[] = $wpdb->prepare("{$lnkkey}=%s", $lnkval);
125	+ }
126	+ }
127	+
128	+ $query .= implode(',', $sets);
129	+
130	+ if(preg_match('/,/',$ids))
131	+ $query .= " WHERE id IN ({$ids})";
132	+ else
133	+ $query .= $wpdb->prepare(" WHERE id=%d", $ids);
134	+
135	+ $query_results = $wpdb->query($query);
136	+ return $query_results;
137	+ }
138	+
139	+ return false;
140	+ }
141	+
142	function update_group( $id, $value, $group_id )
143	{
144	global $wpdb;

classes/models/PrliLinkMeta.php CHANGED Viewed

	@@ -6,7 +6,7 @@ class PrliLinkMeta
6	{
7	var $table_name;
8
9	- function ~~PrliLinkMeta~~()
10	{
11	global $wpdb;
12	$this->table_name = "{$wpdb->prefix}prli_link_metas";
	@@ -58,4 +58,12 @@ class PrliLinkMeta
58	$query = $wpdb->prepare($query_str, $meta_key, $link_id);
59	return $wpdb->query($query);
60	}
61	- }


6	{
7	var $table_name;
8
9	+ function __construct()
10	{
11	global $wpdb;
12	$this->table_name = "{$wpdb->prefix}prli_link_metas";

58	$query = $wpdb->prepare($query_str, $meta_key, $link_id);
59	return $wpdb->query($query);
60	}
61	+
62	+ function delete_link_metas($link_id) {
63	+ global $wpdb;
64	+
65	+ $query_str = "DELETE FROM {$this->table_name} WHERE link_id=%d";
66	+ $query = $wpdb->prepare($query_str, $meta_key, $link_id);
67	+ return $wpdb->query($query);
68	+ }
69	+ }

classes/models/PrliUrlUtils.php DELETED Viewed

@@ -1,166 +0,0 @@
-            -
            <?php
-            -
            if(!defined('ABSPATH'))
-            -
              die('You are not allowed to call this page directly.');
-            -
-            -
            class PrliUrlUtils {
-            -
-            -
              function get_title($url, $slug='')
-            -
              {
-            -
                $title = '';
-            -
-            -
                $data = PrliUrlUtils::curl_read_remote_file($url);
-            -
-            -
                // Look for <title>(.*?)</title> in the text
-            -
                if($data and preg_match('#<title>[\s\n\r]*?(.*?)[\s\n\r]*?</title>#im', $data, $matches))
-            -
                  $title = trim($matches[1]);
-            -
-            -
                if(empty($title) or !$title)
-            -
                  return $slug;
-            -
-            -
                return $title;
-            -
              }
-            -
-            -
              function valid_url($url)
-            -
              {
-            -
                $data = PrliUrlUtils::curl_read_remote_header($url);
-            -
-            -
                if(!empty($data) and $data)
-            -
                {
-            -
                   preg_match("/HTTP\/1\.[1|0]\s(\d{3})/",$data,$matches);
-            -
                   return ($matches[1] == '200');
-            -
                }
-            -
-            -
                // Let's just assume its valid if we can't test it
-            -
                return true;
-            -
              }
-            -
-            -
              function curl_read_remote_header($url)
-            -
              {
-            -
                if(function_exists('curl_init'))
-            -
                {
-            -
                  $ch = curl_init();
-            -
-            -
                  curl_setopt($ch, CURLOPT_URL, $url);
-            -
                  curl_setopt($ch, CURLOPT_HEADER, true);
-            -
                  curl_setopt($ch, CURLOPT_NOBODY, true);
-            -
                  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            -
                  curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-            -
                  curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-            -
-            -
                  $data = curl_exec($ch);
-            -
-            -
                  curl_close($ch);
-            -
-            -
                  return $data;
-            -
                }
-            -
-            -
                return false;
-            -
              }
-            -
-            -
              function curl_read_remote_file($url)
-            -
              {
-            -
                if(function_exists('curl_init'))
-            -
                {
-            -
                  $ch = curl_init();
-            -
-            -
                  curl_setopt($ch, CURLOPT_URL, $url);
-            -
                  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            -
                  curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-            -
                  curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-            -
-            -
                  $data = curl_exec($ch);
-            -
-            -
                  curl_close($ch);
-            -
-            -
                  return $data;
-            -
                }
-            -
-            -
                return false;
-            -
              }
-            -
-            -
              /**
-            -
              * Sends http request ensuring the request will fail before $timeout seconds
-            -
              * gotta use a socket connection because some hosting setups don't allow fopen.
-            -
              * Supports SSL sites as well as 301, 302 & 307 redirects
-            -
              * Returns the response content (no header, trimmed)
-            -
              * @param string $url
-            -
              * @param string $num_chunks Set to 0 if you want to read the full file
-            -
              * @param string $chunk_size In bytes
-            -
              * @param int $timeout
-            -
              * @return string|false false if request failed
-            -
              */
-            -
              function read_remote_file($url, $num_chunks=0, $headers='', $params='', $chunk_size=1024, $timeout=30 )
-            -
              {
-            -
                $purl = @parse_url($url);
-            -
-            -
                $sock_host   = $purl['host'];
-            -
                $sock_port   = ($purl['port']?(int)$purl['port']:80);
-            -
                $sock_scheme = $purl['scheme'];
-            -
-            -
                $req_host    = $purl['host'];
-            -
                $req_path    = $purl['path'];
-            -
-            -
                if(empty($req_path))
-            -
                  $req_path = "/";
-            -
-            -
                if($sock_scheme == 'https')
-            -
                {
-            -
                  $sock_port = 443;
-            -
                  $sock_host = "ssl://{$sock_host}";
-            -
                }
-            -
-            -
                $fp = fsockopen($sock_host, $sock_port, $errno, $errstr, $timeout);
-            -
                $contents = '';
-            -
                $header = '';
-            -
-            -
                if (!$fp)
-            -
                  return false;
-            -
                else
-            -
                {
-            -
                  // Send get request
-            -
                  $request = "GET {$req_path}{$params} HTTP/1.1\r\n";
-            -
                  $request .= "Host: {$req_host}\r\n";
-            -
                  $request .= $headers;
-            -
                  $request .= "Connection: Close\r\n\r\n";
-            -
                  fwrite($fp, $request);
-            -
-            -
                  // Read response
-            -
                  $head_end_found = false;
-            -
                  $buffer = '';
-            -
                  for($i = 0; !feof($fp); $i++)
-            -
                  {
-            -
                    if($num_chunks > 0 and $i >= $num_chunks)
-            -
                      break;
-            -
-            -
                    $out = fread($fp,$chunk_size);
-            -
                    if($head_end_found)
-            -
                      $contents .= $out;
-            -
                    else
-            -
                    {
-            -
                      $buffer .= $out;
-            -
                      $head_end = strpos($buffer, "\r\n\r\n");
-            -
                      if($head_end !== false)
-            -
                      {
-            -
                        $head_end_found = true;
-            -
                        $contents .= substr($buffer, ($head_end + 4));
-            -
                        $header .= substr($buffer, 0, $head_end);
-            -
                        // Follow HTTP redirects
-            -
                        if(preg_match("#http/1\.1 (301|302|307)#i",$header))
-            -
                        {
-            -
                          preg_match("#^Location:(.*?)$#im",$header,$matches);
-            -
                          return PrliUrlUtils::read_remote_file(trim($matches[1]));
-            -
                        }
-            -
                        else if(preg_match("#http/1\.1 (400|401|402|403|404|405|406|407|408|409|410|411|412|413|414|415|416|417|500|501|502|503|504|505)#i",$header))
-            -
                          return false; // The file wasn't found
-            -
                      }
-            -
                    }
-            -
                  }
-            -
                  fclose($fp);
-            -
                }
-            -
-            -
                if(empty($contents))
-            -
                  return false;
-            -
                else
-            -
                  return trim($contents);
-            -
              }
-            -
            }

classes/models/models.inc.php CHANGED Viewed

	@@ -42,6 +42,9 @@ global $prli_app_controller;
42
43	$prli_app_controller = new PrliAppController();
44



45	function prli_get_main_message($message='',$expiration=1800) // Get new messages every 1/2 hour
46	{
47	global $prli_update;


42
43	$prli_app_controller = new PrliAppController();
44
45	+ // Load Helpers
46	+ require_once( PRLI_HELPERS_PATH . '/PrliLinksHelper.php' );
47	+
48	function prli_get_main_message($message='',$expiration=1800) // Get new messages every 1/2 hour
49	{
50	global $prli_update;

classes/views/prli-clicks/list.php CHANGED Viewed

	@@ -16,7 +16,7 @@
16	?>
17	<?php
18	if(!empty($params['l']) and $params['l'] != 'all')
19	- echo '<br/><a href="?page='. ~~PRLI_PLUGIN_NAME .~~'~~/prli-links.php~~">&laquo Back to Links</a>';
20	else if(!empty($params['ip']) or !empty($params['vuid']))
21	echo '<br/><a href="?page='. PRLI_PLUGIN_NAME .'/prli-clicks.php">&laquo Back to Hits</a>';
22
	@@ -129,12 +129,12 @@
129	<?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
130	<td><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php&vuid=<?php echo $click->vuid; ?>" title="View All Activity for Visitor: <?php echo $click->vuid; ?>"><?php echo $click->vuid; ?><?php echo (($click->vuid != null)?" ($click->vuid_count)":''); ?></a></td>
131	<?php } ?>
132	- <td><?php echo ~~gmdate('Y-m-d H:i:s', (strtotime(~~$click->created_at~~) + (get_option('gmt_offset') * 3600)))~~; ?></td>
133	<?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
134	<td><?php echo $click->host; ?></td>
135	<?php } ?>
136	<td><?php echo $click->uri; ?></td>
137	- <td><?php echo $click->referer; ?></td>
138	<td><a href="?page=<?php print PRLI_PLUGIN_NAME; ?>/prli-clicks.php&l=<?php echo $click->link_id; ?>" title="View clicks for <?php echo stripslashes($click->link_name); ?>"><?php echo stripslashes($click->link_name); ?></a></td>
139	</tr>
140	<?php
	@@ -167,4 +167,4 @@
167	require(PRLI_VIEWS_PATH.'/shared/table-nav.php');
168	?>
169
170	- </div>


16	?>
17	<?php
18	if(!empty($params['l']) and $params['l'] != 'all')
19	+ echo '<br/><a href="' . admin_url("admin.php?page=pretty-link") . '">&laquo Back to Links</a>';
20	else if(!empty($params['ip']) or !empty($params['vuid']))
21	echo '<br/><a href="?page='. PRLI_PLUGIN_NAME .'/prli-clicks.php">&laquo Back to Hits</a>';
22

129	<?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
130	<td><a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php&vuid=<?php echo $click->vuid; ?>" title="View All Activity for Visitor: <?php echo $click->vuid; ?>"><?php echo $click->vuid; ?><?php echo (($click->vuid != null)?" ($click->vuid_count)":''); ?></a></td>
131	<?php } ?>
132	+ <td><?php echo $click->created_at; ?></td>
133	<?php if( isset($prli_options->extended_tracking) and $prli_options->extended_tracking == "extended" ) { ?>
134	<td><?php echo $click->host; ?></td>
135	<?php } ?>
136	<td><?php echo $click->uri; ?></td>
137	+ <td><a href="<?php echo $click->referer; ?>"><?php echo $click->referer; ?></a></td>
138	<td><a href="?page=<?php print PRLI_PLUGIN_NAME; ?>/prli-clicks.php&l=<?php echo $click->link_id; ?>" title="View clicks for <?php echo stripslashes($click->link_name); ?>"><?php echo stripslashes($click->link_name); ?></a></td>
139	</tr>
140	<?php

167	require(PRLI_VIEWS_PATH.'/shared/table-nav.php');
168	?>
169
170	+ </div>

classes/views/prli-dashboard-widget/widget.php CHANGED Viewed

	@@ -2,17 +2,17 @@
2	<div class="wrap">
3	<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 prli_get_main_message(__("Add a Pretty Link from your Dashboard:", 'pretty-link')); ?></p></div></div>
4
5	- <form name="form1" method="post" action="~~?page=<?~~php echo ~~PRLI_PLUGIN_NAME ?>/prli-links~~.php">
6	<input type="hidden" name="action" value="quick-create">
7	<?php wp_nonce_field('update-options'); ?>
8
9	<table class="form-table">
10	<tr class="form-field">
11	- <td valign="top">Target URL</td>
12	<td><input type="text" name="url" value="" size="75">
13	</tr>
14	<tr>
15	- <td valign="top">Pretty Link</td>
16	<td><strong><?php echo esc_html($prli_blogurl); ?></strong>/<input type="text" name="slug" value="<?php echo $prli_link->generateValidSlug(); ?>">
17	</tr>
18	</table>
	@@ -21,4 +21,4 @@
21	<input type="submit" name="Submit" value="Create" />
22	</p>
23	</form>
24	- </div>


2	<div class="wrap">
3	<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 prli_get_main_message(__("Add a Pretty Link from your Dashboard:", 'pretty-link')); ?></p></div></div>
4
5	+ <form name="form1" method="post" action="<?php echo admin_url("admin.php?page=pretty-link"); ?>">
6	<input type="hidden" name="action" value="quick-create">
7	<?php wp_nonce_field('update-options'); ?>
8
9	<table class="form-table">
10	<tr class="form-field">
11	+ <td valign="top"><?php _e("Target URL", 'pretty-link'); ?></td>
12	<td><input type="text" name="url" value="" size="75">
13	</tr>
14	<tr>
15	+ <td valign="top"><?php _e("Pretty Link", 'pretty-link'); ?></td>
16	<td><strong><?php echo esc_html($prli_blogurl); ?></strong>/<input type="text" name="slug" value="<?php echo $prli_link->generateValidSlug(); ?>">
17	</tr>
18	</table>

21	<input type="submit" name="Submit" value="Create" />
22	</p>
23	</form>
24	+ </div>

classes/views/prli-groups/list.php CHANGED Viewed

	@@ -63,11 +63,11 @@ if(!defined('ABSPATH'))
63	<div class="group_actions">
64	<a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&action=edit&id=<?php echo $group->id; ?>" title="Edit <?php echo htmlspecialchars(stripslashes($group->name)); ?>">Edit</a> \|
65	<a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&action=destroy&id=<?php echo $group->id; ?>" onclick="return confirm('Are you sure you want to delete your <?php echo htmlspecialchars(stripslashes($group->name)); ?> Pretty Link Group?');" title="Delete <?php echo htmlspecialchars(stripslashes($group->name)); ?>">Delete</a> \|
66	- <a href="~~?page=<?~~php echo ~~PRLI_PLUGIN_NAME; ?>/prli-links~~.php&group~~=<?php echo~~ $group->id; ?>" title="View links in <?php echo htmlspecialchars(stripslashes($group->name)); ?>">Links</a> \|
67	<a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php&group=<?php echo $group->id; ?>" title="View hits in <?php echo htmlspecialchars(stripslashes($group->name)); ?>">Hits</a>
68	</div>
69	</td>
70	- <td><a href="~~?page=<?~~php echo ~~PRLI_PLUGIN_NAME; ?>/prli-links~~.php&group~~=<?php echo~~ $group->id; ?>" title="View links in <?php echo htmlspecialchars(stripslashes($group->name)); ?>"><?php echo $group->link_count; ?></a></td>
71	<td><?php echo $group->created_at; ?></td>
72	</tr>
73	<?php
	@@ -86,4 +86,4 @@ if(!defined('ABSPATH'))
86	require(PRLI_VIEWS_PATH.'/shared/table-nav.php');
87	?>
88
89	- </div>


63	<div class="group_actions">
64	<a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&action=edit&id=<?php echo $group->id; ?>" title="Edit <?php echo htmlspecialchars(stripslashes($group->name)); ?>">Edit</a> \|
65	<a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-groups.php&action=destroy&id=<?php echo $group->id; ?>" onclick="return confirm('Are you sure you want to delete your <?php echo htmlspecialchars(stripslashes($group->name)); ?> Pretty Link Group?');" title="Delete <?php echo htmlspecialchars(stripslashes($group->name)); ?>">Delete</a> \|
66	+ <a href="<?php echo admin_url("admin.php?page=pretty-link&group={$group->id}"); ?>" title="View links in <?php echo htmlspecialchars(stripslashes($group->name)); ?>">Links</a> \|
67	<a href="?page=<?php echo PRLI_PLUGIN_NAME; ?>/prli-clicks.php&group=<?php echo $group->id; ?>" title="View hits in <?php echo htmlspecialchars(stripslashes($group->name)); ?>">Hits</a>
68	</div>
69	</td>
70	+ <td><a href="<?php echo admin_url("admin.php?page=pretty-link&group={$group->id}"); ?>" title="View links in <?php echo htmlspecialchars(stripslashes($group->name)); ?>"><?php echo $group->link_count; ?></a></td>
71	<td><?php echo $group->created_at; ?></td>
72	</tr>
73	<?php

86	require(PRLI_VIEWS_PATH.'/shared/table-nav.php');
87	?>
88
89	+ </div>

classes/views/prli-links/bar.php DELETED Viewed

@@ -1,18 +0,0 @@
-            -
            <?php
-            -
            if(!defined('ABSPATH'))
-            -
              die('You are not allowed to call this page directly.');
-            -
            ?>
-            -
-            -
            <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-            -
            <html>
-            -
              <head>
-            -
                <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-            -
                <meta name="description" content="<?php echo stripslashes($pretty_link->description); ?>" />
-            -
                <title><?php echo htmlspecialchars(stripslashes($pretty_link->name)); ?></title>
-            -
              </head>
-            -
              <frameset rows="66,*" framespacing=0 frameborder=0>
-            -
                <frame src="<?php echo PRLI_URL . "/pretty-bar.php?slug=".$pretty_link->slug . "&url=".urlencode($pretty_link_url.$param_string); ?>" noresize frameborder=0 scrolling=no marginwidth=0 marginheight=0 style="">
-            -
                <frame src="<?php echo $pretty_link_url.$param_string; ?>" frameborder=0 marginwidth=0 marginheight=0>
-            -
                <noframes>Your browser does not support frames. Click <a href="<?php echo $pretty_link_url.$param_string; ?>">here</a> to view the page.</noframes>
-            -
              </frameset>
-            -
            </html>

classes/views/prli-links/form.php CHANGED Viewed

@@ -60,14 +60,14 @@
                     <input type="checkbox" name="nofollow" <?php echo esc_html($values['nofollow']); ?>/>&nbsp; <?php _e("'Nofollow' this Link", 'pretty-link') ?>
                     <p class="description"><?php _e('Add a nofollow and noindex to this link\'s http redirect header', 'pretty-link')?>
                   </div>
-            -
            	  <div id="prli_time_delay" style="display: none">
-            -
            	    <br/>
-            -
            	    <h3><?php _e('Delay Redirect (Seconds):', 'pretty-link'); ?></h3>
-            -
            	    <div class="pane">
-            -
            	      <input type="text" name="delay" value="<?php echo esc_attr($values['delay']); ?>" />
-            -
            	      <p class="description"><?php _e('Time in seconds to wait before redirecting', 'pretty-link') ?></p>
-            -
            	    </div>
-            -
            	  </div>
                 </td>
                 <td valign="top" width="50%">
                   <h3><?php _e("Parameter Forwarding", 'pretty-link') ?></h3>
@@ -79,24 +79,24 @@
                   <div class="pane">
                     <input type="checkbox" name="track_me" <?php echo esc_html($values['track_me']); ?>/>&nbsp; <?php _e("Track Hits on this Link", 'pretty-link') ?>
                     <p class="description"><?php _e('Enable Pretty Link\'s built-in hit (click) tracking', 'pretty-link') ?></p>
-            -
            	    <div id="prli_google_analytics" style="display: none">
-            -
            	      <input type="checkbox" name="google_tracking" <?php echo esc_attr($values['google_tracking']); ?>/>&nbsp; <?php _e('Enable Google Analytics Tracking on this Link', 'pretty-link') ?>
-            -
            	      <p class="description"><?php _e('Requires the Google Analyticator, Google Analytics for WordPress or Google Analytics Plugin installed and configured for this to work.', 'pretty-link') ?></p>
-            -
            	      <?php
-            -
            		  global $prli_update;
-            -
            		  if($prli_update->pro_is_installed_and_authorized()):
-            -
            		    if($ga_info = PrliProUtils::ga_installed()):
-            -
            		      ?>
-            -
            		      <p class="description"><?php printf(__('It appears that <strong>%s</strong> is currently installed. Pretty Link will attempt to use its settings to track this link.', 'pretty-link'), $ga_info['name']); ?></p>
-            -
            		      <?php
-            -
            		    else:
-            -
            		      ?>
-            -
            	          <p class="description"><strong><?php _e('No Google Analytics Plugin is currently installed. Pretty Link cannot track links using Google Analytics until one is.', 'pretty-link'); ?></strong></p>
-            -
            		      <?php
-            -
            		    endif;
-            -
            		  endif;
-            -
            		  ?>
-            -
            	    </div>
                   </div><br/>
                 </td>
               </tr>


60	<input type="checkbox" name="nofollow" <?php echo esc_html($values['nofollow']); ?>/>  <?php _e("'Nofollow' this Link", 'pretty-link') ?>
61	<p class="description"><?php _e('Add a nofollow and noindex to this link\'s http redirect header', 'pretty-link')?>
62	</div>
63	+ <div id="prli_time_delay" style="display: none">
64	+ <br/>
65	+ <h3><?php _e('Delay Redirect (Seconds):', 'pretty-link'); ?></h3>
66	+ <div class="pane">
67	+ <input type="text" name="delay" value="<?php echo esc_attr($values['delay']); ?>" />
68	+ <p class="description"><?php _e('Time in seconds to wait before redirecting', 'pretty-link') ?></p>
69	+ </div>
70	+ </div>
71	</td>
72	<td valign="top" width="50%">
73	<h3><?php _e("Parameter Forwarding", 'pretty-link') ?></h3>

79	<div class="pane">
80	<input type="checkbox" name="track_me" <?php echo esc_html($values['track_me']); ?>/>  <?php _e("Track Hits on this Link", 'pretty-link') ?>
81	<p class="description"><?php _e('Enable Pretty Link\'s built-in hit (click) tracking', 'pretty-link') ?></p>
82	+ <div id="prli_google_analytics" style="display: none">
83	+ <input type="checkbox" name="google_tracking" <?php echo esc_attr($values['google_tracking']); ?>/>  <?php _e('Enable Google Analytics Tracking on this Link', 'pretty-link') ?>
84	+ <p class="description"><?php _e('Requires the Google Analyticator, Google Analytics for WordPress or Google Analytics Plugin installed and configured for this to work.', 'pretty-link') ?></p>
85	+ <?php
86	+ global $prli_update;
87	+ if($prli_update->pro_is_installed_and_authorized()):
88	+ if($ga_info = PrliProUtils::ga_installed()):
89	+ ?>
90	+ <p class="description"><?php printf(__('It appears that <strong>%s</strong> is currently installed. Pretty Link will attempt to use its settings to track this link.', 'pretty-link'), $ga_info['name']); ?></p>
91	+ <?php
92	+ else:
93	+ ?>
94	+ <p class="description"><strong><?php _e('No Google Analytics Plugin is currently installed. Pretty Link cannot track links using Google Analytics until one is.', 'pretty-link'); ?></strong></p>
95	+ <?php
96	+ endif;
97	+ endif;
98	+ ?>
99	+ </div>
100	</div><br/>
101	</td>
102	</tr>

classes/views/prli-links/head.php DELETED Viewed

@@ -1,96 +0,0 @@
-            -
            <?php
-            -
            if(!defined('ABSPATH'))
-            -
              die('You are not allowed to call this page directly.');
-            -
            ?>
-            -
-            -
            <script type="text/javascript">
-            -
            jQuery(document).ready(function() {
-            -
              jQuery('.link_actions').hide();
-            -
              jQuery('.edit_link').hover(
-            -
                function() {
-            -
                  jQuery(this).children(".link_actions").show();
-            -
                },
-            -
                function() {
-            -
                  jQuery(this).children(".link_actions").hide();
-            -
                }
-            -
              );
-            -
-            -
              jQuery(".options-table").hide();
-            -
              jQuery(".options-table-toggle > .expand-options").show();
-            -
              jQuery(".options-table-toggle > .collapse-options").hide();
-            -
              jQuery(".options-table-toggle").click( function () {
-            -
                  jQuery(this).children(".expand-options").toggle();
-            -
                  jQuery(this).children(".collapse-options").toggle();
-            -
                  jQuery(".expand-collapse").toggle();
-            -
                  jQuery(".options-table").toggle();
-            -
              });
-            -
-            -
              jQuery(".toggle_pane").hide();
-            -
              jQuery(".toggle").click( function () {
-            -
                  jQuery(this).next(".toggle_pane").toggle();
-            -
              });
-            -
              jQuery(".expand-all").click( function () {
-            -
                  jQuery(".toggle_pane").show();
-            -
                  jQuery(".expand-all").hide();
-            -
                  jQuery(".collapse-all").show();
-            -
              });
-            -
              jQuery(".collapse-all").click( function () {
-            -
                  jQuery(".toggle_pane").hide();
-            -
                  jQuery(".expand-all").show();
-            -
                  jQuery(".collapse-all").hide();
-            -
              });
-            -
            });
-            -
            </script>
-            -
-            -
            <style type="text/css">
-            -
-            -
            .options-table {
-            -
              width: 80%;
-            -
              margin-top: 10px;
-            -
            }
-            -
-            -
            .options-table td {
-            -
              padding: 10px;
-            -
              background-color: #f4f0db;
-            -
            }
-            -
-            -
            .options-table h3 {
-            -
              padding: 0px;
-            -
              margin: 0px;
-            -
              padding-left: 10px;
-            -
            }
-            -
-            -
            .expand-all, .collapse-all, .options-table-toggle {
-            -
              cursor: pointer;
-            -
            }
-            -
-            -
            .toggle {
-            -
              line-height: 34px;
-            -
              font-size: 12px;
-            -
              font-weight: bold;
-            -
              padding-bottom: 10px;
-            -
              cursor: pointer;
-            -
            }
-            -
-            -
            .pane {
-            -
              background-color: #f4f0db;
-            -
              padding-left: 10px;
-            -
            }
-            -
-            -
            ul.pane li {
-            -
              padding: 0px;
-            -
              margin: 0px;
-            -
            }
-            -
-            -
            .edit_link {
-            -
              height: 50px;
-            -
            }
-            -
-            -
            .slug_name {
-            -
              font-size: 12px;
-            -
              font-weight: bold;
-            -
            }
-            -
            .link_actions {
-            -
              padding-top: 5px;
-            -
            }
-            -
            </style>

classes/views/prli-links/list.php CHANGED Viewed

	@@ -56,13 +56,11 @@ if(!defined('ABSPATH'))
56	<?php
57	}
58	?>
59	- <form class="form-fields link-list-form" name="link_list_form" method="post" action="">
60	- <input type="hidden" name="action" value="list-form"/>
61	<?php $footer = false; require(PRLI_VIEWS_PATH.'/shared/link-table-nav.php'); ?>
62	- <table class="widefat post fixed" cellspacing="0">
63	<thead>
64	<tr>
65	- <th class="manage-column" width="30%"~~><?php~~ ~~do_action('prli~~-~~list~~-~~header~~-~~icon')~~; ~~?><~~a href="<?php echo admin_url('admin.php?page=pretty-link&sort=name' . (($sort_str == 'name' and $sdir_str == 'asc')?'&sdir=desc':'')); ?>">Name<?php echo (($sort_str == 'name')?'   <img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
66	<?php do_action('prli_link_column_header'); ?>
67	<th class="manage-column" width="10%"><a href="<?php echo admin_url('admin.php?page=pretty-link&sort=clicks' . (($sort_str == 'clicks' and $sdir_str == 'asc')?'&sdir=desc':'')); ?>">Hits / Uniq<?php echo (($sort_str == 'clicks')?'   <img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
68	<th class="manage-column" width="5%"><a href="<?php echo admin_url('admin.php?page=pretty-link&sort=group_name' . (($sort_str == 'group_name' and $sdir_str == 'asc')?'&sdir=desc':'')) ?>">Group<?php echo (($sort_str == 'group_name')?'   <img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
	@@ -70,6 +68,45 @@ if(!defined('ABSPATH'))
70	<th class="manage-column" width="20%"><a href="<?php echo admin_url('admin.php?page=pretty-link&sort=slug' . (($sort_str == 'slug' and $sdir_str == 'asc')?'&sdir=desc':'')); ?>">Links<?php echo (($sort_str == 'slug')?'   <img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
71	</tr>
72	</thead>







































73	<?php
74
75	if($record_count <= 0)
	@@ -91,7 +128,9 @@ if(!defined('ABSPATH'))
91	<tr class="link_row">
92	<td class="edit_link">
93

94	<?php do_action('prli_list_icon',$link->id); ?>

95	<?php if( $link->redirect_type == 'prettybar' ) { ?>
96	<img src="<?php echo PRLI_IMAGES_URL . '/pretty-link-small.png'; ?>" title="Using PrettyBar" width="13px" height="13px" />
97	<?php }
	@@ -173,7 +212,9 @@ if(!defined('ABSPATH'))
173	<td><a href="<?php echo admin_url( "admin.php?page=pretty-link&group={$link->group_id}"); ?>"><?php echo $link->group_name; ?></a></td>
174	<td><?php echo $link->created_at; ?></td>
175	</td>
176	- <td~~><input type='text' style="font-size: 10px; width: 100%;" readonly="true" onclick='this.select();' onfocus='this.select();' value='<?php echo $pretty_link_url; ?>' /><br/>~~


177	<?php if( $link->redirect_type != 'pixel' )
178	{
179	?>
	@@ -198,6 +239,5 @@ if(!defined('ABSPATH'))
198	</tfoot>
199	</table>
200	<?php $footer = true; require(PRLI_VIEWS_PATH.'/shared/link-table-nav.php'); ?>
201	- </form>
202
203	</div>


56	<?php
57	}
58	?>


59	<?php $footer = false; require(PRLI_VIEWS_PATH.'/shared/link-table-nav.php'); ?>
60	+ <table class="prli-edit-table widefat post fixed" cellspacing="0">
61	<thead>
62	<tr>
63	+ <th class="manage-column" width="30%"><input type="checkbox" name="check-all" class="select-all-link-action-checkboxes" style="margin-left: 1px;"/>  <a href="<?php echo admin_url('admin.php?page=pretty-link&sort=name' . (($sort_str == 'name' and $sdir_str == 'asc')?'&sdir=desc':'')); ?>">Name<?php echo (($sort_str == 'name')?'   <img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
64	<?php do_action('prli_link_column_header'); ?>
65	<th class="manage-column" width="10%"><a href="<?php echo admin_url('admin.php?page=pretty-link&sort=clicks' . (($sort_str == 'clicks' and $sdir_str == 'asc')?'&sdir=desc':'')); ?>">Hits / Uniq<?php echo (($sort_str == 'clicks')?'   <img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
66	<th class="manage-column" width="5%"><a href="<?php echo admin_url('admin.php?page=pretty-link&sort=group_name' . (($sort_str == 'group_name' and $sdir_str == 'asc')?'&sdir=desc':'')) ?>">Group<?php echo (($sort_str == 'group_name')?'   <img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>

68	<th class="manage-column" width="20%"><a href="<?php echo admin_url('admin.php?page=pretty-link&sort=slug' . (($sort_str == 'slug' and $sdir_str == 'asc')?'&sdir=desc':'')); ?>">Links<?php echo (($sort_str == 'slug')?'   <img src="'.PRLI_IMAGES_URL . '/'.(($sdir_str == 'desc')?'arrow_down.png':'arrow_up.png').'"/>':'') ?></a></th>
69	</tr>
70	</thead>
71	+ <tr id="bulk-edit" class="inline-edit-row inline-edit-row-post inline-edit-post bulk-edit-row bulk-edit-row-post bulk-edit-post" style="display: none;">
72	+ <td class="colspanchange">
73	+ <form id="prli-bulk-action-form" action="<?php echo admin_url('admin.php'); ?>" method="post">
74	+ <input type="hidden" name="page" value="pretty-link" />
75	+ <input type="hidden" name="action" value="bulk-edit" />
76	+ <input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce('prli-bulk-edit'); ?>" />
77	+ <fieldset class="inline-edit-col-left">
78	+ <div class="inline-edit-col">
79	+ <h4><?php _e('Bulk Edit', 'pretty-link'); ?></h4>
80	+ <div id="bulk-title-div">
81	+ <div id="bulk-titles"></div>
82	+ </div>
83	+ </div>
84	+ </fieldset>
85	+ <fieldset class="inline-edit-col-center">
86	+ <h4><?php _e('Basic Link Options', 'pretty-link'); ?></h4>
87	+ <div class="bacheck-title"><?php _e('Redirect Type', 'pretty-link'); ?></div>
88	+ <?php PrliLinksHelper::redirect_type_dropdown( 'bu[redirect_type]', '', array(__('- No Change -', 'pretty-link') => '##nochange##'), 'bulk-edit-select' ) ?>
89	+ <br/>
90	+ <div class="bacheck-title"><?php _e('Group', 'pretty-link'); ?></div>
91	+ <?php PrliLinksHelper::groups_dropdown('bu[group_id]', '', array(__('- No Change -', 'pretty-link') => '##nochange##'), 'bulk-edit-select'); ?>
92	+ <br/>
93	+ <?php PrliLinksHelper::bulk_action_checkbox_dropdown('bu[track_me]', __('Track', 'pretty-link'), 'bulk-edit-select'); ?>
94	+ <br/>
95	+ <?php PrliLinksHelper::bulk_action_checkbox_dropdown('bu[nofollow]', __('Nofollow', 'pretty-link'), 'bulk-edit-select'); ?>
96	+ <br/>
97	+ <?php PrliLinksHelper::bulk_action_checkbox_dropdown('bu[param_forwarding]', __('Forward Params', 'pretty-link'), 'bulk-edit-select'); ?>
98	+ <br/>
99	+ </fieldset>
100	+ <fieldset class="inline-edit-col-right">
101	+ <?php do_action('prli_bulk_action_right_col'); ?>
102	+ </fieldset>
103	+ <p class="submit inline-edit-save">
104	+ <a href="javascript:" title="<?php _e('Cancel', 'pretty-link'); ?>" class="button-secondary bulk-edit-cancel alignleft"><?php _e('Cancel', 'pretty-link'); ?></a>
105	+ <a href="javascript:" title="<?php _e('Update', 'pretty-link'); ?>" class="button-primary bulk-edit-update alignright"><?php _e('Bulk Update', 'pretty-link'); ?></a><br class="clear">
106	+ </p>
107	+ </form>
108	+ </td>
109	+ </tr>
110	<?php
111
112	if($record_count <= 0)

128	<tr class="link_row">
129	<td class="edit_link">
130
131	+ <input type="checkbox" name="link-action[<?php echo $link->id; ?>]" class="link-action-checkbox" data-id="<?php echo $link->id; ?>" data-title="<?php echo stripslashes($link->name); ?>" />
132	<?php do_action('prli_list_icon',$link->id); ?>
133	+
134	<?php if( $link->redirect_type == 'prettybar' ) { ?>
135	<img src="<?php echo PRLI_IMAGES_URL . '/pretty-link-small.png'; ?>" title="Using PrettyBar" width="13px" height="13px" />
136	<?php }

212	<td><a href="<?php echo admin_url( "admin.php?page=pretty-link&group={$link->group_id}"); ?>"><?php echo $link->group_name; ?></a></td>
213	<td><?php echo $link->created_at; ?></td>
214	</td>
215	+ <td>
216	+ <input type='text' style="font-size: 10px; width: 100%;" readonly="true" onclick='this.select();' onfocus='this.select();' value='<?php echo $pretty_link_url; ?>' />
217	+ <span class="list-clippy prli-clipboard"><?php echo $pretty_link_url; ?></span>
218	<?php if( $link->redirect_type != 'pixel' )
219	{
220	?>

239	</tfoot>
240	</table>
241	<?php $footer = true; require(PRLI_VIEWS_PATH.'/shared/link-table-nav.php'); ?>

242
243	</div>

classes/views/prli-links/ultra-cloak.php DELETED Viewed

@@ -1,17 +0,0 @@
-            -
            <?php
-            -
            if(!defined('ABSPATH'))
-            -
              die('You are not allowed to call this page directly.');
-            -
            ?>
-            -
-            -
            <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-            -
            <html>
-            -
              <head>
-            -
                <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-            -
                <title><?php echo htmlspecialchars(stripslashes($pretty_link->name)); ?></title>
-            -
                <meta name="description" content="<?php echo stripslashes($pretty_link->description); ?>" />
-            -
              </head>
-            -
              <frameset rows="*" framespacing=0 frameborder=0>
-            -
                <frame src="<?php echo $pretty_link_url.$param_string; ?>" frameborder=0 marginwidth=0 marginheight=0>
-            -
                <noframes>Your browser does not support frames. Click <a href="<?php echo $pretty_link_url.$param_string; ?>">here</a> to view the page.</noframes>
-            -
              </frameset>
-            -
            </html>

classes/views/prli-options/form.php CHANGED Viewed

	@@ -16,7 +16,7 @@ if(!$permalink_structure or empty($permalink_structure))
16	}
17	?>
18	<?php do_action('prli-options-message'); ?>
19	- <a href="admin.php?page~~=<?php echo PRLI_PLUGIN_NAME~~; ~~?>/prli-links.php~~">« Pretty Link Admin</a>
20
21	<form name="form1" method="post" action="<?php echo admin_url("/admin.php?page=pretty-link/prli-options.php"); ?>">
22	<input type="hidden" name="<?php echo $hidden_field_name; ?>" value="Y">
	@@ -122,4 +122,4 @@ if(!$permalink_structure or empty($permalink_structure))
122	<br/><span class="description">Seriously, only click this link if you want to delete all the Hit data in your database.</span></p>
123
124	</form>
125	- </div>


16	}
17	?>
18	<?php do_action('prli-options-message'); ?>
19	+ <a href="<?php echo admin_url("admin.php?page=pretty-link"); ?>">« Pretty Link Admin</a>
20
21	<form name="form1" method="post" action="<?php echo admin_url("/admin.php?page=pretty-link/prli-options.php"); ?>">
22	<input type="hidden" name="<?php echo $hidden_field_name; ?>" value="Y">

122	<br/><span class="description">Seriously, only click this link if you want to delete all the Hit data in your database.</span></p>
123
124	</form>
125	+ </div>

classes/views/shared/jsredirect.php ADDED Viewed

	@@ -0,0 +1,7 @@


1	+ <?php
2	+ if(!defined('ABSPATH'))
3	+ die('You are not allowed to call this page directly.');
4	+ ?>
5	+ <script type="text/javascript">
6	+ window.location = '<?php echo esc_url_raw($redirect_url); ?>';
7	+ </script>

classes/views/shared/link-table-nav.php CHANGED Viewed

	@@ -7,7 +7,6 @@ if(!defined('ABSPATH'))
7	{
8	?>
9	<div class="tablenav"<?php echo (isset($navstyle)?" style=\"$navstyle\"":''); ?>>
10	- <?php do_action('prli-link-list-actions', $footer); ?>
11	<div class='tablenav-pages'><span class="displaying-num">Displaying <?php echo "$page_first_record–$page_last_record of $record_count"; ?></span>
12
13	<?php
	@@ -15,7 +14,7 @@ if(!defined('ABSPATH'))
15	if($current_page > 1)
16	{
17	?>
18	- <a class='prev page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=<?php echo ($current_page-1); ?>'>«</a>
19	<?php
20	}
21
	@@ -29,7 +28,7 @@ if(!defined('ABSPATH'))
29	else
30	{
31	?>
32	- <a class='page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=1'>1</a>
33	<?php
34	}
35
	@@ -55,7 +54,7 @@ if(!defined('ABSPATH'))
55	else
56	{
57	?>
58	- <a class='page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=<?php echo $i; ?>'><?php echo $i; ?></a>
59	<?php
60	}
61	}
	@@ -78,7 +77,7 @@ if(!defined('ABSPATH'))
78	else
79	{
80	?>
81	- <a class='page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=<?php echo $page_count; ?>'><?php echo $page_count; ?></a>
82	<?php
83	}
84
	@@ -86,11 +85,20 @@ if(!defined('ABSPATH'))
86	if($current_page < $page_count)
87	{
88	?>
89	- <a class='next page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=<?php echo ($current_page + 1); ?>'>»</a>
90	<?php
91	}
92	?>






93	</div>



94	</div>
95	<?php
96	}
	@@ -98,7 +106,18 @@ if(!defined('ABSPATH'))
98	{
99	?>
100	<div class="tablenav"<?php echo (isset($navstyle)?" style=\"$navstyle\"":''); ?>>
101	- ~~<?php~~ ~~do_action(~~'~~prli~~-~~link-list-actions~~'~~, $footer); ?>~~











102	</div>
103	<?php
104	}


7	{
8	?>
9	<div class="tablenav"<?php echo (isset($navstyle)?" style=\"$navstyle\"":''); ?>>

10	<div class='tablenav-pages'><span class="displaying-num">Displaying <?php echo "$page_first_record–$page_last_record of $record_count"; ?></span>
11
12	<?php

14	if($current_page > 1)
15	{
16	?>
17	+ <a class='prev page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=<?php echo ($current_page-1); ?>&size=<?php echo $_REQUEST['size']; ?>'>«</a>
18	<?php
19	}
20

28	else
29	{
30	?>
31	+ <a class='page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=1&size=<?php echo $_REQUEST['size']; ?>'>1</a>
32	<?php
33	}
34

54	else
55	{
56	?>
57	+ <a class='page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=<?php echo $i; ?>&size=<?php echo $_REQUEST['size']; ?>'><?php echo $i; ?></a>
58	<?php
59	}
60	}

77	else
78	{
79	?>
80	+ <a class='page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=<?php echo $page_count; ?>&size=<?php echo $_REQUEST['size']; ?>'><?php echo $page_count; ?></a>
81	<?php
82	}
83

85	if($current_page < $page_count)
86	{
87	?>
88	+ <a class='next page-numbers' href='?page=<?php echo esc_html($_REQUEST['page'].$page_params); ?>&paged=<?php echo ($current_page + 1); ?>&size=<?php echo $_REQUEST['size']; ?>'>»</a>
89	<?php
90	}
91	?>
92	+ <select class="prli-page-size" onchange="location='<?php echo admin_url("admin.php?page=" . esc_html($_REQUEST['page'].$page_params) . "&paged=1&size='+this.options[this.selectedIndex].value"); ?>">
93	+ <option value="10" selected="selected">10</option>
94	+ <option value="25" <?php if($_REQUEST['size'] == 25) echo 'selected="selected"'; ?>>25</option>
95	+ <option value="50" <?php if($_REQUEST['size'] == 50) echo 'selected="selected"'; ?>>50</option>
96	+ <option value="100" <?php if($_REQUEST['size'] == 100) echo 'selected="selected"'; ?>>100 </option>
97	+ </select>
98	</div>
99	+ <?php if(!$footer): ?>
100	+ <?php PrliLinksHelper::bulk_action_dropdown(); ?>
101	+ <?php endif; ?>
102	</div>
103	<?php
104	}

106	{
107	?>
108	<div class="tablenav"<?php echo (isset($navstyle)?" style=\"$navstyle\"":''); ?>>
109	+ <div class='tablenav-pages'>
110	+ <span class="displaying-num">Displaying <?php echo "$page_first_record–$page_last_record of $record_count"; ?></span>
111	+ <select class="prli-page-size" onchange="location='<?php echo admin_url("admin.php?page=" . esc_html($_REQUEST['page'].$page_params) . "&paged=1&size='+this.options[this.selectedIndex].value"); ?>">
112	+ <option value="10" selected="selected">10</option>
113	+ <option value="25" <?php if($_REQUEST['size'] == 25) echo 'selected="selected"'; ?>>25</option>
114	+ <option value="50" <?php if($_REQUEST['size'] == 50) echo 'selected="selected"'; ?>>50</option>
115	+ <option value="100" <?php if($_REQUEST['size'] == 100) echo 'selected="selected"'; ?>>100 </option>
116	+ </select>
117	+ </div>
118	+ <?php if(!$footer): ?>
119	+ <?php PrliLinksHelper::bulk_action_dropdown(); ?>
120	+ <?php endif; ?>
121	</div>
122	<?php
123	}

css/prli-admin-links.css CHANGED Viewed

@@ -34,4 +34,41 @@
             #add_group_message {
               padding-left: 5px;
               display: inline;
-            -
            }


34	#add_group_message {
35	padding-left: 5px;
36	display: inline;
37	+ }
38	+
39	+ .prli-clipboard {
40	+ padding: 2px 0 2px 0;
41	+ width: 100px;
42	+ display: block;
43	+ }
44	+
45	+ #prli-bulk-action-form .title {
46	+ width: 100px !important;
47	+ }
48	+
49	+ #prli_bulk_action_dropdown {
50	+ padding-top: 2px;
51	+ float: left;
52	+ display: inline;
53	+ }
54	+
55	+ .bacheck-title {
56	+ display: inline-block;
57	+ width: 100px !important;
58	+ }
59	+
60	+ .inline-edit-col-left, .inline-edit-col-center, .inline-edit-col-right {
61	+ width: 33% !important;
62	+ }
63	+
64	+ /*
65	+ .keyword-replacements {
66	+ width: 45%;
67	+ clear: none !important;
68	+ }
69	+ */
70	+
71	+ .advanced-link-options {
72	+ width: 100%;
73	+ clear: none !important;
74	+ }

i18n/pretty-link.pot CHANGED Viewed

	@@ -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.7\n"
6	"Report-Msgid-Bugs-To: http://wordpress.org/tag/pretty-link\n"
7	- "POT-Creation-Date: 2012-03-06 06:35:53+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"
	@@ -37,6 +37,51 @@ msgstr ""
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"
	@@ -47,36 +92,40 @@ msgstr ""
47	msgid "Your Database Has Been Successfully Upgraded."
48	msgstr ""
49
50	- #: classes/controllers/PrliLinksController.php:3
51	- #: classes/controllers/PrliGroupsController.php:3
52	- msgid "You are not allowed to call this page directly."
53	- msgstr ""
54	-
55	- #: classes/controllers/PrliLinksController.php:51
56	msgid "Links in Group: "
57	msgstr ""
58
59	- #: classes/controllers/PrliLinksController.php:96
60	- #: classes/controllers/PrliLinksController.php:~~119~~
61	msgid "Your Pretty Link was Successfully Created"
62	msgstr ""
63
64	- #: classes/controllers/PrliLinksController.php:~~137~~
65	- msgid "Your Pretty ~~Links~~ ~~were~~ Successfully Updated"
66	msgstr ""
67
68	- #: classes/controllers/PrliLinksController.php:~~162~~
69	- msgid "Your ~~Pretty~~ ~~Link~~ ~~was~~ ~~Successfully Updated~~"





70	msgstr ""
71
72	- #: classes/controllers/PrliLinksController.php:~~170~~
73	msgid "Your Pretty Link was Successfully Reset"
74	msgstr ""
75
76	- #: classes/controllers/PrliLinksController.php:~~177~~
77	msgid "Your Pretty Link was Successfully Destroyed"
78	msgstr ""
79




80	#: classes/controllers/PrliGroupsController.php:17
81	msgid "An unknown error occurred when creating your group."
82	msgstr ""
	@@ -206,24 +255,57 @@ msgstr ""
206	msgid "Links"
207	msgstr ""
208

































209	#: classes/views/prli-links/list.php:105
210	- msgid "~~Meta Refresh Redirection~~"
211	msgstr ""
212
213	- #: classes/views/prli-links/list.php:~~108~~
214	- msgid "~~Javascript~~ ~~Redirection~~"
215	msgstr ""
216
217	- #: classes/views/prli-links/~~form~~.php:5
218	- msgid "Redirection ~~Type*:~~"
219	msgstr ""
220
221	- #: classes/views/prli-links/~~form~~.php:8
222	- msgid "~~307~~ ~~(Temporary)~~"
223	msgstr ""
224
225	- #: classes/views/prli-links/form.php:9
226	- msgid "~~301~~ ~~(Permanent)~~"
227	msgstr ""
228
229	#: classes/views/prli-links/form.php:16
	@@ -244,15 +326,6 @@ msgstr ""
244	msgid "Title:"
245	msgstr ""
246
247	- #: classes/views/prli-links/form.php:41
248	- #: pro/classes/views/prli-links/form.php:62
249	- msgid "Group"
250	- msgstr ""
251	-
252	- #: classes/views/prli-links/form.php:44
253	- msgid "None"
254	- msgstr ""
255	-
256	#: classes/views/prli-links/form.php:54
257	msgid "Add a New Group"
258	msgstr ""
	@@ -354,6 +427,14 @@ msgstr ""
354	msgid "Add a Pretty Link from your Dashboard:"
355	msgstr ""
356








357	#: classes/views/shared/nav.php:8
358	msgid "Pro Manual"
359	msgstr ""
	@@ -464,12 +545,12 @@ msgstr ""
464	msgid "There was an error fetching your Pretty Link URL"
465	msgstr ""
466
467	- #: prli-~~main~~.php:20
468	- msgid "~~Pretty~~ ~~Link~~ ~~\| Manage~~ Pretty ~~Links~~"
469	msgstr ""
470
471	#: prli-main.php:20
472	- msgid "Pretty Link"
473	msgstr ""
474
475	#: prli-main.php:21
	@@ -480,7 +561,7 @@ msgstr ""
480	msgid "Add New Link"
481	msgstr ""
482
483	- #: prli-main.php:~~355~~ prli-main.php:~~374~~
484	msgid ""
485	"Your Pretty Link Pro installation isn't quite complete yet.<br/>%1"
486	"$sAutomatically Upgrade to Enable Pretty Link Pro%2$s"
	@@ -520,174 +601,174 @@ msgstr ""
520	msgid "Delay Redirect must be a number"
521	msgstr ""
522
523	- #: pro/pretty-link-pro.php:~~1011~~
524	msgid "This Link Has additional Target URL rotations"
525	msgstr ""
526
527	- #: pro/pretty-link-pro.php:~~1589~~
528	msgid "Alternate Pretty Bar Attribution URL:"
529	msgstr ""
530
531	- #: pro/pretty-link-pro.php:~~1682~~
532	msgid "End-Point URL:"
533	msgstr ""
534
535	- #: pro/pretty-link-pro.php:~~1683~~
536	msgid "This can be used to integrate with your twitter client."
537	msgstr ""
538
539	- #: pro/pretty-link-pro.php:~~1686~~
540	msgid "Show TweetDeck Integration Instructions"
541	msgstr ""
542
543	- #: pro/pretty-link-pro.php:~~1688~~ pro/pretty-link-pro.php:~~1694~~
544	msgid "Follow the"
545	msgstr ""
546
547	- #: pro/pretty-link-pro.php:~~1688~~
548	msgid "TweetDeck Custom URL Instructions"
549	msgstr ""
550
551	- #: pro/pretty-link-pro.php:~~1688~~
552	msgid " and add the following URL to TweetDeck"
553	msgstr ""
554
555	- #: pro/pretty-link-pro.php:~~1692~~
556	msgid "Show Twitter for iPhone Integration Instructions"
557	msgstr ""
558
559	- #: pro/pretty-link-pro.php:~~1694~~
560	msgid "Twitter for iPhone Custom URL Instructions"
561	msgstr ""
562
563	- #: pro/pretty-link-pro.php:~~1694~~
564	msgid " and add the following URL to Twitter for iPhone"
565	msgstr ""
566
567	- #: pro/pretty-link-pro.php:~~1704~~
568	msgid "Label:"
569	msgstr ""
570
571	- #: pro/pretty-link-pro.php:~~1709~~ pro/prlipro-create-public-link-widget.php:46
572	msgid "Redirection:"
573	msgstr ""
574
575	- #: pro/pretty-link-pro.php:~~1720~~ pro/prlipro-create-public-link-widget.php:57
576	msgid "Tracking Enabled:"
577	msgstr ""
578
579	- #: pro/pretty-link-pro.php:~~1729~~ pro/prlipro-create-public-link-widget.php:66
580	msgid "Group:"
581	msgstr ""
582
583	- #: pro/pretty-link-pro.php:~~1835~~ pro/pretty-link-pro.php:~~1875~~
584	msgid "There was an error saving your Twitter account."
585	msgstr ""
586
587	- #: pro/pretty-link-pro.php:~~1871~~
588	msgid "Your Twitter Account was successfully saved."
589	msgstr ""
590
591	- #: pro/pretty-link-pro.php:~~1889~~ pro/pretty-link-pro.php:~~1967~~
592	msgid "Pretty Bar"
593	msgstr ""
594
595	- #: pro/pretty-link-pro.php:~~1890~~
596	msgid "Cloaked"
597	msgstr ""
598
599	- #: pro/pretty-link-pro.php:~~1891~~ pro/pretty-link-pro.php:~~1969~~
600	msgid "Pixel"
601	msgstr ""
602
603	- #: pro/pretty-link-pro.php:~~1892~~ pro/pretty-link-pro.php:~~1970~~
604	msgid "Meta Refresh"
605	msgstr ""
606
607	- #: pro/pretty-link-pro.php:~~1893~~ pro/pretty-link-pro.php:~~1971~~
608	msgid "Javascript"
609	msgstr ""
610
611	- #: pro/pretty-link-pro.php:~~1968~~
612	msgid "Cloak"
613	msgstr ""
614
615	- #: pro/pretty-link-pro.php:~~1999~~
616	msgid "Image URL:"
617	msgstr ""
618
619	- #: pro/pretty-link-pro.php:~~2002~~
620	msgid ""
621	"If set, this will replace the logo image on the PrettyBar. The image that "
622	"this URL references should be 48x48 Pixels to fit."
623	msgstr ""
624
625	- #: pro/pretty-link-pro.php:~~2006~~
626	msgid "Background Image URL:"
627	msgstr ""
628
629	- #: pro/pretty-link-pro.php:~~2009~~
630	msgid ""
631	"If set, this will replace the background image on PrettyBar. The image that "
632	"this URL references should be 65px tall - this image will be repeated "
633	"horizontally across the bar."
634	msgstr ""
635
636	- #: pro/pretty-link-pro.php:~~2013~~
637	msgid "Background Color:"
638	msgstr ""
639
640	- #: pro/pretty-link-pro.php:~~2016~~
641	msgid ""
642	"This will alter the background color of the PrettyBar if you haven't "
643	"specified a PrettyBar background image."
644	msgstr ""
645
646	- #: pro/pretty-link-pro.php:~~2020~~
647	msgid "Text Color:"
648	msgstr ""
649
650	- #: pro/pretty-link-pro.php:~~2023~~
651	msgid ""
652	"If not set, this defaults to black (RGB value <code>#000000</code>) but you "
653	"can change it to whatever color you like."
654	msgstr ""
655
656	- #: pro/pretty-link-pro.php:~~2027~~
657	msgid "Link Color:"
658	msgstr ""
659
660	- #: pro/pretty-link-pro.php:~~2030~~
661	msgid ""
662	"If not set, this defaults to blue (RGB value <code>#0000ee</code>) but you "
663	"can change it to whatever color you like."
664	msgstr ""
665
666	- #: pro/pretty-link-pro.php:~~2034~~
667	msgid "Link Hover Color:"
668	msgstr ""
669
670	- #: pro/pretty-link-pro.php:~~2037~~
671	msgid ""
672	"If not set, this defaults to RGB value <code>#ababab</code> but you can "
673	"change it to whatever color you like."
674	msgstr ""
675
676	- #: pro/pretty-link-pro.php:~~2041~~
677	msgid "Visited Link Color:"
678	msgstr ""
679
680	- #: pro/pretty-link-pro.php:~~2044~~
681	msgid ""
682	"If not set, this defaults to RGB value <code>#551a8b</code> but you can "
683	"change it to whatever color you like."
684	msgstr ""
685
686	- #: pro/pretty-link-pro.php:~~2048~~
687	msgid "Title Char Limit*:"
688	msgstr ""
689
690	- #: pro/pretty-link-pro.php:~~2051~~
691	msgid ""
692	"If your Website has a long title then you may need to adjust this value so "
693	"that it will all fit on the PrettyBar. It is recommended that you keep this "
	@@ -695,11 +776,11 @@ msgid ""
695	"good across different browsers and screen resolutions."
696	msgstr ""
697
698	- #: pro/pretty-link-pro.php:~~2055~~
699	msgid "Description Char Limit*:"
700	msgstr ""
701
702	- #: pro/pretty-link-pro.php:~~2058~~
703	msgid ""
704	"If your Website has a long Description (tagline) then you may need to adjust "
705	"this value so that it will all fit on the PrettyBar. It is recommended that "
	@@ -707,118 +788,118 @@ msgid ""
707	"format looks good across different browsers and screen resolutions."
708	msgstr ""
709
710	- #: pro/pretty-link-pro.php:~~2062~~
711	msgid "Target URL Char Limit*:"
712	msgstr ""
713
714	- #: pro/pretty-link-pro.php:~~2065~~
715	msgid ""
716	"If you link to a lot of large Target URLs you may want to adjust this value. "
717	"It is recommended that you keep this value to <code>40</code> or below so "
718	"the PrettyBar's format looks good across different browsers and URL sizes"
719	msgstr ""
720
721	- #: pro/pretty-link-pro.php:~~2070~~
722	msgid "Show Pretty Bar Title"
723	msgstr ""
724
725	- #: pro/pretty-link-pro.php:~~2071~~
726	msgid ""
727	"Make sure this is checked if you want the title of your blog (and link) to "
728	"show up on the PrettyBar."
729	msgstr ""
730
731	- #: pro/pretty-link-pro.php:~~2076~~
732	msgid "Show Pretty Bar Description"
733	msgstr ""
734
735	- #: pro/pretty-link-pro.php:~~2077~~
736	msgid ""
737	"Make sure this is checked if you want your site description to show up on "
738	"the PrettyBar."
739	msgstr ""
740
741	- #: pro/pretty-link-pro.php:~~2082~~
742	msgid "Show Pretty Bar Share Links"
743	msgstr ""
744
745	- #: pro/pretty-link-pro.php:~~2083~~
746	msgid ""
747	"Make sure this is checked if you want \"share links\" to show up on the "
748	"PrettyBar."
749	msgstr ""
750
751	- #: pro/pretty-link-pro.php:~~2088~~
752	msgid "Show Pretty Bar Target URL"
753	msgstr ""
754
755	- #: pro/pretty-link-pro.php:~~2089~~
756	msgid ""
757	"Make sure this is checked if you want a link displaying the Target URL to "
758	"show up on the PrettyBar."
759	msgstr ""
760
761	- #: pro/pretty-link-pro.php:~~2119~~
762	msgid "Logo Image URL must be a correctly formatted URL"
763	msgstr ""
764
765	- #: pro/pretty-link-pro.php:~~2122~~
766	msgid "Background Image URL must be a correctly formatted URL"
767	msgstr ""
768
769	- #: pro/pretty-link-pro.php:~~2125~~
770	msgid "PrettyBar Background Color must be an actual RGB Value"
771	msgstr ""
772
773	- #: pro/pretty-link-pro.php:~~2128~~
774	msgid "PrettyBar Text Color must be an actual RGB Value"
775	msgstr ""
776
777	- #: pro/pretty-link-pro.php:~~2131~~
778	msgid "PrettyBar Link Color must be an actual RGB Value"
779	msgstr ""
780
781	- #: pro/pretty-link-pro.php:~~2134~~ pro/pretty-link-pro.php:~~2137~~
782	msgid "PrettyBar Hover Color must be an actual RGB Value"
783	msgstr ""
784
785	- #: pro/pretty-link-pro.php:~~2140~~
786	msgid "PrettyBar Title Character Limit must not be blank"
787	msgstr ""
788
789	- #: pro/pretty-link-pro.php:~~2143~~
790	msgid "PrettyBar Description Character Limit must not be blank"
791	msgstr ""
792
793	- #: pro/pretty-link-pro.php:~~2146~~
794	msgid "PrettyBar Link Character Limit must not be blank"
795	msgstr ""
796
797	- #: pro/pretty-link-pro.php:~~2149~~
798	msgid "PrettyBar Title Character Limit must be a number"
799	msgstr ""
800
801	- #: pro/pretty-link-pro.php:~~2152~~
802	msgid "PrettyBar Description Character Limit must be a number"
803	msgstr ""
804
805	- #: pro/pretty-link-pro.php:~~2155~~
806	msgid "PrettyBar Link Character Limit must be a number"
807	msgstr ""
808
809	- #: pro/pretty-link-pro.php:~~2278~~
810	msgid "You are unauthorized to view this resource"
811	msgstr ""
812
813	- #: pro/pretty-link-pro.php:~~2308~~
814	msgid "View QR Code for this link: %s"
815	msgstr ""
816
817	- #: pro/pretty-link-pro.php:~~2316~~
818	msgid "Download QR Code for this link: %s"
819	msgstr ""
820
821	- #: pro/pretty-link-pro.php:~~2410~~
822	msgid "Double Redirection Enabled"
823	msgstr ""
824
	@@ -907,8 +988,17 @@ msgid ""
907	"automatically download a %sQR Code%s for each individual Pretty Link."
908	msgstr ""
909




910	#: pro/classes/views/prli-links/bulk-edit.php:7
911	- msgid "~~Bulk~~ ~~Edit Links~~"





912	msgstr ""
913
914	#: pro/classes/views/prlipro-import-export/form.php:7
	@@ -1001,6 +1091,10 @@ msgstr ""
1001	msgid "Link Split-Test Report"
1002	msgstr ""
1003




1004	#: pro/classes/views/prli-reports/edit.php:7
1005	msgid "Edit Link Report"
1006	msgstr ""
	@@ -1013,10 +1107,6 @@ msgstr ""
1013	msgid "Google Analytics for WordPress"
1014	msgstr ""
1015
1016	- #: pro/classes/models/PrliProUtils.php:276
1017	- msgid "Google Analytics"
1018	- msgstr ""
1019	-
1020	#. Plugin Name of the plugin/theme
1021	msgid "Pretty Link Lite"
1022	msgstr ""


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.9\n"
6	"Report-Msgid-Bugs-To: http://wordpress.org/tag/pretty-link\n"
7	+ "POT-Creation-Date: 2012-03-21 15:58:26+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"

37	msgid "No hits older than 90 days were found, so nothing was deleted"
38	msgstr ""
39
40	+ #: classes/helpers/PrliLinksHelper.php:14 classes/views/prli-links/form.php:44
41	+ msgid "None"
42	+ msgstr ""
43	+
44	+ #: classes/helpers/PrliLinksHelper.php:38 classes/views/prli-links/form.php:8
45	+ msgid "307 (Temporary)"
46	+ msgstr ""
47	+
48	+ #: classes/helpers/PrliLinksHelper.php:39 classes/views/prli-links/form.php:9
49	+ msgid "301 (Permanent)"
50	+ msgstr ""
51	+
52	+ #: classes/helpers/PrliLinksHelper.php:49
53	+ msgid "Bulk Actions"
54	+ msgstr ""
55	+
56	+ #: classes/helpers/PrliLinksHelper.php:50
57	+ msgid "Edit"
58	+ msgstr ""
59	+
60	+ #: classes/helpers/PrliLinksHelper.php:51
61	+ msgid "Delete"
62	+ msgstr ""
63	+
64	+ #: classes/helpers/PrliLinksHelper.php:53
65	+ msgid "Are you sure you want to delete the selected links?"
66	+ msgstr ""
67	+
68	+ #: classes/helpers/PrliLinksHelper.php:53
69	+ msgid "Apply"
70	+ msgstr ""
71	+
72	+ #: classes/helpers/PrliLinksHelper.php:63 classes/views/prli-links/list.php:88
73	+ #: classes/views/prli-links/list.php:91
74	+ msgid "- No Change -"
75	+ msgstr ""
76	+
77	+ #: classes/helpers/PrliLinksHelper.php:64
78	+ msgid "Off"
79	+ msgstr ""
80	+
81	+ #: classes/helpers/PrliLinksHelper.php:65
82	+ msgid "On"
83	+ msgstr ""
84	+
85	#: classes/controllers/PrliAppController.php:33
86	msgid ""
87	"Database Upgrade is required for Pretty Link to work properly<br/>%1"

92	msgid "Your Database Has Been Successfully Upgraded."
93	msgstr ""
94
95	+ #: classes/controllers/PrliLinksController.php:65





96	msgid "Links in Group: "
97	msgstr ""
98
99	+ #: classes/controllers/PrliLinksController.php:110
100	+ #: classes/controllers/PrliLinksController.php:133
101	msgid "Your Pretty Link was Successfully Created"
102	msgstr ""
103
104	+ #: classes/controllers/PrliLinksController.php:168
105	+ msgid "Your Pretty Link was Successfully Updated"
106	msgstr ""
107
108	+ #: classes/controllers/PrliLinksController.php:183
109	+ msgid "Your links were updated successfully"
110	+ msgstr ""
111	+
112	+ #: classes/controllers/PrliLinksController.php:200
113	+ #: classes/controllers/PrliLinksController.php:239
114	+ msgid "You are unauthorized to view this page."
115	msgstr ""
116
117	+ #: classes/controllers/PrliLinksController.php:206
118	msgid "Your Pretty Link was Successfully Reset"
119	msgstr ""
120
121	+ #: classes/controllers/PrliLinksController.php:213
122	msgid "Your Pretty Link was Successfully Destroyed"
123	msgstr ""
124
125	+ #: classes/controllers/PrliLinksController.php:226
126	+ msgid "Your links were deleted successfully"
127	+ msgstr ""
128	+
129	#: classes/controllers/PrliGroupsController.php:17
130	msgid "An unknown error occurred when creating your group."
131	msgstr ""

255	msgid "Links"
256	msgstr ""
257
258	+ #: classes/views/prli-links/list.php:79
259	+ msgid "Bulk Edit"
260	+ msgstr ""
261	+
262	+ #: classes/views/prli-links/list.php:86
263	+ msgid "Basic Link Options"
264	+ msgstr ""
265	+
266	+ #: classes/views/prli-links/list.php:87
267	+ msgid "Redirect Type"
268	+ msgstr ""
269	+
270	+ #: classes/views/prli-links/list.php:90 classes/views/prli-links/form.php:41
271	+ #: pro/classes/views/prli-links/form.php:62
272	+ msgid "Group"
273	+ msgstr ""
274	+
275	+ #: classes/views/prli-links/list.php:93
276	+ msgid "Track"
277	+ msgstr ""
278	+
279	+ #: classes/views/prli-links/list.php:95
280	+ msgid "Nofollow"
281	+ msgstr ""
282	+
283	+ #: classes/views/prli-links/list.php:97
284	+ msgid "Forward Params"
285	+ msgstr ""
286	+
287	+ #: classes/views/prli-links/list.php:104
288	+ msgid "Cancel"
289	+ msgstr ""
290	+
291	#: classes/views/prli-links/list.php:105
292	+ msgid "Update"
293	msgstr ""
294
295	+ #: classes/views/prli-links/list.php:105
296	+ msgid "Bulk Update"
297	msgstr ""
298
299	+ #: classes/views/prli-links/list.php:144
300	+ msgid "Meta Refresh Redirection"
301	msgstr ""
302
303	+ #: classes/views/prli-links/list.php:147
304	+ msgid "Javascript Redirection"
305	msgstr ""
306
307	+ #: classes/views/prli-links/form.php:5
308	+ msgid "Redirection Type*:"
309	msgstr ""
310
311	#: classes/views/prli-links/form.php:16

326	msgid "Title:"
327	msgstr ""
328









329	#: classes/views/prli-links/form.php:54
330	msgid "Add a New Group"
331	msgstr ""

427	msgid "Add a Pretty Link from your Dashboard:"
428	msgstr ""
429
430	+ #: classes/views/prli-dashboard-widget/widget.php:11
431	+ msgid "Target URL"
432	+ msgstr ""
433	+
434	+ #: classes/views/prli-dashboard-widget/widget.php:15 prli-main.php:20
435	+ msgid "Pretty Link"
436	+ msgstr ""
437	+
438	#: classes/views/shared/nav.php:8
439	msgid "Pro Manual"
440	msgstr ""

545	msgid "There was an error fetching your Pretty Link URL"
546	msgstr ""
547
548	+ #: prli-bookmarklet.php:33
549	+ msgid "Here's your Pretty Link"
550	msgstr ""
551
552	#: prli-main.php:20
553	+ msgid "Pretty Link \| Manage Pretty Links"
554	msgstr ""
555
556	#: prli-main.php:21

561	msgid "Add New Link"
562	msgstr ""
563
564	+ #: prli-main.php:357 prli-main.php:376
565	msgid ""
566	"Your Pretty Link Pro installation isn't quite complete yet.<br/>%1"
567	"$sAutomatically Upgrade to Enable Pretty Link Pro%2$s"

601	msgid "Delay Redirect must be a number"
602	msgstr ""
603
604	+ #: pro/pretty-link-pro.php:1007
605	msgid "This Link Has additional Target URL rotations"
606	msgstr ""
607
608	+ #: pro/pretty-link-pro.php:1405
609	msgid "Alternate Pretty Bar Attribution URL:"
610	msgstr ""
611
612	+ #: pro/pretty-link-pro.php:1498
613	msgid "End-Point URL:"
614	msgstr ""
615
616	+ #: pro/pretty-link-pro.php:1499
617	msgid "This can be used to integrate with your twitter client."
618	msgstr ""
619
620	+ #: pro/pretty-link-pro.php:1502
621	msgid "Show TweetDeck Integration Instructions"
622	msgstr ""
623
624	+ #: pro/pretty-link-pro.php:1504 pro/pretty-link-pro.php:1510
625	msgid "Follow the"
626	msgstr ""
627
628	+ #: pro/pretty-link-pro.php:1504
629	msgid "TweetDeck Custom URL Instructions"
630	msgstr ""
631
632	+ #: pro/pretty-link-pro.php:1504
633	msgid " and add the following URL to TweetDeck"
634	msgstr ""
635
636	+ #: pro/pretty-link-pro.php:1508
637	msgid "Show Twitter for iPhone Integration Instructions"
638	msgstr ""
639
640	+ #: pro/pretty-link-pro.php:1510
641	msgid "Twitter for iPhone Custom URL Instructions"
642	msgstr ""
643
644	+ #: pro/pretty-link-pro.php:1510
645	msgid " and add the following URL to Twitter for iPhone"
646	msgstr ""
647
648	+ #: pro/pretty-link-pro.php:1520
649	msgid "Label:"
650	msgstr ""
651
652	+ #: pro/pretty-link-pro.php:1525 pro/prlipro-create-public-link-widget.php:46
653	msgid "Redirection:"
654	msgstr ""
655
656	+ #: pro/pretty-link-pro.php:1536 pro/prlipro-create-public-link-widget.php:57
657	msgid "Tracking Enabled:"
658	msgstr ""
659
660	+ #: pro/pretty-link-pro.php:1545 pro/prlipro-create-public-link-widget.php:66
661	msgid "Group:"
662	msgstr ""
663
664	+ #: pro/pretty-link-pro.php:1651 pro/pretty-link-pro.php:1691
665	msgid "There was an error saving your Twitter account."
666	msgstr ""
667
668	+ #: pro/pretty-link-pro.php:1687
669	msgid "Your Twitter Account was successfully saved."
670	msgstr ""
671
672	+ #: pro/pretty-link-pro.php:1705 pro/pretty-link-pro.php:1783
673	msgid "Pretty Bar"
674	msgstr ""
675
676	+ #: pro/pretty-link-pro.php:1706
677	msgid "Cloaked"
678	msgstr ""
679
680	+ #: pro/pretty-link-pro.php:1707 pro/pretty-link-pro.php:1785
681	msgid "Pixel"
682	msgstr ""
683
684	+ #: pro/pretty-link-pro.php:1708 pro/pretty-link-pro.php:1786
685	msgid "Meta Refresh"
686	msgstr ""
687
688	+ #: pro/pretty-link-pro.php:1709 pro/pretty-link-pro.php:1787
689	msgid "Javascript"
690	msgstr ""
691
692	+ #: pro/pretty-link-pro.php:1784
693	msgid "Cloak"
694	msgstr ""
695
696	+ #: pro/pretty-link-pro.php:1815
697	msgid "Image URL:"
698	msgstr ""
699
700	+ #: pro/pretty-link-pro.php:1818
701	msgid ""
702	"If set, this will replace the logo image on the PrettyBar. The image that "
703	"this URL references should be 48x48 Pixels to fit."
704	msgstr ""
705
706	+ #: pro/pretty-link-pro.php:1822
707	msgid "Background Image URL:"
708	msgstr ""
709
710	+ #: pro/pretty-link-pro.php:1825
711	msgid ""
712	"If set, this will replace the background image on PrettyBar. The image that "
713	"this URL references should be 65px tall - this image will be repeated "
714	"horizontally across the bar."
715	msgstr ""
716
717	+ #: pro/pretty-link-pro.php:1829
718	msgid "Background Color:"
719	msgstr ""
720
721	+ #: pro/pretty-link-pro.php:1832
722	msgid ""
723	"This will alter the background color of the PrettyBar if you haven't "
724	"specified a PrettyBar background image."
725	msgstr ""
726
727	+ #: pro/pretty-link-pro.php:1836
728	msgid "Text Color:"
729	msgstr ""
730
731	+ #: pro/pretty-link-pro.php:1839
732	msgid ""
733	"If not set, this defaults to black (RGB value <code>#000000</code>) but you "
734	"can change it to whatever color you like."
735	msgstr ""
736
737	+ #: pro/pretty-link-pro.php:1843
738	msgid "Link Color:"
739	msgstr ""
740
741	+ #: pro/pretty-link-pro.php:1846
742	msgid ""
743	"If not set, this defaults to blue (RGB value <code>#0000ee</code>) but you "
744	"can change it to whatever color you like."
745	msgstr ""
746
747	+ #: pro/pretty-link-pro.php:1850
748	msgid "Link Hover Color:"
749	msgstr ""
750
751	+ #: pro/pretty-link-pro.php:1853
752	msgid ""
753	"If not set, this defaults to RGB value <code>#ababab</code> but you can "
754	"change it to whatever color you like."
755	msgstr ""
756
757	+ #: pro/pretty-link-pro.php:1857
758	msgid "Visited Link Color:"
759	msgstr ""
760
761	+ #: pro/pretty-link-pro.php:1860
762	msgid ""
763	"If not set, this defaults to RGB value <code>#551a8b</code> but you can "
764	"change it to whatever color you like."
765	msgstr ""
766
767	+ #: pro/pretty-link-pro.php:1864
768	msgid "Title Char Limit*:"
769	msgstr ""
770
771	+ #: pro/pretty-link-pro.php:1867
772	msgid ""
773	"If your Website has a long title then you may need to adjust this value so "
774	"that it will all fit on the PrettyBar. It is recommended that you keep this "

776	"good across different browsers and screen resolutions."
777	msgstr ""
778
779	+ #: pro/pretty-link-pro.php:1871
780	msgid "Description Char Limit*:"
781	msgstr ""
782
783	+ #: pro/pretty-link-pro.php:1874
784	msgid ""
785	"If your Website has a long Description (tagline) then you may need to adjust "
786	"this value so that it will all fit on the PrettyBar. It is recommended that "

788	"format looks good across different browsers and screen resolutions."
789	msgstr ""
790
791	+ #: pro/pretty-link-pro.php:1878
792	msgid "Target URL Char Limit*:"
793	msgstr ""
794
795	+ #: pro/pretty-link-pro.php:1881
796	msgid ""
797	"If you link to a lot of large Target URLs you may want to adjust this value. "
798	"It is recommended that you keep this value to <code>40</code> or below so "
799	"the PrettyBar's format looks good across different browsers and URL sizes"
800	msgstr ""
801
802	+ #: pro/pretty-link-pro.php:1886
803	msgid "Show Pretty Bar Title"
804	msgstr ""
805
806	+ #: pro/pretty-link-pro.php:1887
807	msgid ""
808	"Make sure this is checked if you want the title of your blog (and link) to "
809	"show up on the PrettyBar."
810	msgstr ""
811
812	+ #: pro/pretty-link-pro.php:1892
813	msgid "Show Pretty Bar Description"
814	msgstr ""
815
816	+ #: pro/pretty-link-pro.php:1893
817	msgid ""
818	"Make sure this is checked if you want your site description to show up on "
819	"the PrettyBar."
820	msgstr ""
821
822	+ #: pro/pretty-link-pro.php:1898
823	msgid "Show Pretty Bar Share Links"
824	msgstr ""
825
826	+ #: pro/pretty-link-pro.php:1899
827	msgid ""
828	"Make sure this is checked if you want \"share links\" to show up on the "
829	"PrettyBar."
830	msgstr ""
831
832	+ #: pro/pretty-link-pro.php:1904
833	msgid "Show Pretty Bar Target URL"
834	msgstr ""
835
836	+ #: pro/pretty-link-pro.php:1905
837	msgid ""
838	"Make sure this is checked if you want a link displaying the Target URL to "
839	"show up on the PrettyBar."
840	msgstr ""
841
842	+ #: pro/pretty-link-pro.php:1935
843	msgid "Logo Image URL must be a correctly formatted URL"
844	msgstr ""
845
846	+ #: pro/pretty-link-pro.php:1938
847	msgid "Background Image URL must be a correctly formatted URL"
848	msgstr ""
849
850	+ #: pro/pretty-link-pro.php:1941
851	msgid "PrettyBar Background Color must be an actual RGB Value"
852	msgstr ""
853
854	+ #: pro/pretty-link-pro.php:1944
855	msgid "PrettyBar Text Color must be an actual RGB Value"
856	msgstr ""
857
858	+ #: pro/pretty-link-pro.php:1947
859	msgid "PrettyBar Link Color must be an actual RGB Value"
860	msgstr ""
861
862	+ #: pro/pretty-link-pro.php:1950 pro/pretty-link-pro.php:1953
863	msgid "PrettyBar Hover Color must be an actual RGB Value"
864	msgstr ""
865
866	+ #: pro/pretty-link-pro.php:1956
867	msgid "PrettyBar Title Character Limit must not be blank"
868	msgstr ""
869
870	+ #: pro/pretty-link-pro.php:1959
871	msgid "PrettyBar Description Character Limit must not be blank"
872	msgstr ""
873
874	+ #: pro/pretty-link-pro.php:1962
875	msgid "PrettyBar Link Character Limit must not be blank"
876	msgstr ""
877
878	+ #: pro/pretty-link-pro.php:1965
879	msgid "PrettyBar Title Character Limit must be a number"
880	msgstr ""
881
882	+ #: pro/pretty-link-pro.php:1968
883	msgid "PrettyBar Description Character Limit must be a number"
884	msgstr ""
885
886	+ #: pro/pretty-link-pro.php:1971
887	msgid "PrettyBar Link Character Limit must be a number"
888	msgstr ""
889
890	+ #: pro/pretty-link-pro.php:2094
891	msgid "You are unauthorized to view this resource"
892	msgstr ""
893
894	+ #: pro/pretty-link-pro.php:2124
895	msgid "View QR Code for this link: %s"
896	msgstr ""
897
898	+ #: pro/pretty-link-pro.php:2132
899	msgid "Download QR Code for this link: %s"
900	msgstr ""
901
902	+ #: pro/pretty-link-pro.php:2226
903	msgid "Double Redirection Enabled"
904	msgstr ""
905

988	"automatically download a %sQR Code%s for each individual Pretty Link."
989	msgstr ""
990
991	+ #: pro/classes/views/prli-links/bulk-edit.php:6
992	+ msgid "Advanced Link Options"
993	+ msgstr ""
994	+
995	#: pro/classes/views/prli-links/bulk-edit.php:7
996	+ msgid "Double Redirect"
997	+ msgstr ""
998	+
999	+ #: pro/classes/views/prli-links/bulk-edit.php:12
1000	+ #: pro/classes/models/PrliProUtils.php:276
1001	+ msgid "Google Analytics"
1002	msgstr ""
1003
1004	#: pro/classes/views/prlipro-import-export/form.php:7

1091	msgid "Link Split-Test Report"
1092	msgstr ""
1093
1094	+ #: pro/classes/views/prli-reports/split-test-report.php:12
1095	+ msgid "Back to Links"
1096	+ msgstr ""
1097	+
1098	#: pro/classes/views/prli-reports/edit.php:7
1099	msgid "Edit Link Report"
1100	msgstr ""

1107	msgid "Google Analytics for WordPress"
1108	msgstr ""
1109




1110	#. Plugin Name of the plugin/theme
1111	msgid "Pretty Link Lite"
1112	msgstr ""

js/clippy.swf ADDED Viewed

Binary file

js/jquery.clippy.js ADDED Viewed

	@@ -0,0 +1,85 @@


1	+ /*
2	+ We're using Clippy, found at https://github.com/mojombo/clippy, to make a simple-to-use jQuery plugin for easy copying to the clipboard from the web browser. Some Flash required, YMMV.
3	+ */
4	+ (function($){
5	+ $.fn.clippy = function(opts)
6	+ {
7	+ _opts = { // default options
8	+ 'width': '14',
9	+ 'height': '14',
10	+ 'color': '#ffffff',
11	+ 'clippy_path': 'clippy.swf',
12	+ 'keep_text': false
13	+ };
14	+
15	+ opts = $.extend(_opts, opts);
16	+
17	+ params = { // a lot of similar parameters go on the <param>s as well as the <embed>
18	+ 'movie': opts.clippy_path,
19	+ 'allowScriptAccess': 'always',
20	+ 'quality': 'high',
21	+ 'scale': 'noscale',
22	+ 'bgcolor': opts.color
23	+ };
24	+
25	+ // duplicate, then modify the params we already have for the <embed>
26	+ embed_params = $.extend({}, params, {'width': opts.width, 'height': opts.height});
27	+ embed_params.src = embed_params.movie;
28	+
29	+ delete embed_params.movie;
30	+
31	+ // for every element matched...
32	+ this.each(function(idx, val)
33	+ {
34	+ if (opts.text && opts.text != '')
35	+ {
36	+ text = opts.text;
37	+ }
38	+ else if ($(val).data('text') && $(val).data('text') != '')
39	+ {
40	+ text = $(val).data('text');
41	+ }
42	+ else
43	+ {
44	+ text = $(val).text();
45	+ }
46	+
47	+ // text should be URI-encoded, per https://github.com/mojombo/clippy/pull/9
48	+ text = encodeURIComponent(text);
49	+
50	+ // text is set per element, unlike everything else which is set per selector
51	+ params.FlashVars = 'text=' + text;
52	+ embed_params.FlashVars = 'text=' + text;
53	+
54	+ // these tags are built per the example given at https://github.com/mojombo/clippy in the README
55	+ // create <object>
56	+ dom = $('<object />').attr({
57	+ 'classid': 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000',
58	+ 'width': opts.width,
59	+ 'height': opts.height
60	+ });
61	+
62	+ // create, append <param>s to <object>
63	+ $.each(params, function(idx2, val2)
64	+ {
65	+ dom.append($('<param />').attr({ 'name': idx2, 'value': val2 }));
66	+ });
67	+
68	+ // create, append <embed> to <object>
69	+ embed = $('<embed />').attr(embed_params);
70	+
71	+ // append object to dom
72	+ dom.append(embed);
73	+
74	+ // if we keep the text, we put the button and THEN the text, otherwise, just replace text with the button
75	+ if (opts.keep_text)
76	+ {
77	+ $(val).html(dom).append(decodeURIComponent(text));
78	+ }
79	+ else
80	+ {
81	+ $(val).html(dom);
82	+ }
83	+ });
84	+ };
85	+ })(jQuery);

js/prli-admin-links.js CHANGED Viewed

@@ -1,132 +1,205 @@
             function prli_toggle_link_options() {
-            -
              if(jQuery('#redirect_type').val() == 'metarefresh' || jQuery('#redirect_type').val() == 'javascript') {
                 jQuery('#prli_time_delay').show();
-            -
              }
-            -
              else {
                 jQuery('#prli_time_delay').hide();
-            -
              }
-            -
              if(jQuery('#redirect_type').val() != '307' && jQuery('#redirect_type').val() != '301' && jQuery('#redirect_type').val() != 'pixel') {
                 jQuery('#prli_google_analytics').show();
-            -
              }
-            -
              else {
                 jQuery('#prli_google_analytics').hide();
-            -
              }
-            -
-            -
              if(jQuery('#redirect_type').val() == 'pixel') {
-            -
            	  jQuery('#prli_target_url').hide();
-            -
              }
-            -
              else {
-            -
            	  jQuery('#prli_target_url').show();
-            -
              }
-            -
              if(jQuery('.prlipro-enable-split-test').prop('checked')) {
                 jQuery('.prlipro-split-test-goal-link').show();
-            -
              }
-            -
              else {
                 jQuery('.prlipro-split-test-goal-link').hide();
-            -
              }
+            }
-            -
            jQuery(document).ready(function() {
-            -
               prli_toggle_link_options();
-            -
              jQuery('#redirect_type').change(function() {
                 prli_toggle_link_options();
               });
-            -
              jQuery('#param_forwarding').click(function() {
                 prli_toggle_link_options();
               });
-            -
              jQuery('.prlipro-enable-split-test').click(function() {
                 prli_toggle_link_options();
               });
               // tab swapping
-            -
              jQuery('.nav-tab').click(function() {
                 // tab is already active. don't do anything
-            -
                if( jQuery(this).hasClass( 'nav-tab-active' ) )
                   return false;
-            -
                jQuery('.nav-tab-active').removeClass( 'nav-tab-active' );
-            -
                jQuery(this).addClass( 'nav-tab-active' );
-            -
                if( jQuery(this).attr( 'href' ) == '#options-table' ) {
-            -
                  jQuery('#options-table').show();
-            -
            	  jQuery('#pro-options-table').hide();
-            -
                } else {
-            -
                  jQuery('#options-table').hide();
-            -
            	  jQuery('#pro-options-table').show();
+                }
                 return false;
               });
-            -
              jQuery("#add_group_textbox").keypress(function(e) {
                 // Apparently 13 is the enter key
                 if(e.which == 13) {
-            -
            	    e.preventDefault();
-            -
-            -
            	    var add_new_group_data = {
-            -
                		action: 'add_new_prli_group',
-            -
                		new_group_name: jQuery('#add_group_textbox').val(),
-            -
                		_prli_nonce: jQuery('#add_group_textbox').attr('prli_nonce')
-            -
                	};
-            -
                	jQuery.post(ajaxurl, add_new_group_data, function(data) {
                     if(data['status']=='success') {
-            -
                      jQuery('#group_dropdown').append(data['group_option']);
-            -
                      jQuery('#group_dropdown').val(data['group_id']);
-            -
                      jQuery('#add_group_textbox').val('');
-            -
                      jQuery("#add_group_textbox").blur();
-            -
                      jQuery("#add_group_message").addClass('updated');
-            -
                      jQuery("#add_group_message").text(data['message']);
-            -
                      jQuery("#add_group_message").show();
-            -
                      jQuery("#add_group_message").fadeOut(5000, function(e) {
-            -
                        jQuery("#add_group_message").removeClass('updated');
                       });
+                    }
                     else {
-            -
                      jQuery("#add_group_message").addClass('error');
-            -
                      jQuery("#add_group_message").text(data['message']);
-            -
                      jQuery("#add_group_message").fadeOut(5000, function(e) {
-            -
                        jQuery("#add_group_message").removeClass('error');
                       });
+                    }
-            -
                	});
+                }
               });
-            -
              jQuery(".defaultText").focus(function(srcc)
-            -
              {
-            -
                if (jQuery(this).val() == jQuery(this)[0].title)
-            -
                {
-            -
                  jQuery(this).removeClass("defaultTextActive");
-            -
                  jQuery(this).val("");
+                }
               });
-            -
              jQuery(".defaultText").blur(function()
-            -
              {
-            -
                if (jQuery(this).val() == "")
+                {
-            -
                  jQuery(this).addClass("defaultTextActive");
-            -
                  jQuery(this).val(jQuery(this)[0].title);
+                }
               });
-            -
              jQuery(".defaultText").blur();
-            -
              jQuery(".link_row").hover( function() {
-            -
                jQuery(this).find(".link_actions").show();
-            -
              },
-            -
              function() {
-            -
                jQuery(this).find(".link_actions").hide();
               });
-            -
            });


1	function prli_toggle_link_options() {
2	+ if( jQuery('#redirect_type').val() == 'metarefresh' \|\|
3	+ jQuery('#redirect_type').val() == 'javascript' )
4	jQuery('#prli_time_delay').show();
5	+ else

6	jQuery('#prli_time_delay').hide();

7
8	+ if( jQuery('#redirect_type').val() == 'cloak' \|\|
9	+ jQuery('#redirect_type').val() == 'prettybar' \|\|
10	+ jQuery('#redirect_type').val() == 'metarefresh' \|\|
11	+ jQuery('#redirect_type').val() == 'javascript' )
12	jQuery('#prli_google_analytics').show();
13	+ else

14	jQuery('#prli_google_analytics').hide();
15	+
16	+ if( jQuery('#redirect_type').val() == 'pixel' )
17	+ jQuery('#prli_target_url').hide();
18	+ else
19	+ jQuery('#prli_target_url').show();



20
21	+ if( jQuery('.prlipro-enable-split-test').prop('checked') )
22	jQuery('.prlipro-split-test-goal-link').show();
23	+ else

24	jQuery('.prlipro-split-test-goal-link').hide();

25	}
26
27	+ (function ($) { $(document).ready(function(e){

28	prli_toggle_link_options();
29
30	+ $('#redirect_type').change(function() {
31	prli_toggle_link_options();
32	});
33
34	+ $('#param_forwarding').click(function() {
35	prli_toggle_link_options();
36	});
37
38	+ $('.prlipro-enable-split-test').click(function() {
39	prli_toggle_link_options();
40	});
41
42	// tab swapping
43	+ $('.nav-tab').click(function() {
44
45	// tab is already active. don't do anything
46	+ if( $(this).hasClass( 'nav-tab-active' ) )
47	return false;
48
49	+ $('.nav-tab-active').removeClass( 'nav-tab-active' );
50	+ $(this).addClass( 'nav-tab-active' );
51
52	+ if( $(this).attr( 'href' ) == '#options-table' ) {
53	+ $('#options-table').show();
54	+ $('#pro-options-table').hide();
55	+ }
56	+ else {
57	+ $('#options-table').hide();
58	+ $('#pro-options-table').show();
59	}
60
61	return false;
62	});
63
64	+ $("#add_group_textbox").keypress(function(e) {
65	// Apparently 13 is the enter key
66	if(e.which == 13) {
67	+ e.preventDefault();






68
69	+ var add_new_group_data = {
70	+ action: 'add_new_prli_group',
71	+ new_group_name: $('#add_group_textbox').val(),
72	+ _prli_nonce: $('#add_group_textbox').attr('prli_nonce')
73	+ };
74	+
75	+ $.post(ajaxurl, add_new_group_data, function(data) {
76	if(data['status']=='success') {
77	+ $('#group_dropdown').append(data['group_option']);
78	+ $('#group_dropdown').val(data['group_id']);
79	+ $('#add_group_textbox').val('');
80	+ $("#add_group_textbox").blur();
81	+ $("#add_group_message").addClass('updated');
82	+ $("#add_group_message").text(data['message']);
83	+ $("#add_group_message").show();
84
85	+ $("#add_group_message").fadeOut(5000, function(e) {
86	+ $("#add_group_message").removeClass('updated');
87	});
88	}
89	else {
90	+ $("#add_group_message").addClass('error');
91	+ $("#add_group_message").text(data['message']);
92
93	+ $("#add_group_message").fadeOut(5000, function(e) {
94	+ $("#add_group_message").removeClass('error');
95	});
96	}
97	+ });
98	}
99	});
100
101	+ $(".defaultText").focus(function(srcc) {
102	+ if ($(this).val() == $(this)[0].title) {
103	+ $(this).removeClass("defaultTextActive");
104	+ $(this).val('');


105	}
106	});
107
108	+ $(".defaultText").blur(function() {
109	+ if ($(this).val() == "")

110	{
111	+ $(this).addClass("defaultTextActive");
112	+ $(this).val($(this)[0].title);
113	}
114	});
115
116	+ $(".defaultText").blur();
117
118	+ $(".link_row").hover( function() {
119	+ $(this).find(".link_actions").show();
120	+ },
121	+ function() {
122	+ $(this).find(".link_actions").hide();
123	+ });
124	+
125	+ $('.prli_bulk_action_apply').click( function() {
126	+ if($('.prli_bulk_action').val()=='edit') {
127	+ if($('.link-action-checkbox:checkbox:checked').length > 0)
128	+ $('#bulk-edit').slideDown('slow');
129	+ }
130	+ else if($('.prli_bulk_action').val()=='delete') {
131	+ var confmsg = $(this).attr('data-confmsg');
132	+ if(confirm(confmsg)) {
133	+ var ids = $('.link-action-checkbox:checkbox:checked').map(function() {
134	+ return $(this).attr('data-id');
135	+ }).get().join(',');
136	+ var delurl = $('.prli_bulk_action_apply').attr('data-url') +
137	+ window.location.search +
138	+ '&action=bulk-destroy' +
139	+ '&_wpnonce=' + $('.prli_bulk_action_apply').attr('data-wpnonce') +
140	+ '&ids=' + ids;
141	+
142	+ window.location = delurl;
143	+ }
144	+ }
145	+ });
146	+
147	+ $('.bulk-edit-cancel').click( function() {
148	+ $('#bulk-edit').slideUp('slow');
149	+ });
150	+
151	+ $('.bulk-edit-update').click( function() {
152	+ var ids = $('.link-action-checkbox:checkbox:checked').map(function() {
153	+ return $(this).attr('data-id');
154	+ }).get().join(',');
155	+ var editurl = $('.prli_bulk_action_apply').attr('data-url') +
156	+ window.location.search +
157	+ '&action=bulk-update' +
158	+ '&_wpnonce=' + $('.prli_bulk_action_apply').attr('data-wpnonce') +
159	+ '&ids=' + ids;
160	+
161	+ $('.bulk-edit-select').each( function() {
162	+ if($(this).val() != '##nochange##')
163	+ editurl += '&' + $(this).attr('name') + '=' + encodeURIComponent($(this).val());
164	+ });
165	+
166	+ $('.bulk-edit-text').each( function() {
167	+ editurl += '&' + $(this).attr('name') + '=' + encodeURIComponent($(this).val());
168	+ });
169	+
170	+ window.location = editurl;
171	+ });
172	+
173	+ $('.link-action-checkbox').change( function() {
174	+ if($(this).prop('checked')==false)
175	+ $('.select-all-link-action-checkboxes').prop('checked',false);
176	+
177	+ $('#bulk-titles').html('');
178	+ $('.link-action-checkbox:checkbox:checked').each( function() {
179	+ var nid = $(this).attr('data-id');
180	+ var ntitle = $(this).attr('data-title');
181	+ $('#bulk-titles').append('<div id="ttle'+nid+'"><a data-id="'+nid+'" class="ntdelbutton" title="Remove From Bulk Edit">X</a>"'+ntitle+'"</div>');
182	+ $('.ntdelbutton').click( function() {
183	+ var nid = $(this).attr('data-id');
184	+ $('.link-action-checkbox[data-id='+nid+']').prop('checked',false);
185	+ $('.link-action-checkbox[data-id='+nid+']').trigger('change');
186	+ });
187	+ });
188	+ });
189	+
190	+ // Check all boxes when the select all box is checked, etc
191	+ $('.select-all-link-action-checkboxes').change(function() {
192	+ if($(this).prop('checked'))
193	+ $('.link-action-checkbox').prop('checked',true);
194	+ else
195	+ $('.link-action-checkbox').prop('checked',false);
196	+
197	+ $('.link-action-checkbox').trigger('change');
198	});
199
200	+ // Set the correct colspan for the bulk-edit form
201	+ // This is necessary because in some cases, PLP adds a
202	+ // keyword column to this table -- so it has to be dynamic
203	+ $('.prli-edit-table td.colspanchange').attr('colspan', $('table.prli-edit-table thead tr th').length);
204	+ });
205	+ })(jQuery);

pretty-bar.php DELETED Viewed

@@ -1,243 +0,0 @@
-            -
            <?php
-            -
            $root = dirname(dirname(dirname(dirname(__FILE__))));
-            -
            if (file_exists($root.'/wp-load.php'))
-            -
              require_once($root.'/wp-load.php');
-            -
            else
-            -
              require_once($root.'/wp-config.php');
-            -
-            -
            require_once('prli-config.php');
-            -
            require_once(PRLI_MODELS_PATH . '/models.inc.php');
-            -
-            -
            $link = $prli_link->getOneFromSlug(esc_html($_GET['slug']));
-            -
            $bar_image = $prli_options->prettybar_image_url;
-            -
            $bar_background_image = $prli_options->prettybar_background_image_url;
-            -
            $bar_color = $prli_options->prettybar_color;
-            -
            $bar_text_color = $prli_options->prettybar_text_color;
-            -
            $bar_link_color = $prli_options->prettybar_link_color;
-            -
            $bar_visited_color = $prli_options->prettybar_visited_color;
-            -
            $bar_hover_color = $prli_options->prettybar_hover_color;
-            -
            $bar_show_title = $prli_options->prettybar_show_title;
-            -
            $bar_show_description = $prli_options->prettybar_show_description;
-            -
            $bar_show_share_links = $prli_options->prettybar_show_share_links;
-            -
            $bar_show_target_url_link = $prli_options->prettybar_show_target_url_link;
-            -
            $bar_title_limit = (int)$prli_options->prettybar_title_limit;
-            -
            $bar_desc_limit = (int)$prli_options->prettybar_desc_limit;
-            -
            $bar_link_limit = (int)$prli_options->prettybar_link_limit;
-            -
-            -
            $target_url = esc_html($_GET['url']);
-            -
-            -
            $shortened_title = stripslashes(substr($prli_blogname,0,$bar_title_limit));
-            -
            $shortened_desc  = stripslashes(substr($prli_blogdescription,0,$bar_desc_limit));
-            -
            $shortened_link  = stripslashes(substr($target_url,0,$bar_link_limit));
-            -
-            -
            if(strlen($prli_blogname) > $bar_title_limit)
-            -
              $shortened_title .= "...";
-            -
-            -
            if(strlen($prli_blogdescription) > $bar_desc_limit)
-            -
              $shortened_desc .= "...";
-            -
-            -
            if(strlen($target_url) > $bar_link_limit)
-            -
              $shortened_link .= "...";
-            -
-            -
            ?>
-            -
            <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-            -
               "http://www.w3.org/TR/html4/loose.dtd">
-            -
            <html>
-            -
            <head>
-            -
              <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-            -
              <meta name="description" content="<?php echo stripslashes($link->description); ?>" />
-            -
              <title><?php echo stripslashes($link->name); ?></title>
-            -
            <style type="text/css">
-            -
            html, body {
-            -
              margin: 0px;
-            -
              padding: 0px;
-            -
            <?php
-            -
              if(!empty($bar_background_image) and $bar_background_image)
-            -
              {
-            -
            ?>
-            -
              background-image: url(<?php echo $bar_background_image; ?>);
-            -
              background-repeat: repeat-x;
-            -
            <?php
-            -
              }
-            -
              else
-            -
              {
-            -
            ?>
-            -
              background-color: #<?php echo $bar_color; ?>;
-            -
            <?php
-            -
              }
-            -
            ?>
-            -
              color: #<?php echo $bar_text_color; ?>;
-            -
            }
-            -
-            -
            #prettybar {
-            -
              position: fixed;
-            -
              top: 0;
-            -
              padding: 0px;
-            -
              margin: 0px;
-            -
              width: 100%;
-            -
              height: 65px;
-            -
              border-bottom: 2px solid black;
-            -
            }
-            -
-            -
            .baritems {
-            -
              margin-top: 0px;
-            -
              padding: 0px;
-            -
            }
-            -
-            -
            .blog-title {
-            -
              padding-top: 5px;
-            -
              margin: 0px;
-            -
              width: 200px;
-            -
            }
-            -
-            -
            h1,h2,h3,h4,p {
-            -
              font-family: Arial;
-            -
              padding: 0px;
-            -
              margin: 0px;
-            -
            }
-            -
-            -
            a {
-            -
              color: #<?php echo $bar_link_color; ?>;
-            -
              text-decoration: none;
-            -
            }
-            -
-            -
            a:visited {
-            -
              color: #<?php echo $bar_visited_color; ?>;
-            -
            }
-            -
-            -
            a:hover {
-            -
              color: #<?php echo $bar_hover_color; ?>;
-            -
            }
-            -
-            -
            .map {
-            -
              background-image: url(<?php echo PRLI_IMAGES_URL; ?>/bar_map.png);
-            -
              background-repeat: no-repeat;
-            -
            }
-            -
-            -
            .closebutton {
-            -
              background-position: -200px 0;
-            -
              height: 20px;
-            -
              width: 20px;
-            -
              overflow: hidden;
-            -
              /*text-indent: -999em;*/
-            -
              cursor: pointer;
-            -
              text-align: right;
-            -
              float: right;
-            -
            }
-            -
-            -
            .pb-cell {
-            -
              white-space: nowrap;
-            -
              overflow: hidden;
-            -
            }
-            -
-            -
            .right_container {
-            -
              float: right;
-            -
              margin-top: 8px;
-            -
              margin-right: 8px;
-            -
              text-align: right;
-            -
            }
-            -
-            -
            .closebutton:hover {
-            -
              background-position: -200px -30px;
-            -
            }
-            -
-            -
            .closebutton:active {
-            -
              background-position: -200px -60px;
-            -
            }
-            -
-            -
            ul.baritems li {
-            -
              display: inline;
-            -
              /*float: left;*/
-            -
              /*padding-left: 15px;*/
-            -
            }
-            -
-            -
            .retweet {
-            -
              padding-top: 5px;
-            -
              padding-left: 15px;
-            -
              line-height: 26px;
-            -
              width: 200px;
-            -
            }
-            -
-            -
            .blog-image {
-            -
              padding-top: 7px;
-            -
              padding-left: 5px;
-            -
              padding-right: 5px;
-            -
              width: 50px;
-            -
            }
-            -
-            -
            .small-text {
-            -
              font-size: 10px;
-            -
            }
-            -
-            -
            .powered-by {
-            -
              padding-top: 15px;
-            -
              text-align: right;
-            -
            }
-            -
-            -
            /*
-            -
            td {
-            -
              border: 1px solid black;
-            -
            }
-            -
            */
-            -
            </style>
-            -
            </head>
-            -
            <body>
-            -
              <div id="prettybar">
-            -
                <table width="100%" height="65px">
-            -
                  <tr>
-            -
                  <td class="blog-image" valign="top">
-            -
                    <div class="pb-cell">
-            -
                    <a href="<?php echo $prli_blogurl; ?>" target="_top"><img src="<?php echo $bar_image; ?>" width="48px" height="48px" border="0"/></a></div>
-            -
                  </td>
-            -
                  <td class="blog-title" valign="top">
-            -
                    <div class="pb-cell">
-            -
                      <h2>
-            -
                      <?php if( $bar_show_title ) { ?>
-            -
                      <a href="<?php echo $prli_blogurl; ?>" title="<?php echo $shortened_title; ?>" target="_top"><?php echo $shortened_title; ?></a>
-            -
                      <?php } else echo "&nbsp;"; ?>
-            -
                      </h2>
-            -
                      <?php if( $bar_show_description ) { ?>
-            -
                      <p title="<?php echo $prli_blogdescription; ?>"><?php echo $shortened_desc; ?></p>
-            -
                      <?php } else echo "&nbsp;"; ?>
-            -
                    </div>
-            -
                  </td>
-            -
                  <td class="retweet" valign="top">
-            -
                    <div class="pb-cell">
-            -
                      <h4>
-            -
                      <?php if( $bar_show_target_url_link ) { ?>
-            -
                        <a href="<?php echo $target_url; ?>" title="You're viewing: <?php echo $target_url; ?>" target="_top">Viewing: <?php echo $shortened_link; ?></a>
-            -
                      <?php } else echo "&nbsp;"; ?>
-            -
                      </h4>
-            -
                      <h4>
-            -
                      <?php if( $bar_show_share_links ) { ?>
-            -
                        <a href="http://twitter.com/home?status=<?php echo $prli_blogurl . PrliUtils::get_permalink_pre_slug_uri() . esc_html($_GET['slug']); ?>" target="_top">Share on Twitter</a>
-            -
                      <?php } else echo "&nbsp;"; ?>
-            -
                      </h4>
-            -
                    </div>
-            -
                  </td>
-            -
                  <td valign="top">
-            -
                    <div class="pb-cell right_container">
-            -
                      <table width="100%" cellpadding="0" cellspacing="0" style="padding: 0px; margin: 0px;">
-            -
                        <tr>
-            -
                          <td>
-            -
                            <p class="map closebutton"><a href="<?php echo $target_url; ?>" target="_top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a></p>
-            -
                          </td>
-            -
                        <tr>
-            -
                          <td>
-            -
                          <?php
-            -
                            $link_html =<<<LINKHTML
-            -
            <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>
-            -
            LINKHTML;
-            -
                            echo apply_filters('prli-display-attrib-link',$link_html);
-            -
                          ?>
-            -
                          </td>
-            -
                        </tr>
-            -
                      </table>
-            -
                    </div>
-            -
                  </td>
-            -
                  </tr>
-            -
                </table>
-            -
              </div>
-            -
            </div>
-            -
            </body>
-            -
            </html>

pretty-link.php CHANGED Viewed

	@@ -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.7
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.9
7	Author: Caseproof
8	Author URI: http://caseproof.com
9	Copyright: 2004-2012, Caseproof, LLC

prli-bookmarklet.php CHANGED Viewed

	@@ -30,7 +30,15 @@ if(isset($_GET['k']))
30	<html>
31	<head>
32	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
33	- <title>Here's your Pretty Link</title>








34	<style type="text/css">
35	body {
36	font-family: Arial;
	@@ -57,12 +65,15 @@ if(isset($_GET['k']))
57	text-decoration: none;
58	color: blue;
59	}



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>
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>
	@@ -90,4 +101,4 @@ else
90	{
91	wp_redirect($prli_blogurl);
92	exit;
93	- }


30	<html>
31	<head>
32	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
33	+ <title><?php echo __('Here\'s your Pretty Link', 'pretty-link'); ?></title>
34	+ <script type='text/javascript' src='<?php echo site_url('/wp-includes/js/jquery/jquery.js'); ?>'></script>
35	+ <script type='text/javascript' src='<?php echo PRLI_JS_URL . '/jquery.clippy.js'; ?>'></script>
36	+ <script type="text/javascript">
37	+ jQuery(document).ready(function() {
38	+ /* Set up the clippies! */
39	+ jQuery('.clippy').clippy({clippy_path: '<?php echo PRLI_JS_URL; ?>/clippy.swf', width: '100px'});
40	+ });
41	+ </script>
42	<style type="text/css">
43	body {
44	font-family: Arial;

65	text-decoration: none;
66	color: blue;
67	}
68	+ .clippy {
69	+ padding-left: 75px;
70	+ }
71	</style>
72	</head>
73	<body>
74	<p><img src="<?php echo PRLI_IMAGES_URL; ?>/prettylink_logo.jpg" /></p>
75	<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>
76	+ <h2><a href="<?php echo $pretty_link; ?>"><?php echo $pretty_link; ?></a><br/><span class="clippy"><?php echo $pretty_link; ?></span></h2>
77	<p>send this link to:<br/>
78	<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>
79	<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>

101	{
102	wp_redirect($prli_blogurl);
103	exit;
104	+ }

prli-links.php DELETED Viewed

@@ -1,238 +0,0 @@
-            -
            <?php
-            -
            if(!defined('ABSPATH'))
-            -
              die('You are not allowed to call this page directly.');
-            -
-            -
            require_once 'prli-config.php';
-            -
            require_once(PRLI_MODELS_PATH . '/models.inc.php');
-            -
-            -
            $params = $prli_link->get_params_array();
-            -
-            -
            if($params['action'] == 'list')
-            -
            {
-            -
              if(!empty($params['message']))
-            -
                $prli_message = $params['message'];
-            -
              else if(empty($params['group']))
-            -
                $prli_message = prli_get_main_message();
-            -
              else
-            -
                $prli_message = "Links in Group: " . $wpdb->get_var("SELECT name FROM " . $prli_group->table_name . " WHERE id=".$params['group']);
-            -
              if($params['regenerate'] == 'true')
-            -
              {
-            -
                $wp_rewrite->flush_rules();
-            -
                $prli_message = "Your Pretty Links were Successfully Regenerated";
-            -
              }
-            -
-            -
              prli_display_links_list($params, $prli_message);
-            -
            }
-            -
            else if($params['action'] == 'list-form')
-            -
            {
-            -
              if(apply_filters('prli-link-list-process-form', true))
-            -
                prli_display_links_list($params, prli_get_main_message());
-            -
            }
-            -
            else if($params['action'] == 'quick-create')
-            -
            {
-            -
              $errors = $prli_link->validate($_POST);
-            -
-            -
              if( count($errors) > 0 )
-            -
              {
-            -
                $groups = $prli_group->getAll('',' ORDER BY name');
-            -
                $values = setup_new_vars($groups);
-            -
                require_once 'classes/views/prli-links/new.php';
-            -
              }
-            -
              else
-            -
              {
-            -
                $_POST['param_forwarding'] = 'off';
-            -
                $_POST['param_struct'] = '';
-            -
                $_POST['name'] = '';
-            -
                $_POST['description'] = '';
-            -
                if( $prli_options->link_track_me )
-            -
                  $_POST['track_me'] = 'on';
-            -
                if( $prli_options->link_nofollow )
-            -
                  $_POST['nofollow'] = 'on';
-            -
-            -
                $_POST['redirect_type'] = $prli_options->link_redirect_type;
-            -
-            -
                $record = $prli_link->create( $_POST );
-            -
-            -
                $prli_message = "Your Pretty Link was Successfully Created";
-            -
                prli_display_links_list($params, $prli_message, '', 1);
-            -
              }
-            -
            }
-            -
            else if($params['action'] == 'create')
-            -
            {
-            -
              $errors = $prli_link->validate($_POST);
-            -
-            -
              $errors = apply_filters( "prli_validate_link", $errors );
-            -
-            -
              if( count($errors) > 0 )
-            -
              {
-            -
                $groups = $prli_group->getAll('',' ORDER BY name');
-            -
                $values = setup_new_vars($groups);
-            -
                require_once 'classes/views/prli-links/new.php';
-            -
              }
-            -
              else
-            -
              {
-            -
                $record = $prli_link->create( $_POST );
-            -
-            -
                do_action( "prli_update_link", $record );
-            -
-            -
                $prli_message = "Your Pretty Link was Successfully Created";
-            -
                prli_display_links_list($params, $prli_message, '', 1);
-            -
              }
-            -
            }
-            -
            else if($params['action'] == 'edit')
-            -
            {
-            -
              $groups = $prli_group->getAll('',' ORDER BY name');
-            -
-            -
              $record = $prli_link->getOne( $params['id'] );
-            -
              $values = setup_edit_vars($groups,$record);
-            -
              $id = $params['id'];
-            -
              require_once 'classes/views/prli-links/edit.php';
-            -
            }
-            -
            else if($params['action'] == 'bulk-update')
-            -
            {
-            -
              if(apply_filters('prli-bulk-link-update', true))
-            -
              {
-            -
                $prli_message = "Your Pretty Links were Successfully Updated";
-            -
                prli_display_links_list($params, $prli_message, '', 1);
-            -
              }
-            -
            }
-            -
            else if($params['action'] == 'update')
-            -
            {
-            -
              $errors = $prli_link->validate($_POST);
-            -
              $id = $_POST['id'];
-            -
-            -
              $errors = apply_filters( "prli_validate_link", $errors );
-            -
-            -
              if( count($errors) > 0 )
-            -
              {
-            -
                $groups = $prli_group->getAll('',' ORDER BY name');
-            -
                $record = $prli_link->getOne( $params['id'] );
-            -
                $values = setup_edit_vars($groups,$record);
-            -
                require_once 'classes/views/prli-links/edit.php';
-            -
              }
-            -
              else
-            -
              {
-            -
                $record = $prli_link->update( $_POST['id'], $_POST );
-            -
-            -
                do_action( "prli_update_link", $id );
-            -
-            -
                $prli_message = "Your Pretty Link was Successfully Updated";
-            -
                prli_display_links_list($params, $prli_message, '', 1);
-            -
              }
-            -
            }
-            -
            else if($params['action'] == 'reset')
-            -
            {
-            -
              $prli_link->reset( $params['id'] );
-            -
              $prli_message = "Your Pretty Link was Successfully Reset";
-            -
              prli_display_links_list($params, $prli_message, '', 1);
-            -
            }
-            -
            else if($params['action'] == 'destroy')
-            -
            {
-            -
              $prli_link->destroy( $params['id'] );
-            -
              $prli_message = "Your Pretty Link was Successfully Destroyed";
-            -
              prli_display_links_list($params, $prli_message, '', 1);
-            -
            }
-            -
-            -
            // Helpers
-            -
            function prli_display_links_list($params, $prli_message, $page_params_ov = false, $current_page_ov = false)
-            -
            {
-            -
              global $wpdb, $prli_utils, $prli_click, $prli_group, $prli_link, $page_size, $prli_options;
-            -
-            -
              $controller_file = basename(__FILE__);
-            -
-            -
              $where_clause = '';
-            -
              $page_params  = '';
-            -
-            -
              if(!empty($params['group']))
-            -
              {
-            -
                $where_clause = " group_id=" . $params['group'];
-            -
                $page_params = "&group=" . $params['group'];
-            -
              }
-            -
-            -
              $link_vars = prli_get_link_sort_vars($params, $where_clause);
-            -
-            -
              if($current_page_ov)
-            -
                $current_page = $current_page_ov;
-            -
              else
-            -
                $current_page = $params['paged'];
-            -
-            -
              if($page_params_ov)
-            -
                $page_params .= $page_params_ov;
-            -
              else
-            -
                $page_params .= $link_vars['page_params'];
-            -
-            -
              $sort_str = $link_vars['sort_str'];
-            -
              $sdir_str = $link_vars['sdir_str'];
-            -
              $search_str = $link_vars['search_str'];
-            -
-            -
              $record_count = $prli_link->getRecordCount($link_vars['where_clause']);
-            -
              $page_count = $prli_link->getPageCount($page_size,$link_vars['where_clause']);
-            -
              $links = $prli_link->getPage($current_page,$page_size,$link_vars['where_clause'],$link_vars['order_by']);
-            -
              $page_last_record = $prli_utils->getLastRecordNum($record_count,$current_page,$page_size);
-            -
              $page_first_record = $prli_utils->getFirstRecordNum($record_count,$current_page,$page_size);
-            -
-            -
              require_once 'classes/views/prli-links/list.php';
-            -
            }
-            -
-            -
            function prli_get_link_sort_vars($params,$where_clause = '')
-            -
            {
-            -
              $order_by = '';
-            -
              $page_params = '';
-            -
-            -
              // These will have to work with both get and post
-            -
              $sort_str = $params['sort'];
-            -
              $sdir_str = $params['sdir'];
-            -
              $search_str = $params['search'];
-            -
-            -
              // Insert search string
-            -
              if(!empty($search_str))
-            -
              {
-            -
                $search_params = explode(" ", $search_str);
-            -
-            -
                foreach($search_params as $search_param)
-            -
                {
-            -
                  if(!empty($where_clause))
-            -
                    $where_clause .= " AND";
-            -
-            -
                  $where_clause .= " (li.name like '%$search_param%' OR li.slug like '%$search_param%' OR li.url like '%$search_param%' OR li.created_at like '%$search_param%')";
-            -
                }
-            -
-            -
                $page_params .="&search=$search_str";
-            -
              }
-            -
-            -
              // make sure page params stay correct
-            -
              if(!empty($sort_str))
-            -
                $page_params .="&sort=$sort_str";
-            -
-            -
              if(!empty($sdir_str))
-            -
                $page_params .= "&sdir=$sdir_str";
-            -
-            -
              // Add order by clause
-            -
              switch($sort_str)
-            -
              {
-            -
                case "name":
-            -
                case "clicks":
-            -
                case "group_name":
-            -
                case "slug":
-            -
                  $order_by .= " ORDER BY $sort_str";
-            -
                  break;
-            -
                default:
-            -
                  $order_by .= " ORDER BY created_at";
-            -
              }
-            -
-            -
              // Toggle ascending / descending
-            -
              if((empty($sort_str) and empty($sdir_str)) or $sdir_str == 'desc')
-            -
              {
-            -
                $order_by .= ' DESC';
-            -
                $sdir_str = 'desc';
-            -
              }
-            -
              else
-            -
                $sdir_str = 'asc';
-            -
-            -
              return array('order_by' => $order_by,
-            -
                           'sort_str' => $sort_str,
-            -
                           'sdir_str' => $sdir_str,
-            -
                           'search_str' => $search_str,
-            -
                           'where_clause' => $where_clause,
-            -
                           'page_params' => $page_params);
-            -
            }

prli-main.php CHANGED Viewed

	@@ -36,6 +36,8 @@ function prli_menu()
36
37	add_action('admin_print_styles-' . $prli_menu_hook, 'PrliLinksController::load_styles');
38	add_action('admin_print_styles-' . $prli_add_links_menu_hook, 'PrliLinksController::load_styles');


39	}
40
41	/* Add header to prli-options page */


36
37	add_action('admin_print_styles-' . $prli_menu_hook, 'PrliLinksController::load_styles');
38	add_action('admin_print_styles-' . $prli_add_links_menu_hook, 'PrliLinksController::load_styles');
39	+
40	+ add_action('admin_head-' . $prli_menu_hook, 'PrliLinksController::load_dynamic_scripts', 100);
41	}
42
43	/* Add header to prli-options page */

readme.txt CHANGED Viewed

	@@ -4,9 +4,9 @@ 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.7
8
9	- Shrink, beautify, track, manage and share any URL on or off of your WordPress website. Create links that look ~~however~~ you want using your own domain name!
10
11	== Description ==
12
	@@ -66,6 +66,14 @@ http://blairwilliams.com/w7a
66
67	== Changelog ==
68








69	= 1.5.7 =
70	* Feature Re-factored the add/edit link screen to be more intuitive and accurate
71	* Feature Added the ability to add a new group from the Add / Edit Link screen
	@@ -344,6 +352,9 @@ http://blairwilliams.com/w7a
344
345	== Upgrade Notice ==
346



347	= 1.5.7 =
348	* This is a major new release that fixes numerous bugs and adds several new features for Lite and Pro users. Everyone should upgrade.
349


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.9
8
9	+ Shrink, beautify, track, manage and share any URL on or off of your WordPress website. Create links that look how you want using your own domain name!
10
11	== Description ==
12

66
67	== Changelog ==
68
69	+ = 1.5.9 =
70	+ * Feature Added Bulk Actions for Pretty Link Management page
71	+ * Feature Added the ability to change the number of rows displayed in the Pretty Link Management page (no longer limited to 10)
72	+ * Feature Added 1-click copy for pretty links in the Pretty Link management page and bookmarklet
73	+ * Feature Added the ability to click on the referrer links in the pretty link hits table
74	+ * Fix Fixed the permission issue when clicking on some links in the pretty link admin interface
75	+ * Fix Fixed the timestamp issue in hits that some people were experiencing
76	+
77	= 1.5.7 =
78	* Feature Re-factored the add/edit link screen to be more intuitive and accurate
79	* Feature Added the ability to add a new group from the Add / Edit Link screen

352
353	== Upgrade Notice ==
354
355	+ = 1.5.9 =
356	+ * This adds some very useful features for link managment in Lite & Pro ... everyone should upgrade.
357	+
358	= 1.5.7 =
359	* This is a major new release that fixes numerous bugs and adds several new features for Lite and Pro users. Everyone should upgrade.
360

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

Version Description

Release Info

Code changes from version 1.5.7 to 1.5.9