| 1 |
stephdl |
1.1 |
diff -ruN smeserver-userpanel-1.1/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/80Aliases05userpanel smeserver-userpanel-1.1-4/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/80Aliases05userpanel |
| 2 |
|
|
--- smeserver-userpanel-1.1/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/80Aliases05userpanel 2014-08-22 19:08:39.000000000 +0400 |
| 3 |
|
|
+++ smeserver-userpanel-1.1-4/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/80Aliases05userpanel 2015-10-16 01:01:54.348553751 +0400 |
| 4 |
|
|
@@ -1,9 +1,10 @@ |
| 5 |
|
|
|
| 6 |
|
|
# Aliases for the e-smith-user panel: |
| 7 |
|
|
- |
| 8 |
|
|
ScriptAlias /user-manager/cgi-bin /etc/e-smith/web/panels/user/cgi-bin |
| 9 |
|
|
Alias /user-manager /etc/e-smith/web/panels/user/html |
| 10 |
|
|
- |
| 11 |
|
|
- ScriptAlias /user/cgi-bin /etc/e-smith/web/panels/user/cgi-bin |
| 12 |
|
|
- Alias /user /etc/e-smith/web/panels/user/html |
| 13 |
|
|
+ { |
| 14 |
|
|
+ my $UserAlias = ${UserPanelAlias} || 'user'; |
| 15 |
|
|
+ $OUT .= " ScriptAlias /$UserAlias/cgi-bin /etc/e-smith/web/panels/user/cgi-bin\n"; |
| 16 |
|
|
+ $OUT .= " Alias /$UserAlias /etc/e-smith/web/panels/user/html\n"; |
| 17 |
|
|
+ } |
| 18 |
|
|
|
| 19 |
|
|
diff -ruN smeserver-userpanel-1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass smeserver-userpanel-1.1-4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass |
| 20 |
|
|
--- smeserver-userpanel-1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass 2014-08-22 19:08:39.000000000 +0400 |
| 21 |
|
|
+++ smeserver-userpanel-1.1-4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass 2015-10-15 23:16:04.240354029 +0400 |
| 22 |
|
|
@@ -3,9 +3,11 @@ |
| 23 |
|
|
|
| 24 |
|
|
$haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no'; |
| 25 |
|
|
$plainTextAccess = ${'httpd-admin'}{PermitPlainTextAccess} || 'no'; |
| 26 |
|
|
+ $UserAlias = ${UserPanelAlias} || 'user'; |
| 27 |
|
|
+ |
| 28 |
|
|
|
| 29 |
|
|
$OUT = ''; |
| 30 |
|
|
- foreach $place ('user-manager','user') |
| 31 |
|
|
+ foreach $place ('user-manager',$UserAlias) |
| 32 |
|
|
{ |
| 33 |
|
|
if (($port eq "80") && ($haveSSL eq 'yes') && ($plainTextAccess ne 'yes')) |
| 34 |
|
|
{ |
| 35 |
|
|
diff -ruN smeserver-userpanel-1.1/root/etc/e-smith/web/functions/userpanel-navigation smeserver-userpanel-1.1-4/root/etc/e-smith/web/functions/userpanel-navigation |
| 36 |
|
|
--- smeserver-userpanel-1.1/root/etc/e-smith/web/functions/userpanel-navigation 2014-08-22 19:08:39.000000000 +0400 |
| 37 |
|
|
+++ smeserver-userpanel-1.1-4/root/etc/e-smith/web/functions/userpanel-navigation 2015-10-17 15:06:35.939945353 +0400 |
| 38 |
|
|
@@ -141,6 +141,8 @@ |
| 39 |
|
|
my $acctName = $ENV{'REMOTE_USER'}; |
| 40 |
|
|
my @adminpanels; |
| 41 |
|
|
|
| 42 |
|
|
+ my $UserAlias = $conf{UserPanelAlias} || 'user'; |
| 43 |
|
|
+ |
| 44 |
|
|
my $availablePanels = db_get_prop(\%accounts, $acctName, 'AdminPanels') || ''; |
| 45 |
|
|
push (@adminpanels, split (/,/, $availablePanels, -1)); |
| 46 |
|
|
|
| 47 |
|
|
@@ -259,7 +261,7 @@ |
| 48 |
|
|
$nav {$heading} {'WEIGHT'} += $headingWeight; |
| 49 |
|
|
|
| 50 |
|
|
my @filename = split /\//, $files_hash{$file}; |
| 51 |
|
|
- my $path = "/user/$filename[scalar @filename - 1]"; |
| 52 |
|
|
+ my $path = "/$UserAlias/$filename[scalar @filename - 1]"; |
| 53 |
|
|
|
| 54 |
|
|
push @{ $nav {$heading} {'DESCRIPTIONS'} }, |
| 55 |
|
|
{ DESCRIPTION => $description, |
Parent Directory
| 
Revision Log
| 
Revision Graph
