@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. |
| 20 | 20 | Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. |
| 21 | 21 | </p>'; |
| 22 | - }elseif($step_number == 2){
|
|
| 22 | + } elseif($step_number == 2){
|
|
| 23 | 23 | $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, |
| 24 | 24 | sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, |
| 25 | 25 | quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. |
| 33 | 33 | Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. |
| 34 | 34 | </p>'; |
| 35 | - }elseif($step_number == 3){
|
|
| 35 | + } elseif($step_number == 3){
|
|
| 36 | 36 | $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, |
| 37 | 37 | sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, |
| 38 | 38 | quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. |
| 52 | 52 | Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. |
| 53 | 53 | </p>'; |
| 54 | - }else{
|
|
| 54 | + } else{
|
|
| 55 | 55 | $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, |
| 56 | 56 | sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, |
| 57 | 57 | quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. |
@@ -63,6 +63,9 @@ |
||
| 63 | 63 | return $this->getPagination($select, $page, $limit); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | + /** |
|
| 67 | + * @param integer $limit |
|
| 68 | + */ |
|
| 66 | 69 | public function fetchLatest($limit) |
| 67 | 70 | { |
| 68 | 71 | return $this->articleEventsMapper->getLatest($limit); |
@@ -139,15 +139,13 @@ |
||
| 139 | 139 | // We don't want to force user to re-upload image on edit |
| 140 | 140 | if (!$event['featured_img']) { |
| 141 | 141 | unset($event['featured_img']); |
| 142 | - } |
|
| 143 | - else { |
|
| 142 | + } else { |
|
| 144 | 143 | $this->upload->deleteFile($oldArticle->featured_img); |
| 145 | 144 | } |
| 146 | 145 | |
| 147 | 146 | if (!$event['main_img']) { |
| 148 | 147 | unset($event['main_img']); |
| 149 | - } |
|
| 150 | - else { |
|
| 148 | + } else { |
|
| 151 | 149 | $this->upload->deleteFile($oldArticle->main_img); |
| 152 | 150 | } |
| 153 | 151 | |
@@ -203,6 +203,9 @@ |
||
| 203 | 203 | return $this->articleMapper->getCategories($articleId); |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | + /** |
|
| 207 | + * @param integer $limit |
|
| 208 | + */ |
|
| 206 | 209 | public function getLatestWeb($limit) |
| 207 | 210 | { |
| 208 | 211 | return $this->articlePostsMapper->getLatest($limit); |
@@ -146,15 +146,13 @@ |
||
| 146 | 146 | // We don't want to force user to re-upload image on edit |
| 147 | 147 | if (!$post['featured_img']) { |
| 148 | 148 | unset($post['featured_img']); |
| 149 | - } |
|
| 150 | - else { |
|
| 149 | + } else { |
|
| 151 | 150 | $this->upload->deleteFile($oldArticle->featured_img); |
| 152 | 151 | } |
| 153 | 152 | |
| 154 | 153 | if (!$post['main_img']) { |
| 155 | 154 | unset($post['main_img']); |
| 156 | - } |
|
| 157 | - else { |
|
| 155 | + } else { |
|
| 158 | 156 | $this->upload->deleteFile($oldArticle->main_img); |
| 159 | 157 | } |
| 160 | 158 | |
@@ -91,6 +91,9 @@ |
||
| 91 | 91 | return $this->getPagination($select, $page, $limit); |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | + /** |
|
| 95 | + * @param integer $limit |
|
| 96 | + */ |
|
| 94 | 97 | public function fetchLatest($limit) |
| 95 | 98 | { |
| 96 | 99 | return $this->articleVideosMapper->getLatest($limit); |
@@ -158,15 +158,13 @@ |
||
| 158 | 158 | // We don't want to force user to re-upload image on edit |
| 159 | 159 | if(!$videos['featured_img']) { |
| 160 | 160 | unset($videos['featured_img']); |
| 161 | - } |
|
| 162 | - else { |
|
| 161 | + } else { |
|
| 163 | 162 | $this->upload->deleteFile($oldArticle->featured_img); |
| 164 | 163 | } |
| 165 | 164 | |
| 166 | 165 | if(!$videos['main_img']) { |
| 167 | 166 | unset($videos['main_img']); |
| 168 | - } |
|
| 169 | - else { |
|
| 167 | + } else { |
|
| 170 | 168 | $this->upload->deleteFile($oldArticle->main_img); |
| 171 | 169 | } |
| 172 | 170 | |
@@ -44,6 +44,9 @@ |
||
| 44 | 44 | return $select; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | + /** |
|
| 48 | + * @param integer $limit |
|
| 49 | + */ |
|
| 47 | 50 | public function getCategoryPostsSelect($categoryId = null, $limit = null) |
| 48 | 51 | { |
| 49 | 52 | $select = $this->getSql()->select() |
@@ -90,11 +90,9 @@ discard block |
||
| 90 | 90 | } else { |
| 91 | 91 | $this->discussionService->createArticle($user, $data); |
| 92 | 92 | } |
| 93 | - } |
|
| 94 | - catch(FilterException $fe) { |
|
| 93 | + } catch(FilterException $fe) { |
|
| 95 | 94 | return $this->edit($fe->getArrayMessages()); |
| 96 | - } |
|
| 97 | - catch(\Exception $e) { |
|
| 95 | + } catch(\Exception $e) { |
|
| 98 | 96 | throw $e; |
| 99 | 97 | } |
| 100 | 98 | |
@@ -105,8 +103,7 @@ discard block |
||
| 105 | 103 | { |
| 106 | 104 | try { |
| 107 | 105 | $this->discussionService->deleteArticle($this->request->getAttribute('id')); |
| 108 | - } |
|
| 109 | - catch(\Exception $e) { |
|
| 106 | + } catch(\Exception $e) { |
|
| 110 | 107 | throw $e; |
| 111 | 108 | } |
| 112 | 109 | |
@@ -72,11 +72,9 @@ discard block |
||
| 72 | 72 | } else { |
| 73 | 73 | $this->eventService->createArticle($user, $data); |
| 74 | 74 | } |
| 75 | - } |
|
| 76 | - catch(FilterException $fe) { |
|
| 75 | + } catch(FilterException $fe) { |
|
| 77 | 76 | return $this->edit($fe->getArrayMessages()); |
| 78 | - } |
|
| 79 | - catch(\Exception $e) { |
|
| 77 | + } catch(\Exception $e) { |
|
| 80 | 78 | throw $e; |
| 81 | 79 | } |
| 82 | 80 | |
@@ -87,8 +85,7 @@ discard block |
||
| 87 | 85 | { |
| 88 | 86 | try { |
| 89 | 87 | $this->eventService->deleteArticle($this->request->getAttribute('id')); |
| 90 | - } |
|
| 91 | - catch(\Exception $e) { |
|
| 88 | + } catch(\Exception $e) { |
|
| 92 | 89 | throw $e; |
| 93 | 90 | } |
| 94 | 91 | |
@@ -117,11 +117,9 @@ discard block |
||
| 117 | 117 | } else { |
| 118 | 118 | $this->videoService->createArticle($user, $data); |
| 119 | 119 | } |
| 120 | - } |
|
| 121 | - catch(FilterException $fe) { |
|
| 120 | + } catch(FilterException $fe) { |
|
| 122 | 121 | return $this->edit($fe->getArrayMessages()); |
| 123 | - } |
|
| 124 | - catch(\Exception $e) { |
|
| 122 | + } catch(\Exception $e) { |
|
| 125 | 123 | throw $e; |
| 126 | 124 | } |
| 127 | 125 | |
@@ -138,8 +136,7 @@ discard block |
||
| 138 | 136 | { |
| 139 | 137 | try { |
| 140 | 138 | $this->videoService->deleteArticle($this->request->getAttribute('id')); |
| 141 | - } |
|
| 142 | - catch(\Exception $e) { |
|
| 139 | + } catch(\Exception $e) { |
|
| 143 | 140 | throw $e; |
| 144 | 141 | } |
| 145 | 142 | |
@@ -25,8 +25,7 @@ |
||
| 25 | 25 | $this->newsletterService->registerNew($email); |
| 26 | 26 | |
| 27 | 27 | return new JsonResponse(['message' => 'Uspešno ste se prijavili.']); |
| 28 | - } |
|
| 29 | - catch(\Exception $e) { |
|
| 28 | + } catch(\Exception $e) { |
|
| 30 | 29 | return new JsonResponse(['message' => $e->getMessage()], $e->getCode()); |
| 31 | 30 | } |
| 32 | 31 | } |