@@ -30,17 +30,17 @@ |
||
| 30 | 30 | * @since 13.0.0 |
| 31 | 31 | */ |
| 32 | 32 | interface IManager { |
| 33 | - /** |
|
| 34 | - * @param string $className – class name of the ISorter implementation |
|
| 35 | - * @since 13.0.0 |
|
| 36 | - */ |
|
| 37 | - public function registerSorter($className); |
|
| 33 | + /** |
|
| 34 | + * @param string $className – class name of the ISorter implementation |
|
| 35 | + * @since 13.0.0 |
|
| 36 | + */ |
|
| 37 | + public function registerSorter($className); |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @param array $sorters list of sorter IDs, seperated by "|" |
|
| 41 | - * @param array $sortArray array representation of OCP\Collaboration\Collaborators\ISearchResult |
|
| 42 | - * @param array $context context info of the search, keys: itemType, itemId |
|
| 43 | - * @since 13.0.0 |
|
| 44 | - */ |
|
| 45 | - public function runSorters(array $sorters, array &$sortArray, array $context); |
|
| 39 | + /** |
|
| 40 | + * @param array $sorters list of sorter IDs, seperated by "|" |
|
| 41 | + * @param array $sortArray array representation of OCP\Collaboration\Collaborators\ISearchResult |
|
| 42 | + * @param array $context context info of the search, keys: itemType, itemId |
|
| 43 | + * @since 13.0.0 |
|
| 44 | + */ |
|
| 45 | + public function runSorters(array $sorters, array &$sortArray, array $context); |
|
| 46 | 46 | } |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <div class="ldapSettingControls"> |
| 2 | 2 | <button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection"> |
| 3 | - <?php p($l->t('Test Configuration'));?> |
|
| 3 | + <?php p($l->t('Test Configuration')); ?> |
|
| 4 | 4 | </button> |
| 5 | 5 | <a href="<?php p(link_to_docs('admin-ldap')); ?>" |
| 6 | 6 | target="_blank" rel="noreferrer noopener"> |
| 7 | 7 | <img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>" |
| 8 | 8 | style="height:1.75ex" /> |
| 9 | - <?php p($l->t('Help'));?> |
|
| 9 | + <?php p($l->t('Help')); ?> |
|
| 10 | 10 | </a> |
| 11 | 11 | </div> |
@@ -2,10 +2,10 @@ |
||
| 2 | 2 | <div id="nojavascript"> |
| 3 | 3 | <div> |
| 4 | 4 | <?php print_unescaped(str_replace( |
| 5 | - ['{linkstart}', '{linkend}'], |
|
| 6 | - ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'], |
|
| 7 | - $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.') |
|
| 8 | - )); ?> |
|
| 5 | + ['{linkstart}', '{linkend}'], |
|
| 6 | + ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'], |
|
| 7 | + $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.') |
|
| 8 | + )); ?> |
|
| 9 | 9 | </div> |
| 10 | 10 | </div> |
| 11 | 11 | </noscript> |
@@ -33,18 +33,18 @@ |
||
| 33 | 33 | */ |
| 34 | 34 | interface ISorter { |
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * @return string The ID of the sorter, e.g. commenters |
|
| 38 | - * @since 13.0.0 |
|
| 39 | - */ |
|
| 40 | - public function getId(); |
|
| 36 | + /** |
|
| 37 | + * @return string The ID of the sorter, e.g. commenters |
|
| 38 | + * @since 13.0.0 |
|
| 39 | + */ |
|
| 40 | + public function getId(); |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * executes the sort action |
|
| 44 | - * |
|
| 45 | - * @param array $sortArray the array to be sorted, provided as reference |
|
| 46 | - * @param array $context carries key 'itemType' and 'itemId' of the source object (e.g. a file) |
|
| 47 | - * @since 13.0.0 |
|
| 48 | - */ |
|
| 49 | - public function sort(array &$sortArray, array $context); |
|
| 42 | + /** |
|
| 43 | + * executes the sort action |
|
| 44 | + * |
|
| 45 | + * @param array $sortArray the array to be sorted, provided as reference |
|
| 46 | + * @param array $context carries key 'itemType' and 'itemId' of the source object (e.g. a file) |
|
| 47 | + * @since 13.0.0 |
|
| 48 | + */ |
|
| 49 | + public function sort(array &$sortArray, array $context); |
|
| 50 | 50 | } |
@@ -31,42 +31,42 @@ |
||
| 31 | 31 | * Mount provider for custom cache storages |
| 32 | 32 | */ |
| 33 | 33 | class CacheMountProvider implements IMountProvider { |
| 34 | - /** |
|
| 35 | - * @var IConfig |
|
| 36 | - */ |
|
| 37 | - private $config; |
|
| 34 | + /** |
|
| 35 | + * @var IConfig |
|
| 36 | + */ |
|
| 37 | + private $config; |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * ObjectStoreHomeMountProvider constructor. |
|
| 41 | - * |
|
| 42 | - * @param IConfig $config |
|
| 43 | - */ |
|
| 44 | - public function __construct(IConfig $config) { |
|
| 45 | - $this->config = $config; |
|
| 46 | - } |
|
| 39 | + /** |
|
| 40 | + * ObjectStoreHomeMountProvider constructor. |
|
| 41 | + * |
|
| 42 | + * @param IConfig $config |
|
| 43 | + */ |
|
| 44 | + public function __construct(IConfig $config) { |
|
| 45 | + $this->config = $config; |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * Get the cache mount for a user |
|
| 50 | - * |
|
| 51 | - * @param IUser $user |
|
| 52 | - * @param IStorageFactory $loader |
|
| 53 | - * @return \OCP\Files\Mount\IMountPoint[] |
|
| 54 | - */ |
|
| 55 | - public function getMountsForUser(IUser $user, IStorageFactory $loader) { |
|
| 56 | - $cacheBaseDir = $this->config->getSystemValue('cache_path', ''); |
|
| 57 | - if ($cacheBaseDir !== '') { |
|
| 58 | - $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID(); |
|
| 59 | - if (!file_exists($cacheDir)) { |
|
| 60 | - mkdir($cacheDir, 0770, true); |
|
| 61 | - mkdir($cacheDir . '/uploads', 0770, true); |
|
| 62 | - } |
|
| 48 | + /** |
|
| 49 | + * Get the cache mount for a user |
|
| 50 | + * |
|
| 51 | + * @param IUser $user |
|
| 52 | + * @param IStorageFactory $loader |
|
| 53 | + * @return \OCP\Files\Mount\IMountPoint[] |
|
| 54 | + */ |
|
| 55 | + public function getMountsForUser(IUser $user, IStorageFactory $loader) { |
|
| 56 | + $cacheBaseDir = $this->config->getSystemValue('cache_path', ''); |
|
| 57 | + if ($cacheBaseDir !== '') { |
|
| 58 | + $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID(); |
|
| 59 | + if (!file_exists($cacheDir)) { |
|
| 60 | + mkdir($cacheDir, 0770, true); |
|
| 61 | + mkdir($cacheDir . '/uploads', 0770, true); |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - return [ |
|
| 65 | - new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]), |
|
| 66 | - new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader]) |
|
| 67 | - ]; |
|
| 68 | - } else { |
|
| 69 | - return []; |
|
| 70 | - } |
|
| 71 | - } |
|
| 64 | + return [ |
|
| 65 | + new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]), |
|
| 66 | + new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader]) |
|
| 67 | + ]; |
|
| 68 | + } else { |
|
| 69 | + return []; |
|
| 70 | + } |
|
| 71 | + } |
|
| 72 | 72 | } |
@@ -55,15 +55,15 @@ |
||
| 55 | 55 | public function getMountsForUser(IUser $user, IStorageFactory $loader) { |
| 56 | 56 | $cacheBaseDir = $this->config->getSystemValue('cache_path', ''); |
| 57 | 57 | if ($cacheBaseDir !== '') { |
| 58 | - $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID(); |
|
| 58 | + $cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID(); |
|
| 59 | 59 | if (!file_exists($cacheDir)) { |
| 60 | 60 | mkdir($cacheDir, 0770, true); |
| 61 | - mkdir($cacheDir . '/uploads', 0770, true); |
|
| 61 | + mkdir($cacheDir.'/uploads', 0770, true); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | return [ |
| 65 | - new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]), |
|
| 66 | - new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader]) |
|
| 65 | + new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir, $loader]), |
|
| 66 | + new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/uploads', ['datadir' => $cacheDir.'/uploads', $loader]) |
|
| 67 | 67 | ]; |
| 68 | 68 | } else { |
| 69 | 69 | return []; |
@@ -11,32 +11,32 @@ |
||
| 11 | 11 | */ |
| 12 | 12 | class Version13000Date20170926101637 extends BigIntMigration { |
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @return array Returns an array with the following structure |
|
| 16 | - * ['table1' => ['column1', 'column2'], ...] |
|
| 17 | - * @since 13.0.0 |
|
| 18 | - */ |
|
| 19 | - protected function getColumnsByTable() { |
|
| 20 | - return [ |
|
| 21 | - 'admin_settings' => ['id'], |
|
| 22 | - 'authtoken' => ['id'], |
|
| 23 | - 'bruteforce_attempts' => ['id'], |
|
| 24 | - 'comments' => ['id', 'parent_id', 'topmost_parent_id'], |
|
| 25 | - // Disabled for now 'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart'], |
|
| 26 | - 'file_locks' => ['id'], |
|
| 27 | - 'jobs' => ['id'], |
|
| 28 | - // Disabled for now 'mimetypes' => ['id'], |
|
| 29 | - 'mounts' => ['id'], |
|
| 30 | - 'personal_settings' => ['id'], |
|
| 31 | - 'properties' => ['id'], |
|
| 32 | - 'share' => ['id', 'parent', 'file_source'], |
|
| 33 | - // Disabled for now 'storages' => ['numeric_id'], |
|
| 34 | - 'systemtag' => ['id'], |
|
| 35 | - 'systemtag_group' => ['systemtagid'], |
|
| 36 | - 'systemtag_object_mapping' => ['systemtagid'], |
|
| 37 | - 'vcategory' => ['id'], |
|
| 38 | - 'vcategory_to_object' => ['objid', 'categoryid'], |
|
| 39 | - ]; |
|
| 40 | - } |
|
| 14 | + /** |
|
| 15 | + * @return array Returns an array with the following structure |
|
| 16 | + * ['table1' => ['column1', 'column2'], ...] |
|
| 17 | + * @since 13.0.0 |
|
| 18 | + */ |
|
| 19 | + protected function getColumnsByTable() { |
|
| 20 | + return [ |
|
| 21 | + 'admin_settings' => ['id'], |
|
| 22 | + 'authtoken' => ['id'], |
|
| 23 | + 'bruteforce_attempts' => ['id'], |
|
| 24 | + 'comments' => ['id', 'parent_id', 'topmost_parent_id'], |
|
| 25 | + // Disabled for now 'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart'], |
|
| 26 | + 'file_locks' => ['id'], |
|
| 27 | + 'jobs' => ['id'], |
|
| 28 | + // Disabled for now 'mimetypes' => ['id'], |
|
| 29 | + 'mounts' => ['id'], |
|
| 30 | + 'personal_settings' => ['id'], |
|
| 31 | + 'properties' => ['id'], |
|
| 32 | + 'share' => ['id', 'parent', 'file_source'], |
|
| 33 | + // Disabled for now 'storages' => ['numeric_id'], |
|
| 34 | + 'systemtag' => ['id'], |
|
| 35 | + 'systemtag_group' => ['systemtagid'], |
|
| 36 | + 'systemtag_object_mapping' => ['systemtagid'], |
|
| 37 | + 'vcategory' => ['id'], |
|
| 38 | + 'vcategory_to_object' => ['objid', 'categoryid'], |
|
| 39 | + ]; |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | 42 | } |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | $baseDir = $vendorDir; |
| 7 | 7 | |
| 8 | 8 | return array( |
| 9 | - 'OCA\\Files_Sharing\\' => array($baseDir . '/../lib'), |
|
| 9 | + 'OCA\\Files_Sharing\\' => array($baseDir.'/../lib'), |
|
| 10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | $baseDir = $vendorDir; |
| 7 | 7 | |
| 8 | 8 | return array( |
| 9 | - 'OCA\\AdminAudit\\' => array($baseDir . '/../lib'), |
|
| 9 | + 'OCA\\AdminAudit\\' => array($baseDir.'/../lib'), |
|
| 10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | $baseDir = $vendorDir; |
| 7 | 7 | |
| 8 | 8 | return array( |
| 9 | - 'OCA\\DAV\\' => array($baseDir . '/../lib'), |
|
| 9 | + 'OCA\\DAV\\' => array($baseDir.'/../lib'), |
|
| 10 | 10 | ); |