@@ -98,9 +98,9 @@ |
||
| 98 | 98 | ); |
| 99 | 99 | |
| 100 | 100 | $this->setCount(0) |
| 101 | - ->setAllowRemove(true) |
|
| 102 | - ->setAllowAdd(true) |
|
| 103 | - ->setShouldCreateTemplate(true); |
|
| 101 | + ->setAllowRemove(true) |
|
| 102 | + ->setAllowAdd(true) |
|
| 103 | + ->setShouldCreateTemplate(true); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -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 | } |
@@ -104,7 +104,7 @@ |
||
| 104 | 104 | */ |
| 105 | 105 | public static function factory(ServiceManager $sm) |
| 106 | 106 | { |
| 107 | - //$manager = $sm->get('ControllerManager'); |
|
| 107 | + //$manager = $sm->get('ControllerManager'); |
|
| 108 | 108 | return new static($sm->get('AuthenticationService')); |
| 109 | 109 | } |
| 110 | 110 | } |
@@ -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 | } |
@@ -42,9 +42,9 @@ |
||
| 42 | 42 | $this->setApplicationKey($applicationKey); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @param ContainerInterface $serviceManager |
|
| 47 | - */ |
|
| 45 | + /** |
|
| 46 | + * @param ContainerInterface $serviceManager |
|
| 47 | + */ |
|
| 48 | 48 | public function setServiceLocator(ContainerInterface $serviceManager) |
| 49 | 49 | { |
| 50 | 50 | $this->serviceManager = $serviceManager; |
@@ -26,57 +26,57 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function init() |
| 28 | 28 | { |
| 29 | - $this->setName('installation'); |
|
| 29 | + $this->setName('installation'); |
|
| 30 | 30 | |
| 31 | - $this->setAttributes( |
|
| 32 | - array( |
|
| 33 | - 'method' => 'post', |
|
| 34 | - ) |
|
| 35 | - ); |
|
| 31 | + $this->setAttributes( |
|
| 32 | + array( |
|
| 33 | + 'method' => 'post', |
|
| 34 | + ) |
|
| 35 | + ); |
|
| 36 | 36 | |
| 37 | - $this->add( |
|
| 38 | - array( |
|
| 39 | - 'type' => 'Text', |
|
| 40 | - 'name' => 'db_conn', |
|
| 41 | - 'options' => array( |
|
| 42 | - 'label' => /* @translate */ 'Database connection string', |
|
| 43 | - ), |
|
| 44 | - 'attributes' => array( |
|
| 45 | - 'placeholder' => 'mongodb://localhost:27017/YAWIK', |
|
| 46 | - ), |
|
| 37 | + $this->add( |
|
| 38 | + array( |
|
| 39 | + 'type' => 'Text', |
|
| 40 | + 'name' => 'db_conn', |
|
| 41 | + 'options' => array( |
|
| 42 | + 'label' => /* @translate */ 'Database connection string', |
|
| 43 | + ), |
|
| 44 | + 'attributes' => array( |
|
| 45 | + 'placeholder' => 'mongodb://localhost:27017/YAWIK', |
|
| 46 | + ), |
|
| 47 | 47 | |
| 48 | - ) |
|
| 49 | - ); |
|
| 48 | + ) |
|
| 49 | + ); |
|
| 50 | 50 | |
| 51 | - $this->add( |
|
| 52 | - array( |
|
| 53 | - 'type' => 'Text', |
|
| 54 | - 'name' => 'username', |
|
| 55 | - 'options' => array( |
|
| 56 | - 'label' => /* @translate */ 'Initial user name', |
|
| 57 | - ), |
|
| 58 | - ) |
|
| 59 | - ); |
|
| 51 | + $this->add( |
|
| 52 | + array( |
|
| 53 | + 'type' => 'Text', |
|
| 54 | + 'name' => 'username', |
|
| 55 | + 'options' => array( |
|
| 56 | + 'label' => /* @translate */ 'Initial user name', |
|
| 57 | + ), |
|
| 58 | + ) |
|
| 59 | + ); |
|
| 60 | 60 | |
| 61 | - $this->add( |
|
| 62 | - array( |
|
| 63 | - 'type' => 'Password', |
|
| 64 | - 'name' => 'password', |
|
| 65 | - 'options' => array( |
|
| 66 | - 'label' => /* @translate */ 'Password', |
|
| 67 | - ), |
|
| 68 | - ) |
|
| 69 | - ); |
|
| 61 | + $this->add( |
|
| 62 | + array( |
|
| 63 | + 'type' => 'Password', |
|
| 64 | + 'name' => 'password', |
|
| 65 | + 'options' => array( |
|
| 66 | + 'label' => /* @translate */ 'Password', |
|
| 67 | + ), |
|
| 68 | + ) |
|
| 69 | + ); |
|
| 70 | 70 | |
| 71 | - $this->add( |
|
| 72 | - array( |
|
| 73 | - 'type' => 'Text', |
|
| 74 | - 'name' => 'email', |
|
| 75 | - 'options' => array( |
|
| 76 | - 'label' => /* @translate */ 'Email address for system messages', |
|
| 77 | - ), |
|
| 78 | - ) |
|
| 79 | - ); |
|
| 71 | + $this->add( |
|
| 72 | + array( |
|
| 73 | + 'type' => 'Text', |
|
| 74 | + 'name' => 'email', |
|
| 75 | + 'options' => array( |
|
| 76 | + 'label' => /* @translate */ 'Email address for system messages', |
|
| 77 | + ), |
|
| 78 | + ) |
|
| 79 | + ); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public function getInputFilterSpecification() |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | ), |
| 91 | 91 | 'validators' => array( |
| 92 | 92 | array('name' => MongoDbConnectionString::class, |
| 93 | - 'break_chain_on_failure' => true), |
|
| 93 | + 'break_chain_on_failure' => true), |
|
| 94 | 94 | array('name' => MongoDbConnection::class), |
| 95 | 95 | ), |
| 96 | 96 | ), |