@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | $currentChannel = $_['currentChannel']; |
| 15 | 15 | ?> |
| 16 | 16 | <form id="oca_updatenotification_section" class="followupsection"> |
| 17 | - <?php if($isNewVersionAvailable === true) { ?> |
|
| 17 | + <?php if ($isNewVersionAvailable === true) { ?> |
|
| 18 | 18 | <strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong> |
| 19 | 19 | <?php if ($_['updaterEnabled']) { ?> |
| 20 | 20 | <input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>"> |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | <label for="release-channel"><?php p($l->t('Update channel:')) ?></label> |
| 32 | 32 | <select id="release-channel"> |
| 33 | 33 | <option value="<?php p($currentChannel); ?>"><?php p($currentChannel); ?></option> |
| 34 | - <?php foreach ($channels as $channel => $channelTitle){ ?> |
|
| 34 | + <?php foreach ($channels as $channel => $channelTitle) { ?> |
|
| 35 | 35 | <option value="<?php p($channelTitle) ?>"> |
| 36 | 36 | <?php p($channelTitle) ?> |
| 37 | 37 | </option> |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']])); |
| 92 | 92 | |
| 93 | 93 | if ($this->isAdmin()) { |
| 94 | - $notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index') . '#updater'); |
|
| 94 | + $notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index').'#updater'); |
|
| 95 | 95 | } |
| 96 | 96 | } else { |
| 97 | 97 | $appInfo = $this->getAppInfo($notification->getObjectType()); |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | ]); |
| 112 | 112 | |
| 113 | 113 | if ($this->isAdmin()) { |
| 114 | - $notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps') . '#app-' . $notification->getObjectType()); |
|
| 114 | + $notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps').'#app-'.$notification->getObjectType()); |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | $currentChannel = \OCP\Util::getChannel(); |
| 100 | 100 | |
| 101 | 101 | // Remove the currently used channel from the channels list |
| 102 | - if(($key = array_search($currentChannel, $channels)) !== false) { |
|
| 102 | + if (($key = array_search($currentChannel, $channels)) !== false) { |
|
| 103 | 103 | unset($channels[$key]); |
| 104 | 104 | } |
| 105 | 105 | $updateState = $this->updateChecker->getUpdateState(); |
@@ -43,14 +43,14 @@ discard block |
||
| 43 | 43 | $data = $this->updater->check(); |
| 44 | 44 | $result = []; |
| 45 | 45 | |
| 46 | - if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) { |
|
| 46 | + if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) { |
|
| 47 | 47 | $result['updateAvailable'] = true; |
| 48 | 48 | $result['updateVersion'] = $data['versionstring']; |
| 49 | 49 | $result['updaterEnabled'] = $data['autoupdater'] === '1'; |
| 50 | - if(substr($data['web'], 0, 8) === 'https://') { |
|
| 50 | + if (substr($data['web'], 0, 8) === 'https://') { |
|
| 51 | 51 | $result['updateLink'] = $data['web']; |
| 52 | 52 | } |
| 53 | - if(substr($data['url'], 0, 8) === 'https://') { |
|
| 53 | + if (substr($data['url'], 0, 8) === 'https://') { |
|
| 54 | 54 | $result['downloadLink'] = $data['url']; |
| 55 | 55 | } |
| 56 | 56 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | * @param array $data |
| 65 | 65 | */ |
| 66 | 66 | public function getJavaScript(array $data) { |
| 67 | - $data['array']['oc_updateState'] = json_encode([ |
|
| 67 | + $data['array']['oc_updateState'] = json_encode([ |
|
| 68 | 68 | 'updateAvailable' => true, |
| 69 | 69 | 'updateVersion' => $this->getUpdateState()['updateVersion'], |
| 70 | 70 | 'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '', |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | use OCP\AppFramework\IAppContainer; |
| 31 | 31 | |
| 32 | 32 | class Application extends App { |
| 33 | - public function __construct (array $urlParams = array()) { |
|
| 33 | + public function __construct(array $urlParams = array()) { |
|
| 34 | 34 | parent::__construct('updatenotification', $urlParams); |
| 35 | 35 | $container = $this->getContainer(); |
| 36 | 36 | |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | */ |
| 70 | 70 | protected function run($argument) { |
| 71 | 71 | // Delete old tokens after 2 days |
| 72 | - if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
| 72 | + if ($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
| 73 | 73 | $this->config->deleteSystemValue('updater.secret'); |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | * |
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | -if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) { |
|
| 25 | +if (\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) { |
|
| 26 | 26 | $updater = new \OC\Updater\VersionCheck( |
| 27 | 27 | \OC::$server->getHTTPClientService(), |
| 28 | 28 | \OC::$server->getConfig() |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | ); |
| 33 | 33 | |
| 34 | 34 | $userObject = \OC::$server->getUserSession()->getUser(); |
| 35 | - if($userObject !== null) { |
|
| 36 | - if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) && |
|
| 35 | + if ($userObject !== null) { |
|
| 36 | + if (\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) && |
|
| 37 | 37 | !\OC::$server->getAppManager()->isEnabledForUser('notifications')) { |
| 38 | - if($updateChecker->getUpdateState() !== []) { |
|
| 38 | + if ($updateChecker->getUpdateState() !== []) { |
|
| 39 | 39 | \OCP\Util::addScript('updatenotification', 'notification'); |
| 40 | 40 | OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript'); |
| 41 | 41 | } |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | $uid = $user->getUID(); |
| 80 | 80 | foreach (range(1, min([$number, 20])) as $i) { |
| 81 | - $code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS); |
|
| 81 | + $code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS); |
|
| 82 | 82 | |
| 83 | 83 | $dbCode = new BackupCode(); |
| 84 | 84 | $dbCode->setUserId($uid); |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | $codes = $this->mapper->getBackupCodes($user); |
| 133 | 133 | $total = count($codes); |
| 134 | 134 | $used = 0; |
| 135 | - array_walk($codes, function (BackupCode $code) use (&$used) { |
|
| 135 | + array_walk($codes, function(BackupCode $code) use (&$used) { |
|
| 136 | 136 | if (1 === (int) $code->getUsed()) { |
| 137 | 137 | $used++; |
| 138 | 138 | } |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | $rows = $result->fetchAll(); |
| 48 | 48 | $result->closeCursor(); |
| 49 | 49 | |
| 50 | - return array_map(function ($row) { |
|
| 50 | + return array_map(function($row) { |
|
| 51 | 51 | return BackupCode::fromRow($row); |
| 52 | 52 | }, $rows); |
| 53 | 53 | } |