@@ -57,13 +57,16 @@ discard block |
||
57 | 57 | <h3><?php echo JText::_('COM_REDCORE_NOTHING_TO_DISPLAY') ?></h3> |
58 | 58 | </div> |
59 | 59 | </div> |
60 | - <?php else : ?> |
|
60 | + <?php else { |
|
61 | + : ?> |
|
61 | 62 | <table class="table table-striped table-hover" id="translationList"> |
62 | 63 | <thead> |
63 | 64 | <tr> |
64 | 65 | <th style="width:1%" class="hidden-xs"> |
65 | 66 | <input type="checkbox" name="checkall-toggle" value="" |
66 | - title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)"/> |
|
67 | + title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); |
|
68 | +} |
|
69 | +?>" onclick="Joomla.checkAll(this)"/> |
|
67 | 70 | </th> |
68 | 71 | <th class="nowrap center"> |
69 | 72 | <?php echo JHtml::_('rsearchtools.sort', 'JSTATUS', 't.rctranslations_state', $listDirn, $listOrder); ?> |
@@ -127,9 +130,12 @@ discard block |
||
127 | 130 | <span class="hasTooltip" title="" data-original-title="<strong><?php echo $this->escape($item->rctranslations_modified); ?></strong>"> |
128 | 131 | <?php echo $this->escape($item->rctranslations_modified_user); ?> |
129 | 132 | </span> |
130 | - <?php else: ?> |
|
133 | + <?php else { |
|
134 | + : ?> |
|
131 | 135 | -- |
132 | - <?php endif; ?> |
|
136 | + <?php endif; |
|
137 | +} |
|
138 | +?> |
|
133 | 139 | </td> |
134 | 140 | <td> |
135 | 141 | <?php echo !empty($item->rctranslations_language) ? $this->escape($item->rctranslations_language) : '--'; ?> |
@@ -139,8 +145,11 @@ discard block |
||
139 | 145 | <?php echo $editLink ?> |
140 | 146 | <?php if (!empty($item->{'t_' . $column})) : ?> |
141 | 147 | <?php echo strip_tags(substr($item->{'t_' . $column}, 0, 150)); ?> |
142 | - <?php else : ?> |
|
143 | - <?php echo strip_tags(substr($item->{$column}, 0, 150)); ?> |
|
148 | + <?php else { |
|
149 | + : ?> |
|
150 | + <?php echo strip_tags(substr($item->{$column}, 0, 150)); |
|
151 | +} |
|
152 | +?> |
|
144 | 153 | <?php endif; ?> |
145 | 154 | <?php if (!empty($editLink)) : ?> |
146 | 155 | </a> |
@@ -100,9 +100,12 @@ |
||
100 | 100 | <?php foreach ($scopes as $key => $scope): ?> |
101 | 101 | <?php if ($key < 5): ?> |
102 | 102 | <li><?php echo $scope; ?></li> |
103 | - <?php else : ?> |
|
103 | + <?php else { |
|
104 | + : ?> |
|
104 | 105 | <li>...</li> |
105 | - <?php break; ?> |
|
106 | + <?php break; |
|
107 | +} |
|
108 | +?> |
|
106 | 109 | <?php endif; ?> |
107 | 110 | <?php endforeach; ?> |
108 | 111 | </ul> |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public function getToolbar() |
98 | 98 | { |
99 | - $user = JFactory::getUser(); |
|
99 | + $user = JFactory::getUser(); |
|
100 | 100 | |
101 | 101 | $firstGroup = new RToolbarButtonGroup; |
102 | 102 | $secondGroup = new RToolbarButtonGroup; |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | |
137 | 137 | foreach ($actions as $action) |
138 | 138 | { |
139 | - $result->set($action->name, $user->authorise($action->name, $assetName)); |
|
139 | + $result->set($action->name, $user->authorise($action->name, $assetName)); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | return $result; |
@@ -133,7 +133,7 @@ |
||
133 | 133 | |
134 | 134 | foreach ($actions as $action) |
135 | 135 | { |
136 | - $result->set($action->name, $user->authorise($action->name, $assetName)); |
|
136 | + $result->set($action->name, $user->authorise($action->name, $assetName)); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | return $result; |
@@ -90,9 +90,7 @@ |
||
90 | 90 | if (empty($this->item->id)) |
91 | 91 | { |
92 | 92 | $cancel = RToolbarBuilder::createCancelButton('payment_configuration.cancel'); |
93 | - } |
|
94 | - |
|
95 | - else |
|
93 | + } else |
|
96 | 94 | { |
97 | 95 | $cancel = RToolbarBuilder::createCloseButton('payment_configuration.cancel'); |
98 | 96 | } |
@@ -83,15 +83,19 @@ discard block |
||
83 | 83 | <td> |
84 | 84 | <?php if (isset($statistics[$year]['val'][$month]['val'][$day]['count'])) : |
85 | 85 | echo $statistics[$year]['val'][$month]['val'][$day]['count']; |
86 | - else : |
|
86 | + else { |
|
87 | + : |
|
87 | 88 | echo 0; |
89 | + } |
|
88 | 90 | endif; ?> |
89 | 91 | </td> |
90 | 92 | <td> |
91 | 93 | <?php if (isset($statistics[$year]['val'][$month]['val'][$day]['sum'])) : |
92 | 94 | echo RHelperCurrency::getFormattedPrice($statistics[$year]['val'][$month]['val'][$day]['sum'], $this->paymentData['overall']['currency']); |
93 | - else : |
|
95 | + else { |
|
96 | + : |
|
94 | 97 | echo RHelperCurrency::getFormattedPrice(0, $this->paymentData['overall']['currency']); |
98 | + } |
|
95 | 99 | endif; ?> |
96 | 100 | </td> |
97 | 101 | </tr> |
@@ -102,15 +106,19 @@ discard block |
||
102 | 106 | <td> |
103 | 107 | <?php if (isset($statistics[$yesterday[0]]['val'][$yesterday[1]]['val'][$yesterday[2]]['count'])) : |
104 | 108 | echo $statistics[$yesterday[0]]['val'][$yesterday[1]]['val'][$yesterday[2]]['count']; |
105 | - else : |
|
109 | + else { |
|
110 | + : |
|
106 | 111 | echo 0; |
112 | + } |
|
107 | 113 | endif; ?> |
108 | 114 | </td> |
109 | 115 | <td> |
110 | 116 | <?php if (isset($statistics[$yesterday[0]]['val'][$yesterday[1]]['val'][$yesterday[2]]['sum'])) : |
111 | 117 | echo RHelperCurrency::getFormattedPrice($statistics[$yesterday[0]]['val'][$yesterday[1]]['val'][$yesterday[2]]['sum'], $this->paymentData['overall']['currency']); |
112 | - else : |
|
118 | + else { |
|
119 | + : |
|
113 | 120 | echo RHelperCurrency::getFormattedPrice(0, $this->paymentData['overall']['currency']); |
121 | + } |
|
114 | 122 | endif; ?> |
115 | 123 | </td> |
116 | 124 | </tr> |
@@ -121,15 +129,19 @@ discard block |
||
121 | 129 | <td> |
122 | 130 | <?php if (isset($statistics[$year]['val'][$month]['count'])) : |
123 | 131 | echo $statistics[$year]['val'][$month]['count']; |
124 | - else : |
|
132 | + else { |
|
133 | + : |
|
125 | 134 | echo 0; |
135 | + } |
|
126 | 136 | endif; ?> |
127 | 137 | </td> |
128 | 138 | <td> |
129 | 139 | <?php if (isset($statistics[$year]['val'][$month]['sum'])) : |
130 | 140 | echo RHelperCurrency::getFormattedPrice($statistics[$year]['val'][$month]['sum'], $this->paymentData['overall']['currency']); |
131 | - else : |
|
141 | + else { |
|
142 | + : |
|
132 | 143 | echo RHelperCurrency::getFormattedPrice(0, $this->paymentData['overall']['currency']); |
144 | + } |
|
133 | 145 | endif; ?> |
134 | 146 | </td> |
135 | 147 | </tr> |
@@ -140,15 +152,19 @@ discard block |
||
140 | 152 | <td> |
141 | 153 | <?php if (isset($statistics[$lastMonth[0]]['val'][$lastMonth[1]]['count'])) : |
142 | 154 | echo $statistics[$lastMonth[0]]['val'][$lastMonth[1]]['count']; |
143 | - else : |
|
155 | + else { |
|
156 | + : |
|
144 | 157 | echo 0; |
158 | + } |
|
145 | 159 | endif; ?> |
146 | 160 | </td> |
147 | 161 | <td> |
148 | 162 | <?php if (isset($statistics[$lastMonth[0]]['val'][$lastMonth[1]]['sum'])) : |
149 | 163 | echo RHelperCurrency::getFormattedPrice($statistics[$lastMonth[0]]['val'][$lastMonth[1]]['sum'], $this->paymentData['overall']['currency']); |
150 | - else : |
|
164 | + else { |
|
165 | + : |
|
151 | 166 | echo RHelperCurrency::getFormattedPrice(0, $this->paymentData['overall']['currency']); |
167 | + } |
|
152 | 168 | endif; ?> |
153 | 169 | </td> |
154 | 170 | </tr> |
@@ -159,15 +175,19 @@ discard block |
||
159 | 175 | <td> |
160 | 176 | <?php if (isset($statistics[$year]['count'])) : |
161 | 177 | echo $statistics[$year]['count']; |
162 | - else : |
|
178 | + else { |
|
179 | + : |
|
163 | 180 | echo 0; |
181 | + } |
|
164 | 182 | endif; ?> |
165 | 183 | </td> |
166 | 184 | <td> |
167 | 185 | <?php if (isset($statistics[$year]['sum'])) : |
168 | 186 | echo RHelperCurrency::getFormattedPrice($statistics[$year]['sum'], $this->paymentData['overall']['currency']); |
169 | - else : |
|
187 | + else { |
|
188 | + : |
|
170 | 189 | echo RHelperCurrency::getFormattedPrice(0, $this->paymentData['overall']['currency']); |
190 | + } |
|
171 | 191 | endif; ?> |
172 | 192 | </td> |
173 | 193 | </tr> |
@@ -178,15 +198,19 @@ discard block |
||
178 | 198 | <td> |
179 | 199 | <?php if (isset($statistics[$lastYear]['count'])) : |
180 | 200 | echo $statistics[$lastYear]['count']; |
181 | - else : |
|
201 | + else { |
|
202 | + : |
|
182 | 203 | echo 0; |
204 | + } |
|
183 | 205 | endif; ?> |
184 | 206 | </td> |
185 | 207 | <td> |
186 | 208 | <?php if (isset($statistics[$lastYear]['sum'])) : |
187 | 209 | echo RHelperCurrency::getFormattedPrice($statistics[$lastYear]['sum'], $this->paymentData['overall']['currency']); |
188 | - else : |
|
210 | + else { |
|
211 | + : |
|
189 | 212 | echo RHelperCurrency::getFormattedPrice(0, $this->paymentData['overall']['currency']); |
213 | + } |
|
190 | 214 | endif; ?> |
191 | 215 | </td> |
192 | 216 | </tr> |
@@ -197,15 +221,19 @@ discard block |
||
197 | 221 | <td> |
198 | 222 | <?php if (isset($statistics['maxCount'])) : |
199 | 223 | echo $statistics['maxCount']; |
200 | - else : |
|
224 | + else { |
|
225 | + : |
|
201 | 226 | echo 0; |
227 | + } |
|
202 | 228 | endif; ?> |
203 | 229 | </td> |
204 | 230 | <td> |
205 | 231 | <?php if (isset($statistics['maxSum'])) : |
206 | 232 | echo RHelperCurrency::getFormattedPrice($statistics['maxSum'], $this->paymentData['chart']['currency']); |
207 | - else : |
|
233 | + else { |
|
234 | + : |
|
208 | 235 | echo RHelperCurrency::getFormattedPrice(0, $this->paymentData['overall']['currency']); |
236 | + } |
|
209 | 237 | endif; ?> |
210 | 238 | </td> |
211 | 239 | </tr> |
@@ -216,15 +244,19 @@ discard block |
||
216 | 244 | <td> |
217 | 245 | <?php if (isset($statistics[$year]['averageCount'])) : |
218 | 246 | echo $statistics[$year]['averageCount']; |
219 | - else : |
|
247 | + else { |
|
248 | + : |
|
220 | 249 | echo 0; |
250 | + } |
|
221 | 251 | endif; ?> |
222 | 252 | </td> |
223 | 253 | <td> |
224 | 254 | <?php if (isset($statistics['averageSum'])) : |
225 | 255 | echo RHelperCurrency::getFormattedPrice($statistics[$year]['averageSum'], $this->paymentData['overall']['currency']); |
226 | - else : |
|
256 | + else { |
|
257 | + : |
|
227 | 258 | echo RHelperCurrency::getFormattedPrice(0, $this->paymentData['overall']['currency']); |
259 | + } |
|
228 | 260 | endif; ?> |
229 | 261 | </td> |
230 | 262 | </tr> |
@@ -78,12 +78,12 @@ |
||
78 | 78 | */ |
79 | 79 | public function display($tpl = null) |
80 | 80 | { |
81 | - $this->form = $this->get('Form'); |
|
81 | + $this->form = $this->get('Form'); |
|
82 | 82 | $app = JFactory::getApplication(); |
83 | 83 | $this->translationTableName = $app->input->get('translationTableName', ''); |
84 | 84 | $this->translationTable = RTranslationTable::setTranslationTableWithColumn($this->translationTableName); |
85 | 85 | |
86 | - $this->item = $this->get('Item'); |
|
86 | + $this->item = $this->get('Item'); |
|
87 | 87 | |
88 | 88 | $editor = JFactory::getConfig()->get('editor'); |
89 | 89 | $this->editor = JEditor::getInstance($editor); |
@@ -349,8 +349,7 @@ |
||
349 | 349 | |
350 | 350 | // Delete this row |
351 | 351 | return parent::delete($pk); |
352 | - } |
|
353 | - catch (Exception $e) |
|
352 | + } catch (Exception $e) |
|
354 | 353 | { |
355 | 354 | if ($e->getMessage()) |
356 | 355 | { |
@@ -135,7 +135,7 @@ |
||
135 | 135 | */ |
136 | 136 | public function loadCustomFields() |
137 | 137 | { |
138 | - $db = $this->getDbo(); |
|
138 | + $db = $this->getDbo(); |
|
139 | 139 | $fieldList = array(); |
140 | 140 | $query = 'SHOW COLUMNS FROM ' . $db->qn($this->_tbl); |
141 | 141 | $db->setQuery($query); |