@@ -32,13 +32,13 @@ |
||
32 | 32 | $revision=(int)$_GET['revision']; |
33 | 33 | |
34 | 34 | try { |
35 | - list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file); |
|
35 | + list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file); |
|
36 | 36 | } catch(\OCP\Files\NotFoundException $e) { |
37 | - header("HTTP/1.1 404 Not Found"); |
|
38 | - $tmpl = new OCP\Template('', '404', 'guest'); |
|
39 | - $tmpl->assign('file', ''); |
|
40 | - $tmpl->printPage(); |
|
41 | - exit(); |
|
37 | + header("HTTP/1.1 404 Not Found"); |
|
38 | + $tmpl = new OCP\Template('', '404', 'guest'); |
|
39 | + $tmpl->assign('file', ''); |
|
40 | + $tmpl->printPage(); |
|
41 | + exit(); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | $versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision; |
@@ -31,20 +31,20 @@ |
||
31 | 31 | |
32 | 32 | $application = new Application(); |
33 | 33 | $application->registerRoutes($this, [ |
34 | - 'routes' => [ |
|
35 | - [ |
|
36 | - 'name' => 'Preview#getPreview', |
|
37 | - 'url' => '/preview', |
|
38 | - 'verb' => 'GET', |
|
39 | - ], |
|
40 | - ], |
|
34 | + 'routes' => [ |
|
35 | + [ |
|
36 | + 'name' => 'Preview#getPreview', |
|
37 | + 'url' => '/preview', |
|
38 | + 'verb' => 'GET', |
|
39 | + ], |
|
40 | + ], |
|
41 | 41 | ]); |
42 | 42 | |
43 | 43 | /** @var $this \OCP\Route\IRouter */ |
44 | 44 | $this->create('files_versions_download', 'download.php') |
45 | - ->actionInclude('files_versions/download.php'); |
|
45 | + ->actionInclude('files_versions/download.php'); |
|
46 | 46 | $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php') |
47 | - ->actionInclude('files_versions/ajax/getVersions.php'); |
|
47 | + ->actionInclude('files_versions/ajax/getVersions.php'); |
|
48 | 48 | $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php') |
49 | - ->actionInclude('files_versions/ajax/rollbackVersion.php'); |
|
49 | + ->actionInclude('files_versions/ajax/rollbackVersion.php'); |
|
50 | 50 |
@@ -41,17 +41,17 @@ discard block |
||
41 | 41 | */ |
42 | 42 | 'instanceid' => '', |
43 | 43 | |
44 | - /** |
|
45 | - * The salt used to hash all passwords, auto-generated by the Nextcloud |
|
46 | - * installer. (There are also per-user salts.) If you lose this salt you lose |
|
47 | - * all your passwords. This example is for documentation only, and you should |
|
48 | - * never use it. |
|
49 | - * |
|
50 | - * @deprecated This salt is deprecated and only used for legacy-compatibility, |
|
51 | - * developers should *NOT* use this value for anything nowadays. |
|
52 | - * |
|
53 | - * 'passwordsalt' => 'd3c944a9af095aa08f', |
|
54 | - */ |
|
44 | + /** |
|
45 | + * The salt used to hash all passwords, auto-generated by the Nextcloud |
|
46 | + * installer. (There are also per-user salts.) If you lose this salt you lose |
|
47 | + * all your passwords. This example is for documentation only, and you should |
|
48 | + * never use it. |
|
49 | + * |
|
50 | + * @deprecated This salt is deprecated and only used for legacy-compatibility, |
|
51 | + * developers should *NOT* use this value for anything nowadays. |
|
52 | + * |
|
53 | + * 'passwordsalt' => 'd3c944a9af095aa08f', |
|
54 | + */ |
|
55 | 55 | 'passwordsalt' => '', |
56 | 56 | |
57 | 57 | /** |
@@ -67,10 +67,10 @@ discard block |
||
67 | 67 | * ubos-raspberry-pi.local and ubos-raspberry-pi-2.local |
68 | 68 | */ |
69 | 69 | 'trusted_domains' => |
70 | - array ( |
|
70 | + array ( |
|
71 | 71 | 'demo.example.org', |
72 | 72 | 'otherdomain.example.org', |
73 | - ), |
|
73 | + ), |
|
74 | 74 | |
75 | 75 | |
76 | 76 | /** |
@@ -242,10 +242,10 @@ discard block |
||
242 | 242 | * IMAP (OC_User_IMAP), SMB (OC_User_SMB), and FTP (OC_User_FTP). |
243 | 243 | */ |
244 | 244 | 'user_backends' => array( |
245 | - array( |
|
246 | - 'class' => 'OC_User_IMAP', |
|
247 | - 'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX') |
|
248 | - ) |
|
245 | + array( |
|
246 | + 'class' => 'OC_User_IMAP', |
|
247 | + 'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX') |
|
248 | + ) |
|
249 | 249 | ), |
250 | 250 | |
251 | 251 | /** |
@@ -699,9 +699,9 @@ discard block |
||
699 | 699 | * Defaults to an empty array. |
700 | 700 | */ |
701 | 701 | 'log.condition' => [ |
702 | - 'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9', |
|
703 | - 'users' => ['sample-user'], |
|
704 | - 'apps' => ['files'], |
|
702 | + 'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9', |
|
703 | + 'users' => ['sample-user'], |
|
704 | + 'apps' => ['files'], |
|
705 | 705 | ], |
706 | 706 | |
707 | 707 | /** |
@@ -761,11 +761,11 @@ discard block |
||
761 | 761 | * * iOS client : ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8`` |
762 | 762 | */ |
763 | 763 | 'customclient_desktop' => |
764 | - 'https://nextcloud.com/install/#install-clients', |
|
764 | + 'https://nextcloud.com/install/#install-clients', |
|
765 | 765 | 'customclient_android' => |
766 | - 'https://play.google.com/store/apps/details?id=com.nextcloud.client', |
|
766 | + 'https://play.google.com/store/apps/details?id=com.nextcloud.client', |
|
767 | 767 | 'customclient_ios' => |
768 | - 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', |
|
768 | + 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', |
|
769 | 769 | |
770 | 770 | /** |
771 | 771 | * Apps |
@@ -789,11 +789,11 @@ discard block |
||
789 | 789 | * indicates if a Web server can write files to that folder. |
790 | 790 | */ |
791 | 791 | 'apps_paths' => array( |
792 | - array( |
|
793 | - 'path'=> '/var/www/nextcloud/apps', |
|
794 | - 'url' => '/apps', |
|
795 | - 'writable' => true, |
|
796 | - ), |
|
792 | + array( |
|
793 | + 'path'=> '/var/www/nextcloud/apps', |
|
794 | + 'url' => '/apps', |
|
795 | + 'writable' => true, |
|
796 | + ), |
|
797 | 797 | ), |
798 | 798 | |
799 | 799 | /** |
@@ -867,8 +867,8 @@ discard block |
||
867 | 867 | * Defaults to ``''`` (empty string) |
868 | 868 | */ |
869 | 869 | 'preview_office_cl_parameters' => |
870 | - ' --headless --nologo --nofirststartwizard --invisible --norestore '. |
|
871 | - '--convert-to pdf --outdir ', |
|
870 | + ' --headless --nologo --nofirststartwizard --invisible --norestore '. |
|
871 | + '--convert-to pdf --outdir ', |
|
872 | 872 | |
873 | 873 | /** |
874 | 874 | * Only register providers that have been explicitly enabled |
@@ -915,14 +915,14 @@ discard block |
||
915 | 915 | * - OC\Preview\XBitmap |
916 | 916 | */ |
917 | 917 | 'enabledPreviewProviders' => array( |
918 | - 'OC\Preview\PNG', |
|
919 | - 'OC\Preview\JPEG', |
|
920 | - 'OC\Preview\GIF', |
|
921 | - 'OC\Preview\BMP', |
|
922 | - 'OC\Preview\XBitmap', |
|
923 | - 'OC\Preview\MP3', |
|
924 | - 'OC\Preview\TXT', |
|
925 | - 'OC\Preview\MarkDown' |
|
918 | + 'OC\Preview\PNG', |
|
919 | + 'OC\Preview\JPEG', |
|
920 | + 'OC\Preview\GIF', |
|
921 | + 'OC\Preview\BMP', |
|
922 | + 'OC\Preview\XBitmap', |
|
923 | + 'OC\Preview\MP3', |
|
924 | + 'OC\Preview\TXT', |
|
925 | + 'OC\Preview\MarkDown' |
|
926 | 926 | ), |
927 | 927 | |
928 | 928 | /** |
@@ -999,11 +999,11 @@ discard block |
||
999 | 999 | |
1000 | 1000 | /** |
1001 | 1001 | * Extra SSL options to be used for configuration. |
1002 | - * |
|
1002 | + * |
|
1003 | 1003 | * Defaults to an empty array. |
1004 | 1004 | */ |
1005 | 1005 | 'openssl' => array( |
1006 | - 'config' => '/absolute/location/of/openssl.cnf', |
|
1006 | + 'config' => '/absolute/location/of/openssl.cnf', |
|
1007 | 1007 | ), |
1008 | 1008 | |
1009 | 1009 | /** |
@@ -1057,46 +1057,46 @@ discard block |
||
1057 | 1057 | * for more information. |
1058 | 1058 | */ |
1059 | 1059 | 'redis' => array( |
1060 | - 'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock' |
|
1061 | - 'port' => 6379, |
|
1062 | - 'timeout' => 0.0, |
|
1063 | - 'password' => '', // Optional, if not defined no password will be used. |
|
1064 | - 'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index. |
|
1060 | + 'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock' |
|
1061 | + 'port' => 6379, |
|
1062 | + 'timeout' => 0.0, |
|
1063 | + 'password' => '', // Optional, if not defined no password will be used. |
|
1064 | + 'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index. |
|
1065 | 1065 | ), |
1066 | 1066 | |
1067 | 1067 | /** |
1068 | 1068 | * Server details for one or more memcached servers to use for memory caching. |
1069 | 1069 | */ |
1070 | 1070 | 'memcached_servers' => array( |
1071 | - // hostname, port and optional weight. Also see: |
|
1072 | - // http://www.php.net/manual/en/memcached.addservers.php |
|
1073 | - // http://www.php.net/manual/en/memcached.addserver.php |
|
1074 | - array('localhost', 11211), |
|
1075 | - //array('other.host.local', 11211), |
|
1071 | + // hostname, port and optional weight. Also see: |
|
1072 | + // http://www.php.net/manual/en/memcached.addservers.php |
|
1073 | + // http://www.php.net/manual/en/memcached.addserver.php |
|
1074 | + array('localhost', 11211), |
|
1075 | + //array('other.host.local', 11211), |
|
1076 | 1076 | ), |
1077 | 1077 | |
1078 | 1078 | /** |
1079 | 1079 | * Connection options for memcached, see http://apprize.info/php/scaling/15.html |
1080 | 1080 | */ |
1081 | 1081 | 'memcached_options' => array( |
1082 | - // Set timeouts to 50ms |
|
1083 | - \Memcached::OPT_CONNECT_TIMEOUT => 50, |
|
1084 | - \Memcached::OPT_RETRY_TIMEOUT => 50, |
|
1085 | - \Memcached::OPT_SEND_TIMEOUT => 50, |
|
1086 | - \Memcached::OPT_RECV_TIMEOUT => 50, |
|
1087 | - \Memcached::OPT_POLL_TIMEOUT => 50, |
|
1082 | + // Set timeouts to 50ms |
|
1083 | + \Memcached::OPT_CONNECT_TIMEOUT => 50, |
|
1084 | + \Memcached::OPT_RETRY_TIMEOUT => 50, |
|
1085 | + \Memcached::OPT_SEND_TIMEOUT => 50, |
|
1086 | + \Memcached::OPT_RECV_TIMEOUT => 50, |
|
1087 | + \Memcached::OPT_POLL_TIMEOUT => 50, |
|
1088 | 1088 | |
1089 | - // Enable compression |
|
1090 | - \Memcached::OPT_COMPRESSION => true, |
|
1089 | + // Enable compression |
|
1090 | + \Memcached::OPT_COMPRESSION => true, |
|
1091 | 1091 | |
1092 | - // Turn on consistent hashing |
|
1093 | - \Memcached::OPT_LIBKETAMA_COMPATIBLE => true, |
|
1092 | + // Turn on consistent hashing |
|
1093 | + \Memcached::OPT_LIBKETAMA_COMPATIBLE => true, |
|
1094 | 1094 | |
1095 | - // Enable Binary Protocol |
|
1096 | - \Memcached::OPT_BINARY_PROTOCOL => true, |
|
1095 | + // Enable Binary Protocol |
|
1096 | + \Memcached::OPT_BINARY_PROTOCOL => true, |
|
1097 | 1097 | |
1098 | - // Binary serializer vill be enabled if the igbinary PECL module is available |
|
1099 | - //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY, |
|
1098 | + // Binary serializer vill be enabled if the igbinary PECL module is available |
|
1099 | + //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY, |
|
1100 | 1100 | ), |
1101 | 1101 | |
1102 | 1102 | |
@@ -1142,31 +1142,31 @@ discard block |
||
1142 | 1142 | * One way to test is applying for a trystack account at http://trystack.org/ |
1143 | 1143 | */ |
1144 | 1144 | 'objectstore' => [ |
1145 | - 'class' => 'OC\\Files\\ObjectStore\\Swift', |
|
1146 | - 'arguments' => [ |
|
1147 | - // trystack will user your facebook id as the user name |
|
1148 | - 'username' => 'facebook100000123456789', |
|
1149 | - // in the trystack dashboard go to user -> settings -> API Password to |
|
1150 | - // generate a password |
|
1151 | - 'password' => 'Secr3tPaSSWoRdt7', |
|
1152 | - // must already exist in the objectstore, name can be different |
|
1153 | - 'container' => 'nextcloud', |
|
1154 | - // prefix to prepend to the fileid, default is 'oid:urn:' |
|
1155 | - 'objectPrefix' => 'oid:urn:', |
|
1156 | - // create the container if it does not exist. default is false |
|
1157 | - 'autocreate' => true, |
|
1158 | - // required, dev-/trystack defaults to 'RegionOne' |
|
1159 | - 'region' => 'RegionOne', |
|
1160 | - // The Identity / Keystone endpoint |
|
1161 | - 'url' => 'http://8.21.28.222:5000/v2.0', |
|
1162 | - // required on dev-/trystack |
|
1163 | - 'tenantName' => 'facebook100000123456789', |
|
1164 | - // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles' |
|
1165 | - // if omitted |
|
1166 | - 'serviceName' => 'swift', |
|
1167 | - // The Interface / url Type, optional |
|
1168 | - 'urlType' => 'internal' |
|
1169 | - ], |
|
1145 | + 'class' => 'OC\\Files\\ObjectStore\\Swift', |
|
1146 | + 'arguments' => [ |
|
1147 | + // trystack will user your facebook id as the user name |
|
1148 | + 'username' => 'facebook100000123456789', |
|
1149 | + // in the trystack dashboard go to user -> settings -> API Password to |
|
1150 | + // generate a password |
|
1151 | + 'password' => 'Secr3tPaSSWoRdt7', |
|
1152 | + // must already exist in the objectstore, name can be different |
|
1153 | + 'container' => 'nextcloud', |
|
1154 | + // prefix to prepend to the fileid, default is 'oid:urn:' |
|
1155 | + 'objectPrefix' => 'oid:urn:', |
|
1156 | + // create the container if it does not exist. default is false |
|
1157 | + 'autocreate' => true, |
|
1158 | + // required, dev-/trystack defaults to 'RegionOne' |
|
1159 | + 'region' => 'RegionOne', |
|
1160 | + // The Identity / Keystone endpoint |
|
1161 | + 'url' => 'http://8.21.28.222:5000/v2.0', |
|
1162 | + // required on dev-/trystack |
|
1163 | + 'tenantName' => 'facebook100000123456789', |
|
1164 | + // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles' |
|
1165 | + // if omitted |
|
1166 | + 'serviceName' => 'swift', |
|
1167 | + // The Interface / url Type, optional |
|
1168 | + 'urlType' => 'internal' |
|
1169 | + ], |
|
1170 | 1170 | ], |
1171 | 1171 | |
1172 | 1172 | |
@@ -1196,8 +1196,8 @@ discard block |
||
1196 | 1196 | * encryption in MySQL or specify a custom wait timeout on a cheap hoster. |
1197 | 1197 | */ |
1198 | 1198 | 'dbdriveroptions' => array( |
1199 | - PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem', |
|
1200 | - PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800' |
|
1199 | + PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem', |
|
1200 | + PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800' |
|
1201 | 1201 | ), |
1202 | 1202 | |
1203 | 1203 | /** |
@@ -1249,10 +1249,10 @@ discard block |
||
1249 | 1249 | * - pgsql (PostgreSQL) |
1250 | 1250 | */ |
1251 | 1251 | 'supportedDatabases' => array( |
1252 | - 'sqlite', |
|
1253 | - 'mysql', |
|
1254 | - 'pgsql', |
|
1255 | - 'oci', |
|
1252 | + 'sqlite', |
|
1253 | + 'mysql', |
|
1254 | + 'pgsql', |
|
1255 | + 'oci', |
|
1256 | 1256 | ), |
1257 | 1257 | |
1258 | 1258 | /** |
@@ -38,28 +38,28 @@ |
||
38 | 38 | */ |
39 | 39 | interface IApacheBackend { |
40 | 40 | |
41 | - /** |
|
42 | - * In case the user has been authenticated by Apache true is returned. |
|
43 | - * |
|
44 | - * @return boolean whether Apache reports a user as currently logged in. |
|
45 | - * @since 6.0.0 |
|
46 | - */ |
|
47 | - public function isSessionActive(); |
|
41 | + /** |
|
42 | + * In case the user has been authenticated by Apache true is returned. |
|
43 | + * |
|
44 | + * @return boolean whether Apache reports a user as currently logged in. |
|
45 | + * @since 6.0.0 |
|
46 | + */ |
|
47 | + public function isSessionActive(); |
|
48 | 48 | |
49 | - /** |
|
50 | - * Creates an attribute which is added to the logout hyperlink. It can |
|
51 | - * supply any attribute(s) which are valid for <a>. |
|
52 | - * |
|
53 | - * @return string with one or more HTML attributes. |
|
54 | - * @since 6.0.0 |
|
55 | - */ |
|
56 | - public function getLogoutAttribute(); |
|
49 | + /** |
|
50 | + * Creates an attribute which is added to the logout hyperlink. It can |
|
51 | + * supply any attribute(s) which are valid for <a>. |
|
52 | + * |
|
53 | + * @return string with one or more HTML attributes. |
|
54 | + * @since 6.0.0 |
|
55 | + */ |
|
56 | + public function getLogoutAttribute(); |
|
57 | 57 | |
58 | - /** |
|
59 | - * Return the id of the current user |
|
60 | - * @return string |
|
61 | - * @since 6.0.0 |
|
62 | - */ |
|
63 | - public function getCurrentUserId(); |
|
58 | + /** |
|
59 | + * Return the id of the current user |
|
60 | + * @return string |
|
61 | + * @since 6.0.0 |
|
62 | + */ |
|
63 | + public function getCurrentUserId(); |
|
64 | 64 | |
65 | 65 | } |
@@ -29,30 +29,30 @@ |
||
29 | 29 | */ |
30 | 30 | interface ICredentials { |
31 | 31 | |
32 | - /** |
|
33 | - * Get the user UID |
|
34 | - * |
|
35 | - * @since 12 |
|
36 | - * |
|
37 | - * @return string |
|
38 | - */ |
|
39 | - public function getUID(); |
|
32 | + /** |
|
33 | + * Get the user UID |
|
34 | + * |
|
35 | + * @since 12 |
|
36 | + * |
|
37 | + * @return string |
|
38 | + */ |
|
39 | + public function getUID(); |
|
40 | 40 | |
41 | - /** |
|
42 | - * Get the login name the users used to login |
|
43 | - * |
|
44 | - * @since 12 |
|
45 | - * |
|
46 | - * @return string |
|
47 | - */ |
|
48 | - public function getLoginName(); |
|
41 | + /** |
|
42 | + * Get the login name the users used to login |
|
43 | + * |
|
44 | + * @since 12 |
|
45 | + * |
|
46 | + * @return string |
|
47 | + */ |
|
48 | + public function getLoginName(); |
|
49 | 49 | |
50 | - /** |
|
51 | - * Get the password |
|
52 | - * |
|
53 | - * @since 12 |
|
54 | - * |
|
55 | - * @return string |
|
56 | - */ |
|
57 | - public function getPassword(); |
|
50 | + /** |
|
51 | + * Get the password |
|
52 | + * |
|
53 | + * @since 12 |
|
54 | + * |
|
55 | + * @return string |
|
56 | + */ |
|
57 | + public function getPassword(); |
|
58 | 58 | } |
@@ -31,14 +31,14 @@ |
||
31 | 31 | */ |
32 | 32 | interface IStore { |
33 | 33 | |
34 | - /** |
|
35 | - * Get login credentials of the currently logged in user |
|
36 | - * |
|
37 | - * @since 12 |
|
38 | - * |
|
39 | - * @throws CredentialsUnavailableException |
|
40 | - * @return ICredentials the login credentials of the current user |
|
41 | - */ |
|
42 | - public function getLoginCredentials(); |
|
34 | + /** |
|
35 | + * Get login credentials of the currently logged in user |
|
36 | + * |
|
37 | + * @since 12 |
|
38 | + * |
|
39 | + * @throws CredentialsUnavailableException |
|
40 | + * @return ICredentials the login credentials of the current user |
|
41 | + */ |
|
42 | + public function getLoginCredentials(); |
|
43 | 43 | |
44 | 44 | } |
@@ -30,64 +30,64 @@ |
||
30 | 30 | */ |
31 | 31 | interface IProvider { |
32 | 32 | |
33 | - /** |
|
34 | - * Get unique identifier of this 2FA provider |
|
35 | - * |
|
36 | - * @since 9.1.0 |
|
37 | - * |
|
38 | - * @return string |
|
39 | - */ |
|
40 | - public function getId(); |
|
33 | + /** |
|
34 | + * Get unique identifier of this 2FA provider |
|
35 | + * |
|
36 | + * @since 9.1.0 |
|
37 | + * |
|
38 | + * @return string |
|
39 | + */ |
|
40 | + public function getId(); |
|
41 | 41 | |
42 | - /** |
|
43 | - * Get the display name for selecting the 2FA provider |
|
44 | - * |
|
45 | - * Example: "Email" |
|
46 | - * |
|
47 | - * @since 9.1.0 |
|
48 | - * |
|
49 | - * @return string |
|
50 | - */ |
|
51 | - public function getDisplayName(); |
|
42 | + /** |
|
43 | + * Get the display name for selecting the 2FA provider |
|
44 | + * |
|
45 | + * Example: "Email" |
|
46 | + * |
|
47 | + * @since 9.1.0 |
|
48 | + * |
|
49 | + * @return string |
|
50 | + */ |
|
51 | + public function getDisplayName(); |
|
52 | 52 | |
53 | - /** |
|
54 | - * Get the description for selecting the 2FA provider |
|
55 | - * |
|
56 | - * Example: "Get a token via e-mail" |
|
57 | - * |
|
58 | - * @since 9.1.0 |
|
59 | - * |
|
60 | - * @return string |
|
61 | - */ |
|
62 | - public function getDescription(); |
|
53 | + /** |
|
54 | + * Get the description for selecting the 2FA provider |
|
55 | + * |
|
56 | + * Example: "Get a token via e-mail" |
|
57 | + * |
|
58 | + * @since 9.1.0 |
|
59 | + * |
|
60 | + * @return string |
|
61 | + */ |
|
62 | + public function getDescription(); |
|
63 | 63 | |
64 | - /** |
|
65 | - * Get the template for rending the 2FA provider view |
|
66 | - * |
|
67 | - * @since 9.1.0 |
|
68 | - * |
|
69 | - * @param IUser $user |
|
70 | - * @return Template |
|
71 | - */ |
|
72 | - public function getTemplate(IUser $user); |
|
64 | + /** |
|
65 | + * Get the template for rending the 2FA provider view |
|
66 | + * |
|
67 | + * @since 9.1.0 |
|
68 | + * |
|
69 | + * @param IUser $user |
|
70 | + * @return Template |
|
71 | + */ |
|
72 | + public function getTemplate(IUser $user); |
|
73 | 73 | |
74 | - /** |
|
75 | - * Verify the given challenge |
|
76 | - * |
|
77 | - * @since 9.1.0 |
|
78 | - * |
|
79 | - * @param IUser $user |
|
80 | - * @param string $challenge |
|
81 | - */ |
|
82 | - public function verifyChallenge(IUser $user, $challenge); |
|
74 | + /** |
|
75 | + * Verify the given challenge |
|
76 | + * |
|
77 | + * @since 9.1.0 |
|
78 | + * |
|
79 | + * @param IUser $user |
|
80 | + * @param string $challenge |
|
81 | + */ |
|
82 | + public function verifyChallenge(IUser $user, $challenge); |
|
83 | 83 | |
84 | - /** |
|
85 | - * Decides whether 2FA is enabled for the given user |
|
86 | - * |
|
87 | - * @since 9.1.0 |
|
88 | - * |
|
89 | - * @param IUser $user |
|
90 | - * @return boolean |
|
91 | - */ |
|
92 | - public function isTwoFactorAuthEnabledForUser(IUser $user); |
|
84 | + /** |
|
85 | + * Decides whether 2FA is enabled for the given user |
|
86 | + * |
|
87 | + * @since 9.1.0 |
|
88 | + * |
|
89 | + * @param IUser $user |
|
90 | + * @return boolean |
|
91 | + */ |
|
92 | + public function isTwoFactorAuthEnabledForUser(IUser $user); |
|
93 | 93 | } |
@@ -38,13 +38,13 @@ |
||
38 | 38 | * @deprecated 8.1.0 |
39 | 39 | */ |
40 | 40 | interface IHelper { |
41 | - /** |
|
42 | - * Gets the content of an URL by using CURL or a fallback if it is not |
|
43 | - * installed |
|
44 | - * @param string $url the url that should be fetched |
|
45 | - * @return string the content of the webpage |
|
46 | - * @since 6.0.0 |
|
47 | - * @deprecated 8.1.0 Use \OCP\IServerContainer::getHTTPClientService |
|
48 | - */ |
|
49 | - public function getUrlContent($url); |
|
41 | + /** |
|
42 | + * Gets the content of an URL by using CURL or a fallback if it is not |
|
43 | + * installed |
|
44 | + * @param string $url the url that should be fetched |
|
45 | + * @return string the content of the webpage |
|
46 | + * @since 6.0.0 |
|
47 | + * @deprecated 8.1.0 Use \OCP\IServerContainer::getHTTPClientService |
|
48 | + */ |
|
49 | + public function getUrlContent($url); |
|
50 | 50 | } |
@@ -46,17 +46,17 @@ |
||
46 | 46 | */ |
47 | 47 | interface ITagManager { |
48 | 48 | |
49 | - /** |
|
50 | - * Create a new \OCP\ITags instance and load tags from db for the current user. |
|
51 | - * |
|
52 | - * @see \OCP\ITags |
|
53 | - * @param string $type The type identifier e.g. 'contact' or 'event'. |
|
54 | - * @param array $defaultTags An array of default tags to be used if none are stored. |
|
55 | - * @param boolean $includeShared Whether to include tags for items shared with this user by others. |
|
56 | - * @param string $userId user for which to retrieve the tags, defaults to the currently |
|
57 | - * logged in user |
|
58 | - * @return \OCP\ITags |
|
59 | - * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0 |
|
60 | - */ |
|
61 | - public function load($type, $defaultTags = array(), $includeShared = false, $userId = null); |
|
49 | + /** |
|
50 | + * Create a new \OCP\ITags instance and load tags from db for the current user. |
|
51 | + * |
|
52 | + * @see \OCP\ITags |
|
53 | + * @param string $type The type identifier e.g. 'contact' or 'event'. |
|
54 | + * @param array $defaultTags An array of default tags to be used if none are stored. |
|
55 | + * @param boolean $includeShared Whether to include tags for items shared with this user by others. |
|
56 | + * @param string $userId user for which to retrieve the tags, defaults to the currently |
|
57 | + * logged in user |
|
58 | + * @return \OCP\ITags |
|
59 | + * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0 |
|
60 | + */ |
|
61 | + public function load($type, $defaultTags = array(), $includeShared = false, $userId = null); |
|
62 | 62 | } |