WebSVN – ALCASAR – Diff – /web/acc/admin/federation.php

 <?php
-// written by Alexandre BOUIJOUX
+// written by Alexandre BOUIJOUX (mainly) & Rexy
 /*******************
  * READ CONF FILES *
  ******************/
 define('CONF_FILE', '/usr/local/etc/alcasar.conf');
 	$l_delete		= "Supprimer";
 	$l_error_details	= "Détails des erreurs";
 	$l_field		= "Champ";
 	$l_go_network_conf_page	= "Allez sur la page de configuration réseau.";
 	$l_host_name		= "Nom d'hôte";
-	$l_hosts_settings	= "Paramètres de réplication des hôtes";
+	$l_hosts_settings	= "Paramètres de réplication des hôtes distants";
 	$l_import_ssh_key	= "Si cet ALCASAR est primaire, importez ici les clés publiques des secondaires";
 	$l_install_repl		= "Installer la fédération";
+	$l_remote_hosts		= "Hôtes distants";
 	$l_ip_address		= "Adresse IP";
 	$l_no_host_connected = "Aucun hote connecté";
 	$l_no_ssh_key		= "Aucune clé SSH importée.";
 	$l_not_connected	= "Non connecté";
 	$l_pubkey_to_deploy	= "Si cet ALCASAR est secondaire, copiez la clé publique ci-dessous pour l'importez dans le primaire.";
 	$l_started		= "Démarré";
 	$l_stopped		= "Arrêté";
 	$l_in_progress		= "En cours ...";
 	$l_replication_install	= "Installer la Fédération";
 	$l_replication_title	= "Fédération";
+	$l_role			= "Rôle";
 	$l_role_primary		= "Primaire";
 	$l_role_secondary	= "Secondaire";
 	$l_ssh_keys_for_primary	= "Liste des secondaires autorisées à se connecter";
 	$l_ssh_port		= "Port SSH";
 	$l_ssh_user		= "Utilisateur SSH";
 	$l_delete		= "Eliminar";
 	$l_error_details	= "Detalles de los errores";
 	$l_field		= "campo";
 	$l_go_network_conf_page	= "Vaya a la página de configuración de red";
 	$l_host_name		= "Nombre de host";
-	$l_hosts_settings	= "Parámetros de replicación de los hosts";
+	$l_hosts_settings	= "Configuración de replicación de hosts remotos";
 	$l_import_ssh_key	= "Importar una clave SSH";
 	$l_install_repl		= "Creación de la federación";
+	$l_remote_hosts		= "Hosts remotos";
 	$l_ip_address		= "dirección IP";
 	$l_no_host_connected = "No hay ningún host conectado.";
 	$l_no_ssh_key		= "No se ha importado ninguna clave SSH.";
 	$l_not_connected	= "No conectado";
 	$l_pubkey_to_deploy	= "La clave debe implementarse en los servidores primarios.";
 	$l_started		= "Iniciado";
 	$l_stopped		= "Decreto";
 	$l_in_progress		= "En curso ...";
 	$l_replication_install	= "Creación de la federación";
 	$l_replication_title	= "Federación";
+	$l_role			= "Papel";
 	$l_role_primary		= "Primaria";
 	$l_role_secondary	= "Secundaria";
 	$l_ssh_keys_for_primary	= "Lista de claves autorizadas para conectarse al usuario local «replication».";
 	$l_ssh_port		= "Puerto SSH";
 	$l_ssh_user		= "Usuario SSH";
 	$l_delete		= "Delete";
 	$l_error_details	= "Error details";
 	$l_field		= "Field";
 	$l_go_network_conf_page	= "Go to network config page.";
 	$l_host_name		= "Host name";
-	$l_hosts_settings	= "Replicated hosts settings";
+	$l_hosts_settings	= "Remote replicated hosts settings";
 	$l_import_ssh_key	= "Import a SSH key";
 	$l_install_repl		= "Setting up the federation";
+	$l_remote_hosts		= "Remote hosts";
 	$l_ip_address		= "IP address";
 	$l_no_host_connected = "No host connected";
 	$l_no_ssh_key		= "No SSH key imported.";
 	$l_not_connected	= "Not connected";
 	$l_pubkey_to_deploy	= "The following public key has to be deployed on remote primary servers.";
 	$l_started		= "Started";
 	$l_stopped		= "Stopped";
 	$l_in_progress		= "In progress...";
 	$l_replication_install	= "Setting up the federation";
 	$l_replication_title	= "Federation";
