v5.2.4.0

Changelog: https://haproxy-wi.org/changelog.py#5_2_4

app/create_db.py

@@ -111,8 +111,9 @@ def default_values():
 		out_error(e)
 
 	data_source = [
-		{'name': 'admin', 'description': 'Can do everything'},
-		{'name': 'editor', 'description': 'Can edit configs'},
+		{'name': 'superAdmin', 'description': 'Has the highest level of administrative permissions and controls the actions of all other users'},
+		{'name': 'admin', 'description': 'Has access everywhere except the Admin area'},
+		{'name': 'editor', 'description': 'Has the same rights as the admin but has no access to the Servers page'},
 		{'name': 'guest', 'description': 'Read-only access'}
 	]
 
@@ -260,7 +261,7 @@ def update_db_v_4_5_1(**kwargs):
 		sql.append("update role set name = 'superAdmin' where id = '1';")
 		sql.append("update role set name = 'admin', `description` = 'Has access everywhere except the Admin area' where id = '2';")
 		sql.append("update role set id = '4' where id = '3';")
-		sql.append("INSERT  INTO role (id, name, `description`) values('3', 'editor', 'Has the same as the admin except the Servers page');")
+		sql.append("INSERT INTO role (id, name, `description`) values('3', 'editor', 'Has the same as the admin except the Servers page');")
 		sql.append("update user set role = 'superAdmin' where role = 'admin';")
 		sql.append("update user set role = 'admin' where role = 'editor';")
 		for i in sql:

app/sql.py

@@ -11,7 +11,10 @@ def out_error(error):
 	try:
 		funct.logging('localhost', error, haproxywi=1, login=1)
 	except Exception:
-		funct.logging('localhost', error, haproxywi=1)
+		try:
+			funct.logging('localhost', error, haproxywi=1)
+		except Exception:
+			pass
 	print('error: '+error)
 
 

app/templates/admin.html

@@ -42,7 +42,7 @@
 				<td></td>
 			{% else %}
 				<td class="padding10 first-collumn">
-					{% set id = 'name-' + group.0|string() %}
+					{% set id = 'name-' + group.group_id|string() %}
 					{{ input(id, value=group.name) }}
 				</td>
 				<td>
@@ -124,7 +124,8 @@
 		</table>
 		<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
 			<b style="font-size: 20px; display: block; padding-bottom: 10px;">Note:</b>
-			For updating you have to use Roxy-WI RPM. How to start using repository read <a href="https://roxy-wi.org/installation.py" title="Roxy-WI installation" target="_blank">here</a>
+			For updating you have to use Roxy-WI RPM or DEB. Read <a href="https://roxy-wi.org/installation.py" title="Roxy-WI installation" target="_blank">here</a>
+			how to start using repository
 			<br /><br />
 			If the Roxy-WI server uses a proxy to connect to the Internet, add the proxy settings to yum.conf
 			<br /><br />

app/templates/ajax/smon_dashboard.html

@@ -113,13 +113,13 @@ HTTP status check: {{s.http.split(':')[0]}}://{{s.ip}}:{{s.port}}{{s.http.split(
          {% elif s.http_status == 0 %}
             <div class="down">
                  <center style="padding-top: 7px;">
-                      HTTP IS FAILURE
+                      HTTP FAILURE
                  </center>
             </div>
          {% elif s.body_status == 0 %}
             <div class="down">
                  <center style="padding-top: 7px;">
-                      BODY IS FAILURE
+                      BODY FAILURE
                  </center>
             </div>
          {% elif s.status == 3 %}
@@ -131,7 +131,7 @@ HTTP status check: {{s.http.split(':')[0]}}://{{s.ip}}:{{s.port}}{{s.http.split(
          {% else %}
             <div class="down">
                 <center style="padding-top: 7px;">
-                    PORT IS DOWN
+                    PORT DOWN
                 </center>
             </div>
          {% endif %}

app/templates/include/admin_backup.html

@@ -67,6 +67,6 @@
 	<br /><span class="add-button" title="Add a new backup job" id="add-backup-button">+ Add backup</span>
 	<br /><br />
 	<div id="ajax-backup"></div>
-	<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
+	<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
 		You can read the description of all parameters <a href="https://roxy-wi.org/description.py?description=backup" title="Backup description" target="_blank">here</a>
 	</div>