--- smeserver-usbdisksmanager-1.2/root/etc/e-smith/web/functions/usbdisks.old	2017-03-24 18:06:42.000000000 -0400
+++ smeserver-usbdisksmanager-1.2/root/etc/e-smith/web/functions/usbdisks	2017-03-25 01:31:02.000000000 -0400
@@ -308,7 +308,7 @@
            if (  ( "$disques{$clef}{DEVTYPE}" eq "USB" ) ||("$disques{$clef}{DEVTYPE}" eq "FireWire"  )  )
            {
            my %disque = %{$disques{$clef}};
-           my $options= OptionMenu(\%disque);
+           my $options= OptionMenu(\%disque) || "";
            print "<td><font color=black>$options</font></td>";
            }
            else
@@ -358,7 +358,7 @@
     my $mounted=`mount`;
     my @fstab= `cat /etc/fstab`;
     my @blkid= `/sbin/blkid -c /dev/null `;
-    my @swap= `cat /proc/swaps|grep '/' |cut -f1`; warn $swap[0];
+    my @swap= `cat /proc/swaps|grep '/' |cut -f1`; 
     my @lvscan = `/sbin/lvscan`;
     my %disques;
     my $i = 0;
@@ -586,8 +586,8 @@
         my $temp_status =db_get_prop(\%usbdisks,  $UUID , "status");
 	my $temp_status_media = $_=db_get_prop(\%usbdisks,  $UUID , "status_media") ? db_get_prop(\%usbdisks,  $UUID , "status_media") : "disabled";
         my $temp_mountto=db_get_prop(\%usbdisks,  $UUID , "mountto");
-        my $temp_options_mountto=  $_=db_get_prop(\%usbdisks,  $UUID , "options") ? db_get_prop(\%usbdisks,  $UUID , "options") : "pamconsole,exec,noauto,managed";	
-	
+        my $temp_options_mountto=  $_=db_get_prop(\%usbdisks,  $UUID , "options") ? db_get_prop(\%usbdisks,  $UUID , "options") : "default,noauto";	
+	# pamconsole managed should be removed if present
 	esmith::cgi::genHeaderNonCacheable ($q, \%conf, $tr_titre_modifier.' '.$UUID.'<br><br>');
         GeneralMenu ($q);
         print $q->hr;    
