Completed
Pull Request — master (#4890)
by Blizzz
22:36
created
settings/Controller/AdminSettingsController.php 1 patch
Indentation   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -35,81 +35,81 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
apps/federatedfilesharing/lib/Settings/PersonalSection.php 1 patch
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -29,58 +29,58 @@
 block discarded – undo
29 29
 use OCP\Settings\IIconSection;
30 30
 
31 31
 class PersonalSection implements IIconSection {
32
-	/** @var IURLGenerator */
33
-	private $urlGenerator;
34
-	/** @var IL10N */
35
-	private $l;
32
+    /** @var IURLGenerator */
33
+    private $urlGenerator;
34
+    /** @var IL10N */
35
+    private $l;
36 36
 
37
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
38
-		$this->urlGenerator = $urlGenerator;
39
-		$this->l = $l;
40
-	}
37
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
38
+        $this->urlGenerator = $urlGenerator;
39
+        $this->l = $l;
40
+    }
41 41
 
42
-	/**
43
-	 * returns the relative path to an 16*16 icon describing the section.
44
-	 * e.g. '/core/img/places/files.svg'
45
-	 *
46
-	 * @returns string
47
-	 * @since 12
48
-	 */
49
-	public function getIcon() {
50
-		return $this->urlGenerator->imagePath('core', 'actions/share.svg');
51
-	}
42
+    /**
43
+     * returns the relative path to an 16*16 icon describing the section.
44
+     * e.g. '/core/img/places/files.svg'
45
+     *
46
+     * @returns string
47
+     * @since 12
48
+     */
49
+    public function getIcon() {
50
+        return $this->urlGenerator->imagePath('core', 'actions/share.svg');
51
+    }
52 52
 
53
-	/**
54
-	 * returns the ID of the section. It is supposed to be a lower case string,
55
-	 * e.g. 'ldap'
56
-	 *
57
-	 * @returns string
58
-	 * @since 9.1
59
-	 */
60
-	public function getID() {
61
-		return 'sharing';
62
-	}
53
+    /**
54
+     * returns the ID of the section. It is supposed to be a lower case string,
55
+     * e.g. 'ldap'
56
+     *
57
+     * @returns string
58
+     * @since 9.1
59
+     */
60
+    public function getID() {
61
+        return 'sharing';
62
+    }
63 63
 
64
-	/**
65
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
66
-	 * integration'. Use the L10N service to translate it.
67
-	 *
68
-	 * @return string
69
-	 * @since 9.1
70
-	 */
71
-	public function getName() {
72
-		return $this->l->t('Sharing');
73
-	}
64
+    /**
65
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
66
+     * integration'. Use the L10N service to translate it.
67
+     *
68
+     * @return string
69
+     * @since 9.1
70
+     */
71
+    public function getName() {
72
+        return $this->l->t('Sharing');
73
+    }
74 74
 
75
-	/**
76
-	 * @return int whether the form should be rather on the top or bottom of
77
-	 * the settings navigation. The sections are arranged in ascending order of
78
-	 * the priority values. It is required to return a value between 0 and 99.
79
-	 *
80
-	 * E.g.: 70
81
-	 * @since 9.1
82
-	 */
83
-	public function getPriority() {
84
-		return 15;
85
-	}
75
+    /**
76
+     * @return int whether the form should be rather on the top or bottom of
77
+     * the settings navigation. The sections are arranged in ascending order of
78
+     * the priority values. It is required to return a value between 0 and 99.
79
+     *
80
+     * E.g.: 70
81
+     * @since 9.1
82
+     */
83
+    public function getPriority() {
84
+        return 15;
85
+    }
86 86
 }
Please login to merge, or discard this patch.
apps/federatedfilesharing/lib/Settings/Personal.php 1 patch
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -33,69 +33,69 @@
 block discarded – undo
33 33
 
