@@ -42,7 +42,7 @@ |
||
42 | 42 | { |
43 | 43 | $object = parent::hydrate($data, $object); |
44 | 44 | /* @var \Organizations\Entity\Template $template */ |
45 | - $template=$object->getOrganization()->getTemplate(); |
|
45 | + $template = $object->getOrganization()->getTemplate(); |
|
46 | 46 | if (isset($data['description-label-requirements'])) { |
47 | 47 | $template->setLabelRequirements($data['description-label-requirements']); |
48 | 48 | } |
@@ -64,7 +64,7 @@ |
||
64 | 64 | |
65 | 65 | $this->add($fieldset); |
66 | 66 | |
67 | - $mode=$options->getMode(); |
|
67 | + $mode = $options->getMode(); |
|
68 | 68 | if (in_array($mode, [CaptchaOptions::RE_CAPTCHA, CaptchaOptions::IMAGE])) { |
69 | 69 | if ($mode == CaptchaOptions::IMAGE) { |
70 | 70 | $captcha = new Image($options->getImage()); |
@@ -118,11 +118,11 @@ |
||
118 | 118 | { |
119 | 119 | $services = $this->getServiceLocator()->getServiceLocator(); |
120 | 120 | |
121 | - /* |
|
121 | + /* |
|
122 | 122 | * "ViewHelperManager" defined by ZF2 |
123 | 123 | * see http://framework.zend.com/manual/2.0/en/modules/zend.mvc.services.html#viewmanager |
124 | 124 | */ |
125 | - $viewManager = $services->get('ViewHelperManager'); |
|
125 | + $viewManager = $services->get('ViewHelperManager'); |
|
126 | 126 | |
127 | 127 | return $viewManager->get("partial")->__invoke('applications/mail/forward', array("application"=>$this->application)); |
128 | 128 | } |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | public function init() |
29 | 29 | { |
30 | 30 | $this->setName('data') |
31 | - ->setLabel('Group data') |
|
32 | - ->setUseAsBaseFieldset(true) |
|
33 | - ->setHydrator(new EntityHydrator()); |
|
31 | + ->setLabel('Group data') |
|
32 | + ->setUseAsBaseFieldset(true) |
|
33 | + ->setHydrator(new EntityHydrator()); |
|
34 | 34 | |
35 | 35 | $this->add( |
36 | 36 | array( |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | 'required' => true, |
70 | 70 | 'validators' => array( |
71 | 71 | array('name' => 'Auth/Form/UniqueGroupName', |
72 | - 'options' => array( |
|
72 | + 'options' => array( |
|
73 | 73 | 'allowName' => 'edit' == $this->getOption('mode') |
74 | 74 | ? $this->getObject()->getName() |
75 | 75 | : null |
@@ -25,7 +25,7 @@ |
||
25 | 25 | public function init() |
26 | 26 | { |
27 | 27 | $this->setIsDisableCapable(false) |
28 | - ->setIsDisableElementsCapable(false); |
|
28 | + ->setIsDisableElementsCapable(false); |
|
29 | 29 | |
30 | 30 | $this->setForms( |
31 | 31 | array( |
@@ -20,7 +20,7 @@ |
||
20 | 20 | { |
21 | 21 | |
22 | 22 | protected $sortPropertiesMap = [ |
23 | - 'name' => [ 'info.lastName', 'info.firstName', 'info.email' ], |
|
23 | + 'name' => ['info.lastName', 'info.firstName', 'info.email'], |
|
24 | 24 | ]; |
25 | 25 | |
26 | 26 | /** |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | if (true === $this->getOption('include_all_option')) { |
37 | 37 | $valueOptions = array_merge([ |
38 | 38 | 'all' => /*@translate*/ 'All', |
39 | - ], $valueOptions ); |
|
39 | + ], $valueOptions); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $this->setValueOptions($valueOptions); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $options = parent::getValueOptions(); |
83 | 83 | |
84 | 84 | return true === $this->getOption('include_all_option') |
85 | - ? array_merge([ 'all' => /*@translate*/ 'All' ], $options) |
|
85 | + ? array_merge(['all' => /*@translate*/ 'All'], $options) |
|
86 | 86 | : $options; |
87 | 87 | } |
88 | 88 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | if (true === $this->getOption('include_all_option')) { |
37 | 37 | $valueOptions = array_merge([ |
38 | 38 | 'all' => /*@translate*/ 'All', |
39 | - ], $valueOptions ); |
|
39 | + ], $valueOptions ); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $this->setValueOptions($valueOptions); |
@@ -39,15 +39,15 @@ |
||
39 | 39 | 'title' => 'Jobs', |
40 | 40 | 'data' => [ |
41 | 41 | /*@translate*/ 'Total jobs' => [ |
42 | - 'url' => [ 'lang/admin/jobs', [], true ], |
|
42 | + 'url' => ['lang/admin/jobs', [], true], |
|
43 | 43 | 'value' => $total, |
44 | 44 | ], |
45 | 45 | /*@translate*/ 'Active jobs' => [ |
46 | - 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'active' ]], true ], |
|
46 | + 'url' => ['lang/admin/jobs', [], ['query' => ['status' => 'active']], true], |
|
47 | 47 | 'value' => $active |
48 | 48 | ], |
49 | 49 | /*@translate*/ 'Pending jobs' => [ |
50 | - 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'created' ]], true ], |
|
50 | + 'url' => ['lang/admin/jobs', [], ['query' => ['status' => 'created']], true], |
|
51 | 51 | 'value' => $pending |
52 | 52 | ] |
53 | 53 | ], |
@@ -36,21 +36,21 @@ |
||
36 | 36 | $pending = $this->repository->count(['status.name' => StatusInterface::CREATED]); |
37 | 37 | |
38 | 38 | $event->addViewVariables('jobs', [ |
39 | - 'title' => 'Jobs', |
|
40 | - 'data' => [ |
|
39 | + 'title' => 'Jobs', |
|
40 | + 'data' => [ |
|
41 | 41 | /*@translate*/ 'Total jobs' => [ |
42 | 42 | 'url' => [ 'lang/admin/jobs', [], true ], |
43 | 43 | 'value' => $total, |
44 | 44 | ], |
45 | 45 | /*@translate*/ 'Active jobs' => [ |
46 | - 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'active' ]], true ], |
|
47 | - 'value' => $active |
|
48 | - ], |
|
46 | + 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'active' ]], true ], |
|
47 | + 'value' => $active |
|
48 | + ], |
|
49 | 49 | /*@translate*/ 'Pending jobs' => [ |
50 | - 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'created' ]], true ], |
|
51 | - 'value' => $pending |
|
52 | - ] |
|
53 | - ], |
|
54 | - ]); |
|
50 | + 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'created' ]], true ], |
|
51 | + 'value' => $pending |
|
52 | + ] |
|
53 | + ], |
|
54 | + ]); |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 | \ No newline at end of file |
@@ -32,24 +32,24 @@ discard block |
||
32 | 32 | 'log' => array( |
33 | 33 | 'Core/Log' => array( |
34 | 34 | 'writers' => array( |
35 | - array( |
|
36 | - 'name' => 'stream', |
|
35 | + array( |
|
36 | + 'name' => 'stream', |
|
37 | 37 | 'priority' => 1000, |
38 | 38 | 'options' => array( |
39 | - 'stream' => __DIR__ .'/../../../log/yawik.log', |
|
39 | + 'stream' => __DIR__ .'/../../../log/yawik.log', |
|
40 | + ), |
|
40 | 41 | ), |
41 | - ), |
|
42 | 42 | ), |
43 | 43 | ), |
44 | 44 | 'Log/Core/Mail' => array( |
45 | 45 | 'writers' => array( |
46 | - array( |
|
47 | - 'name' => 'stream', |
|
46 | + array( |
|
47 | + 'name' => 'stream', |
|
48 | 48 | 'priority' => 1000, |
49 | 49 | 'options' => array( |
50 | - 'stream' => __DIR__ .'/../../../log/mails.log', |
|
50 | + 'stream' => __DIR__ .'/../../../log/mails.log', |
|
51 | + ), |
|
51 | 52 | ), |
52 | - ), |
|
53 | 53 | ), |
54 | 54 | ), |
55 | 55 | 'ErrorLogger' => array( |
@@ -234,17 +234,17 @@ discard block |
||
234 | 234 | // Defines the Core/Navigation. |
235 | 235 | 'navigation' => array( |
236 | 236 | 'default' => array( |
237 | - 'home' => array( |
|
238 | - 'label' => /*@translate*/ 'Home', |
|
239 | - 'route' => 'lang', |
|
240 | - 'visible' => false |
|
241 | - ), |
|
242 | - 'admin' => array( |
|
243 | - 'label ' => /*@translate*/ 'Admin', |
|
244 | - 'route' => 'lang/admin', |
|
245 | - 'resource' => 'route/lang/admin', |
|
246 | - 'order' => 200, |
|
247 | - ), |
|
237 | + 'home' => array( |
|
238 | + 'label' => /*@translate*/ 'Home', |
|
239 | + 'route' => 'lang', |
|
240 | + 'visible' => false |
|
241 | + ), |
|
242 | + 'admin' => array( |
|
243 | + 'label ' => /*@translate*/ 'Admin', |
|
244 | + 'route' => 'lang/admin', |
|
245 | + 'resource' => 'route/lang/admin', |
|
246 | + 'order' => 200, |
|
247 | + ), |
|
248 | 248 | ), |
249 | 249 | ), |
250 | 250 | // Configuration of the controller service manager (Which loads controllers) |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * @license MIT |
13 | 13 | */ |
14 | 14 | |
15 | -$doctrineConfig = include __DIR__ . '/doctrine.config.php'; |
|
15 | +$doctrineConfig = include __DIR__.'/doctrine.config.php'; |
|
16 | 16 | |
17 | 17 | |
18 | 18 | return array( |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | 'doctrine' => $doctrineConfig, |
21 | 21 | |
22 | 22 | 'options' => [ |
23 | - 'Core/MailServiceOptions' => [ 'class' => '\Core\Options\MailServiceOptions' ], |
|
23 | + 'Core/MailServiceOptions' => ['class' => '\Core\Options\MailServiceOptions'], |
|
24 | 24 | ], |
25 | 25 | |
26 | 26 | 'Core' => array( |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | 'name' => 'stream', |
41 | 41 | 'priority' => 1000, |
42 | 42 | 'options' => array( |
43 | - 'stream' => __DIR__ .'/../../../log/yawik.log', |
|
43 | + 'stream' => __DIR__.'/../../../log/yawik.log', |
|
44 | 44 | ), |
45 | 45 | ), |
46 | 46 | ), |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | 'name' => 'stream', |
52 | 52 | 'priority' => 1000, |
53 | 53 | 'options' => array( |
54 | - 'stream' => __DIR__ .'/../../../log/mails.log', |
|
54 | + 'stream' => __DIR__.'/../../../log/mails.log', |
|
55 | 55 | ), |
56 | 56 | ), |
57 | 57 | ), |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | 'ErrorLogger' => array( |
60 | 60 | 'service' => 'Core/ErrorLogger', |
61 | 61 | 'config' => array( |
62 | - 'stream' => __DIR__ . '/../../../log/error.log', |
|
62 | + 'stream' => __DIR__.'/../../../log/error.log', |
|
63 | 63 | 'log_errors' => true, |
64 | 64 | 'log_exceptions' => true, |
65 | 65 | ), |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | 'mode' => true, // true = production|false = development|null = autodetect|IP address(es) csv/array |
78 | 78 | 'bar' => false, // bool = enabled|Toggle nette diagnostics bar. |
79 | 79 | 'strict' => true, // bool = cause immediate death|int = matched against error severity |
80 | - 'log' => __DIR__ . '/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files) |
|
80 | + 'log' => __DIR__.'/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files) |
|
81 | 81 | 'email' => null, // in production mode notifies the recipient |
82 | 82 | 'email_snooze' => 900 // interval for sending email in seconds |
83 | 83 | ], |
@@ -231,17 +231,17 @@ discard block |
||
231 | 231 | 'translation_file_patterns' => array( |
232 | 232 | [ |
233 | 233 | 'type' => 'gettext', |
234 | - 'base_dir' => __DIR__ . '/../language', |
|
234 | + 'base_dir' => __DIR__.'/../language', |
|
235 | 235 | 'pattern' => '%s.mo', |
236 | 236 | ], |
237 | 237 | [ |
238 | 238 | 'type' => 'phparray', |
239 | - 'base_dir' => __DIR__ . '/../language', |
|
239 | + 'base_dir' => __DIR__.'/../language', |
|
240 | 240 | 'pattern' => 'Zend_Validate.%s.php', |
241 | 241 | ], |
242 | 242 | [ |
243 | 243 | 'type' => 'phparray', |
244 | - 'base_dir' => __DIR__ . '/../language', |
|
244 | + 'base_dir' => __DIR__.'/../language', |
|
245 | 245 | 'pattern' => 'Zend_Captcha.%s.php', |
246 | 246 | ] |
247 | 247 | ), |
@@ -310,32 +310,32 @@ discard block |
||
310 | 310 | 'exception_template' => 'error/index', |
311 | 311 | // Map template to files. Speeds up the lookup through the template stack. |
312 | 312 | 'template_map' => array( |
313 | - 'noscript-notice' => __DIR__ . '/../view/layout/_noscript-notice.phtml', |
|
314 | - 'layout/layout' => __DIR__ . '/../view/layout/layout.phtml', |
|
315 | - 'error/404' => __DIR__ . '/../view/error/404.phtml', |
|
316 | - 'error/403' => __DIR__ . '/../view/error/403.phtml', |
|
317 | - 'error/index' => __DIR__ . '/../view/error/index.phtml', |
|
318 | - 'main-navigation' => __DIR__ . '/../view/partial/main-navigation.phtml', |
|
319 | - 'pagination-control' => __DIR__ . '/../view/partial/pagination-control.phtml', |
|
320 | - 'core/loading-popup' => __DIR__ . '/../view/partial/loading-popup.phtml', |
|
321 | - 'core/notifications' => __DIR__ . '/../view/partial/notifications.phtml', |
|
322 | - 'form/core/buttons' => __DIR__ . '/../view/form/buttons.phtml', |
|
323 | - 'core/social-buttons' => __DIR__ . '/../view/partial/social-buttons.phtml', |
|
324 | - 'form/core/privacy' => __DIR__ . '/../view/form/privacy.phtml', |
|
325 | - 'core/form/permissions-fieldset' => __DIR__ . '/../view/form/permissions-fieldset.phtml', |
|
326 | - 'core/form/permissions-collection' => __DIR__ . '/../view/form/permissions-collection.phtml', |
|
327 | - 'core/form/container-view' => __DIR__ . '/../view/form/container.view.phtml', |
|
328 | - 'core/form/tree-manage.view' => __DIR__ . '/../view/form/tree-manage.view.phtml', |
|
329 | - 'core/form/tree-manage.form' => __DIR__ . '/../view/form/tree-manage.form.phtml', |
|
330 | - 'core/form/tree-add-item' => __DIR__ . '/../view/form/tree-add-item.phtml', |
|
331 | - 'mail/header' => __DIR__ . '/../view/mail/header.phtml', |
|
332 | - 'mail/footer' => __DIR__ . '/../view/mail/footer.phtml', |
|
333 | - 'mail/footer.en' => __DIR__ . '/../view/mail/footer.en.phtml', |
|
313 | + 'noscript-notice' => __DIR__.'/../view/layout/_noscript-notice.phtml', |
|
314 | + 'layout/layout' => __DIR__.'/../view/layout/layout.phtml', |
|
315 | + 'error/404' => __DIR__.'/../view/error/404.phtml', |
|
316 | + 'error/403' => __DIR__.'/../view/error/403.phtml', |
|
317 | + 'error/index' => __DIR__.'/../view/error/index.phtml', |
|
318 | + 'main-navigation' => __DIR__.'/../view/partial/main-navigation.phtml', |
|
319 | + 'pagination-control' => __DIR__.'/../view/partial/pagination-control.phtml', |
|
320 | + 'core/loading-popup' => __DIR__.'/../view/partial/loading-popup.phtml', |
|
321 | + 'core/notifications' => __DIR__.'/../view/partial/notifications.phtml', |
|
322 | + 'form/core/buttons' => __DIR__.'/../view/form/buttons.phtml', |
|
323 | + 'core/social-buttons' => __DIR__.'/../view/partial/social-buttons.phtml', |
|
324 | + 'form/core/privacy' => __DIR__.'/../view/form/privacy.phtml', |
|
325 | + 'core/form/permissions-fieldset' => __DIR__.'/../view/form/permissions-fieldset.phtml', |
|
326 | + 'core/form/permissions-collection' => __DIR__.'/../view/form/permissions-collection.phtml', |
|
327 | + 'core/form/container-view' => __DIR__.'/../view/form/container.view.phtml', |
|
328 | + 'core/form/tree-manage.view' => __DIR__.'/../view/form/tree-manage.view.phtml', |
|
329 | + 'core/form/tree-manage.form' => __DIR__.'/../view/form/tree-manage.form.phtml', |
|
330 | + 'core/form/tree-add-item' => __DIR__.'/../view/form/tree-add-item.phtml', |
|
331 | + 'mail/header' => __DIR__.'/../view/mail/header.phtml', |
|
332 | + 'mail/footer' => __DIR__.'/../view/mail/footer.phtml', |
|
333 | + 'mail/footer.en' => __DIR__.'/../view/mail/footer.en.phtml', |
|
334 | 334 | //'startpage' => __DIR__ . '/../view/layout/startpage.phtml', |
335 | 335 | ), |
336 | 336 | // Where to look for view templates not mapped above |
337 | 337 | 'template_path_stack' => array( |
338 | - __DIR__ . '/../view', |
|
338 | + __DIR__.'/../view', |
|
339 | 339 | ), |
340 | 340 | ), |
341 | 341 | 'view_helpers' => array( |