BOINC / boinc

html/inc/bootstrap.inc

Spacing +17 added lines, -17 removed lines

@@ -141,12 +141,12 @@ 
         // prefix for links; needed for pages not in top dir
     $user,
         // logged-in user, if any
-    $fixed=false,
+    $fixed = false,
         // if true, navbar is fixed at top of page.
         // NOTE: if you do this, you must set a global var $fixed_navbar
         // to true at compile time
         // (it needs to be set when page_head() is called).
-    $inverse=false
+    $inverse = false
         // white on black?
 ) {
     global $master_url;
@@ -214,7 +214,7 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
-function panel($title, $content_func, $class="panel-primary", $body_class="") {
+function panel($title, $content_func, $class = "panel-primary", $body_class = "") {
     echo sprintf('<div class="panel %s">
         ', $class
     );
@@ -240,7 +240,7 @@ 
 // are functions that generate the top, left, and right content
 // $left_width is the width of left column in 1/12 units.
 //
-function grid($top_func, $left_func, $right_func, $left_width=6) {
+function grid($top_func, $left_func, $right_func, $left_width = 6) {
     echo '
         <div class="container-fluid">
     ';
@@ -255,7 +255,7 @@ 
             </div>
         ';
     }
-    $right_width = 12-$left_width;
+    $right_width = 12 - $left_width;
     echo '
         <div class="row">
         <div class="col-sm-'.$left_width.'">
@@ -279,7 +279,7 @@ 
 //      use extra = "name=x"
 //      call forum_focus(x, foo) after defining the field
 //
-function form_start($action, $method='get', $extra='') {
+function form_start($action, $method = 'get', $extra = '') {
     echo sprintf(
         '<div class="container-fluid">
         <form class="form-horizontal" method="%s" action="%s" %s>'
@@ -311,7 +311,7 @@ 
 // just the input field
 //
 function form_input_text_field(
-    $name, $value='', $type='text', $attrs='', $extra=''
+    $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     return sprintf(
         '<input %s type="%s" class="form-control" name="%s" value="%s">%s',
@@ -322,7 +322,7 @@ 
 // the whole row
 //
 function form_input_text(
-    $label, $name, $value='', $type='text', $attrs='', $extra=''
+    $label, $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     echo sprintf('
         <div class="form-group">
@@ -350,7 +350,7 @@ 
     );
 }
 
-function form_input_textarea($label, $name, $value='', $nrows=4) {
+function form_input_textarea($label, $name, $value = '', $nrows = 4) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -400,7 +400,7 @@ 
     );
     $n = 0;
     foreach ($items as $i) {
-        $s = ($flags && $flags[$n])?'selected':'';
+        $s = ($flags && $flags[$n]) ? 'selected' : '';
         echo '<option '.$s.' value="'.$i[0].'">'.$i[1].'</option>
         ';
         $n++;
@@ -410,12 +410,12 @@ 
 
 // return a list of string for checkbox items
 //
-function checkbox_item_strings($items, $attrs='') {
+function checkbox_item_strings($items, $attrs = '') {
     $x = [];
     foreach ($items as $i) {
         $x[] = sprintf('<input %s type="checkbox" name="%s" %s> %s
             ',
-            $attrs, $i[0], $i[2]?"checked":"", $i[1]
+            $attrs, $i[0], $i[2] ? "checked" : "", $i[1]
         );
     }
     return $x;
@@ -423,7 +423,7 @@ 
 
 // $items is list of (name, label, checked)
 //
-function form_checkboxes($label, $items, $attrs='') {
+function form_checkboxes($label, $items, $attrs = '') {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s">%s</label>
@@ -449,7 +449,7 @@ 
         FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS
     );
     foreach ($items as $i) {
-        $checked = ($selected == $i[0])?"checked":"";
+        $checked = ($selected == $i[0]) ? "checked" : "";
         echo sprintf('<input type="radio" name="%s" value="%s" %s> %s <br>
             ',
             $name, $i[0], $checked, $i[1]
@@ -482,7 +482,7 @@ 
 ';
 }
 
-function form_submit($text, $attrs='') {
+function form_submit($text, $attrs = '') {
     form_general(
         "",
         sprintf('<button %s type="submit" class="btn btn-success">%s</button>',
@@ -491,11 +491,11 @@ 
     );
 }
 
-function form_checkbox($label, $name, $checked=false) {
+function form_checkbox($label, $name, $checked = false) {
     echo sprintf('
         <div class="form-group">
             <input type="checkbox" name="%s" %s> &nbsp; <span class="lead">%s</span>
         </div>
-        ', $name, $checked?"checked":"", $label
+        ', $name, $checked ? "checked" : "", $label
     );
 }

html/inc/util.inc

Spacing +76 added lines, -76 removed lines

@@ -37,17 +37,17 @@ 
 //
 $config = get_config();
 global $master_url;
-$master_url = parse_config($config , "<master_url>");
+$master_url = parse_config($config, "<master_url>");
 $recaptcha_public_key = parse_config($config, "<recaptcha_public_key>");
 $recaptcha_private_key = parse_config($config, "<recaptcha_private_key>");
 
 // the following default to on
 //
 $x = parse_config($config, "<user_country>");
-define('USER_COUNTRY', ($x===null)?1:(int)$x);
+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
 
 $x = parse_config($config, "<user_url>");
-define('USER_URL', ($x===null)?1:(int)$x);
+define('USER_URL', ($x === null) ? 1 : (int)$x);
 
 // don't allow /... at the end of URL
 //
@@ -141,10 +141,10 @@ 
 }
 
 function url_base() {
-    return is_https()?secure_url_base():URL_BASE;
+    return is_https() ?secure_url_base() : URL_BASE;
 }
 
-function send_cookie($name, $value, $permanent, $ops=false) {
+function send_cookie($name, $value, $permanent, $ops = false) {
     global $master_url;
 
     // the following allows independent login for projects on the same server
@@ -155,11 +155,11 @@ 
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    $expire = $permanent?time()+3600*24*365:0;
+    $expire = $permanent ?time() + 3600*24*365 : 0;
     setcookie($name, $value, $expire, $path);
 }
 
-function clear_cookie($name, $ops=false) {
+function clear_cookie($name, $ops = false) {
     global $master_url;
     $url = parse_url($master_url);
     $path = $url['path'];
@@ -167,13 +167,13 @@ 
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    setcookie($name, '', time()-3600, $path);
+    setcookie($name, '', time() - 3600, $path);
 }
 
 $g_logged_in_user = null;
 $got_logged_in_user = false;
 
-function get_logged_in_user($must_be_logged_in=true) {
+function get_logged_in_user($must_be_logged_in = true) {
     global $g_logged_in_user, $got_logged_in_user;
     if ($got_logged_in_user) return $g_logged_in_user;
 
@@ -192,7 +192,7 @@ 
             $next_url = $_SERVER['REQUEST_URI'];
             $n = strrpos($next_url, "/");
             if ($n) {
-                $next_url = substr($next_url, $n+1);
+                $next_url = substr($next_url, $n + 1);
             }
         }
         $next_url = urlencode($next_url);
@@ -203,7 +203,7 @@ 
     return $g_logged_in_user;
 }
 
-function show_login_info($prefix="") {
+function show_login_info($prefix = "") {
     $user = get_logged_in_user(false);
     if ($user) {
         $url_tokens = url_tokens($user->authenticator);
@@ -213,7 +213,7 @@ 
     }
 }
 
-$cache_control_extra="";
+$cache_control_extra = "";
 $is_login_page = false;
 
 // Call this to start pages.
@@ -225,11 +225,11 @@ 
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in the project include file.
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
-    $body_attrs=null,
+    $body_attrs = null,
         // <body XXXX>
         // e.g. Javascript to put focus in an input field
         // (onload="document.form.foo.focus()")
@@ -238,10 +238,10 @@ 
         // if set, include schedulers.txt.
         // also pass to project_banner() in case you want a different
         // header for your main page.
-    $url_prefix="",
+    $url_prefix = "",
         // prepend this to links.
         // Use for web pages not in the top directory
-    $head_extra=null
+    $head_extra = null
         // extra stuff to put in <head>. E.g.:
         // reCAPTCHA code (create_profile.php)
         // bbcode javascript (forums)
@@ -263,7 +263,7 @@ 
         header("Content-type: text/html; charset=utf-8");
         header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
             // Date in the past
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
             // always modified
         header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
             // for HTTP/1.1
@@ -284,11 +284,11 @@ 
     if ($head_extra) {
         echo "\n$head_extra\n";
     }
-    if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) {
+    if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) {
         readfile("schedulers.txt");
     }
 
-    $t = $title?$title:PROJECT;
+    $t = $title ? $title : PROJECT;
     echo "<title>$t</title>\n";
     echo '
         <meta charset="utf-8">
@@ -345,7 +345,7 @@ 
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch ($title) {    //kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -360,13 +360,13 @@ 
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
-    $show_date=false,
+    $show_date = false,
         // true for pages that are generated periodically rather than on the fly
-    $url_prefix="",
+    $url_prefix = "",
         // use for pages not at top level
-    $is_main=false
+    $is_main = false
         // passed to project_footer;
 ) {
     echo "<br>\n";
@@ -381,10 +381,10 @@ 
 }
 }
 
-function display_cvs_versions(){
+function display_cvs_versions() {
     global $cvs_version_tracker;
     echo "\n<!-- SVN VERSIONS -->\n";
-    for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
+    for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) {
         echo "<!-- ".$cvs_version_tracker[$i]." -->\n";
     }
 }
@@ -409,23 +409,23 @@ 
 // takes argument in second and returns a human formatted time string
 // in the form D days + h Hours + m Min + s sec.
 
-function time_diff($x, $res=3) {
+function time_diff($x, $res = 3) {
     $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = (int)($x % 60);
+    $hours   = (int)(($x - $days*86400)/3600);
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
+    $seconds = (int)($x%60);
 
     $datestring = "";
     if ($days) {
         $datestring .= "$days ".tra("days")." ";
     }
-    if ($res>0 && ($hours || strlen($datestring))) {
+    if ($res > 0 && ($hours || strlen($datestring))) {
         $datestring .= "$hours ".tra("hours")." ";
     }
-    if ($res>1 && ($minutes || strlen($datestring))) {
+    if ($res > 1 && ($minutes || strlen($datestring))) {
         $datestring .= "$minutes ".tra("min")." ";
     }
-    if ($res>2 && ($seconds)) {
+    if ($res > 2 && ($seconds)) {
         $datestring .= "$seconds ".tra("sec")." ";
     }
 
@@ -440,7 +440,7 @@ 
 
 function time_str($x) {
     if ($x == 0) return "---";
-    return gmdate('j M Y, G:i:s', $x) . " UTC";
+    return gmdate('j M Y, G:i:s', $x)." UTC";
 }
 
 function local_time_str($x) {
@@ -452,14 +452,14 @@ 
     return time_str($x);
 }
 
-function start_table_str($class="", $style="") {
-    $s = $style?'style="'.$style.'"':'';
+function start_table_str($class = "", $style = "") {
+    $s = $style ? 'style="'.$style.'"' : '';
     return '<div class="table">
       <table '.$s.' width="100%" class="table table-condensed '.$class.'" >
     ';
 }
 
-function start_table($class="", $style="") {
+function start_table($class = "", $style = "") {
     echo start_table_str($class, $style);
 }
 
@@ -504,7 +504,7 @@ 
     echo "</tr>\n";
 }
 
-function row1($x, $ncols=2, $class="heading") {
+function row1($x, $ncols = 2, $class = "heading") {
     if ($class == "heading") {
         echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
     } else {
@@ -516,10 +516,10 @@ 
 define('VALUE_ATTRS', 'style="padding-left:12px"');
 define('VALUE_ATTRS_ERR', 'class="danger" style="padding-left:12px"');
 
-function row2($x, $y, $show_error=false, $lwidth='40%') {
-    if ($x==="") $x="<br>";
-    if ($y==="") $y="<br>";
-    $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
+function row2($x, $y, $show_error = false, $lwidth = '40%') {
+    if ($x === "") $x = "<br>";
+    if ($y === "") $y = "<br>";
+    $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
     echo "<tr>
         <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
         <td $attrs >$y</td>
@@ -527,7 +527,7 @@ 
     ";
 }
 
-function row2_init($x, $y, $lwidth='40%') {
+function row2_init($x, $y, $lwidth = '40%') {
     echo '<tr>
         <td class="text-right " width="'.$lwidth.'"  style="padding-right: 20px;">'.$x.'</td>
         <td '.VALUE_ATTRS.'>'.$y.'
@@ -550,20 +550,20 @@ 
     echo "</tr>\n";
 }
 
-define ('ALIGN_RIGHT', 'style="text-align:right;"');
+define('ALIGN_RIGHT', 'style="text-align:right;"');
 
-function row_heading_array($x, $attrs=null, $class='bg-primary') {
+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
     echo "<tr>";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<th $a class=\"$class\">$h</th>";
         $i++;
     }
     echo "</tr>\n";
 }
 
-function row_heading($x, $class='bg-primary') {
+function row_heading($x, $class = 'bg-primary') {
     echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
         ', $class, $x
     );
@@ -623,7 +623,7 @@ 
 // If $ellipsis is true, then an ellipsis is added to any sentence which
 // is cut short.
 
-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
     $words = explode($delimiter, $sentence);
     $total_chars = 0;
     $trunc = false;
@@ -706,8 +706,8 @@ 
 
 // returns null if the arg is optional and missing
 //
-function get_int($name, $optional=false) {
-    $x=null;
+function get_int($name, $optional = false) {
+    $x = null;
     if (isset($_GET[$name])) $x = $_GET[$name];
     if (!is_numeric($x)) {
         if ($optional) {
@@ -726,7 +726,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_num($name, $optional=false) {
+function post_num($name, $optional = false) {
     $x = null;
     if (isset($_POST[$name])) $x = $_POST[$name];
     if (!is_numeric($x)) {
@@ -741,7 +741,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_int($name, $optional=false) {
+function post_int($name, $optional = false) {
     $x = post_num($name, $optional);
     if (is_null($x)) return null;
     $y = (int)$x;
@@ -759,7 +759,7 @@ 
     }
 }
 
-function get_str($name, $optional=false) {
+function get_str($name, $optional = false) {
     if (isset($_GET[$name])) {
         $x = $_GET[$name];
     } else {
@@ -771,7 +771,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_str($name, $optional=false) {
+function post_str($name, $optional = false) {
     if (isset($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -783,7 +783,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_arr($name, $optional=false) {
+function post_arr($name, $optional = false) {
     if (isset($_POST[$name]) && is_array($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -799,7 +799,7 @@ 
     // the mb_* functions are not included by default
     // return (mb_detect_encoding($passwd) -= 'ASCII');
 
-    for ($i=0; $i<strlen($str); $i++) {
+    for ($i = 0; $i < strlen($str); $i++) {
         $c = ord(substr($str, $i));
         if ($c < 32 || $c > 127) return false;
     }
@@ -823,7 +823,7 @@ 
     $number = str_replace(',', '.', $number); // replace the german decimal separator
     // if no value was entered and this is ok
     //
-    if ($number=='' && !$low) return true;
+    if ($number == '' && !$low) return true;
 
     // the supplied value contains alphabetic characters
     //
@@ -840,7 +840,7 @@ 
 
 // Generate a "select" element from an array of values
 //
-function select_from_array($name, $array, $selection=null, $width=240) {
+function select_from_array($name, $array, $selection = null, $width = 240) {
     $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
 
     foreach ($array as $key => $value) {
@@ -865,8 +865,8 @@ 
     return $str;
 }
 
-function strip_bbcode($string){
-    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
+function strip_bbcode($string) {
+    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
 }
 
 function current_url() {
@@ -894,7 +894,7 @@ 
 // @param class The optional CSS class of the button. Defaults to a standard button
 //
 
-function button_text($url, $text, $desc=null, $class="btn-success btn-sm") {
+function button_text($url, $text, $desc = null, $class = "btn-success btn-sm") {
     if (!$desc) {
         $desc = $text;
     }
@@ -903,19 +903,19 @@ 
     );
 }
 
-function show_button($url, $text, $desc=null, $class="btn-success btn-sm") {
+function show_button($url, $text, $desc = null, $class = "btn-success btn-sm") {
     echo button_text($url, $text, $desc, $class);
 }
 
 // for places with a bunch of buttons, like forum posts
 //
-function show_button_small($url, $text, $desc=null) {
+function show_button_small($url, $text, $desc = null) {
     echo button_text($url, $text, $desc, "btn-primary btn-xs");
 }
 
 // used for showing icons
 //
-function show_image($src, $title, $alt, $height=null) {
+function show_image($src, $title, $alt, $height = null) {
     $h = "";
     if ($height) {
         $h = "height=\"$height\"";
@@ -952,7 +952,7 @@ 
 // tries instead to connect to <replica_db_host> if tag exists.
 // DEPRECATED - use boinc_db.inc
 //
-function db_init($try_replica=false) {
+function db_init($try_replica = false) {
     check_web_stopped();
     $retval = db_init_aux($try_replica);
     if ($retval == 1) {
@@ -1023,7 +1023,7 @@ 
 function sanitize_numeric($x) {
     if (is_numeric($x)) {
         return $x;
-    } else if (trim($x) == '' ) {
+    } else if (trim($x) == '') {
         return '';
     } else {
         return "not numeric";
@@ -1046,9 +1046,9 @@ 
     return $c/(200/24);
 }
 
-function do_download($path,$name="") {
-    if (strcmp($name,"") == 0) {
-        $name=basename($path);
+function do_download($path, $name = "") {
+    if (strcmp($name, "") == 0) {
+        $name = basename($path);
     }
     header('Content-Description: File Transfer');
     header('Content-Type: application/octet-stream');
@@ -1057,7 +1057,7 @@ 
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
-    header('Content-Length: ' . filesize($path));
+    header('Content-Length: '.filesize($path));
     flush();
     readfile($path);
 }
@@ -1106,10 +1106,10 @@ 
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
-    $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
+    $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
     if (preg_match($e, $x, $matches)) {
         return $matches[1]*10000 + $matches[2]*100 + $matches[3];
     }
@@ -1138,7 +1138,7 @@ 
     $rem_name = $name."_remaining";
     return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
         onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
-        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
+        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
     ;
 }
 
@@ -1168,7 +1168,7 @@ 
 // use the following around text with long lines,
 // to limit the width and make it more readable.
 //
-function text_start($width=640) {
+function text_start($width = 640) {
     echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
 }
 function text_end() {
@@ -1185,7 +1185,7 @@ 
 }
 
 function cert_filename() {
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
 }
 
 // if user hasn't validated their email addr, tell them to
@@ -1202,6 +1202,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/inc/keywords.inc

Spacing +61 added lines, -61 removed lines

@@ -24,72 +24,72 @@
 define('KW_CATEGORY_SCIENCE', 0);
 define('KW_CATEGORY_LOC', 1);
 
-define('KW_ASTRONOMY',      1);
-define('KW_SETI',           2);
-define('KW_PULSARS',        3);
-define('KW_GW',             4);
-define('KW_COSMOLOGY',      5);
-define('KW_PHYSICS',        6);
+define('KW_ASTRONOMY', 1);
+define('KW_SETI', 2);
+define('KW_PULSARS', 3);
+define('KW_GW', 4);
+define('KW_COSMOLOGY', 5);
+define('KW_PHYSICS', 6);
 define('KW_PARTICLE_PHYSICS', 7);
-define('KW_NANOSCIENCE',    8);
-define('KW_BIOMED',         9);
+define('KW_NANOSCIENCE', 8);
+define('KW_BIOMED', 9);
 define('KW_DRUG_DISCOVERY', 10);
-define('KW_PROTEINS',       11);
-define('KW_GENETICS',       12);
-define('KW_DISEASE',        13);
-define('KW_CANCER',         14);
-define('KW_MATH_CS',        15);
-define('KW_AI',             16);
-define('KW_OCEANIA',        17);
-define('KW_AUSTRALIA',      18);
+define('KW_PROTEINS', 11);
+define('KW_GENETICS', 12);
+define('KW_DISEASE', 13);
+define('KW_CANCER', 14);
+define('KW_MATH_CS', 15);
+define('KW_AI', 16);
+define('KW_OCEANIA', 17);
+define('KW_AUSTRALIA', 18);
 
-define('KW_EUROPE',         20);
-define('KW_GERMANY',        21);
-define('KW_ASIA',           22);
-define('KW_AMERICAS',       23);
-define('KW_US',             24);
-define('KW_UCB',            25);
-define('KW_AEI',            26);
-define('KW_CERN',           27);
-define('KW_UW',             28);
-define('KW_EARTH_SCI',      29);
-define('KW_SPAIN',          30);
-define('KW_SAN_JORGE',      31);
-define('KW_NUMBER_THEORY',  32);
-define('KW_CRYPTO',         33);
-define('KW_ENV_RESEARCH',   34);
-define('KW_CLIMATE',        35);
-define('KW_CZECH',          36);
+define('KW_EUROPE', 20);
+define('KW_GERMANY', 21);
+define('KW_ASIA', 22);
+define('KW_AMERICAS', 23);
+define('KW_US', 24);
+define('KW_UCB', 25);
+define('KW_AEI', 26);
+define('KW_CERN', 27);
+define('KW_UW', 28);
+define('KW_EARTH_SCI', 29);
+define('KW_SPAIN', 30);
+define('KW_SAN_JORGE', 31);
+define('KW_NUMBER_THEORY', 32);
+define('KW_CRYPTO', 33);
+define('KW_ENV_RESEARCH', 34);
+define('KW_CLIMATE', 35);
+define('KW_CZECH', 36);
 define('KW_CHARLES_PRAGUE', 37);
-define('KW_RECHENKRAFT',    38);
-define('KW_RHEINMAIN',      39);
-define('KW_HUNGARY',        40);
-define('KW_IRELAND',        41);
-define('KW_UC_DUBLIN',      42);
-define('KW_POLAND',         43);
-define('KW_RUSSIA',         44);
+define('KW_RECHENKRAFT', 38);
+define('KW_RHEINMAIN', 39);
+define('KW_HUNGARY', 40);
+define('KW_IRELAND', 41);
+define('KW_UC_DUBLIN', 42);
+define('KW_POLAND', 43);
+define('KW_RUSSIA', 44);
 define('KW_SW_STATE_RUSSIA', 45);
-define('KW_RAS',            46);
-define('KW_PRBB',           47);
-define('KW_UK',             48);
-define('KW_OXFORD',         49);
-define('KW_CHINA',          50);
-define('KW_U_DAYTON',       51);
-define('KW_WRIGHT_STATE',   52);
-define('KW_USC',            53);
-define('KW_FULLERTON',      54);
-define('KW_ARIZONA_STATE',  55);
-define('KW_U_ILLINOIS',     56);
-define('KW_U_WARSAW',       57);
-define('KW_RPI',            58);
-define('KW_INTERNATIONAL',  59);
-define('KW_UND',            60);
-define('KW_HOLLAND',        61);
-define('KW_CHEMISTRY',      62);
-define('KW_GAMES',          63);
-define('KW_VIRUS',          64);
-define('KW_FRANCE',         65);
-define('KW_CANADA',         66);
+define('KW_RAS', 46);
+define('KW_PRBB', 47);
+define('KW_UK', 48);
+define('KW_OXFORD', 49);
+define('KW_CHINA', 50);
+define('KW_U_DAYTON', 51);
+define('KW_WRIGHT_STATE', 52);
+define('KW_USC', 53);
+define('KW_FULLERTON', 54);
+define('KW_ARIZONA_STATE', 55);
+define('KW_U_ILLINOIS', 56);
+define('KW_U_WARSAW', 57);
+define('KW_RPI', 58);
+define('KW_INTERNATIONAL', 59);
+define('KW_UND', 60);
+define('KW_HOLLAND', 61);
+define('KW_CHEMISTRY', 62);
+define('KW_GAMES', 63);
+define('KW_VIRUS', 64);
+define('KW_FRANCE', 65);
+define('KW_CANADA', 66);
 
 $job_keywords = array();