@@ -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 | } |
@@ -37,14 +37,14 @@ |
||
| 37 | 37 | $this->options['allowName'] = isset($options['allowName']) ? $options['allowName'] : null; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 41 | - { |
|
| 42 | - $auth = $container->get('AuthenticationService'); |
|
| 43 | - $user = $auth->getUser(); |
|
| 44 | - $options = $this->options; |
|
| 45 | - $options['user'] = $user; |
|
| 46 | - $validator = new UniqueGroupName($options); |
|
| 40 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 41 | + { |
|
| 42 | + $auth = $container->get('AuthenticationService'); |
|
| 43 | + $user = $auth->getUser(); |
|
| 44 | + $options = $this->options; |
|
| 45 | + $options['user'] = $user; |
|
| 46 | + $validator = new UniqueGroupName($options); |
|
| 47 | 47 | |
| 48 | - return $validator; |
|
| 49 | - } |
|
| 48 | + return $validator; |
|
| 49 | + } |
|
| 50 | 50 | } |
@@ -55,8 +55,8 @@ |
||
| 55 | 55 | { |
| 56 | 56 | /* @var $options \Applications\Options\ModuleOptions */ |
| 57 | 57 | $form->get($this->fileName)->setViewHelper('formImageUpload') |
| 58 | - ->setMaxSize($options->getContactImageMaxSize()) |
|
| 59 | - ->setAllowedTypes($options->getContactImageMimeType()) |
|
| 60 | - ->setForm($form); |
|
| 58 | + ->setMaxSize($options->getContactImageMaxSize()) |
|
| 59 | + ->setAllowedTypes($options->getContactImageMimeType()) |
|
| 60 | + ->setForm($form); |
|
| 61 | 61 | } |
| 62 | 62 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | 'info' => array( |
| 63 | 63 | 'type' => 'Auth/UserInfo', |
| 64 | 64 | 'property' => true, |
| 65 | - 'use_post_array' => true |
|
| 65 | + 'use_post_array' => true |
|
| 66 | 66 | ), |
| 67 | 67 | 'image' => array( |
| 68 | 68 | 'type' => 'Auth/UserImage', |
@@ -56,6 +56,6 @@ |
||
| 56 | 56 | $form = new static(); |
| 57 | 57 | $form->forms = $forms->get('FormElementManager'); |
| 58 | 58 | |
| 59 | - return $form; |
|
| 59 | + return $form; |
|
| 60 | 60 | } |
| 61 | 61 | } |
@@ -138,14 +138,14 @@ |
||
| 138 | 138 | if (!$this->test($resource, $privilege)) { |
| 139 | 139 | $msg = null === $privilege |
| 140 | 140 | ? sprintf( |
| 141 | - 'You are not allowed to access resource "%s"', |
|
| 142 | - is_object($resource) ? $resource->getResourceId() : $resource |
|
| 143 | - ) |
|
| 141 | + 'You are not allowed to access resource "%s"', |
|
| 142 | + is_object($resource) ? $resource->getResourceId() : $resource |
|
| 143 | + ) |
|
| 144 | 144 | : sprintf( |
| 145 | - 'You are not allowed to execute operation "%s" on resource "%s"', |
|
| 146 | - $privilege, |
|
| 147 | - is_object($resource) ? $resource->getResourceId() : $resource |
|
| 148 | - ); |
|
| 145 | + 'You are not allowed to execute operation "%s" on resource "%s"', |
|
| 146 | + $privilege, |
|
| 147 | + is_object($resource) ? $resource->getResourceId() : $resource |
|
| 148 | + ); |
|
| 149 | 149 | |
| 150 | 150 | if ($resource instanceof FileInterface && 0 == strpos($resource->getType(), 'image/')) { |
| 151 | 151 | throw new UnauthorizedImageAccessException(str_replace('resource', 'image', $msg)); |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | $LINKEDIN_APP_SECRET = getenv('LINKEDIN_APP_SECRET'); |
| 7 | 7 | |
| 8 | 8 | return array( |
| 9 | - 'hybridauth' => array( |
|
| 9 | + 'hybridauth' => array( |
|
| 10 | 10 | "Facebook" => array ( |
| 11 | 11 | "enabled" => true, |
| 12 | 12 | "keys" => array ( "id" => $FACEBOOK_APP_ID, "secret" => $FACEBOOK_APP_SECRET ), |
@@ -30,13 +30,13 @@ discard block |
||
| 30 | 30 | "scope" => '' |
| 31 | 31 | ), |
| 32 | 32 | "Google" => array( |
| 33 | - // see http://hybridauth.sourceforge.net/userguide/IDProvider_info_Google.html |
|
| 34 | - "enabled" => false, |
|
| 35 | - 'keys' => array ( "id" => '###Your Google Client-ID ###', 'secret' => '###Your GitHub Secret###'), |
|
| 36 | - "scope" => "https://www.googleapis.com/auth/userinfo.profile ". // optional |
|
| 37 | - "https://www.googleapis.com/auth/userinfo.email" , // optional |
|
| 38 | - "access_type" => "offline", // optional |
|
| 39 | - "approval_prompt" => "force", // optional |
|
| 33 | + // see http://hybridauth.sourceforge.net/userguide/IDProvider_info_Google.html |
|
| 34 | + "enabled" => false, |
|
| 35 | + 'keys' => array ( "id" => '###Your Google Client-ID ###', 'secret' => '###Your GitHub Secret###'), |
|
| 36 | + "scope" => "https://www.googleapis.com/auth/userinfo.profile ". // optional |
|
| 37 | + "https://www.googleapis.com/auth/userinfo.email" , // optional |
|
| 38 | + "access_type" => "offline", // optional |
|
| 39 | + "approval_prompt" => "force", // optional |
|
| 40 | 40 | ), |
| 41 | 41 | |
| 42 | 42 | |
@@ -47,12 +47,12 @@ discard block |
||
| 47 | 47 | ), |
| 48 | 48 | |
| 49 | 49 | 'Auth' => array( |
| 50 | - 'first_login' => array ( |
|
| 51 | - 'role' => '%%role%%', // role set on the first login. |
|
| 52 | - 'auth_suffix' => '%%auth.suffix%%', // an auth suffix is needed, if you plan to add external apps. |
|
| 53 | - ), |
|
| 54 | - // this allows an external application to use the YAWIK API |
|
| 55 | - // applications[USERPOSTFIX] => AppKey |
|
| 50 | + 'first_login' => array ( |
|
| 51 | + 'role' => '%%role%%', // role set on the first login. |
|
| 52 | + 'auth_suffix' => '%%auth.suffix%%', // an auth suffix is needed, if you plan to add external apps. |
|
| 53 | + ), |
|
| 54 | + // this allows an external application to use the YAWIK API |
|
| 55 | + // applications[USERPOSTFIX] => AppKey |
|
| 56 | 56 | 'external_applications' => array( |
| 57 | 57 | '%%external.app.prefix%%' => '%%external.app.key%%', |
| 58 | 58 | ), |
@@ -129,10 +129,10 @@ |
||
| 129 | 129 | // ) |
| 130 | 130 | // ); |
| 131 | 131 | $qb->addAnd($qb->expr()->field('user')->equals($userId)) |
| 132 | - ->addAnd( |
|
| 133 | - $qb->expr()->addOr($qb->expr()->field('parent')->exists(false)) |
|
| 134 | - ->addOr($qb->expr()->field('parent')->equals(null)) |
|
| 135 | - ); |
|
| 132 | + ->addAnd( |
|
| 133 | + $qb->expr()->addOr($qb->expr()->field('parent')->exists(false)) |
|
| 134 | + ->addOr($qb->expr()->field('parent')->equals(null)) |
|
| 135 | + ); |
|
| 136 | 136 | |
| 137 | 137 | $q = $qb->getQuery(); |
| 138 | 138 | $entity = $q->getSingleResult(); |
@@ -40,8 +40,8 @@ |
||
| 40 | 40 | |
| 41 | 41 | $plugin = new AcceptInvitationHandler(); |
| 42 | 42 | $plugin->setUserRepository($userRepository) |
| 43 | - ->setOrganizationRepository($organizationRepository) |
|
| 44 | - ->setAuthenticationService($authenticationService); |
|
| 43 | + ->setOrganizationRepository($organizationRepository) |
|
| 44 | + ->setAuthenticationService($authenticationService); |
|
| 45 | 45 | |
| 46 | 46 | return $plugin; |
| 47 | 47 | } |