Permalink
Browse files

Replace <br> with <br />

  • Loading branch information...
1 parent 0809983 commit 4e855f891cb526bc7ffc78b749094fb124c98672 @markkevans markkevans committed with haraldpdl Oct 26, 2010
Showing with 448 additions and 449 deletions.
  1. +2 −2 catalog/account_history.php
  2. +2 −2 catalog/admin/action_recorder.php
  3. +10 −10 catalog/admin/administrators.php
  4. +13 −13 catalog/admin/backup.php
  5. +15 −15 catalog/admin/banner_manager.php
  6. +2 −2 catalog/admin/banner_statistics.php
  7. +38 −38 catalog/admin/categories.php
  8. +4 −4 catalog/admin/configuration.php
  9. +16 −16 catalog/admin/countries.php
  10. +28 −28 catalog/admin/currencies.php
  11. +9 −9 catalog/admin/customers.php
  12. +1 −1 catalog/admin/ext/modules/payment/moneybookers/activation.php
  13. +2 −2 catalog/admin/ext/modules/payment/sofortueberweisung/install.php
  14. +21 −21 catalog/admin/geo_zones.php
  15. +1 −1 catalog/admin/includes/classes/email.php
  16. +6 −6 catalog/admin/includes/classes/phplot.php
  17. +2 −2 catalog/admin/includes/footer.php
  18. +1 −1 catalog/admin/includes/functions/database.php
  19. +6 −6 catalog/admin/includes/functions/general.php
  20. +3 −3 catalog/admin/includes/functions/html_graphs.php
  21. +3 −3 catalog/admin/includes/functions/html_output.php
  22. +3 −3 catalog/admin/includes/languages/english/backup.php
  23. +1 −1 catalog/admin/includes/languages/english/banner_manager.php
  24. +1 −1 catalog/admin/includes/languages/english/banner_statistics.php
  25. +1 −1 catalog/admin/includes/languages/english/define_language.php
  26. +1 −1 catalog/admin/includes/languages/english/newsletters.php
  27. +1 −1 catalog/admin/includes/languages/english/tax_rates.php
  28. +3 −3 catalog/admin/includes/modules/newsletters/product_notification.php
  29. +0 −1 catalog/admin/index.php
  30. +4 −4 catalog/admin/invoice.php
  31. +20 −20 catalog/admin/languages.php
  32. +6 −6 catalog/admin/login.php
  33. +4 −4 catalog/admin/mail.php
  34. +18 −18 catalog/admin/manufacturers.php
  35. +12 −12 catalog/admin/modules.php
  36. +3 −3 catalog/admin/newsletters.php
  37. +10 −10 catalog/admin/orders.php
  38. +13 −13 catalog/admin/orders_status.php
  39. +4 −4 catalog/admin/packingslip.php
  40. +12 −12 catalog/admin/products_attributes.php
  41. +1 −1 catalog/admin/products_expected.php
  42. +11 −11 catalog/admin/reviews.php
  43. +9 −9 catalog/admin/specials.php
  44. +10 −10 catalog/admin/tax_classes.php
  45. +16 −16 catalog/admin/tax_rates.php
  46. +12 −12 catalog/admin/zones.php
  47. +1 −1 catalog/ext/modules/payment/sage_pay/checkout.php
  48. +1 −1 catalog/includes/boxes/categories.php
  49. +1 −1 catalog/includes/boxes/reviews.php
  50. +1 −1 catalog/includes/boxes/whats_new.php
  51. +1 −1 catalog/includes/classes/email.php
  52. +5 −5 catalog/includes/classes/navigation_history.php
  53. +1 −1 catalog/includes/functions/database.php
  54. +2 −2 catalog/includes/functions/general.php
  55. +2 −2 catalog/includes/functions/html_output.php
  56. +2 −2 catalog/includes/languages/english.php
  57. +2 −2 catalog/includes/languages/english/account_notifications.php
  58. +1 −1 catalog/includes/languages/english/address_book.php
  59. +1 −1 catalog/includes/languages/english/advanced_search.php
  60. +2 −2 catalog/includes/languages/english/cookie_usage.php
  61. +1 −1 catalog/includes/languages/english/create_account_success.php
  62. +1 −1 catalog/includes/languages/english/logoff.php
  63. +2 −2 catalog/includes/languages/english/modules/payment/moneybookers.php
  64. +1 −1 catalog/includes/languages/english/modules/payment/moneyorder.php
  65. +1 −1 catalog/includes/languages/english/modules/payment/nochex.php
  66. +1 −1 catalog/includes/languages/english/modules/payment/paypal_express.php
  67. +1 −1 catalog/includes/languages/english/modules/payment/paypal_pro_dp.php
  68. +1 −1 catalog/includes/languages/english/modules/payment/paypal_pro_payflow_dp.php
  69. +1 −1 catalog/includes/languages/english/modules/payment/paypal_pro_payflow_ec.php
  70. +1 −1 catalog/includes/languages/english/modules/payment/paypal_standard.php
  71. +1 −1 catalog/includes/languages/english/modules/payment/paypoint_secpay.php
  72. +1 −1 catalog/includes/languages/english/modules/payment/pm2checkout.php
  73. +1 −1 catalog/includes/languages/english/modules/payment/psigate.php
  74. +1 −1 catalog/includes/languages/english/modules/payment/sage_pay_direct.php
  75. +1 −1 catalog/includes/languages/english/modules/payment/sage_pay_form.php
  76. +1 −1 catalog/includes/languages/english/modules/payment/sage_pay_server.php
  77. +2 −2 catalog/includes/languages/english/modules/payment/sofortueberweisung_direct.php
  78. +2 −2 catalog/includes/languages/english/modules/shipping/usps.php
  79. +2 −2 catalog/includes/languages/english/shopping_cart.php
  80. +2 −2 catalog/includes/languages/english/ssl_check.php
  81. +1 −1 catalog/includes/modules/new_products.php
  82. +1 −1 catalog/includes/modules/shipping/usps.php
  83. +1 −1 catalog/index.php
  84. +4 −4 catalog/info_shopping_cart.php
  85. +25 −25 catalog/install/oscommerce.sql
  86. +1 −1 catalog/product_info.php
  87. +2 −2 catalog/product_reviews.php
  88. +2 −2 catalog/product_reviews_info.php
  89. +1 −1 catalog/product_reviews_write.php
  90. +1 −1 catalog/products_new.php
