0.8.1 Alle Cloudzugriffssachen geklärt, Sicherheitslücken geschlossen bei den div. Views perlogin_required, zwei Bugs bei Gruppenprozessen gelöst und einmal durcgeklickt. QS NEEDcd Documents/GIT/digitaleagentur/!

areas/views.py

@@ -7,37 +7,41 @@ from .forms import AreaAddAreaForm
 from django.contrib.auth.models import User
 from django.http import HttpResponse, JsonResponse
 import json
+from django.contrib.auth.decorators import login_required
 
-
+@login_required
 def area_addareas_ajax(request):
 	if request.method == 'GET':		
-
 		# ADD USER TO MANY-TO-MANY USERSFIELD
 		if request.GET['action'] == 'adduser':
 			area = Areas.objects.get(pk=request.GET['objectid'])
-			area.usersfield.add(User.objects.get(pk=request.GET['userid']))
+
-			area.save()
+			if(area.agency == request.user.profile.agency):
+				area.usersfield.add(User.objects.get(pk=request.GET['userid']))
+				area.save()
 		# REMOVE USER TO MANY-TO-MANY USERSFIELD
 		elif request.GET['action'] == 'remuser':
 			area = Areas.objects.get(pk=request.GET['objectid'])
-			area.usersfield.remove(User.objects.get(pk=request.GET['userid']))
+			if(area.agency == request.user.profile.agency):
-			area.save()
+				area.usersfield.remove(User.objects.get(pk=request.GET['userid']))
+				area.save()
 		userid = request.GET['userid']
 		workinguser = User.objects.get(pk=userid)
 		username_clean = workinguser.first_name + " " + workinguser.last_name
 		
 		# Getting Remaining-Users
 		area = Areas.objects.get(pk=request.GET['objectid'])
-		added_users = area.usersfield.all()
+		if(area.agency == request.user.profile.agency):
-		possible_users = User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).exclude(pk__in=added_users)
+			added_users = area.usersfield.all()
-		possible_users_js = list(possible_users.values())
+			possible_users = User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).exclude(pk__in=added_users)
-		# Cleaned out, that only data is neede will send to the side (first/last-name and id)
+			possible_users_js = list(possible_users.values())
-		final_possible_users = {}
+			# Cleaned out, that only data is neede will send to the side (first/last-name and id)
-		for ele in possible_users_js:
+			final_possible_users = {}
-			final_possible_users.update({'first_name':ele['first_name'],'last_name':ele['last_name'],'id':ele['id']})
+			for ele in possible_users_js:			
-		# Counter for remaining users to show/hide "Keine Mitarbeiter"-Div
+				final_possible_users.update({'first_name':ele['first_name'],'last_name':ele['last_name'],'id':ele['id']})
-		remaining_users_counter = len(added_users)
+			# Counter for remaining users to show/hide "Keine Mitarbeiter"-Div
-		return JsonResponse({'userid' : userid, 'username_clean' : username_clean, 'remaining_users':possible_users_js, 'remaining_users_counter' : final_possible_users})
+			remaining_users_counter = len(added_users)
+			return JsonResponse({'userid' : userid, 'username_clean' : username_clean, 'remaining_users':possible_users_js, 'remaining_users_counter' : final_possible_users})
 	else:
 		return HttpResponse("Request method is not a GET")
 
