diff options
Diffstat (limited to 'apps/files_sharing')
28 files changed, 149 insertions, 24 deletions
diff --git a/apps/files_sharing/css/404.css b/apps/files_sharing/css/404.css new file mode 100644 index 00000000000..2ed81df3b86 --- /dev/null +++ b/apps/files_sharing/css/404.css @@ -0,0 +1,12 @@ + +#body-login .error-broken-link{ + text-align:left;color:#fff; +} + +#body-login .error-broken-link ul{ + margin:10px 0 10px 0; +} + +#body-login .error-broken-link ul li{ + list-style: disc;list-style-position:inside;cursor:default; +} diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php index f29cf3163a0..ccf7fc28ec1 100644 --- a/apps/files_sharing/l10n/ca.php +++ b/apps/files_sharing/l10n/ca.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "la contrasenya és incorrecta. Intenteu-ho de nou.", "Password" => "Contrasenya", "Submit" => "Envia", +"Sorry, this link doesn’t seem to work anymore." => "Aquest enllaç sembla que no funciona.", +"Reasons might be:" => "Les raons podrien ser:", +"the item was removed" => "l'element ha estat eliminat", +"the link expired" => "l'enllaç ha vençut", +"sharing is disabled" => "s'ha desactivat la compartició", +"For more info, please ask the person who sent this link." => "Per més informació contacteu amb qui us ha enviat l'enllaç.", "%s shared the folder %s with you" => "%s ha compartit la carpeta %s amb vós", "%s shared the file %s with you" => "%s ha compartit el fitxer %s amb vós", "Download" => "Baixa", diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php index a57764a18bc..bc9a645e112 100644 --- a/apps/files_sharing/l10n/cs_CZ.php +++ b/apps/files_sharing/l10n/cs_CZ.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Heslo není správné. Zkuste to znovu.", "Password" => "Heslo", "Submit" => "Odeslat", +"Sorry, this link doesn’t seem to work anymore." => "Je nám líto, ale tento odkaz již není funkční.", +"Reasons might be:" => "Možné důvody:", +"the item was removed" => "položka byla odebrána", +"the link expired" => "platnost odkazu vypršela", +"sharing is disabled" => "sdílení je zakázané", +"For more info, please ask the person who sent this link." => "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.", "%s shared the folder %s with you" => "%s s Vámi sdílí složku %s", "%s shared the file %s with you" => "%s s Vámi sdílí soubor %s", "Download" => "Stáhnout", diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php index e3e469a4e51..f9ee949484d 100644 --- a/apps/files_sharing/l10n/da.php +++ b/apps/files_sharing/l10n/da.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Kodeordet er forkert. Prøv igen.", "Password" => "Kodeord", "Submit" => "Send", +"Sorry, this link doesn’t seem to work anymore." => "Desværre, dette link ser ikke ud til at fungerer længere.", +"Reasons might be:" => "Årsagen kan være:", +"the item was removed" => "Filen blev fjernet", +"the link expired" => "linket udløb", +"sharing is disabled" => "deling er deaktiveret", +"For more info, please ask the person who sent this link." => "For yderligere information, kontakt venligst personen der sendte linket. ", "%s shared the folder %s with you" => "%s delte mappen %s med dig", "%s shared the file %s with you" => "%s delte filen %s med dig", "Download" => "Download", diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php index 0854152907d..9b0184f3104 100644 --- a/apps/files_sharing/l10n/de.php +++ b/apps/files_sharing/l10n/de.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.", "Password" => "Passwort", "Submit" => "Absenden", +"Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", +"Reasons might be:" => "Gründe könnten sein:", +"the item was removed" => "Die Elemente wurden entfernt", +"the link expired" => "Der Link ist abgelaufen", +"sharing is disabled" => "Teilen ist deaktiviert", +"For more info, please ask the person who sent this link." => "Für mehr Informationen, frage bitte die Person, die dir diesen Link geschickt hat.", "%s shared the folder %s with you" => "%s hat den Ordner %s mit Dir geteilt", "%s shared the file %s with you" => "%s hat die Datei %s mit Dir geteilt", "Download" => "Download", diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php index 5e365746e84..8661e3ee94d 100644 --- a/apps/files_sharing/l10n/de_DE.php +++ b/apps/files_sharing/l10n/de_DE.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", "Password" => "Passwort", "Submit" => "Bestätigen", +"Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", +"Reasons might be:" => "Gründe könnten sein:", +"the item was removed" => "Das Element wurde entfernt", +"the link expired" => "Der Link ist abgelaufen", +"sharing is disabled" => "Teilen ist deaktiviert", +"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", "%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt", "%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt", "Download" => "Herunterladen", diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php index b7b89353718..8f68ae5818f 100644 --- a/apps/files_sharing/l10n/el.php +++ b/apps/files_sharing/l10n/el.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Εσφαλμένο συνθηματικό. Προσπαθήστε ξανά.", "Password" => "Συνθηματικό", "Submit" => "Καταχώρηση", +"Sorry, this link doesn’t seem to work anymore." => "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.", +"Reasons might be:" => "Οι λόγοι μπορεί να είναι:", +"the item was removed" => "το αντικείμενο απομακρύνθηκε", +"the link expired" => "ο σύνδεσμος έληξε", +"sharing is disabled" => "ο διαμοιρασμός απενεργοποιήθηκε", +"For more info, please ask the person who sent this link." => "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο.", "%s shared the folder %s with you" => "%s μοιράστηκε τον φάκελο %s μαζί σας", "%s shared the file %s with you" => "%s μοιράστηκε το αρχείο %s μαζί σας", "Download" => "Λήψη", diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php index 1b65cf0c190..2a006630ab0 100644 --- a/apps/files_sharing/l10n/es.php +++ b/apps/files_sharing/l10n/es.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" => "Contraseña", "Submit" => "Enviar", +"Sorry, this link doesn’t seem to work anymore." => "Este enlace parece no funcionar más.", +"Reasons might be:" => "Las causas podrían ser:", +"the item was removed" => "el elemento fue eliminado", +"the link expired" => "el enlace expiró", +"sharing is disabled" => "compartir está desactivado", +"For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.", "%s shared the folder %s with you" => "%s compartió la carpeta %s contigo", "%s shared the file %s with you" => "%s compartió el fichero %s contigo", "Download" => "Descargar", diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php index defbaa7ff92..90bfe704d22 100644 --- a/apps/files_sharing/l10n/es_AR.php +++ b/apps/files_sharing/l10n/es_AR.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "La contraseña no es correcta. Probá de nuevo.", "Password" => "Contraseña", "Submit" => "Enviar", "%s shared the folder %s with you" => "%s compartió la carpeta %s con vos", diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php index 7a4559cb655..1d8891792fb 100644 --- a/apps/files_sharing/l10n/eu.php +++ b/apps/files_sharing/l10n/eu.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Pasahitza ez da egokia. Saiatu berriro.", "Password" => "Pasahitza", "Submit" => "Bidali", "%s shared the folder %s with you" => "%sk zurekin %s karpeta elkarbanatu du", diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php index 1a7ae9330ad..7a744c8463d 100644 --- a/apps/files_sharing/l10n/fa.php +++ b/apps/files_sharing/l10n/fa.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "رمزعبور اشتباه می باشد. دوباره امتحان کنید.", "Password" => "گذرواژه", "Submit" => "ثبت", "%s shared the folder %s with you" => "%sپوشه %s را با شما به اشتراک گذاشت", diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php index 03931bf2986..59c951b7248 100644 --- a/apps/files_sharing/l10n/fi_FI.php +++ b/apps/files_sharing/l10n/fi_FI.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Väärä salasana. Yritä uudelleen.", "Password" => "Salasana", "Submit" => "Lähetä", +"Sorry, this link doesn’t seem to work anymore." => "Valitettavasti linkki ei vaikuta enää toimivan.", +"Reasons might be:" => "Mahdollisia syitä:", +"the item was removed" => "kohde poistettiin", +"the link expired" => "linkki vanheni", +"sharing is disabled" => "jakaminen on poistettu käytöstä", +"For more info, please ask the person who sent this link." => "Kysy lisätietoja henkilöltä, jolta sait linkin.", "%s shared the folder %s with you" => "%s jakoi kansion %s kanssasi", "%s shared the file %s with you" => "%s jakoi tiedoston %s kanssasi", "Download" => "Lataa", diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php index 145880b7e59..32aa6e0065a 100644 --- a/apps/files_sharing/l10n/fr.php +++ b/apps/files_sharing/l10n/fr.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.", "Password" => "Mot de passe", "Submit" => "Envoyer", "%s shared the folder %s with you" => "%s a partagé le répertoire %s avec vous", diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php index 2d8de8e1019..c90f5b0760e 100644 --- a/apps/files_sharing/l10n/gl.php +++ b/apps/files_sharing/l10n/gl.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "O contrasinal é incorrecto. Ténteo de novo.", "Password" => "Contrasinal", "Submit" => "Enviar", +"Sorry, this link doesn’t seem to work anymore." => "Semella que esta ligazón non funciona.", +"Reasons might be:" => "As razóns poderían ser:", +"the item was removed" => "o elemento foi retirado", +"the link expired" => "a ligazón caducou", +"sharing is disabled" => "foi desactivada a compartición", +"For more info, please ask the person who sent this link." => "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.", "%s shared the folder %s with you" => "%s compartiu o cartafol %s con vostede", "%s shared the file %s with you" => "%s compartiu o ficheiro %s con vostede", "Download" => "Descargar", diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php index 0b964379bb9..15ff6ff3c2b 100644 --- a/apps/files_sharing/l10n/hu_HU.php +++ b/apps/files_sharing/l10n/hu_HU.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "A megadott jelszó nem megfelelő. Próbálja újra!", "Password" => "Jelszó", "Submit" => "Elküld", "%s shared the folder %s with you" => "%s megosztotta Önnel ezt a mappát: %s", diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php index 66d6af7fd14..5bd18795715 100644 --- a/apps/files_sharing/l10n/it.php +++ b/apps/files_sharing/l10n/it.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "La password è errata. Prova ancora.", "Password" => "Password", "Submit" => "Invia", +"Sorry, this link doesn’t seem to work anymore." => "Spiacenti, questo collegamento sembra non essere più attivo.", +"Reasons might be:" => "I motivi potrebbero essere:", +"the item was removed" => "l'elemento è stato rimosso", +"the link expired" => "il collegamento è scaduto", +"sharing is disabled" => "la condivisione è disabilitata", +"For more info, please ask the person who sent this link." => "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.", "%s shared the folder %s with you" => "%s ha condiviso la cartella %s con te", "%s shared the file %s with you" => "%s ha condiviso il file %s con te", "Download" => "Scarica", diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php index 9968bf7a851..a604affee64 100644 --- a/apps/files_sharing/l10n/lb.php +++ b/apps/files_sharing/l10n/lb.php @@ -1,7 +1,11 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.", "Password" => "Passwuert", "Submit" => "Fortschécken", +"%s shared the folder %s with you" => "%s huet den Dossier %s mad der gedeelt", +"%s shared the file %s with you" => "%s deelt den Fichier %s mad dir", "Download" => "Download", "Upload" => "Eroplueden", -"Cancel upload" => "Upload ofbriechen" +"Cancel upload" => "Upload ofbriechen", +"No preview available for" => "Keeng Preview do fir" ); diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php index 9c736f97d78..65eadd3ccae 100644 --- a/apps/files_sharing/l10n/nb_NO.php +++ b/apps/files_sharing/l10n/nb_NO.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Passordet er feil. Prøv på nytt.", "Password" => "Passord", "Submit" => "Send inn", "%s shared the folder %s with you" => "%s delte mappen %s med deg", diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php index 6c1bf7a53f3..90f2f2290ff 100644 --- a/apps/files_sharing/l10n/nl.php +++ b/apps/files_sharing/l10n/nl.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Wachtwoord ongeldig. Probeer het nogmaals.", "Password" => "Wachtwoord", "Submit" => "Verzenden", "%s shared the folder %s with you" => "%s deelt de map %s met u", diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php index 39039da77b6..3f72403116a 100644 --- a/apps/files_sharing/l10n/pl.php +++ b/apps/files_sharing/l10n/pl.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "To hasło jest niewłaściwe. Spróbuj ponownie.", "Password" => "Hasło", "Submit" => "Wyślij", +"Sorry, this link doesn’t seem to work anymore." => "Przepraszamy ale wygląda na to, że ten link już nie działa.", +"Reasons might be:" => "Możliwe powody:", +"the item was removed" => "element został usunięty", +"the link expired" => "link wygasł", +"sharing is disabled" => "Udostępnianie jest wyłączone", +"For more info, please ask the person who sent this link." => "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.", "%s shared the folder %s with you" => "%s współdzieli folder z tobą %s", "%s shared the file %s with you" => "%s współdzieli z tobą plik %s", "Download" => "Pobierz", diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php index c82989857a9..ffd068f4fc5 100644 --- a/apps/files_sharing/l10n/pt_BR.php +++ b/apps/files_sharing/l10n/pt_BR.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Senha incorreta. Tente novamente.", "Password" => "Senha", "Submit" => "Submeter", +"Sorry, this link doesn’t seem to work anymore." => "Desculpe, este link parece não mais funcionar.", +"Reasons might be:" => "As razões podem ser:", +"the item was removed" => "o item foi removido", +"the link expired" => "o link expirou", +"sharing is disabled" => "compartilhamento está desativada", +"For more info, please ask the person who sent this link." => "Para mais informações, por favor, pergunte a pessoa que enviou este link.", "%s shared the folder %s with you" => "%s compartilhou a pasta %s com você", "%s shared the file %s with you" => "%s compartilhou o arquivo %s com você", "Download" => "Baixar", diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php index 2f41abca1f5..8b02e736062 100644 --- a/apps/files_sharing/l10n/pt_PT.php +++ b/apps/files_sharing/l10n/pt_PT.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Password errada, por favor tente de novo", "Password" => "Password", "Submit" => "Submeter", "%s shared the folder %s with you" => "%s partilhou a pasta %s consigo", diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php index a157866702c..601518e705d 100644 --- a/apps/files_sharing/l10n/ru.php +++ b/apps/files_sharing/l10n/ru.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.", "Password" => "Пароль", "Submit" => "Отправить", +"Sorry, this link doesn’t seem to work anymore." => "К сожалению, эта ссылка, похоже не будет работать больше.", +"Reasons might be:" => "Причиной может быть:", +"the item was removed" => "объект был удалён", +"the link expired" => "срок ссылки истёк", +"sharing is disabled" => "обмен отключен", +"For more info, please ask the person who sent this link." => "Для получения дополнительной информации, пожалуйста, спросите того кто отослал данную ссылку.", "%s shared the folder %s with you" => "%s открыл доступ к папке %s для Вас", "%s shared the file %s with you" => "%s открыл доступ к файлу %s для Вас", "Download" => "Скачать", diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php index 21e4e542d8e..434a81ac28a 100644 --- a/apps/files_sharing/l10n/sv.php +++ b/apps/files_sharing/l10n/sv.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "Lösenordet är fel. Försök igen.", "Password" => "Lösenord", "Submit" => "Skicka", +"Sorry, this link doesn’t seem to work anymore." => "Tyvärr, denna länk verkar inte fungera längre.", +"Reasons might be:" => "Orsaker kan vara:", +"the item was removed" => "objektet togs bort", +"the link expired" => "giltighet för länken har gått ut", +"sharing is disabled" => "delning är inaktiverat", +"For more info, please ask the person who sent this link." => "För mer information, kontakta den person som skickade den här länken.", "%s shared the folder %s with you" => "%s delade mappen %s med dig", "%s shared the file %s with you" => "%s delade filen %s med dig", "Download" => "Ladda ner", diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 96fe12fc86a..741ab145384 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -27,23 +27,9 @@ if (isset($_GET['t'])) { $type = $linkItem['item_type']; $fileSource = $linkItem['file_source']; $shareOwner = $linkItem['uid_owner']; - $fileOwner = null; $path = null; - if (isset($linkItem['parent'])) { - $parent = $linkItem['parent']; - while (isset($parent)) { - $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1); - $item = $query->execute(array($parent))->fetchRow(); - if (isset($item['parent'])) { - $parent = $item['parent']; - } else { - $fileOwner = $item['uid_owner']; - break; - } - } - } else { - $fileOwner = $shareOwner; - } + $rootLinkItem = OCP\Share::resolveReShare($linkItem); + $fileOwner = $rootLinkItem['uid_owner']; if (isset($fileOwner)) { OC_Util::tearDownFS(); OC_Util::setupFS($fileOwner); @@ -151,7 +137,10 @@ if (isset($path)) { if (\OCP\App::isEnabled('files_encryption')) { $allowPublicUploadEnabled = false; } - if (isset($file)) { + if (OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') { + $allowPublicUploadEnabled = false; + } + if ($linkItem['item_type'] !== 'folder') { $allowPublicUploadEnabled = false; } $tmpl->assign('allowPublicUploadEnabled', $allowPublicUploadEnabled); @@ -216,6 +205,7 @@ if (isset($path)) { $folder->assign('isCreatable', false); $folder->assign('permissions', OCP\PERMISSION_READ); $folder->assign('isPublic',true); + $folder->assign('publicUploadEnabled', 'no'); $folder->assign('files', $files); $folder->assign('uploadMaxFilesize', $maxUploadFilesize); $folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); @@ -244,6 +234,12 @@ if (isset($path)) { } else { OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG); } + +$errorTemplate = new OCP\Template('files_sharing', 'part.404', ''); +$errorContent = $errorTemplate->fetchPage(); + header('HTTP/1.0 404 Not Found'); +OCP\Util::addStyle('files_sharing', '404'); $tmpl = new OCP\Template('', '404', 'guest'); +$tmpl->assign('content', $errorContent); $tmpl->printPage(); diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php index fa03f419130..2c89b5df3f6 100644 --- a/apps/files_sharing/templates/authenticate.php +++ b/apps/files_sharing/templates/authenticate.php @@ -1,6 +1,6 @@ <form action="<?php p($_['URL']); ?>" method="post"> <fieldset> - <?php if ($_['wrongpw']): ?> + <?php if (isset($_['wrongpw'])): ?> <div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div> <?php endif; ?> <p class="infield"> diff --git a/apps/files_sharing/templates/part.404.php b/apps/files_sharing/templates/part.404.php new file mode 100644 index 00000000000..b5152e1511a --- /dev/null +++ b/apps/files_sharing/templates/part.404.php @@ -0,0 +1,12 @@ +<ul> + <li class="error error-broken-link"> + <p><?php p($l->t('Sorry, this link doesn’t seem to work anymore.')) ?></p> + <p><?php p($l->t('Reasons might be:')); ?></p> + <ul> + <li><?php p($l->t('the item was removed')); ?></li> + <li><?php p($l->t('the link expired')); ?></li> + <li><?php p($l->t('sharing is disabled')); ?></li> + </ul> + <p><?php p($l->t('For more info, please ask the person who sent this link.')); ?></p> + </li> +</ul>
\ No newline at end of file diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index e8bf80b8720..746a715f3cc 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -2,16 +2,14 @@ <div id="notification" style="display: none;"></div> </div> -<?php $defaults = new OCP\Defaults(); // initialize themable default strings and urls ?> - <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir"> <input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL"> <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename"> <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype"> <header><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" - src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a> - <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> + src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> + <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div class="header-right"> <?php if (isset($_['folder'])): ?> <span id="details"><?php p($l->t('%s shared the folder %s with you', @@ -95,6 +93,6 @@ </div> <footer> <p class="info"> - <?php print_unescaped($defaults->getLongFooter()); ?> + <?php print_unescaped($theme->getLongFooter()); ?> </p> </footer> |