@@ -16,12 +16,12 @@ |
||
16 | 16 | |
17 | 17 | class SocialProfilesFactory implements FactoryInterface |
18 | 18 | { |
19 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
20 | - { |
|
21 | - $request = $container->get('request'); |
|
22 | - $hybridAuth = $container->get('HybridAuth'); |
|
23 | - $plugin = new SocialProfiles($hybridAuth,$request); |
|
19 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
20 | + { |
|
21 | + $request = $container->get('request'); |
|
22 | + $hybridAuth = $container->get('HybridAuth'); |
|
23 | + $plugin = new SocialProfiles($hybridAuth,$request); |
|
24 | 24 | |
25 | - return $plugin; |
|
26 | - } |
|
25 | + return $plugin; |
|
26 | + } |
|
27 | 27 | } |
@@ -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 | } |
@@ -70,28 +70,28 @@ |
||
70 | 70 | |
71 | 71 | protected $externalAdapter; |
72 | 72 | |
73 | - /** |
|
74 | - * IndexController constructor. |
|
75 | - * |
|
76 | - * @param AuthenticationService $auth |
|
77 | - * @param LoggerInterface $logger |
|
78 | - * @param $userLoginAdapter |
|
79 | - * @param $locale |
|
80 | - * @param $urlHelper |
|
81 | - * @param array $forms |
|
82 | - * @param $options |
|
83 | - */ |
|
73 | + /** |
|
74 | + * IndexController constructor. |
|
75 | + * |
|
76 | + * @param AuthenticationService $auth |
|
77 | + * @param LoggerInterface $logger |
|
78 | + * @param $userLoginAdapter |
|
79 | + * @param $locale |
|
80 | + * @param $urlHelper |
|
81 | + * @param array $forms |
|
82 | + * @param $options |
|
83 | + */ |
|
84 | 84 | public function __construct( |
85 | - AuthenticationService $auth, |
|
86 | - LoggerInterface $logger, |
|
87 | - $userLoginAdapter, |
|
88 | - $locale, |
|
89 | - $urlHelper, |
|
90 | - array $forms, |
|
91 | - $options, |
|
92 | - $hybridAuthAdapter, |
|
93 | - $externalAdapter, |
|
94 | - RepositoryService $repositories |
|
85 | + AuthenticationService $auth, |
|
86 | + LoggerInterface $logger, |
|
87 | + $userLoginAdapter, |
|
88 | + $locale, |
|
89 | + $urlHelper, |
|
90 | + array $forms, |
|
91 | + $options, |
|
92 | + $hybridAuthAdapter, |
|
93 | + $externalAdapter, |
|
94 | + RepositoryService $repositories |
|
95 | 95 | ) |
96 | 96 | { |
97 | 97 | $this->auth = $auth; |
@@ -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 | ), |