';
}
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 5ec259f6c47..389679b80bd 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -143,7 +143,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
if(!empty($this->groupSearch)) {
$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
}
- if($limit = -1) {
+ if($limit == -1) {
$limit = null;
}
return array_slice($groupUsers, $offset, $limit);
@@ -187,7 +187,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
if(!empty($this->groupSearch)) {
$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
}
- if($limit = -1) {
+ if($limit == -1) {
$limit = null;
}
return array_slice($groupUsers, $offset, $limit);
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 1bb72f163a7..4ed7ab1f081 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -10,6 +10,7 @@
"Base Group Tree" => "Base Group Tree",
"Group-Member association" => "Group-Member association",
"Use TLS" => "Χρήση TLS",
+"Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.",
"User Display Name Field" => "User Display Name Field",
"Group Display Name Field" => "Group Display Name Field",
"in bytes" => "σε bytes",
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index bacdb8b9ae1..53a65129108 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -111,7 +111,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
if(!empty($this->userSearch)) {
$ldap_users = array_filter($ldap_users, array($this, 'userMatchesFilter'));
}
- if($limit = -1) {
+ if($limit == -1) {
$limit = null;
}
return array_slice($ldap_users, $offset, $limit);
diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php
new file mode 100644
index 00000000000..96d5402e621
--- /dev/null
+++ b/core/ajax/requesttoken.php
@@ -0,0 +1,41 @@
+
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the license, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.
+* If not, see .
+*
+*/
+
+/**
+ * @file core/ajax/requesttoken.php
+ * @brief Ajax method to retrieve a fresh request protection token for ajax calls
+ * @return json: success/error state indicator including a fresh request token
+ * @author Christian Reiner
+ */
+require_once '../../lib/base.php';
+
+// don't load apps or filesystem for this task
+$RUNTIME_NOAPPS = TRUE;
+$RUNTIME_NOSETUPFS = TRUE;
+
+// Sanity checks
+// using OCP\JSON::callCheck() below protects the token refreshing itself.
+//OCP\JSON::callCheck ( );
+OCP\JSON::checkLoggedIn ( );
+// hand out a fresh token
+OCP\JSON::success ( array ( 'token' => OCP\Util::callRegister() ) );
+?>
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index e3ad7e3a671..45c63715a7e 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -40,7 +40,7 @@ OC.EventSource=function(src,data){
dataStr+=name+'='+encodeURIComponent(data[name])+'&';
}
}
- dataStr+='requesttoken='+OC.EventSource.requesttoken;
+ dataStr+='requesttoken='+OC.Request.Token;
if(!this.useFallBack && typeof EventSource !='undefined'){
this.source=new EventSource(src+'?'+dataStr);
this.source.onmessage=function(e){
diff --git a/core/js/js.js b/core/js/js.js
index 71aaedccc29..657dd6d6f8a 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -37,7 +37,7 @@ t.cache={};
* @return string
*/
function fileDownloadPath(dir, file) {
- return OC.filePath('files', 'ajax', 'download.php')+encodeURIComponent('?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir));
+ return OC.filePath('files', 'ajax', 'download.php')+'&files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
}
var OC={
diff --git a/core/js/requesttoken.js b/core/js/requesttoken.js
new file mode 100644
index 00000000000..0d78cd7e93b
--- /dev/null
+++ b/core/js/requesttoken.js
@@ -0,0 +1,55 @@
+/**
+ * ownCloud
+ *
+ * @file core/js/requesttoken.js
+ * @brief Routine to refresh the Request protection request token periodically
+ * @author Christian Reiner (arkascha)
+ * @copyright 2011-2012 Christian Reiner
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the license, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.
+ * If not, see .
+ *
+ */
+
+OC.Request = {
+ // the request token
+ Token: {},
+ // the lifespan span (in secs)
+ Lifespan: {},
+ // method to refresh the local request token periodically
+ Refresh: function(){
+ // just a client side console log to preserve efficiency
+ console.log("refreshing request token (lifebeat)");
+ var dfd=new $.Deferred();
+ $.ajax({
+ type: 'POST',
+ url: OC.filePath('core','ajax','requesttoken.php'),
+ cache: false,
+ data: { },
+ dataType: 'json'
+ }).done(function(response){
+ // store refreshed token inside this class
+ OC.Request.Token=response.token;
+ dfd.resolve();
+ }).fail(dfd.reject);
+ return dfd;
+ }
+}
+// accept requesttoken and lifespan into the OC namespace
+OC.Request.Token = oc_requesttoken;
+OC.Request.Lifespan = oc_requestlifespan;
+// refresh the request token periodically shortly before it becomes invalid on the server side
+setInterval(OC.Request.Refresh,Math.floor(1000*OC.Request.Lifespan*0.93)), // 93% of lifespan value, close to when the token expires
+// early bind token as additional ajax argument for every single request
+$(document).bind('ajaxSend', function(elm, xhr, s){xhr.setRequestHeader('requesttoken', OC.Request.Token);});
diff --git a/core/js/share.js b/core/js/share.js
index 36ee39d8eab..6c26fed18be 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -127,9 +127,9 @@ OC.Share={
var html = '
';
if (data.reshare) {
if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
- html += ''+t('core', 'Shared with you and the group %s by %s', data.reshare.share_with, data.reshare.uid_owner)+'';
+ html += ''+t('core', 'Shared with you and the group')+' '+data.reshare.share_with+' '+t('core', 'by')+' '+data.reshare.uid_owner+'';
} else {
- html += ''+t('core', 'Shared with you by %s', data.reshare.uid_owner)+'';
+ html += ''+t('core', 'Shared with you by')+' '+data.reshare.uid_owner+'';
}
html += ' ';
}
@@ -182,7 +182,7 @@ OC.Share={
// Suggest sharing via email if valid email address
// var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
// if (pattern.test(search.term)) {
-// response([{label: t('core', 'Share via email: %s', search.term), value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
+// response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
// } else {
response([t('core', 'No people found')]);
// }
@@ -247,7 +247,7 @@ OC.Share={
if (collectionList.length > 0) {
$(collectionList).append(', '+shareWith);
} else {
- var html = '
'+t('core', 'Shared in %s with %s', item, shareWith)+'
';
$('#shareWithList').prepend(html);
}
} else {
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 69fdc06a293..461bed99334 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -25,18 +25,20 @@
"Error while sharing" => "Chyba při sdílení",
"Error while unsharing" => "Chyba při rušení sdílení",
"Error while changing permissions" => "Chyba při změně oprávnění",
-"Shared with you and the group %s by %s" => "Sdíleno s Vámi a skupinou %s od %s",
-"Shared with you by %s" => "Sdíleno s Vámi od %s",
+"Shared with you and the group" => "S Vámi a skupinou",
+"by" => "sdílí",
+"Shared with you by" => "S Vámi sdílí",
"Share with" => "Sdílet s",
"Share with link" => "Sdílet s odkazem",
"Password protect" => "Chránit heslem",
"Password" => "Heslo",
"Set expiration date" => "Nastavit datum vypršení platnosti",
"Expiration date" => "Datum vypršení platnosti",
-"Share via email: %s" => "Sdílet e-mailem: %s",
+"Share via email:" => "Sdílet e-mailem:",
"No people found" => "Žádní lidé nenalezeni",
"Resharing is not allowed" => "Sdílení již sdílené položky není povoleno",
-"Shared in %s with %s" => "Sdíleno v %s s %s",
+"Shared in" => "Sdíleno v",
+"with" => "s",
"Unshare" => "Zrušit sdílení",
"can edit" => "lze upravovat",
"access control" => "řízení přístupu",
@@ -45,6 +47,7 @@
"delete" => "smazat",
"share" => "sdílet",
"Password protected" => "Chráněno heslem",
+"Error unsetting expiration date" => "Chyba při odstraňování data vypršení platnosti",
"Error setting expiration date" => "Chyba při nastavení data vypršení platnosti",
"ownCloud password reset" => "Obnovení hesla pro ownCloud",
"Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 284a16c4524..dbc99e237cb 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -25,18 +25,14 @@
"Error while sharing" => "Fejl under deling",
"Error while unsharing" => "Fejl under annullering af deling",
"Error while changing permissions" => "Fejl under justering af rettigheder",
-"Shared with you and the group %s by %s" => "Delt med dig og gruppen %s af %s",
-"Shared with you by %s" => "Delt med dig af %s",
"Share with" => "Del med",
"Share with link" => "Del med link",
"Password protect" => "Beskyt med adgangskode",
"Password" => "Kodeord",
"Set expiration date" => "Vælg udløbsdato",
"Expiration date" => "Udløbsdato",
-"Share via email: %s" => "Del over email: %s",
"No people found" => "Ingen personer fundet",
"Resharing is not allowed" => "Videredeling ikke tilladt",
-"Shared in %s with %s" => "Delt i %s med %s",
"Unshare" => "Fjern deling",
"can edit" => "kan redigere",
"access control" => "Adgangskontrol",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 0a87fc4e8e7..8697967274f 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -22,21 +22,23 @@
"Ok" => "OK",
"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
"Error" => "Fehler",
-"Error while sharing" => "Fehler beim Teilen",
+"Error while sharing" => "Fehler beim Freigeben",
"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
"Error while changing permissions" => "Fehler beim Ändern der Rechte",
-"Shared with you and the group %s by %s" => "%s hat dies für dich und die Gruppe %s freigegeben.",
-"Shared with you by %s" => "%s hat dies mit dir geteilt.",
+"Shared with you and the group" => "Mit Dir und der Gruppe geteilt",
+"by" => "mit",
+"Shared with you by" => "Dies wurde mit dir geteilt von",
"Share with" => "Freigeben für",
"Share with link" => "Über einen Link freigeben",
"Password protect" => "Passwortschutz",
"Password" => "Passwort",
"Set expiration date" => "Setze ein Ablaufdatum",
"Expiration date" => "Ablaufdatum",
-"Share via email: %s" => "Über eine E-Mail freigeben: %s",
+"Share via email:" => "Über eine E-Mail freigeben:",
"No people found" => "Niemand gefunden",
"Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
-"Shared in %s with %s" => "In %s für %s freigegeben",
+"Shared in" => "Geteilt mit",
+"with" => "mit",
"Unshare" => "Freigabe aufheben",
"can edit" => "kann bearbeiten",
"access control" => "Zugriffskontrolle",
@@ -44,15 +46,16 @@
"update" => "aktualisieren",
"delete" => "löschen",
"share" => "teilen",
-"Password protected" => "Passwort geschützt",
+"Password protected" => "Durch ein Passwort geschützt",
+"Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
+"You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
"Requested" => "Angefragt",
"Login failed!" => "Login fehlgeschlagen!",
"Username" => "Benutzername",
-"Request reset" => "Anfrage zurückgesetzt",
+"Request reset" => "Beantrage Zurücksetzung",
"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
"To login page" => "Zur Login-Seite",
"New password" => "Neues Passwort",
@@ -67,10 +70,10 @@
"Edit categories" => "Kategorien bearbeiten",
"Add" => "Hinzufügen",
"Create an admin account" => "Administrator-Konto anlegen",
-"Advanced" => "Erweitert",
+"Advanced" => "Fortgeschritten",
"Data folder" => "Datenverzeichnis",
"Configure the database" => "Datenbank einrichten",
-"will be used" => "wird genutzt",
+"will be used" => "wird verwendet",
"Database user" => "Datenbank-Benutzer",
"Database password" => "Datenbank-Passwort",
"Database name" => "Datenbank-Name",
@@ -82,7 +85,7 @@
"Lost your password?" => "Passwort vergessen?",
"remember" => "merken",
"Log in" => "Einloggen",
-"You are logged out." => "Sie wurden abgemeldet.",
+"You are logged out." => "Du wurdest abgemeldet.",
"prev" => "Zurück",
"next" => "Weiter"
);
diff --git a/core/l10n/el.php b/core/l10n/el.php
index ce341176adf..0e0c43b899e 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -15,13 +15,40 @@
"October" => "Οκτώβριος",
"November" => "Νοέμβριος",
"December" => "Δεκέμβριος",
+"Choose" => "Επιλέξτε",
"Cancel" => "Ακύρωση",
"No" => "Όχι",
"Yes" => "Ναι",
"Ok" => "Οκ",
"No categories selected for deletion." => "Δεν επιλέχτηκαν κατηγορίες για διαγραφή",
"Error" => "Σφάλμα",
+"Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό",
+"Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
+"Error while changing permissions" => "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
+"Shared with you and the group" => "Διαμοιρασμένο με εσένα και την ομάδα",
+"by" => "από",
+"Shared with you by" => "Μοιράστηκε μαζί σας από ",
+"Share with" => "Διαμοιρασμός με",
+"Share with link" => "Διαμοιρασμός με σύνδεσμο",
+"Password protect" => "Προστασία κωδικού",
"Password" => "Κωδικός",
+"Set expiration date" => "Ορισμός ημ. λήξης",
+"Expiration date" => "Ημερομηνία λήξης",
+"Share via email:" => "Διαμοιρασμός μέσω email:",
+"No people found" => "Δεν βρέθηκε άνθρωπος",
+"Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται",
+"Shared in" => "Διαμοιράστηκε με",
+"with" => "με",
+"Unshare" => "Σταμάτημα μοιράσματος",
+"can edit" => "δυνατότητα αλλαγής",
+"access control" => "έλεγχος πρόσβασης",
+"create" => "δημιουργία",
+"update" => "ανανέωση",
+"delete" => "διαγραφή",
+"share" => "διαμοιρασμός",
+"Password protected" => "Προστασία με κωδικό",
+"Error unsetting expiration date" => "Σφάλμα κατά την διαγραφή της ημ. λήξης",
+"Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης",
"ownCloud password reset" => "Επαναφορά κωδικού ownCloud",
"Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
"You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 1f55a59deb1..204760720a2 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -25,18 +25,20 @@
"Error while sharing" => "Error compartiendo",
"Error while unsharing" => "Error descompartiendo",
"Error while changing permissions" => "Error cambiando permisos",
-"Shared with you and the group %s by %s" => "Compartido contigo y el grupo %s por %s",
-"Shared with you by %s" => "Compartido contigo por %s",
+"Shared with you and the group" => "Comprtido contigo y con el grupo",
+"by" => "por",
+"Shared with you by" => "Compartido contigo por",
"Share with" => "Compartir con",
"Share with link" => "Enlace de compartir con ",
"Password protect" => "Protegido por contraseña",
"Password" => "Contraseña",
"Set expiration date" => "Establecer fecha de caducidad",
"Expiration date" => "Fecha de caducidad",
-"Share via email: %s" => "Compartir por email: %s",
+"Share via email:" => "compartido via e-mail:",
"No people found" => "No se encontró gente",
"Resharing is not allowed" => "No se permite compartir de nuevo",
-"Shared in %s with %s" => "Compartido en %s con %s",
+"Shared in" => "Compartido en",
+"with" => "con",
"Unshare" => "No compartir",
"can edit" => "puede editar",
"access control" => "control de acceso",
@@ -45,6 +47,7 @@
"delete" => "eliminar",
"share" => "compartir",
"Password protected" => "Protegido por contraseña",
+"Error unsetting expiration date" => "Error al eliminar la fecha de caducidad",
"Error setting expiration date" => "Error estableciendo fecha de caducidad",
"ownCloud password reset" => "Reiniciar contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 2a98e068501..ea8b2aae78e 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -25,18 +25,14 @@
"Error while sharing" => "Error al compartir",
"Error while unsharing" => "Error en el procedimiento de ",
"Error while changing permissions" => "Error al cambiar permisos",
-"Shared with you and the group %s by %s" => "Compartido con vos y con el grupo %s por %s",
-"Shared with you by %s" => "Compartido con vos por %s",
"Share with" => "Compartir con",
"Share with link" => "Compartir con link",
"Password protect" => "Proteger con contraseña ",
"Password" => "Contraseña",
"Set expiration date" => "Asignar fecha de vencimiento",
"Expiration date" => "Fecha de vencimiento",
-"Share via email: %s" => "Compartir por e-mail: %s",
"No people found" => "No se encontraron usuarios",
"Resharing is not allowed" => "No se permite volver a compartir",
-"Shared in %s with %s" => "Compartido en %s con %s",
"Unshare" => "Remover compartir",
"can edit" => "puede editar",
"access control" => "control de acceso",
@@ -45,6 +41,7 @@
"delete" => "remover",
"share" => "compartir",
"Password protected" => "Protegido por contraseña",
+"Error unsetting expiration date" => "Error al remover la fecha de caducidad",
"Error setting expiration date" => "Error al asignar fecha de vencimiento",
"ownCloud password reset" => "Restablecer contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index fc400a69f11..a5f5d3a6210 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -25,18 +25,14 @@
"Error while sharing" => "Errore bat egon da elkarbanatzean",
"Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
"Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
-"Shared with you and the group %s by %s" => "Zurekin eta %s taldearekin %sk elkarbanatuta",
-"Shared with you by %s" => "%sk zurekin elkarbanatuta",
"Share with" => "Elkarbanatu honekin",
"Share with link" => "Elkarbanatu lotura batekin",
"Password protect" => "Babestu pasahitzarekin",
"Password" => "Pasahitza",
"Set expiration date" => "Ezarri muga data",
"Expiration date" => "Muga data",
-"Share via email: %s" => "Elkarbanatu eposta bidez: %s",
"No people found" => "Ez da inor aurkitu",
"Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
-"Shared in %s with %s" => "Elkarbanatuta hemen %s %srekin",
"Unshare" => "Ez elkarbanatu",
"can edit" => "editatu dezake",
"access control" => "sarrera kontrola",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 4a723b3448f..a11ec5033c0 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -27,7 +27,6 @@
"Password" => "Salasana",
"Set expiration date" => "Aseta päättymispäivä",
"Expiration date" => "Päättymispäivä",
-"Share via email: %s" => "Jaa sähköpostitse: %s",
"Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu",
"can edit" => "voi muokata",
"create" => "luo",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index d6fbb7693df..4ab46a8a332 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -25,18 +25,20 @@
"Error while sharing" => "Erreur lors de la mise en partage",
"Error while unsharing" => "Erreur lors de l'annulation du partage",
"Error while changing permissions" => "Erreur lors du changement des permissions",
-"Shared with you and the group %s by %s" => "Partagé avec vous ainsi qu'avec le groupe %s par %s",
-"Shared with you by %s" => "Partagé avec vous par %s",
+"Shared with you and the group" => "Partagé avec vous ainsi qu'avec le groupe",
+"by" => "par",
+"Shared with you by" => "Partagé avec vous par",
"Share with" => "Partager avec",
"Share with link" => "Partager via lien",
"Password protect" => "Protéger par un mot de passe",
"Password" => "Mot de passe",
"Set expiration date" => "Spécifier la date d'expiration",
"Expiration date" => "Date d'expiration",
-"Share via email: %s" => "Partager via email : %s",
+"Share via email:" => "Partager via e-mail :",
"No people found" => "Aucun utilisateur trouvé",
"Resharing is not allowed" => "Le repartage n'est pas autorisé",
-"Shared in %s with %s" => "Partagé dans %s avec %s",
+"Shared in" => "Partagé dans",
+"with" => "avec",
"Unshare" => "Ne plus partager",
"can edit" => "édition autorisée",
"access control" => "contrôle des accès",
@@ -45,6 +47,7 @@
"delete" => "supprimer",
"share" => "partager",
"Password protected" => "Protégé par un mot de passe",
+"Error unsetting expiration date" => "Un erreur est survenue pendant la suppression de la date d'expiration",
"Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration",
"ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index cce4ac44cdc..c586171275d 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -25,18 +25,20 @@
"Error while sharing" => "Errore durante la condivisione",
"Error while unsharing" => "Errore durante la rimozione della condivisione",
"Error while changing permissions" => "Errore durante la modifica dei permessi",
-"Shared with you and the group %s by %s" => "Condivisa con te e con il gruppo %s da %s",
-"Shared with you by %s" => "Condiviso con te da %s",
+"Shared with you and the group" => "Condiviso con te e con il gruppo",
+"by" => "da",
+"Shared with you by" => "Condiviso con te da",
"Share with" => "Condividi con",
"Share with link" => "Condividi con collegamento",
"Password protect" => "Proteggi con password",
"Password" => "Password",
"Set expiration date" => "Imposta data di scadenza",
"Expiration date" => "Data di scadenza",
-"Share via email: %s" => "Condividi tramite email: %s",
+"Share via email:" => "Condividi tramite email:",
"No people found" => "Non sono state trovate altre persone",
"Resharing is not allowed" => "La ri-condivisione non è consentita",
-"Shared in %s with %s" => "Condiviso in %s con %s",
+"Shared in" => "Condiviso in",
+"with" => "con",
"Unshare" => "Rimuovi condivisione",
"can edit" => "può modificare",
"access control" => "controllo d'accesso",
@@ -45,6 +47,7 @@
"delete" => "eliminare",
"share" => "condividere",
"Password protected" => "Protetta da password",
+"Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza",
"Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
"ownCloud password reset" => "Ripristino password di ownCloud",
"Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index e563c09cf15..089098c2d22 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -25,18 +25,20 @@
"Error while sharing" => "共有でエラー発生",
"Error while unsharing" => "共有解除でエラー発生",
"Error while changing permissions" => "権限変更でエラー発生",
-"Shared with you and the group %s by %s" => "あなたと %s グループが %s で共有しています",
-"Shared with you by %s" => "あなたと %s で共有しています",
+"Shared with you and the group" => "あなたとグループで共有中",
+"by" => "により",
+"Shared with you by" => "あなたと共有",
"Share with" => "共有者",
"Share with link" => "URLリンクで共有",
"Password protect" => "パスワード保護",
"Password" => "パスワード",
"Set expiration date" => "有効期限を設定",
"Expiration date" => "有効期限",
-"Share via email: %s" => "メール経由で共有: %s",
+"Share via email:" => "メール経由で共有: %s",
"No people found" => "ユーザーが見つかりません",
"Resharing is not allowed" => "再共有は許可されていません",
-"Shared in %s with %s" => "%s 内で %s と共有",
+"Shared in" => "の中で共有中",
+"with" => "と",
"Unshare" => "共有解除",
"can edit" => "編集可能",
"access control" => "アクセス権限",
@@ -45,6 +47,7 @@
"delete" => "削除",
"share" => "共有",
"Password protected" => "パスワード保護",
+"Error unsetting expiration date" => "有効期限の未設定エラー",
"Error setting expiration date" => "有効期限の設定でエラー発生",
"ownCloud password reset" => "ownCloudのパスワードをリセットします",
"Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index c5235690eae..e4051fc5c5d 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -25,18 +25,14 @@
"Error while sharing" => "Fout tijdens het delen",
"Error while unsharing" => "Fout tijdens het stoppen met delen",
"Error while changing permissions" => "Fout tijdens het veranderen van permissies",
-"Shared with you and the group %s by %s" => "Gedeeld met u en de group %s door %s",
-"Shared with you by %s" => "Gedeeld met u door %s",
"Share with" => "Deel met",
"Share with link" => "Deel met link",
"Password protect" => "Passeerwoord beveiliging",
"Password" => "Wachtwoord",
"Set expiration date" => "Zet vervaldatum",
"Expiration date" => "Vervaldatum",
-"Share via email: %s" => "Deel via email: %s",
"No people found" => "Geen mensen gevonden",
"Resharing is not allowed" => "Verder delen is niet toegestaan",
-"Shared in %s with %s" => "Deel in %s met %s",
"Unshare" => "Stop met delen",
"can edit" => "kan wijzigen",
"access control" => "toegangscontrole",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
new file mode 100644
index 00000000000..328cc0b60ba
--- /dev/null
+++ b/core/l10n/oc.php
@@ -0,0 +1,91 @@
+ "Nom d'applicacion pas donat.",
+"No category to add?" => "Pas de categoria d'ajustar ?",
+"This category already exists: " => "La categoria exista ja :",
+"Settings" => "Configuracion",
+"January" => "Genièr",
+"February" => "Febrièr",
+"March" => "Març",
+"April" => "Abril",
+"May" => "Mai",
+"June" => "Junh",
+"July" => "Julhet",
+"August" => "Agost",
+"September" => "Septembre",
+"October" => "Octobre",
+"November" => "Novembre",
+"December" => "Decembre",
+"Choose" => "Causís",
+"Cancel" => "Anulla",
+"No" => "Non",
+"Yes" => "Òc",
+"Ok" => "D'accòrdi",
+"No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.",
+"Error" => "Error",
+"Error while sharing" => "Error al partejar",
+"Error while unsharing" => "Error al non partejar",
+"Error while changing permissions" => "Error al cambiar permissions",
+"Shared with you and the group" => "Partejat amb tu e lo grop",
+"by" => "per",
+"Shared with you by" => "Partejat amb tu per",
+"Share with" => "Parteja amb",
+"Share with link" => "Parteja amb lo ligam",
+"Password protect" => "Parat per senhal",
+"Password" => "Senhal",
+"Set expiration date" => "Met la data d'expiracion",
+"Expiration date" => "Data d'expiracion",
+"Share via email:" => "Parteja tras corrièl :",
+"No people found" => "Deguns trobat",
+"Resharing is not allowed" => "Tornar partejar es pas permis",
+"Shared in" => "Partejat dins",
+"with" => "amb",
+"Unshare" => "Non parteje",
+"can edit" => "pòt modificar",
+"access control" => "Contraròtle d'acces",
+"create" => "crea",
+"update" => "met a jorn",
+"delete" => "escafa",
+"share" => "parteja",
+"Password protected" => "Parat per senhal",
+"Error unsetting expiration date" => "Error al metre de la data d'expiracion",
+"Error setting expiration date" => "Error setting expiration date",
+"ownCloud password reset" => "senhal d'ownCloud tornat botar",
+"Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
+"You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
+"Requested" => "Requesit",
+"Login failed!" => "Fracàs de login",
+"Username" => "Nom d'usancièr",
+"Request reset" => "Tornar botar requesit",
+"Your password was reset" => "Ton senhal es estat tornat botar",
+"To login page" => "Pagina cap al login",
+"New password" => "Senhal nòu",
+"Reset password" => "Senhal tornat botar",
+"Personal" => "Personal",
+"Users" => "Usancièrs",
+"Apps" => "Apps",
+"Admin" => "Admin",
+"Help" => "Ajuda",
+"Access forbidden" => "Acces enebit",
+"Cloud not found" => "Nívol pas trobada",
+"Edit categories" => "Edita categorias",
+"Add" => "Ajusta",
+"Create an admin account" => "Crea un compte admin",
+"Advanced" => "Avançat",
+"Data folder" => "Dorsièr de donadas",
+"Configure the database" => "Configura la basa de donadas",
+"will be used" => "serà utilizat",
+"Database user" => "Usancièr de la basa de donadas",
+"Database password" => "Senhal de la basa de donadas",
+"Database name" => "Nom de la basa de donadas",
+"Database tablespace" => "Espandi de taula de basa de donadas",
+"Database host" => "Òste de basa de donadas",
+"Finish setup" => "Configuracion acabada",
+"web services under your control" => "Services web jos ton contraròtle",
+"Log out" => "Sortida",
+"Lost your password?" => "L'as perdut lo senhal ?",
+"remember" => "bremba-te",
+"Log in" => "Dintrada",
+"You are logged out." => "Sias pas dintra (t/ada)",
+"prev" => "dariièr",
+"next" => "venent"
+);
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 7dcf0161792..cc734802cc1 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -30,7 +30,6 @@
"Password" => "Hasło",
"Set expiration date" => "Ustaw datę wygaśnięcia",
"Expiration date" => "Data wygaśnięcia",
-"Share via email: %s" => "Współdziel przez email: %s",
"No people found" => "Nie znaleziono ludzi",
"Resharing is not allowed" => "Współdzielenie nie jest możliwe",
"can edit" => "można edytować",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 21ae28be1e7..37e411ec074 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -25,18 +25,14 @@
"Error while sharing" => "Erro ao compartilhar",
"Error while unsharing" => "Erro ao descompartilhar",
"Error while changing permissions" => "Erro ao mudar permissões",
-"Shared with you and the group %s by %s" => "Compartilhado com você e o grupo %s por %s",
-"Shared with you by %s" => "Compartilhado com você por %s",
"Share with" => "Compartilhar com",
"Share with link" => "Compartilhar com link",
"Password protect" => "Proteger com senha",
"Password" => "Senha",
"Set expiration date" => "Definir data de expiração",
"Expiration date" => "Data de expiração",
-"Share via email: %s" => "Compartilhar via email: %s",
"No people found" => "Nenhuma pessoa encontrada",
"Resharing is not allowed" => "Não é permitido re-compartilhar",
-"Shared in %s with %s" => "Compartilhado em %s com %s",
"Unshare" => "Descompartilhar",
"can edit" => "pode editar",
"access control" => "controle de acesso",
@@ -45,6 +41,7 @@
"delete" => "remover",
"share" => "compartilhar",
"Password protected" => "Protegido com senha",
+"Error unsetting expiration date" => "Erro ao remover data de expiração",
"Error setting expiration date" => "Erro ao definir data de expiração",
"ownCloud password reset" => "Redefinir senha ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 8647cc11901..75e88e2cc16 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -15,13 +15,34 @@
"October" => "Octombrie",
"November" => "Noiembrie",
"December" => "Decembrie",
+"Choose" => "Alege",
"Cancel" => "Anulare",
"No" => "Nu",
"Yes" => "Da",
"Ok" => "Ok",
"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.",
"Error" => "Eroare",
+"Error while sharing" => "Eroare la partajare",
+"Error while unsharing" => "Eroare la anularea partajării",
+"Error while changing permissions" => "Eroare la modificarea permisiunilor",
+"Share with" => "Partajat cu",
+"Share with link" => "Partajare cu legătură",
+"Password protect" => "Protejare cu parolă",
"Password" => "Parola",
+"Set expiration date" => "Specifică data expirării",
+"Expiration date" => "Data expirării",
+"No people found" => "Nici o persoană găsită",
+"Resharing is not allowed" => "Repartajarea nu este permisă",
+"Unshare" => "Anulare partajare",
+"can edit" => "poate edita",
+"access control" => "control acces",
+"create" => "creare",
+"update" => "actualizare",
+"delete" => "ștergere",
+"share" => "partajare",
+"Password protected" => "Protejare cu parolă",
+"Error unsetting expiration date" => "Eroare la anularea datei de expirare",
+"Error setting expiration date" => "Eroare la specificarea datei de expirare",
"ownCloud password reset" => "Resetarea parolei ownCloud ",
"Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 563a261e5d4..00a46c04241 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -25,7 +25,6 @@
"Error while sharing" => "Ошибка создания общего доступа",
"Error while unsharing" => "Ошибка отключения общего доступа",
"Error while changing permissions" => "Ошибка при изменении прав доступа",
-"Shared with you and the group %s by %s" => "Общий доступ для Вас и группы %s к %s",
"Password protect" => "Защитить паролем",
"Password" => "Пароль",
"No people found" => "Не найдено людей",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 2669d4d5b32..90e416fc737 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -25,18 +25,20 @@
"Error while sharing" => "Fel vid delning",
"Error while unsharing" => "Fel när delning skulle avslutas",
"Error while changing permissions" => "Fel vid ändring av rättigheter",
-"Shared with you and the group %s by %s" => "Delad med dig och gruppen %s av %s",
-"Shared with you by %s" => "Delad med dig av %s",
+"Shared with you and the group" => "Delas med dig och gruppen",
+"by" => "av",
+"Shared with you by" => "Delas med dig av",
"Share with" => "Delad med",
"Share with link" => "Delad med länk",
"Password protect" => "Lösenordsskydda",
"Password" => "Lösenord",
"Set expiration date" => "Sätt utgångsdatum",
"Expiration date" => "Utgångsdatum",
-"Share via email: %s" => "Dela via e-post: %s",
+"Share via email:" => "Dela via e-post:",
"No people found" => "Hittar inga användare",
"Resharing is not allowed" => "Dela vidare är inte tillåtet",
-"Shared in %s with %s" => "Delad i %s med %s",
+"Shared in" => "Delas i",
+"with" => "med",
"Unshare" => "Sluta dela",
"can edit" => "kan redigera",
"access control" => "åtkomstkontroll",
@@ -45,6 +47,7 @@
"delete" => "radera",
"share" => "dela",
"Password protected" => "Lösenordsskyddad",
+"Error unsetting expiration date" => "Fel vid borttagning av utgångsdatum",
"Error setting expiration date" => "Fel vid sättning av utgångsdatum",
"ownCloud password reset" => "ownCloud lösenordsåterställning",
"Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index ce8b97ae529..79a50b2c78d 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -25,18 +25,20 @@
"Error while sharing" => "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
"Error while unsharing" => "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
"Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
-"Shared with you and the group %s by %s" => "ได้แชร์ให้กับคุณและกลุ่ม %s โดย %s",
-"Shared with you by %s" => "แชร์ให้กับคุณโดย %s",
+"Shared with you and the group" => "แชร์ให้คุณและกลุ่ม",
+"by" => "โดย",
+"Shared with you by" => "แชร์ให้คุณโดย",
"Share with" => "แชร์ให้กับ",
"Share with link" => "แชร์ด้วยลิงก์",
"Password protect" => "ใส่รหัสผ่านไว้",
"Password" => "รหัสผ่าน",
"Set expiration date" => "กำหนดวันที่หมดอายุ",
"Expiration date" => "วันที่หมดอายุ",
-"Share via email: %s" => "แชร์ผ่านทางอีเมล: %s",
+"Share via email:" => "แชร์ผ่านทางอีเมล",
"No people found" => "ไม่พบบุคคลที่ต้องการ",
"Resharing is not allowed" => "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
-"Shared in %s with %s" => "ถูกแชร์ใน %s ด้วย %s",
+"Shared in" => "แชร์ไว้ใน",
+"with" => "ด้วย",
"Unshare" => "ยกเลิกการแชร์",
"can edit" => "สามารถแก้ไข",
"access control" => "ระดับควบคุมการเข้าใช้งาน",
@@ -45,6 +47,7 @@
"delete" => "ลบ",
"share" => "แชร์",
"Password protected" => "ใส่รหัสผ่านไว้",
+"Error unsetting expiration date" => "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
"Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
"ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index b84519a5c06..6ddc41ffeb2 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -15,13 +15,34 @@
"October" => "十月",
"November" => "十一月",
"December" => "十二月",
+"Choose" => "选择(&C)...",
"Cancel" => "取消",
"No" => "否",
"Yes" => "是",
"Ok" => "好",
"No categories selected for deletion." => "没有选择要删除的类别",
"Error" => "错误",
+"Error while sharing" => "共享时出错",
+"Error while unsharing" => "取消共享时出错",
+"Error while changing permissions" => "修改权限时出错",
+"Share with" => "共享",
+"Share with link" => "共享链接",
+"Password protect" => "密码保护",
"Password" => "密码",
+"Set expiration date" => "设置过期日期",
+"Expiration date" => "过期日期",
+"No people found" => "未找到此人",
+"Resharing is not allowed" => "不允许二次共享",
+"Unshare" => "取消共享",
+"can edit" => "可以修改",
+"access control" => "访问控制",
+"create" => "创建",
+"update" => "更新",
+"delete" => "删除",
+"share" => "共享",
+"Password protected" => "密码已受保护",
+"Error unsetting expiration date" => "取消设置过期日期时出错",
+"Error setting expiration date" => "设置过期日期时出错",
"ownCloud password reset" => "重置 ownCloud 密码",
"Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
"You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 3f58b03c982..4cd8b9079fd 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -13,11 +13,11 @@ require_once '../../lib/base.php';
// Someone lost their password:
if (isset($_POST['user'])) {
if (OC_User::userExists($_POST['user'])) {
- $token = sha1($_POST['user'].md5(uniqid(rand(), true)));
+ $token = hash("sha256", $_POST['user'].OC_Util::generate_random_bytes(10));
OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', $token);
$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
- if (!empty($email) and isset($_POST['sectoken']) and isset($_SESSION['sectoken']) and ($_POST['sectoken']==$_SESSION['sectoken']) ) {
- $link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php', array('user' => urlencode($_POST['user']), 'token' => $token));
+ if (!empty($email)) {
+ $link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php', array('user' => $_POST['user'], 'token' => $token));
$tmpl = new OC_Template('core/lostpassword', 'email');
$tmpl->assign('link', $link, false);
$msg = $tmpl->fetchPage();
@@ -25,18 +25,11 @@ if (isset($_POST['user'])) {
$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
OC_MAIL::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
echo('sent');
-
}
- $sectoken=rand(1000000, 9999999);
- $_SESSION['sectoken']=$sectoken;
- OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true, 'sectoken' => $sectoken));
+ OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true));
} else {
- $sectoken=rand(1000000, 9999999);
- $_SESSION['sectoken']=$sectoken;
- OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => true, 'requested' => false, 'sectoken' => $sectoken));
+ OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => true, 'requested' => false));
}
} else {
- $sectoken=rand(1000000, 9999999);
- $_SESSION['sectoken']=$sectoken;
- OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => false, 'sectoken' => $sectoken));
+ OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => false));
}
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 754eabdad67..4b871963b80 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -10,7 +10,6 @@
-
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 679be2657d4..b6d8a7604a2 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -11,6 +11,8 @@
var oc_webroot = '';
var oc_appswebroots = ;
var oc_current_user = '';
+ var oc_requesttoken = '';
+ var oc_requestlifespan = '';
@@ -24,13 +26,6 @@
echo '/>';
?>
-
diff --git a/core/templates/login.php b/core/templates/login.php
index 2c9b766aa4d..bb7a8337523 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,5 +1,5 @@
-