diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/appinfo/filesync.php | 64 | ||||
| -rw-r--r-- | apps/files/appinfo/info.xml | 1 | ||||
| -rw-r--r-- | apps/files_encryption/l10n/en_GB.php | 1 | ||||
| -rw-r--r-- | apps/files_encryption/l10n/fr.php | 1 | ||||
| -rw-r--r-- | apps/files_encryption/l10n/sl.php | 2 | ||||
| -rw-r--r-- | apps/files_encryption/l10n/tr.php | 1 | ||||
| -rw-r--r-- | apps/files_external/l10n/sl.php | 1 | ||||
| -rw-r--r-- | apps/files_sharing/lib/sharedstorage.php | 4 |
8 files changed, 8 insertions, 67 deletions
diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php deleted file mode 100644 index 47884a4f15e..00000000000 --- a/apps/files/appinfo/filesync.php +++ /dev/null @@ -1,64 +0,0 @@ -<?php -/** - * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -/** - * filesync can be called with a PUT method. - * PUT takes a stream starting with a 2 byte blocksize, - * followed by binary md5 of the blocks. Everything in big-endian. - * The return is a json encoded with: - * - 'transferid' - * - 'needed' chunks - * - 'last' checked chunk - * The URL is made of 3 parts, the service url (remote.php/filesync/), the sync - * type and the path in ownCloud. - * At the moment the only supported sync type is 'oc_chunked'. - * The final URL will look like http://.../remote.php/filesync/oc_chunked/path/to/file - */ - -// load needed apps -$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging'); -OC_App::loadApps($RUNTIME_APPTYPES); -if(!OC_User::isLoggedIn()) { - if(!isset($_SERVER['PHP_AUTH_USER'])) { - header('WWW-Authenticate: Basic realm="ownCloud Server"'); - header('HTTP/1.0 401 Unauthorized'); - echo 'Valid credentials must be supplied'; - exit(); - } else { - if(!OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { - exit(); - } - } -} - -list($type, $file) = explode('/', substr($path_info, 1+strlen($service)+1), 2); - -if ($type != 'oc_chunked') { - OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); - die; -} - -if (!\OC\Files\Filesystem::is_file($file)) { - OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); - die; -} - -switch($_SERVER['REQUEST_METHOD']) { - case 'PUT': - $input = fopen("php://input", "r"); - $org_file = \OC\Files\Filesystem::fopen($file, 'rb'); - $info = array( - 'name' => basename($file), - ); - $sync = new OC_FileChunking($info); - $result = $sync->signature_split($org_file, $input); - echo json_encode($result); - break; - default: - OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); -} diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 390d645e2a4..7f222c0cc7d 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -15,6 +15,5 @@ <remote> <files>appinfo/remote.php</files> <webdav>appinfo/remote.php</webdav> - <filesync>appinfo/filesync.php</filesync> </remote> </info> diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php index b5476566e11..21f69496183 100644 --- a/apps/files_encryption/l10n/en_GB.php +++ b/apps/files_encryption/l10n/en_GB.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "New Recovery key password" => "New recovery key password", "Repeat New Recovery key password" => "Repeat new recovery key password", "Change Password" => "Change Password", +"Your private key password no longer matches your log-in password." => "Your private key password no longer matches your log-in password.", "Set your old private key password to your current log-in password:" => "Set your old private key password to your current log-in password:", " If you don't remember your old password you can ask your administrator to recover your files." => " If you don't remember your old password you can ask your administrator to recover your files.", "Old log-in password" => "Old login password", diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php index d75c2866d72..c78f6aaabd6 100644 --- a/apps/files_encryption/l10n/fr.php +++ b/apps/files_encryption/l10n/fr.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "New Recovery key password" => "Nouveau mot de passe de la clef de récupération", "Repeat New Recovery key password" => "Répétez le nouveau mot de passe de la clé de récupération", "Change Password" => "Changer de mot de passe", +"Your private key password no longer matches your log-in password." => "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.", "Set your old private key password to your current log-in password:" => "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion :", " If you don't remember your old password you can ask your administrator to recover your files." => "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.", "Old log-in password" => "Ancien mot de passe de connexion", diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php index bbb1edefa5f..aeaf80ac6ca 100644 --- a/apps/files_encryption/l10n/sl.php +++ b/apps/files_encryption/l10n/sl.php @@ -30,6 +30,8 @@ $TRANSLATIONS = array( "New Recovery key password" => "Novi ključ za obnovitev gesla", "Repeat New Recovery key password" => "Ponovi novi ključ za obnovitev gesla", "Change Password" => "Spremeni geslo", +"Your private key password no longer matches your log-in password." => "Zasebno geslo ni več skladno s prijavnim geslom.", +"Set your old private key password to your current log-in password:" => "Nastavite star zasebni ključ na trenutno prijavno geslo:", " If you don't remember your old password you can ask your administrator to recover your files." => "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema.", "Old log-in password" => "Staro geslo", "Current log-in password" => "Trenutno geslo", diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php index 5d1b737f974..7055859a33d 100644 --- a/apps/files_encryption/l10n/tr.php +++ b/apps/files_encryption/l10n/tr.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "New Recovery key password" => "Yeni Kurtarma anahtarı parolası", "Repeat New Recovery key password" => "Yeni Kurtarma anahtarı parolasını yineleyin", "Change Password" => "Parola Değiştir", +"Your private key password no longer matches your log-in password." => "Özel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.", "Set your old private key password to your current log-in password:" => "Eski özel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:", " If you don't remember your old password you can ask your administrator to recover your files." => "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz.", "Old log-in password" => "Eski oturum açma parolası", diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php index 2c6c3220d95..5751782c861 100644 --- a/apps/files_external/l10n/sl.php +++ b/apps/files_external/l10n/sl.php @@ -29,6 +29,7 @@ $TRANSLATIONS = array( "OpenStack Object Storage" => "Shramba predmeta OpenStack", "Username (required)" => "Uporabniško ime (zahtevano)", "Region (optional for OpenStack Object Storage)" => "Območje (zahtevano za shrambo predmeta OpenStack)", +"API Key (required for Rackspace Cloud Files)" => "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)", "Tenantname (required for OpenStack Object Storage)" => "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)", "Password (required for OpenStack Object Storage)" => "Geslo (zahtevano za shrambo predmeta OpenStack)", "Service Name (required for OpenStack Object Storage)" => "Ime storitve (zahtevano za shrambo predmeta OpenStack)", diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 8d5b22dc283..02fcd7041dd 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -48,10 +48,10 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { /** * get file cache of the shared item source - * @return string + * @return int */ public function getSourceId() { - return $this->share['file_source']; + return (int) $this->share['file_source']; } /** |