[stabble9] Fix 3rdparty notice stable9

.htaccess

@@ -37,6 +37,17 @@
     SetEnv htaccessWorking true
   </IfModule>
 </IfModule>
+<IfModule mod_php7.c>
+  php_value upload_max_filesize 513M
+  php_value post_max_size 513M
+  php_value memory_limit 512M
+  php_value mbstring.func_overload 0
+  php_value default_charset 'UTF-8'
+  php_value output_buffering 0
+  <IfModule mod_env.c>
+    SetEnv htaccessWorking true
+  </IfModule>
+</IfModule>
 <IfModule mod_rewrite.c>
   RewriteEngine on
   RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
@@ -48,24 +59,6 @@
   RewriteRule ^(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
   RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
   RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
-
-  # Rewrite rules for `front_controller_active`
-  Options -MultiViews
-  RewriteRule ^core/js/oc.js$ index.php/core/js/oc.js [PT,E=PATH_INFO:$1]
-  RewriteRule ^core/preview.png$ index.php/core/preview.png [PT,E=PATH_INFO:$1]
-  RewriteCond %{REQUEST_FILENAME} !\.(css|js|svg|gif|png|html|ttf|woff|ico)$
-  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$
-  RewriteCond %{REQUEST_FILENAME} !/remote.php
-  RewriteCond %{REQUEST_FILENAME} !/public.php
-  RewriteCond %{REQUEST_FILENAME} !/cron.php
-  RewriteCond %{REQUEST_FILENAME} !/core/ajax/update.php
-  RewriteCond %{REQUEST_FILENAME} !/status.php
-  RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php
-  RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php
-  RewriteCond %{REQUEST_FILENAME} !/updater/
-  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/
-  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
-  RewriteRule .* index.php [PT,E=PATH_INFO:$1]
 </IfModule>
 <IfModule mod_mime.c>
   AddType image/svg+xml svg svgz

.travis.yml

@@ -13,7 +13,7 @@ env:
 branches:
   only:
     - master
-#    - /^stable\d+(\.\d+)?$/
+    - /^stable\d+(\.\d+)?$/
 
 addons:
   apt:
@@ -29,6 +29,7 @@ install:
 
 
 script:
+  - sh -c "if [ '$TC' = 'syntax' ]; then composer install && vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .; fi"
   - sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi"
   - sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi"
 
@@ -42,5 +43,13 @@ matrix:
       env: DB=sqlite;TC=carddav
     - php: 5.4
       env: DB=sqlite;TC=caldav
+    - php: 5.4
+      env: DB=sqlite;TC=syntax;TEST_DAV=0
+    - php: 5.5
+      env: DB=sqlite;TC=syntax;TEST_DAV=0
+    - php: 5.6
+      env: DB=sqlite;TC=syntax;TEST_DAV=0
+    - php: 7.0
+      env: DB=sqlite;TC=syntax;TEST_DAV=0
 
   fast_finish: true

apps/comments/activity/extension.php

@@ -105,7 +105,7 @@ public function getDefaultTypes($method) {
 	public function getTypeIcon($type) {
 		switch ($type) {
 			case self::APP_NAME:
-				return false;
+				return 'icon-comment';
 		}
 
 		return false;
@@ -150,6 +150,9 @@ protected function translateShort($text, IL10N $l, array $params) {
 
 		switch ($text) {
 			case self::ADD_COMMENT_SUBJECT:
+				if ($this->authorIsCurrentUser($params[0])) {
+					return (string) $l->t('You commented');
+				}
 				return (string) $l->t('%1$s commented', $params);
 			case self::ADD_COMMENT_MESSAGE:
 				return $this->convertParameterToComment($params[0], 120);
@@ -168,6 +171,9 @@ protected function translateLong($text, IL10N $l, array $params) {
 
 		switch ($text) {
 			case self::ADD_COMMENT_SUBJECT:
+				if ($this->authorIsCurrentUser($params[0])) {
+					return (string) $l->t('You commented on %2$s', $params);
+				}
 				return (string) $l->t('%1$s commented on %2$s', $params);
 			case self::ADD_COMMENT_MESSAGE:
 				return $this->convertParameterToComment($params[0]);
@@ -176,6 +182,21 @@ protected function translateLong($text, IL10N $l, array $params) {
 		return false;
 	}
 
+	/**
+	 * Check if the author is the current user
+	 *
+	 * @param string $user Parameter e.g. `<user display-name="admin">admin</user>`
+	 * @return bool
+	 */
+	protected function authorIsCurrentUser($user) {
+		try {
+			return strip_tags($user) === $this->activityManager->getCurrentUserId();
+		} catch (\UnexpectedValueException $e) {
+			// FIXME this is awkward, but we have no access to the current user in emails
+			return false;
+		}
+	}
+
 	/**
 	 * The extension can define the type of parameters for translation
 	 *

apps/comments/l10n/cs_CZ.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Uložit",
     "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
     "{count} unread comments" : "{count} nepřečtených komentářů",
-    "Comment" : "Komentář"
+    "Comment" : "Komentář",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů"
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");

apps/comments/l10n/cs_CZ.json

@@ -14,6 +14,7 @@
     "Save" : "Uložit",
     "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
     "{count} unread comments" : "{count} nepřečtených komentářů",
-    "Comment" : "Komentář"
+    "Comment" : "Komentář",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
 }

apps/comments/l10n/de.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
     "{count} unread comments" : "{count} ungelesene Kommentare",
-    "Comment" : "Kommentar"
+    "Comment" : "Kommentar",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/de.json

@@ -14,6 +14,7 @@
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
     "{count} unread comments" : "{count} ungelesene Kommentare",
-    "Comment" : "Kommentar"
+    "Comment" : "Kommentar",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/de_DE.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
     "{count} unread comments" : "[count] ungelesene Kommentare",
-    "Comment" : "Kommentar"
+    "Comment" : "Kommentar",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/de_DE.json

@@ -14,6 +14,7 @@
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
     "{count} unread comments" : "[count] ungelesene Kommentare",
-    "Comment" : "Kommentar"
+    "Comment" : "Kommentar",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/en_GB.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Save",
     "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
     "{count} unread comments" : "{count} unread comments",
-    "Comment" : "Comment"
+    "Comment" : "Comment",
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/en_GB.json

@@ -14,6 +14,7 @@
     "Save" : "Save",
     "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
     "{count} unread comments" : "{count} unread comments",
-    "Comment" : "Comment"
+    "Comment" : "Comment",
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/eo.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Konservi",
     "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
     "{count} unread comments" : "{count} nelegitaj komentoj",
-    "Comment" : "Komento"
+    "Comment" : "Komento",
+    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/eo.json

@@ -14,6 +14,7 @@
     "Save" : "Konservi",
     "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
     "{count} unread comments" : "{count} nelegitaj komentoj",
-    "Comment" : "Komento"
+    "Comment" : "Komento",
+    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Guardar",
     "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
     "{count} unread comments" : "{count} comentarios no leídos",
-    "Comment" : "Comentario"
+    "Comment" : "Comentario",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es.json

@@ -14,6 +14,7 @@
     "Save" : "Guardar",
     "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
     "{count} unread comments" : "{count} comentarios no leídos",
-    "Comment" : "Comentario"
+    "Comment" : "Comentario",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/fi_FI.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Tallenna",
     "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
     "{count} unread comments" : "{count} lukematonta kommenttia",
-    "Comment" : "Kommentti"
+    "Comment" : "Kommentti",
+    "<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/fi_FI.json

@@ -14,6 +14,7 @@
     "Save" : "Tallenna",
     "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
     "{count} unread comments" : "{count} lukematonta kommenttia",
-    "Comment" : "Kommentti"
+    "Comment" : "Kommentti",
+    "<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/fr.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Enregistrer",
     "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
     "{count} unread comments" : "{count} commentaires non lus",
-    "Comment" : "Commenter"
+    "Comment" : "Commenter",
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers"
 },
 "nplurals=2; plural=(n > 1);");

apps/comments/l10n/fr.json

@@ -14,6 +14,7 @@
     "Save" : "Enregistrer",
     "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
     "{count} unread comments" : "{count} commentaires non lus",
-    "Comment" : "Commenter"
+    "Comment" : "Commenter",
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/comments/l10n/he.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "שמירה",
     "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
     "{count} unread comments" : "{count} תגובות שלא נקראו",
-    "Comment" : "תגובה"
+    "Comment" : "תגובה",
+    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/he.json

@@ -14,6 +14,7 @@
     "Save" : "שמירה",
     "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
     "{count} unread comments" : "{count} תגובות שלא נקראו",
-    "Comment" : "תגובה"
+    "Comment" : "תגובה",
+    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/hu_HU.js

@@ -3,6 +3,11 @@ OC.L10N.register(
     {
     "Cancel" : "Mégsem",
     "Save" : "Mentés",
-    "Comment" : "Komment"
+    "Comment" : "Komment",
+    "<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> a fájlokhoz",
+    "Delete comment" : "Hozzászólás törlése",
+    "Edit comment" : "Hozzászólás szerkesztése",
+    "No other comments available" : "Nincs több hozzászólás.",
+    "Post" : "Küldés"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/hu_HU.json

@@ -1,6 +1,11 @@
 { "translations": {
     "Cancel" : "Mégsem",
     "Save" : "Mentés",
-    "Comment" : "Komment"
+    "Comment" : "Komment",
+    "<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> a fájlokhoz",
+    "Delete comment" : "Hozzászólás törlése",
+    "Edit comment" : "Hozzászólás szerkesztése",
+    "No other comments available" : "Nincs több hozzászólás.",
+    "Post" : "Küldés"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/id.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Simpan",
     "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
     "{count} unread comments" : "{count} komentar belum dibaca",
-    "Comment" : "Komentar"
+    "Comment" : "Komentar",
+    "<strong>Comments</strong> for files" : "<strong>Komentar</strong> untuk berkas"
 },
 "nplurals=1; plural=0;");

apps/comments/l10n/id.json

@@ -14,6 +14,7 @@
     "Save" : "Simpan",
     "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
     "{count} unread comments" : "{count} komentar belum dibaca",
-    "Comment" : "Komentar"
+    "Comment" : "Komentar",
+    "<strong>Comments</strong> for files" : "<strong>Komentar</strong> untuk berkas"
 },"pluralForm" :"nplurals=1; plural=0;"
 }

apps/comments/l10n/is.js

@@ -3,6 +3,11 @@ OC.L10N.register(
     {
     "Cancel" : "Hætta við",
     "Save" : "Vista",
-    "Comment" : "Athugasemd"
+    "Comment" : "Athugasemd",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "Delete comment" : "Eyða athugasemd",
+    "Edit comment" : "Breyta athugasemd",
+    "No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
+    "Post" : "Senda"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");

apps/comments/l10n/is.json

@@ -1,6 +1,11 @@
 { "translations": {
     "Cancel" : "Hætta við",
     "Save" : "Vista",
-    "Comment" : "Athugasemd"
+    "Comment" : "Athugasemd",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "Delete comment" : "Eyða athugasemd",
+    "Edit comment" : "Breyta athugasemd",
+    "No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
+    "Post" : "Senda"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }

apps/comments/l10n/it.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "Salva",
     "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}",
     "{count} unread comments" : "{count} commenti non letti",
-    "Comment" : "Commento"
+    "Comment" : "Commento",
+    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/it.json

@@ -14,6 +14,7 @@
     "Save" : "Salva",
     "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}",
     "{count} unread comments" : "{count} commenti non letti",
-    "Comment" : "Commento"
+    "Comment" : "Commento",
+    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/ja.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Save" : "保存",
     "Allowed characters {count} of {max}" : "入力文字数  {count} / {max}",
     "{count} unread comments" : "未読コメント数 {count}",
-    "Comment" : "コメント"
+    "Comment" : "コメント",
+    "<strong>Comments</strong> for files" : "ファイルについての<strong>コメント</strong>"
 },
 "nplurals=1; plural=0;");