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,198 +0,0 @@
|
|
1
|
-
<%
|
2
|
-
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
' Copyright (C) 2003-2007 Frederico Caldeira Knabben
|
4
|
-
'
|
5
|
-
' == BEGIN LICENSE ==
|
6
|
-
'
|
7
|
-
' Licensed under the terms of any of the following licenses at your
|
8
|
-
' choice:
|
9
|
-
'
|
10
|
-
' - GNU General Public License Version 2 or later (the "GPL")
|
11
|
-
' http://www.gnu.org/licenses/gpl.html
|
12
|
-
'
|
13
|
-
' - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
|
14
|
-
' http://www.gnu.org/licenses/lgpl.html
|
15
|
-
'
|
16
|
-
' - Mozilla Public License Version 1.1 or later (the "MPL")
|
17
|
-
' http://www.mozilla.org/MPL/MPL-1.1.html
|
18
|
-
'
|
19
|
-
' == END LICENSE ==
|
20
|
-
'
|
21
|
-
' This file include the functions that handle the Command requests
|
22
|
-
' in the ASP Connector.
|
23
|
-
%>
|
24
|
-
<%
|
25
|
-
Sub GetFolders( resourceType, currentFolder )
|
26
|
-
' Map the virtual path to the local server path.
|
27
|
-
Dim sServerDir
|
28
|
-
sServerDir = ServerMapFolder( resourceType, currentFolder, "GetFolders" )
|
29
|
-
|
30
|
-
' Open the "Folders" node.
|
31
|
-
Response.Write "<Folders>"
|
32
|
-
|
33
|
-
Dim oFSO, oCurrentFolder, oFolders, oFolder
|
34
|
-
Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
|
35
|
-
if not (oFSO.FolderExists( sServerDir ) ) then
|
36
|
-
Set oFSO = Nothing
|
37
|
-
SendError 102, currentFolder
|
38
|
-
end if
|
39
|
-
|
40
|
-
Set oCurrentFolder = oFSO.GetFolder( sServerDir )
|
41
|
-
Set oFolders = oCurrentFolder.SubFolders
|
42
|
-
|
43
|
-
For Each oFolder in oFolders
|
44
|
-
Response.Write "<Folder name=""" & ConvertToXmlAttribute( oFolder.name ) & """ />"
|
45
|
-
Next
|
46
|
-
|
47
|
-
Set oFSO = Nothing
|
48
|
-
|
49
|
-
' Close the "Folders" node.
|
50
|
-
Response.Write "</Folders>"
|
51
|
-
End Sub
|
52
|
-
|
53
|
-
Sub GetFoldersAndFiles( resourceType, currentFolder )
|
54
|
-
' Map the virtual path to the local server path.
|
55
|
-
Dim sServerDir
|
56
|
-
sServerDir = ServerMapFolder( resourceType, currentFolder, "GetFoldersAndFiles" )
|
57
|
-
|
58
|
-
Dim oFSO, oCurrentFolder, oFolders, oFolder, oFiles, oFile
|
59
|
-
Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
|
60
|
-
if not (oFSO.FolderExists( sServerDir ) ) then
|
61
|
-
Set oFSO = Nothing
|
62
|
-
SendError 102, currentFolder
|
63
|
-
end if
|
64
|
-
|
65
|
-
Set oCurrentFolder = oFSO.GetFolder( sServerDir )
|
66
|
-
Set oFolders = oCurrentFolder.SubFolders
|
67
|
-
Set oFiles = oCurrentFolder.Files
|
68
|
-
|
69
|
-
' Open the "Folders" node.
|
70
|
-
Response.Write "<Folders>"
|
71
|
-
|
72
|
-
For Each oFolder in oFolders
|
73
|
-
Response.Write "<Folder name=""" & ConvertToXmlAttribute( oFolder.name ) & """ />"
|
74
|
-
Next
|
75
|
-
|
76
|
-
' Close the "Folders" node.
|
77
|
-
Response.Write "</Folders>"
|
78
|
-
|
79
|
-
' Open the "Files" node.
|
80
|
-
Response.Write "<Files>"
|
81
|
-
|
82
|
-
For Each oFile in oFiles
|
83
|
-
Dim iFileSize
|
84
|
-
iFileSize = Round( oFile.size / 1024 )
|
85
|
-
If ( iFileSize < 1 AND oFile.size <> 0 ) Then iFileSize = 1
|
86
|
-
|
87
|
-
Response.Write "<File name=""" & ConvertToXmlAttribute( oFile.name ) & """ size=""" & iFileSize & """ />"
|
88
|
-
Next
|
89
|
-
|
90
|
-
' Close the "Files" node.
|
91
|
-
Response.Write "</Files>"
|
92
|
-
End Sub
|
93
|
-
|
94
|
-
Sub CreateFolder( resourceType, currentFolder )
|
95
|
-
Dim sErrorNumber
|
96
|
-
|
97
|
-
Dim sNewFolderName
|
98
|
-
sNewFolderName = Request.QueryString( "NewFolderName" )
|
99
|
-
sNewFolderName = SanitizeFolderName( sNewFolderName )
|
100
|
-
|
101
|
-
If ( sNewFolderName = "" OR InStr( 1, sNewFolderName, ".." ) > 0 ) Then
|
102
|
-
sErrorNumber = "102"
|
103
|
-
Else
|
104
|
-
' Map the virtual path to the local server path of the current folder.
|
105
|
-
Dim sServerDir
|
106
|
-
sServerDir = ServerMapFolder( resourceType, CombinePaths(currentFolder, sNewFolderName), "CreateFolder" )
|
107
|
-
|
108
|
-
On Error Resume Next
|
109
|
-
|
110
|
-
CreateServerFolder sServerDir
|
111
|
-
|
112
|
-
Dim iErrNumber, sErrDescription
|
113
|
-
iErrNumber = err.number
|
114
|
-
sErrDescription = err.Description
|
115
|
-
|
116
|
-
On Error Goto 0
|
117
|
-
|
118
|
-
Select Case iErrNumber
|
119
|
-
Case 0
|
120
|
-
sErrorNumber = "0"
|
121
|
-
Case 52
|
122
|
-
sErrorNumber = "102" ' Invalid Folder Name.
|
123
|
-
Case 70
|
124
|
-
sErrorNumber = "103" ' Security Error.
|
125
|
-
Case 76
|
126
|
-
sErrorNumber = "102" ' Path too long.
|
127
|
-
Case Else
|
128
|
-
sErrorNumber = "110"
|
129
|
-
End Select
|
130
|
-
End If
|
131
|
-
|
132
|
-
' Create the "Error" node.
|
133
|
-
Response.Write "<Error number=""" & sErrorNumber & """ originalNumber=""" & iErrNumber & """ originalDescription=""" & ConvertToXmlAttribute( sErrDescription ) & """ />"
|
134
|
-
End Sub
|
135
|
-
|
136
|
-
Sub FileUpload( resourceType, currentFolder, sCommand )
|
137
|
-
Dim oUploader
|
138
|
-
Set oUploader = New NetRube_Upload
|
139
|
-
oUploader.MaxSize = 0
|
140
|
-
oUploader.Allowed = ConfigAllowedExtensions.Item( resourceType )
|
141
|
-
oUploader.Denied = ConfigDeniedExtensions.Item( resourceType )
|
142
|
-
oUploader.HtmlExtensions = ConfigHtmlExtensions
|
143
|
-
oUploader.GetData
|
144
|
-
|
145
|
-
Dim sErrorNumber
|
146
|
-
sErrorNumber = "0"
|
147
|
-
|
148
|
-
Dim sFileName, sOriginalFileName, sExtension
|
149
|
-
sFileName = ""
|
150
|
-
|
151
|
-
If oUploader.ErrNum > 0 Then
|
152
|
-
sErrorNumber = "202"
|
153
|
-
Else
|
154
|
-
' Map the virtual path to the local server path.
|
155
|
-
Dim sServerDir
|
156
|
-
sServerDir = ServerMapFolder( resourceType, currentFolder, sCommand )
|
157
|
-
|
158
|
-
Dim oFSO
|
159
|
-
Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
|
160
|
-
if not (oFSO.FolderExists( sServerDir ) ) then
|
161
|
-
sErrorNumber = "102"
|
162
|
-
else
|
163
|
-
' Get the uploaded file name.
|
164
|
-
sFileName = oUploader.File( "NewFile" ).Name
|
165
|
-
sExtension = oUploader.File( "NewFile" ).Ext
|
166
|
-
sFileName = SanitizeFileName( sFileName )
|
167
|
-
sOriginalFileName = sFileName
|
168
|
-
|
169
|
-
Dim iCounter
|
170
|
-
iCounter = 0
|
171
|
-
|
172
|
-
Do While ( True )
|
173
|
-
Dim sFilePath
|
174
|
-
sFilePath = sServerDir & sFileName
|
175
|
-
|
176
|
-
If ( oFSO.FileExists( sFilePath ) ) Then
|
177
|
-
iCounter = iCounter + 1
|
178
|
-
sFileName = RemoveExtension( sOriginalFileName ) & "(" & iCounter & ")." & sExtension
|
179
|
-
sErrorNumber = "201"
|
180
|
-
Else
|
181
|
-
oUploader.SaveAs "NewFile", sFilePath
|
182
|
-
If oUploader.ErrNum > 0 Then sErrorNumber = "202"
|
183
|
-
Exit Do
|
184
|
-
End If
|
185
|
-
Loop
|
186
|
-
end if
|
187
|
-
End If
|
188
|
-
|
189
|
-
Set oUploader = Nothing
|
190
|
-
|
191
|
-
dim sFileUrl
|
192
|
-
sFileUrl = CombinePaths( GetResourceTypePath( resourceType, sCommand ) , currentFolder )
|
193
|
-
sFileUrl = CombinePaths( sFileUrl, sFileName )
|
194
|
-
|
195
|
-
SendUploadResults sErrorNumber, sFileUrl, sFileName, ""
|
196
|
-
End Sub
|
197
|
-
|
198
|
-
%>
|
@@ -1,128 +0,0 @@
|
|
1
|
-
<%
|
2
|
-
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
' Copyright (C) 2003-2007 Frederico Caldeira Knabben
|
4
|
-
'
|
5
|
-
' == BEGIN LICENSE ==
|
6
|
-
'
|
7
|
-
' Licensed under the terms of any of the following licenses at your
|
8
|
-
' choice:
|
9
|
-
'
|
10
|
-
' - GNU General Public License Version 2 or later (the "GPL")
|
11
|
-
' http://www.gnu.org/licenses/gpl.html
|
12
|
-
'
|
13
|
-
' - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
|
14
|
-
' http://www.gnu.org/licenses/lgpl.html
|
15
|
-
'
|
16
|
-
' - Mozilla Public License Version 1.1 or later (the "MPL")
|
17
|
-
' http://www.mozilla.org/MPL/MPL-1.1.html
|
18
|
-
'
|
19
|
-
' == END LICENSE ==
|
20
|
-
'
|
21
|
-
' Configuration file for the File Manager Connector for ASP.
|
22
|
-
%>
|
23
|
-
<%
|
24
|
-
|
25
|
-
' SECURITY: You must explicitelly enable this "connector" (set it to "True").
|
26
|
-
' WARNING: don't just set "ConfigIsEnabled = true", you must be sure that only
|
27
|
-
' authenticated users can access this file or use some kind of session checking.
|
28
|
-
Dim ConfigIsEnabled
|
29
|
-
ConfigIsEnabled = False
|
30
|
-
|
31
|
-
' Path to user files relative to the document root.
|
32
|
-
' This setting is preserved only for backward compatibility.
|
33
|
-
' You should look at the settings for each resource type to get the full potential
|
34
|
-
Dim ConfigUserFilesPath
|
35
|
-
ConfigUserFilesPath = "/userfiles/"
|
36
|
-
|
37
|
-
' Due to security issues with Apache modules, it is reccomended to leave the
|
38
|
-
' following setting enabled.
|
39
|
-
Dim ConfigForceSingleExtension
|
40
|
-
ConfigForceSingleExtension = true
|
41
|
-
|
42
|
-
' What the user can do with this connector
|
43
|
-
Dim ConfigAllowedCommands
|
44
|
-
ConfigAllowedCommands = "QuickUpload|FileUpload|GetFolders|GetFoldersAndFiles|CreateFolder"
|
45
|
-
|
46
|
-
' Allowed Resource Types
|
47
|
-
Dim ConfigAllowedTypes
|
48
|
-
ConfigAllowedTypes = "File|Image|Flash|Media"
|
49
|
-
|
50
|
-
' For security, HTML is allowed in the first Kb of data for files having the
|
51
|
-
' following extensions only.
|
52
|
-
Dim ConfigHtmlExtensions
|
53
|
-
ConfigHtmlExtensions = "html|htm|xml|xsd|txt|js"
|
54
|
-
'
|
55
|
-
' Configuration settings for each Resource Type
|
56
|
-
'
|
57
|
-
' - AllowedExtensions: the possible extensions that can be allowed.
|
58
|
-
' If it is empty then any file type can be uploaded.
|
59
|
-
'
|
60
|
-
' - DeniedExtensions: The extensions that won't be allowed.
|
61
|
-
' If it is empty then no restrictions are done here.
|
62
|
-
'
|
63
|
-
' For a file to be uploaded it has to fullfil both the AllowedExtensions
|
64
|
-
' and DeniedExtensions (that's it: not being denied) conditions.
|
65
|
-
'
|
66
|
-
' - FileTypesPath: the virtual folder relative to the document root where
|
67
|
-
' these resources will be located.
|
68
|
-
' Attention: It must start and end with a slash: '/'
|
69
|
-
'
|
70
|
-
' - FileTypesAbsolutePath: the physical path to the above folder. It must be
|
71
|
-
' an absolute path.
|
72
|
-
' If it's an empty string then it will be autocalculated.
|
73
|
-
' Usefull if you are using a virtual directory, symbolic link or alias.
|
74
|
-
' Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
|
75
|
-
' Attention: The above 'FileTypesPath' must point to the same directory.
|
76
|
-
' Attention: It must end with a slash: '/'
|
77
|
-
'
|
78
|
-
' - QuickUploadPath: the virtual folder relative to the document root where
|
79
|
-
' these resources will be uploaded using the Upload tab in the resources
|
80
|
-
' dialogs.
|
81
|
-
' Attention: It must start and end with a slash: '/'
|
82
|
-
'
|
83
|
-
' - QuickUploadAbsolutePath: the physical path to the above folder. It must be
|
84
|
-
' an absolute path.
|
85
|
-
' If it's an empty string then it will be autocalculated.
|
86
|
-
' Usefull if you are using a virtual directory, symbolic link or alias.
|
87
|
-
' Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
|
88
|
-
' Attention: The above 'QuickUploadPath' must point to the same directory.
|
89
|
-
' Attention: It must end with a slash: '/'
|
90
|
-
'
|
91
|
-
|
92
|
-
Dim ConfigAllowedExtensions, ConfigDeniedExtensions, ConfigFileTypesPath, ConfigFileTypesAbsolutePath, ConfigQuickUploadPath, ConfigQuickUploadAbsolutePath
|
93
|
-
Set ConfigAllowedExtensions = CreateObject( "Scripting.Dictionary" )
|
94
|
-
Set ConfigDeniedExtensions = CreateObject( "Scripting.Dictionary" )
|
95
|
-
Set ConfigFileTypesPath = CreateObject( "Scripting.Dictionary" )
|
96
|
-
Set ConfigFileTypesAbsolutePath = CreateObject( "Scripting.Dictionary" )
|
97
|
-
Set ConfigQuickUploadPath = CreateObject( "Scripting.Dictionary" )
|
98
|
-
Set ConfigQuickUploadAbsolutePath = CreateObject( "Scripting.Dictionary" )
|
99
|
-
|
100
|
-
ConfigAllowedExtensions.Add "File", "7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip"
|
101
|
-
ConfigDeniedExtensions.Add "File", ""
|
102
|
-
ConfigFileTypesPath.Add "File", ConfigUserFilesPath & "file/"
|
103
|
-
ConfigFileTypesAbsolutePath.Add "File", ""
|
104
|
-
ConfigQuickUploadPath.Add "File", ConfigUserFilesPath
|
105
|
-
ConfigQuickUploadAbsolutePath.Add "File", ""
|
106
|
-
|
107
|
-
ConfigAllowedExtensions.Add "Image", "bmp|gif|jpeg|jpg|png|psd|tif|tiff"
|
108
|
-
ConfigDeniedExtensions.Add "Image", ""
|
109
|
-
ConfigFileTypesPath.Add "Image", ConfigUserFilesPath & "image/"
|
110
|
-
ConfigFileTypesAbsolutePath.Add "Image", ""
|
111
|
-
ConfigQuickUploadPath.Add "Image", ConfigUserFilesPath
|
112
|
-
ConfigQuickUploadAbsolutePath.Add "Image", ""
|
113
|
-
|
114
|
-
ConfigAllowedExtensions.Add "Flash", "swf|fla"
|
115
|
-
ConfigDeniedExtensions.Add "Flash", ""
|
116
|
-
ConfigFileTypesPath.Add "Flash", ConfigUserFilesPath & "flash/"
|
117
|
-
ConfigFileTypesAbsolutePath.Add "Flash", ""
|
118
|
-
ConfigQuickUploadPath.Add "Flash", ConfigUserFilesPath
|
119
|
-
ConfigQuickUploadAbsolutePath.Add "Flash", ""
|
120
|
-
|
121
|
-
ConfigAllowedExtensions.Add "Media", "aiff|asf|avi|bmp|fla|flv|gif|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|png|qt|ram|rm|rmi|rmvb|swf|tif|tiff|wav|wma|wmv"
|
122
|
-
ConfigDeniedExtensions.Add "Media", ""
|
123
|
-
ConfigFileTypesPath.Add "Media", ConfigUserFilesPath & "media/"
|
124
|
-
ConfigFileTypesAbsolutePath.Add "Media", ""
|
125
|
-
ConfigQuickUploadPath.Add "Media", ConfigUserFilesPath
|
126
|
-
ConfigQuickUploadAbsolutePath.Add "Media", ""
|
127
|
-
|
128
|
-
%>
|
@@ -1,88 +0,0 @@
|
|
1
|
-
<%@ CodePage=65001 Language="VBScript"%>
|
2
|
-
<%
|
3
|
-
Option Explicit
|
4
|
-
Response.Buffer = True
|
5
|
-
%>
|
6
|
-
<%
|
7
|
-
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
8
|
-
' Copyright (C) 2003-2007 Frederico Caldeira Knabben
|
9
|
-
'
|
10
|
-
' == BEGIN LICENSE ==
|
11
|
-
'
|
12
|
-
' Licensed under the terms of any of the following licenses at your
|
13
|
-
' choice:
|
14
|
-
'
|
15
|
-
' - GNU General Public License Version 2 or later (the "GPL")
|
16
|
-
' http://www.gnu.org/licenses/gpl.html
|
17
|
-
'
|
18
|
-
' - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
|
19
|
-
' http://www.gnu.org/licenses/lgpl.html
|
20
|
-
'
|
21
|
-
' - Mozilla Public License Version 1.1 or later (the "MPL")
|
22
|
-
' http://www.mozilla.org/MPL/MPL-1.1.html
|
23
|
-
'
|
24
|
-
' == END LICENSE ==
|
25
|
-
'
|
26
|
-
' This is the File Manager Connector for ASP.
|
27
|
-
%>
|
28
|
-
<!--#include file="config.asp"-->
|
29
|
-
<!--#include file="util.asp"-->
|
30
|
-
<!--#include file="io.asp"-->
|
31
|
-
<!--#include file="basexml.asp"-->
|
32
|
-
<!--#include file="commands.asp"-->
|
33
|
-
<!--#include file="class_upload.asp"-->
|
34
|
-
<%
|
35
|
-
|
36
|
-
If ( ConfigIsEnabled = False ) Then
|
37
|
-
SendError 1, "This connector is disabled. Please check the ""editor/filemanager/connectors/asp/config.asp"" file"
|
38
|
-
End If
|
39
|
-
|
40
|
-
DoResponse
|
41
|
-
|
42
|
-
Sub DoResponse()
|
43
|
-
Dim sCommand, sResourceType, sCurrentFolder
|
44
|
-
|
45
|
-
' Get the main request information.
|
46
|
-
sCommand = Request.QueryString("Command")
|
47
|
-
|
48
|
-
sResourceType = Request.QueryString("Type")
|
49
|
-
If ( sResourceType = "" ) Then sResourceType = "File"
|
50
|
-
|
51
|
-
sCurrentFolder = GetCurrentFolder()
|
52
|
-
|
53
|
-
' Check if it is an allowed command
|
54
|
-
if ( Not IsAllowedCommand( sCommand ) ) then
|
55
|
-
SendError 1, "The """ & sCommand & """ command isn't allowed"
|
56
|
-
end if
|
57
|
-
|
58
|
-
' Check if it is an allowed resource type.
|
59
|
-
if ( Not IsAllowedType( sResourceType ) ) Then
|
60
|
-
SendError 1, "The """ & sResourceType & """ resource type isn't allowed"
|
61
|
-
end if
|
62
|
-
|
63
|
-
' File Upload doesn't have to Return XML, so it must be intercepted before anything.
|
64
|
-
If ( sCommand = "FileUpload" ) Then
|
65
|
-
FileUpload sResourceType, sCurrentFolder, sCommand
|
66
|
-
Exit Sub
|
67
|
-
End If
|
68
|
-
|
69
|
-
SetXmlHeaders
|
70
|
-
|
71
|
-
CreateXmlHeader sCommand, sResourceType, sCurrentFolder, GetUrlFromPath( sResourceType, sCurrentFolder, sCommand)
|
72
|
-
|
73
|
-
' Execute the required command.
|
74
|
-
Select Case sCommand
|
75
|
-
Case "GetFolders"
|
76
|
-
GetFolders sResourceType, sCurrentFolder
|
77
|
-
Case "GetFoldersAndFiles"
|
78
|
-
GetFoldersAndFiles sResourceType, sCurrentFolder
|
79
|
-
Case "CreateFolder"
|
80
|
-
CreateFolder sResourceType, sCurrentFolder
|
81
|
-
End Select
|
82
|
-
|
83
|
-
CreateXmlFooter
|
84
|
-
|
85
|
-
Response.End
|
86
|
-
End Sub
|
87
|
-
|
88
|
-
%>
|
@@ -1,222 +0,0 @@
|
|
1
|
-
<%
|
2
|
-
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
' Copyright (C) 2003-2007 Frederico Caldeira Knabben
|
4
|
-
'
|
5
|
-
' == BEGIN LICENSE ==
|
6
|
-
'
|
7
|
-
' Licensed under the terms of any of the following licenses at your
|
8
|
-
' choice:
|
9
|
-
'
|
10
|
-
' - GNU General Public License Version 2 or later (the "GPL")
|
11
|
-
' http://www.gnu.org/licenses/gpl.html
|
12
|
-
'
|
13
|
-
' - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
|
14
|
-
' http://www.gnu.org/licenses/lgpl.html
|
15
|
-
'
|
16
|
-
' - Mozilla Public License Version 1.1 or later (the "MPL")
|
17
|
-
' http://www.mozilla.org/MPL/MPL-1.1.html
|
18
|
-
'
|
19
|
-
' == END LICENSE ==
|
20
|
-
'
|
21
|
-
' This file include IO specific functions used by the ASP Connector.
|
22
|
-
%>
|
23
|
-
<%
|
24
|
-
function CombinePaths( sBasePath, sFolder)
|
25
|
-
CombinePaths = RemoveFromEnd( sBasePath, "/" ) & "/" & RemoveFromStart( sFolder, "/" )
|
26
|
-
end function
|
27
|
-
|
28
|
-
Function GetResourceTypePath( resourceType, sCommand )
|
29
|
-
if ( sCommand = "QuickUpload") then
|
30
|
-
GetResourceTypePath = ConfigQuickUploadPath.Item( resourceType )
|
31
|
-
else
|
32
|
-
GetResourceTypePath = ConfigFileTypesPath.Item( resourceType )
|
33
|
-
end if
|
34
|
-
end Function
|
35
|
-
|
36
|
-
Function GetResourceTypeDirectory( resourceType, sCommand )
|
37
|
-
if ( sCommand = "QuickUpload") then
|
38
|
-
|
39
|
-
if ( ConfigQuickUploadAbsolutePath.Item( resourceType ) <> "" ) then
|
40
|
-
GetResourceTypeDirectory = ConfigQuickUploadAbsolutePath.Item( resourceType )
|
41
|
-
else
|
42
|
-
' Map the "UserFiles" path to a local directory.
|
43
|
-
GetResourceTypeDirectory = Server.MapPath( ConfigQuickUploadPath.Item( resourceType ) )
|
44
|
-
end if
|
45
|
-
else
|
46
|
-
if ( ConfigFileTypesAbsolutePath.Item( resourceType ) <> "" ) then
|
47
|
-
GetResourceTypeDirectory = ConfigFileTypesAbsolutePath.Item( resourceType )
|
48
|
-
else
|
49
|
-
' Map the "UserFiles" path to a local directory.
|
50
|
-
GetResourceTypeDirectory = Server.MapPath( ConfigFileTypesPath.Item( resourceType ) )
|
51
|
-
end if
|
52
|
-
end if
|
53
|
-
end Function
|
54
|
-
|
55
|
-
Function GetUrlFromPath( resourceType, folderPath, sCommand )
|
56
|
-
GetUrlFromPath = CombinePaths( GetResourceTypePath( resourceType, sCommand ), folderPath )
|
57
|
-
End Function
|
58
|
-
|
59
|
-
Function RemoveExtension( fileName )
|
60
|
-
RemoveExtension = Left( fileName, InStrRev( fileName, "." ) - 1 )
|
61
|
-
End Function
|
62
|
-
|
63
|
-
Function ServerMapFolder( resourceType, folderPath, sCommand )
|
64
|
-
Dim sResourceTypePath
|
65
|
-
' Get the resource type directory.
|
66
|
-
sResourceTypePath = GetResourceTypeDirectory( resourceType, sCommand )
|
67
|
-
|
68
|
-
' Ensure that the directory exists.
|
69
|
-
CreateServerFolder sResourceTypePath
|
70
|
-
|
71
|
-
' Return the resource type directory combined with the required path.
|
72
|
-
ServerMapFolder = CombinePaths( sResourceTypePath, folderPath )
|
73
|
-
End Function
|
74
|
-
|
75
|
-
Sub CreateServerFolder( folderPath )
|
76
|
-
Dim oFSO
|
77
|
-
Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
|
78
|
-
|
79
|
-
Dim sParent
|
80
|
-
sParent = oFSO.GetParentFolderName( folderPath )
|
81
|
-
|
82
|
-
' Check if the parent exists, or create it.
|
83
|
-
If ( NOT oFSO.FolderExists( sParent ) ) Then CreateServerFolder( sParent )
|
84
|
-
|
85
|
-
If ( oFSO.FolderExists( folderPath ) = False ) Then
|
86
|
-
On Error resume next
|
87
|
-
oFSO.CreateFolder( folderPath )
|
88
|
-
|
89
|
-
if err.number<>0 then
|
90
|
-
dim sErrorNumber
|
91
|
-
Dim iErrNumber, sErrDescription
|
92
|
-
iErrNumber = err.number
|
93
|
-
sErrDescription = err.Description
|
94
|
-
|
95
|
-
On Error Goto 0
|
96
|
-
|
97
|
-
Select Case iErrNumber
|
98
|
-
Case 52
|
99
|
-
sErrorNumber = "102" ' Invalid Folder Name.
|
100
|
-
Case 70
|
101
|
-
sErrorNumber = "103" ' Security Error.
|
102
|
-
Case 76
|
103
|
-
sErrorNumber = "102" ' Path too long.
|
104
|
-
Case Else
|
105
|
-
sErrorNumber = "110"
|
106
|
-
End Select
|
107
|
-
|
108
|
-
SendError sErrorNumber, "CreateServerFolder(" & folderPath & ") : " & sErrDescription
|
109
|
-
end if
|
110
|
-
|
111
|
-
End If
|
112
|
-
|
113
|
-
Set oFSO = Nothing
|
114
|
-
End Sub
|
115
|
-
|
116
|
-
Function IsAllowedExt( extension, resourceType )
|
117
|
-
Dim oRE
|
118
|
-
Set oRE = New RegExp
|
119
|
-
oRE.IgnoreCase = True
|
120
|
-
oRE.Global = True
|
121
|
-
|
122
|
-
Dim sAllowed, sDenied
|
123
|
-
sAllowed = ConfigAllowedExtensions.Item( resourceType )
|
124
|
-
sDenied = ConfigDeniedExtensions.Item( resourceType )
|
125
|
-
|
126
|
-
IsAllowedExt = True
|
127
|
-
|
128
|
-
If sDenied <> "" Then
|
129
|
-
oRE.Pattern = sDenied
|
130
|
-
IsAllowedExt = Not oRE.Test( extension )
|
131
|
-
End If
|
132
|
-
|
133
|
-
If IsAllowedExt And sAllowed <> "" Then
|
134
|
-
oRE.Pattern = sAllowed
|
135
|
-
IsAllowedExt = oRE.Test( extension )
|
136
|
-
End If
|
137
|
-
|
138
|
-
Set oRE = Nothing
|
139
|
-
End Function
|
140
|
-
|
141
|
-
Function IsAllowedType( resourceType )
|
142
|
-
Dim oRE
|
143
|
-
Set oRE = New RegExp
|
144
|
-
oRE.IgnoreCase = True
|
145
|
-
oRE.Global = True
|
146
|
-
oRE.Pattern = "^(" & ConfigAllowedTypes & ")$"
|
147
|
-
|
148
|
-
IsAllowedType = oRE.Test( resourceType )
|
149
|
-
|
150
|
-
Set oRE = Nothing
|
151
|
-
End Function
|
152
|
-
|
153
|
-
Function IsAllowedCommand( sCommand )
|
154
|
-
Dim oRE
|
155
|
-
Set oRE = New RegExp
|
156
|
-
oRE.IgnoreCase = True
|
157
|
-
oRE.Global = True
|
158
|
-
oRE.Pattern = "^(" & ConfigAllowedCommands & ")$"
|
159
|
-
|
160
|
-
IsAllowedCommand = oRE.Test( sCommand )
|
161
|
-
|
162
|
-
Set oRE = Nothing
|
163
|
-
End Function
|
164
|
-
|
165
|
-
function GetCurrentFolder()
|
166
|
-
dim sCurrentFolder
|
167
|
-
sCurrentFolder = Request.QueryString("CurrentFolder")
|
168
|
-
If ( sCurrentFolder = "" ) Then sCurrentFolder = "/"
|
169
|
-
|
170
|
-
' Check the current folder syntax (must begin and start with a slash).
|
171
|
-
If ( Right( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = sCurrentFolder & "/"
|
172
|
-
If ( Left( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = "/" & sCurrentFolder
|
173
|
-
|
174
|
-
' Check for invalid folder paths (..)
|
175
|
-
If ( InStr( 1, sCurrentFolder, ".." ) <> 0 ) Then
|
176
|
-
SendError 102, ""
|
177
|
-
End If
|
178
|
-
|
179
|
-
GetCurrentFolder = sCurrentFolder
|
180
|
-
end function
|
181
|
-
|
182
|
-
' Do a cleanup of the folder name to avoid possible problems
|
183
|
-
function SanitizeFolderName( sNewFolderName )
|
184
|
-
Dim oRegex
|
185
|
-
Set oRegex = New RegExp
|
186
|
-
oRegex.Global = True
|
187
|
-
|
188
|
-
' remove . \ / | : ? * " < >
|
189
|
-
oRegex.Pattern = "(\.|\\|\/|\||:|\?|\*|""|\<|\>)"
|
190
|
-
SanitizeFolderName = oRegex.Replace( sNewFolderName, "_" )
|
191
|
-
|
192
|
-
Set oRegex = Nothing
|
193
|
-
end function
|
194
|
-
|
195
|
-
' Do a cleanup of the file name to avoid possible problems
|
196
|
-
function SanitizeFileName( sNewFileName )
|
197
|
-
Dim oRegex
|
198
|
-
Set oRegex = New RegExp
|
199
|
-
oRegex.Global = True
|
200
|
-
|
201
|
-
if ( ConfigForceSingleExtension = True ) then
|
202
|
-
oRegex.Pattern = "\.(?![^.]*$)"
|
203
|
-
sNewFileName = oRegex.Replace( sNewFileName, "_" )
|
204
|
-
end if
|
205
|
-
|
206
|
-
' remove \ / | : ? * " < >
|
207
|
-
oRegex.Pattern = "(\\|\/|\||:|\?|\*|""|\<|\>)"
|
208
|
-
SanitizeFileName = oRegex.Replace( sNewFileName, "_" )
|
209
|
-
|
210
|
-
Set oRegex = Nothing
|
211
|
-
end function
|
212
|
-
|
213
|
-
' This is the function that sends the results of the uploading process.
|
214
|
-
Sub SendUploadResults( errorNumber, fileUrl, fileName, customMsg )
|
215
|
-
Response.Clear
|
216
|
-
Response.Write "<script type=""text/javascript"">"
|
217
|
-
Response.Write "window.parent.OnUploadCompleted(" & errorNumber & ",""" & Replace( fileUrl, """", "\""" ) & """,""" & Replace( fileName, """", "\""" ) & """,""" & Replace( customMsg , """", "\""" ) & """) ;"
|
218
|
-
Response.Write "</script>"
|
219
|
-
Response.End
|
220
|
-
End Sub
|
221
|
-
|
222
|
-
%>
|