v3.9.3

Bugs fix, a new version haproxy

app/create_db.py

@@ -459,7 +459,7 @@ def update_db_v_3_8_1(**kwargs):
 	
 def update_ver(**kwargs):
 	con, cur = get_cur()
-	sql = """update version set version = '3.9.2'; """
+	sql = """update version set version = '3.9.3'; """
 	try:    
 		cur.execute(sql)
 		con.commit()

app/funct.py

@@ -53,12 +53,14 @@ def logging(serv, action, **kwargs):
 		
 	try:
 		IP = cgi.escape(os.environ["REMOTE_ADDR"])
+	except:
+		IP = ''
+	try:
 		cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
 		user_uuid = cookie.get('uuid')
 		login = sql.get_user_name_by_uuid(user_uuid.value)
-	except:
+	except:	
-		IP = ''
+		login = ''
-		login = kwargs.get('login')
 		
 	if kwargs.get('alerting') == 1:
 		mess = get_data('date_in_log') + action + "\n"

app/options.py

@@ -663,6 +663,8 @@ if form.getvalue('masteradd'):
 	if ssh_enable == 0:
 		ssh_key_name = ''
 		
+	proxy_serv = proxy if proxy is not None else ""
+		
 	os.system("cp scripts/%s ." % script)
 		
 	commands = [ "chmod +x "+script +" &&  ./"+script +" PROXY=" + proxy_serv+ 

app/templates/sections.html

@@ -46,6 +46,8 @@
 					<div class="alert alert-info"><b>Note:</b> If you reconfigure Master server, Slave will reconfigured automatically</div>
 				{% endif %}
 			</div>
+			<script src="/inc/jquery-linenumbers.js"></script>
+			<script>$('textarea').linenumbers({col_width: '25px'});</script>
 		{% endif %}
 	{% endif %}
 	{% if aftersave %}

app/templates/servers.html

@@ -284,8 +284,8 @@
 				</td>
 				<td class="padding10 first-collumn" style="width: 20%;">
 					{% set values = dict() %}
-					{% set values = {'2.0.5-1':'2.0.5-1','2.0.6-1':'2.0.6-1', '2.0.7-1':'2.0.7-1', '2.0.9-1':'2.0.9-1'} %}
+					{% set values = {'2.0.5-1':'2.0.5-1','2.0.6-1':'2.0.6-1', '2.0.7-1':'2.0.7-1', '2.0.9-1':'2.0.9-1', '2.0.11-1':'2.0.11-1'} %}
-					{{ select('hapver',  values=values, selected='2.0.9-1', required='required') }}
+					{{ select('hapver',  values=values, selected='2.0.11-1', required='required') }}
 				</td>
 				<td class="padding10 first-collumn">
 					<select autofocus required name="haproxyaddserv" id="haproxyaddserv">

inc/style.css

@@ -251,6 +251,7 @@ pre {
 }
 .config {
 	height: 60%;
+	width: 60% !important;
 }
 .diffHead {
 	background-color: #F5F5F5;