@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']])); |
107 | 107 | |
108 | 108 | if ($this->isAdmin()) { |
109 | - $notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index') . '#updater'); |
|
109 | + $notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index').'#updater'); |
|
110 | 110 | } |
111 | 111 | } else { |
112 | 112 | $appInfo = $this->getAppInfo($notification->getObjectType()); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | ]); |
127 | 127 | |
128 | 128 | if ($this->isAdmin()) { |
129 | - $notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType()); |
|
129 | + $notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']).'#app-'.$notification->getObjectType()); |
|
130 | 130 | } |
131 | 131 | } |
132 | 132 |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | |
121 | 121 | $calendar = $this->ensureCalendarExists($principalUri); |
122 | 122 | foreach (['', '-death', '-anniversary'] as $tag) { |
123 | - $objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics'; |
|
123 | + $objectUri = $book['uri'].'-'.$cardUri.$tag.'.ics'; |
|
124 | 124 | $this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri); |
125 | 125 | } |
126 | 126 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | return null; |
176 | 176 | } |
177 | 177 | $birthday = $doc->{$dateField}; |
178 | - if (!(string)$birthday) { |
|
178 | + if (!(string) $birthday) { |
|
179 | 179 | return null; |
180 | 180 | } |
181 | 181 | // Skip if the BDAY property is not of the right type. |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | $unknownYear = false; |
194 | 194 | if (!$dateParts['year']) { |
195 | - $birthday = '1900-' . $dateParts['month'] . '-' . $dateParts['date']; |
|
195 | + $birthday = '1900-'.$dateParts['month'].'-'.$dateParts['date']; |
|
196 | 196 | |
197 | 197 | $unknownYear = true; |
198 | 198 | } |
@@ -203,10 +203,10 @@ discard block |
||
203 | 203 | return null; |
204 | 204 | } |
205 | 205 | if ($unknownYear) { |
206 | - $summary = $doc->FN->getValue() . ' ' . $summarySymbol; |
|
206 | + $summary = $doc->FN->getValue().' '.$summarySymbol; |
|
207 | 207 | } else { |
208 | - $year = (int)$date->format('Y'); |
|
209 | - $summary = $doc->FN->getValue() . " ($summarySymbol$year)"; |
|
208 | + $year = (int) $date->format('Y'); |
|
209 | + $summary = $doc->FN->getValue()." ($summarySymbol$year)"; |
|
210 | 210 | } |
211 | 211 | $vCal = new VCalendar(); |
212 | 212 | $vCal->VERSION = '2.0'; |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | $date |
223 | 223 | ); |
224 | 224 | $vEvent->DTEND['VALUE'] = 'DATE'; |
225 | - $vEvent->{'UID'} = $doc->UID . $postfix; |
|
225 | + $vEvent->{'UID'} = $doc->UID.$postfix; |
|
226 | 226 | $vEvent->{'RRULE'} = 'FREQ=YEARLY'; |
227 | 227 | $vEvent->{'SUMMARY'} = $summary; |
228 | 228 | $vEvent->{'TRANSP'} = 'TRANSPARENT'; |
@@ -242,9 +242,9 @@ discard block |
||
242 | 242 | $principal = 'principals/users/'.$user; |
243 | 243 | $this->ensureCalendarExists($principal); |
244 | 244 | $books = $this->cardDavBackEnd->getAddressBooksForUser($principal); |
245 | - foreach($books as $book) { |
|
245 | + foreach ($books as $book) { |
|
246 | 246 | $cards = $this->cardDavBackEnd->getCards($book['id']); |
247 | - foreach($cards as $card) { |
|
247 | + foreach ($cards as $card) { |
|
248 | 248 | $this->onCardChanged($book['id'], $card['uri'], $card['carddata']); |
249 | 249 | } |
250 | 250 | } |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | * @param string[] $type |
298 | 298 | */ |
299 | 299 | private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) { |
300 | - $objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics'; |
|
300 | + $objectUri = $book['uri'].'-'.$cardUri.$type['postfix'].'.ics'; |
|
301 | 301 | $calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['postfix'], $type['symbol']); |
302 | 302 | $existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri); |
303 | 303 | if (is_null($calendarData)) { |
@@ -6,62 +6,62 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\User_LDAP\\Access' => $baseDir . '/../lib/Access.php', |
|
10 | - 'OCA\\User_LDAP\\AccessFactory' => $baseDir . '/../lib/AccessFactory.php', |
|
11 | - 'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', |
|
12 | - 'OCA\\User_LDAP\\BackendUtility' => $baseDir . '/../lib/BackendUtility.php', |
|
13 | - 'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir . '/../lib/Command/CheckUser.php', |
|
14 | - 'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir . '/../lib/Command/CreateEmptyConfig.php', |
|
15 | - 'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir . '/../lib/Command/DeleteConfig.php', |
|
16 | - 'OCA\\User_LDAP\\Command\\Search' => $baseDir . '/../lib/Command/Search.php', |
|
17 | - 'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir . '/../lib/Command/SetConfig.php', |
|
18 | - 'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir . '/../lib/Command/ShowConfig.php', |
|
19 | - 'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir . '/../lib/Command/ShowRemnants.php', |
|
20 | - 'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir . '/../lib/Command/TestConfig.php', |
|
21 | - 'OCA\\User_LDAP\\Configuration' => $baseDir . '/../lib/Configuration.php', |
|
22 | - 'OCA\\User_LDAP\\Connection' => $baseDir . '/../lib/Connection.php', |
|
23 | - 'OCA\\User_LDAP\\ConnectionFactory' => $baseDir . '/../lib/ConnectionFactory.php', |
|
24 | - 'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir . '/../lib/Controller/ConfigAPIController.php', |
|
25 | - 'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir . '/../lib/Controller/RenewPasswordController.php', |
|
26 | - 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir . '/../lib/Exceptions/ConstraintViolationException.php', |
|
27 | - 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir . '/../lib/Exceptions/NotOnLDAP.php', |
|
28 | - 'OCA\\User_LDAP\\FilesystemHelper' => $baseDir . '/../lib/FilesystemHelper.php', |
|
29 | - 'OCA\\User_LDAP\\GroupPluginManager' => $baseDir . '/../lib/GroupPluginManager.php', |
|
30 | - 'OCA\\User_LDAP\\Group_LDAP' => $baseDir . '/../lib/Group_LDAP.php', |
|
31 | - 'OCA\\User_LDAP\\Group_Proxy' => $baseDir . '/../lib/Group_Proxy.php', |
|
32 | - 'OCA\\User_LDAP\\Helper' => $baseDir . '/../lib/Helper.php', |
|
33 | - 'OCA\\User_LDAP\\IGroupLDAP' => $baseDir . '/../lib/IGroupLDAP.php', |
|
34 | - 'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir . '/../lib/ILDAPGroupPlugin.php', |
|
35 | - 'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir . '/../lib/ILDAPUserPlugin.php', |
|
36 | - 'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir . '/../lib/ILDAPWrapper.php', |
|
37 | - 'OCA\\User_LDAP\\IUserLDAP' => $baseDir . '/../lib/IUserLDAP.php', |
|
38 | - 'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir . '/../lib/Jobs/CleanUp.php', |
|
39 | - 'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir . '/../lib/Jobs/Sync.php', |
|
40 | - 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir . '/../lib/Jobs/UpdateGroups.php', |
|
41 | - 'OCA\\User_LDAP\\LDAP' => $baseDir . '/../lib/LDAP.php', |
|
42 | - 'OCA\\User_LDAP\\LDAPProvider' => $baseDir . '/../lib/LDAPProvider.php', |
|
43 | - 'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir . '/../lib/LDAPProviderFactory.php', |
|
44 | - 'OCA\\User_LDAP\\LDAPUtility' => $baseDir . '/../lib/LDAPUtility.php', |
|
45 | - 'OCA\\User_LDAP\\LogWrapper' => $baseDir . '/../lib/LogWrapper.php', |
|
46 | - 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir . '/../lib/Mapping/AbstractMapping.php', |
|
47 | - 'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir . '/../lib/Mapping/GroupMapping.php', |
|
48 | - 'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir . '/../lib/Mapping/UserMapping.php', |
|
49 | - 'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir . '/../lib/Migration/UUIDFix.php', |
|
50 | - 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir . '/../lib/Migration/UUIDFixGroup.php', |
|
51 | - 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir . '/../lib/Migration/UUIDFixInsert.php', |
|
52 | - 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir . '/../lib/Migration/UUIDFixUser.php', |
|
53 | - 'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php', |
|
54 | - 'OCA\\User_LDAP\\Proxy' => $baseDir . '/../lib/Proxy.php', |
|
55 | - 'OCA\\User_LDAP\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php', |
|
56 | - 'OCA\\User_LDAP\\Settings\\Section' => $baseDir . '/../lib/Settings/Section.php', |
|
57 | - 'OCA\\User_LDAP\\UserPluginManager' => $baseDir . '/../lib/UserPluginManager.php', |
|
58 | - 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir . '/../lib/User/DeletedUsersIndex.php', |
|
59 | - 'OCA\\User_LDAP\\User\\IUserTools' => $baseDir . '/../lib/User/IUserTools.php', |
|
60 | - 'OCA\\User_LDAP\\User\\Manager' => $baseDir . '/../lib/User/Manager.php', |
|
61 | - 'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir . '/../lib/User/OfflineUser.php', |
|
62 | - 'OCA\\User_LDAP\\User\\User' => $baseDir . '/../lib/User/User.php', |
|
63 | - 'OCA\\User_LDAP\\User_LDAP' => $baseDir . '/../lib/User_LDAP.php', |
|
64 | - 'OCA\\User_LDAP\\User_Proxy' => $baseDir . '/../lib/User_Proxy.php', |
|
65 | - 'OCA\\User_LDAP\\Wizard' => $baseDir . '/../lib/Wizard.php', |
|
66 | - 'OCA\\User_LDAP\\WizardResult' => $baseDir . '/../lib/WizardResult.php', |
|
9 | + 'OCA\\User_LDAP\\Access' => $baseDir.'/../lib/Access.php', |
|
10 | + 'OCA\\User_LDAP\\AccessFactory' => $baseDir.'/../lib/AccessFactory.php', |
|
11 | + 'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php', |
|
12 | + 'OCA\\User_LDAP\\BackendUtility' => $baseDir.'/../lib/BackendUtility.php', |
|
13 | + 'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir.'/../lib/Command/CheckUser.php', |
|
14 | + 'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir.'/../lib/Command/CreateEmptyConfig.php', |
|
15 | + 'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir.'/../lib/Command/DeleteConfig.php', |
|
16 | + 'OCA\\User_LDAP\\Command\\Search' => $baseDir.'/../lib/Command/Search.php', |
|
17 | + 'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir.'/../lib/Command/SetConfig.php', |
|
18 | + 'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir.'/../lib/Command/ShowConfig.php', |
|
19 | + 'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir.'/../lib/Command/ShowRemnants.php', |
|
20 | + 'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir.'/../lib/Command/TestConfig.php', |
|
21 | + 'OCA\\User_LDAP\\Configuration' => $baseDir.'/../lib/Configuration.php', |
|
22 | + 'OCA\\User_LDAP\\Connection' => $baseDir.'/../lib/Connection.php', |
|
23 | + 'OCA\\User_LDAP\\ConnectionFactory' => $baseDir.'/../lib/ConnectionFactory.php', |
|
24 | + 'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir.'/../lib/Controller/ConfigAPIController.php', |
|
25 | + 'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir.'/../lib/Controller/RenewPasswordController.php', |
|
26 | + 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir.'/../lib/Exceptions/ConstraintViolationException.php', |
|
27 | + 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir.'/../lib/Exceptions/NotOnLDAP.php', |
|
28 | + 'OCA\\User_LDAP\\FilesystemHelper' => $baseDir.'/../lib/FilesystemHelper.php', |
|
29 | + 'OCA\\User_LDAP\\GroupPluginManager' => $baseDir.'/../lib/GroupPluginManager.php', |
|
30 | + 'OCA\\User_LDAP\\Group_LDAP' => $baseDir.'/../lib/Group_LDAP.php', |
|
31 | + 'OCA\\User_LDAP\\Group_Proxy' => $baseDir.'/../lib/Group_Proxy.php', |
|
32 | + 'OCA\\User_LDAP\\Helper' => $baseDir.'/../lib/Helper.php', |
|
33 | + 'OCA\\User_LDAP\\IGroupLDAP' => $baseDir.'/../lib/IGroupLDAP.php', |
|
34 | + 'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir.'/../lib/ILDAPGroupPlugin.php', |
|
35 | + 'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir.'/../lib/ILDAPUserPlugin.php', |
|
36 | + 'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir.'/../lib/ILDAPWrapper.php', |
|
37 | + 'OCA\\User_LDAP\\IUserLDAP' => $baseDir.'/../lib/IUserLDAP.php', |
|
38 | + 'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir.'/../lib/Jobs/CleanUp.php', |
|
39 | + 'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir.'/../lib/Jobs/Sync.php', |
|
40 | + 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir.'/../lib/Jobs/UpdateGroups.php', |
|
41 | + 'OCA\\User_LDAP\\LDAP' => $baseDir.'/../lib/LDAP.php', |
|
42 | + 'OCA\\User_LDAP\\LDAPProvider' => $baseDir.'/../lib/LDAPProvider.php', |
|
43 | + 'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir.'/../lib/LDAPProviderFactory.php', |
|
44 | + 'OCA\\User_LDAP\\LDAPUtility' => $baseDir.'/../lib/LDAPUtility.php', |
|
45 | + 'OCA\\User_LDAP\\LogWrapper' => $baseDir.'/../lib/LogWrapper.php', |
|
46 | + 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir.'/../lib/Mapping/AbstractMapping.php', |
|
47 | + 'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir.'/../lib/Mapping/GroupMapping.php', |
|
48 | + 'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir.'/../lib/Mapping/UserMapping.php', |
|
49 | + 'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir.'/../lib/Migration/UUIDFix.php', |
|
50 | + 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir.'/../lib/Migration/UUIDFixGroup.php', |
|
51 | + 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir.'/../lib/Migration/UUIDFixInsert.php', |
|
52 | + 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir.'/../lib/Migration/UUIDFixUser.php', |
|
53 | + 'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php', |
|
54 | + 'OCA\\User_LDAP\\Proxy' => $baseDir.'/../lib/Proxy.php', |
|
55 | + 'OCA\\User_LDAP\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php', |
|
56 | + 'OCA\\User_LDAP\\Settings\\Section' => $baseDir.'/../lib/Settings/Section.php', |
|
57 | + 'OCA\\User_LDAP\\UserPluginManager' => $baseDir.'/../lib/UserPluginManager.php', |
|
58 | + 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir.'/../lib/User/DeletedUsersIndex.php', |
|
59 | + 'OCA\\User_LDAP\\User\\IUserTools' => $baseDir.'/../lib/User/IUserTools.php', |
|
60 | + 'OCA\\User_LDAP\\User\\Manager' => $baseDir.'/../lib/User/Manager.php', |
|
61 | + 'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir.'/../lib/User/OfflineUser.php', |
|
62 | + 'OCA\\User_LDAP\\User\\User' => $baseDir.'/../lib/User/User.php', |
|
63 | + 'OCA\\User_LDAP\\User_LDAP' => $baseDir.'/../lib/User_LDAP.php', |
|
64 | + 'OCA\\User_LDAP\\User_Proxy' => $baseDir.'/../lib/User_Proxy.php', |
|
65 | + 'OCA\\User_LDAP\\Wizard' => $baseDir.'/../lib/Wizard.php', |
|
66 | + 'OCA\\User_LDAP\\WizardResult' => $baseDir.'/../lib/WizardResult.php', |
|
67 | 67 | ); |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | * |
30 | 30 | */ |
31 | 31 | |
32 | -require_once __DIR__ . '/../lib/versioncheck.php'; |
|
33 | -require_once __DIR__ . '/../lib/base.php'; |
|
32 | +require_once __DIR__.'/../lib/versioncheck.php'; |
|
33 | +require_once __DIR__.'/../lib/base.php'; |
|
34 | 34 | |
35 | 35 | if (\OCP\Util::needUpgrade() |
36 | 36 | || \OC::$server->getSystemConfig()->getValue('maintenance', false)) { |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | * Try the appframework routes |
73 | 73 | */ |
74 | 74 | try { |
75 | - if(!\OC::$server->getUserSession()->isLoggedIn()) { |
|
75 | + if (!\OC::$server->getUserSession()->isLoggedIn()) { |
|
76 | 76 | OC::handleLogin(\OC::$server->getRequest()); |
77 | 77 | } |
78 | 78 | OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo()); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | OC_API::setContentType(); |
81 | 81 | |
82 | 82 | $format = \OC::$server->getRequest()->getParam('format', 'xml'); |
83 | - $txt='Invalid query, please check the syntax. API specifications are here:' |
|
83 | + $txt = 'Invalid query, please check the syntax. API specifications are here:' |
|
84 | 84 | .' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n"; |
85 | 85 | OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format); |
86 | 86 | } catch (MethodNotAllowedException $e) { |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | OC_API::setContentType(); |
96 | 96 | |
97 | 97 | $format = \OC::$server->getRequest()->getParam('format', 'xml'); |
98 | - $txt='Invalid query, please check the syntax. API specifications are here:' |
|
98 | + $txt = 'Invalid query, please check the syntax. API specifications are here:' |
|
99 | 99 | .' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n"; |
100 | 100 | OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format); |
101 | 101 | } |
@@ -122,7 +122,7 @@ |
||
122 | 122 | } |
123 | 123 | |
124 | 124 | $eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite'; |
125 | - $this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [ |
|
125 | + $this->dispatcher->dispatch(self::class.'::'.$eventName, new GenericEvent(null, [ |
|
126 | 126 | 'userId' => $user->getUID(), |
127 | 127 | 'fileId' => $fileId, |
128 | 128 | 'path' => $path, |
@@ -79,8 +79,7 @@ |
||
79 | 79 | 'color-element' => $this->util->elementColor($color), |
80 | 80 | 'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()), |
81 | 81 | 'background' => $backgroundLogo === 'backgroundColor' ? |
82 | - $this->theming->getColorPrimary() : |
|
83 | - $this->url->getAbsoluteURL($this->theming->getBackground()), |
|
82 | + $this->theming->getColorPrimary() : $this->url->getAbsoluteURL($this->theming->getBackground()), |
|
84 | 83 | 'background-plain' => $backgroundLogo === 'backgroundColor', |
85 | 84 | 'background-default' => !$this->util->isBackgroundThemed(), |
86 | 85 | ], |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $pagingSize = $this->config->getAppValue('user_ldap', $configKey, $minPagingSize); |
113 | 113 | $minPagingSize = $minPagingSize === null ? $pagingSize : min($minPagingSize, $pagingSize); |
114 | 114 | } |
115 | - return (int)$minPagingSize; |
|
115 | + return (int) $minPagingSize; |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -123,20 +123,20 @@ discard block |
||
123 | 123 | |
124 | 124 | $isBackgroundJobModeAjax = $this->config |
125 | 125 | ->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'ajax'; |
126 | - if($isBackgroundJobModeAjax) { |
|
126 | + if ($isBackgroundJobModeAjax) { |
|
127 | 127 | return; |
128 | 128 | } |
129 | 129 | |
130 | 130 | $cycleData = $this->getCycle(); |
131 | - if($cycleData === null) { |
|
131 | + if ($cycleData === null) { |
|
132 | 132 | $cycleData = $this->determineNextCycle(); |
133 | - if($cycleData === null) { |
|
133 | + if ($cycleData === null) { |
|
134 | 134 | $this->updateInterval(); |
135 | 135 | return; |
136 | 136 | } |
137 | 137 | } |
138 | 138 | |
139 | - if(!$this->qualifiesToRun($cycleData)) { |
|
139 | + if (!$this->qualifiesToRun($cycleData)) { |
|
140 | 140 | $this->updateInterval(); |
141 | 141 | return; |
142 | 142 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | |
166 | 166 | $filter = $access->combineFilterWithAnd(array( |
167 | 167 | $access->connection->ldapUserFilter, |
168 | - $access->connection->ldapUserDisplayName . '=*', |
|
168 | + $access->connection->ldapUserDisplayName.'=*', |
|
169 | 169 | $access->getFilterPartForUserSearch('') |
170 | 170 | )); |
171 | 171 | $results = $access->fetchListOfUsers( |
@@ -176,10 +176,10 @@ discard block |
||
176 | 176 | true |
177 | 177 | ); |
178 | 178 | |
179 | - if((int)$connection->ldapPagingSize === 0) { |
|
179 | + if ((int) $connection->ldapPagingSize === 0) { |
|
180 | 180 | return false; |
181 | 181 | } |
182 | - return count($results) >= (int)$connection->ldapPagingSize; |
|
182 | + return count($results) >= (int) $connection->ldapPagingSize; |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
@@ -190,16 +190,16 @@ discard block |
||
190 | 190 | */ |
191 | 191 | public function getCycle() { |
192 | 192 | $prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true); |
193 | - if(count($prefixes) === 0) { |
|
193 | + if (count($prefixes) === 0) { |
|
194 | 194 | return null; |
195 | 195 | } |
196 | 196 | |
197 | 197 | $cycleData = [ |
198 | 198 | 'prefix' => $this->config->getAppValue('user_ldap', 'background_sync_prefix', null), |
199 | - 'offset' => (int)$this->config->getAppValue('user_ldap', 'background_sync_offset', 0), |
|
199 | + 'offset' => (int) $this->config->getAppValue('user_ldap', 'background_sync_offset', 0), |
|
200 | 200 | ]; |
201 | 201 | |
202 | - if( |
|
202 | + if ( |
|
203 | 203 | $cycleData['prefix'] !== null |
204 | 204 | && in_array($cycleData['prefix'], $prefixes) |
205 | 205 | ) { |
@@ -228,14 +228,14 @@ discard block |
||
228 | 228 | */ |
229 | 229 | public function determineNextCycle(array $cycleData = null) { |
230 | 230 | $prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true); |
231 | - if(count($prefixes) === 0) { |
|
231 | + if (count($prefixes) === 0) { |
|
232 | 232 | return null; |
233 | 233 | } |
234 | 234 | |
235 | 235 | // get the next prefix in line and remember it |
236 | 236 | $oldPrefix = $cycleData === null ? null : $cycleData['prefix']; |
237 | 237 | $prefix = $this->getNextPrefix($oldPrefix); |
238 | - if($prefix === null) { |
|
238 | + if ($prefix === null) { |
|
239 | 239 | return null; |
240 | 240 | } |
241 | 241 | $cycleData['prefix'] = $prefix; |
@@ -253,8 +253,8 @@ discard block |
||
253 | 253 | * @return bool |
254 | 254 | */ |
255 | 255 | public function qualifiesToRun($cycleData) { |
256 | - $lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'] . '_lastChange', 0); |
|
257 | - if((time() - $lastChange) > 60 * 30) { |
|
256 | + $lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'].'_lastChange', 0); |
|
257 | + if ((time() - $lastChange) > 60 * 30) { |
|
258 | 258 | return true; |
259 | 259 | } |
260 | 260 | return false; |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | */ |
268 | 268 | protected function increaseOffset($cycleData) { |
269 | 269 | $ldapConfig = new Configuration($cycleData['prefix']); |
270 | - $cycleData['offset'] += (int)$ldapConfig->ldapPagingSize; |
|
270 | + $cycleData['offset'] += (int) $ldapConfig->ldapPagingSize; |
|
271 | 271 | $this->setCycle($cycleData); |
272 | 272 | } |
273 | 273 | |
@@ -280,17 +280,17 @@ discard block |
||
280 | 280 | protected function getNextPrefix($lastPrefix) { |
281 | 281 | $prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true); |
282 | 282 | $noOfPrefixes = count($prefixes); |
283 | - if($noOfPrefixes === 0) { |
|
283 | + if ($noOfPrefixes === 0) { |
|
284 | 284 | return null; |
285 | 285 | } |
286 | 286 | $i = $lastPrefix === null ? false : array_search($lastPrefix, $prefixes, true); |
287 | - if($i === false) { |
|
287 | + if ($i === false) { |
|
288 | 288 | $i = -1; |
289 | 289 | } else { |
290 | 290 | $i++; |
291 | 291 | } |
292 | 292 | |
293 | - if(!isset($prefixes[$i])) { |
|
293 | + if (!isset($prefixes[$i])) { |
|
294 | 294 | $i = 0; |
295 | 295 | } |
296 | 296 | return $prefixes[$i]; |
@@ -302,49 +302,49 @@ discard block |
||
302 | 302 | * @param array $argument |
303 | 303 | */ |
304 | 304 | public function setArgument($argument) { |
305 | - if(isset($argument['config'])) { |
|
305 | + if (isset($argument['config'])) { |
|
306 | 306 | $this->config = $argument['config']; |
307 | 307 | } else { |
308 | 308 | $this->config = \OC::$server->getConfig(); |
309 | 309 | } |
310 | 310 | |
311 | - if(isset($argument['helper'])) { |
|
311 | + if (isset($argument['helper'])) { |
|
312 | 312 | $this->ldapHelper = $argument['helper']; |
313 | 313 | } else { |
314 | 314 | $this->ldapHelper = new Helper($this->config); |
315 | 315 | } |
316 | 316 | |
317 | - if(isset($argument['ldapWrapper'])) { |
|
317 | + if (isset($argument['ldapWrapper'])) { |
|
318 | 318 | $this->ldap = $argument['ldapWrapper']; |
319 | 319 | } else { |
320 | 320 | $this->ldap = new LDAP(); |
321 | 321 | } |
322 | 322 | |
323 | - if(isset($argument['avatarManager'])) { |
|
323 | + if (isset($argument['avatarManager'])) { |
|
324 | 324 | $this->avatarManager = $argument['avatarManager']; |
325 | 325 | } else { |
326 | 326 | $this->avatarManager = \OC::$server->getAvatarManager(); |
327 | 327 | } |
328 | 328 | |
329 | - if(isset($argument['dbc'])) { |
|
329 | + if (isset($argument['dbc'])) { |
|
330 | 330 | $this->dbc = $argument['dbc']; |
331 | 331 | } else { |
332 | 332 | $this->dbc = \OC::$server->getDatabaseConnection(); |
333 | 333 | } |
334 | 334 | |
335 | - if(isset($argument['ncUserManager'])) { |
|
335 | + if (isset($argument['ncUserManager'])) { |
|
336 | 336 | $this->ncUserManager = $argument['ncUserManager']; |
337 | 337 | } else { |
338 | 338 | $this->ncUserManager = \OC::$server->getUserManager(); |
339 | 339 | } |
340 | 340 | |
341 | - if(isset($argument['notificationManager'])) { |
|
341 | + if (isset($argument['notificationManager'])) { |
|
342 | 342 | $this->notificationManager = $argument['notificationManager']; |
343 | 343 | } else { |
344 | 344 | $this->notificationManager = \OC::$server->getNotificationManager(); |
345 | 345 | } |
346 | 346 | |
347 | - if(isset($argument['userManager'])) { |
|
347 | + if (isset($argument['userManager'])) { |
|
348 | 348 | $this->userManager = $argument['userManager']; |
349 | 349 | } else { |
350 | 350 | $this->userManager = new Manager( |
@@ -359,19 +359,19 @@ discard block |
||
359 | 359 | ); |
360 | 360 | } |
361 | 361 | |
362 | - if(isset($argument['mapper'])) { |
|
362 | + if (isset($argument['mapper'])) { |
|
363 | 363 | $this->mapper = $argument['mapper']; |
364 | 364 | } else { |
365 | 365 | $this->mapper = new UserMapping($this->dbc); |
366 | 366 | } |
367 | 367 | |
368 | - if(isset($argument['connectionFactory'])) { |
|
368 | + if (isset($argument['connectionFactory'])) { |
|
369 | 369 | $this->connectionFactory = $argument['connectionFactory']; |
370 | 370 | } else { |
371 | 371 | $this->connectionFactory = new ConnectionFactory($this->ldap); |
372 | 372 | } |
373 | 373 | |
374 | - if(isset($argument['accessFactory'])) { |
|
374 | + if (isset($argument['accessFactory'])) { |
|
375 | 375 | $this->accessFactory = $argument['accessFactory']; |
376 | 376 | } else { |
377 | 377 | $this->accessFactory = new AccessFactory( |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | if (version_compare(PHP_VERSION, '7.0') === -1) { |
6 | 6 | http_response_code(500); |
7 | 7 | echo 'This version of Nextcloud requires at least PHP 7.0<br/>'; |
8 | - echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; |
|
8 | + echo 'You are currently running '.PHP_VERSION.'. Please update your PHP version.'; |
|
9 | 9 | exit(-1); |
10 | 10 | } |
11 | 11 | |
@@ -13,6 +13,6 @@ discard block |
||
13 | 13 | if (version_compare(PHP_VERSION, '7.3.0') !== -1) { |
14 | 14 | http_response_code(500); |
15 | 15 | echo 'This version of Nextcloud is not compatible with > PHP 7.2.<br/>'; |
16 | - echo 'You are currently running ' . PHP_VERSION . '.'; |
|
16 | + echo 'You are currently running '.PHP_VERSION.'.'; |
|
17 | 17 | exit(-1); |
18 | 18 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $folder = $this->appData->getFolder($appName); |
73 | 73 | $gzip = false; |
74 | 74 | $file = $this->getFile($folder, $fileName, $gzip); |
75 | - } catch(NotFoundException $e) { |
|
75 | + } catch (NotFoundException $e) { |
|
76 | 76 | return new NotFoundResponse(); |
77 | 77 | } |
78 | 78 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | if (strpos($encoding, 'gzip') !== false) { |
102 | 102 | try { |
103 | 103 | $gzip = true; |
104 | - return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz |
|
104 | + return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz |
|
105 | 105 | } catch (NotFoundException $e) { |
106 | 106 | // continue |
107 | 107 | } |