[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/08/03 22:14:18

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonFile.ml 

Log message:
        patch #6132

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1309&r2=1.1310
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.ml?cvsroot=mldonkey&r1=1.76&r2=1.77

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1309
retrieving revision 1.1310
diff -u -b -r1.1309 -r1.1310
--- distrib/ChangeLog   3 Aug 2007 22:12:57 -0000       1.1309
+++ distrib/ChangeLog   3 Aug 2007 22:14:18 -0000       1.1310
@@ -15,6 +15,8 @@
 =========
 
 2007/08/04
+6132: HTML: Fix group display in vd <num> for admin users
+      view of other users files
 6130: Change API for network_parse_url, support user group
 6127: HTML: Display file_chunk_sizes/file_piece_size in vd <num>
 6135: BT: Fix high CPU load when share_scan_interval = 0

Index: src/daemon/common/commonFile.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.ml,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- src/daemon/common/commonFile.ml     3 Aug 2007 22:11:45 -0000       1.76
+++ src/daemon/common/commonFile.ml     3 Aug 2007 22:14:18 -0000       1.77
@@ -746,7 +746,7 @@
 
       Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" 
(html_mods_cntr ());
       if user2_allow_file_admin file o.conn_user.ui_user &&
-         o.conn_user.ui_user.user_groups <> [] then
+         (file_owner file).user_groups <> [] then begin
         let optionlist =
           if (file_group file) = None then
             ref ""
@@ -777,6 +777,7 @@
    ^ Printf.sprintf "\\<option value=\\\"%s\\\" selected\\>%s\\</option\\>\n" 
(user2_print_group (file_group file)) (user2_print_group (file_group file))
    ^ !optionlist ^ "\\</select\\>\\</td\\>\\</form\\>\\</tr\\>\\</table\\>"
   ) ];
+        end
 
       else
         html_mods_td buf [("File group", "sr br", "Group");