@@ -54,14 +58,16 @@ def area_addareas_ajax(request):
 	Save all areas after drag n drop elements in table
 
 '''
+@login_required
 def area_neworder(request):
 	if request.method == 'GET':
 		if request.GET['action'] == 'newareaorder':
 			neworderdata = json.loads(request.GET['finalod'])
 			for ele in neworderdata:				
 				area = Areas.objects.get(pk=ele['id'])
-				area.areaorder = ele['neworder']
+				if(area.agency == request.user.profile.agency):
-				area.save()
+					area.areaorder = ele['neworder']
+					area.save()
 		return HttpResponse("UPDATED")
 	else:
 		return HttpResponse("Request method is not a GET")

ckeditorplugins/youtube/LICENSE.md

@@ -1,15 +0,0 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-
-

ckeditorplugins/youtube/README.md

@@ -1,156 +0,0 @@
-Youtube Plugin for CKEditor 4
-=============================
-
-Copyright © 2017 Jonnas Fonini <jonnasfonini@gmail.com>.
-
-This work is free. You can redistribute it and/or modify it under the
-terms of the Do What The Fuck You Want To Public License, Version 2,
-as published by Sam Hocevar. See the LICENSE file for more details.
-
-This plugin allow you to insert Youtube videos using embed code or just the video URL.
-
-## Installation
-
-### With NPM
-
- 1. npm install ckeditor-youtube-plugin
-
- 2. Add the plugin to CKEditor (config.js):
-
-    ````js
-    CKEDITOR.plugins.addExternal('youtube', '../node_modules/ckeditor-youtube-plugin/youtube/');
-
-    config.extraPlugins = 'youtube';
-    ````
-
-    You may need to adjust the plugin path. The example is assuming that you have the following directory structure:
-
-    ```
-    project
-    └───ckeditor
-    │   └───config.js
-    └───node_modules
-        └───ckeditor-youtube-plugin
-    ```
-
-### Manual
-
-Follow these steps:
-
- 1. Download the latest version of the plugin from Github.
- 2. Extract the downloaded file into the CKEditor's **plugins** folder.
- 3. Enable the plugin by changing or adding the extraPlugins line in your configuration (config.js):
-
-    ````js
-    config.extraPlugins = 'youtube';
-    ````
-
-## Configuration
-The default options can be overriden on config.js.
-
-Video width:
-
-```js
-config.youtube_width = '640';
-```
-
-Video height:
-
-```js
-config.youtube_height = '480';
-```
-
-Make responsive (ignore width and height, fit to width):
-
-```js
-config.youtube_responsive = true;
-```
-
-Show related videos:
-
-```js
-config.youtube_related = true;
-```
-
-Use old embed code:
-
-```js
-config.youtube_older = false;
-```
-
-Enable privacy-enhanced mode:
-
-```js
-config.youtube_privacy = false;
-```
-
-Start video automatically:
-
-```js
-config.youtube_autoplay = false;
-```
-
-Show player controls:
-
-```js
-config.youtube_controls = true;
-```
-
-Disable the change of settings. The elements on the list will be disabled (but still visible).
-See the available element list below.
-
-```js
-config.youtube_disabled_fields = ['txtEmbed', 'chkAutoplay'];
-```
-
-#### List of UI elements
-
-* txtEmbed
-* txtUrl
-* txtWidth
-* txtHeight
-* chkResponsive
-* chkNoEmbed
-* chkRelated
-* chkOlderCode
-* chkPrivacy
-* chkAutoplay
-* txtStartAt
-* chkControls
-
-
-## How to use
-If everything is ok, a Youtube icon should appear on the CKEditor toolbar. Click it,
-paste your embed code or video URL and the video will be inserted.
-
-## Translators
-Thanks to those who helped translate the plugin
-
- * Eyed Farra (ar)
- * N. Petkov (bg)
- * Lukáš Říha (cs)
- * Sven Jansen (de)
- * Dimitris Kotsakis (el)
- * Victor (pollin14) (es)
- * Kevin Rudissaar (et)
- * Asier Iturralde Sarasola (eu)
- * Jami Pietilä (fi)
- * BiomanRouge (fr)
- * Moshe Simantov (he)
- * Karmacsi Gábor (hu)
- * Francesco Zanoni (it)
- * Yayoshi Nobuhide (ja)
- * MinSoo Kim (ko)
- * Holger Lockertsen (nb, nn)
- * Patrick van Lier (nl)
- * Michał Zalewski, Wirek (pl)
- * Samuel Diogo (pt-br)
- * Alexander Ustimenko (ru)
- * ivanbarlog (sk)
- * Çağdaş Yiğit (tr)
- * Mykola Pukhalskyi (uk)
- * Vu Thao (vi)
- * trowa (zh)
-
-
-[![Licensed under the WTFPL](http://www.wtfpl.net/wp-content/uploads/2012/12/wtfpl-badge-2.png "Licensed under the WTFPL")](http://www.wtfpl.net)

ckeditorplugins/youtube/bower.json

@@ -1,19 +0,0 @@
-{
-  "name": "ckeditor-youtube-plugin",
-  "version": "2.1.13",
-  "homepage": "https://github.com/fonini/ckeditor-youtube-plugin",
-  "authors": [
-    "Jonnas Fonini"
-  ],
-  "license": "MIT",
-  "dependencies": {
-    "ckeditor": ">= 4.0.0"
-  },
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ]
-}

ckeditorplugins/youtube/package.json

@@ -1,22 +0,0 @@
-{
-  "name": "ckeditor-youtube-plugin",
-  "description": "Youtube plugin for CKEditor",
-  "version": "2.1.13",
-  "author": "fonini",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/fonini/ckeditor-youtube-plugin"
-  },
-  "keywords": [
-    "CKEditor",
-    "youtube",
-    "embed"
-  ],
-  "files": [
-    "youtube/",
-    "LICENSE.md",
-    "README.md",
-    "bower.json",
-    "package.json"
-  ]
-}

ckeditorplugins/youtube/youtube/lang/ar.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'ar', {
-	button : 'شيفرة تضمين اليوتيوب',
-	title : 'شيفرة تضمين اليوتيوب',
-	txtEmbed : 'الصق شيفرة التضمين هنا',
-	txtUrl : 'الصق رابط فيديو اليوتيوب',
-	txtWidth : 'العرض',
-	txtHeight : 'الطول',
-	chkRelated : 'اظهر الفيديوهات المقترحة في نهاية الفيديو',
-	txtStartAt : 'ابدأ عند (ss او mm:ss او hh:mm:ss)',
-	chkPrivacy : 'تفعيل وضع تحسين الخصوصية',
-	chkOlderCode : 'استخدم شيفرة التضمين القديمة',
-	chkAutoplay : 'Autoplay',
-	chkControls: 'إظهار عناصر التحكم بالمشغّل',
-	noCode : 'يجب عليك ادخال شيفرة التضمين او الرابط',
-	invalidEmbed : 'شيفرة التضمين التي قمت بإدخالها تبدو غير صحيحة',
-	invalidUrl : 'الرابط الذي قمت بإدخاله يبدو غير صحيح',
-	or : 'او',
-	noWidth : 'يجب عليك ادخال العرض',
-	invalidWidth : 'يجب عليك ادخال عرض صحيح',
-	noHeight : 'يجب عليك ادخال الطول',
-	invalidHeight : 'يجب عليك ادخال طول صحيح',
-	invalidTime : 'يجب عليك ادخال وقت بداية صحيح',
-	txtResponsive : 'Responsive video'
-});

ckeditorplugins/youtube/youtube/lang/bg.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'bg', {
-	button : 'Вмъкни YouTube видео',
-	title : 'Вграждане на YouTube видео',
-	txtEmbed : 'Въведете кода за вграждане тук',
-	txtUrl : 'Въведете YouTube видео URL',
-	txtWidth : 'Ширина',
-	txtHeight : 'Височина',
-	chkRelated : 'Показва предложени видеоклипове в края на клипа',
-	txtStartAt : 'Стартирай в (ss или mm:ss или hh:mm:ss)',
-	chkPrivacy : 'Активирай режим за поверителност',
-	chkOlderCode : 'Използвай стар код за вграждане',
-	chkAutoplay: 'Авто стартиране',
-	chkControls: 'Показва контролите на плейъра',
-	noCode : 'Трябва да въведете код за вграждане или URL адрес',
-	invalidEmbed : 'Кодът за вграждане, който сте въвели, не изглежда валиден',
-	invalidUrl : 'Въведеният URL адрес не изглежда валиден',
-	or : 'или',
-	noWidth : 'Трябва да заложите ширината',
-	invalidWidth : 'Заложете валидна ширина',
-	noHeight : 'Трябва да заложите височина',
-	invalidHeight : 'Заложете валидна височина',
-	invalidTime : 'Заложете валидно време за стартиране',
-	txtResponsive : 'Напасва по ширина (игнорира Ширина и Височина)',
-	txtNoEmbed : 'Само видео изображение и връзка'
-});

ckeditorplugins/youtube/youtube/lang/cs.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'cs', {
-	button : 'Vložit video YouTube',
-	title : 'Vložit video YouTube',
-	txtEmbed : 'Zde vložte kód pro vložení',
-	txtUrl : 'Vložte adresu URL videa YouTube',
-	txtWidth : 'Šířka',
-	txtHeight : 'Výška',
-	chkRelated : 'Po dohrání videa zobrazit navrhovaná videa',
-	txtStartAt : 'Začít přehrávat v čase (ss nebo mm:ss nebo hh:mm:ss)',
-	chkPrivacy : 'Povolit režim s rozšířeným soukromím',
-	chkOlderCode : 'Použít starý kód pro vložení',
-	chkAutoplay : 'Automatické spuštění přehrávání',
-	chkControls : 'Zobrazit ovladače přehrávání',
-	noCode : 'Musíte vložit kód pro vložení nebo adresu URL',
-	invalidEmbed : 'Vložený kód pro vložení zřejmě není platný',
-	invalidUrl : 'Zadaná adresa URL zřejmě není platná',
-	or : 'nebo',
-	noWidth : 'Musíte zadat šířku',
-	invalidWidth : 'Zadejte platnou šířku',
-	noHeight : 'Musíte zadat výšku',
-	invalidHeight : 'Zadejte platnou výšku',
-	invalidTime : 'Zadejte platný počáteční čas',
-	txtResponsive : 'Responzivní design (ignorovat výšku a šířku, uzpůsobit šířce)',
-	txtNoEmbed : 'Pouze obrázek videa s odkazem'
-});

ckeditorplugins/youtube/youtube/lang/de.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'de', {
-	button : 'YouTube Video einbinden',
-	title : 'YouTube Video einbinden',
-	txtEmbed : 'Embed Code hier einfügen',
-	txtUrl : 'YouTube Video URL hier einfügen',
-	txtWidth : 'Breite',
-	txtHeight : 'Höhe',
-	chkRelated : 'Vorschläge am Ende des Videos einblenden',
-	txtStartAt : 'Start bei Position (ss oder mm:ss oder hh:mm:ss)',
-	chkPrivacy : 'Erweiterten Datenschutzmodus aktivieren',
-	chkOlderCode : 'Benutze alten Embed Code',
-	chkAutoplay : 'Autoplay',
-	chkControls : 'Player-Steuerelemente anzeigen',
-	noCode : 'Sie müssen einen Embed Code oder URL angeben',
-	invalidEmbed : 'Der angegebene Embed Code scheint nicht gültig zu sein.',
-	invalidUrl : 'Die angegebene URL scheint nicht gültig zu sein.',
-	or : 'oder',
-	noWidth : 'Geben Sie eine Breite an',
-	invalidWidth : 'Geben Sie eine gültige Breite an',
-	noHeight : 'Geben Sie eine Höhe an',
-	invalidHeight : 'Geben Sie eine gültige Höhe an',
-	invalidTime : 'Geben Sie eine gültige Startzeit an',
-	txtResponsive : 'Automatische Größe (ignoriert Breite und Höhe)'
-});

ckeditorplugins/youtube/youtube/lang/el.js

@@ -1,23 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'el', {
-    button: 'Ενσωμάτωση Youtube βίντεο',
-    title: 'Ενσωμάτωση Youtube βίντεο',
-    txtEmbed: 'Επικόλλησε τον κώδικα ενσωμάτωσης',
-    txtUrl: 'Επικόλλησε το URL του βίντεο',
-    txtWidth: 'Πλάτος',
-    txtHeight: 'Ύψος',
-    chkRelated: 'Εμφάνιση προτεινόμενων βίντεο μόλις ολοκληρωθεί',
-    txtStartAt: 'Χρόνος εκκίνησης (ss or mm:ss or hh:mm:ss)',
-    chkPrivacy: 'Ενεργοποίηση λειτουργίας ενισχυμένου απορρήτου',
-    chkOlderCode: 'Χρήση παλαιού κώδικα ενσωμάτωσης',
-    chkAutoplay: 'Αυτόματη εκκίνηση',
-    chkControls: 'Εμφάνιση στοιχείων ελέγχου προγράμματος αναπαραγωγής',
-    noCode: 'Χρειάζεται κώδικας ενσωμάτωσης ή URL',
-    invalidEmbed: 'Ο κώδικας ενσωμάτωσης που εισήγατε δεν μοιάζει σωστός',
-    invalidUrl: 'Το URL που εισήγατε δεν μοιάζει σωστό',
-    or: 'ή',
-    noWidth: 'Συμπληρώστε το πλάτος',
-    invalidWidth: 'Λανθασμένο πλάτος',
-    noHeight: 'Συμπληρώστε το ύψος',
-    invalidHeight: 'Λανθασμένο ύψος',
-    invalidTime: 'Λανθασμένος χρόνος εκκίνησης'
-});

ckeditorplugins/youtube/youtube/lang/en.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'en', {
-	button : 'Embed YouTube Video',
-	title : 'Embed YouTube Video',
-	txtEmbed : 'Paste Embed Code Here',
-	txtUrl : 'Paste YouTube Video URL',
-	txtWidth : 'Width',
-	txtHeight : 'Height',
-	chkRelated : 'Show suggested videos at the video\'s end',
-	txtStartAt : 'Start at (ss or mm:ss or hh:mm:ss)',
-	chkPrivacy : 'Enable privacy-enhanced mode',
-	chkOlderCode : 'Use old embed code',
-	chkAutoplay: 'Autoplay',
-	chkControls: 'Show player controls',
-	noCode : 'You must input an embed code or URL',
-	invalidEmbed : 'The embed code you\'ve entered doesn\'t appear to be valid',
-	invalidUrl : 'The URL you\'ve entered doesn\'t appear to be valid',
-	or : 'or',
-	noWidth : 'You must inform the width',
-	invalidWidth : 'Inform a valid width',
-	noHeight : 'You must inform the height',
-	invalidHeight : 'Inform a valid height',
-	invalidTime : 'Inform a valid start time',
-	txtResponsive : 'Make Responsive (ignore width and height, fit to width)',
-	txtNoEmbed : 'Video image and link only'
-});

ckeditorplugins/youtube/youtube/lang/es.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'es', {
-    button : 'Embed YouTube video',
-    title : 'Embed YouTube video',
-    txtEmbed : 'Pegar el código embed',
-    txtUrl : 'Pegar la URL al video de Youtube',
-    txtWidth : 'Anchura',
-    txtHeight : 'Altura',
-    chkRelated : 'Mostrar videos sugeridos al final de este video',
-    txtStartAt : 'Comenzar en (ss or mm:ss or hh:mm:ss)',
-    chkPrivacy : 'Habilitar el modo privacy-enhanced',
-    chkOlderCode : 'Usar código embed viejo',
-    chkAutoplay: 'Autoplay',
-    chkControls: 'Mostrar controles del reproductor',
-    noCode : 'Debes de introducir un código embed o URL',
-    invalidEmbed : 'El código embed introducido parece no ser valido',
-    invalidUrl : 'La URL introducida parece no ser valida',
-    or : 'o',
-    noWidth : 'Debes de dar la anchura',
-    invalidWidth : 'Da una anchura valida',
-    noHeight : 'Debes dar una altura valida',
-    invalidHeight : 'Da una altura valida',
-    invalidTime : 'Da un tiempo de valido',
-    txtResponsive : 'Hacer responsivo (ignorar anchura y altura, ajustar a la anchura)'
-});

ckeditorplugins/youtube/youtube/lang/et.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'et', {
-	button : 'Lisa YouTube video',
-	title : 'YouTube video lisamine',
-	txtEmbed : 'Kleepige manustatud kood siia',
-	txtUrl : 'Kleepige YouTube video veebiaadress',
-	txtWidth : 'Laius',
-	txtHeight : 'Kõrgus',
-	chkRelated : 'Näita soovitatud videosi antud video lõppus',
-	txtStartAt : 'Alguskoht: (ss või mm:ss või hh:mm:ss)',
-	chkPrivacy : 'Aktiveerige privaatsust täiendav režiim',
-	chkOlderCode : 'Kasutage vana manuskoodi',
-	chkAutoplay: 'Automaatesitlus',
-	chkControls : 'Kuva pleieri nupud',
-	noCode : 'Te peate sisestama video manuskoodi või veebiaadressi',
-	invalidEmbed : 'Manuskood mille sisestasite ei paista olevat korrektne',
-	invalidUrl : 'Veebiaadress mille sisestasite ei paista olevat korrektne',
-	or : 'või',
-	noWidth : 'Te peate sisestama video laiuse',
-	invalidWidth : 'Sisestage korrektne laius',
-	noHeight : 'Te peate sisestama video kõrguse',
-	invalidHeight : 'Sisestage korrektne kõrgus',
-	invalidTime : 'Sisestage korrektne algusaeg',
-	txtResponsive : 'Aktiveerige ekraani laiusega ühilduv režiim'
-});

ckeditorplugins/youtube/youtube/lang/eu.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'eu', {
-	button : 'Kapsulatu YouTube-ko bideoa',
-	title : 'Kapsulatu YouTube-ko bideoa',
-	txtEmbed : 'Itsatsi kapsulatzeko kodea hemen',
-	txtUrl : 'Itsatsi YouTube-ko bideoaren URLa',
-	txtWidth : 'Zabalera',
-	txtHeight : 'Altuera',
-	chkRelated : 'Erakutsi gomendatutako bideoak amaieran',
-	txtStartAt : 'Hasi hemendik (ss edo mm:ss edo hh:mm:ss)',
-	chkPrivacy : 'Gaitu pribatutasun hobetuko modua',
-	chkOlderCode : 'Erabili kapsulatzeko kode zaharra',
-	chkAutoplay: 'Erreproduzitu automatikoki',
-	chkControls: 'Erakutsi erreproduzigailuaren kontrolak',
-	noCode : 'Kapsulatzeko kode bat edo URL bat sartu behar duzu',
-	invalidEmbed : 'Sartu duzun kapsulatzeko kodea ez da baliozkoa',
-	invalidUrl : 'Sartu duzun URLa ez da baliozkoa',
-	or : 'edo',
-	noWidth : 'Zabalera sartu behar duzu',
-	invalidWidth : 'Sartu baliozko zabalera bat',
-	noHeight : 'Altuera sartu behar duzu',
-	invalidHeight : 'Sartu baliozko altuera bat',
-	invalidTime : 'Sartu baliozko hasierako denbora bat',
-	txtResponsive : 'Egin moldagarria (ez ikusia egin zabalera eta altuerari, zabalerara doitu)',
-	txtNoEmbed : 'Bideoaren irudia eta esteka soilik'
-});

ckeditorplugins/youtube/youtube/lang/fi.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'fi', {
-	button : 'Upota YouTube-video',
-	title : 'Upota YouTube-video',
-	txtEmbed : 'Syötä YouTube-videon upotuskoodi',
-	txtUrl : 'Syötä YouTube-videon www-osoite',
-	txtWidth : 'Leveys',
-	txtHeight : 'Korkeus',
-	chkRelated : 'Näytä suositukset lopussa',
-	txtStartAt : 'Aloitusaika (ss tai mm:ss tai tt:mm:ss)',
-	chkPrivacy : 'Aktivoi yksityisyyttä parantava tila',
-	chkOlderCode : 'Käytä vanhaa upotuskoodia',
-	chkAutoplay: 'Soita automaattisesti',
-	chkControls : 'Näytä soittimen ohjaimet',
-	noCode : 'Sinun täytyy syötää upotuskoodi tai www-osoite',
-	invalidEmbed : 'Upotuskoodi on virheellinen',
-	invalidUrl : 'Www-osoite on virheellinen',
-	or : 'tai',
-	noWidth : 'Syötä leveys',
-	invalidWidth : 'Leveys on virheellinen',
-	noHeight : 'Syötä korkeus',
-	invalidHeight : 'Korkeus on virheellinen',
-	invalidTime : 'Aloitusaika on virheellinen',
-	txtResponsive : 'Responsiivinen leveys (sovita leveys)'
-});

ckeditorplugins/youtube/youtube/lang/fr.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'fr', {
-	button : 'Insérer une vidéo Youtube',
-	title : 'Insérer une vidéo youtube',
-	txtEmbed : 'Coller le code embed ici',
-	txtUrl : 'Coller l\'url de la vidéo ici',
-	txtWidth : 'Largeur',
-	txtHeight : 'Hauteur',
-	chkRelated : 'Montrer les suggestions de vidéo à la fin',
-	txtStartAt : 'Commencer à (ss ou mm:ss ou hh:mm:ss)',
-	chkPrivacy : 'Activer la protection de la vie privée',
-	chkOlderCode : 'Utiliser l\'ancien code embed',
-	chkAutoplay : 'Autoplay',
-	chkControls : 'Afficher les commandes du lecteur',
-	noCode : 'Vous devez entrer un code embed ou une url',
-	invalidEmbed : 'Le code embed est invalide',
-	invalidUrl : 'L\'url est invalide',
-	or : 'ou',
-	noWidth : 'Vous devez saisir une largeur',
-	invalidWidth : 'La largeur saisie est invalide',
-	noHeight : 'Vous devez saisir une hauteur',
-	invalidHeight : 'La hauteur saisie est invalide',
-	invalidTime : 'Le temps de départ de la vidéo est invalide',
-	txtResponsive : 'Responsive video'
-});

ckeditorplugins/youtube/youtube/lang/he.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'he', {
-	button : 'שבץ וידאו של YouTube',
-	title : 'שבץ וידאו של YouTube',
-	txtEmbed : 'הדבק את קוד השיבוץ כאן',
-	txtUrl : 'הדבק כתובת וידאו YouTube',
-	txtWidth : 'אורך',
-	txtHeight : 'גובה',
-	chkRelated : 'הצג סרטונים מומלצים בסוף הודיאו',
-	txtStartAt : 'התחל ב (ss או mm:ss או hh:mm:ss)',
-	chkPrivacy : 'הפעל מצב פרטיות המשופרת',
-	chkOlderCode : 'השתמש בקוד הטמעה ישן',
-	chkAutoplay: 'הפעלה אוטומטית',
-	chkControls : 'הצג פקדי נגן',
-	noCode : 'אתה חייב להזין קוד embed כתובת וידאו אתר',
-	invalidEmbed : 'קוד ההטמעה שהוזן אינו נראה חוקי',
-	invalidUrl : 'כתובת הוידאו אינה נראת חוקית',
-	or : 'או',
-	noWidth : 'חובה להזין אורך',
-	invalidWidth : 'האורך שהוזן שגוי',
-	noHeight : 'חובה להזין גובה',
-	invalidHeight : 'הגובה שהוזן שגוי',
-	invalidTime : 'זמן התחלה שהוזן שגוי',
-	txtResponsive : 'הפוך לרספונסיבי (התעלם מרוחב וגובה, התאם לרוחב)'
-});

ckeditorplugins/youtube/youtube/lang/hu.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'hu', {
-	button : 'Youtube videó beillesztése',
-	title : 'Youtube videó beillesztése',
-	txtEmbed : 'Illessze be a beágyazott kódot',
-	txtUrl : 'Illessze be a Youtube videó URL-jét',
-	txtWidth : 'Szélesség',
-	txtHeight : 'Magasság',
-	txtStartAt : 'Kezdő időpont (ss vagy mm:ss vagy hh:mm:ss)',
-	chkRelated : 'Ajánlott videók megjelenítése, amikor a videó befejeződik',
-	chkPrivacy : 'Fokozott adatvédelmi mód engedélyezése',
-	chkOlderCode : 'Régi beágyazott kód használata',
-	chkAutoplay : 'Automatikus lejátszás',
-	chkControls : 'Lejátszásvezérlők mutatása',
-	noCode : 'A beágyazott kód, vagy az URL megadása kötelező',
-	invalidEmbed : 'A beágyazott kód érvénytelen',
-	invalidUrl : 'A megadott URL érvénytelen',
-	or : 'vagy',
-	noWidth : 'A szélesség megadása kötelező',
-	invalidWidth : 'Érvényes szélességet adjon meg',
-	noHeight : 'A magasság megadása kötelező',
-	invalidHeight : 'Érvényes magasságot adjon meg',
-	invalidTime : 'Érvényes kezdő időpontot adjon meg',
-	txtResponsive : 'Reszponzív videó',
-	txtNoEmbed : 'Csak kép és hivatkozás jelenjen meg'
-});

ckeditorplugins/youtube/youtube/lang/it.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'it', {
-	button : 'Incorpora video Youtube',
-	title : 'Incorpora video Youtube',
-	txtEmbed : 'Incolla qui il codice di incorporamento',
-	txtUrl : 'Incolla l\'URL del video Youtube',
-	txtWidth : 'Larghezza',
-	txtHeight : 'Altezza',
-	chkRelated : 'Mostra i video suggeriti dopo il video',
-	txtStartAt : 'Inizia a (ss o mm:ss o hh:mm:ss)',
-	chkPrivacy : 'Abilita la protezione della privacy',
-	chkOlderCode : 'Usa il vecchio codice di incorporamento',
-	chkAutoplay : 'Autoplay',
-	chkControls : 'Mostra i controlli del player',
-	noCode : 'Devi inserire un codice di incorporamento o un URL',
-	invalidEmbed : 'Il codice di incorporamento inserito non sembra valido',
-	invalidUrl : 'L\'URL inserito non sembra valido',
-	or : 'o',
-	noWidth : 'Devi indicare la larghezza',
-	invalidWidth : 'Indica una larghezza valida',
-	noHeight : 'Devi indicare l\'altezza',
-	invalidHeight : 'Indica un\'altezza valida',
-	invalidTime : 'Indica un tempo di inizio valido',
-	txtResponsive : 'Responsive video'
-});

ckeditorplugins/youtube/youtube/lang/ja.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'ja', {
-	button : 'Youtube動画埋め込み',
-	title : 'Youtube動画埋め込み',
-	txtEmbed : '埋め込みコードを貼り付けてください',
-	txtUrl : 'URLを貼り付けてください',
-	txtWidth : '幅',
-	txtHeight : '高さ',
-	chkRelated : '動画が終わったら関連動画を表示する',
-	txtStartAt : '開始時間（秒）',
-	chkPrivacy : 'プライバシー強化モードを有効にする',
-	chkOlderCode : '以前の埋め込みコードを使用する',
-	chkAutoplay : '自動再生',
-	chkControls: 'プレーヤーのコントロールを表示する',
-	noCode : '埋め込みコードまたはURLを入力してください',
-	invalidEmbed : '不適切な埋め込みコードが入力されました',
-	invalidUrl : '不適切なURLが入力されました',
-	or : 'または',
-	noWidth : '幅を指定してください',
-	invalidWidth : '幅指定に誤りがあります',
-	noHeight : '高さを指定してください',
-	invalidHeight : '高さ指定に誤りがあります',
-	invalidTime : '開始時間を正の整数で入力してください',
-	txtResponsive : 'レスポンシブ表示'
-});

ckeditorplugins/youtube/youtube/lang/ko.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'ko', {
-	button : '유투브 비디오 삽입',
-	title : '유투브 비디오 삽입',
-	txtEmbed : '여기 embed 코드를 붙여넣으세요',
-	txtUrl : '유투브 주소(URL)를 붙여넣으세요',
-	txtWidth : '너비',
-	txtHeight : '높이',
-	chkRelated : '비디오 마지막에 추천 영상 보이기',
-	txtStartAt : '시작 시점 (ss 또는 mm:ss 또는 hh:mm:ss)',
-	chkPrivacy : '개인정보 보호 모드 활성화',
-	chkOlderCode : '옛날 embed 코드 사용',
-	chkAutoplay: '자동 재생',
-	chkControls: '플레이어 컨트롤 표시',
-	noCode : 'embed 코드 또는 URL을 입력해야 합니다',
-	invalidEmbed : '입력하신 embed 코드가 유효하지 않습니다',
-	invalidUrl : '입력하신 주소(URL)가 유효하지 않습니다',
-	or : '또는',
-	noWidth : '너비를 알려주세요',
-	invalidWidth : '너비가 유효하지 않습니다',
-	noHeight : '높이를 알려주세요',
-	invalidHeight : '높이가 유효하지 않습니다',
-	invalidTime : '시작 시점이 유효하지 않습니다',
-	txtResponsive : '반응형 너비 (입력한 너비와 높이를 무시하고 창 너비에 맞춤)',
-	txtNoEmbed : '비디오 이미지와 링크만 달기'
-});

ckeditorplugins/youtube/youtube/lang/nb.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'nb', {
-	button : 'Bygg inn YouTube-video',
-	title : 'Bygg inn YouTube-video',
-	txtEmbed : 'Lim inn embed-kode her',
-	txtUrl : 'Lim inn YouTube video-URL',
-	txtWidth : 'Bredde',
-	txtHeight : 'Høyde',
-	chkRelated : 'Vis foreslåtte videoer når videoen er ferdig',
-	txtStartAt : 'Start ved (ss eller mm:ss eller hh:mm:ss)',
-	chkPrivacy : 'Bruk personverntilpasset modus',
-	chkOlderCode : 'Bruk gammel embedkode',
-	chkAutoplay: 'Spill automatisk',
-	chkControls: 'Vis spillerkontrollene',
-	noCode : 'Du må legge inn en embed-kode eller URL',
-	invalidEmbed : 'Emded-koden du la inn ser ikke ut til å være gyldig',
-	invalidUrl : 'URLen du la inn ser ikke ut til å være gyldig',
-	or : 'eller',
-	noWidth : 'Du må legge inn bredde',
-	invalidWidth : 'Legg inn en gyldig bredde',
-	noHeight : 'Du må legge inn høyde',
-	invalidHeight : 'Legg inn en gyldig høyde',
-	invalidTime : 'Legg inn gyldig starttid',
-	txtResponsive : 'Gjør responsiv (ignorer bredde og høyde, tilpass bredde på sida)'
-});

ckeditorplugins/youtube/youtube/lang/nl.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'nl', {
-	button : 'Youtube video insluiten',
-	title : 'Youtube video insluiten',
-	txtEmbed : 'Plak embedcode hier',
-	txtUrl : 'Plak video URL',
-	txtWidth : 'Breedte',
-	txtHeight : 'Hoogte',
-	chkRelated : 'Toon gesuggereerde video aan het einde van de video',
-	txtStartAt : 'Starten op (ss of mm:ss of hh:mm:ss)',
-	chkPrivacy : 'Privacy-enhanced mode inschakelen',
-	chkOlderCode : 'Gebruik oude embedcode',
-	chkAutoplay: 'Automatisch starten',
-	chkControls: 'Afspeelbediening weergeven',
-	noCode : 'U moet een embedcode of url ingeven',
-	invalidEmbed : 'De ingegeven embedcode lijkt niet geldig',
-	invalidUrl : 'De ingegeven url lijkt niet geldig',
-	or : 'of',
-	noWidth : 'U moet een breedte ingeven',
-	invalidWidth : 'U moet een geldige breedte ingeven',
-	noHeight : 'U moet een hoogte ingeven',
-	invalidHeight : 'U moet een geldige starttijd ingeven',
-	invalidTime : 'Inform a valid start time',
-	txtResponsive : 'Responsive video',
-	txtNoEmbed : 'Alleen video afbeelding en link'
-});

ckeditorplugins/youtube/youtube/lang/nn.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'nn', {
-	button : 'Bygg inn YouTube-video',
-	title : 'Bygg inn YouTube-video',
-	txtEmbed : 'Lim inn embed-kode her',
-	txtUrl : 'Lim inn YouTube video-URL',
-	txtWidth : 'Breidde',
-	txtHeight : 'Høgde',
-	chkRelated : 'Vis foreslåtte videoar når videoen er ferdig',
-	txtStartAt : 'Start ved (ss eller mm:ss eller hh:mm:ss)',
-	chkPrivacy : 'Bruk personverntilpassa modus',
-	chkOlderCode : 'Bruk gamal embedkode',
-	chkAutoplay: 'Spel automatisk',
-	chkControls: 'Vis spillerkontrollene',
-	noCode : 'Du må leggja inn ein embed-kode eller URL',
-	invalidEmbed : 'Emded-koden du la inn ser ikkje ut til å vera gyldig',
-	invalidUrl : 'URLen du la inn ser ikkje ut til å vera gyldig',
-	or : 'eller',
-	noWidth : 'Du må leggja inn breidde',
-	invalidWidth : 'Legg inn ei gyldig breidde',
-	noHeight : 'Du må leggja inn høgde',
-	invalidHeight : 'Legg inn ei gyldig høgde',
-	invalidTime : 'Legg inn gyldig starttid',
-	txtResponsive : 'Gjer responsiv (ignorer breidde og høgde, tilpass breidda på sida)'
-});

ckeditorplugins/youtube/youtube/lang/pl.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'pl', {
-	button : 'Załącznik wideo z YouTube',
-	title : 'Załącznik wideo z YouTube',
-	txtEmbed : 'Wklej kod do umieszczenia',
-	txtUrl : 'Wklej adres URL do wideo z YouTube',
-	txtWidth : 'Szerokość',
-	txtHeight : 'Wysokość',
-	chkRelated : 'Pokaż sugerowane filmy po zakończeniu odtwarzania',
-	txtStartAt : 'Rozpocznij od (ss lub mm:ss lub gg:mm:ss)',
-	chkPrivacy : 'Włącz rozszerzony tryb prywatności',
-	chkOlderCode : 'Użyj starego kodu',
-	chkAutoplay: 'Autoodtwarzanie',
-	chkControls: 'Pokaż elementy sterujące odtwarzacza',
-	noCode : 'Musisz wprowadzić kod lub adres URL',
-	invalidEmbed : 'Wprowadzony kod nie jest poprawny',
-	invalidUrl : 'Wprowadzony adres URL nie jest poprawny',
-	or : 'lub',
-	noWidth : 'Musisz wpisać szerokość',
-	invalidWidth : 'Wprowadzona szerokość nie jest poprawna',
-	noHeight : 'Musisz wprowadzić wysokość',
-	invalidHeight : 'Wprowadzona wysokość nie jest poprawna',
-	invalidTime : 'Musisz wprowadzić poprawny czas rozpoczęcia',
-	txtResponsive : 'El. responsywny (ignoruj szerokość i wysokość, dopasuj do szerokości)'
-});

ckeditorplugins/youtube/youtube/lang/pt-br.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'pt-br', {
-	button : 'Inserir Vídeo do Youtube',
-	title : 'Inserir Vídeo do Youtube',
-	txtEmbed : 'Cole aqui o código embed de um vídeo do Youtube',
-	txtUrl : 'Cole aqui uma URL de um vídeo do Youtube',
-	txtWidth : 'Largura',
-	txtHeight : 'Altura',
-	chkRelated : 'Mostrar vídeos sugeridos ao final do vídeo',
-	txtStartAt : 'Iniciar em (ss ou mm:ss ou hh:mm:ss)',
-	chkPrivacy : 'Ativar o modo de privacidade aprimorada',
-	chkOlderCode : 'Usar código de incorporação antigo',
-	chkAutoplay : 'Reproduzir automaticamente',
-	chkControls: 'Mostrar controles do player',
-	noCode : 'Você precisa informar um código embed ou uma URL',
-	invalidEmbed : 'O código informado não parece ser válido',
-	invalidUrl : 'A URL informada não parece ser válida',
-	or : 'ou',
-	noWidth : 'Você deve informar a largura do vídeo',
-	invalidWidth : 'Informe uma largura válida',
-	noHeight : 'Você deve informar a altura do vídeo',
-	invalidHeight : 'Informe uma altura válida',
-	invalidTime : 'O tempo informado é inválido',
-	txtResponsive : 'Vídeo responsivo',
-	txtNoEmbed : 'Somente imagem e link para o vídeo'
-});

ckeditorplugins/youtube/youtube/lang/pt.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'pt', {
-	button : 'Inserir Vídeo do Youtube',
-	title : 'Inserir Vídeo do Youtube',
-	txtEmbed : 'Cole aqui o código embed de um vídeo do Youtube',
-	txtUrl : 'Cole aqui uma URL de um vídeo do Youtube',
-	txtWidth : 'Largura',
-	txtHeight : 'Altura',
-	chkRelated : 'Mostrar vídeos sugeridos quando o vídeo terminar',
-	txtStartAt : 'Iniciar em (ss ou mm:ss ou hh:mm:ss)',
-	chkPrivacy : 'Ativar o modo de privacidade otimizada',
-	chkOlderCode : 'Usar código de incorporação antigo',
-	chkAutoplay : 'Reproduzir automaticamente',
-	chkControls: 'Mostrar controles do player',
-	noCode : 'Você precisa informar um código embed ou uma URL',
-	invalidEmbed : 'O código informado não parece ser válido',
-	invalidUrl : 'A URL informada não parece ser válida',
-	or : 'ou',
-	noWidth : 'Você deve informar a largura do vídeo',
-	invalidWidth : 'Informe uma largura válida',
-	noHeight : 'Você deve informar a altura do vídeo',
-	invalidHeight : 'Informe uma altura válida',
-	invalidTime : 'O tempo informado é inválido',
-	txtResponsive : 'Vídeo responsivo',
-	txtNoEmbed : 'Somente imagem e link para o vídeo'
-});

ckeditorplugins/youtube/youtube/lang/ru.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'ru', {
-	button : 'Вставить YouTube видео',
-	title : 'Вставить YouTube видео',
-	txtEmbed : 'Вставьте HTML-код сюда',
-	txtUrl : 'Вставьте адрес видео (URL)',
-	txtWidth : 'Ширина',
-	txtHeight : 'Высота',
-	chkRelated : 'Показать похожие видео после завершения просмотра',
-	txtStartAt : 'Начать с (сс или мм:сс или чч:мм:сс)',
-	chkPrivacy : 'Включить режим повышенной конфиденциальности',
-	chkOlderCode : 'Использовать старый код вставки',
-	chkAutoplay: 'Автозапуск',
-	chkControls: 'Показать панель управления',
-	noCode : 'Вы должны ввести HTML-код или адрес',
-	invalidEmbed : 'Ваш HTML-код не похож на правильный',
-	invalidUrl : 'Ваш адрес видео не похож на правильный',
-	or : 'или',
-	noWidth : 'Вы должны указать ширину',
-	invalidWidth : 'Укажите правильную ширину',
-	noHeight : 'Вы должны указать высоту',
-	invalidHeight : 'Укажите правильную высоту',
-	invalidTime : 'Укажите правильное время начала',
-	txtResponsive : 'Растягиваемое видео',
-	txtNoEmbed : 'Не встраивать видео (обложка-ссылка на YouTube)'
-});

ckeditorplugins/youtube/youtube/lang/sk.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'sk', {
-	button : 'Vložiť YouTube video',
-	title : 'Vložiť YouTube video',
-	txtEmbed : 'Vložiť Youtube Embed Video kódu',
-	txtUrl : 'Vložiť pomocou YouTube video URL',
-	txtWidth : 'Šírka',
-	txtHeight : 'Výška',
-	chkRelated : 'Zobraziť odporúčané videá po prehratí',
-	txtStartAt : 'Začať prehrávanie videa (ss alebo mm:ss alebo hh:mm:ss)',
-	chkPrivacy : 'Povoliť pokročilý mód súkromia',
-	chkOlderCode : 'Použiť starú metódu vkladania',
-	chkAutoplay: 'Automatické prehrávanie',
-	chkControls: 'Zobraziť ovládacie prvky prehrávača',
-	noCode : 'Musíte vložiť Youtube Embed kód alebo URL',
-	invalidEmbed : 'Vložený kód nie je valídny',
-	invalidUrl : 'Vložená URL nie je platná',
-	or : 'alebo',
-	noWidth : 'Prosím, zadajte šírku videa',
-	invalidWidth : 'Zadajte valídnu šírku videa',
-	noHeight : 'Prosím, zadajte výšku videa',
-	invalidHeight : 'Zadajte valídnu výšku videa',
-	invalidTime : 'Zadajte valídny formát začiatku prehrávania videa',
-	txtResponsive : 'Prispôsobit rozmery videa rozmerom obrazovky (ignoruje šírku a výšku, prispôsobí sa šírke obrazovky)'
-});

ckeditorplugins/youtube/youtube/lang/tr.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'tr', {
-	button : 'Youtube Video Gömün (Embed)',
-	title : 'Youtube Video',
-	txtEmbed : 'Youtube gömülü kodu (embed) buraya yapıştırınız',
-	txtUrl : 'Youtube linkinizi buraya yapıştırınız',
-	txtWidth : 'Genişlik',
-	txtHeight : 'Yükseklik',
-	chkRelated : 'Önerilen videoları video bitiminde göster',
-	txtStartAt : 'Video başlangıç anı (ss ya da dd:ss ya da ss:dd:ss)',
-	chkPrivacy : 'Gizlilik modunu etkinleştir',
-	chkOlderCode : 'Eski gömülü kodu (embed) kullan',
-	chkAutoplay: 'Otomatik',
-	chkControls: 'Oynatıcı kontrollerini göster',
-	noCode : 'Gömülü kod (embed) veya url yapıştırmak zorundasınız',
-	invalidEmbed : 'Verdiğiniz gömülü kod (embed) ile video bulunamadı',
-	invalidUrl : 'Verdiğiniz linkte video bulunamadı',
-	or : 'ya da',
-	noWidth : 'Genişliği belirtmek zorundasınız',
-	invalidWidth : 'Bir genişlik belirtin',
-	noHeight : 'Yükseliği belirtmek zorundasınız',
-	invalidHeight : 'Yükseklik belirtin',
-	invalidTime : 'Başlangıç anını doğru girin, örneğin: 13 (13. saniye) ya da 12:25 (12. dakika 25. saniye) ya da 01.25.33 (1 saat 25 dakika 33 saniye)',
-	txtResponsive : 'Responsive video'
-});

ckeditorplugins/youtube/youtube/lang/uk.js

@@ -1,25 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'uk', {
-	button : 'Вставити YouTube-відео',
-	title : 'Вставити YouTube-відео',
-	txtEmbed : 'Вставте HTML-код сюди',
-	txtUrl : 'Вставте URL-адресу сюди',
-	txtWidth : 'Ширина',
-	txtHeight : 'Висота',
-	chkRelated : 'Показати пропоновані відео в кінці',
-	txtStartAt : 'Почати з (сс або хх:сс або гг:хх:сс)',
-	chkPrivacy : 'Увімкнути режим підвищеної конфіденційності',
-	chkOlderCode : 'Використовувати старий код вставки',
-	chkAutoplay: 'Автовідтворення',
-	chkControls: 'Показувати елементи управління плеєром',
-	noCode : 'Ви повинні ввести HTML-код або URL-адресу',
-	invalidEmbed : 'Код вставки, який ви додали не вірний',
-	invalidUrl : 'URL-адреса, яку ви додали не вірна',
-	or : 'або',
-	noWidth : 'Укажіть ширину',
-	invalidWidth : 'Укажіть правильну ширину',
-	noHeight : 'Укажіть висоту',
-	invalidHeight : 'Укажіть правильну висоту',
-	invalidTime : 'Укажіть правильний час початку',
-	txtResponsive : 'Адаптивне (таке, яке розтягується) відео',
-	txtNoEmbed : 'Додати лише обкладинку та посилання на YouTube'
-});

ckeditorplugins/youtube/youtube/lang/vi.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'vi', {
-	button : 'Embed Youtube Video',
-	title : 'Nhúng Video Youtube',
-	txtEmbed : 'Dãn mã nhúng Embed vào đây',
-	txtUrl : 'Dãn đường dẫn video Youtube',
-	txtWidth : 'Rộng',
-	txtHeight : 'Cao',
-	chkRelated : 'Hiển thị các video được đề xuất khi video kết thúc',
-	txtStartAt : 'Bắt đầu (ss hoặc mm:ss hoặc hh:mm:ss)',
-	chkPrivacy : 'Kích hoạt chế độ bảo mật nâng cao',
-	chkOlderCode : 'Sử dụng mã nhúng cũ',
-	chkAutoplay: 'Tự động chạy video',
-	chkControls: 'Hiển thị các điều khiển trình phát',
-	noCode : 'Bạn phải nhập mã nhúng hoặc URL',
-	invalidEmbed : 'Mã nhúng bạn đã nhập không đúng',
-	invalidUrl : 'URL bạn đã nhập không đúng',
-	or : 'hoặc',
-	noWidth : 'Bạn phải chiều rộng',
-	invalidWidth : 'Chiều rộng hợp lệ',
-	noHeight : 'Bạn phải chiều cao',
-	invalidHeight : 'Chiều cao hợp lệ',
-	invalidTime : 'Thời gian bắt đầu không đúng',
-	txtResponsive : 'Responsive video'
-});

ckeditorplugins/youtube/youtube/lang/zh.js

@@ -1,24 +0,0 @@
-CKEDITOR.plugins.setLang('youtube', 'zh', {
-    button: '嵌入 Youtube 影片',
-    title: '嵌入 Youtube 影片',
-    txtEmbed: '貼上嵌入碼',
-    txtUrl: '貼上 Youtube 影片 URL',
-    txtWidth: '寬',
-    txtHeight: '高',
-    txtResponsive: '使用自適應縮放模式 (忽略設定的長寬, 以寬為基準縮放)',
-    chkRelated: '影片結束時顯示建議影片',
-    txtStartAt: '開始時間 (ss or mm:ss or hh:mm:ss)',
-    chkPrivacy: '啟用加強隱私模式',
-    chkOlderCode: '使用舊的嵌入碼',
-    chkAutoplay: '自動播放',
-    chkControls: '显示播放器控件',
-    noCode: '必須輸入嵌入碼',
-    invalidEmbed: '錯誤的嵌入碼',
-    invalidUrl: '錯誤的URL',
-    or: '或',
-    noWidth: '必須設定寬',
-    invalidWidth: '寬設定錯誤',
-    noHeight: '必須設定高',
-    invalidHeight: '高設定錯誤',
-    invalidTime: '開始時間設定錯誤'
-});

ckeditorplugins/youtube/youtube/plugin.js

@@ -1,449 +0,0 @@
-/*
-* Youtube Embed Plugin
-*
-* @author Jonnas Fonini <jonnasfonini@gmail.com>
-* @version 2.1.13
-*/
-(function () {
-	CKEDITOR.plugins.add('youtube', {
-		lang: [ 'en', 'bg', 'pt', 'pt-br', 'ja', 'hu', 'it', 'fr', 'tr', 'ru', 'de', 'ar', 'nl', 'pl', 'vi', 'zh', 'el', 'he', 'es', 'nb', 'nn', 'fi', 'et', 'sk', 'cs', 'ko', 'eu', 'uk'],
-		init: function (editor) {
-			editor.addCommand('youtube', new CKEDITOR.dialogCommand('youtube', {
-				allowedContent: 'div{*}(*); iframe{*}[!width,!height,!src,!frameborder,!allowfullscreen,!allow]; object param[*]; a[*]; img[*]'
-			}));
-
-			editor.ui.addButton('Youtube', {
-				label : editor.lang.youtube.button,
-				toolbar : 'insert',
-				command : 'youtube',
-				icon : this.path + 'images/icon.png'
-			});
-
-			CKEDITOR.dialog.add('youtube', function (instance) {
-				var video,
-					disabled = editor.config.youtube_disabled_fields || [];
-
-				return {
-					title : editor.lang.youtube.title,
-					minWidth : 510,
-					minHeight : 200,
-					onShow: function () {
-						for (var i = 0; i < disabled.length; i++) {
-							this.getContentElement('youtubePlugin', disabled[i]).disable();
-						}
-					},
-					contents :
-						[{
-							id : 'youtubePlugin',
-							expand : true,
-							elements :
-								[{
-									id : 'txtEmbed',
-									type : 'textarea',
-									label : editor.lang.youtube.txtEmbed,
-									onChange : function (api) {
-										handleEmbedChange(this, api);
-									},
-									onKeyUp : function (api) {
-										handleEmbedChange(this, api);
-									},
-									validate : function () {
-										if (this.isEnabled()) {
-											if (!this.getValue()) {
-												alert(editor.lang.youtube.noCode);
-												return false;
-											}
-											else
-											if (this.getValue().length === 0 || this.getValue().indexOf('//') === -1) {
-												alert(editor.lang.youtube.invalidEmbed);
-												return false;
-											}
-										}
-									}
-								},
-								{
-									type : 'html',
-									html : editor.lang.youtube.or + '<hr>'
-								},
-								{
-									type : 'hbox',
-									widths : [ '70%', '15%', '15%' ],
-									children :
-									[
-										{
-											id : 'txtUrl',
-											type : 'text',
-											label : editor.lang.youtube.txtUrl,
-											onChange : function (api) {
-												handleLinkChange(this, api);
-											},
-											onKeyUp : function (api) {
-												handleLinkChange(this, api);
-											},
-											validate : function () {
-												if (this.isEnabled()) {
-													if (!this.getValue()) {
-														alert(editor.lang.youtube.noCode);
-														return false;
-													}
-													else{
-														video = ytVidId(this.getValue());
-
-														if (this.getValue().length === 0 ||  video === false)
-														{
-															alert(editor.lang.youtube.invalidUrl);
-															return false;
-														}
-													}
-												}
-											}
-										},
-										{
-											type : 'text',
-											id : 'txtWidth',
-											width : '60px',
-											label : editor.lang.youtube.txtWidth,
-											'default' : editor.config.youtube_width != null ? editor.config.youtube_width : '640',
-											validate : function () {
-												if (this.getValue()) {
-													var width = parseInt (this.getValue()) || 0;
-
-													if (width === 0) {
-														alert(editor.lang.youtube.invalidWidth);
-														return false;
-													}
-												}
-												else {
-													alert(editor.lang.youtube.noWidth);
-													return false;
-												}
-											}
-										},
-										{
-											type : 'text',
-											id : 'txtHeight',
-											width : '60px',
-											label : editor.lang.youtube.txtHeight,
-											'default' : editor.config.youtube_height != null ? editor.config.youtube_height : '360',
-											validate : function () {
-												if (this.getValue()) {
-													var height = parseInt(this.getValue()) || 0;
-
-													if (height === 0) {
-														alert(editor.lang.youtube.invalidHeight);
-														return false;
-													}
-												}
-												else {
-													alert(editor.lang.youtube.noHeight);
-													return false;
-												}
-											}
-										}
-									]
-								},
-								{
-									type : 'hbox',
-									widths : [ '55%', '45%' ],
-									children :
-										[
-											{
-												id : 'chkResponsive',
-												type : 'checkbox',
-												label : editor.lang.youtube.txtResponsive,
-												'default' : editor.config.youtube_responsive != null ? editor.config.youtube_responsive : false
-											},
-											{
-												id : 'chkNoEmbed',
-												type : 'checkbox',
-												label : editor.lang.youtube.txtNoEmbed,
-												'default' : editor.config.youtube_noembed != null ? editor.config.youtube_noembed : false
-											}
-										]
-								},
-								{
-									type : 'hbox',
-									widths : [ '55%', '45%' ],
-									children :
-									[
-										{
-											id : 'chkRelated',
-											type : 'checkbox',
-											'default' : editor.config.youtube_related != null ? editor.config.youtube_related : true,
-											label : editor.lang.youtube.chkRelated
-										},
-										{
-											id : 'chkOlderCode',
-											type : 'checkbox',
-											'default' : editor.config.youtube_older != null ? editor.config.youtube_older : false,
-											label : editor.lang.youtube.chkOlderCode
-										}
-									]
-								},
-								{
-									type : 'hbox',
-									widths : [ '55%', '45%' ],
-									children :
-									[
-										{
-											id : 'chkPrivacy',
-											type : 'checkbox',
-											label : editor.lang.youtube.chkPrivacy,
-											'default' : editor.config.youtube_privacy != null ? editor.config.youtube_privacy : false
-										},
-										{
-											id : 'chkAutoplay',
-											type : 'checkbox',
-											'default' : editor.config.youtube_autoplay != null ? editor.config.youtube_autoplay : false,
-											label : editor.lang.youtube.chkAutoplay
-										}
-									]
-								},
-								{
-									type : 'hbox',
-									widths : [ '55%', '45%'],
-									children :
-									[
-										{
-											id : 'txtStartAt',
-											type : 'text',
-											label : editor.lang.youtube.txtStartAt,
-											validate : function () {
-												if (this.getValue()) {
-													var str = this.getValue();
-
-													if (!/^(?:(?:([01]?\d|2[0-3]):)?([0-5]?\d):)?([0-5]?\d)$/i.test(str)) {
-														alert(editor.lang.youtube.invalidTime);
-														return false;
-													}
-												}
-											}
-										},
-										{
-											id : 'chkControls',
-											type : 'checkbox',
-											'default' : editor.config.youtube_controls != null ? editor.config.youtube_controls : true,
-											label : editor.lang.youtube.chkControls
-										}
-									]
-								}
-							]
-						}
-					],
-					onOk: function()
-					{
-						var content = '';
-						var responsiveStyle = '';
-
-						if (this.getContentElement('youtubePlugin', 'txtEmbed').isEnabled()) {
-							content = this.getValueOf('youtubePlugin', 'txtEmbed');
-						}
-						else {
-							var url = 'https://', params = [], startSecs, paramAutoplay='';
-							var width = this.getValueOf('youtubePlugin', 'txtWidth');
-							var height = this.getValueOf('youtubePlugin', 'txtHeight');
-
-							if (this.getContentElement('youtubePlugin', 'chkPrivacy').getValue() === true) {
-								url += 'www.youtube-nocookie.com/';
-							}
-							else {
-								url += 'www.youtube.com/';
-							}
-
-							url += 'embed/' + video;
-
-							if (this.getContentElement('youtubePlugin', 'chkRelated').getValue() === false) {
-								params.push('rel=0');
-							}
-
-							if (this.getContentElement('youtubePlugin', 'chkAutoplay').getValue() === true) {
-								params.push('autoplay=1');
-								paramAutoplay='autoplay';
-							}
-
-							if (this.getContentElement('youtubePlugin', 'chkControls').getValue() === false) {
-								params.push('controls=0');
-							}
-
-							startSecs = this.getValueOf('youtubePlugin', 'txtStartAt');
-
-							if (startSecs) {
-								var seconds = hmsToSeconds(startSecs);
-
-								params.push('start=' + seconds);
-							}
-
-							if (params.length > 0) {
-								url = url + '?' + params.join('&');
-							}
-
-							if (this.getContentElement('youtubePlugin', 'chkResponsive').getValue() === true) {
-								content += '<div class="youtube-embed-wrapper" style="position:relative;padding-bottom:56.25%;padding-top:30px;height:0;overflow:hidden">';
-								responsiveStyle = 'style="position:absolute;top:0;left:0;width:100%;height:100%"';
-							}
-
-							if (this.getContentElement('youtubePlugin', 'chkOlderCode').getValue() === true) {
-								url = url.replace('embed/', 'v/');
-								url = url.replace(/&/g, '&amp;');
-
-								if (url.indexOf('?') === -1) {
-									url += '?';
-								}
-								else {
-									url += '&amp;';
-								}
-								url += 'hl=' + (this.getParentEditor().config.language ? this.getParentEditor().config.language : 'en') + '&amp;version=3';
-
-								content += '<object width="' + width + '" height="' + height + '" ' + responsiveStyle + '>';
-								content += '<param name="movie" value="' + url + '"></param>';
-								content += '<param name="allowFullScreen" value="true"></param>';
-								content += '<param name="allowscriptaccess" value="always"></param>';
-								content += '<embed src="' + url + '" type="application/x-shockwave-flash" ';
-								content += 'width="' + width + '" height="' + height + '" '+ responsiveStyle + ' allowscriptaccess="always" ';
-								content += 'allowfullscreen="true"></embed>';
-								content += '</object>';
-							}
-							else
-							if (this.getContentElement('youtubePlugin', 'chkNoEmbed').getValue() === true) {
-								var imgSrc = '//img.youtube.com/vi/' + video + '/sddefault.jpg';
-								content += '<a href="' + url + '" ><img width="' + width + '" height="' + height + '" src="' + imgSrc + '" '  + responsiveStyle + '/></a>';
-							}
-							else {
-								content += '<iframe allow="' + paramAutoplay + ';" width="' + width + '" height="' + height + '" src="' + url + '" ' + responsiveStyle;
-								content += 'frameborder="0" allowfullscreen></iframe>';
-							}
-
-							if (this.getContentElement('youtubePlugin', 'chkResponsive').getValue() === true) {
-								content += '</div>';
-							}
-						}
-
-						var element = CKEDITOR.dom.element.createFromHtml(content);
-						var instance = this.getParentEditor();
-						instance.insertElement(element);
-					}
-				};
-			});
-		}
-	});
-})();
-
-function handleLinkChange(el, api) {
-	var video = ytVidId(el.getValue());
-	var time = ytVidTime(el.getValue());
-
-	if (el.getValue().length > 0) {
-		el.getDialog().getContentElement('youtubePlugin', 'txtEmbed').disable();
-	}
-	else {
-		el.getDialog().getContentElement('youtubePlugin', 'txtEmbed').enable();
-	}
-
-	if (video && time) {
-		var seconds = timeParamToSeconds(time);
-		var hms = secondsToHms(seconds);
-		el.getDialog().getContentElement('youtubePlugin', 'txtStartAt').setValue(hms);
-	}
-}
-
-function handleEmbedChange(el, api) {
-	if (el.getValue().length > 0) {
-		el.getDialog().getContentElement('youtubePlugin', 'txtUrl').disable();
-	}
-	else {
-		el.getDialog().getContentElement('youtubePlugin', 'txtUrl').enable();
-	}
-}
-
-
-/**
- * JavaScript function to match (and return) the video Id
- * of any valid Youtube Url, given as input string.
- * @author: Stephan Schmitz <eyecatchup@gmail.com>
- * @url: http://stackoverflow.com/a/10315969/624466
- */
-function ytVidId(url) {
-	var p = /^(?:https?:\/\/)?(?:www\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))((\w|-){11})(?:\S+)?$/;
-	return (url.match(p)) ? RegExp.$1 : false;
-}
-
-/**
- * Matches and returns time param in YouTube Urls.
- */
-function ytVidTime(url) {
-	var p = /t=([0-9hms]+)/;
-	return (url.match(p)) ? RegExp.$1 : false;
-}
-
-/**
- * Converts time in hms format to seconds only
- */
-function hmsToSeconds(time) {
-	var arr = time.split(':'), s = 0, m = 1;
-
-	while (arr.length > 0) {
-		s += m * parseInt(arr.pop(), 10);
-		m *= 60;
-	}
-
-	return s;
-}
-
-/**
- * Converts seconds to hms format
- */
-function secondsToHms(seconds) {
-	var h = Math.floor(seconds / 3600);
-	var m = Math.floor((seconds / 60) % 60);
-	var s = seconds % 60;
-
-	var pad = function (n) {
-		n = String(n);
-		return n.length >= 2 ? n : "0" + n;
-	};
-
-	if (h > 0) {
-		return pad(h) + ':' + pad(m) + ':' + pad(s);
-	}
-	else {
-		return pad(m) + ':' + pad(s);
-	}
-}
-
-/**
- * Converts time in youtube t-param format to seconds
- */
-function timeParamToSeconds(param) {
-	var componentValue = function (si) {
-		var regex = new RegExp('(\\d+)' + si);
-		return param.match(regex) ? parseInt(RegExp.$1, 10) : 0;
-	};
-
-	return componentValue('h') * 3600
-		+ componentValue('m') * 60
-		+ componentValue('s');
-}
-
-/**
- * Converts seconds into youtube t-param value, e.g. 1h4m30s
- */
-function secondsToTimeParam(seconds) {
-	var h = Math.floor(seconds / 3600);
-	var m = Math.floor((seconds / 60) % 60);
-	var s = seconds % 60;
-	var param = '';
-
-	if (h > 0) {
-		param += h + 'h';
-	}
-
-	if (m > 0) {
-		param += m + 'm';
-	}
-
-	if (s > 0) {
-		param += s + 's';
-	}
-
-	return param;
-}

cloud/templates/cloud/cloud_main.html

@@ -65,22 +65,19 @@ a.disabled {
         
         {% setbool False %}
 
-        {% for ag in d.visibleby.all %}
+        {% for dirgroup in d.visibleby.all %}
-          {% if user|has_group:ag.group.name %} 
+          {% if user|has_group:dirgroup.group.name %} 
             {% setbool True %}    
           {% endif %}
         {% endfor %}
 
-        {{d.name}}
+        
-        {{d.visibleby.all|length}}
 
         {% if d.visibleby.all|length == 0 %}
-          DARF
           {% setbool True %}          
         {% endif %}
         
         {% getbool as groupchecker %}
-        {{groupchecker}}
        
       	<tr id="dir_{{d.pk}}" class="droppable_tr">  	
           	<td id="dir_{{d.pk}}_icon"><i class="fas fa-folder" ></i>                
@@ -96,7 +93,7 @@ a.disabled {
           	<td>{{d.date_created|date:"d.m.Y G:i"}}</td>
           	<td>{{d.date_last_modified|date:"d.m.Y G:i"}}</td>
             <td>
-              {% if user|usergperm:"filedirmanager" and groupchecker %} 
+              {% if user|usergperm:"filedirmanager" and groupchecker%} 
               <div class="dropdown no-arrow">
                     <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                       <i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
@@ -439,7 +436,7 @@ function createList(arr, l) {
 }
 
 function targetParentToMove(parid){  
-  console.log(parid);
+  
     $.ajax(
       {
         type: "GET",
@@ -528,7 +525,8 @@ allowedtypes = "application/msword, application/vnd.ms-excel, application/vnd.ms
 function uploadAction(filetodo, parid){
   var formData = new FormData($("#uploadFileForm")[0]);
   formData.append("uploadedfile", filetodo); 
-  
+  var bar = $('.bar');
+  var percent = $('.percent');
   if(allowedtypes.includes(filetodo.type) && filetodo.type.length > 0){
     $.ajax({
         url: "{% url 'cloud-adddir' %}" + parid,
@@ -540,8 +538,14 @@ function uploadAction(filetodo, parid){
         cache: false,
         processData: false,
         contentType: false,
+        beforeSend: function(){
+          $("#uploadModalProgress").modal("toggle");
+        },
+        uploadProgress: function(event, position, total, percentComplete){
+          var percentVal = percentComplete + '%';
+          
+        },
         success: function(data) {         
-          console.log(data);
           if(data["success"] == true){
             window.location = window.location;  
           }

cloud/views.py

@@ -16,6 +16,45 @@ from .models import DataDir, DataFile
 from datetime import datetime
 from users.models import AgencyGroup
 
+
+'''
+
+	Prüft, ob ein Nutzer in diesen Ordner Zugriffsrechte hat. Läuft den gesamten Strang bis nach oben,
+	ob ein Übergeordneter Ordner Rechte einschränkt.
+
+'''
+@login_required
+def checkUserDirRights(request, startdir, userid):
+	canview = True
+	user = User.objects.get(pk=userid, profile__agency=request.user.profile.agency)
+	usergroups=list(user.groups.all())
+	grouptomach = []
+	singleObj = DataDir.objects.get(pk=startdir.pk, agency=request.user.profile.agency)
+	# AGENCYCHECK
+	if(singleObj.agency.pk == user.profile.agency.pk):
+		
+		# Get dirs to check
+		while( singleObj.is_root != True and canview == True):
+			
+
+			for g in singleObj.visibleby.all():
+				grouptomach.append(g.group)
+
+			if(len(grouptomach) == 0):
+				canview = True				
+			else:
+				if(len(set(usergroups).intersection(grouptomach)) > 0):
+					canview = True
+				else:
+					canview = False		
+
+			grouptomach = []
+			singleObj = DataDir.objects.get(pk=singleObj.parent.pk, agency=request.user.profile.agency)
+		
+	else:
+		canview = False
+	return canview
+
 @login_required
 def CloudMain(request, pk):
 	diragency = []
@@ -33,32 +72,22 @@ def CloudMain(request, pk):
 			'active_link' : 'cloud',
 			'dirs' : alldirs,
 			'parentid' : diragency.pk,
-			'files' : DataFile.objects.filter(parent=diragency, agency=request.user.profile.agency),
+			'files' : DataFile.objects.filter(parent=diragency, agency=request.user.profile.agency).order_by("name"),
-			'agencygroups' : AgencyGroup.objects.filter(agency=request.user.profile.agency),
+			'agencygroups' : AgencyGroup.objects.filter(agency=request.user.profile.agency).order_by("agencygroupname"),
 			"rootid" : rootid
 		}
 	else:		
 
 		# CHECK IF USER HAS RIGHTS TO SEE THIS DIR
-		groupsofdir = list(DataDir.objects.filter(pk=pk, agency=request.user.profile.agency))[0]
+		groupsofdir = DataDir.objects.get(pk=pk, agency=request.user.profile.agency)				
-
+		if checkUserDirRights(request, groupsofdir, request.user.pk):
-		userisingroup = False
-
-		if len(groupsofdir.visibleby.all()) == 0:
-			userisingroup = True
-		else:
-			for ag in groupsofdir.visibleby.all():
-				if ag.group in request.user.groups.all():
-					userisingroup = True
-
-		if userisingroup:
 			alldirs = DataDir.objects.filter(is_root=False, agency=request.user.profile.agency, parent=pk).order_by("name")
 			vieweddir = list(DataDir.objects.filter(pk=pk, agency=request.user.profile.agency))[0]
 			
-			singleObj = DataDir.objects.get(pk=pk)
+			singleObj = DataDir.objects.get(pk=pk, agency=request.user.profile.agency)
 			while( singleObj.is_root != True):
 				breadcrump.append(singleObj)			
-				singleObj = DataDir.objects.get(pk=singleObj.parent.pk)
+				singleObj = DataDir.objects.get(pk=singleObj.parent.pk, agency=request.user.profile.agency)
 
 			breadcrump = breadcrump[::-1]
 
@@ -67,8 +96,8 @@ def CloudMain(request, pk):
 				'dirs' : alldirs,
 				'parentid' : pk,
 				'breadcrump' : breadcrump,
-				'files' : DataFile.objects.filter(parent=vieweddir, agency=request.user.profile.agency),
+				'files' : DataFile.objects.filter(parent=vieweddir, agency=request.user.profile.agency).order_by("name"),
-				'agencygroups' : AgencyGroup.objects.filter(agency=request.user.profile.agency),
+				'agencygroups' : AgencyGroup.objects.filter(agency=request.user.profile.agency).order_by("agencygroupname"),
 				"rootid" : rootid
 			}
 		else:
@@ -108,7 +137,7 @@ def adddirbyajax(request, parent):
 			data = {'filename' : fileobj.name}
 		# DELETE FILE
 		elif(request.GET.get("action") == "del_file"):
-			DataFile.objects.filter(pk=request.GET.get('id')).delete()
+			DataFile.objects.filter(pk=request.GET.get('id'), agency=request.user.profile.agency).delete()
 		# CHANGE DIR NAME
 		elif(request.GET.get("action") == "change_dir_name"):
 			dirobj = DataDir.objects.get(pk=request.GET.get('id'), agency=request.user.profile.agency)
@@ -125,8 +154,8 @@ def adddirbyajax(request, parent):
 				success = False
 		# MOVE FILE		
 		elif(request.GET.get("action") == "movefile"):			
-			tempdatafile = DataFile.objects.get(pk=request.GET.get('fileid'))
+			tempdatafile = DataFile.objects.get(pk=request.GET.get('fileid'), agency=request.user.profile.agency)
-			tempdatafile.parent = DataDir.objects.get(pk=request.GET.get('newpar'))			
+			tempdatafile.parent = DataDir.objects.get(pk=request.GET.get('newpar'), agency=request.user.profile.agency)			
 			tempdatafile.date_last_modified = datetime.now()
 			tempdatafile.save()
 		# GROUPS
@@ -136,18 +165,19 @@ def adddirbyajax(request, parent):
 			groupid = request.GET.get('groupid')	
 			value = request.GET.get('value')	
 			if(value == "true"):
-				DataDir.objects.get(pk=dirid).visibleby.add(AgencyGroup.objects.get(pk=groupid))
+				DataDir.objects.get(pk=dirid, agency=request.user.profile.agency).visibleby.add(AgencyGroup.objects.get(pk=groupid, agency=request.user.profile.agency))
 			else:
-				DataDir.objects.get(pk=dirid).visibleby.remove(AgencyGroup.objects.get(pk=groupid))			
+				DataDir.objects.get(pk=dirid, agency=request.user.profile.agency).visibleby.remove(AgencyGroup.objects.get(pk=groupid, agency=request.user.profile.agency))			
 		# GET GROUPS
 		
 		elif(request.GET.get("action") == "getgroupsofdir"):	
 			dirid = request.GET.get('dirid')
-			allgroupsofdir = DataDir.objects.get(pk=dirid).visibleby.all()
+			allgroupsofdir = DataDir.objects.get(pk=dirid, agency=request.user.profile.agency).visibleby.all()
 			
 			grouopsid = []
 			for ag in allgroupsofdir:
 				grouopsid.append({"id" : ag.pk})
+			print(grouopsid)
 			data = {"gdir" : grouopsid}	
 
 	elif request.method == 'POST':
@@ -172,7 +202,7 @@ def adddirbyajax(request, parent):
 		
 	return JsonResponse({"success" : success, "data" : data})
 
-
+@login_required
 def loadAgencyDirList(request):
 	alldirs = []
 
@@ -184,6 +214,7 @@ def loadAgencyDirList(request):
 
 	return alldirs
 
+@login_required
 def getsubdirs(request, dirid):
 	subdirs = []
 	actid = False

news/views.py

@@ -73,13 +73,13 @@ def NewsAdd(request):
 
 @login_required
 def NewsUpdate(request, id):
-	news = News.objects.get(pk=id)
+	news = News.objects.get(pk=id, agency=request.user.profile.agency)
 	if request.method == 'POST':
 		normalForm = NewsAddNews(request.POST, instance=news)
 		#editorForm = NewsAddNewsEditor(request.POST, instance=news)
 		
 		if normalForm.is_valid():
-			news = News.objects.get(pk=id)	
+			news = News.objects.get(pk=id, agency=request.user.profile.agency)	
 			news.last_modified_by = request.user
 			news.last_modified_on = datetime.now()
 			news.go_online_on = normalForm.cleaned_data['go_online_on']
@@ -116,7 +116,7 @@ class NewsDeleteView(LoginRequiredMixin, DeleteView):
 	
 @login_required
 def NewsSingle(request, pk):
-	news = News.objects.get(pk=pk)	
+	news = News.objects.get(pk=pk, agency=request.user.profile.agency)	
 	context = {
 		'active_link':'dashboard',
 		'news' : news

orga/views.py

@@ -35,7 +35,7 @@ def mainorga(request):
 
 @login_required
 def singleorga(request, pk):
-	user = User.objects.get(pk=pk)
+	user = User.objects.get(pk=pk, profile__agency=request.user.profile.agency)
 	'''
 	VON GROß NACH KLEIN - SINNLOS
 	prios = Prio.objects.filter(user__pk=pk).order_by('-prio')[::-1]

