michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't show extensions UI when we enable them via packages https://forum.virtualmin.com/t/there-is-a-problem-with-php-extensions/124552

Browse Source
This commit is contained in:
Jamie Cameron
2025-01-31 19:40:25 -08:00
parent 14f9624ac4
commit 8595a36f18
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
phpini/edit_dirs.cgi
View File

@@ -21,18 +21,22 @@ print &ui_table_row(&opt_help($text{'dirs_include'}, 'include'),
&ui_textarea("include", join("\n", split(/:/, $include)), 3, 60)." ".
&file_chooser_button("include", 1, undef, undef, 1));
# Extensions directory
print &ui_table_row($text{'dirs_ext'},
&ui_opt_textbox("ext", &find_value("extension_dir", $conf),
60, $text{'default'})." ".
&file_chooser_button("ext", 1));
$inidir = &get_php_ini_dir($in{'file'});
if (!$inidir) {
# Extensions directory
print &ui_table_row($text{'dirs_ext'},
&ui_opt_textbox("ext", &find_value("extension_dir", $conf),
60, $text{'default'})." ".
&file_chooser_button("ext", 1));
# Enabled extensions
my @exts = map { [ $_->{'value'}, $_->{'value'} ] } &find("extension", $conf);
my @avail = &list_available_extensions($conf, $in{'file'});
if (@avail) {
print &ui_table_row($text{'dirs_exts'},
&ui_multi_select("exts", \@exts, \@avail, 10, 1));
# Enabled extensions
my @exts = map { [ $_->{'value'}, $_->{'value'} ] }
&find("extension", $conf);
my @avail = &list_available_extensions($conf, $in{'file'});
if (@avail) {
print &ui_table_row($text{'dirs_exts'},
&ui_multi_select("exts", \@exts, \@avail, 10, 1));
}
}
# Can accept uploads?

13
phpini/save_dirs.cgi
View File

@@ -19,11 +19,16 @@ else {
&save_directive($conf, "include_path", join(":", @incs));
}
$in{'ext_def'} || $in{'ext'} =~ /\S/ || &error($text{'dirs_eext'});
&save_directive($conf, "extension_dir", $in{'ext_def'} ? undef : $in{'ext'});
$inidir = &get_php_ini_dir($in{'file'});
if (!$inidir) {
$in{'ext_def'} || $in{'ext'} =~ /\S/ || &error($text{'dirs_eext'});
&save_directive($conf, "extension_dir",
$in{'ext_def'} ? undef : $in{'ext'});
if (defined($in{'exts'})) {
&save_directive($conf, "extension", [ split(/\r?\n/, $in{'exts'}) ]);
if (defined($in{'exts'})) {
&save_directive($conf, "extension",
[ split(/\r?\n/, $in{'exts'}) ]);
}
}
&save_directive($conf, "file_uploads", $in{'file_uploads'} || undef);