Commit a9b32524 authored by Marius Cramer's avatar Marius Cramer

- Ported patches

parent 7bcf62fc
......@@ -34,6 +34,7 @@ server {
fastcgi_buffers 256 4k;
fastcgi_busy_buffers_size 256k;
fastcgi_temp_file_write_size 256k;
fastcgi_read_timeout 1200;
}
location ~ /\. {
......
......@@ -18,4 +18,7 @@ chdir = /
; php_admin_value[open_basedir] = /usr/local/ispconfig/interface:/usr/local/ispconfig/security:/usr/share:/var/lib/roundcube:/etc/roundcube:/usr/share/roundcube
php_admin_value[session.save_path] = /usr/local/ispconfig/interface/temp
php_admin_flag[magic_quotes_gpc] = off
\ No newline at end of file
php_admin_flag[magic_quotes_gpc] = off
php_admin_value[memory_limit] = 4096M
php_admin_value[max_execution_time] = 1200
......@@ -124,6 +124,17 @@ class listform {
$this->errorMessage .= "Custom datasource class or function is empty<br />\r\n";
}
}
if($api == false && isset($field['filters']) && is_array($field['filters'])) {
$new_values = array();
foreach($values as $index => $value) {
$new_index = $app->tform->filterField($index, $index, $field['filters'], 'SHOW');
$new_values[$new_index] = $app->tform->filterField($index, (isset($values[$index]))?$values[$index]:'', $field['filters'], 'SHOW');
}
$values = $new_values;
unset($new_values);
unset($new_index);
}
return $values;
}
......
......@@ -594,7 +594,7 @@ class apache2_plugin {
}
//* Unmount the old log directory bfore we move the log dir
exec('fuser -km '.escapeshellcmd($old_dir.'/log'));
//exec('fuser -km '.escapeshellcmd($old_dir.'/log'));
exec('umount '.escapeshellcmd($old_dir.'/log'));
//* Create new base directory, if it does not exist yet
......@@ -677,7 +677,7 @@ class apache2_plugin {
$app->system->removeLine('/etc/fstab', $fstab_line);
//* Unmount log directory
exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
//exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
}
......@@ -1902,12 +1902,12 @@ class apache2_plugin {
if(is_array($log_folders) && !empty($log_folders)){
foreach($log_folders as $log_folder){
//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
//exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
}
} else {
//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
//exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
}
}
......
......@@ -475,7 +475,7 @@ class nginx_plugin {
}
//* Unmount the old log directory bfore we move the log dir
exec('fuser -km '.escapeshellcmd($old_dir.'/log'));
//exec('fuser -km '.escapeshellcmd($old_dir.'/log'));
exec('umount '.escapeshellcmd($old_dir.'/log'));
//* Create new base directory, if it does not exist yet
......@@ -558,7 +558,7 @@ class nginx_plugin {
$app->system->removeLine('/etc/fstab', $fstab_line);
//* Unmount log directory
exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
//exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
}
......@@ -1882,12 +1882,12 @@ class nginx_plugin {
if(is_array($log_folders) && !empty($log_folders)){
foreach($log_folders as $log_folder){
//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
//exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
}
} else {
//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
//exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment