Permalink
Browse files

Merge branch 'master' of git://github.com/osCommerce/oscommerce

  • Loading branch information...
2 parents 901343c + a5aeb04 commit 0d3c2f9268ee1c20e22f5670891aaaef7d3d131e @tgely committed Feb 5, 2012
Showing with 8,557 additions and 4,314 deletions.
  1. +2 −0 index.php
  2. +4 −0 osCommerce/OM/.htaccess
  3. +9 −0 osCommerce/OM/Core/Access.php
  4. +2 −2 osCommerce/OM/Core/DirectoryListing.php
  5. +5 −0 osCommerce/OM/Core/ErrorHandler.php
  6. +22 −5 osCommerce/OM/Core/HTML.php
  7. +2 −3 osCommerce/OM/Core/HttpRequest/Curl.php
  8. +45 −0 osCommerce/OM/Core/Language.php
  9. +10 −3 osCommerce/OM/Core/OSCOM.php
  10. +15 −3 osCommerce/OM/Core/PDO/MySQL/Standard.php
  11. +18 −0 osCommerce/OM/Core/PDOStatement.php
  12. +9 −0 osCommerce/OM/Core/Site/Admin/Application/Administrators/Model/getAccessModules.php
  13. +22 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Action/BatchDelete.php
  14. +40 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Action/BatchDelete/Process.php
  15. +22 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Action/BatchMove.php
  16. +40 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Action/BatchMove/Process.php
  17. +22 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Action/Delete.php
  18. +33 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Action/Delete/Process.php
  19. +26 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Action/Save.php
  20. +35 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Action/Save/Process.php
  21. +16 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Categories.php
  22. +79 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Controller.php
  23. +47 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Model/delete.php
  24. +35 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Model/deleteImage.php
  25. +60 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Model/find.php
  26. +49 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Model/get.php
  27. +41 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Model/getAll.php
  28. +50 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Model/move.php
  29. +72 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Model/save.php
  30. +31 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/Model/saveSortOrder.php
  31. +39 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/RPC/GetAll.php
  32. +38 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/RPC/GetAvailableImages.php
  33. +39 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/RPC/SaveSortOrder.php
  34. +37 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/RPC/SaveUploadedImage.php
  35. +28 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/SQL/MySQL/Standard/Delete.php
  36. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/SQL/MySQL/Standard/Get.php
  37. +37 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/SQL/MySQL/Standard/Move.php
  38. +91 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/SQL/MySQL/Standard/Save.php
  39. +48 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/SQL/MySQL/Standard/SaveSortOrder.php
  40. +58 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/pages/batch_move.php
  41. +93 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/pages/edit.php
  42. +198 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/pages/main.php
  43. +87 −0 osCommerce/OM/Core/Site/Admin/Application/Categories/pages/new.php
  44. +8 −2 osCommerce/OM/Core/Site/Admin/Application/Configuration/SQL/MySQL/Standard/EntryGet.php
  45. +4 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/Action/Apply/Process.php
  46. +35 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/Action/ViewLog.php
  47. +18 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/Controller.php
  48. +27 −4 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/Model/applyPackage.php
  49. +36 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/Model/findLog.php
  50. +40 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/Model/getLog.php
  51. +32 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/Model/getLogs.php
  52. +28 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/Model/logExists.php
  53. +35 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/RPC/GetLog.php
  54. +6 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/pages/main.php
  55. +91 −0 osCommerce/OM/Core/Site/Admin/Application/CoreUpdate/pages/view_log.php
  56. +22 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Action/BatchDelete.php
  57. +40 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Action/BatchDelete/Process.php
  58. +22 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Action/Delete.php
  59. +31 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Action/Delete/Process.php
  60. +26 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Action/Save.php
  61. +173 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Action/Save/Process.php
  62. +30 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Controller.php
  63. +16 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Customers.php
  64. +24 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Model/delete.php
  65. +25 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Model/deleteAddress.php
  66. +30 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Model/emailAddressExists.php
  67. +30 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Model/find.php
  68. +30 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Model/get.php
  69. +24 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Model/getAddressBook.php
  70. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Model/getAll.php
  71. +27 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Model/save.php
  72. +22 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/Model/saveAddress.php
  73. +50 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/RPC/FormatAddress.php
  74. +44 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/RPC/GetAll.php
  75. +26 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/RPC/GetZones.php
  76. +28 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/SQL/MySQL/Standard/Delete.php
  77. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/SQL/MySQL/Standard/DeleteAddress.php
  78. +51 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/SQL/MySQL/Standard/Find.php
  79. +50 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/SQL/MySQL/Standard/Get.php
  80. +28 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/SQL/MySQL/Standard/GetAddressBook.php
  81. +49 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/SQL/MySQL/Standard/GetAll.php
  82. +72 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/SQL/MySQL/Standard/Save.php
  83. +84 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/SQL/MySQL/Standard/SaveAddress.php
  84. +66 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/pages/edit.php
  85. +181 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/pages/main.php
  86. +64 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/pages/new.php
  87. +680 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/pages/section_addressBook.php
  88. +145 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/pages/section_map.php
  89. +38 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/pages/section_newsletters.php
  90. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/pages/section_password.php
  91. +58 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/pages/section_personal.php
  92. +42 −0 osCommerce/OM/Core/Site/Admin/Application/Customers/pages/section_social.php
  93. +1 −1 osCommerce/OM/Core/Site/Admin/Application/ErrorLog/Action/Delete.php
  94. +0 −34 osCommerce/OM/Core/Site/Admin/Application/ErrorLog/pages/delete.php
  95. +23 −1 osCommerce/OM/Core/Site/Admin/Application/ErrorLog/pages/main.php
  96. +22 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Action/Install.php
  97. +43 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Action/Install/Process.php
  98. +22 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Action/Save.php
  99. +33 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Action/Save/Process.php
  100. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Action/Uninstall.php
  101. +34 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Action/Uninstall/Process.php
  102. +30 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Controller.php
  103. +20 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Model/exists.php
  104. +34 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Model/findInstalled.php
  105. +34 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Model/findUninstalled.php
  106. +34 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Model/get.php
  107. +41 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Model/getInstalled.php
  108. +52 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Model/getUninstalled.php
  109. +89 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Model/install.php
  110. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Model/save.php
  111. +43 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Model/uninstall.php
  112. +35 −0 osCommerce/OM/Core/Site/Admin/Application/Services/RPC/GetInstalled.php
  113. +35 −0 osCommerce/OM/Core/Site/Admin/Application/Services/RPC/GetUninstalled.php
  114. +48 −0 osCommerce/OM/Core/Site/Admin/Application/Services/SQL/MySQL/Standard/Save.php
  115. +16 −0 osCommerce/OM/Core/Site/Admin/Application/Services/Services.php
  116. +58 −0 osCommerce/OM/Core/Site/Admin/Application/Services/pages/edit.php
  117. +99 −0 osCommerce/OM/Core/Site/Admin/Application/Services/pages/install.php
  118. +137 −0 osCommerce/OM/Core/Site/Admin/Application/Services/pages/main.php
  119. +12 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/SQL/MySQL/Standard/EntrySave.php
  120. +2 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries.php
  121. +0 −45 osCommerce/OM/Core/Site/Admin/Application/categories/actions/batch_delete.php
  122. +0 −45 osCommerce/OM/Core/Site/Admin/Application/categories/actions/batch_move.php
  123. +0 −34 osCommerce/OM/Core/Site/Admin/Application/categories/actions/delete.php
  124. +0 −34 osCommerce/OM/Core/Site/Admin/Application/categories/actions/move.php
  125. +0 −58 osCommerce/OM/Core/Site/Admin/Application/categories/actions/save.php
  126. +0 −52 osCommerce/OM/Core/Site/Admin/Application/categories/categories.php
  127. +0 −270 osCommerce/OM/Core/Site/Admin/Application/categories/classes/categories.php
  128. +0 −37 osCommerce/OM/Core/Site/Admin/Application/categories/classes/rpc.php
  129. +0 −54 osCommerce/OM/Core/Site/Admin/Application/categories/pages/batch_delete.php
  130. +0 −67 osCommerce/OM/Core/Site/Admin/Application/categories/pages/batch_move.php
  131. +0 −47 osCommerce/OM/Core/Site/Admin/Application/categories/pages/delete.php
  132. +0 −68 osCommerce/OM/Core/Site/Admin/Application/categories/pages/edit.php
  133. +0 −129 osCommerce/OM/Core/Site/Admin/Application/categories/pages/main.php
  134. +0 −47 osCommerce/OM/Core/Site/Admin/Application/categories/pages/move.php
  135. +0 −59 osCommerce/OM/Core/Site/Admin/Application/categories/pages/new.php
  136. +0 −253 osCommerce/OM/Core/Site/Admin/Application/customers/classes/customers.php
  137. +0 −351 osCommerce/OM/Core/Site/Admin/Application/customers/customers.php
  138. +0 −38 osCommerce/OM/Core/Site/Admin/Application/customers/pages/address_book_delete.php
  139. +0 −189 osCommerce/OM/Core/Site/Admin/Application/customers/pages/address_book_edit.php
  140. +0 −189 osCommerce/OM/Core/Site/Admin/Application/customers/pages/address_book_new.php
  141. +0 −52 osCommerce/OM/Core/Site/Admin/Application/customers/pages/batch_delete.php
  142. +0 −37 osCommerce/OM/Core/Site/Admin/Application/customers/pages/delete.php
  143. +0 −211 osCommerce/OM/Core/Site/Admin/Application/customers/pages/edit.php
  144. +0 −130 osCommerce/OM/Core/Site/Admin/Application/customers/pages/main.php
  145. +0 −111 osCommerce/OM/Core/Site/Admin/Application/customers/pages/new.php
  146. +0 −63 osCommerce/OM/Core/Site/Admin/Application/services/pages/edit.php
  147. +0 −87 osCommerce/OM/Core/Site/Admin/Application/services/pages/main.php
  148. +0 −40 osCommerce/OM/Core/Site/Admin/Application/services/pages/uninstall.php
  149. +0 −220 osCommerce/OM/Core/Site/Admin/Application/services/services.php
  150. +81 −0 osCommerce/OM/Core/Site/Admin/CategoryTree.php
  151. +22 −0 osCommerce/OM/Core/Site/Admin/Controller.php
  152. +18 −6 osCommerce/OM/Core/Site/Admin/Language.php
  153. +12 −7 osCommerce/OM/Core/Site/Admin/Module/Dashboard/Customers.php
  154. +5 −24 osCommerce/OM/Core/Site/Admin/Module/Service/Breadcrumb.php
  155. +6 −11 osCommerce/OM/Core/Site/Admin/Module/Service/CategoryPath.php
  156. +7 −23 osCommerce/OM/Core/Site/Admin/Module/Service/Core.php
  157. +7 −11 osCommerce/OM/Core/Site/Admin/Module/Service/Currencies.php
  158. +6 −11 osCommerce/OM/Core/Site/Admin/Module/Service/Debug.php
  159. +7 −23 osCommerce/OM/Core/Site/Admin/Module/Service/Language.php
  160. +6 −11 osCommerce/OM/Core/Site/Admin/Module/Service/OutputCompression.php
  161. +6 −11 osCommerce/OM/Core/Site/Admin/Module/Service/RecentlyVisited.php
  162. +5 −12 osCommerce/OM/Core/Site/Admin/Module/Service/Reviews.php
  163. +6 −11 osCommerce/OM/Core/Site/Admin/Module/Service/Session.php
  164. +5 −24 osCommerce/OM/Core/Site/Admin/Module/Service/SimpleCounter.php
  165. +5 −12 osCommerce/OM/Core/Site/Admin/Module/Service/Specials.php
  166. +6 −11 osCommerce/OM/Core/Site/Admin/Module/Service/WhosOnline.php
  167. +72 −0 osCommerce/OM/Core/Site/Admin/ServiceAbstract.php
  168. +6 −0 osCommerce/OM/Core/Site/Admin/languages/en_US.php
  169. +32 −0 osCommerce/OM/Core/Site/Admin/languages/en_US/Categories.php
  170. +6 −0 osCommerce/OM/Core/Site/Admin/languages/en_US/CoreUpdate.php
  171. +23 −46 osCommerce/OM/Core/Site/Admin/languages/en_US/{customers.php → Customers.php}
  172. +2 −3 osCommerce/OM/Core/Site/Admin/languages/en_US/ErrorLog.php
  173. +16 −0 osCommerce/OM/Core/Site/Admin/languages/en_US/Services.php
  174. +0 −47 osCommerce/OM/Core/Site/Admin/languages/en_US/categories.php
  175. 0 osCommerce/OM/Core/Site/Admin/languages/en_US/modules/{services/banner.php → Service/Banner.php}
  176. 0 ...rce/OM/Core/Site/Admin/languages/en_US/modules/{services/breadcrumb.php → Service/Breadcrumb.php}
  177. 0 ...M/Core/Site/Admin/languages/en_US/modules/{services/category_path.php → Service/CategoryPath.php}
  178. 0 osCommerce/OM/Core/Site/Admin/languages/en_US/modules/{services/core.php → Service/Core.php}
  179. 0 ...rce/OM/Core/Site/Admin/languages/en_US/modules/{services/currencies.php → Service/Currencies.php}
  180. 0 osCommerce/OM/Core/Site/Admin/languages/en_US/modules/{services/debug.php → Service/Debug.php}
  181. 0 osCommerce/OM/Core/Site/Admin/languages/en_US/modules/{services/language.php → Service/Language.php}
  182. 0 ...e/Admin/languages/en_US/modules/{services/output_compression.php → Service/OutputCompression.php}
  183. 0 .../Site/Admin/languages/en_US/modules/{services/recently_visited.php → Service/RecentlyVisited.php}
  184. 0 osCommerce/OM/Core/Site/Admin/languages/en_US/modules/{services/reviews.php → Service/Reviews.php}
  185. 0 osCommerce/OM/Core/Site/Admin/languages/en_US/modules/{services/sefu.php → Service/SEFU.php}
  186. 0 osCommerce/OM/Core/Site/Admin/languages/en_US/modules/{services/session.php → Service/Session.php}
  187. 0 ...Core/Site/Admin/languages/en_US/modules/{services/simple_counter.php → Service/SimpleCounter.php}
  188. 0 osCommerce/OM/Core/Site/Admin/languages/en_US/modules/{services/specials.php → Service/Specials.php}
  189. 0 ...ce/OM/Core/Site/Admin/languages/en_US/modules/{services/whos_online.php → Service/WhosOnline.php}
  190. +6 −0 osCommerce/OM/Core/Site/Admin/languages/en_US/modules/access/groups/products.php
  191. +0 −19 osCommerce/OM/Core/Site/Admin/languages/en_US/services.php
  192. +16 −3 osCommerce/OM/Core/Site/Admin/templates/oscom.php
  193. +1 −1 osCommerce/OM/Core/Site/Admin/templates/oscom/header.php
  194. +1 −1 osCommerce/OM/Core/Site/Setup/Application/Index/Controller.php
  195. +1 −1 osCommerce/OM/Core/Site/Setup/Application/Install/Controller.php
  196. +8 −0 osCommerce/OM/Core/Site/Setup/Application/Install/Model/checkDB.php
  197. +20 −0 osCommerce/OM/Core/Site/Setup/Application/Install/SQL/MySQL/Standard/CreateDB.php
  198. +4 −1 osCommerce/OM/Core/Site/Setup/Application/Install/pages/step_3.php
  199. +18 −0 osCommerce/OM/Core/Site/Setup/Application/Offline/Controller.php
  200. +40 −0 osCommerce/OM/Core/Site/Setup/Application/Offline/pages/main.php
  201. +8 −0 osCommerce/OM/Core/Site/Setup/Controller.php
  202. +3 −0 osCommerce/OM/Core/Site/Setup/Languages/en_US/Install.php
  203. +14 −0 osCommerce/OM/Core/Site/Setup/Languages/en_US/Offline.php
  204. +3 −3 osCommerce/OM/Core/Site/Setup/templates/default.php
  205. +19 −0 osCommerce/OM/Core/Site/Shop/Address.php
  206. +9 −3 osCommerce/OM/Core/Site/Shop/AddressBook.php
  207. +0 −2 osCommerce/OM/Core/Site/Shop/Application/Account/pages/address_book_delete.php
  208. +20 −18 osCommerce/OM/Core/Site/Shop/Application/Account/pages/address_book_details.php
  209. +3 −2 osCommerce/OM/Core/Site/Shop/Application/Account/pages/address_book_process.php
  210. +1 −1 osCommerce/OM/Core/Site/Shop/Application/Account/pages/create.php
  211. +1 −1 osCommerce/OM/Core/Site/Shop/Application/Account/pages/edit.php
  212. +1 −1 osCommerce/OM/Core/Site/Shop/Application/Cart/pages/main.php
  213. +1 −1 osCommerce/OM/Core/Site/Shop/Application/Checkout/pages/main.php
  214. +2 −2 osCommerce/OM/Core/Site/Shop/Application/Products/pages/reviews_write.php
  215. +4 −4 osCommerce/OM/Core/Site/Shop/Application/Products/pages/tell_a_friend.php
  216. +2 −2 osCommerce/OM/Core/Site/Shop/Application/Search/pages/main.php
  217. +33 −11 osCommerce/OM/Core/Site/Shop/CategoryTree.php
  218. +22 −22 osCommerce/OM/Core/Site/Shop/Order.php
  219. +3 −3 osCommerce/OM/Core/Site/Shop/templates/oscom.php
  220. +169 −0 osCommerce/OM/Core/Upload.php
  221. +4 −0 osCommerce/OM/Work/Temp/.htaccess
  222. +1 −1 osCommerce/OM/version.txt
  223. +31 −0 public/external/fileuploader/fileuploader.css
  224. +9 −0 public/external/fileuploader/fileuploader.min.js
  225. BIN public/external/fileuploader/loading.gif
  226. +0 −16 public/external/jquery/jquery-1.5.1.min.js
  227. +18 −0 public/external/jquery/jquery-1.6.1.min.js
  228. +499 −0 public/external/jquery/jquery.blockUI.js
  229. +269 −0 public/external/jquery/jquery.md5.js
  230. +12 −0 public/external/jquery/jquery.netchanger.min.js
  231. +253 −0 public/external/jquery/jquery.safetynet.js
  232. +0 −783 public/external/jquery/ui/jquery-ui-1.8.11.custom.min.js
  233. +784 −0 public/external/jquery/ui/jquery-ui-1.8.13.custom.min.js
  234. BIN public/external/jquery/ui/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
  235. +19 −14 .../external/jquery/ui/themes/smoothness/{jquery-ui-1.8.11.custom.css → jquery-ui-1.8.13.custom.css}
  236. BIN public/external/jquery/ui/themes/start/images/ui-bg_glass_55_f8da4e_1x400.png
  237. BIN public/external/jquery/ui/themes/start/images/ui-icons_d8e7f3_256x240.png
  238. BIN public/external/jquery/ui/themes/start/images/ui-icons_e0fdff_256x240.png
  239. BIN public/external/jquery/ui/themes/start/images/ui-icons_f5e175_256x240.png
  240. +19 −14 public/external/jquery/ui/themes/start/{jquery-ui-1.8.11.custom.css → jquery-ui-1.8.13.custom.css}
  241. BIN public/sites/Admin/images/applications/16/categories.png
  242. BIN public/sites/Admin/images/applications/16/customers.png
  243. BIN public/sites/Admin/images/applications/16/services.png
  244. BIN public/sites/Admin/images/applications/32/categories.png
  245. BIN public/sites/Admin/images/applications/32/customers.png
  246. BIN public/sites/Admin/images/applications/32/services.png
  247. +26 −1 public/sites/Admin/javascript/datatable.js
  248. +39 −0 public/sites/Admin/javascript/jquery/jquery.buttonsetTabs.js
  249. +20 −0 public/sites/Admin/javascript/jquery/jquery.equalResize.js
  250. +185 −0 public/sites/Admin/javascript/jquery/jquery.imageSelector.js
  251. BIN public/sites/Admin/templates/oscom/images/icons/16x16/fax.png
  252. BIN public/sites/Admin/templates/oscom/images/icons/16x16/undo.png
  253. BIN public/sites/Admin/templates/oscom/images/icons/32x32/user_female.png
  254. BIN public/sites/Admin/templates/oscom/images/icons/32x32/user_male.png
  255. BIN public/sites/Admin/templates/oscom/images/no_image_placeholder.gif
  256. +54 −0 public/sites/Admin/templates/oscom/stylesheets/general.css
  257. 0 public/upload/index.html
View
@@ -13,6 +13,8 @@
error_reporting(E_ALL | E_STRICT);
+ define('OSCOM_PUBLIC_BASE_DIRECTORY', __DIR__ . '/');
+
require('osCommerce/OM/Core/Autoloader.php');
$OSCOM_Autoloader = new Autoloader('osCommerce\OM');
$OSCOM_Autoloader->register();
@@ -0,0 +1,4 @@
+<Files *>
+ Order Deny,Allow
+ Deny from all
+</Files>
@@ -82,6 +82,15 @@ public static function getUserLevels($id, $site = null) {
$applications[] = $file['name'];
}
}
+
+ $DLcapps = new DirectoryListing(OSCOM::BASE_DIRECTORY . 'Custom/Site/' . $site . '/Application');
+ $DLcapps->setIncludeFiles(false);
+
+ foreach ( $DLcapps->getFiles() as $file ) {
+ if ( !in_array($file['name'], $applications) && !in_array($file['name'], call_user_func(array('osCommerce\\OM\\Core\\Site\\' . $site . '\\Controller', 'getGuestApplications'))) && file_exists($DLcapps->getDirectory() . '/' . $file['name'] . '/Controller.php') ) {
+ $applications[] = $file['name'];
+ }
+ }
}
$shortcuts = array();
@@ -75,7 +75,7 @@ public function setRecursive($boolean) {
}
public function setCheckExtension($extension) {
- $this->_check_extension[] = $extension;
+ $this->_check_extension[] = strtolower($extension);
}
public function setAddDirectoryToFilename($boolean) {
@@ -99,7 +99,7 @@ public function read($directory = '') {
while (($entry = $dir->read()) !== false) {
if (!in_array($entry, $this->_exclude_entries)) {
if (($this->_include_files === true) && is_file($dir->path . '/' . $entry)) {
- if (empty($this->_check_extension) || in_array(substr($entry, strrpos($entry, '.')+1), $this->_check_extension)) {
+ if (empty($this->_check_extension) || in_array(strtolower(substr($entry, strrpos($entry, '.')+1)), $this->_check_extension)) {
if ($this->_add_directory_to_filename === true) {
if ($dir->path != $this->_directory) {
$entry = substr($dir->path, strlen($this->_directory)+1) . '/' . $entry;
@@ -9,6 +9,7 @@
namespace osCommerce\OM\Core;
use osCommerce\OM\Core\DateTime;
+ use osCommerce\OM\Core\Language;
use osCommerce\OM\Core\OSCOM;
use osCommerce\OM\Core\PDO;
@@ -56,6 +57,8 @@ public static function execute($errno, $errstr, $errfile, $errline) {
break;
}
+ $errstr = Language::toUTF8($errstr);
+
$error_msg = sprintf('PHP %s: %s in %s on line %d', $errors, $errstr, $errfile, $errline);
$Qinsert = self::$_dbh->prepare('insert into error_log (timestamp, message) values (:timestamp, :message)');
@@ -159,6 +162,8 @@ public static function import($filename) {
unlink($filename);
foreach ( $error_log as $error ) {
+ $error = Language::toUTF8($error);
+
if ( preg_match('/^\[([0-9]{2})-([A-Za-z]{3})-([0-9]{4}) ([0-9]{2}):([0-5][0-9]):([0-5][0-9])\] (.*)$/', $error) ) {
$timestamp = DateTime::getTimestamp(substr($error, 1, 20), 'd-M-Y H:i:s');
$message = substr($error, 23);
@@ -213,7 +213,7 @@ public static function button($params) {
if ( isset($params['newwindow']) ) {
$button .= ' onclick="window.open(\'' . $params['href'] . '\');"';
} else {
- $button .= ' onclick="document.location.href=\'' . $params['href'] . '\';"';
+ $button .= ' onclick="window.location.href=\'' . $params['href'] . '\';"';
}
}
@@ -373,7 +373,7 @@ public static function textareaField($name, $value = null, $width = 60, $height
* Generate a form select menu field
*
* @param string $name The name of the pull down menu field
- * @param array $values Defined values for the pull down menu field
+ * @param array $values Defined values for the pull down menu field [ id, text, group, params (since v3.0.2) ]
* @param string $default The default value for the pull down menu field
* @param string $parameters Additional parameters for the pull down menu field
* @return string
@@ -416,6 +416,10 @@ public static function selectMenu($name, $values, $default = null, $parameters =
$field .= ' selected="selected"';
}
+ if ( isset($values[$i]['params']) ) {
+ $field .= ' ' . $values[$i]['params'];
+ }
+
$field .= '>' . static::output($values[$i]['text'], array('"' => '&quot;', '\'' => '&#039;', '<' => '&lt;', '>' => '&gt;')) . '</option>';
if ( ($group !== false) && (($group != $values[$i]['group']) || !isset($values[$i+1])) ) {
@@ -473,7 +477,7 @@ protected static function selectionField($name, $type, $values, $default = null,
if ( is_array($value) ) {
$selection_value = $value['id'];
- $selection_text = '&nbsp;' . $value['text'];
+ $selection_text = $value['text'];
} else {
$selection_value = $value;
$selection_text = '';
@@ -503,7 +507,7 @@ protected static function selectionField($name, $type, $values, $default = null,
$field .= ' />';
if ( !empty($selection_text) ) {
- $field .= '<label for="' . static::output($name) . (count($values) > 1 ? $counter : '') . '" class="fieldLabel">' . $selection_text . '</label>';
+ $field .= '<label for="' . static::output($name) . (count($values) > 1 ? '_' . $counter : '') . '" class="fieldLabel">' . $selection_text . '</label>';
}
$field .= $separator;
@@ -540,7 +544,8 @@ public static function checkboxField($name, $values = null, $default = null, $pa
* @param string $default The default value for the radio field
* @param string $parameters Additional parameters for the radio field
* @param string $separator The separator to use between multiple options for the radio field
- * @access public
+ * @return string
+ * @since v3.0.0
*/
public static function radioField($name, $values, $default = null, $parameters = null, $separator = '&nbsp;&nbsp;') {
@@ -589,6 +594,18 @@ public static function hiddenSessionIDField() {
}
/**
+ * Generate a form file upload field
+ *
+ * @param string $name The name and ID of the file upload field
+ * @return string
+ * @since v3.0.2
+ */
+
+ public static function fileField($name) {
+ return static::inputField($name, null, null, false, 'file');
+ }
+
+/**
* Generate a label for form field elements
*
* @param string $text The text to use as the form field label
@@ -8,8 +8,6 @@
namespace osCommerce\OM\Core\HttpRequest;
- use osCommerce\OM\Core\HttpRequest;
-
class Curl {
public static function execute($parameters) {
$curl = curl_init($parameters['server']['scheme'] . '://' . $parameters['server']['host'] . $parameters['server']['path'] . (isset($parameters['server']['query']) ? '?' . $parameters['server']['query'] : ''));
@@ -58,9 +56,10 @@ public static function execute($parameters) {
$parameters['redir_counter']++;
$redir_params = array('url' => $redir_url,
+ 'method' => $parameters['method'],
'redir_counter', $parameters['redir_counter']);
- $body = HttpRequest::getResponse($redir_params, 'Curl');
+ $body = \osCommerce\OM\Core\HttpRequest::getResponse($redir_params, 'Curl');
}
}
@@ -236,5 +236,50 @@ public function showImage($code = null, $width = 16, $height = 10, $parameters =
return HTML::image(OSCOM::getPublicSiteLink('images/worldflags/' . $image_code . '.png', null, 'Shop'), $this->_languages[$code]['name'], $width, $height, $parameters);
}
+
+/**
+ * Converts string to UTF-8
+ *
+ * @param string $string The string to convert to UTF-8
+ * @return string
+ * @since v3.0.2
+ */
+
+ public static function toUTF8($string) {
+ if ( !static::isUTF8($string) ) {
+ $string = iconv('CP1252', 'UTF-8', $string);
+ }
+
+ return $string;
+ }
+
+/**
+ * Detect if a string is UTF-8
+ *
+ * @param string $string The string to detect
+ * @return boolean
+ * @since v3.0.2
+ */
+ public static function isUTF8($string) {
+ if ( strlen($string) > 5000 ) {
+ for ( $i=0, $s=5000, $j = ceil(strlen($string)/5000); $i < $j; $i++, $s += 5000 ) {
+ if ( static::isUTF8(substr($string, $s, 5000)) ) {
+ return true;
+ }
+ }
+
+ return false;
+ } else {
+ return preg_match('%^(?:[\x09\x0A\x0D\x20-\x7E] # ASCII
+ | [\xC2-\xDF][\x80-\xBF] # non-overlong 2-byte
+ | \xE0[\xA0-\xBF][\x80-\xBF] # excluding overlongs
+ | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} # straight 3-byte
+ | \xED[\x80-\x9F][\x80-\xBF] # excluding surrogates
+ | \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3
+ | [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15
+ | \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16
+ )*$%xs', $string);
+ }
+ }
}
?>
@@ -258,7 +258,7 @@ public static function getLink($site = null, $application = null, $parameters =
}
if ( !empty($parameters) ) {
- $link .= $parameters . '&';
+ $link .= HTML::output($parameters) . '&';
}
if ( ($add_session_id === true) && Registry::exists('Session') && Registry::get('Session')->hasStarted() && (SERVICE_SESSION_FORCE_COOKIE_USAGE == '-1') ) {
@@ -303,7 +303,7 @@ public static function getPublicSiteLink($url, $parameters = null, $site = null)
$link = 'public/sites/' . $site . '/' . $url;
if ( !empty($parameters) ) {
- $link .= '?' . $parameters;
+ $link .= '?' . HTML::output($parameters);
}
while ( (substr($link, -1) == '&') || (substr($link, -1) == '?') ) {
@@ -367,7 +367,7 @@ public static function getDef($key) {
*
* @param string $procedure The name of the database query to execute
* @param array $data Parameters passed to the database query
- * @param string $ns The namespace the database query is stored in
+ * @param string $type The namespace type the database query is stored in [ Core, Site, CoreUpdate (@since v3.0.2), Application (default) ]
* @return mixed The result of the database query
*/
public static function callDB($procedure, $data = null, $type = 'Application') {
@@ -394,6 +394,13 @@ public static function callDB($procedure, $data = null, $type = 'Application') {
break;
+ case 'CoreUpdate':
+
+ $ns = 'osCommerce\\OM\\Work\\CoreUpdate\\' . $call[0];
+ $procedure = $call[1];
+
+ break;
+
case 'Application':
default:
@@ -33,12 +33,24 @@ public function __construct($server, $username, $password, $database, $port, $dr
}
public function connect() {
- $dsn = 'mysql:dbname=' . $this->_database . ';host=' . $this->_server;
+ $dsn_array = array();
- if ( !empty($this->_port) ) {
- $dsn .= ';port=' . $this->_port;
+ if ( !empty($this->_database) ) {
+ $dsn_array[] = 'dbname=' . $this->_database;
}
+ if ( (strpos($this->_server, '/') !== false) || (strpos($this->_server, '\\') !== false) ) {
+ $dsn_array[] = 'unix_socket=' . $this->_server;
+ } else {
+ $dsn_array[] = 'host=' . $this->_server;
+
+ if ( !empty($this->_port) ) {
+ $dsn_array[] = 'port=' . $this->_port;
+ }
+ }
+
+ $dsn = 'mysql:' . implode(';', $dsn_array);
+
$this->_connected = true;
$dbh = parent::__construct($dsn, $this->_username, $this->_password, $this->_driver_options);
@@ -12,6 +12,13 @@
use osCommerce\OM\Core\PDO;
use osCommerce\OM\Core\Registry;
+/**
+ * Represents a prepared statement and, after the statement is executed, an
+ * associated result set.
+ *
+ * @since v3.0.0
+ */
+
class PDOStatement extends \PDOStatement {
protected $_is_error = false;
protected $_binded_params = array();
@@ -151,6 +158,17 @@ public function isError() {
return $this->_is_error;
}
+/**
+ * Return the query string
+ *
+ * @return string
+ * @since v3.0.2
+ */
+
+ public function getQuery() {
+ return $this->queryString;
+ }
+
public function __destruct() {
if ( $this->_cache_read === false ) {
if ( isset($this->_cache_key) ) {
@@ -28,6 +28,15 @@ public static function execute() {
}
}
+ $DLcapps = new DirectoryListing(OSCOM::BASE_DIRECTORY . 'Custom/Site/' . OSCOM::getSite() . '/Application');
+ $DLcapps->setIncludeFiles(false);
+
+ foreach ( $DLcapps->getFiles() as $file ) {
+ if ( !in_array($file['name'], $module_files) && !in_array($file['name'], call_user_func(array('osCommerce\\OM\\Core\\Site\\' . OSCOM::getSite() . '\\Controller', 'getGuestApplications'))) && file_exists($DLcapps->getDirectory() . '/' . $file['name'] . '/Controller.php') ) {
+ $module_files[] = $file['name'];
+ }
+ }
+
$modules = array();
foreach ( $module_files as $module ) {
@@ -0,0 +1,22 @@
+<?php
+/**
+ * osCommerce Online Merchant
+ *
+ * @copyright Copyright (c) 2011 osCommerce; http://www.oscommerce.com
+ * @license BSD License; http://www.oscommerce.com/bsdlicense.txt
+ */
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\Categories\Action;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+
+/**
+ * @since v3.0.2
+ */
+
+ class BatchDelete {
+ public static function execute(ApplicationAbstract $application) {
+// Does nothing; placeholder for BatchDelete/Process
+ }
+ }
+?>
Oops, something went wrong.

0 comments on commit 0d3c2f9

Please sign in to comment.