-
-
+
+
{% trans 'Back to the video' %}
diff --git a/pod/import_video/templates/import_video/add_or_edit.html b/pod/import_video/templates/import_video/add_or_edit.html
index a6592ca5b7..36dc5e9985 100644
--- a/pod/import_video/templates/import_video/add_or_edit.html
+++ b/pod/import_video/templates/import_video/add_or_edit.html
@@ -239,12 +239,14 @@ {% trans "Terms of Service
parents[parents.length-1].style.display = 'none';
}
};
-window.addEventListener('load', function(event) {
- is_restricted_elt = document.getElementById("id_is_restricted");
- is_restricted_elt.addEventListener('clicked',function (event) {
+is_restricted_elt = document.getElementById("id_is_restricted");
+if (is_restricted_elt !== null) {
+ window.addEventListener('load', function(event) {
+ is_restricted_elt.addEventListener('clicked',function (event) {
+ restrict_access_to_groups();
+ });
restrict_access_to_groups();
});
- restrict_access_to_groups();
-});
+}
{% endblock more_script %}
diff --git a/pod/live/templates/live/event-info.html b/pod/live/templates/live/event-info.html
index 19cb538e25..484319f8c3 100644
--- a/pod/live/templates/live/event-info.html
+++ b/pod/live/templates/live/event-info.html
@@ -91,19 +91,19 @@
{% trans "Terms of Service
parents[parents.length-1].style.display = 'none';
}
};
-window.addEventListener('load', function(event) {
- is_restricted_elt = document.getElementById("id_is_restricted");
- is_restricted_elt.addEventListener('clicked',function (event) {
+is_restricted_elt = document.getElementById("id_is_restricted");
+if (is_restricted_elt !== null) {
+ window.addEventListener('load', function(event) {
+ is_restricted_elt.addEventListener('clicked',function (event) {
+ restrict_access_to_groups();
+ });
restrict_access_to_groups();
});
- restrict_access_to_groups();
-});
+}
{% endblock more_script %}
diff --git a/pod/live/templates/live/event-info.html b/pod/live/templates/live/event-info.html
index 19cb538e25..484319f8c3 100644
--- a/pod/live/templates/live/event-info.html
+++ b/pod/live/templates/live/event-info.html
@@ -91,19 +91,19 @@
-
-
+
{% trans 'Share on Facebook' %}
-
-
+
{% trans 'Share on X (Twitter)' %}
-
-
+
{% trans 'Share on LinkedIn' %}
diff --git a/pod/live/templates/live/event_edit.html b/pod/live/templates/live/event_edit.html
index 2491904a04..ecbb70f36d 100644
--- a/pod/live/templates/live/event_edit.html
+++ b/pod/live/templates/live/event_edit.html
@@ -130,7 +130,7 @@
-
+
{% endif %}
\n"
+"Last-Translator: AymericJak \n"
"Language-Team: Pod Team pod@esup-portail.org\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
@@ -1213,8 +1213,9 @@ msgstr ""
#: pod/completion/models.py pod/enrichment/models.py pod/playlist/models.py
#: pod/recorder/models.py pod/video/models.py
+#: pod/video/templates/channel/channel.html
#: pod/video/templates/videos/video_breadcrumbs.html
-#: pod/video_encode_transcript/models.py
+#: pod/video/templates/videos/videos.html pod/video_encode_transcript/models.py
msgid "Video"
msgstr "Vidéo"
@@ -7147,6 +7148,10 @@ msgstr ""
msgid "Date of event"
msgstr "Date de l’évènement"
+#: pod/video/models.py
+msgid "The password is / will be encrypted."
+msgstr "Le mot de passe est / sera encrypté."
+
#: pod/video/models.py
msgid "Overview"
msgstr "Vue d’ensemble"
@@ -7304,13 +7309,18 @@ msgstr "Statistiques de vues"
#: pod/video/templates/channel/channel.html
#: pod/video/templates/videos/videos.html
-msgid "subscribe to the video feed"
-msgstr "souscrire au flux vidéo"
+msgid "Subscribe to the video feed"
+msgstr "Souscrire au flux vidéo"
+
+#: pod/video/templates/channel/channel.html
+#: pod/video/templates/videos/videos.html
+msgid "Subscribe to the audio feed"
+msgstr "Souscrire au flux audio"
#: pod/video/templates/channel/channel.html
#: pod/video/templates/videos/videos.html
-msgid "subscribe to the audio feed"
-msgstr "souscrire au flux audio"
+msgid "Audio"
+msgstr "Audio"
#: pod/video/templates/channel/channel.html
#: pod/video/templates/channel/my_channels.html
diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.mo b/pod/locale/fr/LC_MESSAGES/djangojs.mo
index e64905e29b..a698c2dc1e 100644
Binary files a/pod/locale/fr/LC_MESSAGES/djangojs.mo and b/pod/locale/fr/LC_MESSAGES/djangojs.mo differ
diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po
index 0b5914f280..2385306660 100644
--- a/pod/locale/fr/LC_MESSAGES/djangojs.po
+++ b/pod/locale/fr/LC_MESSAGES/djangojs.po
@@ -5,9 +5,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Esup-Pod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-19 12:22+0000\n"
+"POT-Creation-Date: 2023-09-21 12:16+0000\n"
"PO-Revision-Date: \n"
-"Last-Translator: obado \n"
+"Last-Translator: AymericJak \n"
"Language-Team: \n"
"Language: fr\n"
"MIME-Version: 1.0\n"
@@ -453,8 +453,8 @@ msgid "Add your picture"
msgstr "Ajouter votre image"
#: pod/main/static/js/main.js
-msgid "text copied"
-msgstr "texte copié"
+msgid "Text copied"
+msgstr "Texte copié"
#: pod/main/static/js/main.js
msgid "Errors appear in the form, please correct them"
diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po
index bae4f6d043..00818bb9f7 100644
--- a/pod/locale/nl/LC_MESSAGES/django.po
+++ b/pod/locale/nl/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-19 12:22+0000\n"
+"POT-Creation-Date: 2023-09-21 12:16+0000\n"
"PO-Revision-Date: 2023-06-08 14:37+0200\n"
"Last-Translator: obado \n"
"Language-Team: \n"
@@ -1148,8 +1148,9 @@ msgstr ""
#: pod/completion/models.py pod/enrichment/models.py pod/playlist/models.py
#: pod/recorder/models.py pod/video/models.py
+#: pod/video/templates/channel/channel.html
#: pod/video/templates/videos/video_breadcrumbs.html
-#: pod/video_encode_transcript/models.py
+#: pod/video/templates/videos/videos.html pod/video_encode_transcript/models.py
msgid "Video"
msgstr ""
@@ -6698,6 +6699,10 @@ msgstr ""
msgid "Date of event"
msgstr ""
+#: pod/video/models.py
+msgid "The password is / will be encrypted."
+msgstr ""
+
#: pod/video/models.py
msgid "Overview"
msgstr ""
@@ -6852,12 +6857,17 @@ msgstr ""
#: pod/video/templates/channel/channel.html
#: pod/video/templates/videos/videos.html
-msgid "subscribe to the video feed"
+msgid "Subscribe to the video feed"
+msgstr ""
+
+#: pod/video/templates/channel/channel.html
+#: pod/video/templates/videos/videos.html
+msgid "Subscribe to the audio feed"
msgstr ""
#: pod/video/templates/channel/channel.html
#: pod/video/templates/videos/videos.html
-msgid "subscribe to the audio feed"
+msgid "Audio"
msgstr ""
#: pod/video/templates/channel/channel.html
diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po
index c2472d12c4..1b6832e399 100644
--- a/pod/locale/nl/LC_MESSAGES/djangojs.po
+++ b/pod/locale/nl/LC_MESSAGES/djangojs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Esup-Pod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-19 12:22+0000\n"
+"POT-Creation-Date: 2023-09-21 12:16+0000\n"
"PO-Revision-Date: 2023-02-08 15:22+0100\n"
"Last-Translator: obado \n"
"Language-Team: \n"
@@ -432,7 +432,7 @@ msgid "Add your picture"
msgstr ""
#: pod/main/static/js/main.js
-msgid "text copied"
+msgid "Text copied"
msgstr ""
#: pod/main/static/js/main.js
diff --git a/pod/main/static/css/dark.css b/pod/main/static/css/dark.css
index 3971a3eeb5..d237d23292 100644
--- a/pod/main/static/css/dark.css
+++ b/pod/main/static/css/dark.css
@@ -71,10 +71,14 @@
}*/
/* switch logoPod color on dark theme */
-[data-theme="dark"] .pod-navbar__brand img{
+[data-theme="dark"] .pod-navbar__brand img {
filter: invert(100%) saturate(2908%) hue-rotate(27deg) brightness(121%) contrast(99%);
}
+[data-theme="dark"] .vjs-logo-button {
+ filter: brightness(0) invert(1);
+}
+
[data-theme="dark"] :not(.alert)>.btn-close {
filter: invert(100%);
}
@@ -171,10 +175,9 @@
color: #A8AFB5;
}
-[data-theme="dark"] .btn-outline-primary{
- background-color: #000;
+[data-theme="dark"] .btn-outline-primary {
--bs-btn-hover-bg: var(--pod-primary-darken-dark);
- color: var(--pod-primary-lighten-dark);
+ color: var(--pod-font-color);
}
[data-theme="dark"] .btn-outline-primary>svg {
diff --git a/pod/main/static/css/pod.css b/pod/main/static/css/pod.css
index d8d9b68a14..cb9a0e9578 100755
--- a/pod/main/static/css/pod.css
+++ b/pod/main/static/css/pod.css
@@ -1629,7 +1629,7 @@ table .alert.alert-danger.btn.pod-btn-social {
}
.vjs-logo-button {
- filter: invert(100%)
+ filter: invert(100%);
}
.vjs-logo-button:hover,
diff --git a/pod/main/static/js/main.js b/pod/main/static/js/main.js
index 6cfb4f05e5..4e85dda90f 100644
--- a/pod/main/static/js/main.js
+++ b/pod/main/static/js/main.js
@@ -1070,7 +1070,7 @@ if (btnpartageprive) {
var copyText = document.getElementById("txtpartageprive");
copyText.select();
document.execCommand("copy");
- showalert(gettext("text copied"), "alert-info");
+ showalert(gettext("Text copied"), "alert-info");
});
}
diff --git a/pod/main/templates/aside.html b/pod/main/templates/aside.html
index fa5a27f140..dd82becf0f 100644
--- a/pod/main/templates/aside.html
+++ b/pod/main/templates/aside.html
@@ -8,15 +8,15 @@
{% trans 'Share' %}
-
+
{% trans 'Share on Facebook' %}
-
+
{% trans 'Share on X (Twitter)' %}
-
+
{% trans 'Share on LinkedIn' %}
diff --git a/pod/main/templates/base.html b/pod/main/templates/base.html
index 7a8cf660b1..0f59dda399 100644
--- a/pod/main/templates/base.html
+++ b/pod/main/templates/base.html
@@ -82,9 +82,17 @@
diff --git a/pod/main/templates/navbar.html b/pod/main/templates/navbar.html
index e3e790cb26..c4f24b55bf 100644
--- a/pod/main/templates/navbar.html
+++ b/pod/main/templates/navbar.html
@@ -13,7 +13,7 @@
aria-controls="pod-navbar__menu" title="{% trans 'Toggle navigation' %}">
-
+
{{ TITLE_SITE }}
diff --git a/pod/meeting/templates/meeting/internal_recordings.html b/pod/meeting/templates/meeting/internal_recordings.html
index b9e5e1b579..c2e8f31135 100644
--- a/pod/meeting/templates/meeting/internal_recordings.html
+++ b/pod/meeting/templates/meeting/internal_recordings.html
@@ -51,7 +51,7 @@
{% endif %}
- {% if record.videoUrl != "" %}
+ {% if record.videoUrl != "" %}
diff --git a/pod/playlist/apps.py b/pod/playlist/apps.py
index e4d27f9728..a5d361427d 100644
--- a/pod/playlist/apps.py
+++ b/pod/playlist/apps.py
@@ -115,20 +115,23 @@ def create_new_favorites(self):
from pod.playlist.models import Playlist, PlaylistContent
from django.utils.translation import gettext_lazy as _
from django.contrib.auth.models import User
+ from django.contrib.sites.models import Site
# Add Favorites playlist for users without favorites
existing_users = User.objects.all()
users_without_favorites = existing_users.exclude(id__in=FAVORITES_DATA.keys())
for user in users_without_favorites:
- Playlist.objects.create(
+ Playlist.objects.get_or_create(
name=FAVORITE_PLAYLIST_NAME,
- description=_("Your favorites videos."),
- visibility="private",
- autoplay=True,
owner=user,
- editable=False,
+ site=Site.objects.get_current(),
+ defaults={
+ "description": _("Your favorites videos."),
+ "visibility": "private",
+ "autoplay": True,
+ "editable": False,
+ }
)
-
# Converting previous favorites to new system
for owner_id, data_lists in FAVORITES_DATA.items():
new_favorites_playlist = Playlist.objects.create(
diff --git a/pod/playlist/static/playlist/css/playlist.css b/pod/playlist/static/playlist/css/playlist.css
index 6132ce48b0..8fa72a64a6 100644
--- a/pod/playlist/static/playlist/css/playlist.css
+++ b/pod/playlist/static/playlist/css/playlist.css
@@ -183,6 +183,10 @@ a.player-element:not(.disabled):hover {
border: var(--bs-border-width) solid var(--pod-primary) !important;
}
+a.player-element:not(.disabled).selected:hover {
+ background-color: #BEBEBE;
+}
+
a.player-element.selected {
background-color: #D1D1D1;
}
diff --git a/pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js b/pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js
index 5fdff03a3d..8fcfaaab89 100644
--- a/pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js
+++ b/pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js
@@ -46,15 +46,17 @@ function refreshPlaylistsSearch() {
});
}
-
-// Add trigger event to manage sort direction.
-document
- .getElementById('sort_direction_label')
- .addEventListener('click', function (e) {
- e.preventDefault();
- toggleSortDirection();
+let playlist_list = document.getElementById("playlists_list");
+if (playlist_list.dataset.numberVideos >= 2) {
+ // Add trigger event to manage sort direction.
+ document
+ .getElementById('sort_direction_label')
+ .addEventListener('click', function (e) {
+ e.preventDefault();
+ toggleSortDirection();
+ refreshPlaylistsSearch();
+ });
+ document.getElementById('sort').addEventListener('change', function (e) {
refreshPlaylistsSearch();
});
-document.getElementById('sort').addEventListener('change', function (e) {
- refreshPlaylistsSearch();
-});
+}
diff --git a/pod/playlist/static/playlist/js/playlist-player.js b/pod/playlist/static/playlist/js/playlist-player.js
index efb71a500c..93d793c34a 100644
--- a/pod/playlist/static/playlist/js/playlist-player.js
+++ b/pod/playlist/static/playlist/js/playlist-player.js
@@ -10,6 +10,8 @@ function switchToNextVideo() {
}
playerElements[currentIndex + 1].classList.add('selected');
selectedElement.classList.remove('selected');
+ selectedElement.querySelector("span.rank").innerHTML = selectedElement.id;
+ playerElements[currentIndex + 1].querySelector("span.rank").innerHTML = '';
let nextElement = playerElements[currentIndex + 1];
if (!(nextElement.classList.contains('disabled'))) {
const videoSrc = playerElements[currentIndex + 1].getAttribute('href');
diff --git a/pod/playlist/templates/playlist/filter_aside.html b/pod/playlist/templates/playlist/filter_aside.html
index 97821b3d44..530fb9969d 100644
--- a/pod/playlist/templates/playlist/filter_aside.html
+++ b/pod/playlist/templates/playlist/filter_aside.html
@@ -72,7 +72,7 @@
document.location.href = urlWithoutGetOptions + "?visibility=allmy";
}
const visibilityValue = new URL(window.location).searchParams.get("visibility");
- if (!visibilityValue || !["private", "password-protected", "additional", "public", "promoted", "allmy", "allpublic", "all"].includes(visibilityValue)) {
+ if (!visibilityValue || !["private", "protected", "additional", "public", "promoted", "allmy", "allpublic", "all"].includes(visibilityValue)) {
redirectToAllPlaylists();
}
diff --git a/pod/playlist/templates/playlist/playlist_sort_select.html b/pod/playlist/templates/playlist/playlist_sort_select.html
index 0cffcfcbd6..607ffb6840 100644
--- a/pod/playlist/templates/playlist/playlist_sort_select.html
+++ b/pod/playlist/templates/playlist/playlist_sort_select.html
@@ -2,9 +2,9 @@
{% if sort_direction == 'on' %}
-
+
{% else %}
-
+
{% endif %}
diff --git a/pod/playlist/templates/playlist/playlists.html b/pod/playlist/templates/playlist/playlists.html
index 6ccaf14821..a336d6102e 100644
--- a/pod/playlist/templates/playlist/playlists.html
+++ b/pod/playlist/templates/playlist/playlists.html
@@ -35,7 +35,7 @@ {% trans "No playlists found"%}
-
+
{% for playlist in playlists %}
{% include "playlist/playlist_card.html" %}
diff --git a/pod/video/apps.py b/pod/video/apps.py
index 5c7d8814de..4a093c1c1a 100644
--- a/pod/video/apps.py
+++ b/pod/video/apps.py
@@ -58,6 +58,19 @@ def fix_transcript(sender, **kwargs):
Video.objects.filter(transcript="0").update(transcript="")
+def update_video_passwords(sender, **kwargs):
+ """Encrypt all video passwords."""
+ from pod.video.models import Video
+ from django.contrib.auth.hashers import make_password
+ from django.db.models import Q
+ # Filter insecure protected videos
+ videos_to_update = Video.objects.filter(
+ Q(password__isnull=False) & ~Q(password__startswith=('pbkdf2', 'sha256$')))
+ for video in videos_to_update:
+ video.password = make_password(video.password, hasher='pbkdf2_sha256')
+ video.save()
+
+
class VideoConfig(AppConfig):
name = "pod.video"
default_auto_field = "django.db.models.BigAutoField"
@@ -68,6 +81,7 @@ def ready(self):
post_migrate.connect(set_default_site, sender=self)
post_migrate.connect(self.send_previous_data, sender=self)
post_migrate.connect(fix_transcript, sender=self)
+ post_migrate.connect(update_video_passwords, sender=self)
def execute_query(self, query, mapping_dict):
"""
diff --git a/pod/video/models.py b/pod/video/models.py
index 3f556e941e..b8aa2cbdfb 100644
--- a/pod/video/models.py
+++ b/pod/video/models.py
@@ -34,6 +34,7 @@
from django.db.models.signals import pre_save
from pod.main.models import AdditionalChannelTab
import importlib
+from django.contrib.auth.hashers import make_password
from sorl.thumbnail import get_thumbnail
from pod.authentication.models import AccessGroup
@@ -815,7 +816,7 @@ class Video(models.Model):
)
password = models.CharField(
_("password"),
- help_text=_("Viewing this video will not be possible without this password."),
+ help_text=_("Viewing this video will not be possible without this password.") + " " + _("The password is / will be encrypted.") ,
max_length=50,
blank=True,
null=True,
@@ -858,6 +859,11 @@ class Meta:
verbose_name = _("video")
verbose_name_plural = _("videos")
+ def set_password(self):
+ """Encrypt the password if video is protected. An encrypted password cannot be re-encrypted."""
+ if self.password and not self.password.startswith(('pbkdf2', 'sha256$')):
+ self.password = make_password(self.password, hasher="pbkdf2_sha256")
+
def save(self, *args, **kwargs):
"""Store a video object in db."""
newid = -1
@@ -887,6 +893,7 @@ def save(self, *args, **kwargs):
newid = "%04d" % newid
self.slug = "%s-%s" % (newid, slugify(self.title))
self.tags = remove_accents(self.tags)
+ self.set_password()
super(Video, self).save(*args, **kwargs)
def __str__(self):
diff --git a/pod/video/templates/channel/channel.html b/pod/video/templates/channel/channel.html
index 971c6b9c0e..168ea2d349 100644
--- a/pod/video/templates/channel/channel.html
+++ b/pod/video/templates/channel/channel.html
@@ -58,21 +58,34 @@
{% if USE_STATS_VIEW %}
{% if theme %}
- {% trans 'Statistics views' %}
+
+ {% trans 'Statistics views' %}
+
{% else %}
- {% trans 'Statistics views' %}
+
+
+ {% trans 'Statistics views' %}
+
{% endif %}
{% endif %}
{% if theme %}
- Video
- Audio
+
+ {% trans "Video" %}
+
+
+ {% trans "Audio" %}
+
{% else %}
- Video
- Audio
+
+ {% trans "Video" %}
+
+
+ {% trans "Audio" %}
+
{% endif %}
{% if request.user in channel.owners.all %}
- {% trans "Edit the channel"%}
+ {% trans "Edit the channel"%}
{% endif %}
@@ -147,21 +160,29 @@
{% if theme %}
{% if USE_STATS_VIEW %}
- {% trans 'Statistics views' %}
+ {% trans 'Statistics views' %}
{% endif %}
- Video
- Audio
+
+ {% trans "Video" %}
+
+
+ {% trans "Audio" %}
+
{% else %}
{% if USE_STATS_VIEW %}
- {% trans 'Statistics views' %}
+ {% trans 'Statistics views' %}
{% endif %}
- Video
- Audio
+
+ {% trans "Video" %}
+
+
+ {% trans "Audio" %}
+
{% endif %}
{% if request.user in channel.owners.all %}
- {% trans "Edit the channel"%}
+ {% trans "Edit the channel"%}
{% endif %}
{% if theme %}
diff --git a/pod/video/templates/videos/card.html b/pod/video/templates/videos/card.html
index 2558047828..a80df022df 100644
--- a/pod/video/templates/videos/card.html
+++ b/pod/video/templates/videos/card.html
@@ -13,26 +13,26 @@
{{video.duration_in_time}}
{% if video.password or video.is_restricted %}
-
+
{% endif %}
{% if video.is_draft %}
-
-
+
+
{% endif %}
{% if video.chapter_set.all %}
-
+
{% endif %}
{% if video.is_video %}
-
+
{% else %}
-
+
{% endif %}
diff --git a/pod/video/templates/videos/category_modal_card.html b/pod/video/templates/videos/category_modal_card.html
index 6567bfe79f..fa4b5d6e16 100644
--- a/pod/video/templates/videos/category_modal_card.html
+++ b/pod/video/templates/videos/category_modal_card.html
@@ -6,12 +6,12 @@
{{video.duration_in_time}}
{% if video.is_video %}
-
+
{% else %}
-
-
+
+
{% endif %}
diff --git a/pod/video/templates/videos/link_video.html b/pod/video/templates/videos/link_video.html
index bc8ed950f0..f9148ae21a 100644
--- a/pod/video/templates/videos/link_video.html
+++ b/pod/video/templates/videos/link_video.html
@@ -7,7 +7,7 @@
{% if playlist %}
{% user_can_edit_or_remove playlist as can_edit_or_remove %}
{% if not in_favorites_playlist and can_edit_or_remove%}
-
+
{% endif %}
@@ -17,18 +17,18 @@
{% get_favorite_playlist user as fav_playlist %}
{% if USE_PLAYLIST and USE_FAVORITES and video.is_draft is False and not hide_favorite_link is True %}
{% if is_favorite %}
-
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if video.owner == request.user or request.user.is_superuser or request.user in video.additional_owners.all or perms.video.change_video %}
-
+
{% endif %}
{% comment %}
@@ -42,22 +42,22 @@
{% endif %}
{% endcomment %}
{% if video.owner == request.user or request.user.is_superuser or request.user in video.additional_owners.all or perms.completion.add_contributor or perms.completion.add_track or perms.completion.add_document or perms.completion.add_overlay %}
-
+
{% endif %}
{% if video.encoded and video.encoding_in_progress is False %}
{% if video.owner == request.user or request.user.is_superuser or perms.cut.cut_video %}
-
+
{% endif %}
{% endif %}
{% if video.owner == request.user or request.user.is_superuser or request.user in video.additional_owners.all or perms.chapter.change_chapter %}
-
+
{% endif %}
{% if video.encoded and video.encoding_in_progress is False %}
{% if video.owner == request.user or request.user.is_superuser or perms.video.delete_video %}
-
+
{% endif %}
{% endif %}
diff --git a/pod/video/templates/videos/video-info.html b/pod/video/templates/videos/video-info.html
index 572fbdbeb7..2e9f601bfa 100644
--- a/pod/video/templates/videos/video-info.html
+++ b/pod/video/templates/videos/video-info.html
@@ -319,19 +319,19 @@
-
diff --git a/pod/video/templates/videos/video_sort_select.html b/pod/video/templates/videos/video_sort_select.html
index 84bd904139..171e9aa703 100644
--- a/pod/video/templates/videos/video_sort_select.html
+++ b/pod/video/templates/videos/video_sort_select.html
@@ -2,9 +2,9 @@
{% if sort_direction == 'on' %}
-
+
{% else %}
-
+
{% endif %}
diff --git a/pod/video/templates/videos/videos.html b/pod/video/templates/videos/videos.html
index 7acf7a31a5..3e0a03e3fb 100644
--- a/pod/video/templates/videos/videos.html
+++ b/pod/video/templates/videos/videos.html
@@ -22,12 +22,16 @@
{% blocktrans count counter=count_videos %}{{ counter }} video found{% plural %}{{ counter }} videos found{% endblocktrans %}
-
- Audio
-
- Video
+
+ {% trans "Audio" %}
+
+
+ {% trans "Video" %}
+
{% if USE_STATS_VIEW %}
- {% trans "Statistics views" %}
+
+ {% trans "Statistics views" %}
+
{% endif %}
- - + {% trans 'Share on Facebook' %}
- - + {% trans 'Share on X (Twitter)' %}
-
-
+
{% trans 'Share on LinkedIn' %}
diff --git a/pod/live/templates/live/event_edit.html b/pod/live/templates/live/event_edit.html
index 2491904a04..ecbb70f36d 100644
--- a/pod/live/templates/live/event_edit.html
+++ b/pod/live/templates/live/event_edit.html
@@ -130,7 +130,7 @@
- + {% endif %} \n" +"Last-Translator: AymericJak
{% trans 'Share' %}
- + {% trans 'Share on Facebook' %} - + {% trans 'Share on X (Twitter)' %} - + {% trans 'Share on LinkedIn' %} diff --git a/pod/main/templates/base.html b/pod/main/templates/base.html index 7a8cf660b1..0f59dda399 100644 --- a/pod/main/templates/base.html +++ b/pod/main/templates/base.html @@ -82,9 +82,17 @@ diff --git a/pod/main/templates/navbar.html b/pod/main/templates/navbar.html index e3e790cb26..c4f24b55bf 100644 --- a/pod/main/templates/navbar.html +++ b/pod/main/templates/navbar.html @@ -13,7 +13,7 @@ aria-controls="pod-navbar__menu" title="{% trans 'Toggle navigation' %}"> - +
document.location.href = urlWithoutGetOptions + "?visibility=allmy"; } const visibilityValue = new URL(window.location).searchParams.get("visibility"); - if (!visibilityValue || !["private", "password-protected", "additional", "public", "promoted", "allmy", "allpublic", "all"].includes(visibilityValue)) { + if (!visibilityValue || !["private", "protected", "additional", "public", "promoted", "allmy", "allpublic", "all"].includes(visibilityValue)) { redirectToAllPlaylists(); } diff --git a/pod/playlist/templates/playlist/playlist_sort_select.html b/pod/playlist/templates/playlist/playlist_sort_select.html index 0cffcfcbd6..607ffb6840 100644 --- a/pod/playlist/templates/playlist/playlist_sort_select.html +++ b/pod/playlist/templates/playlist/playlist_sort_select.html @@ -2,9 +2,9 @@
{% if sort_direction == 'on' %} - + {% else %} - + {% endif %} diff --git a/pod/playlist/templates/playlist/playlists.html b/pod/playlist/templates/playlist/playlists.html index 6ccaf14821..a336d6102e 100644 --- a/pod/playlist/templates/playlist/playlists.html +++ b/pod/playlist/templates/playlist/playlists.html @@ -35,7 +35,7 @@-{% trans "No playlists found"%}
+{% for playlist in playlists %}{% include "playlist/playlist_card.html" %} diff --git a/pod/video/apps.py b/pod/video/apps.py index 5c7d8814de..4a093c1c1a 100644 --- a/pod/video/apps.py +++ b/pod/video/apps.py @@ -58,6 +58,19 @@ def fix_transcript(sender, **kwargs): Video.objects.filter(transcript="0").update(transcript="") +def update_video_passwords(sender, **kwargs): + """Encrypt all video passwords.""" + from pod.video.models import Video + from django.contrib.auth.hashers import make_password + from django.db.models import Q + # Filter insecure protected videos + videos_to_update = Video.objects.filter( + Q(password__isnull=False) & ~Q(password__startswith=('pbkdf2', 'sha256$'))) + for video in videos_to_update: + video.password = make_password(video.password, hasher='pbkdf2_sha256') + video.save() + + class VideoConfig(AppConfig): name = "pod.video" default_auto_field = "django.db.models.BigAutoField" @@ -68,6 +81,7 @@ def ready(self): post_migrate.connect(set_default_site, sender=self) post_migrate.connect(self.send_previous_data, sender=self) post_migrate.connect(fix_transcript, sender=self) + post_migrate.connect(update_video_passwords, sender=self) def execute_query(self, query, mapping_dict): """ diff --git a/pod/video/models.py b/pod/video/models.py index 3f556e941e..b8aa2cbdfb 100644 --- a/pod/video/models.py +++ b/pod/video/models.py @@ -34,6 +34,7 @@ from django.db.models.signals import pre_save from pod.main.models import AdditionalChannelTab import importlib +from django.contrib.auth.hashers import make_password from sorl.thumbnail import get_thumbnail from pod.authentication.models import AccessGroup @@ -815,7 +816,7 @@ class Video(models.Model): ) password = models.CharField( _("password"), - help_text=_("Viewing this video will not be possible without this password."), + help_text=_("Viewing this video will not be possible without this password.") + " " + _("The password is / will be encrypted.") , max_length=50, blank=True, null=True, @@ -858,6 +859,11 @@ class Meta: verbose_name = _("video") verbose_name_plural = _("videos") + def set_password(self): + """Encrypt the password if video is protected. An encrypted password cannot be re-encrypted.""" + if self.password and not self.password.startswith(('pbkdf2', 'sha256$')): + self.password = make_password(self.password, hasher="pbkdf2_sha256") + def save(self, *args, **kwargs): """Store a video object in db.""" newid = -1 @@ -887,6 +893,7 @@ def save(self, *args, **kwargs): newid = "%04d" % newid self.slug = "%s-%s" % (newid, slugify(self.title)) self.tags = remove_accents(self.tags) + self.set_password() super(Video, self).save(*args, **kwargs) def __str__(self): diff --git a/pod/video/templates/channel/channel.html b/pod/video/templates/channel/channel.html index 971c6b9c0e..168ea2d349 100644 --- a/pod/video/templates/channel/channel.html +++ b/pod/video/templates/channel/channel.html @@ -58,21 +58,34 @@diff --git a/pod/video/templates/videos/video_sort_select.html b/pod/video/templates/videos/video_sort_select.html index 84bd904139..171e9aa703 100644 --- a/pod/video/templates/videos/video_sort_select.html +++ b/pod/video/templates/videos/video_sort_select.html @@ -2,9 +2,9 @@{% if USE_STATS_VIEW %} {% if theme %} - {% trans 'Statistics views' %} + + {% trans 'Statistics views' %} + {% else %} - {% trans 'Statistics views' %} + + + {% trans 'Statistics views' %} + {% endif %} {% endif %} {% if theme %} - Video - Audio + + {% trans "Video" %} + + + {% trans "Audio" %} + {% else %} - Video - Audio + + {% trans "Video" %} + + + {% trans "Audio" %} + {% endif %} {% if request.user in channel.owners.all %} - {% trans "Edit the channel"%} + {% trans "Edit the channel"%} {% endif %}
@@ -147,21 +160,29 @@{% if theme %} {% if USE_STATS_VIEW %} - {% trans 'Statistics views' %} + {% trans 'Statistics views' %} {% endif %} - Video - Audio + + {% trans "Video" %} + + + {% trans "Audio" %} + {% else %} {% if USE_STATS_VIEW %} - {% trans 'Statistics views' %} + {% trans 'Statistics views' %} {% endif %} - Video - Audio + + {% trans "Video" %} + + + {% trans "Audio" %} + {% endif %} {% if request.user in channel.owners.all %} - {% trans "Edit the channel"%} + {% trans "Edit the channel"%} {% endif %} {% if theme %} diff --git a/pod/video/templates/videos/card.html b/pod/video/templates/videos/card.html index 2558047828..a80df022df 100644 --- a/pod/video/templates/videos/card.html +++ b/pod/video/templates/videos/card.html @@ -13,26 +13,26 @@ {{video.duration_in_time}} {% if video.password or video.is_restricted %} - + {% endif %} {% if video.is_draft %} - - + + {% endif %} {% if video.chapter_set.all %} - + {% endif %} {% if video.is_video %} - + {% else %} - + {% endif %} diff --git a/pod/video/templates/videos/category_modal_card.html b/pod/video/templates/videos/category_modal_card.html index 6567bfe79f..fa4b5d6e16 100644 --- a/pod/video/templates/videos/category_modal_card.html +++ b/pod/video/templates/videos/category_modal_card.html @@ -6,12 +6,12 @@ {{video.duration_in_time}} {% if video.is_video %} - + {% else %} - - + + {% endif %} diff --git a/pod/video/templates/videos/link_video.html b/pod/video/templates/videos/link_video.html index bc8ed950f0..f9148ae21a 100644 --- a/pod/video/templates/videos/link_video.html +++ b/pod/video/templates/videos/link_video.html @@ -7,7 +7,7 @@ {% if playlist %} {% user_can_edit_or_remove playlist as can_edit_or_remove %} {% if not in_favorites_playlist and can_edit_or_remove%} - + {% endif %} @@ -17,18 +17,18 @@ {% get_favorite_playlist user as fav_playlist %} {% if USE_PLAYLIST and USE_FAVORITES and video.is_draft is False and not hide_favorite_link is True %} {% if is_favorite %} - + {% else %} - + {% endif %} {% endif %} {% if video.owner == request.user or request.user.is_superuser or request.user in video.additional_owners.all or perms.video.change_video %} - + {% endif %} {% comment %} @@ -42,22 +42,22 @@ {% endif %} {% endcomment %} {% if video.owner == request.user or request.user.is_superuser or request.user in video.additional_owners.all or perms.completion.add_contributor or perms.completion.add_track or perms.completion.add_document or perms.completion.add_overlay %} - + {% endif %} {% if video.encoded and video.encoding_in_progress is False %} {% if video.owner == request.user or request.user.is_superuser or perms.cut.cut_video %} - + {% endif %} {% endif %} {% if video.owner == request.user or request.user.is_superuser or request.user in video.additional_owners.all or perms.chapter.change_chapter %} - + {% endif %} {% if video.encoded and video.encoding_in_progress is False %} {% if video.owner == request.user or request.user.is_superuser or perms.video.delete_video %} - + {% endif %} {% endif %} diff --git a/pod/video/templates/videos/video-info.html b/pod/video/templates/videos/video-info.html index 572fbdbeb7..2e9f601bfa 100644 --- a/pod/video/templates/videos/video-info.html +++ b/pod/video/templates/videos/video-info.html @@ -319,19 +319,19 @@
{% if sort_direction == 'on' %} - + {% else %} - + {% endif %} diff --git a/pod/video/templates/videos/videos.html b/pod/video/templates/videos/videos.html index 7acf7a31a5..3e0a03e3fb 100644 --- a/pod/video/templates/videos/videos.html +++ b/pod/video/templates/videos/videos.html @@ -22,12 +22,16 @@{% blocktrans count counter=count_videos %}{{ counter }} video found{% plural %}{{ counter }} videos found{% endblocktrans %}
- - Audio - - Video + + {% trans "Audio" %} + + + {% trans "Video" %} + {% if USE_STATS_VIEW %} - {% trans "Statistics views" %} + + {% trans "Statistics views" %} + {% endif %}