@@ -49,7 +49,7 @@ |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if (null === $uri && isset($_SERVER['REQUEST_URI'])) { |
| 52 | - $uri = preg_replace('~^' . $this->getView()->basePath() . '~', '', $_SERVER['REQUEST_URI']); |
|
| 52 | + $uri = preg_replace('~^'.$this->getView()->basePath().'~', '', $_SERVER['REQUEST_URI']); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | if (null === $stripParams) { |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | $identity = $this->getIdentity(); |
| 121 | - $applicationId = '@' . $this->getApplicationIdentifier(); |
|
| 121 | + $applicationId = '@'.$this->getApplicationIdentifier(); |
|
| 122 | 122 | $applicationIdIndex = strrpos($identity, $applicationId); |
| 123 | 123 | //$login = (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex)?substr($identity, 0, $applicationIdIndex):$identity; |
| 124 | 124 | $login = $identity; |
@@ -130,8 +130,8 @@ discard block |
||
| 130 | 130 | $loginSuccess = false; |
| 131 | 131 | $loginResult = array(); |
| 132 | 132 | |
| 133 | - if (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex) { |
|
| 134 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with correct suffix: '); |
|
| 133 | + if (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex) { |
|
| 134 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with correct suffix: '); |
|
| 135 | 135 | // the login ends with the applicationID, therefore use the secret key |
| 136 | 136 | // the external login must be the form 'xxxxx@yyyy' where yyyy is the matching suffix to the external application key |
| 137 | 137 | if (isset($user)) { |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | $loginSuccess = true; |
| 140 | 140 | } else { |
| 141 | 141 | $loginSuccess = false; |
| 142 | - $this->serviceManager->get('Core/Log')->info('User ' . $login . ', secret: ' . $user->secret . ' != loginPassword: ' . $filter->filter($credential) . ' (' . $credential . ')'); |
|
| 142 | + $this->serviceManager->get('Core/Log')->info('User '.$login.', secret: '.$user->secret.' != loginPassword: '.$filter->filter($credential).' ('.$credential.')'); |
|
| 143 | 143 | } |
| 144 | 144 | } else { |
| 145 | 145 | $user = $users->create( |
@@ -155,17 +155,17 @@ discard block |
||
| 155 | 155 | $loginResult = array('firstLogin' => true); |
| 156 | 156 | } |
| 157 | 157 | } elseif (isset($user)) { |
| 158 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with noncorrect suffix: '); |
|
| 158 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with noncorrect suffix: '); |
|
| 159 | 159 | if ($user->credential == $filter->filter($credential)) { |
| 160 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are equal'); |
|
| 160 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are equal'); |
|
| 161 | 161 | $loginSuccess = true; |
| 162 | 162 | } elseif (!empty($applicationId)) { |
| 163 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are not equal'); |
|
| 163 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are not equal'); |
|
| 164 | 164 | // TODO: remove this code as soon as the secret key has been fully established |
| 165 | 165 | // basically this does allow an external login with an applicationIndex match against the User-Password |
| 166 | 166 | // the way it had been used in the start |
| 167 | 167 | if ($user->credential == $filter->filter($credential)) { |
| 168 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials2 test'); |
|
| 168 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials2 test'); |
|
| 169 | 169 | $loginSuccess = true; |
| 170 | 170 | } |
| 171 | 171 | } |
@@ -45,6 +45,6 @@ |
||
| 45 | 45 | if (!$loginSuffixResponseCollection->isEmpty()) { |
| 46 | 46 | $suffix = $loginSuffixResponseCollection->last(); |
| 47 | 47 | } |
| 48 | - return $value . $suffix; |
|
| 48 | + return $value.$suffix; |
|
| 49 | 49 | } |
| 50 | 50 | } |
@@ -44,6 +44,6 @@ |
||
| 44 | 44 | |
| 45 | 45 | parse_str($query, $queryParams); |
| 46 | 46 | $queryParams = array_diff_key($queryParams, array_flip($stripParams)); |
| 47 | - return $uri . (empty($queryParams) ? '' : '?' . http_build_query($queryParams)); |
|
| 47 | + return $uri.(empty($queryParams) ? '' : '?'.http_build_query($queryParams)); |
|
| 48 | 48 | } |
| 49 | 49 | } |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | throw new \InvalidArgumentException( |
| 57 | 57 | sprintf( |
| 58 | 58 | 'Adapter must be either a string or an instance of \Auth\Controller\Plugin\SocialProfiles\AbstractAdapter, but received %s', |
| 59 | - is_object($adapter) ? get_class($adapter) : '(' . gettype($adapter) . ')' |
|
| 59 | + is_object($adapter) ? get_class($adapter) : '('.gettype($adapter).')' |
|
| 60 | 60 | ) |
| 61 | 61 | ); |
| 62 | 62 | } |
@@ -79,13 +79,13 @@ |
||
| 79 | 79 | |
| 80 | 80 | /* Set locale */ |
| 81 | 81 | $translator = $e->getApplication()->getServiceManager()->get('mvctranslator'); |
| 82 | - $locale = $lang . '_' . strtoupper($lang); |
|
| 82 | + $locale = $lang.'_'.strtoupper($lang); |
|
| 83 | 83 | |
| 84 | 84 | setlocale( |
| 85 | 85 | LC_ALL, |
| 86 | 86 | array( |
| 87 | - $locale . ".utf8", |
|
| 88 | - $locale . ".iso88591", |
|
| 87 | + $locale.".utf8", |
|
| 88 | + $locale.".iso88591", |
|
| 89 | 89 | $locale, |
| 90 | 90 | substr($locale, 0, 2), |
| 91 | 91 | 'de_DE.utf8', |
@@ -92,9 +92,9 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | // Create a file with the class/file map. |
| 94 | 94 | // Stupid syntax highlighters make separating < from PHP declaration necessary |
| 95 | - $content = '<' . "?php\n" |
|
| 95 | + $content = '<'."?php\n" |
|
| 96 | 96 | . "\n" |
| 97 | - . 'return ' . var_export($config, true) . ';'; |
|
| 97 | + . 'return '.var_export($config, true).';'; |
|
| 98 | 98 | |
| 99 | 99 | // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op |
| 100 | 100 | $content = str_replace("\\'", "'", $content); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $content = str_replace('array (', 'array(', $content); |
| 108 | 108 | |
| 109 | 109 | // Make the file end by EOL |
| 110 | - $content = rtrim($content, "\n") . "\n"; |
|
| 110 | + $content = rtrim($content, "\n")."\n"; |
|
| 111 | 111 | |
| 112 | 112 | return $content; |
| 113 | 113 | |
@@ -33,6 +33,6 @@ |
||
| 33 | 33 | */ |
| 34 | 34 | public function getUri() |
| 35 | 35 | { |
| 36 | - return "/file/Applications.Attachment/" . $this->id . "/" .urlencode($this->name); |
|
| 36 | + return "/file/Applications.Attachment/".$this->id."/".urlencode($this->name); |
|
| 37 | 37 | } |
| 38 | 38 | } |
@@ -50,12 +50,12 @@ |
||
| 50 | 50 | |
| 51 | 51 | public function __construct($status = self::INCOMING) |
| 52 | 52 | { |
| 53 | - $constant = 'self::' . strtoupper($status); |
|
| 53 | + $constant = 'self::'.strtoupper($status); |
|
| 54 | 54 | if (!defined($constant)) { |
| 55 | - throw new \DomainException('Unknown status: ' . $status); |
|
| 55 | + throw new \DomainException('Unknown status: '.$status); |
|
| 56 | 56 | } |
| 57 | - $this->name=constant($constant); |
|
| 58 | - $this->order=$this->getOrder(); |
|
| 57 | + $this->name = constant($constant); |
|
| 58 | + $this->order = $this->getOrder(); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |