@@ -448,7 +448,7 @@ |
||
| 448 | 448 | |
| 449 | 449 | /** |
| 450 | 450 | * Checks if the CSRF check was correct |
| 451 | - * @return bool true if CSRF check passed |
|
| 451 | + * @return boolean|null true if CSRF check passed |
|
| 452 | 452 | */ |
| 453 | 453 | public function passesCSRFCheck() { |
| 454 | 454 | if($this->csrfTokenManager === null) { |
@@ -20,7 +20,6 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | namespace OCA\DAV\CalDAV\Publishing\Xml; |
| 22 | 22 | |
| 23 | -use OCA\DAV\CalDAV\Publishing\PublishPlugin as Plugin; |
|
| 24 | 23 | use Sabre\Xml\Writer; |
| 25 | 24 | use Sabre\Xml\XmlSerializable; |
| 26 | 25 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * @param IDBConnection $connection |
| 31 | - * @return array |
|
| 31 | + * @return string[] |
|
| 32 | 32 | */ |
| 33 | 33 | public function sql(IDBConnection $connection) { |
| 34 | 34 | $qb = $connection->getQueryBuilder(); |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | * get the owner of a path |
| 100 | 100 | * |
| 101 | 101 | * @param string $path The path to get the owner |
| 102 | - * @return string uid or false |
|
| 102 | + * @return integer uid or false |
|
| 103 | 103 | */ |
| 104 | 104 | public function getOwner($path) { |
| 105 | 105 | return $this->user->getUID(); |
@@ -308,6 +308,7 @@ |
||
| 308 | 308 | * @param array $params the parameters of the sql query |
| 309 | 309 | * @param int $limit the maximum number of rows |
| 310 | 310 | * @param int $offset from which row we want to start |
| 311 | + * @param string $msg |
|
| 311 | 312 | * @return string formatted error message string |
| 312 | 313 | * @since 9.1.0 |
| 313 | 314 | */ |
@@ -329,7 +329,7 @@ |
||
| 329 | 329 | /** |
| 330 | 330 | * Checks if the version requires an update and shows |
| 331 | 331 | * @param bool $showTemplate Whether an update screen should get shown |
| 332 | - * @return bool |
|
| 332 | + * @return null|boolean |
|
| 333 | 333 | */ |
| 334 | 334 | public static function checkUpgrade($showTemplate = true) { |
| 335 | 335 | if (\OCP\Util::needUpgrade()) { |
@@ -308,7 +308,7 @@ |
||
| 308 | 308 | /** |
| 309 | 309 | * counts the users in the database |
| 310 | 310 | * |
| 311 | - * @return int|bool |
|
| 311 | + * @return integer |
|
| 312 | 312 | */ |
| 313 | 313 | public function countUsers() { |
| 314 | 314 | $query = \OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); |
@@ -26,11 +26,9 @@ |
||
| 26 | 26 | |
| 27 | 27 | use OCP\Settings\ISettings; |
| 28 | 28 | use OCP\Template; |
| 29 | -use OCP\IUser; |
|
| 30 | 29 | use OCP\IGroupManager; |
| 31 | 30 | use OCP\IUserSession; |
| 32 | 31 | use OCP\IConfig; |
| 33 | -use OC\Settings\Panels\Helper; |
|
| 34 | 32 | use OCP\L10N\IFactory; |
| 35 | 33 | |
| 36 | 34 | class Profile implements ISettings { |
@@ -39,7 +39,6 @@ discard block |
||
| 39 | 39 | use OCP\IGroupManager; |
| 40 | 40 | use OCP\Defaults; |
| 41 | 41 | use OCP\IURLGenerator; |
| 42 | - |
|
| 43 | 42 | use OC\Settings\Panels\Personal\Profile; |
| 44 | 43 | use OC\Settings\Panels\Personal\Legacy as LegacyPersonal; |
| 45 | 44 | use OC\Settings\Panels\Admin\Legacy as LegacyAdmin; |
@@ -54,7 +53,6 @@ discard block |
||
| 54 | 53 | use OC\Settings\Panels\Admin\Mail; |
| 55 | 54 | use OC\Settings\Panels\Admin\Logging; |
| 56 | 55 | use OC\Settings\Panels\Admin\SecurityWarning; |
| 57 | -use OC\Settings\Panels\Admin\Updater; |
|
| 58 | 56 | use OC\Settings\Panels\Admin\Tips; |
| 59 | 57 | use OC\Settings\Panels\Admin\Status; |
| 60 | 58 | |