From ddf58a07aa774107b2e9e12ad5226fbcc6f1cc28 Mon Sep 17 00:00:00 2001
From: jose <627622230@qq.com>
Date: Wed, 26 Jun 2019 18:15:27 +0800
Subject: [PATCH] Increase the BasicAuth authentication function and fix some
 display problems under apache2.2.

---
 BTPanel/templates/default/config.html | 318 +++++++++++++-------------
 1 file changed, 163 insertions(+), 155 deletions(-)

diff --git a/BTPanel/templates/default/config.html b/BTPanel/templates/default/config.html
index 19838493..8ae80e3f 100644
--- a/BTPanel/templates/default/config.html
+++ b/BTPanel/templates/default/config.html
@@ -2,53 +2,53 @@
 
 {% block content %}
 <div class="main-content">
-	<div class="container-fluid" style="padding-bottom:54px">
-		<div class="pos-box bgw mtb15">
-			<div class="position f14 c9 pull-left">
-				<a class="plr10 c4" href="/">{{data['lan']['H1']}}</a>/<span class="plr10 c4">{{data['lan']['H2']}}</span>
-			</div>
-		</div>
-		<div class="clearfix bgw mtb15 pd15">
-			<div class="safe-port pull-left">
-				<div class="ss-text pull-left mr50">
-					<em>{{data['lan']['I1']}}</em>
-					<div class='ssh-item'>
-						<input class='btswitch btswitch-ios' id='closePl' type='checkbox'>
-						<label class='btswitch-btn' for='closePl' onclick='ClosePanel()'></label>
-					</div>
-				</div>
-				<div class="ss-text pull-left mr50">
-					<em title={{data['lan']['SET_IPV6']}}>{{data['lan']['LISTEN_IPV6']}}</em>
-					<div class='ssh-item'>
-						<input class='btswitch btswitch-ios' id='panelIPv6' type='checkbox' {{data['ipv6']}}>
-						<label class='btswitch-btn' for='panelIPv6' onclick="SetIPv6()"></label>
-					</div>
-				</div>
-				<div class="ss-text pull-left mr50">
-					<em class="btlink" style="color: #20a53a;" onclick="GetPanelSSL()" title={{data['lan']['SET_PANEL_SSL']}}>{{data['lan']['I3']}}</em>
-					<div class='ssh-item'>
-						<input class='btswitch btswitch-ios' id='panelSSL' type='checkbox'>
-						<label class='btswitch-btn' for='panelSSL' onclick="setPanelSSL()"></label>
-					</div>
-				</div>
-				<div class="ss-text pull-left mr50">
-					<em class="btlink" style="color: #20a53a;" onclick="GetPanelApi()" title={{data['lan']['SET_API']}}>{{data['lan']['API']}}</em>
-					<div class='ssh-item'>
-						<input class='btswitch btswitch-ios' id='panelApi' type='checkbox' {{data['api']}}>
-						<label class='btswitch-btn' for='panelApi' onclick="SetPanelApi(2)"></label>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="setbox bgw mtb15">
-			<div class="title c6 plr15">
-				<h3 class="f16">{{data['lan']['C1']}}</h3>
-				<button class="btn btn-default btn-sm" style="float: right;margin-top: 10px;display: none;" onclick="apiSetup()">{{data['lan']['C2']}}</button>
-			</div>
-			<div class="info-title-tips" style="margin: 20px 30px 0px;">
-				<p><span class="glyphicon glyphicon-alert" style="color: #f39c12; margin-right: 10px;"></span>{{data['lan']['C3']}}</p>
-			</div>
-			<div class="setting-con pd15">
+    <div class="container-fluid" style="padding-bottom:54px">
+        <div class="pos-box bgw mtb15">
+            <div class="position f14 c9 pull-left">
+                <a class="plr10 c4" href="/">{{data['lan']['H1']}}</a>/<span class="plr10 c4">{{data['lan']['H2']}}</span>
+            </div>
+        </div>
+        <div class="clearfix bgw mtb15 pd15">
+            <div class="safe-port pull-left">
+                <div class="ss-text pull-left mr50">
+                    <em>{{data['lan']['I1']}}</em>
+                    <div class='ssh-item'>
+                        <input class='btswitch btswitch-ios' id='closePl' type='checkbox'>
+                        <label class='btswitch-btn' for='closePl' onclick='ClosePanel()'></label>
+                    </div>
+                </div>
+                <div class="ss-text pull-left mr50">
+                    <em title={{data['lan']['SET_IPV6']}}>{{data['lan']['LISTEN_IPV6']}}</em>
+                    <div class='ssh-item'>
+                        <input class='btswitch btswitch-ios' id='panelIPv6' type='checkbox' {{data['ipv6']}}>
+                        <label class='btswitch-btn' for='panelIPv6' onclick="SetIPv6()"></label>
+                    </div>
+                </div>
+                <div class="ss-text pull-left mr50">
+                    <em class="btlink" style="color: #20a53a;" onclick="GetPanelSSL()" title={{data['lan']['SET_PANEL_SSL']}}>{{data['lan']['I3']}}</em>
+                    <div class='ssh-item'>
+                        <input class='btswitch btswitch-ios' id='panelSSL' type='checkbox'>
+                        <label class='btswitch-btn' for='panelSSL' onclick="setPanelSSL()"></label>
+                    </div>
+                </div>
+                <div class="ss-text pull-left mr50">
+                    <em class="btlink" style="color: #20a53a;" onclick="GetPanelApi()" title={{data['lan']['SET_API']}}>{{data['lan']['API']}}</em>
+                    <div class='ssh-item'>
+                        <input class='btswitch btswitch-ios' id='panelApi' type='checkbox' {{data['api']}}>
+                        <label class='btswitch-btn' for='panelApi' onclick="SetPanelApi(2)"></label>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="setbox bgw mtb15">
+            <div class="title c6 plr15">
+                <h3 class="f16">{{data['lan']['C1']}}</h3>
+                <button class="btn btn-default btn-sm" style="float: right;margin-top: 10px;display: none;" onclick="apiSetup()">{{data['lan']['C2']}}</button>
+            </div>
+            <div class="info-title-tips" style="margin: 20px 30px 0px;">
+                <p><span class="glyphicon glyphicon-alert" style="color: #f39c12; margin-right: 10px;"></span>{{data['lan']['C3']}}</p>
+            </div>
+            <div class="setting-con pd15">
 				<form id="set-Config">
 					<div class="mtb15">
 						<span class="set-tit text-right" title="{{data['lan']['CT1']}}">{{data['lan']['CT1']}}</span>
