diff --git a/gulliver/system/class.wysiwygEditor.php b/gulliver/system/class.wysiwygEditor.php index 7b9baaef5..12eed86f0 100644 --- a/gulliver/system/class.wysiwygEditor.php +++ b/gulliver/system/class.wysiwygEditor.php @@ -85,23 +85,22 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field var actualCaretPositionBookmark; var formProcessID = document.getElementById("form[pro_uid]").value; tinyMCE.init({ - theme : "advanced", - plugins : "advhr,advimage,advlink,advlist,autolink,autoresize,contextmenu,directionality,emotions,example,example_dependency,fullpage,fullscreen,iespell,inlinepopups,insertdatetime,layer,legacyoutput,lists,media,nonbreaking,noneditable,pagebreak,paste,preview,print,save,searchreplace,style,tabfocus,table,template,visualblocks,visualchars,wordcount,xhtmlxtras,pmSimpleUploader,pmVariablePicker,style", - mode : "specific_textareas", - editor_selector : "tmceEditor", - width : "760", - height : "'.$this->height.'", + theme: "advanced", + plugins: "advhr,advimage,advlink,advlist,autolink,autoresize,contextmenu,directionality,emotions,example,example_dependency,fullpage,fullscreen,iespell,inlinepopups,insertdatetime,layer,legacyoutput,lists,media,nonbreaking,noneditable,pagebreak,paste,preview,print,save,searchreplace,style,tabfocus,table,template,visualblocks,visualchars,wordcount,xhtmlxtras,pmSimpleUploader,pmVariablePicker,pmGrids,style", + mode: "specific_textareas", + editor_selector: "tmceEditor", + width: "770", + height: "' . $this->height . '", directionality: "' . ($serverConf->isRtl(SYS_LANG) ? 'rtl' : 'ltr') . '", - - theme_advanced_buttons1 : "pmSimpleUploader,|,pmVariablePicker,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect,|,cut,copy,paste,|,bullist,numlist,|,outdent,indent,blockquote", - theme_advanced_buttons2 : "tablecontrols,|,undo,redo,|,link,unlink,image,|,forecolor,backcolor,styleprops,|,hr,removeformat,visualaid,|,sub,sup,|,ltr,rtl,|,code", + verify_html: false, + theme_advanced_buttons1: "pmSimpleUploader,|,pmVariablePicker,|,pmGrids,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect,|,cut,copy,paste,|,bullist,numlist,|,outdent,indent,blockquote", + theme_advanced_buttons2: "tablecontrols,|,undo,redo,|,link,unlink,image,|,forecolor,backcolor,styleprops,|,hr,removeformat,visualaid,|,sub,sup,|,ltr,rtl,|,code", popup_css : "/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css", skin : "o2k7", skin_variant : "silver", oninit: function (){ tinyMCE.activeEditor.processID = formProcessID; tinyMCE.activeEditor.domainURL = domainURL; - }, onchange_callback: function(inst) { if(inst.isDirty()) { @@ -123,16 +122,16 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field // is necessary the process uid variable in order to load the picker correctly var formProcessID = document.getElementById("form[PRO_UID]").value; tinyMCE.init({ - theme : "advanced", - plugins : "advhr,advimage,advlink,advlist,autolink,autoresize,contextmenu,directionality,emotions,example,example_dependency,fullpage,fullscreen,iespell,inlinepopups,insertdatetime,layer,legacyoutput,lists,media,nonbreaking,noneditable,pagebreak,paste,preview,print,save,searchreplace,style,tabfocus,table,template,visualblocks,visualchars,wordcount,xhtmlxtras,pmSimpleUploader,pmVariablePicker,pmGrids,style", - mode : "specific_textareas", - editor_selector : "tmceEditor", - width : "770", - height : "305", + theme: "advanced", + plugins: "advhr,advimage,advlink,advlist,autolink,autoresize,contextmenu,directionality,emotions,example,example_dependency,fullpage,fullscreen,iespell,inlinepopups,insertdatetime,layer,legacyoutput,lists,media,nonbreaking,noneditable,pagebreak,paste,preview,print,save,searchreplace,style,tabfocus,table,template,visualblocks,visualchars,wordcount,xhtmlxtras,pmSimpleUploader,pmVariablePicker,pmGrids,style", + mode: "specific_textareas", + editor_selector: "tmceEditor", + width: "770", + height: "305", directionality: "' . ($serverConf->isRtl(SYS_LANG) ? 'rtl' : 'ltr') . '", - verify_html : false, - theme_advanced_buttons1 : "pmSimpleUploader,|,pmVariablePicker,|,pmGrids,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect,|,cut,copy,paste,|,bullist,numlist,|,outdent,indent,blockquote", - theme_advanced_buttons2 : "tablecontrols,|,undo,redo,|,link,unlink,image,|,forecolor,backcolor,styleprops,|,hr,removeformat,visualaid,|,sub,sup,|,ltr,rtl,|,code", + verify_html: false, + theme_advanced_buttons1: "pmSimpleUploader,|,pmVariablePicker,|,pmGrids,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect,|,cut,copy,paste,|,bullist,numlist,|,outdent,indent,blockquote", + theme_advanced_buttons2: "tablecontrols,|,undo,redo,|,link,unlink,image,|,forecolor,backcolor,styleprops,|,hr,removeformat,visualaid,|,sub,sup,|,ltr,rtl,|,code", popup_css : "/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css", skin : "o2k7", skin_variant : "silver", @@ -229,3 +228,4 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field return $editorDefinition; } } + diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index f0ad1a768..e0a37c224 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -319,8 +319,7 @@ try { $oProcessMap->processFilesManager( $oData->pro_uid ); break; case 'exploreDirectory': - $objData = Bootstrap::json_decode( $_REQUEST['data'] ); - $_SESSION['PFMDirectory'] = $objData->{'main_directory'}; + $_SESSION["PFMDirectory"] = $oData->main_directory; $oProcessMap->exploreDirectory( $oData->pro_uid, $oData->main_directory, $oData->directory ); break; case 'deleteFile': diff --git a/workflow/engine/xmlform/processes/processes_FilesOptions.xml b/workflow/engine/xmlform/processes/processes_FilesOptions.xml index d5c7da7fe..2ea24df15 100755 --- a/workflow/engine/xmlform/processes/processes_FilesOptions.xml +++ b/workflow/engine/xmlform/processes/processes_FilesOptions.xml @@ -6,7 +6,7 @@ - Upload............... + Upload @@ -24,20 +24,20 @@ var oUploadFilesPanel; var oUploadFilesPanel; var uploadFilesScreen = function(PRO_UID, MAIN_DIRECTORY, CURRENT_DIRECTORY) { - var swNavigator; + var swNavigator; if(navigator.appName=='Microsoft Internet Explorer'){ var rv = ''; if (new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})").exec(navigator.userAgent) != null) { - rv = parseFloat(RegExp.$1); + rv = parseFloat(RegExp.$1); } - + if (rv >= 9) { - swNavigator='ie9+'; + swNavigator='ie9+'; } - else { + else { swNavigator='ie'; } - + wd = 420; hg = 170; } else { @@ -48,11 +48,11 @@ var uploadFilesScreen = function(PRO_UID, MAIN_DIRECTORY, CURRENT_DIRECTORY) { CURRENT_MAIN_DIRECTORY = MAIN_DIRECTORY; CURRENT_CURRENT_DIRECTORY = CURRENT_DIRECTORY; - + Pm.tmp.processFilesManagerPanel.events = { remove: function() { oUploadFilesPanel.remove(); }.extend(this) }; - + oUploadFilesPanel = new leimnud.module.panel(); oUploadFilesPanel.options={ limit : true, @@ -76,19 +76,20 @@ function editFile(pro_uid, fileName){ var typofile = fileName.split("."); if( typofile[typofile.length-1].toLowerCase() != 'txt' && typofile[typofile.length-1].toLowerCase() != 'html' ){ msgBox(G_STRINGS.HTML_FILES,"alert");return; - } + } oPanel = new leimnud.module.panel(); oPanel.options={ - limit : true, - size : {w:800,h:530}, - position : {x:50,y:50,center:true}, - title : '', - control : {close:true,resize:false}, - fx : {shadow:true,modal:true} + limit: true, + size: {w: 820, h: 500}, + position: {x: 50, y: 50, center: true}, + title: "", + control: {close: true, resize: false}, + statusBar: true, + fx: {shadow: true, modal: true} }; oPanel.make(); - + var oRPC = new leimnud.module.rpc.xmlhttp({ url : 'processes_Ajax', args: 'action=editFile&filename='+fileName+'&pro_uid='+pro_uid @@ -107,17 +108,17 @@ function editFile(pro_uid, fileName){ /*refresh content tiny*/ function saveFile(pro_uid, fileName){ - + var fc64 = base64_encode(getField('fcontent').value); tinyMCE.execCommand('mceRemoveControl',false,'form[fcontent]'); fc64 = fc64.replace(/&/g, "@amp@"); fc64 = fc64.replace(/\+/g, '%2B'); - + var oRPC = new leimnud.module.rpc.xmlhttp({ url : 'processes_Ajax', args: 'action=saveFile&filename='+fileName+'&pro_uid='+pro_uid+'&MAIN_DIRECTORY='+CURRENT_MAIN_DIRECTORY+'&fcontent='+fc64 }); - + oPanel.loader.show(); oRPC.callback = function(rpc) { oPanel.remove(); @@ -153,12 +154,12 @@ function showCreateEmptyOptions(e, MAIN_DIRECTORY){ function saveEmptyFile(){ var fileName = getField('emptyfilename').value + ".html"; fileName = fileName.trim(); - + var oRPC = new leimnud.module.rpc.xmlhttp({ url : 'processes_Ajax', args: 'action=saveFile&filename='+fileName+'&pro_uid='+CURRENT_PRO_UID+'&MAIN_DIRECTORY='+CURRENT_MAIN_DIRECTORY+'&fcontent=' }); - + oRPC.callback = function(rpc){ showCreateEmptyOptionsPanel.remove(); /// goToDirectory(CURRENT_PRO_UID, 'mailTemplates', ''); @@ -172,11 +173,12 @@ function saveEmptyFile(){ oRPC.make(); } -function xReaload(){ +function xReaload(){ goToDirectory(CURRENT_PRO_UID, CURRENT_MAIN_DIRECTORY, CURRENT_CURRENT_DIRECTORY); } ]]> - + +