Completed
Push — master ( 38498c...be9c40 )
by Marcus
02:53
created
src/Controller/Customer/Userhome.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
                     $hResult->execute();
84 84
                     $iRows = $hResult->rowCount();
85 85
                     if ($iRows == 1) {
86
-                        $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>';
86
+                        $sErr .= $this->textcats->T("userprofile_emailalreadyinuse").'<br>';
87 87
                     }
88 88
                     $sErr = CHelper::validateCustomerForm(HelperConfig::$lang, $sErr, true);
89 89
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
                             $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
113 113
                             $hResult = $this->db->prepare($sql);
114 114
                             foreach ($aData as $sKey => $sValue) {
115
-                                $hResult->bindValue(':' . $sKey, $sValue);
115
+                                $hResult->bindValue(':'.$sKey, $sValue);
116 116
                             }
117 117
                             $hResult->execute();
118 118
                             $aPData["infochangessaved"] = true;
Please login to merge, or discard this patch.
src/Controller/Customer/Login.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -45,19 +45,19 @@  discard block
 block discarded – undo
45 45
         } else {
46 46
             $mLogin = $this->getLogin();
47 47
             if (isset($mLogin["status"]) && $mLogin["status"] === 'success') {
48
-                $this->P->oPayload->cl_html = $textcats->T("login_success") . '<br>';
48
+                $this->P->oPayload->cl_html = $textcats->T("login_success").'<br>';
49 49
                 header('Location: /_misc/userhome.html?login=true');
50 50
                 die();
51 51
             } elseif (isset($mLogin["status"]) && $mLogin["status"] === 'tosnotaccepted') {
52
-                $this->P->oPayload->cl_html = $textcats->T("login_fail_tosnotaccepted") . '<br>';
52
+                $this->P->oPayload->cl_html = $textcats->T("login_fail_tosnotaccepted").'<br>';
53 53
                 $this->P->cb_customcontenttemplate = 'customer/login';
54 54
             } elseif (isset($mLogin["status"]) && $mLogin["status"] === 'emailnotverified') {
55
-                $this->P->oPayload->cl_html = $textcats->T("login_fail_emailnotverified") . '<br><br>';
55
+                $this->P->oPayload->cl_html = $textcats->T("login_fail_emailnotverified").'<br><br>';
56 56
                 $this->P->oPayload->cl_html .= '<a href="/_misc/resendverificationmail.html?email='
57
-                    . $mLogin["data"]['cust_email'] . '">' . $textcats->T("login_fail_emailnotverifiedresend") . '</a>';
57
+                    . $mLogin["data"]['cust_email'].'">'.$textcats->T("login_fail_emailnotverifiedresend").'</a>';
58 58
                 $this->P->cb_customcontenttemplate = 'customer/login';
59 59
             } elseif (isset($mLogin["status"]) && $mLogin["status"] === 'accountinactive') {
60
-                $this->P->oPayload->cl_html = $textcats->T("login_fail_accountinactive") . '<br>';
60
+                $this->P->oPayload->cl_html = $textcats->T("login_fail_accountinactive").'<br>';
61 61
                 $this->P->cb_customcontenttemplate = 'customer/login';
62 62
             } else {
63 63
                 $this->P->oPayload->cl_html = $textcats->T("login_fail");
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         $hResult->execute();
112 112
 
113 113
         $iRows = $hResult->rowCount();
114
-        if($iRows == 1) {
114
+        if ($iRows == 1) {
115 115
             $aRow = $hResult->fetch();
116 116
 
117 117
             if (password_verify($_POST["password"], $aRow['cust_password'])) {
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
121 121
                 } elseif ($aRow['cust_tosaccepted'] === 'n') {
122 122
                     return ['status' => 'tosnotaccepted'];
123 123
                 } elseif ($aRow['cust_emailverified'] === 'n') {
124
-                    return ['status' => 'emailnotverified', 'data' => $aRow,];
124
+                    return ['status' => 'emailnotverified', 'data' => $aRow, ];
125 125
                 } elseif ($aRow['cust_active'] === 'n') {
126
-                    return ['status' => 'accountinactive',];
126
+                    return ['status' => 'accountinactive', ];
127 127
                 }
128 128
             }
129 129
         }
Please login to merge, or discard this patch.
src/Controller/Admin/Customer/Customeradmin.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -57,11 +57,11 @@  discard block
 block discarded – undo
57 57
         $this->P->cb_subnav = 'admin';
58 58
 
59 59
         $CUA = [
60
-            ['title' => HardcodedText::get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
61
-            ['title' => HardcodedText::get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
62
-            ['title' => HardcodedText::get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
63
-            ['title' => HardcodedText::get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
64
-            ['title' => HardcodedText::get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',],
60
+            ['title' => HardcodedText::get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
61
+            ['title' => HardcodedText::get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
62
+            ['title' => HardcodedText::get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
63
+            ['title' => HardcodedText::get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
64
+            ['title' => HardcodedText::get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ],
65 65
             [
66 66
                 'title' => HardcodedText::get('customeradmin_list_edit'),
67 67
                 'key' => 'cust_id',
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
                 'linked' => true,
70 70
                 'ltarget' => '/_admin/customeradmin.html',
71 71
                 'lkeyname' => 'id',
72
-                'lgetvars' => ['action' => 'edit',],
72
+                'lgetvars' => ['action' => 'edit', ],
73 73
             ],
74 74
         ];
75 75
         $aPData = $this->handleCustomerAdmin($CUA, $this->serviceManager->get('twig'));
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
                         $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id');
162 162
                         $hResult = $this->db->prepare($sql);
163 163
                         foreach ($aData as $sKey => $sValue) {
164
-                            $hResult->bindValue(':' . $sKey, $sValue);
164
+                            $hResult->bindValue(':'.$sKey, $sValue);
165 165
                         }
166 166
                         $hResult->execute();
167 167
                         $aInfo["changeswritten"] = true;
Please login to merge, or discard this patch.
src/Controller/Admin/Phpinfo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
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
             )
Please login to merge, or discard this patch.
src/Customer/Helper.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
         if (!$bEdit && (!isset($_POST["tos"]) || $_POST["tos"] != 'y')) {
63 63
             $aErr["tos"] = true;
64 64
         }
65
-        if (!$bEdit && (!isset( $_POST["cancellationdisclaimer"] ) || $_POST["cancellationdisclaimer"] != 'y')) {
65
+        if (!$bEdit && (!isset($_POST["cancellationdisclaimer"]) || $_POST["cancellationdisclaimer"] != 'y')) {
66 66
             $aErr["cancellationdisclaimer"] = true;
67 67
         }
68 68
 
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     /**
106 106
      * @param string $sKeyConfig
107 107
      * @param string $sKeyForm
108
-     * @param array|bool $aUserData
108
+     * @param boolean $aUserData
109 109
      * @return bool
110 110
      */
111 111
     public static function getCustomerFormDefaultValue($sKeyConfig, $sKeyForm, $aUserData) {
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
     }
119 119
 
120 120
     /**
121
-     * @param $sLang
121
+     * @param string $sLang
122 122
      * @param string $sPurpose
123 123
      * @param string $sErr
124 124
      * @param bool $aUserData
Please login to merge, or discard this patch.
src/Router.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 
87 87
             $aPath = explode('/', $this->sPath);
88 88
             if (!empty($map[$this->sPath])) {
89
-                $class = '\\HaaseIT\\HCSF\\Controller\\' . $map[$this->sPath];
89
+                $class = '\\HaaseIT\\HCSF\\Controller\\'.$map[$this->sPath];
90 90
             } else {
91 91
                 if ($aPath[1] == HelperConfig::$core['directory_images']) {
92 92
                     $class = '\\HaaseIT\\HCSF\\Controller\\Glide';
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
                 } else { // if it is found, go on
133 133
                     // Support for shorturls
134 134
                     if ($this->P->cb_pagetype === 'shorturl') {
135
-                        header('Location: ' . $this->P->cb_pageconfig, true, 302);
135
+                        header('Location: '.$this->P->cb_pageconfig, true, 302);
136 136
                         exit();
137 137
                     }
138 138
 
@@ -149,14 +149,14 @@  discard block
 block discarded – undo
149 149
                 $this->P->iStatus = 404;
150 150
 
151 151
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_page_not_found");
152
-                header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
152
+                header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
153 153
             } elseif (!is_object($this->P) && $this->P == 500) {
154 154
                 $this->P = new CorePage($this->serviceManager);
155 155
                 $this->P->cb_pagetype = 'error';
156 156
                 $this->P->iStatus = 500;
157 157
 
158 158
                 $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_server_error");
159
-                header($_SERVER["SERVER_PROTOCOL"] . " 500 Internal Server Error");
159
+                header($_SERVER["SERVER_PROTOCOL"]." 500 Internal Server Error");
160 160
             } elseif (is_object($this->P) && $this->P->oPayload == NULL) {// elseif the page has been found but contains no payload...
161 161
                 if (
162 162
                     !(
@@ -166,10 +166,10 @@  discard block
 block discarded – undo
166 166
                     )
167 167
                 ) { // no payload is fine if page is one of these
168 168
                     $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_content_not_found");
169
-                    header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
169
+                    header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
170 170
                 }
171 171
             } elseif ($this->P->oPayload->cl_lang != NULL && $this->P->oPayload->cl_lang != HelperConfig::$lang) { // if the page is available but not in the current language, display info
172
-                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_page_not_available_lang") . '<br><br>' . $this->P->oPayload->cl_html;
172
+                $this->P->oPayload->cl_html = $this->serviceManager->get('textcats')->T("misc_page_not_available_lang").'<br><br>'.$this->P->oPayload->cl_html;
173 173
             }
174 174
         }
175 175
         return $this->P;
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
                 // to allow dots in the filename, we have to iterate through all parts of the filename
192 192
                 $aRoutingoverride["itemno"] = '';
193 193
                 for ($i = 0; $i < count($aTMP["exploded_request_file"]) - 1; $i++) {
194
-                    $aRoutingoverride["itemno"] .= $aTMP["exploded_request_file"][$i] . '.';
194
+                    $aRoutingoverride["itemno"] .= $aTMP["exploded_request_file"][$i].'.';
195 195
                 }
196 196
                 // remove the trailing dot
197 197
                 $aRoutingoverride["itemno"] = \HaaseIT\Toolbox\Tools::cutStringend($aRoutingoverride["itemno"], 1);
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
                 // rebuild the path string without the trailing '/item/itemno.html'
202 202
                 $this->sPath = '';
203 203
                 for ($i = 0; $i < $aTMP["parts_in_path"] - 2; $i++) {
204
-                    $this->sPath .= $aPath[$i] . '/';
204
+                    $this->sPath .= $aPath[$i].'/';
205 205
                 }
206 206
             }
207 207
         }
Please login to merge, or discard this patch.
src/Controller/Admin/Shop/Itemgroupadmin.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
      * @param $purifier
161 161
      * @return string
162 162
      */
163
-    private function admin_updateGroup( $purifier)
163
+    private function admin_updateGroup($purifier)
164 164
     {
165 165
         $sql = 'SELECT * FROM itemgroups_base WHERE itmg_id != :id AND itmg_no = :gno';
166 166
         $hResult = $this->db->prepare($sql);
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
         $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_base', 'itmg_id');
186 186
         $hResult = $this->db->prepare($sql);
187 187
         foreach ($aData as $sKey => $sValue) {
188
-            $hResult->bindValue(':' . $sKey, $sValue);
188
+            $hResult->bindValue(':'.$sKey, $sValue);
189 189
         }
190 190
         $hResult->execute();
191 191
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
             $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_text', 'itmgt_id');
208 208
             $hResult = $this->db->prepare($sql);
209 209
             foreach ($aData as $sKey => $sValue) {
210
-                $hResult->bindValue(':' . $sKey, $sValue);
210
+                $hResult->bindValue(':'.$sKey, $sValue);
211 211
             }
212 212
             $hResult->execute();
213 213
         }
Please login to merge, or discard this patch.