@@ -35,51 +35,51 @@ |
||
35 | 35 | */ |
36 | 36 | class DeleteOrphanedFiles extends Command { |
37 | 37 | |
38 | - const CHUNK_SIZE = 200; |
|
38 | + const CHUNK_SIZE = 200; |
|
39 | 39 | |
40 | - /** |
|
41 | - * @var IDBConnection |
|
42 | - */ |
|
43 | - protected $connection; |
|
40 | + /** |
|
41 | + * @var IDBConnection |
|
42 | + */ |
|
43 | + protected $connection; |
|
44 | 44 | |
45 | - public function __construct(IDBConnection $connection) { |
|
46 | - $this->connection = $connection; |
|
47 | - parent::__construct(); |
|
48 | - } |
|
45 | + public function __construct(IDBConnection $connection) { |
|
46 | + $this->connection = $connection; |
|
47 | + parent::__construct(); |
|
48 | + } |
|
49 | 49 | |
50 | - protected function configure() { |
|
51 | - $this |
|
52 | - ->setName('files:cleanup') |
|
53 | - ->setDescription('cleanup filecache'); |
|
54 | - } |
|
50 | + protected function configure() { |
|
51 | + $this |
|
52 | + ->setName('files:cleanup') |
|
53 | + ->setDescription('cleanup filecache'); |
|
54 | + } |
|
55 | 55 | |
56 | - public function execute(InputInterface $input, OutputInterface $output) { |
|
57 | - $deletedEntries = 0; |
|
56 | + public function execute(InputInterface $input, OutputInterface $output) { |
|
57 | + $deletedEntries = 0; |
|
58 | 58 | |
59 | - $query = $this->connection->getQueryBuilder(); |
|
60 | - $query->select('fc.fileid') |
|
61 | - ->from('filecache', 'fc') |
|
62 | - ->where($query->expr()->isNull('s.numeric_id')) |
|
63 | - ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id')) |
|
64 | - ->setMaxResults(self::CHUNK_SIZE); |
|
59 | + $query = $this->connection->getQueryBuilder(); |
|
60 | + $query->select('fc.fileid') |
|
61 | + ->from('filecache', 'fc') |
|
62 | + ->where($query->expr()->isNull('s.numeric_id')) |
|
63 | + ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id')) |
|
64 | + ->setMaxResults(self::CHUNK_SIZE); |
|
65 | 65 | |
66 | - $deleteQuery = $this->connection->getQueryBuilder(); |
|
67 | - $deleteQuery->delete('filecache') |
|
68 | - ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid'))); |
|
66 | + $deleteQuery = $this->connection->getQueryBuilder(); |
|
67 | + $deleteQuery->delete('filecache') |
|
68 | + ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid'))); |
|
69 | 69 | |
70 | - $deletedInLastChunk = self::CHUNK_SIZE; |
|
71 | - while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
72 | - $deletedInLastChunk = 0; |
|
73 | - $result = $query->execute(); |
|
74 | - while ($row = $result->fetch()) { |
|
75 | - $deletedInLastChunk++; |
|
76 | - $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid']) |
|
77 | - ->execute(); |
|
78 | - } |
|
79 | - $result->closeCursor(); |
|
80 | - } |
|
70 | + $deletedInLastChunk = self::CHUNK_SIZE; |
|
71 | + while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
72 | + $deletedInLastChunk = 0; |
|
73 | + $result = $query->execute(); |
|
74 | + while ($row = $result->fetch()) { |
|
75 | + $deletedInLastChunk++; |
|
76 | + $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid']) |
|
77 | + ->execute(); |
|
78 | + } |
|
79 | + $result->closeCursor(); |
|
80 | + } |
|
81 | 81 | |
82 | - $output->writeln("$deletedEntries orphaned file cache entries deleted"); |
|
83 | - } |
|
82 | + $output->writeln("$deletedEntries orphaned file cache entries deleted"); |
|
83 | + } |
|
84 | 84 | |
85 | 85 | } |
@@ -34,29 +34,29 @@ |
||
34 | 34 | * @package OCA\Files |
35 | 35 | */ |
36 | 36 | class Capabilities implements ICapability { |
37 | - /** @var IConfig */ |
|
38 | - protected $config; |
|
37 | + /** @var IConfig */ |
|
38 | + protected $config; |
|
39 | 39 | |
40 | - /** |
|
41 | - * Capabilities constructor. |
|
42 | - * |
|
43 | - * @param IConfig $config |
|
44 | - */ |
|
45 | - public function __construct(IConfig $config) { |
|
46 | - $this->config = $config; |
|
47 | - } |
|
40 | + /** |
|
41 | + * Capabilities constructor. |
|
42 | + * |
|
43 | + * @param IConfig $config |
|
44 | + */ |
|
45 | + public function __construct(IConfig $config) { |
|
46 | + $this->config = $config; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Return this classes capabilities |
|
51 | - * |
|
52 | - * @return array |
|
53 | - */ |
|
54 | - public function getCapabilities() { |
|
55 | - return [ |
|
56 | - 'files' => [ |
|
57 | - 'bigfilechunking' => true, |
|
58 | - 'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']), |
|
59 | - ], |
|
60 | - ]; |
|
61 | - } |
|
49 | + /** |
|
50 | + * Return this classes capabilities |
|
51 | + * |
|
52 | + * @return array |
|
53 | + */ |
|
54 | + public function getCapabilities() { |
|
55 | + return [ |
|
56 | + 'files' => [ |
|
57 | + 'bigfilechunking' => true, |
|
58 | + 'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']), |
|
59 | + ], |
|
60 | + ]; |
|
61 | + } |
|
62 | 62 | } |
@@ -30,29 +30,29 @@ |
||
30 | 30 | */ |
31 | 31 | class CleanupFileLocks extends TimedJob { |
32 | 32 | |
33 | - /** |
|
34 | - * Default interval in minutes |
|
35 | - * |
|
36 | - * @var int $defaultIntervalMin |
|
37 | - **/ |
|
38 | - protected $defaultIntervalMin = 5; |
|
33 | + /** |
|
34 | + * Default interval in minutes |
|
35 | + * |
|
36 | + * @var int $defaultIntervalMin |
|
37 | + **/ |
|
38 | + protected $defaultIntervalMin = 5; |
|
39 | 39 | |
40 | - /** |
|
41 | - * sets the correct interval for this timed job |
|
42 | - */ |
|
43 | - public function __construct() { |
|
44 | - $this->interval = $this->defaultIntervalMin * 60; |
|
45 | - } |
|
40 | + /** |
|
41 | + * sets the correct interval for this timed job |
|
42 | + */ |
|
43 | + public function __construct() { |
|
44 | + $this->interval = $this->defaultIntervalMin * 60; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * Makes the background job do its work |
|
49 | - * |
|
50 | - * @param array $argument unused argument |
|
51 | - */ |
|
52 | - public function run($argument) { |
|
53 | - $lockingProvider = \OC::$server->getLockingProvider(); |
|
54 | - if($lockingProvider instanceof DBLockingProvider) { |
|
55 | - $lockingProvider->cleanExpiredLocks(); |
|
56 | - } |
|
57 | - } |
|
47 | + /** |
|
48 | + * Makes the background job do its work |
|
49 | + * |
|
50 | + * @param array $argument unused argument |
|
51 | + */ |
|
52 | + public function run($argument) { |
|
53 | + $lockingProvider = \OC::$server->getLockingProvider(); |
|
54 | + if($lockingProvider instanceof DBLockingProvider) { |
|
55 | + $lockingProvider->cleanExpiredLocks(); |
|
56 | + } |
|
57 | + } |
|
58 | 58 | } |
@@ -32,123 +32,123 @@ |
||
32 | 32 | */ |
33 | 33 | class DeleteOrphanedItems extends TimedJob { |
34 | 34 | |
35 | - const CHUNK_SIZE = 200; |
|
36 | - |
|
37 | - /** @var \OCP\IDBConnection */ |
|
38 | - protected $connection; |
|
39 | - |
|
40 | - /** @var \OCP\ILogger */ |
|
41 | - protected $logger; |
|
42 | - |
|
43 | - /** |
|
44 | - * Default interval in minutes |
|
45 | - * |
|
46 | - * @var int $defaultIntervalMin |
|
47 | - **/ |
|
48 | - protected $defaultIntervalMin = 60; |
|
49 | - |
|
50 | - /** |
|
51 | - * sets the correct interval for this timed job |
|
52 | - */ |
|
53 | - public function __construct() { |
|
54 | - $this->interval = $this->defaultIntervalMin * 60; |
|
55 | - $this->connection = \OC::$server->getDatabaseConnection(); |
|
56 | - $this->logger = \OC::$server->getLogger(); |
|
57 | - } |
|
58 | - |
|
59 | - /** |
|
60 | - * Makes the background job do its work |
|
61 | - * |
|
62 | - * @param array $argument unused argument |
|
63 | - */ |
|
64 | - public function run($argument) { |
|
65 | - $this->cleanSystemTags(); |
|
66 | - $this->cleanUserTags(); |
|
67 | - $this->cleanComments(); |
|
68 | - $this->cleanCommentMarkers(); |
|
69 | - } |
|
70 | - |
|
71 | - /** |
|
72 | - * Deleting orphaned system tag mappings |
|
73 | - * |
|
74 | - * @param string $table |
|
75 | - * @param string $idCol |
|
76 | - * @param string $typeCol |
|
77 | - * @return int Number of deleted entries |
|
78 | - */ |
|
79 | - protected function cleanUp($table, $idCol, $typeCol) { |
|
80 | - $deletedEntries = 0; |
|
81 | - |
|
82 | - $query = $this->connection->getQueryBuilder(); |
|
83 | - $query->select('t1.' . $idCol) |
|
84 | - ->from($table, 't1') |
|
85 | - ->where($query->expr()->eq($typeCol, $query->expr()->literal('files'))) |
|
86 | - ->andWhere($query->expr()->isNull('t2.fileid')) |
|
87 | - ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | - ->groupBy('t1.' . $idCol) |
|
89 | - ->setMaxResults(self::CHUNK_SIZE); |
|
90 | - |
|
91 | - $deleteQuery = $this->connection->getQueryBuilder(); |
|
92 | - $deleteQuery->delete($table) |
|
93 | - ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid'))); |
|
94 | - |
|
95 | - $deletedInLastChunk = self::CHUNK_SIZE; |
|
96 | - while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
97 | - $result = $query->execute(); |
|
98 | - $deletedInLastChunk = 0; |
|
99 | - while ($row = $result->fetch()) { |
|
100 | - $deletedInLastChunk++; |
|
101 | - $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol]) |
|
102 | - ->execute(); |
|
103 | - } |
|
104 | - $result->closeCursor(); |
|
105 | - } |
|
106 | - |
|
107 | - return $deletedEntries; |
|
108 | - } |
|
109 | - |
|
110 | - /** |
|
111 | - * Deleting orphaned system tag mappings |
|
112 | - * |
|
113 | - * @return int Number of deleted entries |
|
114 | - */ |
|
115 | - protected function cleanSystemTags() { |
|
116 | - $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype'); |
|
117 | - $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
118 | - return $deletedEntries; |
|
119 | - } |
|
120 | - |
|
121 | - /** |
|
122 | - * Deleting orphaned user tag mappings |
|
123 | - * |
|
124 | - * @return int Number of deleted entries |
|
125 | - */ |
|
126 | - protected function cleanUserTags() { |
|
127 | - $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type'); |
|
128 | - $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
129 | - return $deletedEntries; |
|
130 | - } |
|
131 | - |
|
132 | - /** |
|
133 | - * Deleting orphaned comments |
|
134 | - * |
|
135 | - * @return int Number of deleted entries |
|
136 | - */ |
|
137 | - protected function cleanComments() { |
|
138 | - $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type'); |
|
139 | - $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']); |
|
140 | - return $deletedEntries; |
|
141 | - } |
|
142 | - |
|
143 | - /** |
|
144 | - * Deleting orphaned comment read markers |
|
145 | - * |
|
146 | - * @return int Number of deleted entries |
|
147 | - */ |
|
148 | - protected function cleanCommentMarkers() { |
|
149 | - $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type'); |
|
150 | - $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']); |
|
151 | - return $deletedEntries; |
|
152 | - } |
|
35 | + const CHUNK_SIZE = 200; |
|
36 | + |
|
37 | + /** @var \OCP\IDBConnection */ |
|
38 | + protected $connection; |
|
39 | + |
|
40 | + /** @var \OCP\ILogger */ |
|
41 | + protected $logger; |
|
42 | + |
|
43 | + /** |
|
44 | + * Default interval in minutes |
|
45 | + * |
|
46 | + * @var int $defaultIntervalMin |
|
47 | + **/ |
|
48 | + protected $defaultIntervalMin = 60; |
|
49 | + |
|
50 | + /** |
|
51 | + * sets the correct interval for this timed job |
|
52 | + */ |
|
53 | + public function __construct() { |
|
54 | + $this->interval = $this->defaultIntervalMin * 60; |
|
55 | + $this->connection = \OC::$server->getDatabaseConnection(); |
|
56 | + $this->logger = \OC::$server->getLogger(); |
|
57 | + } |
|
58 | + |
|
59 | + /** |
|
60 | + * Makes the background job do its work |
|
61 | + * |
|
62 | + * @param array $argument unused argument |
|
63 | + */ |
|
64 | + public function run($argument) { |
|
65 | + $this->cleanSystemTags(); |
|
66 | + $this->cleanUserTags(); |
|
67 | + $this->cleanComments(); |
|
68 | + $this->cleanCommentMarkers(); |
|
69 | + } |
|
70 | + |
|
71 | + /** |
|
72 | + * Deleting orphaned system tag mappings |
|
73 | + * |
|
74 | + * @param string $table |
|
75 | + * @param string $idCol |
|
76 | + * @param string $typeCol |
|
77 | + * @return int Number of deleted entries |
|
78 | + */ |
|
79 | + protected function cleanUp($table, $idCol, $typeCol) { |
|
80 | + $deletedEntries = 0; |
|
81 | + |
|
82 | + $query = $this->connection->getQueryBuilder(); |
|
83 | + $query->select('t1.' . $idCol) |
|
84 | + ->from($table, 't1') |
|
85 | + ->where($query->expr()->eq($typeCol, $query->expr()->literal('files'))) |
|
86 | + ->andWhere($query->expr()->isNull('t2.fileid')) |
|
87 | + ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | + ->groupBy('t1.' . $idCol) |
|
89 | + ->setMaxResults(self::CHUNK_SIZE); |
|
90 | + |
|
91 | + $deleteQuery = $this->connection->getQueryBuilder(); |
|
92 | + $deleteQuery->delete($table) |
|
93 | + ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid'))); |
|
94 | + |
|
95 | + $deletedInLastChunk = self::CHUNK_SIZE; |
|
96 | + while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
97 | + $result = $query->execute(); |
|
98 | + $deletedInLastChunk = 0; |
|
99 | + while ($row = $result->fetch()) { |
|
100 | + $deletedInLastChunk++; |
|
101 | + $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol]) |
|
102 | + ->execute(); |
|
103 | + } |
|
104 | + $result->closeCursor(); |
|
105 | + } |
|
106 | + |
|
107 | + return $deletedEntries; |
|
108 | + } |
|
109 | + |
|
110 | + /** |
|
111 | + * Deleting orphaned system tag mappings |
|
112 | + * |
|
113 | + * @return int Number of deleted entries |
|
114 | + */ |
|
115 | + protected function cleanSystemTags() { |
|
116 | + $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype'); |
|
117 | + $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
118 | + return $deletedEntries; |
|
119 | + } |
|
120 | + |
|
121 | + /** |
|
122 | + * Deleting orphaned user tag mappings |
|
123 | + * |
|
124 | + * @return int Number of deleted entries |
|
125 | + */ |
|
126 | + protected function cleanUserTags() { |
|
127 | + $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type'); |
|
128 | + $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
129 | + return $deletedEntries; |
|
130 | + } |
|
131 | + |
|
132 | + /** |
|
133 | + * Deleting orphaned comments |
|
134 | + * |
|
135 | + * @return int Number of deleted entries |
|
136 | + */ |
|
137 | + protected function cleanComments() { |
|
138 | + $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type'); |
|
139 | + $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']); |
|
140 | + return $deletedEntries; |
|
141 | + } |
|
142 | + |
|
143 | + /** |
|
144 | + * Deleting orphaned comment read markers |
|
145 | + * |
|
146 | + * @return int Number of deleted entries |
|
147 | + */ |
|
148 | + protected function cleanCommentMarkers() { |
|
149 | + $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type'); |
|
150 | + $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']); |
|
151 | + return $deletedEntries; |
|
152 | + } |
|
153 | 153 | |
154 | 154 | } |
@@ -36,80 +36,80 @@ |
||
36 | 36 | * @package OCA\Files\BackgroundJob |
37 | 37 | */ |
38 | 38 | class ScanFiles extends \OC\BackgroundJob\TimedJob { |
39 | - /** @var IConfig */ |
|
40 | - private $config; |
|
41 | - /** @var IUserManager */ |
|
42 | - private $userManager; |
|
43 | - /** @var IDBConnection */ |
|
44 | - private $dbConnection; |
|
45 | - /** @var ILogger */ |
|
46 | - private $logger; |
|
47 | - /** Amount of users that should get scanned per execution */ |
|
48 | - const USERS_PER_SESSION = 500; |
|
39 | + /** @var IConfig */ |
|
40 | + private $config; |
|
41 | + /** @var IUserManager */ |
|
42 | + private $userManager; |
|
43 | + /** @var IDBConnection */ |
|
44 | + private $dbConnection; |
|
45 | + /** @var ILogger */ |
|
46 | + private $logger; |
|
47 | + /** Amount of users that should get scanned per execution */ |
|
48 | + const USERS_PER_SESSION = 500; |
|
49 | 49 | |
50 | - /** |
|
51 | - * @param IConfig|null $config |
|
52 | - * @param IUserManager|null $userManager |
|
53 | - * @param IDBConnection|null $dbConnection |
|
54 | - * @param ILogger|null $logger |
|
55 | - */ |
|
56 | - public function __construct(IConfig $config = null, |
|
57 | - IUserManager $userManager = null, |
|
58 | - IDBConnection $dbConnection = null, |
|
59 | - ILogger $logger = null) { |
|
60 | - // Run once per 10 minutes |
|
61 | - $this->setInterval(60 * 10); |
|
50 | + /** |
|
51 | + * @param IConfig|null $config |
|
52 | + * @param IUserManager|null $userManager |
|
53 | + * @param IDBConnection|null $dbConnection |
|
54 | + * @param ILogger|null $logger |
|
55 | + */ |
|
56 | + public function __construct(IConfig $config = null, |
|
57 | + IUserManager $userManager = null, |
|
58 | + IDBConnection $dbConnection = null, |
|
59 | + ILogger $logger = null) { |
|
60 | + // Run once per 10 minutes |
|
61 | + $this->setInterval(60 * 10); |
|
62 | 62 | |
63 | - if (is_null($userManager) || is_null($config)) { |
|
64 | - $this->fixDIForJobs(); |
|
65 | - } else { |
|
66 | - $this->config = $config; |
|
67 | - $this->userManager = $userManager; |
|
68 | - $this->logger = $logger; |
|
69 | - } |
|
70 | - } |
|
63 | + if (is_null($userManager) || is_null($config)) { |
|
64 | + $this->fixDIForJobs(); |
|
65 | + } else { |
|
66 | + $this->config = $config; |
|
67 | + $this->userManager = $userManager; |
|
68 | + $this->logger = $logger; |
|
69 | + } |
|
70 | + } |
|
71 | 71 | |
72 | - protected function fixDIForJobs() { |
|
73 | - $this->config = \OC::$server->getConfig(); |
|
74 | - $this->userManager = \OC::$server->getUserManager(); |
|
75 | - $this->logger = \OC::$server->getLogger(); |
|
76 | - } |
|
72 | + protected function fixDIForJobs() { |
|
73 | + $this->config = \OC::$server->getConfig(); |
|
74 | + $this->userManager = \OC::$server->getUserManager(); |
|
75 | + $this->logger = \OC::$server->getLogger(); |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * @param IUser $user |
|
80 | - */ |
|
81 | - protected function runScanner(IUser $user) { |
|
82 | - try { |
|
83 | - $scanner = new Scanner( |
|
84 | - $user->getUID(), |
|
85 | - $this->dbConnection, |
|
86 | - $this->logger |
|
87 | - ); |
|
88 | - $scanner->backgroundScan(''); |
|
89 | - } catch (\Exception $e) { |
|
90 | - $this->logger->logException($e, ['app' => 'files']); |
|
91 | - } |
|
92 | - \OC_Util::tearDownFS(); |
|
93 | - } |
|
78 | + /** |
|
79 | + * @param IUser $user |
|
80 | + */ |
|
81 | + protected function runScanner(IUser $user) { |
|
82 | + try { |
|
83 | + $scanner = new Scanner( |
|
84 | + $user->getUID(), |
|
85 | + $this->dbConnection, |
|
86 | + $this->logger |
|
87 | + ); |
|
88 | + $scanner->backgroundScan(''); |
|
89 | + } catch (\Exception $e) { |
|
90 | + $this->logger->logException($e, ['app' => 'files']); |
|
91 | + } |
|
92 | + \OC_Util::tearDownFS(); |
|
93 | + } |
|
94 | 94 | |
95 | - /** |
|
96 | - * @param $argument |
|
97 | - * @throws \Exception |
|
98 | - */ |
|
99 | - protected function run($argument) { |
|
100 | - $offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0); |
|
101 | - $users = $this->userManager->search('', self::USERS_PER_SESSION, $offset); |
|
102 | - if (!count($users)) { |
|
103 | - // No users found, reset offset and retry |
|
104 | - $offset = 0; |
|
105 | - $users = $this->userManager->search('', self::USERS_PER_SESSION); |
|
106 | - } |
|
95 | + /** |
|
96 | + * @param $argument |
|
97 | + * @throws \Exception |
|
98 | + */ |
|
99 | + protected function run($argument) { |
|
100 | + $offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0); |
|
101 | + $users = $this->userManager->search('', self::USERS_PER_SESSION, $offset); |
|
102 | + if (!count($users)) { |
|
103 | + // No users found, reset offset and retry |
|
104 | + $offset = 0; |
|
105 | + $users = $this->userManager->search('', self::USERS_PER_SESSION); |
|
106 | + } |
|
107 | 107 | |
108 | - $offset += self::USERS_PER_SESSION; |
|
109 | - $this->config->setAppValue('files', 'cronjob_scan_files', $offset); |
|
108 | + $offset += self::USERS_PER_SESSION; |
|
109 | + $this->config->setAppValue('files', 'cronjob_scan_files', $offset); |
|
110 | 110 | |
111 | - foreach ($users as $user) { |
|
112 | - $this->runScanner($user); |
|
113 | - } |
|
114 | - } |
|
111 | + foreach ($users as $user) { |
|
112 | + $this->runScanner($user); |
|
113 | + } |
|
114 | + } |
|
115 | 115 | } |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $filename = $_GET["file"]; |
31 | 31 | |
32 | 32 | if(!\OC\Files\Filesystem::file_exists($filename)) { |
33 | - header("HTTP/1.0 404 Not Found"); |
|
34 | - $tmpl = new OCP\Template( '', '404', 'guest' ); |
|
35 | - $tmpl->assign('file', $filename); |
|
36 | - $tmpl->printPage(); |
|
37 | - exit; |
|
33 | + header("HTTP/1.0 404 Not Found"); |
|
34 | + $tmpl = new OCP\Template( '', '404', 'guest' ); |
|
35 | + $tmpl->assign('file', $filename); |
|
36 | + $tmpl->printPage(); |
|
37 | + exit; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename )); |
@@ -29,60 +29,60 @@ |
||
29 | 29 | |
30 | 30 | $application = new Application(); |
31 | 31 | $application->registerRoutes( |
32 | - $this, |
|
33 | - array( |
|
34 | - 'routes' => array( |
|
35 | - array( |
|
36 | - 'name' => 'API#getThumbnail', |
|
37 | - 'url' => '/api/v1/thumbnail/{x}/{y}/{file}', |
|
38 | - 'verb' => 'GET', |
|
39 | - 'requirements' => array('file' => '.+') |
|
40 | - ), |
|
41 | - array( |
|
42 | - 'name' => 'API#updateFileTags', |
|
43 | - 'url' => '/api/v1/files/{path}', |
|
44 | - 'verb' => 'POST', |
|
45 | - 'requirements' => array('path' => '.+'), |
|
46 | - ), |
|
47 | - array( |
|
48 | - 'name' => 'API#getRecentFiles', |
|
49 | - 'url' => '/api/v1/recent/', |
|
50 | - 'verb' => 'GET' |
|
51 | - ), |
|
52 | - array( |
|
53 | - 'name' => 'API#updateFileSorting', |
|
54 | - 'url' => '/api/v1/sorting', |
|
55 | - 'verb' => 'POST' |
|
56 | - ), |
|
57 | - array( |
|
58 | - 'name' => 'API#showHiddenFiles', |
|
59 | - 'url' => '/api/v1/showhidden', |
|
60 | - 'verb' => 'POST' |
|
61 | - ), |
|
62 | - [ |
|
63 | - 'name' => 'view#index', |
|
64 | - 'url' => '/', |
|
65 | - 'verb' => 'GET', |
|
66 | - ], |
|
67 | - [ |
|
68 | - 'name' => 'settings#setMaxUploadSize', |
|
69 | - 'url' => '/settings/maxUpload', |
|
70 | - 'verb' => 'POST', |
|
71 | - ] |
|
72 | - ) |
|
73 | - ) |
|
32 | + $this, |
|
33 | + array( |
|
34 | + 'routes' => array( |
|
35 | + array( |
|
36 | + 'name' => 'API#getThumbnail', |
|
37 | + 'url' => '/api/v1/thumbnail/{x}/{y}/{file}', |
|
38 | + 'verb' => 'GET', |
|
39 | + 'requirements' => array('file' => '.+') |
|
40 | + ), |
|
41 | + array( |
|
42 | + 'name' => 'API#updateFileTags', |
|
43 | + 'url' => '/api/v1/files/{path}', |
|
44 | + 'verb' => 'POST', |
|
45 | + 'requirements' => array('path' => '.+'), |
|
46 | + ), |
|
47 | + array( |
|
48 | + 'name' => 'API#getRecentFiles', |
|
49 | + 'url' => '/api/v1/recent/', |
|
50 | + 'verb' => 'GET' |
|
51 | + ), |
|
52 | + array( |
|
53 | + 'name' => 'API#updateFileSorting', |
|
54 | + 'url' => '/api/v1/sorting', |
|
55 | + 'verb' => 'POST' |
|
56 | + ), |
|
57 | + array( |
|
58 | + 'name' => 'API#showHiddenFiles', |
|
59 | + 'url' => '/api/v1/showhidden', |
|
60 | + 'verb' => 'POST' |
|
61 | + ), |
|
62 | + [ |
|
63 | + 'name' => 'view#index', |
|
64 | + 'url' => '/', |
|
65 | + 'verb' => 'GET', |
|
66 | + ], |
|
67 | + [ |
|
68 | + 'name' => 'settings#setMaxUploadSize', |
|
69 | + 'url' => '/settings/maxUpload', |
|
70 | + 'verb' => 'POST', |
|
71 | + ] |
|
72 | + ) |
|
73 | + ) |
|
74 | 74 | ); |
75 | 75 | |
76 | 76 | /** @var $this \OC\Route\Router */ |
77 | 77 | |
78 | 78 | $this->create('files_ajax_download', 'ajax/download.php') |
79 | - ->actionInclude('files/ajax/download.php'); |
|
79 | + ->actionInclude('files/ajax/download.php'); |
|
80 | 80 | $this->create('files_ajax_getstoragestats', 'ajax/getstoragestats.php') |
81 | - ->actionInclude('files/ajax/getstoragestats.php'); |
|
81 | + ->actionInclude('files/ajax/getstoragestats.php'); |
|
82 | 82 | $this->create('files_ajax_list', 'ajax/list.php') |
83 | - ->actionInclude('files/ajax/list.php'); |
|
83 | + ->actionInclude('files/ajax/list.php'); |
|
84 | 84 | |
85 | 85 | $this->create('download', 'download{file}') |
86 | - ->requirements(array('file' => '.*')) |
|
87 | - ->actionInclude('files/download.php'); |
|
86 | + ->requirements(array('file' => '.*')) |
|
87 | + ->actionInclude('files/download.php'); |
|
88 | 88 |
@@ -34,16 +34,16 @@ |
||
34 | 34 | $subject = (string)$_POST['ldap_clear_mapping']; |
35 | 35 | $mapping = null; |
36 | 36 | if($subject === 'user') { |
37 | - $mapping = new UserMapping(\OC::$server->getDatabaseConnection()); |
|
37 | + $mapping = new UserMapping(\OC::$server->getDatabaseConnection()); |
|
38 | 38 | } else if($subject === 'group') { |
39 | - $mapping = new GroupMapping(\OC::$server->getDatabaseConnection()); |
|
39 | + $mapping = new GroupMapping(\OC::$server->getDatabaseConnection()); |
|
40 | 40 | } |
41 | 41 | try { |
42 | - if(is_null($mapping) || !$mapping->clear()) { |
|
43 | - $l = \OC::$server->getL10N('user_ldap'); |
|
44 | - throw new \Exception($l->t('Failed to clear the mappings.')); |
|
45 | - } |
|
46 | - OCP\JSON::success(); |
|
42 | + if(is_null($mapping) || !$mapping->clear()) { |
|
43 | + $l = \OC::$server->getL10N('user_ldap'); |
|
44 | + throw new \Exception($l->t('Failed to clear the mappings.')); |
|
45 | + } |
|
46 | + OCP\JSON::success(); |
|
47 | 47 | } catch (\Exception $e) { |
48 | - OCP\JSON::error(array('message' => $e->getMessage())); |
|
48 | + OCP\JSON::error(array('message' => $e->getMessage())); |
|
49 | 49 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
35 | 35 | $configuration = $connection->getConfiguration(); |
36 | 36 | if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') { |
37 | - // hide password |
|
38 | - $configuration['ldap_agent_password'] = '**PASSWORD SET**'; |
|
37 | + // hide password |
|
38 | + $configuration['ldap_agent_password'] = '**PASSWORD SET**'; |
|
39 | 39 | } |
40 | 40 | OCP\JSON::success(array('configuration' => $configuration)); |