Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 7 insertions, 7 deletions

diff --git a/src/web/websession.vala b/src/web/websession.vala
index ae3cafc..85fd516 100644
--- a/src/web/websession.vala
+++ b/src/web/websession.vala
@@ -82,7 +82,7 @@ public class WebSession {
 		return result;
 	}
 
-	private void setup_auth(int user) throws DatabaseError, IOError {
+	private void setup_auth(int user) throws DatabaseError, IOError, DBusError {
 		var auth = db.get_user_auth(user);
 		this.disabled  = db.user_is_disabled(user);
 		this.superuser = auth.superuser;
@@ -92,7 +92,7 @@ public class WebSession {
 		this.logged_in = true;
 	}
 
-	public void logout() throws DatabaseError, IOError {
+	public void logout() throws DatabaseError, IOError, DBusError {
 		if(logged_in) {
 			db.set_sessionid(user, "");
 			superuser = false;
@@ -103,7 +103,7 @@ public class WebSession {
 		}
 	}
 
-	public WebSession(Soup.Server server, Soup.Message msg, string path, GLib.HashTable<string,string>? query, Soup.ClientContext client) throws DatabaseError, IOError {
+	public WebSession(Soup.Server server, Soup.Message msg, string path, GLib.HashTable<string,string>? query, Soup.ClientContext client) throws DatabaseError, IOError, DBusError {
 		var cookies = Soup.cookies_from_request(msg);
 
 		/* Check for existing session */
@@ -128,9 +128,9 @@ public class WebSession {
 			return;
 		}
 		var form_data = Soup.Form.decode((string) msg.request_body.data);
-		if (form_data == null || !form_data.contains("user") || !form_data.contains("password")) {		
-			return;					
-		}			
+		if (form_data == null || !form_data.contains("user") || !form_data.contains("password")) {
+			return;
+		}
 
 
 		/* get credentials */
@@ -162,7 +162,7 @@ public class WebSession {
 
 			setup_auth(user);
 		} else {
-			stderr.printf("Login for user id %d failed\n", userid);
+			stderr.printf(_("Login for user id %d failed\n"), userid);
 			/* login failed */
 			failed=true;
 		}