Submit the form in $request_type to prevent Firefox alerting users of…

… submitting a form on a HTTPS page leading to a HTTP page (#606)
osCommerce · Sep 8, 2013 · e2d0282 · e2d0282
1 parent 8918e52
commit e2d0282
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/catalog/includes/modules/boxes/bm_manufacturers.php b/catalog/includes/modules/boxes/bm_manufacturers.php
@@ -31,7 +31,7 @@ function bm_manufacturers() {
     }
 
     function getData() {
-      global $HTTP_GET_VARS, $oscTemplate;
+      global $HTTP_GET_VARS, $request_type, $oscTemplate;
 
       $data = '';
 
@@ -62,7 +62,7 @@ function getData() {
                                            'text' => $manufacturers_name);
           }
 
-          $content = tep_draw_form('manufacturers', tep_href_link(FILENAME_DEFAULT, '', 'NONSSL', false), 'get') .
+          $content = tep_draw_form('manufacturers', tep_href_link(FILENAME_DEFAULT, '', $request_type, false), 'get') .
                      tep_draw_pull_down_menu('manufacturers_id', $manufacturers_array, (isset($HTTP_GET_VARS['manufacturers_id']) ? $HTTP_GET_VARS['manufacturers_id'] : ''), 'onchange="this.form.submit();" size="' . MAX_MANUFACTURERS_LIST . '" style="width: 100%"') . tep_hide_session_id() .
                      '</form>';
         }

diff --git a/catalog/includes/modules/boxes/bm_search.php b/catalog/includes/modules/boxes/bm_search.php
@@ -31,12 +31,12 @@ function bm_search() {
     }
 
     function execute() {
-      global $oscTemplate;
+      global $request_type, $oscTemplate;
 
       $data = '<div class="ui-widget infoBoxContainer">' .
               '  <div class="ui-widget-header infoBoxHeading">' . MODULE_BOXES_SEARCH_BOX_TITLE . '</div>' .
               '  <div class="ui-widget-content infoBoxContents" style="text-align: center;">' .
-              '    ' . tep_draw_form('quick_find', tep_href_link(FILENAME_ADVANCED_SEARCH_RESULT, '', 'NONSSL', false), 'get') .
+              '    ' . tep_draw_form('quick_find', tep_href_link(FILENAME_ADVANCED_SEARCH_RESULT, '', $request_type, false), 'get') .
               '    ' . tep_draw_input_field('keywords', '', 'size="10" maxlength="30" style="width: 75%"') . '&nbsp;' . tep_draw_hidden_field('search_in_description', '1') . tep_hide_session_id() . tep_image_submit('button_quick_find.gif', MODULE_BOXES_SEARCH_BOX_TITLE) . '<br />' . MODULE_BOXES_SEARCH_BOX_TEXT . '<br /><a href="' . tep_href_link(FILENAME_ADVANCED_SEARCH) . '"><strong>' . MODULE_BOXES_SEARCH_BOX_ADVANCED_SEARCH . '</strong></a>' .
               '    </form>' .
               '  </div>' .