+	$l_role			= "Role";
 	$l_role_primary		= "Primary";
 	$l_role_secondary	= "Secondary";
 	$l_ssh_keys_for_primary	= "List of keys allowed to connect to local 'replication' user.";
 	$l_ssh_port		= "SSH port";
 	$l_ssh_user		= "SSH user";
 	case 'add_replica':
 		$role = trim($_POST['role'] ?? "");
 		$name = trim($_POST['name'] ?? "");
 		$ip = trim($_POST['ip'] ?? "");
 		$port = trim($_POST['port'] ?? "");
-		// we fix ssh user name to simplify ACC
+		// we fix ssh_user, db_user to simplify ACC
 		// $user = trim($_POST['user'] ?? "");
-		$user = "replication" ;
-		// we fix db user name to simplify ACC
 		// $db_user = trim($_POST['db_user'] ?? "");
+		$user = "replication" ;
 		$db_user = "db_replication";
+		// we retrieve db_pwd via SSH to simplify ACC
-		$db_pwd = trim($_POST['db_pwd'] ?? "");
+		//$db_pwd = trim($_POST['db_pwd'] ?? "");
+		$db_pwd = "no more used : set via ssh";
 		$bind_port = trim($_POST['bind_port'] ?? "");
 		$stdout = [];
 		$return = 0;
 		switch ($role) {
 			case 'primary':
 	<title><?= $l_replication_title ?></title>
 	<link rel="stylesheet" href="/css/acc.css" type="text/css">
 	<script src="/js/jquery.min.js"></script>
 	<script src="/js/jquery.connections.js"></script>
 	<script type="text/javascript">
+		// listener to enable submitbutton only when forms are completed
+		document.addEventListener('DOMContentLoaded', function() {
+			const rolePrimaryRadio = document.getElementById('role_primary');
+			const roleSecondaryRadio = document.getElementById('role_secondary');
+			const nameInput = document.getElementById('input_name');
+			const ipInput = document.getElementById('input_ip');
+			const bindPortInput = document.getElementById('input_bind_port');
+			const portInput = document.getElementById('input_port');
+			const submitButton = document.getElementById('apply_add_remote');
+			// madatory fields in relation to role
+			function checkRequiredFields() {
+				let allFilled = false;
+				if (rolePrimaryRadio.checked) {
+			// primary : name, ip, port
+				allFilled = nameInput.value.trim() !== '' &&
+					ipInput.value.trim() !== '' &&
+					portInput.value.trim() !== '';
+				} else if (roleSecondaryRadio.checked) {
+			// secondary : name, bind_port
+				allFilled = nameInput.value.trim() !== '' &&
+				bindPortInput.value.trim() !== '';
+				}
+			submitButton.disabled = !allFilled;
+			}
+			// Events listening
+			nameInput.addEventListener('input', checkRequiredFields);
+			ipInput.addEventListener('input', checkRequiredFields);
+			bindPortInput.addEventListener('input', checkRequiredFields);
+			portInput.addEventListener('input', checkRequiredFields);
+			// disable on load
+			submitButton.disabled = true;
+		});
 		window.onload = main;
 		function main() {
 			show_fields_for_new_primary();
 			set_required_on_common_fields();
-			enable_apply_btn_if_selected_primary_action();
+			enable_apply_btn_if_selected_remote_action();
 			enable_apply_btn_if_selected_ssh_key_action();
+		}
 		// Set 'required' attribute on fields needed by both primary and secondary
 		function set_required_on_common_fields() {
 			document.querySelectorAll(".role_primary.role_secondary").forEach((input) => {
 				input.setAttribute("required", "");
 				input.removeAttribute("disabled");
 			});
+		}
 		// Enable the remote's list Apply button if there are any pending actions
-		function enable_apply_btn_if_selected_primary_action() {
+		function enable_apply_btn_if_selected_remote_action() {
-			let btn = document.querySelector("#apply_changes_primary_btn");
+			let btn = document.querySelector("#apply_changes_remote_btn");
 			if (!btn) {
 				return;}
 			let change_to_apply = false;
 			// Check for any pending change
 			document.querySelectorAll(".primary_action_select").forEach((element) => {
 	<tr>
 		<td width="50%" align="center">
 			<?php $section = "change_replicas_state" ?>
 			<form action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
 			<input type="hidden" name="choice" value="<?= $section ?>">
+			<center><?= $l_remote_hosts ?></center>
 			<table cellspacing="2" cellpadding="3" border="1" style="table-layout: auto; min-width: 10em;">
 				<tr>
 					<th><?= $l_ip_address ?></th>
 					<th><?= $l_host_name ?></th>
+					<th><?= $l_role ?></th>
 					<th><?= $l_repl_io_running ?></th>
 					<th><?= $l_bind_port ?></th>
 					<th><?= $l_action ?></th>
 				</tr>
 				<?php
 								} else {
 									echo "$l_not_connected";
+								}
 							?></td>
 							<td><?= $prim["Connection_name"] ?></td>
+							<td><?php
+								if ($conf['REPLICATION_TO'] == "") { echo "$l_role_secondary"; }
+									else { echo "$l_role_primary"; }
+								?></td>
 							<td>
 							<? if ($prim["Slave_IO_Running"] == "Yes") { echo "$l_started"; }
 							   if ($prim["Slave_IO_Running"] == "No") { echo "$l_stopped"; }
 							   if ($prim["Slave_IO_Running"] == "Connecting") { echo "$l_in_progress"; }
 							?>
 							</td>
 							<td><?= $prim["Master_Port"] ?></td>
 							<td>
-								<select name="action_primary_<?= $prim["Connection_name"] ?>" class="primary_action_select" onchange="enable_apply_btn_if_selected_primary_action()">
+								<select name="action_primary_<?= $prim["Connection_name"] ?>" class="primary_action_select" onchange="enable_apply_btn_if_selected_remote_action()">
 									<option value=""></option>
 									<?php
 										// Actions available on all remotes
 										$options = array(
 											"start" => "$l_start",
 								</select>
 							</td>
 						</tr>
 					<?php }
 					// Show submit button if there are primary servers connected
-					echo "<tr><td colspan=5 valign='middle' align='center'>";
+					echo "<tr><td colspan=6 valign='middle' align='center'>";
 					if (sizeof($connected_prims)) { ?>
-						<input type="submit" id="apply_changes_primary_btn" value="<?= $l_apply ?>" onClick="document.getElementById('ldoverlay').style.display='block';">
+						<input type="submit" id="apply_changes_remote_btn" value="<?= $l_apply ?>" onClick="document.getElementById('ldoverlay').style.display='block';">
 					<?php } else { ?>
 						<p><?= $l_no_host_connected ?></p>
 					<?php }
 					echo "</td></tr>";
 				} ?>
 				</details>
 			<?php } ?>
 		</td>
 		<td width="50%" valign="middle" align="center">
 			<?php $section = "add_replica" ?>
-			<form action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
+			<form id="form_add_remote" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
 			<input type="hidden" name="choice" value="<?= $section ?>">
 				<table cellspacing="2" cellpadding="3" border="1">
 					<tr>
 						<th><?= $l_field ?></th>
 						<th><?= $l_value ?></th>
 					</tr>
 					<tr>
 						<td><label for="input_port"><?= $l_ssh_port ?></label></td>
 						<td><input type="number" id="input_port" name="port" min="0" max="65535" class="role_primary" pattern="<?= $reg_ip_port ?>"></td>
 					</tr>
+<!--					<tr>
+						<td><label for="input_db_user"><?= $l_db_user ?></label></td>
+						<td><input type="text" id="input_db_user" name="db_user" class="role_primary role_secondary" pattern="<?= $reg_mariadb_user ?>"></td>
+					</tr>
 					<tr>
 					<td><label for="input_db_pwd"><?= $l_db_pwd ?></label></td>
 						<td><input type="password" id="input_db_pwd" name="db_pwd" class="role_primary role_secondary"></td>
-					</tr>
+					</tr> -->
 					<tr>
 						<td colspan=2 valign="middle" align="center">
-							<input type="submit" class="button" value="<?= $l_add_to_list ?>">
+							<input type="submit" id="apply_add_remote" class="button" value="<?= $l_add_to_list ?>" onClick="document.getElementById('ldoverlay').style.display='block';">
 						</td>
 					</tr>
 				</table>
 			</form>
 			<?php if (isset($errors_msg[$section."_error"])) { ?>

Subversion Repositories ALCASAR

(root)/web/acc/admin/federation.php – Rev 3319 → 3320