34 34
 class Personal implements ISettings {
35 35
 
36
-	/** @var FederatedShareProvider */
37
-	private $federatedShareProvider;
38
-	/** @var IUserSession */
39
-	private $userSession;
40
-	/** @var IL10N */
41
-	private $l;
42
-	/** @var IURLGenerator */
43
-	private $urlGenerator;
44
-	/** @var \OC_Defaults */
45
-	private $defaults;
36
+    /** @var FederatedShareProvider */
37
+    private $federatedShareProvider;
38
+    /** @var IUserSession */
39
+    private $userSession;
40
+    /** @var IL10N */
41
+    private $l;
42
+    /** @var IURLGenerator */
43
+    private $urlGenerator;
44
+    /** @var \OC_Defaults */
45
+    private $defaults;
46 46
 
47
-	public function __construct(
48
-		FederatedShareProvider $federatedShareProvider, #
49
-		IUserSession $userSession,
50
-		IL10N $l,
51
-		IURLGenerator $urlGenerator,
52
-		\OC_Defaults $defaults
53
-	) {
54
-		$this->federatedShareProvider = $federatedShareProvider;
55
-		$this->userSession = $userSession;
56
-		$this->l = $l;
57
-		$this->urlGenerator = $urlGenerator;
58
-		$this->defaults = $defaults;
59
-	}
47
+    public function __construct(
48
+        FederatedShareProvider $federatedShareProvider, #
49
+        IUserSession $userSession,
50
+        IL10N $l,
51
+        IURLGenerator $urlGenerator,
52
+        \OC_Defaults $defaults
53
+    ) {
54
+        $this->federatedShareProvider = $federatedShareProvider;
55
+        $this->userSession = $userSession;
56
+        $this->l = $l;
57
+        $this->urlGenerator = $urlGenerator;
58
+        $this->defaults = $defaults;
59
+    }
60 60
 
61
-	/**
62
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
63
-	 * @since 9.1
64
-	 */
65
-	public function getForm() {
66
-		$cloudID = $this->userSession->getUser()->getCloudId();
67
-		$url = 'https://nextcloud.com/federation#' . $cloudID;
61
+    /**
62
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
63
+     * @since 9.1
64
+     */
65
+    public function getForm() {
66
+        $cloudID = $this->userSession->getUser()->getCloudId();
67
+        $url = 'https://nextcloud.com/federation#' . $cloudID;
68 68
 
69
-		$parameters = [
70
-			'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
71
-			'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
72
-			'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
73
-			'logoPath' => $this->urlGenerator->imagePath('core', 'logo-icon.svg'),
74
-			'reference' => $url,
75
-			'cloudId' => $cloudID,
76
-			'color' => $this->defaults->getColorPrimary(),
77
-			'textColor' => "#ffffff",
78
-		];
79
-		return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
80
-	}
69
+        $parameters = [
70
+            'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
71
+            'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
72
+            'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
73
+            'logoPath' => $this->urlGenerator->imagePath('core', 'logo-icon.svg'),
74
+            'reference' => $url,
75
+            'cloudId' => $cloudID,
76
+            'color' => $this->defaults->getColorPrimary(),
77
+            'textColor' => "#ffffff",
78
+        ];
79
+        return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
80
+    }
81 81
 
82
-	/**
83
-	 * @return string the section ID, e.g. 'sharing'
84
-	 * @since 9.1
85
-	 */
86
-	public function getSection() {
87
-		return 'sharing';
88
-	}
82
+    /**
83
+     * @return string the section ID, e.g. 'sharing'
84
+     * @since 9.1
85
+     */
86
+    public function getSection() {
87
+        return 'sharing';
88
+    }
89 89
 
90
-	/**
91
-	 * @return int whether the form should be rather on the top or bottom of
92
-	 * the admin section. The forms are arranged in ascending order of the
93
-	 * priority values. It is required to return a value between 0 and 100.
94
-	 *
95
-	 * E.g.: 70
96
-	 * @since 9.1
97
-	 */
98
-	public function getPriority() {
99
-		return 40;
100
-	}
90
+    /**
91
+     * @return int whether the form should be rather on the top or bottom of
92
+     * the admin section. The forms are arranged in ascending order of the
93
+     * priority values. It is required to return a value between 0 and 100.
94
+     *
95
+     * E.g.: 70
96
+     * @since 9.1
97
+     */
98
+    public function getPriority() {
99
+        return 40;
100
+    }
101 101
 }
Please login to merge, or discard this patch.
apps/federatedfilesharing/lib/AppInfo/Application.php 1 patch
Indentation   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -34,86 +34,86 @@
 block discarded – undo
34 34
 
