@@ -26,14 +26,14 @@ |
||
26 | 26 | use OCP\AutoloadNotAllowedException; |
27 | 27 | |
28 | 28 | class RegularJob extends \OC\BackgroundJob\Job { |
29 | - public function run($argument) { |
|
30 | - try { |
|
31 | - if (is_callable($argument)) { |
|
32 | - call_user_func($argument); |
|
33 | - } |
|
34 | - } catch (AutoloadNotAllowedException $e) { |
|
35 | - // job is from a disabled app, ignore |
|
36 | - return null; |
|
37 | - } |
|
38 | - } |
|
29 | + public function run($argument) { |
|
30 | + try { |
|
31 | + if (is_callable($argument)) { |
|
32 | + call_user_func($argument); |
|
33 | + } |
|
34 | + } catch (AutoloadNotAllowedException $e) { |
|
35 | + // job is from a disabled app, ignore |
|
36 | + return null; |
|
37 | + } |
|
38 | + } |
|
39 | 39 | } |
@@ -26,67 +26,67 @@ |
||
26 | 26 | use OCP\Settings\IIconSection; |
27 | 27 | |
28 | 28 | class Section implements IIconSection { |
29 | - /** @var string */ |
|
30 | - private $id; |
|
31 | - /** @var string */ |
|
32 | - private $name; |
|
33 | - /** @var int */ |
|
34 | - private $priority; |
|
35 | - /** @var string */ |
|
36 | - private $icon; |
|
29 | + /** @var string */ |
|
30 | + private $id; |
|
31 | + /** @var string */ |
|
32 | + private $name; |
|
33 | + /** @var int */ |
|
34 | + private $priority; |
|
35 | + /** @var string */ |
|
36 | + private $icon; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param string $id |
|
40 | - * @param string $name |
|
41 | - * @param int $priority |
|
42 | - * @param string $icon |
|
43 | - */ |
|
44 | - public function __construct($id, $name, $priority, $icon = '') { |
|
45 | - $this->id = $id; |
|
46 | - $this->name = $name; |
|
47 | - $this->priority = $priority; |
|
48 | - $this->icon = $icon; |
|
49 | - } |
|
38 | + /** |
|
39 | + * @param string $id |
|
40 | + * @param string $name |
|
41 | + * @param int $priority |
|
42 | + * @param string $icon |
|
43 | + */ |
|
44 | + public function __construct($id, $name, $priority, $icon = '') { |
|
45 | + $this->id = $id; |
|
46 | + $this->name = $name; |
|
47 | + $this->priority = $priority; |
|
48 | + $this->icon = $icon; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
53 | - * e.g. 'ldap' |
|
54 | - * |
|
55 | - * @returns string |
|
56 | - */ |
|
57 | - public function getID() { |
|
58 | - return $this->id; |
|
59 | - } |
|
51 | + /** |
|
52 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
53 | + * e.g. 'ldap' |
|
54 | + * |
|
55 | + * @returns string |
|
56 | + */ |
|
57 | + public function getID() { |
|
58 | + return $this->id; |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
63 | - * integration'. Use the L10N service to translate it. |
|
64 | - * |
|
65 | - * @return string |
|
66 | - */ |
|
67 | - public function getName() { |
|
68 | - return $this->name; |
|
69 | - } |
|
61 | + /** |
|
62 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
63 | + * integration'. Use the L10N service to translate it. |
|
64 | + * |
|
65 | + * @return string |
|
66 | + */ |
|
67 | + public function getName() { |
|
68 | + return $this->name; |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * @return int whether the form should be rather on the top or bottom of |
|
73 | - * the settings navigation. The sections are arranged in ascending order of |
|
74 | - * the priority values. It is required to return a value between 0 and 99. |
|
75 | - * |
|
76 | - * E.g.: 70 |
|
77 | - */ |
|
78 | - public function getPriority() { |
|
79 | - return $this->priority; |
|
80 | - } |
|
71 | + /** |
|
72 | + * @return int whether the form should be rather on the top or bottom of |
|
73 | + * the settings navigation. The sections are arranged in ascending order of |
|
74 | + * the priority values. It is required to return a value between 0 and 99. |
|
75 | + * |
|
76 | + * E.g.: 70 |
|
77 | + */ |
|
78 | + public function getPriority() { |
|
79 | + return $this->priority; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * returns the relative path to an 16*16 icon describing the section. |
|
84 | - * e.g. '/core/img/places/files.svg' |
|
85 | - * |
|
86 | - * @returns string |
|
87 | - * @since 12 |
|
88 | - */ |
|
89 | - public function getIcon() { |
|
90 | - return $this->icon; |
|
91 | - } |
|
82 | + /** |
|
83 | + * returns the relative path to an 16*16 icon describing the section. |
|
84 | + * e.g. '/core/img/places/files.svg' |
|
85 | + * |
|
86 | + * @returns string |
|
87 | + * @since 12 |
|
88 | + */ |
|
89 | + public function getIcon() { |
|
90 | + return $this->icon; |
|
91 | + } |
|
92 | 92 | } |
@@ -23,32 +23,32 @@ |
||
23 | 23 | namespace OC\Memcache; |
24 | 24 | |
25 | 25 | trait CADTrait { |
26 | - abstract public function get($key); |
|
26 | + abstract public function get($key); |
|
27 | 27 | |
28 | - abstract public function remove($key); |
|
28 | + abstract public function remove($key); |
|
29 | 29 | |
30 | - abstract public function add($key, $value, $ttl = 0); |
|
30 | + abstract public function add($key, $value, $ttl = 0); |
|
31 | 31 | |
32 | - /** |
|
33 | - * Compare and delete |
|
34 | - * |
|
35 | - * @param string $key |
|
36 | - * @param mixed $old |
|
37 | - * @return bool |
|
38 | - */ |
|
39 | - public function cad($key, $old) { |
|
40 | - //no native cas, emulate with locking |
|
41 | - if ($this->add($key . '_lock', true)) { |
|
42 | - if ($this->get($key) === $old) { |
|
43 | - $this->remove($key); |
|
44 | - $this->remove($key . '_lock'); |
|
45 | - return true; |
|
46 | - } else { |
|
47 | - $this->remove($key . '_lock'); |
|
48 | - return false; |
|
49 | - } |
|
50 | - } else { |
|
51 | - return false; |
|
52 | - } |
|
53 | - } |
|
32 | + /** |
|
33 | + * Compare and delete |
|
34 | + * |
|
35 | + * @param string $key |
|
36 | + * @param mixed $old |
|
37 | + * @return bool |
|
38 | + */ |
|
39 | + public function cad($key, $old) { |
|
40 | + //no native cas, emulate with locking |
|
41 | + if ($this->add($key . '_lock', true)) { |
|
42 | + if ($this->get($key) === $old) { |
|
43 | + $this->remove($key); |
|
44 | + $this->remove($key . '_lock'); |
|
45 | + return true; |
|
46 | + } else { |
|
47 | + $this->remove($key . '_lock'); |
|
48 | + return false; |
|
49 | + } |
|
50 | + } else { |
|
51 | + return false; |
|
52 | + } |
|
53 | + } |
|
54 | 54 | } |
@@ -33,27 +33,27 @@ |
||
33 | 33 | */ |
34 | 34 | class CoreCapabilities implements ICapability { |
35 | 35 | |
36 | - /** @var IConfig */ |
|
37 | - private $config; |
|
36 | + /** @var IConfig */ |
|
37 | + private $config; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param IConfig $config |
|
41 | - */ |
|
42 | - public function __construct(IConfig $config) { |
|
43 | - $this->config = $config; |
|
44 | - } |
|
39 | + /** |
|
40 | + * @param IConfig $config |
|
41 | + */ |
|
42 | + public function __construct(IConfig $config) { |
|
43 | + $this->config = $config; |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Return this classes capabilities |
|
48 | - * |
|
49 | - * @return array |
|
50 | - */ |
|
51 | - public function getCapabilities() { |
|
52 | - return [ |
|
53 | - 'core' => [ |
|
54 | - 'pollinterval' => $this->config->getSystemValue('pollinterval', 60), |
|
55 | - 'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'), |
|
56 | - ] |
|
57 | - ]; |
|
58 | - } |
|
46 | + /** |
|
47 | + * Return this classes capabilities |
|
48 | + * |
|
49 | + * @return array |
|
50 | + */ |
|
51 | + public function getCapabilities() { |
|
52 | + return [ |
|
53 | + 'core' => [ |
|
54 | + 'pollinterval' => $this->config->getSystemValue('pollinterval', 60), |
|
55 | + 'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'), |
|
56 | + ] |
|
57 | + ]; |
|
58 | + } |
|
59 | 59 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | * @package OC\AppFramework\Middleware\Security\Exceptions |
32 | 32 | */ |
33 | 33 | class NotConfirmedException extends SecurityException { |
34 | - public function __construct() { |
|
35 | - parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN); |
|
36 | - } |
|
34 | + public function __construct() { |
|
35 | + parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN); |
|
36 | + } |
|
37 | 37 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
35 | 35 | */ |
36 | 36 | class CrossSiteRequestForgeryException extends SecurityException { |
37 | - public function __construct() { |
|
38 | - parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED); |
|
39 | - } |
|
37 | + public function __construct() { |
|
38 | + parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED); |
|
39 | + } |
|
40 | 40 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
35 | 35 | */ |
36 | 36 | class AppNotEnabledException extends SecurityException { |
37 | - public function __construct() { |
|
38 | - parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED); |
|
39 | - } |
|
37 | + public function __construct() { |
|
38 | + parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED); |
|
39 | + } |
|
40 | 40 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
35 | 35 | */ |
36 | 36 | class NotLoggedInException extends SecurityException { |
37 | - public function __construct() { |
|
38 | - parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED); |
|
39 | - } |
|
37 | + public function __construct() { |
|
38 | + parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED); |
|
39 | + } |
|
40 | 40 | } |
@@ -29,50 +29,50 @@ |
||
29 | 29 | |
30 | 30 | class FixMountStorages implements IRepairStep { |
31 | 31 | |
32 | - /** @var IDBConnection */ |
|
33 | - private $db; |
|
32 | + /** @var IDBConnection */ |
|
33 | + private $db; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @param IDBConnection $db |
|
37 | - */ |
|
38 | - public function __construct(IDBConnection $db) { |
|
39 | - $this->db = $db; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @param IDBConnection $db |
|
37 | + */ |
|
38 | + public function __construct(IDBConnection $db) { |
|
39 | + $this->db = $db; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @return string |
|
44 | - */ |
|
45 | - public function getName() { |
|
46 | - return 'Fix potential broken mount points'; |
|
47 | - } |
|
42 | + /** |
|
43 | + * @return string |
|
44 | + */ |
|
45 | + public function getName() { |
|
46 | + return 'Fix potential broken mount points'; |
|
47 | + } |
|
48 | 48 | |
49 | - public function run(IOutput $output) { |
|
50 | - $query = $this->db->getQueryBuilder(); |
|
51 | - $query->select('m.id', 'f.storage') |
|
52 | - ->from('mounts', 'm') |
|
53 | - ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid')) |
|
54 | - ->where($query->expr()->neq('m.storage_id', 'f.storage')); |
|
49 | + public function run(IOutput $output) { |
|
50 | + $query = $this->db->getQueryBuilder(); |
|
51 | + $query->select('m.id', 'f.storage') |
|
52 | + ->from('mounts', 'm') |
|
53 | + ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid')) |
|
54 | + ->where($query->expr()->neq('m.storage_id', 'f.storage')); |
|
55 | 55 | |
56 | - $update = $this->db->getQueryBuilder(); |
|
57 | - $update->update('mounts') |
|
58 | - ->set('storage_id', $update->createParameter('storage')) |
|
59 | - ->where($query->expr()->eq('id', $update->createParameter('mount'))); |
|
56 | + $update = $this->db->getQueryBuilder(); |
|
57 | + $update->update('mounts') |
|
58 | + ->set('storage_id', $update->createParameter('storage')) |
|
59 | + ->where($query->expr()->eq('id', $update->createParameter('mount'))); |
|
60 | 60 | |
61 | - $result = $query->execute(); |
|
62 | - $entriesUpdated = 0; |
|
63 | - while ($row = $result->fetch()) { |
|
64 | - $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT) |
|
65 | - ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT); |
|
66 | - $update->execute(); |
|
67 | - $entriesUpdated++; |
|
68 | - } |
|
69 | - $result->closeCursor(); |
|
61 | + $result = $query->execute(); |
|
62 | + $entriesUpdated = 0; |
|
63 | + while ($row = $result->fetch()) { |
|
64 | + $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT) |
|
65 | + ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT); |
|
66 | + $update->execute(); |
|
67 | + $entriesUpdated++; |
|
68 | + } |
|
69 | + $result->closeCursor(); |
|
70 | 70 | |
71 | - if ($entriesUpdated > 0) { |
|
72 | - $output->info($entriesUpdated . ' mounts updated'); |
|
73 | - return; |
|
74 | - } |
|
71 | + if ($entriesUpdated > 0) { |
|
72 | + $output->info($entriesUpdated . ' mounts updated'); |
|
73 | + return; |
|
74 | + } |
|
75 | 75 | |
76 | - $output->info('No mounts updated'); |
|
77 | - } |
|
76 | + $output->info('No mounts updated'); |
|
77 | + } |
|
78 | 78 | } |