@@ -78,6 +78,14 @@
 						</div>
 						<span class="set-info c7">{{data['lan']['CY15']}}</span>
 					</div>
+					<div class="mtb15">
+						<span class="set-tit text-right" title="{{data['lan']['BASICAUTH_TIPS1']}}">{{data['lan']['BASICAUTH']}}</span>
+						<div class="btn_tips">
+                            <input id="basic_auth" name="basic_auth" class="inputtxt bt-input-text disable" type="text" value="{{data['basic_auth']['value']}}" disabled>
+                            <span class="modify btn btn-xs btn-success basic_auth" onclick="modify_basic_auth()">{{data['lan']['CONFIG']}}</span>
+                        </div>
+						<span class="set-info c7">{{data['lan']['BASICAUTH_TIPS1']}}</span>
+					</div>
 					<div class="mtb15">
 						<span class="set-tit text-right" title="{{data['lan']['CT3']}}">{{data['lan']['CT3']}}</span>
 						<input name="domain" class="inputtxt bt-input-text" type="text" value="{{data['panel']['domain']}}">
@@ -109,8 +117,8 @@
 							<input id="systemdate" name="systemdate" class="inputtxt bt-input-text disable" type="text" value="{{data['systemdate']}}">
 							<!--span class="modify btn btn-xs btn-success" onclick="syncDate()">{{data['lan']['CY8']}}</span-->
 						</div>
-						
-						
+
+
 					</div>
 					<div class="mtb15">
 						<span class="set-tit text-right" title="{{data['lan']['CT9']}}">{{data['lan']['CT9']}}</span>
@@ -136,131 +144,131 @@
 	</div>
 </div>
 <style>
-	.boxConter {
-		height: 458px;
-		position: relative;
-		overflow: auto;
-	}
+    .boxConter {
+        height: 458px;
+        position: relative;
+        overflow: auto;
+    }
 
-	.iconCode {
-		padding: 50px 60px;
-	}
+    .iconCode {
+        padding: 50px 60px;
+    }
 
-	.box-conter {
-		width: 100%;
-	}
+    .box-conter {
+        width: 100%;
+    }
 
-	#QRcode {
-		margin-bottom: 25px;
-		text-align: center;
-	}
+    #QRcode {
+        margin-bottom: 25px;
+        text-align: center;
+    }
 
-	.iconCode #QRcode,
-	.iconCode .codeTip {
-		width: 100%;
-		text-align: center;
-		font-size: 17px;
-	}
+    .iconCode #QRcode,
+    .iconCode .codeTip {
+        width: 100%;
+        text-align: center;
+        font-size: 17px;
+    }
 
