Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of boinc.berkeley.edu:boinc-v2

This commit is contained in:
David Anderson 2013-11-26 08:00:11 +00:00
parent 7aa64df475 7f12630cd2
commit 09036ce4db
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
html/user/create_account.php
View File

@ -34,6 +34,9 @@ $config = get_config();
if (parse_bool($config, "disable_account_creation")) {
xml_error(-208);
}
if (parse_bool($config, "disable_account_creation_rpc")) {
xml_error(-208);
}
if(defined('INVITE_CODES')) {
$invite_code = get_str("invite_code");

2
html/user/create_account_form.php
View File

@ -112,7 +112,7 @@ $publickey = parse_config($config, "<recaptcha_public_key>");
if ($publickey) {
row2(
tra("Please enter the words shown in the image"),
recaptcha_get_html($publickey)
recaptcha_get_html($publickey, null, true)
);
}

4
lib/gui_rpc_client_print.cpp
View File

@ -57,8 +57,8 @@ void DAILY_XFER_HISTORY::print() {
time_t t = dx.when*86400;
struct tm* tm = localtime(&t);
strftime(buf, sizeof(buf)-1, "%d-%b-%Y", tm);
printf("%s: %d bytes uploaded, %d bytes downloaded\n",
buf, (int)dx.up, (int)dx.down
printf("%s: %.0f bytes uploaded, %.0f bytes downloaded\n",
buf, dx.up, dx.down
);
}
}