@@ -31,75 +31,75 @@ |
||
| 31 | 31 | |
| 32 | 32 | class Version1002Date20170607113030 extends SimpleMigrationStep { |
| 33 | 33 | |
| 34 | - /** @var IDBConnection */ |
|
| 35 | - protected $connection; |
|
| 34 | + /** @var IDBConnection */ |
|
| 35 | + protected $connection; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @param IDBConnection $connection |
|
| 39 | - */ |
|
| 40 | - public function __construct(IDBConnection $connection) { |
|
| 41 | - $this->connection = $connection; |
|
| 42 | - } |
|
| 37 | + /** |
|
| 38 | + * @param IDBConnection $connection |
|
| 39 | + */ |
|
| 40 | + public function __construct(IDBConnection $connection) { |
|
| 41 | + $this->connection = $connection; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @param IOutput $output |
|
| 46 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 47 | - * @param array $options |
|
| 48 | - * @since 13.0.0 |
|
| 49 | - */ |
|
| 50 | - public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
| 51 | - /** @var ISchemaWrapper $schema */ |
|
| 52 | - $schema = $schemaClosure(); |
|
| 44 | + /** |
|
| 45 | + * @param IOutput $output |
|
| 46 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 47 | + * @param array $options |
|
| 48 | + * @since 13.0.0 |
|
| 49 | + */ |
|
| 50 | + public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
| 51 | + /** @var ISchemaWrapper $schema */ |
|
| 52 | + $schema = $schemaClosure(); |
|
| 53 | 53 | |
| 54 | - if (!$schema->hasTable('twofactor_backup_codes')) { |
|
| 55 | - // Legacy table does not exist |
|
| 56 | - return; |
|
| 57 | - } |
|
| 54 | + if (!$schema->hasTable('twofactor_backup_codes')) { |
|
| 55 | + // Legacy table does not exist |
|
| 56 | + return; |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - $insert = $this->connection->getQueryBuilder(); |
|
| 60 | - $insert->insert('twofactor_backupcodes') |
|
| 61 | - ->values([ |
|
| 62 | - // Inserting with id might fail: 'id' => $insert->createParameter('id'), |
|
| 63 | - 'user_id' => $insert->createParameter('user_id'), |
|
| 64 | - 'code' => $insert->createParameter('code'), |
|
| 65 | - 'used' => $insert->createParameter('used'), |
|
| 66 | - ]); |
|
| 59 | + $insert = $this->connection->getQueryBuilder(); |
|
| 60 | + $insert->insert('twofactor_backupcodes') |
|
| 61 | + ->values([ |
|
| 62 | + // Inserting with id might fail: 'id' => $insert->createParameter('id'), |
|
| 63 | + 'user_id' => $insert->createParameter('user_id'), |
|
| 64 | + 'code' => $insert->createParameter('code'), |
|
| 65 | + 'used' => $insert->createParameter('used'), |
|
| 66 | + ]); |
|
| 67 | 67 | |
| 68 | - $query = $this->connection->getQueryBuilder(); |
|
| 69 | - $query->select('*') |
|
| 70 | - ->from('twofactor_backup_codes') |
|
| 71 | - ->orderBy('id', 'ASC'); |
|
| 72 | - $result = $query->execute(); |
|
| 68 | + $query = $this->connection->getQueryBuilder(); |
|
| 69 | + $query->select('*') |
|
| 70 | + ->from('twofactor_backup_codes') |
|
| 71 | + ->orderBy('id', 'ASC'); |
|
| 72 | + $result = $query->execute(); |
|
| 73 | 73 | |
| 74 | - $output->startProgress(); |
|
| 75 | - while ($row = $result->fetch()) { |
|
| 76 | - $output->advance(); |
|
| 74 | + $output->startProgress(); |
|
| 75 | + while ($row = $result->fetch()) { |
|
| 76 | + $output->advance(); |
|
| 77 | 77 | |
| 78 | - $insert |
|
| 79 | - // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT) |
|
| 80 | - ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR) |
|
| 81 | - ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR) |
|
| 82 | - ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT) |
|
| 83 | - ->execute(); |
|
| 84 | - } |
|
| 85 | - $output->finishProgress(); |
|
| 86 | - } |
|
| 78 | + $insert |
|
| 79 | + // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT) |
|
| 80 | + ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR) |
|
| 81 | + ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR) |
|
| 82 | + ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT) |
|
| 83 | + ->execute(); |
|
| 84 | + } |
|
| 85 | + $output->finishProgress(); |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - /** |
|
| 89 | - * @param IOutput $output |
|
| 90 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 91 | - * @param array $options |
|
| 92 | - * @return null|ISchemaWrapper |
|
| 93 | - * @since 13.0.0 |
|
| 94 | - */ |
|
| 95 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
| 96 | - /** @var ISchemaWrapper $schema */ |
|
| 97 | - $schema = $schemaClosure(); |
|
| 88 | + /** |
|
| 89 | + * @param IOutput $output |
|
| 90 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 91 | + * @param array $options |
|
| 92 | + * @return null|ISchemaWrapper |
|
| 93 | + * @since 13.0.0 |
|
| 94 | + */ |
|
| 95 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
| 96 | + /** @var ISchemaWrapper $schema */ |
|
| 97 | + $schema = $schemaClosure(); |
|
| 98 | 98 | |
| 99 | - if ($schema->hasTable('twofactor_backup_codes')) { |
|
| 100 | - $schema->dropTable('twofactor_backup_codes'); |
|
| 101 | - return $schema; |
|
| 102 | - } |
|
| 103 | - return null; |
|
| 104 | - } |
|
| 99 | + if ($schema->hasTable('twofactor_backup_codes')) { |
|
| 100 | + $schema->dropTable('twofactor_backup_codes'); |
|
| 101 | + return $schema; |
|
| 102 | + } |
|
| 103 | + return null; |
|
| 104 | + } |
|
| 105 | 105 | } |
@@ -33,80 +33,80 @@ |
||
| 33 | 33 | * Specialized version of Local storage for home directory usage |
| 34 | 34 | */ |
| 35 | 35 | class Home extends Local implements \OCP\Files\IHomeStorage { |
| 36 | - /** |
|
| 37 | - * @var string |
|
| 38 | - */ |
|
| 39 | - protected $id; |
|
| 36 | + /** |
|
| 37 | + * @var string |
|
| 38 | + */ |
|
| 39 | + protected $id; |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * @var \OC\User\User $user |
|
| 43 | - */ |
|
| 44 | - protected $user; |
|
| 41 | + /** |
|
| 42 | + * @var \OC\User\User $user |
|
| 43 | + */ |
|
| 44 | + protected $user; |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * Construct a Home storage instance |
|
| 48 | - * |
|
| 49 | - * @param array $arguments array with "user" containing the |
|
| 50 | - * storage owner |
|
| 51 | - */ |
|
| 52 | - public function __construct($arguments) { |
|
| 53 | - $this->user = $arguments['user']; |
|
| 54 | - $datadir = $this->user->getHome(); |
|
| 55 | - $this->id = 'home::' . $this->user->getUID(); |
|
| 46 | + /** |
|
| 47 | + * Construct a Home storage instance |
|
| 48 | + * |
|
| 49 | + * @param array $arguments array with "user" containing the |
|
| 50 | + * storage owner |
|
| 51 | + */ |
|
| 52 | + public function __construct($arguments) { |
|
| 53 | + $this->user = $arguments['user']; |
|
| 54 | + $datadir = $this->user->getHome(); |
|
| 55 | + $this->id = 'home::' . $this->user->getUID(); |
|
| 56 | 56 | |
| 57 | - parent::__construct(['datadir' => $datadir]); |
|
| 58 | - } |
|
| 57 | + parent::__construct(['datadir' => $datadir]); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - public function getId() { |
|
| 61 | - return $this->id; |
|
| 62 | - } |
|
| 60 | + public function getId() { |
|
| 61 | + return $this->id; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * @return \OC\Files\Cache\HomeCache |
|
| 66 | - */ |
|
| 67 | - public function getCache($path = '', $storage = null) { |
|
| 68 | - if (!$storage) { |
|
| 69 | - $storage = $this; |
|
| 70 | - } |
|
| 71 | - if (!isset($this->cache)) { |
|
| 72 | - $this->cache = new \OC\Files\Cache\HomeCache($storage); |
|
| 73 | - } |
|
| 74 | - return $this->cache; |
|
| 75 | - } |
|
| 64 | + /** |
|
| 65 | + * @return \OC\Files\Cache\HomeCache |
|
| 66 | + */ |
|
| 67 | + public function getCache($path = '', $storage = null) { |
|
| 68 | + if (!$storage) { |
|
| 69 | + $storage = $this; |
|
| 70 | + } |
|
| 71 | + if (!isset($this->cache)) { |
|
| 72 | + $this->cache = new \OC\Files\Cache\HomeCache($storage); |
|
| 73 | + } |
|
| 74 | + return $this->cache; |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - /** |
|
| 78 | - * get a propagator instance for the cache |
|
| 79 | - * |
|
| 80 | - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
| 81 | - * @return \OC\Files\Cache\Propagator |
|
| 82 | - */ |
|
| 83 | - public function getPropagator($storage = null) { |
|
| 84 | - if (!$storage) { |
|
| 85 | - $storage = $this; |
|
| 86 | - } |
|
| 87 | - if (!isset($this->propagator)) { |
|
| 88 | - $this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection()); |
|
| 89 | - } |
|
| 90 | - return $this->propagator; |
|
| 91 | - } |
|
| 77 | + /** |
|
| 78 | + * get a propagator instance for the cache |
|
| 79 | + * |
|
| 80 | + * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
| 81 | + * @return \OC\Files\Cache\Propagator |
|
| 82 | + */ |
|
| 83 | + public function getPropagator($storage = null) { |
|
| 84 | + if (!$storage) { |
|
| 85 | + $storage = $this; |
|
| 86 | + } |
|
| 87 | + if (!isset($this->propagator)) { |
|
| 88 | + $this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection()); |
|
| 89 | + } |
|
| 90 | + return $this->propagator; |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * Returns the owner of this home storage |
|
| 96 | - * |
|
| 97 | - * @return \OC\User\User owner of this home storage |
|
| 98 | - */ |
|
| 99 | - public function getUser() { |
|
| 100 | - return $this->user; |
|
| 101 | - } |
|
| 94 | + /** |
|
| 95 | + * Returns the owner of this home storage |
|
| 96 | + * |
|
| 97 | + * @return \OC\User\User owner of this home storage |
|
| 98 | + */ |
|
| 99 | + public function getUser() { |
|
| 100 | + return $this->user; |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - /** |
|
| 104 | - * get the owner of a path |
|
| 105 | - * |
|
| 106 | - * @param string $path The path to get the owner |
|
| 107 | - * @return string uid or false |
|
| 108 | - */ |
|
| 109 | - public function getOwner($path) { |
|
| 110 | - return $this->user->getUID(); |
|
| 111 | - } |
|
| 103 | + /** |
|
| 104 | + * get the owner of a path |
|
| 105 | + * |
|
| 106 | + * @param string $path The path to get the owner |
|
| 107 | + * @return string uid or false |
|
| 108 | + */ |
|
| 109 | + public function getOwner($path) { |
|
| 110 | + return $this->user->getUID(); |
|
| 111 | + } |
|
| 112 | 112 | } |
@@ -31,41 +31,41 @@ |
||
| 31 | 31 | * @since 7.0.0 |
| 32 | 32 | */ |
| 33 | 33 | interface IAppConfig { |
| 34 | - /** |
|
| 35 | - * check if a key is set in the appconfig |
|
| 36 | - * @param string $app |
|
| 37 | - * @param string $key |
|
| 38 | - * @return bool |
|
| 39 | - * @since 7.0.0 |
|
| 40 | - */ |
|
| 41 | - public function hasKey($app, $key); |
|
| 34 | + /** |
|
| 35 | + * check if a key is set in the appconfig |
|
| 36 | + * @param string $app |
|
| 37 | + * @param string $key |
|
| 38 | + * @return bool |
|
| 39 | + * @since 7.0.0 |
|
| 40 | + */ |
|
| 41 | + public function hasKey($app, $key); |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * get multiply values, either the app or key can be used as wildcard by setting it to false |
|
| 45 | - * |
|
| 46 | - * @param string|false $key |
|
| 47 | - * @param string|false $app |
|
| 48 | - * @return array|false |
|
| 49 | - * @since 7.0.0 |
|
| 50 | - */ |
|
| 51 | - public function getValues($app, $key); |
|
| 43 | + /** |
|
| 44 | + * get multiply values, either the app or key can be used as wildcard by setting it to false |
|
| 45 | + * |
|
| 46 | + * @param string|false $key |
|
| 47 | + * @param string|false $app |
|
| 48 | + * @return array|false |
|
| 49 | + * @since 7.0.0 |
|
| 50 | + */ |
|
| 51 | + public function getValues($app, $key); |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * get all values of the app or and filters out sensitive data |
|
| 55 | - * |
|
| 56 | - * @param string $app |
|
| 57 | - * @return array |
|
| 58 | - * @since 12.0.0 |
|
| 59 | - */ |
|
| 60 | - public function getFilteredValues($app); |
|
| 53 | + /** |
|
| 54 | + * get all values of the app or and filters out sensitive data |
|
| 55 | + * |
|
| 56 | + * @param string $app |
|
| 57 | + * @return array |
|
| 58 | + * @since 12.0.0 |
|
| 59 | + */ |
|
| 60 | + public function getFilteredValues($app); |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Get all apps using the config |
|
| 64 | - * @return array an array of app ids |
|
| 65 | - * |
|
| 66 | - * This function returns a list of all apps that have at least one |
|
| 67 | - * entry in the appconfig table. |
|
| 68 | - * @since 7.0.0 |
|
| 69 | - */ |
|
| 70 | - public function getApps(); |
|
| 62 | + /** |
|
| 63 | + * Get all apps using the config |
|
| 64 | + * @return array an array of app ids |
|
| 65 | + * |
|
| 66 | + * This function returns a list of all apps that have at least one |
|
| 67 | + * entry in the appconfig table. |
|
| 68 | + * @since 7.0.0 |
|
| 69 | + */ |
|
| 70 | + public function getApps(); |
|
| 71 | 71 | } |
@@ -26,27 +26,27 @@ |
||
| 26 | 26 | |
| 27 | 27 | class RequestTime extends Controller { |
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * @NoAdminRequired |
|
| 31 | - * |
|
| 32 | - * @param string $search |
|
| 33 | - * @return JSONResponse |
|
| 34 | - */ |
|
| 35 | - public function getTimezones($search = '') { |
|
| 36 | - $timezones = \DateTimeZone::listIdentifiers(); |
|
| 29 | + /** |
|
| 30 | + * @NoAdminRequired |
|
| 31 | + * |
|
| 32 | + * @param string $search |
|
| 33 | + * @return JSONResponse |
|
| 34 | + */ |
|
| 35 | + public function getTimezones($search = '') { |
|
| 36 | + $timezones = \DateTimeZone::listIdentifiers(); |
|
| 37 | 37 | |
| 38 | - if ($search !== '') { |
|
| 39 | - $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
| 40 | - return stripos($timezone, $search) !== false; |
|
| 41 | - }); |
|
| 42 | - } |
|
| 38 | + if ($search !== '') { |
|
| 39 | + $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
| 40 | + return stripos($timezone, $search) !== false; |
|
| 41 | + }); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - $timezones = array_slice($timezones, 0, 10); |
|
| 44 | + $timezones = array_slice($timezones, 0, 10); |
|
| 45 | 45 | |
| 46 | - $response = []; |
|
| 47 | - foreach ($timezones as $timezone) { |
|
| 48 | - $response[$timezone] = $timezone; |
|
| 49 | - } |
|
| 50 | - return new JSONResponse($response); |
|
| 51 | - } |
|
| 46 | + $response = []; |
|
| 47 | + foreach ($timezones as $timezone) { |
|
| 48 | + $response[$timezone] = $timezone; |
|
| 49 | + } |
|
| 50 | + return new JSONResponse($response); |
|
| 51 | + } |
|
| 52 | 52 | } |
@@ -28,40 +28,40 @@ |
||
| 28 | 28 | namespace OCA\Files; |
| 29 | 29 | |
| 30 | 30 | class App { |
| 31 | - /** |
|
| 32 | - * @var \OCP\INavigationManager |
|
| 33 | - */ |
|
| 34 | - private static $navigationManager; |
|
| 31 | + /** |
|
| 32 | + * @var \OCP\INavigationManager |
|
| 33 | + */ |
|
| 34 | + private static $navigationManager; |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * Returns the app's navigation manager |
|
| 38 | - * |
|
| 39 | - * @return \OCP\INavigationManager |
|
| 40 | - */ |
|
| 41 | - public static function getNavigationManager() { |
|
| 42 | - // TODO: move this into a service in the Application class |
|
| 43 | - if (self::$navigationManager === null) { |
|
| 44 | - self::$navigationManager = new \OC\NavigationManager( |
|
| 45 | - \OC::$server->getAppManager(), |
|
| 46 | - \OC::$server->getURLGenerator(), |
|
| 47 | - \OC::$server->getL10NFactory(), |
|
| 48 | - \OC::$server->getUserSession(), |
|
| 49 | - \OC::$server->getGroupManager(), |
|
| 50 | - \OC::$server->getConfig() |
|
| 51 | - ); |
|
| 52 | - self::$navigationManager->clear(false); |
|
| 53 | - } |
|
| 54 | - return self::$navigationManager; |
|
| 55 | - } |
|
| 36 | + /** |
|
| 37 | + * Returns the app's navigation manager |
|
| 38 | + * |
|
| 39 | + * @return \OCP\INavigationManager |
|
| 40 | + */ |
|
| 41 | + public static function getNavigationManager() { |
|
| 42 | + // TODO: move this into a service in the Application class |
|
| 43 | + if (self::$navigationManager === null) { |
|
| 44 | + self::$navigationManager = new \OC\NavigationManager( |
|
| 45 | + \OC::$server->getAppManager(), |
|
| 46 | + \OC::$server->getURLGenerator(), |
|
| 47 | + \OC::$server->getL10NFactory(), |
|
| 48 | + \OC::$server->getUserSession(), |
|
| 49 | + \OC::$server->getGroupManager(), |
|
| 50 | + \OC::$server->getConfig() |
|
| 51 | + ); |
|
| 52 | + self::$navigationManager->clear(false); |
|
| 53 | + } |
|
| 54 | + return self::$navigationManager; |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - public static function extendJsConfig($settings) { |
|
| 58 | - $appConfig = json_decode($settings['array']['oc_appconfig'], true); |
|
| 57 | + public static function extendJsConfig($settings) { |
|
| 58 | + $appConfig = json_decode($settings['array']['oc_appconfig'], true); |
|
| 59 | 59 | |
| 60 | - $maxChunkSize = (int)\OC::$server->getConfig()->getAppValue('files', 'max_chunk_size', 10 * 1024 * 1024); |
|
| 61 | - $appConfig['files'] = [ |
|
| 62 | - 'max_chunk_size' => $maxChunkSize |
|
| 63 | - ]; |
|
| 60 | + $maxChunkSize = (int)\OC::$server->getConfig()->getAppValue('files', 'max_chunk_size', 10 * 1024 * 1024); |
|
| 61 | + $appConfig['files'] = [ |
|
| 62 | + 'max_chunk_size' => $maxChunkSize |
|
| 63 | + ]; |
|
| 64 | 64 | |
| 65 | - $settings['array']['oc_appconfig'] = json_encode($appConfig); |
|
| 66 | - } |
|
| 65 | + $settings['array']['oc_appconfig'] = json_encode($appConfig); |
|
| 66 | + } |
|
| 67 | 67 | } |
@@ -36,51 +36,51 @@ |
||
| 36 | 36 | */ |
| 37 | 37 | class RSA extends AuthMechanism { |
| 38 | 38 | |
| 39 | - /** @var IConfig */ |
|
| 40 | - private $config; |
|
| 39 | + /** @var IConfig */ |
|
| 40 | + private $config; |
|
| 41 | 41 | |
| 42 | - public function __construct(IL10N $l, IConfig $config) { |
|
| 43 | - $this->config = $config; |
|
| 42 | + public function __construct(IL10N $l, IConfig $config) { |
|
| 43 | + $this->config = $config; |
|
| 44 | 44 | |
| 45 | - $this |
|
| 46 | - ->setIdentifier('publickey::rsa') |
|
| 47 | - ->setScheme(self::SCHEME_PUBLICKEY) |
|
| 48 | - ->setText($l->t('RSA public key')) |
|
| 49 | - ->addParameters([ |
|
| 50 | - new DefinitionParameter('user', $l->t('Username')), |
|
| 51 | - new DefinitionParameter('public_key', $l->t('Public key')), |
|
| 52 | - (new DefinitionParameter('private_key', 'private_key')) |
|
| 53 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 54 | - ]) |
|
| 55 | - ->addCustomJs('public_key') |
|
| 56 | - ; |
|
| 57 | - } |
|
| 45 | + $this |
|
| 46 | + ->setIdentifier('publickey::rsa') |
|
| 47 | + ->setScheme(self::SCHEME_PUBLICKEY) |
|
| 48 | + ->setText($l->t('RSA public key')) |
|
| 49 | + ->addParameters([ |
|
| 50 | + new DefinitionParameter('user', $l->t('Username')), |
|
| 51 | + new DefinitionParameter('public_key', $l->t('Public key')), |
|
| 52 | + (new DefinitionParameter('private_key', 'private_key')) |
|
| 53 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 54 | + ]) |
|
| 55 | + ->addCustomJs('public_key') |
|
| 56 | + ; |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
| 60 | - $auth = new RSACrypt(); |
|
| 61 | - $auth->setPassword($this->config->getSystemValue('secret', '')); |
|
| 62 | - if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
|
| 63 | - throw new \RuntimeException('unable to load private key'); |
|
| 64 | - } |
|
| 65 | - $storage->setBackendOption('public_key_auth', $auth); |
|
| 66 | - } |
|
| 59 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
| 60 | + $auth = new RSACrypt(); |
|
| 61 | + $auth->setPassword($this->config->getSystemValue('secret', '')); |
|
| 62 | + if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
|
| 63 | + throw new \RuntimeException('unable to load private key'); |
|
| 64 | + } |
|
| 65 | + $storage->setBackendOption('public_key_auth', $auth); |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * Generate a keypair |
|
| 70 | - * |
|
| 71 | - * @param int $keyLenth |
|
| 72 | - * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey] |
|
| 73 | - */ |
|
| 74 | - public function createKey($keyLength) { |
|
| 75 | - $rsa = new RSACrypt(); |
|
| 76 | - $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH); |
|
| 77 | - $rsa->setPassword($this->config->getSystemValue('secret', '')); |
|
| 68 | + /** |
|
| 69 | + * Generate a keypair |
|
| 70 | + * |
|
| 71 | + * @param int $keyLenth |
|
| 72 | + * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey] |
|
| 73 | + */ |
|
| 74 | + public function createKey($keyLength) { |
|
| 75 | + $rsa = new RSACrypt(); |
|
| 76 | + $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH); |
|
| 77 | + $rsa->setPassword($this->config->getSystemValue('secret', '')); |
|
| 78 | 78 | |
| 79 | - if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) { |
|
| 80 | - $keyLength = 1024; |
|
| 81 | - } |
|
| 79 | + if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) { |
|
| 80 | + $keyLength = 1024; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - return $rsa->createKey($keyLength); |
|
| 84 | - } |
|
| 83 | + return $rsa->createKey($keyLength); |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | 86 | } |
@@ -31,40 +31,40 @@ |
||
| 31 | 31 | |
| 32 | 32 | class ClearFrontendCaches implements IRepairStep { |
| 33 | 33 | |
| 34 | - /** @var ICacheFactory */ |
|
| 35 | - protected $cacheFactory; |
|
| 34 | + /** @var ICacheFactory */ |
|
| 35 | + protected $cacheFactory; |
|
| 36 | 36 | |
| 37 | - /** @var SCSSCacher */ |
|
| 38 | - protected $scssCacher; |
|
| 37 | + /** @var SCSSCacher */ |
|
| 38 | + protected $scssCacher; |
|
| 39 | 39 | |
| 40 | - /** @var JSCombiner */ |
|
| 41 | - protected $jsCombiner; |
|
| 40 | + /** @var JSCombiner */ |
|
| 41 | + protected $jsCombiner; |
|
| 42 | 42 | |
| 43 | - public function __construct(ICacheFactory $cacheFactory, |
|
| 44 | - SCSSCacher $SCSSCacher, |
|
| 45 | - JSCombiner $JSCombiner) { |
|
| 46 | - $this->cacheFactory = $cacheFactory; |
|
| 47 | - $this->scssCacher = $SCSSCacher; |
|
| 48 | - $this->jsCombiner = $JSCombiner; |
|
| 49 | - } |
|
| 43 | + public function __construct(ICacheFactory $cacheFactory, |
|
| 44 | + SCSSCacher $SCSSCacher, |
|
| 45 | + JSCombiner $JSCombiner) { |
|
| 46 | + $this->cacheFactory = $cacheFactory; |
|
| 47 | + $this->scssCacher = $SCSSCacher; |
|
| 48 | + $this->jsCombiner = $JSCombiner; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - public function getName() { |
|
| 52 | - return 'Clear frontend caches'; |
|
| 53 | - } |
|
| 51 | + public function getName() { |
|
| 52 | + return 'Clear frontend caches'; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - public function run(IOutput $output) { |
|
| 56 | - try { |
|
| 57 | - $c = $this->cacheFactory->createDistributed('imagePath'); |
|
| 58 | - $c->clear(); |
|
| 59 | - $output->info('Image cache cleared'); |
|
| 55 | + public function run(IOutput $output) { |
|
| 56 | + try { |
|
| 57 | + $c = $this->cacheFactory->createDistributed('imagePath'); |
|
| 58 | + $c->clear(); |
|
| 59 | + $output->info('Image cache cleared'); |
|
| 60 | 60 | |
| 61 | - $this->scssCacher->resetCache(); |
|
| 62 | - $output->info('SCSS cache cleared'); |
|
| 61 | + $this->scssCacher->resetCache(); |
|
| 62 | + $output->info('SCSS cache cleared'); |
|
| 63 | 63 | |
| 64 | - $this->jsCombiner->resetCache(); |
|
| 65 | - $output->info('JS cache cleared'); |
|
| 66 | - } catch (\Exception $e) { |
|
| 67 | - $output->warning('Unable to clear the frontend cache'); |
|
| 68 | - } |
|
| 69 | - } |
|
| 64 | + $this->jsCombiner->resetCache(); |
|
| 65 | + $output->info('JS cache cleared'); |
|
| 66 | + } catch (\Exception $e) { |
|
| 67 | + $output->warning('Unable to clear the frontend cache'); |
|
| 68 | + } |
|
| 69 | + } |
|
| 70 | 70 | } |
@@ -34,35 +34,35 @@ |
||
| 34 | 34 | * @since 11.0.0 |
| 35 | 35 | */ |
| 36 | 36 | interface ISimpleRoot { |
| 37 | - /** |
|
| 38 | - * Get the folder with name $name |
|
| 39 | - * |
|
| 40 | - * @param string $name |
|
| 41 | - * @return ISimpleFolder |
|
| 42 | - * @throws NotFoundException |
|
| 43 | - * @throws \RuntimeException |
|
| 44 | - * @since 11.0.0 |
|
| 45 | - */ |
|
| 46 | - public function getFolder(string $name): ISimpleFolder; |
|
| 37 | + /** |
|
| 38 | + * Get the folder with name $name |
|
| 39 | + * |
|
| 40 | + * @param string $name |
|
| 41 | + * @return ISimpleFolder |
|
| 42 | + * @throws NotFoundException |
|
| 43 | + * @throws \RuntimeException |
|
| 44 | + * @since 11.0.0 |
|
| 45 | + */ |
|
| 46 | + public function getFolder(string $name): ISimpleFolder; |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * Get all the Folders |
|
| 50 | - * |
|
| 51 | - * @return ISimpleFolder[] |
|
| 52 | - * @throws NotFoundException |
|
| 53 | - * @throws \RuntimeException |
|
| 54 | - * @since 11.0.0 |
|
| 55 | - */ |
|
| 56 | - public function getDirectoryListing(): array; |
|
| 48 | + /** |
|
| 49 | + * Get all the Folders |
|
| 50 | + * |
|
| 51 | + * @return ISimpleFolder[] |
|
| 52 | + * @throws NotFoundException |
|
| 53 | + * @throws \RuntimeException |
|
| 54 | + * @since 11.0.0 |
|
| 55 | + */ |
|
| 56 | + public function getDirectoryListing(): array; |
|
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * Create a new folder named $name |
|
| 60 | - * |
|
| 61 | - * @param string $name |
|
| 62 | - * @return ISimpleFolder |
|
| 63 | - * @throws NotPermittedException |
|
| 64 | - * @throws \RuntimeException |
|
| 65 | - * @since 11.0.0 |
|
| 66 | - */ |
|
| 67 | - public function newFolder(string $name): ISimpleFolder; |
|
| 58 | + /** |
|
| 59 | + * Create a new folder named $name |
|
| 60 | + * |
|
| 61 | + * @param string $name |
|
| 62 | + * @return ISimpleFolder |
|
| 63 | + * @throws NotPermittedException |
|
| 64 | + * @throws \RuntimeException |
|
| 65 | + * @since 11.0.0 |
|
| 66 | + */ |
|
| 67 | + public function newFolder(string $name): ISimpleFolder; |
|
| 68 | 68 | } |
@@ -34,101 +34,101 @@ |
||
| 34 | 34 | use OCP\Share\IShareHelper; |
| 35 | 35 | |
| 36 | 36 | class Listener { |
| 37 | - /** @var IManager */ |
|
| 38 | - protected $activityManager; |
|
| 39 | - /** @var IUserSession */ |
|
| 40 | - protected $session; |
|
| 41 | - /** @var \OCP\App\IAppManager */ |
|
| 42 | - protected $appManager; |
|
| 43 | - /** @var \OCP\Files\Config\IMountProviderCollection */ |
|
| 44 | - protected $mountCollection; |
|
| 45 | - /** @var \OCP\Files\IRootFolder */ |
|
| 46 | - protected $rootFolder; |
|
| 47 | - /** @var IShareHelper */ |
|
| 48 | - protected $shareHelper; |
|
| 37 | + /** @var IManager */ |
|
| 38 | + protected $activityManager; |
|
| 39 | + /** @var IUserSession */ |
|
| 40 | + protected $session; |
|
| 41 | + /** @var \OCP\App\IAppManager */ |
|
| 42 | + protected $appManager; |
|
| 43 | + /** @var \OCP\Files\Config\IMountProviderCollection */ |
|
| 44 | + protected $mountCollection; |
|
| 45 | + /** @var \OCP\Files\IRootFolder */ |
|
| 46 | + protected $rootFolder; |
|
| 47 | + /** @var IShareHelper */ |
|
| 48 | + protected $shareHelper; |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * Listener constructor. |
|
| 52 | - * |
|
| 53 | - * @param IManager $activityManager |
|
| 54 | - * @param IUserSession $session |
|
| 55 | - * @param IAppManager $appManager |
|
| 56 | - * @param IMountProviderCollection $mountCollection |
|
| 57 | - * @param IRootFolder $rootFolder |
|
| 58 | - * @param IShareHelper $shareHelper |
|
| 59 | - */ |
|
| 60 | - public function __construct(IManager $activityManager, |
|
| 61 | - IUserSession $session, |
|
| 62 | - IAppManager $appManager, |
|
| 63 | - IMountProviderCollection $mountCollection, |
|
| 64 | - IRootFolder $rootFolder, |
|
| 65 | - IShareHelper $shareHelper) { |
|
| 66 | - $this->activityManager = $activityManager; |
|
| 67 | - $this->session = $session; |
|
| 68 | - $this->appManager = $appManager; |
|
| 69 | - $this->mountCollection = $mountCollection; |
|
| 70 | - $this->rootFolder = $rootFolder; |
|
| 71 | - $this->shareHelper = $shareHelper; |
|
| 72 | - } |
|
| 50 | + /** |
|
| 51 | + * Listener constructor. |
|
| 52 | + * |
|
| 53 | + * @param IManager $activityManager |
|
| 54 | + * @param IUserSession $session |
|
| 55 | + * @param IAppManager $appManager |
|
| 56 | + * @param IMountProviderCollection $mountCollection |
|
| 57 | + * @param IRootFolder $rootFolder |
|
| 58 | + * @param IShareHelper $shareHelper |
|
| 59 | + */ |
|
| 60 | + public function __construct(IManager $activityManager, |
|
| 61 | + IUserSession $session, |
|
| 62 | + IAppManager $appManager, |
|
| 63 | + IMountProviderCollection $mountCollection, |
|
| 64 | + IRootFolder $rootFolder, |
|
| 65 | + IShareHelper $shareHelper) { |
|
| 66 | + $this->activityManager = $activityManager; |
|
| 67 | + $this->session = $session; |
|
| 68 | + $this->appManager = $appManager; |
|
| 69 | + $this->mountCollection = $mountCollection; |
|
| 70 | + $this->rootFolder = $rootFolder; |
|
| 71 | + $this->shareHelper = $shareHelper; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * @param CommentsEvent $event |
|
| 76 | - */ |
|
| 77 | - public function commentEvent(CommentsEvent $event) { |
|
| 78 | - if ($event->getComment()->getObjectType() !== 'files' |
|
| 79 | - || $event->getEvent() !== CommentsEvent::EVENT_ADD |
|
| 80 | - || !$this->appManager->isInstalled('activity')) { |
|
| 81 | - // Comment not for file, not adding a comment or no activity-app enabled (save the energy) |
|
| 82 | - return; |
|
| 83 | - } |
|
| 74 | + /** |
|
| 75 | + * @param CommentsEvent $event |
|
| 76 | + */ |
|
| 77 | + public function commentEvent(CommentsEvent $event) { |
|
| 78 | + if ($event->getComment()->getObjectType() !== 'files' |
|
| 79 | + || $event->getEvent() !== CommentsEvent::EVENT_ADD |
|
| 80 | + || !$this->appManager->isInstalled('activity')) { |
|
| 81 | + // Comment not for file, not adding a comment or no activity-app enabled (save the energy) |
|
| 82 | + return; |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - // Get all mount point owners |
|
| 86 | - $cache = $this->mountCollection->getMountCache(); |
|
| 87 | - $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId()); |
|
| 88 | - if (empty($mounts)) { |
|
| 89 | - return; |
|
| 90 | - } |
|
| 85 | + // Get all mount point owners |
|
| 86 | + $cache = $this->mountCollection->getMountCache(); |
|
| 87 | + $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId()); |
|
| 88 | + if (empty($mounts)) { |
|
| 89 | + return; |
|
| 90 | + } |
|
| 91 | 91 | |
| 92 | - $users = []; |
|
| 93 | - foreach ($mounts as $mount) { |
|
| 94 | - $owner = $mount->getUser()->getUID(); |
|
| 95 | - $ownerFolder = $this->rootFolder->getUserFolder($owner); |
|
| 96 | - $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId()); |
|
| 97 | - if (!empty($nodes)) { |
|
| 98 | - /** @var Node $node */ |
|
| 99 | - $node = array_shift($nodes); |
|
| 100 | - $al = $this->shareHelper->getPathsForAccessList($node); |
|
| 101 | - $users += $al['users']; |
|
| 102 | - } |
|
| 103 | - } |
|
| 92 | + $users = []; |
|
| 93 | + foreach ($mounts as $mount) { |
|
| 94 | + $owner = $mount->getUser()->getUID(); |
|
| 95 | + $ownerFolder = $this->rootFolder->getUserFolder($owner); |
|
| 96 | + $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId()); |
|
| 97 | + if (!empty($nodes)) { |
|
| 98 | + /** @var Node $node */ |
|
| 99 | + $node = array_shift($nodes); |
|
| 100 | + $al = $this->shareHelper->getPathsForAccessList($node); |
|
| 101 | + $users += $al['users']; |
|
| 102 | + } |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | - $actor = $this->session->getUser(); |
|
| 106 | - if ($actor instanceof IUser) { |
|
| 107 | - $actor = $actor->getUID(); |
|
| 108 | - } else { |
|
| 109 | - $actor = ''; |
|
| 110 | - } |
|
| 105 | + $actor = $this->session->getUser(); |
|
| 106 | + if ($actor instanceof IUser) { |
|
| 107 | + $actor = $actor->getUID(); |
|
| 108 | + } else { |
|
| 109 | + $actor = ''; |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | - $activity = $this->activityManager->generateEvent(); |
|
| 113 | - $activity->setApp('comments') |
|
| 114 | - ->setType('comments') |
|
| 115 | - ->setAuthor($actor) |
|
| 116 | - ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId()) |
|
| 117 | - ->setMessage('add_comment_message', [ |
|
| 118 | - 'commentId' => $event->getComment()->getId(), |
|
| 119 | - ]); |
|
| 112 | + $activity = $this->activityManager->generateEvent(); |
|
| 113 | + $activity->setApp('comments') |
|
| 114 | + ->setType('comments') |
|
| 115 | + ->setAuthor($actor) |
|
| 116 | + ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId()) |
|
| 117 | + ->setMessage('add_comment_message', [ |
|
| 118 | + 'commentId' => $event->getComment()->getId(), |
|
| 119 | + ]); |
|
| 120 | 120 | |
| 121 | - foreach ($users as $user => $path) { |
|
| 122 | - // numerical user ids end up as integers from array keys, but string |
|
| 123 | - // is required |
|
| 124 | - $activity->setAffectedUser((string)$user); |
|
| 121 | + foreach ($users as $user => $path) { |
|
| 122 | + // numerical user ids end up as integers from array keys, but string |
|
| 123 | + // is required |
|
| 124 | + $activity->setAffectedUser((string)$user); |
|
| 125 | 125 | |
| 126 | - $activity->setSubject('add_comment_subject', [ |
|
| 127 | - 'actor' => $actor, |
|
| 128 | - 'fileId' => (int) $event->getComment()->getObjectId(), |
|
| 129 | - 'filePath' => trim($path, '/'), |
|
| 130 | - ]); |
|
| 131 | - $this->activityManager->publish($activity); |
|
| 132 | - } |
|
| 133 | - } |
|
| 126 | + $activity->setSubject('add_comment_subject', [ |
|
| 127 | + 'actor' => $actor, |
|
| 128 | + 'fileId' => (int) $event->getComment()->getObjectId(), |
|
| 129 | + 'filePath' => trim($path, '/'), |
|
| 130 | + ]); |
|
| 131 | + $this->activityManager->publish($activity); |
|
| 132 | + } |
|
| 133 | + } |
|
| 134 | 134 | } |