--- usr/www/all/html/de/home/home.js.orig 2009-03-22 01:12:00.000000000 +0100 +++ usr/www/all/html/de/home/home.js 2009-03-22 01:12:01.000000000 +0100 @@ -386,6 +386,9 @@ var timeBudgetReached = ""; if (timeBudgetReached == "1") strWarn = "{?de.home.home.js:305?}"; +var volBudgetReached = ""; +if (volBudgetReached == "1") +strWarn = "das in Ihrem Tarif enthaltene Datenvolumen für diesen Monat ist aufgebraucht."; if (strWarn != "") { strWarn = strWarn.fontcolor("#cc0000"); @@ -398,6 +401,27 @@ var minutes = Math.ceil(cur%60); var hmstr = timestrings.getHmStr(hours,minutes); var retstr = timestrings.getOfHStr(hmstr,maxh); +var g_Mega = 1000000; //1000*1000; +var g_Shift32 = 4294967296; //2**32 +function mb2byte(mb){ return Math.floor(g_Mega*mb); } +function byte2mb(b){ return Math.round(b/g_Mega); } +function byte2low(b){ return b%g_Shift32; } +function byte2high(b){ return Math.floor(b/g_Shift32); } +function highlow2byte(h,l){ return h*g_Shift32+l; } +if (maxtime==0) +{ +var maxlow = ; +var maxhigh = ; +var reclow = ; +var rechigh = ; +var sentlow = ; +var senthigh = ; +var maxvol = highlow2byte(maxhigh,maxlow); +var curvol = highlow2byte(rechigh,reclow) + highlow2byte(senthigh,sentlow); +var maxmb = byte2mb(maxvol); +var curmb = byte2mb(curvol); +retstr = curmb+g_txt_von+maxmb+ "MB"+"."; +} return retstr; } function ConnectDisplay(n) { --- usr/www/all/html/de/internet/budget.frm.orig 2009-03-17 18:29:21.000000000 +0100 +++ usr/www/all/html/de/internet/budget.frm 2009-03-22 01:12:01.000000000 +0100 @@ -3,3 +3,8 @@ + + + + + --- usr/www/all/html/de/internet/budget.html.orig 2009-03-17 18:29:15.000000000 +0100 +++ usr/www/all/html/de/internet/budget.html 2009-03-22 01:12:01.000000000 +0100 @@ -1,13 +1,25 @@
-{?de.internet.budget.html:6010?} +Tarif eintragen
-{?de.internet.budget.html:8198?} +Geben Sie hier das enthaltene Datenvolumen oder die Freistunden Ihres Tarifs an.

 

+

 

+

+ MB Datenvolumen pro Monat inklusive
+Beispiel: 5000 MB (entsprechen 5 Gigabyte)

+

   + +

+

 

+

{?de.internet.budget.html:65?}
{?de.internet.budget.html:70?}

@@ -17,10 +29,10 @@

-{?de.internet.budget.html:3635?} +Im Bereich "System / INFO-Anzeige" können Sie festlegen, dass die INFO-LED der FRITZ!Box zu blinken beginnt, wenn [?das angegebene Datenvolumen oder?] die Freistunden überschritten sind.

-

  -

--- usr/www/all/html/de/internet/budget.js.orig 2009-03-17 18:29:34.000000000 +0100 +++ usr/www/all/html/de/internet/budget.js 2009-03-22 01:12:01.000000000 +0100 @@ -19,20 +19,34 @@ function byte2high(b){ return Math.floor(b/g_Shift32); } function highlow2byte(h,l){ return h*g_Shift32+l; } function uiDoOnLoad() { -var Title = "{?de.internet.budget.js:5632?}"; +var Title = "Tarif eintragen"; document.title = Title; var tmp=0; var tmp2=0; // StartofMonth jslCopyValue("uiViewStartOfMonth","uiPostStartOfMonth"); +// RoundUp +jslGetCheckValue("uiViewRoundUpOn","uiPostRoundUpOn"); +if (jslGetValue("uiPostRoundUpBytes")=="1000") +jslSetSelection("uiViewRoundUpBytes","1000"); +else +jslSetSelection("uiViewRoundUpBytes","1000000"); +OnToggleRoundUp(); // WarnOnly jslSetChecked("uiViewDisconnect",jslGetValue("uiPostWarnOnly") != "1"); // Time (in hours) tmp = jslGetValue("uiPostBudgetTime"); tmp /= 3600; jslSetValue("uiViewBudgetTimeVal", Math.floor(tmp)); -jslSetEnabled("uiViewBudgetTimeVal", 1); -jslSetChecked("uiViewBudgetOn",jslGetValue("uiPostBudgetOn") == "1"); +// Volume (in MB) +var low = Number(jslGetValue("uiPostBudgetVolumeLow")); +var high = Number(jslGetValue("uiPostBudgetVolumeHigh")); +tmp = highlow2byte(high,low); +tmp = byte2mb(tmp); +jslSetValue("uiViewBudgetVolumeVal", Math.floor(tmp)); +OnToggleTarif(jslGetValue("uiPostBudgetTime") != "0" ? 2:1); +// Budget +jslGetCheckValue("uiViewBudgetOn","uiPostBudgetOn"); OnToggleBudget(); if (!isDslIp() && !isWanIp()) { jslDisplay("uiViewDisconnectText", true); @@ -51,6 +65,12 @@ alert(g_mldSoM); return false; } } +// RoundUp +jslSetCheckValue("uiPostRoundUpOn","uiViewRoundUpOn"); +if (document.getElementById("uiViewRoundUpBytes").options[0].selected == true) +jslSetValue("uiPostRoundUpBytes","1000"); +else +jslSetValue("uiPostRoundUpBytes","1000000"); // WarnOnly jslSetValue("uiPostWarnOnly",jslGetChecked("uiViewDisconnect") ? "0" : "1"); // Budget @@ -58,6 +78,10 @@ // Time (in hours) if (jslGetChecked("uiViewBudgetOn")) { +if (jslGetChecked("uiViewBudgetTimeOn") == true) +{ +jslSetValue("uiPostBudgetVolumeLow","0"); +jslSetValue("uiPostBudgetVolumeHigh","0"); tmp = jslGetValue("uiViewBudgetTimeVal"); if (valIsZahl(tmp) && tmp>0 && tmp<=744) { @@ -69,6 +93,30 @@ return false; } } +else +jslSetValue("uiPostBudgetTime","0"); +// Volume (in MB) +if (jslGetChecked("uiViewBudgetVolumeOn") == true) +{ +tmp = Number(jslGetValue("uiViewBudgetVolumeVal")); +if (isNaN(tmp) || tmp <= 0) +{ +alert(g_mldVolume); +return false; +} +tmp = mb2byte(tmp); +var tmphigh = byte2high(tmp); +tmphigh = byte2low(tmphigh); // Damit ist auch tmphigh höchstens 32-Bit +var tmplow = byte2low(tmp); +jslSetValue("uiPostBudgetVolumeLow",tmplow); +jslSetValue("uiPostBudgetVolumeHigh",tmphigh); +} +else +{ +jslSetValue("uiPostBudgetVolumeLow","0"); +jslSetValue("uiPostBudgetVolumeHigh","0"); +} +} // Save jslSetValue("uiPostMenu", jslGetValue("uiPostMenu")); jslSetValue("uiPostPageName", "inetstat"); @@ -81,13 +129,38 @@ function uiDoHelp() { jslPopHelp("hilfe_budget"); } +function OnToggleRoundUp () { +if (jslGetChecked("uiViewRoundUpOn") == true) +jslEnable("uiViewRoundUpBytes"); +else +jslDisable("uiViewRoundUpBytes"); +} function OnToggleBudget() { -if(jslGetChecked("uiViewBudgetOn")){ -jslSetEnabled("uiViewBudgetTimeVal",1); +if (jslGetChecked("uiViewBudgetOn") == true) { +jslEnable("uiViewBudgetTimeOn"); +jslEnable("uiViewBudgetVolumeOn"); +OnToggleTarif(jslGetChecked("uiViewBudgetTimeOn") ? 2:1); jslEnable("uiViewDisconnect"); }else{ -jslSetEnabled("uiViewBudgetTimeVal",0); -jslSetEnabled("uiViewDisconnect",0); +jslDisable("uiViewBudgetTimeOn"); +jslDisable("uiViewBudgetTimeVal"); +jslDisable("uiViewBudgetVolumeOn"); +jslDisable("uiViewBudgetVolumeVal"); +jslDisable("uiViewRoundUpOn"); +jslDisable("uiViewRoundUpBytes"); +jslDisable("uiViewDisconnect"); +} +} +function OnToggleTarif(id) { +jslSetChecked("uiViewBudgetVolumeOn", id==1); +jslSetChecked("uiViewBudgetTimeOn", id==2); +jslSetEnabled("uiViewBudgetTimeVal", id==2); +jslSetEnabled("uiViewBudgetVolumeVal", id==1); +jslSetEnabled("uiViewRoundUpOn", id==1); +if (id==1) { +OnToggleRoundUp(); +} else { +jslDisable("uiViewRoundUpBytes"); } } function isAtamode () { --- usr/www/all/html/de/internet/inetstat.html.orig 2009-03-17 18:29:30.000000000 +0100 +++ usr/www/all/html/de/internet/inetstat.html 2009-03-22 01:12:01.000000000 +0100 @@ -21,7 +21,7 @@