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,93 +0,0 @@
|
|
1
|
-
<?php
|
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
|
-
* These functions define the base of the XML response sent by the PHP
|
23
|
-
* connector.
|
24
|
-
*/
|
25
|
-
|
26
|
-
function SetXmlHeaders()
|
27
|
-
{
|
28
|
-
ob_end_clean() ;
|
29
|
-
|
30
|
-
// Prevent the browser from caching the result.
|
31
|
-
// Date in the past
|
32
|
-
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT') ;
|
33
|
-
// always modified
|
34
|
-
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT') ;
|
35
|
-
// HTTP/1.1
|
36
|
-
header('Cache-Control: no-store, no-cache, must-revalidate') ;
|
37
|
-
header('Cache-Control: post-check=0, pre-check=0', false) ;
|
38
|
-
// HTTP/1.0
|
39
|
-
header('Pragma: no-cache') ;
|
40
|
-
|
41
|
-
// Set the response format.
|
42
|
-
header( 'Content-Type: text/xml; charset=utf-8' ) ;
|
43
|
-
}
|
44
|
-
|
45
|
-
function CreateXmlHeader( $command, $resourceType, $currentFolder )
|
46
|
-
{
|
47
|
-
SetXmlHeaders() ;
|
48
|
-
|
49
|
-
// Create the XML document header.
|
50
|
-
echo '<?xml version="1.0" encoding="utf-8" ?>' ;
|
51
|
-
|
52
|
-
// Create the main "Connector" node.
|
53
|
-
echo '<Connector command="' . $command . '" resourceType="' . $resourceType . '">' ;
|
54
|
-
|
55
|
-
// Add the current folder node.
|
56
|
-
echo '<CurrentFolder path="' . ConvertToXmlAttribute( $currentFolder ) . '" url="' . ConvertToXmlAttribute( GetUrlFromPath( $resourceType, $currentFolder, $command ) ) . '" />' ;
|
57
|
-
|
58
|
-
$GLOBALS['HeaderSent'] = true ;
|
59
|
-
}
|
60
|
-
|
61
|
-
function CreateXmlFooter()
|
62
|
-
{
|
63
|
-
echo '</Connector>' ;
|
64
|
-
}
|
65
|
-
|
66
|
-
function SendError( $number, $text )
|
67
|
-
{
|
68
|
-
if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
|
69
|
-
{
|
70
|
-
SendErrorNode( $number, $text ) ;
|
71
|
-
CreateXmlFooter() ;
|
72
|
-
}
|
73
|
-
else
|
74
|
-
{
|
75
|
-
SetXmlHeaders() ;
|
76
|
-
|
77
|
-
// Create the XML document header
|
78
|
-
echo '<?xml version="1.0" encoding="utf-8" ?>' ;
|
79
|
-
|
80
|
-
echo '<Connector>' ;
|
81
|
-
|
82
|
-
SendErrorNode( $number, $text ) ;
|
83
|
-
|
84
|
-
echo '</Connector>' ;
|
85
|
-
}
|
86
|
-
exit ;
|
87
|
-
}
|
88
|
-
|
89
|
-
function SendErrorNode( $number, $text )
|
90
|
-
{
|
91
|
-
echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
|
92
|
-
}
|
93
|
-
?>
|
@@ -1,245 +0,0 @@
|
|
1
|
-
<?php
|
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 Manager Connector for PHP.
|
23
|
-
*/
|
24
|
-
|
25
|
-
function GetFolders( $resourceType, $currentFolder )
|
26
|
-
{
|
27
|
-
// Map the virtual path to the local server path.
|
28
|
-
$sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'GetFolders' ) ;
|
29
|
-
|
30
|
-
// Array that will hold the folders names.
|
31
|
-
$aFolders = array() ;
|
32
|
-
|
33
|
-
$oCurrentFolder = opendir( $sServerDir ) ;
|
34
|
-
|
35
|
-
while ( $sFile = readdir( $oCurrentFolder ) )
|
36
|
-
{
|
37
|
-
if ( $sFile != '.' && $sFile != '..' && is_dir( $sServerDir . $sFile ) )
|
38
|
-
$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
|
39
|
-
}
|
40
|
-
|
41
|
-
closedir( $oCurrentFolder ) ;
|
42
|
-
|
43
|
-
// Open the "Folders" node.
|
44
|
-
echo "<Folders>" ;
|
45
|
-
|
46
|
-
natcasesort( $aFolders ) ;
|
47
|
-
foreach ( $aFolders as $sFolder )
|
48
|
-
echo $sFolder ;
|
49
|
-
|
50
|
-
// Close the "Folders" node.
|
51
|
-
echo "</Folders>" ;
|
52
|
-
}
|
53
|
-
|
54
|
-
function GetFoldersAndFiles( $resourceType, $currentFolder )
|
55
|
-
{
|
56
|
-
// Map the virtual path to the local server path.
|
57
|
-
$sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'GetFoldersAndFiles' ) ;
|
58
|
-
|
59
|
-
// Arrays that will hold the folders and files names.
|
60
|
-
$aFolders = array() ;
|
61
|
-
$aFiles = array() ;
|
62
|
-
|
63
|
-
$oCurrentFolder = opendir( $sServerDir ) ;
|
64
|
-
|
65
|
-
while ( $sFile = readdir( $oCurrentFolder ) )
|
66
|
-
{
|
67
|
-
if ( $sFile != '.' && $sFile != '..' )
|
68
|
-
{
|
69
|
-
if ( is_dir( $sServerDir . $sFile ) )
|
70
|
-
$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
|
71
|
-
else
|
72
|
-
{
|
73
|
-
$iFileSize = @filesize( $sServerDir . $sFile ) ;
|
74
|
-
if ( !$iFileSize ) {
|
75
|
-
$iFileSize = 0 ;
|
76
|
-
}
|
77
|
-
if ( $iFileSize > 0 )
|
78
|
-
{
|
79
|
-
$iFileSize = round( $iFileSize / 1024 ) ;
|
80
|
-
if ( $iFileSize < 1 ) $iFileSize = 1 ;
|
81
|
-
}
|
82
|
-
|
83
|
-
$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
|
84
|
-
}
|
85
|
-
}
|
86
|
-
}
|
87
|
-
|
88
|
-
// Send the folders
|
89
|
-
natcasesort( $aFolders ) ;
|
90
|
-
echo '<Folders>' ;
|
91
|
-
|
92
|
-
foreach ( $aFolders as $sFolder )
|
93
|
-
echo $sFolder ;
|
94
|
-
|
95
|
-
echo '</Folders>' ;
|
96
|
-
|
97
|
-
// Send the files
|
98
|
-
natcasesort( $aFiles ) ;
|
99
|
-
echo '<Files>' ;
|
100
|
-
|
101
|
-
foreach ( $aFiles as $sFiles )
|
102
|
-
echo $sFiles ;
|
103
|
-
|
104
|
-
echo '</Files>' ;
|
105
|
-
}
|
106
|
-
|
107
|
-
function CreateFolder( $resourceType, $currentFolder )
|
108
|
-
{
|
109
|
-
if (!isset($_GET)) {
|
110
|
-
global $_GET;
|
111
|
-
}
|
112
|
-
$sErrorNumber = '0' ;
|
113
|
-
$sErrorMsg = '' ;
|
114
|
-
|
115
|
-
if ( isset( $_GET['NewFolderName'] ) )
|
116
|
-
{
|
117
|
-
$sNewFolderName = $_GET['NewFolderName'] ;
|
118
|
-
$sNewFolderName = SanitizeFolderName( $sNewFolderName ) ;
|
119
|
-
|
120
|
-
if ( strpos( $sNewFolderName, '..' ) !== FALSE )
|
121
|
-
$sErrorNumber = '102' ; // Invalid folder name.
|
122
|
-
else
|
123
|
-
{
|
124
|
-
// Map the virtual path to the local server path of the current folder.
|
125
|
-
$sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'CreateFolder' ) ;
|
126
|
-
|
127
|
-
if ( is_writable( $sServerDir ) )
|
128
|
-
{
|
129
|
-
$sServerDir .= $sNewFolderName ;
|
130
|
-
|
131
|
-
$sErrorMsg = CreateServerFolder( $sServerDir ) ;
|
132
|
-
|
133
|
-
switch ( $sErrorMsg )
|
134
|
-
{
|
135
|
-
case '' :
|
136
|
-
$sErrorNumber = '0' ;
|
137
|
-
break ;
|
138
|
-
case 'Invalid argument' :
|
139
|
-
case 'No such file or directory' :
|
140
|
-
$sErrorNumber = '102' ; // Path too long.
|
141
|
-
break ;
|
142
|
-
default :
|
143
|
-
$sErrorNumber = '110' ;
|
144
|
-
break ;
|
145
|
-
}
|
146
|
-
}
|
147
|
-
else
|
148
|
-
$sErrorNumber = '103' ;
|
149
|
-
}
|
150
|
-
}
|
151
|
-
else
|
152
|
-
$sErrorNumber = '102' ;
|
153
|
-
|
154
|
-
// Create the "Error" node.
|
155
|
-
echo '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute( $sErrorMsg ) . '" />' ;
|
156
|
-
}
|
157
|
-
|
158
|
-
function FileUpload( $resourceType, $currentFolder, $sCommand )
|
159
|
-
{
|
160
|
-
if (!isset($_FILES)) {
|
161
|
-
global $_FILES;
|
162
|
-
}
|
163
|
-
$sErrorNumber = '0' ;
|
164
|
-
$sFileName = '' ;
|
165
|
-
|
166
|
-
if ( isset( $_FILES['NewFile'] ) && !is_null( $_FILES['NewFile']['tmp_name'] ) )
|
167
|
-
{
|
168
|
-
global $Config ;
|
169
|
-
|
170
|
-
$oFile = $_FILES['NewFile'] ;
|
171
|
-
|
172
|
-
// Map the virtual path to the local server path.
|
173
|
-
$sServerDir = ServerMapFolder( $resourceType, $currentFolder, $sCommand ) ;
|
174
|
-
|
175
|
-
// Get the uploaded file name.
|
176
|
-
$sFileName = $oFile['name'] ;
|
177
|
-
$sFileName = SanitizeFileName( $sFileName ) ;
|
178
|
-
|
179
|
-
$sOriginalFileName = $sFileName ;
|
180
|
-
|
181
|
-
// Get the extension.
|
182
|
-
$sExtension = substr( $sFileName, ( strrpos($sFileName, '.') + 1 ) ) ;
|
183
|
-
$sExtension = strtolower( $sExtension ) ;
|
184
|
-
|
185
|
-
if ( isset( $Config['SecureImageUploads'] ) )
|
186
|
-
{
|
187
|
-
if ( !IsImageValid( $oFile['tmp_name'], $sExtension ) )
|
188
|
-
{
|
189
|
-
$sErrorNumber = '202' ;
|
190
|
-
}
|
191
|
-
}
|
192
|
-
|
193
|
-
if ( isset( $Config['HtmlExtensions'] ) )
|
194
|
-
{
|
195
|
-
if ( !IsHtmlExtension( $sExtension, $Config['HtmlExtensions'] ) && DetectHtml( $oFile['tmp_name'] ) )
|
196
|
-
{
|
197
|
-
$sErrorNumber = '202' ;
|
198
|
-
}
|
199
|
-
}
|
200
|
-
|
201
|
-
// Check if it is an allowed extension.
|
202
|
-
if ( !$sErrorNumber && IsAllowedExt( $sExtension, $resourceType ) )
|
203
|
-
{
|
204
|
-
$iCounter = 0 ;
|
205
|
-
|
206
|
-
while ( true )
|
207
|
-
{
|
208
|
-
$sFilePath = $sServerDir . $sFileName ;
|
209
|
-
|
210
|
-
if ( is_file( $sFilePath ) )
|
211
|
-
{
|
212
|
-
$iCounter++ ;
|
213
|
-
$sFileName = RemoveExtension( $sOriginalFileName ) . '(' . $iCounter . ').' . $sExtension ;
|
214
|
-
$sErrorNumber = '201' ;
|
215
|
-
}
|
216
|
-
else
|
217
|
-
{
|
218
|
-
move_uploaded_file( $oFile['tmp_name'], $sFilePath ) ;
|
219
|
-
|
220
|
-
if ( is_file( $sFilePath ) )
|
221
|
-
{
|
222
|
-
$oldumask = umask(0) ;
|
223
|
-
chmod( $sFilePath, 0777 ) ;
|
224
|
-
umask( $oldumask ) ;
|
225
|
-
}
|
226
|
-
|
227
|
-
break ;
|
228
|
-
}
|
229
|
-
}
|
230
|
-
}
|
231
|
-
else
|
232
|
-
$sErrorNumber = '202' ;
|
233
|
-
}
|
234
|
-
else
|
235
|
-
$sErrorNumber = '202' ;
|
236
|
-
|
237
|
-
|
238
|
-
$sFileUrl = CombinePaths( GetResourceTypePath( $resourceType, $sCommand ) , $currentFolder ) ;
|
239
|
-
$sFileUrl = CombinePaths( $sFileUrl, $sFileName ) ;
|
240
|
-
|
241
|
-
SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName ) ;
|
242
|
-
|
243
|
-
exit ;
|
244
|
-
}
|
245
|
-
?>
|
@@ -1,140 +0,0 @@
|
|
1
|
-
<?php
|
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
|
-
* Configuration file for the File Manager Connector for PHP.
|
23
|
-
*/
|
24
|
-
|
25
|
-
global $Config ;
|
26
|
-
|
27
|
-
// SECURITY: You must explicitelly enable this "connector". (Set it to "true").
|
28
|
-
// WARNING: don't just set "ConfigIsEnabled = true", you must be sure that only
|
29
|
-
// authenticated users can access this file or use some kind of session checking.
|
30
|
-
$Config['Enabled'] = false ;
|
31
|
-
|
32
|
-
|
33
|
-
// Path to user files relative to the document root.
|
34
|
-
$Config['UserFilesPath'] = '/userfiles/' ;
|
35
|
-
|
36
|
-
// Fill the following value it you prefer to specify the absolute path for the
|
37
|
-
// user files directory. Usefull if you are using a virtual directory, symbolic
|
38
|
-
// link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
|
39
|
-
// Attention: The above 'UserFilesPath' must point to the same directory.
|
40
|
-
$Config['UserFilesAbsolutePath'] = '' ;
|
41
|
-
|
42
|
-
// Due to security issues with Apache modules, it is reccomended to leave the
|
43
|
-
// following setting enabled.
|
44
|
-
$Config['ForceSingleExtension'] = true ;
|
45
|
-
|
46
|
-
// Perform additional checks for image files
|
47
|
-
// if set to true, validate image size (using getimagesize)
|
48
|
-
$Config['SecureImageUploads'] = true;
|
49
|
-
|
50
|
-
// What the user can do with this connector
|
51
|
-
$Config['ConfigAllowedCommands'] = array('QuickUpload', 'FileUpload', 'GetFolders', 'GetFoldersAndFiles', 'CreateFolder') ;
|
52
|
-
|
53
|
-
// Allowed Resource Types
|
54
|
-
$Config['ConfigAllowedTypes'] = array('File', 'Image', 'Flash', 'Media') ;
|
55
|
-
|
56
|
-
// For security, HTML is allowed in the first Kb of data for files having the
|
57
|
-
// following extensions only.
|
58
|
-
$Config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js") ;
|
59
|
-
|
60
|
-
/*
|
61
|
-
Configuration settings for each Resource Type
|
62
|
-
|
63
|
-
- AllowedExtensions: the possible extensions that can be allowed.
|
64
|
-
If it is empty then any file type can be uploaded.
|
65
|
-
- DeniedExtensions: The extensions that won't be allowed.
|
66
|
-
If it is empty then no restrictions are done here.
|
67
|
-
|
68
|
-
For a file to be uploaded it has to fullfil both the AllowedExtensions
|
69
|
-
and DeniedExtensions (that's it: not being denied) conditions.
|
70
|
-
|
71
|
-
- FileTypesPath: the virtual folder relative to the document root where
|
72
|
-
these resources will be located.
|
73
|
-
Attention: It must start and end with a slash: '/'
|
74
|
-
|
75
|
-
- FileTypesAbsolutePath: the physical path to the above folder. It must be
|
76
|
-
an absolute path.
|
77
|
-
If it's an empty string then it will be autocalculated.
|
78
|
-
Usefull if you are using a virtual directory, symbolic link or alias.
|
79
|
-
Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
|
80
|
-
Attention: The above 'FileTypesPath' must point to the same directory.
|
81
|
-
Attention: It must end with a slash: '/'
|
82
|
-
|
83
|
-
- QuickUploadPath: the virtual folder relative to the document root where
|
84
|
-
these resources will be uploaded using the Upload tab in the resources
|
85
|
-
dialogs.
|
86
|
-
Attention: It must start and end with a slash: '/'
|
87
|
-
|
88
|
-
- QuickUploadAbsolutePath: the physical path to the above folder. It must be
|
89
|
-
an absolute path.
|
90
|
-
If it's an empty string then it will be autocalculated.
|
91
|
-
Usefull if you are using a virtual directory, symbolic link or alias.
|
92
|
-
Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
|
93
|
-
Attention: The above 'QuickUploadPath' must point to the same directory.
|
94
|
-
Attention: It must end with a slash: '/'
|
95
|
-
|
96
|
-
NOTE: by default, QuickUploadPath and QuickUploadAbsolutePath point to
|
97
|
-
"userfiles" directory to maintain backwards compatibility with older versions of FCKeditor.
|
98
|
-
This is fine, but you in some cases you will be not able to browse uploaded files using file browser.
|
99
|
-
Example: if you clik on "image button", select "Upload" tab and send image
|
100
|
-
to the server, image will appear in FCKeditor correctly, but because it is placed
|
101
|
-
directly in /userfiles/ directory, you'll be not able to see it in built-in file browser.
|
102
|
-
The more expected behaviour would be to send images directly to "image" subfolder.
|
103
|
-
To achieve that, simply change
|
104
|
-
$Config['QuickUploadPath']['Image'] = $Config['UserFilesPath'] ;
|
105
|
-
$Config['QuickUploadAbsolutePath']['Image'] = $Config['UserFilesAbsolutePath'] ;
|
106
|
-
into:
|
107
|
-
$Config['QuickUploadPath']['Image'] = $Config['FileTypesPath']['Image'] ;
|
108
|
-
$Config['QuickUploadAbsolutePath'['Image'] = $Config['FileTypesAbsolutePath']['Image'] ;
|
109
|
-
|
110
|
-
*/
|
111
|
-
|
112
|
-
$Config['AllowedExtensions']['File'] = array('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') ;
|
113
|
-
$Config['DeniedExtensions']['File'] = array() ;
|
114
|
-
$Config['FileTypesPath']['File'] = $Config['UserFilesPath'] . 'file/' ;
|
115
|
-
$Config['FileTypesAbsolutePath']['File']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/' ;
|
116
|
-
$Config['QuickUploadPath']['File'] = $Config['UserFilesPath'] ;
|
117
|
-
$Config['QuickUploadAbsolutePath']['File']= $Config['UserFilesAbsolutePath'] ;
|
118
|
-
|
119
|
-
$Config['AllowedExtensions']['Image'] = array('bmp','gif','jpeg','jpg','png','psd','tif','tiff') ;
|
120
|
-
$Config['DeniedExtensions']['Image'] = array() ;
|
121
|
-
$Config['FileTypesPath']['Image'] = $Config['UserFilesPath'] . 'image/' ;
|
122
|
-
$Config['FileTypesAbsolutePath']['Image']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/' ;
|
123
|
-
$Config['QuickUploadPath']['Image'] = $Config['UserFilesPath'] ;
|
124
|
-
$Config['QuickUploadAbsolutePath']['Image']= $Config['UserFilesAbsolutePath'] ;
|
125
|
-
|
126
|
-
$Config['AllowedExtensions']['Flash'] = array('swf','fla') ;
|
127
|
-
$Config['DeniedExtensions']['Flash'] = array() ;
|
128
|
-
$Config['FileTypesPath']['Flash'] = $Config['UserFilesPath'] . 'flash/' ;
|
129
|
-
$Config['FileTypesAbsolutePath']['Flash']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'flash/' ;
|
130
|
-
$Config['QuickUploadPath']['Flash'] = $Config['UserFilesPath'] ;
|
131
|
-
$Config['QuickUploadAbsolutePath']['Flash']= $Config['UserFilesAbsolutePath'] ;
|
132
|
-
|
133
|
-
$Config['AllowedExtensions']['Media'] = array('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') ;
|
134
|
-
$Config['DeniedExtensions']['Media'] = array() ;
|
135
|
-
$Config['FileTypesPath']['Media'] = $Config['UserFilesPath'] . 'media/' ;
|
136
|
-
$Config['FileTypesAbsolutePath']['Media']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'media/' ;
|
137
|
-
$Config['QuickUploadPath']['Media'] = $Config['UserFilesPath'] ;
|
138
|
-
$Config['QuickUploadAbsolutePath']['Media']= $Config['UserFilesAbsolutePath'] ;
|
139
|
-
|
140
|
-
?>
|