@@ -55,8 +55,8 @@
<div class="contentText">
<table border="0" width="100%" cellspacing="2" cellpadding="2">
<tr>
- <td width="50%" valign="top"><?php echo '<b>' . TEXT_ORDER_DATE . '</b> ' . tep_date_long($history['date_purchased']) . '<br><b>' . $order_type . '</b> ' . tep_output_string_protected($order_name); ?></td>
- <td width="30%" valign="top"><?php echo '<b>' . TEXT_ORDER_PRODUCTS . '</b> ' . $products['count'] . '<br><b>' . TEXT_ORDER_COST . '</b> ' . strip_tags($history['order_total']); ?></td>
+ <td width="50%" valign="top"><?php echo '<b>' . TEXT_ORDER_DATE . '</b> ' . tep_date_long($history['date_purchased']) . '<br /><b>' . $order_type . '</b> ' . tep_output_string_protected($order_name); ?></td>
+ <td width="30%" valign="top"><?php echo '<b>' . TEXT_ORDER_PRODUCTS . '</b> ' . $products['count'] . '<br /><b>' . TEXT_ORDER_COST . '</b> ' . strip_tags($history['order_total']); ?></td>
<td width="20%" align="right"><?php echo tep_draw_button(SMALL_IMAGE_BUTTON_VIEW, 'document', tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, (isset($HTTP_GET_VARS['page']) ? 'page=' . $HTTP_GET_VARS['page'] . '&' : '') . 'order_id=' . $history['orders_id'], 'SSL'), 'primary'); ?></td>
</tr>
</table>
@@ -188,8 +188,8 @@
if (isset($aInfo) && is_object($aInfo)) {
$heading[] = array('text' => '<b>' . $aInfo->module . '</b>');
- $contents[] = array('text' => TEXT_INFO_IDENTIFIER . '<br><br>' . (!empty($aInfo->identifier) ? '<a href="' . tep_href_link(FILENAME_ACTION_RECORDER, 'search=' . $aInfo->identifier) . '"><u>' . tep_output_string_protected($aInfo->identifier) . '</u></a>': '(empty)'));
- $contents[] = array('text' => '<br>' . TEXT_INFO_DATE_ADDED . ' ' . tep_datetime_short($aInfo->date_added));
+ $contents[] = array('text' => TEXT_INFO_IDENTIFIER . '<br /><br />' . (!empty($aInfo->identifier) ? '<a href="' . tep_href_link(FILENAME_ACTION_RECORDER, 'search=' . $aInfo->identifier) . '"><u>' . tep_output_string_protected($aInfo->identifier) . '</u></a>': '(empty)'));
+ $contents[] = array('text' => '<br />' . TEXT_INFO_DATE_ADDED . ' ' . tep_datetime_short($aInfo->date_added));
}
break;
}
@@ -310,22 +310,22 @@
$contents = array('form' => tep_draw_form('administrator', FILENAME_ADMINISTRATORS, 'action=insert', 'post', 'autocomplete="off"'));
$contents[] = array('text' => TEXT_INFO_INSERT_INTRO);
- $contents[] = array('text' => '<br>' . TEXT_INFO_USERNAME . '<br>' . tep_draw_input_field('username'));
- $contents[] = array('text' => '<br>' . TEXT_INFO_PASSWORD . '<br>' . tep_draw_password_field('password'));
+ $contents[] = array('text' => '<br />' . TEXT_INFO_USERNAME . '<br />' . tep_draw_input_field('username'));
+ $contents[] = array('text' => '<br />' . TEXT_INFO_PASSWORD . '<br />' . tep_draw_password_field('password'));
if (is_array($htpasswd_array)) {
- $contents[] = array('text' => '<br>' . tep_draw_checkbox_field('htaccess', 'true') . ' ' . TEXT_INFO_PROTECT_WITH_HTPASSWD);
+ $contents[] = array('text' => '<br />' . tep_draw_checkbox_field('htaccess', 'true') . ' ' . TEXT_INFO_PROTECT_WITH_HTPASSWD);
}
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_draw_button(IMAGE_SAVE, 'disk', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_ADMINISTRATORS)));
+ $contents[] = array('align' => 'center', 'text' => '<br />' . tep_draw_button(IMAGE_SAVE, 'disk', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_ADMINISTRATORS)));
break;
case 'edit':
$heading[] = array('text' => '<b>' . $aInfo->user_name . '</b>');
$contents = array('form' => tep_draw_form('administrator', FILENAME_ADMINISTRATORS, 'aID=' . $aInfo->id . '&action=save', 'post', 'autocomplete="off"'));
$contents[] = array('text' => TEXT_INFO_EDIT_INTRO);
- $contents[] = array('text' => '<br>' . TEXT_INFO_USERNAME . '<br>' . tep_draw_input_field('username', $aInfo->user_name));
- $contents[] = array('text' => '<br>' . TEXT_INFO_NEW_PASSWORD . '<br>' . tep_draw_password_field('password'));
+ $contents[] = array('text' => '<br />' . TEXT_INFO_USERNAME . '<br />' . tep_draw_input_field('username', $aInfo->user_name));
+ $contents[] = array('text' => '<br />' . TEXT_INFO_NEW_PASSWORD . '<br />' . tep_draw_password_field('password'));
if (is_array($htpasswd_array)) {
$default_flag = false;
@@ -339,18 +339,18 @@
}
}
- $contents[] = array('text' => '<br>' . tep_draw_checkbox_field('htaccess', 'true', $default_flag) . ' ' . TEXT_INFO_PROTECT_WITH_HTPASSWD);
+ $contents[] = array('text' => '<br />' . tep_draw_checkbox_field('htaccess', 'true', $default_flag) . ' ' . TEXT_INFO_PROTECT_WITH_HTPASSWD);
}
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_draw_button(IMAGE_SAVE, 'disk', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_ADMINISTRATORS, 'aID=' . $aInfo->id)));
+ $contents[] = array('align' => 'center', 'text' => '<br />' . tep_draw_button(IMAGE_SAVE, 'disk', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_ADMINISTRATORS, 'aID=' . $aInfo->id)));
break;
case 'delete':
$heading[] = array('text' => '<b>' . $aInfo->user_name . '</b>');
$contents = array('form' => tep_draw_form('administrator', FILENAME_ADMINISTRATORS, 'aID=' . $aInfo->id . '&action=deleteconfirm'));
$contents[] = array('text' => TEXT_INFO_DELETE_INTRO);
- $contents[] = array('text' => '<br><b>' . $aInfo->user_name . '</b>');
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_draw_button(IMAGE_DELETE, 'trash', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_ADMINISTRATORS, 'aID=' . $aInfo->id)));
+ $contents[] = array('text' => '<br /><b>' . $aInfo->user_name . '</b>');
+ $contents[] = array('align' => 'center', 'text' => '<br />' . tep_draw_button(IMAGE_DELETE, 'trash', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_ADMINISTRATORS, 'aID=' . $aInfo->id)));
break;
default:
if (isset($aInfo) && is_object($aInfo)) {
View
@@ -420,49 +420,49 @@
$contents = array('form' => tep_draw_form('backup', FILENAME_BACKUP, 'action=backupnow'));
$contents[] = array('text' => TEXT_INFO_NEW_BACKUP);
- $contents[] = array('text' => '<br>' . tep_draw_radio_field('compress', 'no', true) . ' ' . TEXT_INFO_USE_NO_COMPRESSION);
- if (file_exists(LOCAL_EXE_GZIP)) $contents[] = array('text' => '<br>' . tep_draw_radio_field('compress', 'gzip') . ' ' . TEXT_INFO_USE_GZIP);
+ $contents[] = array('text' => '<br />' . tep_draw_radio_field('compress', 'no', true) . ' ' . TEXT_INFO_USE_NO_COMPRESSION);
+ if (file_exists(LOCAL_EXE_GZIP)) $contents[] = array('text' => '<br />' . tep_draw_radio_field('compress', 'gzip') . ' ' . TEXT_INFO_USE_GZIP);
if (file_exists(LOCAL_EXE_ZIP)) $contents[] = array('text' => tep_draw_radio_field('compress', 'zip') . ' ' . TEXT_INFO_USE_ZIP);
if ($dir_ok == true) {
- $contents[] = array('text' => '<br>' . tep_draw_checkbox_field('download', 'yes') . ' ' . TEXT_INFO_DOWNLOAD_ONLY . '*<br><br>*' . TEXT_INFO_BEST_THROUGH_HTTPS);
+ $contents[] = array('text' => '<br />' . tep_draw_checkbox_field('download', 'yes') . ' ' . TEXT_INFO_DOWNLOAD_ONLY . '*<br /><br />*' . TEXT_INFO_BEST_THROUGH_HTTPS);
} else {
- $contents[] = array('text' => '<br>' . tep_draw_radio_field('download', 'yes', true) . ' ' . TEXT_INFO_DOWNLOAD_ONLY . '*<br><br>*' . TEXT_INFO_BEST_THROUGH_HTTPS);
+ $contents[] = array('text' => '<br />' . tep_draw_radio_field('download', 'yes', true) . ' ' . TEXT_INFO_DOWNLOAD_ONLY . '*<br /><br />*' . TEXT_INFO_BEST_THROUGH_HTTPS);
}
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_draw_button(IMAGE_BACKUP, 'copy', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_BACKUP)));
+ $contents[] = array('align' => 'center', 'text' => '<br />' . tep_draw_button(IMAGE_BACKUP, 'copy', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_BACKUP)));
break;
case 'restore':
$heading[] = array('text' => '<b>' . $buInfo->date . '</b>');
$contents[] = array('text' => tep_break_string(sprintf(TEXT_INFO_RESTORE, DIR_FS_BACKUP . (($buInfo->compression != TEXT_NO_EXTENSION) ? substr($buInfo->file, 0, strrpos($buInfo->file, '.')) : $buInfo->file), ($buInfo->compression != TEXT_NO_EXTENSION) ? TEXT_INFO_UNPACK : ''), 35, ' '));
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_draw_button(IMAGE_RESTORE, 'arrowrefresh-1-w', tep_href_link(FILENAME_BACKUP, 'file=' . $buInfo->file . '&action=restorenow'), 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_BACKUP, 'file=' . $buInfo->file)));
+ $contents[] = array('align' => 'center', 'text' => '<br />' . tep_draw_button(IMAGE_RESTORE, 'arrowrefresh-1-w', tep_href_link(FILENAME_BACKUP, 'file=' . $buInfo->file . '&action=restorenow'), 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_BACKUP, 'file=' . $buInfo->file)));
break;
case 'restorelocal':
$heading[] = array('text' => '<b>' . TEXT_INFO_HEADING_RESTORE_LOCAL . '</b>');
$contents = array('form' => tep_draw_form('restore', FILENAME_BACKUP, 'action=restorelocalnow', 'post', 'enctype="multipart/form-data"'));
- $contents[] = array('text' => TEXT_INFO_RESTORE_LOCAL . '<br><br>' . TEXT_INFO_BEST_THROUGH_HTTPS);
- $contents[] = array('text' => '<br>' . tep_draw_file_field('sql_file'));
+ $contents[] = array('text' => TEXT_INFO_RESTORE_LOCAL . '<br /><br />' . TEXT_INFO_BEST_THROUGH_HTTPS);
+ $contents[] = array('text' => '<br />' . tep_draw_file_field('sql_file'));
$contents[] = array('text' => TEXT_INFO_RESTORE_LOCAL_RAW_FILE);
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_draw_button(IMAGE_RESTORE, 'arrowrefresh-1-w', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_BACKUP)));
+ $contents[] = array('align' => 'center', 'text' => '<br />' . tep_draw_button(IMAGE_RESTORE, 'arrowrefresh-1-w', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_BACKUP)));
break;
case 'delete':
$heading[] = array('text' => '<b>' . $buInfo->date . '</b>');
$contents = array('form' => tep_draw_form('delete', FILENAME_BACKUP, 'file=' . $buInfo->file . '&action=deleteconfirm'));
$contents[] = array('text' => TEXT_DELETE_INTRO);
- $contents[] = array('text' => '<br><b>' . $buInfo->file . '</b>');
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_draw_button(IMAGE_DELETE, 'trash', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_BACKUP, 'file=' . $buInfo->file)));
+ $contents[] = array('text' => '<br /><b>' . $buInfo->file . '</b>');
+ $contents[] = array('align' => 'center', 'text' => '<br />' . tep_draw_button(IMAGE_DELETE, 'trash', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_BACKUP, 'file=' . $buInfo->file)));
break;
default:
if (isset($buInfo) && is_object($buInfo)) {
$heading[] = array('text' => '<b>' . $buInfo->date . '</b>');
$contents[] = array('align' => 'center', 'text' => tep_draw_button(IMAGE_RESTORE, 'arrowrefresh-1-w', tep_href_link(FILENAME_BACKUP, 'file=' . $buInfo->file . '&action=restore')) . tep_draw_button(IMAGE_DELETE, 'trash', tep_href_link(FILENAME_BACKUP, 'file=' . $buInfo->file . '&action=delete')));
- $contents[] = array('text' => '<br>' . TEXT_INFO_DATE . ' ' . $buInfo->date);
+ $contents[] = array('text' => '<br />' . TEXT_INFO_DATE . ' ' . $buInfo->date);
$contents[] = array('text' => TEXT_INFO_SIZE . ' ' . $buInfo->size);
- $contents[] = array('text' => '<br>' . TEXT_INFO_COMPRESSION . ' ' . $buInfo->compression);
+ $contents[] = array('text' => '<br />' . TEXT_INFO_COMPRESSION . ' ' . $buInfo->compression);
}
break;
}
Oops, something went wrong.

0 comments on commit 4e855f8

Please sign in to comment.