summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/ajax/share.php2
-rw-r--r--core/css/styles.css5
-rw-r--r--core/js/js.js9
-rw-r--r--core/l10n/ar.php5
-rw-r--r--core/l10n/bn_BD.php4
-rw-r--r--core/l10n/ca.php5
-rw-r--r--core/l10n/cs_CZ.php5
-rw-r--r--core/l10n/da.php5
-rw-r--r--core/l10n/de.php5
-rw-r--r--core/l10n/de_DE.php5
-rw-r--r--core/l10n/el.php4
-rw-r--r--core/l10n/eo.php5
-rw-r--r--core/l10n/es.php5
-rw-r--r--core/l10n/es_AR.php4
-rw-r--r--core/l10n/et_EE.php4
-rw-r--r--core/l10n/eu.php4
-rw-r--r--core/l10n/fi_FI.php10
-rw-r--r--core/l10n/fr.php5
-rw-r--r--core/l10n/gl.php5
-rw-r--r--core/l10n/he.php5
-rw-r--r--core/l10n/hu_HU.php4
-rw-r--r--core/l10n/id.php5
-rw-r--r--core/l10n/is.php5
-rw-r--r--core/l10n/it.php5
-rw-r--r--core/l10n/ja_JP.php5
-rw-r--r--core/l10n/ka_GE.php4
-rw-r--r--core/l10n/ko.php5
-rw-r--r--core/l10n/lt_LT.php5
-rw-r--r--core/l10n/mk.php5
-rw-r--r--core/l10n/nb_NO.php4
-rw-r--r--core/l10n/nl.php5
-rw-r--r--core/l10n/pl.php5
-rw-r--r--core/l10n/pt_BR.php5
-rw-r--r--core/l10n/pt_PT.php5
-rw-r--r--core/l10n/ro.php5
-rw-r--r--core/l10n/ru.php5
-rw-r--r--core/l10n/ru_RU.php5
-rw-r--r--core/l10n/sk_SK.php12
-rw-r--r--core/l10n/sl.php5
-rw-r--r--core/l10n/sr.php5
-rw-r--r--core/l10n/sv.php5
-rw-r--r--core/l10n/ta_LK.php5
-rw-r--r--core/l10n/th_TH.php5
-rw-r--r--core/l10n/tr.php4
-rw-r--r--core/l10n/uk.php4
-rw-r--r--core/l10n/vi.php5
-rw-r--r--core/l10n/zh_CN.GB2312.php5
-rw-r--r--core/l10n/zh_CN.php5
-rw-r--r--core/l10n/zh_TW.php5
-rw-r--r--core/templates/installation.php8
-rw-r--r--core/templates/layout.user.php6
-rw-r--r--core/templates/login.php86
-rw-r--r--core/templates/verify.php18
53 files changed, 117 insertions, 249 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 72ffc52e997..077baa8ba56 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -98,7 +98,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user);
OCP\JSON::success();
} catch (Exception $exception) {
- OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
+ OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage()))));
}
break;
}
diff --git a/core/css/styles.css b/core/css/styles.css
index 496320561f8..3c172d11df8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -94,8 +94,9 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
/* CONTENT ------------------------------------------------------------------ */
#controls { padding:0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
#controls .button { display:inline-block; }
-#content { top:3.5em; left:12.5em; position:absolute; }
-#leftcontent, .leftcontent { position:fixed; overflow:auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
+#content { height: 100%; width: 100%; position: relative; }
+#content-wrapper { height: 100%; width: 100%; padding-top: 3.5em; padding-left: 12.5em; box-sizing: border-box; -moz-box-sizing: border-box; position: absolute;}
+#leftcontent, .leftcontent { position:fixed; top: 0; overflow:auto; width:20em; background:#f8f8f8; border-right:1px solid #ddd; box-sizing: border-box; -moz-box-sizing: border-box; height: 100%; padding-top: 6.4em }
#leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
#leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
#leftcontent li.active, .leftcontent li.active { font-weight:bold; }
diff --git a/core/js/js.js b/core/js/js.js
index 95889ac8a27..23ace89f4e3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -504,6 +504,7 @@ function fillHeight(selector) {
if(selector.outerHeight() > selector.height()){
selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
}
+ console.warn("This function is deprecated! Use CSS instead");
}
/**
@@ -519,17 +520,11 @@ function fillWindow(selector) {
if(selector.outerWidth() > selector.width()){
selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
}
+ console.warn("This function is deprecated! Use CSS instead");
}
$(document).ready(function(){
- $(window).resize(function () {
- fillHeight($('#leftcontent'));
- fillWindow($('#content'));
- fillWindow($('#rightcontent'));
- });
- $(window).trigger('resize');
-
if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
replaceSVG();
}else{
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 221ea8aebb1..38450f8d54f 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -99,8 +99,5 @@
"remember" => "تذكر",
"Log in" => "أدخل",
"prev" => "السابق",
-"next" => "التالي",
-"Security Warning!" => "تحذير أمان!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "الرجاء التحقق من كلمة السر. <br/>من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى.",
-"Verify" => "تحقيق"
+"next" => "التالي"
);
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 60e23e4c16c..333e4bf0be5 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -121,7 +121,5 @@
"Log in" => "প্রবেশ",
"prev" => "পূর্ববর্তী",
"next" => "পরবর্তী",
-"Updating ownCloud to version %s, this may take a while." => "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।",
-"Security Warning!" => "নিরাপত্তাবিষয়ক সতর্কবাণী",
-"Verify" => "যাচাই কর"
+"Updating ownCloud to version %s, this may take a while." => "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।"
);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 8a186bfc54e..e66bad25e43 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -127,8 +127,5 @@
"Log in" => "Inici de sessió",
"prev" => "anterior",
"next" => "següent",
-"Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona.",
-"Security Warning!" => "Avís de seguretat!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Comproveu la vostra contrasenya. <br/>Per raons de seguretat se us pot demanar escriure de nou la vostra contrasenya.",
-"Verify" => "Comprova"
+"Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona."
);
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 4d2803261b6..7a766bd7176 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -127,8 +127,5 @@
"Log in" => "Přihlásit",
"prev" => "předchozí",
"next" => "následující",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat.",
-"Security Warning!" => "Bezpečnostní upozornění.",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ověřte, prosím, své heslo. <br/>Z bezpečnostních důvodů můžete být občas požádáni o jeho opětovné zadání.",
-"Verify" => "Ověřit"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
);
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 26cc6a5e08e..e8155c298c0 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -126,8 +126,5 @@
"remember" => "husk",
"Log in" => "Log ind",
"prev" => "forrige",
-"next" => "næste",
-"Security Warning!" => "Sikkerhedsadvarsel!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verificer din adgangskode.<br/>Af sikkerhedsårsager kan du lejlighedsvist blive bedt om at indtaste din adgangskode igen.",
-"Verify" => "Verificer"
+"next" => "næste"
);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 76f1379e21e..89846301a58 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -127,8 +127,5 @@
"Log in" => "Einloggen",
"prev" => "Zurück",
"next" => "Weiter",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
-"Security Warning!" => "Sicherheitswarnung!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte bestätige Dein Passwort. <br/> Aus Sicherheitsgründen wirst Du hierbei gebeten, Dein Passwort erneut einzugeben.",
-"Verify" => "Bestätigen"
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
);
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 2eb8758215f..d62b000c0ab 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -127,8 +127,5 @@
"Log in" => "Einloggen",
"prev" => "Zurück",
"next" => "Weiter",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
-"Security Warning!" => "Sicherheitshinweis!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte überprüfen Sie Ihr Passwort. <br/>Aus Sicherheitsgründen werden Sie gelegentlich aufgefordert, Ihr Passwort erneut einzugeben.",
-"Verify" => "Überprüfen"
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
);
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 88c169ace7a..c029b01fd9c 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -127,7 +127,5 @@
"Log in" => "Είσοδος",
"prev" => "προηγούμενο",
"next" => "επόμενο",
-"Security Warning!" => "Προειδοποίηση Ασφαλείας!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Παρακαλώ επιβεβαιώστε το συνθηματικό σας. <br/>Για λόγους ασφαλείας μπορεί να ερωτάστε να εισάγετε ξανά το συνθηματικό σας.",
-"Verify" => "Επαλήθευση"
+"Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο."
);
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 0cbe7d33be6..0319eeef2d4 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -122,8 +122,5 @@
"remember" => "memori",
"Log in" => "Ensaluti",
"prev" => "maljena",
-"next" => "jena",
-"Security Warning!" => "Sekureca averto!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bonvolu kontroli vian pasvorton. <br/>Pro sekureco, oni okaze povas peti al vi enigi vian pasvorton ree.",
-"Verify" => "Kontroli"
+"next" => "jena"
);
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 2cc604f590c..4f8f1936c7f 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -127,8 +127,5 @@
"Log in" => "Entrar",
"prev" => "anterior",
"next" => "siguiente",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
-"Security Warning!" => "¡Advertencia de seguridad!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique su contraseña. <br/>Por razones de seguridad se le puede volver a preguntar ocasionalmente la contraseña.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
);
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 48b8177573b..374a679260b 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -127,7 +127,5 @@
"Log in" => "Entrar",
"prev" => "anterior",
"next" => "siguiente",
-"Security Warning!" => "¡Advertencia de seguridad!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verificá tu contraseña. <br/>Por razones de seguridad, puede ser que que te pregunte ocasionalmente la contraseña.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede domorar un rato."
);
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 226c0d27e80..b79dd4761e7 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -102,7 +102,5 @@
"remember" => "pea meeles",
"Log in" => "Logi sisse",
"prev" => "eelm",
-"next" => "järgm",
-"Security Warning!" => "turvahoiatus!",
-"Verify" => "Kinnita"
+"next" => "järgm"
);
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index becd4d83b66..3f1a2909531 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -127,7 +127,5 @@
"Log in" => "Hasi saioa",
"prev" => "aurrekoa",
"next" => "hurrengoa",
-"Security Warning!" => "Segurtasun abisua",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Mesedez egiaztatu zure pasahitza. <br/>Segurtasun arrazoiengatik noizbehinka zure pasahitza berriz sartzea eska diezazukegu.",
-"Verify" => "Egiaztatu"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake."
);
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 3d3bd93845f..751293e1fd5 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -5,7 +5,9 @@
"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Käyttäjä %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa täältä: %s",
"No category to add?" => "Ei lisättävää luokkaa?",
"This category already exists: " => "Tämä luokka on jo olemassa: ",
+"Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.",
"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
+"Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.",
"Settings" => "Asetukset",
"seconds ago" => "sekuntia sitten",
"1 minute ago" => "1 minuutti sitten",
@@ -31,6 +33,9 @@
"Error while sharing" => "Virhe jaettaessa",
"Error while unsharing" => "Virhe jakoa peruttaessa",
"Error while changing permissions" => "Virhe oikeuksia muuttaessa",
+"Shared with you and the group {group} by {owner}" => "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
+"Shared with you by {owner}" => "Jaettu kanssasi käyttäjän {owner} toimesta",
+"Share with" => "Jaa",
"Share with link" => "Jaa linkillä",
"Password protect" => "Suojaa salasanalla",
"Password" => "Salasana",
@@ -115,8 +120,5 @@
"Log in" => "Kirjaudu sisään",
"prev" => "edellinen",
"next" => "seuraava",
-"Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken.",
-"Security Warning!" => "Turvallisuusvaroitus!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vahvista salasanasi. <br/>Turvallisuussyistä sinulta saatetaan ajoittain kysyä salasanasi uudelleen.",
-"Verify" => "Vahvista"
+"Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."
);
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 8cbf5f45adb..39269e43b5d 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -127,8 +127,5 @@
"Log in" => "Connexion",
"prev" => "précédent",
"next" => "suivant",
-"Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps.",
-"Security Warning!" => "Alerte de sécurité !",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Veuillez vérifier votre mot de passe. <br/>Par sécurité il vous sera occasionnellement demandé d'entrer votre mot de passe de nouveau.",
-"Verify" => "Vérification"
+"Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
);
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index bdd1293113c..2642debb288 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -127,8 +127,5 @@
"Log in" => "Conectar",
"prev" => "anterior",
"next" => "seguinte",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s, esto pode levar un anaco.",
-"Security Warning!" => "Advertencia de seguranza",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifique o seu contrasinal.<br/>Por motivos de seguranza pode que ocasionalmente se lle pregunte de novo polo seu contrasinal.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s, esto pode levar un anaco."
);
diff --git a/core/l10n/he.php b/core/l10n/he.php
index bb6ac48dd92..59eb3ae14d4 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -127,8 +127,5 @@
"Log in" => "כניסה",
"prev" => "הקודם",
"next" => "הבא",
-"Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה.",
-"Security Warning!" => "אזהרת אבטחה!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "נא לאמת את הססמה שלך. <br/>מטעמי אבטחה יתכן שתופיע בקשה להזין את הססמה שוב.",
-"Verify" => "אימות"
+"Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה."
);
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index fa02064f3d2..a9e20fc6466 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -127,7 +127,5 @@
"Log in" => "Bejelentkezés",
"prev" => "előző",
"next" => "következő",
-"Security Warning!" => "Biztonsági figyelmeztetés!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Kérjük írja be a jelszavát! <br/>Biztonsági okokból néha a bejelentkezést követően is ellenőrzésképpen meg kell adnia a jelszavát.",
-"Verify" => "Ellenőrzés"
+"Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
);
diff --git a/core/l10n/id.php b/core/l10n/id.php
index d0ba6c694fb..ee5fad95217 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -101,8 +101,5 @@
"remember" => "selalu login",
"Log in" => "Masuk",
"prev" => "sebelum",
-"next" => "selanjutnya",
-"Security Warning!" => "peringatan keamanan!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "mohon periksa kembali kata kunci anda. <br/>untuk alasan keamanan,anda akan sesekali diminta untuk memasukan kata kunci lagi.",
-"Verify" => "periksa kembali"
+"next" => "selanjutnya"
);
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 0b2b2ce3e9a..e810eb359fd 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -127,8 +127,5 @@
"Log in" => "<strong>Skrá inn</strong>",
"prev" => "fyrra",
"next" => "næsta",
-"Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund.",
-"Security Warning!" => "Öryggis aðvörun!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vinsamlegast staðfestu lykilorðið þitt.<br/>Í öryggisskyni munum við biðja þig um að skipta um lykilorð af og til.",
-"Verify" => "Staðfesta"
+"Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund."
);
diff --git a/core/l10n/it.php b/core/l10n/it.php
index d868150346a..89b6a7952a9 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -127,8 +127,5 @@
"Log in" => "Accedi",
"prev" => "precedente",
"next" => "successivo",
-"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo.",
-"Security Warning!" => "Avviso di sicurezza",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifica la tua password.<br/>Per motivi di sicurezza, potresti ricevere una richiesta di digitare nuovamente la password.",
-"Verify" => "Verifica"
+"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo."
);
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 5efbe05bc56..7d4baf94583 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -127,8 +127,5 @@
"Log in" => "ログイン",
"prev" => "前",
"next" => "次",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。",
-"Security Warning!" => "セキュリティ警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "パスワードの確認<br/>セキュリティ上の理由によりパスワードの再入力をお願いします。",
-"Verify" => "確認"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。"
);
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index b002b42cb59..aafdacab4c6 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -99,7 +99,5 @@
"remember" => "დამახსოვრება",
"Log in" => "შესვლა",
"prev" => "წინა",
-"next" => "შემდეგი",
-"Security Warning!" => "უსაფრთხოების გაფრთხილება!",
-"Verify" => "შემოწმება"
+"next" => "შემდეგი"
);
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 0faa19865f9..3db5a501173 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -127,8 +127,5 @@
"Log in" => "로그인",
"prev" => "이전",
"next" => "다음",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud 를 버젼 %s로 업데이트 하는 중, 시간이 소요됩니다.",
-"Security Warning!" => "보안 경고!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "암호를 확인해 주십시오.<br/>보안상의 이유로 종종 암호를 물어볼 것입니다.",
-"Verify" => "확인"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud 를 버젼 %s로 업데이트 하는 중, 시간이 소요됩니다."
);
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 19826b26c16..ec15c646191 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -105,8 +105,5 @@
"remember" => "prisiminti",
"Log in" => "Prisijungti",
"prev" => "atgal",
-"next" => "kitas",
-"Security Warning!" => "Saugumo pranešimas!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prašome patvirtinti savo vartotoją.<br/>Dėl saugumo, slaptažodžio patvirtinimas bus reikalaujamas įvesti kas kiek laiko.",
-"Verify" => "Patvirtinti"
+"next" => "kitas"
);
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 94c9ee581b1..d8fa16d44f3 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -126,8 +126,5 @@
"remember" => "запамти",
"Log in" => "Најава",
"prev" => "претходно",
-"next" => "следно",
-"Security Warning!" => "Безбедносно предупредување.",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно.",
-"Verify" => "Потврди"
+"next" => "следно"
);
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 45ee77e3c17..d985e454b7c 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -101,7 +101,5 @@
"remember" => "husk",
"Log in" => "Logg inn",
"prev" => "forrige",
-"next" => "neste",
-"Security Warning!" => "Sikkerhetsadvarsel!",
-"Verify" => "Verifiser"
+"next" => "neste"
);
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index b3a43523a76..739d8181d6f 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -127,8 +127,5 @@
"Log in" => "Meld je aan",
"prev" => "vorige",
"next" => "volgende",
-"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren.",
-"Security Warning!" => "Beveiligingswaarschuwing!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifieer uw wachtwoord!<br/>Om veiligheidsredenen wordt u regelmatig gevraagd uw wachtwoord in te geven.",
-"Verify" => "Verifieer"
+"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren."
);
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 159e5b9caed..3324040209b 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -127,8 +127,5 @@
"Log in" => "Zaloguj",
"prev" => "wstecz",
"next" => "naprzód",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę.",
-"Security Warning!" => "Ostrzeżenie o zabezpieczeniach!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Sprawdź swoje hasło.<br/>Ze względów bezpieczeństwa możesz zostać czasami poproszony o wprowadzenie hasła ponownie.",
-"Verify" => "Zweryfikowane"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę."
);
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index a5e21734c3e..3b119650268 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -118,8 +118,5 @@
"remember" => "lembrete",
"Log in" => "Log in",
"prev" => "anterior",
-"next" => "próximo",
-"Security Warning!" => "Aviso de Segurança!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente.",
-"Verify" => "Verificar"
+"next" => "próximo"
);
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index b896dda4003..6e3a558986c 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -127,8 +127,5 @@
"Log in" => "Entrar",
"prev" => "anterior",
"next" => "seguinte",
-"Updating ownCloud to version %s, this may take a while." => "A Actualizar o ownCloud para a versão %s, esta operação pode demorar.",
-"Security Warning!" => "Aviso de Segurança!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique a sua palavra-passe. <br/>Por razões de segurança, pode ser-lhe perguntada, ocasionalmente, a sua palavra-passe de novo.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "A Actualizar o ownCloud para a versão %s, esta operação pode demorar."
);
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 3c47ef0f8ca..c3434706df8 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -110,8 +110,5 @@
"remember" => "amintește",
"Log in" => "Autentificare",
"prev" => "precedentul",
-"next" => "următorul",
-"Security Warning!" => "Advertisment de Securitate",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Te rog verifica parola. <br/>Pentru securitate va poate fi cerut ocazional introducerea parolei din nou",
-"Verify" => "Verifica"
+"next" => "următorul"
);
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 9a72986aea4..7434d6af7f8 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -127,8 +127,5 @@
"Log in" => "Войти",
"prev" => "пред",
"next" => "след",
-"Updating ownCloud to version %s, this may take a while." => "Производится обновление ownCloud до версии %s. Это может занять некоторое время.",
-"Security Warning!" => "Предупреждение безопасности!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности, Вам иногда придется вводить свой пароль снова.",
-"Verify" => "Подтвердить"
+"Updating ownCloud to version %s, this may take a while." => "Производится обновление ownCloud до версии %s. Это может занять некоторое время."
);
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 400aa3996e4..84bd8f93156 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -126,8 +126,5 @@
"remember" => "запомнить",
"Log in" => "Войти",
"prev" => "предыдущий",
-"next" => "следующий",
-"Security Warning!" => "Предупреждение системы безопасности!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности Вам может быть иногда предложено ввести пароль еще раз.",
-"Verify" => "Проверить"
+"next" => "следующий"
);
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index f9d1aa14e79..286642ace7a 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Používateľ %s zdieľa s Vami súbor",
+"User %s shared a folder with you" => "Používateľ %s zdieľa s Vami adresár",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami súbor \"%s\". Môžete si ho stiahnuť tu: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami adresár \"%s\". Môžete si ho stiahnuť tu: %s",
"Category type not provided." => "Neposkytnutý kategorický typ.",
"No category to add?" => "Žiadna kategória pre pridanie?",
"This category already exists: " => "Táto kategória už existuje:",
@@ -39,6 +43,8 @@
"Share with link" => "Zdieľať cez odkaz",
"Password protect" => "Chrániť heslom",
"Password" => "Heslo",
+"Email link to person" => "Odoslať odkaz osobe e-mailom",
+"Send" => "Odoslať",
"Set expiration date" => "Nastaviť dátum expirácie",
"Expiration date" => "Dátum expirácie",
"Share via email:" => "Zdieľať cez e-mail:",
@@ -55,6 +61,8 @@
"Password protected" => "Chránené heslom",
"Error unsetting expiration date" => "Chyba pri odstraňovaní dátumu vypršania platnosti",
"Error setting expiration date" => "Chyba pri nastavení dátumu vypršania platnosti",
+"Sending ..." => "Odosielam ...",
+"Email sent" => "Email odoslaný",
"ownCloud password reset" => "Obnovenie hesla pre ownCloud",
"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
@@ -119,7 +127,5 @@
"Log in" => "Prihlásiť sa",
"prev" => "späť",
"next" => "ďalej",
-"Security Warning!" => "Bezpečnostné varovanie!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prosím, overte svoje heslo. <br />Z bezpečnostných dôvodov môžete byť občas požiadaný o jeho opätovné zadanie.",
-"Verify" => "Overenie"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
);
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 795c5a89952..b2c924d412e 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -126,8 +126,5 @@
"remember" => "Zapomni si me",
"Log in" => "Prijava",
"prev" => "nazaj",
-"next" => "naprej",
-"Security Warning!" => "Varnostno opozorilo!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prosimo, če preverite vaše geslo. Iz varnostnih razlogov vas lahko občasno prosimo, da ga ponovno vnesete.",
-"Verify" => "Preveri"
+"next" => "naprej"
);
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 1679b9e6ddd..6b64d1957e7 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -118,8 +118,5 @@
"remember" => "упамти",
"Log in" => "Пријава",
"prev" => "претходно",
-"next" => "следеће",
-"Security Warning!" => "Сигурносно упозорење!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Потврдите лозинку. <br />Из сигурносних разлога затрежићемо вам да два пута унесете лозинку.",
-"Verify" => "Потврди"
+"next" => "следеће"
);
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 6bb62613048..70a9871be26 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -127,8 +127,5 @@
"Log in" => "Logga in",
"prev" => "föregående",
"next" => "nästa",
-"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund.",
-"Security Warning!" => "Säkerhetsvarning!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bekräfta ditt lösenord. <br/>Av säkerhetsskäl kan du ibland bli ombedd att ange ditt lösenord igen.",
-"Verify" => "Verifiera"
+"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund."
);
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index ec5f142ecfb..65cfbbf965d 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -118,8 +118,5 @@
"remember" => "ஞாபகப்படுத்துக",
"Log in" => "புகுபதிகை",
"prev" => "முந்தைய",
-"next" => "அடுத்து",
-"Security Warning!" => "பாதுகாப்பு எச்சரிக்கை!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "உங்களுடைய கடவுச்சொல்லை உறுதிப்படுத்துக. <br/> பாதுகாப்பு காரணங்களுக்காக நீங்கள் எப்போதாவது உங்களுடைய கடவுச்சொல்லை மீண்டும் நுழைக்க கேட்கப்படுவீர்கள்.",
-"Verify" => "உறுதிப்படுத்தல்"
+"next" => "அடுத்து"
);
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 7cbc39dd1e0..183997e4c94 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -118,8 +118,5 @@
"remember" => "จำรหัสผ่าน",
"Log in" => "เข้าสู่ระบบ",
"prev" => "ก่อนหน้า",
-"next" => "ถัดไป",
-"Security Warning!" => "คำเตือนเพื่อความปลอดภัย!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "กรุณายืนยันรหัสผ่านของคุณ <br/> เพื่อความปลอดภัย คุณจะถูกขอให้กรอกรหัสผ่านอีกครั้ง",
-"Verify" => "ยืนยัน"
+"next" => "ถัดไป"
);
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 1020b61f9b9..284a4d97130 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -105,7 +105,5 @@
"remember" => "hatırla",
"Log in" => "Giriş yap",
"prev" => "önceki",
-"next" => "sonraki",
-"Security Warning!" => "Güvenlik Uyarısı!",
-"Verify" => "Doğrula"
+"next" => "sonraki"
);
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index c088db6d419..88e18d3eb28 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -127,7 +127,5 @@
"Log in" => "Вхід",
"prev" => "попередній",
"next" => "наступний",
-"Security Warning!" => "Попередження про небезпеку!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Будь ласка, повторно введіть свій пароль. <br/>З питань безпеки, Вам інколи доведеться повторно вводити свій пароль.",
-"Verify" => "Підтвердити"
+"Updating ownCloud to version %s, this may take a while." => "Оновлення ownCloud до версії %s, це може зайняти деякий час."
);
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index b27600491df..c827dc038e6 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -118,8 +118,5 @@
"remember" => "ghi nhớ",
"Log in" => "Đăng nhập",
"prev" => "Lùi lại",
-"next" => "Kế tiếp",
-"Security Warning!" => "Cảnh báo bảo mật !",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vui lòng xác nhận mật khẩu của bạn. <br/> Vì lý do bảo mật thỉnh thoảng bạn có thể được yêu cầu nhập lại mật khẩu.",
-"Verify" => "Kiểm tra"
+"next" => "Kế tiếp"
);
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 1f6d5198703..74dd9ad8a3f 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -107,8 +107,5 @@
"remember" => "备忘",
"Log in" => "登陆",
"prev" => "后退",
-"next" => "前进",
-"Security Warning!" => "安全警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "请确认您的密码。<br/>处于安全原因你偶尔也会被要求再次输入您的密码。",
-"Verify" => "确认"
+"next" => "前进"
);
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 82e80bd000e..626ede4cc70 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -43,6 +43,7 @@
"Share with link" => "共享链接",
"Password protect" => "密码保护",
"Password" => "密码",
+"Email link to person" => "发送链接到个人",
"Send" => "发送",
"Set expiration date" => "设置过期日期",
"Expiration date" => "过期日期",
@@ -126,7 +127,5 @@
"Log in" => "登录",
"prev" => "上一页",
"next" => "下一页",
-"Security Warning!" => "安全警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "请验证您的密码。 <br/>出于安全考虑,你可能偶尔会被要求再次输入密码。",
-"Verify" => "验证"
+"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s,这可能需要一些时间。"
);
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index de91ba0bd83..7537c764451 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -127,8 +127,5 @@
"Log in" => "登入",
"prev" => "上一頁",
"next" => "下一頁",
-"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ,這可能需要一點時間。",
-"Security Warning!" => "安全性警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "請輸入您的密碼。<br/>基於安全性的理由,您有時候可能會被要求再次輸入密碼。",
-"Verify" => "驗證"
+"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ,這可能需要一點時間。"
);
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 3128c4f2e70..03c580c9b0b 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,7 +1,7 @@
-<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'></input>
-<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'></input>
-<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input>
-<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'></input>
+<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'>
+<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'>
+<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'>
+<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'>
<form action="index.php" method="post">
<input type="hidden" name="install" value="true" />
<?php if(count($_['errors']) > 0): ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index ba5053edecf..a16d2c9e55d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -67,8 +67,10 @@
</ul>
</div></nav>
- <div id="content">
- <?php echo $_['content']; ?>
+ <div id="content-wrapper">
+ <div id="content">
+ <?php echo $_['content']; ?>
+ </div>
</div>
</body>
</html>
diff --git a/core/templates/login.php b/core/templates/login.php
index 10093baabf7..43e45997803 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,50 +1,50 @@
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
<form method="post">
- <fieldset>
- <?php if (!empty($_['redirect_url'])) {
- echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
- } ?>
- <ul>
- <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
- <li class="errors">
- <?php echo $l->t('Automatic logon rejected!'); ?><br>
- <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
- <br>
- <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
- </li>
- <?php endif; ?>
- <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
- <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
- <li class="errors">
- <?php echo $l->t('Lost your password?'); ?>
- </li>
- </a>
- <?php endif; ?>
- </ul>
- <p class="infield grouptop">
- <input type="text" name="user" id="user"
- value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
- autocomplete="on" required/>
- <label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
- <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
- </p>
+ <fieldset>
+ <?php if (!empty($_['redirect_url'])) {
+ echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
+ } ?>
+ <ul>
+ <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
+ <li class="errors">
+ <?php echo $l->t('Automatic logon rejected!'); ?><br>
+ <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
+ <br>
+ <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
+ </li>
+ <?php endif; ?>
+ <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
+ <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
+ <li class="errors">
+ <?php echo $l->t('Lost your password?'); ?>
+ </li>
+ </a>
+ <?php endif; ?>
+ </ul>
+ <p class="infield grouptop">
+ <input type="text" name="user" id="user"
+ value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
+ autocomplete="on" required/>
+ <label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
+ <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
+ </p>
- <p class="infield groupbottom">
- <input type="password" name="password" id="password" value=""
- required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
- <label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
- <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
- </p>
- <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
- for="remember_login"><?php echo $l->t('remember'); ?></label>
- <input type="hidden" name="timezone-offset" id="timezone-offset"/>
- <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
- </fieldset>
+ <p class="infield groupbottom">
+ <input type="password" name="password" id="password" value=""
+ required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
+ <label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
+ <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+ </p>
+ <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
+ for="remember_login"><?php echo $l->t('remember'); ?></label>
+ <input type="hidden" name="timezone-offset" id="timezone-offset"/>
+ <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
+ </fieldset>
</form>
<script>
- $(document).ready(function () {
- var visitortimezone = (-new Date().getTimezoneOffset() / 60);
- $('#timezone-offset').val(visitortimezone);
- });
+ $(document).ready(function () {
+ var visitortimezone = (-new Date().getTimezoneOffset() / 60);
+ $('#timezone-offset').val(visitortimezone);
+ });
</script>
diff --git a/core/templates/verify.php b/core/templates/verify.php
deleted file mode 100644
index 600eaca05b7..00000000000
--- a/core/templates/verify.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<form method="post">
- <fieldset>
- <ul>
- <li class="errors">
- <?php echo $l->t('Security Warning!'); ?><br>
- <small><?php echo $l->t("Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again."); ?></small>
- </li>
- </ul>
- <p class="infield">
- <input type="text" value="<?php echo $_['username']; ?>" disabled="disabled" />
- </p>
- <p class="infield">
- <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
- <input type="password" name="password" id="password" value="" required />
- </p>
- <input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Verify' ); ?>" />
- </fieldset>
-</form>