@@ -28,52 +28,52 @@ discard block |
||
28 | 28 | |
29 | 29 | $this->setAttributes( |
30 | 30 | array( |
31 | - 'method' => 'post', |
|
32 | - ) |
|
31 | + 'method' => 'post', |
|
32 | + ) |
|
33 | 33 | ); |
34 | 34 | |
35 | 35 | $this->add( |
36 | 36 | array( |
37 | - 'type' => 'Text', |
|
38 | - 'name' => 'db_conn', |
|
39 | - 'options' => array( |
|
40 | - 'label' => /* @translate */ 'Database connection string', |
|
41 | - ), |
|
42 | - 'attributes' => array( |
|
43 | - 'placeholder' => 'mongodb://localhost:27017/YAWIK', |
|
44 | - ), |
|
37 | + 'type' => 'Text', |
|
38 | + 'name' => 'db_conn', |
|
39 | + 'options' => array( |
|
40 | + 'label' => /* @translate */ 'Database connection string', |
|
41 | + ), |
|
42 | + 'attributes' => array( |
|
43 | + 'placeholder' => 'mongodb://localhost:27017/YAWIK', |
|
44 | + ), |
|
45 | 45 | |
46 | - ) |
|
46 | + ) |
|
47 | 47 | ); |
48 | 48 | |
49 | 49 | $this->add( |
50 | 50 | array( |
51 | - 'type' => 'Text', |
|
52 | - 'name' => 'username', |
|
53 | - 'options' => array( |
|
54 | - 'label' => /* @translate */ 'Initial user name', |
|
55 | - ), |
|
56 | - ) |
|
51 | + 'type' => 'Text', |
|
52 | + 'name' => 'username', |
|
53 | + 'options' => array( |
|
54 | + 'label' => /* @translate */ 'Initial user name', |
|
55 | + ), |
|
56 | + ) |
|
57 | 57 | ); |
58 | 58 | |
59 | 59 | $this->add( |
60 | 60 | array( |
61 | - 'type' => 'Password', |
|
62 | - 'name' => 'password', |
|
63 | - 'options' => array( |
|
64 | - 'label' => /* @translate */ 'Password', |
|
65 | - ), |
|
66 | - ) |
|
61 | + 'type' => 'Password', |
|
62 | + 'name' => 'password', |
|
63 | + 'options' => array( |
|
64 | + 'label' => /* @translate */ 'Password', |
|
65 | + ), |
|
66 | + ) |
|
67 | 67 | ); |
68 | 68 | |
69 | 69 | $this->add( |
70 | 70 | array( |
71 | - 'type' => 'Text', |
|
72 | - 'name' => 'email', |
|
73 | - 'options' => array( |
|
74 | - 'label' => /* @translate */ 'Email address for system messages', |
|
75 | - ), |
|
76 | - ) |
|
71 | + 'type' => 'Text', |
|
72 | + 'name' => 'email', |
|
73 | + 'options' => array( |
|
74 | + 'label' => /* @translate */ 'Email address for system messages', |
|
75 | + ), |
|
76 | + ) |
|
77 | 77 | ); |
78 | 78 | } |
79 | 79 | |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | ), |
89 | 89 | 'validators' => array( |
90 | 90 | array('name' => 'Install/ConnectionString', |
91 | - 'break_chain_on_failure' => true), |
|
91 | + 'break_chain_on_failure' => true), |
|
92 | 92 | array('name' => 'Install/Connection'), |
93 | 93 | ), |
94 | 94 | ), |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | $routeMatch->setParam('action', $p); |
43 | 43 | $response = $this->getResponse(); |
44 | 44 | $response->getHeaders() |
45 | - ->addHeaderLine('Content-Type', 'application/json') |
|
46 | - ->addHeaderLine('Content-Encoding', 'utf8'); |
|
45 | + ->addHeaderLine('Content-Type', 'application/json') |
|
46 | + ->addHeaderLine('Content-Encoding', 'utf8'); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | |
@@ -60,10 +60,10 @@ discard block |
||
60 | 60 | |
61 | 61 | return $this->createViewModel( |
62 | 62 | array( |
63 | - 'prerequisites' => $prereqs, |
|
64 | - 'form' => $form, |
|
65 | - 'lang' => $this->params('lang'), |
|
66 | - ) |
|
63 | + 'prerequisites' => $prereqs, |
|
64 | + 'form' => $form, |
|
65 | + 'lang' => $this->params('lang'), |
|
66 | + ) |
|
67 | 67 | ); |
68 | 68 | } |
69 | 69 | |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | if (!$form->isValid()) { |
96 | 96 | return $this->createJsonResponse( |
97 | 97 | array( |
98 | - 'ok' => false, |
|
99 | - 'errors' => $form->getMessages(), |
|
100 | - ) |
|
98 | + 'ok' => false, |
|
99 | + 'errors' => $form->getMessages(), |
|
100 | + ) |
|
101 | 101 | ); |
102 | 102 | } |
103 | 103 |
@@ -19,7 +19,7 @@ |
||
19 | 19 | * |
20 | 20 | * @param ServiceLocatorInterface $serviceLocator |
21 | 21 | * |
22 | - * @return UsersController |
|
22 | + * @return \Auth\Controller\RemoveController |
|
23 | 23 | */ |
24 | 24 | public function createService(ServiceLocatorInterface $serviceLocator) |
25 | 25 | { |
@@ -60,9 +60,11 @@ |
||
60 | 60 | { |
61 | 61 | $items = []; |
62 | 62 | |
63 | - foreach ($this->repository->getUserOrganizations($user->getId(), $limit) as $organization) /* @var $organization \Organizations\Entity\Organization */ |
|
63 | + foreach ($this->repository->getUserOrganizations($user->getId(), $limit) as $organization) { |
|
64 | + /* @var $organization \Organizations\Entity\Organization */ |
|
64 | 65 | { |
65 | 66 | $name = $organization->getOrganizationName(); |
67 | + } |
|
66 | 68 | $title = $name ? $name->getName() : '**** DRAFT ****'; |
67 | 69 | $url = $view->url('lang/organizations/edit', ['id' => $organization->getId()]); |
68 | 70 | $items[] = new ListItem($title, $url); |
@@ -54,9 +54,11 @@ |
||
54 | 54 | return $items; |
55 | 55 | } |
56 | 56 | |
57 | - foreach ($employees->slice(0, $limit) as $employee) /* @var $employee \Organizations\Entity\Employee */ |
|
57 | + foreach ($employees->slice(0, $limit) as $employee) { |
|
58 | + /* @var $employee \Organizations\Entity\Employee */ |
|
58 | 59 | { |
59 | 60 | $info = $employee->getUser()->getInfo(); |
61 | + } |
|
60 | 62 | $title = $info->getDisplayName(); |
61 | 63 | $items[] = new ListItem($title); |
62 | 64 | } |
@@ -63,7 +63,7 @@ |
||
63 | 63 | foreach ($this->repository->getUserApplications($user->getId(), $limit) as $application) /* @var $application \Applications\Entity\Application */ |
64 | 64 | { |
65 | 65 | $title = $application->getJob()->getTitle(); |
66 | - $title .= ' ('. $view->dateFormat($application->getDateCreated()) . ')'; |
|
66 | + $title .= ' ('.$view->dateFormat($application->getDateCreated()).')'; |
|
67 | 67 | $url = $view->url('lang/applications/detail', ['id' => $application->getId()]); |
68 | 68 | $items[] = new ListItem($title, $url); |
69 | 69 | } |
@@ -60,9 +60,11 @@ |
||
60 | 60 | { |
61 | 61 | $items = []; |
62 | 62 | |
63 | - foreach ($this->repository->getUserApplications($user->getId(), $limit) as $application) /* @var $application \Applications\Entity\Application */ |
|
63 | + foreach ($this->repository->getUserApplications($user->getId(), $limit) as $application) { |
|
64 | + /* @var $application \Applications\Entity\Application */ |
|
64 | 65 | { |
65 | 66 | $title = $application->getJob()->getTitle(); |
67 | + } |
|
66 | 68 | $title .= ' ('. $view->dateFormat($application->getDateCreated()) . ')'; |
67 | 69 | $url = $view->url('lang/applications/detail', ['id' => $application->getId()]); |
68 | 70 | $items[] = new ListItem($title, $url); |
@@ -63,7 +63,7 @@ |
||
63 | 63 | foreach ($this->repository->getUserJobs($user->getId(), $limit) as $job) /* @var $job \Jobs\Entity\Job */ |
64 | 64 | { |
65 | 65 | $title = $job->getTitle() ?: $view->translate('untitled'); |
66 | - $title .= ' ('. $view->dateFormat($job->getDateCreated(), 'short', 'none') . ')'; |
|
66 | + $title .= ' ('.$view->dateFormat($job->getDateCreated(), 'short', 'none').')'; |
|
67 | 67 | $url = $view->url('lang/jobs/manage', ['action' => 'edit'], [ |
68 | 68 | 'query' => [ |
69 | 69 | 'id' => $job->getId() |
@@ -60,9 +60,11 @@ |
||
60 | 60 | { |
61 | 61 | $items = []; |
62 | 62 | |
63 | - foreach ($this->repository->getUserJobs($user->getId(), $limit) as $job) /* @var $job \Jobs\Entity\Job */ |
|
63 | + foreach ($this->repository->getUserJobs($user->getId(), $limit) as $job) { |
|
64 | + /* @var $job \Jobs\Entity\Job */ |
|
64 | 65 | { |
65 | 66 | $title = $job->getTitle() ?: $view->translate('untitled'); |
67 | + } |
|
66 | 68 | $title .= ' ('. $view->dateFormat($job->getDateCreated(), 'short', 'none') . ')'; |
67 | 69 | $url = $view->url('lang/jobs/manage', ['action' => 'edit'], [ |
68 | 70 | 'query' => [ |
@@ -56,7 +56,7 @@ |
||
56 | 56 | |
57 | 57 | protected function attachDefaultListeners() |
58 | 58 | { |
59 | - $this->getEventManager()->attach(static::EVENT_REMOVE_ITEMS, function (EventInterface $event) { |
|
59 | + $this->getEventManager()->attach(static::EVENT_REMOVE_ITEMS, function(EventInterface $event) { |
|
60 | 60 | $user = $event->getParam('user'); |
61 | 61 | foreach ($this->getLists() as $list) { |
62 | 62 | foreach ($list->getEntities($user) as $entity) { |
@@ -41,9 +41,7 @@ discard block |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
44 | - * @param User $user |
|
45 | - * @param Router $router |
|
46 | - * @return ListInterface[] |
|
44 | + * @return \Zend\EventManager\ResponseCollection |
|
47 | 45 | */ |
48 | 46 | public function getLists() |
49 | 47 | { |
@@ -52,8 +50,7 @@ discard block |
||
52 | 50 | |
53 | 51 | /** |
54 | 52 | * @param User $user |
55 | - * @param Router $router |
|
56 | - * @return \Zend\EventManager\ResponseCollection |
|
53 | + * @return boolean |
|
57 | 54 | */ |
58 | 55 | public function removeItems(User $user) |
59 | 56 | { |
@@ -98,12 +98,12 @@ discard block |
||
98 | 98 | </a> |
99 | 99 | <div class="fu-errors input-error"> |
100 | 100 | <ul class="errors"> |
101 | - <li class="fu-error-size">' . $translator->translate('The file is too big', $textDomain) . '</li> |
|
102 | - <li class="fu-error-type">' . $translator->translate('The file type is not supported', $textDomain) . '</li> |
|
101 | + <li class="fu-error-size">' . $translator->translate('The file is too big', $textDomain).'</li> |
|
102 | + <li class="fu-error-type">' . $translator->translate('The file type is not supported', $textDomain).'</li> |
|
103 | 103 | <li class="fu-error-count">' . sprintf( |
104 | 104 | $translator->translate('You may only upload %d files', $textDomain), |
105 | 105 | $element->getAttribute('data-maxfilecount') |
106 | -) . '</li><li class="fu-error-general">' . $translator->translate('An unknown error occured.') . '</li> |
|
106 | +).'</li><li class="fu-error-general">'.$translator->translate('An unknown error occured.').'</li> |
|
107 | 107 | </ul> |
108 | 108 | </div> |
109 | 109 | </li>'; |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | /* @var $basepath \Zend\View\Helper\BasePath */ |
112 | 112 | $renderer = $this->getView(); |
113 | 113 | $basepath = $renderer->plugin('basepath'); |
114 | - $createFileDisplay = function ($file) use ($template, $basepath) { |
|
114 | + $createFileDisplay = function($file) use ($template, $basepath) { |
|
115 | 115 | /* @var $file \Core\Entity\FileInterface */ |
116 | 116 | $uri = $basepath($file->getUri()); |
117 | 117 | $name = $file->getName(); |
@@ -146,11 +146,11 @@ discard block |
||
146 | 146 | } |
147 | 147 | |
148 | 148 | $nonemptynotice = |
149 | - '<div class="fu-nonempty-notice"' . ('' == trim($preview) ? ' style="display:none;"' : '') . '>' |
|
150 | - . $this->getNonEmptyNotice() . '</div>'; |
|
149 | + '<div class="fu-nonempty-notice"'.('' == trim($preview) ? ' style="display:none;"' : '').'>' |
|
150 | + . $this->getNonEmptyNotice().'</div>'; |
|
151 | 151 | $emptynotice = '<div class="fu-empty-notice"' |
152 | - . ('' == trim($preview) ? '' : ' style="display: none;"') . '> |
|
153 | - ' . $this->getEmptyNotice() . ' |
|
152 | + . ('' == trim($preview) ? '' : ' style="display: none;"').'> |
|
153 | + ' . $this->getEmptyNotice().' |
|
154 | 154 | </div>'; |
155 | 155 | |
156 | 156 | $markup = ' |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | */ |
299 | 299 | protected function getDefaultNotice() |
300 | 300 | { |
301 | - return '<small>' . $this->getTranslator()->translate('Click here to add files or use drag and drop.') . '</small>'; |
|
301 | + return '<small>'.$this->getTranslator()->translate('Click here to add files or use drag and drop.').'</small>'; |
|
302 | 302 | } |
303 | 303 | |
304 | 304 | /** |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | public function setAllowRemove($allowRemove) |
310 | 310 | { |
311 | - $this->allowRemove = (bool)$allowRemove; |
|
311 | + $this->allowRemove = (bool) $allowRemove; |
|
312 | 312 | |
313 | 313 | return $this; |
314 | 314 | } |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | */ |
321 | 321 | public function setAllowClickableDropZone($allowClickableDropZone) |
322 | 322 | { |
323 | - $this->allowClickableDropZone = (bool)$allowClickableDropZone; |
|
323 | + $this->allowClickableDropZone = (bool) $allowClickableDropZone; |
|
324 | 324 | |
325 | 325 | return $this; |
326 | 326 | } |
@@ -113,11 +113,11 @@ discard block |
||
113 | 113 | |
114 | 114 | return str_replace( |
115 | 115 | array('#abort', |
116 | - '__file-uri__', |
|
117 | - '__file-name__', |
|
118 | - '__file-size__', |
|
119 | - 'fu-working', |
|
120 | - 'fa-file-o' |
|
116 | + '__file-uri__', |
|
117 | + '__file-name__', |
|
118 | + '__file-size__', |
|
119 | + 'fu-working', |
|
120 | + 'fa-file-o' |
|
121 | 121 | ), |
122 | 122 | array("$uri?do=delete", $uri, $name, $size, '', $icon), |
123 | 123 | $template |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | '<div class="fu-nonempty-notice"' . ('' == trim($preview) ? ' style="display:none;"' : '') . '>' |
142 | 142 | . $this->getNonEmptyNotice() . '</div>'; |
143 | 143 | $emptynotice = '<div class="fu-empty-notice"' |
144 | - . ('' == trim($preview) ? '' : ' style="display: none;"') . '> |
|
144 | + . ('' == trim($preview) ? '' : ' style="display: none;"') . '> |
|
145 | 145 | ' . $this->getEmptyNotice() . ' |
146 | 146 | </div>'; |
147 | 147 | |
@@ -230,99 +230,99 @@ discard block |
||
230 | 230 | } |
231 | 231 | |
232 | 232 | /** |
233 | - * @param string $emptyNotice |
|
234 | - * @return FormFileUpload |
|
235 | - * @since 0.27 |
|
236 | - */ |
|
237 | - public function setEmptyNotice($emptyNotice) |
|
238 | - { |
|
239 | - $this->emptyNotice = $emptyNotice; |
|
233 | + * @param string $emptyNotice |
|
234 | + * @return FormFileUpload |
|
235 | + * @since 0.27 |
|
236 | + */ |
|
237 | + public function setEmptyNotice($emptyNotice) |
|
238 | + { |
|
239 | + $this->emptyNotice = $emptyNotice; |
|
240 | 240 | |
241 | - return $this; |
|
242 | - } |
|
241 | + return $this; |
|
242 | + } |
|
243 | 243 | |
244 | 244 | /** |
245 | - * @return string |
|
246 | - * @since 0.27 |
|
247 | - */ |
|
248 | - protected function getEmptyNotice() |
|
249 | - { |
|
250 | - if (!isset($this->emptyNotice)) |
|
251 | - { |
|
252 | - $this->emptyNotice = ' |
|
245 | + * @return string |
|
246 | + * @since 0.27 |
|
247 | + */ |
|
248 | + protected function getEmptyNotice() |
|
249 | + { |
|
250 | + if (!isset($this->emptyNotice)) |
|
251 | + { |
|
252 | + $this->emptyNotice = ' |
|
253 | 253 | <div class="pull-left"> |
254 | 254 | <span class="yk-icon fa-files-o fa-5x"></span> |
255 | 255 | </div>' . $this->getDefaultNotice(); |
256 | - } |
|
256 | + } |
|
257 | 257 | |
258 | - return $this->emptyNotice; |
|
259 | - } |
|
258 | + return $this->emptyNotice; |
|
259 | + } |
|
260 | 260 | |
261 | 261 | /** |
262 | - * @param string $nonEmptyNotice |
|
263 | - * @return FormFileUpload |
|
264 | - * @since 0.27 |
|
265 | - */ |
|
266 | - public function setNonEmptyNotice($nonEmptyNotice) |
|
267 | - { |
|
268 | - $this->nonEmptyNotice = $nonEmptyNotice; |
|
262 | + * @param string $nonEmptyNotice |
|
263 | + * @return FormFileUpload |
|
264 | + * @since 0.27 |
|
265 | + */ |
|
266 | + public function setNonEmptyNotice($nonEmptyNotice) |
|
267 | + { |
|
268 | + $this->nonEmptyNotice = $nonEmptyNotice; |
|
269 | 269 | |
270 | - return $this; |
|
271 | - } |
|
270 | + return $this; |
|
271 | + } |
|
272 | 272 | |
273 | 273 | /** |
274 | - * @return string |
|
275 | - * @since 0.27 |
|
276 | - */ |
|
277 | - protected function getNonEmptyNotice() |
|
278 | - { |
|
279 | - if (!isset($this->nonEmptyNotice)) |
|
280 | - { |
|
281 | - $this->nonEmptyNotice = $this->getDefaultNotice(); |
|
282 | - } |
|
274 | + * @return string |
|
275 | + * @since 0.27 |
|
276 | + */ |
|
277 | + protected function getNonEmptyNotice() |
|
278 | + { |
|
279 | + if (!isset($this->nonEmptyNotice)) |
|
280 | + { |
|
281 | + $this->nonEmptyNotice = $this->getDefaultNotice(); |
|
282 | + } |
|
283 | 283 | |
284 | - return $this->nonEmptyNotice; |
|
285 | - } |
|
284 | + return $this->nonEmptyNotice; |
|
285 | + } |
|
286 | 286 | |
287 | 287 | /** |
288 | - * @return string |
|
289 | - * @since 0.27 |
|
290 | - */ |
|
291 | - protected function getDefaultNotice() |
|
292 | - { |
|
293 | - return '<small>' . $this->getTranslator()->translate('Click here to add files or use drag and drop.') . '</small>'; |
|
294 | - } |
|
288 | + * @return string |
|
289 | + * @since 0.27 |
|
290 | + */ |
|
291 | + protected function getDefaultNotice() |
|
292 | + { |
|
293 | + return '<small>' . $this->getTranslator()->translate('Click here to add files or use drag and drop.') . '</small>'; |
|
294 | + } |
|
295 | 295 | |
296 | 296 | /** |
297 | - * @param boolean $allowRemove |
|
298 | - * @return FormFileUpload |
|
299 | - * @since 0.27 |
|
300 | - */ |
|
301 | - public function setAllowRemove($allowRemove) |
|
302 | - { |
|
303 | - $this->allowRemove = (bool)$allowRemove; |
|
297 | + * @param boolean $allowRemove |
|
298 | + * @return FormFileUpload |
|
299 | + * @since 0.27 |
|
300 | + */ |
|
301 | + public function setAllowRemove($allowRemove) |
|
302 | + { |
|
303 | + $this->allowRemove = (bool)$allowRemove; |
|
304 | 304 | |
305 | - return $this; |
|
306 | - } |
|
305 | + return $this; |
|
306 | + } |
|
307 | 307 | |
308 | 308 | /** |
309 | - * @param boolean $allowClickableDropZone |
|
310 | - * @return FormFileUpload |
|
311 | - * @since 0.27 |
|
312 | - */ |
|
313 | - public function setAllowClickableDropZone($allowClickableDropZone) |
|
314 | - { |
|
315 | - $this->allowClickableDropZone = (bool)$allowClickableDropZone; |
|
309 | + * @param boolean $allowClickableDropZone |
|
310 | + * @return FormFileUpload |
|
311 | + * @since 0.27 |
|
312 | + */ |
|
313 | + public function setAllowClickableDropZone($allowClickableDropZone) |
|
314 | + { |
|
315 | + $this->allowClickableDropZone = (bool)$allowClickableDropZone; |
|
316 | 316 | |
317 | - return $this; |
|
318 | - } |
|
317 | + return $this; |
|
318 | + } |
|
319 | 319 | |
320 | - /** |
|
321 | - * @since 0.27 |
|
322 | - */ |
|
323 | - protected function setupAssets() |
|
324 | - { |
|
325 | - /* @var $renderer \Zend\View\Renderer\PhpRenderer */ |
|
320 | + /** |
|
321 | + * @since 0.27 |
|
322 | + */ |
|
323 | + protected function setupAssets() |
|
324 | + { |
|
325 | + /* @var $renderer \Zend\View\Renderer\PhpRenderer */ |
|
326 | 326 | /* @var $basepath \Zend\View\Helper\BasePath */ |
327 | 327 | $renderer = $this->getView(); |
328 | 328 | $basepath = $renderer->plugin('basepath'); |
@@ -331,5 +331,5 @@ discard block |
||
331 | 331 | ->appendFile($basepath('js/jquery-file-upload/jquery.iframe-transport.js')) |
332 | 332 | ->appendFile($basepath('js/jquery-file-upload/jquery.fileupload.js')) |
333 | 333 | ->appendFile($basepath($this->scriptFile)); |
334 | - } |
|
334 | + } |
|
335 | 335 | } |