quicklinks/views.py

@@ -6,6 +6,7 @@ from .forms import QlAddQlForm
 from django.contrib import messages
 from django.shortcuts import redirect
 from django.http import HttpResponse, HttpResponseRedirect
+from django.contrib.auth.decorators import login_required
 
 # Create your views here.
 class QlManagement(LoginRequiredMixin, ListView):
@@ -67,6 +68,7 @@ class QlUpdateView(LoginRequiredMixin, UpdateView):
 		context['active_link'] = 'quicklinks'
 		return context
 
+@login_required
 def loaddefaultql(request):
 	if request.method == 'GET':
 		if request.GET['action'] == 'adddefql':

standards/templates/standards/standards_update.html

@@ -154,10 +154,6 @@
 
 <script type="text/javascript">
 //STANDARD
-function remStandard(sid, sname){
-  console.log(sid, sname);
-}
-
 function clearSearchfieldAddStandard(){
   $("#searchstandards").val("");
 }

standards/templatetags/counter_tag.py

@@ -29,7 +29,11 @@ def incvar():
 @register.filter(name='has_group')
 def has_group(user, group_name):
 	group = Group.objects.get(name=group_name)
-	return True if group in user.groups.all() else False
+	in_group = False
+	for g in user.groups.all():
+		if g.name == group_name:
+			in_group = True
+	return in_group
 
 
 @register.simple_tag

