Commit 142b232a authored by nanahira's avatar nanahira

Merge branch 'mc'

parents 330cb6be 848207b6
...@@ -100,7 +100,7 @@ check_permission = (user, permission_required) -> ...@@ -100,7 +100,7 @@ check_permission = (user, permission_required) ->
return false return false
return permission[permission_required] return permission[permission_required]
@auth = (name, pass, permission_required, action = 'unknown') -> @auth = (name, pass, permission_required, action = 'unknown', no_log) ->
reload() reload()
user = users.users[name] user = users.users[name]
if !user if !user
...@@ -115,7 +115,8 @@ check_permission = (user, permission_required) -> ...@@ -115,7 +115,8 @@ check_permission = (user, permission_required) ->
if !check_permission(user, permission_required) if !check_permission(user, permission_required)
add_log("Permission denied. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action) add_log("Permission denied. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
return false return false
add_log("Operation success. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action) if !no_log
add_log("Operation success. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
return true return true
@add_user = (name, pass, enabled, permissions) -> @add_user = (name, pass, enabled, permissions) ->
......
...@@ -122,7 +122,7 @@ or as follows, to use a specific set of permissions. ...@@ -122,7 +122,7 @@ or as follows, to use a specific set of permissions.
return permission[permission_required]; return permission[permission_required];
}; };
this.auth = function(name, pass, permission_required, action) { this.auth = function(name, pass, permission_required, action, no_log) {
var user; var user;
if (action == null) { if (action == null) {
action = 'unknown'; action = 'unknown';
...@@ -145,7 +145,9 @@ or as follows, to use a specific set of permissions. ...@@ -145,7 +145,9 @@ or as follows, to use a specific set of permissions.
add_log("Permission denied. User: " + name + ", Permission needed: " + permission_required + ", Action: " + action); add_log("Permission denied. User: " + name + ", Permission needed: " + permission_required + ", Action: " + action);
return false; return false;
} }
add_log("Operation success. User: " + name + ", Permission needed: " + permission_required + ", Action: " + action); if (!no_log) {
add_log("Operation success. User: " + name + ", Permission needed: " + permission_required + ", Action: " + action);
}
return true; return true;
}; };
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment