@@ -24,8 +24,7 @@ discard block |
||
24 | 24 | // Load the display being edited from cache, if possible. |
25 | 25 | if (!empty($_POST) && is_object($cache = panels_edit_cache_get($did))) { |
26 | 26 | $display = $cache->display; |
27 | - } |
|
28 | - else { |
|
27 | + } else { |
|
29 | 28 | $cache = panels_edit_cache_get_default($display, $content_types, $title); |
30 | 29 | } |
31 | 30 | |
@@ -67,8 +66,7 @@ discard block |
||
67 | 66 | // that to go away. |
68 | 67 | if (empty($form_state['no display settings'])) { |
69 | 68 | $links = $renderer->get_display_links(); |
70 | - } |
|
71 | - else { |
|
69 | + } else { |
|
72 | 70 | $links = ''; |
73 | 71 | } |
74 | 72 | $form['hide']['display-settings'] = array( |
@@ -54,8 +54,7 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | return $blocks; |
57 | - } |
|
58 | - elseif ($op == 'view') { |
|
57 | + } elseif ($op == 'view') { |
|
59 | 58 | // static recursion protection. |
60 | 59 | static $viewing = array(); |
61 | 60 | if (!empty($viewing[$delta])) { |
@@ -80,8 +79,7 @@ discard block |
||
80 | 79 | |
81 | 80 | unset($viewing[$delta]); |
82 | 81 | return $block; |
83 | - } |
|
84 | - elseif ($op = 'configure') { |
|
82 | + } elseif ($op = 'configure') { |
|
85 | 83 | return array( |
86 | 84 | 'admin-shortcut' => array( |
87 | 85 | '#value' => l(t('Manage this mini-panel'), "admin/build/mini-panels/list/$delta/edit") |
@@ -99,8 +97,7 @@ discard block |
||
99 | 97 | $id = 'mini-panel-' . $name; |
100 | 98 | if (!empty($id_cache[$name])) { |
101 | 99 | $id .= "-" . $id_cache[$name]++; |
102 | - } |
|
103 | - else { |
|
100 | + } else { |
|
104 | 101 | $id_cache[$name] = 1; |
105 | 102 | } |
106 | 103 | |
@@ -140,8 +137,7 @@ discard block |
||
140 | 137 | if (!empty($result[$name]->title) && empty($result[$name]->admin_title)) { |
141 | 138 | $cache[$name]->admin_title = $result[$name]->title; |
142 | 139 | } |
143 | - } |
|
144 | - else { |
|
140 | + } else { |
|
145 | 141 | $cache[$name] = NULL; |
146 | 142 | } |
147 | 143 | } |
@@ -173,8 +169,7 @@ discard block |
||
173 | 169 | if (empty($cache[$mini->name])) { |
174 | 170 | if (!empty($mini->did)) { |
175 | 171 | $dids[$mini->did] = $mini->name; |
176 | - } |
|
177 | - else { |
|
172 | + } else { |
|
178 | 173 | // Translate old style titles into new titles. |
179 | 174 | if (!empty($mini->title) && empty($mini->display->title)) { |
180 | 175 | $mini->display->title = $mini->title; |
@@ -402,8 +397,7 @@ discard block |
||
402 | 397 | |
403 | 398 | if ($rows) { |
404 | 399 | $content = theme('table', array(), $rows, array('class' => 'panels-manage')); |
405 | - } |
|
406 | - else { |
|
400 | + } else { |
|
407 | 401 | $content = '<p>' . t('There are no mini panels.') . '</p>'; |
408 | 402 | } |
409 | 403 |
@@ -223,8 +223,7 @@ |
||
223 | 223 | $form_state['item']->temp_layout = $form_state['values']['layout']; |
224 | 224 | $form_state['clicked_button']['#next'] = 'move'; |
225 | 225 | } |
226 | - } |
|
227 | - else { |
|
226 | + } else { |
|
228 | 227 | $form_state['item']->display->layout = $form_state['values']['layout']; |
229 | 228 | } |
230 | 229 | } |
@@ -65,8 +65,7 @@ |
||
65 | 65 | |
66 | 66 | if (isset($this->formats[$this->options['type']])) { |
67 | 67 | return $value ? $this->formats[$this->options['type']][0] : $this->formats[$this->options['type']][1]; |
68 | - } |
|
69 | - else { |
|
68 | + } else { |
|
70 | 69 | return $value ? $this->formats['yes-no'][0] : $this->formats['yes-no'][1]; |
71 | 70 | } |
72 | 71 | } |
@@ -89,8 +89,7 @@ discard block |
||
89 | 89 | if (is_array($info)) { |
90 | 90 | if (isset($info['table'])) { |
91 | 91 | $table_alias = $this->query->ensure_table($info['table'], $this->relationship); |
92 | - } |
|
93 | - else { |
|
92 | + } else { |
|
94 | 93 | $table_alias = $this->table_alias; |
95 | 94 | } |
96 | 95 | if (empty($table_alias)) { |
@@ -99,8 +98,7 @@ discard block |
||
99 | 98 | continue; |
100 | 99 | } |
101 | 100 | $this->aliases[$identifier] = $this->query->add_field($table_alias, $info['field']); |
102 | - } |
|
103 | - else { |
|
101 | + } else { |
|
104 | 102 | $this->aliases[$info] = $this->query->add_field($this->table_alias, $info); |
105 | 103 | } |
106 | 104 | } |
@@ -476,8 +474,7 @@ discard block |
||
476 | 474 | function advanced_render($values) { |
477 | 475 | if ($this->allow_advanced_render() && method_exists($this, 'render_item')) { |
478 | 476 | $raw_items = $this->get_items($values); |
479 | - } |
|
480 | - else { |
|
477 | + } else { |
|
481 | 478 | $this->last_render = $value = $this->render($values); |
482 | 479 | $this->original_value = $value; |
483 | 480 | } |
@@ -495,8 +492,7 @@ discard block |
||
495 | 492 | } |
496 | 493 | |
497 | 494 | $value = $this->render_items($items); |
498 | - } |
|
499 | - else { |
|
495 | + } else { |
|
500 | 496 | $value = $this->render_text($this->options['alter']); |
501 | 497 | } |
502 | 498 | |
@@ -710,8 +706,7 @@ discard block |
||
710 | 706 | foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) { |
711 | 707 | if (isset($handler->last_render)) { |
712 | 708 | $tokens["[$field]"] = $handler->last_render; |
713 | - } |
|
714 | - else { |
|
709 | + } else { |
|
715 | 710 | $tokens["[$field]"] = ''; |
716 | 711 | } |
717 | 712 | $this->add_self_tokens($tokens, $item); |
@@ -788,8 +783,10 @@ discard block |
||
788 | 783 | return t('Broken/missing handler'); |
789 | 784 | } |
790 | 785 | |
791 | - function ensure_my_table() { /* No table to ensure! */ } |
|
792 | - function query() { /* No query to run */ } |
|
786 | + function ensure_my_table() { |
|
787 | +/* No table to ensure! */ } |
|
788 | + function query() { |
|
789 | +/* No query to run */ } |
|
793 | 790 | function options_form(&$form, &$form_state) { |
794 | 791 | $form['markup'] = array( |
795 | 792 | '#prefix' => '<div class="form-item description">', |
@@ -836,8 +833,7 @@ discard block |
||
836 | 833 | default: |
837 | 834 | return format_size($values->{$this->field_alias}); |
838 | 835 | } |
839 | - } |
|
840 | - else { |
|
836 | + } else { |
|
841 | 837 | return ''; |
842 | 838 | } |
843 | 839 | } |
@@ -65,8 +65,10 @@ |
||
65 | 65 | return t('Broken/missing handler'); |
66 | 66 | } |
67 | 67 | |
68 | - function ensure_my_table() { /* No table to ensure! */ } |
|
69 | - function query() { /* No query to run */ } |
|
68 | + function ensure_my_table() { |
|
69 | +/* No table to ensure! */ } |
|
70 | + function query() { |
|
71 | +/* No query to run */ } |
|
70 | 72 | function options_form(&$form, &$form_state) { |
71 | 73 | $form['markup'] = array( |
72 | 74 | '#prefix' => '<div class="form-item description">', |
@@ -36,8 +36,7 @@ discard block |
||
36 | 36 | function get_default_argument($raw = FALSE) { |
37 | 37 | if (!$raw && $this->options['default_argument_type'] == 'date') { |
38 | 38 | return date($this->arg_format, time()); |
39 | - } |
|
40 | - else if (!$raw && in_array($this->options['default_argument_type'], array('node_created', 'node_changed'))) { |
|
39 | + } else if (!$raw && in_array($this->options['default_argument_type'], array('node_created', 'node_changed'))) { |
|
41 | 40 | foreach (range(1, 3) as $i) { |
42 | 41 | $node = menu_get_object('node', $i); |
43 | 42 | if (!empty($node)) { |
@@ -51,11 +50,9 @@ discard block |
||
51 | 50 | |
52 | 51 | if (empty($node)) { |
53 | 52 | return parent::get_default_argument(); |
54 | - } |
|
55 | - else if ($this->options['default_argument_type'] == 'node_created') { |
|
53 | + } else if ($this->options['default_argument_type'] == 'node_created') { |
|
56 | 54 | return date($this->arg_format, $node->created); |
57 | - } |
|
58 | - else if ($this->options['default_argument_type'] == 'node_changed') { |
|
55 | + } else if ($this->options['default_argument_type'] == 'node_changed') { |
|
59 | 56 | return date($this->arg_format, $node->changed); |
60 | 57 | } |
61 | 58 | } |
@@ -25,8 +25,7 @@ discard block |
||
25 | 25 | } |
26 | 26 | if (isset($this->definition['accept null'])) { |
27 | 27 | $this->accept_null = (bool) $this->definition['accept null']; |
28 | - } |
|
29 | - else if (isset($this->definition['accept_null'])) { |
|
28 | + } else if (isset($this->definition['accept_null'])) { |
|
30 | 29 | $this->accept_null = (bool) $this->definition['accept_null']; |
31 | 30 | } |
32 | 31 | $this->value_options = NULL; |
@@ -81,8 +80,7 @@ discard block |
||
81 | 80 | if (!empty($form_state['exposed'])) { |
82 | 81 | // Exposed filter: use a select box to save space. |
83 | 82 | $filter_form_type = 'select'; |
84 | - } |
|
85 | - else { |
|
83 | + } else { |
|
86 | 84 | // Configuring a filter: use radios for clarity. |
87 | 85 | $filter_form_type = 'radios'; |
88 | 86 | } |
@@ -145,12 +143,10 @@ discard block |
||
145 | 143 | if ($this->accept_null) { |
146 | 144 | $where = '(' . $where . " OR $this->table_alias.$this->real_field IS NULL)"; |
147 | 145 | } |
148 | - } |
|
149 | - else { |
|
146 | + } else { |
|
150 | 147 | if (!empty($this->definition['use equal'])) { |
151 | 148 | $where .= '= 1'; |
152 | - } |
|
153 | - else { |
|
149 | + } else { |
|
154 | 150 | $where .= '<> 0'; |
155 | 151 | } |
156 | 152 | } |
@@ -18,8 +18,7 @@ |
||
18 | 18 | if ($this->accept_null) { |
19 | 19 | $where = '(' . $where . " OR $this->table_alias.$this->real_field IS NULL)"; |
20 | 20 | } |
21 | - } |
|
22 | - else { |
|
21 | + } else { |
|
23 | 22 | $where .= "<> ''"; |
24 | 23 | } |
25 | 24 | $this->query->add_where($this->options['group'], $where); |