standards/views.py

@@ -12,6 +12,7 @@ from areas.models import Areas
 from datetime import datetime
 from users.models import AgencyGroup
 from cloud.models import DataFile, DataDir
+from django.contrib.auth.decorators import login_required
 
 # ALLE STANDARDS EINER AGENTUR
 class StandardsManagement(LoginRequiredMixin, ListView):
@@ -30,6 +31,42 @@ class StandardsManagement(LoginRequiredMixin, ListView):
 		context.update({'active_link' : 'standards', 'tasks': tasks, 'unpubstandards_of_user' : unpubstandards_of_user, 'standards_of_agency' : standards_of_agency, 'areas' : areas, 'standards_of_user' : standards_of_user})
 		return context
 
+
+@login_required
+def checkUserDirRights(request, startdir, userid):
+	canview = True
+	user = User.objects.get(pk=userid)
+	usergroups=list(user.groups.all())
+	grouptomach = []
+	singleObj = DataDir.objects.get(pk=startdir.pk)
+	# AGENCYCHECK
+	if(singleObj.agency.pk == user.profile.agency.pk):
+		
+		# Get dirs to check
+		while( singleObj.is_root != True and canview == True):			
+
+			for g in singleObj.visibleby.all():
+				grouptomach.append(g.group)
+
+			if(len(grouptomach) == 0):
+				canview = True				
+			else:
+				if(len(set(usergroups).intersection(grouptomach)) > 0):
+					canview = True
+				else:
+					canview = False		
+
+			grouptomach = []
+			singleObj = DataDir.objects.get(pk=singleObj.parent.pk)
+		
+	else:
+		canview = False
+	return canview
+
+
+
+
+
 @login_required
 def StandardAdd(request):
 	if request.method == 'POST':
