@@ -35,81 +35,81 @@ |
||
| 35 | 35 | * @package OC\Settings\Controller |
| 36 | 36 | */ |
| 37 | 37 | class AdminSettingsController extends Controller { |
| 38 | - use CommonSettingsTrait; |
|
| 38 | + use CommonSettingsTrait; |
|
| 39 | 39 | |
| 40 | - /** @var INavigationManager */ |
|
| 41 | - private $navigationManager; |
|
| 40 | + /** @var INavigationManager */ |
|
| 41 | + private $navigationManager; |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @param string $appName |
|
| 45 | - * @param IRequest $request |
|
| 46 | - * @param INavigationManager $navigationManager |
|
| 47 | - * @param ISettingsManager $settingsManager |
|
| 48 | - */ |
|
| 49 | - public function __construct( |
|
| 50 | - $appName, |
|
| 51 | - IRequest $request, |
|
| 52 | - INavigationManager $navigationManager, |
|
| 53 | - ISettingsManager $settingsManager |
|
| 54 | - ) { |
|
| 55 | - parent::__construct($appName, $request); |
|
| 56 | - $this->navigationManager = $navigationManager; |
|
| 57 | - $this->settingsManager = $settingsManager; |
|
| 58 | - } |
|
| 43 | + /** |
|
| 44 | + * @param string $appName |
|
| 45 | + * @param IRequest $request |
|
| 46 | + * @param INavigationManager $navigationManager |
|
| 47 | + * @param ISettingsManager $settingsManager |
|
| 48 | + */ |
|
| 49 | + public function __construct( |
|
| 50 | + $appName, |
|
| 51 | + IRequest $request, |
|
| 52 | + INavigationManager $navigationManager, |
|
| 53 | + ISettingsManager $settingsManager |
|
| 54 | + ) { |
|
| 55 | + parent::__construct($appName, $request); |
|
| 56 | + $this->navigationManager = $navigationManager; |
|
| 57 | + $this->settingsManager = $settingsManager; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * @param string $section |
|
| 62 | - * @return TemplateResponse |
|
| 63 | - * |
|
| 64 | - * @NoCSRFRequired |
|
| 65 | - */ |
|
| 66 | - public function index($section) { |
|
| 67 | - $this->navigationManager->setActiveEntry('admin'); |
|
| 68 | - return $this->getIndexResponse($section); |
|
| 69 | - } |
|
| 60 | + /** |
|
| 61 | + * @param string $section |
|
| 62 | + * @return TemplateResponse |
|
| 63 | + * |
|
| 64 | + * @NoCSRFRequired |
|
| 65 | + */ |
|
| 66 | + public function index($section) { |
|
| 67 | + $this->navigationManager->setActiveEntry('admin'); |
|
| 68 | + return $this->getIndexResponse($section); |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - /** |
|
| 72 | - * @param string $section |
|
| 73 | - * @return array |
|
| 74 | - */ |
|
| 75 | - protected function getSettings($section) { |
|
| 76 | - $settings = $this->settingsManager->getAdminSettings($section); |
|
| 77 | - $formatted = $this->formatSettings($settings); |
|
| 78 | - if($section === 'additional') { |
|
| 79 | - $formatted['content'] .= $this->getLegacyForms(); |
|
| 80 | - } |
|
| 81 | - return $formatted; |
|
| 82 | - } |
|
| 71 | + /** |
|
| 72 | + * @param string $section |
|
| 73 | + * @return array |
|
| 74 | + */ |
|
| 75 | + protected function getSettings($section) { |
|
| 76 | + $settings = $this->settingsManager->getAdminSettings($section); |
|
| 77 | + $formatted = $this->formatSettings($settings); |
|
| 78 | + if($section === 'additional') { |
|
| 79 | + $formatted['content'] .= $this->getLegacyForms(); |
|
| 80 | + } |
|
| 81 | + return $formatted; |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - /** |
|
| 85 | - * @return bool|string |
|
| 86 | - */ |
|
| 87 | - private function getLegacyForms() { |
|
| 88 | - $forms = \OC_App::getForms('admin'); |
|
| 84 | + /** |
|
| 85 | + * @return bool|string |
|
| 86 | + */ |
|
| 87 | + private function getLegacyForms() { |
|
| 88 | + $forms = \OC_App::getForms('admin'); |
|
| 89 | 89 | |
| 90 | - $forms = array_map(function ($form) { |
|
| 91 | - if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) { |
|
| 92 | - $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]); |
|
| 93 | - $sectionName = str_replace('</h2>', '', $sectionName); |
|
| 94 | - $anchor = strtolower($sectionName); |
|
| 95 | - $anchor = str_replace(' ', '-', $anchor); |
|
| 90 | + $forms = array_map(function ($form) { |
|
| 91 | + if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) { |
|
| 92 | + $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]); |
|
| 93 | + $sectionName = str_replace('</h2>', '', $sectionName); |
|
| 94 | + $anchor = strtolower($sectionName); |
|
| 95 | + $anchor = str_replace(' ', '-', $anchor); |
|
| 96 | 96 | |
| 97 | - return array( |
|
| 98 | - 'anchor' => $anchor, |
|
| 99 | - 'section-name' => $sectionName, |
|
| 100 | - 'form' => $form |
|
| 101 | - ); |
|
| 102 | - } |
|
| 103 | - return array( |
|
| 104 | - 'form' => $form |
|
| 105 | - ); |
|
| 106 | - }, $forms); |
|
| 97 | + return array( |
|
| 98 | + 'anchor' => $anchor, |
|
| 99 | + 'section-name' => $sectionName, |
|
| 100 | + 'form' => $form |
|
| 101 | + ); |
|
| 102 | + } |
|
| 103 | + return array( |
|
| 104 | + 'form' => $form |
|
| 105 | + ); |
|
| 106 | + }, $forms); |
|
| 107 | 107 | |
| 108 | - $out = new Template('settings', 'settings/additional'); |
|
| 109 | - $out->assign('forms', $forms); |
|
| 108 | + $out = new Template('settings', 'settings/additional'); |
|
| 109 | + $out->assign('forms', $forms); |
|
| 110 | 110 | |
| 111 | - return $out->fetchPage(); |
|
| 112 | - } |
|
| 111 | + return $out->fetchPage(); |
|
| 112 | + } |
|
| 113 | 113 | |
| 114 | 114 | |
| 115 | 115 | } |