Clean Up

gburton · Feb 13, 2020 · 2a6b20f · 2a6b20f
1 parent 870e577
commit 2a6b20f
Show file tree

Hide file tree

Showing 68 changed files with 220 additions and 216 deletions.
diff --git a/account_edit.php b/account_edit.php
@@ -53,9 +53,9 @@
 <div class="contentContainer">
   <div class="text-danger text-right"><?php echo FORM_REQUIRED_INFORMATION; ?></div>
 
-<?php
+  <?php
   $customer_data->display_input($customer_data->get_fields_for_page('account_edit'), $customer->fetch_to_address());
-?>
+  ?>
 
   <div class="buttonSet">
     <div class="text-right"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'fas fa-angle-right', null, 'primary', null, 'btn-success btn-lg btn-block'); ?></div>

diff --git a/account_history.php b/account_history.php
@@ -55,22 +55,22 @@
           </tr>
         </thead>
         <tbody>
-<?php
-    while ($history = tep_db_fetch_array($history_query)) {
-      $products_query = tep_db_query("select sum(products_quantity) as count from orders_products where orders_id = '" . (int)$history['orders_id'] . "'");
-      $products = tep_db_fetch_array($products_query);
-?>
-          <tr>
-            <th scope="row"><?php echo $history['orders_id']; ?></th>
-            <td class="d-none d-md-table-cell"><?php echo $history['orders_status_name']; ?></td>
-            <td><?php echo tep_date_short($history['date_purchased']); ?></td>
-            <td class="d-none d-md-table-cell"><?php echo $products['count']; ?></td>
-            <td><?php echo strip_tags($history['order_total']); ?></td>
-            <td class="text-right"><?php echo tep_draw_button(BUTTON_VIEW_ORDER, null, tep_href_link('account_history_info.php', tep_get_all_get_params(['order_id']) . 'order_id=' . (int)$history['orders_id'], 'SSL'), 'primary', NULL, 'btn-primary btn-sm'); ?></td>
-          </tr>
-<?php
-    }
-?>
+          <?php
+          while ($history = tep_db_fetch_array($history_query)) {
+            $products_query = tep_db_query("select sum(products_quantity) as count from orders_products where orders_id = '" . (int)$history['orders_id'] . "'");
+            $products = tep_db_fetch_array($products_query);
+            ?>
+            <tr>
+              <th scope="row"><?php echo $history['orders_id']; ?></th>
+              <td class="d-none d-md-table-cell"><?php echo $history['orders_status_name']; ?></td>
+              <td><?php echo tep_date_short($history['date_purchased']); ?></td>
+              <td class="d-none d-md-table-cell"><?php echo $products['count']; ?></td>
+              <td><?php echo strip_tags($history['order_total']); ?></td>
+              <td class="text-right"><?php echo tep_draw_button(BUTTON_VIEW_ORDER, null, tep_href_link('account_history_info.php', tep_get_all_get_params(['order_id']) . 'order_id=' . (int)$history['orders_id'], 'SSL'), 'primary', NULL, 'btn-primary btn-sm'); ?></td>
+            </tr>
+            <?php
+          }
+          ?>
         </tbody>
       </table>
     </div>

diff --git a/account_newsletters.php b/account_newsletters.php
@@ -60,10 +60,10 @@
   <div class="form-group row align-items-center">
     <div class="col-form-label col-sm-4 text-left text-sm-right"><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER; ?></div>
     <div class="col-sm-8 pl-5 custom-control custom-switch">
-<?php
-  echo tep_draw_checkbox_field('newsletter_general', '1', ($customer_data->get('newsletter', $newsletter) == '1'), 'class="custom-control-input" id="inputNewsletter"');
-  echo '<label for="inputNewsletter" class="custom-control-label text-muted"><small>' . MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION . '&nbsp;</small></label>';
-?>
+      <?php
+      echo tep_draw_checkbox_field('newsletter_general', '1', ($customer_data->get('newsletter', $newsletter) == '1'), 'class="custom-control-input" id="inputNewsletter"');
+      echo '<label for="inputNewsletter" class="custom-control-label text-muted"><small>' . MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION . '&nbsp;</small></label>';
+      ?>
     </div>
   </div>
 

diff --git a/account_password.php b/account_password.php
@@ -71,15 +71,15 @@
 <div class="contentContainer">
   <p class="text-danger text-right"><?php echo FORM_REQUIRED_INFORMATION; ?></p>
 
