From 18dedc122fbcb7cca2f9e944afbdb4e93ed47a57 Mon Sep 17 00:00:00 2001
From: Matthieu Lalonde <matth_web_git@lalonde.me>
Date: Mon, 6 Jun 2011 11:00:41 -0400
Subject: [PATCH] FIXED - Bandwidth viewer is back

---
 DDWRT_MonitorAppDelegate.m | 18 ++++++++++++
 English.lproj/MainMenu.xib | 58 +++++++++++++++-----------------------
 WRTStatusClient.m          |  6 ++--
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/DDWRT_MonitorAppDelegate.m b/DDWRT_MonitorAppDelegate.m
index 756e5df..2dd51d9 100644
--- a/DDWRT_MonitorAppDelegate.m
+++ b/DDWRT_MonitorAppDelegate.m
@@ -33,6 +33,7 @@
 	[AppMenu release];
 	[_appMenu release];
 	[ConfigPanel release];
+	[BandwidthViewer release];
     [super dealloc];
 }
 
@@ -60,6 +61,11 @@
 
 - (void) deinitialize
 {
+	if (_updateTimer != nil) {
+		[_updateTimer invalidate];
+		_updateTimer	= nil;
+	}
+	
 	[wrt_update_client release];
 	wrt_update_client	= nil;
 	
@@ -67,6 +73,18 @@
 	wrt_request_client	= nil;
 }
 
+- (void) showBandwidthViewer:(id)sender
+{
+	[ [BandwidthViewerWebView mainFrame] loadRequest: [wrt_update_client requestForBandwidthViewerForInterface:[wrt_update_client getWanPort]] ];
+	
+	// Failed attempt at automagically setting the bit/byte mode in the svg graph
+	//WebScriptObject *scriptObject = [BandwidthViewerWebView windowScriptObject];
+    //[scriptObject callWebScriptMethod:@"alert" withArguments:[NSArray arrayWithObject:@"Will"]];
+	//[scriptObject setValue:@"bits" forKey:@"unit"];
+	
+	[BandwidthViewer makeKeyAndOrderFront:nil];
+}
+
 # pragma mark -
 # pragma mark Menu Methods:
 - (void) showMenubar
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 8e1961c..14fd394 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1053,7 +1053,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							</object>
 							<string key="NSFrameSize">{555, 275}</string>
 							<reference key="NSSuperview" ref="40768770"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView"/>
 							<bool key="NSViewIsLayerTreeHost">YES</bool>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
@@ -1087,7 +1086,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<string key="NSFrame">{{7, 11}, {555, 275}}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="519676712"/>
 					<bool key="NSViewIsLayerTreeHost">YES</bool>
 					<int key="NSViewLayerContentsRedrawPolicy">2</int>
@@ -1326,14 +1324,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">775</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">refreshClientsMenu:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="406982965"/>
-					</object>
-					<int key="connectionID">778</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">AppMenu</string>
@@ -1342,14 +1332,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">779</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">refreshSystemMenu:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="148702963"/>
-					</object>
-					<int key="connectionID">780</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menuWanUptime</string>
@@ -1358,14 +1340,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">782</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">refreshWanMenu:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="1061072709"/>
-					</object>
-					<int key="connectionID">784</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menuDNS</string>
@@ -2655,10 +2629,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>copyParentMenuTitle:</string>
-							<string>refreshClientsMenu:</string>
+							<string>hideConfigPanel:</string>
 							<string>refreshMenu:</string>
-							<string>refreshSystemMenu:</string>
-							<string>refreshWanMenu:</string>
+							<string>saveConfig:</string>
+							<string>setConfigProtocol:</string>
+							<string>setConfigRefresh:</string>
+							<string>showConfigPanel:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2667,6 +2643,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -2674,10 +2652,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>copyParentMenuTitle:</string>
-							<string>refreshClientsMenu:</string>
+							<string>hideConfigPanel:</string>
 							<string>refreshMenu:</string>
-							<string>refreshSystemMenu:</string>
-							<string>refreshWanMenu:</string>
+							<string>saveConfig:</string>
+							<string>setConfigProtocol:</string>
+							<string>setConfigRefresh:</string>
+							<string>showConfigPanel:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2686,7 +2666,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">refreshClientsMenu:</string>
+								<string key="name">hideConfigPanel:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
@@ -2694,11 +2674,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">refreshSystemMenu:</string>
+								<string key="name">saveConfig:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">setConfigProtocol:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">setConfigRefresh:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">refreshWanMenu:</string>
+								<string key="name">showConfigPanel:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 						</object>
diff --git a/WRTStatusClient.m b/WRTStatusClient.m
index 6b738a4..16f1ad7 100644
--- a/WRTStatusClient.m
+++ b/WRTStatusClient.m
@@ -112,10 +112,10 @@
 	} else {
 		NSString *stringData	= [[NSString alloc] initWithData:data  encoding:NSASCIIStringEncoding];
 		NSRange pageValid		= [stringData rangeOfString:@"Bandwidth Monitoring"];
+		NSRange startRange		= [stringData rangeOfString:@"WAN</h2>"];
 		
-		if (pageValid.location != NSNotFound) {
+		if (pageValid.location != NSNotFound && startRange.location != NSNotFound) {
 			// grab the wan port name
-			NSRange startRange	= [stringData rangeOfString:@"WAN</h2>"];
 			stringData			= [stringData substringFromIndex:startRange.location];
 			NSString *key		= @"<iframe src=\"/graph_if.svg?";
 			startRange			= [stringData rangeOfString:key];
@@ -126,7 +126,7 @@
 			[self setWrtReachable:true];
 		} else {
 			[self setWrtReachable:false];
-			wanPort			= nil;
+			wanPort				= nil;
 		}
 	}
 }