--- rpms/e-smith-ibays/sme9/e-smith-ibays-2.4.0_add_php_values_and_SSLRequireSSL.patch 2014/03/15 17:10:40 1.1 +++ rpms/e-smith-ibays/sme9/e-smith-ibays-2.4.0_add_php_values_and_SSLRequireSSL.patch 2014/04/08 20:05:03 1.2 @@ -5,15 +5,15 @@ diff -Nur e-smith-ibays-2.4.0.old/root/e my $followSymLinks = $properties{'FollowSymLinks'} || "disabled"; my $indexes = $properties{'Indexes'} || "enabled"; my $sslRequireSSL = $properties{'SSLRequireSSL'} || "disabled"; -+ my $ssldb = $properties{'SSL'} || "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 $maxfileSize = $properties{'UpMaxFileSize'} || "disabled"; -+ my $postmaxSize = $properties{'PostMaxSize'} || "disabled"; -+ my $maxexecutionTime = $properties{'MaxExecTime'} || "disabled"; -+ $maxexecutionTime = '0' if $maxexecutionTime eq "unlimited"; ++###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"; @@ -23,7 +23,7 @@ diff -Nur e-smith-ibays-2.4.0.old/root/e $OUT .= "\n"; $OUT .= "\n"; - if ($sslRequireSSL eq 'enabled') -+ if (("$sslRequireSSL" eq 'enabled') || ("$ssldb" eq 'enabled')) ++ if (($sslRequireSSL eq 'enabled') || ($ssldb eq 'enabled')) { $OUT .=" SSLRequireSSL\n"; } @@ -34,11 +34,11 @@ diff -Nur e-smith-ibays-2.4.0.old/root/e - { + { $OUT .= " Options +Includes\n"; -+ $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 $maxfileSize\n" if ($maxfileSize 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"); ++ $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 {