@@ -86,10 +123,6 @@ def StandardAdd(request):
 				new_standard.save()
 				messages.success(request, f'Standard {tempstandardname} hinzugefügt! Dieser muss noch veröffentlicht werden.')			
 			return redirect('standards')	
-		else:
-			print("INVALID")
-			print(normalForm)
-			print(editorForm)
 
 	else:
 		normalForm = StandardAddStandard(instance=request.user)
@@ -104,18 +137,14 @@ def StandardAdd(request):
 
 	allfiles = DataFile.objects.filter(agency=request.user.profile.agency)
 
-	for file in allfiles:
+	for f in allfiles:		
-		user_can_view_file = False
+		actParent = DataDir.objects.get(pk=f.parent.pk)
-		parentdir = DataDir.objects.get(pk=file.parent.pk)
+		if actParent.is_root:
-		if(parentdir.is_root == False):
+			possibleFilesByVisible.append(f)
-			for p_group in parentdir.visibleby.all():
-				if p_group.group in request.user.groups.all():
-					user_can_view_file = True
 		else:
-			user_can_view_file = True
+			if(checkUserDirRights(request, actParent, request.user.pk)):
+				possibleFilesByVisible.append(f)
 
-		if user_can_view_file:
-			possibleFilesByVisible.append(file)
 	
 
 