-<?php
+  <?php
   $input_id = 'inputCurrent';
   $label_text = ENTRY_PASSWORD_CURRENT;
-  $input = tep_draw_input_field('password_current', null, abstract_customer_data_module::REQUIRED_ATTRIBUTE . 'autofocus="autofocus" id="' . $input_id . '" autocomplete="current-password" placeholder="' . ENTRY_PASSWORD_CURRENT_TEXT . '"', 'password')
-         . FORM_REQUIRED_INPUT;
+  $input = tep_draw_input_field('password_current', null, abstract_customer_data_module::REQUIRED_ATTRIBUTE . 'autofocus="autofocus" id="' . $input_id . '" autocomplete="current-password" placeholder="' . ENTRY_PASSWORD_CURRENT_TEXT . '"', 'password') . FORM_REQUIRED_INPUT;
+
   include $oscTemplate->map_to_template('includes/modules/customer_data/cd_whole_row_input.php');
 
   $customer_data->display_input($page_fields);
-?>
+  ?>
 
   <div class="buttonSet">
     <div class="text-right"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'fas fa-angle-right', null, 'primary', null, 'btn-success btn-lg btn-block'); ?></div>

diff --git a/address_book_process.php b/address_book_process.php
@@ -147,7 +147,7 @@
         <div class="card-header"><?php echo DELETE_ADDRESS_TITLE; ?></div>
 
         <div class="card-body">
-          <?php echo $customer->make_address_label((int)$_GET['delete'], true, ' ', '<br />'); ?>
+          <?php echo $customer->make_address_label((int)$_GET['delete'], true, ' ', '<br>'); ?>
         </div>
       </div>
     </div>

diff --git a/checkout_confirmation.php b/checkout_confirmation.php
@@ -115,23 +115,23 @@
       <h5 class="mb-1"><?php echo LIST_PRODUCTS; ?><small><a class="font-weight-lighter ml-2" href="<?php echo tep_href_link('shopping_cart.php', '', 'SSL'); ?>"><?php echo TEXT_EDIT; ?></a></small></h5>
       <div class="border">
         <ul class="list-group list-group-flush">
-<?php
-  foreach ($order->products as $product) {
-    echo '<li class="list-group-item">';
-      echo '<span class="float-right">' . $currencies->display_price($product['final_price'], $product['tax'], $product['qty']) . '</span>';
-      echo '<h5 class="mb-1">' . $product['name'] . '<small> x ' . $product['qty'] . '</small></h5>';
-
-      if ( (isset($product['attributes'])) && (count($product['attributes']) > 0) ) {
-        echo '<p class="w-100 mb-1">';
-        foreach ($product['attributes'] as $attribute) {
-          echo '- ' . $attribute['option'] . ': ' . $attribute['value'] . '<br>';
-        }
-        echo '</p>';
-      }
+          <?php
+          foreach ($order->products as $product) {
+            echo '<li class="list-group-item">';
+              echo '<span class="float-right">' . $currencies->display_price($product['final_price'], $product['tax'], $product['qty']) . '</span>';
+              echo '<h5 class="mb-1">' . $product['name'] . '<small> x ' . $product['qty'] . '</small></h5>';
+
+              if ( (isset($product['attributes'])) && (count($product['attributes']) > 0) ) {
+                echo '<p class="w-100 mb-1">';
+                foreach ($product['attributes'] as $attribute) {
+                  echo '- ' . $attribute['option'] . ': ' . $attribute['value'] . '<br>';
+                }
+                echo '</p>';
+              }
 
-    echo '</li>';
-  }
-?>
+            echo '</li>';
+          }
+          ?>
         </ul>
         <table class="table mb-0">
           <?php
@@ -152,14 +152,14 @@
             echo '<li class="list-group-item">';
               echo '<i class="fas fa-shipping-fast fa-fw fa-3x float-right text-black-50"></i>';
               echo '<h5 class="mb-0">' . HEADING_DELIVERY_ADDRESS . '<small><a class="font-weight-lighter ml-2" href="' . tep_href_link('checkout_shipping_address.php', '', 'SSL') . '">' . TEXT_EDIT . '</a></small></h5>';
-              echo '<p class="w-100 mb-1">' . $address->format($order->delivery, 1, ' ', '<br />') . '</p>';
+              echo '<p class="w-100 mb-1">' . $address->format($order->delivery, 1, ' ', '<br>') . '</p>';
             echo '</li>';
           }
 
           echo '<li class="list-group-item">';
             echo '<i class="fas fa-file-invoice-dollar fa-fw fa-3x float-right text-black-50"></i>';
             echo '<h5 class="mb-0">' . HEADING_BILLING_ADDRESS . '<small><a class="font-weight-lighter ml-2" href="' . tep_href_link('checkout_payment_address.php', '', 'SSL') . '">' . TEXT_EDIT . '</a></small></h5>';
