Skip to content
Permalink
Browse files

Merge some more changes from v1.8.x

  • Loading branch information...
slackero committed May 20, 2017
1 parent 997d8d9 commit 5f8738605fa8da05345ef4451dc8f5c75353e2f7
0 LICENSE.txt → LICENSE 100644 → 100755
File renamed without changes.
@@ -4,35 +4,39 @@
*/

CKEDITOR.editorConfig = function( config ) {
// Define changes to default configuration here. For example:
// config.language = 'fr';
// config.uiColor = '#AADC6E';
// Define changes to default configuration here. For example:
// config.language = 'fr';
// config.uiColor = '#AADC6E';

// For the complete reference:
// http://docs.ckeditor.com/#!/api/CKEDITOR.config
// For the complete reference:
// http://docs.ckeditor.com/#!/api/CKEDITOR.config

config.toolbar = [
{ name: 'tools', items: ['Maximize', '-', 'Source', '-', 'Undo', 'Redo', '-', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Find', '-', 'ShowBlocks' ] },
{ name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
{ name: 'colors', items: [ 'TextColor', 'BGColor' ] },
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
{ name: 'paragraph', groups: [ 'align', 'list', 'indent', 'blocks' ], items: [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BulletedList', 'NumberedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv'] },
{ name: 'insert', items: [ 'Image', 'Table', 'HorizontalRule', 'Iframe', 'SpecialChar' ] },
{ name: 'styles', items: [ 'Styles', 'Format', 'Font' ] },
{ name: 'about', items: [ 'About' ] }
];
config.toolbar = [
{ name: 'tools', items: ['Maximize', '-', 'Source', '-', 'Undo', 'Redo', '-', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Find', '-', 'ShowBlocks' ] },
{ name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
{ name: 'colors', items: [ 'TextColor', 'BGColor' ] },
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
{ name: 'paragraph', groups: [ 'align', 'list', 'indent', 'blocks' ], items: [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BulletedList', 'NumberedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv'] },
{ name: 'insert', items: [ 'Image', 'Table', 'HorizontalRule', 'Iframe', 'SpecialChar' ] },
{ name: 'styles', items: [ 'Styles', 'Format', 'Font' ] },
{ name: 'about', items: [ 'About' ] }
];

// Remove some buttons, provided by the standard plugins, which we don't
// need to have in the Standard(s) toolbar.
//config.removeButtons = 'Underline,Subscript,Superscript';
// Remove some buttons, provided by the standard plugins, which we don't
// need to have in the Standard(s) toolbar.
//config.removeButtons = 'Underline,Subscript,Superscript';

// set some recommend defaults
config.extraAllowedContent = '*(*)'; // allow classes for all tags
config.forcePasteAsPlainText = true;
config.pasteFromWordRemoveFontStyles = true;
config.pasteFromWordRemoveStyles = true;
config.pasteFromWordPromptCleanup = true;
config.protectedSource.push(/<i[^>]*><\/i>/g);
config.protectedSource.push(/<span[^>]*><\/span>/g);
// set some recommend defaults
config.extraAllowedContent = '*(*)'; // allow classes for all tags
config.forcePasteAsPlainText = true;
config.pasteFromWordRemoveFontStyles = true;
config.pasteFromWordRemoveStyles = true;
config.pasteFromWordPromptCleanup = true;
config.protectedSource.push(/<i[^>]*><\/i>/g);
config.protectedSource.push(/<span[^>]*><\/span>/g);

config.image2_altRequired = true;
config.image2_alignClasses = ['image-left', 'image-center', 'image-right'];
config.image2_captionedClass = 'image-captioned';

};

This file was deleted.

@@ -1328,7 +1328,7 @@ public function init()
// Pass whatever was set with config options over to the sanitizer.
// Pass the classes in for legacy support; new classes should use the registry instead
$this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->registry->get_class('Cache'));
$this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen);
$this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen, $this->curl_options);
if (!empty($this->multifeed_url))
{
@@ -16179,7 +16179,7 @@ public function parse(&$data, $encoding, $url = '')
{
libxml_clear_errors();
$xml = new XMLReader();
$xml->XML($data);
$xml->xml($data);
while (@$xml->read())
{
switch ($xml->nodeType)
@@ -1,72 +1,80 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.html or http://ckeditor.com/license
*
* CP Tabs loads this configration
*/

CKEDITOR.editorConfig = function( config ) {
// Define changes to default configuration here.
// For the complete reference:
// http://docs.ckeditor.com/#!/api/CKEDITOR.config
// Define changes to default configuration here.
// For the complete reference:
// http://docs.ckeditor.com/#!/api/CKEDITOR.config

/* The full default CKEditor toolbar
config.toolbar = [
{ name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source', '-', 'Save', 'NewPage', 'Preview', 'Print', '-', 'Templates' ] },
{ name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] },
{ name: 'forms', items: [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
'/',
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl', 'Language' ] },
{ name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
{ name: 'insert', items: [ 'Image', 'Flash', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak', 'Iframe' ] },
'/',
{ name: 'styles', items: [ 'Styles', 'Format', 'Font', 'FontSize' ] },
{ name: 'colors', items: [ 'TextColor', 'BGColor' ] },
{ name: 'tools', items: [ 'Maximize', 'ShowBlocks' ] },
{ name: 'others', items: [ '-' ] },
{ name: 'about', items: [ 'About' ] }
];
*/
/* phpwcms default toolbar setting
config.toolbar = [
{ name: 'tools', items: ['Maximize', '-', 'Source', '-', 'Undo', 'Redo', '-', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Find', '-', 'ShowBlocks' ] },
{ name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
{ name: 'colors', items: [ 'TextColor', 'BGColor' ] },
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
{ name: 'paragraph', groups: [ 'align', 'list', 'indent', 'blocks' ], items: [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BulletedList', 'NumberedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv'] },
{ name: 'insert', items: [ 'Image', 'Table', 'HorizontalRule', 'Iframe', 'SpecialChar' ] },
{ name: 'styles', items: [ 'Styles', 'Format', 'Font' ] },
{ name: 'about', items: [ 'About' ] }
];
*/
/* The full default CKEditor toolbar
config.toolbar = [
{ name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source', '-', 'Save', 'NewPage', 'Preview', 'Print', '-', 'Templates' ] },
{ name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] },
{ name: 'forms', items: [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
'/',
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl', 'Language' ] },
{ name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
{ name: 'insert', items: [ 'Image', 'Flash', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak', 'Iframe' ] },
'/',
{ name: 'styles', items: [ 'Styles', 'Format', 'Font', 'FontSize' ] },
{ name: 'colors', items: [ 'TextColor', 'BGColor' ] },
{ name: 'tools', items: [ 'Maximize', 'ShowBlocks' ] },
{ name: 'others', items: [ '-' ] },
{ name: 'about', items: [ 'About' ] }
];
*/
/* phpwcms default toolbar setting
config.toolbar = [
{ name: 'tools', items: ['Maximize', '-', 'Source', '-', 'Undo', 'Redo', '-', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Find', '-', 'ShowBlocks' ] },
{ name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
{ name: 'colors', items: [ 'TextColor', 'BGColor' ] },
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
{ name: 'paragraph', groups: [ 'align', 'list', 'indent', 'blocks' ], items: [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BulletedList', 'NumberedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv'] },
{ name: 'insert', items: [ 'Image', 'Table', 'HorizontalRule', 'Iframe', 'SpecialChar' ] },
{ name: 'styles', items: [ 'Styles', 'Format', 'Font' ] },
{ name: 'about', items: [ 'About' ] }
];
*/

// Remove some buttons, provided by the standard plugins, which we don't
// need to have in the Standard(s) toolbar.
//config.removeButtons = 'Copy,Iframe,Flash,Smiley,PageBreak,FontSize,Save,Print,NewPage,Preview,Templates,PasteFromWord,PasteText';
// Remove some buttons, provided by the standard plugins, which we don't
// need to have in the Standard(s) toolbar.
//config.removeButtons = 'Copy,Iframe,Flash,Smiley,PageBreak,FontSize,Save,Print,NewPage,Preview,Templates,PasteFromWord,PasteText';

//config.width = 538;
//config.height = 200;
//config.width = 538;
//config.height = 200;

//config.extraPlugins = 'magicline,image2';
//config.removePlugins = 'resize';
//config.extraPlugins = 'magicline,image2';
//config.removePlugins = 'resize';

//config.toolbarCanCollapse = true;
//config.toolbarStartupExpanded = false;
//config.toolbarCanCollapse = true;
//config.toolbarStartupExpanded = false;

// Allow classes for all tags
//config.extraAllowedContent = '*(*)';
// Allow classes for all tags
//config.extraAllowedContent = '*(*)';

//config.forcePasteAsPlainText = true;
//config.pasteFromWordRemoveFontStyles = true;
//config.pasteFromWordRemoveStyles = true;
//config.pasteFromWordPromptCleanup = true;
//config.forcePasteAsPlainText = true;
//config.pasteFromWordRemoveFontStyles = true;
//config.pasteFromWordRemoveStyles = true;
//config.pasteFromWordPromptCleanup = true;

//config.contentsCss = 'template/config/ckeditor/ckeditor.custom.css';
//config.protectedSource.push( /<i[\s\S]*?\>/g ); //allows beginning <i> tag
//config.protectedSource.push( /<\/i[\s\S]*?\>/g ); //allows ending </i> tag
//config.contentsCss = 'template/config/ckeditor/ckeditor.custom.css';
//config.protectedSource.push( /<i[\s\S]*?\>/g ); //allows beginning <i> tag
//config.protectedSource.push( /<\/i[\s\S]*?\>/g ); //allows ending </i> tag

//config.contentsCss = 'assets/config/ckeditor/ckeditor.custom.css';
//config.colorButton_colors = "00F"; //000,FFF,...

//config.format_uppercase = { element: 'span', attributes: {'class': 'uppercase'}, name: 'UPPERCASE' };
//config.format_blockquote = { element: 'blockquote', name: 'Blockquote' };

//config.image2_altRequired = true;
//config.image2_alignClasses = ['image-left', 'image-center', 'image-right'];
//config.image2_captionedClass = 'image-captioned';

//config.contentsCss = 'assets/config/ckeditor/ckeditor.custom.css';
//config.colorButton_colors = "00F"; //000,FFF,...
};

0 comments on commit 5f87386

Please sign in to comment.
You can’t perform that action at this time.