@@ -34,7 +34,7 @@ |
||
| 34 | 34 | /* @var $serviceLocator \Zend\ServiceManager\AbstractPluginManager |
| 35 | 35 | * @var $headscript \Zend\View\Helper\HeadScript */ |
| 36 | 36 | $services = $serviceLocator->getServiceLocator(); |
| 37 | - $viewHelpers= $services->get('ViewHelperManager'); |
|
| 37 | + $viewHelpers = $services->get('ViewHelperManager'); |
|
| 38 | 38 | $headscript = $viewHelpers->get('headscript'); |
| 39 | 39 | $basepath = $viewHelpers->get('basepath'); |
| 40 | 40 | |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | public function createService(ServiceLocatorInterface $serviceLocator) |
| 22 | 22 | { |
| 23 | - $services= $serviceLocator->getServiceLocator(); |
|
| 23 | + $services = $serviceLocator->getServiceLocator(); |
|
| 24 | 24 | $user = $services->get('AuthenticationService')->getUser(); |
| 25 | 25 | $fieldset = new UserInfoFieldset(); |
| 26 | 26 | $imageEntity = new UserImage(); |
@@ -20,8 +20,8 @@ |
||
| 20 | 20 | public function init() |
| 21 | 21 | { |
| 22 | 22 | $this->setName('base'); |
| 23 | - //->setLabel( /* @translate */ 'General'); |
|
| 24 | - //->setHydrator(new \Core\Model\Hydrator\ModelHydrator()); |
|
| 23 | + //->setLabel( /* @translate */ 'General'); |
|
| 24 | + //->setHydrator(new \Core\Model\Hydrator\ModelHydrator()); |
|
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | $this->add( |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | /** |
| 23 | 23 | * a new password was created |
| 24 | 24 | */ |
| 25 | - const EVENT_AUTH_NEWPASSWORD = 'auth.newpassword'; |
|
| 25 | + const EVENT_AUTH_NEWPASSWORD = 'auth.newpassword'; |
|
| 26 | 26 | |
| 27 | 27 | protected $userEntity; |
| 28 | 28 | |
@@ -35,8 +35,7 @@ discard block |
||
| 35 | 35 | /** |
| 36 | 36 | * Sets the job entity |
| 37 | 37 | * |
| 38 | - * @param Job $jobEntity |
|
| 39 | - * @return MvcEvent |
|
| 38 | + * @return AuthEvent |
|
| 40 | 39 | */ |
| 41 | 40 | public function setUserEntity($userEntity) |
| 42 | 41 | { |
@@ -65,6 +64,9 @@ discard block |
||
| 65 | 64 | return $this->newPassword; |
| 66 | 65 | } |
| 67 | 66 | |
| 67 | + /** |
|
| 68 | + * @param string $resetLink |
|
| 69 | + */ |
|
| 68 | 70 | public function setResetLink($resetLink) |
| 69 | 71 | { |
| 70 | 72 | $this->resetLink = $resetLink; |
@@ -76,6 +78,9 @@ discard block |
||
| 76 | 78 | return $this->resetLink; |
| 77 | 79 | } |
| 78 | 80 | |
| 81 | + /** |
|
| 82 | + * @param \Auth\Entity\UserInterface $user |
|
| 83 | + */ |
|
| 79 | 84 | public function setUser($user) |
| 80 | 85 | { |
| 81 | 86 | $this->user = $user; |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | { |
| 28 | 28 | public function attach(EventManagerInterface $events) |
| 29 | 29 | { |
| 30 | - $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [ $this, 'onDispatchError']); |
|
| 30 | + $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'onDispatchError']); |
|
| 31 | 31 | |
| 32 | 32 | return $this; |
| 33 | 33 | } |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | if ($exception instanceof UnauthorizedImageAccessException) { |
| 58 | 58 | $image = __DIR__ . '/../../../../../public/images/unauthorized-access.png'; |
| 59 | 59 | $response->setStatusCode(403) |
| 60 | - ->setContent(file_get_contents($image)) |
|
| 61 | - ->getHeaders() |
|
| 62 | - ->addHeaderLine('Content-Type', 'image/png'); |
|
| 60 | + ->setContent(file_get_contents($image)) |
|
| 61 | + ->getHeaders() |
|
| 62 | + ->addHeaderLine('Content-Type', 'image/png'); |
|
| 63 | 63 | $e->stopPropagation(); |
| 64 | 64 | $response->sendHeaders(); |
| 65 | 65 | //echo file_get_contents($image); |
@@ -99,10 +99,10 @@ discard block |
||
| 99 | 99 | $model->setTemplate($this->getExceptionTemplate()); |
| 100 | 100 | $e->setResult($model); |
| 101 | 101 | |
| 102 | - // $statusCode = $response->getStatusCode(); |
|
| 103 | - // if ($statusCode === 200) { |
|
| 102 | + // $statusCode = $response->getStatusCode(); |
|
| 103 | + // if ($statusCode === 200) { |
|
| 104 | 104 | $response->setStatusCode(403); |
| 105 | - // } |
|
| 105 | + // } |
|
| 106 | 106 | |
| 107 | 107 | |
| 108 | 108 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * Return an image, if an image was requested. |
| 56 | 56 | */ |
| 57 | 57 | if ($exception instanceof UnauthorizedImageAccessException) { |
| 58 | - $image = __DIR__ . '/../../../../../public/images/unauthorized-access.png'; |
|
| 58 | + $image = __DIR__.'/../../../../../public/images/unauthorized-access.png'; |
|
| 59 | 59 | $response->setStatusCode(403) |
| 60 | 60 | ->setContent(file_get_contents($image)) |
| 61 | 61 | ->getHeaders() |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $routeMatch->setParam('action', 'index'); |
| 79 | 79 | $query = $e->getRequest()->getQuery(); |
| 80 | 80 | $ref = $e->getRequest()->getRequestUri(); |
| 81 | - $ref = preg_replace('~^' . preg_quote($e->getRouter()->getBaseUrl()) . '~', '', $ref); |
|
| 81 | + $ref = preg_replace('~^'.preg_quote($e->getRouter()->getBaseUrl()).'~', '', $ref); |
|
| 82 | 82 | $query->set('ref', $ref); |
| 83 | 83 | $query->set('req', 1); |
| 84 | 84 | $result = $e->getApplication()->getEventManager()->trigger('dispatch', $e); |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | const NAMESPACE_INFO = 'info'; |
| 22 | 22 | const NAMESPACE_WARNING = 'warning'; |
| 23 | 23 | const NAMESPACE_DANGER = 'danger'; |
| 24 | - const NAMESPACE_SUCCESS = 'success'; |
|
| 24 | + const NAMESPACE_SUCCESS = 'success'; |
|
| 25 | 25 | |
| 26 | 26 | protected $namespace2priority = array( |
| 27 | 27 | self::NAMESPACE_INFO => NotificationEntity::INFO, |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function setListener($listener) |
| 61 | 61 | { |
| 62 | - $listener->getSharedManager()->attach('*', NotificationEvent::EVENT_NOTIFICATION_HTML, array($this,'createOutput'), 1); |
|
| 62 | + $listener->getSharedManager()->attach('*', NotificationEvent::EVENT_NOTIFICATION_HTML, array($this, 'createOutput'), 1); |
|
| 63 | 63 | $this->notificationListener = $listener; |
| 64 | 64 | } |
| 65 | 65 | |
@@ -135,7 +135,7 @@ |
||
| 135 | 135 | public function getList($namespace, $callback) |
| 136 | 136 | { |
| 137 | 137 | $session = new Container($namespace); |
| 138 | - $params = $session->params?:array(); |
|
| 138 | + $params = $session->params ?: array(); |
|
| 139 | 139 | if (!$session->list) { |
| 140 | 140 | $session->list = is_array($callback) |
| 141 | 141 | ? call_user_func($callback, $session->params) |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @param object $object |
| 47 | 47 | * @return object |
| 48 | 48 | */ |
| 49 | - public function hydrate (array $data, $object) |
|
| 49 | + public function hydrate(array $data, $object) |
|
| 50 | 50 | { |
| 51 | 51 | |
| 52 | 52 | return $object; |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * @return array|string |
| 58 | 58 | * @throws \InvalidArgumentException |
| 59 | 59 | */ |
| 60 | - public function extract ($object) |
|
| 60 | + public function extract($object) |
|
| 61 | 61 | { |
| 62 | 62 | if (!$object instanceof EntityInterface) { |
| 63 | 63 | throw new \InvalidArgumentException("Extract only from Entities"); |