Changeset 10663

Timestamp:

10/28/08 15:23:28 (5 years ago)

Author:

BrainSlayer

Message:

different handling since live_translate is not context safe

Location:

src/router

Files:

• httpd/modules/broadcom.c (modified) (1 diff)
• httpd/visuals/status.c (modified) (4 diffs)
• kromo/dd-wrt/Status_Internet.asp (modified) (2 diffs)
• kromo/dd-wrt/Status_Internet.live.asp (modified) (1 diff)

src/router/httpd/modules/broadcom.c

@@ -1759 +1759 @@
     char *lang = getLanguageName(  );
     char buf[64];
+    memset(temp,0,sizeof(temp));
+    memset(temp1,0,sizeof(temp));
 
     sprintf( buf, "%s", lang );

src/router/httpd/visuals/status.c

@@ -99 +99 @@
     struct dns_lists *dns_list = NULL;
     int wan_link = check_wan_link( 0 );
-
+    int trans=0;
 #ifdef FASTWEB
-    ejArgs( argc, argv, "%s", &type );
+    ejArgs( argc, argv, "%s %d", &type,&trans );
 #else
-    if( ejArgs( argc, argv, "%s", &type ) < 1 )
+    if( ejArgs( argc, argv, "%s %d", &type, &trans ) < 2 )
     {
         websError( wp, 400, "Insufficient args\n" );
@@ -161 +161 @@
             if( retry_count != -1 )
             {
-                status1 = live_translate( "share.statu");
-                status2 = live_translate( "share.connecting");
-                button1 = live_translate( "share.disconnect");
+                status1 = "share.statu";
+                status2 = "share.connecting";
+                if (trans)
+                    button1 = "share.disconnect";
+                else            
+                    button1 = "Disconnect";
             }
             else
             {
-                status1 = live_translate( "share.statu");
-                status2 = live_translate( "share.disconnect");
-                button1 = live_translate( "share.connect");
+                status1 = "share.statu";
+                status2 = "share.disconnect";
+                if (trans)
+                    button1 = "share.connect";
+                else            
+                    button1 = "Connect";
             }
         }
@@ -175 +181 @@
         {
             retry_count = -1;
-            status1 = live_translate( "share.statu");
-            status2 = live_translate( "share.connected");
-            button1 = live_translate( "share.disconnect");
+            status1 = "share.statu";
+            status2 = "share.connected";
+                if (trans)
+                    button1 = "share.disconnect";
+                else            
+                    button1 = "Disconnect";
         }
     }
     else
     {
-        status1 = live_translate( "share.disable");;    // only for nonbrand
+        status1 = "share.disable";      // only for nonbrand
         status2 = "&nbsp;";
         hidden1 = "<!--";
@@ -212 +221 @@
     }
     else if( !strcmp( type, "status1" ) )
-        websWrite( wp, "%s", status1 );
+        websWrite( wp, "%s", live_translate(status1) );
     else if( !strcmp( type, "status2" ) )
-        websWrite( wp, "%s", status2 );
+        websWrite( wp, "%s", live_translate(status2) );
     else if( !strcmp( type, "button1" ) )
-        websWrite( wp, "%s", button1 );
+        {
+        if (trans)
+                websWrite( wp, "%s", live_translate(button1) );
+            else
+                websWrite( wp, "%s", button1 );
+        }
     else if( !strcmp( type, "hidden1" ) )
         websWrite( wp, "%s", hidden1 );

src/router/kromo/dd-wrt/Status_Internet.asp

@@ -119 +119 @@
                                                                                 <div class="setting" id="wan_connection">
                                                                                         <div class="label"><% tran("status_inet.www_loginstatus"); %></div>
-                                                                                        <span id="wan_status"><% nvram_status_get("status2"); %>&nbsp;<input type="button" value="<% nvram_status_get("button1"); %>" onclick="connect(this.form, '<% nvram_status_get("button1"); %>_<% nvram_get("wan_proto"); %>');" /></span>
+                                                                                        <span id="wan_status"><% nvram_status_get("status2","1"); %>&nbsp;<input type="button" value="<% nvram_status_get("button1","1"); %>" onclick="connect(this.form, '<% nvram_status_get("button1","0"); %>_<% nvram_get("wan_proto"); %>');" /></span>
                                                                                 </div>
                                                                                  <div class="setting">
@@ -127 +127 @@
                                                                                 <div class="setting">
                                                                                         <div class="label"><% tran("share.ip"); %></div>
-                                                                                        <span id="wan_ipaddr"><% nvram_status_get("wan_ipaddr"); %></span>&nbsp;
+                                                                                        <span id="wan_ipaddr"><% nvram_status_get("wan_ipaddr","0"); %></span>&nbsp;
                                                                                 </div>
                                                                                 <div class="setting">
                                                                                         <div class="label"><% tran("share.subnet"); %></div>
-                                                                                        <span id="wan_netmask"><% nvram_status_get("wan_netmask"); %></span>&nbsp;
+                                                                                        <span id="wan_netmask"><% nvram_status_get("wan_netmask","0"); %></span>&nbsp;
                                                                                 </div>
                                                                                 <div class="setting">
                                                                                         <div class="label"><% tran("share.gateway"); %></div>
-                                                                                        <span id="wan_gateway"><% nvram_status_get("wan_gateway"); %></span>&nbsp;
+                                                                                        <span id="wan_gateway"><% nvram_status_get("wan_gateway","0"); %></span>&nbsp;
                                                                                 </div>
                                                                                 <div class="setting">
                                                                                         <div class="label">DNS 1</div>
-                                                                                        <span id="wan_dns0"><% nvram_status_get("wan_dns0"); %></span>&nbsp;
+                                                                                        <span id="wan_dns0"><% nvram_status_get("wan_dns0","0"); %></span>&nbsp;
                                                                                 </div>
                                                                                 <div class="setting">
                                                                                         <div class="label">DNS 2</div>
-                                                                                        <span id="wan_dns1"><% nvram_status_get("wan_dns1"); %></span>&nbsp;
+                                                                                        <span id="wan_dns1"><% nvram_status_get("wan_dns1","0"); %></span>&nbsp;
                                                                                 </div>
                                                                                 <div class="setting">
                                                                                         <div class="label">DNS 3</div>
-                                                                                        <span id="wan_dns2"><% nvram_status_get("wan_dns2"); %></span>&nbsp;
+                                                                                        <span id="wan_dns2"><% nvram_status_get("wan_dns2","0"); %></span>&nbsp;
                                                                                 </div>
                                                                                 <div id="wan_dhcp">

src/router/kromo/dd-wrt/Status_Internet.live.asp

@@ -1 +1 @@
 {wan_shortproto::<% nvram_get("wan_proto"); %>}
-{wan_status::<% nvram_status_get("status2"); %>&nbsp;&nbsp;<input type="button" value="<% nvram_status_get("button1"); %>" onclick="connect(this.form, '<% nvram_status_get("button1"); %>_<% nvram_get("wan_proto"); %>')" />}
+{wan_status::<% nvram_status_get("status2","1"); %>&nbsp;&nbsp;<input type="button" value="<% nvram_status_get("button1","1"); %>" onclick="connect(this.form, '<% nvram_status_get("button1","0"); %>_<% nvram_get("wan_proto"); %>')" />}
 {wan_uptime::<% get_wan_uptime(); %>}
 {wan_ipaddr::<% nvram_status_get("wan_ipaddr"); %>}