0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:wesnoth/wesnoth-old

Browse source
This commit is contained in:
Alexander van Gessel 2014-02-05 00:26:41 +01:00
commit 4c567d903e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/campaign_server/campaign_server.cpp
View file

@ -591,6 +591,8 @@ namespace {
LOG_CS << "Upload aborted - incorrect passphrase.\n";
network::send_data(construct_error("Add-on rejected: The add-on already exists, and your passphrase was incorrect."), sock);
} else {
const time_t upload_ts = time(NULL);
// Warn admins in the log about reuploading add-ons whose names don't
// pass the addon_name_legal() whitelist check above.
@ -607,6 +609,7 @@ namespace {
if(campaign == NULL) {
campaign = &campaigns().add_child("campaign");
(*campaign)["original_timestamp"] = lexical_cast<std::string>(upload_ts);
}
(*campaign)["title"] = upload["title"];
@ -626,7 +629,7 @@ namespace {
if((*campaign)["downloads"].empty()) {
(*campaign)["downloads"] = 0;
}
(*campaign)["timestamp"] = lexical_cast<std::string>(time(NULL));
(*campaign)["timestamp"] = lexical_cast<std::string>(upload_ts);
int uploads = (*campaign)["uploads"].to_int() + 1;
(*campaign)["uploads"] = uploads;
@ -644,6 +647,7 @@ namespace {
data["description"] = (*campaign)["description"];
data["version"] = (*campaign)["version"];
data["timestamp"] = (*campaign)["timestamp"];
data["original_timestamp"] = (*campaign)["original_timestamp"];
data["icon"] = (*campaign)["icon"];
data["type"] = (*campaign)["type"];
(*campaign).clear_children("translation");