@@ -32,13 +32,13 @@ discard block |
||
| 32 | 32 | <ul> |
| 33 | 33 | <li class="settings-caption">Personal</li> |
| 34 | 34 | <?php |
| 35 | - foreach($_['forms']['personal'] as $form) { |
|
| 36 | - if (isset($form['anchor'])) { |
|
| 37 | - $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); |
|
| 38 | - $class = 'nav-icon-' . $form['anchor']; |
|
| 39 | - $sectionName = $form['section-name']; |
|
| 40 | - $active = $form['active'] ? ' class="active"' : ''; |
|
| 41 | - ?> |
|
| 35 | + foreach($_['forms']['personal'] as $form) { |
|
| 36 | + if (isset($form['anchor'])) { |
|
| 37 | + $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); |
|
| 38 | + $class = 'nav-icon-' . $form['anchor']; |
|
| 39 | + $sectionName = $form['section-name']; |
|
| 40 | + $active = $form['active'] ? ' class="active"' : ''; |
|
| 41 | + ?> |
|
| 42 | 42 | <li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>> |
| 43 | 43 | <a href="<?php p($anchor); ?>"> |
| 44 | 44 | <?php if (!empty($form['icon'])) { ?> |
@@ -50,24 +50,24 @@ discard block |
||
| 50 | 50 | </a> |
| 51 | 51 | </li> |
| 52 | 52 | <?php |
| 53 | - } |
|
| 54 | - } |
|
| 55 | - ?> |
|
| 53 | + } |
|
| 54 | + } |
|
| 55 | + ?> |
|
| 56 | 56 | |
| 57 | 57 | <?php |
| 58 | - if(!empty($_['forms']['admin'])) { |
|
| 59 | - ?> |
|
| 58 | + if(!empty($_['forms']['admin'])) { |
|
| 59 | + ?> |
|
| 60 | 60 | <li class="settings-caption">Administration</li> |
| 61 | 61 | <?php |
| 62 | - } |
|
| 63 | - foreach($_['forms']['admin'] as $form) { |
|
| 64 | - if (isset($form['anchor'])) { |
|
| 62 | + } |
|
| 63 | + foreach($_['forms']['admin'] as $form) { |
|
| 64 | + if (isset($form['anchor'])) { |
|
| 65 | 65 | |
| 66 | - $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); |
|
| 67 | - $class = 'nav-icon-' . $form['anchor']; |
|
| 68 | - $sectionName = $form['section-name']; |
|
| 69 | - $active = $form['active'] ? ' class="active"' : ''; |
|
| 70 | - ?> |
|
| 66 | + $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); |
|
| 67 | + $class = 'nav-icon-' . $form['anchor']; |
|
| 68 | + $sectionName = $form['section-name']; |
|
| 69 | + $active = $form['active'] ? ' class="active"' : ''; |
|
| 70 | + ?> |
|
| 71 | 71 | <li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>> |
| 72 | 72 | <a href="<?php p($anchor); ?>"> |
| 73 | 73 | <?php if (!empty($form['icon'])) { ?> |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | </a> |
| 80 | 80 | </li> |
| 81 | 81 | <?php |
| 82 | - } |
|
| 83 | - } |
|
| 84 | - ?> |
|
| 82 | + } |
|
| 83 | + } |
|
| 84 | + ?> |
|
| 85 | 85 | </ul> |
| 86 | 86 | </div> |
| 87 | 87 | |
@@ -30,56 +30,56 @@ |
||
| 30 | 30 | |
| 31 | 31 | class SyncClients implements ISettings { |
| 32 | 32 | |
| 33 | - /** @var IConfig */ |
|
| 34 | - private $config; |
|
| 35 | - /** @var \OC_Defaults */ |
|
| 36 | - private $defaults; |
|
| 33 | + /** @var IConfig */ |
|
| 34 | + private $config; |
|
| 35 | + /** @var \OC_Defaults */ |
|
| 36 | + private $defaults; |
|
| 37 | 37 | |
| 38 | - public function __construct(IConfig $config, \OC_Defaults $defaults) { |
|
| 39 | - $this->config = $config; |
|
| 40 | - $this->defaults = $defaults; |
|
| 41 | - } |
|
| 38 | + public function __construct(IConfig $config, \OC_Defaults $defaults) { |
|
| 39 | + $this->config = $config; |
|
| 40 | + $this->defaults = $defaults; |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
| 45 | - * @since 9.1 |
|
| 46 | - */ |
|
| 47 | - public function getForm() { |
|
| 48 | - $parameters = [ 'clients' => $this->getClientLinks() ]; |
|
| 49 | - return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters); |
|
| 50 | - } |
|
| 43 | + /** |
|
| 44 | + * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
| 45 | + * @since 9.1 |
|
| 46 | + */ |
|
| 47 | + public function getForm() { |
|
| 48 | + $parameters = [ 'clients' => $this->getClientLinks() ]; |
|
| 49 | + return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters); |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @return string the section ID, e.g. 'sharing' |
|
| 54 | - * @since 9.1 |
|
| 55 | - */ |
|
| 56 | - public function getSection() { |
|
| 57 | - return 'sync-clients'; |
|
| 58 | - } |
|
| 52 | + /** |
|
| 53 | + * @return string the section ID, e.g. 'sharing' |
|
| 54 | + * @since 9.1 |
|
| 55 | + */ |
|
| 56 | + public function getSection() { |
|
| 57 | + return 'sync-clients'; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * @return int whether the form should be rather on the top or bottom of |
|
| 62 | - * the admin section. The forms are arranged in ascending order of the |
|
| 63 | - * priority values. It is required to return a value between 0 and 100. |
|
| 64 | - * |
|
| 65 | - * E.g.: 70 |
|
| 66 | - * @since 9.1 |
|
| 67 | - */ |
|
| 68 | - public function getPriority() { |
|
| 69 | - return 20; |
|
| 70 | - } |
|
| 60 | + /** |
|
| 61 | + * @return int whether the form should be rather on the top or bottom of |
|
| 62 | + * the admin section. The forms are arranged in ascending order of the |
|
| 63 | + * priority values. It is required to return a value between 0 and 100. |
|
| 64 | + * |
|
| 65 | + * E.g.: 70 |
|
| 66 | + * @since 9.1 |
|
| 67 | + */ |
|
| 68 | + public function getPriority() { |
|
| 69 | + return 20; |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | - /** |
|
| 73 | - * returns an array containing links to the various clients |
|
| 74 | - * |
|
| 75 | - * @return array |
|
| 76 | - */ |
|
| 77 | - private function getClientLinks() { |
|
| 78 | - $clients = [ |
|
| 79 | - 'desktop' => $this->config->getSystemValue('customclient_desktop', $this->defaults->getSyncClientUrl()), |
|
| 80 | - 'android' => $this->config->getSystemValue('customclient_android', $this->defaults->getAndroidClientUrl()), |
|
| 81 | - 'ios' => $this->config->getSystemValue('customclient_ios', $this->defaults->getiOSClientUrl()) |
|
| 82 | - ]; |
|
| 83 | - return $clients; |
|
| 84 | - } |
|
| 72 | + /** |
|
| 73 | + * returns an array containing links to the various clients |
|
| 74 | + * |
|
| 75 | + * @return array |
|
| 76 | + */ |
|
| 77 | + private function getClientLinks() { |
|
| 78 | + $clients = [ |
|
| 79 | + 'desktop' => $this->config->getSystemValue('customclient_desktop', $this->defaults->getSyncClientUrl()), |
|
| 80 | + 'android' => $this->config->getSystemValue('customclient_android', $this->defaults->getAndroidClientUrl()), |
|
| 81 | + 'ios' => $this->config->getSystemValue('customclient_ios', $this->defaults->getiOSClientUrl()) |
|
| 82 | + ]; |
|
| 83 | + return $clients; |
|
| 84 | + } |
|
| 85 | 85 | } |
@@ -41,241 +41,241 @@ |
||
| 41 | 41 | */ |
| 42 | 42 | |
| 43 | 43 | class NavigationManager implements INavigationManager { |
| 44 | - protected $entries = []; |
|
| 45 | - protected $closureEntries = []; |
|
| 46 | - protected $activeEntry; |
|
| 47 | - /** @var bool */ |
|
| 48 | - protected $init = false; |
|
| 49 | - /** @var IAppManager|AppManager */ |
|
| 50 | - protected $appManager; |
|
| 51 | - /** @var IURLGenerator */ |
|
| 52 | - private $urlGenerator; |
|
| 53 | - /** @var IFactory */ |
|
| 54 | - private $l10nFac; |
|
| 55 | - /** @var IUserSession */ |
|
| 56 | - private $userSession; |
|
| 57 | - /** @var IGroupManager|Manager */ |
|
| 58 | - private $groupManager; |
|
| 59 | - /** @var IConfig */ |
|
| 60 | - private $config; |
|
| 44 | + protected $entries = []; |
|
| 45 | + protected $closureEntries = []; |
|
| 46 | + protected $activeEntry; |
|
| 47 | + /** @var bool */ |
|
| 48 | + protected $init = false; |
|
| 49 | + /** @var IAppManager|AppManager */ |
|
| 50 | + protected $appManager; |
|
| 51 | + /** @var IURLGenerator */ |
|
| 52 | + private $urlGenerator; |
|
| 53 | + /** @var IFactory */ |
|
| 54 | + private $l10nFac; |
|
| 55 | + /** @var IUserSession */ |
|
| 56 | + private $userSession; |
|
| 57 | + /** @var IGroupManager|Manager */ |
|
| 58 | + private $groupManager; |
|
| 59 | + /** @var IConfig */ |
|
| 60 | + private $config; |
|
| 61 | 61 | |
| 62 | - public function __construct(IAppManager $appManager, |
|
| 63 | - IURLGenerator $urlGenerator, |
|
| 64 | - IFactory $l10nFac, |
|
| 65 | - IUserSession $userSession, |
|
| 66 | - IGroupManager $groupManager, |
|
| 67 | - IConfig $config) { |
|
| 68 | - $this->appManager = $appManager; |
|
| 69 | - $this->urlGenerator = $urlGenerator; |
|
| 70 | - $this->l10nFac = $l10nFac; |
|
| 71 | - $this->userSession = $userSession; |
|
| 72 | - $this->groupManager = $groupManager; |
|
| 73 | - $this->config = $config; |
|
| 74 | - } |
|
| 62 | + public function __construct(IAppManager $appManager, |
|
| 63 | + IURLGenerator $urlGenerator, |
|
| 64 | + IFactory $l10nFac, |
|
| 65 | + IUserSession $userSession, |
|
| 66 | + IGroupManager $groupManager, |
|
| 67 | + IConfig $config) { |
|
| 68 | + $this->appManager = $appManager; |
|
| 69 | + $this->urlGenerator = $urlGenerator; |
|
| 70 | + $this->l10nFac = $l10nFac; |
|
| 71 | + $this->userSession = $userSession; |
|
| 72 | + $this->groupManager = $groupManager; |
|
| 73 | + $this->config = $config; |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - /** |
|
| 77 | - * Creates a new navigation entry |
|
| 78 | - * |
|
| 79 | - * @param array|\Closure $entry Array containing: id, name, order, icon and href key |
|
| 80 | - * The use of a closure is preferred, because it will avoid |
|
| 81 | - * loading the routing of your app, unless required. |
|
| 82 | - * @return void |
|
| 83 | - */ |
|
| 84 | - public function add($entry) { |
|
| 85 | - if ($entry instanceof \Closure) { |
|
| 86 | - $this->closureEntries[] = $entry; |
|
| 87 | - return; |
|
| 88 | - } |
|
| 76 | + /** |
|
| 77 | + * Creates a new navigation entry |
|
| 78 | + * |
|
| 79 | + * @param array|\Closure $entry Array containing: id, name, order, icon and href key |
|
| 80 | + * The use of a closure is preferred, because it will avoid |
|
| 81 | + * loading the routing of your app, unless required. |
|
| 82 | + * @return void |
|
| 83 | + */ |
|
| 84 | + public function add($entry) { |
|
| 85 | + if ($entry instanceof \Closure) { |
|
| 86 | + $this->closureEntries[] = $entry; |
|
| 87 | + return; |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - $entry['active'] = false; |
|
| 91 | - if(!isset($entry['icon'])) { |
|
| 92 | - $entry['icon'] = ''; |
|
| 93 | - } |
|
| 94 | - if(!isset($entry['type'])) { |
|
| 95 | - $entry['type'] = 'link'; |
|
| 96 | - } |
|
| 97 | - $this->entries[] = $entry; |
|
| 98 | - } |
|
| 90 | + $entry['active'] = false; |
|
| 91 | + if(!isset($entry['icon'])) { |
|
| 92 | + $entry['icon'] = ''; |
|
| 93 | + } |
|
| 94 | + if(!isset($entry['type'])) { |
|
| 95 | + $entry['type'] = 'link'; |
|
| 96 | + } |
|
| 97 | + $this->entries[] = $entry; |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - /** |
|
| 101 | - * returns all the added Menu entries |
|
| 102 | - * @param string $type |
|
| 103 | - * @return array an array of the added entries |
|
| 104 | - */ |
|
| 105 | - public function getAll($type = 'link') { |
|
| 106 | - $this->init(); |
|
| 107 | - foreach ($this->closureEntries as $c) { |
|
| 108 | - $this->add($c()); |
|
| 109 | - } |
|
| 110 | - $this->closureEntries = array(); |
|
| 100 | + /** |
|
| 101 | + * returns all the added Menu entries |
|
| 102 | + * @param string $type |
|
| 103 | + * @return array an array of the added entries |
|
| 104 | + */ |
|
| 105 | + public function getAll($type = 'link') { |
|
| 106 | + $this->init(); |
|
| 107 | + foreach ($this->closureEntries as $c) { |
|
| 108 | + $this->add($c()); |
|
| 109 | + } |
|
| 110 | + $this->closureEntries = array(); |
|
| 111 | 111 | |
| 112 | - if ($type === 'all') { |
|
| 113 | - return $this->entries; |
|
| 114 | - } |
|
| 112 | + if ($type === 'all') { |
|
| 113 | + return $this->entries; |
|
| 114 | + } |
|
| 115 | 115 | |
| 116 | - return array_filter($this->entries, function($entry) use ($type) { |
|
| 117 | - return $entry['type'] === $type; |
|
| 118 | - }); |
|
| 119 | - } |
|
| 116 | + return array_filter($this->entries, function($entry) use ($type) { |
|
| 117 | + return $entry['type'] === $type; |
|
| 118 | + }); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - /** |
|
| 122 | - * removes all the entries |
|
| 123 | - */ |
|
| 124 | - public function clear($loadDefaultLinks = true) { |
|
| 125 | - $this->entries = []; |
|
| 126 | - $this->closureEntries = []; |
|
| 127 | - $this->init = !$loadDefaultLinks; |
|
| 128 | - } |
|
| 121 | + /** |
|
| 122 | + * removes all the entries |
|
| 123 | + */ |
|
| 124 | + public function clear($loadDefaultLinks = true) { |
|
| 125 | + $this->entries = []; |
|
| 126 | + $this->closureEntries = []; |
|
| 127 | + $this->init = !$loadDefaultLinks; |
|
| 128 | + } |
|
| 129 | 129 | |
| 130 | - /** |
|
| 131 | - * Sets the current navigation entry of the currently running app |
|
| 132 | - * @param string $id of the app entry to activate (from added $entry) |
|
| 133 | - */ |
|
| 134 | - public function setActiveEntry($id) { |
|
| 135 | - $this->activeEntry = $id; |
|
| 136 | - } |
|
| 130 | + /** |
|
| 131 | + * Sets the current navigation entry of the currently running app |
|
| 132 | + * @param string $id of the app entry to activate (from added $entry) |
|
| 133 | + */ |
|
| 134 | + public function setActiveEntry($id) { |
|
| 135 | + $this->activeEntry = $id; |
|
| 136 | + } |
|
| 137 | 137 | |
| 138 | - /** |
|
| 139 | - * gets the active Menu entry |
|
| 140 | - * @return string id or empty string |
|
| 141 | - * |
|
| 142 | - * This function returns the id of the active navigation entry (set by |
|
| 143 | - * setActiveEntry |
|
| 144 | - */ |
|
| 145 | - public function getActiveEntry() { |
|
| 146 | - return $this->activeEntry; |
|
| 147 | - } |
|
| 138 | + /** |
|
| 139 | + * gets the active Menu entry |
|
| 140 | + * @return string id or empty string |
|
| 141 | + * |
|
| 142 | + * This function returns the id of the active navigation entry (set by |
|
| 143 | + * setActiveEntry |
|
| 144 | + */ |
|
| 145 | + public function getActiveEntry() { |
|
| 146 | + return $this->activeEntry; |
|
| 147 | + } |
|
| 148 | 148 | |
| 149 | - private function init() { |
|
| 150 | - if ($this->init) { |
|
| 151 | - return; |
|
| 152 | - } |
|
| 153 | - $this->init = true; |
|
| 149 | + private function init() { |
|
| 150 | + if ($this->init) { |
|
| 151 | + return; |
|
| 152 | + } |
|
| 153 | + $this->init = true; |
|
| 154 | 154 | |
| 155 | - $l = $this->l10nFac->get('lib'); |
|
| 156 | - if ($this->config->getSystemValue('knowledgebaseenabled', true)) { |
|
| 157 | - $this->add([ |
|
| 158 | - 'type' => 'settings', |
|
| 159 | - 'id' => 'help', |
|
| 160 | - 'order' => 5, |
|
| 161 | - 'href' => $this->urlGenerator->linkToRoute('settings_help'), |
|
| 162 | - 'name' => $l->t('Help'), |
|
| 163 | - 'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'), |
|
| 164 | - ]); |
|
| 165 | - } |
|
| 155 | + $l = $this->l10nFac->get('lib'); |
|
| 156 | + if ($this->config->getSystemValue('knowledgebaseenabled', true)) { |
|
| 157 | + $this->add([ |
|
| 158 | + 'type' => 'settings', |
|
| 159 | + 'id' => 'help', |
|
| 160 | + 'order' => 5, |
|
| 161 | + 'href' => $this->urlGenerator->linkToRoute('settings_help'), |
|
| 162 | + 'name' => $l->t('Help'), |
|
| 163 | + 'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'), |
|
| 164 | + ]); |
|
| 165 | + } |
|
| 166 | 166 | |
| 167 | - if ($this->userSession->isLoggedIn()) { |
|
| 168 | - if ($this->isAdmin()) { |
|
| 169 | - // App management |
|
| 170 | - $this->add([ |
|
| 171 | - 'type' => 'settings', |
|
| 172 | - 'id' => 'core_apps', |
|
| 173 | - 'order' => 3, |
|
| 174 | - 'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'), |
|
| 175 | - 'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'), |
|
| 176 | - 'name' => $l->t('Apps'), |
|
| 177 | - ]); |
|
| 178 | - } |
|
| 167 | + if ($this->userSession->isLoggedIn()) { |
|
| 168 | + if ($this->isAdmin()) { |
|
| 169 | + // App management |
|
| 170 | + $this->add([ |
|
| 171 | + 'type' => 'settings', |
|
| 172 | + 'id' => 'core_apps', |
|
| 173 | + 'order' => 3, |
|
| 174 | + 'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'), |
|
| 175 | + 'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'), |
|
| 176 | + 'name' => $l->t('Apps'), |
|
| 177 | + ]); |
|
| 178 | + } |
|
| 179 | 179 | |
| 180 | - // Personal and (if applicable) admin settings |
|
| 181 | - $this->add([ |
|
| 182 | - 'type' => 'settings', |
|
| 183 | - 'id' => 'settings', |
|
| 184 | - 'order' => 1, |
|
| 185 | - 'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'), |
|
| 186 | - 'name' => $l->t('Settings'), |
|
| 187 | - 'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'), |
|
| 188 | - ]); |
|
| 180 | + // Personal and (if applicable) admin settings |
|
| 181 | + $this->add([ |
|
| 182 | + 'type' => 'settings', |
|
| 183 | + 'id' => 'settings', |
|
| 184 | + 'order' => 1, |
|
| 185 | + 'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'), |
|
| 186 | + 'name' => $l->t('Settings'), |
|
| 187 | + 'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'), |
|
| 188 | + ]); |
|
| 189 | 189 | |
| 190 | - // Logout |
|
| 191 | - $this->add([ |
|
| 192 | - 'type' => 'settings', |
|
| 193 | - 'id' => 'logout', |
|
| 194 | - 'order' => 99999, |
|
| 195 | - 'href' => $this->urlGenerator->linkToRouteAbsolute( |
|
| 196 | - 'core.login.logout', |
|
| 197 | - ['requesttoken' => \OCP\Util::callRegister()] |
|
| 198 | - ), |
|
| 199 | - 'name' => $l->t('Log out'), |
|
| 200 | - 'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'), |
|
| 201 | - ]); |
|
| 190 | + // Logout |
|
| 191 | + $this->add([ |
|
| 192 | + 'type' => 'settings', |
|
| 193 | + 'id' => 'logout', |
|
| 194 | + 'order' => 99999, |
|
| 195 | + 'href' => $this->urlGenerator->linkToRouteAbsolute( |
|
| 196 | + 'core.login.logout', |
|
| 197 | + ['requesttoken' => \OCP\Util::callRegister()] |
|
| 198 | + ), |
|
| 199 | + 'name' => $l->t('Log out'), |
|
| 200 | + 'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'), |
|
| 201 | + ]); |
|
| 202 | 202 | |
| 203 | - if ($this->isSubadmin()) { |
|
| 204 | - // User management |
|
| 205 | - $this->add([ |
|
| 206 | - 'type' => 'settings', |
|
| 207 | - 'id' => 'core_users', |
|
| 208 | - 'order' => 4, |
|
| 209 | - 'href' => $this->urlGenerator->linkToRoute('settings_users'), |
|
| 210 | - 'name' => $l->t('Users'), |
|
| 211 | - 'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'), |
|
| 212 | - ]); |
|
| 213 | - } |
|
| 214 | - } |
|
| 203 | + if ($this->isSubadmin()) { |
|
| 204 | + // User management |
|
| 205 | + $this->add([ |
|
| 206 | + 'type' => 'settings', |
|
| 207 | + 'id' => 'core_users', |
|
| 208 | + 'order' => 4, |
|
| 209 | + 'href' => $this->urlGenerator->linkToRoute('settings_users'), |
|
| 210 | + 'name' => $l->t('Users'), |
|
| 211 | + 'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'), |
|
| 212 | + ]); |
|
| 213 | + } |
|
| 214 | + } |
|
| 215 | 215 | |
| 216 | - if ($this->appManager === 'null') { |
|
| 217 | - return; |
|
| 218 | - } |
|
| 219 | - foreach ($this->appManager->getInstalledApps() as $app) { |
|
| 220 | - // load plugins and collections from info.xml |
|
| 221 | - $info = $this->appManager->getAppInfo($app); |
|
| 222 | - if (empty($info['navigations'])) { |
|
| 223 | - continue; |
|
| 224 | - } |
|
| 225 | - foreach ($info['navigations'] as $nav) { |
|
| 226 | - if (!isset($nav['name'])) { |
|
| 227 | - continue; |
|
| 228 | - } |
|
| 229 | - if (!isset($nav['route'])) { |
|
| 230 | - continue; |
|
| 231 | - } |
|
| 232 | - $role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all'; |
|
| 233 | - if ($role === 'admin' && !$this->isAdmin()) { |
|
| 234 | - continue; |
|
| 235 | - } |
|
| 236 | - $l = $this->l10nFac->get($app); |
|
| 237 | - $id = isset($nav['id']) ? $nav['id'] : $app; |
|
| 238 | - $order = isset($nav['order']) ? $nav['order'] : 100; |
|
| 239 | - $type = isset($nav['type']) ? $nav['type'] : 'link'; |
|
| 240 | - $route = $this->urlGenerator->linkToRoute($nav['route']); |
|
| 241 | - $icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg'; |
|
| 242 | - foreach ([$icon, "$app.svg"] as $i) { |
|
| 243 | - try { |
|
| 244 | - $icon = $this->urlGenerator->imagePath($app, $i); |
|
| 245 | - break; |
|
| 246 | - } catch (\RuntimeException $ex) { |
|
| 247 | - // no icon? - ignore it then |
|
| 248 | - } |
|
| 249 | - } |
|
| 250 | - if ($icon === null) { |
|
| 251 | - $icon = $this->urlGenerator->imagePath('core', 'default-app-icon'); |
|
| 252 | - } |
|
| 216 | + if ($this->appManager === 'null') { |
|
| 217 | + return; |
|
| 218 | + } |
|
| 219 | + foreach ($this->appManager->getInstalledApps() as $app) { |
|
| 220 | + // load plugins and collections from info.xml |
|
| 221 | + $info = $this->appManager->getAppInfo($app); |
|
| 222 | + if (empty($info['navigations'])) { |
|
| 223 | + continue; |
|
| 224 | + } |
|
| 225 | + foreach ($info['navigations'] as $nav) { |
|
| 226 | + if (!isset($nav['name'])) { |
|
| 227 | + continue; |
|
| 228 | + } |
|
| 229 | + if (!isset($nav['route'])) { |
|
| 230 | + continue; |
|
| 231 | + } |
|
| 232 | + $role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all'; |
|
| 233 | + if ($role === 'admin' && !$this->isAdmin()) { |
|
| 234 | + continue; |
|
| 235 | + } |
|
| 236 | + $l = $this->l10nFac->get($app); |
|
| 237 | + $id = isset($nav['id']) ? $nav['id'] : $app; |
|
| 238 | + $order = isset($nav['order']) ? $nav['order'] : 100; |
|
| 239 | + $type = isset($nav['type']) ? $nav['type'] : 'link'; |
|
| 240 | + $route = $this->urlGenerator->linkToRoute($nav['route']); |
|
| 241 | + $icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg'; |
|
| 242 | + foreach ([$icon, "$app.svg"] as $i) { |
|
| 243 | + try { |
|
| 244 | + $icon = $this->urlGenerator->imagePath($app, $i); |
|
| 245 | + break; |
|
| 246 | + } catch (\RuntimeException $ex) { |
|
| 247 | + // no icon? - ignore it then |
|
| 248 | + } |
|
| 249 | + } |
|
| 250 | + if ($icon === null) { |
|
| 251 | + $icon = $this->urlGenerator->imagePath('core', 'default-app-icon'); |
|
| 252 | + } |
|
| 253 | 253 | |
| 254 | - $this->add([ |
|
| 255 | - 'id' => $id, |
|
| 256 | - 'order' => $order, |
|
| 257 | - 'href' => $route, |
|
| 258 | - 'icon' => $icon, |
|
| 259 | - 'type' => $type, |
|
| 260 | - 'name' => $l->t($nav['name']), |
|
| 261 | - ]); |
|
| 262 | - } |
|
| 263 | - } |
|
| 264 | - } |
|
| 254 | + $this->add([ |
|
| 255 | + 'id' => $id, |
|
| 256 | + 'order' => $order, |
|
| 257 | + 'href' => $route, |
|
| 258 | + 'icon' => $icon, |
|
| 259 | + 'type' => $type, |
|
| 260 | + 'name' => $l->t($nav['name']), |
|
| 261 | + ]); |
|
| 262 | + } |
|
| 263 | + } |
|
| 264 | + } |
|
| 265 | 265 | |
| 266 | - private function isAdmin() { |
|
| 267 | - $user = $this->userSession->getUser(); |
|
| 268 | - if ($user !== null) { |
|
| 269 | - return $this->groupManager->isAdmin($user->getUID()); |
|
| 270 | - } |
|
| 271 | - return false; |
|
| 272 | - } |
|
| 266 | + private function isAdmin() { |
|
| 267 | + $user = $this->userSession->getUser(); |
|
| 268 | + if ($user !== null) { |
|
| 269 | + return $this->groupManager->isAdmin($user->getUID()); |
|
| 270 | + } |
|
| 271 | + return false; |
|
| 272 | + } |
|
| 273 | 273 | |
| 274 | - private function isSubadmin() { |
|
| 275 | - $user = $this->userSession->getUser(); |
|
| 276 | - if ($user !== null) { |
|
| 277 | - return $this->groupManager->getSubAdmin()->isSubAdmin($user); |
|
| 278 | - } |
|
| 279 | - return false; |
|
| 280 | - } |
|
| 274 | + private function isSubadmin() { |
|
| 275 | + $user = $this->userSession->getUser(); |
|
| 276 | + if ($user !== null) { |
|
| 277 | + return $this->groupManager->getSubAdmin()->isSubAdmin($user); |
|
| 278 | + } |
|
| 279 | + return false; |
|
| 280 | + } |
|
| 281 | 281 | } |
@@ -25,10 +25,10 @@ discard block |
||
| 25 | 25 | /** @var array $_ */ |
| 26 | 26 | |
| 27 | 27 | script('settings', [ |
| 28 | - 'usersettings', |
|
| 29 | - 'federationsettingsview', |
|
| 30 | - 'federationscopemenu', |
|
| 31 | - 'settings/personalInfo', |
|
| 28 | + 'usersettings', |
|
| 29 | + 'federationsettingsview', |
|
| 30 | + 'federationscopemenu', |
|
| 31 | + 'settings/personalInfo', |
|
| 32 | 32 | ]); |
| 33 | 33 | vendor_script('strengthify/jquery.strengthify'); |
| 34 | 34 | vendor_style('strengthify/strengthify'); |
@@ -46,10 +46,10 @@ discard block |
||
| 46 | 46 | <p id="quotatext"> |
| 47 | 47 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
| 48 | 48 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>', |
| 49 | - [$_['usage'], $_['total_space']]));?> |
|
| 49 | + [$_['usage'], $_['total_space']]));?> |
|
| 50 | 50 | <?php else: ?> |
| 51 | 51 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)', |
| 52 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
| 52 | + [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
| 53 | 53 | <?php endif ?> |
| 54 | 54 | </p> |
| 55 | 55 | </div> |
@@ -118,17 +118,17 @@ discard block |
||
| 118 | 118 | <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>"> |
| 119 | 119 | <img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src=" |
| 120 | 120 | <?php |
| 121 | - switch($_['emailVerification']) { |
|
| 122 | - case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 123 | - p(image_path('core', 'actions/verifying.svg')); |
|
| 124 | - break; |
|
| 125 | - case \OC\Accounts\AccountManager::VERIFIED: |
|
| 126 | - p(image_path('core', 'actions/verified.svg')); |
|
| 127 | - break; |
|
| 128 | - default: |
|
| 129 | - p(image_path('core', 'actions/verify.svg')); |
|
| 130 | - } |
|
| 131 | - ?>"> |
|
| 121 | + switch($_['emailVerification']) { |
|
| 122 | + case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 123 | + p(image_path('core', 'actions/verifying.svg')); |
|
| 124 | + break; |
|
| 125 | + case \OC\Accounts\AccountManager::VERIFIED: |
|
| 126 | + p(image_path('core', 'actions/verified.svg')); |
|
| 127 | + break; |
|
| 128 | + default: |
|
| 129 | + p(image_path('core', 'actions/verify.svg')); |
|
| 130 | + } |
|
| 131 | + ?>"> |
|
| 132 | 132 | </div> |
| 133 | 133 | <input type="email" name="email" id="email" value="<?php p($_['email']); ?>" |
| 134 | 134 | <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> |
@@ -185,17 +185,17 @@ discard block |
||
| 185 | 185 | <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>"> |
| 186 | 186 | <img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src=" |
| 187 | 187 | <?php |
| 188 | - switch($_['websiteVerification']) { |
|
| 189 | - case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 190 | - p(image_path('core', 'actions/verifying.svg')); |
|
| 191 | - break; |
|
| 192 | - case \OC\Accounts\AccountManager::VERIFIED: |
|
| 193 | - p(image_path('core', 'actions/verified.svg')); |
|
| 194 | - break; |
|
| 195 | - default: |
|
| 196 | - p(image_path('core', 'actions/verify.svg')); |
|
| 197 | - } |
|
| 198 | - ?>" |
|
| 188 | + switch($_['websiteVerification']) { |
|
| 189 | + case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 190 | + p(image_path('core', 'actions/verifying.svg')); |
|
| 191 | + break; |
|
| 192 | + case \OC\Accounts\AccountManager::VERIFIED: |
|
| 193 | + p(image_path('core', 'actions/verified.svg')); |
|
| 194 | + break; |
|
| 195 | + default: |
|
| 196 | + p(image_path('core', 'actions/verify.svg')); |
|
| 197 | + } |
|
| 198 | + ?>" |
|
| 199 | 199 | <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
| 200 | 200 | > |
| 201 | 201 | <div class="verification-dialog popovermenu bubble menu"> |
@@ -222,17 +222,17 @@ discard block |
||
| 222 | 222 | <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>"> |
| 223 | 223 | <img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src=" |
| 224 | 224 | <?php |
| 225 | - switch($_['twitterVerification']) { |
|
| 226 | - case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 227 | - p(image_path('core', 'actions/verifying.svg')); |
|
| 228 | - break; |
|
| 229 | - case \OC\Accounts\AccountManager::VERIFIED: |
|
| 230 | - p(image_path('core', 'actions/verified.svg')); |
|
| 231 | - break; |
|
| 232 | - default: |
|
| 233 | - p(image_path('core', 'actions/verify.svg')); |
|
| 234 | - } |
|
| 235 | - ?>" |
|
| 225 | + switch($_['twitterVerification']) { |
|
| 226 | + case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 227 | + p(image_path('core', 'actions/verifying.svg')); |
|
| 228 | + break; |
|
| 229 | + case \OC\Accounts\AccountManager::VERIFIED: |
|
| 230 | + p(image_path('core', 'actions/verified.svg')); |
|
| 231 | + break; |
|
| 232 | + default: |
|
| 233 | + p(image_path('core', 'actions/verify.svg')); |
|
| 234 | + } |
|
| 235 | + ?>" |
|
| 236 | 236 | <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
| 237 | 237 | > |
| 238 | 238 | <div class="verification-dialog popovermenu bubble menu"> |
@@ -265,8 +265,8 @@ discard block |
||
| 265 | 265 | |
| 266 | 266 | <?php |
| 267 | 267 | if($_['passwordChangeSupported']) { |
| 268 | - script('jquery-showpassword'); |
|
| 269 | - ?> |
|
| 268 | + script('jquery-showpassword'); |
|
| 269 | + ?> |
|
| 270 | 270 | <form id="passwordform" class="section"> |
| 271 | 271 | <h2 class="inlineblock"><?php p($l->t('Password'));?></h2> |
| 272 | 272 | <div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div> |
@@ -42,15 +42,15 @@ |
||
| 42 | 42 | |
| 43 | 43 | <p> |
| 44 | 44 | <?php print_unescaped(str_replace( |
| 45 | - [ |
|
| 46 | - '{contributeopen}', |
|
| 47 | - '{linkclose}', |
|
| 48 | - ], |
|
| 49 | - [ |
|
| 50 | - '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">', |
|
| 51 | - '</a>', |
|
| 52 | - ], |
|
| 53 | - $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?> |
|
| 45 | + [ |
|
| 46 | + '{contributeopen}', |
|
| 47 | + '{linkclose}', |
|
| 48 | + ], |
|
| 49 | + [ |
|
| 50 | + '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">', |
|
| 51 | + '</a>', |
|
| 52 | + ], |
|
| 53 | + $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?> |
|
| 54 | 54 | </p> |
| 55 | 55 | |
| 56 | 56 | <?php if(OC_APP::isEnabled('firstrunwizard')) {?> |
@@ -29,31 +29,31 @@ |
||
| 29 | 29 | |
| 30 | 30 | class Additional implements ISettings { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
| 34 | - * @since 9.1 |
|
| 35 | - */ |
|
| 36 | - public function getForm() { |
|
| 37 | - return new TemplateResponse('settings', 'settings/empty'); |
|
| 38 | - } |
|
| 32 | + /** |
|
| 33 | + * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
| 34 | + * @since 9.1 |
|
| 35 | + */ |
|
| 36 | + public function getForm() { |
|
| 37 | + return new TemplateResponse('settings', 'settings/empty'); |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @return string the section ID, e.g. 'sharing' |
|
| 42 | - * @since 9.1 |
|
| 43 | - */ |
|
| 44 | - public function getSection() { |
|
| 45 | - return 'additional'; |
|
| 46 | - } |
|
| 40 | + /** |
|
| 41 | + * @return string the section ID, e.g. 'sharing' |
|
| 42 | + * @since 9.1 |
|
| 43 | + */ |
|
| 44 | + public function getSection() { |
|
| 45 | + return 'additional'; |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * @return int whether the form should be rather on the top or bottom of |
|
| 50 | - * the admin section. The forms are arranged in ascending order of the |
|
| 51 | - * priority values. It is required to return a value between 0 and 100. |
|
| 52 | - * |
|
| 53 | - * E.g.: 70 |
|
| 54 | - * @since 9.1 |
|
| 55 | - */ |
|
| 56 | - public function getPriority() { |
|
| 57 | - return '5'; |
|
| 58 | - } |
|
| 48 | + /** |
|
| 49 | + * @return int whether the form should be rather on the top or bottom of |
|
| 50 | + * the admin section. The forms are arranged in ascending order of the |
|
| 51 | + * priority values. It is required to return a value between 0 and 100. |
|
| 52 | + * |
|
| 53 | + * E.g.: 70 |
|
| 54 | + * @since 9.1 |
|
| 55 | + */ |
|
| 56 | + public function getPriority() { |
|
| 57 | + return '5'; |
|
| 58 | + } |
|
| 59 | 59 | } |
@@ -26,189 +26,189 @@ |
||
| 26 | 26 | use OCP\IDBConnection; |
| 27 | 27 | |
| 28 | 28 | class Mapper { |
| 29 | - const TABLE_ADMIN_SETTINGS = 'admin_settings'; |
|
| 30 | - const TABLE_ADMIN_SECTIONS = 'admin_sections'; |
|
| 31 | - const TABLE_PERSONAL_SETTINGS = 'personal_settings'; |
|
| 32 | - const TABLE_PERSONAL_SECTIONS = 'personal_sections'; |
|
| 33 | - |
|
| 34 | - /** @var IDBConnection */ |
|
| 35 | - private $dbc; |
|
| 36 | - |
|
| 37 | - /** |
|
| 38 | - * @param IDBConnection $dbc |
|
| 39 | - */ |
|
| 40 | - public function __construct(IDBConnection $dbc) { |
|
| 41 | - $this->dbc = $dbc; |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - /** |
|
| 45 | - * Get the configured admin settings from the database for the provided section |
|
| 46 | - * |
|
| 47 | - * @param string $section |
|
| 48 | - * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 49 | - */ |
|
| 50 | - public function getAdminSettingsFromDB($section) { |
|
| 51 | - return $this->getSettingsFromDB(self::TABLE_ADMIN_SETTINGS, $section); |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - /** |
|
| 55 | - * Get the configured personal settings from the database for the provided section |
|
| 56 | - * |
|
| 57 | - * @param string $section |
|
| 58 | - * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 59 | - */ |
|
| 60 | - public function getPersonalSettingsFromDB($section) { |
|
| 61 | - return $this->getSettingsFromDB(self::TABLE_PERSONAL_SETTINGS, $section); |
|
| 62 | - } |
|
| 63 | - |
|
| 64 | - /** |
|
| 65 | - * Get the configured settings from the database for the provided table and section |
|
| 66 | - * |
|
| 67 | - * @param $table |
|
| 68 | - * @param $section |
|
| 69 | - * @return array |
|
| 70 | - */ |
|
| 71 | - private function getSettingsFromDB($table, $section) { |
|
| 72 | - $query = $this->dbc->getQueryBuilder(); |
|
| 73 | - $query->select(['class', 'priority']) |
|
| 74 | - ->from($table) |
|
| 75 | - ->where($query->expr()->eq('section', $this->dbc->getQueryBuilder()->createParameter('section'))) |
|
| 76 | - ->setParameter('section', $section); |
|
| 77 | - |
|
| 78 | - $result = $query->execute(); |
|
| 79 | - return $result->fetchAll(); |
|
| 80 | - } |
|
| 81 | - |
|
| 82 | - /** |
|
| 83 | - * Get the configured admin sections from the database |
|
| 84 | - * |
|
| 85 | - * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 86 | - */ |
|
| 87 | - public function getAdminSectionsFromDB() { |
|
| 88 | - return $this->getSectionsFromDB('admin'); |
|
| 89 | - } |
|
| 90 | - |
|
| 91 | - /** |
|
| 92 | - * Get the configured admin sections from the database |
|
| 93 | - * |
|
| 94 | - * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 95 | - */ |
|
| 96 | - public function getPersonalSectionsFromDB() { |
|
| 97 | - return $this->getSectionsFromDB('personal'); |
|
| 98 | - } |
|
| 99 | - |
|
| 100 | - /** |
|
| 101 | - * Get the configured sections from the database by table |
|
| 102 | - * |
|
| 103 | - * @param string $type either 'personal' or 'admin' |
|
| 104 | - * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 105 | - */ |
|
| 106 | - public function getSectionsFromDB($type) { |
|
| 107 | - if($type === 'admin') { |
|
| 108 | - $sectionsTable = self::TABLE_ADMIN_SECTIONS; |
|
| 109 | - $settingsTable = self::TABLE_ADMIN_SETTINGS; |
|
| 110 | - } else if($type === 'personal') { |
|
| 111 | - $sectionsTable = self::TABLE_PERSONAL_SECTIONS; |
|
| 112 | - $settingsTable = self::TABLE_PERSONAL_SETTINGS; |
|
| 113 | - } else { |
|
| 114 | - throw new \InvalidArgumentException('"admin" or "personal" expected'); |
|
| 115 | - } |
|
| 116 | - $query = $this->dbc->getQueryBuilder(); |
|
| 117 | - $query->selectDistinct('s.class') |
|
| 118 | - ->addSelect('s.priority') |
|
| 119 | - ->from($sectionsTable, 's') |
|
| 120 | - ->from($settingsTable, 'f') |
|
| 121 | - ->where($query->expr()->eq('s.id', 'f.section')); |
|
| 122 | - $result = $query->execute(); |
|
| 123 | - return array_map(function ($row) { |
|
| 124 | - $row['priority'] = (int)$row['priority']; |
|
| 125 | - return $row; |
|
| 126 | - }, $result->fetchAll()); |
|
| 127 | - } |
|
| 128 | - |
|
| 129 | - /** |
|
| 130 | - * @param string $table one of the Mapper::TABLE_* constants |
|
| 131 | - * @param array $values |
|
| 132 | - */ |
|
| 133 | - public function add($table, array $values) { |
|
| 134 | - $query = $this->dbc->getQueryBuilder(); |
|
| 135 | - $values = array_map(function ($value) use ($query) { |
|
| 136 | - return $query->createNamedParameter($value); |
|
| 137 | - }, $values); |
|
| 138 | - $query->insert($table)->values($values); |
|
| 139 | - $query->execute(); |
|
| 140 | - } |
|
| 141 | - |
|
| 142 | - /** |
|
| 143 | - * returns the registered classes in the given table |
|
| 144 | - * |
|
| 145 | - * @param string $table one of the Mapper::TABLE_* constants |
|
| 146 | - * @return string[] |
|
| 147 | - */ |
|
| 148 | - public function getClasses($table) { |
|
| 149 | - $q = $this->dbc->getQueryBuilder(); |
|
| 150 | - $resultStatement = $q->select('class') |
|
| 151 | - ->from($table) |
|
| 152 | - ->execute(); |
|
| 153 | - $data = $resultStatement->fetchAll(); |
|
| 154 | - $resultStatement->closeCursor(); |
|
| 155 | - |
|
| 156 | - return array_map(function ($row) { |
|
| 157 | - return $row['class']; |
|
| 158 | - }, $data); |
|
| 159 | - } |
|
| 160 | - |
|
| 161 | - /** |
|
| 162 | - * Check if a class is configured in the database |
|
| 163 | - * |
|
| 164 | - * @param string $table one of the Mapper::TABLE_* constants |
|
| 165 | - * @param string $className |
|
| 166 | - * @return bool |
|
| 167 | - */ |
|
| 168 | - public function has($table, $className) { |
|
| 169 | - $query = $this->dbc->getQueryBuilder(); |
|
| 170 | - $query->select('class') |
|
| 171 | - ->from($table) |
|
| 172 | - ->where($query->expr()->eq('class', $query->createNamedParameter($className))) |
|
| 173 | - ->setMaxResults(1); |
|
| 174 | - |
|
| 175 | - $result = $query->execute(); |
|
| 176 | - $row = $result->fetch(); |
|
| 177 | - $result->closeCursor(); |
|
| 178 | - |
|
| 179 | - return (bool)$row; |
|
| 180 | - } |
|
| 181 | - |
|
| 182 | - /** |
|
| 183 | - * deletes an settings or admin entry from the given table |
|
| 184 | - * |
|
| 185 | - * @param string $table one of the Mapper::TABLE_* constants |
|
| 186 | - * @param string $className |
|
| 187 | - */ |
|
| 188 | - public function remove($table, $className) { |
|
| 189 | - $query = $this->dbc->getQueryBuilder(); |
|
| 190 | - $query->delete($table) |
|
| 191 | - ->where($query->expr()->eq('class', $query->createNamedParameter($className))); |
|
| 192 | - |
|
| 193 | - $query->execute(); |
|
| 194 | - } |
|
| 195 | - |
|
| 196 | - /** |
|
| 197 | - * @param string $table one of the Mapper::TABLE_* constants |
|
| 198 | - * @param string $idCol |
|
| 199 | - * @param string $id |
|
| 200 | - * @param array $values |
|
| 201 | - */ |
|
| 202 | - public function update($table, $idCol, $id, $values) { |
|
| 203 | - $query = $this->dbc->getQueryBuilder(); |
|
| 204 | - $query->update($table); |
|
| 205 | - foreach ($values as $key => $value) { |
|
| 206 | - $query->set($key, $query->createNamedParameter($value)); |
|
| 207 | - } |
|
| 208 | - $query |
|
| 209 | - ->where($query->expr()->eq($idCol, $query->createParameter($idCol))) |
|
| 210 | - ->setParameter($idCol, $id) |
|
| 211 | - ->execute(); |
|
| 212 | - } |
|
| 29 | + const TABLE_ADMIN_SETTINGS = 'admin_settings'; |
|
| 30 | + const TABLE_ADMIN_SECTIONS = 'admin_sections'; |
|
| 31 | + const TABLE_PERSONAL_SETTINGS = 'personal_settings'; |
|
| 32 | + const TABLE_PERSONAL_SECTIONS = 'personal_sections'; |
|
| 33 | + |
|
| 34 | + /** @var IDBConnection */ |
|
| 35 | + private $dbc; |
|
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * @param IDBConnection $dbc |
|
| 39 | + */ |
|
| 40 | + public function __construct(IDBConnection $dbc) { |
|
| 41 | + $this->dbc = $dbc; |
|
| 42 | + } |
|
| 43 | + |
|
| 44 | + /** |
|
| 45 | + * Get the configured admin settings from the database for the provided section |
|
| 46 | + * |
|
| 47 | + * @param string $section |
|
| 48 | + * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 49 | + */ |
|
| 50 | + public function getAdminSettingsFromDB($section) { |
|
| 51 | + return $this->getSettingsFromDB(self::TABLE_ADMIN_SETTINGS, $section); |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + /** |
|
| 55 | + * Get the configured personal settings from the database for the provided section |
|
| 56 | + * |
|
| 57 | + * @param string $section |
|
| 58 | + * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 59 | + */ |
|
| 60 | + public function getPersonalSettingsFromDB($section) { |
|
| 61 | + return $this->getSettingsFromDB(self::TABLE_PERSONAL_SETTINGS, $section); |
|
| 62 | + } |
|
| 63 | + |
|
| 64 | + /** |
|
| 65 | + * Get the configured settings from the database for the provided table and section |
|
| 66 | + * |
|
| 67 | + * @param $table |
|
| 68 | + * @param $section |
|
| 69 | + * @return array |
|
| 70 | + */ |
|
| 71 | + private function getSettingsFromDB($table, $section) { |
|
| 72 | + $query = $this->dbc->getQueryBuilder(); |
|
| 73 | + $query->select(['class', 'priority']) |
|
| 74 | + ->from($table) |
|
| 75 | + ->where($query->expr()->eq('section', $this->dbc->getQueryBuilder()->createParameter('section'))) |
|
| 76 | + ->setParameter('section', $section); |
|
| 77 | + |
|
| 78 | + $result = $query->execute(); |
|
| 79 | + return $result->fetchAll(); |
|
| 80 | + } |
|
| 81 | + |
|
| 82 | + /** |
|
| 83 | + * Get the configured admin sections from the database |
|
| 84 | + * |
|
| 85 | + * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 86 | + */ |
|
| 87 | + public function getAdminSectionsFromDB() { |
|
| 88 | + return $this->getSectionsFromDB('admin'); |
|
| 89 | + } |
|
| 90 | + |
|
| 91 | + /** |
|
| 92 | + * Get the configured admin sections from the database |
|
| 93 | + * |
|
| 94 | + * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 95 | + */ |
|
| 96 | + public function getPersonalSectionsFromDB() { |
|
| 97 | + return $this->getSectionsFromDB('personal'); |
|
| 98 | + } |
|
| 99 | + |
|
| 100 | + /** |
|
| 101 | + * Get the configured sections from the database by table |
|
| 102 | + * |
|
| 103 | + * @param string $type either 'personal' or 'admin' |
|
| 104 | + * @return array[] [['class' => string, 'priority' => int], ...] |
|
| 105 | + */ |
|
| 106 | + public function getSectionsFromDB($type) { |
|
| 107 | + if($type === 'admin') { |
|
| 108 | + $sectionsTable = self::TABLE_ADMIN_SECTIONS; |
|
| 109 | + $settingsTable = self::TABLE_ADMIN_SETTINGS; |
|
| 110 | + } else if($type === 'personal') { |
|
| 111 | + $sectionsTable = self::TABLE_PERSONAL_SECTIONS; |
|
| 112 | + $settingsTable = self::TABLE_PERSONAL_SETTINGS; |
|
| 113 | + } else { |
|
| 114 | + throw new \InvalidArgumentException('"admin" or "personal" expected'); |
|
| 115 | + } |
|
| 116 | + $query = $this->dbc->getQueryBuilder(); |
|
| 117 | + $query->selectDistinct('s.class') |
|
| 118 | + ->addSelect('s.priority') |
|
| 119 | + ->from($sectionsTable, 's') |
|
| 120 | + ->from($settingsTable, 'f') |
|
| 121 | + ->where($query->expr()->eq('s.id', 'f.section')); |
|
| 122 | + $result = $query->execute(); |
|
| 123 | + return array_map(function ($row) { |
|
| 124 | + $row['priority'] = (int)$row['priority']; |
|
| 125 | + return $row; |
|
| 126 | + }, $result->fetchAll()); |
|
| 127 | + } |
|
| 128 | + |
|
| 129 | + /** |
|
| 130 | + * @param string $table one of the Mapper::TABLE_* constants |
|
| 131 | + * @param array $values |
|
| 132 | + */ |
|
| 133 | + public function add($table, array $values) { |
|
| 134 | + $query = $this->dbc->getQueryBuilder(); |
|
| 135 | + $values = array_map(function ($value) use ($query) { |
|
| 136 | + return $query->createNamedParameter($value); |
|
| 137 | + }, $values); |
|
| 138 | + $query->insert($table)->values($values); |
|
| 139 | + $query->execute(); |
|
| 140 | + } |
|
| 141 | + |
|
| 142 | + /** |
|
| 143 | + * returns the registered classes in the given table |
|
| 144 | + * |
|
| 145 | + * @param string $table one of the Mapper::TABLE_* constants |
|
| 146 | + * @return string[] |
|
| 147 | + */ |
|
| 148 | + public function getClasses($table) { |
|
| 149 | + $q = $this->dbc->getQueryBuilder(); |
|
| 150 | + $resultStatement = $q->select('class') |
|
| 151 | + ->from($table) |
|
| 152 | + ->execute(); |
|
| 153 | + $data = $resultStatement->fetchAll(); |
|
| 154 | + $resultStatement->closeCursor(); |
|
| 155 | + |
|
| 156 | + return array_map(function ($row) { |
|
| 157 | + return $row['class']; |
|
| 158 | + }, $data); |
|
| 159 | + } |
|
| 160 | + |
|
| 161 | + /** |
|
| 162 | + * Check if a class is configured in the database |
|
| 163 | + * |
|
| 164 | + * @param string $table one of the Mapper::TABLE_* constants |
|
| 165 | + * @param string $className |
|
| 166 | + * @return bool |
|
| 167 | + */ |
|
| 168 | + public function has($table, $className) { |
|
| 169 | + $query = $this->dbc->getQueryBuilder(); |
|
| 170 | + $query->select('class') |
|
| 171 | + ->from($table) |
|
| 172 | + ->where($query->expr()->eq('class', $query->createNamedParameter($className))) |
|
| 173 | + ->setMaxResults(1); |
|
| 174 | + |
|
| 175 | + $result = $query->execute(); |
|
| 176 | + $row = $result->fetch(); |
|
| 177 | + $result->closeCursor(); |
|
| 178 | + |
|
| 179 | + return (bool)$row; |
|
| 180 | + } |
|
| 181 | + |
|
| 182 | + /** |
|
| 183 | + * deletes an settings or admin entry from the given table |
|
| 184 | + * |
|
| 185 | + * @param string $table one of the Mapper::TABLE_* constants |
|
| 186 | + * @param string $className |
|
| 187 | + */ |
|
| 188 | + public function remove($table, $className) { |
|
| 189 | + $query = $this->dbc->getQueryBuilder(); |
|
| 190 | + $query->delete($table) |
|
| 191 | + ->where($query->expr()->eq('class', $query->createNamedParameter($className))); |
|
| 192 | + |
|
| 193 | + $query->execute(); |
|
| 194 | + } |
|
| 195 | + |
|
| 196 | + /** |
|
| 197 | + * @param string $table one of the Mapper::TABLE_* constants |
|
| 198 | + * @param string $idCol |
|
| 199 | + * @param string $id |
|
| 200 | + * @param array $values |
|
| 201 | + */ |
|
| 202 | + public function update($table, $idCol, $id, $values) { |
|
| 203 | + $query = $this->dbc->getQueryBuilder(); |
|
| 204 | + $query->update($table); |
|
| 205 | + foreach ($values as $key => $value) { |
|
| 206 | + $query->set($key, $query->createNamedParameter($value)); |
|
| 207 | + } |
|
| 208 | + $query |
|
| 209 | + ->where($query->expr()->eq($idCol, $query->createParameter($idCol))) |
|
| 210 | + ->setParameter($idCol, $id) |
|
| 211 | + ->execute(); |
|
| 212 | + } |
|
| 213 | 213 | |
| 214 | 214 | } |
@@ -41,89 +41,89 @@ |
||
| 41 | 41 | */ |
| 42 | 42 | class Application extends App implements IBackendProvider, IAuthMechanismProvider { |
| 43 | 43 | |
| 44 | - public function __construct(array $urlParams = array()) { |
|
| 45 | - parent::__construct('files_external', $urlParams); |
|
| 46 | - |
|
| 47 | - $container = $this->getContainer(); |
|
| 48 | - |
|
| 49 | - $container->registerService('OCP\Files\Config\IUserMountCache', function (IAppContainer $c) { |
|
| 50 | - return $c->getServer()->query('UserMountCache'); |
|
| 51 | - }); |
|
| 52 | - |
|
| 53 | - $backendService = $container->query('OCA\\Files_External\\Service\\BackendService'); |
|
| 54 | - $backendService->registerBackendProvider($this); |
|
| 55 | - $backendService->registerAuthMechanismProvider($this); |
|
| 56 | - |
|
| 57 | - // force-load auth mechanisms since some will register hooks |
|
| 58 | - // TODO: obsolete these and use the TokenProvider to get the user's password from the session |
|
| 59 | - $this->getAuthMechanisms(); |
|
| 60 | - |
|
| 61 | - // app developers: do NOT depend on this! it will disappear with oC 9.0! |
|
| 62 | - \OC::$server->getEventDispatcher()->dispatch( |
|
| 63 | - 'OCA\\Files_External::loadAdditionalBackends' |
|
| 64 | - ); |
|
| 65 | - } |
|
| 66 | - |
|
| 67 | - /** |
|
| 68 | - * @{inheritdoc} |
|
| 69 | - */ |
|
| 70 | - public function getBackends() { |
|
| 71 | - $container = $this->getContainer(); |
|
| 72 | - |
|
| 73 | - $backends = [ |
|
| 74 | - $container->query('OCA\Files_External\Lib\Backend\Local'), |
|
| 75 | - $container->query('OCA\Files_External\Lib\Backend\FTP'), |
|
| 76 | - $container->query('OCA\Files_External\Lib\Backend\DAV'), |
|
| 77 | - $container->query('OCA\Files_External\Lib\Backend\OwnCloud'), |
|
| 78 | - $container->query('OCA\Files_External\Lib\Backend\SFTP'), |
|
| 79 | - $container->query('OCA\Files_External\Lib\Backend\AmazonS3'), |
|
| 80 | - $container->query('OCA\Files_External\Lib\Backend\Dropbox'), |
|
| 81 | - $container->query('OCA\Files_External\Lib\Backend\Google'), |
|
| 82 | - $container->query('OCA\Files_External\Lib\Backend\Swift'), |
|
| 83 | - $container->query('OCA\Files_External\Lib\Backend\SFTP_Key'), |
|
| 84 | - $container->query('OCA\Files_External\Lib\Backend\SMB'), |
|
| 85 | - $container->query('OCA\Files_External\Lib\Backend\SMB_OC'), |
|
| 86 | - ]; |
|
| 87 | - |
|
| 88 | - return $backends; |
|
| 89 | - } |
|
| 90 | - |
|
| 91 | - /** |
|
| 92 | - * @{inheritdoc} |
|
| 93 | - */ |
|
| 94 | - public function getAuthMechanisms() { |
|
| 95 | - $container = $this->getContainer(); |
|
| 96 | - |
|
| 97 | - return [ |
|
| 98 | - // AuthMechanism::SCHEME_NULL mechanism |
|
| 99 | - $container->query('OCA\Files_External\Lib\Auth\NullMechanism'), |
|
| 100 | - |
|
| 101 | - // AuthMechanism::SCHEME_BUILTIN mechanism |
|
| 102 | - $container->query('OCA\Files_External\Lib\Auth\Builtin'), |
|
| 103 | - |
|
| 104 | - // AuthMechanism::SCHEME_PASSWORD mechanisms |
|
| 105 | - $container->query('OCA\Files_External\Lib\Auth\Password\Password'), |
|
| 106 | - $container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'), |
|
| 107 | - $container->query('OCA\Files_External\Lib\Auth\Password\LoginCredentials'), |
|
| 108 | - $container->query('OCA\Files_External\Lib\Auth\Password\UserProvided'), |
|
| 109 | - $container->query('OCA\Files_External\Lib\Auth\Password\GlobalAuth'), |
|
| 110 | - |
|
| 111 | - // AuthMechanism::SCHEME_OAUTH1 mechanisms |
|
| 112 | - $container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'), |
|
| 113 | - |
|
| 114 | - // AuthMechanism::SCHEME_OAUTH2 mechanisms |
|
| 115 | - $container->query('OCA\Files_External\Lib\Auth\OAuth2\OAuth2'), |
|
| 116 | - |
|
| 117 | - // AuthMechanism::SCHEME_PUBLICKEY mechanisms |
|
| 118 | - $container->query('OCA\Files_External\Lib\Auth\PublicKey\RSA'), |
|
| 119 | - |
|
| 120 | - // AuthMechanism::SCHEME_OPENSTACK mechanisms |
|
| 121 | - $container->query('OCA\Files_External\Lib\Auth\OpenStack\OpenStack'), |
|
| 122 | - $container->query('OCA\Files_External\Lib\Auth\OpenStack\Rackspace'), |
|
| 123 | - |
|
| 124 | - // Specialized mechanisms |
|
| 125 | - $container->query('OCA\Files_External\Lib\Auth\AmazonS3\AccessKey'), |
|
| 126 | - ]; |
|
| 127 | - } |
|
| 44 | + public function __construct(array $urlParams = array()) { |
|
| 45 | + parent::__construct('files_external', $urlParams); |
|
| 46 | + |
|
| 47 | + $container = $this->getContainer(); |
|
| 48 | + |
|
| 49 | + $container->registerService('OCP\Files\Config\IUserMountCache', function (IAppContainer $c) { |
|
| 50 | + return $c->getServer()->query('UserMountCache'); |
|
| 51 | + }); |
|
| 52 | + |
|
| 53 | + $backendService = $container->query('OCA\\Files_External\\Service\\BackendService'); |
|
| 54 | + $backendService->registerBackendProvider($this); |
|
| 55 | + $backendService->registerAuthMechanismProvider($this); |
|
| 56 | + |
|
| 57 | + // force-load auth mechanisms since some will register hooks |
|
| 58 | + // TODO: obsolete these and use the TokenProvider to get the user's password from the session |
|
| 59 | + $this->getAuthMechanisms(); |
|
| 60 | + |
|
| 61 | + // app developers: do NOT depend on this! it will disappear with oC 9.0! |
|
| 62 | + \OC::$server->getEventDispatcher()->dispatch( |
|
| 63 | + 'OCA\\Files_External::loadAdditionalBackends' |
|
| 64 | + ); |
|
| 65 | + } |
|
| 66 | + |
|
| 67 | + /** |
|
| 68 | + * @{inheritdoc} |
|
| 69 | + */ |
|
| 70 | + public function getBackends() { |
|
| 71 | + $container = $this->getContainer(); |
|
| 72 | + |
|
| 73 | + $backends = [ |
|
| 74 | + $container->query('OCA\Files_External\Lib\Backend\Local'), |
|
| 75 | + $container->query('OCA\Files_External\Lib\Backend\FTP'), |
|
| 76 | + $container->query('OCA\Files_External\Lib\Backend\DAV'), |
|
| 77 | + $container->query('OCA\Files_External\Lib\Backend\OwnCloud'), |
|
| 78 | + $container->query('OCA\Files_External\Lib\Backend\SFTP'), |
|
| 79 | + $container->query('OCA\Files_External\Lib\Backend\AmazonS3'), |
|
| 80 | + $container->query('OCA\Files_External\Lib\Backend\Dropbox'), |
|
| 81 | + $container->query('OCA\Files_External\Lib\Backend\Google'), |
|
| 82 | + $container->query('OCA\Files_External\Lib\Backend\Swift'), |
|
| 83 | + $container->query('OCA\Files_External\Lib\Backend\SFTP_Key'), |
|
| 84 | + $container->query('OCA\Files_External\Lib\Backend\SMB'), |
|
| 85 | + $container->query('OCA\Files_External\Lib\Backend\SMB_OC'), |
|
| 86 | + ]; |
|
| 87 | + |
|
| 88 | + return $backends; |
|
| 89 | + } |
|
| 90 | + |
|
| 91 | + /** |
|
| 92 | + * @{inheritdoc} |
|
| 93 | + */ |
|
| 94 | + public function getAuthMechanisms() { |
|
| 95 | + $container = $this->getContainer(); |
|
| 96 | + |
|
| 97 | + return [ |
|
| 98 | + // AuthMechanism::SCHEME_NULL mechanism |
|
| 99 | + $container->query('OCA\Files_External\Lib\Auth\NullMechanism'), |
|
| 100 | + |
|
| 101 | + // AuthMechanism::SCHEME_BUILTIN mechanism |
|
| 102 | + $container->query('OCA\Files_External\Lib\Auth\Builtin'), |
|
| 103 | + |
|
| 104 | + // AuthMechanism::SCHEME_PASSWORD mechanisms |
|
| 105 | + $container->query('OCA\Files_External\Lib\Auth\Password\Password'), |
|
| 106 | + $container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'), |
|
| 107 | + $container->query('OCA\Files_External\Lib\Auth\Password\LoginCredentials'), |
|
| 108 | + $container->query('OCA\Files_External\Lib\Auth\Password\UserProvided'), |
|
| 109 | + $container->query('OCA\Files_External\Lib\Auth\Password\GlobalAuth'), |
|
| 110 | + |
|
| 111 | + // AuthMechanism::SCHEME_OAUTH1 mechanisms |
|
| 112 | + $container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'), |
|
| 113 | + |
|
| 114 | + // AuthMechanism::SCHEME_OAUTH2 mechanisms |
|
| 115 | + $container->query('OCA\Files_External\Lib\Auth\OAuth2\OAuth2'), |
|
| 116 | + |
|
| 117 | + // AuthMechanism::SCHEME_PUBLICKEY mechanisms |
|
| 118 | + $container->query('OCA\Files_External\Lib\Auth\PublicKey\RSA'), |
|
| 119 | + |
|
| 120 | + // AuthMechanism::SCHEME_OPENSTACK mechanisms |
|
| 121 | + $container->query('OCA\Files_External\Lib\Auth\OpenStack\OpenStack'), |
|
| 122 | + $container->query('OCA\Files_External\Lib\Auth\OpenStack\Rackspace'), |
|
| 123 | + |
|
| 124 | + // Specialized mechanisms |
|
| 125 | + $container->query('OCA\Files_External\Lib\Auth\AmazonS3\AccessKey'), |
|
| 126 | + ]; |
|
| 127 | + } |
|
| 128 | 128 | |
| 129 | 129 | } |
@@ -32,72 +32,72 @@ |
||
| 32 | 32 | |
| 33 | 33 | class Personal implements ISettings { |
| 34 | 34 | |
| 35 | - /** @var IManager */ |
|
| 36 | - private $encryptionManager; |
|
| 35 | + /** @var IManager */ |
|
| 36 | + private $encryptionManager; |
|
| 37 | 37 | |
| 38 | - /** @var UserGlobalStoragesService */ |
|
| 39 | - private $userGlobalStoragesService; |
|
| 38 | + /** @var UserGlobalStoragesService */ |
|
| 39 | + private $userGlobalStoragesService; |
|
| 40 | 40 | |
| 41 | - /** @var BackendService */ |
|
| 42 | - private $backendService; |
|
| 41 | + /** @var BackendService */ |
|
| 42 | + private $backendService; |
|
| 43 | 43 | |
| 44 | - /** @var GlobalAuth */ |
|
| 45 | - private $globalAuth; |
|
| 44 | + /** @var GlobalAuth */ |
|
| 45 | + private $globalAuth; |
|
| 46 | 46 | |
| 47 | - /** @var IUserSession */ |
|
| 48 | - private $userSession; |
|
| 47 | + /** @var IUserSession */ |
|
| 48 | + private $userSession; |
|
| 49 | 49 | |
| 50 | - public function __construct( |
|
| 51 | - IManager $encryptionManager, |
|
| 52 | - UserGlobalStoragesService $userGlobalStoragesService, |
|
| 53 | - BackendService $backendService, |
|
| 54 | - GlobalAuth $globalAuth, |
|
| 55 | - IUserSession $userSession |
|
| 56 | - ) { |
|
| 57 | - $this->encryptionManager = $encryptionManager; |
|
| 58 | - $this->userGlobalStoragesService = $userGlobalStoragesService; |
|
| 59 | - $this->backendService = $backendService; |
|
| 60 | - $this->globalAuth = $globalAuth; |
|
| 61 | - $this->userSession = $userSession; |
|
| 62 | - } |
|
| 50 | + public function __construct( |
|
| 51 | + IManager $encryptionManager, |
|
| 52 | + UserGlobalStoragesService $userGlobalStoragesService, |
|
| 53 | + BackendService $backendService, |
|
| 54 | + GlobalAuth $globalAuth, |
|
| 55 | + IUserSession $userSession |
|
| 56 | + ) { |
|
| 57 | + $this->encryptionManager = $encryptionManager; |
|
| 58 | + $this->userGlobalStoragesService = $userGlobalStoragesService; |
|
| 59 | + $this->backendService = $backendService; |
|
| 60 | + $this->globalAuth = $globalAuth; |
|
| 61 | + $this->userSession = $userSession; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * @return TemplateResponse |
|
| 66 | - */ |
|
| 67 | - public function getForm() { |
|
| 68 | - $uid = $this->userSession->getUser()->getUID(); |
|
| 64 | + /** |
|
| 65 | + * @return TemplateResponse |
|
| 66 | + */ |
|
| 67 | + public function getForm() { |
|
| 68 | + $uid = $this->userSession->getUser()->getUID(); |
|
| 69 | 69 | |
| 70 | - $parameters = [ |
|
| 71 | - 'encryptionEnabled' => $this->encryptionManager->isEnabled(), |
|
| 72 | - 'visibilityType' => BackendService::VISIBILITY_PERSONAL, |
|
| 73 | - 'storages' => $this->userGlobalStoragesService->getStorages(), |
|
| 74 | - 'backends' => $this->backendService->getAvailableBackends(), |
|
| 75 | - 'authMechanisms' => $this->backendService->getAuthMechanisms(), |
|
| 76 | - 'dependencies' => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()), |
|
| 77 | - 'allowUserMounting' => $this->backendService->isUserMountingAllowed(), |
|
| 78 | - 'globalCredentials' => $this->globalAuth->getAuth($uid), |
|
| 79 | - 'globalCredentialsUid' => $uid, |
|
| 80 | - ]; |
|
| 70 | + $parameters = [ |
|
| 71 | + 'encryptionEnabled' => $this->encryptionManager->isEnabled(), |
|
| 72 | + 'visibilityType' => BackendService::VISIBILITY_PERSONAL, |
|
| 73 | + 'storages' => $this->userGlobalStoragesService->getStorages(), |
|
| 74 | + 'backends' => $this->backendService->getAvailableBackends(), |
|
| 75 | + 'authMechanisms' => $this->backendService->getAuthMechanisms(), |
|
| 76 | + 'dependencies' => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()), |
|
| 77 | + 'allowUserMounting' => $this->backendService->isUserMountingAllowed(), |
|
| 78 | + 'globalCredentials' => $this->globalAuth->getAuth($uid), |
|
| 79 | + 'globalCredentialsUid' => $uid, |
|
| 80 | + ]; |
|
| 81 | 81 | |
| 82 | - return new TemplateResponse('files_external', 'settings', $parameters, ''); |
|
| 83 | - } |
|
| 82 | + return new TemplateResponse('files_external', 'settings', $parameters, ''); |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - /** |
|
| 86 | - * @return string the section ID, e.g. 'sharing' |
|
| 87 | - */ |
|
| 88 | - public function getSection() { |
|
| 89 | - return 'externalstorages'; |
|
| 90 | - } |
|
| 85 | + /** |
|
| 86 | + * @return string the section ID, e.g. 'sharing' |
|
| 87 | + */ |
|
| 88 | + public function getSection() { |
|
| 89 | + return 'externalstorages'; |
|
| 90 | + } |
|
| 91 | 91 | |
| 92 | - /** |
|
| 93 | - * @return int whether the form should be rather on the top or bottom of |
|
| 94 | - * the admin section. The forms are arranged in ascending order of the |
|
| 95 | - * priority values. It is required to return a value between 0 and 100. |
|
| 96 | - * |
|
| 97 | - * E.g.: 70 |
|
| 98 | - */ |
|
| 99 | - public function getPriority() { |
|
| 100 | - return 40; |
|
| 101 | - } |
|
| 92 | + /** |
|
| 93 | + * @return int whether the form should be rather on the top or bottom of |
|
| 94 | + * the admin section. The forms are arranged in ascending order of the |
|
| 95 | + * priority values. It is required to return a value between 0 and 100. |
|
| 96 | + * |
|
| 97 | + * E.g.: 70 |
|
| 98 | + */ |
|
| 99 | + public function getPriority() { |
|
| 100 | + return 40; |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | 103 | } |