Fix to remove modules and use a new vendor_perl under Webmin

webmin · Nov 17, 2022 · b7bf0bb · b7bf0bb
1 parent e09518f
commit b7bf0bb
Show file tree

Hide file tree

Showing 71 changed files with 65 additions and 8,128 deletions.
diff --git a/401.cgi b/401.cgi
@@ -9,6 +9,6 @@ use strict;
 
 our $trust_unknown_referers = 1;
 
-do("$ENV{'THEME_ROOT'}/authentic-lib.pl");
+do($ENV{'THEME_ROOT'} . "/authentic-lib.pl");
 
 error_40x();
diff --git a/403.cgi b/403.cgi
@@ -9,6 +9,6 @@ use strict;
 
 our $trust_unknown_referers = 1;
 
-do("$ENV{'THEME_ROOT'}/authentic-lib.pl");
+do($ENV{'THEME_ROOT'} . "/authentic-lib.pl");
 
 error_40x();
diff --git a/404.cgi b/404.cgi
@@ -9,6 +9,6 @@ use strict;
 
 our $trust_unknown_referers = 1;
 
-do("$ENV{'THEME_ROOT'}/authentic-lib.pl");
+do($ENV{'THEME_ROOT'} . "/authentic-lib.pl");
 
 error_40x();
diff --git a/authentic-init.pl b/authentic-init.pl
@@ -37,7 +37,7 @@
      $theme_root_directory,
      $title);
 
-do("$ENV{'THEME_ROOT'}/authentic-funcs.pl");
+do($ENV{'THEME_ROOT'} . "/authentic-funcs.pl");
 init_prefail();
 init_vars();
 
