diff --git a/inc/config.php b/inc/config.php index b9be9991..4f917f82 100644 --- a/inc/config.php +++ b/inc/config.php @@ -1164,9 +1164,32 @@ '' ), array( - '/^https?:\/\/(\w+\.)?metacafe\.com\/watch\/(\d+)\/([a-zA-Z0-9_\-.]+)\/(\?[^\'"<>]+)?$/i', - '' + '/^https?:\/\/(www\.)?rumble\.com\/embed\/([a-zA-Z0-9]+)(\/\?[^\'"<>]*)?$/i', + '' ), + array( + '/^https?:\/\/(www\.)?bitchute\.com\/(?:video|embed)\/([a-zA-Z0-9]+)(\/)?(\?[^\'"<>]*)?$/i', + '' + ), + array( + '/^https?:\/\/(?:www\.)?odysee\.com\/(?:@[^\/]+\/)?([-a-zA-Z0-9_]+:[a-zA-Z0-9]+)(\/)?(\?[^\'"<>]*)?$/i', + '' + ), + array( + '/^https?:\/\/(www\.)?kick\.com\/([a-zA-Z0-9_]+)(\?[^\'"<>]*)?$/i', + '' + ), + /* + //Both TikTok and Instagram are commented out since they contain some extra scripting you might not want natively on your website. + array( + '/^https?:\/\/(www\.)?tiktok\.com\/@([a-zA-Z0-9_.]+)\/video\/([0-9]+)(\?[^\'"<>]*)?$/i', + '
' + ), + array( + '/^https?:\/\/(www\.)?instagram\.com\/(p|reel|tv)\/([a-zA-Z0-9_-]+)(\/)?(\?[^\'"<>]*)?$/i', + '
' + ), + */ array( '/^https?:\/\/(\w+\.)?(vocaroo\.com\/|voca\.ro\/)([a-zA-Z0-9]{2,12})$/i', '' diff --git a/inc/mod/pages.php b/inc/mod/pages.php index 8a549481..a3276702 100644 --- a/inc/mod/pages.php +++ b/inc/mod/pages.php @@ -2643,6 +2643,10 @@ function mod_config(Context $ctx, $board_config = false) { if ($board_config && !openBoard($board_config)) error($config['error']['noboard']); + else { + include $board_config . '/config.php';; + } + if (!hasPermission($config['mod']['edit_config'], $board_config)) error($config['error']['noaccess']); diff --git a/install.php b/install.php index 36151c87..6c8d627d 100644 --- a/install.php +++ b/install.php @@ -1,7 +1,7 @@ "+_("never")+""; - return strftime(window.post_date, new Date((f.expires|0)*1000), datelocale) + - ((f.expires < time()) ? "" : " "+_("in ")+until(f.expires|0)+""); + var formattedDate = strftime("%m/%d/%Y (%a) %H:%M:%S", new Date((f.expires|0)*1000), datelocale); + return formattedDate + ((f.expires < time()) ? "" : " "+_("in ")+until(f.expires|0)+""); } }, username: {name: _("Staff"), width: "100px", fmt: function(f) { var pre='',suf='',un=f.username; diff --git a/static/banners/defaultbanner.png b/static/banners/defaultbanner.png index 44fee962..791457ad 100644 Binary files a/static/banners/defaultbanner.png and b/static/banners/defaultbanner.png differ diff --git a/stylesheets/style.css b/stylesheets/style.css index ef1abf8b..66060c64 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -1234,12 +1234,35 @@ div.mix { display: inline-block; } -.ban-reason-table .warning-reason-table tr td:first-child { - text-align: right; - padding-right: 10px; +.ban-reason-table { + margin: 10px auto; + border-collapse: collapse; + width: auto; + font-size: 10pt; } -.ban-reason-table .warning-reason-table tr:hover td { - cursor: pointer; - background-color: rgba(100%,100%,100%,0.2); +.ban-reason-table th, +.ban-reason-table td { + border: 1px solid #98E; + padding: 4px 8px; + text-align: left; +} + +.ban-reason-table th { + background-color: #98E; + color: black; + font-weight: bold; +} + +.ban-reason-table tr:nth-child(even) td { + background-color: #EEF2FF; +} + +.ban-reason-table tr:nth-child(odd) td { + background-color: #FFFFFF; +} + +.ban-reason-table tr:hover td { + background-color: #D6DAF0; + cursor: pointer; } diff --git a/templates/mod/ban_history.html b/templates/mod/ban_history.html index 812a3ee1..307c8929 100644 --- a/templates/mod/ban_history.html +++ b/templates/mod/ban_history.html @@ -11,7 +11,7 @@ {% trans 'IP' %} - {{ ban.cmask }} + {{ ban.mask|cloak_mask }} {% trans 'Reason' %} diff --git a/templates/mod/login.html b/templates/mod/login.html index 6ffd950f..6ed8dc64 100644 --- a/templates/mod/login.html +++ b/templates/mod/login.html @@ -7,7 +7,7 @@ {% trans 'Username' %} - + diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html index 867312c4..e4871275 100644 --- a/templates/mod/view_ip.html +++ b/templates/mod/view_ip.html @@ -103,7 +103,7 @@
{% trans 'New ban' %} {% set redirect = '?/IP/' ~ ip|cloak_ip ~ '#bans' %} - {% include 'mod/ban_form.html' %} + {% include 'mod/ban_form.html' with { 'reasons': config.premade_ban_reasons } %}
{% endif %} diff --git a/templates/post/fileinfo.html b/templates/post/fileinfo.html index ec490129..ae1dc092 100644 --- a/templates/post/fileinfo.html +++ b/templates/post/fileinfo.html @@ -1,16 +1,16 @@ {% if post.embed %} {{ post.embed }} - {% else %} -
- {% for file in post.files %} -
+ {% else %} +
+ {% for file in post.files %} +
{% if file.file == 'deleted' %} {% else %} -

File: {{ file.file }} +

File: {{ file.file }} ( {% if file.thumb == 'spoiler' %} - {% trans %}Spoiler Image{% endtrans %}, + {% trans %}Spoiler Image{% endtrans %}, {% endif %} {{ file.size|filesize }} {% if file.width and file.height %} @@ -21,18 +21,22 @@ {% endif %} {% if config.show_filename and file.filename %} , - {% if file.filename|length > config.max_filename_display %} - {{ file.filename|truncate_filename(config.max_filename_display)|e|bidi_cleanup }} + {% if file.thumb == 'spoiler' %} + {% trans %}Spoiler Image{% endtrans %} + {% elseif file.filename|length > config.max_filename_display %} + {{ file.filename|truncate_filename(config.max_filename_display)|e|bidi_cleanup }} {% else %} - {{ file.filename|e|bidi_cleanup }} + {{ file.filename|e|bidi_cleanup }} {% endif %} {% endif %} ) + {% include "post/image_identification.html" %} - {% include "post/file_controls.html" %}

+ {% include "post/file_controls.html" %} +

{% include "post/image.html" with {'post':file} %} {% endif %}
- {% endfor %} + {% endfor %}
- {% endif %} + {% endif %}