diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/connector/sabre/quotaplugin.php | 59 | ||||
| -rw-r--r-- | lib/l10n/nb_NO.php | 1 | ||||
| -rw-r--r-- | lib/l10n/ru.php | 1 | ||||
| -rw-r--r-- | lib/user/database.php | 5 |
4 files changed, 65 insertions, 1 deletions
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php new file mode 100644 index 00000000000..5b8ef941710 --- /dev/null +++ b/lib/connector/sabre/quotaplugin.php @@ -0,0 +1,59 @@ +<?php + +/** + * This plugin check user quota and deny creating files when they exceeds the quota. + * + * @copyright Copyright (C) 2012 entreCables S.L. All rights reserved. + * @author Sergio Cambra + * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License + */ +class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { + + /** + * Reference to main server object + * + * @var Sabre_DAV_Server + */ + private $server; + + /** + * This initializes the plugin. + * + * This function is called by Sabre_DAV_Server, after + * addPlugin is called. + * + * This method should set up the requires event subscriptions. + * + * @param Sabre_DAV_Server $server + * @return void + */ + public function initialize(Sabre_DAV_Server $server) { + + $this->server = $server; + $this->server->subscribeEvent('beforeWriteContent', array($this, 'checkQuota'), 10); + $this->server->subscribeEvent('beforeCreateFile', array($this, 'checkQuota'), 10); + + } + + /** + * This method is called before any HTTP method and forces users to be authenticated + * + * @param string $method + * @throws Sabre_DAV_Exception + * @return bool + */ + public function checkQuota($uri, $data = null) { + $expected = $this->server->httpRequest->getHeader('X-Expected-Entity-Length'); + $length = $expected ? $expected : $this->server->httpRequest->getHeader('Content-Length'); + if ($length) { + if (substr($uri, 0, 1)!=='/') { + $uri='/'.$uri; + } + list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri); + if ($length > OC_Filesystem::free_space($parentUri)) { + throw new Sabre_DAV_Exception('Quota exceeded. File is too big.'); + } + } + return true; + } +} diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php index afb80288b53..ece05b389ca 100644 --- a/lib/l10n/nb_NO.php +++ b/lib/l10n/nb_NO.php @@ -14,6 +14,7 @@ "Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.", "Files" => "Filer", "Text" => "Tekst", +"Images" => "Bilder", "seconds ago" => "sekunder siden", "1 minute ago" => "1 minuitt siden", "%d minutes ago" => "%d minutter siden", diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index c703c30ac44..1a7319eb168 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -14,6 +14,7 @@ "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.", "Files" => "Файлы", "Text" => "Текст", +"Images" => "Изображения", "seconds ago" => "менее минуты", "1 minute ago" => "1 минуту назад", "%d minutes ago" => "%d минут назад", diff --git a/lib/user/database.php b/lib/user/database.php index 25e24fcf7e4..b8c90615067 100644 --- a/lib/user/database.php +++ b/lib/user/database.php @@ -172,7 +172,10 @@ class OC_User_Database extends OC_User_Backend { public function userExists($uid) { $query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' ); $result = $query->execute( array( $uid )); - + if (OC_DB::isError($result)) { + OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); + return false; + } return $result->numRows() > 0; } |