Skip to content
Browse files

Converting linefeeds to UNIX style. Converted TAB to spaces for code …

…consistency
  • Loading branch information...
1 parent 2d68568 commit 9baa0e40d1971754aa01d9a6f9e73415e138e57e @acidvertigo acidvertigo committed Dec 28, 2011
Showing with 1,319 additions and 1,319 deletions.
  1. +2 −2 CHANGELOG
  2. +91 −91 LICENSE
  3. +1 −1 catalog/account_history_info.php
  4. +2 −2 catalog/account_password.php
  5. +5 −5 catalog/admin/administrators.php
  6. +1 −1 catalog/admin/backup.php
  7. +18 −18 catalog/admin/categories.php
  8. +135 −135 catalog/admin/ext/modules/payment/sofortueberweisung/install.php
  9. +1 −1 catalog/admin/geo_zones.php
  10. +1 −1 catalog/admin/includes/application_bottom.php
  11. +1 −1 catalog/admin/includes/classes/currencies.php
  12. +1 −1 catalog/admin/includes/classes/language.php
  13. +1 −1 catalog/admin/includes/classes/message_stack.php
  14. +7 −7 catalog/admin/includes/classes/mime.php
  15. +223 −223 catalog/admin/includes/classes/passwordhash.php
  16. +2 −2 catalog/admin/includes/classes/payment_module_info.php
  17. +3 −3 catalog/admin/includes/classes/phplot.php
  18. +2 −2 catalog/admin/includes/classes/rss.php
  19. +3 −3 catalog/admin/includes/classes/shopping_cart.php
  20. +2 −2 catalog/admin/includes/classes/table_block.php
  21. +1 −1 catalog/admin/includes/configure.php
  22. +2 −2 catalog/admin/includes/functions/compatibility.php
  23. +3 −3 catalog/admin/includes/functions/database.php
  24. +12 −12 catalog/admin/includes/functions/general.php
  25. +10 −10 catalog/admin/includes/functions/html_graphs.php
  26. +6 −6 catalog/admin/includes/functions/html_output.php
  27. +1 −1 catalog/admin/includes/functions/languages.php
  28. +1 −1 catalog/admin/includes/functions/sessions.php
  29. +1 −1 catalog/admin/includes/functions/validations.php
  30. +1 −1 catalog/admin/includes/header.php
  31. +1 −1 catalog/admin/includes/languages/english/action_recorder.php
  32. +1 −1 catalog/admin/includes/languages/english/banner_statistics.php
  33. +1 −1 catalog/admin/includes/languages/english/configuration.php
  34. +1 −1 catalog/admin/includes/languages/english/modules/newsletters/newsletter.php
  35. +1 −1 catalog/admin/includes/languages/english/modules/newsletters/product_notification.php
  36. +1 −1 catalog/admin/includes/languages/english/newsletters.php
  37. +1 −1 catalog/admin/includes/languages/english/orders_status.php
  38. +1 −1 catalog/admin/includes/languages/english/products_attributes.php
  39. +1 −1 catalog/admin/includes/languages/english/products_expected.php
  40. +1 −1 catalog/admin/includes/languages/english/reviews.php
  41. +1 −1 catalog/admin/includes/languages/english/server_info.php
  42. +1 −1 catalog/admin/includes/languages/english/stats_customers.php
  43. +1 −1 catalog/admin/includes/languages/english/stats_products_purchased.php
  44. +1 −1 catalog/admin/includes/languages/english/stats_products_viewed.php
  45. +1 −1 catalog/admin/includes/languages/english/store_logo.php
  46. +1 −1 catalog/admin/includes/languages/english/tax_classes.php
  47. +1 −1 catalog/admin/includes/languages/english/version_check.php
  48. +1 −1 catalog/admin/includes/languages/english/whos_online.php
  49. +1 −1 catalog/admin/includes/languages/english/zones.php
  50. +1 −1 catalog/admin/includes/modules/dashboard/d_reviews.php
  51. +1 −1 catalog/admin/index.php
  52. +1 −1 catalog/admin/invoice.php
  53. +1 −1 catalog/admin/mail.php
  54. +1 −1 catalog/admin/modules.php
  55. +3 −3 catalog/admin/orders.php
  56. +1 −1 catalog/admin/orders_status.php
  57. +2 −2 catalog/admin/packingslip.php
  58. +23 −23 catalog/admin/products_attributes.php
  59. +1 −1 catalog/admin/reviews.php
  60. +1 −1 catalog/admin/sec_dir_permissions.php
  61. +1 −1 catalog/admin/whos_online.php
  62. +3 −3 catalog/advanced_search_result.php
  63. +4 −4 catalog/checkout_confirmation.php
  64. +2 −2 catalog/checkout_payment.php
  65. +67 −67 catalog/checkout_process.php
  66. +4 −4 catalog/checkout_shipping.php
  67. +2 −2 catalog/checkout_success.php
  68. +1 −1 catalog/create_account.php
  69. +3 −3 catalog/download.php
  70. +36 −36 catalog/ext/flot/API.txt
  71. +5 −5 catalog/ext/flot/NEWS.txt
  72. +8 −8 catalog/ext/flot/PLUGINS.txt
  73. +1 −1 catalog/ext/flot/README.txt
  74. +33 −33 catalog/ext/modules/payment/inpay/inpay_functions.php
  75. +12 −12 catalog/ext/modules/payment/inpay/pb_handler.php
  76. +5 −5 catalog/includes/application_top.php
  77. +1 −1 catalog/includes/classes/boxes.php
  78. +3 −3 catalog/includes/classes/breadcrumb.php
  79. +1 −1 catalog/includes/classes/cc_validation.php
  80. +3 −3 catalog/includes/classes/email.php
  81. +9 −9 catalog/includes/classes/http_client.php
  82. +5 −5 catalog/includes/classes/language.php
  83. +3 −3 catalog/includes/classes/message_stack.php
  84. +8 −8 catalog/includes/classes/mime.php
  85. +3 −3 catalog/includes/classes/navigation_history.php
  86. +1 −1 catalog/includes/classes/order.php
  87. +1 −1 catalog/includes/classes/order_total.php
  88. +223 −223 catalog/includes/classes/passwordhash.php
  89. +1 −1 catalog/includes/classes/payment.php
  90. +2 −2 catalog/includes/classes/shipping.php
  91. +1 −1 catalog/includes/classes/shopping_cart.php
  92. +1 −1 catalog/includes/classes/split_page_results.php
  93. +2 −2 catalog/includes/functions/cache.php
  94. +3 −3 catalog/includes/functions/database.php
  95. +5 −5 catalog/includes/functions/general.php
  96. +1 −1 catalog/includes/functions/gzip_compression.php
  97. +6 −6 catalog/includes/functions/html_output.php
  98. +1 −1 catalog/includes/functions/password_funcs.php
  99. +1 −1 catalog/includes/functions/sessions.php
  100. +1 −1 catalog/includes/functions/specials.php
  101. +1 −1 catalog/includes/functions/validations.php
  102. +1 −1 catalog/includes/languages/english/account.php
  103. +1 −1 catalog/includes/languages/english/checkout_process.php
  104. +1 −1 catalog/includes/languages/english/checkout_success.php
  105. +1 −1 catalog/includes/languages/english/conditions.php
  106. +1 −1 catalog/includes/languages/english/contact_us.php
  107. +1 −1 catalog/includes/languages/english/info_shopping_cart.php
  108. +1 −1 catalog/includes/languages/english/modules/order_total/ot_loworderfee.php
  109. +1 −1 catalog/includes/languages/english/modules/order_total/ot_shipping.php
  110. +1 −1 catalog/includes/languages/english/modules/order_total/ot_subtotal.php
  111. +1 −1 catalog/includes/languages/english/modules/order_total/ot_tax.php
  112. +1 −1 catalog/includes/languages/english/modules/order_total/ot_total.php
  113. +1 −1 catalog/includes/languages/english/modules/payment/cod.php
  114. +10 −10 catalog/includes/languages/english/modules/payment/inpay.php
  115. +1 −1 catalog/includes/languages/english/modules/payment/pm2checkout.php
  116. +1 −1 catalog/includes/languages/english/modules/payment/psigate.php
  117. +1 −1 catalog/includes/languages/english/password_forgotten.php
  118. +1 −1 catalog/includes/languages/english/privacy.php
  119. +1 −1 catalog/includes/languages/english/product_reviews.php
  120. +1 −1 catalog/includes/languages/english/product_reviews_info.php
  121. +1 −1 catalog/includes/languages/english/products_new.php
  122. +1 −1 catalog/includes/languages/english/reviews.php
  123. +1 −1 catalog/includes/languages/english/shipping.php
  124. +1 −1 catalog/includes/languages/english/shopping_cart.php
  125. +1 −1 catalog/includes/languages/local/README
  126. +1 −1 catalog/includes/modules/boxes/bm_categories.php
  127. +3 −3 catalog/includes/modules/boxes/bm_currencies.php
  128. +87 −87 catalog/includes/modules/header_tags/ht_mailchimp_360/MCAPI.class.php
  129. +15 −15 catalog/includes/modules/header_tags/ht_mailchimp_360/mc360.php
  130. +1 −1 catalog/includes/modules/order_total/ot_tax.php
  131. +1 −1 catalog/includes/modules/payment/authorizenet_cc_aim.php
  132. +12 −12 catalog/includes/modules/payment/inpay.php
  133. +1 −1 catalog/includes/modules/payment/ipayment_cc.php
  134. +1 −1 catalog/includes/modules/payment/moneyorder.php
  135. +4 −4 catalog/includes/modules/payment/paypal_express.php
  136. +5 −5 catalog/includes/modules/payment/paypal_pro_dp.php
  137. +6 −6 catalog/includes/modules/payment/pm2checkout.php
  138. +3 −3 catalog/includes/modules/payment/psigate.php
  139. +7 −7 catalog/includes/modules/payment/rbsworldpay_hosted.php
  140. +2 −2 catalog/includes/modules/payment/sage_pay_direct.php
  141. +1 −1 catalog/includes/modules/shipping/table.php
  142. +23 −23 catalog/includes/modules/shipping/usps.php
  143. +15 −15 catalog/includes/modules/shipping/zones.php
  144. +1 −1 catalog/includes/modules/social_bookmarks/sb_digg.php
  145. +1 −1 catalog/includes/modules/social_bookmarks/sb_email.php
  146. +1 −1 catalog/includes/modules/social_bookmarks/sb_facebook.php
  147. +1 −1 catalog/includes/modules/social_bookmarks/sb_google_buzz.php
  148. +1 −1 catalog/includes/modules/social_bookmarks/sb_twitter.php
  149. +1 −1 catalog/includes/modules/social_bookmarks/sb_twitter_button.php
  150. +1 −1 catalog/includes/spiders.txt
  151. +1 −1 catalog/includes/template_bottom.php
  152. +1 −1 catalog/includes/version.php
  153. +1 −1 catalog/index.php
  154. +1 −1 catalog/install/includes/functions/general.php
  155. +1 −1 catalog/install/templates/pages/install_2.php
  156. +1 −1 catalog/install/templates/pages/install_3.php
  157. +1 −1 catalog/install/templates/pages/install_4.php
  158. +4 −4 catalog/shopping_cart.php
  159. +3 −3 extras/update-20060817.txt
  160. +8 −8 extras/upgrade-22rc2a.html
