diff -u -r -Bb wp-slimstat.orig/view/panel1.php wp-slimstat/view/panel1.php
--- wp-slimstat.orig/view/panel1.php Thu Jun 14 20:05:11 2012
+++ wp-slimstat/view/panel1.php Fri Jun 15 02:19:19 2012
@@ -155,7 +155,7 @@
}
else
echo __('Direct visit to','wp-slimstat-view');
- echo ' '.substr($results[$i]['resource'], 0, 40)."$searchterms_span</p>";
+ echo ' '.substr(urldecode($results[$i]['resource']), 0, 40)."$searchterms_span</p>";
} ?>
</div>
</div>
@@ -213,7 +213,7 @@
if ($count_results == 0) echo '<p class="nodata">'.__('No data to display','wp-slimstat-view').'</p>';
for($i=0;$i<$count_results;$i++){
- $strings = trim_value($results[$i]['resource'], 60);
+ $strings = trim_value(urldecode($results[$i]['resource']), 60);
$extra_info = "title='".__('Last','wp-slimstat-view').': '.date_i18n($wp_slimstat_view->date_time_format, $results[$i]['dt']).', '.(!empty($results[$i]['user'])?$results[$i]['user'].'@':'').long2ip($results[$i]['ip']).(!empty($results[$i]['other_ip'])?' / '.long2ip($results[$i]['other_ip']):'')."'";
$clean_string = urlencode($results[$i]['resource']);
$element_title = sprintf(__('Open %s in a new window','wp-slimstat-view'), $results[$i]['resource']);
diff -u -r -Bb wp-slimstat.orig/view/panel4.php wp-slimstat/view/panel4.php
--- wp-slimstat.orig/view/panel4.php Thu Jun 14 20:05:11 2012
+++ wp-slimstat/view/panel4.php Thu Jun 14 22:38:00 2012
@@ -48,7 +48,7 @@
<?php break; case 'p4_02': ?>
<div class="postbox <?php echo $wp_locale->text_direction ?>" id="p4_02">
- <div class="more"><a href="<?php echo $admin_url ?>?page=wp-slimstat&slimpanel=5&ftu=get_recent_resources<?php echo $wp_slimstat_view->filters_query ?>"><?php _e('More','wp-slimstat-view') ?></a></div>
+ <div class="more"><a href="<?php echo $admin_url ?>?page=wp-slimstat&slimpanel=5&ftu=get_recent_resources=<?php echo $wp_slimstat_view->filters_query ?>"><?php _e('More','wp-slimstat-view') ?></a></div>
<h3 class="hndle"><?php _e('Recent Contents', "wp-slimstat-view"); ?></h3>
<div class="container slimstat-tooltips"><?php
$results = $wp_slimstat_view->get_recent('t1.resource', 't1.ip, t1.user');
@@ -56,7 +56,7 @@
if ($count_results == 0) echo '<p class="nodata">'.__('No data to display','wp-slimstat-view').'</p>';
for($i=0;$i<$count_results;$i++){
- $strings = trim_value($results[$i]['resource'], 40);
+ $strings = trim_value(urldecode($results[$i]['resource']), 40);
$extra_info = "title='".date_i18n($wp_slimstat_view->date_time_format, $results[$i]['dt']).', '.(empty($results[$i]['user'])?long2ip($results[$i]['ip']):$results[$i]['user'])."'";
$clean_string = urlencode($results[$i]['resource']);
if (!isset($wp_slimstat_view->filters_parsed['resource'][1]) || $wp_slimstat_view->filters_parsed['resource'][1]!='equals')
@@ -78,7 +78,7 @@
if ($count_results == 0) echo '<p class="nodata">'.__('No data to display','wp-slimstat-view').'</p>';
for($i=0;$i<$count_results;$i++){
- $strings = trim_value($results[$i]['resource'], 30);
+ $strings = trim_value(urldecode($results[$i]['resource']), 30);
$element_title = sprintf(__('Open %s in a new window','wp-slimstat-view'), $results[$i]['resource']);
$element_url = $wp_slimstat_view->blog_domain.$results[$i]['resource'];
$extra_info = "title='".date_i18n($wp_slimstat_view->date_time_format, $results[$i]['dt']).', '.(empty($results[$i]['user'])?long2ip($results[$i]['ip']):$results[$i]['user'])."'";
@@ -231,7 +231,7 @@
if ($count_results == 0) echo '<p class="nodata">'.__('No data to display','wp-slimstat-view').'</p>';
for($i=0;$i<$count_results;$i++){
- $strings = trim_value($results[$i]['resource'], 36);
+ $strings = trim_value(urldecode($results[$i]['resource']), 36);
$results[$i]['count'] = number_format($results[$i]['count'], 0, $wp_slimstat_view->decimal_separator, $wp_slimstat_view->thousand_separator);
$extra_info = "title='".__('Hits','wp-slimstat-view').": {$results[$i]['count']}'";
$clean_string = urlencode($results[$i]['resource']);
diff -u -r -Bb wp-slimstat.orig/view/panel5.php wp-slimstat/view/panel5.php
--- wp-slimstat.orig/view/panel5.php Thu Jun 14 20:05:11 2012
+++ wp-slimstat/view/panel5.php Fri Jun 15 02:46:03 2012
@@ -192,7 +192,7 @@
if (empty($results[$i]['resource']))
$results[$i]['resource'] = __('Local search page','wp-slimstat-view');
- echo ' '.substr($results[$i]['resource'], 0, 70);
+ echo ' '.substr(urldecode($results[$i]['resource']), 0, 70);
if (!empty($searchterms['text'])) echo " <span{$searchterms['tooltip']} class='highlight-term'>{$searchterms['text']}</span>";
break;
case 'get_recent_searchterms':
@@ -205,7 +205,12 @@
$count_top = number_format($results[$i]['count'], 0, $wp_slimstat_view->decimal_separator, $wp_slimstat_view->thousand_separator);
$percentage = number_format(sprintf("%01.2f", (100*$results[$i]['count']/$count_raw_data)), 2, $wp_slimstat_view->decimal_separator, $wp_slimstat_view->thousand_separator);
$resource = trim_value($results[$i]['resource'], 120);
- echo "<span class='element-title'{$resource['tooltip']}>{$resource['text']}</span><span>$percentage%</span><span>$count_top</span>";
+ //echo "<span class='element-title'{$resource['tooltip']}>" . urldecode($resource['text']) . "</span><span>$percentage%</span><span>$count_top</span>";
+ //
+ $clean_string = urlencode($results[$i]['resource']);
+ if (!isset($wp_slimstat_view->filters_parsed['resource'][1]) || $wp_slimstat_view->filters_parsed['resource'][1]!='equals')
+ echo "<span class='element-title'{$resource['tooltip']}><a{$strings['tooltip']} class='activate-filter' href='$admin_url?page=wp-slimstat&slimpanel=1$wp_slimstat_view->filters_query&resource=$clean_string'>" . urldecode($resource['text']) . "</a></span><span>$percentage%</span><span>$count_top</span>";
+ //
break;
case 'get_top_searchterms':
$count_top = number_format($results[$i]['count'], 0, $wp_slimstat_view->decimal_separator, $wp_slimstat_view->thousand_separator);
@@ -221,7 +226,7 @@
break;
default:
if (empty($results[$i]['resource'])) $results[$i]['resource'] = __('Local search results page','wp-slimstat-view');
- $resource = trim_value($results[$i]['resource'], 120);
+ $resource = trim_value(urldecode($results[$i]['resource']), 120);
$searchterms = trim_value($results[$i]['searchterms'], 70);
$domain = trim_value($results[$i]['domain'], 50);
$referer = trim_value($results[$i]['referer'], 200);
diff -u -r -Bb wp-slimstat.orig/view/wp-slimstat-view.php wp-slimstat/view/wp-slimstat-view.php
--- wp-slimstat.orig/view/wp-slimstat-view.php Thu Jun 14 20:05:11 2012
+++ wp-slimstat/view/wp-slimstat-view.php Thu Jun 14 22:20:00 2012
@@ -104,10 +104,10 @@
$f_operator = empty($_GET[$a_filter_label.'-op'])?'equals':$_GET[$a_filter_label.'-op'];
}
else continue;
- $f_value = ($a_filter_details[0] == 'integer')?abs(intval($f_value)):$wpdb->escape(str_replace('\\', '', htmlspecialchars_decode(urldecode($f_value))));
+ $f_value = ($a_filter_details[0] == 'integer')?abs(intval($f_value)):$wpdb->escape(str_replace('\\', '', htmlspecialchars_decode($f_value)));
$f_operator = $wpdb->escape(htmlspecialchars(str_replace('\\', '', $f_operator)));
$this->filters_parsed[$a_filter_label] = array($f_value, $f_operator, $a_filter_details[1]);
- $this->filters_query .= "&$a_filter_label=$f_value&$a_filter_label-op=$f_operator";
+ $this->filters_query .= "&$a_filter_label=" . urlencode($f_value) . "&$a_filter_label-op=$f_operator";
}
// Date filter
diff -u -r -Bb wp-slimstat.orig/wp-slimstat-dashboard.php wp-slimstat/wp-slimstat-dashboard.php
--- wp-slimstat.orig/wp-slimstat-dashboard.php Thu Jun 14 20:05:14 2012
+++ wp-slimstat/wp-slimstat-dashboard.php Thu Jun 14 23:54:30 2012
@@ -84,7 +84,7 @@
if ($count_results == 0) '<p class="slimstat-row nodata">'.__('No data to display','wp-slimstat-view').'</p>';
for($i=0;$i<$count_results;$i++){
- $strings = $this->trim_value($results[$i]['resource'], 60);
+ $strings = $this->trim_value(urldecode($results[$i]['resource']), 60);
$last_element = ($i == $count_results-1)?' class="slimstat-row last"':' class="slimstat-row"';
$extra_info = "title='".__('Last','wp-slimstat-view').': '.date_i18n($this->date_time_format, $results[$i]['dt']).', '.(empty($results[$i]['user'])?long2ip($results[$i]['ip']):$results[$i]['user'])."'";
$clean_string = urlencode($results[$i]['resource']);
@@ -135,7 +135,7 @@
echo "<a target='_blank' title='$element_title' href='http://{$results[$i]['domain']}{$results[$i]['referer']}'><img src='".plugins_url('/images/url.gif', __FILE__)."' /></a> {$results[$i]['domain']} »";
else
echo __('Direct visit to','wp-slimstat-view');
- echo ' '.substr($results[$i]['resource'], 0, 40)."$searchterms_span</p>";
+ echo ' '.substr(urldecode($results[$i]['resource']), 0, 40)."$searchterms_span</p>";
}
}
// end show_spy_view