Allow use of webmin variables in backup dests

mysql/config

@@ -20,3 +20,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-aix

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-cobalt-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-coherent-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-debian-linux

@@ -18,3 +18,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-debian-linux-2.2-*

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/mysql/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-freebsd

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-gentoo-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/mysql/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-mandrake-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-mandrake-linux-10.1-*

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-msc-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-netbsd

@@ -18,3 +18,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-open-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-openmamba-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-pardus-linux

@@ -16,3 +16,4 @@ max_dbs=50
 my_cnf=/etc/mysql/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-redhat-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-redhat-linux-24.0-*

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-redhat-linux-7.0-23.0

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-slackware-linux-8.0-*

@@ -23,3 +23,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-sol-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-solaris-10

@@ -20,3 +20,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-solaris-11-*

@@ -20,3 +20,4 @@ max_dbs=50
 my_cnf=/etc/mysql/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-solaris-9

@@ -20,3 +20,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-suse-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-suse-linux-7.1-*

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-trustix-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-turbo-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-united-linux

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config-windows

@@ -19,3 +19,4 @@ max_dbs=50
 my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
+webmin_subs=0

mysql/config.info

@@ -8,6 +8,7 @@ blob_mode=Show blob and text fields as,1,0-Data in table,1-Links to download
 nodbi=Use DBI to connect if available?,1,0-Yes,1-No
 nopwd=Use MYSQL_PWD variable to pass password?,1,0-Yes,1-No
 date_subs=Do <tt>strftime</tt> substitution of backup destinations?,1,1-Yes,0-No
+webmin_subs=Do Webmin variable substitution on backup destinations?,1,1-Yes,0-No
 passwd_mode=Password hashing mode,1,1-Old,0-Default
 encoding=Encoding for database content,3,Default (from current language)
 max_dbs=Maximum number of databases and tables to display,0,5

mysql/mysql-lib.pl

@@ -783,18 +783,23 @@ else {
 # Does strftime-style date substitutions on a filename, if enabled
 sub date_subs
 {
+local ($path) = @_;
+local $rv;
 if ($config{'date_subs'}) {
         eval "use POSIX";
 	eval "use posix" if ($@);
         local @tm = localtime(time());
 	&clear_time_locale();
-        local $rv = strftime($_[0], @tm);
+        $rv = strftime($path, @tm);
 	&reset_time_locale();
-	return $rv;
         }
 else {
-        return $_[0];
+        $path = $rv;
         }
+if ($config{'webmin_subs'}) {
+	$rv = &substitute_template($rv, { });
+	}
+return $rv;
 }
 
 # execute_before(db, handle, escape, path, db-for-config)