@@ -44,13 +44,11 @@ |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | $status = 200; |
| 47 | - } |
|
| 48 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 47 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 49 | 48 | { |
| 50 | 49 | $status = 404; |
| 51 | 50 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 52 | - } |
|
| 53 | - catch( \Exception $e ) |
|
| 51 | + } catch( \Exception $e ) |
|
| 54 | 52 | { |
| 55 | 53 | $status = 500; |
| 56 | 54 | $view->errors = $this->getErrorDetails( $e ); |
@@ -44,13 +44,11 @@ |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | $status = 200; |
| 47 | - } |
|
| 48 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 47 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 49 | 48 | { |
| 50 | 49 | $status = 404; |
| 51 | 50 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 52 | - } |
|
| 53 | - catch( \Exception $e ) |
|
| 51 | + } catch( \Exception $e ) |
|
| 54 | 52 | { |
| 55 | 53 | $status = 500; |
| 56 | 54 | $view->errors = $this->getErrorDetails( $e ); |
@@ -101,8 +101,7 @@ |
||
| 101 | 101 | foreach( $items as $item ) { |
| 102 | 102 | $data[] = $entryFcn( $item ); |
| 103 | 103 | } |
| 104 | - } |
|
| 105 | - else |
|
| 104 | + } else |
|
| 106 | 105 | { |
| 107 | 106 | $data = $entryFcn( $items ); |
| 108 | 107 | } |
@@ -79,25 +79,21 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | $this->controller->deleteListItem( $entry->id ); |
| 81 | 81 | } |
| 82 | - } |
|
| 83 | - else |
|
| 82 | + } else |
|
| 84 | 83 | { |
| 85 | 84 | $this->controller->deleteListItem( $relId ); |
| 86 | 85 | } |
| 87 | 86 | |
| 88 | 87 | $status = 200; |
| 89 | - } |
|
| 90 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 88 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 91 | 89 | { |
| 92 | 90 | $status = 403; |
| 93 | 91 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 94 | - } |
|
| 95 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 92 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 96 | 93 | { |
| 97 | 94 | $status = 404; |
| 98 | 95 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 99 | - } |
|
| 100 | - catch( \Exception $e ) |
|
| 96 | + } catch( \Exception $e ) |
|
| 101 | 97 | { |
| 102 | 98 | $status = 500; |
| 103 | 99 | $view->errors = $this->getErrorDetails( $e ); |
@@ -130,26 +126,22 @@ discard block |
||
| 130 | 126 | { |
| 131 | 127 | $filter = $this->initCriteria( $cntl->createListsFilter(), $view->param( 'filter', [] ) ); |
| 132 | 128 | $view->items = $cntl->searchListItems( $filter, $total ); |
| 133 | - } |
|
| 134 | - else |
|
| 129 | + } else |
|
| 135 | 130 | { |
| 136 | 131 | $view->items = $cntl->getListItem( $relId ); |
| 137 | 132 | } |
| 138 | 133 | |
| 139 | 134 | $view->total = $total; |
| 140 | 135 | $status = 200; |
| 141 | - } |
|
| 142 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 136 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 143 | 137 | { |
| 144 | 138 | $status = 403; |
| 145 | 139 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 146 | - } |
|
| 147 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 140 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 148 | 141 | { |
| 149 | 142 | $status = 404; |
| 150 | 143 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 151 | - } |
|
| 152 | - catch( \Exception $e ) |
|
| 144 | + } catch( \Exception $e ) |
|
| 153 | 145 | { |
| 154 | 146 | $status = 500; |
| 155 | 147 | $view->errors = $this->getErrorDetails( $e ); |
@@ -185,18 +177,15 @@ discard block |
||
| 185 | 177 | $view->items = $cntl->editListItem( $view->param( 'relatedid' ), (array) $payload->data->attributes ); |
| 186 | 178 | $view->total = 1; |
| 187 | 179 | $status = 200; |
| 188 | - } |
|
| 189 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 180 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 190 | 181 | { |
| 191 | 182 | $status = 403; |
| 192 | 183 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 193 | - } |
|
| 194 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 184 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 195 | 185 | { |
| 196 | 186 | $status = 404; |
| 197 | 187 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 198 | - } |
|
| 199 | - catch( \Exception $e ) |
|
| 188 | + } catch( \Exception $e ) |
|
| 200 | 189 | { |
| 201 | 190 | $status = 500; |
| 202 | 191 | $view->errors = $this->getErrorDetails( $e ); |
@@ -245,18 +234,15 @@ discard block |
||
| 245 | 234 | $view->total = count( $list ); |
| 246 | 235 | $view->items = $list; |
| 247 | 236 | $status = 201; |
| 248 | - } |
|
| 249 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 237 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 250 | 238 | { |
| 251 | 239 | $status = 403; |
| 252 | 240 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 253 | - } |
|
| 254 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 241 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 255 | 242 | { |
| 256 | 243 | $status = 404; |
| 257 | 244 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 258 | - } |
|
| 259 | - catch( \Exception $e ) |
|
| 245 | + } catch( \Exception $e ) |
|
| 260 | 246 | { |
| 261 | 247 | $status = 500; |
| 262 | 248 | $view->errors = $this->getErrorDetails( $e ); |
@@ -96,8 +96,7 @@ |
||
| 96 | 96 | foreach( $items as $item ) { |
| 97 | 97 | $data[] = $entryFcn( $item, $this->get( 'form' ) ); |
| 98 | 98 | } |
| 99 | - } |
|
| 100 | - else |
|
| 99 | + } else |
|
| 101 | 100 | { |
| 102 | 101 | $data = $entryFcn( $items, $this->get( 'form' ) ); |
| 103 | 102 | } |
@@ -42,18 +42,15 @@ discard block |
||
| 42 | 42 | $cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'customer' ); |
| 43 | 43 | $cntl->deleteItem( $view->param( 'id' ) ); |
| 44 | 44 | $status = 200; |
| 45 | - } |
|
| 46 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 45 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 47 | 46 | { |
| 48 | 47 | $status = 403; |
| 49 | 48 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 50 | - } |
|
| 51 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 49 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 52 | 50 | { |
| 53 | 51 | $status = 404; |
| 54 | 52 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 55 | - } |
|
| 56 | - catch( \Exception $e ) |
|
| 53 | + } catch( \Exception $e ) |
|
| 57 | 54 | { |
| 58 | 55 | $status = 500; |
| 59 | 56 | $view->errors = $this->getErrorDetails( $e ); |
@@ -88,18 +85,15 @@ discard block |
||
| 88 | 85 | |
| 89 | 86 | $view->item = $cntl->getItem( $view->param( 'id' ), $ref ); |
| 90 | 87 | $status = 200; |
| 91 | - } |
|
| 92 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 88 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 93 | 89 | { |
| 94 | 90 | $status = 403; |
| 95 | 91 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 96 | - } |
|
| 97 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 92 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 98 | 93 | { |
| 99 | 94 | $status = 404; |
| 100 | 95 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 101 | - } |
|
| 102 | - catch( \Exception $e ) |
|
| 96 | + } catch( \Exception $e ) |
|
| 103 | 97 | { |
| 104 | 98 | $status = 500; |
| 105 | 99 | $view->errors = $this->getErrorDetails( $e ); |
@@ -134,18 +128,15 @@ discard block |
||
| 134 | 128 | |
| 135 | 129 | $view->item = $cntl->editItem( $view->param( 'id' ), (array) $payload->data->attributes ); |
| 136 | 130 | $status = 200; |
| 137 | - } |
|
| 138 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 131 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 139 | 132 | { |
| 140 | 133 | $status = 403; |
| 141 | 134 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 142 | - } |
|
| 143 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 135 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 144 | 136 | { |
| 145 | 137 | $status = 404; |
| 146 | 138 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 147 | - } |
|
| 148 | - catch( \Exception $e ) |
|
| 139 | + } catch( \Exception $e ) |
|
| 149 | 140 | { |
| 150 | 141 | $status = 500; |
| 151 | 142 | $view->errors = $this->getErrorDetails( $e ); |
@@ -181,18 +172,15 @@ discard block |
||
| 181 | 172 | $view->item = $cntl->addItem( (array) $payload->data->attributes ); |
| 182 | 173 | $view->nodata = true; // only expose customer ID to attackers |
| 183 | 174 | $status = 201; |
| 184 | - } |
|
| 185 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 175 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 186 | 176 | { |
| 187 | 177 | $status = 403; |
| 188 | 178 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 189 | - } |
|
| 190 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 179 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 191 | 180 | { |
| 192 | 181 | $status = 404; |
| 193 | 182 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 194 | - } |
|
| 195 | - catch( \Exception $e ) |
|
| 183 | + } catch( \Exception $e ) |
|
| 196 | 184 | { |
| 197 | 185 | $status = 500; |
| 198 | 186 | $view->errors = $this->getErrorDetails( $e ); |
@@ -82,8 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | $this->controller->deleteService( $entry->id ); |
| 84 | 84 | } |
| 85 | - } |
|
| 86 | - else |
|
| 85 | + } else |
|
| 87 | 86 | { |
| 88 | 87 | $this->controller->deleteService( $relId ); |
| 89 | 88 | } |
@@ -91,13 +90,11 @@ discard block |
||
| 91 | 90 | |
| 92 | 91 | $view->item = $this->controller->get(); |
| 93 | 92 | $status = 200; |
| 94 | - } |
|
| 95 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 93 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 96 | 94 | { |
| 97 | 95 | $status = 404; |
| 98 | 96 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 99 | - } |
|
| 100 | - catch( \Exception $e ) |
|
| 97 | + } catch( \Exception $e ) |
|
| 101 | 98 | { |
| 102 | 99 | $status = 500; |
| 103 | 100 | $view->errors = $this->getErrorDetails( $e ); |
@@ -159,13 +156,11 @@ discard block |
||
| 159 | 156 | |
| 160 | 157 | $view->item = $this->controller->get(); |
| 161 | 158 | $status = 201; |
| 162 | - } |
|
| 163 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 159 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 164 | 160 | { |
| 165 | 161 | $status = 404; |
| 166 | 162 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 167 | - } |
|
| 168 | - catch( \Exception $e ) |
|
| 163 | + } catch( \Exception $e ) |
|
| 169 | 164 | { |
| 170 | 165 | $status = 500; |
| 171 | 166 | $view->errors = $this->getErrorDetails( $e ); |
@@ -102,8 +102,7 @@ |
||
| 102 | 102 | |
| 103 | 103 | $view->resources = (array) $resources; |
| 104 | 104 | $status = 200; |
| 105 | - } |
|
| 106 | - catch( \Exception $e ) |
|
| 105 | + } catch( \Exception $e ) |
|
| 107 | 106 | { |
| 108 | 107 | $status = 500; |
| 109 | 108 | $view->errors = $this->getErrorDetails( $e ); |
@@ -77,25 +77,21 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | $this->controller->deleteAddressItem( $entry->id ); |
| 79 | 79 | } |
| 80 | - } |
|
| 81 | - else |
|
| 80 | + } else |
|
| 82 | 81 | { |
| 83 | 82 | $this->controller->deleteAddressItem( $relId ); |
| 84 | 83 | } |
| 85 | 84 | |
| 86 | 85 | $status = 200; |
| 87 | - } |
|
| 88 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 86 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 89 | 87 | { |
| 90 | 88 | $status = 403; |
| 91 | 89 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 92 | - } |
|
| 93 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 90 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 94 | 91 | { |
| 95 | 92 | $status = 404; |
| 96 | 93 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 97 | - } |
|
| 98 | - catch( \Exception $e ) |
|
| 94 | + } catch( \Exception $e ) |
|
| 99 | 95 | { |
| 100 | 96 | $status = 500; |
| 101 | 97 | $view->errors = $this->getErrorDetails( $e ); |
@@ -125,26 +121,22 @@ discard block |
||
| 125 | 121 | { |
| 126 | 122 | $view->items = $cntl->getItem( $view->param( 'id' ), ['customer/address'] )->getAddressItems(); |
| 127 | 123 | $view->total = count( $view->items ); |
| 128 | - } |
|
| 129 | - else |
|
| 124 | + } else |
|
| 130 | 125 | { |
| 131 | 126 | $view->items = $cntl->getAddressItem( $relId ); |
| 132 | 127 | $view->total = 1; |
| 133 | 128 | } |
| 134 | 129 | |
| 135 | 130 | $status = 200; |
| 136 | - } |
|
| 137 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 131 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 138 | 132 | { |
| 139 | 133 | $status = 403; |
| 140 | 134 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 141 | - } |
|
| 142 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 135 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 143 | 136 | { |
| 144 | 137 | $status = 404; |
| 145 | 138 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 146 | - } |
|
| 147 | - catch( \Exception $e ) |
|
| 139 | + } catch( \Exception $e ) |
|
| 148 | 140 | { |
| 149 | 141 | $status = 500; |
| 150 | 142 | $view->errors = $this->getErrorDetails( $e ); |
@@ -178,18 +170,15 @@ discard block |
||
| 178 | 170 | $view->items = $cntl->editAddressItem( $view->param( 'relatedid' ), (array) $payload->data->attributes ); |
| 179 | 171 | $view->total = 1; |
| 180 | 172 | $status = 200; |
| 181 | - } |
|
| 182 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 173 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 183 | 174 | { |
| 184 | 175 | $status = 403; |
| 185 | 176 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 186 | - } |
|
| 187 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 177 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 188 | 178 | { |
| 189 | 179 | $status = 404; |
| 190 | 180 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 191 | - } |
|
| 192 | - catch( \Exception $e ) |
|
| 181 | + } catch( \Exception $e ) |
|
| 193 | 182 | { |
| 194 | 183 | $status = 500; |
| 195 | 184 | $view->errors = $this->getErrorDetails( $e ); |
@@ -236,18 +225,15 @@ discard block |
||
| 236 | 225 | $view->total = count( $list ); |
| 237 | 226 | $view->items = $list; |
| 238 | 227 | $status = 201; |
| 239 | - } |
|
| 240 | - catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 228 | + } catch( \Aimeos\Controller\Frontend\Customer\Exception $e ) |
|
| 241 | 229 | { |
| 242 | 230 | $status = 403; |
| 243 | 231 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
| 244 | - } |
|
| 245 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 232 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 246 | 233 | { |
| 247 | 234 | $status = 404; |
| 248 | 235 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 249 | - } |
|
| 250 | - catch( \Exception $e ) |
|
| 236 | + } catch( \Exception $e ) |
|
| 251 | 237 | { |
| 252 | 238 | $status = 500; |
| 253 | 239 | $view->errors = $this->getErrorDetails( $e ); |