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,65 +0,0 @@
|
|
1
|
-
[//lasso
|
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 Lasso.
|
23
|
-
*/
|
24
|
-
|
25
|
-
/*.....................................................................
|
26
|
-
The connector uses the file tags, which require authentication. Enter a
|
27
|
-
valid username and password from Lasso admin for a group with file tags
|
28
|
-
permissions for uploads and the path you define in UserFilesPath below.
|
29
|
-
*/
|
30
|
-
|
31
|
-
var('connection') = array(
|
32
|
-
-username='xxxxxxxx',
|
33
|
-
-password='xxxxxxxx'
|
34
|
-
);
|
35
|
-
|
36
|
-
|
37
|
-
/*.....................................................................
|
38
|
-
Set the base path for files that users can upload and browse (relative
|
39
|
-
to server root).
|
40
|
-
|
41
|
-
Set which file extensions are allowed and/or denied for each file type.
|
42
|
-
*/
|
43
|
-
var('config') = map(
|
44
|
-
'Enabled' = false,
|
45
|
-
'UserFilesPath' = '/userfiles/',
|
46
|
-
'Subdirectories' = map(
|
47
|
-
'File' = 'File/',
|
48
|
-
'Image' = 'Image/',
|
49
|
-
'Flash' = 'Flash/',
|
50
|
-
'Media' = 'Media/'
|
51
|
-
),
|
52
|
-
'AllowedExtensions' = map(
|
53
|
-
'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'),
|
54
|
-
'Image' = array('bmp','gif','jpeg','jpg','png','psd','tif','tiff'),
|
55
|
-
'Flash' = array('swf','fla'),
|
56
|
-
'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')
|
57
|
-
),
|
58
|
-
'DeniedExtensions' = map(
|
59
|
-
'File' = array(),
|
60
|
-
'Image' = array(),
|
61
|
-
'Flash' = array(),
|
62
|
-
'Media' = array()
|
63
|
-
)
|
64
|
-
);
|
65
|
-
]
|
@@ -1,257 +0,0 @@
|
|
1
|
-
[//lasso
|
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 Lasso.
|
23
|
-
*/
|
24
|
-
|
25
|
-
/*.....................................................................
|
26
|
-
Include global configuration. See config.lasso for details.
|
27
|
-
*/
|
28
|
-
include('config.lasso');
|
29
|
-
|
30
|
-
|
31
|
-
/*.....................................................................
|
32
|
-
Translate current date/time to GMT for custom header.
|
33
|
-
*/
|
34
|
-
var('headerDate') = date_localtogmt(date)->format('%a, %d %b %Y %T GMT');
|
35
|
-
|
36
|
-
|
37
|
-
/*.....................................................................
|
38
|
-
Convert query string parameters to variables and initialize output.
|
39
|
-
*/
|
40
|
-
var(
|
41
|
-
'Command' = action_param('Command'),
|
42
|
-
'Type' = action_param('Type'),
|
43
|
-
'CurrentFolder' = action_param('CurrentFolder'),
|
44
|
-
'ServerPath' = action_param('ServerPath'),
|
45
|
-
'NewFolderName' = action_param('NewFolderName'),
|
46
|
-
'NewFile' = null,
|
47
|
-
'NewFileName' = string,
|
48
|
-
'OrigFilePath' = string,
|
49
|
-
'NewFilePath' = string,
|
50
|
-
'commandData' = string,
|
51
|
-
'folders' = '\t<Folders>\n',
|
52
|
-
'files' = '\t<Files>\n',
|
53
|
-
'errorNumber' = integer,
|
54
|
-
'responseType' = 'xml',
|
55
|
-
'uploadResult' = '0'
|
56
|
-
);
|
57
|
-
|
58
|
-
|
59
|
-
/*.....................................................................
|
60
|
-
Calculate the path to the current folder.
|
61
|
-
*/
|
62
|
-
$ServerPath == '' ? $ServerPath = $config->find('UserFilesPath');
|
63
|
-
|
64
|
-
var('currentFolderURL' = $ServerPath
|
65
|
-
+ $config->find('Subdirectories')->find(action_param('Type'))
|
66
|
-
+ action_param('CurrentFolder')
|
67
|
-
);
|
68
|
-
|
69
|
-
|
70
|
-
/*.....................................................................
|
71
|
-
Build the appropriate response per the 'Command' parameter. Wrap the
|
72
|
-
entire process in an inline for file tag permissions.
|
73
|
-
*/
|
74
|
-
inline($connection);
|
75
|
-
select($Command);
|
76
|
-
/*.............................................................
|
77
|
-
List all subdirectories in the 'Current Folder' directory.
|
78
|
-
*/
|
79
|
-
case('GetFolders');
|
80
|
-
$commandData += '\t<Folders>\n';
|
81
|
-
|
82
|
-
iterate(file_listdirectory($currentFolderURL), local('this'));
|
83
|
-
#this->endswith('/') ? $commandData += '\t\t<Folder name="' + #this->removetrailing('/')& + '" />\n';
|
84
|
-
/iterate;
|
85
|
-
|
86
|
-
$commandData += '\t</Folders>\n';
|
87
|
-
|
88
|
-
|
89
|
-
/*.............................................................
|
90
|
-
List both files and folders in the 'Current Folder' directory.
|
91
|
-
Include the file sizes in kilobytes.
|
92
|
-
*/
|
93
|
-
case('GetFoldersAndFiles');
|
94
|
-
iterate(file_listdirectory($currentFolderURL), local('this'));
|
95
|
-
if(#this->endswith('/'));
|
96
|
-
$folders += '\t\t<Folder name="' + #this->removetrailing('/')& + '" />\n';
|
97
|
-
else;
|
98
|
-
local('size') = file_getsize($currentFolderURL + #this) / 1024;
|
99
|
-
$files += '\t\t<File name="' + #this + '" size="' + #size + '" />\n';
|
100
|
-
/if;
|
101
|
-
/iterate;
|
102
|
-
|
103
|
-
$folders += '\t</Folders>\n';
|
104
|
-
$files += '\t</Files>\n';
|
105
|
-
|
106
|
-
$commandData += $folders + $files;
|
107
|
-
|
108
|
-
|
109
|
-
/*.............................................................
|
110
|
-
Create a directory 'NewFolderName' within the 'Current Folder.'
|
111
|
-
*/
|
112
|
-
case('CreateFolder');
|
113
|
-
var('newFolder' = $currentFolderURL + $NewFolderName + '/');
|
114
|
-
file_create($newFolder);
|
115
|
-
|
116
|
-
|
117
|
-
/*.........................................................
|
118
|
-
Map Lasso's file error codes to FCKEditor's error codes.
|
119
|
-
*/
|
120
|
-
select(file_currenterror( -errorcode));
|
121
|
-
case(0);
|
122
|
-
$errorNumber = 0;
|
123
|
-
case( -9983);
|
124
|
-
$errorNumber = 101;
|
125
|
-
case( -9976);
|
126
|
-
$errorNumber = 102;
|
127
|
-
case( -9977);
|
128
|
-
$errorNumber = 102;
|
129
|
-
case( -9961);
|
130
|
-
$errorNumber = 103;
|
131
|
-
case;
|
132
|
-
$errorNumber = 110;
|
133
|
-
/select;
|
134
|
-
|
135
|
-
$commandData += '<Error number="' + $errorNumber + '" />\n';
|
136
|
-
|
137
|
-
|
138
|
-
/*.............................................................
|
139
|
-
Process an uploaded file.
|
140
|
-
*/
|
141
|
-
case('FileUpload');
|
142
|
-
/*.........................................................
|
143
|
-
This is the only command that returns an HTML response.
|
144
|
-
*/
|
145
|
-
$responseType = 'html';
|
146
|
-
|
147
|
-
|
148
|
-
/*.........................................................
|
149
|
-
Was a file actually uploaded?
|
150
|
-
*/
|
151
|
-
file_uploads->size ? $NewFile = file_uploads->get(1) | $uploadResult = '202';
|
152
|
-
|
153
|
-
if($uploadResult == '0');
|
154
|
-
/*.....................................................
|
155
|
-
Split the file's extension from the filename in order
|
156
|
-
to follow the API's naming convention for duplicate
|
157
|
-
files. (Test.txt, Test(1).txt, Test(2).txt, etc.)
|
158
|
-
*/
|
159
|
-
$NewFileName = $NewFile->find('OrigName');
|
160
|
-
$OrigFilePath = $currentFolderURL + $NewFileName;
|
161
|
-
$NewFilePath = $OrigFilePath;
|
162
|
-
local('fileExtension') = '.' + $NewFile->find('OrigExtension');
|
163
|
-
local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&;
|
164
|
-
|
165
|
-
|
166
|
-
/*.....................................................
|
167
|
-
Make sure the file extension is allowed.
|
168
|
-
*/
|
169
|
-
if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension'));
|
170
|
-
$uploadResult = '202';
|
171
|
-
else;
|
172
|
-
/*.................................................
|
173
|
-
Rename the target path until it is unique.
|
174
|
-
*/
|
175
|
-
while(file_exists($NewFilePath));
|
176
|
-
$NewFilePath = $currentFolderURL + #shortFileName + '(' + loop_count + ')' + #fileExtension;
|
177
|
-
/while;
|
178
|
-
|
179
|
-
|
180
|
-
/*.................................................
|
181
|
-
Copy the uploaded file to its final location.
|
182
|
-
*/
|
183
|
-
file_copy($NewFile->find('path'), $NewFilePath);
|
184
|
-
|
185
|
-
|
186
|
-
/*.................................................
|
187
|
-
Set the error code for the response. Note whether
|
188
|
-
the file had to be renamed.
|
189
|
-
*/
|
190
|
-
select(file_currenterror( -errorcode));
|
191
|
-
case(0);
|
192
|
-
$OrigFilePath != $NewFilePath ? $uploadResult = 201;
|
193
|
-
case;
|
194
|
-
$uploadResult = '202';
|
195
|
-
/select;
|
196
|
-
/if;
|
197
|
-
/if;
|
198
|
-
|
199
|
-
|
200
|
-
/*.........................................................
|
201
|
-
Set the HTML response.
|
202
|
-
*/
|
203
|
-
if($uploadResult == '0' || $uploadResult == '201');
|
204
|
-
$__html_reply__ = '\
|
205
|
-
<script type="text/javascript">
|
206
|
-
window.parent.frames[\'frmUpload\'].OnUploadCompleted(' + $uploadResult + ',\'' + $NewFilePath + '\',\'' + $NewFilePath->split('/')->last + '\');
|
207
|
-
</script>
|
208
|
-
';
|
209
|
-
else;
|
210
|
-
$__html_reply__ = '\
|
211
|
-
<script type="text/javascript">
|
212
|
-
window.parent.frames[\'frmUpload\'].OnUploadCompleted(' + $uploadResult + ');
|
213
|
-
</script>
|
214
|
-
';
|
215
|
-
/if;
|
216
|
-
/select;
|
217
|
-
/inline;
|
218
|
-
|
219
|
-
|
220
|
-
/*.....................................................................
|
221
|
-
Send a custom header for xml responses.
|
222
|
-
*/
|
223
|
-
if($responseType == 'xml');
|
224
|
-
header;
|
225
|
-
]
|
226
|
-
HTTP/1.0 200 OK
|
227
|
-
Date: [$headerDate]
|
228
|
-
Server: Lasso Professional [lasso_version( -lassoversion)]
|
229
|
-
Expires: Mon, 26 Jul 1997 05:00:00 GMT
|
230
|
-
Last-Modified: [$headerDate]
|
231
|
-
Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
|
232
|
-
Pragma: no-cache
|
233
|
-
Keep-Alive: timeout=15, max=98
|
234
|
-
Connection: Keep-Alive
|
235
|
-
Content-Type: text/xml; charset=utf-8
|
236
|
-
[//lasso
|
237
|
-
/header;
|
238
|
-
|
239
|
-
|
240
|
-
/*.................................................................
|
241
|
-
Set the content type encoding for Lasso.
|
242
|
-
*/
|
243
|
-
content_type('text/xml; charset=utf-8');
|
244
|
-
|
245
|
-
|
246
|
-
/*.................................................................
|
247
|
-
Wrap the response as XML and output.
|
248
|
-
*/
|
249
|
-
$__html_reply__ = '\
|
250
|
-
<?xml version="1.0" encoding="utf-8" ?>
|
251
|
-
<Connector command="' + $Command + '" resourceType="' + $Type + '">
|
252
|
-
<CurrentFolder path="' + $CurrentFolder + '" url="' + $currentFolderURL + '" />
|
253
|
-
' + $commandData + '
|
254
|
-
</Connector>
|
255
|
-
';
|
256
|
-
/if;
|
257
|
-
]
|
@@ -1,157 +0,0 @@
|
|
1
|
-
[//lasso
|
2
|
-
/*
|
3
|
-
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
4
|
-
* Copyright (C) 2003-2007 Frederico Caldeira Knabben
|
5
|
-
*
|
6
|
-
* == BEGIN LICENSE ==
|
7
|
-
*
|
8
|
-
* Licensed under the terms of any of the following licenses at your
|
9
|
-
* choice:
|
10
|
-
*
|
11
|
-
* - GNU General Public License Version 2 or later (the "GPL")
|
12
|
-
* http://www.gnu.org/licenses/gpl.html
|
13
|
-
*
|
14
|
-
* - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
|
15
|
-
* http://www.gnu.org/licenses/lgpl.html
|
16
|
-
*
|
17
|
-
* - Mozilla Public License Version 1.1 or later (the "MPL")
|
18
|
-
* http://www.mozilla.org/MPL/MPL-1.1.html
|
19
|
-
*
|
20
|
-
* == END LICENSE ==
|
21
|
-
*
|
22
|
-
* This is the "File Uploader" for Lasso.
|
23
|
-
*/
|
24
|
-
|
25
|
-
/*.....................................................................
|
26
|
-
Include global configuration. See config.lasso for details.
|
27
|
-
*/
|
28
|
-
include('config.lasso');
|
29
|
-
|
30
|
-
|
31
|
-
/*.....................................................................
|
32
|
-
Convert query string parameters to variables and initialize output.
|
33
|
-
*/
|
34
|
-
var(
|
35
|
-
'Type' = action_param('Type'),
|
36
|
-
'CurrentFolder' = action_param('CurrentFolder'),
|
37
|
-
'ServerPath' = action_param('ServerPath'),
|
38
|
-
'NewFile' = null,
|
39
|
-
'NewFileName' = string,
|
40
|
-
'OrigFilePath' = string,
|
41
|
-
'NewFilePath' = string,
|
42
|
-
'errorNumber' = 0,
|
43
|
-
'customMsg' = ''
|
44
|
-
);
|
45
|
-
|
46
|
-
$Type == '' ? $Type = 'File';
|
47
|
-
|
48
|
-
|
49
|
-
/*.....................................................................
|
50
|
-
Calculate the path to the current folder.
|
51
|
-
*/
|
52
|
-
$ServerPath == '' ? $ServerPath = $config->find('UserFilesPath');
|
53
|
-
|
54
|
-
var('currentFolderURL' = $ServerPath
|
55
|
-
+ $config->find('Subdirectories')->find(action_param('Type'))
|
56
|
-
+ action_param('CurrentFolder')
|
57
|
-
);
|
58
|
-
|
59
|
-
|
60
|
-
/*.....................................................................
|
61
|
-
Custom tag sets the HTML response.
|
62
|
-
*/
|
63
|
-
|
64
|
-
define_tag(
|
65
|
-
'sendresults',
|
66
|
-
-namespace='fck_',
|
67
|
-
-priority='replace',
|
68
|
-
-required='errorNumber',
|
69
|
-
-type='integer',
|
70
|
-
-optional='fileUrl',
|
71
|
-
-type='string',
|
72
|
-
-optional='fileName',
|
73
|
-
-type='string',
|
74
|
-
-optional='customMsg',
|
75
|
-
-type='string',
|
76
|
-
-description='Sets the HTML response for the FCKEditor Quick Upload feature.'
|
77
|
-
);
|
78
|
-
$__html_reply__ = '\
|
79
|
-
<script type="text/javascript">
|
80
|
-
window.parent.OnUploadCompleted(' + #errorNumber + ',"'
|
81
|
-
+ string_replace(#fileUrl, -find='"', -replace='\\"') + '","'
|
82
|
-
+ string_replace(#fileName, -find='"', -replace='\\"') + '","'
|
83
|
-
+ string_replace(#customMsg, -find='"', -replace='\\"') + '");
|
84
|
-
</script>
|
85
|
-
';
|
86
|
-
/define_tag;
|
87
|
-
|
88
|
-
|
89
|
-
if($config->find('Enabled'));
|
90
|
-
/*.................................................................
|
91
|
-
Process an uploaded file.
|
92
|
-
*/
|
93
|
-
inline($connection);
|
94
|
-
/*.............................................................
|
95
|
-
Was a file actually uploaded?
|
96
|
-
*/
|
97
|
-
file_uploads->size ? $NewFile = file_uploads->get(1) | $errorNumber = 202;
|
98
|
-
|
99
|
-
if($errorNumber == 0);
|
100
|
-
/*.........................................................
|
101
|
-
Split the file's extension from the filename in order
|
102
|
-
to follow the API's naming convention for duplicate
|
103
|
-
files. (Test.txt, Test(1).txt, Test(2).txt, etc.)
|
104
|
-
*/
|
105
|
-
$NewFileName = $NewFile->find('OrigName');
|
106
|
-
$OrigFilePath = $currentFolderURL + $NewFileName;
|
107
|
-
$NewFilePath = $OrigFilePath;
|
108
|
-
local('fileExtension') = '.' + $NewFile->find('OrigExtension');
|
109
|
-
local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&;
|
110
|
-
|
111
|
-
|
112
|
-
/*.........................................................
|
113
|
-
Make sure the file extension is allowed.
|
114
|
-
*/
|
115
|
-
|
116
|
-
if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension'));
|
117
|
-
$errorNumber = 202;
|
118
|
-
else;
|
119
|
-
/*.....................................................
|
120
|
-
Rename the target path until it is unique.
|
121
|
-
*/
|
122
|
-
while(file_exists($NewFilePath));
|
123
|
-
$NewFileName = #shortFileName + '(' + loop_count + ')' + #fileExtension;
|
124
|
-
$NewFilePath = $currentFolderURL + $NewFileName;
|
125
|
-
/while;
|
126
|
-
|
127
|
-
|
128
|
-
/*.....................................................
|
129
|
-
Copy the uploaded file to its final location.
|
130
|
-
*/
|
131
|
-
file_copy($NewFile->find('path'), $NewFilePath);
|
132
|
-
|
133
|
-
|
134
|
-
/*.....................................................
|
135
|
-
Set the error code for the response.
|
136
|
-
*/
|
137
|
-
select(file_currenterror( -errorcode));
|
138
|
-
case(0);
|
139
|
-
$OrigFilePath != $NewFilePath ? $errorNumber = 201;
|
140
|
-
case;
|
141
|
-
$errorNumber = 202;
|
142
|
-
/select;
|
143
|
-
/if;
|
144
|
-
/if;
|
145
|
-
/inline;
|
146
|
-
else;
|
147
|
-
$errorNumber = 1;
|
148
|
-
$customMsg = 'This file uploader is disabled. Please check the "editor/filemanager/upload/lasso/config.lasso" file.';
|
149
|
-
/if;
|
150
|
-
|
151
|
-
fck_sendresults(
|
152
|
-
-errorNumber=$errorNumber,
|
153
|
-
-fileUrl=$NewFilePath,
|
154
|
-
-fileName=$NewFileName,
|
155
|
-
-customMsg=$customMsg
|
156
|
-
);
|
157
|
-
]
|