Update to support the new bits on ZNC v.1.5-git

modules/webadmin/tmpl/add_edit_network.tmpl

@@ -15,6 +15,7 @@
 			<ul class="nav nav-tabs">
 				<li class="active"><a href="#netinfotab" data-toggle="tab">Network Info</a></li>
 				<li><a href="#floodprotab" data-toggle="tab">Flood Protection</a></li>
+				<li><a href="#charencodetab" data-toggle="tab">Character Encoding</a></li>
 				<li><a href="#channelstab" data-toggle="tab">Channels</a></li>
                 <li><a href="#modulestab" data-toggle="tab">Modules</a></li>
             </ul>
@@ -104,6 +105,14 @@
 						<span class="help-block">One server per line, "host [[+]port] [password]", + means SSL</span>
 					</div>
 				</div>	
+				
+				<div class="form-group">
+				<label for="inputTrustedSSL" class="col-sm-2 control-label">Trusted SSL fingerprints of this IRC network:</label>
+					<div class="col-sm-10">
+						<textarea class="form-control" name="fingerprints" rows="5"><? LOOP TrustedFingerprints ?><? VAR FP ?><? ENDLOOP ?></textarea>
+						<span class="help-block">When these certificates are encountered, checks for hostname, expiration date, CA are skipped</span>
+					</div>
+				</div>			
 			</div> <!-- Network Info -->
 			 
 			 <!-- Flood Protection -->
@@ -114,7 +123,7 @@
 						<div class="switch">
 							<input type="checkbox" name="floodprotection" id="floodprotection_checkbox" class="cmn-toggle cmn-toggle-round-flat" onchange="floodprotection_change();" <? IF FloodProtection ?>checked="checked"<? ENDIF ?> />
 							<label for="floodprotection_checkbox"></label>
