@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | function zen_theme(&$existing, $type, $theme, $path) { |
| 24 | 24 | // When #341140 is fixed, replace _zen_path() with drupal_get_path(). |
| 25 | - include_once './' . _zen_path() . '/zen-internals/template.theme-registry.inc'; |
|
| 25 | + include_once './'._zen_path().'/zen-internals/template.theme-registry.inc'; |
|
| 26 | 26 | return _zen_theme($existing, $type, $theme, $path); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | elseif (theme_get_setting('zen_breadcrumb_trailing')) { |
| 58 | 58 | $trailing_separator = $breadcrumb_separator; |
| 59 | 59 | } |
| 60 | - return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>"; |
|
| 60 | + return '<div class="breadcrumb">'.implode($breadcrumb_separator, $breadcrumb)."$trailing_separator$title</div>"; |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | // Otherwise, return an empty string. |
@@ -106,14 +106,14 @@ discard block |
||
| 106 | 106 | 'level' => 'h2', |
| 107 | 107 | ); |
| 108 | 108 | } |
| 109 | - $output .= '<' . $heading['level']; |
|
| 109 | + $output .= '<'.$heading['level']; |
|
| 110 | 110 | if (!empty($heading['class'])) { |
| 111 | 111 | $output .= drupal_attributes(array('class' => $heading['class'])); |
| 112 | 112 | } |
| 113 | - $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>'; |
|
| 113 | + $output .= '>'.check_plain($heading['text']).'</'.$heading['level'].'>'; |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | - $output .= '<ul'. drupal_attributes($attributes) .'>'; |
|
| 116 | + $output .= '<ul'.drupal_attributes($attributes).'>'; |
|
| 117 | 117 | |
| 118 | 118 | $num_links = count($links); |
| 119 | 119 | $i = 1; |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | && (empty($link['language']) || $link['language']->language == $language->language)) { |
| 133 | 133 | $class .= ' active'; |
| 134 | 134 | } |
| 135 | - $output .= '<li'. drupal_attributes(array('class' => $class)) .'>'; |
|
| 135 | + $output .= '<li'.drupal_attributes(array('class' => $class)).'>'; |
|
| 136 | 136 | |
| 137 | 137 | if (isset($link['href'])) { |
| 138 | 138 | // Pass in $link as $options, they share the same keys. |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | if (isset($link['attributes'])) { |
| 148 | 148 | $span_attributes = drupal_attributes($link['attributes']); |
| 149 | 149 | } |
| 150 | - $output .= '<span'. $span_attributes .'>'. $link['title'] .'</span>'; |
|
| 150 | + $output .= '<span'.$span_attributes.'>'.$link['title'].'</span>'; |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | $i++; |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | // If an item is a LOCAL TASK, render it as a tab |
| 172 | 172 | if ($link['type'] & MENU_IS_LOCAL_TASK) { |
| 173 | - $link['title'] = '<span class="tab">' . check_plain($link['title']) . '</span>'; |
|
| 173 | + $link['title'] = '<span class="tab">'.check_plain($link['title']).'</span>'; |
|
| 174 | 174 | $link['localized_options']['html'] = TRUE; |
| 175 | 175 | } |
| 176 | 176 | |
@@ -195,10 +195,10 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | if ($primary) { |
| 198 | - $output .= '<ul class="tabs primary clearfix">' . $primary . '</ul>'; |
|
| 198 | + $output .= '<ul class="tabs primary clearfix">'.$primary.'</ul>'; |
|
| 199 | 199 | } |
| 200 | 200 | if ($secondary) { |
| 201 | - $output .= '<ul class="tabs secondary clearfix">' . $secondary . '</ul>'; |
|
| 201 | + $output .= '<ul class="tabs secondary clearfix">'.$secondary.'</ul>'; |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | return $output; |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $elements['#region'] = $region; |
| 254 | 254 | |
| 255 | 255 | // Set the theme hook suggestions. |
| 256 | - $hook = array('region_' . $region); |
|
| 256 | + $hook = array('region_'.$region); |
|
| 257 | 257 | if (strpos($region, 'sidebar_') === 0) { |
| 258 | 258 | $hook[] = 'region_sidebar'; |
| 259 | 259 | } |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | // Views (and possibly other modules) have templates with a $classes |
| 296 | 296 | // variable that isn't a string, so we leave those variables alone. |
| 297 | 297 | if (is_string($vars[$key])) { |
| 298 | - $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]); |
|
| 298 | + $vars['classes_array'] = explode(' ', $hook.' '.$vars[$key]); |
|
| 299 | 299 | unset($vars[$key]); |
| 300 | 300 | } |
| 301 | 301 | } |
@@ -319,37 +319,37 @@ discard block |
||
| 319 | 319 | function zen_preprocess_page(&$vars, $hook) { |
| 320 | 320 | // If the user is silly and enables Zen as the theme, add some styles. |
| 321 | 321 | if ($GLOBALS['theme'] == 'zen') { |
| 322 | - include_once './' . _zen_path() . '/zen-internals/template.zen.inc'; |
|
| 322 | + include_once './'._zen_path().'/zen-internals/template.zen.inc'; |
|
| 323 | 323 | _zen_preprocess_page($vars, $hook); |
| 324 | 324 | } |
| 325 | 325 | // Add conditional stylesheets. |
| 326 | 326 | elseif (!module_exists('conditional_styles')) { |
| 327 | 327 | $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : ''; |
| 328 | - $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, ''); |
|
| 328 | + $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, ''); |
|
| 329 | 329 | $vars['styles'] .= $vars['conditional_styles']; |
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | // Classes for body element. Allows advanced theming based on context |
| 333 | 333 | // (home page, node of certain type, etc.) |
| 334 | 334 | // Remove the mostly useless page-ARG0 class. |
| 335 | - if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'. drupal_strtolower(arg(0))), $vars['classes_array'])) { |
|
| 335 | + if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'.drupal_strtolower(arg(0))), $vars['classes_array'])) { |
|
| 336 | 336 | unset($vars['classes_array'][$index]); |
| 337 | 337 | } |
| 338 | 338 | if (!$vars['is_front']) { |
| 339 | 339 | // Add unique class for each page. |
| 340 | 340 | $path = drupal_get_path_alias($_GET['q']); |
| 341 | - $vars['classes_array'][] = drupal_html_class('page-' . $path); |
|
| 341 | + $vars['classes_array'][] = drupal_html_class('page-'.$path); |
|
| 342 | 342 | // Add unique class for each website section. |
| 343 | - list($section, ) = explode('/', $path, 2); |
|
| 343 | + list($section,) = explode('/', $path, 2); |
|
| 344 | 344 | if (arg(0) == 'node') { |
| 345 | 345 | if (arg(1) == 'add') { |
| 346 | 346 | $section = 'node-add'; |
| 347 | 347 | } |
| 348 | 348 | elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) { |
| 349 | - $section = 'node-' . arg(2); |
|
| 349 | + $section = 'node-'.arg(2); |
|
| 350 | 350 | } |
| 351 | 351 | } |
| 352 | - $vars['classes_array'][] = drupal_html_class('section-' . $section); |
|
| 352 | + $vars['classes_array'][] = drupal_html_class('section-'.$section); |
|
| 353 | 353 | } |
| 354 | 354 | if (theme_get_setting('zen_wireframes')) { |
| 355 | 355 | $vars['classes_array'][] = 'with-wireframes'; // Optionally add the wireframes style. |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | } |
| 377 | 377 | else { |
| 378 | 378 | $vars['classes_array'][] = 'one-sidebar'; |
| 379 | - $vars['classes_array'][] = 'sidebar-' . $vars['layout']; |
|
| 379 | + $vars['classes_array'][] = 'sidebar-'.$vars['layout']; |
|
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | // Store the menu item since it has some useful information. |
@@ -406,13 +406,13 @@ discard block |
||
| 406 | 406 | function zen_preprocess_maintenance_page(&$vars, $hook) { |
| 407 | 407 | // If Zen is the maintenance theme, add some styles. |
| 408 | 408 | if ($GLOBALS['theme'] == 'zen') { |
| 409 | - include_once './' . _zen_path() . '/zen-internals/template.zen.inc'; |
|
| 409 | + include_once './'._zen_path().'/zen-internals/template.zen.inc'; |
|
| 410 | 410 | _zen_preprocess_page($vars, $hook); |
| 411 | 411 | } |
| 412 | 412 | // Add conditional stylesheets. |
| 413 | 413 | elseif (!module_exists('conditional_styles')) { |
| 414 | 414 | $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : ''; |
| 415 | - $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, ''); |
|
| 415 | + $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, ''); |
|
| 416 | 416 | $vars['styles'] .= $vars['conditional_styles']; |
| 417 | 417 | } |
| 418 | 418 | } |
@@ -459,11 +459,11 @@ discard block |
||
| 459 | 459 | $vars['user_picture'] = $vars['picture']; |
| 460 | 460 | |
| 461 | 461 | // Create the Drupal 7 $display_submitted variable. |
| 462 | - $vars['display_submitted'] = theme_get_setting('toggle_node_info_' . $vars['node']->type); |
|
| 462 | + $vars['display_submitted'] = theme_get_setting('toggle_node_info_'.$vars['node']->type); |
|
| 463 | 463 | |
| 464 | 464 | // Special classes for nodes. |
| 465 | 465 | // Class for node type: "node-type-page", "node-type-story", "node-type-my-custom-type", etc. |
| 466 | - $vars['classes_array'][] = drupal_html_class('node-type-' . $vars['type']); |
|
| 466 | + $vars['classes_array'][] = drupal_html_class('node-type-'.$vars['type']); |
|
| 467 | 467 | if ($vars['promote']) { |
| 468 | 468 | $vars['classes_array'][] = 'node-promoted'; |
| 469 | 469 | } |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | if (isset($vars['preview'])) { |
| 487 | 487 | $vars['classes_array'][] = 'node-preview'; |
| 488 | 488 | } |
| 489 | - $vars['classes_array'][] = 'build-mode-' . $vars['build_mode'] ; |
|
| 489 | + $vars['classes_array'][] = 'build-mode-'.$vars['build_mode']; |
|
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | /** |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | * The name of the template being rendered ("comment" in this case.) |
| 499 | 499 | */ |
| 500 | 500 | function zen_preprocess_comment(&$vars, $hook) { |
| 501 | - include_once './' . _zen_path() . '/zen-internals/template.comment.inc'; |
|
| 501 | + include_once './'._zen_path().'/zen-internals/template.comment.inc'; |
|
| 502 | 502 | _zen_preprocess_comment($vars, $hook); |
| 503 | 503 | } |
| 504 | 504 | |
@@ -516,7 +516,7 @@ discard block |
||
| 516 | 516 | $vars['region'] = $vars['elements']['#region']; |
| 517 | 517 | |
| 518 | 518 | // Setup the default classes. |
| 519 | - $vars['classes_array'] = array('region', 'region-' . str_replace('_', '-', $vars['region'])); |
|
| 519 | + $vars['classes_array'] = array('region', 'region-'.str_replace('_', '-', $vars['region'])); |
|
| 520 | 520 | |
| 521 | 521 | // Sidebar regions get a couple extra classes. |
| 522 | 522 | if (strpos($vars['region'], 'sidebar_') === 0) { |
@@ -542,7 +542,7 @@ discard block |
||
| 542 | 542 | $vars['title'] = $block->subject; |
| 543 | 543 | |
| 544 | 544 | // Special classes for blocks. |
| 545 | - $vars['classes_array'][] = 'block-' . $block->module; |
|
| 545 | + $vars['classes_array'][] = 'block-'.$block->module; |
|
| 546 | 546 | // Classes describing the position of the block within the region. |
| 547 | 547 | if ($vars['block_id'] == 1) { |
| 548 | 548 | $vars['classes_array'][] = 'first'; |
@@ -550,17 +550,17 @@ discard block |
||
| 550 | 550 | if (!function_exists('context_blocks') && count(block_list($vars['block']->region)) == $vars['block_id']) { |
| 551 | 551 | $vars['classes_array'][] = 'last'; |
| 552 | 552 | } |
| 553 | - $vars['classes_array'][] = 'region-' . $vars['block_zebra']; |
|
| 553 | + $vars['classes_array'][] = 'region-'.$vars['block_zebra']; |
|
| 554 | 554 | $vars['classes_array'][] = $vars['zebra']; |
| 555 | - $vars['classes_array'][] = 'region-count-' . $vars['block_id']; |
|
| 556 | - $vars['classes_array'][] = 'count-' . $vars['id']; |
|
| 555 | + $vars['classes_array'][] = 'region-count-'.$vars['block_id']; |
|
| 556 | + $vars['classes_array'][] = 'count-'.$vars['id']; |
|
| 557 | 557 | |
| 558 | 558 | // Create the block ID. |
| 559 | - $vars['block_html_id'] = 'block-' . $block->module . '-' . $block->delta; |
|
| 559 | + $vars['block_html_id'] = 'block-'.$block->module.'-'.$block->delta; |
|
| 560 | 560 | |
| 561 | 561 | $vars['edit_links_array'] = array(); |
| 562 | 562 | if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) { |
| 563 | - include_once './' . _zen_path() . '/zen-internals/template.block-editing.inc'; |
|
| 563 | + include_once './'._zen_path().'/zen-internals/template.block-editing.inc'; |
|
| 564 | 564 | zen_preprocess_block_editing($vars, $hook); |
| 565 | 565 | $vars['classes_array'][] = 'with-block-editing'; |
| 566 | 566 | } |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | * The name of the template being rendered ("block" in this case.) |
| 591 | 591 | */ |
| 592 | 592 | function zen_process_block(&$vars, $hook) { |
| 593 | - $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">' . implode(' ', $vars['edit_links_array']) . '</div>' : ''; |
|
| 593 | + $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">'.implode(' ', $vars['edit_links_array']).'</div>' : ''; |
|
| 594 | 594 | } |
| 595 | 595 | |
| 596 | 596 | if (!function_exists('drupal_html_class')) { |
@@ -24,72 +24,72 @@ |
||
| 24 | 24 | define('KW_CATEGORY_SCIENCE', 0); |
| 25 | 25 | define('KW_CATEGORY_LOC', 1); |
| 26 | 26 | |
| 27 | -define('KW_ASTRONOMY', 1); |
|
| 28 | -define('KW_SETI', 2); |
|
| 29 | -define('KW_PULSARS', 3); |
|
| 30 | -define('KW_GW', 4); |
|
| 31 | -define('KW_COSMOLOGY', 5); |
|
| 32 | -define('KW_PHYSICS', 6); |
|
| 27 | +define('KW_ASTRONOMY', 1); |
|
| 28 | +define('KW_SETI', 2); |
|
| 29 | +define('KW_PULSARS', 3); |
|
| 30 | +define('KW_GW', 4); |
|
| 31 | +define('KW_COSMOLOGY', 5); |
|
| 32 | +define('KW_PHYSICS', 6); |
|
| 33 | 33 | define('KW_PARTICLE_PHYSICS', 7); |
| 34 | -define('KW_NANOSCIENCE', 8); |
|
| 35 | -define('KW_BIOMED', 9); |
|
| 34 | +define('KW_NANOSCIENCE', 8); |
|
| 35 | +define('KW_BIOMED', 9); |
|
| 36 | 36 | define('KW_DRUG_DISCOVERY', 10); |
| 37 | -define('KW_PROTEINS', 11); |
|
| 38 | -define('KW_GENETICS', 12); |
|
| 39 | -define('KW_DISEASE', 13); |
|
| 40 | -define('KW_CANCER', 14); |
|
| 41 | -define('KW_MATH_CS', 15); |
|
| 42 | -define('KW_AI', 16); |
|
| 43 | -define('KW_OCEANIA', 17); |
|
| 44 | -define('KW_AUSTRALIA', 18); |
|
| 37 | +define('KW_PROTEINS', 11); |
|
| 38 | +define('KW_GENETICS', 12); |
|
| 39 | +define('KW_DISEASE', 13); |
|
| 40 | +define('KW_CANCER', 14); |
|
| 41 | +define('KW_MATH_CS', 15); |
|
| 42 | +define('KW_AI', 16); |
|
| 43 | +define('KW_OCEANIA', 17); |
|
| 44 | +define('KW_AUSTRALIA', 18); |
|
| 45 | 45 | |
| 46 | -define('KW_EUROPE', 20); |
|
| 47 | -define('KW_GERMANY', 21); |
|
| 48 | -define('KW_ASIA', 22); |
|
| 49 | -define('KW_AMERICAS', 23); |
|
| 50 | -define('KW_US', 24); |
|
| 51 | -define('KW_UCB', 25); |
|
| 52 | -define('KW_AEI', 26); |
|
| 53 | -define('KW_CERN', 27); |
|
| 54 | -define('KW_UW', 28); |
|
| 55 | -define('KW_EARTH_SCI', 29); |
|
| 56 | -define('KW_SPAIN', 30); |
|
| 57 | -define('KW_SAN_JORGE', 31); |
|
| 58 | -define('KW_NUMBER_THEORY', 32); |
|
| 59 | -define('KW_CRYPTO', 33); |
|
| 60 | -define('KW_ENV_RESEARCH', 34); |
|
| 61 | -define('KW_CLIMATE', 35); |
|
| 62 | -define('KW_CZECH', 36); |
|
| 46 | +define('KW_EUROPE', 20); |
|
| 47 | +define('KW_GERMANY', 21); |
|
| 48 | +define('KW_ASIA', 22); |
|
| 49 | +define('KW_AMERICAS', 23); |
|
| 50 | +define('KW_US', 24); |
|
| 51 | +define('KW_UCB', 25); |
|
| 52 | +define('KW_AEI', 26); |
|
| 53 | +define('KW_CERN', 27); |
|
| 54 | +define('KW_UW', 28); |
|
| 55 | +define('KW_EARTH_SCI', 29); |
|
| 56 | +define('KW_SPAIN', 30); |
|
| 57 | +define('KW_SAN_JORGE', 31); |
|
| 58 | +define('KW_NUMBER_THEORY', 32); |
|
| 59 | +define('KW_CRYPTO', 33); |
|
| 60 | +define('KW_ENV_RESEARCH', 34); |
|
| 61 | +define('KW_CLIMATE', 35); |
|
| 62 | +define('KW_CZECH', 36); |
|
| 63 | 63 | define('KW_CHARLES_PRAGUE', 37); |
| 64 | -define('KW_RECHENKRAFT', 38); |
|
| 65 | -define('KW_RHEINMAIN', 39); |
|
| 66 | -define('KW_HUNGARY', 40); |
|
| 67 | -define('KW_IRELAND', 41); |
|
| 68 | -define('KW_UC_DUBLIN', 42); |
|
| 69 | -define('KW_POLAND', 43); |
|
| 70 | -define('KW_RUSSIA', 44); |
|
| 64 | +define('KW_RECHENKRAFT', 38); |
|
| 65 | +define('KW_RHEINMAIN', 39); |
|
| 66 | +define('KW_HUNGARY', 40); |
|
| 67 | +define('KW_IRELAND', 41); |
|
| 68 | +define('KW_UC_DUBLIN', 42); |
|
| 69 | +define('KW_POLAND', 43); |
|
| 70 | +define('KW_RUSSIA', 44); |
|
| 71 | 71 | define('KW_SW_STATE_RUSSIA', 45); |
| 72 | -define('KW_RAS', 46); |
|
| 73 | -define('KW_PRBB', 47); |
|
| 74 | -define('KW_UK', 48); |
|
| 75 | -define('KW_OXFORD', 49); |
|
| 76 | -define('KW_CHINA', 50); |
|
| 77 | -define('KW_U_DAYTON', 51); |
|
| 78 | -define('KW_WRIGHT_STATE', 52); |
|
| 79 | -define('KW_USC', 53); |
|
| 80 | -define('KW_FULLERTON', 54); |
|
| 81 | -define('KW_ARIZONA_STATE', 55); |
|
| 82 | -define('KW_U_ILLINOIS', 56); |
|
| 83 | -define('KW_U_WARSAW', 57); |
|
| 84 | -define('KW_RPI', 58); |
|
| 85 | -define('KW_INTERNATIONAL', 59); |
|
| 86 | -define('KW_UND', 60); |
|
| 87 | -define('KW_HOLLAND', 61); |
|
| 88 | -define('KW_CHEMISTRY', 62); |
|
| 89 | -define('KW_GAMES', 63); |
|
| 90 | -define('KW_VIRUS', 64); |
|
| 91 | -define('KW_FRANCE', 65); |
|
| 92 | -define('KW_CANADA', 66); |
|
| 72 | +define('KW_RAS', 46); |
|
| 73 | +define('KW_PRBB', 47); |
|
| 74 | +define('KW_UK', 48); |
|
| 75 | +define('KW_OXFORD', 49); |
|
| 76 | +define('KW_CHINA', 50); |
|
| 77 | +define('KW_U_DAYTON', 51); |
|
| 78 | +define('KW_WRIGHT_STATE', 52); |
|
| 79 | +define('KW_USC', 53); |
|
| 80 | +define('KW_FULLERTON', 54); |
|
| 81 | +define('KW_ARIZONA_STATE', 55); |
|
| 82 | +define('KW_U_ILLINOIS', 56); |
|
| 83 | +define('KW_U_WARSAW', 57); |
|
| 84 | +define('KW_RPI', 58); |
|
| 85 | +define('KW_INTERNATIONAL', 59); |
|
| 86 | +define('KW_UND', 60); |
|
| 87 | +define('KW_HOLLAND', 61); |
|
| 88 | +define('KW_CHEMISTRY', 62); |
|
| 89 | +define('KW_GAMES', 63); |
|
| 90 | +define('KW_VIRUS', 64); |
|
| 91 | +define('KW_FRANCE', 65); |
|
| 92 | +define('KW_CANADA', 66); |
|
| 93 | 93 | |
| 94 | 94 | $job_keywords = array(); |
| 95 | 95 | |
@@ -46,10 +46,10 @@ discard block |
||
| 46 | 46 | "; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | -function xml_error($num=-1, $msg=null, $file=null, $line=null) { |
|
| 49 | +function xml_error($num = -1, $msg = null, $file = null, $line = null) { |
|
| 50 | 50 | global $xml_outer_tag; |
| 51 | 51 | if (!$msg) { |
| 52 | - switch($num) { |
|
| 52 | + switch ($num) { |
|
| 53 | 53 | case -112: $msg = "Invalid XML"; break; |
| 54 | 54 | case -136: $msg = "Not found"; break; |
| 55 | 55 | case -137: $msg = "Name or email address is not unique"; break; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | // If it's a single-tag element, and it's present, just return the tag |
| 96 | 96 | // |
| 97 | 97 | function parse_element($xml, $tag) { |
| 98 | - $closetag = "</" . substr($tag,1); |
|
| 98 | + $closetag = "</".substr($tag, 1); |
|
| 99 | 99 | $x = strstr($xml, $tag); |
| 100 | 100 | if ($x) { |
| 101 | 101 | if (strstr($tag, "/>")) return $tag; |
@@ -111,8 +111,8 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | function parse_next_element($xml, $tag, &$cursor) { |
| 113 | 113 | $element = null; |
| 114 | - $closetag = "</" . substr($tag,1); |
|
| 115 | - $pos = substr($xml,$cursor); |
|
| 114 | + $closetag = "</".substr($tag, 1); |
|
| 115 | + $pos = substr($xml, $cursor); |
|
| 116 | 116 | $x = strstr($pos, $tag); |
| 117 | 117 | if ($x) { |
| 118 | 118 | if (strstr($tag, "/>")) return $tag; |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | $avg = round($app->info->avg, 2); |
| 181 | 181 | $min = round($app->info->min, 2); |
| 182 | 182 | $max = round($app->info->max, 2); |
| 183 | - $x = $max?"$avg ($min - $max)":"---"; |
|
| 183 | + $x = $max ? "$avg ($min - $max)" : "---"; |
|
| 184 | 184 | $u = $app->info->users; |
| 185 | 185 | } else { |
| 186 | 186 | $x = '---'; |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | $cmd = trim($cmd); |
| 274 | 274 | $x = explode(" ", $cmd); |
| 275 | 275 | $prog = $x[0]; |
| 276 | - $pidname = $prog . '.pid'; |
|
| 276 | + $pidname = $prog.'.pid'; |
|
| 277 | 277 | } |
| 278 | 278 | $path = "../../pid_$host/$pidname"; |
| 279 | 279 | if (is_file($path)) { |
@@ -314,12 +314,12 @@ discard block |
||
| 314 | 314 | } |
| 315 | 315 | $master_host = $u["host"]; |
| 316 | 316 | if ($config->www_host) { |
| 317 | - $web_host = trim((string) $config->www_host); |
|
| 317 | + $web_host = trim((string)$config->www_host); |
|
| 318 | 318 | } else { |
| 319 | 319 | $web_host = $main_host; |
| 320 | 320 | } |
| 321 | 321 | if ($config->sched_host) { |
| 322 | - $sched_host = trim((string) $config->sched_host); |
|
| 322 | + $sched_host = trim((string)$config->sched_host); |
|
| 323 | 323 | } else { |
| 324 | 324 | $sched_host = $main_host; |
| 325 | 325 | } |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | |
| 330 | 330 | // the upload and download servers are sort of daemons too |
| 331 | 331 | // |
| 332 | - $url = trim((string) $config->download_url); |
|
| 332 | + $url = trim((string)$config->download_url); |
|
| 333 | 333 | $u = parse_url($url); |
| 334 | 334 | $h = $u["host"]; |
| 335 | 335 | if ($h == $master_host) { |
@@ -341,14 +341,14 @@ discard block |
||
| 341 | 341 | } else { |
| 342 | 342 | $have_remote = true; |
| 343 | 343 | } |
| 344 | - $url = trim((string) $config->upload_url); |
|
| 344 | + $url = trim((string)$config->upload_url); |
|
| 345 | 345 | $u = parse_url($url); |
| 346 | 346 | $h = $u["host"]; |
| 347 | 347 | if ($h == $master_host) { |
| 348 | 348 | $y = new StdClass; |
| 349 | 349 | $y->cmd = "Upload server"; |
| 350 | 350 | $y->host = $h; |
| 351 | - $y->status = !file_exists("../../stop_upload");; |
|
| 351 | + $y->status = !file_exists("../../stop_upload"); ; |
|
| 352 | 352 | $local_daemons[] = $y; |
| 353 | 353 | } else { |
| 354 | 354 | $have_remote = true; |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | $y = new StdClass; |
| 361 | 361 | $y->cmd = "Scheduler"; |
| 362 | 362 | $y->host = $sched_host; |
| 363 | - $y->status = !file_exists("../../stop_sched");; |
|
| 363 | + $y->status = !file_exists("../../stop_sched"); ; |
|
| 364 | 364 | $local_daemons[] = $y; |
| 365 | 365 | } else { |
| 366 | 366 | $have_remote = true; |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | $disabled_daemons[] = $x; |
| 377 | 377 | continue; |
| 378 | 378 | } |
| 379 | - $host = $d->host?(string)$d->host:$main_host; |
|
| 379 | + $host = $d->host ? (string)$d->host : $main_host; |
|
| 380 | 380 | if ($host != $web_host) { |
| 381 | 381 | $have_remote = true; |
| 382 | 382 | continue; |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | $preview = post_str("preview", true); |
| 57 | 57 | $warning = null; |
| 58 | 58 | |
| 59 | -if ($content && $title && (!$preview)){ |
|
| 60 | - if (post_str('add_signature', true) == "add_it"){ |
|
| 61 | - $add_signature = true; // set a flag and concatenate later |
|
| 62 | - } else { |
|
| 59 | +if ($content && $title && (!$preview)) { |
|
| 60 | + if (post_str('add_signature', true) == "add_it") { |
|
| 61 | + $add_signature = true; // set a flag and concatenate later |
|
| 62 | + } else { |
|
| 63 | 63 | $add_signature = false; |
| 64 | 64 | } |
| 65 | 65 | check_tokens($logged_in_user->authenticator); |
@@ -71,14 +71,14 @@ discard block |
||
| 71 | 71 | $title, $content, $logged_in_user, $forum, $add_signature, $export |
| 72 | 72 | ); |
| 73 | 73 | if ($thread) { |
| 74 | - header('Location: forum_thread.php?id=' . $thread->id); |
|
| 74 | + header('Location: forum_thread.php?id='.$thread->id); |
|
| 75 | 75 | } else { |
| 76 | 76 | error_page("Can't create thread. $forum_error"); |
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | -page_head(tra("Create new thread"),'','','', $bbcode_js); |
|
| 81 | +page_head(tra("Create new thread"), '', '', '', $bbcode_js); |
|
| 82 | 82 | show_forum_header($logged_in_user); |
| 83 | 83 | |
| 84 | 84 | if ($warning) { |
@@ -119,12 +119,12 @@ discard block |
||
| 119 | 119 | $submit_help = "<br /><font color=\"red\">".tra("Remember to add a title")."</font>"; |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | -if ($force_title && $title){ |
|
| 122 | +if ($force_title && $title) { |
|
| 123 | 123 | row2(tra("Title"), htmlspecialchars($title)."<input type=\"hidden\" name=\"title\" value=\"".htmlspecialchars($title)."\">"); |
| 124 | 124 | } else { |
| 125 | 125 | row2(tra("Title").$submit_help, |
| 126 | 126 | sprintf('<input type="text" class="form-control" name="title" value="%s">', |
| 127 | - $title?htmlspecialchars($title):'' |
|
| 127 | + $title ?htmlspecialchars($title) : '' |
|
| 128 | 128 | ) |
| 129 | 129 | ); |
| 130 | 130 | } |
@@ -134,14 +134,14 @@ discard block |
||
| 134 | 134 | echo $bbcode_html; |
| 135 | 135 | end_table(); |
| 136 | 136 | echo sprintf('<textarea class="form-control" name="content" rows="12" cols="80">%s</textarea>', |
| 137 | - $content?htmlspecialchars($content):'' |
|
| 137 | + $content ?htmlspecialchars($content) : '' |
|
| 138 | 138 | ); |
| 139 | 139 | echo "</td></tr>"; |
| 140 | 140 | |
| 141 | 141 | if (!$logged_in_user->prefs->no_signature_by_default) { |
| 142 | - $enable_signature="checked=\"true\""; |
|
| 142 | + $enable_signature = "checked=\"true\""; |
|
| 143 | 143 | } else { |
| 144 | - $enable_signature=""; |
|
| 144 | + $enable_signature = ""; |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | if (is_news_forum($forum)) { |
@@ -157,5 +157,5 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | page_tail(); |
| 159 | 159 | |
| 160 | -$cvs_version_tracker[]="\$Id$"; |
|
| 160 | +$cvs_version_tracker[] = "\$Id$"; |
|
| 161 | 161 | ?> |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | $offset = get_int("offset", true); |
| 35 | -if (!$offset) $offset=0; |
|
| 35 | +if (!$offset) $offset = 0; |
|
| 36 | 36 | |
| 37 | 37 | if ($offset > 1000) { |
| 38 | 38 | error_page(tra("Limit exceeded: Can only display the first 1000 members.")); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | function show_forum_rss_item($thread, $userid, $threads_only, $no_images) { |
| 33 | - $unique_url=secure_url_base()."forum_thread.php?id=".$thread->id; |
|
| 33 | + $unique_url = secure_url_base()."forum_thread.php?id=".$thread->id; |
|
| 34 | 34 | |
| 35 | 35 | $clause2 = " and hidden=0 "; |
| 36 | 36 | if ($userid) $clause2 .= "and user=$userid"; |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | if (!count($posts)) return; |
| 43 | 43 | $post = $posts[0]; |
| 44 | - $post_date = gmdate('D, d M Y H:i:s',$post->timestamp).' GMT'; |
|
| 44 | + $post_date = gmdate('D, d M Y H:i:s', $post->timestamp).' GMT'; |
|
| 45 | 45 | $post_user = BOincUser::lookup_id($post->user); |
| 46 | 46 | BoincForumPrefs::lookup($post_user); |
| 47 | 47 | $options = new output_options(); |
@@ -84,25 +84,25 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | // Now construct header |
| 86 | 86 | // |
| 87 | - header ("Expires: " . gmdate('D, d M Y H:i:s', time()+86400) . " GMT"); |
|
| 87 | + header("Expires: ".gmdate('D, d M Y H:i:s', time() + 86400)." GMT"); |
|
| 88 | 88 | if (sizeof($threads)) { |
| 89 | 89 | $t = $threads[0]; |
| 90 | - $last_mod_time = $threads_only?$t->create_time:$t->timestamp; |
|
| 91 | - $create_date = gmdate('D, d M Y H:i:s', $last_mod_time) . ' GMT'; |
|
| 92 | - header ("Last-Modified: " . $create_date); |
|
| 90 | + $last_mod_time = $threads_only ? $t->create_time : $t->timestamp; |
|
| 91 | + $create_date = gmdate('D, d M Y H:i:s', $last_mod_time).' GMT'; |
|
| 92 | + header("Last-Modified: ".$create_date); |
|
| 93 | 93 | } else { |
| 94 | - $create_date = gmdate('D, d M Y H:i:s') . ' GMT'; |
|
| 94 | + $create_date = gmdate('D, d M Y H:i:s').' GMT'; |
|
| 95 | 95 | } |
| 96 | - header ("Content-Type: application/xml"); |
|
| 96 | + header("Content-Type: application/xml"); |
|
| 97 | 97 | |
| 98 | - $forum=BoincForum::lookup_id($forumid); |
|
| 98 | + $forum = BoincForum::lookup_id($forumid); |
|
| 99 | 99 | // Create channel header and open XML content |
| 100 | 100 | // |
| 101 | 101 | $description = PROJECT.": $forum->title"; |
| 102 | 102 | if ($userid) { |
| 103 | 103 | $description .= " (posts by $user->name)"; |
| 104 | 104 | } |
| 105 | - $channel_image = secure_url_base() . "rss_image.gif"; |
|
| 105 | + $channel_image = secure_url_base()."rss_image.gif"; |
|
| 106 | 106 | $language = "en-us"; |
| 107 | 107 | echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> |
| 108 | 108 | <rss version=\"2.0\"> |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | $dh = opendir($langdir.$transdir); |
| 65 | 65 | if (!$dh) die("can't open translation dir"); |
| 66 | 66 | while (($file = readdir($dh)) !== false) { |
| 67 | - if ($file==".." || $file==".") { |
|
| 67 | + if ($file == ".." || $file == ".") { |
|
| 68 | 68 | continue; |
| 69 | 69 | } |
| 70 | 70 | // only do files ending in .po |
| 71 | - if (substr($file,-3) != ".po"){ |
|
| 71 | + if (substr($file, -3) != ".po") { |
|
| 72 | 72 | //debug("File $file with unknown extension found in $info_dir"); |
| 73 | 73 | continue; |
| 74 | 74 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | "-------------Compiling $transdir$file------------", 0 |
| 77 | 77 | ); |
| 78 | 78 | $language = parse_po_file($langdir.$transdir.$file); |
| 79 | - if (!$language){ |
|
| 79 | + if (!$language) { |
|
| 80 | 80 | language_log( |
| 81 | 81 | "WARNING: Could not parse language ".$file |
| 82 | 82 | ); |
@@ -95,10 +95,10 @@ discard block |
||
| 95 | 95 | ); |
| 96 | 96 | exit; |
| 97 | 97 | } |
| 98 | - foreach ($language as $key => $value){ |
|
| 98 | + foreach ($language as $key => $value) { |
|
| 99 | 99 | if ($value !== "") { |
| 100 | 100 | // Skip if the msgstr is empty |
| 101 | - fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n"); |
|
| 101 | + fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file, 0, -3))."\"][\"".$key."\"] = \"".$value."\";\n"); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | // don't write \?\> - may append |
@@ -115,27 +115,27 @@ discard block |
||
| 115 | 115 | function parse_po_file($file) { |
| 116 | 116 | $translation_file = file($file); |
| 117 | 117 | $first_entry = true; |
| 118 | - $current_token_text=""; |
|
| 119 | - $current_token =""; |
|
| 118 | + $current_token_text = ""; |
|
| 119 | + $current_token = ""; |
|
| 120 | 120 | $parsing_token = false; |
| 121 | 121 | $parsing_text = false; |
| 122 | 122 | $size = sizeof($translation_file); |
| 123 | 123 | $output = array(); |
| 124 | - for ($i=0; $i<$size; $i++){ |
|
| 124 | + for ($i = 0; $i < $size; $i++) { |
|
| 125 | 125 | $entry = trim($translation_file[$i]); |
| 126 | 126 | //echo "line $i: $entry\n"; |
| 127 | - if (substr($entry, 0, 1)=="#") { |
|
| 127 | + if (substr($entry, 0, 1) == "#") { |
|
| 128 | 128 | continue; |
| 129 | 129 | } elseif (strpos($entry, "msgid") !== false) { |
| 130 | - if (!$first_entry){ |
|
| 130 | + if (!$first_entry) { |
|
| 131 | 131 | //If this is not the first, save the previous entry |
| 132 | - $output[$current_token]=$current_token_text; |
|
| 132 | + $output[$current_token] = $current_token_text; |
|
| 133 | 133 | } |
| 134 | 134 | $current_token = get_po_line($entry, $file); |
| 135 | - $current_token_text=""; |
|
| 135 | + $current_token_text = ""; |
|
| 136 | 136 | $parsing_token = true; |
| 137 | 137 | $parsing_text = false; |
| 138 | - $first_entry=false; |
|
| 138 | + $first_entry = false; |
|
| 139 | 139 | } elseif (strpos($entry, "msgstr") !== false) { |
| 140 | 140 | $current_token_text = get_po_line($entry, $file); |
| 141 | 141 | $parsing_token = false; |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | // Get the last token |
| 151 | 151 | // |
| 152 | - if ($current_token && $current_token_text){ |
|
| 152 | + if ($current_token && $current_token_text) { |
|
| 153 | 153 | $output[$current_token] = $current_token_text; |
| 154 | 154 | } |
| 155 | 155 | return $output; |
@@ -159,9 +159,9 @@ discard block |
||
| 159 | 159 | // Returns the contents of a line (ie removes "" from start and end) |
| 160 | 160 | // |
| 161 | 161 | function get_po_line($line, $file) { |
| 162 | - $start = strpos($line, '"')+1; |
|
| 162 | + $start = strpos($line, '"') + 1; |
|
| 163 | 163 | $stop = strrpos($line, '"'); |
| 164 | - $x = substr($line, $start, $stop-$start); |
|
| 164 | + $x = substr($line, $start, $stop - $start); |
|
| 165 | 165 | $n = preg_match("/[^\\\\]\"/", $x); |
| 166 | 166 | if ($n) { |
| 167 | 167 | echo "ERROR - MISMATCHED QUOTES IN $file: $line\n"; |
@@ -180,11 +180,11 @@ discard block |
||
| 180 | 180 | |
| 181 | 181 | // Find the string in the user's language |
| 182 | 182 | // |
| 183 | - foreach ($languages_in_use as $language){ |
|
| 183 | + foreach ($languages_in_use as $language) { |
|
| 184 | 184 | if (isset($language_lookup_array[$language][$text])) { |
| 185 | 185 | $text = $language_lookup_array[$language][$text]; |
| 186 | 186 | break; |
| 187 | - } else if ($language=="en"){ |
|
| 187 | + } else if ($language == "en") { |
|
| 188 | 188 | // This language is defined in the code and is always available |
| 189 | 189 | break; |
| 190 | 190 | } |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | // Replace relevant substrings with given arguments. |
| 194 | 194 | // Use strtr to avoid problems if an argument contains %n. |
| 195 | 195 | $replacements = array(); |
| 196 | - for ($i=1; $i<func_num_args(); $i++){ |
|
| 196 | + for ($i = 1; $i < func_num_args(); $i++) { |
|
| 197 | 197 | $replacements["%".$i] = func_get_arg($i); |
| 198 | 198 | } |
| 199 | 199 | |
@@ -210,14 +210,14 @@ discard block |
||
| 210 | 210 | return $text; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | -function language_log($message, $loglevel=0) { |
|
| 213 | +function language_log($message, $loglevel = 0) { |
|
| 214 | 214 | global $lang_log_level; |
| 215 | 215 | $msg = ""; |
| 216 | - if ($loglevel==0) $msg = "[ Debug ]"; |
|
| 217 | - if ($loglevel==1) $msg = "[ Warning ]"; |
|
| 218 | - if ($loglevel==2) $msg = "[ CRITICAL ]"; |
|
| 216 | + if ($loglevel == 0) $msg = "[ Debug ]"; |
|
| 217 | + if ($loglevel == 1) $msg = "[ Warning ]"; |
|
| 218 | + if ($loglevel == 2) $msg = "[ CRITICAL ]"; |
|
| 219 | 219 | |
| 220 | - if ($loglevel >= $lang_log_level){ |
|
| 220 | + if ($loglevel >= $lang_log_level) { |
|
| 221 | 221 | echo gmdate("Y-m-d H:i:s", time())." ".$msg." ".$message."\n"; |
| 222 | 222 | } |
| 223 | 223 | } |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | // (by looking at cookies and browser settings) |
| 227 | 227 | // cookies have highest priority. |
| 228 | 228 | |
| 229 | -if (isset($_COOKIE['lang'])){ |
|
| 229 | +if (isset($_COOKIE['lang'])) { |
|
| 230 | 230 | $language_string = $_COOKIE['lang'].","; |
| 231 | 231 | } else { |
| 232 | 232 | $language_string = ''; |
@@ -257,10 +257,10 @@ discard block |
||
| 257 | 257 | // Loop over languages that the client requests |
| 258 | 258 | // |
| 259 | 259 | $size = sizeof($client_languages); |
| 260 | -for ($i=0; $i<$size; $i++) { |
|
| 261 | - if ((strlen($client_languages[$i])>2) |
|
| 260 | +for ($i = 0; $i < $size; $i++) { |
|
| 261 | + if ((strlen($client_languages[$i]) > 2) |
|
| 262 | 262 | && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-") |
| 263 | - ){ |
|
| 263 | + ) { |
|
| 264 | 264 | // If this is defined as primary-secondary, represent it as xx_YY |
| 265 | 265 | // |
| 266 | 266 | $language = substr( |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | |
| 280 | 280 | // if main language is english, look no further |
| 281 | 281 | // |
| 282 | - if ((count($languages_in_use)==0) && ($language == 'en' || $language2 == 'en')) { |
|
| 282 | + if ((count($languages_in_use) == 0) && ($language == 'en' || $language2 == 'en')) { |
|
| 283 | 283 | break; |
| 284 | 284 | } |
| 285 | 285 | |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | // |
| 288 | 288 | $file_name = $lang_language_dir.$lang_compiled_dir.$language.".po.inc"; |
| 289 | 289 | if (file_exists($file_name)) { |
| 290 | - if (!in_array($language, $languages_in_use)){ |
|
| 290 | + if (!in_array($language, $languages_in_use)) { |
|
| 291 | 291 | require_once($file_name); |
| 292 | 292 | $languages_in_use[] = $language; |
| 293 | 293 | } |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | if ($language2) { |
| 296 | 296 | $file_name = $lang_language_dir.$lang_compiled_dir.$language2.".po.inc"; |
| 297 | 297 | if (file_exists($file_name)) { |
| 298 | - if (!in_array($language2, $languages_in_use)){ |
|
| 298 | + if (!in_array($language2, $languages_in_use)) { |
|
| 299 | 299 | require_once($file_name); |
| 300 | 300 | $languages_in_use[] = $language2; |
| 301 | 301 | } |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | } |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | -$GLOBALS['languages_in_use'] = $languages_in_use; // for Drupal |
|
| 306 | +$GLOBALS['languages_in_use'] = $languages_in_use; // for Drupal |
|
| 307 | 307 | |
| 308 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
| 308 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
| 309 | 309 | ?> |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | "Zimbabwe" |
| 258 | 258 | ); |
| 259 | 259 | |
| 260 | -$country_to_iso3166_2 = array ( |
|
| 260 | +$country_to_iso3166_2 = array( |
|
| 261 | 261 | "Afghanistan" => "af", |
| 262 | 262 | "Albania" => "al", |
| 263 | 263 | "Algeria" => "dz", |
@@ -493,25 +493,25 @@ discard block |
||
| 493 | 493 | |
| 494 | 494 | // return a list of country options for a <select> |
| 495 | 495 | // |
| 496 | -function country_select_options($selected_country="None") { |
|
| 496 | +function country_select_options($selected_country = "None") { |
|
| 497 | 497 | global $countries; |
| 498 | 498 | |
| 499 | 499 | require_once("../inc/geoip.inc"); |
| 500 | 500 | |
| 501 | 501 | // See if we can find the user's country and select it as default: |
| 502 | 502 | // |
| 503 | - $gi = geoip_open("../inc/GeoIP.dat",GEOIP_STANDARD); |
|
| 504 | - $geoip_country = geoip_country_name_by_addr($gi,$_SERVER["REMOTE_ADDR"]); |
|
| 503 | + $gi = geoip_open("../inc/GeoIP.dat", GEOIP_STANDARD); |
|
| 504 | + $geoip_country = geoip_country_name_by_addr($gi, $_SERVER["REMOTE_ADDR"]); |
|
| 505 | 505 | geoip_close($gi); |
| 506 | 506 | |
| 507 | - if ($selected_country=="") $selected_country="None"; |
|
| 508 | - if ($selected_country=="None" and $geoip_country!=""){ |
|
| 509 | - $selected_country=$geoip_country; |
|
| 507 | + if ($selected_country == "") $selected_country = "None"; |
|
| 508 | + if ($selected_country == "None" and $geoip_country != "") { |
|
| 509 | + $selected_country = $geoip_country; |
|
| 510 | 510 | } |
| 511 | 511 | |
| 512 | 512 | $x = ""; |
| 513 | 513 | foreach ($countries as $country) { |
| 514 | - $selected = ($selected_country == $country ? "selected":""); |
|
| 514 | + $selected = ($selected_country == $country ? "selected" : ""); |
|
| 515 | 515 | $x .= "<option value=\"$country\" $selected>$country</option>\n"; |
| 516 | 516 | } |
| 517 | 517 | return $x; |