| 1 |
brianr |
1.1 |
diff -up smeserver-webshare-1.0.0/root/etc/e-smith/events/actions/webshare-adduser.sme8bis smeserver-webshare-1.0.0/root/etc/e-smith/events/actions/webshare-adduser |
| 2 |
|
|
--- smeserver-webshare-1.0.0/root/etc/e-smith/events/actions/webshare-adduser.sme8bis 2006-12-01 11:36:28.000000000 -0500 |
| 3 |
|
|
+++ smeserver-webshare-1.0.0/root/etc/e-smith/events/actions/webshare-adduser 2013-05-25 00:58:02.000000000 -0400 |
| 4 |
|
|
@@ -24,12 +24,14 @@ if ( ( "$MultiAccessWebshare" eq "$pro |
| 5 |
|
|
my $foo = |
| 6 |
|
|
new Apache::Htpasswd("/home/e-smith/db/webshare/htpasswd.$MultiAccessWebshare"); |
| 7 |
|
|
$foo->htDelete("$userName"); |
| 8 |
|
|
+ $foo->{'USEMD5'} = "MD5"; |
| 9 |
|
|
$foo->htpasswd( "$userName", "$password" ); |
| 10 |
|
|
|
| 11 |
|
|
foreach my $MultiWebshares (%MultiWebshares) { |
| 12 |
|
|
my $foo1 = |
| 13 |
|
|
new Apache::Htpasswd("/home/e-smith/db/webshare/htpasswd.$MultiWebshares"); |
| 14 |
|
|
- $foo1->htDelete("$userName"); |
| 15 |
|
|
+ $foo1->htDelete("$userName");i |
| 16 |
|
|
+ $foo->{'USEMD5'} = "MD5"; |
| 17 |
|
|
$foo1->htpasswd( "$userName", "$password" ); |
| 18 |
|
|
} |
| 19 |
|
|
} |
| 20 |
|
|
@@ -41,6 +43,7 @@ else { |
| 21 |
|
|
#------------------------------------------------------------ |
| 22 |
|
|
|
| 23 |
|
|
my $foo = new Apache::Htpasswd("/home/e-smith/db/webshare/htpasswd.$projectName"); |
| 24 |
|
|
+ $foo->{'USEMD5'} = "MD5"; |
| 25 |
|
|
$foo->htpasswd( "$userName", "$password" ); |
| 26 |
|
|
} |
| 27 |
|
|
|
| 28 |
|
|
diff -up smeserver-webshare-1.0.0/root/etc/e-smith/events/actions/webshare-rebuild-htpasswd.sme8bis smeserver-webshare-1.0.0/root/etc/e-smith/events/actions/webshare-rebuild-htpasswd |
| 29 |
|
|
--- smeserver-webshare-1.0.0/root/etc/e-smith/events/actions/webshare-rebuild-htpasswd.sme8bis 2006-12-01 11:37:44.000000000 -0500 |
| 30 |
|
|
+++ smeserver-webshare-1.0.0/root/etc/e-smith/events/actions/webshare-rebuild-htpasswd 2013-05-25 01:03:33.000000000 -0400 |
| 31 |
|
|
@@ -35,6 +35,7 @@ foreach my $WebShare (@WebShare) { |
| 32 |
|
|
new Apache::Htpasswd( |
| 33 |
|
|
"/home/e-smith/db/webshare/htpasswd.$MultiAccessWebshare"); |
| 34 |
|
|
$foo->htDelete("$userName"); |
| 35 |
|
|
+ $foo->{'USEMD5'} = "MD5"; |
| 36 |
|
|
$foo->htpasswd( "$userName", "$password" ); |
| 37 |
|
|
|
| 38 |
|
|
foreach my $MultiWebshares ( sort %MultiWebshares ) { |
| 39 |
|
|
@@ -42,6 +43,7 @@ foreach my $WebShare (@WebShare) { |
| 40 |
|
|
new Apache::Htpasswd( |
| 41 |
|
|
"/home/e-smith/db/webshare/htpasswd.$MultiWebshares"); |
| 42 |
|
|
$foo1->htDelete("$userName"); |
| 43 |
|
|
+ $foo->{'USEMD5'} = "MD5"; |
| 44 |
|
|
$foo1->htpasswd( "$userName", "$password" ); |
| 45 |
|
|
} |
| 46 |
|
|
} |
| 47 |
|
|
@@ -53,6 +55,7 @@ foreach my $WebShare (@WebShare) { |
| 48 |
|
|
|
| 49 |
|
|
my $foo = new Apache::Htpasswd("/home/e-smith/db/webshare/htpasswd.$ws"); |
| 50 |
|
|
$foo->htDelete("$userName"); |
| 51 |
|
|
+ $foo->{'USEMD5'} = "MD5"; |
| 52 |
|
|
$foo->htpasswd( "$userName", "$password" ); |
| 53 |
|
|
} |
| 54 |
|
|
} |
| 55 |
|
|
diff -up smeserver-webshare-1.0.0/root/etc/e-smith/web/functions/webshare.sme8bis smeserver-webshare-1.0.0/root/etc/e-smith/web/functions/webshare |
| 56 |
|
|
--- smeserver-webshare-1.0.0/root/etc/e-smith/web/functions/webshare.sme8bis 2013-05-24 17:41:07.000000000 -0400 |
| 57 |
|
|
+++ smeserver-webshare-1.0.0/root/etc/e-smith/web/functions/webshare 2013-05-25 01:14:45.000000000 -0400 |
| 58 |
|
|
@@ -155,7 +155,7 @@ foreach (sort keys %projects) |
| 59 |
|
|
esmith::cgi::genHeaderNonCacheable |
| 60 |
|
|
($q, \%conf, 'Web share Operation status report'); |
| 61 |
|
|
|
| 62 |
|
|
- print $q->p ($msg); |
| 63 |
|
|
+ print $q->div ({-class => "sme-error"}, $msg); |
| 64 |
|
|
print $q->hr; |
| 65 |
|
|
} |
| 66 |
|
|
|
| 67 |
|
|
diff -up smeserver-webshare-1.0.0/root/opt/webshare-tools/phpfm/incl/libfile.php.sme8bis smeserver-webshare-1.0.0/root/opt/webshare-tools/phpfm/incl/libfile.php |
| 68 |
|
|
--- smeserver-webshare-1.0.0/root/opt/webshare-tools/phpfm/incl/libfile.php.sme8bis 2006-01-30 16:36:11.000000000 -0500 |
| 69 |
|
|
+++ smeserver-webshare-1.0.0/root/opt/webshare-tools/phpfm/incl/libfile.php 2013-05-24 23:47:14.000000000 -0400 |
| 70 |
|
|
@@ -39,7 +39,7 @@ if ($AllowDownload || $AllowView) |
| 71 |
|
|
header("Content-Type: ".get_mimetype($filename)); |
| 72 |
|
|
header("Content-Length: ".filesize($fullpath)); |
| 73 |
|
|
if ($_GET['action'] == "download"); |
| 74 |
|
|
- header("Content-Disposition: attachment; filename=$filename"); |
| 75 |
|
|
+ header("Content-Disposition: attachment; filename=\"$filename\""); |
| 76 |
|
|
|
| 77 |
|
|
readfile($fullpath); |
| 78 |
|
|
} |
| 79 |
|
|
@@ -47,4 +47,4 @@ if ($AllowDownload || $AllowView) |
| 80 |
|
|
print "<font color='#CC0000'>$StrDownloadFail</font>"; |
| 81 |
|
|
} |
| 82 |
|
|
|
| 83 |
|
|
-?> |
| 84 |
|
|
\ Pas de fin de ligne à la fin du fichier. |
| 85 |
|
|
+?> |
Parent Directory
| 
Revision Log
| 
Revision Graph
