@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - |
|
| 4 | 3 | * |
| 5 | 4 | * @author Bjoern Schiessle <[email protected]> |
| 6 | 5 | * @author Jan-Christoph Borchardt <[email protected]> |
@@ -28,55 +28,55 @@ |
||
| 28 | 28 | use OCP\Settings\IIconSection; |
| 29 | 29 | |
| 30 | 30 | class Section implements IIconSection { |
| 31 | - /** @var IL10N */ |
|
| 32 | - private $l; |
|
| 33 | - /** @var IURLGenerator */ |
|
| 34 | - private $url; |
|
| 31 | + /** @var IL10N */ |
|
| 32 | + private $l; |
|
| 33 | + /** @var IURLGenerator */ |
|
| 34 | + private $url; |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * @param IURLGenerator $url |
|
| 38 | - * @param IL10N $l |
|
| 39 | - */ |
|
| 40 | - public function __construct(IURLGenerator $url, IL10N $l) { |
|
| 41 | - $this->url = $url; |
|
| 42 | - $this->l = $l; |
|
| 43 | - } |
|
| 36 | + /** |
|
| 37 | + * @param IURLGenerator $url |
|
| 38 | + * @param IL10N $l |
|
| 39 | + */ |
|
| 40 | + public function __construct(IURLGenerator $url, IL10N $l) { |
|
| 41 | + $this->url = $url; |
|
| 42 | + $this->l = $l; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
| 47 | - * e.g. 'ldap' |
|
| 48 | - * |
|
| 49 | - * @returns string |
|
| 50 | - */ |
|
| 51 | - public function getID() { |
|
| 52 | - return 'theming'; |
|
| 53 | - } |
|
| 45 | + /** |
|
| 46 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
| 47 | + * e.g. 'ldap' |
|
| 48 | + * |
|
| 49 | + * @returns string |
|
| 50 | + */ |
|
| 51 | + public function getID() { |
|
| 52 | + return 'theming'; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
| 57 | - * integration'. Use the L10N service to translate it. |
|
| 58 | - * |
|
| 59 | - * @return string |
|
| 60 | - */ |
|
| 61 | - public function getName() { |
|
| 62 | - return $this->l->t('Theming'); |
|
| 63 | - } |
|
| 55 | + /** |
|
| 56 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
| 57 | + * integration'. Use the L10N service to translate it. |
|
| 58 | + * |
|
| 59 | + * @return string |
|
| 60 | + */ |
|
| 61 | + public function getName() { |
|
| 62 | + return $this->l->t('Theming'); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * @return int whether the form should be rather on the top or bottom of |
|
| 67 | - * the settings navigation. The sections are arranged in ascending order of |
|
| 68 | - * the priority values. It is required to return a value between 0 and 99. |
|
| 69 | - * |
|
| 70 | - * E.g.: 70 |
|
| 71 | - */ |
|
| 72 | - public function getPriority() { |
|
| 73 | - return 30; |
|
| 74 | - } |
|
| 65 | + /** |
|
| 66 | + * @return int whether the form should be rather on the top or bottom of |
|
| 67 | + * the settings navigation. The sections are arranged in ascending order of |
|
| 68 | + * the priority values. It is required to return a value between 0 and 99. |
|
| 69 | + * |
|
| 70 | + * E.g.: 70 |
|
| 71 | + */ |
|
| 72 | + public function getPriority() { |
|
| 73 | + return 30; |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - /** |
|
| 77 | - * {@inheritdoc} |
|
| 78 | - */ |
|
| 79 | - public function getIcon() { |
|
| 80 | - return $this->url->imagePath('theming', 'app-dark.svg'); |
|
| 81 | - } |
|
| 76 | + /** |
|
| 77 | + * {@inheritdoc} |
|
| 78 | + */ |
|
| 79 | + public function getIcon() { |
|
| 80 | + return $this->url->imagePath('theming', 'app-dark.svg'); |
|
| 81 | + } |
|
| 82 | 82 | } |
@@ -30,46 +30,46 @@ |
||
| 30 | 30 | |
| 31 | 31 | class SettingsController extends Controller { |
| 32 | 32 | |
| 33 | - /** @var BackupCodeStorage */ |
|
| 34 | - private $storage; |
|
| 33 | + /** @var BackupCodeStorage */ |
|
| 34 | + private $storage; |
|
| 35 | 35 | |
| 36 | - /** @var IUserSession */ |
|
| 37 | - private $userSession; |
|
| 36 | + /** @var IUserSession */ |
|
| 37 | + private $userSession; |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @param string $appName |
|
| 41 | - * @param IRequest $request |
|
| 42 | - * @param BackupCodeStorage $storage |
|
| 43 | - * @param IUserSession $userSession |
|
| 44 | - */ |
|
| 45 | - public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) { |
|
| 46 | - parent::__construct($appName, $request); |
|
| 47 | - $this->userSession = $userSession; |
|
| 48 | - $this->storage = $storage; |
|
| 49 | - } |
|
| 39 | + /** |
|
| 40 | + * @param string $appName |
|
| 41 | + * @param IRequest $request |
|
| 42 | + * @param BackupCodeStorage $storage |
|
| 43 | + * @param IUserSession $userSession |
|
| 44 | + */ |
|
| 45 | + public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) { |
|
| 46 | + parent::__construct($appName, $request); |
|
| 47 | + $this->userSession = $userSession; |
|
| 48 | + $this->storage = $storage; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @NoAdminRequired |
|
| 53 | - * @return JSONResponse |
|
| 54 | - */ |
|
| 55 | - public function state() { |
|
| 56 | - $user = $this->userSession->getUser(); |
|
| 57 | - return $this->storage->getBackupCodesState($user); |
|
| 58 | - } |
|
| 51 | + /** |
|
| 52 | + * @NoAdminRequired |
|
| 53 | + * @return JSONResponse |
|
| 54 | + */ |
|
| 55 | + public function state() { |
|
| 56 | + $user = $this->userSession->getUser(); |
|
| 57 | + return $this->storage->getBackupCodesState($user); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * @NoAdminRequired |
|
| 62 | - * @PasswordConfirmationRequired |
|
| 63 | - * |
|
| 64 | - * @return JSONResponse |
|
| 65 | - */ |
|
| 66 | - public function createCodes() { |
|
| 67 | - $user = $this->userSession->getUser(); |
|
| 68 | - $codes = $this->storage->createCodes($user); |
|
| 69 | - return new JSONResponse([ |
|
| 70 | - 'codes' => $codes, |
|
| 71 | - 'state' => $this->storage->getBackupCodesState($user), |
|
| 72 | - ]); |
|
| 73 | - } |
|
| 60 | + /** |
|
| 61 | + * @NoAdminRequired |
|
| 62 | + * @PasswordConfirmationRequired |
|
| 63 | + * |
|
| 64 | + * @return JSONResponse |
|
| 65 | + */ |
|
| 66 | + public function createCodes() { |
|
| 67 | + $user = $this->userSession->getUser(); |
|
| 68 | + $codes = $this->storage->createCodes($user); |
|
| 69 | + return new JSONResponse([ |
|
| 70 | + 'codes' => $codes, |
|
| 71 | + 'state' => $this->storage->getBackupCodesState($user), |
|
| 72 | + ]); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | 75 | } |
@@ -34,13 +34,13 @@ |
||
| 34 | 34 | */ |
| 35 | 35 | class BackupCode extends Entity { |
| 36 | 36 | |
| 37 | - /** @var string */ |
|
| 38 | - protected $userId; |
|
| 37 | + /** @var string */ |
|
| 38 | + protected $userId; |
|
| 39 | 39 | |
| 40 | - /** @var string */ |
|
| 41 | - protected $code; |
|
| 40 | + /** @var string */ |
|
| 41 | + protected $code; |
|
| 42 | 42 | |
| 43 | - /** @var int */ |
|
| 44 | - protected $used; |
|
| 43 | + /** @var int */ |
|
| 44 | + protected $used; |
|
| 45 | 45 | |
| 46 | 46 | } |
@@ -21,17 +21,17 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | // @codeCoverageIgnoreStart |
| 23 | 23 | return [ |
| 24 | - 'routes' => [ |
|
| 25 | - [ |
|
| 26 | - 'name' => 'settings#state', |
|
| 27 | - 'url' => '/settings/state', |
|
| 28 | - 'verb' => 'GET' |
|
| 29 | - ], |
|
| 30 | - [ |
|
| 31 | - 'name' => 'settings#createCodes', |
|
| 32 | - 'url' => '/settings/create', |
|
| 33 | - 'verb' => 'POST' |
|
| 34 | - ], |
|
| 35 | - ] |
|
| 24 | + 'routes' => [ |
|
| 25 | + [ |
|
| 26 | + 'name' => 'settings#state', |
|
| 27 | + 'url' => '/settings/state', |
|
| 28 | + 'verb' => 'GET' |
|
| 29 | + ], |
|
| 30 | + [ |
|
| 31 | + 'name' => 'settings#createCodes', |
|
| 32 | + 'url' => '/settings/create', |
|
| 33 | + 'verb' => 'POST' |
|
| 34 | + ], |
|
| 35 | + ] |
|
| 36 | 36 | ]; |
| 37 | 37 | // @codeCoverageIgnoreEnd |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password']))); |
| 6 | 6 | if ( isset($_['expiration']) ) { |
| 7 | - print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); |
|
| 8 | - print_unescaped("\n\n"); |
|
| 7 | + print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); |
|
| 8 | + print_unescaped("\n\n"); |
|
| 9 | 9 | } |
| 10 | 10 | // TRANSLATORS term at the end of a mail |
| 11 | 11 | p($l->t("Cheers!")); |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | - /** @var array $_ */ |
|
| 3 | - /** @var \OCP\IL10N $l */ |
|
| 2 | + /** @var array $_ */ |
|
| 3 | + /** @var \OCP\IL10N $l */ |
|
| 4 | 4 | script('encryption', 'settings-personal'); |
| 5 | 5 | script('core', 'multiselect'); |
| 6 | 6 | ?> |
@@ -20,8 +20,8 @@ discard block |
||
| 20 | 20 | <br /> |
| 21 | 21 | <?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?> |
| 22 | 22 | <?php if ( $_["recoveryEnabledForUser"] ): |
| 23 | - p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) ); |
|
| 24 | - endif; ?> |
|
| 23 | + p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) ); |
|
| 24 | + endif; ?> |
|
| 25 | 25 | <br /> |
| 26 | 26 | <input |
| 27 | 27 | type="password" |
@@ -15,10 +15,10 @@ |
||
| 15 | 15 | <td width="20px"> </td> |
| 16 | 16 | <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;"> |
| 17 | 17 | <?php |
| 18 | - print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', array($_['password']))); |
|
| 19 | - // TRANSLATORS term at the end of a mail |
|
| 20 | - p($l->t('Cheers!')); |
|
| 21 | - ?> |
|
| 18 | + print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', array($_['password']))); |
|
| 19 | + // TRANSLATORS term at the end of a mail |
|
| 20 | + p($l->t('Cheers!')); |
|
| 21 | + ?> |
|
| 22 | 22 | </td> |
| 23 | 23 | </tr> |
| 24 | 24 | <tr><td colspan="2"> </td></tr> |
@@ -32,58 +32,58 @@ |
||
| 32 | 32 | use OCP\IUserSession; |
| 33 | 33 | |
| 34 | 34 | class Setup { |
| 35 | - /** |
|
| 36 | - * @var Crypt |
|
| 37 | - */ |
|
| 38 | - private $crypt; |
|
| 39 | - /** |
|
| 40 | - * @var KeyManager |
|
| 41 | - */ |
|
| 42 | - private $keyManager; |
|
| 43 | - /** |
|
| 44 | - * @var ILogger |
|
| 45 | - */ |
|
| 46 | - private $logger; |
|
| 47 | - /** |
|
| 48 | - * @var bool|string |
|
| 49 | - */ |
|
| 50 | - private $user; |
|
| 35 | + /** |
|
| 36 | + * @var Crypt |
|
| 37 | + */ |
|
| 38 | + private $crypt; |
|
| 39 | + /** |
|
| 40 | + * @var KeyManager |
|
| 41 | + */ |
|
| 42 | + private $keyManager; |
|
| 43 | + /** |
|
| 44 | + * @var ILogger |
|
| 45 | + */ |
|
| 46 | + private $logger; |
|
| 47 | + /** |
|
| 48 | + * @var bool|string |
|
| 49 | + */ |
|
| 50 | + private $user; |
|
| 51 | 51 | |
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * @param ILogger $logger |
|
| 55 | - * @param IUserSession $userSession |
|
| 56 | - * @param Crypt $crypt |
|
| 57 | - * @param KeyManager $keyManager |
|
| 58 | - */ |
|
| 59 | - public function __construct(ILogger $logger, |
|
| 60 | - IUserSession $userSession, |
|
| 61 | - Crypt $crypt, |
|
| 62 | - KeyManager $keyManager) { |
|
| 63 | - $this->logger = $logger; |
|
| 64 | - $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false; |
|
| 65 | - $this->crypt = $crypt; |
|
| 66 | - $this->keyManager = $keyManager; |
|
| 67 | - } |
|
| 53 | + /** |
|
| 54 | + * @param ILogger $logger |
|
| 55 | + * @param IUserSession $userSession |
|
| 56 | + * @param Crypt $crypt |
|
| 57 | + * @param KeyManager $keyManager |
|
| 58 | + */ |
|
| 59 | + public function __construct(ILogger $logger, |
|
| 60 | + IUserSession $userSession, |
|
| 61 | + Crypt $crypt, |
|
| 62 | + KeyManager $keyManager) { |
|
| 63 | + $this->logger = $logger; |
|
| 64 | + $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false; |
|
| 65 | + $this->crypt = $crypt; |
|
| 66 | + $this->keyManager = $keyManager; |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * @param string $uid user id |
|
| 71 | - * @param string $password user password |
|
| 72 | - * @return bool |
|
| 73 | - */ |
|
| 74 | - public function setupUser($uid, $password) { |
|
| 75 | - if (!$this->keyManager->userHasKeys($uid)) { |
|
| 76 | - return $this->keyManager->storeKeyPair($uid, $password, |
|
| 77 | - $this->crypt->createKeyPair()); |
|
| 78 | - } |
|
| 79 | - return true; |
|
| 80 | - } |
|
| 69 | + /** |
|
| 70 | + * @param string $uid user id |
|
| 71 | + * @param string $password user password |
|
| 72 | + * @return bool |
|
| 73 | + */ |
|
| 74 | + public function setupUser($uid, $password) { |
|
| 75 | + if (!$this->keyManager->userHasKeys($uid)) { |
|
| 76 | + return $this->keyManager->storeKeyPair($uid, $password, |
|
| 77 | + $this->crypt->createKeyPair()); |
|
| 78 | + } |
|
| 79 | + return true; |
|
| 80 | + } |
|
| 81 | 81 | |
| 82 | - /** |
|
| 83 | - * make sure that all system keys exists |
|
| 84 | - */ |
|
| 85 | - public function setupSystem() { |
|
| 86 | - $this->keyManager->validateShareKey(); |
|
| 87 | - $this->keyManager->validateMasterKey(); |
|
| 88 | - } |
|
| 82 | + /** |
|
| 83 | + * make sure that all system keys exists |
|
| 84 | + */ |
|
| 85 | + public function setupSystem() { |
|
| 86 | + $this->keyManager->validateShareKey(); |
|
| 87 | + $this->keyManager->validateMasterKey(); |
|
| 88 | + } |
|
| 89 | 89 | } |