-							<span class="help-block">This prevents 'excess flood' errors, which occur, when an IRC robot is command flooded or spammed.</span>
+							<span class="help-block">You might enable the flood protection. This prevents `excess flood' errors, which occur, when your IRC bot is command flooded or spammed. After changing this, reconnect ZNC to server</span>
 						</div>
 					</div>
 				</div>	 
@@ -122,26 +131,42 @@
 				<div class="form-group">
 				<label for="inputFloodproRate" class="col-sm-2 control-label">Flood protection rate:</label>
 					<div class="col-sm-10">
-						<input class="form-control" type="number" name="floodrate" min="0.3" step="0.05" id="floodrate" placeholder="The number of seconds per line." <? IF FloodProtection ?> value="<? VAR FloodRate ?>" <? ELSE ?> value="1.00" disabled="disabled" <? ENDIF ?> /> seconds per line
+						<input class="form-control" type="number" name="floodrate" min="0.3" step="0.05" id="floodrate" placeholder="The number of seconds per line." <? IF FloodProtection ?> value="<? VAR FloodRate ?>" <? ELSE ?> value="1.00" disabled="disabled" <? ENDIF ?> />
+						<span class="help-block">The number of seconds per line. After changing this, reconnect ZNC to server</span>
 					</div>
 				</div>			
 			 
+				
 				<div class="form-group">
 				<label for="inputFloodproBurst" class="col-sm-2 control-label">Flood protection burst:</label>
 					<div class="col-sm-10">
-						<input type="number" class="form-control" name="floodburst" min="1" id="inputFloodproBurst floodburst" placeholder="Defines the number of lines, which can be sent immediately." <? IF FloodProtection ?> value="<? VAR FloodBurst ?>" <? ELSE ?> value="4" disabled="disabled" <? ENDIF ?> /> lines can be sent immediately
+						<input type="number" class="form-control" name="floodburst" min="1" id="inputFloodproBurst floodburst" <? IF FloodProtection ?> value="<? VAR FloodBurst ?>" <? ELSE ?> value="4" disabled="disabled" <? ENDIF ?> /> 
+						<span class="help-block">Defines the number of lines, which can be sent immediately. After changing this, reconnect ZNC to server</span>
 					</div>
 				</div>			
 				
 				<div class="form-group">
-				<label for="inputJoinDelay" class="col-sm-2 control-label">Channel join delay:</label>
+				<label for="inputChanjoindelay" class="col-sm-2 control-label">Channel join delay:</label>
 					<div class="col-sm-10">
-						<input class="form-control" type="number" name="joindelay" id="joindelay" min="0" placeholder="Defines the delay in seconds, until channels are joined after getting connected." value="<? VAR JoinDelay ?>"/> seconds
+						<input type="number" class="form-control" name="joindelay" min="0" id="inputChanjoindelay joindelay" value="<? VAR JoinDelay ?>" /> 
+						<span class="help-block">Defines the delay in seconds, until channels are joined after getting connected</span>
 					</div>
 				</div>		
+
 				<script type="text/javascript">floodprotection_change();</script>
 			</div> <!-- Flood Protection -->
 			
+			
+			 <!-- Server Encoding -->
+			<div class="tab-pane fade" id="charencodetab">
+				<div class="form-group">
+					<label for="inputChanencode" class="col-sm-2 control-label">Server encoding:</label>
+						<div class="col-sm-10">
+							<? INC encoding_settings.tmpl ?>
+						</div>	
+				</div>		
+			</div> <!-- Server Encoding -->
+			
 			<!-- Channels -->
 			<div class="tab-pane fade" id="channelstab">
 				<? IF !Edit ?>

modules/webadmin/tmpl/add_edit_user.tmpl

@@ -316,6 +316,17 @@
 						</div>
 					</div>
 					
+
+					<div class="form-group">
+					<label for="inputClientencode" class="col-sm-2 control-label">Client encoding:</label>
+						<div class="col-sm-10">
+							<? INC encoding_settings.tmpl ?>
+							<span class="help-block">Character encoding used between IRC client and ZNC. After changing this, reconnect client to ZNC</span>
+						</div>
+					</div>
+
+
+					
 					<div class="form-group">
 					<label for="inputJoinTries" class="col-sm-2 control-label">Join Tries:</label>
 						<div class="col-sm-10">

modules/webadmin/tmpl/encoding_settings.tmpl

@@ -0,0 +1,56 @@
+<div class="radio">
+	<label>
+		<input type="radio" name="encoding_utf" id="encoding_utf_legacy" value="legacy" <? IF EncodingUtf == "legacy" ?>checked="checked"<? ENDIF ?> <? IF EncodingDisabled ?>disabled="disabled"<? ENDIF ?> />
+		<span class="help-block" for="encoding_utf_legacy">Don't ensure any encoding at all (legacy mode, not recommended)</span>
+	</label>
+</div>
+
+<div class="radio">
+	<label>
+		<input type="radio" name="encoding_utf" id="encoding_utf_send" value="send" <? IF EncodingUtf == "send" ?>checked="checked"<? ENDIF ?> <? IF EncodingDisabled ?>disabled="disabled"<? ENDIF ?> />
+		<span class="help-block" for="encoding_utf_send">Try to parse as UTF-8 and as <span class="encoding-placeholder-big text-success">&nbsp;&nbsp;<span class="encoding-placeholder"></span>&nbsp;&nbsp;</span>, send as UTF-8</span>
+	</label>
+</div>
+
+<div class="radio">
+	<label>
+		<input type="radio" name="encoding_utf" id="encoding_utf_receive" value="receive" <? IF EncodingUtf == "receive" ?>checked="checked"<? ENDIF ?> <? IF EncodingDisabled ?>disabled="disabled"<? ENDIF ?> />
+		<span class="help-block" for="encoding_utf_receive">Try to parse as UTF-8 and as <span class="encoding-placeholder-big text-success">&nbsp;&nbsp;<span class="encoding-placeholder"></span>&nbsp;&nbsp;</span>, send as <span class="encoding-placeholder-big text-success">&nbsp;&nbsp;<span class="encoding-placeholder"></span	>&nbsp;&nbsp;</span>
+	</label>
+</div>
+
+<div class="radio">
+	<label>
+		<input type="radio" name="encoding_utf" id="encoding_utf_simple" value="simple" <? IF EncodingUtf == "simple" ?>checked="checked"<? ENDIF ?> <? IF EncodingDisabled ?>disabled="disabled"<? ENDIF ?> />
+		<span class="help-block" for="encoding_utf_simple">Parse and send as <span class="encoding-placeholder-big text-success">&nbsp;&nbsp;<span class="encoding-placeholder"></span>&nbsp;&nbsp;</span> only</span>
+	</label>
+</div> 
+ 
+<div class="test-text">
+	<input class="form-control" type="text"	name="encoding" placeholder="Enter a text here (e.g. UTF-8 or ISO-8859-15)" value="<? VAR Encoding ?>" list="encoding_list" <? IF EncodingDisabled ?>disabled="disabled"<? ENDIF ?> />
+</div>
+
+<datalist id="encoding_list">
+	<? LOOP EncodingLoop ?>
+		<option value="<? VAR Encoding ?>"/>
+	<? ENDLOOP ?>
+</datalist>
+		
+<script type="text/javascript">
+	function updateEncodingText() {
+		var value = jQuery("input[name=encoding]").val();
+			jQuery(".encoding-placeholder").each(function(index, element) {
+				jQuery(element).text(value);
+			});
+	}
+		jQuery("input[name=encoding]").on("keyup change input", updateEncodingText);
+			updateEncodingText();
+
+		function updateEncodingLegacy() {
+			var disabled = jQuery("input:radio[name=encoding_utf]:checked").val() == "legacy";
+			jQuery("input[name=encoding]").prop("disabled", disabled);
+		}
+		
+		jQuery("input:radio[name=encoding_utf]").change(updateEncodingLegacy);
+		updateEncodingLegacy();
+</script>

modules/webadmin/tmpl/settings.tmpl

@@ -187,7 +187,9 @@
 						<div class="form-group">
 						<label for="inputMOTD" class="col-sm-2 control-label">MOTD:</label>
 							<div class="col-sm-10">
-								<textarea type="text" class="form-control" id="inputMOTD" name="motd" cols="70" rows="5" class="monospace"><? LOOP MOTDLoop ?><? VAR Line ?><? ENDLOOP ?></textarea>
+								<textarea class="form-control" id="inputMOTD" name="motd" rows="5" class="monospace"><? LOOP MOTDLoop ?><? VAR Line ?>
+<? ENDLOOP ?>
+</textarea>
 								<div class="alert alert-info help-block">"Message of the Day", sent to all ZNC users on connect.</div>
 							</div>
 						</div>

webskins/_default_/pub/bootstrap.css

@@ -1698,6 +1698,8 @@ output {
   background-image: none;
   border: 1px solid #ccc;
   border-radius: 4px;
+  overflow: scroll;
+  white-space: inherit;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
   -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;

webskins/_default_/tmpl/Navbar.tmpl

@@ -110,7 +110,7 @@
                                         <p class="text-left"><strong>User: <? VAR SessionUser ?></strong></p>
                                         <p class="text-left small">IP Address: <? VAR SessionIP ?></p>
                                         <p class="text-left">
-                                            <a href="<? IF GlobalModLoop ?>/mods/global/webadmin/edituser<? ELSE ?>/mods/user/webadmin/edituser<? ENDIF ?>" class="btn btn-primary btn-block btn-sm"><i class="fa fa-wrench"></i> Edit Settings</a>
+                                            <a href="<? VAR URIPrefix TOP ?><? VAR ModPath ?>/edituser" class="btn btn-primary btn-block btn-sm"><i class="fa fa-wrench"></i> Edit Settings</a>
                                         </p>
                                     </div>
                                 </div>