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,296 +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 is the "File Uploader" for ColdFusion 5.
23
- * Based on connector.cfm by Mark Woods (mark@thickpaddy.com)
24
- *
25
- * Note:
26
- * FCKeditor requires that the connector responds with UTF-8 encoded XML.
27
- * As ColdFusion 5 does not fully support UTF-8 encoding, we force ASCII
28
- * file and folder names in this connector to allow CF5 send a UTF-8
29
- * encoded response - code points under 127 in UTF-8 are stored using a
30
- * single byte, using the same encoding as ASCII, which is damn handy.
31
- * This is all grand for the English speakers, like meself, but I dunno
32
- * how others are gonna take to it. Well, the previous version of this
33
- * connector already did this with file names and nobody seemed to mind,
34
- * so fingers-crossed nobody will mind their folder names being munged too.
35
- *
36
- --->
37
-
38
- <cfparam name="url.command" default="QuickUpload">
39
- <cfparam name="url.type" default="File">
40
- <cfparam name="url.currentFolder" default="/">
41
-
42
- <cfif not isDefined("config_included")>
43
- <cfinclude template="config.cfm">
44
- </cfif>
45
-
46
- <cfscript>
47
- function SendUploadResults(errorNumber, fileUrl, fileName, customMsg)
48
- {
49
- WriteOutput('<script type="text/javascript">');
50
- WriteOutput('window.parent.OnUploadCompleted(' & errorNumber & ', "' & JSStringFormat(fileUrl) & '", "' & JSStringFormat(fileName) & '", "' & JSStringFormat(customMsg) & '");' );
51
- WriteOutput('</script>');
52
- }
53
- </cfscript>
54
-
55
- <cfif NOT config.enabled>
56
- <cfset SendUploadResults(1, "", "", "This file uploader is disabled. Please check the ""editor/filemanager/connectors/cfm/config.cfm"" file")>
57
- <cfabort>
58
- </cfif>
59
-
60
- <cfif isDefined("Config.ConfigAllowedCommands") and not ListFind(Config.ConfigAllowedCommands, url.command)>
61
- <cfset SendUploadResults(1, "", "", "The """ & url.command & """ command isn't allowed")>
62
- <cfabort>
63
- </cfif>
64
-
65
- <cfif isDefined("Config.ConfigAllowedTypes") and not ListFind(Config.ConfigAllowedTypes, url.type)>
66
- <cfset SendUploadResults(1, "", "", "The """ & url.type & """ type isn't allowed")>
67
- <cfabort>
68
- </cfif>
69
-
70
- <cfif find( "..", url.currentFolder)>
71
- <cfset SendUploadResults(102)>
72
- <cfabort>
73
- </cfif>
74
-
75
- <cfscript>
76
- userFilesPath = config.userFilesPath;
77
-
78
- if ( userFilesPath eq "" ) {
79
- userFilesPath = "/userfiles/";
80
- }
81
-
82
- // make sure the user files path is correctly formatted
83
- userFilesPath = replace(userFilesPath, "\", "/", "ALL");
84
- userFilesPath = replace(userFilesPath, '//', '/', 'ALL');
85
- if ( right(userFilesPath,1) NEQ "/" ) {
86
- userFilesPath = userFilesPath & "/";
87
- }
88
- if ( left(userFilesPath,1) NEQ "/" ) {
89
- userFilesPath = "/" & userFilesPath;
90
- }
91
-
92
- // make sure the current folder is correctly formatted
93
- url.currentFolder = replace(url.currentFolder, "\", "/", "ALL");
94
- url.currentFolder = replace(url.currentFolder, '//', '/', 'ALL');
95
- if ( right(url.currentFolder,1) neq "/" ) {
96
- url.currentFolder = url.currentFolder & "/";
97
- }
98
- if ( left(url.currentFolder,1) neq "/" ) {
99
- url.currentFolder = "/" & url.currentFolder;
100
- }
101
-
102
- if (find("/",getBaseTemplatePath())) {
103
- fs = "/";
104
- } else {
105
- fs = "\";
106
- }
107
-
108
- // Get the base physical path to the web root for this application. The code to determine the path automatically assumes that
109
- // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a
110
- // virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary.
111
- if ( len(config.serverPath) ) {
112
- serverPath = config.serverPath;
113
-
114
- if ( right(serverPath,1) neq fs ) {
115
- serverPath = serverPath & fs;
116
- }
117
- } else {
118
- serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
119
- }
120
-
121
- rootPath = left( serverPath, Len(serverPath) - Len(userFilesPath) ) ;
122
- </cfscript>
123
- <cfif url.command eq "QuickUpload">
124
- <cfset resourceTypeUrl = rereplace( replace( Config.QuickUploadPath[url.type], fs, "/", "all"), "/$", "") >
125
- <cfif isDefined( "Config.QuickUploadAbsolutePath" )
126
- and structkeyexists( Config.QuickUploadAbsolutePath, url.type )
127
- and Len( Config.QuickUploadAbsolutePath[url.type] )>
128
- <cfset userFilesServerPath = Config.QuickUploadAbsolutePath[url.type] & url.currentFolder>
129
- <cfelse>
130
- <cftry>
131
- <cfset userFilesServerPath = expandpath( resourceTypeUrl ) & url.currentFolder>
132
- <!--- Catch: Parameter 1 of function ExpandPath must be a relative path --->
133
- <cfcatch type="any">
134
- <cfset userFilesServerPath = rootPath & Config.QuickUploadPath[url.type] & url.currentFolder>
135
- </cfcatch>
136
- </cftry>
137
- </cfif>
138
- <cfelse>
139
- <cfset resourceTypeUrl = rereplace( replace( Config.FileTypesPath[url.type], fs, "/", "all"), "/$", "") >
140
- <cfif isDefined( "Config.FileTypesAbsolutePath" )
141
- and structkeyexists( Config.FileTypesAbsolutePath, url.type )
142
- and Len( Config.FileTypesAbsolutePath[url.type] )>
143
- <cfset userFilesServerPath = Config.FileTypesAbsolutePath[url.type] & url.currentFolder>
144
- <cfelse>
145
- <cftry>
146
- <cfset userFilesServerPath = expandpath( resourceTypeUrl ) & url.currentFolder>
147
- <!--- Catch: Parameter 1 of function ExpandPath must be a relative path --->
148
- <cfcatch type="any">
149
- <cfset userFilesServerPath = rootPath & Config.FileTypesPath[url.type] & url.currentFolder>
150
- </cfcatch>
151
- </cftry>
152
- </cfif>
153
- </cfif>
154
-
155
- <cfset userFilesServerPath = replace( userFilesServerPath, "/", fs, "all" ) >
156
- <!--- get rid of double directory separators --->
157
- <cfset userFilesServerPath = replace( userFilesServerPath, fs & fs, fs, "all") >
158
-
159
- <!--- create resource type directory if not exists --->
160
- <cfset resourceTypeDirectory = left( userFilesServerPath, Len(userFilesServerPath) - Len(url.currentFolder) )>
161
-
162
- <cfif not directoryexists( resourceTypeDirectory )>
163
-
164
- <cfset currentPath = "">
165
- <cftry>
166
- <cfloop list="#resourceTypeDirectory#" index="name" delimiters="#fs#">
167
- <cfif currentPath eq "" and fs eq "\">
168
- <!--- Without checking this, we would have in Windows \C:\ --->
169
- <cfif not directoryExists(name)>
170
- <cfdirectory action="create" directory="#name#" mode="755">
171
- </cfif>
172
- <cfelse>
173
- <cfif not directoryExists(currentPath & fs & name)>
174
- <cfdirectory action="create" directory="#currentPath##fs##name#" mode="755">
175
- </cfif>
176
- </cfif>
177
-
178
- <cfif fs eq "\" and currentPath eq "">
179
- <cfset currentPath = name>
180
- <cfelse>
181
- <cfset currentPath = currentPath & fs & name>
182
- </cfif>
183
- </cfloop>
184
-
185
- <cfcatch type="any">
186
-
187
- <!--- this should only occur as a result of a permissions problem --->
188
- <cfset SendUploadResults(103)>
189
- <cfabort>
190
-
191
- </cfcatch>
192
-
193
- </cftry>
194
- </cfif>
195
-
196
- <cfset currentFolderPath = userFilesServerPath>
197
- <cfset resourceType = url.type>
198
-
199
- <cfset fileName = "">
200
- <cfset fileExt = "">
201
-
202
- <!--- Can be overwritten. The last value will be sent with the result --->
203
- <cfset customMsg = "">
204
-
205
- <cftry>
206
- <!--- first upload the file with an unique filename --->
207
- <cffile action="upload"
208
- fileField="NewFile"
209
- destination="#currentFolderPath#"
210
- nameConflict="makeunique"
211
- mode="644"
212
- attributes="normal">
213
-
214
- <cfif cffile.fileSize EQ 0>
215
- <cfthrow>
216
- </cfif>
217
-
218
- <cfset lAllowedExtensions = config.allowedExtensions[#resourceType#]>
219
- <cfset lDeniedExtensions = config.deniedExtensions[#resourceType#]>
220
-
221
- <cfif ( len(lAllowedExtensions) and not listFindNoCase(lAllowedExtensions,cffile.ServerFileExt) )
222
- or ( len(lDeniedExtensions) and listFindNoCase(lDeniedExtensions,cffile.ServerFileExt) )>
223
-
224
- <cfset errorNumber = "202">
225
- <cffile action="delete" file="#cffile.ServerDirectory##fs##cffile.ServerFile#">
226
-
227
- <cfelse>
228
-
229
- <cfscript>
230
- errorNumber = 0;
231
- fileName = cffile.ClientFileName ;
232
- fileExt = cffile.ServerFileExt ;
233
- fileExisted = false ;
234
-
235
- // munge filename for html download. Only a-z, 0-9, _, - and . are allowed
236
- if( reFind("[^A-Za-z0-9_\-\.]", fileName) ) {
237
- fileName = reReplace(fileName, "[^A-Za-z0-9\-\.]", "_", "ALL");
238
- fileName = reReplace(fileName, "_{2,}", "_", "ALL");
239
- fileName = reReplace(fileName, "([^_]+)_+$", "\1", "ALL");
240
- fileName = reReplace(fileName, "$_([^_]+)$", "\1", "ALL");
241
- }
242
-
243
- // remove additional dots from file name
244
- if( isDefined("Config.ForceSingleExtension") and Config.ForceSingleExtension )
245
- fileName = replace( fileName, '.', "_", "all" ) ;
246
-
247
- // When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename.
248
- if( compare( cffile.ServerFileName, fileName ) ) {
249
- counter = 0;
250
- tmpFileName = fileName;
251
- while( fileExists("#currentFolderPath##fileName#.#fileExt#") ) {
252
- fileExisted = true ;
253
- counter = counter + 1 ;
254
- fileName = tmpFileName & '(#counter#)' ;
255
- }
256
- }
257
- </cfscript>
258
-
259
- <!--- Rename the uploaded file, if neccessary --->
260
- <cfif compare(cffile.ServerFileName,fileName)>
261
-
262
- <cfif fileExisted>
263
- <cfset errorNumber = "201">
264
- </cfif>
265
- <cffile
266
- action="rename"
267
- source="#currentFolderPath##cffile.ServerFileName#.#cffile.ServerFileExt#"
268
- destination="#currentFolderPath##fileName#.#fileExt#"
269
- mode="644"
270
- attributes="normal">
271
-
272
- </cfif>
273
-
274
- </cfif>
275
-
276
- <cfcatch type="any">
277
-
278
- <cfset errorNumber = "1">
279
- <cfset customMsg = cfcatch.message >
280
-
281
- </cfcatch>
282
- </cftry>
283
-
284
- <cfif errorNumber EQ 0>
285
- <!--- file was uploaded succesfully --->
286
- <cfset SendUploadResults(errorNumber, '#resourceTypeUrl##url.currentFolder##fileName#.#fileExt#', "", "")>
287
- <cfabort>
288
- <cfelseif errorNumber EQ 201>
289
- <!--- file was changed (201), submit the new filename --->
290
- <cfset SendUploadResults(errorNumber, '#resourceTypeUrl##url.currentFolder##fileName#.#fileExt#', replace( fileName & "." & fileExt, "'", "\'", "ALL"), customMsg)>
291
- <cfabort>
292
- <cfelse>
293
- <!--- An error occured(202). Submit only the error code and a message (if available). --->
294
- <cfset SendUploadResults(errorNumber, '', '', customMsg)>
295
- <cfabort>
296
- </cfif>
@@ -1,68 +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 the functions that create the base XML output by the ColdFusion Connector (MX 6.0 and above).
23
- --->
24
-
25
- <cffunction name="SetXmlHeaders" returntype="void">
26
- <cfheader name="Expires" value="#GetHttpTimeString(Now())#">
27
- <cfheader name="Pragma" value="no-cache">
28
- <cfheader name="Cache-Control" value="no-cache, no-store, must-revalidate">
29
- <cfcontent reset="true" type="text/xml; charset=UTF-8">
30
- </cffunction>
31
-
32
- <cffunction name="CreateXmlHeader" returntype="void" output="true">
33
- <cfargument name="command" required="true">
34
- <cfargument name="resourceType" required="true">
35
- <cfargument name="currentFolder" required="true">
36
-
37
- <cfset SetXmlHeaders()>
38
- <cfoutput><?xml version="1.0" encoding="utf-8" ?></cfoutput>
39
- <cfoutput><Connector command="#ARGUMENTS.command#" resourceType="#ARGUMENTS.resourceType#"></cfoutput>
40
- <cfoutput><CurrentFolder path="#HTMLEditFormat(ARGUMENTS.currentFolder)#" url="#HTMLEditFormat( GetUrlFromPath( resourceType, currentFolder, command ) )#" /></cfoutput>
41
- <cfset REQUEST.HeaderSent = true>
42
- </cffunction>
43
-
44
- <cffunction name="CreateXmlFooter" returntype="void" output="true">
45
- <cfoutput></Connector></cfoutput>
46
- </cffunction>
47
-
48
- <cffunction name="SendError" returntype="void" output="true">
49
- <cfargument name="number" required="true" type="Numeric">
50
- <cfargument name="text" required="true">
51
- <cfif isDefined("REQUEST.HeaderSent") and REQUEST.HeaderSent>
52
- <cfset SendErrorNode( ARGUMENTS.number, ARGUMENTS.text )>
53
- <cfset CreateXmlFooter() >
54
- <cfelse>
55
- <cfset SetXmlHeaders()>
56
- <cfoutput><?xml version="1.0" encoding="utf-8" ?></cfoutput>
57
- <cfoutput><Connector></cfoutput>
58
- <cfset SendErrorNode( ARGUMENTS.number, ARGUMENTS.text )>
59
- <cfset CreateXmlFooter() >
60
- </cfif>
61
- <cfabort>
62
- </cffunction>
63
-
64
- <cffunction name="SendErrorNode" returntype="void" output="true">
65
- <cfargument name="number" required="true" type="Numeric">
66
- <cfargument name="text" required="true">
67
- <cfoutput><Error number="#ARGUMENTS.number#" text="#htmleditformat(ARGUMENTS.text)#" /></cfoutput>
68
- </cffunction>
@@ -1,225 +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 the functions that handle the Command requests
23
- * in the ColdFusion Connector (MX 6.0 and above).
24
- --->
25
-
26
- <cffunction name="FileUpload" returntype="void" output="true">
27
- <cfargument name="resourceType" type="string" required="yes" default="">
28
- <cfargument name="currentFolder" type="string" required="yes" default="">
29
- <cfargument name="sCommand" type="string" required="yes" default="">
30
-
31
- <cfset var sFileName = "">
32
- <cfset var sFilePart = "">
33
- <cfset var sFileExt = "">
34
- <cfset var sFileUrl = "">
35
- <cfset var sTempFilePath = "">
36
- <cfset var errorNumber = 0>
37
- <cfset var customMsg = 0>
38
- <cfset var counter = 0>
39
- <cfset var destination = "">
40
-
41
- <cftry>
42
- <cffile action="UPLOAD" filefield="NewFile" destination="#GetTempDirectory()#" nameconflict="makeunique" mode="0755" />
43
- <cfset sTempFilePath = CFFILE.ServerDirectory & REQUEST.fs & CFFILE.ServerFile>
44
-
45
- <!--- Map the virtual path to the local server path. --->
46
- <cfset sServerDir = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, ARGUMENTS.sCommand) >
47
- <!--- Get the uploaded file name. --->
48
- <cfset sFileName = SanitizeFileName( CFFILE.ClientFile ) >
49
- <cfset sOriginalFileName = sFileName >
50
-
51
- <cfif isDefined( "REQUEST.Config.SecureImageUploads" ) and REQUEST.Config.SecureImageUploads>
52
- <cfif not IsImageValid( sTempFilePath, CFFILE.ClientFileExt )>
53
- <cftry>
54
- <cffile action="delete" file="#sTempFilePath#">
55
- <cfcatch type="any">
56
- </cfcatch>
57
- </cftry>
58
- <cfthrow errorcode="202" type="fckeditor">
59
- </cfif>
60
- </cfif>
61
-
62
- <cfif isDefined( "REQUEST.Config.HtmlExtensions" ) and not listFindNoCase( REQUEST.Config.HtmlExtensions, CFFILE.ClientFileExt )>
63
- <cfif DetectHtml( sTempFilePath )>
64
- <cftry>
65
- <cffile action="delete" file="#sTempFilePath#">
66
- <cfcatch type="any">
67
- </cfcatch>
68
- </cftry>
69
- <cfthrow errorcode="202" type="fckeditor">
70
- </cfif>
71
- </cfif>
72
-
73
- <cfif not IsAllowedExt( CFFILE.ClientFileExt, ARGUMENTS.resourceType )>
74
- <cftry>
75
- <cffile action="delete" file="#sTempFilePath#">
76
- <cfcatch type="any">
77
- </cfcatch>
78
- </cftry>
79
- <cfthrow errorcode="202" type="fckeditor">
80
- </cfif>
81
-
82
- <!--- When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename. --->
83
- <cfscript>
84
- sFileExt = GetExtension( sFileName ) ;
85
- sFilePart = RemoveExtension( sFileName );
86
- while( fileExists( sServerDir & sFileName ) )
87
- {
88
- counter = counter + 1;
89
- sFileName = sFilePart & '(#counter#).' & CFFILE.ClientFileExt;
90
- errorNumber = 201;
91
- }
92
- </cfscript>
93
-
94
- <cfset destination = sServerDir & sFileName>
95
- <!---
96
- <cfdump var="#sTempFilePath#">
97
- <cfoutput ><br /></cfoutput>
98
- <cfdump var="#destination#">
99
- <cfabort>
100
- --->
101
- <cflock name="#destination#" timeout="30" type="Exclusive">
102
- <cftry>
103
- <cffile action="move" source="#sTempFilePath#" destination="#destination#" mode="755">
104
- <!--- omit CF 6.1 error during moving uploaded file, just copy that file instead of moving --->
105
- <cfcatch type="any">
106
- <cffile action="copy" source="#sTempFilePath#" destination="#destination#" mode="755">
107
- </cfcatch>
108
- </cftry>
109
- </cflock>
110
-
111
- <cfset sFileUrl = CombinePaths( GetResourceTypePath( ARGUMENTS.resourceType, sCommand ) , ARGUMENTS.currentFolder ) >
112
- <cfset sFileUrl = CombinePaths( sFileUrl , sFileName ) >
113
-
114
- <cfcatch type="fckeditor">
115
- <cfset errorNumber = CFCATCH.ErrorCode>
116
- </cfcatch>
117
-
118
- <cfcatch type="any">
119
- <cfset errorNumber = "1">
120
- <cfset customMsg = CFCATCH.Message >
121
- </cfcatch>
122
-
123
- </cftry>
124
-
125
- <cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >
126
- </cffunction>
127
-
128
- <cffunction name="GetFolders" returntype="void" output="true">
129
- <cfargument name="resourceType" type="String" required="true">
130
- <cfargument name="currentFolder" type="String" required="true">
131
-
132
- <cfset var i = 1>
133
- <cfset var folders = "">
134
- <!--- Map the virtual path to the local server path --->
135
- <cfset var sServerDir = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, "GetFolders" ) >
136
-
137
- <!--- Sort directories first, name ascending --->
138
- <cfdirectory action="list" directory="#sServerDir#" name="qDir" sort="type,name">
139
- <cfscript>
140
- while( i lte qDir.recordCount )
141
- {
142
- if( compareNoCase( qDir.type[i], "FILE" ) and not listFind( ".,..", qDir.name[i] ) )
143
- {
144
- folders = folders & '<Folder name="#HTMLEditFormat( qDir.name[i] )#" />' ;
145
- }
146
- i = i + 1;
147
- }
148
- </cfscript>
149
- <cfoutput><Folders>#folders#</Folders></cfoutput>
150
- </cffunction>
151
-
152
- <cffunction name="GetFoldersAndfiles" returntype="void" output="true">
153
- <cfargument name="resourceType" type="String" required="true">
154
- <cfargument name="currentFolder" type="String" required="true">
155
-
156
- <cfset var i = 1>
157
- <cfset var folders = "">
158
- <cfset var files = "">
159
- <!--- Map the virtual path to the local server path --->
160
- <cfset var sServerDir = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, "GetFolders" ) >
161
-
162
- <!--- Sort directories first, name ascending --->
163
- <cfdirectory action="list" directory="#sServerDir#" name="qDir" sort="type,name">
164
- <cfscript>
165
- while( i lte qDir.recordCount )
166
- {
167
- if( not compareNoCase( qDir.type[i], "DIR" ) and not listFind( ".,..", qDir.name[i] ) )
168
- {
169
- folders = folders & '<Folder name="#HTMLEditFormat(qDir.name[i])#" />' ;
170
- }
171
- else if( not compareNoCase( qDir.type[i], "FILE" ) )
172
- {
173
- fileSizeKB = round(qDir.size[i] / 1024) ;
174
- files = files & '<File name="#HTMLEditFormat(qDir.name[i])#" size="#IIf( fileSizeKB GT 0, DE( fileSizeKB ), 1)#" />' ;
175
- }
176
- i = i + 1 ;
177
- }
178
- </cfscript>
179
- <cfoutput><Folders>#folders#</Folders></cfoutput>
180
- <cfoutput><Files>#files#</Files></cfoutput>
181
- </cffunction>
182
-
183
- <cffunction name="CreateFolder" returntype="void" output="true">
184
- <cfargument name="resourceType" required="true" type="string">
185
- <cfargument name="currentFolder" required="true" type="string">
186
-
187
- <cfset var sNewFolderName = url.newFolderName >
188
- <cfset var sServerDir = "" >
189
- <cfset var errorNumber = 0>
190
- <cfset var sErrorMsg = "">
191
- <cfset var currentFolderPath = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, 'CreateFolder' )>
192
-
193
- <cfparam name="url.newFolderName" default="">
194
-
195
- <cfscript>
196
- sNewFolderName = SanitizeFolderName( sNewFolderName ) ;
197
- </cfscript>
198
-
199
- <cfif not len( sNewFolderName ) or len( sNewFolderName ) gt 255>
200
- <cfset errorNumber = 102>
201
- <cfelseif directoryExists( currentFolderPath & sNewFolderName )>
202
- <cfset errorNumber = 101>
203
- <cfelseif find( "..", sNewFolderName )>
204
- <cfset errorNumber = 103>
205
- <cfelse>
206
- <cfset errorNumber = 0>
207
-
208
- <!--- Map the virtual path to the local server path of the current folder. --->
209
- <cfset sServerDir = currentFolderPath & sNewFolderName >
210
-
211
- <cftry>
212
- <cfdirectory action="create" directory="#currentFolderPath##sNewFolderName#" mode="755">
213
- <cfcatch type="any">
214
- <!---
215
- un-resolvable error numbers in ColdFusion:
216
- * 102 : Invalid folder name.
217
- * 103 : You have no permissions to create the folder.
218
- --->
219
- <cfset errorNumber = 110>
220
- </cfcatch>
221
- </cftry>
222
- </cfif>
223
-
224
- <cfoutput><Error number="#errorNumber#" originalDescription="#HTMLEditFormat(sErrorMsg)#" /></cfoutput>
225
- </cffunction>