@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * Return an image, if an image was requested. |
56 | 56 | */ |
57 | 57 | if ($exception instanceof UnauthorizedImageAccessException) { |
58 | - $image = __DIR__ . '/../../../../../public/images/unauthorized-access.png'; |
|
58 | + $image = __DIR__.'/../../../../../public/images/unauthorized-access.png'; |
|
59 | 59 | $response->setStatusCode(Response::STATUS_CODE_403) |
60 | 60 | ->setContent(file_get_contents($image)) |
61 | 61 | ->getHeaders() |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $routeMatch->setParam('action', 'index'); |
79 | 79 | $query = $e->getRequest()->getQuery(); |
80 | 80 | $ref = $e->getRequest()->getRequestUri(); |
81 | - $ref = preg_replace('~^' . preg_quote($e->getRouter()->getBaseUrl()) . '~', '', $ref); |
|
81 | + $ref = preg_replace('~^'.preg_quote($e->getRouter()->getBaseUrl()).'~', '', $ref); |
|
82 | 82 | $query->set('ref', $ref); |
83 | 83 | $query->set('req', 1); |
84 | 84 | $response->setStatusCode(Response::STATUS_CODE_401); |
@@ -87,7 +87,7 @@ |
||
87 | 87 | 'attributes' => [ |
88 | 88 | 'data-placeholder' => /*@translate*/ 'please select', |
89 | 89 | 'data-allowclear' => 'false', |
90 | - 'data-searchbox' => -1, // hide the search box |
|
90 | + 'data-searchbox' => -1, // hide the search box |
|
91 | 91 | 'required' => true, // mark label as required |
92 | 92 | ], |
93 | 93 | ] |
@@ -48,7 +48,7 @@ |
||
48 | 48 | break; |
49 | 49 | } |
50 | 50 | |
51 | - $config = $container->get('Config'); |
|
51 | + $config = $container->get('Config'); |
|
52 | 52 | |
53 | 53 | if (isset($config['view_manager'])) { |
54 | 54 | if (isset($config['view_manager']['display_exceptions'])) { |
@@ -97,8 +97,8 @@ |
||
97 | 97 | $value = null; |
98 | 98 | $service = $this->getService(); |
99 | 99 | $user = $service->getUser(); |
100 | - if (method_exists($user,"get".$property)) { |
|
101 | - $value = $user->{"get" . $property}(); |
|
100 | + if (method_exists($user, "get".$property)) { |
|
101 | + $value = $user->{"get".$property}(); |
|
102 | 102 | } |
103 | 103 | return $value; |
104 | 104 | } catch (\OutOfBoundsException $e) { |
@@ -92,7 +92,7 @@ |
||
92 | 92 | } |
93 | 93 | return $value; |
94 | 94 | } |
95 | - return 'id' == $property ? $auth->getIdentity() : $auth->getUser()->{'get' . $property}(); |
|
95 | + return 'id' == $property ? $auth->getIdentity() : $auth->getUser()->{'get'.$property}(); |
|
96 | 96 | } |
97 | 97 | return null; |
98 | 98 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function fetch($api) |
36 | 36 | { |
37 | - $result = $this->queryApi($api); |
|
37 | + $result = $this->queryApi($api); |
|
38 | 38 | if (!$result) { |
39 | 39 | return false; |
40 | 40 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $class = get_class($this); |
61 | 61 | $class = explode('\\', $class); |
62 | 62 | $class = array_pop($class); |
63 | - $class = '\\Auth\\Entity\\SocialProfiles\\' . $class; |
|
63 | + $class = '\\Auth\\Entity\\SocialProfiles\\'.$class; |
|
64 | 64 | |
65 | 65 | return $class; |
66 | 66 | } |
@@ -40,9 +40,9 @@ |
||
40 | 40 | * @var array |
41 | 41 | */ |
42 | 42 | protected $reCaptcha = [ |
43 | - 'site_key' => 'Your Recapture Public Key', // "site_key" |
|
44 | - 'secret_key' => 'Your Recapture Private Key', // "secret_key" |
|
45 | - 'ssl' => true, // include google api via http(s) |
|
43 | + 'site_key' => 'Your Recapture Public Key', // "site_key" |
|
44 | + 'secret_key' => 'Your Recapture Private Key', // "secret_key" |
|
45 | + 'ssl' => true, // include google api via http(s) |
|
46 | 46 | ]; |
47 | 47 | |
48 | 48 | /** |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | } |
116 | 116 | |
117 | 117 | $identity = $this->getIdentity(); |
118 | - $applicationId = '@' . $this->getApplicationIdentifier(); |
|
118 | + $applicationId = '@'.$this->getApplicationIdentifier(); |
|
119 | 119 | $applicationIdIndex = strrpos($identity, $applicationId); |
120 | 120 | //$login = (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex)?substr($identity, 0, $applicationIdIndex):$identity; |
121 | 121 | $login = $identity; |
@@ -128,8 +128,8 @@ discard block |
||
128 | 128 | $loginSuccess = false; |
129 | 129 | $loginResult = array(); |
130 | 130 | |
131 | - if (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex) { |
|
132 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with correct suffix: '); |
|
131 | + if (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex) { |
|
132 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with correct suffix: '); |
|
133 | 133 | // the login ends with the applicationID, therefore use the secret key |
134 | 134 | // the external login must be the form 'xxxxx@yyyy' where yyyy is the matching suffix to the external application key |
135 | 135 | if (isset($user)) { |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | $loginSuccess = true; |
138 | 138 | } else { |
139 | 139 | $loginSuccess = false; |
140 | - $this->serviceManager->get('Core/Log')->info('User ' . $login . ', secret: ' . $user->getSecret() . ' != loginPassword: ' . $filter->filter($credential) . ' (' . $credential . ')'); |
|
140 | + $this->serviceManager->get('Core/Log')->info('User '.$login.', secret: '.$user->getSecret().' != loginPassword: '.$filter->filter($credential).' ('.$credential.')'); |
|
141 | 141 | } |
142 | 142 | } else { |
143 | 143 | $user = $users->create( |
@@ -153,17 +153,17 @@ discard block |
||
153 | 153 | $loginResult = array('firstLogin' => true); |
154 | 154 | } |
155 | 155 | } elseif (isset($user)) { |
156 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with incorrect suffix: '); |
|
156 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with incorrect suffix: '); |
|
157 | 157 | if ($user->getCredential() == $filter->filter($credential)) { |
158 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are equal'); |
|
158 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are equal'); |
|
159 | 159 | $loginSuccess = true; |
160 | 160 | } elseif (!empty($applicationId)) { |
161 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are not equal'); |
|
161 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are not equal'); |
|
162 | 162 | // TODO: remove this code as soon as the secret key has been fully established |
163 | 163 | // basically this does allow an external login with an applicationIndex match against the User-Password |
164 | 164 | // the way it had been used in the start |
165 | 165 | if ($user->getCredential() == $filter->filter($credential)) { |
166 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials2 test'); |
|
166 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials2 test'); |
|
167 | 167 | $loginSuccess = true; |
168 | 168 | } |
169 | 169 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | 'translation_file_patterns' => [ |
38 | 38 | [ |
39 | 39 | 'type' => 'gettext', |
40 | - 'base_dir' => __DIR__ . '/../language', |
|
40 | + 'base_dir' => __DIR__.'/../language', |
|
41 | 41 | 'pattern' => '%s.mo', |
42 | 42 | ], |
43 | 43 | ], |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | // Configuration of the controller service manager (Which loads controllers) |
88 | 88 | 'controllers' => [ |
89 | 89 | 'factories' => [ |
90 | - 'Settings\Controller\Index' => [\Settings\Controller\IndexController::class,'factory'] |
|
90 | + 'Settings\Controller\Index' => [\Settings\Controller\IndexController::class, 'factory'] |
|
91 | 91 | ], |
92 | 92 | ], |
93 | 93 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | // Where to look for view templates not mapped above |
101 | 101 | 'template_path_stack' => [ |
102 | - __DIR__ . '/../view', |
|
102 | + __DIR__.'/../view', |
|
103 | 103 | ], |
104 | 104 | ], |
105 | 105 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | 'factories' => [ |
116 | 116 | 'Settings' => '\Settings\Settings\SettingsFactory', |
117 | 117 | 'Settings/EntityResolver' => '\Settings\Repository\SettingsEntityResolverFactory', |
118 | - 'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class,'factory'], |
|
118 | + 'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class, 'factory'], |
|
119 | 119 | ], |
120 | 120 | 'initializers' => [], |
121 | 121 | 'shared' => [], |
@@ -128,8 +128,8 @@ discard block |
||
128 | 128 | |
129 | 129 | 'form_elements' => [ |
130 | 130 | 'factories' => [ |
131 | - 'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class,'factory'], |
|
132 | - 'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class,'factory'], |
|
131 | + 'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class, 'factory'], |
|
132 | + 'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class, 'factory'], |
|
133 | 133 | 'Settings/Fieldset' => \Settings\Form\Factory\SettingsFieldsetFactory::class, |
134 | 134 | ], |
135 | 135 | 'aliases' => [ |