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 --- e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/ibay-delete 2021-03-08 03:47:25.664000000 -0500 +++ e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/ibay-delete 2021-03-08 14:40:29.013000000 -0500 @@ -36,7 +36,6 @@ x=0 # exit value /bin/rm -rf /home/e-smith/files/ibays/$ibay -/bin/rm -rf /var/cache/e-smith/files/ibays/$ibay if [ "$ldapauth" != "enabled" ] then /usr/sbin/userdel "$ibay" || x=1 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 --- e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/ibay-modify 2021-03-08 03:47:25.664000000 -0500 +++ e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/ibay-modify 2021-03-08 14:40:28.767000000 -0500 @@ -158,23 +158,9 @@ #-------------------------------------------------- # main directory is writeable only by root #-------------------------------------------------- -##create ibay cache dir -my $cachedir= ('/var/cache/e-smith/files/ibays/' . $ibay->key ); -mkdir $cachedir unless (-d $cachedir); -##create the upload_tmp_folder in the ibay cache dir if PHPTmpDir is set to 'enabled' -my $tmpdir = $ibay->prop('PHPTmpDir') || 'enabled'; -$tmpdir = ('/var/cache/e-smith/files/ibays/' . $ibay->key . '/tmp') if $tmpdir eq 'enabled'; -mkdir $tmpdir unless (-d $tmpdir || $tmpdir eq "disabled"); -##create the session dir in the ibay cache dir if is set to 'enabled' -my $sessdir = $ibay->prop('PHPSessionDir') || 'enabled'; -$sessdir = ('/var/cache/e-smith/files/ibays/' . $ibay->key . '/session') if $sessdir eq 'enabled'; -mkdir $sessdir unless (-d $sessdir || $sessdir eq "disabled"); - chdir "/home/e-smith/files/ibays/$ibayName" or ( $x = 255, warn "Could not chdir to /home/e-smith/files/ibays/$ibayName" ); -mkdir '.AppleDesktop' unless (-d '.AppleDesktop'); - esmith::util::chownFile("root", "root", "."); chmod 0755, "."; @@ -238,23 +224,9 @@ $experm |= $::fileperm; chmod $experm, $_; } - ##chmod 0600 ; chown www:www if upload_tmp_folder exists - my $tmpdirperm = (('/var/cache/e-smith/files/ibays/' . $ibay->key . '/tmp')||''); - if ( -d $tmpdirperm) - { - system ('/bin/chown', '-R', 'www:www' , $tmpdirperm); - system ('/bin/chmod', '0600' , $tmpdirperm ); - } - ##chmod 0600 ; chown www:www if session folder exists - my $sessdirperm = (('/var/cache/e-smith/files/ibays/' . $ibay->key . '/session')||''); - if ( -d $sessdirperm) - { - system ('/bin/chown', '-R', 'www:www' , $sessdirperm); - system ('/bin/chmod', '0600' , $sessdirperm ); - } } } -find(\&process, glob("* .AppleDesktop")); +find(\&process, glob("*")); exit ($x); 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 --- e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/init-ibays 2021-03-08 03:47:25.665000000 -0500 +++ e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/init-ibays 2021-03-08 14:40:28.530000000 -0500 @@ -60,41 +60,5 @@ "/home/e-smith/files/ibays/Primary/html/index.htm"); } -#we want to create the folder tmp if enabled in all Ibays(enabled by default) -#introduced by the bug [SME: 7011] -my $accounts = esmith::AccountsDB->open_ro or warn "Could not open account database: $!"; -my @ibays = $accounts->ibays; -my $uid = '102'; #or www -my $gid = '102'; #or www - -foreach my $ibay (@ibays) -{ - #Then we retrieve the name of the ebay - my $key = $ibay->key; - my $path = (('/var/cache/e-smith/files/ibays/') . $key ); - #we test the condition if ibay folder exists - unless (-d $path ) - { - mkdir $path, 0600 or warn "Could not create dir $path: $!"; - chown $uid, $gid, $path or warn "Could not chown dir $path: $!"; - } - - $path = (('/var/cache/e-smith/files/ibays/') . $key . '/tmp'); - #we test the condition if /tmp exists - unless (-d $path) - { - mkdir $path, 0600 or warn "Could not create dir $path: $!"; - chown $uid, $gid, $path or warn "Could not chown dir $path: $!"; - } - - $path = (('/var/cache/e-smith/files/ibays/') . $key . '/session'); - #we test the condition if /session exists - unless (-d $path) - { - mkdir $path, 0600 or warn "Could not create dir $path: $!"; - chown $uid, $gid, $path or warn "Could not chown dir $path: $!"; - } -} - exit (0); 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 --- 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 +++ 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 @@ -95,14 +95,6 @@ my $sslRequireSSL = $properties{'SSLRequireSSL'} || "disabled"; my $ssldb = $properties{'SSL'} || 'disabled'; -###php values for each ibay or set 'disabled' if not defined - my $allowurlfopen = $properties{'AllowUrlfOpen'} || 'disabled'; - my $memoryLimit = $properties{'MemoryLimit'} || 'disabled'; - my $upmaxfileSize = $properties{'UpMaxFileSize'} || 'disabled'; - my $postmaxSize = $properties{'PostMaxSize'} || 'disabled'; - my $maxexecutionTime = $properties{'MaxExecTime'} || 'disabled'; - $maxexecutionTime = '0' if $maxexecutionTime eq 'unlimited'; - $OUT .= "\n"; $OUT .= "#------------------------------------------------------------\n"; $OUT .= "# $key ibay directories ($properties{'Name'})\n"; @@ -120,20 +112,12 @@ if ($dynamicContent eq 'enabled') { $OUT .= " Options +Includes\n"; - if ((exists $php{status} and $php{status} eq "enabled") and $phpModule eq "enabled") - { - $OUT .= " php_admin_flag allow_url_fopen on\n" if ($allowurlfopen eq 'enabled'); - $OUT .= " php_admin_value memory_limit $memoryLimit\n" if ($memoryLimit ne 'disabled'); - $OUT .= " php_admin_value upload_max_filesize $upmaxfileSize\n" if ($upmaxfileSize ne 'disabled'); - $OUT .= " php_admin_value post_max_size $postmaxSize\n" if ($postmaxSize ne 'disabled'); - $OUT .= " php_admin_value max_execution_time $maxexecutionTime\n" if ($maxexecutionTime ne 'disabled'); - } } else { $OUT .= " DirectoryIndex index.shtml index.htm index.html\n"; $OUT .= " Options +IncludesNOEXEC\n"; - $OUT .= " \n"; + $OUT .= " \n"; $OUT .= " order deny,allow\n"; $OUT .= " Deny from all\n"; $OUT .= " \n"; @@ -152,10 +136,6 @@ $OUT .= " Satisfy $satisfy\n"; } - if (($properties{PHPRegisterGlobals} || 'disabled') eq 'enabled') - { - $OUT .= " php_flag register_globals on\n"; - } $OUT .= "\n"; $OUT .= "\n";