@@ -31,35 +31,35 @@ |
||
| 31 | 31 | * @package OC\Hooks |
| 32 | 32 | */ |
| 33 | 33 | abstract class ForwardingEmitter extends BasicEmitter { |
| 34 | - /** |
|
| 35 | - * @var \OC\Hooks\Emitter[] array |
|
| 36 | - */ |
|
| 37 | - private $forwardEmitters = []; |
|
| 34 | + /** |
|
| 35 | + * @var \OC\Hooks\Emitter[] array |
|
| 36 | + */ |
|
| 37 | + private $forwardEmitters = []; |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @param string $scope |
|
| 41 | - * @param string $method |
|
| 42 | - * @param callable $callback |
|
| 43 | - */ |
|
| 44 | - public function listen($scope, $method, callable $callback) { |
|
| 45 | - parent::listen($scope, $method, $callback); |
|
| 46 | - foreach ($this->forwardEmitters as $emitter) { |
|
| 47 | - $emitter->listen($scope, $method, $callback); |
|
| 48 | - } |
|
| 49 | - } |
|
| 39 | + /** |
|
| 40 | + * @param string $scope |
|
| 41 | + * @param string $method |
|
| 42 | + * @param callable $callback |
|
| 43 | + */ |
|
| 44 | + public function listen($scope, $method, callable $callback) { |
|
| 45 | + parent::listen($scope, $method, $callback); |
|
| 46 | + foreach ($this->forwardEmitters as $emitter) { |
|
| 47 | + $emitter->listen($scope, $method, $callback); |
|
| 48 | + } |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @param \OC\Hooks\Emitter $emitter |
|
| 53 | - */ |
|
| 54 | - protected function forward(Emitter $emitter) { |
|
| 55 | - $this->forwardEmitters[] = $emitter; |
|
| 51 | + /** |
|
| 52 | + * @param \OC\Hooks\Emitter $emitter |
|
| 53 | + */ |
|
| 54 | + protected function forward(Emitter $emitter) { |
|
| 55 | + $this->forwardEmitters[] = $emitter; |
|
| 56 | 56 | |
| 57 | - //forward all previously connected hooks |
|
| 58 | - foreach ($this->listeners as $key => $listeners) { |
|
| 59 | - list($scope, $method) = explode('::', $key, 2); |
|
| 60 | - foreach ($listeners as $listener) { |
|
| 61 | - $emitter->listen($scope, $method, $listener); |
|
| 62 | - } |
|
| 63 | - } |
|
| 64 | - } |
|
| 57 | + //forward all previously connected hooks |
|
| 58 | + foreach ($this->listeners as $key => $listeners) { |
|
| 59 | + list($scope, $method) = explode('::', $key, 2); |
|
| 60 | + foreach ($listeners as $listener) { |
|
| 61 | + $emitter->listen($scope, $method, $listener); |
|
| 62 | + } |
|
| 63 | + } |
|
| 64 | + } |
|
| 65 | 65 | } |
@@ -24,15 +24,15 @@ |
||
| 24 | 24 | namespace OC\Hooks; |
| 25 | 25 | |
| 26 | 26 | abstract class LegacyEmitter extends BasicEmitter { |
| 27 | - /** |
|
| 28 | - * @param string $scope |
|
| 29 | - * @param string $method |
|
| 30 | - * @param array $arguments |
|
| 31 | - * |
|
| 32 | - * @suppress PhanAccessMethodProtected |
|
| 33 | - */ |
|
| 34 | - protected function emit($scope, $method, array $arguments = []) { |
|
| 35 | - \OC_Hook::emit($scope, $method, $arguments); |
|
| 36 | - parent::emit($scope, $method, $arguments); |
|
| 37 | - } |
|
| 27 | + /** |
|
| 28 | + * @param string $scope |
|
| 29 | + * @param string $method |
|
| 30 | + * @param array $arguments |
|
| 31 | + * |
|
| 32 | + * @suppress PhanAccessMethodProtected |
|
| 33 | + */ |
|
| 34 | + protected function emit($scope, $method, array $arguments = []) { |
|
| 35 | + \OC_Hook::emit($scope, $method, $arguments); |
|
| 36 | + parent::emit($scope, $method, $arguments); |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | * @package OC\AppFramework\Middleware\Security\Exceptions |
| 33 | 33 | */ |
| 34 | 34 | class StrictCookieMissingException extends SecurityException { |
| 35 | - public function __construct() { |
|
| 36 | - parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED); |
|
| 37 | - } |
|
| 35 | + public function __construct() { |
|
| 36 | + parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED); |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -23,11 +23,11 @@ |
||
| 23 | 23 | |
| 24 | 24 | class PublicCalendarObject extends CalendarObject { |
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * public calendars are always shared |
|
| 28 | - * @return bool |
|
| 29 | - */ |
|
| 30 | - protected function isShared() { |
|
| 31 | - return true; |
|
| 32 | - } |
|
| 26 | + /** |
|
| 27 | + * public calendars are always shared |
|
| 28 | + * @return bool |
|
| 29 | + */ |
|
| 30 | + protected function isShared() { |
|
| 31 | + return true; |
|
| 32 | + } |
|
| 33 | 33 | } |
@@ -29,40 +29,40 @@ |
||
| 29 | 29 | |
| 30 | 30 | class FedAuth extends AbstractBasic { |
| 31 | 31 | |
| 32 | - /** @var DbHandler */ |
|
| 33 | - private $db; |
|
| 32 | + /** @var DbHandler */ |
|
| 33 | + private $db; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * FedAuth constructor. |
|
| 37 | - * |
|
| 38 | - * @param DbHandler $db |
|
| 39 | - */ |
|
| 40 | - public function __construct(DbHandler $db) { |
|
| 41 | - $this->db = $db; |
|
| 42 | - $this->principalPrefix = 'principals/system/'; |
|
| 35 | + /** |
|
| 36 | + * FedAuth constructor. |
|
| 37 | + * |
|
| 38 | + * @param DbHandler $db |
|
| 39 | + */ |
|
| 40 | + public function __construct(DbHandler $db) { |
|
| 41 | + $this->db = $db; |
|
| 42 | + $this->principalPrefix = 'principals/system/'; |
|
| 43 | 43 | |
| 44 | - // setup realm |
|
| 45 | - $defaults = new \OCP\Defaults(); |
|
| 46 | - $this->realm = $defaults->getName(); |
|
| 47 | - } |
|
| 44 | + // setup realm |
|
| 45 | + $defaults = new \OCP\Defaults(); |
|
| 46 | + $this->realm = $defaults->getName(); |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * Validates a username and password |
|
| 51 | - * |
|
| 52 | - * This method should return true or false depending on if login |
|
| 53 | - * succeeded. |
|
| 54 | - * |
|
| 55 | - * @param string $username |
|
| 56 | - * @param string $password |
|
| 57 | - * @return bool |
|
| 58 | - */ |
|
| 59 | - protected function validateUserPass($username, $password) { |
|
| 60 | - return $this->db->auth($username, $password); |
|
| 61 | - } |
|
| 49 | + /** |
|
| 50 | + * Validates a username and password |
|
| 51 | + * |
|
| 52 | + * This method should return true or false depending on if login |
|
| 53 | + * succeeded. |
|
| 54 | + * |
|
| 55 | + * @param string $username |
|
| 56 | + * @param string $password |
|
| 57 | + * @return bool |
|
| 58 | + */ |
|
| 59 | + protected function validateUserPass($username, $password) { |
|
| 60 | + return $this->db->auth($username, $password); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * @inheritdoc |
|
| 65 | - */ |
|
| 66 | - public function challenge(RequestInterface $request, ResponseInterface $response) { |
|
| 67 | - } |
|
| 63 | + /** |
|
| 64 | + * @inheritdoc |
|
| 65 | + */ |
|
| 66 | + public function challenge(RequestInterface $request, ResponseInterface $response) { |
|
| 67 | + } |
|
| 68 | 68 | } |
@@ -15,10 +15,10 @@ |
||
| 15 | 15 | <td width="20px"> </td> |
| 16 | 16 | <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;"> |
| 17 | 17 | <?php |
| 18 | - print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', [$_['password']])); |
|
| 19 | - // TRANSLATORS term at the end of a mail |
|
| 20 | - p($l->t('Cheers!')); |
|
| 21 | - ?> |
|
| 18 | + print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', [$_['password']])); |
|
| 19 | + // TRANSLATORS term at the end of a mail |
|
| 20 | + p($l->t('Cheers!')); |
|
| 21 | + ?> |
|
| 22 | 22 | </td> |
| 23 | 23 | </tr> |
| 24 | 24 | <tr><td colspan="2"> </td></tr> |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | use OCP\AppFramework\Http; |
| 6 | 6 | |
| 7 | 7 | class NotSubAdminException extends \Exception { |
| 8 | - public function __construct() { |
|
| 9 | - parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
| 10 | - } |
|
| 8 | + public function __construct() { |
|
| 9 | + parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
| 10 | + } |
|
| 11 | 11 | } |
@@ -28,23 +28,23 @@ |
||
| 28 | 28 | use Symfony\Component\Console\Output\OutputInterface; |
| 29 | 29 | |
| 30 | 30 | class Status extends Base { |
| 31 | - protected function configure() { |
|
| 32 | - parent::configure(); |
|
| 31 | + protected function configure() { |
|
| 32 | + parent::configure(); |
|
| 33 | 33 | |
| 34 | - $this |
|
| 35 | - ->setName('status') |
|
| 36 | - ->setDescription('show some status information') |
|
| 37 | - ; |
|
| 38 | - } |
|
| 34 | + $this |
|
| 35 | + ->setName('status') |
|
| 36 | + ->setDescription('show some status information') |
|
| 37 | + ; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 41 | - $values = [ |
|
| 42 | - 'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false), |
|
| 43 | - 'version' => implode('.', \OCP\Util::getVersion()), |
|
| 44 | - 'versionstring' => \OC_Util::getVersionString(), |
|
| 45 | - 'edition' => '', |
|
| 46 | - ]; |
|
| 40 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 41 | + $values = [ |
|
| 42 | + 'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false), |
|
| 43 | + 'version' => implode('.', \OCP\Util::getVersion()), |
|
| 44 | + 'versionstring' => \OC_Util::getVersionString(), |
|
| 45 | + 'edition' => '', |
|
| 46 | + ]; |
|
| 47 | 47 | |
| 48 | - $this->writeArrayInOutputFormat($input, $output, $values); |
|
| 49 | - } |
|
| 48 | + $this->writeArrayInOutputFormat($input, $output, $values); |
|
| 49 | + } |
|
| 50 | 50 | } |
@@ -29,59 +29,59 @@ |
||
| 29 | 29 | namespace OC\L10N; |
| 30 | 30 | |
| 31 | 31 | class L10NString implements \JsonSerializable { |
| 32 | - /** @var \OC\L10N\L10N */ |
|
| 33 | - protected $l10n; |
|
| 32 | + /** @var \OC\L10N\L10N */ |
|
| 33 | + protected $l10n; |
|
| 34 | 34 | |
| 35 | - /** @var string */ |
|
| 36 | - protected $text; |
|
| 35 | + /** @var string */ |
|
| 36 | + protected $text; |
|
| 37 | 37 | |
| 38 | - /** @var array */ |
|
| 39 | - protected $parameters; |
|
| 38 | + /** @var array */ |
|
| 39 | + protected $parameters; |
|
| 40 | 40 | |
| 41 | - /** @var integer */ |
|
| 42 | - protected $count; |
|
| 41 | + /** @var integer */ |
|
| 42 | + protected $count; |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @param \OC\L10N\L10N $l10n |
|
| 46 | - * @param string|string[] $text |
|
| 47 | - * @param array $parameters |
|
| 48 | - * @param int $count |
|
| 49 | - */ |
|
| 50 | - public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) { |
|
| 51 | - $this->l10n = $l10n; |
|
| 52 | - $this->text = $text; |
|
| 53 | - $this->parameters = $parameters; |
|
| 54 | - $this->count = $count; |
|
| 55 | - } |
|
| 44 | + /** |
|
| 45 | + * @param \OC\L10N\L10N $l10n |
|
| 46 | + * @param string|string[] $text |
|
| 47 | + * @param array $parameters |
|
| 48 | + * @param int $count |
|
| 49 | + */ |
|
| 50 | + public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) { |
|
| 51 | + $this->l10n = $l10n; |
|
| 52 | + $this->text = $text; |
|
| 53 | + $this->parameters = $parameters; |
|
| 54 | + $this->count = $count; |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @return string |
|
| 59 | - */ |
|
| 60 | - public function __toString() { |
|
| 61 | - $translations = $this->l10n->getTranslations(); |
|
| 57 | + /** |
|
| 58 | + * @return string |
|
| 59 | + */ |
|
| 60 | + public function __toString() { |
|
| 61 | + $translations = $this->l10n->getTranslations(); |
|
| 62 | 62 | |
| 63 | - $text = $this->text; |
|
| 64 | - if(array_key_exists($this->text, $translations)) { |
|
| 65 | - if(is_array($translations[$this->text])) { |
|
| 66 | - $fn = $this->l10n->getPluralFormFunction(); |
|
| 67 | - $id = $fn($this->count); |
|
| 68 | - $text = $translations[$this->text][$id]; |
|
| 69 | - } |
|
| 70 | - else{ |
|
| 71 | - $text = $translations[$this->text]; |
|
| 72 | - } |
|
| 73 | - } |
|
| 63 | + $text = $this->text; |
|
| 64 | + if(array_key_exists($this->text, $translations)) { |
|
| 65 | + if(is_array($translations[$this->text])) { |
|
| 66 | + $fn = $this->l10n->getPluralFormFunction(); |
|
| 67 | + $id = $fn($this->count); |
|
| 68 | + $text = $translations[$this->text][$id]; |
|
| 69 | + } |
|
| 70 | + else{ |
|
| 71 | + $text = $translations[$this->text]; |
|
| 72 | + } |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - // Replace %n first (won't interfere with vsprintf) |
|
| 76 | - $text = str_replace('%n', (string)$this->count, $text); |
|
| 77 | - return vsprintf($text, $this->parameters); |
|
| 78 | - } |
|
| 75 | + // Replace %n first (won't interfere with vsprintf) |
|
| 76 | + $text = str_replace('%n', (string)$this->count, $text); |
|
| 77 | + return vsprintf($text, $this->parameters); |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * @return string |
|
| 83 | - */ |
|
| 84 | - public function jsonSerialize() { |
|
| 85 | - return $this->__toString(); |
|
| 86 | - } |
|
| 81 | + /** |
|
| 82 | + * @return string |
|
| 83 | + */ |
|
| 84 | + public function jsonSerialize() { |
|
| 85 | + return $this->__toString(); |
|
| 86 | + } |
|
| 87 | 87 | } |