Added speed up code from html and fixed Archived expressions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1547 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
b1f17c365a
commit
c1fc4fa473
|
@ -46,8 +46,8 @@ while( $row = mysql_fetch_assoc( $result ) )
|
|||
{
|
||||
continue;
|
||||
}
|
||||
$row['zmc'] = zmcCheck( $row );
|
||||
$row['zma'] = zmaCheck( $row );
|
||||
$row['zmc'] = zmcStatus( $row );
|
||||
$row['zma'] = zmaStatus( $row );
|
||||
$sql = "select count(Id) as ZoneCount from Zones where MonitorId = '".$row['Id']."'";
|
||||
$result2 = mysql_query( $sql );
|
||||
if ( !$result2 )
|
||||
|
@ -114,8 +114,8 @@ foreach( $monitors as $monitor )
|
|||
?>
|
||||
<td align="left" style="width: 6em"><?= makeLink( "$PHP_SELF?view=watch&mid=".$monitor['Id'], substr( $monitor['Name'], 0, 8 ), ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
|
||||
<td align="left" style="width: 4em"><?= makeLink( "$PHP_SELF?view=function&mid=".$monitor['Id'], "<span class=\"$fclass\">".substr( $monitor['Function'], 0, 4 )."</span>", canEdit( 'Monitors' ) ) ?></td>
|
||||
<td align="right" style="width: 3em"><?= makeLink( "$PHP_SELF?view=events&page=1&filter=1&trms=3&attr1=MonitorId&op1=%3d&val1=".$monitor['Id']."&cnj2=and&attr2=Archived&val2=0&cnj3=and&attr3=DateTime&op3=%3e%3d&val3=-1%20hour", $monitor['HourEventCount'], canView( 'Events' ) ) ?></td>
|
||||
<td align="right" style="width: 3em"><?= makeLink( "$PHP_SELF?view=events&page=1&filter=1&trms=3&attr1=MonitorId&op1=%3d&val1=".$monitor['Id']."&cnj2=and&attr2=Archived&val2=0&cnj3=and&attr3=Date&op3=%3e%3d&val3=today", $monitor['TodayEventCount'], canView( 'Events' ) ) ?></td>
|
||||
<td align="right" style="width: 3em"><?= makeLink( "$PHP_SELF?view=events&page=1&filter=1&trms=3&attr1=MonitorId&op1=%3d&val1=".$monitor['Id']."&cnj2=and&attr2=Archived&op2=%3d&val2=0&cnj3=and&attr3=DateTime&op3=%3e%3d&val3=-1%20hour", $monitor['HourEventCount'], canView( 'Events' ) ) ?></td>
|
||||
<td align="right" style="width: 3em"><?= makeLink( "$PHP_SELF?view=events&page=1&filter=1&trms=3&attr1=MonitorId&op1=%3d&val1=".$monitor['Id']."&cnj2=and&attr2=Archived&op2=%3d&val2=0&cnj3=and&attr3=Date&op3=%3e%3d&val3=today", $monitor['TodayEventCount'], canView( 'Events' ) ) ?></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
|
@ -123,8 +123,8 @@ foreach( $monitors as $monitor )
|
|||
<tr>
|
||||
<td align="left"> </td>
|
||||
<td align="center"><?= makeLink( "$PHP_SELF?view=montage", count($monitors), ( canView( 'Stream' ) && $cycle_count > 1 ) ) ?></td>
|
||||
<td align="right" class="text"><?= makeLink( "$PHP_SELF?view=events&page=1&filter=1&trms=2&attr1=Archived&val1=0&cnj2=and&attr2=DateTime&op2=%3e%3d&val2=-1%20hour", $hour_event_count, canView( 'Events' ) ) ?></td>
|
||||
<td align="right" class="text"><?= makeLink( "$PHP_SELF?view=events&page=1&filter=1&trms=2&attr1=Archived&val1=0&cnj2=and&attr2=Date&op2=%3e%3d&val2=today", $today_event_count, canView( 'Events' ) ) ?></td>
|
||||
<td align="right" class="text"><?= makeLink( "$PHP_SELF?view=events&page=1&filter=1&trms=2&attr1=Archived&op1=%3d&val1=0&cnj2=and&attr2=DateTime&op2=%3e%3d&val2=-1%20hour", $hour_event_count, canView( 'Events' ) ) ?></td>
|
||||
<td align="right" class="text"><?= makeLink( "$PHP_SELF?view=events&page=1&filter=1&trms=2&attr1=Archived&op1=%3d&val1=0&cnj2=and&attr2=Date&op2=%3e%3d&val2=today", $today_event_count, canView( 'Events' ) ) ?></td>
|
||||
</tr>
|
||||
</table>
|
||||
</body>
|
||||
|
|
Loading…
Reference in New Issue