@@ -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 | ), |
@@ -17,10 +17,10 @@ |
||
| 17 | 17 | class Module |
| 18 | 18 | { |
| 19 | 19 | /** |
| 20 | - * Loads module specific configuration. |
|
| 21 | - * |
|
| 22 | - * @return array |
|
| 23 | - */ |
|
| 20 | + * Loads module specific configuration. |
|
| 21 | + * |
|
| 22 | + * @return array |
|
| 23 | + */ |
|
| 24 | 24 | public function getConfig() |
| 25 | 25 | { |
| 26 | 26 | return include __DIR__ . '/../config/module.config.php'; |
@@ -63,16 +63,16 @@ |
||
| 63 | 63 | |
| 64 | 64 | foreach ($result as $key => $val) { |
| 65 | 65 | $row=[ |
| 66 | - 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
| 67 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
| 68 | - 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
| 69 | - 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
| 70 | - 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
| 66 | + 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
| 67 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
| 68 | + 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
| 69 | + 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
| 70 | + 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
| 71 | 71 | |
| 72 | - 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
| 73 | - 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
| 74 | - //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
| 75 | - //'data' => json_encode($val), |
|
| 72 | + 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
| 73 | + 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
| 74 | + //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
| 75 | + //'data' => json_encode($val), |
|
| 76 | 76 | ]; |
| 77 | 77 | if ($val->geometry) { |
| 78 | 78 | $row['coordinates'] = [ |
@@ -66,14 +66,14 @@ discard block |
||
| 66 | 66 | 'view_manager' => [ |
| 67 | 67 | // Map template to files. Speeds up the lookup through the template stack. |
| 68 | 68 | 'template_map' => [ |
| 69 | - 'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml', |
|
| 70 | - 'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml', |
|
| 71 | - 'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml', |
|
| 72 | - 'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml', |
|
| 73 | - 'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml', |
|
| 74 | - 'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml', |
|
| 75 | - 'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml', |
|
| 76 | - 'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml', |
|
| 69 | + 'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml', |
|
| 70 | + 'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml', |
|
| 71 | + 'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml', |
|
| 72 | + 'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml', |
|
| 73 | + 'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml', |
|
| 74 | + 'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml', |
|
| 75 | + 'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml', |
|
| 76 | + 'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml', |
|
| 77 | 77 | 'organizations/profile/disabled' => __DIR__ . '/../view/organizations/profile/disabled.phtml', |
| 78 | 78 | ], |
| 79 | 79 | // Where to look for view templates not mapped above |
@@ -83,21 +83,21 @@ discard block |
||
| 83 | 83 | ], |
| 84 | 84 | 'form_elements' => [ |
| 85 | 85 | 'invokables' => [ |
| 86 | - 'Organizations/Form' => 'Organizations\Form\Organizations', |
|
| 87 | - 'Organizations/OrganizationsContactForm' => 'Organizations\Form\OrganizationsContactForm', |
|
| 88 | - 'Organizations/OrganizationsNameForm' => 'Organizations\Form\OrganizationsNameForm', |
|
| 89 | - 'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm', |
|
| 90 | - 'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset', |
|
| 91 | - 'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset', |
|
| 92 | - //'Organizations/OrganizationFieldset' => 'Organizations\Form\OrganizationFieldset', |
|
| 93 | - 'Organizations/EmployeesContainer' => 'Organizations\Form\EmployeesContainer', |
|
| 94 | - 'Organizations/Employees' => 'Organizations\Form\Employees', |
|
| 95 | - 'Organizations/InviteEmployeeBar' => 'Organizations\Form\Element\InviteEmployeeBar', |
|
| 96 | - 'Organizations/Employee' => 'Organizations\Form\Element\Employee', |
|
| 97 | - 'Organizations/WorkflowSettings' => 'Organizations\Form\WorkflowSettings', |
|
| 98 | - 'Organizations/WorkflowSettingsFieldset' => 'Organizations\Form\WorkflowSettingsFieldset', |
|
| 99 | - 'Organizations/Profile' => \Organizations\Form\OrganizationsProfileForm::class, |
|
| 100 | - 'Organizations/ProfileFieldset' => \Organizations\Form\OrganizationsProfileFieldset::class |
|
| 86 | + 'Organizations/Form' => 'Organizations\Form\Organizations', |
|
| 87 | + 'Organizations/OrganizationsContactForm' => 'Organizations\Form\OrganizationsContactForm', |
|
| 88 | + 'Organizations/OrganizationsNameForm' => 'Organizations\Form\OrganizationsNameForm', |
|
| 89 | + 'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm', |
|
| 90 | + 'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset', |
|
| 91 | + 'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset', |
|
| 92 | + //'Organizations/OrganizationFieldset' => 'Organizations\Form\OrganizationFieldset', |
|
| 93 | + 'Organizations/EmployeesContainer' => 'Organizations\Form\EmployeesContainer', |
|
| 94 | + 'Organizations/Employees' => 'Organizations\Form\Employees', |
|
| 95 | + 'Organizations/InviteEmployeeBar' => 'Organizations\Form\Element\InviteEmployeeBar', |
|
| 96 | + 'Organizations/Employee' => 'Organizations\Form\Element\Employee', |
|
| 97 | + 'Organizations/WorkflowSettings' => 'Organizations\Form\WorkflowSettings', |
|
| 98 | + 'Organizations/WorkflowSettingsFieldset' => 'Organizations\Form\WorkflowSettingsFieldset', |
|
| 99 | + 'Organizations/Profile' => \Organizations\Form\OrganizationsProfileForm::class, |
|
| 100 | + 'Organizations/ProfileFieldset' => \Organizations\Form\OrganizationsProfileFieldset::class |
|
| 101 | 101 | ], |
| 102 | 102 | 'factories' => [ |
| 103 | 103 | 'Organizations/OrganizationsNameFieldset' => \Organizations\Factory\Form\OrganizationsNameFieldsetFactory::class, |
@@ -212,13 +212,13 @@ discard block |
||
| 212 | 212 | |
| 213 | 213 | 'service_manager' => [ |
| 214 | 214 | 'invokables' => [ |
| 215 | - 'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener' |
|
| 215 | + 'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener' |
|
| 216 | 216 | ], |
| 217 | 217 | 'factories' => [ |
| 218 | - 'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory', |
|
| 219 | - 'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory', |
|
| 220 | - 'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory', |
|
| 221 | - 'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory', |
|
| 218 | + 'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory', |
|
| 219 | + 'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory', |
|
| 220 | + 'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory', |
|
| 221 | + 'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory', |
|
| 222 | 222 | ], |
| 223 | 223 | ], |
| 224 | 224 | |
@@ -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 | } |
@@ -118,11 +118,11 @@ |
||
| 118 | 118 | |
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | - * Sets the name of the organization |
|
| 122 | - * |
|
| 123 | - * @param OrganizationName organizationName |
|
| 124 | - * @return OrganizationInterface |
|
| 125 | - */ |
|
| 121 | + * Sets the name of the organization |
|
| 122 | + * |
|
| 123 | + * @param OrganizationName organizationName |
|
| 124 | + * @return OrganizationInterface |
|
| 125 | + */ |
|
| 126 | 126 | public function setOrganizationName(OrganizationName $organizationNames); |
| 127 | 127 | |
| 128 | 128 | /** |
@@ -310,9 +310,9 @@ |
||
| 310 | 310 | if (!$user) { |
| 311 | 311 | $user = $repository->create(); |
| 312 | 312 | $user->setEmail($email) |
| 313 | - ->setLogin($email) |
|
| 314 | - ->setRole(\Auth\Entity\User::ROLE_RECRUITER) |
|
| 315 | - ->setIsDraft(true); |
|
| 313 | + ->setLogin($email) |
|
| 314 | + ->setRole(\Auth\Entity\User::ROLE_RECRUITER) |
|
| 315 | + ->setIsDraft(true); |
|
| 316 | 316 | $info = $user->getInfo(); |
| 317 | 317 | /* @var $info \Auth\Entity\InfoInterface */ |
| 318 | 318 | $info->setEmail($email); |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | $services = $application->getServiceManager(); |
| 43 | 43 | |
| 44 | 44 | $services->get('Install/Listener/LanguageSetter') |
| 45 | - ->attach($eventManager); |
|
| 45 | + ->attach($eventManager); |
|
| 46 | 46 | |
| 47 | 47 | // start tracy debugging |
| 48 | 48 | $services->get('Tracy')->startDebug(); |