@@ -94,13 +94,11 @@ |
||
94 | 94 | if (db_is_active()) { |
95 | 95 | variable_set('conditional_styles_' . $theme, $conditional_styles); |
96 | 96 | variable_set('conditional_styles_' . $theme . '_rtl', $conditional_styles_rtl); |
97 | - } |
|
98 | - else { |
|
97 | + } else { |
|
99 | 98 | $GLOBALS['conf']['conditional_styles_' . $theme] = $conditional_styles; |
100 | 99 | $GLOBALS['conf']['conditional_styles_' . $theme . '_rtl'] = $conditional_styles_rtl; |
101 | 100 | } |
102 | - } |
|
103 | - elseif (db_is_active()) { |
|
101 | + } elseif (db_is_active()) { |
|
104 | 102 | variable_del('conditional_styles_' . $theme); |
105 | 103 | variable_del('conditional_styles_' . $theme . '_rtl'); |
106 | 104 | } |
@@ -122,8 +122,7 @@ |
||
122 | 122 | // Save the settings back to the database. |
123 | 123 | if (db_is_active()) { |
124 | 124 | variable_set('theme_'. $theme .'_settings', $settings); |
125 | - } |
|
126 | - else { |
|
125 | + } else { |
|
127 | 126 | $GLOBALS['conf']['theme_'. $theme .'_settings'] = $settings; |
128 | 127 | } |
129 | 128 | // If the active theme has been loaded, force refresh of Drupal internals. |
@@ -19,8 +19,7 @@ |
||
19 | 19 | // Add default styles. |
20 | 20 | if (theme_get_setting('zen_layout') == 'zen-columns-fixed') { |
21 | 21 | drupal_add_css($directory . '/zen-fixed.css', 'theme', 'all'); |
22 | - } |
|
23 | - else { |
|
22 | + } else { |
|
24 | 23 | drupal_add_css($directory . '/zen-liquid.css', 'theme', 'all'); |
25 | 24 | } |
26 | 25 | // Add print styles. |
@@ -29,8 +29,7 @@ discard block |
||
29 | 29 | if ($vars['comment']->status == COMMENT_NOT_PUBLISHED) { |
30 | 30 | $vars['unpublished'] = TRUE; |
31 | 31 | $vars['classes_array'][] = $vars['status']; |
32 | - } |
|
33 | - else { |
|
32 | + } else { |
|
34 | 33 | $vars['unpublished'] = FALSE; |
35 | 34 | } |
36 | 35 | // Zebra striping. |
@@ -44,8 +43,7 @@ discard block |
||
44 | 43 | if ($vars['comment']->uid == 0) { |
45 | 44 | // Comment is by an anonymous user. |
46 | 45 | $vars['classes_array'][] = 'comment-by-anonymous'; |
47 | - } |
|
48 | - else { |
|
46 | + } else { |
|
49 | 47 | if ($vars['comment']->uid == $vars['node']->uid) { |
50 | 48 | // Comment is by the node author. |
51 | 49 | $vars['classes_array'][] = 'comment-by-node-author'; |
@@ -53,8 +53,7 @@ discard block |
||
53 | 53 | if ($title = drupal_get_title()) { |
54 | 54 | $trailing_separator = $breadcrumb_separator; |
55 | 55 | } |
56 | - } |
|
57 | - elseif (theme_get_setting('zen_breadcrumb_trailing')) { |
|
56 | + } elseif (theme_get_setting('zen_breadcrumb_trailing')) { |
|
58 | 57 | $trailing_separator = $breadcrumb_separator; |
59 | 58 | } |
60 | 59 | return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>"; |
@@ -137,8 +136,7 @@ discard block |
||
137 | 136 | if (isset($link['href'])) { |
138 | 137 | // Pass in $link as $options, they share the same keys. |
139 | 138 | $output .= l($link['title'], $link['href'], $link); |
140 | - } |
|
141 | - else if (!empty($link['title'])) { |
|
139 | + } else if (!empty($link['title'])) { |
|
142 | 140 | // Some links are actually not links, but we wrap these in <span> for adding title and class attributes |
143 | 141 | if (empty($link['html'])) { |
144 | 142 | $link['title'] = check_plain($link['title']); |
@@ -188,8 +186,7 @@ discard block |
||
188 | 186 | ctools_include('menu'); |
189 | 187 | $primary = ctools_menu_primary_local_tasks(); |
190 | 188 | $secondary = ctools_menu_secondary_local_tasks(); |
191 | - } |
|
192 | - else { |
|
189 | + } else { |
|
193 | 190 | $primary = menu_primary_local_tasks(); |
194 | 191 | $secondary = menu_secondary_local_tasks(); |
195 | 192 | } |
@@ -237,8 +234,7 @@ discard block |
||
237 | 234 | // Allow context module to set blocks. |
238 | 235 | if (function_exists('context_blocks')) { |
239 | 236 | $output = context_blocks($region); |
240 | - } |
|
241 | - else { |
|
237 | + } else { |
|
242 | 238 | foreach (block_list($region) as $key => $block) { |
243 | 239 | // $key == module_delta |
244 | 240 | $output .= theme('block', $block); |
@@ -298,8 +294,7 @@ discard block |
||
298 | 294 | $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]); |
299 | 295 | unset($vars[$key]); |
300 | 296 | } |
301 | - } |
|
302 | - else { |
|
297 | + } else { |
|
303 | 298 | $vars['classes_array'] = array($hook); |
304 | 299 | } |
305 | 300 | // Add support for Skinr |
@@ -344,8 +339,7 @@ discard block |
||
344 | 339 | if (arg(0) == 'node') { |
345 | 340 | if (arg(1) == 'add') { |
346 | 341 | $section = 'node-add'; |
347 | - } |
|
348 | - elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) { |
|
342 | + } elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) { |
|
349 | 343 | $section = 'node-' . arg(2); |
350 | 344 | } |
351 | 345 | } |
@@ -373,8 +367,7 @@ discard block |
||
373 | 367 | // Set the proper layout body classes. |
374 | 368 | if ($vars['layout'] == 'both') { |
375 | 369 | $vars['classes_array'][] = 'two-sidebars'; |
376 | - } |
|
377 | - else { |
|
370 | + } else { |
|
378 | 371 | $vars['classes_array'][] = 'one-sidebar'; |
379 | 372 | $vars['classes_array'][] = 'sidebar-' . $vars['layout']; |
380 | 373 | } |
@@ -431,8 +424,7 @@ discard block |
||
431 | 424 | case NODE_BUILD_NORMAL: |
432 | 425 | if ($vars['node']->build_mode === NODE_BUILD_NORMAL) { |
433 | 426 | $vars['build_mode'] = $vars['teaser'] ? 'teaser' : 'full'; |
434 | - } |
|
435 | - else { |
|
427 | + } else { |
|
436 | 428 | $vars['build_mode'] = $vars['node']->build_mode; |
437 | 429 | } |
438 | 430 | break; |
@@ -473,8 +465,7 @@ discard block |
||
473 | 465 | if (!$vars['status']) { |
474 | 466 | $vars['classes_array'][] = 'node-unpublished'; |
475 | 467 | $vars['unpublished'] = TRUE; |
476 | - } |
|
477 | - else { |
|
468 | + } else { |
|
478 | 469 | $vars['unpublished'] = FALSE; |
479 | 470 | } |
480 | 471 | if ($vars['uid'] && $vars['uid'] == $GLOBALS['user']->uid) { |
@@ -98,50 +98,35 @@ |
||
98 | 98 | $amount = "<select class=\"form-control\" name=\"from\" onchange=\"Cvalue();numberFormat();\" style=\"width: 200px;\">\n"; |
99 | 99 | if (DONATION_CURRENCY == "EUR") { |
100 | 100 | $amount .= "<option value=\"51\">Euros</option>\n"; |
101 | -} |
|
102 | -elseif (DONATION_CURRENCY == "CAD") { |
|
101 | +} elseif (DONATION_CURRENCY == "CAD") { |
|
103 | 102 | $amount .= "<option value=\"30\">Canadian Dollars</option>\n"; |
104 | -} |
|
105 | -elseif (DONATION_CURRENCY == "GBP") { |
|
103 | +} elseif (DONATION_CURRENCY == "GBP") { |
|
106 | 104 | $amount .= "<option value=\"24\">Pounds Sterling</option>\n"; |
107 | -} |
|
108 | -elseif (DONATION_CURRENCY == "USD") { |
|
105 | +} elseif (DONATION_CURRENCY == "USD") { |
|
109 | 106 | $amount .= "<option value=\"3\">U.S. Dollars</option>\n"; |
110 | -} |
|
111 | -elseif (DONATION_CURRENCY == "JPY") { |
|
107 | +} elseif (DONATION_CURRENCY == "JPY") { |
|
112 | 108 | $amount .= "<option value=\"72\">Yen</option>\n"; |
113 | -} |
|
114 | -elseif (DONATION_CURRENCY == "AUD") { |
|
109 | +} elseif (DONATION_CURRENCY == "AUD") { |
|
115 | 110 | $amount .= "<option value=\"9\">Australian Dollars</option>\n"; |
116 | -} |
|
117 | -elseif (DONATION_CURRENCY == "NZD") { |
|
111 | +} elseif (DONATION_CURRENCY == "NZD") { |
|
118 | 112 | $amount .= "<option value=\"102\">New Zealand Dollars</option>\n"; |
119 | -} |
|
120 | -elseif (DONATION_CURRENCY == "CHF") { |
|
113 | +} elseif (DONATION_CURRENCY == "CHF") { |
|
121 | 114 | $amount .= "<option value=\"139\">Swiss Francs</option>\n"; |
122 | -} |
|
123 | -elseif (DONATION_CURRENCY == "HKD") { |
|
115 | +} elseif (DONATION_CURRENCY == "HKD") { |
|
124 | 116 | $amount .= "<option value=\"63\">Hong Kong Dollars</option>\n"; |
125 | -} |
|
126 | -elseif (DONATION_CURRENCY == "SGD") { |
|
117 | +} elseif (DONATION_CURRENCY == "SGD") { |
|
127 | 118 | $amount .= "<option value=\"126\">Singapore Dollars</option>\n"; |
128 | -} |
|
129 | -elseif (DONATION_CURRENCY == "SEK") { |
|
119 | +} elseif (DONATION_CURRENCY == "SEK") { |
|
130 | 120 | $amount .= "<option value=\"138\">Swedish Kronor</option>\n"; |
131 | -} |
|
132 | -elseif (DONATION_CURRENCY == "DKK") { |
|
121 | +} elseif (DONATION_CURRENCY == "DKK") { |
|
133 | 122 | $amount .= "<option value=\"42\">Danish Kroner</option>\n"; |
134 | -} |
|
135 | -elseif (DONATION_CURRENCY == "PLN") { |
|
123 | +} elseif (DONATION_CURRENCY == "PLN") { |
|
136 | 124 | $amount .= "<option value=\"114\">Polish Zloty</option>\n"; |
137 | -} |
|
138 | -elseif (DONATION_CURRENCY == "NOK") { |
|
125 | +} elseif (DONATION_CURRENCY == "NOK") { |
|
139 | 126 | $amount .= "<option value=\"106\">Norwegian Kroner</option>\n"; |
140 | -} |
|
141 | -elseif (DONATION_CURRENCY == "HUF") { |
|
127 | +} elseif (DONATION_CURRENCY == "HUF") { |
|
142 | 128 | $amount .= "<option value=\"64\">Hungarian Forint</option>\n"; |
143 | -} |
|
144 | -elseif (DONATION_CURRENCY == "CZK") { |
|
129 | +} elseif (DONATION_CURRENCY == "CZK") { |
|
145 | 130 | $amount .= "<option value=\"41\">Czech Koruna</option>\n"; |
146 | 131 | } |
147 | 132 | $amount .= "</select>\n"; |
@@ -7,8 +7,7 @@ |
||
7 | 7 | list($module, $api) = func_get_args(); |
8 | 8 | if ($module == "context" && $api == "context") { |
9 | 9 | return array("version" => 3); |
10 | - } |
|
11 | - elseif ($module == "strongarm" && $api == "strongarm") { |
|
10 | + } elseif ($module == "strongarm" && $api == "strongarm") { |
|
12 | 11 | return array("version" => 1); |
13 | 12 | } |
14 | 13 | } |
@@ -7,8 +7,7 @@ |
||
7 | 7 | list($module, $api) = func_get_args(); |
8 | 8 | if ($module == "context" && $api == "context") { |
9 | 9 | return array("version" => 3); |
10 | - } |
|
11 | - elseif ($module == "strongarm" && $api == "strongarm") { |
|
10 | + } elseif ($module == "strongarm" && $api == "strongarm") { |
|
12 | 11 | return array("version" => 1); |
13 | 12 | } |
14 | 13 | } |
@@ -75,8 +75,7 @@ discard block |
||
75 | 75 | if (!(strcmp($cpid,"0"))) { |
76 | 76 | $newcpid=random_string(); |
77 | 77 | echo "Problematic CPID=0 for [$id] $email_addr gets CPID=$newcpid<br/>"; |
78 | - } |
|
79 | - else |
|
78 | + } else |
|
80 | 79 | $newcpid=$cpid; |
81 | 80 | |
82 | 81 | if (strcmp($email_addr, $new_email) || strcmp($newcpid,$cpid)) { |
@@ -84,8 +83,7 @@ discard block |
||
84 | 83 | if ($confirm != "yes") { |
85 | 84 | echo "QUERY WOULD BE [$id] $query <br/>[click the link at the bottom to enable]<br/>"; |
86 | 85 | $update_needed = TRUE; |
87 | - } |
|
88 | - else { |
|
86 | + } else { |
|
89 | 87 | _mysql_query($update); |
90 | 88 | echo "Doing $update<br/>\n"; |
91 | 89 | } |