@@ -133,7 +162,7 @@ def StandardAdd(request):
 
 @login_required
 def StandardUpdate(request, id):
-	standard = Standards.objects.get(pk=id)
+	standard = Standards.objects.get(pk=id, agency=request.user.profile.agency)
 	if request.method == 'POST':
 		#normalForm = StandardUpdateStandard(request.POST, instance=standard)
 		normalForm = StandardUpdateStandard(request.POST, instance=standard)
@@ -177,26 +206,25 @@ def StandardUpdate(request, id):
 		normalForm = StandardUpdateStandard(instance=standard)
 		editorForm = StandardUpdateStandardEditor(instance=standard)
 	
+	'''
+		Hier werden nur die Dateien dem aktuellen User zur Auswahl gestellt, auf die er auch Zugriff hat.
+		Das geht NICHT rekursiv! Es wird nur das oberste Verzeichnis geprüft! SPÄTER!
+	'''
+	
 	possibleFilesByVisible = []
 
 	allfiles = DataFile.objects.filter(agency=request.user.profile.agency)
 
-	for file in allfiles:		
+	for f in allfiles:		
-		user_can_view_file = False
+		actParent = DataDir.objects.get(pk=f.parent.pk, agency=request.user.profile.agency)
-		parentdir = DataDir.objects.get(pk=file.parent.pk)
+		if actParent.is_root:
-
+			possibleFilesByVisible.append(f)
-		if(parentdir.is_root == False and len(parentdir.visibleby.all()) > 0):			
-			for p_group in parentdir.visibleby.all():				
-				if p_group.group in request.user.groups.all():
-					user_can_view_file = True						
 		else:
