@@ -52,4 +52,4 @@ |
||
52 | 52 | <?php endif; ?> |
53 | 53 | <?php echo $text ?> |
54 | 54 | </button> |
55 | -<?php endif;?> |
|
55 | +<?php endif; ?> |
@@ -45,8 +45,11 @@ |
||
45 | 45 | <?php echo $text ?> |
46 | 46 | </a> |
47 | 47 | </li> |
48 | -<?php else:?> |
|
49 | - <button class="<?php echo $btnClass ?>" onclick="location.href='<?php echo $url ?>';"<?php if ($extraProperties != '') : echo ' ' . $extraProperties; endif; ?>> |
|
48 | +<?php else { |
|
49 | + :?> |
|
50 | + <button class="<?php echo $btnClass ?>" onclick="location.href='<?php echo $url ?>';"<?php if ($extraProperties != '') : echo ' ' . $extraProperties; |
|
51 | +} |
|
52 | +endif; ?>> |
|
50 | 53 | <?php if (!empty($iconClass)) : ?> |
51 | 54 | <i class="<?php echo $iconClass ?>"></i> |
52 | 55 | <?php endif; ?> |
@@ -78,8 +78,11 @@ |
||
78 | 78 | }); |
79 | 79 | </script> |
80 | 80 | |
81 | -<?php else: ?> |
|
81 | +<?php else { |
|
82 | + : ?> |
|
82 | 83 | <button type="button" class="btn btn-primary disabled"> |
83 | - <?php echo JText::_('LIB_REDCORE_TRANSLATION_SAVE_ITEM_TO_TRANSLATE'); ?> |
|
84 | + <?php echo JText::_('LIB_REDCORE_TRANSLATION_SAVE_ITEM_TO_TRANSLATE'); |
|
85 | +} |
|
86 | +?> |
|
84 | 87 | </button> |
85 | 88 | <?php endif; |
@@ -19,7 +19,7 @@ |
||
19 | 19 | $data['options'] = new JRegistry($data['options']); |
20 | 20 | } |
21 | 21 | |
22 | -$searchField = 'filter_' . $data['options']->get('searchField', 'search'); |
|
22 | +$searchField = 'filter_' . $data['options']->get('searchField', 'search'); |
|
23 | 23 | |
24 | 24 | // Load the form filters |
25 | 25 | $filters = $data['view']->filterForm->getGroup('filter'); |
@@ -49,13 +49,13 @@ |
||
49 | 49 | <?php if ($filterButton) : ?> |
50 | 50 | <div class="btn-wrapper hidden-phone"> |
51 | 51 | <button type="button" class="btn hasTooltip js-stools-btn-filter" title="<?php echo RHtml::tooltipText('JSEARCH_TOOLS_DESC'); ?>"> |
52 | - <?php echo JText::_('JSEARCH_TOOLS');?> <i class="caret"></i> |
|
52 | + <?php echo JText::_('JSEARCH_TOOLS'); ?> <i class="caret"></i> |
|
53 | 53 | </button> |
54 | 54 | </div> |
55 | 55 | <?php endif; ?> |
56 | 56 | <div class="btn-wrapper"> |
57 | 57 | <button type="button" class="btn hasTooltip js-stools-btn-clear" title="<?php echo RHtml::tooltipText('JSEARCH_FILTER_CLEAR'); ?>"> |
58 | - <?php echo JText::_('JSEARCH_FILTER_CLEAR');?> |
|
58 | + <?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?> |
|
59 | 59 | </button> |
60 | 60 | </div> |
61 | 61 | <?php endif; ?> |
@@ -33,8 +33,11 @@ |
||
33 | 33 | <label for="filter_search" class="element-invisible"> |
34 | 34 | <?php if (isset($filters[$searchField]->label)) : ?> |
35 | 35 | <?php echo JText::_($filters[$searchField]->label); ?> |
36 | - <?php else : ?> |
|
37 | - <?php echo JText::_('LIB_REDCORE_FILTER_SEARCH_DESC'); ?> |
|
36 | + <?php else { |
|
37 | + : ?> |
|
38 | + <?php echo JText::_('LIB_REDCORE_FILTER_SEARCH_DESC'); |
|
39 | +} |
|
40 | +?> |
|
38 | 41 | <?php endif; ?> |
39 | 42 | </label> |
40 | 43 | <div class="btn-wrapper input-append"> |
@@ -40,13 +40,13 @@ |
||
40 | 40 | <?php if ($filterButton) : ?> |
41 | 41 | <div class="btn-wrapper hidden-xs"> |
42 | 42 | <button type="button" class="btn btn-default hasTooltip js-stools-btn-filter" title="<?php echo RHtml::tooltipText('JSEARCH_TOOLS_DESC'); ?>"> |
43 | - <?php echo JText::_('JSEARCH_TOOLS');?> <i class="caret"></i> |
|
43 | + <?php echo JText::_('JSEARCH_TOOLS'); ?> <i class="caret"></i> |
|
44 | 44 | </button> |
45 | 45 | </div> |
46 | 46 | <?php endif; ?> |
47 | 47 | <div class="btn-wrapper"> |
48 | 48 | <button type="button" class="btn btn-default hasTooltip js-stools-btn-clear" title="<?php echo RHtml::tooltipText('JSEARCH_FILTER_CLEAR'); ?>"> |
49 | - <?php echo JText::_('JSEARCH_FILTER_CLEAR');?> |
|
49 | + <?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?> |
|
50 | 50 | </button> |
51 | 51 | </div> |
52 | 52 | <?php endif; ?> |
@@ -166,13 +166,11 @@ discard block |
||
166 | 166 | if ($this->pagesTotal < $displayedPages) |
167 | 167 | { |
168 | 168 | $this->pagesStart = 1; |
169 | - } |
|
170 | - else |
|
169 | + } else |
|
171 | 170 | { |
172 | 171 | $this->pagesStart = $this->pagesTotal - $displayedPages + 1; |
173 | 172 | } |
174 | - } |
|
175 | - else |
|
173 | + } else |
|
176 | 174 | { |
177 | 175 | $this->pagesStop = $this->pagesStart + $displayedPages - 1; |
178 | 176 | } |
@@ -204,8 +202,7 @@ discard block |
||
204 | 202 | if ($value === null) |
205 | 203 | { |
206 | 204 | unset($this->additionalUrlParams[$key]); |
207 | - } |
|
208 | - else |
|
205 | + } else |
|
209 | 206 | { |
210 | 207 | $this->additionalUrlParams[$key] = $value; |
211 | 208 | } |
@@ -296,8 +293,7 @@ discard block |
||
296 | 293 | if ($this->limitstart + $this->limit < $this->total) |
297 | 294 | { |
298 | 295 | $toResult = $this->limitstart + $this->limit; |
299 | - } |
|
300 | - else |
|
296 | + } else |
|
301 | 297 | { |
302 | 298 | $toResult = $this->total; |
303 | 299 | } |
@@ -307,8 +303,7 @@ discard block |
||
307 | 303 | { |
308 | 304 | $msg = JText::sprintf('JLIB_HTML_RESULTS_OF', $fromResult, $toResult, $this->total); |
309 | 305 | $html .= "\n" . $msg; |
310 | - } |
|
311 | - else |
|
306 | + } else |
|
312 | 307 | { |
313 | 308 | $html .= "\n" . JText::_('JLIB_HTML_NO_RECORDS_FOUND'); |
314 | 309 | } |
@@ -363,8 +358,7 @@ discard block |
||
363 | 358 | { |
364 | 359 | $list['all']['active'] = true; |
365 | 360 | $list['all']['data'] = ($itemOverride) ? pagination_item_active($data->all) : $this->_item_active($data->all); |
366 | - } |
|
367 | - else |
|
361 | + } else |
|
368 | 362 | { |
369 | 363 | $list['all']['active'] = false; |
370 | 364 | $list['all']['data'] = ($itemOverride) ? pagination_item_inactive($data->all) : $this->_item_inactive($data->all); |
@@ -374,8 +368,7 @@ discard block |
||
374 | 368 | { |
375 | 369 | $list['start']['active'] = true; |
376 | 370 | $list['start']['data'] = ($itemOverride) ? pagination_item_active($data->start) : $this->_item_active($data->start); |
377 | - } |
|
378 | - else |
|
371 | + } else |
|
379 | 372 | { |
380 | 373 | $list['start']['active'] = false; |
381 | 374 | $list['start']['data'] = ($itemOverride) ? pagination_item_inactive($data->start) : $this->_item_inactive($data->start); |
@@ -385,8 +378,7 @@ discard block |
||
385 | 378 | { |
386 | 379 | $list['previous']['active'] = true; |
387 | 380 | $list['previous']['data'] = ($itemOverride) ? pagination_item_active($data->previous) : $this->_item_active($data->previous); |
388 | - } |
|
389 | - else |
|
381 | + } else |
|
390 | 382 | { |
391 | 383 | $list['previous']['active'] = false; |
392 | 384 | $list['previous']['data'] = ($itemOverride) ? pagination_item_inactive($data->previous) : $this->_item_inactive($data->previous); |
@@ -401,8 +393,7 @@ discard block |
||
401 | 393 | { |
402 | 394 | $list['pages'][$i]['active'] = true; |
403 | 395 | $list['pages'][$i]['data'] = ($itemOverride) ? pagination_item_active($page) : $this->_item_active($page); |
404 | - } |
|
405 | - else |
|
396 | + } else |
|
406 | 397 | { |
407 | 398 | $list['pages'][$i]['active'] = false; |
408 | 399 | $list['pages'][$i]['data'] = ($itemOverride) ? pagination_item_inactive($page) : $this->_item_inactive($page); |
@@ -413,8 +404,7 @@ discard block |
||
413 | 404 | { |
414 | 405 | $list['next']['active'] = true; |
415 | 406 | $list['next']['data'] = ($itemOverride) ? pagination_item_active($data->next) : $this->_item_active($data->next); |
416 | - } |
|
417 | - else |
|
407 | + } else |
|
418 | 408 | { |
419 | 409 | $list['next']['active'] = false; |
420 | 410 | $list['next']['data'] = ($itemOverride) ? pagination_item_inactive($data->next) : $this->_item_inactive($data->next); |
@@ -424,8 +414,7 @@ discard block |
||
424 | 414 | { |
425 | 415 | $list['end']['active'] = true; |
426 | 416 | $list['end']['data'] = ($itemOverride) ? pagination_item_active($data->end) : $this->_item_active($data->end); |
427 | - } |
|
428 | - else |
|
417 | + } else |
|
429 | 418 | { |
430 | 419 | $list['end']['active'] = false; |
431 | 420 | $list['end']['data'] = ($itemOverride) ? pagination_item_inactive($data->end) : $this->_item_inactive($data->end); |
@@ -434,8 +423,7 @@ discard block |
||
434 | 423 | if ($this->total > $this->limit) |
435 | 424 | { |
436 | 425 | return ($listOverride) ? pagination_list_render($list) : $this->_list_render($list); |
437 | - } |
|
438 | - else |
|
426 | + } else |
|
439 | 427 | { |
440 | 428 | return ''; |
441 | 429 | } |
@@ -595,8 +583,7 @@ discard block |
||
595 | 583 | 'text', |
596 | 584 | $selected |
597 | 585 | ); |
598 | - } |
|
599 | - else |
|
586 | + } else |
|
600 | 587 | { |
601 | 588 | $html = JHtml::_( |
602 | 589 | 'select.genericlist', |
@@ -631,8 +618,7 @@ discard block |
||
631 | 618 | if (($i > 0 || ($i + $this->limitstart > 0)) && $condition) |
632 | 619 | { |
633 | 620 | return JHtml::_('rgrid.orderUp', $i, $task, '', $alt, $enabled, $checkbox); |
634 | - } |
|
635 | - else |
|
621 | + } else |
|
636 | 622 | { |
637 | 623 | return ' '; |
638 | 624 | } |
@@ -658,8 +644,7 @@ discard block |
||
658 | 644 | if (($i < $n - 1 || $i + $this->limitstart < $this->total - 1) && $condition) |
659 | 645 | { |
660 | 646 | return JHtml::_('rgrid.orderDown', $i, $task, '', $alt, $enabled, $checkbox); |
661 | - } |
|
662 | - else |
|
647 | + } else |
|
663 | 648 | { |
664 | 649 | return ' '; |
665 | 650 | } |
@@ -831,8 +816,7 @@ discard block |
||
831 | 816 | { |
832 | 817 | $data->pages[$i]->base = $offset; |
833 | 818 | $data->pages[$i]->link = JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $offset); |
834 | - } |
|
835 | - else |
|
819 | + } else |
|
836 | 820 | { |
837 | 821 | $data->pages[$i]->active = true; |
838 | 822 | } |
@@ -128,8 +128,7 @@ discard block |
||
128 | 128 | if (is_resource($source) && (get_resource_type($source) == 'gd')) |
129 | 129 | { |
130 | 130 | $this->handle = &$source; |
131 | - } |
|
132 | - elseif (!empty($source) && is_string($source)) |
|
131 | + } elseif (!empty($source) && is_string($source)) |
|
133 | 132 | { |
134 | 133 | // If the source input is not empty, assume it is a path and populate the image handle. |
135 | 134 | $this->loadFile($source); |
@@ -432,8 +431,7 @@ discard block |
||
432 | 431 | if (!$this->generateBestQuality) |
433 | 432 | { |
434 | 433 | imagecopyresized($handle, $this->handle, 0, 0, $left, $top, $width, $height, $width, $height); |
435 | - } |
|
436 | - else |
|
434 | + } else |
|
437 | 435 | { |
438 | 436 | imagecopyresampled($handle, $this->handle, 0, 0, $left, $top, $width, $height, $width, $height); |
439 | 437 | } |
@@ -740,8 +738,7 @@ discard block |
||
740 | 738 | $transparency = imagecolorAllocateAlpha($this->handle, 0, 0, 0, 127); |
741 | 739 | imagecolorTransparent($this->handle, $transparency); |
742 | 740 | } |
743 | - } |
|
744 | - else |
|
741 | + } else |
|
745 | 742 | { |
746 | 743 | $handle = imagecreatetruecolor($dimensions->width, $dimensions->height); |
747 | 744 | } |
@@ -775,8 +772,7 @@ discard block |
||
775 | 772 | $this->getWidth(), |
776 | 773 | $this->getHeight() |
777 | 774 | ); |
778 | - } |
|
779 | - else |
|
775 | + } else |
|
780 | 776 | { |
781 | 777 | imagecopyresampled( |
782 | 778 | $handle, |
@@ -837,8 +833,7 @@ discard block |
||
837 | 833 | if (($this->getWidth() / $width) < ($this->getHeight() / $height)) |
838 | 834 | { |
839 | 835 | $resizeheight = 0; |
840 | - } |
|
841 | - else |
|
836 | + } else |
|
842 | 837 | { |
843 | 838 | $resizewidth = 0; |
844 | 839 | } |
@@ -1072,8 +1067,7 @@ discard block |
||
1072 | 1067 | if ($scaleMethod != self::SCALE_OUTSIDE) |
1073 | 1068 | { |
1074 | 1069 | $ratio = max($rx, $ry); |
1075 | - } |
|
1076 | - else |
|
1070 | + } else |
|
1077 | 1071 | { |
1078 | 1072 | $ratio = min($rx, $ry); |
1079 | 1073 | } |
@@ -77,8 +77,7 @@ |
||
77 | 77 | { |
78 | 78 | throw new RuntimeException('Server connection timed out.'); |
79 | 79 | } |
80 | - } |
|
81 | - else |
|
80 | + } else |
|
82 | 81 | { |
83 | 82 | throw new RuntimeException('Not connected to server.'); |
84 | 83 | } |
@@ -210,12 +210,10 @@ |
||
210 | 210 | if (isset($metadata['wrapper_data']['headers'])) |
211 | 211 | { |
212 | 212 | $headers = $metadata['wrapper_data']['headers']; |
213 | - } |
|
214 | - elseif (isset($metadata['wrapper_data'])) |
|
213 | + } elseif (isset($metadata['wrapper_data'])) |
|
215 | 214 | { |
216 | 215 | $headers = $metadata['wrapper_data']; |
217 | - } |
|
218 | - else |
|
216 | + } else |
|
219 | 217 | { |
220 | 218 | $headers = array(); |
221 | 219 | } |