From 9aca25f21e86d98496e578fb21c1c8ffcc39aa81 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Thu, 8 Dec 2005 11:20:00 +0000
Subject: [PATCH] Javascript tidy up and removed redundant file.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1662 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/zm_html_view_controlcaps.php |   2 +-
 web/zm_html_view_controlmenu.php |   2 +-
 web/zm_html_view_cycle.php       |   2 +-
 web/zm_html_view_frame.php       |   2 +-
 web/zm_html_view_frames.php      |   2 +-
 web/zm_html_view_monitor.php     |   2 +-
 web/zm_html_view_montagemenu.php |   2 +-
 web/zm_xhtml.php                 |   1 -
 web/zm_xhtml_view_frame.php      |   1 -
 web/zm_xhtml_view_frames.php     | 115 -------------------------------
 10 files changed, 7 insertions(+), 124 deletions(-)
 delete mode 100644 web/zm_xhtml_view_frames.php

diff --git a/web/zm_html_view_controlcaps.php b/web/zm_html_view_controlcaps.php
index 09b69895b..8e4c2793b 100644
--- a/web/zm_html_view_controlcaps.php
+++ b/web/zm_html_view_controlcaps.php
@@ -44,7 +44,7 @@ while( $row = mysql_fetch_assoc( $result ) )
 //window.resizeTo( <?= $jws['console']['w'] ?>, <?= $jws['console']['h']+(25*(count($controls)>6?count($controls):6)) ?> );
 function newWindow(Url,Name,Width,Height)
 {
-	var Name = window.open(Url,Name,"resizable,width="+Width+",height="+Height);
+	var Win = window.open(Url,Name,"resizable,width="+Width+",height="+Height);
 }
 function closeWindow()
 {
diff --git a/web/zm_html_view_controlmenu.php b/web/zm_html_view_controlmenu.php
index 72b465903..2a00eb174 100644
--- a/web/zm_html_view_controlmenu.php
+++ b/web/zm_html_view_controlmenu.php
@@ -55,7 +55,7 @@ while( $row = mysql_fetch_assoc( $result ) )
 <script type="text/javascript">
 function newWindow(Url,Name,Width,Height)
 {
-   	var Name = window.open(Url,Name,"resizable,width="+Width+",height="+Height);
+   	var Win = window.open(Url,Name,"resizable,width="+Width+",height="+Height);
 }
 function closeWindow()
 {
diff --git a/web/zm_html_view_cycle.php b/web/zm_html_view_cycle.php
index dc7b3a63d..069a55858 100644
--- a/web/zm_html_view_cycle.php
+++ b/web/zm_html_view_cycle.php
@@ -88,7 +88,7 @@ header("Pragma: no-cache");			  // HTTP/1.0
 <script type="text/javascript">
 function newWindow(Url,Name,Width,Height)
 {
-	var Name = window.open(Url,Name,"resizable,scrollbars,width="+Width+",height="+Height);
+	var Win = window.open(Url,Name,"resizable,scrollbars,width="+Width+",height="+Height);
 }
 function closeWindow()
 {
diff --git a/web/zm_html_view_frame.php b/web/zm_html_view_frame.php
index 5afe5d47f..ee8842224 100644
--- a/web/zm_html_view_frame.php
+++ b/web/zm_html_view_frame.php
@@ -74,7 +74,7 @@ $img_class = $alarm_frame?"alarm":"normal";
 window.focus();
 function newWindow(Url,Name,Width,Height)
 {
-   	var Name = window.open(Url,Name,"resizable,scrollbars,width="+Width+",height="+Height);
+   	var Win = window.open(Url,Name,"resizable,scrollbars,width="+Width+",height="+Height);
 }
 function closeWindow()
 {
diff --git a/web/zm_html_view_frames.php b/web/zm_html_view_frames.php
index e411c01b7..7a3661fec 100644
--- a/web/zm_html_view_frames.php
+++ b/web/zm_html_view_frames.php
@@ -48,7 +48,7 @@ while ( $row = mysql_fetch_assoc( $result ) )
 window.focus();
 function newWindow(Url,Name,Width,Height)
 {
-   	var Name = window.open(Url,Name,"resizable,scrollbars,width="+Width+",height="+Height);
+   	var Win = window.open(Url,Name,"resizable,scrollbars,width="+Width+",height="+Height);
 }
 function closeWindow()
 {
diff --git a/web/zm_html_view_monitor.php b/web/zm_html_view_monitor.php
index 02fa56666..6afa62158 100644
--- a/web/zm_html_view_monitor.php
+++ b/web/zm_html_view_monitor.php
@@ -151,7 +151,7 @@ function submitTab(Form,Tab)
 
 function newWindow(Url,Name,Width,Height)
 {
-	var Name = window.open(Url,Name,"resizable,width="+Width+",height="+Height);
+	var Win = window.open(Url,Name,"resizable,width="+Width+",height="+Height);
 }
 
 function closeWindow()
diff --git a/web/zm_html_view_montagemenu.php b/web/zm_html_view_montagemenu.php
index e32fc6176..9f74676c6 100644
--- a/web/zm_html_view_montagemenu.php
+++ b/web/zm_html_view_montagemenu.php
@@ -74,7 +74,7 @@ elseif ( ZM_OPT_CONTROL )
 <script type="text/javascript">
 function newWindow(Url,Name,Width,Height)
 {
-	var Name = window.open(Url,Name,"resizable,width="+Width+",height="+Height);
+	var Win = window.open(Url,Name,"resizable,width="+Width+",height="+Height);
 }
 </script>
 </head>
diff --git a/web/zm_xhtml.php b/web/zm_xhtml.php
index 5bc6b391a..351f29851 100644
--- a/web/zm_xhtml.php
+++ b/web/zm_xhtml.php
@@ -127,7 +127,6 @@ switch( $view )
 	case "event" :
 	case "eventdetails" :
 	case "frame" :
-	case "frames" :
 	case "monitor" :
 	case "video" :
 	case "function" :
diff --git a/web/zm_xhtml_view_frame.php b/web/zm_xhtml_view_frame.php
index 050d6259f..5f75ee7df 100644
--- a/web/zm_xhtml_view_frame.php
+++ b/web/zm_xhtml_view_frame.php
@@ -112,7 +112,6 @@ else
 <table>
 <tr>
 <td class="smallhead"><?= $zmSlangFrame ?> <?= $eid."-".$fid." (".$frame['Score'].")" ?></td>
-<!--<td align="center" class="text"><?php if ( canEdit( 'Events' ) ) { ?><a href="javascript: deleteEvent();"><?= $zmSlangDelete ?></a><?php } else { ?>&nbsp<?php } ?></td>-->
 </tr>
 </table>
 <table>
diff --git a/web/zm_xhtml_view_frames.php b/web/zm_xhtml_view_frames.php
deleted file mode 100644
index 6f0f11c3e..000000000
--- a/web/zm_xhtml_view_frames.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-//
-// ZoneMinder web frames view file, $Date$, $Revision$
-// Copyright (C) 2003, 2004, 2005  Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-	$view = "error";
-	return;
-}
-$sql = "select E.*,M.Name as MonitorName,M.Width,M.Height from Events as E inner join Monitors as M on E.MonitorId = M.Id where E.Id = '$eid'";
-$result = mysql_query( $sql );
-if ( !$result )
-	die( mysql_error() );
-$event = mysql_fetch_assoc( $result );
-
-$sql = "select *, unix_timestamp( TimeStamp ) as UnixTimeStamp from Frames where EventID = '$eid' order by FrameId";
-$result = mysql_query( $sql );
-if ( !$result )
-	die( mysql_error() );
-while ( $row = mysql_fetch_assoc( $result ) )
-{
-	$frames[] = $row;
-}
-
-?>
-<html>
-<head>
-<title><?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangFrames ?> <?= $eid ?></title>
-<link rel="stylesheet" href="zm_xhtml_styles.css" type="text/css">
-<script type="text/javascript">
-window.focus();
-function newWindow(Url,Name,Width,Height)
-{
-   	var Name = window.open(Url,Name,"resizable,scrollbars,width="+Width+",height="+Height);
-}
-function closeWindow()
-{
-	window.close();
-}
-</script>
-</head>
-<body>
-<table width="96%" border="0">
-<tr>
-<td align="left" class="smallhead"><b><?= $zmSlangEvent ?> <?= $eid ?></b></td>
-<td align="right" class="text"><a href="javascript: closeWindow();"><?= $zmSlangClose ?></a></td>
-</tr>
-<tr><td colspan="2"><table width="100%" border="0" bgcolor="#7F7FB2" cellpadding="3" cellspacing="1"><tr bgcolor="#FFFFFF">
-<td class="smallhead" align="center"><?= $zmSlangFrameId ?></td>
-<td class="smallhead" align="center"><?= $zmSlangAlarmFrame ?></td>
-<td class="smallhead" align="center"><?= $zmSlangTimeStamp ?></td>
-<td class="smallhead" align="center"><?= $zmSlangTimeDelta ?></td>
-<td class="smallhead" align="center"><?= $zmSlangScore ?></td>
-</tr>
-<?php
-if ( count($frames) )
-{
-	foreach ( $frames as $frame )
-	{
-		$alarm_frame = $frame['Type']=='Alarm';
-		$bgcolor = $alarm_frame?'#FA8072':($frame['Type']=='Bulk'?'#CCCCCC':'#FFFFFF');
-?>
-<tr bgcolor="<?= $bgcolor ?>">
-<td class="text" align="center"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=frame&eid=<?= $eid ?>&fid=<?= $frame['FrameId'] ?>', 'zmImage', <?= $event['Width']+$jws['image']['w'] ?>, <?= $event['Height']+$jws['image']['h'] ?> );"><?= $frame['FrameId'] ?></a></td>
-<td class="text" align="center"><?= $alarm_frame?$zmSlangYes:$zmSlangNo ?></td>
-<td class="text" align="center"><?= date( "H:i:s", $frame['UnixTimeStamp'] ) ?></td>
-<td class="text" align="center"><?= number_format( $frame['Delta'], 2 ) ?></td>
-<?php
-		if ( ZM_RECORD_EVENT_STATS && $alarm_frame )
-		{
-?>
-<td class="text" align="center"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=stats&eid=<?= $eid ?>&fid=<?= $frame['FrameId'] ?>', 'zmStats', <?= $jws['stats']['w'] ?>, <?= $jws['stats']['h'] ?> );"><?= $frame['Score'] ?></a></td>
-<?php
-		}
-		else
-		{
-?> 
-<td class="text" align="center"><?= $frame['Score'] ?></td>
-<?php
-		}
-?> 
-</tr>
-<?php
-	}
-}
-else
-{
-?>
-<tr bgcolor="#FFFFFF">
-<td class="text" colspan="8" align="center"><br><?= $zmSlangNoFramesRecorded ?><br><br></td>
-</tr>
-<?php
-}
-?>
-</table></td>
-</tr>
-</table>
-</body>
-</html>