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.
- data/CHANGES-5.1 +54 -0
- data/app/apis/meta_weblog_service.rb +7 -6
- data/app/controllers/accounts_controller.rb +2 -1
- data/app/controllers/admin/content_controller.rb +45 -3
- data/app/controllers/admin/pages_controller.rb +1 -1
- data/app/controllers/admin/textfilters_controller.rb +4 -4
- data/app/controllers/admin/users_controller.rb +14 -2
- data/app/controllers/application.rb +4 -1
- data/app/controllers/articles_controller.rb +1 -3
- data/app/controllers/backend_controller.rb +2 -0
- data/app/controllers/comments_controller.rb +6 -0
- data/app/helpers/admin/base_helper.rb +24 -26
- data/app/helpers/admin/feedback_helper.rb +0 -20
- data/app/helpers/application_helper.rb +1 -0
- data/app/models/article.rb +2 -0
- data/app/models/blog.rb +1 -0
- data/app/models/blog_sweeper.rb +8 -9
- data/app/models/page_cache.rb +1 -0
- data/app/models/tag.rb +2 -2
- data/app/models/user.rb +5 -1
- data/app/views/admin/blacklist/destroy.html.erb +1 -1
- data/app/views/admin/categories/destroy.html.erb +1 -1
- data/app/views/admin/comments/destroy.html.erb +1 -1
- data/app/views/admin/content/_articles.html.erb +4 -4
- data/app/views/admin/content/_attachment.html.erb +6 -7
- data/app/views/admin/content/_drafts.html.erb +6 -0
- data/app/views/admin/content/_form.html.erb +47 -34
- data/app/views/admin/content/destroy.html.erb +1 -1
- data/app/views/admin/content/edit.html.erb +1 -1
- data/app/views/admin/content/index.html.erb +1 -6
- data/app/views/admin/content/new.html.erb +1 -1
- data/app/views/admin/pages/_form.html.erb +4 -3
- data/app/views/admin/pages/_pages.html.erb +3 -3
- data/app/views/admin/pages/destroy.html.erb +1 -1
- data/app/views/admin/resources/destroy.html.erb +1 -1
- data/app/views/admin/settings/index.html.erb +10 -0
- data/app/views/admin/shared/_edit.html.erb +1 -6
- data/app/views/admin/textfilters/destroy.html.erb +3 -0
- data/app/views/admin/textfilters/edit.html.erb +3 -1
- data/app/views/admin/textfilters/index.html.erb +1 -1
- data/app/views/admin/textfilters/new.html.erb +3 -1
- data/app/views/admin/trackbacks/show.html.erb +1 -1
- data/app/views/admin/users/destroy.html.erb +1 -1
- data/app/views/admin/users/edit.html.erb +1 -5
- data/app/views/admin/users/index.html.erb +1 -1
- data/app/views/articles/_comment_failed.html.erb +3 -0
- data/config/initializers/access_rules.rb +3 -3
- data/db/migrate/070_add_users_to_non_admins.rb +17 -0
- data/installer/rails_installer_defaults.yml +1 -1
- data/lib/tasks/release.rake +3 -3
- data/lib/typo_version.rb +1 -1
- data/public/images/admin/cancel.png +0 -0
- data/public/images/admin/checked.png +0 -0
- data/public/images/admin/delete.png +0 -0
- data/public/images/admin/edit.png +0 -0
- data/public/images/admin/show.png +0 -0
- data/public/javascripts/controls.js +2 -0
- data/public/javascripts/dragdrop.js +2 -0
- data/public/javascripts/effects.js +6 -4
- data/public/javascripts/fckeditor/editor/_source/classes/fckcontextmenu.js +13 -8
- data/public/javascripts/fckeditor/editor/_source/classes/fckdataprocessor.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange.js +189 -79
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_gecko.js +4 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_ie.js +16 -15
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrangeiterator.js +30 -9
- data/public/javascripts/fckeditor/editor/_source/classes/fckeditingarea.js +108 -90
- data/public/javascripts/fckeditor/editor/_source/classes/fckelementpath.js +22 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fckenterkey.js +76 -38
- data/public/javascripts/fckeditor/editor/_source/classes/fckevents.js +7 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckhtmliterator.js +142 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckicon.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckiecleanup.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fckimagepreloader.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckkeystrokehandler.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fckmenublock.js +8 -5
- data/public/javascripts/fckeditor/editor/_source/classes/fckmenublockpanel.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fckmenuitem.js +6 -5
- data/public/javascripts/fckeditor/editor/_source/classes/fckpanel.js +85 -38
- data/public/javascripts/fckeditor/editor/_source/classes/fckplugin.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckspecialcombo.js +7 -8
- data/public/javascripts/fckeditor/editor/_source/classes/fckstyle.js +180 -17
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbar.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbutton.js +9 -4
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js +5 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js +15 -4
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js +5 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js +13 -13
- data/public/javascripts/fckeditor/editor/_source/classes/fckw3crange.js +17 -13
- data/public/javascripts/fckeditor/editor/_source/classes/fckxml.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckxml_gecko.js +28 -13
- data/public/javascripts/fckeditor/editor/_source/classes/fckxml_ie.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fck_othercommands.js +75 -19
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js +64 -8
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js +3 -1
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckfitwindow.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckindentcommands.js +5 -3
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckjustifycommands.js +6 -6
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcklistcommands.js +4 -4
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcknamedcommand.js +3 -1
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js +3 -1
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckshowblocks.js +7 -9
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js +4 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js +4 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckstylecommand.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktablecommand.js +4 -4
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js +28 -10
- data/public/javascripts/fckeditor/editor/_source/fckconstants.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/fckeditorapi.js +21 -13
- data/public/javascripts/fckeditor/editor/_source/fckjscoreextensions.js +5 -5
- data/public/javascripts/fckeditor/editor/_source/fckscriptloader.js +4 -4
- data/public/javascripts/fckeditor/editor/_source/internals/fck.js +148 -38
- data/public/javascripts/fckeditor/editor/_source/internals/fck_contextmenu.js +4 -4
- data/public/javascripts/fckeditor/editor/_source/internals/fck_gecko.js +45 -47
- data/public/javascripts/fckeditor/editor/_source/internals/fck_ie.js +50 -17
- data/public/javascripts/fckeditor/editor/_source/internals/fckbrowserinfo.js +4 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckcodeformatter.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckcommands.js +28 -28
- data/public/javascripts/fckeditor/editor/_source/internals/fckconfig.js +12 -13
- data/public/javascripts/fckeditor/editor/_source/internals/fckdebug.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckdialog.js +211 -15
- data/public/javascripts/fckeditor/editor/_source/internals/fckdocumentprocessor.js +63 -39
- data/public/javascripts/fckeditor/editor/_source/internals/fckdomtools.js +177 -37
- data/public/javascripts/fckeditor/editor/_source/internals/fcklanguagemanager.js +2 -1
- data/public/javascripts/fckeditor/editor/_source/internals/fcklisthandler.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fcklistslib.js +5 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckplugins.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckregexlib.js +5 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckselection.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/internals/fckselection_gecko.js +36 -27
- data/public/javascripts/fckeditor/editor/_source/internals/fckselection_ie.js +91 -17
- data/public/javascripts/fckeditor/editor/_source/internals/fckstyles.js +22 -13
- data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler.js +15 -15
- data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_gecko.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_ie.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbaritems.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbarset.js +32 -6
- data/public/javascripts/fckeditor/editor/_source/internals/fcktools.js +181 -22
- data/public/javascripts/fckeditor/editor/_source/internals/fcktools_gecko.js +19 -7
- data/public/javascripts/fckeditor/editor/_source/internals/fcktools_ie.js +8 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckundo.js +8 -5
- data/public/javascripts/fckeditor/editor/_source/internals/fckurlparams.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml.js +116 -61
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_gecko.js +6 -10
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_ie.js +51 -56
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtmlentities.js +1 -1
- data/public/javascripts/fckeditor/editor/css/fck_editorarea.css +3 -2
- data/public/javascripts/fckeditor/editor/css/fck_internal.css +19 -2
- data/public/javascripts/fckeditor/editor/css/fck_showtableborders_gecko.css +8 -1
- data/public/javascripts/fckeditor/editor/css/images/fck_plugin.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.css +8 -1
- data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.js +199 -26
- data/public/javascripts/fckeditor/editor/dialog/fck_about.html +20 -14
- data/public/javascripts/fckeditor/editor/dialog/fck_about/sponsors/spellchecker_net.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_anchor.html +15 -10
- data/public/javascripts/fckeditor/editor/dialog/fck_button.html +9 -14
- data/public/javascripts/fckeditor/editor/dialog/fck_checkbox.html +8 -13
- data/public/javascripts/fckeditor/editor/dialog/fck_colorselector.html +4 -3
- data/public/javascripts/fckeditor/editor/dialog/fck_docprops.html +6 -6
- data/public/javascripts/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html +1 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_flash.html +9 -3
- data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash.js +18 -11
- data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html +7 -3
- data/public/javascripts/fckeditor/editor/dialog/fck_form.html +7 -4
- data/public/javascripts/fckeditor/editor/dialog/fck_hiddenfield.html +12 -15
- data/public/javascripts/fckeditor/editor/dialog/fck_image.html +9 -3
- data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image.js +24 -12
- data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image_preview.html +24 -18
- data/public/javascripts/fckeditor/editor/dialog/fck_link.html +1 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_link/fck_link.js +41 -20
- data/public/javascripts/fckeditor/editor/dialog/fck_listprop.html +8 -4
- data/public/javascripts/fckeditor/editor/dialog/fck_paste.html +53 -54
- data/public/javascripts/fckeditor/editor/dialog/fck_radiobutton.html +8 -13
- data/public/javascripts/fckeditor/editor/dialog/fck_replace.html +157 -79
- data/public/javascripts/fckeditor/editor/dialog/fck_select.html +14 -11
- data/public/javascripts/fckeditor/editor/dialog/fck_select/fck_select.js +2 -2
- data/public/javascripts/fckeditor/editor/dialog/fck_smiley.html +9 -4
- data/public/javascripts/fckeditor/editor/dialog/fck_source.html +5 -2
- data/public/javascripts/fckeditor/editor/dialog/fck_specialchar.html +9 -6
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages.html +2 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm +3 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php +5 -2
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl +2 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js +0 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css +1 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_table.html +10 -5
- data/public/javascripts/fckeditor/editor/dialog/fck_tablecell.html +8 -6
- data/public/javascripts/fckeditor/editor/dialog/fck_template.html +1 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_textarea.html +10 -11
- data/public/javascripts/fckeditor/editor/dialog/fck_textfield.html +10 -14
- data/public/javascripts/fckeditor/editor/dtd/fck_dtd_test.html +0 -2
- data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10strict.js +2 -2
- data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10transitional.js +3 -3
- data/public/javascripts/fckeditor/editor/fckdebug.html +1 -1
- data/public/javascripts/fckeditor/editor/fckdialog.html +660 -213
- data/public/javascripts/fckeditor/editor/fckeditor.html +66 -16
- data/public/javascripts/fckeditor/editor/fckeditor.original.html +70 -16
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.css +2 -2
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.html +37 -2
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmactualfolder.html +33 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html +1 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmfolders.html +2 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourceslist.html +3 -2
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourcetype.html +1 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmupload.html +2 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/common.js +34 -2
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/fckxml.js +3 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/connector.aspx +5 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/upload.aspx +5 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/basexml.pl +1 -1
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/commands.pl +50 -4
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/connector.cgi +2 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/io.pl +14 -4
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload.cgi +2 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl +23 -4
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/util.pl +1 -1
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/config.py +43 -32
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/connector.py +16 -16
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckcommands.py +26 -9
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckconnector.py +2 -2
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckoutput.py +40 -9
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckutil.py +20 -21
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/htaccess.txt +2 -2
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/upload.py +13 -13
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/wsgi.py +3 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/zope.py +4 -5
- data/public/javascripts/fckeditor/editor/filemanager/connectors/test.html +34 -1
- data/public/javascripts/fckeditor/editor/filemanager/connectors/uploadtest.html +47 -4
- data/public/javascripts/fckeditor/editor/js/fckadobeair.js +176 -0
- data/public/javascripts/fckeditor/editor/js/fckeditorcode_gecko.js +77 -77
- data/public/javascripts/fckeditor/editor/js/fckeditorcode_ie.js +74 -74
- data/public/javascripts/fckeditor/editor/lang/_translationstatus.txt +55 -54
- data/public/javascripts/fckeditor/editor/lang/af.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ar.js +16 -17
- data/public/javascripts/fckeditor/editor/lang/bg.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/bn.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/bs.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ca.js +27 -28
- data/public/javascripts/fckeditor/editor/lang/cs.js +18 -19
- data/public/javascripts/fckeditor/editor/lang/da.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/de.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/el.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/en-au.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/en-ca.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/en-uk.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/en.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/eo.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/es.js +34 -35
- data/public/javascripts/fckeditor/editor/lang/et.js +32 -33
- data/public/javascripts/fckeditor/editor/lang/eu.js +32 -33
- data/public/javascripts/fckeditor/editor/lang/fa.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/fi.js +15 -16
- data/public/javascripts/fckeditor/editor/lang/fo.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/fr-ca.js +515 -0
- data/public/javascripts/fckeditor/editor/lang/fr.js +5 -6
- data/public/javascripts/fckeditor/editor/lang/gl.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/he.js +15 -16
- data/public/javascripts/fckeditor/editor/lang/hi.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/hr.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/hu.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/it.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ja.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/km.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ko.js +25 -26
- data/public/javascripts/fckeditor/editor/lang/lt.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/lv.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/mn.js +199 -200
- data/public/javascripts/fckeditor/editor/lang/ms.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/nb.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/nl.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/no.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/pl.js +51 -52
- data/public/javascripts/fckeditor/editor/lang/pt-br.js +16 -17
- data/public/javascripts/fckeditor/editor/lang/pt.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ro.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ru.js +31 -32
- data/public/javascripts/fckeditor/editor/lang/sk.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/sl.js +39 -40
- data/public/javascripts/fckeditor/editor/lang/sr-latn.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/sr.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/sv.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/th.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/tr.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/uk.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/vi.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/zh-cn.js +2 -3
- data/public/javascripts/fckeditor/editor/lang/zh.js +1 -2
- data/public/javascripts/fckeditor/editor/plugins/autogrow/fckplugin.js +9 -2
- data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.config.js +1 -1
- data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.html +1 -1
- data/public/javascripts/fckeditor/editor/plugins/bbcode/fckplugin.js +2 -2
- data/public/javascripts/fckeditor/editor/plugins/dragresizetable/fckplugin.js +35 -11
- data/public/javascripts/fckeditor/editor/plugins/placeholder/fck_placeholder.html +10 -5
- data/public/javascripts/fckeditor/editor/plugins/placeholder/fckplugin.js +3 -3
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/de.js +2 -2
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/en.js +2 -2
- data/public/javascripts/fckeditor/editor/{filemanager/connectors/cfm/upload.cfm → plugins/placeholder/lang/es.js} +9 -13
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/fr.js +1 -1
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/it.js +1 -1
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/pl.js +2 -2
- data/public/javascripts/fckeditor/editor/plugins/simplecommands/fckplugin.js +1 -1
- data/public/javascripts/fckeditor/editor/plugins/tablecommands/fckplugin.js +1 -1
- data/public/javascripts/fckeditor/editor/skins/_fckviewstrips.html +1 -1
- data/public/javascripts/fckeditor/editor/skins/default/fck_dialog.css +271 -8
- data/public/javascripts/fckeditor/editor/skins/default/fck_editor.css +2 -2
- data/public/javascripts/fckeditor/editor/skins/office2003/fck_dialog.css +270 -8
- data/public/javascripts/fckeditor/editor/skins/office2003/fck_editor.css +2 -2
- data/public/javascripts/fckeditor/editor/skins/silver/fck_dialog.css +270 -11
- data/public/javascripts/fckeditor/editor/skins/silver/fck_editor.css +2 -2
- data/public/javascripts/fckeditor/fckconfig.js +58 -55
- data/public/javascripts/fckeditor/fckeditor.js +99 -8
- data/public/javascripts/fckeditor/fckeditor.py +2 -4
- data/public/javascripts/fckeditor/fckpackager.xml +12 -12
- data/public/javascripts/fckeditor/fckstyles.xml +2 -5
- data/public/javascripts/fckeditor/fcktemplates.xml +1 -1
- data/public/javascripts/fckeditor/license.txt +1 -2
- data/public/javascripts/prototype.js +46 -101
- data/public/javascripts/scriptaculous.js +28 -17
- data/public/stylesheets/administration.css +5 -1
- data/themes/dirtylicious/about.markdown +3 -0
- data/themes/dirtylicious/images/body.jpg +0 -0
- data/themes/dirtylicious/images/container.jpg +0 -0
- data/themes/dirtylicious/images/gravatar.gif +0 -0
- data/themes/dirtylicious/images/header.jpg +0 -0
- data/themes/dirtylicious/images/li.gif +0 -0
- data/themes/dirtylicious/images/main.gif +0 -0
- data/themes/dirtylicious/images/nav.gif +0 -0
- data/themes/dirtylicious/images/quote.gif +0 -0
- data/themes/dirtylicious/images/spinner.gif +0 -0
- data/themes/dirtylicious/layouts/default.html.erb +60 -0
- data/themes/dirtylicious/preview.png +0 -0
- data/themes/dirtylicious/stylesheets/application.css +327 -0
- data/themes/dirtylicious/views/articles/_article.html.erb +33 -0
- data/themes/dirtylicious/views/articles/_comment.html.erb +14 -0
- data/themes/dirtylicious/views/articles/_comment_form.html.erb +37 -0
- data/themes/dirtylicious/views/articles/_comment_list.html.erb +7 -0
- data/themes/dirtylicious/views/articles/_trackback.html.erb +9 -0
- data/themes/dirtylicious/views/articles/comment_preview.html.erb +10 -0
- data/themes/dirtylicious/views/articles/index.html.erb +5 -0
- data/themes/dirtylicious/views/articles/read.html.erb +42 -0
- data/themes/dirtylicious/views/shared/_search.html.erb +16 -0
- data/themes/standard_issue/about.markdown +5 -0
- data/themes/standard_issue/images/img01.gif +0 -0
- data/themes/standard_issue/images/img02.gif +0 -0
- data/themes/standard_issue/images/img03.gif +0 -0
- data/themes/standard_issue/images/img04.jpg +0 -0
- data/themes/standard_issue/images/img05.gif +0 -0
- data/themes/standard_issue/images/img06.gif +0 -0
- data/themes/standard_issue/images/img07.gif +0 -0
- data/themes/standard_issue/images/img08.gif +0 -0
- data/themes/standard_issue/images/img09.gif +0 -0
- data/themes/standard_issue/images/img10.gif +0 -0
- data/themes/standard_issue/images/spacer.gif +0 -0
- data/themes/standard_issue/images/spinner.gif +0 -0
- data/themes/standard_issue/layouts/default.html.erb +59 -0
- data/themes/standard_issue/preview.png +0 -0
- data/themes/standard_issue/stylesheets/application.css +461 -0
- data/themes/standard_issue/views/articles/_article.html.erb +37 -0
- data/themes/standard_issue/views/articles/_comment.html.erb +12 -0
- data/themes/standard_issue/views/articles/_comment_form.html.erb +48 -0
- data/themes/standard_issue/views/articles/_comment_list.html.erb +7 -0
- data/themes/standard_issue/views/articles/_trackback.html.erb +9 -0
- data/themes/standard_issue/views/articles/comment_preview.html.erb +10 -0
- data/themes/standard_issue/views/articles/index.html.erb +5 -0
- data/themes/standard_issue/views/articles/read.html.erb +42 -0
- data/themes/standard_issue/views/shared/_search.html.erb +17 -0
- data/themes/standard_issue/views/theme/static_view_test.html.erb +1 -0
- data/themes/typographic/images/accept.gif +0 -0
- data/themes/typographic/images/accept50.gif +0 -0
- data/themes/typographic/images/bg_white.gif +0 -0
- data/themes/typographic/images/bg_wrapper.gif +0 -0
- data/themes/typographic/images/bullet_bottom.gif +0 -0
- data/themes/typographic/images/bullet_right.gif +0 -0
- data/themes/typographic/images/email_open.gif +0 -0
- data/themes/typographic/images/email_open50.gif +0 -0
- data/themes/typographic/images/meta.gif +0 -0
- data/themes/typographic/images/page_edit.gif +0 -0
- data/themes/typographic/images/page_edit50.gif +0 -0
- data/themes/typographic/images/spinner.gif +0 -0
- data/themes/typographic/images/tag.gif +0 -0
- data/themes/typographic/images/user.gif +0 -0
- data/themes/typographic/images/user50.gif +0 -0
- data/themes/typographic/images/world_link.gif +0 -0
- data/themes/typographic/images/world_link50.gif +0 -0
- data/themes/typographic/layouts/default.html.erb +5 -2
- data/themes/typographic/stylesheets/ie6.css +86 -0
- data/themes/typographic/views/articles/_article.html.erb +2 -2
- data/vendor/plugins/fckeditor/README +0 -7
- data/vendor/plugins/fckeditor/app/helpers/fckeditor_helper.rb +1 -3
- data/vendor/plugins/fckeditor/lib/fckeditor_version.rb +2 -2
- data/vendor/plugins/fckeditor/tasks/fckeditor_tasks.rake +1 -1
- data/vendor/plugins/fckeditor/test/fckeditor_test.rb +8 -0
- metadata +98 -66
- data/CHANGES-5.0.4 +0 -33
- data/SIDEBARS +0 -39
- data/app/views/admin/content/_quick_post.html.erb +0 -20
- data/db/schema.rb +0 -224
- data/public/.DS_Store +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/basexml.asp +0 -62
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/class_upload.asp +0 -353
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/commands.asp +0 -198
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/config.asp +0 -128
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/connector.asp +0 -88
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/io.asp +0 -222
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/upload.asp +0 -61
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/util.asp +0 -55
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc +0 -273
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm +0 -315
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm +0 -296
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm +0 -68
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm +0 -225
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm +0 -89
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm +0 -288
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm +0 -68
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm +0 -132
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/config.cfm +0 -183
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/connector.cfm +0 -31
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/image.cfc +0 -1325
- data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/config.lasso +0 -65
- data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/connector.lasso +0 -257
- data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/upload.lasso +0 -157
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/basexml.php +0 -93
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/commands.php +0 -245
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/config.php +0 -140
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/connector.php +0 -87
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/io.php +0 -272
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/phpcompat.php +0 -17
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/upload.php +0 -59
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/util.php +0 -185
- data/public/javascripts/fckeditor/fckeditor.afp +0 -161
- data/public/javascripts/fckeditor/fckeditor.asp +0 -235
- data/public/javascripts/fckeditor/fckeditor.cfc +0 -273
- data/public/javascripts/fckeditor/fckeditor.cfm +0 -210
- data/public/javascripts/fckeditor/fckeditor.lasso +0 -112
- data/test/mocks/themes/typographic/.DS_Store +0 -0
- data/themes/typographic/.DS_Store +0 -0
- data/vendor/plugins/audioscrobbler_sidebar/MAINTAINERS +0 -26
- data/vendor/plugins/audioscrobbler_sidebar/MIT-LICENSE +0 -21
- data/vendor/plugins/audioscrobbler_sidebar/README +0 -27
- data/vendor/plugins/audioscrobbler_sidebar/Rakefile +0 -22
- data/vendor/plugins/audioscrobbler_sidebar/init.rb +0 -5
- data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler.rb +0 -54
- data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb +0 -13
- data/vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb +0 -8
- 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>
|