| 1 |
diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/ibay-delete e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/ibay-delete |
| 2 |
--- e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/ibay-delete 2021-03-08 03:47:25.664000000 -0500 |
| 3 |
+++ e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/ibay-delete 2021-03-08 14:40:29.013000000 -0500 |
| 4 |
@@ -36,7 +36,6 @@ |
| 5 |
x=0 # exit value |
| 6 |
|
| 7 |
/bin/rm -rf /home/e-smith/files/ibays/$ibay |
| 8 |
-/bin/rm -rf /var/cache/e-smith/files/ibays/$ibay |
| 9 |
if [ "$ldapauth" != "enabled" ] |
| 10 |
then |
| 11 |
/usr/sbin/userdel "$ibay" || x=1 |
| 12 |
diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/ibay-modify e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/ibay-modify |
| 13 |
--- e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/ibay-modify 2021-03-08 03:47:25.664000000 -0500 |
| 14 |
+++ e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/ibay-modify 2021-03-08 14:40:28.767000000 -0500 |
| 15 |
@@ -158,23 +158,9 @@ |
| 16 |
#-------------------------------------------------- |
| 17 |
# main directory is writeable only by root |
| 18 |
#-------------------------------------------------- |
| 19 |
-##create ibay cache dir |
| 20 |
-my $cachedir= ('/var/cache/e-smith/files/ibays/' . $ibay->key ); |
| 21 |
-mkdir $cachedir unless (-d $cachedir); |
| 22 |
-##create the upload_tmp_folder in the ibay cache dir if PHPTmpDir is set to 'enabled' |
| 23 |
-my $tmpdir = $ibay->prop('PHPTmpDir') || 'enabled'; |
| 24 |
-$tmpdir = ('/var/cache/e-smith/files/ibays/' . $ibay->key . '/tmp') if $tmpdir eq 'enabled'; |
| 25 |
-mkdir $tmpdir unless (-d $tmpdir || $tmpdir eq "disabled"); |
| 26 |
-##create the session dir in the ibay cache dir if is set to 'enabled' |
| 27 |
-my $sessdir = $ibay->prop('PHPSessionDir') || 'enabled'; |
| 28 |
-$sessdir = ('/var/cache/e-smith/files/ibays/' . $ibay->key . '/session') if $sessdir eq 'enabled'; |
| 29 |
-mkdir $sessdir unless (-d $sessdir || $sessdir eq "disabled"); |
| 30 |
- |
| 31 |
chdir "/home/e-smith/files/ibays/$ibayName" |
| 32 |
or ( $x = 255, warn "Could not chdir to /home/e-smith/files/ibays/$ibayName" ); |
| 33 |
|
| 34 |
-mkdir '.AppleDesktop' unless (-d '.AppleDesktop'); |
| 35 |
- |
| 36 |
esmith::util::chownFile("root", "root", "."); |
| 37 |
chmod 0755, "."; |
| 38 |
|
| 39 |
@@ -238,23 +224,9 @@ |
| 40 |
$experm |= $::fileperm; |
| 41 |
chmod $experm, $_; |
| 42 |
} |
| 43 |
- ##chmod 0600 ; chown www:www if upload_tmp_folder exists |
| 44 |
- my $tmpdirperm = (('/var/cache/e-smith/files/ibays/' . $ibay->key . '/tmp')||''); |
| 45 |
- if ( -d $tmpdirperm) |
| 46 |
- { |
| 47 |
- system ('/bin/chown', '-R', 'www:www' , $tmpdirperm); |
| 48 |
- system ('/bin/chmod', '0600' , $tmpdirperm ); |
| 49 |
- } |
| 50 |
- ##chmod 0600 ; chown www:www if session folder exists |
| 51 |
- my $sessdirperm = (('/var/cache/e-smith/files/ibays/' . $ibay->key . '/session')||''); |
| 52 |
- if ( -d $sessdirperm) |
| 53 |
- { |
| 54 |
- system ('/bin/chown', '-R', 'www:www' , $sessdirperm); |
| 55 |
- system ('/bin/chmod', '0600' , $sessdirperm ); |
| 56 |
- } |
| 57 |
} |
| 58 |
} |
| 59 |
|
| 60 |
-find(\&process, glob("* .AppleDesktop")); |
| 61 |
+find(\&process, glob("*")); |
| 62 |
|
| 63 |
exit ($x); |
| 64 |
diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/init-ibays e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/init-ibays |
| 65 |
--- e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/init-ibays 2021-03-08 03:47:25.665000000 -0500 |
| 66 |
+++ e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/init-ibays 2021-03-08 14:40:28.530000000 -0500 |
| 67 |
@@ -60,41 +60,5 @@ |
| 68 |
"/home/e-smith/files/ibays/Primary/html/index.htm"); |
| 69 |
} |
| 70 |
|
| 71 |
-#we want to create the folder tmp if enabled in all Ibays(enabled by default) |
| 72 |
-#introduced by the bug [SME: 7011] |
| 73 |
-my $accounts = esmith::AccountsDB->open_ro or warn "Could not open account database: $!"; |
| 74 |
-my @ibays = $accounts->ibays; |
| 75 |
-my $uid = '102'; #or www |
| 76 |
-my $gid = '102'; #or www |
| 77 |
- |
| 78 |
-foreach my $ibay (@ibays) |
| 79 |
-{ |
| 80 |
- #Then we retrieve the name of the ebay |
| 81 |
- my $key = $ibay->key; |
| 82 |
- my $path = (('/var/cache/e-smith/files/ibays/') . $key ); |
| 83 |
- #we test the condition if ibay folder exists |
| 84 |
- unless (-d $path ) |
| 85 |
- { |
| 86 |
- mkdir $path, 0600 or warn "Could not create dir $path: $!"; |
| 87 |
- chown $uid, $gid, $path or warn "Could not chown dir $path: $!"; |
| 88 |
- } |
| 89 |
- |
| 90 |
- $path = (('/var/cache/e-smith/files/ibays/') . $key . '/tmp'); |
| 91 |
- #we test the condition if /tmp exists |
| 92 |
- unless (-d $path) |
| 93 |
- { |
| 94 |
- mkdir $path, 0600 or warn "Could not create dir $path: $!"; |
| 95 |
- chown $uid, $gid, $path or warn "Could not chown dir $path: $!"; |
| 96 |
- } |
| 97 |
- |
| 98 |
- $path = (('/var/cache/e-smith/files/ibays/') . $key . '/session'); |
| 99 |
- #we test the condition if /session exists |
| 100 |
- unless (-d $path) |
| 101 |
- { |
| 102 |
- mkdir $path, 0600 or warn "Could not create dir $path: $!"; |
| 103 |
- chown $uid, $gid, $path or warn "Could not chown dir $path: $!"; |
| 104 |
- } |
| 105 |
-} |
| 106 |
- |
| 107 |
exit (0); |
| 108 |
|
| 109 |
diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays |
| 110 |
--- e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2021-03-08 03:47:25.670000000 -0500 |
| 111 |
+++ e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2021-03-08 14:40:29.246000000 -0500 |
| 112 |
@@ -95,14 +95,6 @@ |
| 113 |
my $sslRequireSSL = $properties{'SSLRequireSSL'} || "disabled"; |
| 114 |
my $ssldb = $properties{'SSL'} || 'disabled'; |
| 115 |
|
| 116 |
-###php values for each ibay or set 'disabled' if not defined |
| 117 |
- my $allowurlfopen = $properties{'AllowUrlfOpen'} || 'disabled'; |
| 118 |
- my $memoryLimit = $properties{'MemoryLimit'} || 'disabled'; |
| 119 |
- my $upmaxfileSize = $properties{'UpMaxFileSize'} || 'disabled'; |
| 120 |
- my $postmaxSize = $properties{'PostMaxSize'} || 'disabled'; |
| 121 |
- my $maxexecutionTime = $properties{'MaxExecTime'} || 'disabled'; |
| 122 |
- $maxexecutionTime = '0' if $maxexecutionTime eq 'unlimited'; |
| 123 |
- |
| 124 |
$OUT .= "\n"; |
| 125 |
$OUT .= "#------------------------------------------------------------\n"; |
| 126 |
$OUT .= "# $key ibay directories ($properties{'Name'})\n"; |
| 127 |
@@ -120,20 +112,12 @@ |
| 128 |
if ($dynamicContent eq 'enabled') |
| 129 |
{ |
| 130 |
$OUT .= " Options +Includes\n"; |
| 131 |
- if ((exists $php{status} and $php{status} eq "enabled") and $phpModule eq "enabled") |
| 132 |
- { |
| 133 |
- $OUT .= " php_admin_flag allow_url_fopen on\n" if ($allowurlfopen eq 'enabled'); |
| 134 |
- $OUT .= " php_admin_value memory_limit $memoryLimit\n" if ($memoryLimit ne 'disabled'); |
| 135 |
- $OUT .= " php_admin_value upload_max_filesize $upmaxfileSize\n" if ($upmaxfileSize ne 'disabled'); |
| 136 |
- $OUT .= " php_admin_value post_max_size $postmaxSize\n" if ($postmaxSize ne 'disabled'); |
| 137 |
- $OUT .= " php_admin_value max_execution_time $maxexecutionTime\n" if ($maxexecutionTime ne 'disabled'); |
| 138 |
- } |
| 139 |
} |
| 140 |
else |
| 141 |
{ |
| 142 |
$OUT .= " DirectoryIndex index.shtml index.htm index.html\n"; |
| 143 |
$OUT .= " Options +IncludesNOEXEC\n"; |
| 144 |
- $OUT .= " <FilesMatch \"\\.(php|phtml)\$\">\n"; |
| 145 |
+ $OUT .= " <FilesMatch \"\\.(phar|php|phtml)\$\">\n"; |
| 146 |
$OUT .= " order deny,allow\n"; |
| 147 |
$OUT .= " Deny from all\n"; |
| 148 |
$OUT .= " </FilesMatch>\n"; |
| 149 |
@@ -152,10 +136,6 @@ |
| 150 |
$OUT .= " Satisfy $satisfy\n"; |
| 151 |
} |
| 152 |
|
| 153 |
- if (($properties{PHPRegisterGlobals} || 'disabled') eq 'enabled') |
| 154 |
- { |
| 155 |
- $OUT .= " php_flag register_globals on\n"; |
| 156 |
- } |
| 157 |
$OUT .= "</Directory>\n"; |
| 158 |
|
| 159 |
$OUT .= "\n"; |
Parent Directory
| 
Revision Log
| 
Revision Graph
