Changeset 2751:a96ec5640056
- Timestamp:
- 09/09/14 16:30:31 (11 years ago)
- Branch:
- default
- Files:
-
- 12 edited
-
admin/media.php (modified) (9 diffs)
-
admin/media_item.php (modified) (15 diffs)
-
plugins/dcCKEditor/_post_config.php (modified) (6 diffs)
-
plugins/dcCKEditor/js/ckeditor-plugins/dclink/plugin.js (modified) (2 diffs)
-
plugins/dcCKEditor/js/ckeditor-plugins/entrylink/plugin.js (modified) (3 diffs)
-
plugins/dcCKEditor/js/ckeditor-plugins/media/plugin.js (modified) (2 diffs)
-
plugins/dcCKEditor/js/popup_link.js (modified) (1 diff)
-
plugins/dcCKEditor/js/popup_media.js (modified) (2 diffs)
-
plugins/dcCKEditor/js/popup_posts.js (modified) (1 diff)
-
plugins/dcLegacyEditor/js/_post_editor.js (modified) (5 diffs)
-
plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.dotclear.js (modified) (3 diffs)
-
plugins/tags/_admin.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
admin/media.php
r2720 r2751 28 28 } 29 29 $d = isset($_REQUEST['d']) ? $_REQUEST['d'] : null; 30 $plugin_id = isset($_REQUEST['plugin_id']) ? html::sanitizeURL($_REQUEST['plugin_id']) : ''; 30 31 $dir = null; 31 32 … … 74 75 $popup = (integer) !empty($_GET['popup']); 75 76 76 $page_url = $core->adminurl->get("admin.media",array('popup' => $popup,'post_id' => $post_id ));77 $page_url = $core->adminurl->get("admin.media",array('popup' => $popup,'post_id' => $post_id, 'plugin_id' => $plugin_id)); 77 78 if (($temp = $core->callBehavior('adminMediaURL',$page_url))!='') { 78 79 $page_url = $temp; … … 144 145 # Adding a file 145 146 if ($dir && !empty($_FILES['upfile'])) { 146 147 // only one file per request : @see option singleFileUploads in admin/js/jsUpload/jquery.fileupload 147 148 $upfile = array('name' => $_FILES['upfile']['name'][0], 148 149 'type' => $_FILES['upfile']['type'][0], … … 160 161 $new_file_id = $core->media->uploadFile($upfile['tmp_name'], $upfile['name']); 161 162 162 $message['files'][] = array('name' => $upfile['name'], 163 $message['files'][] = array( 164 'name' => $upfile['name'], 163 165 'size' => $upfile['size'], 164 'html' => mediaItemLine($core->media->getFile($new_file_id), 1 )165 166 'html' => mediaItemLine($core->media->getFile($new_file_id), 1, $plugin_id) 167 ); 166 168 } catch (Exception $e) { 167 169 $message['files'][] = array('name' => $upfile['name'], … … 379 381 $fmt_form_media = '<form action="'.$core->adminurl->get("admin.media").'" method="post" id="form-medias">'. 380 382 '<div class="files-group">%s</div>'. 381 '<p class="hidden">'.$core->formNonce() . form::hidden(array('d'),$d). '</p>';383 '<p class="hidden">'.$core->formNonce() . form::hidden(array('d'),$d).form::hidden(array('plugin_id'),$plugin_id).'</p>'; 382 384 383 385 if (!$popup) { … … 410 412 '<input type="submit" value="'.__('OK').'" />'. 411 413 form::hidden(array('popup'),$popup). 414 form::hidden(array('plugin_id'),$plugin_id). 412 415 form::hidden(array('post_id'),$post_id). 413 416 '</p>'. … … 420 423 { 421 424 if ($items[$i]->d) { 422 $dgroup .= mediaItemLine($items[$i],$j );425 $dgroup .= mediaItemLine($items[$i],$j,$plugin_id); 423 426 } else { 424 $fgroup .= mediaItemLine($items[$i],$j );427 $fgroup .= mediaItemLine($items[$i],$j,$plugin_id); 425 428 } 426 429 } … … 561 564 562 565 /* ----------------------------------------------------- */ 563 function mediaItemLine($f,$i )566 function mediaItemLine($f,$i,$plugin_id) 564 567 { 565 568 global $core, $page_url, $popup, $post_id; … … 578 581 } 579 582 } else { 580 $link = $core->adminurl->get("admin.media.item", array('id' => $f->media_id,'popup' => $popup,'post_id' => $post_id)); 581 if (($temp = $core->callBehavior('adminMediaURL',$link))!='') { 582 $link = $temp; 583 } 583 $link = $core->adminurl->get( 584 'admin.media.item', 585 array( 586 'id' => $f->media_id, 587 'plugin_id' => $plugin_id, 588 'popup' => $popup, 589 'post_id' => $post_id 590 ) 591 ); 592 if (($temp = $core->callBehavior('adminMediaURL',$link))!='') { 593 $link = $temp; 594 } 584 595 } 585 596 -
admin/media_item.php
r2749 r2751 29 29 $file = null; 30 30 $popup = (integer) !empty($_GET['popup']); 31 $plugin_id = isset($_REQUEST['plugin_id']) ? html::sanitizeURL($_REQUEST['plugin_id']) : ''; 31 32 $page_url = $core->adminurl->get("admin.media.item",array('popup' => $popup,'post_id' => $post_id)); 32 33 $media_page_url = $core->adminurl->get("admin.media",array('popup' => $popup,'post_id' => $post_id)); … … 83 84 84 85 dcPage::addSuccessNotice(__('File has been successfully updated.')); 85 http::redirect($page_url.'&id='.$id );86 http::redirect($page_url.'&id='.$id.'&plugin_id='.$plugin_id); 86 87 } catch (Exception $e) { 87 88 $core->error->add($e->getMessage()); … … 112 113 113 114 dcPage::addSuccessNotice(__('File has been successfully updated.')); 114 http::redirect($page_url.'&id='.$id.'& tab=media-details-tab');115 http::redirect($page_url.'&id='.$id.'&plugin_id='.$plugin_id.'&tab=media-details-tab'); 115 116 } catch (Exception $e) { 116 117 $core->error->add($e->getMessage()); … … 126 127 127 128 dcPage::addSuccessNotice(__('Thumbnails have been successfully updated.')); 128 http::redirect($page_url.'&id='.$id.'& tab=media-details-tab');129 http::redirect($page_url.'&id='.$id.'&plugin_id='.$plugin_id.'&tab=media-details-tab'); 129 130 } catch (Exception $e) { 130 131 $core->error->add($e->getMessage()); … … 139 140 140 141 dcPage::addSuccessNotice(__('Zip file has been successfully extracted.')); 141 http::redirect($media_page_url.'&d='.$unzip_dir );142 http::redirect($media_page_url.'&d='.$unzip_dir.'&plugin_id='.$plugin_id); 142 143 } catch (Exception $e) { 143 144 $core->error->add($e->getMessage()); … … 164 165 165 166 dcPage::addSuccessNotice(__('Default media insertion settings have been successfully updated.')); 166 http::redirect($page_url.'&id='.$id );167 http::redirect($page_url.'&id='.$id.'&plugin_id='.$plugin_id); 167 168 } 168 169 … … 207 208 "</script>". 208 209 dcPage::jsLoad('js/_media_item.js'); 209 if ($popup) { 210 // perhaps better to put active editor in session 211 $post_format = $core->auth->getOption('post_format'); 212 $post_editor = $core->auth->getOption('editor'); 213 214 $starting_scripts .= $core->callBehavior('adminPopupMedia', $post_editor[$post_format]); 210 if ($popup && !empty($plugin_id)) { 211 $starting_scripts .= $core->callBehavior('adminPopupMedia', $plugin_id); 215 212 } 216 213 call_user_func($open_f,__('Media manager'), … … 422 419 form::hidden(array('pref_insertion'),''). 423 420 form::hidden(array('id'),$id). 421 form::hidden(array('plugin_id'),$plugin_id). 424 422 $core->formNonce().'</p>'. 425 423 '</form>'.'</div>'; … … 464 462 $strong_link = ($s == $thumb_size) ? '<strong>%s</strong>' : '%s'; 465 463 printf($strong_link,'<a href="'.html::escapeURL($page_url). 466 '&id='.$id.'& size='.$s.'&tab=media-details-tab">'.$core->media->thumb_sizes[$s][2].'</a> | ');467 } 468 echo '<a href="'.html::escapeURL($page_url).'&id='.$id.'& size=o&tab=media-details-tab">'.__('original').'</a>';464 '&id='.$id.'&plugin_id='.$plugin_id.'&size='.$s.'&tab=media-details-tab">'.$core->media->thumb_sizes[$s][2].'</a> | '); 465 } 466 echo '<a href="'.html::escapeURL($page_url).'&id='.$id.'&plugin_id='.$plugin_id.'&size=o&tab=media-details-tab">'.__('original').'</a>'; 469 467 echo '</p>'; 470 468 } … … 492 490 { 493 491 echo 494 '<p><a class="button" href="'.html::escapeHTML($page_url).'&id='.$id.'& amp;find_posts=1&tab=media-details-tab">'.492 '<p><a class="button" href="'.html::escapeHTML($page_url).'&id='.$id.'&plugin_id='.$plugin_id.'&find_posts=1&tab=media-details-tab">'. 495 493 __('Show entries containing this media').'</a></p>'; 496 494 } … … 592 590 '<p><input type="submit" name="thumbs" value="'.__('Update thumbnails').'" />'. 593 591 form::hidden(array('id'),$id). 592 form::hidden(array('plugin_id'),$plugin_id). 594 593 $core->formNonce().'</p>'. 595 594 '</form>'; … … 616 615 '<input type="submit" name="unzip" value="'.__('Extract').'" />'. 617 616 form::hidden(array('id'),$id). 617 form::hidden(array('plugin_id'),$plugin_id). 618 618 $core->formNonce().'</p>'. 619 619 '</form>'; … … 635 635 '<p><input type="submit" accesskey="s" value="'.__('Save').'" />'. 636 636 form::hidden(array('id'),$id). 637 form::hidden(array('plugin_id'),$plugin_id). 637 638 $core->formNonce().'</p>'. 638 639 '</form>'; … … 648 649 '<p><input type="submit" value="'.__('Send').'" />'. 649 650 form::hidden(array('id'),$id). 651 form::hidden(array('plugin_id'),$plugin_id). 650 652 $core->formNonce().'</p>'. 651 653 '</form>'; … … 655 657 '<form id="delete-form" method="post" action="'.html::escapeURL($media_page_url). 656 658 '&d='.rawurlencode(dirname($file->relname)). 659 '&plugin_id='.$plugin_id. 657 660 '&remove='.rawurlencode($file->basename).'">'. 658 661 '<p><input name="delete" type="submit" class="delete" value="'.__('Delete this media').'" />'. -
plugins/dcCKEditor/_post_config.php
r2738 r2751 31 31 } 32 32 } 33 33 34 34 return url; 35 35 }; 36 36 37 /* Retrieve editor name from URL */ 38 $.getEditorName = function getEditorName(url) { 39 return url.replace(/.*editor=([^&]*)(&.*)?/,'$1'); 37 /* Retrieve editor from popup */ 38 $.active_editor = null; 39 $.getEditorName = function getEditorName() { 40 return $.active_editor; 40 41 } 41 42 })(jQuery); … … 49 50 CKEDITOR.config.skin = 'dotclear,'+dotclear.dcckeditor_plugin_url+'/js/ckeditor-skins/dotclear/'; 50 51 51 <?php if (!empty($dcckeditor_cancollapse_button)):?> 52 <?php if (!empty($dcckeditor_cancollapse_button)):?> 52 53 CKEDITOR.config.toolbarCanCollapse = true; 53 54 <?php endif;?> 54 55 CKEDITOR.plugins.addExternal('entrylink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/entrylink/'); 55 56 CKEDITOR.plugins.addExternal('entrylink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/entrylink/'); 56 57 CKEDITOR.plugins.addExternal('dclink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/dclink/'); 57 58 CKEDITOR.plugins.addExternal('media',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/media/'); … … 75 76 extraPlugins: '<?php echo $defautExtraPlugins;?>', 76 77 77 <?php if (!empty($dcckeditor_format_select)):?> 78 <?php if (!empty($dcckeditor_format_select)):?> 78 79 // format tags 79 80 format_tags: 'p;h1;h2;h3;h4;h5;h6;pre;address', … … 102 103 <?php endif;?> 103 104 'Bold','Italic','Underline','Strike','Subscript','Superscript','Code','Blockquote', 104 105 105 106 <?php if (!empty($dcckeditor_list_buttons)):?> 106 107 'NumberedList', 'BulletedList', … … 135 136 ,'TextColor' 136 137 <?php endif;?> 137 ] 138 ] 138 139 }, 139 140 <?php // add extra buttons comming from dotclear plugins … … 156 157 $('#cke_post_excerpt').addClass('hide'); 157 158 } 158 159 159 160 $('#excerpt-area label').click(function() { 160 161 $('#cke_post_excerpt').toggleClass('hide',$('#post_excerpt').hasClass('hide')); 161 162 }); 162 163 }); 164 165 // @TODO: find a better way to retrieve active editor 166 for (var id in CKEDITOR.instances) { 167 CKEDITOR.instances[id].on('focus', function(e) { 168 $.active_editor = e.editor.name; 169 }); 170 } 163 171 }); -
plugins/dcCKEditor/js/ckeditor-plugins/dclink/plugin.js
r2743 r2751 6 6 exec: function(editor) { 7 7 if (editor.getSelection().getNative().toString().replace(/\s*/,'')!='') { 8 $.toolbarPopup('popup_link.php? editor='+editor.name);8 $.toolbarPopup('popup_link.php?plugin_id=dcCKEditor'); 9 9 } 10 10 } … … 26 26 editor.getSelection().selectElement(element); 27 27 28 var popup_url = 'popup_link.php? editor='+editor.name;28 var popup_url = 'popup_link.php?plugin_id=dcCKEditor'; 29 29 if (element.getAttribute('href')) { 30 30 popup_url += '&href='+element.getAttribute('href'); -
plugins/dcCKEditor/js/ckeditor-plugins/entrylink/plugin.js
r2743 r2751 6 6 exec: function(editor) { 7 7 if (editor.getSelection().getNative().toString().replace(/\s*/,'')!='') { 8 $.toolbarPopup('popup_posts.php?popup=1& editor='+editor.name);8 $.toolbarPopup('popup_posts.php?popup=1&plugin_id=dcCKEditor'); 9 9 } 10 10 } … … 18 18 19 19 editor.on('doubleclick',function(e) { 20 var element = CKEDITOR.plugins.link.getSelectedLink( editor) || e.data.element;20 var element = CKEDITOR.plugins.link.getSelectedLink(editor) || e.data.element; 21 21 if (!element.isReadOnly()) { 22 22 if (element.is('a') … … 25 25 editor.getSelection().selectElement(element); 26 26 27 $.toolbarPopup('popup_posts.php?popup=1& editor='+editor.name);27 $.toolbarPopup('popup_posts.php?popup=1&plugin_id=dcCKEditor'); 28 28 return false; 29 29 } -
plugins/dcCKEditor/js/ckeditor-plugins/media/plugin.js
r2743 r2751 5 5 editor.addCommand('mediaCommand', { 6 6 exec: function(editor) { 7 $.toolbarPopup('media.php?popup=1& editor='+editor.name);7 $.toolbarPopup('media.php?popup=1&plugin_id=dcCKEditor'); 8 8 } 9 9 }); … … 19 19 if (!element.isReadOnly()) { 20 20 if (element.is('img') || (element.is('a') && element.hasClass('media-link'))) { 21 $.toolbarPopup('media.php?popup=1& editor='+editor.name);21 $.toolbarPopup('media.php?popup=1&plugin_id=dcCKEditor'); 22 22 return false; 23 23 } -
plugins/dcCKEditor/js/popup_link.js
r2738 r2751 6 6 $('#link-insert-ok').click(function() { 7 7 var insert_form = $('#link-insert-form').get(0); 8 if (insert_form == undefined) { 9 return; 8 if (insert_form == undefined) { 9 return; 10 10 } 11 11 12 var editor_name = window.opener.$.getEditorName( document.location.search),12 var editor_name = window.opener.$.getEditorName(), 13 13 editor = window.opener.CKEDITOR.instances[editor_name], 14 link = '', 14 link = '', 15 15 selected_text = editor.getSelection().getNative().toString(); 16 16 -
plugins/dcCKEditor/js/popup_media.js
r2738 r2751 3 3 window.close(); 4 4 }); 5 5 6 6 $('#media-insert-ok').click(function() { 7 7 var insert_form = $('#media-insert-form').get(0); 8 if (insert_form === undefined) { 9 return; 8 if (insert_form === undefined) { 9 return; 10 10 } 11 11 12 var editor_name = window.opener.$.getEditorName( document.location.search),12 var editor_name = window.opener.$.getEditorName(), 13 13 editor = window.opener.CKEDITOR.instances[editor_name], 14 14 type = insert_form.elements.type.value, … … 47 47 element = window.opener.CKEDITOR.dom.element.createFromHtml(img); 48 48 } 49 49 50 50 editor.insertElement(element); 51 51 } -
plugins/dcCKEditor/js/popup_posts.js
r2738 r2751 6 6 $('#form-entries tr>td.maximal>a').click(function(e) { 7 7 e.preventDefault(); 8 var editor_name = window.opener.$.getEditorName( document.location.search),8 var editor_name = window.opener.$.getEditorName(), 9 9 editor = window.opener.CKEDITOR.instances[editor_name], 10 10 link = '', -
plugins/dcLegacyEditor/js/_post_editor.js
r2705 r2751 1 1 $(function() { 2 2 if ($('#edit-entry').length==0) {return;} 3 4 // remove editor prefix5 var getPostFormat = function getPostFormat(post_format) {6 return post_format.replace(/[^:]*:/,'');7 };8 var getPostEditor = function getPostEditor(post_format) {9 return post_format.replace(/:.*/,'');10 };11 3 12 4 // Get document format and prepare toolbars … … 14 6 var last_post_format = $(formatField).val(); 15 7 $(formatField).change(function() { 16 if ( getPostEditor(this.value)!='dcLegacyEditor') { return;}8 if (this.value!='dcLegacyEditor') { return;} 17 9 18 var post_format = getPostFormat(this.value);10 var post_format = this.value; 19 11 20 12 // Confirm post format change … … 37 29 38 30 $('.format_control > *').addClass('hide'); 39 $('.format_control:not(.control_no_'+ getPostFormat(last_post_format)+') > *').removeClass('hide');31 $('.format_control:not(.control_no_'+last_post_format+') > *').removeClass('hide'); 40 32 41 33 if ($('#comment_content').length>0) { … … 61 53 excerpt: excerpt_content, 62 54 content: post_content, 63 format: getPostFormat($('#post_format').get(0).value),55 format: $('#post_format').get(0).value, 64 56 lang: $('#post_lang').get(0).value 65 57 }; … … 111 103 112 104 // Load toolbars 113 contentTb.switchMode( getPostFormat(formatField.value));114 excerptTb.switchMode( getPostFormat(formatField.value));105 contentTb.switchMode(formatField.value); 106 excerptTb.switchMode(formatField.value); 115 107 116 108 // Check unsaved changes before XHTML conversion -
plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.dotclear.js
r2614 r2751 5 5 jsToolBar.prototype.elements.link.open_url = 'popup_link.php'; 6 6 7 jsToolBar.prototype.elements.link.popup = function 7 jsToolBar.prototype.elements.link.popup = function(args) { 8 8 window.the_toolbar = this; 9 9 args = args || ''; … … 155 155 fn: {}, 156 156 fncall: {}, 157 open_url: 'media.php?popup=1 ',157 open_url: 'media.php?popup=1&plugin_id=dcLegacyEditor', 158 158 data: {}, 159 159 popup: function() { … … 355 355 title: 'Link to an entry', 356 356 fn: {}, 357 open_url: 'popup_posts.php ',357 open_url: 'popup_posts.php?plugin_id=dcLegacyEditor', 358 358 data: {}, 359 359 popup: function() { -
plugins/tags/_admin.php
r2680 r2751 40 40 $core->addBehavior('adminPageHelpBlock', array('tagsBehaviors', 'adminPageHelpBlock')); 41 41 42 $core->addBehavior('ckeditorExtraPlugins', array('tagsBehaviors', 'ckeditorExtraPlugins'));42 //$core->addBehavior('ckeditorExtraPlugins', array('tagsBehaviors', 'ckeditorExtraPlugins')); 43 43 44 44 # BEHAVIORS
Note: See TracChangeset
for help on using the changeset viewer.