-	.iconCode .weChatSamll img {
-		width: 100%;
-	}
+    .iconCode .weChatSamll img {
+        width: 100%;
+    }
 
-	.iconCode .weChatSamll {
-		display: none;
-		width: 200px;
-		height: 200px;
-		position: absolute;
-		border: 1px solid #ececec;
-		border-radius: 5px;
-		bottom: 150px;
-		right: 50px;
-		padding: 20px;
-		background-color: #fff;
-	}
+    .iconCode .weChatSamll {
+        display: none;
+        width: 200px;
+        height: 200px;
+        position: absolute;
+        border: 1px solid #ececec;
+        border-radius: 5px;
+        bottom: 150px;
+        right: 50px;
+        padding: 20px;
+        background-color: #fff;
+    }
 
-	.iconCode .weChatSamll:after {
-		content: '';
-		width: 15px;
-		height: 15px;
-		background: #ffffff;
-		border-bottom: 1px solid #ececec;
-		border-right: 1px solid #ececec;
-		transform: rotate(45deg);
-		position: absolute;
-		border-radius: 4px;
-		left: 90px;
-		bottom: -8px;
-	}
+        .iconCode .weChatSamll:after {
+            content: '';
+            width: 15px;
+            height: 15px;
+            background: #ffffff;
+            border-bottom: 1px solid #ececec;
+            border-right: 1px solid #ececec;
+            transform: rotate(45deg);
+            position: absolute;
+            border-radius: 4px;
+            left: 90px;
+            bottom: -8px;
+        }
 
-	.iconCode .weChat {
-		margin-left: 15px;
-	}
+    .iconCode .weChat {
+        margin-left: 15px;
+    }
 
-	.iconCode .weChat:hover .weChatSamll {
-		display: block;
-	}
+        .iconCode .weChat:hover .weChatSamll {
+            display: block;
+        }
 
-	.iconCode .QRcode {
-		margin-bottom: 15px;
-		text-align: center;
-	}
+    .iconCode .QRcode {
+        margin-bottom: 15px;
+        text-align: center;
+    }
 
-	.codeTip ul li {
-		margin-bottom: 10px;
-	}
+    .codeTip ul li {
+        margin-bottom: 10px;
+    }
 
-	.personalDetails .head_img {
-		width: 50px;
-		height: 50px;
-		float: left;
-		margin-right: 30px;
-	}
+    .personalDetails .head_img {
+        width: 50px;
+        height: 50px;
+        float: left;
+        margin-right: 30px;
+    }
 
-	.personalDetails .head_img img {
-		height: 100%;
-		border-radius: 50%;
-	}
+        .personalDetails .head_img img {
+            height: 100%;
+            border-radius: 50%;
+        }
 
-	.personalDetails .nick_name {
-		height: 50px;
-		line-height: 50px;
-		width: 148px;
-		float: left;
-		font-size: 15px;
-		color: #808080;
-	}
+    .personalDetails .nick_name {
+        height: 50px;
+        line-height: 50px;
+        width: 148px;
+        float: left;
+        font-size: 15px;
+        color: #808080;
+    }
 
-	.personalDetails .userList {
-		height: 100%;
-	}
+    .personalDetails .userList {
+        height: 100%;
+    }
 
-	.personalDetails .userList .addweChat {
-		height: 50px;
-		text-align: center;
-		padding-top: 20px;
-		color: #20a53a;
-		font-size: 16px;
-	}
+        .personalDetails .userList .addweChat {
+            height: 50px;
+            text-align: center;
+            padding-top: 20px;
+            color: #20a53a;
+            font-size: 16px;
+        }
 
-	.personalDetails .userList .addweChat:hover {
-	}
+            .personalDetails .userList .addweChat:hover {
+            }
 
-	.personalDetails .userList .item {
-		height: 70px;
-		padding: 10px 15px;
-		border: 1px solid #ececec;
-		margin: 15px 65px;
-		border-radius: 5px;
-	}
+        .personalDetails .userList .item {
+            height: 70px;
+            padding: 10px 15px;
+            border: 1px solid #ececec;
+            margin: 15px 65px;
+            border-radius: 5px;
+        }
 
-	.personalDetails .userList .cancelBind {
-		height: 50px;
-		width: 60px;
-		float: right;
-		line-height: 50px;
-		text-align: center;
-	}
+        .personalDetails .userList .cancelBind {
+            height: 50px;
+            width: 60px;
+            float: right;
+            line-height: 50px;
+            text-align: center;
+        }
 </style>
 <script type="text/javascript" src="/static/js/jquery.qrcode.min.js"></script>
 <script src="/static/js/config.js?date={{g['version']}}"></script>