diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-php smeserver-php-3.0.0/root/etc/e-smith/db/accounts/migrate/20ibay-php --- smeserver-php-3.0.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-php 2021-09-17 22:29:19.715000000 -0400 +++ smeserver-php-3.0.0/root/etc/e-smith/db/accounts/migrate/20ibay-php 2021-09-17 22:32:21.548000000 -0400 @@ -5,7 +5,7 @@ PHPPostMaxSize => "PostMaxSize", PHPMaxExecutionTime => "MaxExecutionTime", PHPMemoryLimit => "MemoryLimit", - PHPAllowUrlFopen => "AllowUrlFopen", + PHPAllowUrlfOpen => "AllowUrlFopen", PHPFileUpload => "FileUpload", PHPDisabledFunctions => "DisabledFunctions", PHPAutoPrependFile => "AutoPrependFile", diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2021-09-17 22:29:19.715000000 -0400 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2021-09-17 22:54:48.304000000 -0400 @@ -38,16 +38,21 @@ # the following block is only in case phpmodule is enabled. if (exists $php{status} and $php{status} eq "enabled" and $phpModule eq "enabled") { - my $allow_url_fopen = $properties{'AllowUrlfOpen'} || $defaultPHPproperties{'AllowUrlfOpen'} ; + my $allow_url_fopen = $properties{'AllowUrlFopen'} || $defaultPHPproperties{'AllowUrlFopen'} ; my $memoryLimit = $properties{'MemoryLimit'} || $defaultPHPproperties{'MemoryLimit'}; my $upmaxfileSize = $properties{'UploadMaxFilesize'} || $defaultPHPproperties{'UploadMaxFilesize'}; my $postmaxSize = $properties{'PostMaxSize'} || $defaultPHPproperties{'PostMaxSize'}; my $file_upload = $properties{'FileUpload'} || $defaultPHPproperties{'FileUpload'}; my $maxexecutionTime = (defined $properties{'MaxExecutionTime'}) ? $properties{'MaxExecutionTime'} : $defaultPHPproperties{'MaxExecutionTime'}; my $max_input_time = (defined $properties{'MaxInputTime'}) ? $properties{'MaxInputTime'} : $defaultPHPproperties{'MaxInputTime'}; + my $display_errors = $properties{'DisplayErrors'} || 'off'; + my $error_reporting = $properties{'ErrorReporting'} || 'E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT'; + $maxexecutionTime = '0' if $maxexecutionTime eq 'unlimited'; $file_upload = ($file_upload =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $allow_url_fopen = ($allow_url_fopen =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; + $display_errors = ($display_errors =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; + $error_reporting = ($error_reporting eq 'E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT') ? '#default error_reporting' : "php_value[error_reporting] = $error_reporting"; $OUT .= " php_admin_flag allow_url_fopen $allow_url_fopen\n"; $OUT .= " php_admin_value memory_limit $memoryLimit\n"; @@ -56,6 +61,8 @@ $OUT .= " php_admin_flag file_upload $file_upload\n"; $OUT .= " php_admin_value max_input_time $max_input_time\n"; $OUT .= " php_admin_value max_execution_time $maxexecutionTime\n"; + $OUT .= " php_flag display_errors $display_errors\n"; + $OUT .= " $error_reporting\n"; # Set upload_tmp_dir and sys_temp_dir where php can upload files or write tmp files $tmpdir= "/var/lib/php/$key/tmp"; diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays 2021-09-17 22:29:19.726000000 -0400 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays 2021-09-17 22:53:19.534000000 -0400 @@ -15,10 +15,12 @@ my $memory_limit = $ibay->prop('MemoryLimit') || $defaultPHPproperties{'MemoryLimit'}; my $max_execution_time = (defined $ibay->prop('MaxExecutionTime') ) ? $ibay->prop('MaxExecutionTime') : $defaultPHPproperties{'MaxExecutionTime'}; my $max_input_time = (defined $ibay->prop('MaxInputTime'))? $ibay->prop('MaxInputTime') : $defaultPHPproperties{'MaxInputTime'}; - my $allow_url_fopen = $ibay->prop('AllowUrlFopen') || $defaultPHPproperties{'AllowUrlfOpen'}; + my $allow_url_fopen = $ibay->prop('AllowUrlFopen') || $defaultPHPproperties{'AllowUrlFopen'}; my $post_max_size = $ibay->prop('PostMaxSize') || $defaultPHPproperties{'PostMaxSize'}; my $upload_max_filesize = $ibay->prop('UploadMaxFilesize') || $defaultPHPproperties{'UploadMaxFilesize'}; my $file_upload = $ibay->prop('FileUpload') || $defaultPHPproperties{'FileUpload'}; + my $display_errors = $ibay->prop('DisplayErrors') || 'off'; #we do not set this one at php level to avoid to have a whole server displaying errors and security issues + my $error_reporting = $ibay->prop('ErrorReporting') || 'E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT'; #same reason, we hardcoded the default my $open_basedir = $ibay->prop('PHPBaseDir') || '/home/e-smith/files/ibays/' . $key . '/' . ':/var/lib/php/' . $key . '/'; my $disabled_functions = (defined $ibay->prop('DisabledFunctions')) ? $ibay->prop('DisabledFunctions') : $defaultPHPproperties{'DisabledFunctions'}; @@ -32,6 +34,8 @@ $file_upload = ($file_upload =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $allow_url_fopen = ($allow_url_fopen =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $disabled_functions = join(', ', split /[,;:]/, $disabled_functions); + $display_errors = ($display_errors =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; + $error_reporting = ($error_reporting eq 'E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT') ? '#default error_reporting' : "php_value[error_reporting] = $error_reporting"; $open_basedir = join(':', split(/[,;:]/, $open_basedir . $autoprepath)); $OUT .=<<"_EOF" if ($version eq $PHP_VERSION); @@ -56,7 +60,8 @@ php_admin_value[upload_tmp_dir] = /var/lib/php/$key/tmp php_admin_value[sys_temp_dir] = /var/lib/php/$key/tmp php_admin_value[mail.force_extra_parameters] = '-f $MailForceSender' -php_admin_flag[display_errors] = off +php_flag[display_errors] = $display_errors +$error_reporting php_admin_flag[log_errors] = on php_admin_value[error_log] = /var/log/php/$key/error.log php_admin_value[memory_limit] = $memory_limit