View
4 CHANGELOG
@@ -419,7 +419,7 @@ Please review the update-20060817.txt file for the important changes made.
* Fixed bug 1662; update of customers address through the My Account page
resulted in the country value not being stored properly and affected tax
rate values.
-
+
------------------------------------------------------------------------------
11/12/2005 osCommerce 2.2 Milestone 2 Update 051112
------------------------------------------------------------------------------
@@ -595,7 +595,7 @@ Please review the update-20060817.txt file for the important changes made.
* All address information is now stored in the address_book table only. This
change was made to reduce redundancy and allow more feautures in the
- checkout part (e.g. selection of different BillTo and SendTo addresses)
+ checkout part (e.g. selection of different BillTo and SendTo addresses)
------------------------------------------------------------------------------
03/06/2001 The Exchange Project Preview Release 2.1
View
182 LICENSE
@@ -1,91 +1,91 @@
-GNU GENERAL PUBLIC LICENSE
-
-
-Version 2, June 1991
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-
-Preamble
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-
-GNU GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-
-c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-
-NO WARRANTY
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-
-END OF TERMS AND CONDITIONS
+GNU GENERAL PUBLIC LICENSE
+
+
+Version 2, June 1991
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+
+Preamble
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+
+GNU GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+
+NO WARRANTY
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+END OF TERMS AND CONDITIONS
View
2 catalog/account_history_info.php
@@ -20,7 +20,7 @@
if (!isset($_GET['order_id']) || (isset($_GET['order_id']) && !is_numeric($_GET['order_id']))) {
tep_redirect(tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
}
-
+
$customer_info_query = tep_db_query("select o.customers_id from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_STATUS . " s where o.orders_id = '". (int)$_GET['order_id'] . "' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' and s.public_flag = '1'");
$customer_info = tep_db_fetch_array($customer_info_query);
if ($customer_info['customers_id'] != $customer_id) {
View
4 catalog/account_password.php
@@ -86,11 +86,11 @@
<td class="fieldKey"><?php echo ENTRY_PASSWORD_CURRENT; ?></td>
<td class="fieldValue"><?php echo tep_draw_password_field('password_current') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_CURRENT_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_CURRENT_TEXT . '</span>': ''); ?></td>
</tr>
- <tr>
+ <tr>
<td class="fieldKey"><?php echo ENTRY_PASSWORD_NEW; ?></td>
<td class="fieldValue"><?php echo tep_draw_password_field('password_new') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_NEW_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_NEW_TEXT . '</span>': ''); ?></td>
</tr>
- <tr>
+ <tr>
<td class="fieldKey"><?php echo ENTRY_PASSWORD_CONFIRMATION; ?></td>
<td class="fieldValue"><?php echo tep_draw_password_field('password_confirmation') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_CONFIRMATION_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '</span>': ''); ?></td>
</tr>
View
10 catalog/admin/administrators.php
@@ -129,7 +129,7 @@
if (tep_not_null($password)) {
// update password in htpasswd
if (is_array($htpasswd_array)) {
- $n=sizeof($htpasswd_array);
+ $n=sizeof($htpasswd_array);
for ($i=0; $i<$n; $i++) {
list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
@@ -146,7 +146,7 @@
tep_db_query("update " . TABLE_ADMINISTRATORS . " set user_password = '" . tep_db_input(tep_encrypt_password($password)) . "' where id = '" . (int)$_GET['aID'] . "'");
} elseif (!isset($_POST['htaccess']) || ($_POST['htaccess'] != 'true')) {
if (is_array($htpasswd_array)) {
- $n=sizeof($htpasswd_array);
+ $n=sizeof($htpasswd_array);
for ($i=0; $i<$n; $i++) {
list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
@@ -207,7 +207,7 @@
fclose($fp);
if (empty($htpasswd_array)) {
- $n=sizeof($htaccess_array);
+ $n=sizeof($htaccess_array);
for ($i=0; $i<$n; $i++) {
if (in_array($htaccess_array[$i], $authuserfile_array)) {
unset($htaccess_array[$i]);
@@ -280,7 +280,7 @@
}
if (is_array($htpasswd_array)) {
- $n=sizeof($htpasswd_array);
+ $n=sizeof($htpasswd_array);
for ($i=0; $i<$n; $i++) {
list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
@@ -338,7 +338,7 @@
if (is_array($htpasswd_array)) {
$default_flag = false;
- $n=sizeof($htpasswd_array);
+ $n=sizeof($htpasswd_array);
for ($i=0; $i<$n; $i++) {
list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
View
2 catalog/admin/backup.php
@@ -80,7 +80,7 @@
$index[$kname]['columns'][] = $keys['Column_name'];
}
- foreach ($index as $kname => $info) {
+ foreach ($index as $kname => $info) {
$schema .= ',' . "\n";
$columns = implode($info['columns'], ', ');
View
36 catalog/admin/categories.php
@@ -58,7 +58,7 @@
}
$languages = tep_get_languages();
- $n=sizeof($languages);
+ $n=sizeof($languages);
for ($i=0; $i<$n; $i++) {
$categories_name_array = $_POST['categories_name'];
@@ -100,7 +100,7 @@
$products = array();
$products_delete = array();
- $n=sizeof($categories);
+ $n=sizeof($categories);
for ($i=0; $i<$n; $i++) {
$product_ids_query = tep_db_query("select products_id from " . TABLE_PRODUCTS_TO_CATEGORIES . " where categories_id = '" . (int)$categories[$i]['id'] . "'");
@@ -109,10 +109,10 @@
}
}
- foreach ($products as $key => $value) {
+ foreach ($products as $key => $value) {
$category_ids = '';
- $n=sizeof($value['categories']);
+ $n=sizeof($value['categories']);
for ($i=0; $i<$n; $i++) {
$category_ids .= "'" . (int)$value['categories'][$i] . "', ";
}
@@ -127,7 +127,7 @@
// removing categories can be a lengthy process
tep_set_time_limit(0);
- $n=sizeof($categories);
+ $n=sizeof($categories);
for ($i=0; $i<$n; $i++) {
tep_remove_category($categories[$i]['id']);
}
@@ -150,7 +150,7 @@
$product_id = tep_db_prepare_input($_POST['products_id']);
$product_categories = $_POST['product_categories'];
- $n=sizeof($product_categories);
+ $n=sizeof($product_categories);
for ($i=0; $i<$n; $i++) {
tep_db_query("delete from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id = '" . (int)$product_id . "' and categories_id = '" . (int)$product_categories[$i] . "'");
}
@@ -249,7 +249,7 @@
}
$languages = tep_get_languages();
- $n=sizeof($languages);
+ $n=sizeof($languages);
for ($i=0; $i<$n; $i++) {
$language_id = $languages[$i]['id'];
@@ -451,7 +451,7 @@
<script type="text/javascript"><!--
var tax_rates = new Array();
<?php
- $n=sizeof($tax_class_array);
+ $n=sizeof($tax_class_array);
for ($i=0; $i<$n; $i++) {
if ($tax_class_array[$i]['id'] > 0) {
echo 'tax_rates["' . $tax_class_array[$i]['id'] . '"] = ' . tep_get_tax_rate_value($tax_class_array[$i]['id']) . ';' . "\n";
@@ -533,7 +533,7 @@ function updateNet() {
<td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
</tr>
<?php
- $n=sizeof($languages);
+ $n=sizeof($languages);
for ($i=0; $i<$n; $i++) {
?>
<tr>
@@ -565,7 +565,7 @@ function updateNet() {
updateGross();
//--></script>
<?php
- $n=sizeof($languages);
+ $n=sizeof($languages);
for ($i=0; $i<$n; $i++) {
?>
<tr>
@@ -669,7 +669,7 @@ function showPiDelConfirm(piId) {
<td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
</tr>
<?php
- $n=sizeof($languages);
+ $n=sizeof($languages);
for ($i=0; $i<$n; $i++) {
?>
<tr>
@@ -712,7 +712,7 @@ function showPiDelConfirm(piId) {
$products_image_name = $pInfo->products_image;
$languages = tep_get_languages();
- $n=sizeof($languages);
+ $n=sizeof($languages);
for ($i=0; $i<$n; $i++) {
$pInfo->products_name = tep_get_products_name($pInfo->products_id, $languages[$i]['id']);
$pInfo->products_description = tep_get_products_description($pInfo->products_id, $languages[$i]['id']);
@@ -911,7 +911,7 @@ function showPiDelConfirm(piId) {
$cPath_back = '';
if (sizeof($cPath_array) > 0) {
- $n=sizeof($cPath_array)-1;
+ $n=sizeof($cPath_array)-1;
for ($i=0; $i<$n; $i++) {
if (empty($cPath_back)) {
$cPath_back .= $cPath_array[$i];
@@ -944,7 +944,7 @@ function showPiDelConfirm(piId) {
$category_inputs_string = '';
$languages = tep_get_languages();
- $n = sizeof($languages);
+ $n = sizeof($languages);
for ($i = 0; $i < $n; $i++) {
$category_inputs_string .= '<br />' . tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . '&nbsp;' . tep_draw_input_field('categories_name[' . $languages[$i]['id'] . ']');
}
@@ -962,7 +962,7 @@ function showPiDelConfirm(piId) {
$category_inputs_string = '';
$languages = tep_get_languages();
- $n = sizeof($languages);
+ $n = sizeof($languages);
for ($i = 0; $i < $n; $i++) {
$category_inputs_string .= '<br />' . tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . '&nbsp;' . tep_draw_input_field('categories_name[' . $languages[$i]['id'] . ']', tep_get_category_name($cInfo->categories_id, $languages[$i]['id']));
}
@@ -1000,10 +1000,10 @@ function showPiDelConfirm(piId) {
$product_categories_string = '';
$product_categories = tep_generate_category_path($pInfo->products_id, 'product');
- $n = sizeof($product_categories);
+ $n = sizeof($product_categories);
for ($i = 0; $i < $n; $i++) {
$category_path = '';
- $k = sizeof($product_categories[$i]);
+ $k = sizeof($product_categories[$i]);
for ($j = 0; $j < $k; $j++) {
$category_path .= $product_categories[$i][$j]['text'] . '&nbsp;&gt;&nbsp;';
}
@@ -1088,4 +1088,4 @@ function showPiDelConfirm(piId) {
require(DIR_WS_INCLUDES . 'template_bottom.php');
require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>
+?>
View
270 catalog/admin/ext/modules/payment/sofortueberweisung/install.php
@@ -82,29 +82,29 @@ function tep_create_random_value($length, $type = 'mixed') {
<link rel="stylesheet" type="text/css" href="https://www.sofortueberweisung.de/cms/modul/style.css">
<script type="text/javascript">
function init() {
- if(false) {
- document.getElementById('table1').style.display = '';
- document.getElementById('table2').style.display = '';
- document.getElementById('table3').style.display = '';
- document.getElementById('table4').style.display = '';
- document.getElementById('table5').style.display = '';
- document.getElementById('table6').style.display = '';
- }
+ if(false) {
+ document.getElementById('table1').style.display = '';
+ document.getElementById('table2').style.display = '';
+ document.getElementById('table3').style.display = '';
+ document.getElementById('table4').style.display = '';
+ document.getElementById('table5').style.display = '';
+ document.getElementById('table6').style.display = '';
+ }
}
function toggleTableById(id) {
- if(document.getElementById(id).style.display == 'none')
- document.getElementById(id).style.display = '';
- else
- document.getElementById(id).style.display = 'none';
+ if(document.getElementById(id).style.display == 'none')
+ document.getElementById(id).style.display = '';
+ else
+ document.getElementById(id).style.display = 'none';
}
function giveValue(value,name0, name1, name2, name3, name4) {
- if(name0 != '') document.getElementsByName(name0)[0].value = value;
- if(name1 != '') document.getElementsByName(name1)[0].value = value;
- if(name2 != '') document.getElementsByName(name2)[0].value = value;
- if(name3 != '') document.getElementsByName(name3)[0].value = value;
- if(name4 != '') document.getElementsByName(name4)[0].value = value;
+ if(name0 != '') document.getElementsByName(name0)[0].value = value;
+ if(name1 != '') document.getElementsByName(name1)[0].value = value;
+ if(name2 != '') document.getElementsByName(name2)[0].value = value;
+ if(name3 != '') document.getElementsByName(name3)[0].value = value;
+ if(name4 != '') document.getElementsByName(name4)[0].value = value;
}
function checkChar(string, validChars) {
@@ -117,53 +117,53 @@ function checkChar(string, validChars) {
}
function submitForm() {
- var is_error=false;
- var wert, wert1, wert2;
+ var is_error=false;
+ var wert, wert1, wert2;
- wert = document.getElementById('sammel_input_project_name').value;
- if(!is_error) if(wert == '') {alert('Bitte Projektnamen eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_project_name').value;
+ if(!is_error) if(wert == '') {alert('Bitte Projektnamen eintragen'); is_error=true;}
- wert = document.getElementById('sammel_input_name').value;
- if(!is_error) if(wert == '') {alert('Bitte Namen eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_name').value;
+ if(!is_error) if(wert == '') {alert('Bitte Namen eintragen'); is_error=true;}
- wert = document.getElementById('sammel_input_firma').value;
- if(!is_error) if(wert == '') {alert('Bitte Firma eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_firma').value;
+ if(!is_error) if(wert == '') {alert('Bitte Firma eintragen'); is_error=true;}
- wert = document.getElementById('sammel_input_strasse').value;
- if(!is_error) if(wert == '') {alert('Bitte Strasse eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_strasse').value;
+ if(!is_error) if(wert == '') {alert('Bitte Strasse eintragen'); is_error=true;}
- wert = document.getElementById('sammel_input_plz').value;
- if(!is_error) if(!checkChar(wert,'0123456789') || wert == '' || (wert.length!=5 && wert.length!=4)) {alert('PLZ muss aus 4 oder 5 Ziffern bestehen'); is_error=true;}
+ wert = document.getElementById('sammel_input_plz').value;
+ if(!is_error) if(!checkChar(wert,'0123456789') || wert == '' || (wert.length!=5 && wert.length!=4)) {alert('PLZ muss aus 4 oder 5 Ziffern bestehen'); is_error=true;}
- wert = document.getElementById('sammel_input_ort').value;
- if(!is_error) if(wert == '') {alert('Bitte Ort eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_ort').value;
+ if(!is_error) if(wert == '') {alert('Bitte Ort eintragen'); is_error=true;}
- wert = document.getElementById('sammel_input_land').value;
- if(!is_error) if(wert == '') {alert('Bitte Land eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_land').value;
+ if(!is_error) if(wert == '') {alert('Bitte Land eintragen'); is_error=true;}
- wert = document.getElementById('sammel_input_konto_inhaber').value;
- if(!is_error) if(wert == '') {alert('Bitte Kontoinhaber eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_konto_inhaber').value;
+ if(!is_error) if(wert == '') {alert('Bitte Kontoinhaber eintragen'); is_error=true;}
- wert = document.getElementById('sammel_input_kontonummer').value;
- if(!is_error) if(!checkChar(wert,'0123456789') || wert == '') {alert('Kontonummer darf nur aus Ziffern bestehen'); is_error=true;}
+ wert = document.getElementById('sammel_input_kontonummer').value;
+ if(!is_error) if(!checkChar(wert,'0123456789') || wert == '') {alert('Kontonummer darf nur aus Ziffern bestehen'); is_error=true;}
- wert = document.getElementById('sammel_input_blz').value;
- if(!is_error) if(!checkChar(wert,'0123456789') || wert == '' || wert.length!=8) {alert('BLZ muss aus 8 Ziffern bestehen'); is_error=true;}
+ wert = document.getElementById('sammel_input_blz').value;
+ if(!is_error) if(!checkChar(wert,'0123456789') || wert == '' || wert.length!=8) {alert('BLZ muss aus 8 Ziffern bestehen'); is_error=true;}
- wert = document.getElementById('sammel_input_bank').value;
- if(!is_error) if(wert == '') {alert('Bitte Bankname eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_bank').value;
+ if(!is_error) if(wert == '') {alert('Bitte Bankname eintragen'); is_error=true;}
- wert = document.getElementById('sammel_input_homepage').value;
- if(!is_error) if(wert == '') {alert('Bitte Homepage eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_homepage').value;
+ if(!is_error) if(wert == '') {alert('Bitte Homepage eintragen'); is_error=true;}
- wert = document.getElementById('sammel_input_email').value;
- if(!is_error) if(wert == '') {alert('Bitte Email-Adresse eintragen'); is_error=true;}
+ wert = document.getElementById('sammel_input_email').value;
+ if(!is_error) if(wert == '') {alert('Bitte Email-Adresse eintragen'); is_error=true;}
- //if(!is_error) if(document.getElementById('sammel_input_ustid').value == '' && document.getElementById('sammel_input_steuernummer').value == '') {alert('Bitte alle Pflichtfelder ausf�llen'); is_error=true;}
+ //if(!is_error) if(document.getElementById('sammel_input_ustid').value == '' && document.getElementById('sammel_input_steuernummer').value == '') {alert('Bitte alle Pflichtfelder ausf�llen'); is_error=true;}
- wert1 = document.getElementById('sammel_input_telefon').value;
- wert2 = document.getElementById('sammel_input_mobil').value;
- if(!is_error) if(wert1 == '' && wert2 == '') {alert('Es muss mindestens ein telefonischer Kontakt angegeben sein'); is_error=true;}
+ wert1 = document.getElementById('sammel_input_telefon').value;
+ wert2 = document.getElementById('sammel_input_mobil').value;
+ if(!is_error) if(wert1 == '' && wert2 == '') {alert('Es muss mindestens ein telefonischer Kontakt angegeben sein'); is_error=true;}
// adjust Backlink
document.getElementsByName('user[backlink]')[0].value += '&konto_inhaber=' + escape(document.getElementById('sammel_input_konto_inhaber').value);
@@ -172,7 +172,7 @@ function submitForm() {
document.getElementsByName('user[backlink]')[0].value += '&konto_bank=' + escape(document.getElementById('sammel_input_bank').value);
- if(!is_error) document.getElementById('form').submit();
+ if(!is_error) document.getElementById('form').submit();
}
</script>
<style>
@@ -192,86 +192,86 @@ function submitForm() {
</tr>
<tr>
<td>
- <img src="https://www.sofortueberweisung.de/cms/p.gif" width=5 height=5 alt="" border=0 vspace=0 hspace=0>
- </td>
+ <img src="https://www.sofortueberweisung.de/cms/p.gif" width=5 height=5 alt="" border=0 vspace=0 hspace=0>
+ </td>
</tr>
<tr>
<td>
<table align="center" width="970" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td><img src="https://www.sofortueberweisung.de/cms/design/content_01.gif" width="190" height="10" alt="" border=0 vspace=0 hspace=0></td>
- <td><img src="https://www.sofortueberweisung.de/cms/design/content_02.gif" width="212" height="10" alt="" border=0 vspace=0 hspace=0></td>
- <td align="right"><img src="https://www.sofortueberweisung.de/cms/design/content_03.gif" width="568" height="10" alt="" border=0 vspace=0 hspace=0></td>
- </tr>
- </table>
- </td>
+ <tr>
+ <td><img src="https://www.sofortueberweisung.de/cms/design/content_01.gif" width="190" height="10" alt="" border=0 vspace=0 hspace=0></td>
+ <td><img src="https://www.sofortueberweisung.de/cms/design/content_02.gif" width="212" height="10" alt="" border=0 vspace=0 hspace=0></td>
+ <td align="right"><img src="https://www.sofortueberweisung.de/cms/design/content_03.gif" width="568" height="10" alt="" border=0 vspace=0 hspace=0></td>
+ </tr>
+ </table>
+ </td>
</tr>
<tr>
<td bgcolor="white">
- <table width="100%" border="0">
- <tr>
- <td width="50%">
+ <table width="100%" border="0">
+ <tr>
+ <td width="50%">
<table border="0" cellpadding="2" cellspacing="0" style="padding-left: 20px;">
- <tr><td>Projektname*</td><td><input id="sammel_input_project_name" size="40" type="text" value="<?php echo STORE_NAME; ?>" onkeyup="javascript:giveValue(this.value,'project[projekt_name]', '', '', '', '')"></td></tr>
- <tr><td>Projektbeschreibung</td><td><input size="40" type="text" onkeyup="javascript:giveValue(this.value,'project[projekt_beschreibung]', '', '', '', '' )"></td></tr>
+ <tr><td>Projektname*</td><td><input id="sammel_input_project_name" size="40" type="text" value="<?php echo STORE_NAME; ?>" onkeyup="javascript:giveValue(this.value,'project[projekt_name]', '', '', '', '')"></td></tr>
+ <tr><td>Projektbeschreibung</td><td><input size="40" type="text" onkeyup="javascript:giveValue(this.value,'project[projekt_beschreibung]', '', '', '', '' )"></td></tr>
<tr><td colspan="2"><hr /></td></tr>
- <tr><td>Anrede</td><td><input size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[r_anrede]','user[anspr_anrede]','project[anrede]', '', '')"></td></tr>
- <tr><td>Name*</td><td><input id="sammel_input_name" value="<?php echo STORE_OWNER; ?>" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[r_name]','user[anspr_name]','project[name]', '', '')">
- <tr><td>Firma*</td><td><input id="sammel_input_firma" size="40" type="text" value="<?php echo STORE_NAME; ?>" onkeyup="javascript:giveValue(this.value,'user[firma]','user[r_firma]','project[firma]', '', '')"></td></tr>
- <tr><td>Rechtsform</td><td>
- <select onchange="javascript:giveValue(this.value,'user[rechtsform]', '', '', '', '')">
- <option value="">Bitte ausw�hlen...</option>
- <option value="AG" >AG</option>
- <option value="AG & Co. OHG" >AG & Co. OHG</option>
- <option value="ARGE" >ARGE</option>
- <option value="e.G." >e.G.</option>
- <option value="e.K." >e.K.</option>
- <option value="e.V." >e.V.</option>
- <option value="GbR" >GbR</option>
- <option value="GmbH" >GmbH</option>
- <option value="GmbH & Co. KG" >GmbH & Co. KG</option>
- <option value="GmbH & Co. OHG" >GmbH & Co. OHG</option>
- <option value="KG" >KG</option>
- <option value="KGaA" >KGaA</option>
- <option value="OHG" >OHG</option>
- <option value="Selbstst�ndig" >Selbstst�ndig</option>
- <option value="VvAG" >VvAG</option>
- <option value="Sonstige" >Sonstige</option>
- </select>
- <tr><td>Strasse*</td><td><input id="sammel_input_strasse" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[strasse]','user[r_strasse]','project[strasse]', '', '')"></td></tr>
- <tr><td>PLZ*</td><td><input maxlength="5" id="sammel_input_plz" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[plz]','user[r_plz]','project[plz]', '', '')"></td></tr>
- <tr><td>Ort*</td><td><input id="sammel_input_ort" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[ort]','user[r_ort]','project[ort]', '', '')"></td></tr>
- <tr><td>Land*</td><td><input id="sammel_input_land" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[land]','user[r_land]','project[land]', '', '')"></td></tr>
- <tr><td>Telefon+</td><td><input id="sammel_input_telefon" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[telefon]','user[anspr_fon]','project[telefon]', '', '')"></td></tr>
- <tr><td>Mobil+</td><td><input id="sammel_input_mobil" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[anspr_mobil]', '', '', '', '')"></td></tr>
- <tr><td>Telefax</td><td><input size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[anspr_fax]','project[telefax]','user[telefax]', '', '')"></td></tr>
+ <tr><td>Anrede</td><td><input size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[r_anrede]','user[anspr_anrede]','project[anrede]', '', '')"></td></tr>
+ <tr><td>Name*</td><td><input id="sammel_input_name" value="<?php echo STORE_OWNER; ?>" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[r_name]','user[anspr_name]','project[name]', '', '')">
+ <tr><td>Firma*</td><td><input id="sammel_input_firma" size="40" type="text" value="<?php echo STORE_NAME; ?>" onkeyup="javascript:giveValue(this.value,'user[firma]','user[r_firma]','project[firma]', '', '')"></td></tr>
+ <tr><td>Rechtsform</td><td>
+ <select onchange="javascript:giveValue(this.value,'user[rechtsform]', '', '', '', '')">
+ <option value="">Bitte ausw�hlen...</option>
+ <option value="AG" >AG</option>
+ <option value="AG & Co. OHG" >AG & Co. OHG</option>
+ <option value="ARGE" >ARGE</option>
+ <option value="e.G." >e.G.</option>
+ <option value="e.K." >e.K.</option>
+ <option value="e.V." >e.V.</option>
+ <option value="GbR" >GbR</option>
+ <option value="GmbH" >GmbH</option>
+ <option value="GmbH & Co. KG" >GmbH & Co. KG</option>
+ <option value="GmbH & Co. OHG" >GmbH & Co. OHG</option>
+ <option value="KG" >KG</option>
+ <option value="KGaA" >KGaA</option>
+ <option value="OHG" >OHG</option>
+ <option value="Selbstst�ndig" >Selbstst�ndig</option>
+ <option value="VvAG" >VvAG</option>
+ <option value="Sonstige" >Sonstige</option>
+ </select>
+ <tr><td>Strasse*</td><td><input id="sammel_input_strasse" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[strasse]','user[r_strasse]','project[strasse]', '', '')"></td></tr>
+ <tr><td>PLZ*</td><td><input maxlength="5" id="sammel_input_plz" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[plz]','user[r_plz]','project[plz]', '', '')"></td></tr>
+ <tr><td>Ort*</td><td><input id="sammel_input_ort" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[ort]','user[r_ort]','project[ort]', '', '')"></td></tr>
+ <tr><td>Land*</td><td><input id="sammel_input_land" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[land]','user[r_land]','project[land]', '', '')"></td></tr>
+ <tr><td>Telefon+</td><td><input id="sammel_input_telefon" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[telefon]','user[anspr_fon]','project[telefon]', '', '')"></td></tr>
+ <tr><td>Mobil+</td><td><input id="sammel_input_mobil" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[anspr_mobil]', '', '', '', '')"></td></tr>
+ <tr><td>Telefax</td><td><input size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[anspr_fax]','project[telefax]','user[telefax]', '', '')"></td></tr>
<tr><td colspan="2"><hr /></td></tr>
- <tr><td colspan="2"><strong>Konto auf welches die Zahlungseing�nge gutgeschrieben werden:</strong></td></tr>
- <tr><td>Konto Inhaber*</td><td><input id="sammel_input_konto_inhaber" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[elv_konto_inhaber]', 'project[an_konto_inhaber]', '', '', '')"></td></tr>
- <tr><td>Kontonummer*</td><td><input maxlength="15" id="sammel_input_kontonummer" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[elv_konto_nr]', 'project[an_konto_nr]', '', '', '')"></td></tr>
- <tr><td>Bankleitzahl*</td><td><input maxlength="8" id="sammel_input_blz" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[elv_konto_blz]', 'project[an_konto_blz]', '', '', '')"></td></tr>
- <tr><td>Name der Bank*</td><td><input id="sammel_input_bank" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[elv_konto_bank]', 'project[an_konto_bank]', '', '', '')"></td></tr>
+ <tr><td colspan="2"><strong>Konto auf welches die Zahlungseing�nge gutgeschrieben werden:</strong></td></tr>
+ <tr><td>Konto Inhaber*</td><td><input id="sammel_input_konto_inhaber" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[elv_konto_inhaber]', 'project[an_konto_inhaber]', '', '', '')"></td></tr>
+ <tr><td>Kontonummer*</td><td><input maxlength="15" id="sammel_input_kontonummer" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[elv_konto_nr]', 'project[an_konto_nr]', '', '', '')"></td></tr>
+ <tr><td>Bankleitzahl*</td><td><input maxlength="8" id="sammel_input_blz" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[elv_konto_blz]', 'project[an_konto_blz]', '', '', '')"></td></tr>
+ <tr><td>Name der Bank*</td><td><input id="sammel_input_bank" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[elv_konto_bank]', 'project[an_konto_bank]', '', '', '')"></td></tr>
<tr><td colspan="2"><strong>Hiermit beauftrage ich Sie, die f�lligen <a href="https://www.sofortueberweisung.de/cms/index.php?plink=tarife&l=1&fs=" target="_blank">Betr�ge</a> per Lastschrift von meinem Konto einzuziehen.</strong></td></tr>
- <tr><td>Ustid</td><td><input id="sammel_input_ustid" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[ustid]', '', '', '', '')"></td></tr>
- <tr><td>Steuernr</td><td><input id="sammel_input_steuernummer" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[steuernr]', '', '', '', '')"></td></tr>
+ <tr><td>Ustid</td><td><input id="sammel_input_ustid" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[ustid]', '', '', '', '')"></td></tr>
+ <tr><td>Steuernr</td><td><input id="sammel_input_steuernummer" size="40" type="text" onkeyup="javascript:giveValue(this.value,'user[steuernr]', '', '', '', '')"></td></tr>
<tr><td colspan="2"><hr /></td></tr>
- <tr><td>Homepage*</td><td><input id="sammel_input_homepage" size="40" type="text" value="<?php echo tep_catalog_href_link() ;?>" onkeyup="javascript:giveValue(this.value,'project[homepage]','user[homepage]', '', '', '')"></td></tr>
- <tr><td>Email*</td><td><input id="sammel_input_email" size="40" type="text" value="<?php echo STORE_OWNER_EMAIL_ADDRESS; ?>" onkeyup="javascript:giveValue(this.value,'user[r_email]','user[anspr_email]','project[email]','user[email]','alert[alert_email_adresse]')"></td></tr>
- <tr><td>Email-Benachrichtigungen bei Zahlungseing�ngen aktivieren:</td>
- <td><input type="radio" name="sammel_input_email_flag" value="1" CHECKED onfocus="javascript:giveValue(this.value,'alert[alert_email_status]', '', '', '', '')"> Ja <input type="radio" name="sammel_input_email_flag" value="0" onfocus="javascript:giveValue(this.value,'alert[alert_email_status]', '', '', '', '')"> Nein</td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="button" name="Absenden" value="Absenden" onclick="javascript:submitForm()"><br /><strong>Nach der Registrierung des Projekts bei Sofort�berweisung, unbedingt dem Link zur�ck zum Shop folgen!</strong>
- </td>
- </tr>
- </table>
- </td>
- <td valign="top" align="left">
+ <tr><td>Homepage*</td><td><input id="sammel_input_homepage" size="40" type="text" value="<?php echo tep_catalog_href_link() ;?>" onkeyup="javascript:giveValue(this.value,'project[homepage]','user[homepage]', '', '', '')"></td></tr>
+ <tr><td>Email*</td><td><input id="sammel_input_email" size="40" type="text" value="<?php echo STORE_OWNER_EMAIL_ADDRESS; ?>" onkeyup="javascript:giveValue(this.value,'user[r_email]','user[anspr_email]','project[email]','user[email]','alert[alert_email_adresse]')"></td></tr>
+ <tr><td>Email-Benachrichtigungen bei Zahlungseing�ngen aktivieren:</td>
+ <td><input type="radio" name="sammel_input_email_flag" value="1" CHECKED onfocus="javascript:giveValue(this.value,'alert[alert_email_status]', '', '', '', '')"> Ja <input type="radio" name="sammel_input_email_flag" value="0" onfocus="javascript:giveValue(this.value,'alert[alert_email_status]', '', '', '', '')"> Nein</td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input type="button" name="Absenden" value="Absenden" onclick="javascript:submitForm()"><br /><strong>Nach der Registrierung des Projekts bei Sofort�berweisung, unbedingt dem Link zur�ck zum Shop folgen!</strong>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td valign="top" align="left">
<table border="0" cellspacing="0">
- <tr><td><a href="#" onclick="javascript:toggleTableById('table2')"><u>Alternative Rechnungsanschrift</u></a></td></tr>
- <tr><td>
- <table border="0" cellspacing="0" id="table2" style="display:none">
+ <tr><td><a href="#" onclick="javascript:toggleTableById('table2')"><u>Alternative Rechnungsanschrift</u></a></td></tr>
+ <tr><td>
+ <table border="0" cellspacing="0" id="table2" style="display:none">
<tr><td>Anrede</td><td><input size="40" type="text" name="user[r_anrede]" value=""></td></tr>
<tr><td>Firma</td><td><input size="40" type="text" name="user[r_firma]" value="<?php echo STORE_NAME; ?>"></td></tr>
<tr><td>Name</td><td><input size="40" type="text" name="user[r_name]" value=""></td></tr>
@@ -280,12 +280,12 @@ function submitForm() {
<tr><td>Ort</td><td><input size="40" type="text" name="user[r_ort]" value=""></td></tr>
<tr><td>Land</td><td><input size="40" type="text" name="user[r_land]" value=""></td></tr>
<tr><td>Email</td><td><input size="40" type="text" name="user[r_email]" value="<?php echo STORE_OWNER_EMAIL_ADDRESS; ?>"></td></tr>
- </table>
- </td></tr>
+ </table>
+ </td></tr>
</table>
- <table border="0" cellspacing="0">
- <tr><td><a href="#" onclick="javascript:toggleTableById('table4')"><u>Alternativer Ansprechpartner</u></a></td></tr>
- <tr><td>
+ <table border="0" cellspacing="0">
+ <tr><td><a href="#" onclick="javascript:toggleTableById('table4')"><u>Alternativer Ansprechpartner</u></a></td></tr>
+ <tr><td>
<table border="0" cellspacing="0" id="table4" style="display:none">
<tr><td>Anrede</td><td><input size="40" type="text" name="user[anspr_anrede]" value=""></td><td>&nbsp;</td></tr>
<tr><td>Name</td><td><input size="40" type="text" name="user[anspr_name]" value=""></td><td>&nbsp;</td></tr>
@@ -294,23 +294,23 @@ function submitForm() {
<tr><td>Mobil</td><td><input size="40" type="text" name="user[anspr_mobil]" value=""></td><td>&nbsp;</td></tr>
<tr><td>Email</td><td><input size="40" type="text" name="user[anspr_email]" value="<?php echo STORE_OWNER_EMAIL_ADDRESS; ?>"></td><td>&nbsp;</td></tr>
</table>
- </td></tr>
- </table>
- </td>
- </tr>
- <tr><td style="padding-left: 20px;">* zeichnet Pflichtfelder aus<br />+ zeichnet Felder aus, bei denen mindestens eines gef�llt sein muss<br />Alle Zahlen sind ohne Leerzeichen einzugeben</td></tr>
+ </td></tr>
+ </table>
+ </td>
+ </tr>
+ <tr><td style="padding-left: 20px;">* zeichnet Pflichtfelder aus<br />+ zeichnet Felder aus, bei denen mindestens eines gef�llt sein muss<br />Alle Zahlen sind ohne Leerzeichen einzugeben</td></tr>
</table>
</td></tr>
<tr>
<td>
- <table width="970" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="190" valign="top"><img src="https://www.sofortueberweisung.de/cms/design/content_11.gif" width=190 height=10 alt="" border=0 vspace=0 hspace=0></td>
- <td bgcolor="white"><img src="https://www.sofortueberweisung.de/cms/p.gif" width=5 height=10 alt="" border=0 vspace=0 hspace=0></td>
- <td align="right" width="568"><img src="https://www.sofortueberweisung.de/cms/design/content_13.gif" width=568 height=10 alt="" border=0 vspace=0 hspace=0></td>
- </tr>
- </table>
- </td>
+ <table width="970" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td width="190" valign="top"><img src="https://www.sofortueberweisung.de/cms/design/content_11.gif" width=190 height=10 alt="" border=0 vspace=0 hspace=0></td>
+ <td bgcolor="white"><img src="https://www.sofortueberweisung.de/cms/p.gif" width=5 height=10 alt="" border=0 vspace=0 hspace=0></td>
+ <td align="right" width="568"><img src="https://www.sofortueberweisung.de/cms/design/content_13.gif" width=568 height=10 alt="" border=0 vspace=0 hspace=0></td>
+ </tr>
+ </table>
+ </td>
</tr>
</table>
View
2 catalog/admin/geo_zones.php
@@ -100,7 +100,7 @@ function update_zone(theForm) {
while(NumState > 0) {
NumState--;
theForm.zone_id.options[NumState] = null;
- }
+ }
SelectedCountry = theForm.zone_country_id.options[theForm.zone_country_id.selectedIndex].value;
View
2 catalog/admin/includes/application_bottom.php
@@ -17,4 +17,4 @@
if (!is_object($logger)) $logger = new logger;
echo $logger->timer_stop(DISPLAY_PAGE_PARSE_TIME);
}
-?>
+?>
View
2 catalog/admin/includes/classes/currencies.php
@@ -21,7 +21,7 @@ function currencies() {
$this->currencies = array();
$currencies_query = tep_db_query("select code, title, symbol_left, symbol_right, decimal_point, thousands_point, decimal_places, value from " . TABLE_CURRENCIES);
while ($currencies = tep_db_fetch_array($currencies_query)) {
- $this->currencies[$currencies['code']] = array('title' => $currencies['title'],
+ $this->currencies[$currencies['code']] = array('title' => $currencies['title'],
'symbol_left' => $currencies['symbol_left'],
'symbol_right' => $currencies['symbol_right'],
'decimal_point' => $currencies['decimal_point'],
View
2 catalog/admin/includes/classes/language.php
@@ -83,7 +83,7 @@ function get_browser_language() {
$n=sizeof($this->browser_languages);
for ($i=0; $i<$n; $i++) {
- foreach ($this->languages as $key => $value) {
+ foreach ($this->languages as $key => $value) {
if (preg_match('/^(' . $value . ')(;q=[0-9]\\.[0-9])?$/i', $this->browser_languages[$i]) && isset($this->catalog_languages[$key])) {
$this->language = $this->catalog_languages[$key];
break 2;
View
2 catalog/admin/includes/classes/message_stack.php
@@ -26,7 +26,7 @@ function messageStack() {
$this->errors = array();
if (tep_session_is_registered('messageToStack')) {
- $n = sizeof($messageToStack);
+ $n = sizeof($messageToStack);
for ($i = 0; $i < $n; $i++) {
$this->add($messageToStack[$i]['text'], $messageToStack[$i]['type']);
}
View
14 catalog/admin/includes/classes/mime.php
@@ -24,7 +24,7 @@ class mime {
/**
* Constructor.
- *
+ *
* Sets up the object.
*
* @param $body - The body of the mime part if any.
@@ -98,7 +98,7 @@ function mime($body, $params = '') {
/**
* encode()
- *
+ *
* Encodes and returns the email. Also stores
* it in the encoded member variable
*
@@ -126,7 +126,7 @@ function encode() {
$_subparts = $this->_subparts[$i];
$tmp = $_subparts->encode();
- foreach ($tmp['headers'] as $key => $value) {
+ foreach ($tmp['headers'] as $key => $value) {
$headers[] = $key . ': ' . $value;
}
@@ -148,7 +148,7 @@ function encode() {
/**
* &addSubPart()
- *
+ *
* Adds a subpart to current mime part and returns
* a reference to it
*
@@ -172,7 +172,7 @@ function addSubPart($body, $params) {
/**
* _getEncodedData()
- *
+ *
* Returns encoded data based upon encoding passed to it
*
* @param $data The data to encode.
@@ -197,11 +197,11 @@ function _getEncodedData($data, $encoding) {
/**
* quoteadPrintableEncode()
- *
+ *
* Encodes data to quoted-printable standard.
*
* @param $input The data to encode
- * @param $line_max Optional max line length. Should
+ * @param $line_max Optional max line length. Should
* not be more than 76 chars
*
* @access private
View
446 catalog/admin/includes/classes/passwordhash.php
@@ -26,229 +26,229 @@
# requirements (there can be none), but merely suggestions.
#
class PasswordHash {
- var $itoa64;
- var $iteration_count_log2;
- var $portable_hashes;
- var $random_state;
-
- function PasswordHash($iteration_count_log2, $portable_hashes)
- {
- $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-
- if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
- $iteration_count_log2 = 8;
- $this->iteration_count_log2 = $iteration_count_log2;
-
- $this->portable_hashes = $portable_hashes;
-
- $this->random_state = microtime();
- if (function_exists('getmypid'))
- $this->random_state .= getmypid();
- }
-
- function get_random_bytes($count)
- {
- $output = '';
- if (@is_readable('/dev/urandom') &&
- ($fh = @fopen('/dev/urandom', 'rb'))) {
- $output = fread($fh, $count);
- fclose($fh);
- }
-
- if (strlen($output) < $count) {
- $output = '';
- for ($i = 0; $i < $count; $i += 16) {
- $this->random_state =
- md5(microtime() . $this->random_state);
- $output .=
- pack('H*', md5($this->random_state));
- }
- $output = substr($output, 0, $count);
- }
-
- return $output;
- }
-
- function encode64($input, $count)
- {
- $output = '';
- $i = 0;
- do {
- $value = ord($input[$i++]);
- $output .= $this->itoa64[$value & 0x3f];
- if ($i < $count)
- $value |= ord($input[$i]) << 8;
- $output .= $this->itoa64[($value >> 6) & 0x3f];
- if ($i++ >= $count)
- break;
- if ($i < $count)
- $value |= ord($input[$i]) << 16;
- $output .= $this->itoa64[($value >> 12) & 0x3f];
- if ($i++ >= $count)
- break;
- $output .= $this->itoa64[($value >> 18) & 0x3f];
- } while ($i < $count);
-
- return $output;
- }
-
- function gensalt_private($input)
- {
- $output = '$P$';
- $output .= $this->itoa64[min($this->iteration_count_log2 +
- ((PHP_VERSION >= '5') ? 5 : 3), 30)];
- $output .= $this->encode64($input, 6);
-
- return $output;
- }
-
- function crypt_private($password, $setting)
- {
- $output = '*0';
- if (substr($setting, 0, 2) == $output)
- $output = '*1';
-
- $id = substr($setting, 0, 3);
- # We use "$P$", phpBB3 uses "$H$" for the same thing
- if ($id != '$P$' && $id != '$H$')
- return $output;
-
- $count_log2 = strpos($this->itoa64, $setting[3]);
- if ($count_log2 < 7 || $count_log2 > 30)
- return $output;
-
- $count = 1 << $count_log2;
-
- $salt = substr($setting, 4, 8);
- if (strlen($salt) != 8)
- return $output;
-
- # We're kind of forced to use MD5 here since it's the only
- # cryptographic primitive available in all versions of PHP
- # currently in use. To implement our own low-level crypto
- # in PHP would result in much worse performance and
- # consequently in lower iteration counts and hashes that are
- # quicker to crack (by non-PHP code).
- if (PHP_VERSION >= '5') {
- $hash = md5($salt . $password, TRUE);
- do {
- $hash = md5($hash . $password, TRUE);
- } while (--$count);
- } else {
- $hash = pack('H*', md5($salt . $password));
- do {
- $hash = pack('H*', md5($hash . $password));
- } while (--$count);
- }
-
- $output = substr($setting, 0, 12);
- $output .= $this->encode64($hash, 16);
-
- return $output;
- }
-
- function gensalt_extended($input)
- {
- $count_log2 = min($this->iteration_count_log2 + 8, 24);
- # This should be odd to not reveal weak DES keys, and the
- # maximum valid value is (2**24 - 1) which is odd anyway.
- $count = (1 << $count_log2) - 1;
-
- $output = '_';
- $output .= $this->itoa64[$count & 0x3f];
- $output .= $this->itoa64[($count >> 6) & 0x3f];
- $output .= $this->itoa64[($count >> 12) & 0x3f];
- $output .= $this->itoa64[($count >> 18) & 0x3f];
-
- $output .= $this->encode64($input, 3);
-
- return $output;
- }
-
- function gensalt_blowfish($input)
- {
- # This one needs to use a different order of characters and a
- # different encoding scheme from the one in encode64() above.
- # We care because the last character in our encoded string will
- # only represent 2 bits. While two known implementations of
- # bcrypt will happily accept and correct a salt string which
- # has the 4 unused bits set to non-zero, we do not want to take
- # chances and we also do not want to waste an additional byte
- # of entropy.
- $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
- $output = '$2a$';
- $output .= chr(ord('0') + $this->iteration_count_log2 / 10);
- $output .= chr(ord('0') + $this->iteration_count_log2 % 10);
- $output .= '$';
-
- $i = 0;
- do {
- $c1 = ord($input[$i++]);
- $output .= $itoa64[$c1 >> 2];
- $c1 = ($c1 & 0x03) << 4;
- if ($i >= 16) {
- $output .= $itoa64[$c1];
- break;
- }
-
- $c2 = ord($input[$i++]);
- $c1 |= $c2 >> 4;
- $output .= $itoa64[$c1];
- $c1 = ($c2 & 0x0f) << 2;
-
- $c2 = ord($input[$i++]);
- $c1 |= $c2 >> 6;
- $output .= $itoa64[$c1];
- $output .= $itoa64[$c2 & 0x3f];
- } while (1);
-
- return $output;
- }
-
- function HashPassword($password)
- {
- $random = '';
-
- if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
- $random = $this->get_random_bytes(16);
- $hash =
- crypt($password, $this->gensalt_blowfish($random));
- if (strlen($hash) == 60)
- return $hash;
- }
-
- if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
- if (strlen($random) < 3)
- $random = $this->get_random_bytes(3);
- $hash =
- crypt($password, $this->gensalt_extended($random));
- if (strlen($hash) == 20)
- return $hash;
- }
-
- if (strlen($random) < 6)
- $random = $this->get_random_bytes(6);
- $hash =
- $this->crypt_private($password,
- $this->gensalt_private($random));
- if (strlen($hash) == 34)
- return $hash;
-
- # Returning '*' on error is safe here, but would _not_ be safe
- # in a crypt(3)-like function used _both_ for generating new
- # hashes and for validating passwords against existing hashes.
- return '*';
- }
-
- function CheckPassword($password, $stored_hash)
- {
- $hash = $this->crypt_private($password, $stored_hash);
- if ($hash[0] == '*')
- $hash = crypt($password, $stored_hash);
-
- return $hash == $stored_hash;
- }
+ var $itoa64;
+ var $iteration_count_log2;
+ var $portable_hashes;
+ var $random_state;
+
+ function PasswordHash($iteration_count_log2, $portable_hashes)
+ {
+ $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+
+ if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
+ $iteration_count_log2 = 8;
+ $this->iteration_count_log2 = $iteration_count_log2;
+
+ $this->portable_hashes = $portable_hashes;
+
+ $this->random_state = microtime();
+ if (function_exists('getmypid'))
+ $this->random_state .= getmypid();
+ }
+
+ function get_random_bytes($count)
+ {
+ $output = '';
+ if (@is_readable('/dev/urandom') &&
+ ($fh = @fopen('/dev/urandom', 'rb'))) {
+ $output = fread($fh, $count);
+ fclose($fh);
+ }
+
+ if (strlen($output) < $count) {
+ $output = '';
+ for ($i = 0; $i < $count; $i += 16) {
+ $this->random_state =
+ md5(microtime() . $this->random_state);
+ $output .=
+ pack('H*', md5($this->random_state));
+ }
+ $output = substr($output, 0, $count);
+ }
+
+ return $output;
+ }
+
+ function encode64($input, $count)
+ {
+ $output = '';
+ $i = 0;
+ do {
+ $value = ord($input[$i++]);
+ $output .= $this->itoa64[$value & 0x3f];
+ if ($i < $count)
+ $value |= ord($input[$i]) << 8;
+ $output .= $this->itoa64[($value >> 6) & 0x3f];
+ if ($i++ >= $count)
+ break;
+ if ($i < $count)
+ $value |= ord($input[$i]) << 16;
+ $output .= $this->itoa64[($value >> 12) & 0x3f];
+ if ($i++ >= $count)
+ break;
+ $output .= $this->itoa64[($value >> 18) & 0x3f];
+ } while ($i < $count);
+
+ return $output;
+ }
+
+ function gensalt_private($input)
+ {
+ $output = '$P$';
+ $output .= $this->itoa64[min($this->iteration_count_log2 +
+ ((PHP_VERSION >= '5') ? 5 : 3), 30)];
+ $output .= $this->encode64($input, 6);
+
+ return $output;
+ }
+
+ function crypt_private($password, $setting)
+ {
+ $output = '*0';
+ if (substr($setting, 0, 2) == $output)
+ $output = '*1';
+
+ $id = substr($setting, 0, 3);
+ # We use "$P$", phpBB3 uses "$H$" for the same thing
+ if ($id != '$P$' && $id != '$H$')
+ return $output;
+
+ $count_log2 = strpos($this->itoa64, $setting[3]);
+ if ($count_log2 < 7 || $count_log2 > 30)
+ return $output;
+
+ $count = 1 << $count_log2;
+
+ $salt = substr($setting, 4, 8);
+ if (strlen($salt) != 8)
+ return $output;
+
+ # We're kind of forced to use MD5 here since it's the only
+ # cryptographic primitive available in all versions of PHP
+ # currently in use. To implement our own low-level crypto
+ # in PHP would result in much worse performance and
+ # consequently in lower iteration counts and hashes that are
+ # quicker to crack (by non-PHP code).
+ if (PHP_VERSION >= '5') {
+ $hash = md5($salt . $password, TRUE);
+ do {
+ $hash = md5($hash . $password, TRUE);
+ } while (--$count);
+ } else {
+ $hash = pack('H*', md5($salt . $password));
+ do {
+ $hash = pack('H*', md5($hash . $password));
+ } while (--$count);
+ }
+
+ $output = substr($setting, 0, 12);
+ $output .= $this->encode64($hash, 16);
+
+ return $output;
+ }
+
+ function gensalt_extended($input)
+ {
+ $count_log2 = min($this->iteration_count_log2 + 8, 24);
+ # This should be odd to not reveal weak DES keys, and the
+ # maximum valid value is (2**24 - 1) which is odd anyway.
+ $count = (1 << $count_log2) - 1;
+
+ $output = '_';
+ $output .= $this->itoa64[$count & 0x3f];
+ $output .= $this->itoa64[($count >> 6) & 0x3f];
+ $output .= $this->itoa64[($count >> 12) & 0x3f];
+ $output .= $this->itoa64[($count >> 18) & 0x3f];
+
+ $output .= $this->encode64($input, 3);
+
+ return $output;
+ }
+
+ function gensalt_blowfish($input)
+ {
+ # This one needs to use a different order of characters and a
+ # different encoding scheme from the one in encode64() above.
+ # We care because the last character in our encoded string will
+ # only represent 2 bits. While two known implementations of
+ # bcrypt will happily accept and correct a salt string which
+ # has the 4 unused bits set to non-zero, we do not want to take
+ # chances and we also do not want to waste an additional byte
+ # of entropy.
+ $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+ $output = '$2a$';
+ $output .= chr(ord('0') + $this->iteration_count_log2 / 10);
+ $output .= chr(ord('0') + $this->iteration_count_log2 % 10);
+ $output .= '$';
+
+ $i = 0;
+ do {
+ $c1 = ord($input[$i++]);
+ $output .= $itoa64[$c1 >> 2];
+ $c1 = ($c1 & 0x03) << 4;
+ if ($i >= 16) {
+ $output .= $itoa64[$c1];
+ break;
+ }
+
+ $c2 = ord($input[$i++]);
+ $c1 |= $c2 >> 4;
+ $output .= $itoa64[$c1];
+ $c1 = ($c2 & 0x0f) << 2;
+
+ $c2 = ord($input[$i++]);
+ $c1 |= $c2 >> 6;
+ $output .= $itoa64[$c1];
+ $output .= $itoa64[$c2 & 0x3f];
+ } while (1);
+
+ return $output;
+ }
+
+ function HashPassword($password)
+ {
+ $random = '';
+
+ if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
+ $random = $this->get_random_bytes(16);
+ $hash =
+ crypt($password, $this->gensalt_blowfish($random));
+ if (strlen($hash) == 60)
+ return $hash;
+ }
+
+ if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
+ if (strlen($random) < 3)
+ $random = $this->get_random_bytes(3);
+ $hash =
+ crypt($password, $this->gensalt_extended($random));
+ if (strlen($hash) == 20)
+ return $hash;
+ }
+
+ if (strlen($random) < 6)
+ $random = $this->get_random_bytes(6);
+ $hash =
+ $this->crypt_private($password,
+ $this->gensalt_private($random));
+ if (strlen($hash) == 34)
+ return $hash;
+
+ # Returning '*' on error is safe here, but would _not_ be safe
+ # in a crypt(3)-like function used _both_ for generating new
+ # hashes and for validating passwords against existing hashes.
+ return '*';
+ }
+
+ function CheckPassword($password, $stored_hash)
+ {
+ $hash = $this->crypt_private($password, $stored_hash);
+ if ($hash[0] == '*')
+ $hash = crypt($password, $stored_hash);
+
+ return $hash == $stored_hash;
+ }
}
?>
View
4 catalog/admin/includes/classes/payment_module_info.php
@@ -6,7 +6,7 @@ class paymentModuleInfo {
function paymentModuleInfo($pmInfo_array) {
$this->payment_code = $pmInfo_array['payment_code'];
- $n = sizeof($pmInfo_array) - 1;
+ $n = sizeof($pmInfo_array) - 1;
for ($i = 0; $i < $n; $i++) {
$key_value_query = tep_db_query("select configuration_title, configuration_value, configuration_description from " . TABLE_CONFIGURATION . " where configuration_key = '" . $pmInfo_array[$i] . "'");
$key_value = tep_db_fetch_array($key_value_query);
@@ -17,4 +17,4 @@ function paymentModuleInfo($pmInfo_array) {
}
}
}
-?>
+?>
View
6 catalog/admin/includes/classes/phplot.php
@@ -900,7 +900,7 @@ protected function GetDefaultTTFont()
$fonts = array('LiberationSans-Regular.ttf', // For Linux with a correct GD font search path
'Verdana.ttf', 'Arial.ttf', 'Helvetica.ttf', // For Windows, maybe others
'ttf-liberation/LiberationSans-Regular.ttf', // For Debian, Ubuntu, and friends
- 'benjamingothic.ttf', // Original PHPlot default
+ 'benjamingothic.ttf', // Original PHPlot default
);
foreach ($fonts as $font) {
// First try the font name alone, to see if GD can find and load it.
@@ -2890,7 +2890,7 @@ protected function FindDataLimits()
if ($this->GetCallback('debug_scale')) {
$this->DoCallback('debug_scale', __FUNCTION__, array(
'min_x' => $this->min_x, 'min_y' => $this->min_y,
- 'max_x' => $this->max_x, 'max_y' => $this->max_y,
+ 'max_x' => $this->max_x, 'max_y' => $this->max_y,
'min_z' => isset($this->min_z) ? $this->min_z : '',
'max_z' => isset($this->max_z) ? $this->max_z : ''));
}