35 35
 class Application extends App {
36 36
 
37
-	/** @var FederatedShareProvider */
38
-	protected $federatedShareProvider;
37
+    /** @var FederatedShareProvider */
38
+    protected $federatedShareProvider;
39 39
 
40
-	public function __construct() {
41
-		parent::__construct('federatedfilesharing');
40
+    public function __construct() {
41
+        parent::__construct('federatedfilesharing');
42 42
 
43
-		$container = $this->getContainer();
44
-		$server = $container->getServer();
43
+        $container = $this->getContainer();
44
+        $server = $container->getServer();
45 45
 
46
-		$container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
47
-			$addressHandler = new AddressHandler(
48
-				$server->getURLGenerator(),
49
-				$server->getL10N('federatedfilesharing'),
50
-				$server->getCloudIdManager()
51
-			);
52
-			$notification = new Notifications(
53
-				$addressHandler,
54
-				$server->getHTTPClientService(),
55
-				$server->query(\OCP\OCS\IDiscoveryService::class),
56
-				\OC::$server->getJobList()
57
-			);
58
-			return new RequestHandlerController(
59
-				$c->query('AppName'),
60
-				$server->getRequest(),
61
-				$this->getFederatedShareProvider(),
62
-				$server->getDatabaseConnection(),
63
-				$server->getShareManager(),
64
-				$notification,
65
-				$addressHandler,
66
-				$server->getUserManager(),
67
-				$server->getCloudIdManager()
68
-			);
69
-		});
70
-	}
46
+        $container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
47
+            $addressHandler = new AddressHandler(
48
+                $server->getURLGenerator(),
49
+                $server->getL10N('federatedfilesharing'),
50
+                $server->getCloudIdManager()
51
+            );
52
+            $notification = new Notifications(
53
+                $addressHandler,
54
+                $server->getHTTPClientService(),
55
+                $server->query(\OCP\OCS\IDiscoveryService::class),
56
+                \OC::$server->getJobList()
57
+            );
58
+            return new RequestHandlerController(
59
+                $c->query('AppName'),
60
+                $server->getRequest(),
61
+                $this->getFederatedShareProvider(),
62
+                $server->getDatabaseConnection(),
63
+                $server->getShareManager(),
64
+                $notification,
65
+                $addressHandler,
66
+                $server->getUserManager(),
67
+                $server->getCloudIdManager()
68
+            );
69
+        });
70
+    }
71 71
 
72
-	/**
73
-	 * get instance of federated share provider
74
-	 *
75
-	 * @return FederatedShareProvider
76
-	 */
77
-	public function getFederatedShareProvider() {
78
-		if ($this->federatedShareProvider === null) {
79
-			$this->initFederatedShareProvider();
80
-		}
81
-		return $this->federatedShareProvider;
82
-	}
72
+    /**
73
+     * get instance of federated share provider
74
+     *
75
+     * @return FederatedShareProvider
76
+     */
77
+    public function getFederatedShareProvider() {
78
+        if ($this->federatedShareProvider === null) {
79
+            $this->initFederatedShareProvider();
80
+        }
81
+        return $this->federatedShareProvider;
82
+    }
83 83
 
84
-	/**
85
-	 * initialize federated share provider
86
-	 */
87
-	protected function initFederatedShareProvider() {
88
-		$c = $this->getContainer();
89
-		$addressHandler = new \OCA\FederatedFileSharing\AddressHandler(
90
-			\OC::$server->getURLGenerator(),
91
-			\OC::$server->getL10N('federatedfilesharing'),
92
-			\OC::$server->getCloudIdManager()
93
-		);
94
-		$notifications = new \OCA\FederatedFileSharing\Notifications(
95
-			$addressHandler,
96
-			\OC::$server->getHTTPClientService(),
97
-			\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
98
-			\OC::$server->getJobList()
99
-		);
100
-		$tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
101
-			\OC::$server->getSecureRandom()
102
-		);
84
+    /**
85
+     * initialize federated share provider
86
+     */
87
+    protected function initFederatedShareProvider() {
88
+        $c = $this->getContainer();
89
+        $addressHandler = new \OCA\FederatedFileSharing\AddressHandler(
90
+            \OC::$server->getURLGenerator(),
91
+            \OC::$server->getL10N('federatedfilesharing'),
92
+            \OC::$server->getCloudIdManager()
93
+        );
94
+        $notifications = new \OCA\FederatedFileSharing\Notifications(
95
+            $addressHandler,
96
+            \OC::$server->getHTTPClientService(),
97
+            \OC::$server->query(\OCP\OCS\IDiscoveryService::class),
98
+            \OC::$server->getJobList()
99
+        );
100
+        $tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
101
+            \OC::$server->getSecureRandom()
102
+        );
103 103
 
104
-		$this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider(
105
-			\OC::$server->getDatabaseConnection(),
106
-			$addressHandler,
107
-			$notifications,
108
-			$tokenHandler,
109
-			\OC::$server->getL10N('federatedfilesharing'),
110
-			\OC::$server->getLogger(),
111
-			\OC::$server->getLazyRootFolder(),
112
-			\OC::$server->getConfig(),
113
-			\OC::$server->getUserManager(),
114
-			\OC::$server->getCloudIdManager(),
115
-			$c->query(IConfig::class)
116
-		);
117
-	}
104
+        $this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider(
105
+            \OC::$server->getDatabaseConnection(),
106
+            $addressHandler,
107
+            $notifications,
108
+            $tokenHandler,
109
+            \OC::$server->getL10N('federatedfilesharing'),
110
+            \OC::$server->getLogger(),
111
+            \OC::$server->getLazyRootFolder(),
112
+            \OC::$server->getConfig(),
113
+            \OC::$server->getUserManager(),
114
+            \OC::$server->getCloudIdManager(),
115
+            $c->query(IConfig::class)
116
+        );
117
+    }
118 118
 
119 119
 }
Please login to merge, or discard this patch.