Skip to content
Snippets Groups Projects
Commit 6ccf3150 authored by Julian Rother's avatar Julian Rother
Browse files

Merged auth-columns user, passwd and param

parent 4fd41f9c
No related branches found
No related tags found
No related merge requests found
...@@ -113,8 +113,7 @@ CREATE TABLE IF NOT EXISTS `auth_data` ( ...@@ -113,8 +113,7 @@ CREATE TABLE IF NOT EXISTS `auth_data` (
`video_id` INTEGER, `video_id` INTEGER,
`auth_type` varchar(10), `auth_type` varchar(10),
`auth_param` varchar(127), `auth_param` varchar(127),
`auth_user` varchar(127), `auth_param2` varchar(127),
`auth_passwd` varchar(127),
`time_created` datetime NOT NULL, `time_created` datetime NOT NULL,
`time_updated` datetime NOT NULL, `time_updated` datetime NOT NULL,
`created_by` INTEGER DEFAULT NULL `created_by` INTEGER DEFAULT NULL
......
...@@ -96,7 +96,7 @@ def checkauth(auths, username=None, password=None): ...@@ -96,7 +96,7 @@ def checkauth(auths, username=None, password=None):
if auth['auth_type'] == 'public': if auth['auth_type'] == 'public':
return True return True
elif auth['auth_type'] == 'password': 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 return True
elif auth['auth_type'] == 'l2p': elif auth['auth_type'] == 'l2p':
if auth['auth_param'] in session.get('l2p_courses', []): if auth['auth_param'] in session.get('l2p_courses', []):
...@@ -390,7 +390,7 @@ tabs = { ...@@ -390,7 +390,7 @@ tabs = {
['created_by', 'time_created', 'time_updated']), ['created_by', 'time_created', 'time_updated']),
'featured': ('featured', 'id', ['title', 'text', 'internal', 'visible', 'deleted'], 'featured': ('featured', 'id', ['title', 'text', 'internal', 'visible', 'deleted'],
['created_by', 'time_created', 'time_updated']), ['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']), ['course_id', 'lecture_id', 'video_id', 'created_by', 'time_created', 'time_updated']),
'sorterrorlog': ('sorterrorlog_data', 'id', ['deleted'], 'sorterrorlog': ('sorterrorlog_data', 'id', ['deleted'],
['time_created', 'time_updated']) ['time_created', 'time_updated'])
......
...@@ -125,11 +125,11 @@ var moderator = { ...@@ -125,11 +125,11 @@ var moderator = {
if ((moderator.acleditor.acls[i][type+'_id'] == id)) { if ((moderator.acleditor.acls[i][type+'_id'] == id)) {
var auth = {}; var auth = {};
auth.type = moderator.acleditor.acls[i]['auth_type']; auth.type = moderator.acleditor.acls[i]['auth_type'];
auth.user = moderator.acleditor.acls[i]['auth_user']; auth.param = moderator.acleditor.acls[i]['auth_param'];
auth.password = moderator.acleditor.acls[i]['auth_passwd']; auth.param2 = moderator.acleditor.acls[i]['auth_param2'];
auth.id = moderator.acleditor.acls[i]['auth_id']; auth.id = moderator.acleditor.acls[i]['auth_id'];
idlist[idlist.length] = 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>'; html += '</select>';
...@@ -155,18 +155,18 @@ var moderator = { ...@@ -155,18 +155,18 @@ var moderator = {
var auth = {}; var auth = {};
auth.type = $(".authtype", element.parentElement).val(); auth.type = $(".authtype", element.parentElement).val();
if (auth.type == "password") { if (auth.type == "password") {
auth.user = $(".authuser", element.parentElement).val(); auth.param = $(".authuser", element.parentElement).val();
auth.password = $(".authpassword", element.parentElement).val(); auth.param2 = $(".authpassword", element.parentElement).val();
} }
dict = {} dict = {}
dict['auth_type'] = auth.type; dict['auth_type'] = auth.type;
dict['auth_user'] = auth.user; dict['auth_param'] = auth.param;
dict['auth_passwd'] = auth.password; dict['auth_param2'] = auth.param2;
dict[$(element.parentElement).data('type')+'_id'] = $(element.parentElement).data('id'); dict[$(element.parentElement).data('type')+'_id'] = $(element.parentElement).data('id');
moderator.api.add_new(dict,'auth',true); moderator.api.add_new(dict,'auth',true);
var option = $('<option>', { 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) "data-auth": JSON.stringify(auth)
}); });
$(".acllist",element.parentElement).append(option); $(".acllist",element.parentElement).append(option);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment