Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add the following sniffs:

PEAR.Commenting.InlineComment sniff.
PEAR.Formatting.MultiLineAssignment
Generic.Functions.FunctionCallArgumentSpacing
Joomla.WhiteSpace.OperatorSpacing
Joomla.WhiteSpace.MemberVarSpacing
Joomla.Functions.FunctionCallSignature
Joomla.Functions.FunctionDeclaration
object operator indentation

Extend PEAR.NamingConventions.ValidClassName to the cli folder
Update code style with small fixes from the code style repository.
Improve class docblocks a bit more.
  • Loading branch information...
commit 544add4880417c586c2ca1b60b60c2fae7b63513 1 parent 37ba228
@realityking realityking authored
Showing with 2,283 additions and 928 deletions.
  1. +1 −1  administrator/components/com_admin/helpers/html/directory.php
  2. +6 −2 administrator/components/com_admin/models/sysinfo.php
  3. +9 −7 administrator/components/com_admin/script.php
  4. +1 −1  administrator/components/com_admin/views/help/tmpl/default.php
  5. +10 −5 administrator/components/com_admin/views/help/view.html.php
  6. +4 −0 administrator/components/com_admin/views/profile/view.html.php
  7. +1 −1  administrator/components/com_admin/views/sysinfo/tmpl/default_config.php
  8. +1 −1  administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php
  9. +9 −5 administrator/components/com_admin/views/sysinfo/view.html.php
  10. +1 −1  administrator/components/com_banners/helpers/banners.php
  11. +6 −6 administrator/components/com_banners/models/tracks.php
  12. +13 −12 administrator/components/com_banners/tables/banner.php
  13. +1 −1  administrator/components/com_banners/views/banner/tmpl/edit.php
  14. +3 −1 administrator/components/com_banners/views/banner/view.html.php
  15. +16 −16 administrator/components/com_banners/views/banners/tmpl/default.php
  16. +3 −0  administrator/components/com_banners/views/banners/view.html.php
  17. +1 −1  administrator/components/com_banners/views/client/tmpl/edit.php
  18. +2 −0  administrator/components/com_banners/views/client/view.html.php
  19. +6 −6 administrator/components/com_banners/views/clients/tmpl/default.php
  20. +2 −0  administrator/components/com_banners/views/clients/view.html.php
  21. +3 −3 administrator/components/com_banners/views/tracks/tmpl/default.php
  22. +2 −0  administrator/components/com_banners/views/tracks/view.html.php
  23. +1 −1  administrator/components/com_categories/models/category.php
  24. +3 −3 administrator/components/com_categories/models/fields/categoryedit.php
  25. +2 −2 administrator/components/com_categories/models/fields/categoryparent.php
  26. +11 −11 administrator/components/com_categories/views/categories/tmpl/default.php
  27. +1 −1  administrator/components/com_categories/views/categories/tmpl/default_batch.php
  28. +6 −3 administrator/components/com_categories/views/categories/view.html.php
  29. +2 −2 administrator/components/com_categories/views/category/tmpl/edit.php
  30. +1 −1  administrator/components/com_categories/views/category/tmpl/edit_options.php
  31. +4 −2 administrator/components/com_categories/views/category/view.html.php
  32. +8 −4 administrator/components/com_checkin/models/checkin.php
  33. +2 −2 administrator/components/com_checkin/views/checkin/tmpl/default.php
  34. +2 −0  administrator/components/com_config/controllers/application.php
  35. +2 −0  administrator/components/com_config/models/application.php
  36. +2 −0  administrator/components/com_config/models/component.php
  37. +4 −0 administrator/components/com_config/views/application/view.html.php
  38. +1 −1  administrator/components/com_config/views/component/tmpl/default.php
  39. +2 −0  administrator/components/com_config/views/component/view.html.php
  40. +2 −0  administrator/components/com_contact/controllers/contact.php
  41. +2 −1  administrator/components/com_contact/helpers/contact.php
  42. +1 −1  administrator/components/com_contact/models/contact.php
  43. +2 −1  administrator/components/com_contact/tables/contact.php
  44. +2 −0  administrator/components/com_contact/views/contact/view.html.php
  45. +12 −12 administrator/components/com_contact/views/contacts/tmpl/default.php
  46. +3 −3 administrator/components/com_contact/views/contacts/tmpl/modal.php
  47. +2 −0  administrator/components/com_contact/views/contacts/view.html.php
  48. +8 −4 administrator/components/com_content/helpers/content.php
  49. +2 −2 administrator/components/com_content/models/article.php
  50. +2 −1  administrator/components/com_content/models/articles.php
  51. +2 −2 administrator/components/com_content/views/article/tmpl/edit.php
  52. +3 −3 administrator/components/com_content/views/article/tmpl/pagebreak.php
  53. +5 −3 administrator/components/com_content/views/article/view.html.php
  54. +13 −13 administrator/components/com_content/views/articles/tmpl/default.php
  55. +3 −3 administrator/components/com_content/views/articles/tmpl/modal.php
  56. +2 −0  administrator/components/com_content/views/articles/view.html.php
  57. +8 −8 administrator/components/com_content/views/featured/tmpl/default.php
  58. +2 −0  administrator/components/com_content/views/featured/view.html.php
  59. +3 −2 administrator/components/com_cpanel/views/cpanel/tmpl/default.php
  60. +4 −4 administrator/components/com_finder/views/filters/tmpl/default.php
  61. +2 −2 administrator/components/com_installer/controllers/manage.php
  62. +3 −3 administrator/components/com_installer/models/database.php
  63. +2 −1  administrator/components/com_installer/models/extension.php
  64. +3 −3 administrator/components/com_installer/models/fields/search.php
  65. +5 −3 administrator/components/com_installer/models/manage.php
  66. +14 −14 administrator/components/com_installer/models/warnings.php
  67. +2 −2 administrator/components/com_installer/views/database/tmpl/default.php
  68. +1 −1  administrator/components/com_installer/views/database/view.html.php
  69. +1 −1  administrator/components/com_installer/views/discover/tmpl/default.php
  70. +1 −1  administrator/components/com_installer/views/manage/tmpl/default.php
  71. +5 −2 administrator/components/com_installer/views/manage/view.html.php
  72. +2 −2 administrator/components/com_installer/views/update/tmpl/default.php
  73. +1 −1  administrator/components/com_installer/views/warnings/tmpl/default.php
  74. +6 −6 administrator/components/com_joomlaupdate/models/default.php
  75. +5 −2 administrator/components/com_joomlaupdate/views/update/tmpl/default.php
  76. +1 −1  administrator/components/com_languages/helpers/html/languages.php
  77. +1 −1  administrator/components/com_languages/helpers/multilangstatus.php
  78. +4 −4 administrator/components/com_languages/views/installed/tmpl/default.php
  79. +7 −7 administrator/components/com_languages/views/installed/view.html.php
  80. +1 −1  administrator/components/com_languages/views/language/tmpl/edit.php
  81. +2 −0  administrator/components/com_languages/views/language/view.html.php
  82. +13 −13 administrator/components/com_languages/views/languages/tmpl/default.php
  83. +2 −0  administrator/components/com_languages/views/languages/view.html.php
  84. +5 −5 administrator/components/com_login/models/login.php
  85. +2 −2 administrator/components/com_login/views/login/tmpl/default.php
  86. +7 −6 administrator/components/com_media/controllers/file.php
  87. +1 −1  administrator/components/com_media/helpers/media.php
  88. +1 −1  administrator/components/com_media/media.php
  89. +7 −5 administrator/components/com_media/models/manager.php
  90. +3 −3 administrator/components/com_media/views/images/tmpl/default.php
  91. +2 −2 administrator/components/com_media/views/imageslist/tmpl/default.php
  92. +2 −2 administrator/components/com_media/views/media/tmpl/default.php
  93. +3 −3 administrator/components/com_media/views/medialist/tmpl/details.php
  94. +1 −1  administrator/components/com_media/views/medialist/tmpl/details_folder.php
  95. +3 −3 administrator/components/com_media/views/medialist/tmpl/thumbs.php
  96. +1 −1  administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php
  97. +5 −3 administrator/components/com_menus/helpers/html/menus.php
  98. +2 −1  administrator/components/com_menus/helpers/menus.php
  99. +3 −3 administrator/components/com_menus/models/fields/menuordering.php
  100. +9 −6 administrator/components/com_menus/models/item.php
  101. +2 −1  administrator/components/com_menus/models/menu.php
  102. +3 −3 administrator/components/com_menus/views/item/tmpl/edit.php
  103. +1 −1  administrator/components/com_menus/views/item/tmpl/edit_options.php
  104. +3 −0  administrator/components/com_menus/views/item/view.html.php
  105. +17 −17 administrator/components/com_menus/views/items/tmpl/default.php
  106. +1 −1  administrator/components/com_menus/views/items/tmpl/default_batch.php
  107. +3 −0  administrator/components/com_menus/views/items/view.html.php
  108. +2 −0  administrator/components/com_menus/views/menu/view.html.php
  109. +5 −5 administrator/components/com_menus/views/menus/tmpl/default.php
  110. +3 −0  administrator/components/com_menus/views/menus/view.html.php
  111. +3 −3 administrator/components/com_menus/views/menutypes/tmpl/default.php
  112. +1 −1  administrator/components/com_messages/controllers/config.php
  113. +1 −1  administrator/components/com_messages/controllers/message.php
  114. +1 −1  administrator/components/com_messages/models/config.php
  115. +1 −1  administrator/components/com_messages/models/fields/usermessages.php
  116. +4 −4 administrator/components/com_messages/models/message.php
  117. +2 −0  administrator/components/com_messages/views/config/view.html.php
  118. +2 −0  administrator/components/com_messages/views/message/view.html.php
  119. +1 −1  administrator/components/com_messages/views/messages/tmpl/default.php
  120. +2 −0  administrator/components/com_messages/views/messages/view.html.php
  121. +6 −3 administrator/components/com_modules/helpers/modules.php
  122. +4 −4 administrator/components/com_modules/models/module.php
  123. +21 −18 administrator/components/com_modules/models/positions.php
  124. +2 −2 administrator/components/com_modules/views/module/tmpl/edit_assignment.php
  125. +1 −1  administrator/components/com_modules/views/module/tmpl/edit_options.php
  126. +3 −1 administrator/components/com_modules/views/module/view.html.php
  127. +15 −15 administrator/components/com_modules/views/modules/tmpl/default.php
  128. +4 −2 administrator/components/com_modules/views/modules/view.html.php
  129. +2 −2 administrator/components/com_modules/views/positions/tmpl/modal.php
  130. +2 −0  administrator/components/com_modules/views/positions/view.html.php
  131. +1 −0  administrator/components/com_modules/views/select/view.html.php
  132. +2 −1  administrator/components/com_newsfeeds/helpers/newsfeeds.php
  133. +1 −1  administrator/components/com_newsfeeds/models/newsfeed.php
  134. +2 −1  administrator/components/com_newsfeeds/tables/newsfeed.php
  135. +1 −1  administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
  136. +3 −1 administrator/components/com_newsfeeds/views/newsfeed/view.html.php
  137. +14 −14 administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
  138. +2 −2 administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php
  139. +2 −0  administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
  140. +2 −2 administrator/components/com_plugins/models/fields/ordering.php
  141. +2 −1  administrator/components/com_plugins/models/plugin.php
  142. +2 −1  administrator/components/com_plugins/models/plugins.php
  143. +1 −1  administrator/components/com_plugins/views/plugin/tmpl/edit_options.php
  144. +2 −0  administrator/components/com_plugins/views/plugin/view.html.php
  145. +9 −9 administrator/components/com_plugins/views/plugins/tmpl/default.php
  146. +4 −2 administrator/components/com_plugins/views/plugins/view.html.php
  147. +2 −0  administrator/components/com_redirect/views/link/view.html.php
  148. +3 −3 administrator/components/com_redirect/views/links/tmpl/default.php
  149. +3 −0  administrator/components/com_redirect/views/links/view.html.php
  150. +3 −0  administrator/components/com_search/views/searches/view.html.php
  151. +3 −3 administrator/components/com_templates/controllers/source.php
  152. +12 −9 administrator/components/com_templates/models/style.php
  153. +6 −3 administrator/components/com_templates/tables/style.php
  154. +1 −2  administrator/components/com_templates/views/prevuuw/tmpl/default.php
  155. +5 −0 administrator/components/com_templates/views/prevuuw/view.html.php
  156. +4 −0 administrator/components/com_templates/views/source/view.html.php
  157. +1 −1  administrator/components/com_templates/views/style/tmpl/edit.php
  158. +2 −0  administrator/components/com_templates/views/style/view.html.php
  159. +8 −8 administrator/components/com_templates/views/styles/tmpl/default.php
  160. +4 −2 administrator/components/com_templates/views/styles/view.html.php
  161. +2 −0  administrator/components/com_templates/views/template/view.html.php
  162. +1 −1  administrator/components/com_templates/views/templates/tmpl/default.php
  163. +2 −2 administrator/components/com_templates/views/templates/view.html.php
  164. +2 −2 administrator/components/com_users/controllers/users.php
  165. +1 −1  administrator/components/com_users/models/group.php
  166. +1 −1  administrator/components/com_users/models/level.php
  167. +6 −6 administrator/components/com_users/models/mail.php
  168. +3 −0  administrator/components/com_users/views/debuggroup/view.html.php
  169. +3 −0  administrator/components/com_users/views/debuguser/view.html.php
  170. +2 −0  administrator/components/com_users/views/group/view.html.php
  171. +3 −3 administrator/components/com_users/views/groups/tmpl/default.php
  172. +2 −0  administrator/components/com_users/views/groups/view.html.php
  173. +2 −0  administrator/components/com_users/views/level/view.html.php
  174. +6 −6 administrator/components/com_users/views/levels/tmpl/default.php
  175. +2 −0  administrator/components/com_users/views/levels/view.html.php
  176. +11 −5 administrator/components/com_users/views/notes/tmpl/default.php
  177. +5 −1 administrator/components/com_users/views/user/view.html.php
  178. +1 −1  administrator/components/com_users/views/users/tmpl/default.php
  179. +2 −0  administrator/components/com_users/views/users/view.html.php
  180. +2 −1  administrator/components/com_weblinks/helpers/weblinks.php
  181. +1 −1  administrator/components/com_weblinks/models/weblink.php
  182. +5 −5 administrator/components/com_weblinks/models/weblinks.php
  183. +3 −2 administrator/components/com_weblinks/tables/weblink.php
  184. +1 −1  administrator/components/com_weblinks/views/weblink/tmpl/edit.php
  185. +2 −0  administrator/components/com_weblinks/views/weblink/view.html.php
  186. +19 −19 administrator/components/com_weblinks/views/weblinks/tmpl/default.php
  187. +2 −0  administrator/components/com_weblinks/views/weblinks/view.html.php
  188. +1 −1  administrator/includes/application.php
  189. +10 −10 administrator/includes/defines.php
  190. +1 −1  administrator/includes/toolbar.php
  191. +3 −3 administrator/index.php
  192. +12 −7 administrator/language/en-GB/en-GB.localise.php
  193. +1 −1  administrator/modules/mod_latest/tmpl/default.php
  194. +1 −1  administrator/modules/mod_login/tmpl/default.php
  195. +2 −2 administrator/modules/mod_menu/menu.php
  196. +2 −2 administrator/modules/mod_menu/tmpl/default_disabled.php
  197. +3 −3 administrator/modules/mod_menu/tmpl/default_enabled.php
  198. +1 −1  administrator/modules/mod_popular/tmpl/default.php
  199. +2 −1  administrator/modules/mod_version/helper.php
  200. +2 −2 administrator/templates/bluestork/cpanel.php
  201. +5 −1 administrator/templates/bluestork/html/pagination.php
  202. +1 −1  administrator/templates/bluestork/index.php
  203. +1 −1  administrator/templates/bluestork/login.php
  204. +2 −2 administrator/templates/hathor/cpanel.php
  205. +1 −1  administrator/templates/hathor/html/com_banners/banner/edit.php
  206. +21 −21 administrator/templates/hathor/html/com_banners/banners/default.php
  207. +1 −1  administrator/templates/hathor/html/com_banners/client/edit.php
  208. +7 −7 administrator/templates/hathor/html/com_banners/clients/default.php
  209. +4 −4 administrator/templates/hathor/html/com_banners/tracks/default.php
  210. +11 −11 administrator/templates/hathor/html/com_categories/categories/default.php
  211. +2 −2 administrator/templates/hathor/html/com_categories/category/edit.php
  212. +1 −1  administrator/templates/hathor/html/com_categories/category/edit_options.php
  213. +12 −12 administrator/templates/hathor/html/com_contact/contacts/default.php
  214. +3 −3 administrator/templates/hathor/html/com_contact/contacts/modal.php
  215. +2 −2 administrator/templates/hathor/html/com_content/article/edit.php
  216. +13 −13 administrator/templates/hathor/html/com_content/articles/default.php
  217. +3 −3 administrator/templates/hathor/html/com_content/articles/modal.php
  218. +8 −8 administrator/templates/hathor/html/com_content/featured/default.php
  219. +4 −4 administrator/templates/hathor/html/com_finder/filters/default.php
  220. +1 −1  administrator/templates/hathor/html/com_installer/discover/default.php
  221. +1 −1  administrator/templates/hathor/html/com_installer/manage/default.php
  222. +2 −2 administrator/templates/hathor/html/com_installer/update/default.php
  223. +4 −4 administrator/templates/hathor/html/com_languages/installed/default.php
  224. +13 −13 administrator/templates/hathor/html/com_languages/languages/default.php
  225. +3 −3 administrator/templates/hathor/html/com_menus/item/edit.php
  226. +1 −1  administrator/templates/hathor/html/com_menus/item/edit_options.php
  227. +17 −17 administrator/templates/hathor/html/com_menus/items/default.php
  228. +5 −5 administrator/templates/hathor/html/com_menus/menus/default.php
  229. +1 −1  administrator/templates/hathor/html/com_messages/messages/default.php
  230. +1 −1  administrator/templates/hathor/html/com_modules/module/edit_options.php
  231. +15 −15 administrator/templates/hathor/html/com_modules/modules/default.php
  232. +2 −2 administrator/templates/hathor/html/com_modules/positions/modal.php
  233. +1 −1  administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php
  234. +14 −14 administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
  235. +2 −2 administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
  236. +1 −1  administrator/templates/hathor/html/com_plugins/plugin/edit_options.php
  237. +9 −9 administrator/templates/hathor/html/com_plugins/plugins/default.php
  238. +3 −3 administrator/templates/hathor/html/com_redirect/links/default.php
  239. +9 −9 administrator/templates/hathor/html/com_templates/styles/default.php
  240. +1 −1  administrator/templates/hathor/html/com_templates/templates/default.php
  241. +3 −3 administrator/templates/hathor/html/com_users/groups/default.php
  242. +6 −6 administrator/templates/hathor/html/com_users/levels/default.php
  243. +11 −5 administrator/templates/hathor/html/com_users/notes/default.php
  244. +1 −1  administrator/templates/hathor/html/com_users/users/default.php
  245. +1 −1  administrator/templates/hathor/html/com_weblinks/weblink/edit.php
  246. +19 −19 administrator/templates/hathor/html/com_weblinks/weblinks/default.php
  247. +5 −2 administrator/templates/hathor/html/pagination.php
  248. +1 −1  administrator/templates/hathor/index.php
  249. +1 −1  administrator/templates/hathor/login.php
  250. +4 −3 administrator/templates/system/html/modules.php
  251. +1 −0  build/phpcs/Joomla/Sniffs/Classes/InstantiateNewClassesSniff.php
  252. +257 −0 build/phpcs/Joomla/Sniffs/Functions/FunctionCallSignatureSniff.php
  253. +228 −0 build/phpcs/Joomla/Sniffs/Functions/FunctionDeclarationSniff.php
  254. +151 −0 build/phpcs/Joomla/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
  255. +169 −0 build/phpcs/Joomla/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
  256. +259 −0 build/phpcs/Joomla/Sniffs/WhiteSpace/OperatorSpacingSniff.php
  257. +13 −4 build/phpcs/Joomla/ruleset.xml
  258. +1 −1  components/com_banners/controller.php
  259. +7 −5 components/com_banners/models/banner.php
  260. +11 −9 components/com_banners/models/banners.php
  261. +2 −2 components/com_contact/controller.php
  262. +1 −1  components/com_contact/helpers/icon.php
  263. +3 −2 components/com_contact/models/category.php
  264. +4 −2 components/com_contact/models/contact.php
  265. +1 −1  components/com_contact/models/featured.php
  266. +2 −1  components/com_contact/router.php
  267. +3 −0  components/com_contact/views/categories/view.html.php
  268. +4 −0 components/com_contact/views/category/view.html.php
  269. +13 −13 components/com_contact/views/contact/tmpl/default.php
  270. +1 −1  components/com_contact/views/contact/tmpl/default_form.php
  271. +1 −1  components/com_contact/views/contact/tmpl/default_profile.php
  272. +24 −21 components/com_contact/views/contact/view.html.php
  273. +15 −14 components/com_contact/views/contact/view.vcf.php
  274. +1 −1  components/com_contact/views/featured/tmpl/default.php
  275. +1 −1  components/com_contact/views/featured/tmpl/default_items.php
  276. +4 −0 components/com_contact/views/featured/view.html.php
  277. +2 −2 components/com_content/controller.php
  278. +2 −2 components/com_content/helpers/icon.php
  279. +2 −2 components/com_content/helpers/query.php
  280. +14 −13 components/com_content/models/article.php
  281. +6 −4 components/com_content/models/articles.php
  282. +1 −1  components/com_content/models/category.php
  283. +2 −1  components/com_content/models/featured.php
  284. +5 −4 components/com_content/router.php
  285. +4 −3 components/com_content/views/archive/tmpl/default_items.php
  286. +3 −0  components/com_content/views/archive/view.html.php
  287. +5 −5 components/com_content/views/article/tmpl/default.php
  288. +6 −1 components/com_content/views/article/view.html.php
  289. +2 −0  components/com_content/views/categories/view.html.php
  290. +7 −7 components/com_content/views/category/tmpl/blog.php
  291. +4 −3 components/com_content/views/category/tmpl/blog_item.php
  292. +8 −4 components/com_content/views/category/tmpl/default_articles.php
  293. +7 −0 components/com_content/views/category/view.html.php
  294. +8 −8 components/com_content/views/featured/tmpl/default.php
  295. +4 −3 components/com_content/views/featured/tmpl/default_item.php
  296. +6 −0 components/com_content/views/featured/view.html.php
  297. +1 −1  components/com_content/views/form/tmpl/edit.php
  298. +6 −3 components/com_content/views/form/view.html.php
  299. +1 −1  components/com_finder/views/search/tmpl/default_results.php
  300. +3 −0  components/com_finder/views/search/view.html.php