-            echo '<p class="w-100 mb-1">' . $address->format($order->billing, 1, ' ', '<br />') . '</p>';
+            echo '<p class="w-100 mb-1">' . $address->format($order->billing, 1, ' ', '<br>') . '</p>';
           echo '</li>';
 
           if ($order->info['shipping_method']) {
@@ -240,13 +240,13 @@
 
   <div class="buttonSet mt-3">
     <div class="text-right">
-<?php
-  if (is_array($payment_modules->modules)) {
-    echo $payment_modules->process_button();
-  }
+      <?php
+      if (is_array($payment_modules->modules)) {
+        echo $payment_modules->process_button();
+      }
 
-  echo tep_draw_button(IMAGE_BUTTON_FINALISE_ORDER, 'fas fa-check-circle', null, 'primary', null, 'btn-success btn-block btn-lg');
-?>
+      echo tep_draw_button(IMAGE_BUTTON_FINALISE_ORDER, 'fas fa-check-circle', null, 'primary', null, 'btn-success btn-block btn-lg');
+      ?>
     </div>
   </div>
 

diff --git a/checkout_payment.php b/checkout_payment.php
@@ -164,7 +164,7 @@
       </h5>
       <div class="border">
         <ul class="list-group list-group-flush">
-          <li class="list-group-item"><?php echo PAYMENT_FA_ICON . $customer->make_address_label($_SESSION['billto'], true, ' ', '<br />'); ?>
+          <li class="list-group-item"><?php echo PAYMENT_FA_ICON . $customer->make_address_label($_SESSION['billto'], true, ' ', '<br>'); ?>
           </li>
         </ul>
       </div>

diff --git a/checkout_payment_address.php b/checkout_payment_address.php
@@ -124,7 +124,7 @@
       <h5 class="mb-1"><?php echo TABLE_HEADING_PAYMENT_ADDRESS; ?></h5>
       <div class="border">
         <ul class="list-group list-group-flush">
-          <li class="list-group-item"><?php echo PAYMENT_FA_ICON . $customer->make_address_label($billto, true, ' ', '<br />'); ?>
+          <li class="list-group-item"><?php echo PAYMENT_FA_ICON . $customer->make_address_label($billto, true, ' ', '<br>'); ?>
           </li>
         </ul>
       </div>

diff --git a/checkout_shipping.php b/checkout_shipping.php
@@ -246,7 +246,7 @@ function tep_process_selected_shipping_method() {
       </h5>
       <div class="border">
         <ul class="list-group list-group-flush">
-          <li class="list-group-item"><?php echo SHIPPING_FA_ICON . $customer->make_address_label($_SESSION['sendto'], true, ' ', '<br />'); ?></li>
+          <li class="list-group-item"><?php echo SHIPPING_FA_ICON . $customer->make_address_label($_SESSION['sendto'], true, ' ', '<br>'); ?></li>
         </ul>
       </div>
     </div>

diff --git a/checkout_shipping_address.php b/checkout_shipping_address.php
@@ -107,22 +107,22 @@
       <div>
         <table class="table border-right border-left border-bottom table-hover m-0">
           <tbody>
-<?php
-  $address_query = $customer->get_all_addresses_query();
-  while ($address = tep_db_fetch_array($address_query)) {
-?>
-            <tr class="table-selection">
-              <td><label for="csa_<?php echo $address['address_book_id']; ?>"><?php echo $customer_data->get_module('address')->format($address, true, ' ', ', '); ?></label></td>
-              <td align="text-right">
-                <div class="custom-control custom-radio custom-control-inline">
-                  <?php echo tep_draw_radio_field('address', $address['address_book_id'], ($address['address_book_id'] == $_SESSION['sendto']), 'id="csa_' . $address['address_book_id'] . '" aria-describedby="csa_' . $address['address_book_id'] . '" class="custom-control-input"'); ?>
-                  <label class="custom-control-label" for="csa_<?php echo $address['address_book_id']; ?>">&nbsp;</label>
-                </div>
-              </td>
-            </tr>
-<?php
-  }
-?>
+            <?php
+            $address_query = $customer->get_all_addresses_query();
+            while ($address = tep_db_fetch_array($address_query)) {
+              ?>
+              <tr class="table-selection">
+                <td><label for="csa_<?php echo $address['address_book_id']; ?>"><?php echo $customer_data->get_module('address')->format($address, true, ' ', ', '); ?></label></td>
+                <td align="text-right">
+                  <div class="custom-control custom-radio custom-control-inline">
+                    <?php echo tep_draw_radio_field('address', $address['address_book_id'], ($address['address_book_id'] == $_SESSION['sendto']), 'id="csa_' . $address['address_book_id'] . '" aria-describedby="csa_' . $address['address_book_id'] . '" class="custom-control-input"'); ?>
+                    <label class="custom-control-label" for="csa_<?php echo $address['address_book_id']; ?>">&nbsp;</label>
+                  </div>
+                </td>
+              </tr>
+              <?php
+              }
+            ?>
           </tbody>
         </table>
       </div>
@@ -131,7 +131,7 @@
       <h5 class="mb-1"><?php echo TABLE_HEADING_SHIPPING_ADDRESS; ?></h5>
       <div class="border">
         <ul class="list-group list-group-flush">
-          <li class="list-group-item"><?php echo SHIPPING_FA_ICON . $customer->make_address_label($_SESSION['sendto'], true, ' ', '<br />'); ?></li>
+          <li class="list-group-item"><?php echo SHIPPING_FA_ICON . $customer->make_address_label($_SESSION['sendto'], true, ' ', '<br>'); ?></li>
         </ul>
       </div>
     </div>

diff --git a/create_account.php b/create_account.php
@@ -76,16 +76,16 @@
 <?php echo tep_draw_form('create_account', tep_href_link('create_account.php', '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?>
 
 <div class="contentContainer">
-<?php
+  <?php
   while ($customer_data_group = tep_db_fetch_array($customer_data_group_query)) {
     if (empty($grouped_modules[$customer_data_group['customer_data_groups_id']])) {
       continue;
     }
-?>
+    ?>
 
-  <h4><?php echo $customer_data_group['customer_data_groups_name']; ?></h4>
+    <h4><?php echo $customer_data_group['customer_data_groups_name']; ?></h4>
 
-<?php
+    <?php
     foreach ((array)$grouped_modules[$customer_data_group['customer_data_groups_id']] as $module) {
       $module->display_input();
     }

diff --git a/includes/apps/braintree_cc/Braintree/CreditCard.php b/includes/apps/braintree_cc/Braintree/CreditCard.php
@@ -12,7 +12,7 @@
  *
  * <b>== More information ==</b>
  *
- * For more detailed information on CreditCards, see {@link http://www.braintreepayments.com/gateway/credit-card-api http://www.braintreepaymentsolutions.com/gateway/credit-card-api}<br />
+ * For more detailed information on CreditCards, see {@link http://www.braintreepayments.com/gateway/credit-card-api http://www.braintreepaymentsolutions.com/gateway/credit-card-api}<br>
  * For more detailed information on CreditCard verifications, see {@link http://www.braintreepayments.com/gateway/credit-card-verification-api http://www.braintreepaymentsolutions.com/gateway/credit-card-verification-api}
  *
  * @package    Braintree

diff --git a/includes/apps/paypal/cfg_params/ssl_version.php b/includes/apps/paypal/cfg_params/ssl_version.php
@@ -96,15 +96,15 @@ function getSetField() {
 
       $.getJSON('{$connection_test_url}', function (data) {
         if ( (typeof data == 'object') && ('rpcStatus' in data) && (data.rpcStatus == 1) ) {
-          var content = '<p>{$dialog_connection_test_curl_version} ' + data.curl_version + '<br />{$dialog_connection_test_curl_ssl_version} ' + data.curl_ssl_version + '</p><p>{$dialog_connection_test_default_setting} ';
+          var content = '<p>{$dialog_connection_test_curl_version} ' + data.curl_version + '<br>{$dialog_connection_test_curl_ssl_version} ' + data.curl_ssl_version + '</p><p>{$dialog_connection_test_default_setting} ';
 
           if (data.default == true) {
             content += '<span style="color: green; font-weight: bold;">{$dialog_connection_test_success}</span>';
           } else {
             content += '<span style="color: red; font-weight: bold;">{$dialog_connection_test_failed}</span>';
           }
 
-          content += '<br />{$dialog_connection_test_tlsv12_setting} ';
+          content += '<br>{$dialog_connection_test_tlsv12_setting} ';
 
           if (data.tlsv12 == true) {
             content += '<span style="color: green; font-weight: bold;">{$dialog_connection_test_success}</span>';

diff --git a/includes/apps/paypal/languages/english/cfg_params/ssl_version.php b/includes/apps/paypal/languages/english/cfg_params/ssl_version.php
@@ -17,6 +17,6 @@
 cfg_ssl_version_dialog_tlsv12_setting = TLS v1.2:
 cfg_ssl_version_dialog_success = Success
 cfg_ssl_version_dialog_failed = Failed
-cfg_ssl_version_dialog_default_failed = A connection to PayPal could not be made using the default cURL configured SSL version.<br /><br />The SSL Version parameter must be set to TLS v1.2 by <b>June 30, 2017</b> otherwise connections will continue to fail.
-cfg_ssl_version_dialog_tlsv12_failed = A connection to PayPal could not be made using TLS v1.2. Please consult with your hosting provider to upgrade the cURL version that is installed with your PHP web server to support TLS v1.2 connections.<br /><br />This must be performed by <b>June 30, 2017</b> otherwise connections will continue to fail.
+cfg_ssl_version_dialog_default_failed = A connection to PayPal could not be made using the default cURL configured SSL version.<br><br>The SSL Version parameter must be set to TLS v1.2 by <b>June 30, 2017</b> otherwise connections will continue to fail.
+cfg_ssl_version_dialog_tlsv12_failed = A connection to PayPal could not be made using TLS v1.2. Please consult with your hosting provider to upgrade the cURL version that is installed with your PHP web server to support TLS v1.2 connections.<br><br>This must be performed by <b>June 30, 2017</b> otherwise connections will continue to fail.
 cfg_ssl_version_dialog_general_error = A general error occurred. Please try again.
diff --git a/includes/apps/paypal/languages/english/modules/EC/cfg_params/checkout_flow.php b/includes/apps/paypal/languages/english/modules/EC/cfg_params/checkout_flow.php
@@ -1,5 +1,5 @@
 cfg_ec_checkout_flow_title = Checkout Flow
-cfg_ec_checkout_flow_desc = Use the new pop-up In-Context checkout flow and have PayPal automatically choose the best checkout flow to use, or use standard full-page Classic checkout flow.<br /><br /><em>In-Context does not yet support all of the features of the Classic checkout flow such as Instant Update.</em>
+cfg_ec_checkout_flow_desc = Use the new pop-up In-Context checkout flow and have PayPal automatically choose the best checkout flow to use, or use standard full-page Classic checkout flow.<br><br><em>In-Context does not yet support all of the features of the Classic checkout flow such as Instant Update.</em>
 
 cfg_ec_checkout_flow_default = Classic
 cfg_ec_checkout_flow_in_context = In-Context
diff --git a/includes/apps/paypal/languages/english/modules/EC/cfg_params/instant_update.php b/includes/apps/paypal/languages/english/modules/EC/cfg_params/instant_update.php
@@ -1,5 +1,5 @@
 cfg_ec_instant_update_title = Instant Update
-cfg_ec_instant_update_desc = Enable this to have PayPal retrieve a list of shipping rates after the customer has selected their shipping address during the Express Checkout flow.<br /><br /><em>Instant Update requires SSL to be enabled on your store.</em>
+cfg_ec_instant_update_desc = Enable this to have PayPal retrieve a list of shipping rates after the customer has selected their shipping address during the Express Checkout flow.<br><br><em>Instant Update requires SSL to be enabled on your store.</em>
 
 cfg_ec_instant_update_enabled = Enabled
 cfg_ec_instant_update_disabled = Disabled
diff --git a/includes/apps/paypal/languages/english/modules/LOGIN/LOGIN.php b/includes/apps/paypal/languages/english/modules/LOGIN/LOGIN.php
@@ -16,7 +16,7 @@
 module_login_error_curl = This module requires cURL to be enabled in PHP and will not load until it has been enabled on this webserver.
 module_login_error_credentials = This module will not load until the Client ID and Secret parameters have been configured. Please edit and configure the settings of the PayPal App.
 
-module_login_notice_paypal_app_return_url = The following url must be configured as your Return URL in the PayPal REST App settings that was created for Log In with PayPal:<br /><br />:return_url
+module_login_notice_paypal_app_return_url = The following url must be configured as your Return URL in the PayPal REST App settings that was created for Log In with PayPal:<br><br>:return_url
 
 module_login_template_title = Log In with PayPal
 module_login_template_content = Have a PayPal account? Securely log in with PayPal to shop even faster!