@@ -43,7 +43,7 @@ |
||
| 43 | 43 | $html .= implode("\n", |
| 44 | 44 | array_map( |
| 45 | 45 | function($i) { |
| 46 | - return '.phpinfodisplay '.preg_replace( '/,/', ',.phpinfodisplay ', $i ); |
|
| 46 | + return '.phpinfodisplay '.preg_replace('/,/', ',.phpinfodisplay ', $i); |
|
| 47 | 47 | }, |
| 48 | 48 | preg_split('/\n/', $matches[1]) |
| 49 | 49 | ) |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | } elseif (isset($mLogin['status']) && $mLogin['status'] === 'emailnotverified') { |
| 54 | 54 | $this->P->oPayload->cl_html = $textcats->T('login_fail_emailnotverified').'<br><br>'; |
| 55 | 55 | $this->P->oPayload->cl_html .= '<a href="/_misc/resendverificationmail.html?email=' |
| 56 | - .$mLogin['data']['cust_email'].'">'.$textcats->T('login_fail_emailnotverifiedresend').'</a>'; |
|
| 56 | + .$mLogin['data']['cust_email'].'">'.$textcats->T('login_fail_emailnotverifiedresend').'</a>'; |
|
| 57 | 57 | $this->P->cb_customcontenttemplate = 'customer/login'; |
| 58 | 58 | } elseif (isset($mLogin['status']) && $mLogin['status'] === 'accountinactive') { |
| 59 | 59 | $this->P->oPayload->cl_html = $textcats->T('login_fail_accountinactive').'<br>'; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $sUser = filter_var(trim(Tools::getFormfield('user')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW); |
| 84 | 84 | |
| 85 | 85 | $sql = 'SELECT cust_no, cust_email, cust_password, cust_active, cust_emailverified, cust_tosaccepted' |
| 86 | - .' FROM customer WHERE '; |
|
| 86 | + .' FROM customer WHERE '; |
|
| 87 | 87 | if ($bTryEmail) { |
| 88 | 88 | $sql .= '('; |
| 89 | 89 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $hResult->execute(); |
| 111 | 111 | |
| 112 | 112 | $iRows = $hResult->rowCount(); |
| 113 | - if($iRows == 1) { |
|
| 113 | + if ($iRows == 1) { |
|
| 114 | 114 | $aRow = $hResult->fetch(); |
| 115 | 115 | |
| 116 | 116 | if (password_verify(filter_input(INPUT_POST, 'password'), $aRow['cust_password'])) { |
@@ -120,9 +120,9 @@ discard block |
||
| 120 | 120 | } elseif ($aRow['cust_tosaccepted'] === 'n') { |
| 121 | 121 | return ['status' => 'tosnotaccepted']; |
| 122 | 122 | } elseif ($aRow['cust_emailverified'] === 'n') { |
| 123 | - return ['status' => 'emailnotverified', 'data' => $aRow,]; |
|
| 123 | + return ['status' => 'emailnotverified', 'data' => $aRow, ]; |
|
| 124 | 124 | } elseif ($aRow['cust_active'] === 'n') { |
| 125 | - return ['status' => 'accountinactive',]; |
|
| 125 | + return ['status' => 'accountinactive', ]; |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | } |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | $this->P->oPayload->cl_html = $this->textcats->T('denied_default'); |
| 62 | 62 | } else { |
| 63 | 63 | $sql = 'SELECT cust_email, cust_id FROM customer ' |
| 64 | - .'WHERE cust_emailverificationcode = :key AND cust_emailverified = \'n\''; |
|
| 64 | + .'WHERE cust_emailverificationcode = :key AND cust_emailverified = \'n\''; |
|
| 65 | 65 | /** @var \PDOStatement $hResult */ |
| 66 | 66 | $hResult = $this->db->prepare($sql); |
| 67 | 67 | $hResult->bindValue(':key', filter_input(INPUT_GET, 'key', FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW), \PDO::PARAM_STR); |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | |
| 55 | 55 | $iId = \filter_input(INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT); |
| 56 | 56 | $sql = 'SELECT * FROM orders ' |
| 57 | - ."WHERE o_id = :id AND o_paymentmethod = 'sofortueberweisung' AND o_paymentcompleted = 'n'"; |
|
| 57 | + ."WHERE o_id = :id AND o_paymentmethod = 'sofortueberweisung' AND o_paymentcompleted = 'n'"; |
|
| 58 | 58 | |
| 59 | 59 | /** @var \PDOStatement $hResult */ |
| 60 | 60 | $hResult = $this->serviceManager->get('db')->prepare($sql); |
@@ -174,7 +174,7 @@ |
||
| 174 | 174 | } |
| 175 | 175 | echo $this->serviceManager->get('twig')->render('shop/update-cart.twig', $aAR); |
| 176 | 176 | } else { |
| 177 | - $aMSG['msg'] = $sReply; |
|
| 177 | + $aMSG['msg'] = $sReply; |
|
| 178 | 178 | if (count($aMore)) { |
| 179 | 179 | $aMSG = array_merge($aMSG, $aMore); |
| 180 | 180 | } |
@@ -117,7 +117,7 @@ |
||
| 117 | 117 | $user = filter_input(INPUT_SERVER, 'PHP_AUTH_USER'); |
| 118 | 118 | $pass = filter_input(INPUT_SERVER, 'PHP_AUTH_PW'); |
| 119 | 119 | if (filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION') !== null) { // fix for php cgi mode |
| 120 | - list($user, $pass) = explode(':' , base64_decode(substr(filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION'), 6))); |
|
| 120 | + list($user, $pass) = explode(':', base64_decode(substr(filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION'), 6))); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | if (!empty($user) && !empty($pass)) { |
@@ -449,12 +449,12 @@ |
||
| 449 | 449 | } |
| 450 | 450 | // because array_rand will change numerical (string) values to integer, we have to do this awkward dance |
| 451 | 451 | foreach ($keysAddSuggsTMP as $key => $item) { |
| 452 | - $keysAddSuggs[] = (string)$item; |
|
| 452 | + $keysAddSuggs[] = (string) $item; |
|
| 453 | 453 | } |
| 454 | 454 | |
| 455 | 455 | // iterate suggestions and remove those that which will not be kept |
| 456 | 456 | foreach ($suggestions['additional'] as $addSuggsKey => $addSuggsVal) { |
| 457 | - if (!in_array((string)$addSuggsKey, $keysAddSuggs, true)) { |
|
| 457 | + if (!in_array((string) $addSuggsKey, $keysAddSuggs, true)) { |
|
| 458 | 458 | unset($suggestions['additional'][$addSuggsKey]); |
| 459 | 459 | } |
| 460 | 460 | } |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | { |
| 308 | 308 | $aFilesToSend = []; |
| 309 | 309 | if ( |
| 310 | - isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang]) |
|
| 310 | + isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang]) |
|
| 311 | 311 | && file_exists( |
| 312 | 312 | PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'] |
| 313 | 313 | .'/'.HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | ) { |
| 317 | 317 | $aFilesToSend[] = |
| 318 | 318 | PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'].'/' |
| 319 | - .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang]; |
|
| 319 | + .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang]; |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | Helper::mailWrapper( |
@@ -390,9 +390,9 @@ discard block |
||
| 390 | 390 | 'country' => !empty($postcountry) ? |
| 391 | 391 | ( |
| 392 | 392 | isset( |
| 393 | - HelperConfig::$countries['countries_' .HelperConfig::$lang][$postcountry] |
|
| 393 | + HelperConfig::$countries['countries_'.HelperConfig::$lang][$postcountry] |
|
| 394 | 394 | ) |
| 395 | - ? HelperConfig::$countries['countries_' .HelperConfig::$lang][$postcountry] |
|
| 395 | + ? HelperConfig::$countries['countries_'.HelperConfig::$lang][$postcountry] |
|
| 396 | 396 | : $postcountry) |
| 397 | 397 | : '', |
| 398 | 398 | 'remarks' => $this->getPostValue('remarks'), |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | 'paymentmethod' => $this->getPostValue('paymentmethod'), |
| 402 | 402 | 'shippingcost' => empty($_SESSION['shippingcost']) ? false : $_SESSION['shippingcost'], |
| 403 | 403 | 'paypallink' => $postpaymentmethod === 'paypal' ? $serverservername.'/_misc/paypal.html?id='.$iId : '', |
| 404 | - 'sofortueberweisunglink' => $postpaymentmethod === 'sofortueberweisung' ? $serverservername.'/_misc/sofortueberweisung.html?id='.$iId : '', |
|
| 404 | + 'sofortueberweisunglink' => $postpaymentmethod === 'sofortueberweisung' ? $serverservername.'/_misc/sofortueberweisung.html?id='.$iId : '', |
|
| 405 | 405 | 'SESSION' => !$bCust ? Tools::debug($_SESSION, '$_SESSION', true, true) : '', |
| 406 | 406 | 'POST' => !$bCust ? Tools::debug($_POST, '$_POST', true, true) : '', |
| 407 | 407 | 'orderid' => $iId, |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | } else { |
| 443 | 443 | $return .= $getcartkey; |
| 444 | 444 | } |
| 445 | - $return.= ' '.$this->textcats->T('shoppingcart_msg_'.$getmsg.'_2'); |
|
| 445 | + $return .= ' '.$this->textcats->T('shoppingcart_msg_'.$getmsg.'_2'); |
|
| 446 | 446 | if ($getmsg === 'updated') { |
| 447 | 447 | $return .= ' '.$getamount; |
| 448 | 448 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $this->setupHardcodedTextcats(); |
| 64 | 64 | |
| 65 | - $this->serviceManager->setFactory('db', function () { |
|
| 65 | + $this->serviceManager->setFactory('db', function() { |
|
| 66 | 66 | return null; |
| 67 | 67 | }); |
| 68 | 68 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | if (HelperConfig::$core['enable_module_shop']) { |
| 80 | - $this->serviceManager->setFactory('oItem', function (ServiceManager $serviceManager) { |
|
| 80 | + $this->serviceManager->setFactory('oItem', function(ServiceManager $serviceManager) { |
|
| 81 | 81 | return new \HaaseIT\HCSF\Shop\Items($serviceManager); |
| 82 | 82 | }); |
| 83 | 83 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | { |
| 95 | 95 | // PSR-7 Stuff |
| 96 | 96 | // Init request object |
| 97 | - $this->serviceManager->setFactory('request', function () { |
|
| 97 | + $this->serviceManager->setFactory('request', function() { |
|
| 98 | 98 | $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals(); |
| 99 | 99 | |
| 100 | 100 | // cleanup request |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | protected function setupDB() |
| 156 | 156 | { |
| 157 | - $this->serviceManager->setFactory('dbal', function () { |
|
| 157 | + $this->serviceManager->setFactory('dbal', function() { |
|
| 158 | 158 | $config = new \Doctrine\DBAL\Configuration(); |
| 159 | 159 | |
| 160 | 160 | $connectionParams = [ |
@@ -175,14 +175,14 @@ discard block |
||
| 175 | 175 | return \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); |
| 176 | 176 | }); |
| 177 | 177 | |
| 178 | - $this->serviceManager->setFactory('db', function (ServiceManager $serviceManager) { |
|
| 178 | + $this->serviceManager->setFactory('db', function(ServiceManager $serviceManager) { |
|
| 179 | 179 | return $serviceManager->get('dbal')->getWrappedConnection(); |
| 180 | 180 | }); |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | protected function setupTextcats() |
| 184 | 184 | { |
| 185 | - $this->serviceManager->setFactory('textcats', function (ServiceManager $serviceManager) { |
|
| 185 | + $this->serviceManager->setFactory('textcats', function(ServiceManager $serviceManager) { |
|
| 186 | 186 | $langavailable = HelperConfig::$core['lang_available']; |
| 187 | 187 | $textcats = new \HaaseIT\Toolbox\Textcat( |
| 188 | 188 | HelperConfig::$lang, |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | |
| 200 | 200 | protected function setupTwig() |
| 201 | 201 | { |
| 202 | - $this->serviceManager->setFactory('twig', function (ServiceManager $serviceManager) { |
|
| 202 | + $this->serviceManager->setFactory('twig', function(ServiceManager $serviceManager) { |
|
| 203 | 203 | $loader = new \Twig_Loader_Filesystem([PATH_BASEDIR.'customviews', HCSF_BASEDIR.'src/views/']); |
| 204 | 204 | |
| 205 | 205 | $twig_options = [ |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | $aP['countrylist'][] = ' | '; |
| 324 | - foreach (HelperConfig::$countries['countries_' .HelperConfig::$lang] as $sKey => $sValue) { |
|
| 324 | + foreach (HelperConfig::$countries['countries_'.HelperConfig::$lang] as $sKey => $sValue) { |
|
| 325 | 325 | $aP['countrylist'][] = $sKey.'|'.$sValue; |
| 326 | 326 | } |
| 327 | 327 | |