Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/blocks.tpl =================================================================== diff -u -r7009 -r7068 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/blocks.tpl (.../blocks.tpl) (revision 7009) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/blocks.tpl (.../blocks.tpl) (revision 7068) @@ -1,11 +1,11 @@ - + - -

" name="" enctype="multipart/form-data" method="post" action=""> + + " id="" name="" enctype="multipart/form-data" method="post" action=""> " /> Index: branches/unlabeled/unlabeled-1.10.2/admin/editor/cmseditor/editor/filemanager/browser/default/frmupload.html =================================================================== diff -u -r5297 -r7068 --- branches/unlabeled/unlabeled-1.10.2/admin/editor/cmseditor/editor/filemanager/browser/default/frmupload.html (.../frmupload.html) (revision 5297) +++ branches/unlabeled/unlabeled-1.10.2/admin/editor/cmseditor/editor/filemanager/browser/default/frmupload.html (.../frmupload.html) (revision 7068) @@ -132,10 +132,24 @@ } } - +function UploadNewFile() +{ + + var file_name = document.frmUpload.elements['NewFile'].value; + if (file_name.length > 0) { + + var ret = window.parent.frames['frmResourcesList'].ValidateFileName(file_name); + if (!ret) + return false; + else + document.frmUpload.submit(); + } return false; +} + + - +

@@ -144,7 +158,7 @@ - +

Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/inp_styles.xml =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/inp_styles.xml (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/inp_styles.xml (revision 7068) @@ -0,0 +1,29 @@ + + + + + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r7037 -r7068 --- branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7037) +++ branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7068) @@ -756,7 +756,7 @@ { $object =& $this->getObject($params); /* @var $object kDBList */ - + $field = $params['field']; $saved_value = $object->Queried ? $object->GetDBField($field) : null; @@ -1720,9 +1720,9 @@ $oFCKeditor->Config = Array( //'UserFilesPath' => $pathtoroot.'kernel/user_files', 'ProjectPath' => BASE_PATH.'/', - 'CustomConfigurationsPath' => $this->Application->BaseURL().'core/cmseditor/inp_fckconfig.js', + 'CustomConfigurationsPath' => $this->Application->BaseURL().'core/admin_templates/js/inp_fckconfig.js', // 'EditorAreaCSS' => $this->Application->BaseURL().'/themes/inportal_site/inc/inportal.css', //GetThemeCSS(), - //'StylesXmlPath' => '../../inp_styles.xml', + 'StylesXmlPath' => $this->Application->BaseURL().'core/admin_templates/js/inp_styles.xml', // 'Debug' => 1, 'Admin' => 1, 'K4' => 1, Index: branches/unlabeled/unlabeled-1.22.2/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html =================================================================== diff -u -r5056 -r7068 --- branches/unlabeled/unlabeled-1.22.2/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html (.../frmresourceslist.html) (revision 5056) +++ branches/unlabeled/unlabeled-1.22.2/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html (.../frmresourceslist.html) (revision 7068) @@ -194,14 +194,18 @@ document.getElementById("context_menu").style.display = "none"; } -function RenameFromContextMenu() { - file_name = document.getElementById("context_menu_file").value; +function RenameFromContextMenu(old_name) { + if (old_name) + file_name = old_name; + else + file_name = document.getElementById("context_menu_file").value; f=prompt('Rename file "'+file_name+'"?',file_name); if (f) { RenameFile(file_name,f); } } + function DeleteFromContextMenu() { file_name = document.getElementById("context_menu_file").value; f=confirm('Delete file "'+file_name+'"?',file_name); @@ -241,9 +245,29 @@ window.top.opener.focus() ; } + +function ValidateFileName(file_name) +{ + var sp = file_name.replace(/\\/g, '\/'); + sp=sp.split("/"); + file_name = sp[sp.length-1]; + var re = /^([\/a-zA-Z0-9_\.-]+)$/ + + if (!re.test(file_name)) { + alert('Please name your files to be web-friendly. We recommend using only these characters in file names:'+"\n"+ + 'Letters a-z, A-Z, Numbers 0-9, "_" (underscore), "-" (dash), " " (space), "." (period)'+"\n"+ + 'Please avoid using any other characters like quotes, brackets, quotation marks, "?", "!", "=", foreign symbols, etc.'); + return false; + } else + return true; +} + function RenameFile(old_name,new_name) { - oConnector.SendCommand( 'RenameFile_'+old_name+'|'+new_name, null, RenameCallBack ); + if (ValidateFileName(new_name)) + oConnector.SendCommand( 'RenameFile_'+old_name+'|'+new_name, null, RenameCallBack ); + else + RenameFromContextMenu(old_name); } function DeleteFiles(confirm) Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/inp_fckconfig.js =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/inp_fckconfig.js (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/inp_fckconfig.js (revision 7068) @@ -0,0 +1,114 @@ +/* + * Edited by Kostja + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2004 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * File Name: fckconfig.js + * Editor configuration settings. + * See the documentation for more info. + * + * Version: 2.0 RC3 + * Modified: 2005-02-27 21:31:48 + * + * File Authors: + * Frederico Caldeira Knabben (fredck@fckeditor.net) +*/ + +//FCKConfig.CustomConfigurationsPath = '' ; + +//FCKConfig.EditorAreaCSS = FCKConfig.ProjectPath + 'themes/inportal_site/inc/inportal.css' ; + +FCKConfig.BaseHref = '' ; + +FCKConfig.FullPage = false ; + +FCKConfig.Debug = false ; + +FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ; + +FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; + +// FCKConfig.Plugins.Add( 'placeholder', 'en,it' ) ; + +FCKConfig.AutoDetectLanguage = true ; +FCKConfig.DefaultLanguage = 'en' ; +FCKConfig.ContentLangDirection = 'ltr' ; + +FCKConfig.EnableXHTML = true ; +FCKConfig.EnableSourceXHTML = true ; +FCKConfig.FillEmptyBlocks = true ; +FCKConfig.FormatSource = true ; +FCKConfig.FormatOutput = true ; +FCKConfig.FormatIndentator = ' ' ; +FCKConfig.GeckoUseSPAN = true ; +FCKConfig.StartupFocus = false ; +FCKConfig.ForcePasteAsPlainText = true ; +FCKConfig.ForceSimpleAmpersand = false ; +FCKConfig.TabSpaces = 0; +FCKConfig.ShowBorders = true; +FCKConfig.ShowTableBorders = true; +FCKConfig.UseBROnCarriageReturn = false ; +FCKConfig.ToolbarStartExpanded = true ; +FCKConfig.ToolbarCanCollapse = true ; +//FCKConfig.ProjectPath = FCKConfig.BasePath.replace(/\/cmseditor\/editor\/$/,''); +FCKConfig.IconImagesUrl = FCKConfig.ProjectPath+'kernel/user_files/icons'; + + +FCKConfig.ToolbarSets["Default"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','NewPage','SelectAll','-','Link','Unlink','Anchor','-','Image','SpecialChar','-','Find','Replace','-','Rule'], + ['Source'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent'], + '/', + ['Style','RemoveFormat'] +] ; +FCKConfig.ToolbarSets["Advanced"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + +FCKConfig.ToolbarSets["Basic"] = [ + ['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About'] +] ; +FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Select','Document','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ; +FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ; +FCKConfig.FontNames = 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ; +FCKConfig.FontSizes = '1/xx-small;2/x-small;3/small;4/medium;5/large;6/x-large;7/xx-large' ; +FCKConfig.FontFormats = 'p;div;pre;address;h1;h2;h3;h4;h5;h6' ; +//FCKConfig.StylesXmlPath = '../../inp_styles.xml' ; +FCKConfig.SpellChecker = 'ieSpell' ; // 'ieSpell' | 'SpellerPages' +FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ; +FCKConfig.LinkBrowser = true ; +FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files' ; +FCKConfig.LinkBrowserWindowWidth = screen.width * 0.7 ; // 70% +FCKConfig.LinkBrowserWindowHeight = screen.height * 0.7 ; // 70% +FCKConfig.ImageBrowser = true ; +FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Images&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files' ; +FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; +FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; +FCKConfig.DocumentBrowser = true ; +FCKConfig.DocumentBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Documents&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files' ; +FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; +FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; +FCKConfig.DocumentsServerPath = FCKConfig.ProjectPath+'kernel/user_files/Documents' +FCKConfig.StructureBrowser = true ; +FCKConfig.StructureBrowserURL = FCKConfig.ProjectPath+'/admin/index.php?t=structure/tree' ; +FCKConfig.StructureBrowserWindowWidth = screen.width * 0.5 ; // 50% +FCKConfig.StructureBrowserWindowHeight = screen.height * 0.7 ; // 70% +FCKConfig.FilesBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Files&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files/' ; +FCKConfig.SmileyPath = FCKConfig.BasePath + 'images/smiley/msn/' ; +FCKConfig.SmileyImages = ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ; +FCKConfig.SmileyColumns = 8 ; +FCKConfig.SmileyWindowWidth = 320 ; +FCKConfig.SmileyWindowHeight = 240 ; + +FCKConfig.K4Mode = 1; \ No newline at end of file