Merge branch 'master' of https://github.com/BOINC/boinc

Author: davidpanderson

client/cs_scheduler.cpp

@@ -679,10 +679,20 @@ int CLIENT_STATE::handle_scheduler_reply(
     // insert extra elements, write to disk, and parse
     //
     if (sr.global_prefs_xml) {
-        // skip this if we have host-specific prefs
-        // and we're talking to an old scheduler
-        //
-        if (!global_prefs.host_specific || sr.scheduler_version >= 507) {
+        if (gstate.acct_mgr_info.using_am()
+            // ignore prefs if we're using prefs from account mgr
+            //
+            && !strcmp(global_prefs.source_project, gstate.acct_mgr_info.master_url)
+        ) {
+            if (log_flags.sched_op_debug) {
+                msg_printf(project, MSG_INFO,
+                    "ignoring prefs from project; using prefs from AM"
+                );
+            }
+        } else if (!global_prefs.host_specific || sr.scheduler_version >= 507) {
+            // ignore prefs if we have host-specific prefs
+            // and we're talking to an old scheduler
+            //
             retval = save_global_prefs(
                 sr.global_prefs_xml, project->master_url, scheduler_url
             );

drupal/sites/default/boinc/modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.module

@@ -107,7 +107,7 @@ function boinc_solr_comments_apachesolr_index_documents_alter(array &$documents,
 
         $comment_document->entity_id = $comment->cid;
         $comment_document->entity_type = 'comment';
-        $comment_document->bundle = 'comment';
+        $comment_document->bundle = 'Comment';
         $comment_document->bundle_name = 'Comment';
 
         $comment_document->path = 'goto/comment/' . $comment->cid;

html/inc/account.inc

@@ -19,6 +19,7 @@
 // forms for account creation and login
 
 function create_account_form($teamid, $next_url) {
+    global $recaptcha_public_key;
     echo "
         <form action=\"create_account_action.php\" method=\"post\">
         <input type=hidden name=next_url value=\"$next_url\">
@@ -75,13 +76,12 @@ function create_account_form($teamid, $next_url) {
         );
     }
 
-    // Check if we're reCaptcha to prevent spam accounts
+    // Check if we're using reCaptcha to prevent spam accounts
     //
-    $publickey = parse_config(get_config(), "<recaptcha_public_key>");
-    if ($publickey) {
+    if ($recaptcha_public_key) {
         row2(
             "",
-            boinc_recaptcha_get_html($publickey)
+            boinc_recaptcha_get_html($recaptcha_public_key)
         );
     }
 

html/inc/bootstrap.inc

@@ -79,18 +79,20 @@ function navbar_right($user) {
     ';
     if (!$is_login_page) {
         if ($user) {
-            echo '
-                <li><a href=home.php>'.$user->name.'</a></li>
-            ';
+            echo sprintf('
+                <li><a href=%shome.php>'.$user->name.'</a></li>
+                ', URL_BASE
+            );
             $url_tokens = url_tokens($user->authenticator);
-            echo '
-                <li><a href="logout.php?'.$url_tokens.'">Log out</a></li>
-            ';
+            echo sprintf('<li><a href="%slogout.php?%s">Log out</a></li>',
+                URL_BASE, $url_tokens
+            );
         } else {
-            echo '
-                <li><a href="create_account_form.php">Sign Up</a></li>
-                <li><a href="login_form.php">Login</a></li>
-            ';
+            echo sprintf('
+                <li><a href="%screate_account_form.php">Sign Up</a></li>
+                <li><a href="%slogin_form.php">Login</a></li>
+                ', URL_BASE, URL_BASE
+            );
         }
     }
 }

html/inc/recaptchalib.php

@@ -22,16 +22,15 @@
 require('../inc/recaptcha_loader.php');
 
 function boinc_recaptcha_get_head_extra() {
-    // are we using recaptcha?
-    $publickey = parse_config(get_config(), "<recaptcha_public_key>");
-    if ($publickey) {
+    global $recaptcha_public_key;
+    if ($recaptcha_public_key) {
         // the meta tag must be included
         // for Recaptcha to work with some IE browsers
         return '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" >
-        <script src="https://www.google.com/recaptcha/api.js" async defer></script>';
-    } else {
-        return null;
+        <script src="https://www.google.com/recaptcha/api.js?ver=2" async defer></script>
+        ';
     }
+    return "";
 }
 
 function boinc_recaptcha_get_html($publickey) {
@@ -56,4 +55,4 @@ function boinc_recaptcha_isValidated($privatekey) {
     return true;
 }
 
-?>
+?>

html/inc/util.inc

@@ -31,7 +31,13 @@ require_once("../inc/translation.inc");
 require_once("../inc/profile.inc");
 require_once("../inc/bootstrap.inc");
 
-$master_url = parse_config(get_config(), "<master_url>");
+// parse some stuff from config (do it here for efficiency)
+//
+$config = get_config();
+$master_url = parse_config($config , "<master_url>");
+$no_computing =  parse_bool($config, "no_computing");
+$recaptcha_public_key = parse_config($config, "<recaptcha_public_key>");
+$recaptcha_private_key = parse_config($config, "<recaptcha_private_key>");
 
 // don't allow /... at the end of URL
 
@@ -152,7 +158,7 @@ function get_logged_in_user($must_be_logged_in=true) {
             }
         }
         $next_url = urlencode($next_url);
-        Header("Location: login_form.php?next_url=$next_url");
+        Header("Location: ".URL_BASE."login_form.php?next_url=$next_url");
         exit;
     }
     $got_logged_in_user = true;
@@ -533,7 +539,8 @@ function check_tokens($auth) {
 }
 
 function no_computing() {
-    return parse_bool(get_config(), "no_computing");
+    global $no_computing;
+    return $no_computing;
 }
 
 // Generates a legal filename from a parameter string.

lib/boinc_win.h

@@ -31,11 +31,13 @@
 #pragma warning(disable: 4244)  // conversion from int to char
 #define getpid _getpid
 #define getcwd      _getcwd
-#define snprintf _snprintf
 #define strdate     _strdate
 #define strdup _strdup
 #define stricmp     _stricmp
 #define strtime     _strtime
+#if _MSC_VER < 1900
+#define snprintf _snprintf
+#endif
 #endif
 
 #ifndef HAVE_CONFIG_H