Version bump

Missed dialogs for new 1.830 distro

README

@@ -1,4 +1,4 @@
-Webmin Version 1.830
+Webmin Version 1.831
 --------------------
 Webmin is a web-based interface for system administration for Unix. 
 Using any browser that supports tables and forms, you can setup user

defaulttheme

@@ -1 +1 @@
-gray-theme
+authentic-theme

filemin/unauthenticated/templates/dialogs.html

@@ -104,7 +104,7 @@
                     <select name="method">
                         <option value="tar">.tar.gz</option>
                         <option value="zip">.zip</option>
-                    </select> 
+                    </select>
                 </form>
             </div>
             <div class="modal-footer">
@@ -163,6 +163,56 @@
     </div>
 </div>
 
+<div id="chattrDialog" class="modal fade">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="warning">$text{'chattr_selected'}</h4>
+            </div>
+            <div class="modal-body">
+                <form id="chattrForm">
+                    <div class="form-group">
+                        <label>$text{'attr_label'}</label>
+                        <input name="label" type="text" class="form-control">
+                        <label>$text{'dialog_recursive'}</label>
+                        <input id="chattr-recursive" type="checkbox" name="recursive" class="form-control">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="chattrSelected()">$text{'dialog_change'}</button>
+                <button type="button" class="btn bnt-default" data-dismiss="modal">$text{'dialog_cancel'}</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div id="chconDialog" class="modal fade">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="warning">$text{'chcon_selected'}</h4>
+            </div>
+            <div class="modal-body">
+                <form id="chconForm">
+                    <div class="form-group">
+                        <label>$text{'context_label'}</label>
+                        <input name="label" type="text" class="form-control">
+                        <label>$text{'dialog_recursive'}</label>
+                        <input id="chcon-recursive" type="checkbox" name="recursive" class="form-control">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="chconSelected()">$text{'dialog_change'}</button>
+                <button type="button" class="btn bnt-default" data-dismiss="modal">$text{'dialog_cancel'}</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div id="chmodDialog" class="modal fade">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -190,7 +240,7 @@
                             <td><input type="checkbox" name="group4" value="4" onclick="calc_chmod()"></td>
                             <td><input type="checkbox" name="other4" value="4" onclick="calc_chmod()"></td>
                         </tr>
-                        <tr>		
+                        <tr>
                             <td>$text{'chmod_write'}</td>
                             <td><input type="checkbox" name="owner2" value="2" onclick="calc_chmod()"></td>
                             <td><input type="checkbox" name="group2" value="2" onclick="calc_chmod()"></td>
@@ -318,3 +368,4 @@
         </div>
     </div>
 </div>
+

mount/lang/de

@@ -152,6 +152,7 @@ linux_continue=Weitermachen
 linux_conv=DOS-Unix-Zeilenumbruchumwandlung
 linux_conv2=OS/2-Unix-Zeilenumbruchumwandlung
 linux_credentials=Datei mit Anmeldeinformationen
+linux_cvers=CIFS Version
 linux_df=Reservierte Blöcke in Dateisystemgröße einrechnen?
 linux_disk=Festplatte
 linux_dmode=Verzeichnisrechte
@@ -161,6 +162,7 @@ linux_eautomap=Die Automount-Übersichtsdatei '$1' existiert nicht
 linux_ebind=Fehlendes oder nicht-existentes Original-Verzeichnis
 linux_ecname=Fehlender oder ungültiger Netbios-Client-Name
 linux_ecodepage=Fehlende oder ungültige Zeichensatztabelle
+linux_ecvers=CIFS Version muss eine Zahl sein
 linux_edev=Kein Gerät angegeben
 linux_edevfile=Die Gerätedatei '$1' existiert nicht
 linux_edmode='$1' ist kein gültiger oktaler Verzeichnismodus

mount/lang/en

@@ -390,6 +390,8 @@ linux_iocharset=IO character set
 linux_ecodepage=Missing or invalid code page
 linux_eiocharset=Missing or invalid IO character set
 linux_nounix=Disable CIFS Unix extensions?
+linux_cvers=CIFS version
+linux_ecvers=CIFS version must be a number
 
 log_mount=Mounted $3
 log_mount_l=Mounted $2 $1 on $3

mount/linux-lib.pl

@@ -1558,6 +1558,10 @@ elsif ($type eq $smbfs_fs || $type eq "cifs") {
 		print &ui_table_row($text{'linux_nounix'},
 			&ui_yesno_radio("smbfs_nounix",
 					defined($options{"nounix"})));
+
+		print &ui_table_row($text{'linux_cvers'},
+			&ui_opt_textbox("smbfs_vers", $options{"vers"},
+					5, $text{'linux_auto'}));
 		}
 	}
 elsif ($type eq "reiserfs") {
@@ -2123,6 +2127,13 @@ elsif ($_[0] eq $smbfs_fs || $_[0] eq "cifs") {
 
 		delete($options{'nounix'});
 		if ($in{'smbfs_nounix'}) { $options{'nounix'} = ''; }
+
+		delete($options{'vers'});
+		if (!$in{'smbfs_vers_def'}) {
+			$in{'smbfs_vers'} =~ /^[0-9\.]+$/ ||
+				&error($text{'linux_ecvers'});
+			$options{'vers'} = $in{'smbfs_vers'};
+			}
 		}
 	}
 elsif ($_[0] eq "reiserfs") {

mysql/index.cgi

@@ -53,9 +53,7 @@ elsif (!$mysql_version) {
 	&ui_print_footer("/", $text{'index'});
 	exit;
 	}
-open(VERSION, ">$module_config_directory/version");
-print VERSION $mysql_version,"\n";
-close(VERSION);
+&save_mysql_version($mysql_version);
 
 # Check if MYSQL_PWD works
 ($r, $rout) = &is_mysql_running();

version

@@ -1 +1 @@
-1.830
+1.831

webmin/letsencrypt-lib.pl

@@ -52,9 +52,9 @@ $email ||= "root\@$doms[0]";
 
 # Create a challenges directory under the web root
 my $challenge = "$webroot/.well-known/acme-challenge";
+my @st = stat($webroot);
+my $user = getpwuid($st[4]);
 if (!-d $challenge) {
-	my @st = stat($webroot);
-	my $user = getpwuid($st[4]);
 	my $cmd = "mkdir -p -m 755 ".quotemeta($challenge);
 	if ($user && $user ne "root") {
 		$cmd = &command_as_user($user, 0, $cmd);
@@ -65,6 +65,17 @@ if (!-d $challenge) {
 		}
 	}
 
+# Create a .htaccess file to ensure the directory is accessible 
+my $htaccess = "$challenge/.htaccess";
+if (!-r $htaccess) {
+	&open_tempfile(HT, ">$htaccess");
+	&print_tempfile(HT, "AuthType None\n");
+	&print_tempfile(HT, "Require all granted\n");
+	&print_tempfile(HT, "Satisfy any\n");
+	&close_tempfile(HT);
+	&set_ownership_permissions($user, undef, 0755, $htaccess);
+	}
+
 if ($letsencrypt_cmd && -d "/etc/letsencrypt/accounts") {
 	# Use the native Let's Encrypt client if possible
 	my $temp = &transname();