@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | 'constraints' => [ |
140 | 140 | new Type('string'), |
141 | 141 | new Regex([ |
142 | - 'pattern' => '/^(?:'. UsersConstant::UNAME_VALIDATION_PATTERN .'(?:\s*,\s*'. UsersConstant::UNAME_VALIDATION_PATTERN .')*)?$/uD', |
|
142 | + 'pattern' => '/^(?:' . UsersConstant::UNAME_VALIDATION_PATTERN . '(?:\s*,\s*' . UsersConstant::UNAME_VALIDATION_PATTERN . ')*)?$/uD', |
|
143 | 143 | 'message' => $options['translator']->__('The value provided does not appear to be a valid list of user names. The list should consist of one or more user names made up of lowercase letters, numbers, underscores, periods, or dashes. Separate each user name with a comma. For example: \'root, administrator, superuser\' (the quotes should not appear in the list). Spaces surrounding commas are ignored, however extra spaces before or after the list are not and will result in an error. Empty values (two commas together, or separated only by spaces) are not allowed. The list is optional, and if no values are to be defined then the list should be completely empty (no extra spaces, commas, or any other characters).') |
144 | 144 | ]) |
145 | 145 | ] |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | 'constraints' => [ |
167 | 167 | new Type('string'), |
168 | 168 | new Regex([ |
169 | - 'pattern' => '/^(?:'. UsersConstant::EMAIL_DOMAIN_VALIDATION_PATTERN .'(?:\s*,\s*'. UsersConstant::EMAIL_DOMAIN_VALIDATION_PATTERN .')*)?$/Ui', |
|
169 | + 'pattern' => '/^(?:' . UsersConstant::EMAIL_DOMAIN_VALIDATION_PATTERN . '(?:\s*,\s*' . UsersConstant::EMAIL_DOMAIN_VALIDATION_PATTERN . ')*)?$/Ui', |
|
170 | 170 | 'message' => $options['translator']->__('The contents of this field does not appear to be a valid list of e-mail address domains. The list should consist of one or more e-mail address domains (the part after the \'@\'), separated by commas. For example: \'gmail.com, example.org, acme.co.uk\' (the quotes should not appear in the list). Do not include the \'@\' itself. Spaces surrounding commas are ignored, however extra spaces before or after the list are not and will result in an error. Empty values (two commas together, or separated only by spaces) are not allowed. The list is optional, and if no values are to be defined then the list should be completely empty (no extra spaces, commas, or any other characters).') |
171 | 171 | ]) |
172 | 172 | ] |
@@ -96,6 +96,9 @@ |
||
96 | 96 | return $this->mailerApi->sendMessage($message, $subject, $body, $altBody, $html); |
97 | 97 | } |
98 | 98 | |
99 | + /** |
|
100 | + * @param string $notificationType |
|
101 | + */ |
|
99 | 102 | private function generateEmailSubject($notificationType) |
100 | 103 | { |
101 | 104 | $siteName = $this->variableApi->getSystemVar('sitename'); |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | case 'lang': |
140 | 140 | $addcurrentlang2url = $systemVars['languageurl']; |
141 | 141 | if ($addcurrentlang2url == 0) { |
142 | - $pager['args'][$k] = $v; |
|
142 | + $pager['args'][$k] = $v; |
|
143 | 143 | } |
144 | 144 | break; |
145 | 145 | default: |
@@ -161,19 +161,19 @@ discard block |
||
161 | 161 | } |
162 | 162 | } elseif (strlen($vv)) { |
163 | 163 | $tkey = $k . '[' . $kk . ']'; |
164 | - $pager['args'][$tkey] = $vv; |
|
164 | + $pager['args'][$tkey] = $vv; |
|
165 | 165 | } |
166 | 166 | } |
167 | 167 | } else { |
168 | 168 | if (strlen($v)) { |
169 | - $pager['args'][$k] = $v; |
|
169 | + $pager['args'][$k] = $v; |
|
170 | 170 | } |
171 | 171 | } |
172 | 172 | } |
173 | 173 | } |
174 | 174 | } |
175 | 175 | |
176 | - $pagerUrl = function ($pager) use ($routeName, $systemVars) { |
|
176 | + $pagerUrl = function($pager) use ($routeName, $systemVars) { |
|
177 | 177 | if ($routeName) { |
178 | 178 | return $this->container->get('router')->generate($routeName, $pager['args']); |
179 | 179 | } |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | unset($params['names']); |
386 | 386 | unset($params['values']); |
387 | 387 | unset($params['route']); |
388 | - $pagerUrl = function ($pager) { |
|
388 | + $pagerUrl = function($pager) { |
|
389 | 389 | return $this->container->get('router')->generate($pager['route'], $pager['args']); |
390 | 390 | }; |
391 | 391 | $allVars = array_merge($request->request->all(), $request->query->all(), $request->attributes->get('_route_params', [])); |
@@ -417,19 +417,19 @@ discard block |
||
417 | 417 | unset($pager['args'][$pager['posvar']]); |
418 | 418 | |
419 | 419 | // begin to fill the output |
420 | - $output = '<ul class="'.$params['class'].'">'."\n"; |
|
420 | + $output = '<ul class="' . $params['class'] . '">' . "\n"; |
|
421 | 421 | $style = ''; |
422 | 422 | if ($params['printempty']) { |
423 | 423 | $active = ''; |
424 | 424 | if (!empty($params['class_numon'])) { |
425 | 425 | if (!isset($allVars[$pager['posvar']])) { |
426 | - $style = ' class="'.$params['class_numon'].'"'; |
|
426 | + $style = ' class="' . $params['class_numon'] . '"'; |
|
427 | 427 | $active = 'class="active"'; |
428 | 428 | } elseif (!empty($params['class_num'])) { |
429 | - $style = ' class="'.$params['class_num'].'"'; |
|
429 | + $style = ' class="' . $params['class_num'] . '"'; |
|
430 | 430 | } |
431 | 431 | } |
432 | - $output .= '<li '.$active.'><a '.$style.' href="'.$pagerUrl($pager).'"> -'."\n</a></li>"; |
|
432 | + $output .= '<li ' . $active . '><a ' . $style . ' href="' . $pagerUrl($pager) . '"> -' . "\n</a></li>"; |
|
433 | 433 | } |
434 | 434 | |
435 | 435 | $style = ''; |
@@ -437,16 +437,16 @@ discard block |
||
437 | 437 | $active = ''; |
438 | 438 | if (!empty($params['class_numon'])) { |
439 | 439 | if (isset($allVars[$pager['posvar']]) && $allVars[$pager['posvar']] == $pager['values'][$i]) { |
440 | - $style = ' class="'.$params['class_numon'].'"'; |
|
440 | + $style = ' class="' . $params['class_numon'] . '"'; |
|
441 | 441 | $active = 'class="active"'; |
442 | 442 | } elseif (!empty($params['class_num'])) { |
443 | - $style = ' class="'.$params['class_num'].'"'; |
|
443 | + $style = ' class="' . $params['class_num'] . '"'; |
|
444 | 444 | } else { |
445 | 445 | $style = ''; |
446 | 446 | } |
447 | 447 | } |
448 | 448 | $pager['args'][$pager['posvar']] = $pager['values'][$i]; |
449 | - $output .= '<li '.$active.'><a '.$style.' href="'.$pagerUrl($pager).'">'.$pager['names'][$i]."</a></li>\n"; |
|
449 | + $output .= '<li ' . $active . '><a ' . $style . ' href="' . $pagerUrl($pager) . '">' . $pager['names'][$i] . "</a></li>\n"; |
|
450 | 450 | } |
451 | 451 | $output .= "</ul>\n"; |
452 | 452 |
@@ -110,7 +110,7 @@ |
||
110 | 110 | * This function is only ever called once during the lifetime of a particular |
111 | 111 | * module instance |
112 | 112 | * |
113 | - * @return bool false |
|
113 | + * @return boolean|null false |
|
114 | 114 | */ |
115 | 115 | public function defaultdata() |
116 | 116 | { |
@@ -12,15 +12,14 @@ |
||
12 | 12 | |
13 | 13 | namespace Zikula\RoutesModule\Controller; |
14 | 14 | |
15 | -use Zikula\RoutesModule\Controller\Base\AbstractRouteController; |
|
16 | - |
|
17 | 15 | use RuntimeException; |
18 | 16 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
19 | 17 | use Symfony\Component\HttpFoundation\Request; |
20 | -use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
21 | 18 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
22 | -use Zikula\ThemeModule\Engine\Annotation\Theme; |
|
19 | +use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
20 | +use Zikula\RoutesModule\Controller\Base\AbstractRouteController; |
|
23 | 21 | use Zikula\RoutesModule\Entity\RouteEntity; |
22 | +use Zikula\ThemeModule\Engine\Annotation\Theme; |
|
24 | 23 | |
25 | 24 | /** |
26 | 25 | * Route controller class providing navigation and interaction functionality. |
@@ -12,9 +12,8 @@ |
||
12 | 12 | |
13 | 13 | namespace Zikula\RoutesModule\Entity; |
14 | 14 | |
15 | -use Zikula\RoutesModule\Entity\Base\AbstractRouteEntity as BaseEntity; |
|
16 | - |
|
17 | 15 | use Doctrine\ORM\Mapping as ORM; |
16 | +use Zikula\RoutesModule\Entity\Base\AbstractRouteEntity as BaseEntity; |
|
18 | 17 | |
19 | 18 | /** |
20 | 19 | * Entity class that defines the entity structure and behaviours. |
@@ -16,10 +16,10 @@ |
||
16 | 16 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
17 | 17 | use Zikula\Common\Translator\TranslatorInterface; |
18 | 18 | use Zikula\Core\Event\GenericEvent; |
19 | +use Zikula\RoutesModule\Entity\Factory\EntityFactory; |
|
19 | 20 | use Zikula\UsersModule\Api\ApiInterface\CurrentUserApiInterface; |
20 | 21 | use Zikula\UsersModule\Constant as UsersConstant; |
21 | 22 | use Zikula\UsersModule\UserEvents; |
22 | -use Zikula\RoutesModule\Entity\Factory\EntityFactory; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * Event handler base class for user-related events. |
@@ -17,8 +17,8 @@ |
||
17 | 17 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
18 | 18 | use Symfony\Component\DependencyInjection\ContainerAwareTrait; |
19 | 19 | use Zikula\Common\Translator\TranslatorTrait; |
20 | -use Zikula\UsersModule\Constant as UsersConstant; |
|
21 | 20 | use Zikula\RoutesModule\Entity\RouteEntity; |
21 | +use Zikula\UsersModule\Constant as UsersConstant; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * This is the item actions menu implementation class. |
@@ -33,7 +33,7 @@ |
||
33 | 33 | if (php_sapi_name() != 'cli') { |
34 | 34 | echo '<html><body><pre>'; |
35 | 35 | } |
36 | - echo 'The following errors were discovered when checking the' .PHP_EOL. 'Zikula Core system/environment requirements:' . PHP_EOL; |
|
36 | + echo 'The following errors were discovered when checking the' . PHP_EOL . 'Zikula Core system/environment requirements:' . PHP_EOL; |
|
37 | 37 | echo '******************************************************' . PHP_EOL . PHP_EOL; |
38 | 38 | foreach ($versionChecker->requirementsErrors as $error) { |
39 | 39 | echo $error . PHP_EOL; |