Fix strings escaping in tree-view for mail

extensions/mail/folders.cgi

@@ -29,9 +29,9 @@ foreach my $folder (@folders_data) {
     my ($fid) = $id =~ m#([^/]+)$#;
     my ($parent, $child) = $fid =~ m|^ (.+) \. ([^\.]+) \z|x;
     my $name   = $folder->{'name'};
-    my $key    = folders_escape_key($id);
-    my $title  = folders_title_unseen(html_escape($child ? $child : $name), $unread);
-    my $active = (folders_escape_key($in{'key'}) eq $key ? 1 : 0);
+    my $key    = folders_key_escape($id);
+    my $title  = folders_title_escape(folders_title_unseen(html_escape($child ? $child : $name), $unread));
+    my $active = (folders_key_escape($in{'key'}) eq $key ? 1 : 0);
     my $data = $temporary{$fid} = { key    => $key,
                                     title  => $title,
                                     active => $active,

extensions/mail/mail-lib.pm

@@ -72,9 +72,18 @@ sub get_json
     }
 }
 
-sub folders_escape_key
+sub folders_key_escape
 {
-    return quote_escape(replace(' ', '_', $_[0]));
+    my ($str) = @_;
+    $str =~ s/%26/&/g;
+    return replace(' ', '_', $str);
+}
+
+sub folders_title_escape
+{
+    my ($str) = @_;
+    $str =~ s/\\"/"/g;
+    return $str;
 }
 
 sub folders_title_unseen

extensions/mail/mail.src.js

@@ -54,7 +54,7 @@ const mail = (function() {
 
     // Get folders data
     function get(key) {
-      key = key ? ('?key=' + key) : String();
+      key = key ? ('?key=' + key.replace(/&/g, '%26')) : String();
 
       $.post(_g.path.extensions + "/mail/folders.cgi" + key + "", function(source) {
         if (!!key) {

theme.info

@@ -1,7 +1,7 @@
 desc=Authentic Theme
 longdesc=Webmin/Usermin/Virtualmin/Cloudmin theme based on Bootstrap and Font Awesome (https://github.com/qooob/authentic-theme)
 version=19.17
-mversion=2
+mversion=3
 depends=1.880 1.740
 webmin=1
 usermin=1