diff --git a/e107_plugins/log/stats.php b/e107_plugins/log/stats.php index c10a4530c..67fe9654d 100644 --- a/e107_plugins/log/stats.php +++ b/e107_plugins/log/stats.php @@ -1135,7 +1135,6 @@ class siteStats $var = array('TOTAL' => number_format($total), ); $text .= $tp->simpleParse($template['end'], $var); - $text .= ""; } else { @@ -1235,17 +1234,12 @@ class siteStats } $total = array_sum($osArray); - $text .= " - \n - - - \n - - \n - - - \n"; + $var = array('START_CAPTION' => $this->browser_headings[$act].$pars['hdg_extra'], + 'START_TITLE' => ($this -> order ? "sort by total" : "sort alphabetically"), + 'START_URL' => e_SELF."?".($show_version ? "4" : "15").($this -> order ? "" : ".1" ), + ); + $text .= $tp->simpleParse($template['start'], $var); + if (count($osArray)) { @@ -1265,19 +1259,22 @@ class siteStats elseif(stristr($key, "Android")) { $image = "android.png"; } $percentage = round(($info/$total) * 100, 2); - $text .= " - ". - ($entries == 1 ? "" : "")." - - \n"; + $var = array( + 'ITEM_IMAGE' => ($image ? " " : ""), + 'ITEM_KEY' => $key, + 'ITEM_BAR' => $this -> bar($percentage, $info), + 'ITEM_PERC'=> $percentage, + ); + $text .= $tp->simpleParse($template['item'], $var); } - $text .= "\n"; + $var = array('TOTAL' => number_format($total), + ); + $text .= $tp->simpleParse($template['end'], $var); } else { - $text .= "\n"; + $text .= $tp->simpleParse($template['nostatistic']); } - $text .= "
".$this->browser_headings[$act].$pars['hdg_extra']."
- ".ADSTAT_L27."".ADSTAT_L21."%
".($image ? " " : "").$key."".$this -> bar($percentage, $info)."".$this -> bar($percentage, $info)."".$percentage."%
".ADSTAT_L21."{$total} 
".ADSTAT_L25."

"; } return $text; } diff --git a/e107_plugins/log/templates/log_template.php b/e107_plugins/log/templates/log_template.php index 89075b735..1d38dc939 100644 --- a/e107_plugins/log/templates/log_template.php +++ b/e107_plugins/log/templates/log_template.php @@ -107,9 +107,28 @@ $LOG_TEMPLATE['browsers']['end'] = " $LOG_TEMPLATE['browsers']['nostatistic'] = "".ADSTAT_L25."
"; -$LOG_TEMPLATE['oses']['start'] = ""; -$LOG_TEMPLATE['oses']['item'] = ""; -$LOG_TEMPLATE['oses']['end'] = ""; +$LOG_TEMPLATE['oses']['start'] = " +
+\n + + + \n + + \n + + +"; +$LOG_TEMPLATE['oses']['item'] = $LOG_TEMPLATE['browsers']['item']; +$LOG_TEMPLATE['oses']['end'] = " + + + + + +
{START_CAPTION}
+ ".ADSTAT_L27."".ADSTAT_L21."%
".ADSTAT_L21."{TOTAL} 

"; +$LOG_TEMPLATE['oses']['nostatistic'] = $LOG_TEMPLATE['browsers']['nostatistic']; + $LOG_TEMPLATE['domains']['start'] = ""; $LOG_TEMPLATE['domains']['item'] = "";