@@ -29,59 +29,59 @@ |
||
29 | 29 | use OCP\IUser; |
30 | 30 | |
31 | 31 | class MountProvider implements IMountProvider { |
32 | - const STORAGE = '\OCA\Files_Sharing\External\Storage'; |
|
32 | + const STORAGE = '\OCA\Files_Sharing\External\Storage'; |
|
33 | 33 | |
34 | - /** |
|
35 | - * @var \OCP\IDBConnection |
|
36 | - */ |
|
37 | - private $connection; |
|
34 | + /** |
|
35 | + * @var \OCP\IDBConnection |
|
36 | + */ |
|
37 | + private $connection; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @var callable |
|
41 | - */ |
|
42 | - private $managerProvider; |
|
39 | + /** |
|
40 | + * @var callable |
|
41 | + */ |
|
42 | + private $managerProvider; |
|
43 | 43 | |
44 | - /** |
|
45 | - * @var ICloudIdManager |
|
46 | - */ |
|
47 | - private $cloudIdManager; |
|
44 | + /** |
|
45 | + * @var ICloudIdManager |
|
46 | + */ |
|
47 | + private $cloudIdManager; |
|
48 | 48 | |
49 | - /** |
|
50 | - * @param \OCP\IDBConnection $connection |
|
51 | - * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself |
|
52 | - * @param ICloudIdManager $cloudIdManager |
|
53 | - */ |
|
54 | - public function __construct(IDBConnection $connection, callable $managerProvider, ICloudIdManager $cloudIdManager) { |
|
55 | - $this->connection = $connection; |
|
56 | - $this->managerProvider = $managerProvider; |
|
57 | - $this->cloudIdManager = $cloudIdManager; |
|
58 | - } |
|
49 | + /** |
|
50 | + * @param \OCP\IDBConnection $connection |
|
51 | + * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself |
|
52 | + * @param ICloudIdManager $cloudIdManager |
|
53 | + */ |
|
54 | + public function __construct(IDBConnection $connection, callable $managerProvider, ICloudIdManager $cloudIdManager) { |
|
55 | + $this->connection = $connection; |
|
56 | + $this->managerProvider = $managerProvider; |
|
57 | + $this->cloudIdManager = $cloudIdManager; |
|
58 | + } |
|
59 | 59 | |
60 | - public function getMount(IUser $user, $data, IStorageFactory $storageFactory) { |
|
61 | - $managerProvider = $this->managerProvider; |
|
62 | - $manager = $managerProvider(); |
|
63 | - $data['manager'] = $manager; |
|
64 | - $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/'); |
|
65 | - $data['mountpoint'] = $mountPoint; |
|
66 | - $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']); |
|
67 | - $data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID()); |
|
68 | - $data['HttpClientService'] = \OC::$server->getHTTPClientService(); |
|
69 | - return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory); |
|
70 | - } |
|
60 | + public function getMount(IUser $user, $data, IStorageFactory $storageFactory) { |
|
61 | + $managerProvider = $this->managerProvider; |
|
62 | + $manager = $managerProvider(); |
|
63 | + $data['manager'] = $manager; |
|
64 | + $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/'); |
|
65 | + $data['mountpoint'] = $mountPoint; |
|
66 | + $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']); |
|
67 | + $data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID()); |
|
68 | + $data['HttpClientService'] = \OC::$server->getHTTPClientService(); |
|
69 | + return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory); |
|
70 | + } |
|
71 | 71 | |
72 | - public function getMountsForUser(IUser $user, IStorageFactory $loader) { |
|
73 | - $query = $this->connection->prepare(' |
|
72 | + public function getMountsForUser(IUser $user, IStorageFactory $loader) { |
|
73 | + $query = $this->connection->prepare(' |
|
74 | 74 | SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner` |
75 | 75 | FROM `*PREFIX*share_external` |
76 | 76 | WHERE `user` = ? AND `accepted` = ? |
77 | 77 | '); |
78 | - $query->execute([$user->getUID(), 1]); |
|
79 | - $mounts = []; |
|
80 | - while ($row = $query->fetch()) { |
|
81 | - $row['manager'] = $this; |
|
82 | - $row['token'] = $row['share_token']; |
|
83 | - $mounts[] = $this->getMount($user, $row, $loader); |
|
84 | - } |
|
85 | - return $mounts; |
|
86 | - } |
|
78 | + $query->execute([$user->getUID(), 1]); |
|
79 | + $mounts = []; |
|
80 | + while ($row = $query->fetch()) { |
|
81 | + $row['manager'] = $this; |
|
82 | + $row['token'] = $row['share_token']; |
|
83 | + $mounts[] = $this->getMount($user, $row, $loader); |
|
84 | + } |
|
85 | + return $mounts; |
|
86 | + } |
|
87 | 87 | } |
@@ -23,12 +23,12 @@ |
||
23 | 23 | namespace OCA\Files_Sharing\External; |
24 | 24 | |
25 | 25 | class Watcher extends \OC\Files\Cache\Watcher { |
26 | - /** |
|
27 | - * remove deleted files in $path from the cache |
|
28 | - * |
|
29 | - * @param string $path |
|
30 | - */ |
|
31 | - public function cleanFolder($path) { |
|
32 | - // not needed, the scanner takes care of this |
|
33 | - } |
|
26 | + /** |
|
27 | + * remove deleted files in $path from the cache |
|
28 | + * |
|
29 | + * @param string $path |
|
30 | + */ |
|
31 | + public function cleanFolder($path) { |
|
32 | + // not needed, the scanner takes care of this |
|
33 | + } |
|
34 | 34 | } |
@@ -31,36 +31,36 @@ |
||
31 | 31 | */ |
32 | 32 | class DeleteOrphanedSharesJob extends TimedJob { |
33 | 33 | |
34 | - /** |
|
35 | - * Default interval in minutes |
|
36 | - * |
|
37 | - * @var int $defaultIntervalMin |
|
38 | - **/ |
|
39 | - protected $defaultIntervalMin = 15; |
|
34 | + /** |
|
35 | + * Default interval in minutes |
|
36 | + * |
|
37 | + * @var int $defaultIntervalMin |
|
38 | + **/ |
|
39 | + protected $defaultIntervalMin = 15; |
|
40 | 40 | |
41 | - /** |
|
42 | - * sets the correct interval for this timed job |
|
43 | - */ |
|
44 | - public function __construct(){ |
|
45 | - $this->interval = $this->defaultIntervalMin * 60; |
|
46 | - } |
|
41 | + /** |
|
42 | + * sets the correct interval for this timed job |
|
43 | + */ |
|
44 | + public function __construct(){ |
|
45 | + $this->interval = $this->defaultIntervalMin * 60; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * Makes the background job do its work |
|
50 | - * |
|
51 | - * @param array $argument unused argument |
|
52 | - */ |
|
53 | - public function run($argument) { |
|
54 | - $connection = \OC::$server->getDatabaseConnection(); |
|
55 | - $logger = \OC::$server->getLogger(); |
|
48 | + /** |
|
49 | + * Makes the background job do its work |
|
50 | + * |
|
51 | + * @param array $argument unused argument |
|
52 | + */ |
|
53 | + public function run($argument) { |
|
54 | + $connection = \OC::$server->getDatabaseConnection(); |
|
55 | + $logger = \OC::$server->getLogger(); |
|
56 | 56 | |
57 | - $sql = |
|
58 | - 'DELETE FROM `*PREFIX*share` ' . |
|
59 | - 'WHERE `item_type` in (\'file\', \'folder\') ' . |
|
60 | - 'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)'; |
|
57 | + $sql = |
|
58 | + 'DELETE FROM `*PREFIX*share` ' . |
|
59 | + 'WHERE `item_type` in (\'file\', \'folder\') ' . |
|
60 | + 'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)'; |
|
61 | 61 | |
62 | - $deletedEntries = $connection->executeUpdate($sql); |
|
63 | - $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']); |
|
64 | - } |
|
62 | + $deletedEntries = $connection->executeUpdate($sql); |
|
63 | + $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']); |
|
64 | + } |
|
65 | 65 | |
66 | 66 | } |
@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - |
|
4 | 3 | * |
5 | 4 | * @author Bjoern Schiessle <[email protected]> |
6 | 5 | * @author Jan-Christoph Borchardt <[email protected]> |
@@ -28,55 +28,55 @@ |
||
28 | 28 | use OCP\Settings\IIconSection; |
29 | 29 | |
30 | 30 | class Section implements IIconSection { |
31 | - /** @var IL10N */ |
|
32 | - private $l; |
|
33 | - /** @var IURLGenerator */ |
|
34 | - private $url; |
|
31 | + /** @var IL10N */ |
|
32 | + private $l; |
|
33 | + /** @var IURLGenerator */ |
|
34 | + private $url; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param IURLGenerator $url |
|
38 | - * @param IL10N $l |
|
39 | - */ |
|
40 | - public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | - $this->url = $url; |
|
42 | - $this->l = $l; |
|
43 | - } |
|
36 | + /** |
|
37 | + * @param IURLGenerator $url |
|
38 | + * @param IL10N $l |
|
39 | + */ |
|
40 | + public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | + $this->url = $url; |
|
42 | + $this->l = $l; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | - * e.g. 'ldap' |
|
48 | - * |
|
49 | - * @returns string |
|
50 | - */ |
|
51 | - public function getID() { |
|
52 | - return 'theming'; |
|
53 | - } |
|
45 | + /** |
|
46 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | + * e.g. 'ldap' |
|
48 | + * |
|
49 | + * @returns string |
|
50 | + */ |
|
51 | + public function getID() { |
|
52 | + return 'theming'; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | - * integration'. Use the L10N service to translate it. |
|
58 | - * |
|
59 | - * @return string |
|
60 | - */ |
|
61 | - public function getName() { |
|
62 | - return $this->l->t('Theming'); |
|
63 | - } |
|
55 | + /** |
|
56 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | + * integration'. Use the L10N service to translate it. |
|
58 | + * |
|
59 | + * @return string |
|
60 | + */ |
|
61 | + public function getName() { |
|
62 | + return $this->l->t('Theming'); |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @return int whether the form should be rather on the top or bottom of |
|
67 | - * the settings navigation. The sections are arranged in ascending order of |
|
68 | - * the priority values. It is required to return a value between 0 and 99. |
|
69 | - * |
|
70 | - * E.g.: 70 |
|
71 | - */ |
|
72 | - public function getPriority() { |
|
73 | - return 30; |
|
74 | - } |
|
65 | + /** |
|
66 | + * @return int whether the form should be rather on the top or bottom of |
|
67 | + * the settings navigation. The sections are arranged in ascending order of |
|
68 | + * the priority values. It is required to return a value between 0 and 99. |
|
69 | + * |
|
70 | + * E.g.: 70 |
|
71 | + */ |
|
72 | + public function getPriority() { |
|
73 | + return 30; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * {@inheritdoc} |
|
78 | - */ |
|
79 | - public function getIcon() { |
|
80 | - return $this->url->imagePath('theming', 'app-dark.svg'); |
|
81 | - } |
|
76 | + /** |
|
77 | + * {@inheritdoc} |
|
78 | + */ |
|
79 | + public function getIcon() { |
|
80 | + return $this->url->imagePath('theming', 'app-dark.svg'); |
|
81 | + } |
|
82 | 82 | } |
@@ -34,13 +34,13 @@ |
||
34 | 34 | */ |
35 | 35 | class BackupCode extends Entity { |
36 | 36 | |
37 | - /** @var string */ |
|
38 | - protected $userId; |
|
37 | + /** @var string */ |
|
38 | + protected $userId; |
|
39 | 39 | |
40 | - /** @var string */ |
|
41 | - protected $code; |
|
40 | + /** @var string */ |
|
41 | + protected $code; |
|
42 | 42 | |
43 | - /** @var int */ |
|
44 | - protected $used; |
|
43 | + /** @var int */ |
|
44 | + protected $used; |
|
45 | 45 | |
46 | 46 | } |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease 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.\n\n", array($_['password']))); |
6 | 6 | if ( isset($_['expiration']) ) { |
7 | - print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); |
|
8 | - print_unescaped("\n\n"); |
|
7 | + print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); |
|
8 | + print_unescaped("\n\n"); |
|
9 | 9 | } |
10 | 10 | // TRANSLATORS term at the end of a mail |
11 | 11 | p($l->t("Cheers!")); |
@@ -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>', array($_['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>', array($_['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> |
@@ -32,58 +32,58 @@ |
||
32 | 32 | use OCP\IUserSession; |
33 | 33 | |
34 | 34 | class Setup { |
35 | - /** |
|
36 | - * @var Crypt |
|
37 | - */ |
|
38 | - private $crypt; |
|
39 | - /** |
|
40 | - * @var KeyManager |
|
41 | - */ |
|
42 | - private $keyManager; |
|
43 | - /** |
|
44 | - * @var ILogger |
|
45 | - */ |
|
46 | - private $logger; |
|
47 | - /** |
|
48 | - * @var bool|string |
|
49 | - */ |
|
50 | - private $user; |
|
35 | + /** |
|
36 | + * @var Crypt |
|
37 | + */ |
|
38 | + private $crypt; |
|
39 | + /** |
|
40 | + * @var KeyManager |
|
41 | + */ |
|
42 | + private $keyManager; |
|
43 | + /** |
|
44 | + * @var ILogger |
|
45 | + */ |
|
46 | + private $logger; |
|
47 | + /** |
|
48 | + * @var bool|string |
|
49 | + */ |
|
50 | + private $user; |
|
51 | 51 | |
52 | 52 | |
53 | - /** |
|
54 | - * @param ILogger $logger |
|
55 | - * @param IUserSession $userSession |
|
56 | - * @param Crypt $crypt |
|
57 | - * @param KeyManager $keyManager |
|
58 | - */ |
|
59 | - public function __construct(ILogger $logger, |
|
60 | - IUserSession $userSession, |
|
61 | - Crypt $crypt, |
|
62 | - KeyManager $keyManager) { |
|
63 | - $this->logger = $logger; |
|
64 | - $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false; |
|
65 | - $this->crypt = $crypt; |
|
66 | - $this->keyManager = $keyManager; |
|
67 | - } |
|
53 | + /** |
|
54 | + * @param ILogger $logger |
|
55 | + * @param IUserSession $userSession |
|
56 | + * @param Crypt $crypt |
|
57 | + * @param KeyManager $keyManager |
|
58 | + */ |
|
59 | + public function __construct(ILogger $logger, |
|
60 | + IUserSession $userSession, |
|
61 | + Crypt $crypt, |
|
62 | + KeyManager $keyManager) { |
|
63 | + $this->logger = $logger; |
|
64 | + $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false; |
|
65 | + $this->crypt = $crypt; |
|
66 | + $this->keyManager = $keyManager; |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * @param string $uid user id |
|
71 | - * @param string $password user password |
|
72 | - * @return bool |
|
73 | - */ |
|
74 | - public function setupUser($uid, $password) { |
|
75 | - if (!$this->keyManager->userHasKeys($uid)) { |
|
76 | - return $this->keyManager->storeKeyPair($uid, $password, |
|
77 | - $this->crypt->createKeyPair()); |
|
78 | - } |
|
79 | - return true; |
|
80 | - } |
|
69 | + /** |
|
70 | + * @param string $uid user id |
|
71 | + * @param string $password user password |
|
72 | + * @return bool |
|
73 | + */ |
|
74 | + public function setupUser($uid, $password) { |
|
75 | + if (!$this->keyManager->userHasKeys($uid)) { |
|
76 | + return $this->keyManager->storeKeyPair($uid, $password, |
|
77 | + $this->crypt->createKeyPair()); |
|
78 | + } |
|
79 | + return true; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * make sure that all system keys exists |
|
84 | - */ |
|
85 | - public function setupSystem() { |
|
86 | - $this->keyManager->validateShareKey(); |
|
87 | - $this->keyManager->validateMasterKey(); |
|
88 | - } |
|
82 | + /** |
|
83 | + * make sure that all system keys exists |
|
84 | + */ |
|
85 | + public function setupSystem() { |
|
86 | + $this->keyManager->validateShareKey(); |
|
87 | + $this->keyManager->validateMasterKey(); |
|
88 | + } |
|
89 | 89 | } |