Changeset 17591

Timestamp:

09/07/11 10:00:56 (22 months ago)

Author:

BrainSlayer

Message:

fix for some peripheral upgrade issues

Location:

src/router

Files:

• httpd/modules/upgrade.c (modified) (2 diffs)
• kromo/dd-wrt/Upgrade.asp (modified) (3 diffs)

src/router/httpd/modules/upgrade.c

@@ -33 +33 @@
 
 void set_upgrade_ret(int result) {
-        fprintf( stderr, "[UPGRADE] set upgrade_ret %i\n", result);
         if( result != 0) {
                 upgrade_ret = result;
+        } else {
+                upgrade_ret = NULL;
         }
 }
@@ -46 +47 @@
 #ifndef ANTI_FLASH
 
+fprintf(stderr, "[UPGRADE] ret: %d\n", upgrade_ret);
         if (upgrade_ret) {
                 do_ej(handler, "Fail_u_s.asp", stream, NULL);

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

@@ -20 +20 @@
                                 }
                         }
-                } else {
+                } else if( F.upgrade_files.checked ) {
                         upgrade_file = F.upgrade_files.value;
                 }
@@ -28 +28 @@
                 $(F.id).setAttribute('action', 'olupgrade.cgi');
                 $(F.id).setAttribute('enctype', '');
+                $('submit_button').remove();
         } else if (F.file.value == "")  {
                 alert(errmsg.err60);
@@ -80 +81 @@
                                         <div id="contents">
                                                 <form name="firmware" id="firmware" method="post" action="upgrade.cgi" enctype="multipart/form-data">
-                                                        <input type="hidden" name="submit_button" value="Upgrade" />
+                                                        <input type="hidden" name="submit_button" id="submit_button" />
                                                         <input type="hidden" name="action" />
                                                         <input type="hidden" name="change_action" />