Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/Policies/CustomCSPPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ public function configure()
Keyword::NONE,
])->addDirective(Directive::BASE, [
Keyword::SELF,
])->addDirective(Directive::FRAME, [
'self',
'https://www.youtube.com',
'http://www.youtube.com'
]);
}

Expand Down
3 changes: 2 additions & 1 deletion catatan_rilis.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Di rilis ini, versi 2604.0.1 berisi penambahan dan perbaikan yang diminta pengguna.
Di rilis ini, versi 2605.0.1 berisi penambahan dan perbaikan yang diminta pengguna.

#### Penambahan Fitur

Expand All @@ -15,6 +15,7 @@ Di rilis ini, versi 2604.0.1 berisi penambahan dan perbaikan yang diminta penggu
#### Perbaikan BUG
1. [#1023](https://github.com/OpenSID/OpenKab/issues/1023) Percobaan login gagal terkadang error 500
2. [#1025](https://github.com/OpenSID/OpenKab/issues/1025) Arahkan/Infokan pembuatan kategori artikel ketika kategori kosong saat membuat artikel opensid
3. [#1026](https://github.com/OpenSID/OpenKab/issues/1026) Perbaiki fungsi insert media dan gambar pada tinymce artikel

#### Perubahan Teknis

Expand Down
4 changes: 2 additions & 2 deletions config/file-manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@
*
* null - no restrictions
*/
'maxUploadFileSize' => 1024,
'maxUploadFileSize' => 5120, // 5 MB

/**
* File upload - Allow these file types
*
* [] - no restrictions
*/
'allowFileTypes' => ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp'],
'allowFileTypes' => ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp','mp4','mkv','mov'],

/**
* Show / Hide system files and folders
Expand Down
108 changes: 108 additions & 0 deletions config/purifier.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<?php
/**
* Ok, glad you are here
* first we get a config instance, and set the settings
* $config = HTMLPurifier_Config::createDefault();
* $config->set('Core.Encoding', $this->config->get('purifier.encoding'));
* $config->set('Cache.SerializerPath', $this->config->get('purifier.cachePath'));
* if ( ! $this->config->get('purifier.finalize')) {
* $config->autoFinalize = false;
* }
* $config->loadArray($this->getConfig());
*
* You must NOT delete the default settings
* anything in settings should be compacted with params that needed to instance HTMLPurifier_Config.
*
* @link http://htmlpurifier.org/live/configdoc/plain.html
*/

return [
'encoding' => 'UTF-8',
'finalize' => true,
'ignoreNonStrings' => false,
'cachePath' => storage_path('app/purifier'),
'cacheFileMode' => 0755,
'settings' => [
'default' => [
'HTML.Doctype' => 'HTML 4.01 Transitional',
'HTML.Allowed' => 'div,b,strong,i,em,u,a[href|title],ul,ol,li,p[style],br,span[style],img[width|height|alt|src],video[src|type|width|height|poster|preload|controls],source[src|type],iframe[src|width|height|frameborder|allowfullscreen]',
'CSS.AllowedProperties' => 'font,font-size,font-weight,font-style,font-family,text-decoration,padding-left,color,background-color,text-align',
'AutoFormat.AutoParagraph' => true,
'AutoFormat.RemoveEmpty' => false,
'HTML.SafeIframe' => 'true',
'URI.SafeIframeRegexp' => '%^(http://|https://|//)(www.youtube.com/embed/|www.youtube.com/watch|vimeo.com/|player.vimeo.com/video/|youtu.be/|www.facebook.com/plugins/video/|www.instagram.com/p/|platform.twitter.com/embed/)%',
],
'test' => [
'Attr.EnableID' => 'true',
],
"youtube" => [
"HTML.SafeIframe" => 'true',
"URI.SafeIframeRegexp" => "%^(http://|https://|//)(www.youtube.com/embed/|player.vimeo.com/video/)%",
],
'custom_definition' => [
'id' => 'html5-definitions',
'rev' => 1,
'debug' => false,
'elements' => [
// http://developers.whatwg.org/sections.html
['section', 'Block', 'Flow', 'Common'],
['nav', 'Block', 'Flow', 'Common'],
['article', 'Block', 'Flow', 'Common'],
['aside', 'Block', 'Flow', 'Common'],
['header', 'Block', 'Flow', 'Common'],
['footer', 'Block', 'Flow', 'Common'],

// Content model actually excludes several tags, not modelled here
['address', 'Block', 'Flow', 'Common'],
['hgroup', 'Block', 'Required: h1 | h2 | h3 | h4 | h5 | h6', 'Common'],

// http://developers.whatwg.org/grouping-content.html
['figure', 'Block', 'Optional: (figcaption, Flow) | (Flow, figcaption) | Flow', 'Common'],
['figcaption', 'Inline', 'Flow', 'Common'],

// http://developers.whatwg.org/the-video-element.html#the-video-element
['video', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', [
'src' => 'URI',
'type' => 'Text',
'width' => 'Length',
'height' => 'Length',
'poster' => 'URI',
'preload' => 'Enum#auto,metadata,none',
'controls' => 'Bool',
]],
['source', 'Block', 'Empty', 'Common', [
'src' => 'URI',
'type' => 'Text',
]],

// http://developers.whatwg.org/text-level-semantics.html
['s', 'Inline', 'Inline', 'Common'],
['var', 'Inline', 'Inline', 'Common'],
['sub', 'Inline', 'Inline', 'Common'],
['sup', 'Inline', 'Inline', 'Common'],
['mark', 'Inline', 'Inline', 'Common'],
['wbr', 'Inline', 'Empty', 'Core'],

// http://developers.whatwg.org/edits.html
['ins', 'Block', 'Flow', 'Common', ['cite' => 'URI', 'datetime' => 'CDATA']],
['del', 'Block', 'Flow', 'Common', ['cite' => 'URI', 'datetime' => 'CDATA']],
],
'attributes' => [
['iframe', 'allowfullscreen', 'Bool'],
['table', 'height', 'Text'],
['td', 'border', 'Text'],
['th', 'border', 'Text'],
['tr', 'width', 'Text'],
['tr', 'height', 'Text'],
['tr', 'border', 'Text'],
],
],
'custom_attributes' => [
['a', 'target', 'Enum#_blank,_self,_target,_top'],
],
'custom_elements' => [
['u', 'Inline', 'Inline', 'Common'],
],
],

];
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"select2": "^4.1.0-rc.0",
"select2-bootstrap4-theme": "^1.0.0",
"sweetalert2": "^11.7.27",
"tinymce": "^6.7.0"
"tinymce": "^8.5.0"
}
}
1 change: 1 addition & 0 deletions public/build/assets/tinymce-049ecb70.css

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions public/build/assets/tinymce-4bed85b8.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/build/assets/tinymce-580bfc24.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import"./tinymce-4bed85b8.js";
84 changes: 0 additions & 84 deletions public/build/assets/tinymce-7862aad6.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/assets/tinymce-c9a62ee6.js

This file was deleted.

11 changes: 0 additions & 11 deletions public/build/assets/tinymce-ede989c3.css

This file was deleted.

6 changes: 3 additions & 3 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"src": "resources/js/app.js"
},
"resources/js/tinymce.js": {
"file": "assets/tinymce-c9a62ee6.js",
"file": "assets/tinymce-580bfc24.js",
"imports": [
"resources/sass/tinymce.scss"
],
Expand All @@ -75,9 +75,9 @@
},
"resources/sass/tinymce.scss": {
"css": [
"assets/tinymce-ede989c3.css"
"assets/tinymce-049ecb70.css"
],
"file": "assets/tinymce-7862aad6.js",
"file": "assets/tinymce-4bed85b8.js",
"isEntry": true,
"src": "resources/sass/tinymce.scss"
}
Expand Down
Loading