typo 5.0.3.98.1 → 5.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (453) hide show
  1. data/CHANGES-5.1 +54 -0
  2. data/app/apis/meta_weblog_service.rb +7 -6
  3. data/app/controllers/accounts_controller.rb +2 -1
  4. data/app/controllers/admin/content_controller.rb +45 -3
  5. data/app/controllers/admin/pages_controller.rb +1 -1
  6. data/app/controllers/admin/textfilters_controller.rb +4 -4
  7. data/app/controllers/admin/users_controller.rb +14 -2
  8. data/app/controllers/application.rb +4 -1
  9. data/app/controllers/articles_controller.rb +1 -3
  10. data/app/controllers/backend_controller.rb +2 -0
  11. data/app/controllers/comments_controller.rb +6 -0
  12. data/app/helpers/admin/base_helper.rb +24 -26
  13. data/app/helpers/admin/feedback_helper.rb +0 -20
  14. data/app/helpers/application_helper.rb +1 -0
  15. data/app/models/article.rb +2 -0
  16. data/app/models/blog.rb +1 -0
  17. data/app/models/blog_sweeper.rb +8 -9
  18. data/app/models/page_cache.rb +1 -0
  19. data/app/models/tag.rb +2 -2
  20. data/app/models/user.rb +5 -1
  21. data/app/views/admin/blacklist/destroy.html.erb +1 -1
  22. data/app/views/admin/categories/destroy.html.erb +1 -1
  23. data/app/views/admin/comments/destroy.html.erb +1 -1
  24. data/app/views/admin/content/_articles.html.erb +4 -4
  25. data/app/views/admin/content/_attachment.html.erb +6 -7
  26. data/app/views/admin/content/_drafts.html.erb +6 -0
  27. data/app/views/admin/content/_form.html.erb +47 -34
  28. data/app/views/admin/content/destroy.html.erb +1 -1
  29. data/app/views/admin/content/edit.html.erb +1 -1
  30. data/app/views/admin/content/index.html.erb +1 -6
  31. data/app/views/admin/content/new.html.erb +1 -1
  32. data/app/views/admin/pages/_form.html.erb +4 -3
  33. data/app/views/admin/pages/_pages.html.erb +3 -3
  34. data/app/views/admin/pages/destroy.html.erb +1 -1
  35. data/app/views/admin/resources/destroy.html.erb +1 -1
  36. data/app/views/admin/settings/index.html.erb +10 -0
  37. data/app/views/admin/shared/_edit.html.erb +1 -6
  38. data/app/views/admin/textfilters/destroy.html.erb +3 -0
  39. data/app/views/admin/textfilters/edit.html.erb +3 -1
  40. data/app/views/admin/textfilters/index.html.erb +1 -1
  41. data/app/views/admin/textfilters/new.html.erb +3 -1
  42. data/app/views/admin/trackbacks/show.html.erb +1 -1
  43. data/app/views/admin/users/destroy.html.erb +1 -1
  44. data/app/views/admin/users/edit.html.erb +1 -5
  45. data/app/views/admin/users/index.html.erb +1 -1
  46. data/app/views/articles/_comment_failed.html.erb +3 -0
  47. data/config/initializers/access_rules.rb +3 -3
  48. data/db/migrate/070_add_users_to_non_admins.rb +17 -0
  49. data/installer/rails_installer_defaults.yml +1 -1
  50. data/lib/tasks/release.rake +3 -3
  51. data/lib/typo_version.rb +1 -1
  52. data/public/images/admin/cancel.png +0 -0
  53. data/public/images/admin/checked.png +0 -0
  54. data/public/images/admin/delete.png +0 -0
  55. data/public/images/admin/edit.png +0 -0
  56. data/public/images/admin/show.png +0 -0
  57. data/public/javascripts/controls.js +2 -0
  58. data/public/javascripts/dragdrop.js +2 -0
  59. data/public/javascripts/effects.js +6 -4
  60. data/public/javascripts/fckeditor/editor/_source/classes/fckcontextmenu.js +13 -8
  61. data/public/javascripts/fckeditor/editor/_source/classes/fckdataprocessor.js +2 -2
  62. data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js +2 -2
  63. data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js +2 -2
  64. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange.js +189 -79
  65. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_gecko.js +4 -3
  66. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_ie.js +16 -15
  67. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrangeiterator.js +30 -9
  68. data/public/javascripts/fckeditor/editor/_source/classes/fckeditingarea.js +108 -90
  69. data/public/javascripts/fckeditor/editor/_source/classes/fckelementpath.js +22 -3
  70. data/public/javascripts/fckeditor/editor/_source/classes/fckenterkey.js +76 -38
  71. data/public/javascripts/fckeditor/editor/_source/classes/fckevents.js +7 -2
  72. data/public/javascripts/fckeditor/editor/_source/classes/fckhtmliterator.js +142 -0
  73. data/public/javascripts/fckeditor/editor/_source/classes/fckicon.js +2 -2
  74. data/public/javascripts/fckeditor/editor/_source/classes/fckiecleanup.js +1 -1
  75. data/public/javascripts/fckeditor/editor/_source/classes/fckimagepreloader.js +2 -2
  76. data/public/javascripts/fckeditor/editor/_source/classes/fckkeystrokehandler.js +3 -3
  77. data/public/javascripts/fckeditor/editor/_source/classes/fckmenublock.js +8 -5
  78. data/public/javascripts/fckeditor/editor/_source/classes/fckmenublockpanel.js +3 -3
  79. data/public/javascripts/fckeditor/editor/_source/classes/fckmenuitem.js +6 -5
  80. data/public/javascripts/fckeditor/editor/_source/classes/fckpanel.js +85 -38
  81. data/public/javascripts/fckeditor/editor/_source/classes/fckplugin.js +2 -2
  82. data/public/javascripts/fckeditor/editor/_source/classes/fckspecialcombo.js +7 -8
  83. data/public/javascripts/fckeditor/editor/_source/classes/fckstyle.js +180 -17
  84. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbar.js +2 -2
  85. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js +2 -2
  86. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js +1 -1
  87. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbutton.js +9 -4
  88. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js +5 -1
  89. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js +3 -3
  90. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js +1 -1
  91. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js +1 -1
  92. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js +15 -4
  93. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js +5 -2
  94. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js +13 -13
  95. data/public/javascripts/fckeditor/editor/_source/classes/fckw3crange.js +17 -13
  96. data/public/javascripts/fckeditor/editor/_source/classes/fckxml.js +2 -2
  97. data/public/javascripts/fckeditor/editor/_source/classes/fckxml_gecko.js +28 -13
  98. data/public/javascripts/fckeditor/editor/_source/classes/fckxml_ie.js +2 -2
  99. data/public/javascripts/fckeditor/editor/_source/commandclasses/fck_othercommands.js +75 -19
  100. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js +64 -8
  101. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js +3 -1
  102. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckfitwindow.js +2 -2
  103. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckindentcommands.js +5 -3
  104. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckjustifycommands.js +6 -6
  105. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcklistcommands.js +4 -4
  106. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcknamedcommand.js +3 -1
  107. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js +3 -1
  108. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js +2 -2
  109. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js +2 -2
  110. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckshowblocks.js +7 -9
  111. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js +4 -2
  112. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js +4 -2
  113. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckstylecommand.js +3 -3
  114. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktablecommand.js +4 -4
  115. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js +28 -10
  116. data/public/javascripts/fckeditor/editor/_source/fckconstants.js +1 -1
  117. data/public/javascripts/fckeditor/editor/_source/fckeditorapi.js +21 -13
  118. data/public/javascripts/fckeditor/editor/_source/fckjscoreextensions.js +5 -5
  119. data/public/javascripts/fckeditor/editor/_source/fckscriptloader.js +4 -4
  120. data/public/javascripts/fckeditor/editor/_source/internals/fck.js +148 -38
  121. data/public/javascripts/fckeditor/editor/_source/internals/fck_contextmenu.js +4 -4
  122. data/public/javascripts/fckeditor/editor/_source/internals/fck_gecko.js +45 -47
  123. data/public/javascripts/fckeditor/editor/_source/internals/fck_ie.js +50 -17
  124. data/public/javascripts/fckeditor/editor/_source/internals/fckbrowserinfo.js +4 -2
  125. data/public/javascripts/fckeditor/editor/_source/internals/fckcodeformatter.js +2 -2
  126. data/public/javascripts/fckeditor/editor/_source/internals/fckcommands.js +28 -28
  127. data/public/javascripts/fckeditor/editor/_source/internals/fckconfig.js +12 -13
  128. data/public/javascripts/fckeditor/editor/_source/internals/fckdebug.js +2 -2
  129. data/public/javascripts/fckeditor/editor/_source/internals/fckdialog.js +211 -15
  130. data/public/javascripts/fckeditor/editor/_source/internals/fckdocumentprocessor.js +63 -39
  131. data/public/javascripts/fckeditor/editor/_source/internals/fckdomtools.js +177 -37
  132. data/public/javascripts/fckeditor/editor/_source/internals/fcklanguagemanager.js +2 -1
  133. data/public/javascripts/fckeditor/editor/_source/internals/fcklisthandler.js +2 -2
  134. data/public/javascripts/fckeditor/editor/_source/internals/fcklistslib.js +5 -2
  135. data/public/javascripts/fckeditor/editor/_source/internals/fckplugins.js +2 -2
  136. data/public/javascripts/fckeditor/editor/_source/internals/fckregexlib.js +5 -2
  137. data/public/javascripts/fckeditor/editor/_source/internals/fckselection.js +3 -3
  138. data/public/javascripts/fckeditor/editor/_source/internals/fckselection_gecko.js +36 -27
  139. data/public/javascripts/fckeditor/editor/_source/internals/fckselection_ie.js +91 -17
  140. data/public/javascripts/fckeditor/editor/_source/internals/fckstyles.js +22 -13
  141. data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler.js +15 -15
  142. data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_gecko.js +2 -2
  143. data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_ie.js +2 -2
  144. data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbaritems.js +1 -1
  145. data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbarset.js +32 -6
  146. data/public/javascripts/fckeditor/editor/_source/internals/fcktools.js +181 -22
  147. data/public/javascripts/fckeditor/editor/_source/internals/fcktools_gecko.js +19 -7
  148. data/public/javascripts/fckeditor/editor/_source/internals/fcktools_ie.js +8 -2
  149. data/public/javascripts/fckeditor/editor/_source/internals/fckundo.js +8 -5
  150. data/public/javascripts/fckeditor/editor/_source/internals/fckurlparams.js +2 -2
  151. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml.js +116 -61
  152. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_gecko.js +6 -10
  153. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_ie.js +51 -56
  154. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtmlentities.js +1 -1
  155. data/public/javascripts/fckeditor/editor/css/fck_editorarea.css +3 -2
  156. data/public/javascripts/fckeditor/editor/css/fck_internal.css +19 -2
  157. data/public/javascripts/fckeditor/editor/css/fck_showtableborders_gecko.css +8 -1
  158. data/public/javascripts/fckeditor/editor/css/images/fck_plugin.gif +0 -0
  159. data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.css +8 -1
  160. data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.js +199 -26
  161. data/public/javascripts/fckeditor/editor/dialog/fck_about.html +20 -14
  162. data/public/javascripts/fckeditor/editor/dialog/fck_about/sponsors/spellchecker_net.gif +0 -0
  163. data/public/javascripts/fckeditor/editor/dialog/fck_anchor.html +15 -10
  164. data/public/javascripts/fckeditor/editor/dialog/fck_button.html +9 -14
  165. data/public/javascripts/fckeditor/editor/dialog/fck_checkbox.html +8 -13
  166. data/public/javascripts/fckeditor/editor/dialog/fck_colorselector.html +4 -3
  167. data/public/javascripts/fckeditor/editor/dialog/fck_docprops.html +6 -6
  168. data/public/javascripts/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html +1 -1
  169. data/public/javascripts/fckeditor/editor/dialog/fck_flash.html +9 -3
  170. data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash.js +18 -11
  171. data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html +7 -3
  172. data/public/javascripts/fckeditor/editor/dialog/fck_form.html +7 -4
  173. data/public/javascripts/fckeditor/editor/dialog/fck_hiddenfield.html +12 -15
  174. data/public/javascripts/fckeditor/editor/dialog/fck_image.html +9 -3
  175. data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image.js +24 -12
  176. data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image_preview.html +24 -18
  177. data/public/javascripts/fckeditor/editor/dialog/fck_link.html +1 -1
  178. data/public/javascripts/fckeditor/editor/dialog/fck_link/fck_link.js +41 -20
  179. data/public/javascripts/fckeditor/editor/dialog/fck_listprop.html +8 -4
  180. data/public/javascripts/fckeditor/editor/dialog/fck_paste.html +53 -54
  181. data/public/javascripts/fckeditor/editor/dialog/fck_radiobutton.html +8 -13
  182. data/public/javascripts/fckeditor/editor/dialog/fck_replace.html +157 -79
  183. data/public/javascripts/fckeditor/editor/dialog/fck_select.html +14 -11
  184. data/public/javascripts/fckeditor/editor/dialog/fck_select/fck_select.js +2 -2
  185. data/public/javascripts/fckeditor/editor/dialog/fck_smiley.html +9 -4
  186. data/public/javascripts/fckeditor/editor/dialog/fck_source.html +5 -2
  187. data/public/javascripts/fckeditor/editor/dialog/fck_specialchar.html +9 -6
  188. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages.html +2 -1
  189. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm +3 -1
  190. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php +5 -2
  191. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl +2 -1
  192. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js +0 -1
  193. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css +1 -1
  194. data/public/javascripts/fckeditor/editor/dialog/fck_table.html +10 -5
  195. data/public/javascripts/fckeditor/editor/dialog/fck_tablecell.html +8 -6
  196. data/public/javascripts/fckeditor/editor/dialog/fck_template.html +1 -1
  197. data/public/javascripts/fckeditor/editor/dialog/fck_textarea.html +10 -11
  198. data/public/javascripts/fckeditor/editor/dialog/fck_textfield.html +10 -14
  199. data/public/javascripts/fckeditor/editor/dtd/fck_dtd_test.html +0 -2
  200. data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10strict.js +2 -2
  201. data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10transitional.js +3 -3
  202. data/public/javascripts/fckeditor/editor/fckdebug.html +1 -1
  203. data/public/javascripts/fckeditor/editor/fckdialog.html +660 -213
  204. data/public/javascripts/fckeditor/editor/fckeditor.html +66 -16
  205. data/public/javascripts/fckeditor/editor/fckeditor.original.html +70 -16
  206. data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.css +2 -2
  207. data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.html +37 -2
  208. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmactualfolder.html +33 -1
  209. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html +1 -1
  210. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmfolders.html +2 -1
  211. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourceslist.html +3 -2
  212. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourcetype.html +1 -1
  213. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmupload.html +2 -1
  214. data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/common.js +34 -2
  215. data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/fckxml.js +3 -3
  216. data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/connector.aspx +5 -3
  217. data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/upload.aspx +5 -3
  218. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/basexml.pl +1 -1
  219. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/commands.pl +50 -4
  220. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/connector.cgi +2 -3
  221. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/io.pl +14 -4
  222. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload.cgi +2 -3
  223. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl +23 -4
  224. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/util.pl +1 -1
  225. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/config.py +43 -32
  226. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/connector.py +16 -16
  227. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckcommands.py +26 -9
  228. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckconnector.py +2 -2
  229. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckoutput.py +40 -9
  230. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckutil.py +20 -21
  231. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/htaccess.txt +2 -2
  232. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/upload.py +13 -13
  233. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/wsgi.py +3 -3
  234. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/zope.py +4 -5
  235. data/public/javascripts/fckeditor/editor/filemanager/connectors/test.html +34 -1
  236. data/public/javascripts/fckeditor/editor/filemanager/connectors/uploadtest.html +47 -4
  237. data/public/javascripts/fckeditor/editor/js/fckadobeair.js +176 -0
  238. data/public/javascripts/fckeditor/editor/js/fckeditorcode_gecko.js +77 -77
  239. data/public/javascripts/fckeditor/editor/js/fckeditorcode_ie.js +74 -74
  240. data/public/javascripts/fckeditor/editor/lang/_translationstatus.txt +55 -54
  241. data/public/javascripts/fckeditor/editor/lang/af.js +1 -2
  242. data/public/javascripts/fckeditor/editor/lang/ar.js +16 -17
  243. data/public/javascripts/fckeditor/editor/lang/bg.js +1 -2
  244. data/public/javascripts/fckeditor/editor/lang/bn.js +1 -2
  245. data/public/javascripts/fckeditor/editor/lang/bs.js +1 -2
  246. data/public/javascripts/fckeditor/editor/lang/ca.js +27 -28
  247. data/public/javascripts/fckeditor/editor/lang/cs.js +18 -19
  248. data/public/javascripts/fckeditor/editor/lang/da.js +1 -2
  249. data/public/javascripts/fckeditor/editor/lang/de.js +1 -2
  250. data/public/javascripts/fckeditor/editor/lang/el.js +1 -2
  251. data/public/javascripts/fckeditor/editor/lang/en-au.js +1 -2
  252. data/public/javascripts/fckeditor/editor/lang/en-ca.js +1 -2
  253. data/public/javascripts/fckeditor/editor/lang/en-uk.js +1 -2
  254. data/public/javascripts/fckeditor/editor/lang/en.js +1 -2
  255. data/public/javascripts/fckeditor/editor/lang/eo.js +1 -2
  256. data/public/javascripts/fckeditor/editor/lang/es.js +34 -35
  257. data/public/javascripts/fckeditor/editor/lang/et.js +32 -33
  258. data/public/javascripts/fckeditor/editor/lang/eu.js +32 -33
  259. data/public/javascripts/fckeditor/editor/lang/fa.js +1 -2
  260. data/public/javascripts/fckeditor/editor/lang/fi.js +15 -16
  261. data/public/javascripts/fckeditor/editor/lang/fo.js +1 -2
  262. data/public/javascripts/fckeditor/editor/lang/fr-ca.js +515 -0
  263. data/public/javascripts/fckeditor/editor/lang/fr.js +5 -6
  264. data/public/javascripts/fckeditor/editor/lang/gl.js +1 -2
  265. data/public/javascripts/fckeditor/editor/lang/he.js +15 -16
  266. data/public/javascripts/fckeditor/editor/lang/hi.js +1 -2
  267. data/public/javascripts/fckeditor/editor/lang/hr.js +1 -2
  268. data/public/javascripts/fckeditor/editor/lang/hu.js +1 -2
  269. data/public/javascripts/fckeditor/editor/lang/it.js +1 -2
  270. data/public/javascripts/fckeditor/editor/lang/ja.js +1 -2
  271. data/public/javascripts/fckeditor/editor/lang/km.js +1 -2
  272. data/public/javascripts/fckeditor/editor/lang/ko.js +25 -26
  273. data/public/javascripts/fckeditor/editor/lang/lt.js +1 -2
  274. data/public/javascripts/fckeditor/editor/lang/lv.js +1 -2
  275. data/public/javascripts/fckeditor/editor/lang/mn.js +199 -200
  276. data/public/javascripts/fckeditor/editor/lang/ms.js +1 -2
  277. data/public/javascripts/fckeditor/editor/lang/nb.js +1 -2
  278. data/public/javascripts/fckeditor/editor/lang/nl.js +1 -2
  279. data/public/javascripts/fckeditor/editor/lang/no.js +1 -2
  280. data/public/javascripts/fckeditor/editor/lang/pl.js +51 -52
  281. data/public/javascripts/fckeditor/editor/lang/pt-br.js +16 -17
  282. data/public/javascripts/fckeditor/editor/lang/pt.js +1 -2
  283. data/public/javascripts/fckeditor/editor/lang/ro.js +1 -2
  284. data/public/javascripts/fckeditor/editor/lang/ru.js +31 -32
  285. data/public/javascripts/fckeditor/editor/lang/sk.js +1 -2
  286. data/public/javascripts/fckeditor/editor/lang/sl.js +39 -40
  287. data/public/javascripts/fckeditor/editor/lang/sr-latn.js +1 -2
  288. data/public/javascripts/fckeditor/editor/lang/sr.js +1 -2
  289. data/public/javascripts/fckeditor/editor/lang/sv.js +1 -2
  290. data/public/javascripts/fckeditor/editor/lang/th.js +1 -2
  291. data/public/javascripts/fckeditor/editor/lang/tr.js +1 -2
  292. data/public/javascripts/fckeditor/editor/lang/uk.js +1 -2
  293. data/public/javascripts/fckeditor/editor/lang/vi.js +1 -2
  294. data/public/javascripts/fckeditor/editor/lang/zh-cn.js +2 -3
  295. data/public/javascripts/fckeditor/editor/lang/zh.js +1 -2
  296. data/public/javascripts/fckeditor/editor/plugins/autogrow/fckplugin.js +9 -2
  297. data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.config.js +1 -1
  298. data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.html +1 -1
  299. data/public/javascripts/fckeditor/editor/plugins/bbcode/fckplugin.js +2 -2
  300. data/public/javascripts/fckeditor/editor/plugins/dragresizetable/fckplugin.js +35 -11
  301. data/public/javascripts/fckeditor/editor/plugins/placeholder/fck_placeholder.html +10 -5
  302. data/public/javascripts/fckeditor/editor/plugins/placeholder/fckplugin.js +3 -3
  303. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/de.js +2 -2
  304. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/en.js +2 -2
  305. data/public/javascripts/fckeditor/editor/{filemanager/connectors/cfm/upload.cfm → plugins/placeholder/lang/es.js} +9 -13
  306. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/fr.js +1 -1
  307. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/it.js +1 -1
  308. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/pl.js +2 -2
  309. data/public/javascripts/fckeditor/editor/plugins/simplecommands/fckplugin.js +1 -1
  310. data/public/javascripts/fckeditor/editor/plugins/tablecommands/fckplugin.js +1 -1
  311. data/public/javascripts/fckeditor/editor/skins/_fckviewstrips.html +1 -1
  312. data/public/javascripts/fckeditor/editor/skins/default/fck_dialog.css +271 -8
  313. data/public/javascripts/fckeditor/editor/skins/default/fck_editor.css +2 -2
  314. data/public/javascripts/fckeditor/editor/skins/office2003/fck_dialog.css +270 -8
  315. data/public/javascripts/fckeditor/editor/skins/office2003/fck_editor.css +2 -2
  316. data/public/javascripts/fckeditor/editor/skins/silver/fck_dialog.css +270 -11
  317. data/public/javascripts/fckeditor/editor/skins/silver/fck_editor.css +2 -2
  318. data/public/javascripts/fckeditor/fckconfig.js +58 -55
  319. data/public/javascripts/fckeditor/fckeditor.js +99 -8
  320. data/public/javascripts/fckeditor/fckeditor.py +2 -4
  321. data/public/javascripts/fckeditor/fckpackager.xml +12 -12
  322. data/public/javascripts/fckeditor/fckstyles.xml +2 -5
  323. data/public/javascripts/fckeditor/fcktemplates.xml +1 -1
  324. data/public/javascripts/fckeditor/license.txt +1 -2
  325. data/public/javascripts/prototype.js +46 -101
  326. data/public/javascripts/scriptaculous.js +28 -17
  327. data/public/stylesheets/administration.css +5 -1
  328. data/themes/dirtylicious/about.markdown +3 -0
  329. data/themes/dirtylicious/images/body.jpg +0 -0
  330. data/themes/dirtylicious/images/container.jpg +0 -0
  331. data/themes/dirtylicious/images/gravatar.gif +0 -0
  332. data/themes/dirtylicious/images/header.jpg +0 -0
  333. data/themes/dirtylicious/images/li.gif +0 -0
  334. data/themes/dirtylicious/images/main.gif +0 -0
  335. data/themes/dirtylicious/images/nav.gif +0 -0
  336. data/themes/dirtylicious/images/quote.gif +0 -0
  337. data/themes/dirtylicious/images/spinner.gif +0 -0
  338. data/themes/dirtylicious/layouts/default.html.erb +60 -0
  339. data/themes/dirtylicious/preview.png +0 -0
  340. data/themes/dirtylicious/stylesheets/application.css +327 -0
  341. data/themes/dirtylicious/views/articles/_article.html.erb +33 -0
  342. data/themes/dirtylicious/views/articles/_comment.html.erb +14 -0
  343. data/themes/dirtylicious/views/articles/_comment_form.html.erb +37 -0
  344. data/themes/dirtylicious/views/articles/_comment_list.html.erb +7 -0
  345. data/themes/dirtylicious/views/articles/_trackback.html.erb +9 -0
  346. data/themes/dirtylicious/views/articles/comment_preview.html.erb +10 -0
  347. data/themes/dirtylicious/views/articles/index.html.erb +5 -0
  348. data/themes/dirtylicious/views/articles/read.html.erb +42 -0
  349. data/themes/dirtylicious/views/shared/_search.html.erb +16 -0
  350. data/themes/standard_issue/about.markdown +5 -0
  351. data/themes/standard_issue/images/img01.gif +0 -0
  352. data/themes/standard_issue/images/img02.gif +0 -0
  353. data/themes/standard_issue/images/img03.gif +0 -0
  354. data/themes/standard_issue/images/img04.jpg +0 -0
  355. data/themes/standard_issue/images/img05.gif +0 -0
  356. data/themes/standard_issue/images/img06.gif +0 -0
  357. data/themes/standard_issue/images/img07.gif +0 -0
  358. data/themes/standard_issue/images/img08.gif +0 -0
  359. data/themes/standard_issue/images/img09.gif +0 -0
  360. data/themes/standard_issue/images/img10.gif +0 -0
  361. data/themes/standard_issue/images/spacer.gif +0 -0
  362. data/themes/standard_issue/images/spinner.gif +0 -0
  363. data/themes/standard_issue/layouts/default.html.erb +59 -0
  364. data/themes/standard_issue/preview.png +0 -0
  365. data/themes/standard_issue/stylesheets/application.css +461 -0
  366. data/themes/standard_issue/views/articles/_article.html.erb +37 -0
  367. data/themes/standard_issue/views/articles/_comment.html.erb +12 -0
  368. data/themes/standard_issue/views/articles/_comment_form.html.erb +48 -0
  369. data/themes/standard_issue/views/articles/_comment_list.html.erb +7 -0
  370. data/themes/standard_issue/views/articles/_trackback.html.erb +9 -0
  371. data/themes/standard_issue/views/articles/comment_preview.html.erb +10 -0
  372. data/themes/standard_issue/views/articles/index.html.erb +5 -0
  373. data/themes/standard_issue/views/articles/read.html.erb +42 -0
  374. data/themes/standard_issue/views/shared/_search.html.erb +17 -0
  375. data/themes/standard_issue/views/theme/static_view_test.html.erb +1 -0
  376. data/themes/typographic/images/accept.gif +0 -0
  377. data/themes/typographic/images/accept50.gif +0 -0
  378. data/themes/typographic/images/bg_white.gif +0 -0
  379. data/themes/typographic/images/bg_wrapper.gif +0 -0
  380. data/themes/typographic/images/bullet_bottom.gif +0 -0
  381. data/themes/typographic/images/bullet_right.gif +0 -0
  382. data/themes/typographic/images/email_open.gif +0 -0
  383. data/themes/typographic/images/email_open50.gif +0 -0
  384. data/themes/typographic/images/meta.gif +0 -0
  385. data/themes/typographic/images/page_edit.gif +0 -0
  386. data/themes/typographic/images/page_edit50.gif +0 -0
  387. data/themes/typographic/images/spinner.gif +0 -0
  388. data/themes/typographic/images/tag.gif +0 -0
  389. data/themes/typographic/images/user.gif +0 -0
  390. data/themes/typographic/images/user50.gif +0 -0
  391. data/themes/typographic/images/world_link.gif +0 -0
  392. data/themes/typographic/images/world_link50.gif +0 -0
  393. data/themes/typographic/layouts/default.html.erb +5 -2
  394. data/themes/typographic/stylesheets/ie6.css +86 -0
  395. data/themes/typographic/views/articles/_article.html.erb +2 -2
  396. data/vendor/plugins/fckeditor/README +0 -7
  397. data/vendor/plugins/fckeditor/app/helpers/fckeditor_helper.rb +1 -3
  398. data/vendor/plugins/fckeditor/lib/fckeditor_version.rb +2 -2
  399. data/vendor/plugins/fckeditor/tasks/fckeditor_tasks.rake +1 -1
  400. data/vendor/plugins/fckeditor/test/fckeditor_test.rb +8 -0
  401. metadata +98 -66
  402. data/CHANGES-5.0.4 +0 -33
  403. data/SIDEBARS +0 -39
  404. data/app/views/admin/content/_quick_post.html.erb +0 -20
  405. data/db/schema.rb +0 -224
  406. data/public/.DS_Store +0 -0
  407. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/basexml.asp +0 -62
  408. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/class_upload.asp +0 -353
  409. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/commands.asp +0 -198
  410. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/config.asp +0 -128
  411. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/connector.asp +0 -88
  412. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/io.asp +0 -222
  413. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/upload.asp +0 -61
  414. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/util.asp +0 -55
  415. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc +0 -273
  416. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm +0 -315
  417. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm +0 -296
  418. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm +0 -68
  419. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm +0 -225
  420. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm +0 -89
  421. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm +0 -288
  422. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm +0 -68
  423. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm +0 -132
  424. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/config.cfm +0 -183
  425. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/connector.cfm +0 -31
  426. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/image.cfc +0 -1325
  427. data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/config.lasso +0 -65
  428. data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/connector.lasso +0 -257
  429. data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/upload.lasso +0 -157
  430. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/basexml.php +0 -93
  431. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/commands.php +0 -245
  432. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/config.php +0 -140
  433. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/connector.php +0 -87
  434. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/io.php +0 -272
  435. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/phpcompat.php +0 -17
  436. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/upload.php +0 -59
  437. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/util.php +0 -185
  438. data/public/javascripts/fckeditor/fckeditor.afp +0 -161
  439. data/public/javascripts/fckeditor/fckeditor.asp +0 -235
  440. data/public/javascripts/fckeditor/fckeditor.cfc +0 -273
  441. data/public/javascripts/fckeditor/fckeditor.cfm +0 -210
  442. data/public/javascripts/fckeditor/fckeditor.lasso +0 -112
  443. data/test/mocks/themes/typographic/.DS_Store +0 -0
  444. data/themes/typographic/.DS_Store +0 -0
  445. data/vendor/plugins/audioscrobbler_sidebar/MAINTAINERS +0 -26
  446. data/vendor/plugins/audioscrobbler_sidebar/MIT-LICENSE +0 -21
  447. data/vendor/plugins/audioscrobbler_sidebar/README +0 -27
  448. data/vendor/plugins/audioscrobbler_sidebar/Rakefile +0 -22
  449. data/vendor/plugins/audioscrobbler_sidebar/init.rb +0 -5
  450. data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler.rb +0 -54
  451. data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb +0 -13
  452. data/vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb +0 -8
  453. data/vendor/plugins/audioscrobbler_sidebar/views/content.rhtml +0 -10