Sorry, we could not display the entire diff because too many files (399) changed.
View
2  administrator/components/com_admin/helpers/html/directory.php
@@ -50,7 +50,7 @@ public static function message($dir, $message, $visible=true)
$output = $dir;
}
else {
- $output ='';
+ $output = '';
}
if (empty($message)) {
return $output;
View
8 administrator/components/com_admin/models/sysinfo.php
@@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
+ * Model for the system information
+ *
* @package Joomla.Administrator
* @subpackage com_admin
* @since 1.6
@@ -157,7 +159,8 @@ function &getPHPInfo()
*
* @return array states of directories
*/
- public function getDirectory() {
+ public function getDirectory()
+ {
if (is_null($this->directories))
{
$this->directories = array();
@@ -223,7 +226,8 @@ public function getDirectory() {
return $this->directories;
}
- private function _addDirectory($name, $path, $message = '') {
+ private function _addDirectory($name, $path, $message = '')
+ {
$this->directories[$name] = array('writable' => is_writable($path), 'message' => $message);
}
View
16 administrator/components/com_admin/script.php
@@ -73,7 +73,7 @@ protected function updateDatabase()
}
foreach ($results as $result)
{
- if ($result->Support=='DEFAULT')
+ if ($result->Support == 'DEFAULT')
{
$query = 'ALTER TABLE #__update_sites_extensions ENGINE = ' . $result->Engine;
$db->setQuery($query);
@@ -92,14 +92,16 @@ protected function updateDatabase()
protected function updateManifestCaches()
{
// TODO Remove this for 2.5
- if (!JTable::getInstance('Extension')->load(array('element'=> 'pkg_joomla', 'type'=>'package'))) {
+ if (!JTable::getInstance('Extension')->load(array('element' => 'pkg_joomla', 'type' => 'package'))) {
// Create the package pkg_joomla
$db = JFactory::getDbo();
$query = $db->getQuery(true);
$query->insert('#__extensions');
- $query->columns(array($db->quoteName('name'), $db->quoteName('type'),
- $db->quoteName('element'), $db->quoteName('enabled'), $db->quoteName('access'),
- $db->quoteName('protected')));
+ $query->columns(
+ array($db->quoteName('name'), $db->quoteName('type'),
+ $db->quoteName('element'), $db->quoteName('enabled'), $db->quoteName('access'),
+ $db->quoteName('protected'))
+ );
$query->values($db->quote('joomla'). ', '. $db->quote('package').', '.$db->quote('pkg_joomla') . ', 1, 1, 1');
$db->setQuery($query);
@@ -113,7 +115,7 @@ protected function updateManifestCaches()
// TODO Remove this for 2.5
$table = JTable::getInstance('Extension');
- if ($table->load(array('element'=> 'mod_online', 'type'=>'module', 'client_id'=>1))) {
+ if ($table->load(array('element' => 'mod_online', 'type' => 'module', 'client_id' => 1))) {
if (!file_exists(JPATH_ADMINISTRATOR . '/modules/mod_online')) {
// Delete this extension
if (!$table->delete()) {
@@ -133,7 +135,7 @@ protected function updateManifestCaches()
// TODO Remove this for 2.5
$table = JTable::getInstance('Extension');
- if ($table->load(array('element'=> 'mod_unread', 'type'=>'module', 'client_id'=>1))) {
+ if ($table->load(array('element' => 'mod_unread', 'type' => 'module', 'client_id' => 1))) {
if (!file_exists(JPATH_ADMINISTRATOR . '/modules/mod_unread')) {
// Delete this extension
if (!$table->delete()) {
View
2  administrator/components/com_admin/views/help/tmpl/default.php
@@ -34,7 +34,7 @@
<div class="helpIndex">
<ul class="subext">
- <?php foreach ($this->toc as $k=>$v):?>
+ <?php foreach ($this->toc as $k => $v):?>
<li>
<?php $url = JHelp::createUrl('JHELP_'.strtoupper($k)); ?>
<?php echo JHtml::_('link', $url, $v, array('target' => 'helpFrame'));?>
View
15 administrator/components/com_admin/views/help/view.html.php
@@ -21,23 +21,28 @@ class AdminViewHelp extends JViewLegacy
/**
* @var string the search string
*/
- protected $help_search=null;
+ protected $help_search = null;
+
/**
* @var string the page to be viewed
*/
- protected $page=null;
+ protected $page = null;
+
/**
* @var string the iso language tag
*/
- protected $lang_tag=null;
+ protected $lang_tag = null;
+
/**
* @var array Table of contents
*/
- protected $toc=null;
+ protected $toc = null;
+
/**
* @var string url for the latest version check
*/
- protected $latest_version_check= 'http://www.joomla.org/download.html';
+ protected $latest_version_check = 'http://www.joomla.org/download.html';
+
/**
* @var string url for the start here link.
*/
View
4 administrator/components/com_admin/views/profile/view.html.php
@@ -10,13 +10,17 @@
defined('_JEXEC') or die;
/**
+ * View for the user profile
+ *
* @package Joomla.Administrator
* @subpackage com_admin
*/
class AdminViewProfile extends JViewLegacy
{
protected $form;
+
protected $item;
+
protected $state;
/**
View
2  administrator/components/com_admin/views/sysinfo/tmpl/default_config.php
@@ -28,7 +28,7 @@
</tr>
</tfoot>
<tbody>
- <?php foreach ($this->config as $key=>$value):?>
+ <?php foreach ($this->config as $key => $value):?>
<tr>
<td>
<?php echo $key;?>
View
2  administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php
@@ -28,7 +28,7 @@
</tr>
</tfoot>
<tbody>
- <?php foreach($this->directory as $dir=>$info):?>
+ <?php foreach($this->directory as $dir => $info):?>
<tr>
<td>
<?php echo JHtml::_('directory.message', $dir, $info['message']);?>
View
14 administrator/components/com_admin/views/sysinfo/view.html.php
@@ -21,23 +21,27 @@ class AdminViewSysinfo extends JViewLegacy
/**
* @var array some php settings
*/
- protected $php_settings=null;
+ protected $php_settings = null;
+
/**
* @var array config values
*/
- protected $config=null;
+ protected $config = null;
+
/**
* @var array somme system values
*/
- protected $info=null;
+ protected $info = null;
+
/**
* @var string php info
*/
- protected $php_info=null;
+ protected $php_info = null;
+
/**
* @var array informations about writable state of directories
*/
- protected $directory=null;
+ protected $directory = null;
/**
* Display the view
View
2  administrator/components/com_banners/helpers/banners.php
@@ -39,7 +39,7 @@ public static function addSubmenu($vName)
'index.php?option=com_categories&extension=com_banners',
$vName == 'categories'
);
- if ($vName=='categories') {
+ if ($vName == 'categories') {
JToolBarHelper::title(
JText::sprintf('COM_CATEGORIES_CATEGORIES_TITLE', JText::_('com_banners')),
'banners-categories');
View
12 administrator/components/com_banners/models/tracks.php
@@ -206,12 +206,12 @@ public function delete()
// Filter by client
$clientId = $this->getState('filter.client_id');
if (!empty($clientId)) {
- $where.=' AND cid = '.(int) $clientId;
+ $where .= ' AND cid = '.(int) $clientId;
}
// Filter by category
if (!empty($categoryId)) {
- $where.=' AND catid = '.(int) $categoryId;
+ $where .= ' AND catid = '.(int) $categoryId;
}
$query->where('banner_id IN (SELECT id FROM '.$db->quoteName('#__banners').' WHERE '.$where.')');
@@ -401,7 +401,7 @@ public function getContent()
if (!isset($this->content)) {
$this->content = '';
- $this->content.=
+ $this->content .=
'"'.str_replace('"', '""', JText::_('COM_BANNERS_HEADING_NAME')).'","'.
str_replace('"', '""', JText::_('COM_BANNERS_HEADING_CLIENT')).'","'.
str_replace('"', '""', JText::_('JCATEGORY')).'","'.
@@ -411,11 +411,11 @@ public function getContent()
foreach($this->getItems() as $item) {
- $this->content.=
+ $this->content .=
'"'.str_replace('"', '""', $item->name).'","'.
str_replace('"', '""', $item->client_name).'","'.
str_replace('"', '""', $item->category_title).'","'.
- str_replace('"', '""', ($item->track_type==1 ? JText::_('COM_BANNERS_IMPRESSION'): JText::_('COM_BANNERS_CLICK'))).'","'.
+ str_replace('"', '""', ($item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION'): JText::_('COM_BANNERS_CLICK'))) . '","' .
str_replace('"', '""', $item->count).'","'.
str_replace('"', '""', $item->track_date).'"'."\n";
}
@@ -424,7 +424,7 @@ public function getContent()
$app = JFactory::getApplication('administrator');
$files = array();
- $files['track']=array();
+ $files['track'] = array();
$files['track']['name'] = $this->getBasename() . '.csv';
$files['track']['data'] = $this->content;
$files['track']['time'] = time();
View
25 administrator/components/com_banners/tables/banner.php
@@ -142,7 +142,7 @@ function store($updateNulls = false)
switch($purchase_type)
{
case 1:
- $this->reset=$this->_db->getNullDate();
+ $this->reset = $this->_db->getNullDate();
break;
case 2:
$date = JFactory::getDate('+1 year '.date('Y-m-d', strtotime('now')));
@@ -175,7 +175,8 @@ function store($updateNulls = false)
// Verify that the alias is unique
$table = JTable::getInstance('Banner', 'BannersTable');
- if ($table->load(array('alias'=>$this->alias, 'catid'=>$this->catid)) && ($table->id != $this->id || $this->id==0)) {
+ if ($table->load(array('alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0))
+ {
$this->setError(JText::_('COM_BANNERS_ERROR_UNIQUE_ALIAS'));
return false;
}
@@ -184,13 +185,13 @@ function store($updateNulls = false)
parent::store($updateNulls);
// Need to reorder ?
- if ($oldrow->state>=0 && ($this->state < 0 || $oldrow->catid != $this->catid))
+ if ($oldrow->state >= 0 && ($this->state < 0 || $oldrow->catid != $this->catid))
{
// Reorder the oldrow
$this->reorder($this->_db->quoteName('catid').'=' . $this->_db->Quote($oldrow->catid).' AND state>=0');
}
}
- return count($this->getErrors())==0;
+ return count($this->getErrors()) == 0;
}
/**
@@ -241,12 +242,12 @@ public function publish($pks = null, $state = 1, $userId = 0)
}
// Verify checkout
- if($table->checked_out==0 || $table->checked_out==$userId)
+ if ($table->checked_out == 0 || $table->checked_out == $userId)
{
// Change the state
$table->state = $state;
- $table->checked_out=0;
- $table->checked_out_time=$this->_db->getNullDate();
+ $table->checked_out = 0;
+ $table->checked_out_time = $this->_db->getNullDate();
// Check the row
$table->check();
@@ -258,7 +259,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
}
}
}
- return count($this->getErrors())==0;
+ return count($this->getErrors()) == 0;
}
/**
@@ -309,12 +310,12 @@ public function stick($pks = null, $state = 1, $userId = 0)
}
// Verify checkout
- if($table->checked_out==0 || $table->checked_out==$userId)
+ if ($table->checked_out == 0 || $table->checked_out == $userId)
{
// Change the state
$table->sticky = $state;
- $table->checked_out=0;
- $table->checked_out_time=$this->_db->getNullDate();
+ $table->checked_out = 0;
+ $table->checked_out_time = $this->_db->getNullDate();
// Check the row
$table->check();
@@ -326,6 +327,6 @@ public function stick($pks = null, $state = 1, $userId = 0)
}
}
}
- return count($this->getErrors())==0;
+ return count($this->getErrors()) == 0;
}
}
View
2  administrator/components/com_banners/views/banner/tmpl/edit.php
@@ -98,7 +98,7 @@
</div>
<div class="width-40 fltrt">
- <?php echo JHtml::_('sliders.start', 'banner-sliders-'.$this->item->id, array('useCookie'=>1)); ?>
+ <?php echo JHtml::_('sliders.start', 'banner-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
<?php echo JHtml::_('sliders.panel', JText::_('COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS'), 'publishing-details'); ?>
<fieldset class="panelform">
View
4 administrator/components/com_banners/views/banner/view.html.php
@@ -21,7 +21,9 @@
class BannersViewBanner extends JViewLegacy
{
protected $form;
+
protected $item;
+
protected $state;
/**
@@ -58,7 +60,7 @@ protected function addToolbar()
$isNew = ($this->item->id == 0);
$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
// Since we don't track these assets at the item level, use the category id.
- $canDo = BannersHelper::getActions($this->item->catid,0);
+ $canDo = BannersHelper::getActions($this->item->catid, 0);
JToolBarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_BANNER_NEW') : JText::_('COM_BANNERS_MANAGER_BANNER_EDIT'), 'banners.png');
View
32 administrator/components/com_banners/views/banners/tmpl/default.php
@@ -18,7 +18,7 @@
$listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction'));
$canOrder = $user->authorise('core.edit.state', 'com_banners.category');
-$saveOrder = $listOrder=='ordering';
+$saveOrder = $listOrder == 'ordering';
$params = (isset($this->state->params)) ? $this->state->params : new JObject;
?>
<form action="<?php echo JRoute::_('index.php?option=com_banners&view=banners'); ?>" method="post" name="adminForm" id="adminForm">
@@ -61,7 +61,7 @@
<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
</th>
<th>
- <?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_NAME', 'a.name', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_NAME', 'a.name', $listDirn, $listOrder); ?>
</th>
<th width="5%">
<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
@@ -76,9 +76,9 @@
<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'category_title', $listDirn, $listOrder); ?>
</th>
<th width="10%">
- <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
<?php if ($canOrder && $saveOrder): ?>
- <?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'banners.saveorder'); ?>
+ <?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'banners.saveorder'); ?>
<?php endif;?>
</th>
<th width="5%">
@@ -110,12 +110,12 @@
</tfoot>
<tbody>
<?php foreach ($this->items as $i => $item) :
- $ordering = ($listOrder == 'ordering');
- $item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_banners&task=edit&type=other&cid[]='. $item->catid);
- $canCreate = $user->authorise('core.create', 'com_banners.category.'.$item->catid);
- $canEdit = $user->authorise('core.edit', 'com_banners.category.'.$item->catid);
- $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
- $canChange = $user->authorise('core.edit.state', 'com_banners.category.'.$item->catid) && $canCheckin;
+ $ordering = ($listOrder == 'ordering');
+ $item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_banners&task=edit&type=other&cid[]=' . $item->catid);
+ $canCreate = $user->authorise('core.create', 'com_banners.category.' . $item->catid);
+ $canEdit = $user->authorise('core.edit', 'com_banners.category.' . $item->catid);
+ $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+ $canChange = $user->authorise('core.edit.state', 'com_banners.category.' . $item->catid) && $canCheckin;
?>
<tr class="row<?php echo $i % 2; ?>">
<td class="center">
@@ -150,11 +150,11 @@
<?php if ($canChange) : ?>
<?php if ($saveOrder) : ?>
<?php if ($listDirn == 'asc') : ?>
- <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i - 1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i + 1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
<?php elseif ($listDirn == 'desc') : ?>
- <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i - 1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i + 1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
<?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
@@ -168,7 +168,7 @@
</td>
<td class="center">
<?php echo $item->clicks;?> -
- <?php echo sprintf('%.2f%%', $item->impmade ? 100 * $item->clicks/$item->impmade : 0);?>
+ <?php echo sprintf('%.2f%%', $item->impmade ? 100 * $item->clicks / $item->impmade : 0);?>
</td>
<td>
<?php echo $item->metakey; ?>
@@ -181,7 +181,7 @@
<?php endif;?>
</td>
<td class="center nowrap">
- <?php if ($item->language=='*'):?>
+ <?php if ($item->language == '*'):?>
<?php echo JText::alt('JALL', 'language'); ?>
<?php else:?>
<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
View
3  administrator/components/com_banners/views/banners/view.html.php
@@ -19,8 +19,11 @@
class BannersViewBanners extends JViewLegacy
{
protected $categories;
+
protected $items;
+
protected $pagination;
+
protected $state;
/**
View
2  administrator/components/com_banners/views/client/tmpl/edit.php
@@ -60,7 +60,7 @@
</div>
<div class="width-40 fltrt">
- <?php echo JHtml::_('sliders.start', 'banner-client-sliders-'.$this->item->id, array('useCookie'=>1)); ?>
+ <?php echo JHtml::_('sliders.start', 'banner-client-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'metadata'); ?>
<fieldset class="panelform">
View
2  administrator/components/com_banners/views/client/view.html.php
@@ -21,7 +21,9 @@
class BannersViewClient extends JViewLegacy
{
protected $form;
+
protected $item;
+
protected $state;
/**
View
12 administrator/components/com_banners/views/clients/tmpl/default.php
@@ -51,7 +51,7 @@
<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_CONTACT', 'contact', $listDirn, $listOrder); ?>
</th>
<th width="5%">
- <?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
</th>
<th width="5%">
<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_ACTIVE', 'nbanners', $listDirn, $listOrder); ?>
@@ -77,10 +77,10 @@
<tbody>
<?php foreach ($this->items as $i => $item) :
$ordering = ($listOrder == 'ordering');
- $canCreate = $user->authorise('core.create', 'com_banners');
- $canEdit = $user->authorise('core.edit', 'com_banners');
- $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out==$user->get('id') || $item->checked_out==0;
- $canChange = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
+ $canCreate = $user->authorise('core.create', 'com_banners');
+ $canEdit = $user->authorise('core.edit', 'com_banners');
+ $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+ $canChange = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
?>
<tr class="row<?php echo $i % 2; ?>">
<td class="center">
@@ -110,7 +110,7 @@
<?php echo $item->metakey; ?>
</td>
<td class="center">
- <?php if ($item->purchase_type<0):?>
+ <?php if ($item->purchase_type < 0):?>
<?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_'.$params->get('purchase_type')));?>
<?php else:?>
<?php echo JText::_('COM_BANNERS_FIELD_VALUE_'.$item->purchase_type);?>
View
2  administrator/components/com_banners/views/clients/view.html.php
@@ -19,7 +19,9 @@
class BannersViewClients extends JViewLegacy
{
protected $items;
+
protected $pagination;
+
protected $state;
/**
View
6 administrator/components/com_banners/views/tracks/tmpl/default.php
@@ -23,10 +23,10 @@
<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-hide-lbl" for="filter_begin"><?php echo JText::_('COM_BANNERS_BEGIN_LABEL'); ?></label>
- <?php echo JHtml::_('calendar', $this->state->get('filter.begin'), 'filter_begin', 'filter_begin', '%Y-%m-%d' , array('size'=>10, 'onchange'=>"this.form.fireEvent('submit');this.form.submit()"));?>
+ <?php echo JHtml::_('calendar', $this->state->get('filter.begin'), 'filter_begin', 'filter_begin', '%Y-%m-%d', array('size' => 10, 'onchange' => "this.form.fireEvent('submit');this.form.submit()"));?>
<label class="filter-hide-lbl" for="filter_end"><?php echo JText::_('COM_BANNERS_END_LABEL'); ?></label>
- <?php echo JHtml::_('calendar', $this->state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d' , array('size'=>10, 'onchange'=>"this.form.fireEvent('submit');this.form.submit()"));?>
+ <?php echo JHtml::_('calendar', $this->state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d', array('size' => 10, 'onchange' => "this.form.fireEvent('submit');this.form.submit()"));?>
</div>
<div class="filter-select fltrt">
@@ -91,7 +91,7 @@
<?php echo $item->category_title;?>
</td>
<td>
- <?php echo $item->track_type==1 ? JText::_('COM_BANNERS_IMPRESSION'): JText::_('COM_BANNERS_CLICK');?>
+ <?php echo $item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION'): JText::_('COM_BANNERS_CLICK');?>
</td>
<td>
<?php echo $item->count;?>
View
2  administrator/components/com_banners/views/tracks/view.html.php
@@ -19,7 +19,9 @@
class BannersViewTracks extends JViewLegacy
{
protected $items;
+
protected $pagination;
+
protected $state;
/**
View
2  administrator/components/com_categories/models/category.php
@@ -817,7 +817,7 @@ protected function batchMove($value, $pks, $contexts)
$query->clear();
$query->select('id');
$query->from($db->quoteName('#__categories'));
- $query->where($db->quoteName('lft' ) .' BETWEEN ' . (int) $table->lft . ' AND ' . (int) $table->rgt);
+ $query->where($db->quoteName('lft') .' BETWEEN ' . (int) $table->lft . ' AND ' . (int) $table->rgt);
$db->setQuery($query);
$children = array_merge($children, (array) $db->loadColumn());
}
View
6 administrator/components/com_categories/models/fields/categoryedit.php
@@ -52,14 +52,14 @@ protected function getOptions()
{
$oldCat = $jinput->get('id', 0);
$oldParent = $this->form->getValue($name, 0);
- $extension = $this->element['extension'] ? (string) $this->element['extension'] : (string) $jinput->get('extension','com_content');
+ $extension = $this->element['extension'] ? (string) $this->element['extension'] : (string) $jinput->get('extension', 'com_content');
}
else
// For items the old category is the category they are in when opened or 0 if new.
{
- $thisItem = $jinput->get('id',0);
+ $thisItem = $jinput->get('id', 0);
$oldCat = $this->form->getValue($name, 0);
- $extension = $this->element['extension'] ? (string) $this->element['extension'] : (string) $jinput->get('option','com_content');
+ $extension = $this->element['extension'] ? (string) $this->element['extension'] : (string) $jinput->get('option', 'com_content');
}
$db = JFactory::getDbo();
View
4 administrator/components/com_categories/models/fields/categoryparent.php
@@ -45,13 +45,13 @@ protected function getOptions()
// For categories the old category is the category id 0 for new category.
if ($this->element['parent'])
{
- $oldCat = $jinput->get('id',0);
+ $oldCat = $jinput->get('id', 0);
$oldParent = $this->form->getValue($name);
}
else
// For items the old category is the category they are in when opened or 0 if new.
{
- $thisItem = $jinput->get('id',0);
+ $thisItem = $jinput->get('id', 0);
$oldCat = $this->form->getValue($name);
}
View
22 administrator/components/com_categories/views/categories/tmpl/default.php
@@ -71,17 +71,17 @@
<th width="10%">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.lft', $listDirn, $listOrder); ?>
<?php if ($saveOrder) :?>
- <?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'categories.saveorder'); ?>
+ <?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'categories.saveorder'); ?>
<?php endif; ?>
</th>
<th width="10%">
- <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.title', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.title', $listDirn, $listOrder); ?>
</th>
<th width="5%" class="nowrap">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
</th>
<th width="1%" class="nowrap">
- <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
</th>
</tr>
</thead>
@@ -96,18 +96,18 @@
<?php
$originalOrders = array();
foreach ($this->items as $i => $item) :
- $orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
- $canEdit = $user->authorise('core.edit', $extension.'.category.'.$item->id);
- $canCheckin = $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
- $canEditOwn = $user->authorise('core.edit.own', $extension.'.category.'.$item->id) && $item->created_user_id == $userId;
- $canChange = $user->authorise('core.edit.state', $extension.'.category.'.$item->id) && $canCheckin;
+ $orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
+ $canEdit = $user->authorise('core.edit', $extension . '.category.' . $item->id);
+ $canCheckin = $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+ $canEditOwn = $user->authorise('core.edit.own', $extension . '.category.' . $item->id) && $item->created_user_id == $userId;
+ $canChange = $user->authorise('core.edit.state', $extension . '.category.' . $item->id) && $canCheckin;
?>
<tr class="row<?php echo $i % 2; ?>">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td>
- <?php echo str_repeat('<span class="gi">|&mdash;</span>', $item->level-1) ?>
+ <?php echo str_repeat('<span class="gi">|&mdash;</span>', $item->level - 1) ?>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
<?php endif; ?>
@@ -118,7 +118,7 @@
<?php echo $this->escape($item->title); ?>
<?php endif; ?>
<p class="smallsub" title="<?php echo $this->escape($item->path);?>">
- <?php echo str_repeat('<span class="gtr">|&mdash;</span>', $item->level-1) ?>
+ <?php echo str_repeat('<span class="gtr">|&mdash;</span>', $item->level - 1) ?>
<?php if (empty($item->note)) : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?>
<?php else : ?>
@@ -145,7 +145,7 @@
<?php echo $this->escape($item->access_level); ?>
</td>
<td class="center nowrap">
- <?php if ($item->language=='*'):?>
+ <?php if ($item->language == '*'):?>
<?php echo JText::alt('JALL', 'language'); ?>
<?php else:?>
<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
View
2  administrator/components/com_categories/views/categories/tmpl/default_batch.php
@@ -31,7 +31,7 @@
<option value=""><?php echo JText::_('JSELECT') ?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.categories', $extension, array('filter.published' => $published)));?>
</select>
- <?php echo JHtml::_( 'select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+ <?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
</fieldset>
<?php endif; ?>
View
9 administrator/components/com_categories/views/categories/view.html.php
@@ -19,7 +19,9 @@
class CategoriesViewCategories extends JViewLegacy
{
protected $items;
+
protected $pagination;
+
protected $state;
/**
@@ -99,7 +101,7 @@ protected function addToolbar()
}
// Else if the component section string exits, let's use it
elseif ($lang->hasKey($component_section_key = strtoupper($component.($section?"_$section":'')))) {
- $title = JText::sprintf( 'COM_CATEGORIES_CATEGORIES_TITLE', $this->escape(JText::_($component_section_key)));
+ $title = JText::sprintf('COM_CATEGORIES_CATEGORIES_TITLE', $this->escape(JText::_($component_section_key)));
}
// Else use the base title
else {
@@ -116,7 +118,8 @@ protected function addToolbar()
JToolBarHelper::addNew('category.add');
}
- if ($canDo->get('core.edit' ) || $canDo->get('core.edit.own')) {
+ if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+ {
JToolBarHelper::editList('category.edit');
JToolBarHelper::divider();
}
@@ -163,6 +166,6 @@ protected function addToolbar()
else {
$url = null;
}
- JToolBarHelper::help($ref_key, JComponentHelper::getParams( $component )->exists('helpURL'), $url);
+ JToolBarHelper::help($ref_key, JComponentHelper::getParams($component)->exists('helpURL'), $url);
}
}
View
4 administrator/components/com_categories/views/category/tmpl/edit.php
@@ -77,7 +77,7 @@
<div class="width-40 fltrt">
- <?php echo JHtml::_('sliders.start', 'categories-sliders-'.$this->item->id, array('useCookie'=>1)); ?>
+ <?php echo JHtml::_('sliders.start', 'categories-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
<?php echo $this->loadTemplate('options'); ?>
<div class="clr"></div>
@@ -93,7 +93,7 @@
<?php if ($this->canDo->get('core.admin')): ?>
<div class="width-100 fltlft">
- <?php echo JHtml::_('sliders.start', 'permissions-sliders-'.$this->item->id, array('useCookie'=>1)); ?>
+ <?php echo JHtml::_('sliders.start', 'permissions-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
<?php echo JHtml::_('sliders.panel', JText::_('COM_CATEGORIES_FIELDSET_RULES'), 'access-rules'); ?>
<fieldset class="panelform">
View
2  administrator/components/com_categories/views/category/tmpl/edit_options.php
@@ -50,7 +50,7 @@
<?php echo $field->input; ?></li>
<?php endforeach; ?>
- <?php if ($name=='basic'):?>
+ <?php if ($name == 'basic'):?>
<li><?php echo $this->form->getLabel('note'); ?>
<?php echo $this->form->getInput('note'); ?></li>
<?php endif;?>
View
6 administrator/components/com_categories/views/category/view.html.php
@@ -18,7 +18,9 @@
class CategoriesViewCategory extends JViewLegacy
{
protected $form;
+
protected $item;
+
protected $state;
/**
@@ -86,7 +88,7 @@ protected function addToolbar()
}
// Else if the component section string exits, let's use it
elseif ($lang->hasKey($component_section_key = $component.($section?"_$section":''))) {
- $title = JText::sprintf( 'COM_CATEGORIES_CATEGORY_'.($isNew?'ADD':'EDIT').'_TITLE', $this->escape(JText::_($component_section_key)));
+ $title = JText::sprintf('COM_CATEGORIES_CATEGORY_'.($isNew?'ADD':'EDIT').'_TITLE', $this->escape(JText::_($component_section_key)));
}
// Else use the base title
else {
@@ -146,6 +148,6 @@ protected function addToolbar()
else {
$url = null;
}
- JToolBarHelper::help($ref_key, JComponentHelper::getParams( $component )->exists('helpURL'), $url, $component);
+ JToolBarHelper::help($ref_key, JComponentHelper::getParams($component)->exists('helpURL'), $url, $component);
}
}
View
12 administrator/components/com_checkin/models/checkin.php
@@ -19,7 +19,9 @@
class CheckinModelCheckin extends JModelList
{
protected $total;
+
protected $tables;
+
/**
* Method to auto-populate the model state.
*
@@ -142,7 +144,7 @@ public function getItems()
}
foreach ($tables as $tn)
{
- $query=$db->getQuery(true)
+ $query = $db->getQuery(true)
->select('COUNT(*)')
->from($db->quoteName($tn))
->where('checked_out > 0');
@@ -155,9 +157,10 @@ public function getItems()
}
}
$this->total = count($results);
- if ($this->getState('list.ordering')=='table')
+ if ($this->getState('list.ordering') == 'table')
{
- if ($this->getState('list.direction')=='asc') {
+ if ($this->getState('list.direction') == 'asc')
+ {
ksort($results);
}
else {
@@ -166,7 +169,8 @@ public function getItems()
}
else
{
- if ($this->getState('list.direction')=='asc') {
+ if ($this->getState('list.direction') == 'asc')
+ {
asort($results);
}
else {
View
4 administrator/components/com_checkin/views/checkin/tmpl/default.php
@@ -34,8 +34,8 @@
</tr>
</thead>
<tbody>
- <?php foreach ($this->items as $table => $count): $i=0;?>
- <tr class="row<?php echo $i%2; ?>">
+ <?php foreach ($this->items as $table => $count): $i = 0;?>
+ <tr class="row<?php echo $i % 2; ?>">
<td class="center"><?php echo JHtml::_('grid.id', $i, $table); ?></td>
<td><?php echo JText::sprintf('COM_CHECKIN_TABLE', $table); ?></td>
<td width="200" class="center"><?php echo $count; ?></td>
View
2  administrator/components/com_config/controllers/application.php
@@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
+ * Controller for global configuration
+ *
* @package Joomla.Administrator
* @subpackage com_config
*/
View
2  administrator/components/com_config/models/application.php
@@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
+ * Model for the global configuration
+ *
* @package Joomla.Administrator
* @subpackage com_config
*/
View
2  administrator/components/com_config/models/component.php
@@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
+ * Model for component configuration
+ *
* @package Joomla.Administrator
* @subpackage com_config
*/
View
4 administrator/components/com_config/views/application/view.html.php
@@ -10,13 +10,17 @@
defined('_JEXEC') or die;
/**
+ * View for the global configuration
+ *
* @package Joomla.Administrator
* @subpackage com_config
*/
class ConfigViewApplication extends JViewLegacy
{
public $state;
+
public $form;
+
public $data;
/**
View
2  administrator/components/com_config/views/component/tmpl/default.php
@@ -39,7 +39,7 @@
</fieldset>
<?php
- echo JHtml::_('tabs.start', 'config-tabs-'.$this->component->option.'_configuration', array('useCookie'=>1));
+ echo JHtml::_('tabs.start', 'config-tabs-' . $this->component->option . '_configuration', array('useCookie' => 1));
$fieldSets = $this->form->getFieldsets();
foreach ($fieldSets as $name => $fieldSet) :
$label = empty($fieldSet->label) ? 'COM_CONFIG_'.$name.'_FIELDSET_LABEL' : $fieldSet->label;
View
2  administrator/components/com_config/views/component/view.html.php
@@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
+ * View for the component configuration
+ *
* @package Joomla.Administrator
* @subpackage com_config
*/
View
2  administrator/components/com_contact/controllers/contact.php
@@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
+ * Controller for a single contact
+ *
* @package Joomla.Administrator
* @subpackage com_contact
* @since 1.6
View
3  administrator/components/com_contact/helpers/contact.php
@@ -39,7 +39,8 @@ public static function addSubmenu($vName)
$vName == 'categories'
);
- if ($vName=='categories') {
+ if ($vName == 'categories')
+ {
JToolBarHelper::title(
JText::sprintf('COM_CATEGORIES_CATEGORIES_TITLE', JText::_('com_contact')),
'contact-categories');
View
2  administrator/components/com_contact/models/contact.php
@@ -443,7 +443,7 @@ protected function prepareTable($table)
$db->setQuery('SELECT MAX(ordering) FROM #__contact_details');
$max = $db->loadResult();
- $table->ordering = $max+1;
+ $table->ordering = $max + 1;
}
}
else {
View
3  administrator/components/com_contact/tables/contact.php
@@ -84,7 +84,8 @@ public function store($updateNulls = false)
}
// Verify that the alias is unique
$table = JTable::getInstance('Contact', 'ContactTable');
- if ($table->load(array('alias'=>$this->alias, 'catid'=>$this->catid)) && ($table->id != $this->id || $this->id==0)) {
+ if ($table->load(array('alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0))
+ {
$this->setError(JText::_('COM_CONTACT_ERROR_UNIQUE_ALIAS'));
return false;
}
View
2  administrator/components/com_contact/views/contact/view.html.php
@@ -19,7 +19,9 @@
class ContactViewContact extends JViewLegacy
{
protected $form;
+
protected $item;
+
protected $state;
/**
View
24 administrator/components/com_contact/views/contacts/tmpl/default.php
@@ -78,7 +78,7 @@
<th width="10%">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
<?php if ($canOrder && $saveOrder) :?>
- <?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'contacts.saveorder'); ?>
+ <?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'contacts.saveorder'); ?>
<?php endif; ?>
</th>
<th width="10%">
@@ -103,12 +103,12 @@
<?php
$n = count($this->items);
foreach ($this->items as $i => $item) :
- $ordering = $listOrder == 'a.ordering';
- $canCreate = $user->authorise('core.create', 'com_contact.category.'.$item->catid);
- $canEdit = $user->authorise('core.edit', 'com_contact.category.'.$item->catid);
- $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
- $canEditOwn = $user->authorise('core.edit.own', 'com_contact.category.'.$item->catid) && $item->created_by == $userId;
- $canChange = $user->authorise('core.edit.state', 'com_contact.category.'.$item->catid) && $canCheckin;
+ $ordering = $listOrder == 'a.ordering';
+ $canCreate = $user->authorise('core.create', 'com_contact.category.' . $item->catid);
+ $canEdit = $user->authorise('core.edit', 'com_contact.category.' . $item->catid);
+ $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+ $canEditOwn = $user->authorise('core.edit.own', 'com_contact.category.' . $item->catid) && $item->created_by == $userId;
+ $canChange = $user->authorise('core.edit.state', 'com_contact.category.' . $item->catid) && $canCheckin;
$item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_contact&task=edit&type=other&id='.$item->catid);
?>
@@ -147,11 +147,11 @@
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
<?php if ($listDirn == 'asc') : ?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'contacts.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i+1]->catid), 'contacts.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i - 1]->catid), 'contacts.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i + 1]->catid), 'contacts.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
<?php elseif ($listDirn == 'desc') : ?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'contacts.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i+1]->catid), 'contacts.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i - 1]->catid), 'contacts.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i + 1]->catid), 'contacts.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
<?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
@@ -164,7 +164,7 @@
<?php echo $item->access_level; ?>
</td>
<td class="center">
- <?php if ($item->language=='*'):?>
+ <?php if ($item->language == '*'):?>
<?php echo JText::alt('JALL', 'language'); ?>
<?php else:?>
<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
View
6 administrator/components/com_contact/views/contacts/tmpl/modal.php
@@ -57,10 +57,10 @@
<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
</th>
<th>
- <?php echo JHtml::_('grid.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
</th>
<th width="15%">
- <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
</th>
<th width="15%">
<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'a.catid', $listDirn, $listOrder); ?>
@@ -99,7 +99,7 @@
<?php echo $this->escape($item->category_title); ?>
</td>
<td class="center">
- <?php if ($item->language=='*'):?>
+ <?php if ($item->language == '*'):?>
<?php echo JText::alt('JALL', 'language'); ?>
<?php else:?>
<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
View
2  administrator/components/com_contact/views/contacts/view.html.php
@@ -19,7 +19,9 @@
class ContactViewContacts extends JViewLegacy
{
protected $items;
+
protected $pagination;
+
protected $state;
/**
View
12 administrator/components/com_content/helpers/content.php
@@ -210,10 +210,14 @@ public static function filterText($text)
elseif ($blackList) {
// Remove the white-listed attributes from the black-list.
$filter = JFilterInput::getInstance(
- array_diff($blackListTags, $whiteListTags), // blacklisted tags
- array_diff($blackListAttributes, $whiteListAttributes), <