cpp/openttd-patchpack/source Changeset - r25256:9aa975c3b919

Changeset - r25256:9aa975c3b919

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Patric Stout - 4 years ago 2021-04-23 10:55:09
truebrain@openttd.org

Add: ask for confirmation on admin actions in network games

2 files changed with 80 insertions and 6 deletions:

src/lang/english.txt

src/network/network_gui.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -2150,12 +2150,18 @@ STR_NETWORK_CLIENT_LIST_SPECTATORS @@
 STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_KICK                       :Kick
 STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_BAN                        :Ban
 STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_RESET                     :Delete
 STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_UNLOCK                    :Password unlock
 STR_NETWORK_CLIENT_LIST_ASK_CAPTION                             :{WHITE}Admin action
 STR_NETWORK_CLIENT_LIST_ASK_CLIENT_KICK                         :{YELLOW}Are you sure you want to kick player '{RAW_STRING}'?
 STR_NETWORK_CLIENT_LIST_ASK_CLIENT_BAN                          :{YELLOW}Are you sure you want to ban player '{RAW_STRING}'?
 STR_NETWORK_CLIENT_LIST_ASK_COMPANY_RESET                       :{YELLOW}Are you sure you want to delete company '{COMPANY}'?
 STR_NETWORK_CLIENT_LIST_ASK_COMPANY_UNLOCK                      :{YELLOW}Are you sure you want to reset the password of company '{COMPANY}'?
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectators
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Do not save the entered password

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -51,12 +51,15 @@ @@
 #include "../safeguards.h"
 static void ShowNetworkStartServerWindow();
 static void ShowNetworkLobbyWindow(NetworkGameList *ngl);
 static ClientID _admin_client_id = INVALID_CLIENT_ID; ///< For what client a confirmation window is open.
 static CompanyID _admin_company_id = INVALID_COMPANY; ///< For what company a confirmation window is open.
 /**
  * Visibility of the server. Public servers advertise, where private servers
  * do not.
  */
 static const StringID _server_visibility_dropdown[] = {
 	STR_NETWORK_SERVER_VISIBILITY_PRIVATE,
@@ @@ -1629,12 +1632,55 @@ enum DropDownAdmin { @@
 	DD_CLIENT_ADMIN_BAN,
 	DD_COMPANY_ADMIN_RESET,
 	DD_COMPANY_ADMIN_UNLOCK,
 };
 /**
  * Callback function for admin command to kick client.
  * @param w The window which initiated the confirmation dialog.
  * @param confirmed Iff the user pressed Yes.
  */
 static void AdminClientKickCallback(Window *w, bool confirmed)
+{
 	if (confirmed) NetworkServerKickClient(_admin_client_id, nullptr);
+}
 /**
  * Callback function for admin command to ban client.
  * @param w The window which initiated the confirmation dialog.
  * @param confirmed Iff the user pressed Yes.
  */
 static void AdminClientBanCallback(Window *w, bool confirmed)
+{
 	if (confirmed) NetworkServerKickOrBanIP(_admin_client_id, true, nullptr);
+}
 /**
  * Callback function for admin command to reset company.
  * @param w The window which initiated the confirmation dialog.
  * @param confirmed Iff the user pressed Yes.
  */
 static void AdminCompanyResetCallback(Window *w, bool confirmed)
+{
 	if (confirmed) {
 		if (NetworkCompanyHasClients(_admin_company_id)) return;
 		DoCommandP(0, CCA_DELETE | _admin_company_id << 16 | CRR_MANUAL << 24, 0, CMD_COMPANY_CTRL);
+	}
+}
 /**
  * Callback function for admin command to unlock company.
  * @param w The window which initiated the confirmation dialog.
  * @param confirmed Iff the user pressed Yes.
  */
 static void AdminCompanyUnlockCallback(Window *w, bool confirmed)
+{
 	if (confirmed) NetworkServerSetCompanyPassword(_admin_company_id, "", false);
+}
 /**
  * Button shown for either a company or client in the client-list.
+ *
  * These buttons are dynamic and strongly depends on which company/client
  * what buttons are available. This class allows dynamically creating them
  * as the current Widget system does not.
  */
@@ @@ -2008,35 +2054,57 @@ public: @@
 			case WID_CL_SERVER_VISIBILITY:
 				if (!_network_server) break;
 				_settings_client.network.server_advertise = (index != 0);
 				break;
 			case WID_CL_MATRIX:
 			case WID_CL_MATRIX: {
 				StringID text = STR_NULL;
 				QueryCallbackProc *callback = nullptr;
 				switch (index) {
 					case DD_CLIENT_ADMIN_KICK:
 						NetworkServerKickClient(this->dd_client_id, nullptr);
 						_admin_client_id = this->dd_client_id;
 						text = STR_NETWORK_CLIENT_LIST_ASK_CLIENT_KICK;
 						callback = AdminClientKickCallback;
 						SetDParamStr(0, NetworkClientInfo::GetByClientID(_admin_client_id)->client_name);
 						break;
 					case DD_CLIENT_ADMIN_BAN:
 						NetworkServerKickOrBanIP(this->dd_client_id, true, nullptr);
 						_admin_client_id = this->dd_client_id;
 						text = STR_NETWORK_CLIENT_LIST_ASK_CLIENT_BAN;
 						callback = AdminClientBanCallback;
 						SetDParamStr(0, NetworkClientInfo::GetByClientID(_admin_client_id)->client_name);
 						break;
 					case DD_COMPANY_ADMIN_RESET:
 						if (NetworkCompanyHasClients(this->dd_company_id)) break;
 						DoCommandP(0, CCA_DELETE | this->dd_company_id << 16 | CRR_MANUAL << 24, 0, CMD_COMPANY_CTRL);
 						_admin_company_id = this->dd_company_id;
 						text = STR_NETWORK_CLIENT_LIST_ASK_COMPANY_RESET;
 						callback = AdminCompanyResetCallback;
 						SetDParam(0, _admin_company_id);
 						break;
 					case DD_COMPANY_ADMIN_UNLOCK:
 						NetworkServerSetCompanyPassword(this->dd_company_id, "", false);
 						_admin_company_id = this->dd_company_id;
 						text = STR_NETWORK_CLIENT_LIST_ASK_COMPANY_UNLOCK;
 						callback = AdminCompanyUnlockCallback;
 						SetDParam(0, _admin_company_id);
 						break;
 					default:
 						NOT_REACHED();
+				}
 				assert(text != STR_NULL);
 				assert(callback != nullptr);
 				/* Always ask confirmation for all admin actions. */
 				ShowQuery(STR_NETWORK_CLIENT_LIST_ASK_CAPTION, text, this, callback);
 				break;
+			}
 			default:
 				NOT_REACHED();
+		}
 		this->SetDirty();

0 comments (0 inline, 0 general)