From 883ca1903fa78a634ebc0cec056747406d11de88 Mon Sep 17 00:00:00 2001
From: Sergi Amoros <sergi.amoros@softmachine.es>
Date: Sat, 10 Sep 2022 12:11:15 +0200
Subject: [PATCH 1/2] change short_name for name

---
 src/webserver/default/amuleweb-main-dload.php  | 16 ++++++++++++++--
 src/webserver/default/amuleweb-main-search.php | 11 ++++++++++-
 src/webserver/default/amuleweb-main-shared.php | 17 +++++++++++++----
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/webserver/default/amuleweb-main-dload.php b/src/webserver/default/amuleweb-main-dload.php
index c8bf40561c..f26e56f8ad 100644
--- a/src/webserver/default/amuleweb-main-dload.php
+++ b/src/webserver/default/amuleweb-main-dload.php
@@ -115,6 +115,18 @@ function MM_nbGroup(event, grpName) { //v6.0
 	font-family: Helvetica;
 	font-size: 12px;
 	font-weight: normal;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	word-break: break-all;
+	word-wrap: break-word;
+}
+.texte-full-name{
+	max-width: 0;
+	width: 45%;
+}
+.texte-full-name-upload{
+	width: 55%;
 }
 label {
 font-family:"trebuchet ms",sans-serif;
@@ -394,7 +406,7 @@ function my_cmp($a, $b)
 	
 				echo "<td class='texte' height='22'>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
 	
-				echo "<td class='texte' height='22'>", $file->short_name, "</td>";
+				echo "<td class='texte texte-full-name' height='22'>", $file->name, "</td>";
 				
 				echo "<td class='texte' height='22' align='center'>", CastToXBytes($file->size), "</td>";
 
@@ -478,7 +490,7 @@ function CastToXBytes($size)
 	
 				echo "<td class='texte' height='22' align='center'>", "</td>";
 				
-				echo "<td class='texte' height='22'>", $file->short_name, "</td>";
+				echo "<td class='texte texte-full-name texte-full-name-upload' height='22'>", $file->name, "</td>";
 
 				echo "<td class='texte' height='22' align='center'>", $file->user_name, "</td>";
 	
diff --git a/src/webserver/default/amuleweb-main-search.php b/src/webserver/default/amuleweb-main-search.php
index a80a6f1e34..667ff81b21 100644
--- a/src/webserver/default/amuleweb-main-search.php
+++ b/src/webserver/default/amuleweb-main-search.php
@@ -75,6 +75,15 @@ function MM_swapImage() { //v3.0
 	font-family: Helvetica;
 	font-size: 12px;
 	font-weight: normal;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	word-break: break-all;
+	word-wrap: break-word;
+}
+.texte-full-name{
+	max-width: 0;
+	width: 75%;
 }
 label {
 font-family:"trebuchet ms",sans-serif;
@@ -311,7 +320,7 @@ function cat2idx($cat)
 
 			echo "<td class='texte'>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
 
-			echo "<td class='texte'>", $file->short_name, "</td>";
+			echo "<td class='texte texte-full-name'>", $file->name, "</td>";
 			
 			echo "<td class='texte' align='center'>", CastToXBytes($file->size), "</td>";
 
diff --git a/src/webserver/default/amuleweb-main-shared.php b/src/webserver/default/amuleweb-main-shared.php
index ca500a1dee..57396995f4 100644
--- a/src/webserver/default/amuleweb-main-shared.php
+++ b/src/webserver/default/amuleweb-main-shared.php
@@ -109,6 +109,15 @@ function MM_nbGroup(event, grpName) { //v6.0
 	font-family: Helvetica;
 	font-size: 12px;
 	font-weight: normal;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	word-break: break-all;
+	word-wrap: break-word;
+}
+.texte-full-name{
+	max-width: 0;
+	width: 45%;
 }
 label {
 font-family:"trebuchet ms",sans-serif;
@@ -178,9 +187,9 @@ function formCommandSubmit(command)
                   <td><input type="hidden" name="command"></td>
                   
             <td><a href="javascript:formCommandSubmit('reload');" onClick="MM_nbGroup('down','group1','reload','',1)" onMouseOver="MM_nbGroup('over','reload','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/refresh.png" alt="Ricarica Files Condivisi" name="reload" border="0" onload=""></a></td>
-				  <td><a href="javascript:formCommandSubmit('prioup');" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img name="up" src="images/up.png" border="0" alt="Alza Priorità" onLoad=""></a></td>
+				  <td><a href="javascript:formCommandSubmit('prioup');" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img name="up" src="images/up.png" border="0" alt="Alza Priorit�" onLoad=""></a></td>
                   
-            <td><a href="javascript:formCommandSubmit('priodown');" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/down.png" alt="Abbassa Priorità" name="down" border="0" onload=""></a></td>
+            <td><a href="javascript:formCommandSubmit('priodown');" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/down.png" alt="Abbassa Priorit�" name="down" border="0" onload=""></a></td>
                   <td><select name="select">
                       <option selected>Select prio</option>
                       <option>Low</option>
@@ -188,7 +197,7 @@ function formCommandSubmit(command)
                       <option>High</option>
                     </select> </td>
                   
-            <td><a href="javascript:formCommandSubmit('setprio');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/ok.png" alt="Imposta Priorità" name="resume" border="0" onload=""></a></td>
+            <td><a href="javascript:formCommandSubmit('setprio');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/ok.png" alt="Imposta Priorit�" name="resume" border="0" onload=""></a></td>
               
                   <td> 
                     <?php
@@ -340,7 +349,7 @@ function my_cmp($a, $b)
 
 			echo "<td class='texte'>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
 
-			echo "<td class='texte'>", $file->short_name, "</td>";
+			echo "<td class='texte texte-full-name'>", $file->name, "</td>";
 			echo "<td class='texte' align='center'>", CastToXBytes($file->xfer), " (", CastToXBytes($file->xfer_all),")</td>";
 
 			echo "<td class='texte' align='center'>", $file->req, " (", $file->req_all, ")</td>";

From 0db97f92d6006ad186b6757fcbb4b5107f2b662b Mon Sep 17 00:00:00 2001
From: Sergi Amoros <sergi.amoros@softmachine.es>
Date: Sat, 10 Sep 2022 12:16:16 +0200
Subject: [PATCH 2/2] PR review - file codification ANSI

---
 src/webserver/default/amuleweb-main-shared.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/webserver/default/amuleweb-main-shared.php b/src/webserver/default/amuleweb-main-shared.php
index 57396995f4..826b1519e2 100644
--- a/src/webserver/default/amuleweb-main-shared.php
+++ b/src/webserver/default/amuleweb-main-shared.php
@@ -187,9 +187,9 @@ function formCommandSubmit(command)
                   <td><input type="hidden" name="command"></td>
                   
             <td><a href="javascript:formCommandSubmit('reload');" onClick="MM_nbGroup('down','group1','reload','',1)" onMouseOver="MM_nbGroup('over','reload','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/refresh.png" alt="Ricarica Files Condivisi" name="reload" border="0" onload=""></a></td>
-				  <td><a href="javascript:formCommandSubmit('prioup');" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img name="up" src="images/up.png" border="0" alt="Alza Priorit�" onLoad=""></a></td>
+				  <td><a href="javascript:formCommandSubmit('prioup');" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img name="up" src="images/up.png" border="0" alt="Alza Priorità" onLoad=""></a></td>
                   
-            <td><a href="javascript:formCommandSubmit('priodown');" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/down.png" alt="Abbassa Priorit�" name="down" border="0" onload=""></a></td>
+            <td><a href="javascript:formCommandSubmit('priodown');" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/down.png" alt="Abbassa Priorità" name="down" border="0" onload=""></a></td>
                   <td><select name="select">
                       <option selected>Select prio</option>
                       <option>Low</option>
@@ -197,7 +197,7 @@ function formCommandSubmit(command)
                       <option>High</option>
                     </select> </td>
                   
-            <td><a href="javascript:formCommandSubmit('setprio');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/ok.png" alt="Imposta Priorit�" name="resume" border="0" onload=""></a></td>
+            <td><a href="javascript:formCommandSubmit('setprio');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/ok.png" alt="Imposta Priorità" name="resume" border="0" onload=""></a></td>
               
                   <td> 
                     <?php