-			user_can_view_file = True
+			if(checkUserDirRights(request, actParent, request.user.pk) and f not in standard.addedfiles.all()):
+				possibleFilesByVisible.append(f)
 
 
 
-		# Check if file is in standard
-		if file not in standard.addedfiles.all() and user_can_view_file:			
-			possibleFilesByVisible.append(file)
 
 	possiblestandards = Standards.objects.filter(agency=request.user.profile.agency, public=True)
 	possiblestandards_final = []
@@ -221,7 +249,7 @@ def StandardUpdate(request, id):
 @login_required
 def load_tasks(request):
     areaid = request.GET.get('areaid')
-    tasks = Tasks.objects.filter(area__id=areaid).order_by('name')    
+    tasks = Tasks.objects.filter(area__id=areaid, agency=request.user.profile.agency).order_by('name')    
     return render(request, 'standards/standards_tasklist.html', {'tasks': tasks})
 
 
@@ -231,7 +259,7 @@ class StandardDeleteView(LoginRequiredMixin, DeleteView):
 	template_name = 'standards/standard_confirm_delete.html'	
 
 	def delete(self, request, *args, **kwargs):		
-		standard = Standards.objects.get(pk=kwargs['pk'])
+		standard = Standards.objects.get(pk=kwargs['pk'], agency=request.user.profile.agency)
 		response = super(StandardDeleteView, self).delete(request, *args, **kwargs)
 		names = standard.name
 		messages.success(request, f'Standard ' +names+ ' wurde gelöscht!')
@@ -286,7 +314,7 @@ def StandardSingle(request, pk):
 @login_required
 def StandardArea(request, pk):
 	standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(area__pk=pk)
-	area = Areas.objects.get(pk=pk)
+	area = Areas.objects.get(pk=pk, agency=request.user.profile.agency)
 	context = {
 		'active_link':'standards',
 		'standards_of_agency_area' : standards,
@@ -298,8 +326,8 @@ def StandardArea(request, pk):
 @login_required
 def StandardTask(request, pk):
 	standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(task__pk=pk)
-	task = Tasks.objects.get(pk=pk)
+	task = Tasks.objects.get(pk=pk, agency=request.user.profile.agency)
-	area = Areas.objects.get(pk=task.area.pk)
+	area = Areas.objects.get(pk=task.area.pk, agency=request.user.profile.agency)
 	context = {
 		'active_link':'standards',
 		'standards_of_agency_task' : standards,
@@ -315,30 +343,30 @@ def StandardTask(request, pk):
 def updatesbyajax(request, pk):
 	if(request.method == "GET"):
 		success = True
-		workingstandard = Standards.objects.get(pk=pk)
+		workingstandard = Standards.objects.get(pk=pk, agency=request.user.profile.agency)
 		# Check for correct user and userrights
 		if(request.user.profile.agency == workingstandard.agency and request.user.has_perm("standardmanager")):
 			# CHANGE GROUP
 			# ADD
 			if(request.GET["action"] == "s_addgroup"):
-				workingstandard.visibleby.add(AgencyGroup.objects.get(pk=request.GET["groupid"]))
+				workingstandard.visibleby.add(AgencyGroup.objects.get(pk=request.GET["groupid"], agency=request.user.profile.agency))
 			# REMOVE
 			elif(request.GET["action"] == "s_remgroup"):
-				workingstandard.visibleby.remove(AgencyGroup.objects.get(pk=request.GET["groupid"]))
+				workingstandard.visibleby.remove(AgencyGroup.objects.get(pk=request.GET["groupid"], agency=request.user.profile.agency))
 			# FILES
 			# REMOVE
 			elif(request.GET["action"] == "s_remfile"):
-				workingstandard.addedfiles.remove(DataFile.objects.get(pk=request.GET["fileid"]))
+				workingstandard.addedfiles.remove(DataFile.objects.get(pk=request.GET["fileid"], agency=request.user.profile.agency))
 			# ADD
 			elif(request.GET["action"] == "s_addfile"):
-				workingstandard.addedfiles.add(DataFile.objects.get(pk=request.GET["fileid"]))
+				workingstandard.addedfiles.add(DataFile.objects.get(pk=request.GET["fileid"], agency=request.user.profile.agency))
 			# STANDARD
 			# REMOVE
 			elif(request.GET["action"] == "s_remstandard"):
-				workingstandard.linked_standards.remove(Standards.objects.get(pk=request.GET["standardid"]))
+				workingstandard.linked_standards.remove(Standards.objects.get(pk=request.GET["standardid"], agency=request.user.profile.agency))
 			# ADD
 			elif(request.GET["action"] == "s_addstandard"):
-				workingstandard.linked_standards.add(Standards.objects.get(pk=request.GET["standardid"]))
+				workingstandard.linked_standards.add(Standards.objects.get(pk=request.GET["standardid"], agency=request.user.profile.agency))
 		else:
 			success = False			
 

tasks/views.py

@@ -7,7 +7,7 @@ from .forms import TasksAddTaskForm
 from django.contrib import messages
 from django.http import HttpResponse, JsonResponse
 from users.priomodel import Prio
-
+from django.contrib.auth.decorators import login_required
 
 
 class TasksAddTask(LoginRequiredMixin, CreateView):
@@ -87,28 +87,28 @@ class TasksUpdateView(LoginRequiredMixin, UpdateView):
 	Prio-Objekt erzeugt/entfernt, damit der Mitarbeiter seine Prioritäten auf dem Organigramm einstellen kann.
 
 '''
-
+@login_required
 def task_addtasks_ajax(request):
 	if request.method == 'GET':
 
 		# ADD USER TO MANY-TO-MANY USERSFIELD
 		if request.GET['action'] == 'adduser':
-			task = Tasks.objects.get(pk=request.GET['objectid'])
+			task = Tasks.objects.get(pk=request.GET['objectid'], agency=request.user.profile.agency)
-			task.usersfield.add(User.objects.get(pk=request.GET['userid']))
+			task.usersfield.add(User.objects.get(pk=request.GET['userid'], profile__agency=request.user.profile.agency))
 			task.save()
 			# PRIO
-			prio = Prio(user=User.objects.get(pk=request.GET['userid']), task=task)
+			prio = Prio(user=User.objects.get(pk=request.GET['userid'], profile__agency=request.user.profile.agency), task=task)
 			prio.save()
 		# REMOVE USER TO MANY-TO-MANY USERSFIELD
 		elif request.GET['action'] == 'remuser':
-			task = Tasks.objects.get(pk=request.GET['objectid'])
+			task = Tasks.objects.get(pk=request.GET['objectid'], agency=request.user.profile.agency)
-			task.usersfield.remove(User.objects.get(pk=request.GET['userid']))
+			task.usersfield.remove(User.objects.get(pk=request.GET['userid'], profile__agency=request.user.profile.agency))
 			task.save()
 			# DELETE PRIO
 			Prio.objects.filter(user__pk=request.GET['userid']).filter(task__pk=request.GET['objectid']).delete()
 
 		userid = request.GET['userid']
-		workinguser = User.objects.get(pk=userid)
+		workinguser = User.objects.get(pk=userid, profile__agency=request.user.profile.agency)
 		username_clean = workinguser.first_name + " " + workinguser.last_name
 		
 		# Getting Remaining-Users

users/signals.py

@@ -48,6 +48,7 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using,
 	# IF FALSE NO MAILS WILL BE SEND - IN PRODUCTIVITY CHANGE TO TRUE #
 	GLOBALSENDMAILS = True
 	# GROUPSETTINGS FOR SOME USER WAS CHANGED
+	
 	if isinstance(instance, Group):
 		group_touched = AgencyGroup.objects.get(group=instance)	
 		userid = list(pk_set)[0]	
@@ -98,6 +99,7 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using,
 					)
 
 		
+    
 # SIGNAL FOR NEWS
 @receiver(post_save, sender=News)
 def save_news(sender, instance, **kwargs):

users/views.py

@@ -73,8 +73,8 @@ def toUpdate(request):
 		print("default groups created...adding users...")
 		users_of_agency = User.objects.filter(profile__agency__pk=request.user.profile.agency.pk)
 		for user in users_of_agency:
-			print(temgroup_verwaltung_ag)
+			#print(temgroup_verwaltung_ag)
-			print(temgroup_verwaltung_ag.group)
+			#print(temgroup_verwaltung_ag.group)
 			temgroup_verwaltung_ag.group.user_set.add(user)
 			temgroup_mitarbeiter_ag.group.user_set.add(user)
 
@@ -372,7 +372,7 @@ class ProfileDeleteView(LoginRequiredMixin, DeleteView):
 			t.save()
 
 		standards_fs = Standards.objects.filter(created_standard_by=user)
-		print(standards_fs)
+		#print(standards_fs)
 		for a in standards_fs:
 			a.created_standard_by = logged_user
 			a.save()
@@ -469,6 +469,7 @@ def cleanhtml(raw_html):
   return cleantext
 
 # Searxh for Standards by name, content, creator - standards needs to be public!
+@login_required
 def GlobalSearch(request):
 	if request.method == 'GET':
 		searchfor = request.GET['searchstring']
@@ -483,7 +484,7 @@ def GlobalSearch(request):
 	else:
 		return HttpResponse("Request method is not a GET")
 
-
+@login_required
 def searchStandardRouter(request):
 	if request.method == 'GET':
 		return redirect('/standards/standard/'+request.GET['s_id']+'/single')