@@ -267,7 +267,7 @@ sub embed_header
     print "</script>\n";
 
     if ($args[2]) {
-        do("$ENV{'THEME_ROOT'}/dependencies.pl");
+        do($ENV{'THEME_ROOT'} . "/dependencies.pl");
     }
 
     if ($args[3] eq '1') {

diff --git a/authentic-lib.pl b/authentic-lib.pl
@@ -5,7 +5,7 @@
 #
 use strict;
 
-use lib ("$ENV{'THEME_ROOT'}/lib");
+use lib ($ENV{'PERLLIB'} . "/vendor_perl");
 
 use File::Grep qw( fgrep fmap fdo );
 use Encode     qw( encode decode );
@@ -26,7 +26,7 @@
 
 init_type();
 init_config();
-do("$ENV{'THEME_ROOT'}/authentic-init.pl");
+do($ENV{'THEME_ROOT'} . "/authentic-init.pl");
 
 sub authentic
 {
@@ -2216,7 +2216,7 @@ sub content
     print '</div>' . "\n";
 
     # Navigation
-    do("$ENV{'THEME_ROOT'}/navigation-lib.pl");
+    do($ENV{'THEME_ROOT'} . "/navigation-lib.pl");
     print '<aside style="' . get_filters() . '" id="sidebar" class="hidden-xs">' . "\n";
     print_switch();
     print "<ul class=\"navigation\">\n";

diff --git a/authentic.pl b/authentic.pl
@@ -38,7 +38,7 @@
      $user_module_config_directory,
      $theme_webprefix);
 
-do("$ENV{'THEME_ROOT'}/authentic-init.pl");
+do($ENV{'THEME_ROOT'} . "/authentic-init.pl");
 
 sub theme_header
 {

diff --git a/extensions/file-manager/bookmark.cgi b/extensions/file-manager/bookmark.cgi
@@ -10,7 +10,7 @@ use strict;
 
 our (%text, @remote_user_info, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 get_paths();
 my $confdir = "$remote_user_info[7]/.filemin";

diff --git a/extensions/file-manager/chattr.cgi b/extensions/file-manager/chattr.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my $recursive;
 my %errors;

diff --git a/extensions/file-manager/chcon.cgi b/extensions/file-manager/chcon.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my $recursive;
 my %errors;

diff --git a/extensions/file-manager/chmod.cgi b/extensions/file-manager/chmod.cgi
@@ -10,7 +10,7 @@ use strict;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my %errors;
 

diff --git a/extensions/file-manager/chown.cgi b/extensions/file-manager/chown.cgi
@@ -10,7 +10,7 @@ use strict;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my %errors;
 my $error_fatal;

diff --git a/extensions/file-manager/compress.cgi b/extensions/file-manager/compress.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in, %text, %config, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 if (!$in{'arch'}) {
     redirect_local('list.cgi?path=' . urlize($path) . '&module=filemin');

diff --git a/extensions/file-manager/copy.cgi b/extensions/file-manager/copy.cgi
@@ -10,7 +10,7 @@ use strict;
 
 our (%in, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 open(my $fh, ">", &get_paste_buffer_file()) or die "Error: $!";
 print $fh "copy\n";

diff --git a/extensions/file-manager/create_file.cgi b/extensions/file-manager/create_file.cgi
@@ -10,7 +10,7 @@ use strict;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my $path_urlized = urlize($path);
 

diff --git a/extensions/file-manager/create_folder.cgi b/extensions/file-manager/create_folder.cgi
@@ -10,7 +10,7 @@ use strict;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my $path_urlized = urlize($path);
 

diff --git a/extensions/file-manager/create_symlink.cgi b/extensions/file-manager/create_symlink.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my @entries_list = get_entries_list();
 my $path_urlized = urlize($path);

diff --git a/extensions/file-manager/cut.cgi b/extensions/file-manager/cut.cgi
@@ -10,7 +10,7 @@ use strict;
 
 our (%in, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 open(my $fh, ">", &get_paste_buffer_file()) or die "Error: $!";
 print $fh "cut\n";

diff --git a/extensions/file-manager/delete.cgi b/extensions/file-manager/delete.cgi
@@ -8,14 +8,14 @@
 #
 use strict;
 
-use lib ("$ENV{'THEME_ROOT'}/lib");
+use lib ($ENV{'PERLLIB'} . "/vendor_perl");
 
 use File::Copy;
 use File::Path;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my %errors;
 my @deleted_entries;

diff --git a/extensions/file-manager/download.cgi b/extensions/file-manager/download.cgi
@@ -10,7 +10,7 @@ use strict;
 
 our (%in, $cwd);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my $command;
 my $has_zip    = has_command('zip');

diff --git a/extensions/file-manager/extract.cgi b/extensions/file-manager/extract.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in, %text, %config, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my @entries_list = get_entries_list();
 my %errors;

diff --git a/extensions/file-manager/fetcher.cgi b/extensions/file-manager/fetcher.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 if (is_root() && supports_users()) {
     if ($in{'list_users'} || $in{'home_base'}) {

diff --git a/extensions/file-manager/file-manager-lib.pl b/extensions/file-manager/file-manager-lib.pl
@@ -5,9 +5,9 @@
 #
 use strict;
 
-use lib ("$ENV{'THEME_ROOT'}/lib");
+use lib ($ENV{'PERLLIB'} . "/vendor_perl");
 
-do("$ENV{'THEME_ROOT'}/authentic-funcs.pl");
+do($ENV{'THEME_ROOT'} . "/authentic-funcs.pl");
 
 use Cwd 'abs_path';
 use Encode qw(decode encode);

diff --git a/extensions/file-manager/gpg.cgi b/extensions/file-manager/gpg.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in, %text, %config, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my @entries_list = get_entries_list();
 my %errors;

diff --git a/extensions/file-manager/http_download.cgi b/extensions/file-manager/http_download.cgi
@@ -11,7 +11,7 @@ use strict;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 if (!$in{'link'}) {
     redirect_local('list.cgi?path=' . urlize($path) . '&module=filemin' . extra_query());

diff --git a/extensions/file-manager/list-images.cgi b/extensions/file-manager/list-images.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in, %text, %gconfig, %request_uri, %userconfig, @allowed_paths, @remote_user_info, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 kill_previous($0, $$);
 

diff --git a/extensions/file-manager/list.cgi b/extensions/file-manager/list.cgi
@@ -7,6 +7,6 @@
 #
 use strict;
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 print_content();
diff --git a/extensions/file-manager/paste.cgi b/extensions/file-manager/paste.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in, %request_uri, $cwd, $base, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 open(my $fh, "<" . &get_paste_buffer_file()) or die "Error: $!";
 my @arr = <$fh>;

diff --git a/extensions/file-manager/purge_trash.cgi b/extensions/file-manager/purge_trash.cgi
@@ -7,11 +7,11 @@
 #
 use strict;
 
-use lib ("$ENV{'THEME_ROOT'}/lib");
+use lib ($ENV{'PERLLIB'} . "/vendor_perl");
 
 our (%access, @remote_user_info, %in, %text, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 my %errors;
 my $tdirname = '.Trash';

diff --git a/extensions/file-manager/rename.cgi b/extensions/file-manager/rename.cgi
@@ -10,7 +10,7 @@ use strict;
 
 our (%in, %text, $cwd, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 if (!$in{'name'}) {
     redirect_local('list.cgi?path=' . urlize($path) . '&module=filemin' . extra_query());

diff --git a/extensions/file-manager/search.cgi b/extensions/file-manager/search.cgi
@@ -7,6 +7,6 @@
 #
 use strict;
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 print_content();
diff --git a/extensions/file-manager/tree.cgi b/extensions/file-manager/tree.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%in, %text, @allowed_paths, $cwd, $base, $path);
 
-do("$ENV{'THEME_ROOT'}/extensions/file-manager/file-manager-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/file-manager/file-manager-lib.pl");
 
 kill_previous($0, $$);
 

diff --git a/extensions/mail/folders.cgi b/extensions/mail/folders.cgi
@@ -7,11 +7,11 @@
 #
 use strict;
 
-use lib ("$ENV{'THEME_ROOT'}/lib");
+use lib ($ENV{'PERLLIB'} . "/vendor_perl");
 
 our (%in);
 
-do("$ENV{'THEME_ROOT'}/extensions/mail/mail-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/mail/mail-lib.pl");
 
 my %temporary;
 my @folders_data = list_folders_sorted();

diff --git a/extensions/mail/mail-lib.pl b/extensions/mail/mail-lib.pl
@@ -51,7 +51,7 @@ sub get_request_uri
 
 sub get_libs
 {
-    do("$ENV{'THEME_ROOT'}/authentic-funcs.pl");
+    do($ENV{'THEME_ROOT'} . "/authentic-funcs.pl");
     do(get_env('document_root') . '/' . get_module() . '/' . get_module() . '-lib.pl');
 
     ReadParse();

diff --git a/extensions/mail/message.cgi b/extensions/mail/message.cgi
@@ -10,7 +10,7 @@ use strict;
 my %email;
 our (%in);
 
-do("$ENV{'THEME_ROOT'}/extensions/mail/mail-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/mail/mail-lib.pl");
 
 my @folders = list_folders_sorted();
 my ($folder) = grep {$_->{'index'} == $in{'folder'}} @folders;

diff --git a/extensions/mail/messages.cgi b/extensions/mail/messages.cgi
@@ -9,7 +9,7 @@ use strict;
 
 our (%text, %in, %userconfig, %config, $special_folder_id);
 
-do("$ENV{'THEME_ROOT'}/extensions/mail/mail-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/mail/mail-lib.pl");
 
 my %mails;
 

diff --git a/extensions/mail/search.cgi b/extensions/mail/search.cgi
@@ -7,7 +7,7 @@
 #
 use strict;
 
-do("$ENV{'THEME_ROOT'}/extensions/mail/mail-lib.pl");
+do($ENV{'THEME_ROOT'} . "/extensions/mail/mail-lib.pl");
 
 # Find mail messages matching some pattern
 our (%text, %in, %userconfig);

diff --git a/index.cgi b/index.cgi
@@ -7,6 +7,6 @@
 #
 use strict;
 
-do("$ENV{'THEME_ROOT'}/authentic-lib.pl");
+do($ENV{'THEME_ROOT'} . "/authentic-lib.pl");
 
 authentic();