From 9b90a8ec13167378b555c085ce00ec055fa8ef3e Mon Sep 17 00:00:00 2001
From: Irina Gómez <irinagomez@us.es>
Date: Sun, 4 Jul 2021 14:01:16 +0200
Subject: #918 The web console commands for cloning synchronized images adapt
 to images synced with git.     GIT is included as a cloning protocol with
 options git_option:acl_option with the values [ clone | checkout ] : [ total
 | user ].

---
 admin/WebConsole/includes/pintaParticiones.php     | 27 +++++++++++++---------
 .../includes/pintaTablaConfiguraciones.php         |  3 ++-
 2 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'admin/WebConsole/includes')

diff --git a/admin/WebConsole/includes/pintaParticiones.php b/admin/WebConsole/includes/pintaParticiones.php
index c789298d..1398ba0d 100644
--- a/admin/WebConsole/includes/pintaParticiones.php
+++ b/admin/WebConsole/includes/pintaParticiones.php
@@ -450,7 +450,7 @@ function pintaParticionesRestaurarImagenSincronizacion1($cmd,$configuraciones,$i
 	// Separamos las configuraciones segun el disco al que pertenezcan
 	$diskConfigs = splitConfigurationsByDisk($configuraciones);
 	
-	$columns=14;
+	$columns=16;
 	echo '<TR>';
 	echo '<TH align=center>&nbsp;&nbsp;</TH>';
 	echo '<th align="center">&nbsp;'.$TbMsg["DISK"].'&nbsp;</th>'; // Número de  disco
@@ -463,9 +463,11 @@ function pintaParticionesRestaurarImagenSincronizacion1($cmd,$configuraciones,$i
 	echo '<TH align=center>&nbsp;'.$TbMsg[16].'&nbsp;</TH>';	
 	echo '<TH align=center>&nbsp;'.$TbMsg["SYNC_METHOD"].'&nbsp;</TH>';
 	echo '<TH align=center>&nbsp;'.$TbMsg["SEND"].'&nbsp;</TH>';
-	echo '  <TH align=center>&nbsp;<dfn  title="'.$TbMsg["TITLE_W"].'">W</dfn> &nbsp;</TH>';
-	echo '  <TH align=center>&nbsp;<dfn  title="'.$TbMsg["TITLE_E"].'">E</dfn> &nbsp;</TH>';
-	echo '  <TH align=center>&nbsp;<dfn  title="'.$TbMsg["TITLE_C"].'">C</dfn> &nbsp;</TH>';
+	echo '  <TH id="whl" align=center>&nbsp;<dfn  title="'.$TbMsg["TITLE_W"].'">W</dfn> &nbsp;</TH>';
+	echo '  <TH id="eli" align=center>&nbsp;<dfn  title="'.$TbMsg["TITLE_E"].'">E</dfn> &nbsp;</TH>';
+	echo '  <TH id="cmp" align=center>&nbsp;<dfn  title="'.$TbMsg["TITLE_C"].'">C</dfn> &nbsp;</TH>';
+	echo '  <TH id="git" align=center>&nbsp;<dfn  title="'.$TbMsg["TITLE_G"].'">G</dfn> &nbsp;</TH>';
+	echo '  <TH id="acl" align=center>&nbsp;<dfn  title="'.$TbMsg["TITLE_A"].'">A</dfn> &nbsp;</TH>';
 	echo '</TR>';
 
 	
@@ -474,7 +476,7 @@ function pintaParticionesRestaurarImagenSincronizacion1($cmd,$configuraciones,$i
 	foreach($diskConfigs as $disk => $diskConfig){
 		$disk = (int)$disk;
 
-		echo '<tr height="16">'.chr(13);
+		echo '<tr height="18">'.chr(13);
 
 		$html_disk_type = draw_disk_type($cmd, $idordenadores, $disk);
 		echo '<td colspan="' . $columns . '" style="BORDER-TOP: " .
@@ -505,8 +507,9 @@ function pintaParticionesRestaurarImagenSincronizacion1($cmd,$configuraciones,$i
 						
 						$metodos="SYNC0="."  ".chr(13);
 						$metodos.="SYNC1=".$TbMsg["SYNC1_DIR"].chr(13);						
-						$metodos.="SYNC2=".$TbMsg["SYNC2_FILE"];		
-						echo '<TD align=center>'.HTMLCTESELECT($metodos,"desplesync_".$icp,"estilodesple","",1,100).'</TD>';								
+						$metodos.="SYNC2=".$TbMsg["SYNC2_FILE"].chr(13);
+						$metodos.="SYNC3=".$TbMsg["SYNC3_GIT"];
+						echo '<TD align=center>'.HTMLCTESELECT($metodos,"desplesync_".$icp,"estilodesple","",1,100,"protocolo_opt").'</TD>';
 							
 						$metodos="UNICAST="."Unicast".chr(13);						
 						$metodos.="MULTICAST_". mcast_syntax($cmd,$ambito,$idambito) ."="."Multicast".chr(13);		
@@ -514,9 +517,11 @@ function pintaParticionesRestaurarImagenSincronizacion1($cmd,$configuraciones,$i
 						$metodos.="RSYNC=Rsync";
 						echo '<TD align=center>'.HTMLCTESELECT($metodos,"despletpt_".$icp,"estilodesple","",1,100).'</TD>';								
 						
-						echo '<td align=center><input type=checkbox name="whole" id="whl-'.$icp.'"></td>';	
-						echo '<td align=center><input type=checkbox name="paramb" checked id="eli-'.$icp.'"></td>';	
-						echo '<td align=center><input type=checkbox name="compres" id="cmp-'.$icp.'"></td>';	
+						echo '<td align=center><input type=checkbox name="whole" class="whole" id="whl-'.$icp.'"></td>';
+						echo '<td align=center><input type=checkbox name="eli" class="paramb" checked id="eli-'.$icp.'"></td>';
+						echo '<td align=center><input type=checkbox name="compres" class="compres" id="cmp-'.$icp.'"></td>';
+						echo '<td align=center><input type=checkbox name="git" class="git" id="git-'.$icp.'"></td>';
+						echo '<td align=center><input type=checkbox name="acl" class="acl" id="acl-'.$icp.'"></td>';
 										
 					}
 					echo '</TR>'.chr(13);
@@ -526,5 +531,5 @@ function pintaParticionesRestaurarImagenSincronizacion1($cmd,$configuraciones,$i
 	}	
 
 	echo '<TR><TD colspan="'.$columns.'" style="BORDER-TOP: #999999 1px solid;BACKGROUND-COLOR: #FFFFFF; height: 5px;">&nbsp;</TD></TR>';
-	echo '<tr><th colspan="14">'.$TbMsg["WARN_PROTOCOL"].'</th></tr>';
+	echo '<tr><th colspan="'.$columns.'">'.$TbMsg["WARN_PROTOCOL"].'</th></tr>';
 }
diff --git a/admin/WebConsole/includes/pintaTablaConfiguraciones.php b/admin/WebConsole/includes/pintaTablaConfiguraciones.php
index 41b3d296..8bebe39d 100644
--- a/admin/WebConsole/includes/pintaTablaConfiguraciones.php
+++ b/admin/WebConsole/includes/pintaTablaConfiguraciones.php
@@ -315,7 +315,8 @@ function tablaConfiguracionesSincronizacion1($idordenador)
 			
 			$metodos="SYNC0="." ".chr(13);			
 			$metodos.="SYNC1=".$TbMsg["SYNC1_DIR"].chr(13);						
-			$metodos.="SYNC2=".$TbMsg["SYNC2_FILE"];		
+			$metodos.="SYNC2=".$TbMsg["SYNC2_FILE"].chr(13);
+			$metodos.="SYNC3=".$TbMsg["SYNC3_GIT"];
 			$tablaHtml.= '<TD align=center>'.HTMLCTESELECT($metodos,"desplesync_".$rs->campos["numpar"],"estilodesple","",1,100).'</TD>';			
 					
 			$tablaHtml.='<td align=center><input type=checkbox name="whole" id="whl-'.$rs->campos["numpar"].'"></td>';	
-- 
cgit v1.2.3-18-g5258