Commit 6ccf3150 authored by Julian Rother's avatar Julian Rother
Browse files

Merged auth-columns user, passwd and param

parent 4fd41f9c
......@@ -107,14 +107,13 @@ CREATE TABLE IF NOT EXISTS `places` (
);
CREATE TABLE IF NOT EXISTS `auth_data` (
`auth_id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
`deleted` INTEGER NOT NULL DEFAULT '0',
`deleted` INTEGER NOT NULL DEFAULT '0',
`course_id` INTEGER,
`lecture_id` INTEGER,
`video_id` INTEGER,
`auth_type` varchar(10),
`auth_param` varchar(127),
`auth_user` varchar(127),
`auth_passwd` varchar(127),
`auth_param2` varchar(127),
`time_created` datetime NOT NULL,
`time_updated` datetime NOT NULL,
`created_by` INTEGER DEFAULT NULL
......
......@@ -96,7 +96,7 @@ def checkauth(auths, username=None, password=None):
if auth['auth_type'] == 'public':
return True
elif auth['auth_type'] == 'password':
if auth['auth_user'] == username and auth['auth_password'] == password:
if auth['auth_param'] == username and auth['auth_param2'] == password:
return True
elif auth['auth_type'] == 'l2p':
if auth['auth_param'] in session.get('l2p_courses', []):
......@@ -390,7 +390,7 @@ tabs = {
['created_by', 'time_created', 'time_updated']),
'featured': ('featured', 'id', ['title', 'text', 'internal', 'visible', 'deleted'],
['created_by', 'time_created', 'time_updated']),
'auth': ('auth_data', 'auth_id', ['auth_type', 'auth_user', 'auth_passwd', 'deleted'],
'auth': ('auth_data', 'auth_id', ['auth_type', 'auth_param', 'auth_param2', 'deleted'],
['course_id', 'lecture_id', 'video_id', 'created_by', 'time_created', 'time_updated']),
'sorterrorlog': ('sorterrorlog_data', 'id', ['deleted'],
['time_created', 'time_updated'])
......
......@@ -125,11 +125,11 @@ var moderator = {
if ((moderator.acleditor.acls[i][type+'_id'] == id)) {
var auth = {};
auth.type = moderator.acleditor.acls[i]['auth_type'];
auth.user = moderator.acleditor.acls[i]['auth_user'];
auth.password = moderator.acleditor.acls[i]['auth_passwd'];
auth.param = moderator.acleditor.acls[i]['auth_param'];
auth.param2 = moderator.acleditor.acls[i]['auth_param2'];
auth.id = moderator.acleditor.acls[i]['auth_id'];
idlist[idlist.length] = auth.id;
html += '<option data-auth_id="'+auth.id+'">#'+auth.id+' '+auth.type+' '+ ( auth.type == "password" ? ' ("'+auth.user+'":"'+auth.password+'")' : '' ) +'</option>';
html += '<option data-auth_id="'+auth.id+'">#'+auth.id+' '+auth.type+' '+ ( auth.type == "password" ? ' ("'+auth.param+'":"'+auth.param2+'")' : '' ) +'</option>';
}
}
html += '</select>';
......@@ -155,18 +155,18 @@ var moderator = {
var auth = {};
auth.type = $(".authtype", element.parentElement).val();
if (auth.type == "password") {
auth.user = $(".authuser", element.parentElement).val();
auth.password = $(".authpassword", element.parentElement).val();
auth.param = $(".authuser", element.parentElement).val();
auth.param2 = $(".authpassword", element.parentElement).val();
}
dict = {}
dict['auth_type'] = auth.type;
dict['auth_user'] = auth.user;
dict['auth_passwd'] = auth.password;
dict['auth_param'] = auth.param;
dict['auth_param2'] = auth.param2;
dict[$(element.parentElement).data('type')+'_id'] = $(element.parentElement).data('id');
moderator.api.add_new(dict,'auth',true);
var option = $('<option>', {
"text": auth.type+' '+( auth.type == "password" ? ' ("'+auth.user+'":"'+auth.password+'")' : '' ) ,
"text": auth.type+' '+( auth.type == "password" ? ' ("'+auth.param+'":"'+auth.param2+'")' : '' ) ,
"data-auth": JSON.stringify(auth)
});
$(".acllist",element.parentElement).append(option);
......
Supports Markdown
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