@@ -1,89 +0,0 @@
1
- <cfsetting enablecfoutputonly="yes" showdebugoutput="no">
2
- <!---
3
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
4
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
5
- *
6
- * == BEGIN LICENSE ==
7
- *
8
- * Licensed under the terms of any of the following licenses at your
9
- * choice:
10
- *
11
- * - GNU General Public License Version 2 or later (the "GPL")
12
- * http://www.gnu.org/licenses/gpl.html
13
- *
14
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
15
- * http://www.gnu.org/licenses/lgpl.html
16
- *
17
- * - Mozilla Public License Version 1.1 or later (the "MPL")
18
- * http://www.mozilla.org/MPL/MPL-1.1.html
19
- *
20
- * == END LICENSE ==
21
- *
22
- * File Browser connector for ColdFusion (MX 6.0 and above).
23
- * (based on the original CF connector by Hendrik Kramer - hk@lwd.de)
24
- *
25
- --->
26
-
27
- <cfparam name="url.command">
28
- <cfparam name="url.type">
29
- <cfparam name="url.currentFolder">
30
-
31
- <!--- note: no serverPath url parameter - see config.cfm if you need to set the serverPath manually --->
32
-
33
- <cfinclude template="config.cfm">
34
- <cfinclude template="cf_util.cfm">
35
- <cfinclude template="cf_io.cfm">
36
- <cfinclude template="cf_basexml.cfm">
37
- <cfinclude template="cf_commands.cfm">
38
-
39
- <cfif not Config.Enabled>
40
- <cfset SendError( 1, 'This connector is disabled. Please check the "editor/filemanager/connectors/cfm/config.cfm" file' )>
41
- </cfif>
42
-
43
- <cfset REQUEST.Config = Config>
44
- <cfif find( "/", getBaseTemplatePath() ) >
45
- <cfset REQUEST.Fs = "/">
46
- <cfelse>
47
- <cfset REQUEST.Fs = "\">
48
- </cfif>
49
-
50
- <cfset DoResponse() >
51
-
52
- <cffunction name="DoResponse" output="true" returntype="void">
53
-
54
- <!--- Get the main request informaiton. --->
55
- <cfset var sCommand = "#URL.Command#" >
56
- <cfset var sResourceType = URL.Type >
57
- <cfset var sCurrentFolder = GetCurrentFolder() >
58
-
59
- <!--- Check if it is an allowed command --->
60
- <cfif not IsAllowedCommand( sCommand ) >
61
- <cfset SendError( 1, "The """ & sCommand & """ command isn't allowed" ) >
62
- </cfif>
63
-
64
- <!--- Check if it is an allowed type. --->
65
- <cfif not IsAllowedType( sResourceType ) >
66
- <cfset SendError( 1, 'Invalid type specified' ) >
67
- </cfif>
68
-
69
- <!--- File Upload doesn't have to Return XML, so it must be intercepted before anything. --->
70
- <cfif sCommand eq "FileUpload">
71
- <cfset FileUpload( sResourceType, sCurrentFolder, sCommand )>
72
- <cfabort>
73
- </cfif>
74
-
75
- <cfset CreateXmlHeader( sCommand, sResourceType, sCurrentFolder )>
76
-
77
- <!--- Execute the required command. --->
78
- <cfif sCommand eq "GetFolders">
79
- <cfset GetFolders( sResourceType, sCurrentFolder ) >
80
- <cfelseif sCommand eq "GetFoldersAndFiles">
81
- <cfset GetFoldersAndFiles( sResourceType, sCurrentFolder ) >
82
- <cfelseif sCommand eq "CreateFolder">
83
- <cfset CreateFolder( sResourceType, sCurrentFolder ) >
84
- </cfif>
85
-
86
- <cfset CreateXmlFooter()>
87
-
88
- <cfexit>
89
- </cffunction>
@@ -1,288 +0,0 @@
1
- <cfsetting enablecfoutputonly="Yes">
2
- <!---
3
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
4
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
5
- *
6
- * == BEGIN LICENSE ==
7
- *
8
- * Licensed under the terms of any of the following licenses at your
9
- * choice:
10
- *
11
- * - GNU General Public License Version 2 or later (the "GPL")
12
- * http://www.gnu.org/licenses/gpl.html
13
- *
14
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
15
- * http://www.gnu.org/licenses/lgpl.html
16
- *
17
- * - Mozilla Public License Version 1.1 or later (the "MPL")
18
- * http://www.mozilla.org/MPL/MPL-1.1.html
19
- *
20
- * == END LICENSE ==
21
- *
22
- * This file include IO specific functions used by the ColdFusion Connector (MX 6.0 and above).
23
- *
24
- --->
25
-
26
- <cffunction name="CombinePaths" returntype="String" output="true">
27
- <cfargument name="sBasePath" required="true">
28
- <cfargument name="sFolder" required="true">
29
- <cfset sBasePath = RemoveFromEnd( sBasePath, "/" )>
30
- <cfset sBasePath = RemoveFromEnd( sBasePath, "\" )>
31
- <cfreturn sBasePath & "/" & RemoveFromStart( ARGUMENTS.sFolder, '/' )>
32
- </cffunction>
33
-
34
- <cffunction name="GetResourceTypePath" returntype="String" output="false">
35
- <cfargument name="resourceType" required="true">
36
- <cfargument name="sCommand" required="true">
37
-
38
- <cfif ARGUMENTS.sCommand eq "QuickUpload">
39
- <cfreturn REQUEST.Config['QuickUploadPath'][ARGUMENTS.resourceType]>
40
- <cfelse>
41
- <cfreturn REQUEST.Config['FileTypesPath'][ARGUMENTS.resourceType]>
42
- </cfif>
43
- </cffunction>
44
-
45
- <cffunction name="GetResourceTypeDirectory" returntype="String" output="false">
46
- <cfargument name="resourceType" required="true">
47
- <cfargument name="sCommand" required="true">
48
-
49
- <cfif ARGUMENTS.sCommand eq "QuickUpload">
50
- <cfif isDefined( "REQUEST.Config.QuickUploadAbsolutePath" )
51
- and structkeyexists( REQUEST.Config.QuickUploadAbsolutePath, ARGUMENTS.resourceType )
52
- and Len( REQUEST.Config.QuickUploadAbsolutePath[ARGUMENTS.resourceType] )>
53
- <cfreturn REQUEST.Config.QuickUploadAbsolutePath[ARGUMENTS.resourceType]>
54
- </cfif>
55
-
56
- <cfreturn expandpath( REQUEST.Config.QuickUploadPath[ARGUMENTS.resourceType] )>
57
- <cfelse>
58
- <cfif isDefined( "REQUEST.Config.FileTypesAbsolutePath" )
59
- and structkeyexists( REQUEST.Config.FileTypesAbsolutePath, ARGUMENTS.resourceType )
60
- and Len( REQUEST.Config.FileTypesAbsolutePath[ARGUMENTS.resourceType] )>
61
- <cfreturn REQUEST.Config.FileTypesAbsolutePath[ARGUMENTS.resourceType]>
62
- </cfif>
63
-
64
- <cfreturn expandpath( REQUEST.Config.FileTypesPath[ARGUMENTS.resourceType] )>
65
- </cfif>
66
- </cffunction>
67
-
68
- <cffunction name="GetUrlFromPath" returntype="String" output="false">
69
- <cfargument name="resourceType" required="true">
70
- <cfargument name="folderPath" required="true">
71
- <cfargument name="sCommand" required="true">
72
-
73
- <cfreturn CombinePaths( GetResourceTypePath( ARGUMENTS.resourceType, ARGUMENTS.sCommand ), ARGUMENTS.folderPath )>
74
- </cffunction>
75
-
76
- <cffunction name="RemoveExtension" output="false" returntype="String">
77
- <cfargument name="fileName" required="true">
78
- <cfset var pos = find( ".", reverse ( ARGUMENTS.fileName ) )>
79
-
80
- <cfreturn mid( ARGUMENTS.fileName, 1, Len( ARGUMENTS.fileName ) - pos ) >
81
- </cffunction>
82
-
83
- <cffunction name="GetExtension" output="false" returntype="String">
84
- <cfargument name="fileName" required="true">
85
- <cfset var pos = find( ".", reverse ( ARGUMENTS.fileName ) )>
86
-
87
- <cfif not pos>
88
- <cfreturn "">
89
- </cfif>
90
-
91
- <cfreturn mid( ARGUMENTS.fileName, pos, Len( ARGUMENTS.fileName ) - pos ) >
92
- </cffunction>
93
-
94
- <cffunction name="ServerMapFolder" returntype="String" output="false">
95
- <cfargument name="resourceType" required="true">
96
- <cfargument name="folderPath" required="true">
97
- <cfargument name="sCommand" required="true">
98
-
99
- <!--- Get the resource type directory. --->
100
- <cfset var sResourceTypePath = GetResourceTypeDirectory( ARGUMENTS.resourceType, ARGUMENTS.sCommand ) >
101
- <!--- Ensure that the directory exists. --->
102
- <cfset var sErrorMsg = CreateServerFolder( sResourceTypePath ) >
103
-
104
- <cfif sErrorMsg neq ''>
105
- <cfset SendError( 1, 'Error creating folder "' & sResourceTypePath & '" (' & sErrorMsg & ')' )>
106
- </cfif>
107
-
108
- <!--- Return the resource type directory combined with the required path. --->
109
- <cfreturn CombinePaths( sResourceTypePath , ARGUMENTS.folderPath )>
110
- </cffunction>
111
-
112
- <cffunction name="GetParentFolder" returntype="string" output="false">
113
- <cfargument name="folderPath" required="true">
114
-
115
- <cfreturn rereplace(ARGUMENTS.folderPath, "[/\\\\][^/\\\\]+[/\\\\]?$", "")>
116
- </cffunction>
117
-
118
- <cffunction name="CreateServerFolder" returntype="String" output="false">
119
- <cfargument name="folderPath">
120
-
121
- <!--- Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms --->
122
- <cfset folderPath = rereplace(ARGUMENTS.folderPath, "//+", "/", "all")>
123
-
124
- <cfif directoryexists(ARGUMENTS.folderPath) or fileexists(ARGUMENTS.folderPath)>
125
- <cfreturn "">
126
- <cfelse>
127
- <cftry>
128
- <cfdirectory action="create" mode="0755" directory="#ARGUMENTS.folderPath#">
129
- <cfcatch type="any">
130
- <cfreturn CFCATCH.Message>
131
- </cfcatch>
132
- </cftry>
133
- </cfif>
134
-
135
- <cfreturn "">
136
- </cffunction>
137
-
138
- <cffunction name="IsAllowedExt" returntype="boolean" output="false">
139
- <cfargument name="sExtension" required="true">
140
- <cfargument name="resourceType" required="true">
141
-
142
- <cfif isDefined( "REQUEST.Config.AllowedExtensions." & ARGUMENTS.resourceType )
143
- and listLen( REQUEST.Config.AllowedExtensions[ARGUMENTS.resourceType] )
144
- and not listFindNoCase( REQUEST.Config.AllowedExtensions[ARGUMENTS.resourceType], ARGUMENTS.sExtension )>
145
- <cfreturn false>
146
- </cfif>
147
-
148
- <cfif isDefined( "REQUEST.Config.DeniedExtensions." & ARGUMENTS.resourceType )
149
- and listLen( REQUEST.Config.DeniedExtensions[ARGUMENTS.resourceType] )
150
- and listFindNoCase( REQUEST.Config.DeniedExtensions[ARGUMENTS.resourceType], ARGUMENTS.sExtension )>
151
- <cfreturn false>
152
- </cfif>
153
-
154
- <cfreturn true>
155
- </cffunction>
156
-
157
- <cffunction name="IsAllowedType" returntype="boolean" output="false">
158
- <cfargument name="resourceType">
159
-
160
- <cfif not listFindNoCase( REQUEST.Config.ConfigAllowedTypes, ARGUMENTS.resourceType )>
161
- <cfreturn false>
162
- </cfif>
163
-
164
- <cfreturn true>
165
- </cffunction>
166
-
167
- <cffunction name="IsAllowedCommand" returntype="boolean" output="true">
168
- <cfargument name="sCommand" required="true" type="String">
169
-
170
- <cfif not listFindNoCase( REQUEST.Config.ConfigAllowedCommands, ARGUMENTS.sCommand )>
171
- <cfreturn false>
172
- </cfif>
173
-
174
- <cfreturn true>
175
- </cffunction>
176
-
177
- <cffunction name="GetCurrentFolder" returntype="String" output="false">
178
- <cfset var sCurrentFolder = "/">
179
-
180
- <cfif isDefined( "URL.CurrentFolder" )>
181
- <cfset sCurrentFolder = URL.CurrentFolder>
182
- </cfif>
183
-
184
- <!--- Check the current folder syntax (must begin and start with a slash). --->
185
- <cfif not refind( "/$", sCurrentFolder)>
186
- <cfset sCurrentFolder = sCurrentFolder & "/">
187
- </cfif>
188
-
189
- <cfif not refind( "^/", sCurrentFolder )>
190
- <cfset sCurrentFolder = "/" & sCurrentFolder>
191
- </cfif>
192
-
193
- <!--- Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms --->
194
- <cfset sCurrentFolder = rereplace( sCurrentFolder, "//+", "/", "all" )>
195
-
196
- <cfif find( "..", sCurrentFolder)>
197
- <cfset SendError( 102, "" )>
198
- </cfif>
199
-
200
- <cfreturn sCurrentFolder>
201
- </cffunction>
202
-
203
- <cffunction name="SanitizeFolderName" returntype="String" output="false">
204
- <cfargument name="sNewFolderName" required="true">
205
-
206
- <!--- Do a cleanup of the folder name to avoid possible problems --->
207
- <!--- Remove . \ / | : ? * " < > --->
208
- <cfset sNewFolderName = rereplace( sNewFolderName, '\.+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>
209
-
210
- <cfreturn sNewFolderName>
211
- </cffunction>
212
-
213
- <cffunction name="BinaryFileRead" returntype="String" output="true">
214
- <cfargument name="fileName" required="true" type="string">
215
- <cfargument name="bytes" required="true" type="Numeric">
216
-
217
- <cfscript>
218
- var chunk = "";
219
- var fileReaderClass = "";
220
- var fileReader = "";
221
- var file = "";
222
- var done = false;
223
- var counter = 0;
224
- var byteArray = "";
225
-
226
- if( not fileExists( ARGUMENTS.fileName ) )
227
- {
228
- return "" ;
229
- }
230
-
231
- if (REQUEST.CFVersion gte 8)
232
- {
233
- file = FileOpen( ARGUMENTS.fileName, "readbinary" ) ;
234
- byteArray = FileRead( file, 1024 ) ;
235
- chunk = toString( toBinary( toBase64( byteArray ) ) ) ;
236
- FileClose( file ) ;
237
- }
238
- else
239
- {
240
- fileReaderClass = createObject("java", "java.io.FileInputStream");
241
- fileReader = fileReaderClass.init(fileName);
242
-
243
- while(not done)
244
- {
245
- char = fileReader.read();
246
- counter = counter + 1;
247
- if ( char eq -1 or counter eq ARGUMENTS.bytes)
248
- {
249
- done = true;
250
- }
251
- else
252
- {
253
- chunk = chunk & chr(char) ;
254
- }
255
- }
256
- }
257
- </cfscript>
258
-
259
- <cfreturn chunk>
260
- </cffunction>
261
-
262
- <cffunction name="SendUploadResults" returntype="String" output="true">
263
- <cfargument name="errorNumber" required="true" type="Numeric">
264
- <cfargument name="fileUrl" required="false" type="String" default="">
265
- <cfargument name="fileName" required="false" type="String" default="">
266
- <cfargument name="customMsg" required="false" type="String" default="">
267
-
268
- <cfoutput>
269
- <script type="text/javascript">
270
- window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
271
- </script>
272
- </cfoutput>
273
- <cfabort>
274
- </cffunction>
275
-
276
- <cffunction name="SanitizeFileName" returntype="String" output="false">
277
- <cfargument name="sNewFileName" required="true">
278
-
279
- <cfif isDefined("REQUEST.Config.ForceSingleExtension") and REQUEST.Config.ForceSingleExtension>
280
- <cfset sNewFileName = rereplace( sNewFileName, '\.(?![^.]*$)', "_", "all" )>
281
- </cfif>
282
-
283
- <!--- Do a cleanup of the file name to avoid possible problems --->
284
- <!--- Remove \ / | : ? * " < > --->
285
- <cfset sNewFileName = rereplace( sNewFileName, '\\[.]+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>
286
-
287
- <cfreturn sNewFileName>
288
- </cffunction>
@@ -1,68 +0,0 @@
1
- <cfsetting enablecfoutputonly="yes" showdebugoutput="no">
2
- <!---
3
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
4
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
5
- *
6
- * == BEGIN LICENSE ==
7
- *
8
- * Licensed under the terms of any of the following licenses at your
9
- * choice:
10
- *
11
- * - GNU General Public License Version 2 or later (the "GPL")
12
- * http://www.gnu.org/licenses/gpl.html
13
- *
14
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
15
- * http://www.gnu.org/licenses/lgpl.html
16
- *
17
- * - Mozilla Public License Version 1.1 or later (the "MPL")
18
- * http://www.mozilla.org/MPL/MPL-1.1.html
19
- *
20
- * == END LICENSE ==
21
- *
22
- * File Browser connector for ColdFusion (MX 6.0 and above).
23
- * (based on the original CF connector by Hendrik Kramer - hk@lwd.de)
24
- --->
25
-
26
- <cfparam name="url.type" default="File">
27
- <cfparam name="url.currentFolder" default="/">
28
-
29
- <!--- note: no serverPath url parameter - see config.cfm if you need to set the serverPath manually --->
30
-
31
- <cfinclude template="config.cfm">
32
- <cfinclude template="cf_util.cfm">
33
- <cfinclude template="cf_io.cfm">
34
- <cfinclude template="cf_commands.cfm">
35
-
36
- <cfset REQUEST.Config = Config>
37
- <cfif find( "/", getBaseTemplatePath() ) >
38
- <cfset REQUEST.Fs = "/">
39
- <cfelse>
40
- <cfset REQUEST.Fs = "\">
41
- </cfif>
42
-
43
- <cfif not Config.Enabled>
44
- <cfset SendUploadResults( '1', '', '', 'This file uploader is disabled. Please check the "editor/filemanager/connectors/cfm/config.cfm" file' )>
45
- </cfif>
46
-
47
- <cfset sCommand = 'QuickUpload'>
48
- <cfset sType = "File">
49
-
50
- <cfif isDefined( "URL.Type" )>
51
- <cfset sType = URL.Type>
52
- </cfif>
53
-
54
- <cfset sCurrentFolder = GetCurrentFolder()>
55
-
56
- <!--- Is enabled the upload? --->
57
- <cfif not IsAllowedCommand( sCommand )>
58
- <cfset SendUploadResults( "1", "", "", "The """ & sCommand & """ command isn't allowed" )>
59
- </cfif>
60
-
61
- <!--- Check if it is an allowed type. --->
62
- <cfif not IsAllowedType( sType )>
63
- <cfset SendUploadResults( "1", "", "", "Invalid type specified" ) >
64
- </cfif>
65
-
66
- <cfset FileUpload( sType, sCurrentFolder, sCommand )>
67
-
68
-
@@ -1,132 +0,0 @@
1
- <cfsetting enablecfoutputonly="Yes">
2
- <!---
3
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
4
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
5
- *
6
- * == BEGIN LICENSE ==
7
- *
8
- * Licensed under the terms of any of the following licenses at your
9
- * choice:
10
- *
11
- * - GNU General Public License Version 2 or later (the "GPL")
12
- * http://www.gnu.org/licenses/gpl.html
13
- *
14
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
15
- * http://www.gnu.org/licenses/lgpl.html
16
- *
17
- * - Mozilla Public License Version 1.1 or later (the "MPL")
18
- * http://www.mozilla.org/MPL/MPL-1.1.html
19
- *
20
- * == END LICENSE ==
21
- *
22
- * This file include generic functions used by the ColdFusion Connector (MX 6.0 and above).
23
- --->
24
-
25
- <cffunction name="RemoveFromStart" output="false" returntype="String">
26
- <cfargument name="sourceString" type="String">
27
- <cfargument name="charToRemove" type="String">
28
-
29
- <cfif left(ARGUMENTS.sourceString, 1) eq ARGUMENTS.charToRemove>
30
- <cfreturn mid( ARGUMENTS.sourceString, 2, len(ARGUMENTS.sourceString) -1 )>
31
- </cfif>
32
-
33
- <cfreturn ARGUMENTS.sourceString>
34
- </cffunction>
35
-
36
- <cffunction name="RemoveFromEnd" output="false" returntype="String">
37
- <cfargument name="sourceString" type="String">
38
- <cfargument name="charToRemove" type="String">
39
-
40
- <cfif right(ARGUMENTS.sourceString, 1) eq ARGUMENTS.charToRemove>
41
- <cfreturn mid( ARGUMENTS.sourceString, 1, len(ARGUMENTS.sourceString) -1 )>
42
- </cfif>
43
-
44
- <cfreturn ARGUMENTS.sourceString>
45
- </cffunction>
46
-
47
- <!---
48
- Check file content.
49
- Currently this function validates only image files.
50
- Returns false if file is invalid.
51
- detectionLevel:
52
- 0 = none
53
- 1 = check image size for images,
54
- 2 = use DetectHtml for images
55
- ---->
56
- <cffunction name="IsImageValid" returntype="boolean" output="true">
57
- <cfargument name="filePath" required="true" type="String">
58
- <cfargument name="extension" required="true" type="String">
59
-
60
- <cfset var imageCFC = "">
61
- <cfset var imageInfo = "">
62
-
63
- <cfif not ListFindNoCase("gif,jpeg,jpg,png,swf,psd,bmp,iff,tiff,tif,swc,jpc,jp2,jpx,jb2,xmb,wbmp", ARGUMENTS.extension)>
64
- <cfreturn true>
65
- </cfif>
66
-
67
- <cftry>
68
- <cfif REQUEST.CFVersion gte 8>
69
- <cfset objImage = ImageRead(ARGUMENTS.filePath) >
70
- <cfset imageInfo = ImageInfo(objImage)>
71
- <!--- <cfimage action="info" source="#ARGUMENTS.filePath#" structName="imageInfo" /> --->
72
- <cfelse>
73
- <cfset imageCFC = createObject("component", "image")>
74
- <cfset imageInfo = imageCFC.getImageInfo("", ARGUMENTS.filePath)>
75
- </cfif>
76
-
77
- <cfif imageInfo.height lte 0 or imageInfo.width lte 0>
78
- <cfreturn false>
79
- </cfif>
80
- <cfcatch type="any">
81
- <cfreturn false>
82
- </cfcatch>
83
- </cftry>
84
-
85
- <cfreturn true>
86
- </cffunction>
87
-
88
- <!---
89
- Detect HTML in the first KB to prevent against potential security issue with
90
- IE/Safari/Opera file type auto detection bug.
91
- Returns true if file contain insecure HTML code at the beginning.
92
- --->
93
- <cffunction name="DetectHtml" output="false" returntype="boolean">
94
- <cfargument name="filePath" required="true" type="String">
95
-
96
- <cfset var tags = "<body,<head,<html,<img,<pre,<script,<table,<title">
97
- <cfset var chunk = lcase( Trim( BinaryFileRead( ARGUMENTS.filePath, 1024 ) ) )>
98
-
99
- <cfif not Len(chunk)>
100
- <cfreturn false>
101
- </cfif>
102
-
103
- <cfif refind('<!doctype\W*x?html', chunk)>
104
- <cfreturn true>
105
- </cfif>
106
-
107
- <cfloop index = "tag" list = "#tags#">
108
- <cfif find( tag, chunk )>
109
- <cfreturn true>
110
- </cfif>
111
- </cfloop>
112
-
113
- <!--- type = javascript --->
114
- <cfif refind('type\s*=\s*[''"]?\s*(?:\w*/)?(?:ecma|java)', chunk)>
115
- <cfreturn true>
116
- </cfif> >
117
-
118
- <!--- href = javascript --->
119
- <!--- src = javascript --->
120
- <!--- data = javascript --->
121
- <cfif refind('(?:href|src|data)\s*=\s*[\''"]?\s*(?:ecma|java)script:', chunk)>
122
- <cfreturn true>
123
- </cfif>
124
-
125
- <!--- url(javascript --->
126
- <cfif refind('url\s*\(\s*[\''"]?\s*(?:ecma|java)script:', chunk)>
127
- <cfreturn true>
128
- </cfif>
129
-
130
- <cfreturn false>
131
- </cffunction>
132
-