mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Styling fixes. Debug timer totals fix.

Browse Source
This commit is contained in:
Cameron
2016-12-12 08:11:41 -08:00
parent 13fa0c4e9d
commit 366d3fe5cf
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
e107_handlers/db_debug_class.php
View File

@@ -412,11 +412,30 @@ class e107_db_debug {
$aSum['%Time']=$totTime ? number_format(100.0 * ($aSum['Time'] / $totTime), 0) : 0; $aSum['%Time']=$totTime ? number_format(100.0 * ($aSum['Time'] / $totTime), 0) : 0;
$aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0; $aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0;
$aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0; $aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0;
$aSum['Time']=number_format($aSum['Time']*1000.0, 1); $aSum['Time']=number_format($aSum['Time'] * 1000.0, 1);
$aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1); $aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1);
$text .= "<tr><td class='fcaption'><b>".implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aSum)."</b>&nbsp;</td><td class='fcaption'>&nbsp;</td></tr>\n";
$text .= "\n</table><br />\n"; $text .= "<tr>
<td class='fcaption'>&nbsp;</td>
<td class='fcaption' style='text-align:right'><b>Total</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['%Time']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['%DB Time']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['%DB Count']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['Time']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['DB Time']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['DB Count']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$tMarker['Memory']."</b></td>
<td class='fcaption' style='text-align:right'><b>".$tMarker['OB Lev']."</b></td>
</tr>
";
// $text .= "<tr><td class='fcaption'><b>".implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aSum)."</b>&nbsp;</td><td class='fcaption'>&nbsp;</td></tr>\n";
$text .= "\n</table><br />\n";
// //
// Stats by Table // Stats by Table
@@ -461,7 +480,7 @@ class e107_db_debug {
$aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0; $aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0;
$aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0; $aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0;
$aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1); $aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1);
$text .= "<tr><td class='fcaption'>".implode("&nbsp;</td><td class='fcaption' style='text-align:right'>", array_values($aSum))."&nbsp;</td></tr>\n"; $text .= "<tr><td class='fcaption'><b>".implode("&nbsp;</td><td class='fcaption' style='text-align:right'><b>", array_values($aSum))."&nbsp;</b></td></tr>\n";
$text .= "\n</table><br />\n"; $text .= "\n</table><br />\n";
return $text; return $text;

11
e107_plugins/log/stats.php
View File

@@ -816,12 +816,16 @@ class siteStats
$url = str_replace($this->plugFolder,'',$url); $url = str_replace($this->plugFolder,'',$url);
if($truncate) if($truncate)
{ {
return e107::getParser()->text_truncate($url,50); $result = e107::getParser()->text_truncate($url,50);
return $result;
} }
return $url; return trim($url);
} }
@@ -842,6 +846,7 @@ class siteStats
$totalArray = array(); $totalArray = array();
$totalv = 0; $totalv = 0;
$totalu = 0; $totalu = 0;
$total = 0;
foreach ($this -> fileInfo as $k => $v) foreach ($this -> fileInfo as $k => $v)
{ {
$found = (strpos($k,'error/') === 0); $found = (strpos($k,'error/') === 0);
@@ -871,7 +876,7 @@ class siteStats
if($info['ttl']) if($info['ttl'])
{ {
$percentage = round(($info['ttl']/$totalv) * 100, 2); $percentage = round(($info['ttl']/$totalv) * 100, 2);
$text .= "<tr>\n<td class='forumheader3' style='width: 20%;'><img src='".e_PLUGIN."log/images/html.png' alt='' style='vertical-align: middle;' /> <a href='".$info['url']."'>".$this->getLabel($key)."</a> $text .= "<tr>\n<td class='forumheader3' style='width: 20%;text-align:left'><img src='".e_PLUGIN."log/images/html.png' alt='' style='vertical-align: middle;' /> <a href='".$info['url']."'>".$this->getLabel($key)."</a>
</td>\n<td class='forumheader3' style='width: 70%;'>".$this -> bar($percentage, $info['ttl']." [".$info['unq']."]")."</td>\n<td class='forumheader3' style='width: 10%; text-align: center;'>".$percentage."%</td>\n</tr>\n"; </td>\n<td class='forumheader3' style='width: 70%;'>".$this -> bar($percentage, $info['ttl']." [".$info['unq']."]")."</td>\n<td class='forumheader3' style='width: 10%; text-align: center;'>".$percentage."%</td>\n</tr>\n";
} }
} }

2
e107_themes/bootstrap3/style.css
View File

@@ -143,7 +143,7 @@ table label.checkbox {
#sidebar .panel-body ul.list-unstyled { padding-left:0} #sidebar .panel-body ul.list-unstyled { padding-left:0}
li.dropdown-avatar > a.dropdown-toggle { padding:0; padding-top:9px; padding-bottom:10px} li.dropdown-avatar > a.dropdown-toggle { padding:9px 15px 10px 0; }