@@ -602,7 +602,7 @@
                       esmith::cgi::genSmallCell ($q, "<input type=\"text\" size=\"45\" name=\"usbd_mountto\" value=\"$temp_mountto\">(".$temp_mountto.")"));
         print $q->Tr (esmith::cgi::genSmallCell ($q, "$tr_options_mount_to :"),
                       esmith::cgi::genSmallCell ($q, "<input type=\"text\" size=\"45\" name=\"usbd_options_mountto\" value=\"$temp_options_mountto\">(".$temp_options_mountto.")
-		      <br>defaults / pamconsole,exec,noauto,managed"));		      
+		      <br>defaults : defaults,noauto"));		      
         print $q->Tr (esmith::cgi::genSmallCell ($q, "$tr_status :"),
                       esmith::cgi::genSmallCell ($q, "<SELECT name=\"usbd_status\"><option value =\"$temp_status\">$temp_status</option><option value =\"disabled\">disabled</option><option value =\"enabled\">enabled</option</SELECT>(".$temp_status.")"));
         print $q->Tr (esmith::cgi::genSmallCell ($q, "$tr_status_media :"),
@@ -668,7 +668,7 @@
     if ($pud_status_media eq "enabled") {db_set_prop(\%usbdisks,  $pud_UUID , "status_media", "enabled");} else{db_set_prop(\%usbdisks,  $pud_UUID , "status_media", "disabled");};
     
     #options
-    if ($pud_options_mountto eq "") {db_set_prop(\%usbdisks,  $pud_UUID , "options", "pamconsole,exec,noauto,managed");} else{db_set_prop(\%usbdisks,  $pud_UUID , "options",$pud_options_mountto );};
+    if ($pud_options_mountto eq "") {db_set_prop(\%usbdisks,  $pud_UUID , "options", "default,noauto");} else{db_set_prop(\%usbdisks,  $pud_UUID , "options",$pud_options_mountto );};
     
     
     $pud_mountto =~ s/\\/\//g; # au cas ou un windowzien viens à taper le chemin de la ressource partagée à la mode Win$
@@ -717,8 +717,8 @@
     print $q->Tr (esmith::cgi::genSmallCell ($q, "mount to"),
                   esmith::cgi::genSmallCell ($q, "<input type=\"text\" size=\"45\" name=\"usbd_mountto\">"));
     print $q->Tr (esmith::cgi::genSmallCell ($q, "$tr_options_mount_to :"),
-                      esmith::cgi::genSmallCell ($q, "<input type=\"text\" size=\"45\" name=\"usbd_options_mountto\" value=\"pamconsole,exec,noauto,managed\">
-		      <br>defaults / pamconsole,exec,noauto,managed"));		      
+                      esmith::cgi::genSmallCell ($q, "<input type=\"text\" size=\"45\" name=\"usbd_options_mountto\" value=\"default,noauto\">
+		      <br>defaults : default,noauto"));		      
     print $q->Tr (esmith::cgi::genSmallCell ($q, "Status"),
                   esmith::cgi::genSmallCell ($q, "<SELECT name=\"usbd_status\"><option value =\"disabled\">disabled</option><option value =\"enabled\">enabled</option</SELECT>"));
     print $q->Tr (esmith::cgi::genSmallCell ($q, "$tr_status_media :"),
@@ -780,7 +780,7 @@
     if ($pud_status_media eq "enabled") {db_set_prop(\%usbdisks,  $pud_UUID , "status_media", "enabled");} else{db_set_prop(\%usbdisks,  $pud_UUID , "status_media", "disabled");};
     
     #options
-    if ($pud_options_mountto eq "") {db_set_prop(\%usbdisks,  $pud_UUID , "options", "pamconsole,exec,noauto,managed");} else{db_set_prop(\%usbdisks,  $pud_UUID , "options",$pud_options_mountto );};
+    if ($pud_options_mountto eq "") {db_set_prop(\%usbdisks,  $pud_UUID , "options", "default,noauto");} else{db_set_prop(\%usbdisks,  $pud_UUID , "options",$pud_options_mountto );};
     #mount to
     $pud_mountto =~ s/\\/\//g; # au cas ou un windowzien viens à taper le chemin de la ressource partagée à la mode Win$
     if (-e $pud_mountto) {
@@ -811,13 +811,14 @@
 
 sub USBMountDisk($)
 {
-   my ($q) = @_;
-   my $UUID = $q->param ('UUID') || return showInitial ($q,"");
+    my ($q) = @_;
+    my $UUID = $q->param ('UUID') || return showInitial ($q,"");
+    ($UUID) = $UUID =~ m/^([A-Z0-9-]+)$/ig ;
     my $blkid= `/sbin/blkid -t UUID=$UUID`;
-    my $dev=  $blkid =~ /^(\/dev\/[a-z\-]{2,3}[0-9]{1}):/ ? $1 : "unknown";
+    my $dev=  $blkid =~ /^(\/dev\/[a-z0-9_\-\/]{2,}):/ ? $1 : "unknown";
     # essaie de montage par UUID ne semble pas correcte pour vfat
     #my $mount=`/bin/mount -U $UUID`;
-    my $mount=`/bin/mount $dev  `;
+    my $mount=`/bin/mount $dev  2>&1`;
     my $mounted= `/bin/mount`=~ /$dev/ ? "$tr_success" : "$tr_failure";
     print " $dev :mount  $mounted <br>";
     showInitial ($q, "<b><font size='+1'>$tr_rapport mount :</font></b><br>$mounted<BR>
@@ -826,14 +827,15 @@
 
 sub USBUnMountDisk($)
 {
-   my ($q) = @_;
-   my $UUID = $q->param ('UUID') || return showInitial ($q,"");
+    my ($q) = @_;
+    my $UUID = $q->param ('UUID') || return showInitial ($q,"");
+    ($UUID) = $UUID =~ m/^([A-Z0-9-]+)$/ig ;
     my $blkid= `/sbin/blkid -t UUID=$UUID`;
-    my $dev=  $blkid =~ /^(\/dev\/[a-z\-]{2,3}[0-9]{1}):/ ? $1 : "unknown";
+    my $dev=  $blkid =~ /^(\/dev\/[a-z0-9_\-\/]{2,}):/ ? $1 : "unknown";
     my $mounted=`mount`;
     #destination
     my $dest= $mounted =~ /$dev on (\/media\/[a-zA-Z0-9_]+) / ? $1 : "unknown" ;
-    my $mount=`/bin/umount -f $dest`;
+    my $mount=`/bin/umount -f $dest  2>&1`;
     $mounted= `/bin/mount`=~ /$dev on (\/media\/[a-zA-Z0-9_]+)/ ? "$tr_failure" : "$tr_success";
     showInitial ($q, "<b><font size='+1'>$tr_rapport umount :</font></b><br>$mounted<BR>
 			<B>$dev : $dest</B>: $mount<BR><BR>");
@@ -845,7 +847,7 @@
 
     my  $OUT= "<h1>".$tr_known_mounts."</h1>";
     $OUT .= "<table border='1' cellpadding='3' cellspacing='3'>\n";
-    $OUT .= "<tr><td>$tr_uuid</td><td>$tr_device_type</td><td>$tr_status_mountto</td><td>$tr_status_mountmedia</td><td>$tr_mount_to</td><td>$tr_connected</td><td>$tr_mounted_to</td><td>$tr_action</td></tr>\n";
+    $OUT .= "<tr><td>$tr_uuid</td><td>$tr_device_type</td><td>$tr_status_mountmedia</td><td>$tr_status_mountto</td><td>$tr_mount_to</td><td>$tr_connected</td><td>$tr_mounted_to</td><td>$tr_action</td></tr>\n";
     my $clef;
     my $disque;
 
@@ -860,8 +862,28 @@
        $OUT .=  "<tr>\n";
            $OUT .=  "<td><font color=black>$clef</font></td>";
            $OUT .=  "<td><font color=blue>".db_get_type(\%usbdisks,  $clef )."</font></td>";
+	   # status auto mount media
+           $OUT .=  "<td> ";
+	   if ( $usbd_status_mediaG eq "disabled")
+	      {
+		$OUT.= "Globally disabled"
+	      }
+	   else
+	      {
+           	if ( (db_get_type(\%usbdisks,  $clef ) eq "USB") || (db_get_type(\%usbdisks,  $clef ) eq "FireWire") )
+              		{
+              		if (db_get_prop(\%usbdisks,  $clef , "status_media")eq "enabled")
+                 		{$OUT .="<a href=usbdisks?state=disable_mediaentry&UUID=$clef>".db_get_prop(\%usbdisks,  $clef , "status_media")." </a>"; }
+              		elsif (db_get_prop(\%usbdisks,  $clef , "status_media")eq "disabled")
+	         		{$OUT .="<a href=usbdisks?state=enable_mediaentry&UUID=$clef>".db_get_prop(\%usbdisks,  $clef , "status_media")."  </a>"; }
+	      		else
+	        		{$OUT .="<a href=usbdisks?state=enable_mediaentry&UUID=$clef>not set</a>"; }    
+	      		}
+           	else {$OUT.= db_get_prop(\%usbdisks,  $clef , "status_media");};
+	      }
+           $OUT.= "</td>";	    	   
            # status auto mount_to
-	   $OUT .=  "<td> ";
+           $OUT .=  "<td> ";
            if ( (db_get_type(\%usbdisks,  $clef ) eq "USB") || (db_get_type(\%usbdisks,  $clef ) eq "FireWire") )
               {
            if (db_get_prop(\%usbdisks,  $clef , "status")eq "enabled")
@@ -871,19 +893,6 @@
               }
            else {$OUT.= db_get_prop(\%usbdisks,  $clef , "status");};
            $OUT.= "</td>";
-	   # status auto mount media
-           $OUT .=  "<td> ";
-           if ( (db_get_type(\%usbdisks,  $clef ) eq "USB") || (db_get_type(\%usbdisks,  $clef ) eq "FireWire") )
-              {
-           if (db_get_prop(\%usbdisks,  $clef , "status_media")eq "enabled")
-                 {$OUT .="<a href=usbdisks?state=disable_mediaentry&UUID=$clef>".db_get_prop(\%usbdisks,  $clef , "status_media")." </a>"; }
-           elsif (db_get_prop(\%usbdisks,  $clef , "status_media")eq "disabled")
-	         {$OUT .="<a href=usbdisks?state=enable_mediaentry&UUID=$clef>".db_get_prop(\%usbdisks,  $clef , "status_media")."  </a>"; }
-	   else
-	        {$OUT .="<a href=usbdisks?state=enable_mediaentry&UUID=$clef>not set</a>"; }    
-	      }
-           else {$OUT.= db_get_prop(\%usbdisks,  $clef , "status_media");};
-           $OUT.= "</td>";	    	   
            #mount to
            $OUT .=  "<td><font color=black>".db_get_prop(\%usbdisks,  $clef , "mountto")."</font></td>";
            # connecté
@@ -970,13 +979,16 @@
 {
     my ($q) = @_;
     my $UUID = $q->param ('UUID') || return showInitial ($q,"");
-    my $blkid= `/sbin/blkid -t UUID=$UUID`;
-    my $dev=  $blkid =~ /^(\/dev\/[a-z\-]{2,3}[0-9]{1}):/ ? $1 : "$tr_unknown";
-    my $dest= db_get_prop(\%usbdisks,  $UUID, "mountto");
-    my $options= $_=db_get_prop(\%usbdisks,  $UUID, "options")? db_get_prop(\%usbdisks,  $UUID, "options")  : "pamconsole,exec,noauto,managed";
+    ($UUID) = $UUID =~ m/^([A-Z0-9-]+)$/ig ;
+    my $blkid= `/sbin/blkid -t UUID=$UUID -c /dev/null`;
+    my $dev=  $blkid =~ /^(\/dev\/[a-z0-9_\-\/]{2,}):/ ? $1 : "$tr_unknown";
+    #my $dev = `/bin/readlink -f  /dev/disk/by-uuid/$UUID`;#with line return at the end 
+    my $dest= db_get_prop(\%usbdisks,  $UUID, "mountto"); 
+    my $options= $_=db_get_prop(\%usbdisks,  $UUID, "options")? db_get_prop(\%usbdisks,  $UUID, "options")  : "default,noauto";
     # mount par le UUID pas supporté pour vfat
-    #my $mount=`/bin/mount -U $UUID $dest -o pamconsole,exec,noauto,managed`;
-    my $mount=`/bin/mount $dev -t auto $dest -o $options`;
+    #my $mount=`/bin/mount -U $UUID $dest -o default,noauto`;
+    # to get filesystem type : blkid -o value -s TYPE /dev/sdc1
+    my $mount=`/bin/mount $dev -t auto  $dest -o $options 2>&1`;
     my $mounted= `/bin/mount`=~ /$dev/ ? "$tr_success" : "$tr_failure";
     showInitial ($q, "<b><font size='+1'>$tr_rapport mount : </font></b><br>$mounted<BR>
 			<B>$dev</B>: $mount<BR><BR>");
@@ -985,12 +997,13 @@
 
 sub USBUnMounttoDisk($)
 {
-   my ($q) = @_;
-   my $UUID = $q->param ('UUID') || return showInitial ($q,"");
+    my ($q) = @_;
+    my $UUID = $q->param ('UUID') || return showInitial ($q,"");
+    ($UUID) = $UUID =~ m/^([A-Z0-9-]+)$/ig ;
     my $blkid= `/sbin/blkid -t UUID=$UUID`;
-    my $dev=  $blkid =~ /^(\/dev\/[a-z\-]{2,3}[0-9]{1}):/ ? $1 : "unknown";
+    my $dev=  $blkid =~ /^(\/dev\/[a-z0-9_\-\/]{2,}):/ ? $1 : "unknown";
     my $dest= db_get_prop(\%usbdisks,  $UUID, "mountto");
-    my $mount=`/bin/umount -f $dest`;
+    my $mount=`/bin/umount -f $dest 2>&1`;
     my $mounted= `/bin/mount`=~ /$dev/ ? "$tr_failure" : "$tr_success";
     showInitial ($q, "<b><font size='+1'>$tr_rapport umount :</font></b><br>$mounted<BR>
 			<B>$dest</B>: $mount<BR><BR>");