| @@ -27,17 +27,17 @@ | ||
| 27 | 27 | * @since 13.0.0 | 
| 28 | 28 | */ | 
| 29 | 29 |  interface IApiCollection { | 
| 30 | - /** | |
| 31 | - * @return IUserApi | |
| 32 | - * | |
| 33 | - * @since 13.0.0 | |
| 34 | - */ | |
| 35 | - public function getUserApi(); | |
| 30 | + /** | |
| 31 | + * @return IUserApi | |
| 32 | + * | |
| 33 | + * @since 13.0.0 | |
| 34 | + */ | |
| 35 | + public function getUserApi(); | |
| 36 | 36 | |
| 37 | - /** | |
| 38 | - * @return ICapabilitiesApi | |
| 39 | - * | |
| 40 | - * @since 13.0.0 | |
| 41 | - */ | |
| 42 | - public function getCapabilitiesApi(); | |
| 37 | + /** | |
| 38 | + * @return ICapabilitiesApi | |
| 39 | + * | |
| 40 | + * @since 13.0.0 | |
| 41 | + */ | |
| 42 | + public function getCapabilitiesApi(); | |
| 43 | 43 | } | 
| @@ -27,17 +27,17 @@ | ||
| 27 | 27 | * @since 13.0.0 | 
| 28 | 28 | */ | 
| 29 | 29 |  interface ICredentials { | 
| 30 | - /** | |
| 31 | - * @return string | |
| 32 | - * | |
| 33 | - * @since 13.0.0 | |
| 34 | - */ | |
| 35 | - public function getUsername(); | |
| 30 | + /** | |
| 31 | + * @return string | |
| 32 | + * | |
| 33 | + * @since 13.0.0 | |
| 34 | + */ | |
| 35 | + public function getUsername(); | |
| 36 | 36 | |
| 37 | - /** | |
| 38 | - * @return string | |
| 39 | - * | |
| 40 | - * @since 13.0.0 | |
| 41 | - */ | |
| 42 | - public function getPassword(); | |
| 37 | + /** | |
| 38 | + * @return string | |
| 39 | + * | |
| 40 | + * @since 13.0.0 | |
| 41 | + */ | |
| 42 | + public function getPassword(); | |
| 43 | 43 | } | 
| @@ -27,94 +27,94 @@ | ||
| 27 | 27 | * @since 13.0.0 | 
| 28 | 28 | */ | 
| 29 | 29 |  interface IUser { | 
| 30 | - /** | |
| 31 | - * @return string | |
| 32 | - * | |
| 33 | - * @since 13.0.0 | |
| 34 | - */ | |
| 35 | - public function getUserId(); | |
| 30 | + /** | |
| 31 | + * @return string | |
| 32 | + * | |
| 33 | + * @since 13.0.0 | |
| 34 | + */ | |
| 35 | + public function getUserId(); | |
| 36 | 36 | |
| 37 | - /** | |
| 38 | - * @return string | |
| 39 | - * | |
| 40 | - * @since 13.0.0 | |
| 41 | - */ | |
| 42 | - public function getEmail(); | |
| 37 | + /** | |
| 38 | + * @return string | |
| 39 | + * | |
| 40 | + * @since 13.0.0 | |
| 41 | + */ | |
| 42 | + public function getEmail(); | |
| 43 | 43 | |
| 44 | - /** | |
| 45 | - * @return string | |
| 46 | - * | |
| 47 | - * @since 13.0.0 | |
| 48 | - */ | |
| 49 | - public function getDisplayName(); | |
| 44 | + /** | |
| 45 | + * @return string | |
| 46 | + * | |
| 47 | + * @since 13.0.0 | |
| 48 | + */ | |
| 49 | + public function getDisplayName(); | |
| 50 | 50 | |
| 51 | - /** | |
| 52 | - * @return string | |
| 53 | - * | |
| 54 | - * @since 13.0.0 | |
| 55 | - */ | |
| 56 | - public function getPhone(); | |
| 51 | + /** | |
| 52 | + * @return string | |
| 53 | + * | |
| 54 | + * @since 13.0.0 | |
| 55 | + */ | |
| 56 | + public function getPhone(); | |
| 57 | 57 | |
| 58 | - /** | |
| 59 | - * @return string | |
| 60 | - * | |
| 61 | - * @since 13.0.0 | |
| 62 | - */ | |
| 63 | - public function getAddress(); | |
| 58 | + /** | |
| 59 | + * @return string | |
| 60 | + * | |
| 61 | + * @since 13.0.0 | |
| 62 | + */ | |
| 63 | + public function getAddress(); | |
| 64 | 64 | |
| 65 | - /** | |
| 66 | - * @return string | |
| 67 | - * | |
| 68 | - * @since 13.0.0 | |
| 69 | - */ | |
| 70 | - public function getWebsite(); | |
| 65 | + /** | |
| 66 | + * @return string | |
| 67 | + * | |
| 68 | + * @since 13.0.0 | |
| 69 | + */ | |
| 70 | + public function getWebsite(); | |
| 71 | 71 | |
| 72 | - /** | |
| 73 | - * @return string | |
| 74 | - * | |
| 75 | - * @since 13.0.0 | |
| 76 | - */ | |
| 77 | - public function getTwitter(); | |
| 72 | + /** | |
| 73 | + * @return string | |
| 74 | + * | |
| 75 | + * @since 13.0.0 | |
| 76 | + */ | |
| 77 | + public function getTwitter(); | |
| 78 | 78 | |
| 79 | - /** | |
| 80 | - * @return string[] | |
| 81 | - * | |
| 82 | - * @since 13.0.0 | |
| 83 | - */ | |
| 84 | - public function getGroups(); | |
| 79 | + /** | |
| 80 | + * @return string[] | |
| 81 | + * | |
| 82 | + * @since 13.0.0 | |
| 83 | + */ | |
| 84 | + public function getGroups(); | |
| 85 | 85 | |
| 86 | - /** | |
| 87 | - * @return string | |
| 88 | - * | |
| 89 | - * @since 13.0.0 | |
| 90 | - */ | |
| 91 | - public function getLanguage(); | |
| 86 | + /** | |
| 87 | + * @return string | |
| 88 | + * | |
| 89 | + * @since 13.0.0 | |
| 90 | + */ | |
| 91 | + public function getLanguage(); | |
| 92 | 92 | |
| 93 | - /** | |
| 94 | - * @return int | |
| 95 | - * | |
| 96 | - * @since 13.0.0 | |
| 97 | - */ | |
| 98 | - public function getUsedSpace(); | |
| 93 | + /** | |
| 94 | + * @return int | |
| 95 | + * | |
| 96 | + * @since 13.0.0 | |
| 97 | + */ | |
| 98 | + public function getUsedSpace(); | |
| 99 | 99 | |
| 100 | - /** | |
| 101 | - * @return int | |
| 102 | - * | |
| 103 | - * @since 13.0.0 | |
| 104 | - */ | |
| 105 | - public function getFreeSpace(); | |
| 100 | + /** | |
| 101 | + * @return int | |
| 102 | + * | |
| 103 | + * @since 13.0.0 | |
| 104 | + */ | |
| 105 | + public function getFreeSpace(); | |
| 106 | 106 | |
| 107 | - /** | |
| 108 | - * @return int | |
| 109 | - * | |
| 110 | - * @since 13.0.0 | |
| 111 | - */ | |
| 112 | - public function getTotalSpace(); | |
| 107 | + /** | |
| 108 | + * @return int | |
| 109 | + * | |
| 110 | + * @since 13.0.0 | |
| 111 | + */ | |
| 112 | + public function getTotalSpace(); | |
| 113 | 113 | |
| 114 | - /** | |
| 115 | - * @return int | |
| 116 | - * | |
| 117 | - * @since 13.0.0 | |
| 118 | - */ | |
| 119 | - public function getQuota(); | |
| 114 | + /** | |
| 115 | + * @return int | |
| 116 | + * | |
| 117 | + * @since 13.0.0 | |
| 118 | + */ | |
| 119 | + public function getQuota(); | |
| 120 | 120 | } | 
| @@ -27,40 +27,40 @@ | ||
| 27 | 27 | * @since 13.0.0 | 
| 28 | 28 | */ | 
| 29 | 29 |  interface IInstance { | 
| 30 | - /** | |
| 31 | - * @return string The url of the remote server without protocol | |
| 32 | - * | |
| 33 | - * @since 13.0.0 | |
| 34 | - */ | |
| 35 | - public function getUrl(); | |
| 30 | + /** | |
| 31 | + * @return string The url of the remote server without protocol | |
| 32 | + * | |
| 33 | + * @since 13.0.0 | |
| 34 | + */ | |
| 35 | + public function getUrl(); | |
| 36 | 36 | |
| 37 | - /** | |
| 38 | - * @return string The of of the remote server with protocol | |
| 39 | - * | |
| 40 | - * @since 13.0.0 | |
| 41 | - */ | |
| 42 | - public function getFullUrl(); | |
| 37 | + /** | |
| 38 | + * @return string The of of the remote server with protocol | |
| 39 | + * | |
| 40 | + * @since 13.0.0 | |
| 41 | + */ | |
| 42 | + public function getFullUrl(); | |
| 43 | 43 | |
| 44 | - /** | |
| 45 | - * @return string The full version string in '13.1.2.3' format | |
| 46 | - * | |
| 47 | - * @since 13.0.0 | |
| 48 | - */ | |
| 49 | - public function getVersion(); | |
| 44 | + /** | |
| 45 | + * @return string The full version string in '13.1.2.3' format | |
| 46 | + * | |
| 47 | + * @since 13.0.0 | |
| 48 | + */ | |
| 49 | + public function getVersion(); | |
| 50 | 50 | |
| 51 | - /** | |
| 52 | - * @return string 'http' or 'https' | |
| 53 | - * | |
| 54 | - * @since 13.0.0 | |
| 55 | - */ | |
| 56 | - public function getProtocol(); | |
| 51 | + /** | |
| 52 | + * @return string 'http' or 'https' | |
| 53 | + * | |
| 54 | + * @since 13.0.0 | |
| 55 | + */ | |
| 56 | + public function getProtocol(); | |
| 57 | 57 | |
| 58 | - /** | |
| 59 | - * Check that the remote server is installed and not in maintenance mode | |
| 60 | - * | |
| 61 | - * @since 13.0.0 | |
| 62 | - * | |
| 63 | - * @return bool | |
| 64 | - */ | |
| 65 | - public function isActive(); | |
| 58 | + /** | |
| 59 | + * Check that the remote server is installed and not in maintenance mode | |
| 60 | + * | |
| 61 | + * @since 13.0.0 | |
| 62 | + * | |
| 63 | + * @return bool | |
| 64 | + */ | |
| 65 | + public function isActive(); | |
| 66 | 66 | } | 
| @@ -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 []; |