X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fhtml%2Fthemes%2Fmaniac%2Finclude%2Ffunctions.pl;h=0bb1d6e70d625dbb67b03ef2a3b0007d29ae51f6;hb=769185b58ec52fcc9eaedab5df42b1b25057d0c7;hp=3759bbb252bb78bc9cb94034f2a45f8e20681e2c;hpb=eea1d2d7e167120d7af02fa27876bea164af7374;p=ipfire-2.x.git

diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl
index 3759bbb252..0bb1d6e70d 100644
--- a/html/html/themes/maniac/include/functions.pl
+++ b/html/html/themes/maniac/include/functions.pl
@@ -177,66 +177,53 @@ END
 ;
 if ($settings{'SPEED'} ne 'off') {
 print <<END
-                <script type="text/javascript" language="javascript">
-                 
-                    var http_request = false;
-                 
-                    function LoadInetInfo(url) {
-                 
-                        http_request = false;
-                 
-                        if (window.XMLHttpRequest) { // Mozilla, Safari,...
-                            http_request = new XMLHttpRequest();
-                            if (http_request.overrideMimeType) {
-                                http_request.overrideMimeType('text/xml');
-                                // zu dieser Zeile siehe weiter unten
-                            }
-                        } else if (window.ActiveXObject) { // IE
-                            try {
-                                http_request = new ActiveXObject("Msxml2.XMLHTTP");
-                            } catch (e) {
-                                try {
-                                    http_request = new ActiveXObject("Microsoft.XMLHTTP");
-                                } catch (e) {}
-                            }
-                        }
-                 
-                        if (!http_request) {
-                            alert('Ende :( Kann keine XMLHTTP-Instanz erzeugen');
-                            return false;
-                        }
-                        http_request.onreadystatechange = DisplayInetInfo;
-                        http_request.open('GET', url, true);
-                        http_request.send(null);
-                 
-                    }
-                 
-                    function DisplayInetInfo() {
-                        if (http_request.readyState == 4) {
-                             var xmldoc = http_request.responseXML;
-                             var root1_node = xmldoc.getElementsByTagName('rx_kbs').item(0);
-                             var root2_node = xmldoc.getElementsByTagName('tx_kbs').item(0);
-                             var root3_node = xmldoc.getElementsByTagName('rxb').item(0);
-                             var root4_node = xmldoc.getElementsByTagName('txb').item(0);
-                
-                             document.forms['speed'].txkb.value  = root1_node.firstChild.data;
-                             document.forms['speed'].rxkb.value  = root2_node.firstChild.data;
-                
-                                        // document.getElementsByTagName("input")[0].style.color = "#00FF00";
-                                        url    = "/cgi-bin/speed.cgi?rxb_last=" + root3_node.firstChild.data + "&txb_last=" + root4_node.firstChild.data;
-                
-                              window.setTimeout("LoadInetInfo(url)", 3000);
-                        }
-                 
-                    }
-                </script>
+    <script type="text/javascript" src="/include/jquery.js"></script>
+    <script type="text/javascript">
+        var t_current;
+        var t_last;
+        var rxb_current;
+        var rxb_last;
+        var txb_current;
+        var txb_last;
+				function refreshInetInfo() {
+						\$.ajax({
+								url: '/cgi-bin/speed.cgi',
+											success: function(xml){
+											t_current = new Date();
+											var t_diff = t_current - t_last;
+											t_last = t_current;
+				
+											rxb_current = \$("rxb",xml).text();
+											var rxb_diff = rxb_current - rxb_last;
+											rxb_last = rxb_current;
+				
+											var rx_kbs = rxb_diff/t_diff;
+											rx_kbs = Math.round(rx_kbs*10)/10;
+				
+											txb_current = \$("txb",xml).text();
+											var txb_diff = txb_current - txb_last;
+											txb_last = txb_current;
+				
+											var tx_kbs = txb_diff/t_diff;
+											tx_kbs = Math.round(tx_kbs*10)/10;
+				
+											\$("#rx_kbs").text(rx_kbs + ' kb/s');
+											\$("#tx_kbs").text(tx_kbs + ' kb/s');
+											}
+								});
+								window.setTimeout("refreshInetInfo()", 3000);
+						}
+						\$(document).ready(function(){
+						refreshInetInfo();
+				});
+    </script>
   </head>
-  <body onLoad="LoadInetInfo('/cgi-bin/speed.cgi')">
+  <body>
 END
 ;
 }
 else {
-print "</head><body>";}
+print "</head>\n<body>";}
 print <<END
 <!-- IPFIRE HEADER -->
 
@@ -344,9 +331,14 @@ END
 }
 
 sub closepage () {
-    my $status = &connectionstatus();
-    $uptime = `/usr/bin/uptime`;
-	
+	my $status = &connectionstatus();
+	my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`;
+	$uptime =~ s/year(s|)/$Lang::tr{'year'}/;
+	$uptime =~ s/month(s|)/$Lang::tr{'month'}/;
+	$uptime =~ s/day(s|)/$Lang::tr{'day'}/;
+	$uptime =~ s/user(s|)/$Lang::tr{'user'}/;
+	$uptime =~ s/load average/$Lang::tr{'uptime load average'}/;     
+				
     print <<END
 			</div>
 		</div>
@@ -359,22 +351,20 @@ END
     &showsubsection($menu);
     &showsubsubsection($menu);
 
-	print <<END			
+	print <<END
+				</div>
 			</div>
-		</div>
-
-		<br class="clear" />	
-		<div id="footer" class="fixed">
-			<b>Status:</b> $status <b>Uptime:</b>$uptime
+			<br class="clear" />	
+			<div id="footer" class="fixed">
+				<b>Status:</b> $status <b>Uptime:</b> $uptime
 END
 ;
 if ($settings{'SPEED'} ne 'off') {
 print <<END                        
                         <br />
-                        <form name='speed'>
-                                <b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: none; padding: 0; background-color: #000000; vertical-align: middle" />
-                                $Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: none; padding: 0; background-color: #000000; vertical-align: middle"/>
-                        </form>
+                                <b>$Lang::tr{'bandwidth usage'}:</b>
+				$Lang::tr{'incoming'}: <span id="rx_kbs"></span>&nbsp;$Lang::tr{'outgoing'}: <span id="tx_kbs"></span>
+
 END
 ;
 }