diff --git a/README.MD b/README.MD
index 2daba11..945654e 100644
--- a/README.MD
+++ b/README.MD
@@ -21,5 +21,20 @@ npm install express --save
npm install fs --save
npm install express-session --save
npm install whiskers --save
+```
-```
\ No newline at end of file
+
+Codacs which don't work
+H.265
+MPEG-2 Video AC-3 (ATSC A/52)
+
+Video but no audio
+H.264 audio:AC-3 (ATSC A/52)
+H.264 (Main Profile) AC-3 (ATSC A/52)
+
+Audio but no video:
+H.265 (Main 10 Profile) MPEG-4 AAC
+
+
+just work:
+H.264 (High Profile), MPEG-4 AAC
diff --git a/html/users.html b/html/users.html
index 4aada34..5b7f822 100644
--- a/html/users.html
+++ b/html/users.html
@@ -8,7 +8,6 @@
-
{else}
- This is an admin page.
+ {if loggedIn}
+
+ {else}
+
Login Required
+
+
+
+ {/if}
{/if}
diff --git a/img/404.jpg b/img/404.jpg
new file mode 100644
index 0000000..b03e6f6
Binary files /dev/null and b/img/404.jpg differ
diff --git a/server.js b/server.js
index 9731d5a..236ec13 100644
--- a/server.js
+++ b/server.js
@@ -66,6 +66,8 @@ function renderHTML(request, result, templateFile, templateDependencyFunction)
function getUserInformation(templateContext, request)
{
templateContext.users = config.users;
+ templateContext.id = request.session.userID;
+ templateContext.username = request.session.username;
}
function getHomePageInformation(templateContext, request)
@@ -78,6 +80,7 @@ app.get('/users', (req, res) => renderHTML(req, res, "users.html", getUserInform
app.use(express.static('css'));
app.use(express.static('js'));
+app.use(express.static('img'));
app.post('/login', function(request, result)
@@ -86,12 +89,11 @@ app.post('/login', function(request, result)
{
request.session.login = true;
request.session.username = request.body.username;
-
+ request.session.userID = userUtils.getID(request.body.username, config);
if(userUtils.isAdmin(request.body.username, config))
{
request.session.admin = true;
}
-
}
result.redirect('/');
});
@@ -222,6 +224,24 @@ app.post('/edituser', function(request, result)
}
});
+
+app.post('/updateUser', function(request, result)
+{
+ if(checkPrivilege(request) >= PRIVILEGE.MEMBER)
+ {
+ console.log(request.session.userID);
+ var admin = false;
+ userUtils.editUser(request.session.userID, request.body.username, request.body.password,admin, config);
+ fileIO.writeJSONToFile(CONFIG_FILE_NAME, config);
+ result.redirect('/users');
+ }
+ else
+ {
+ result.status(401);
+ result.send('None shall pass');
+ }
+});
+
const PRIVILEGE = {NOBODY: 0, MEMBER: 1, ADMIN: 2};
const checkPrivilege = function(request)
{
diff --git a/user.js b/user.js
index 213a623..1c3d26b 100644
--- a/user.js
+++ b/user.js
@@ -82,6 +82,13 @@ module.exports =
return false;
},
+
+ getID: function(username, configuration)
+ {
+ var index = getIndexOfUser(username, configuration);
+ return configuration.users[index].id;
+ },
+
/**
* Checks to see if there was a valid login attempt
*
@@ -144,8 +151,9 @@ module.exports =
{
for(var i = 0; i < configuration.users.length; i++)
{
- if (configuration.users[i].id + "" === id)
+ if (configuration.users[i].id=== id)
{
+ console.log("User account updated.");
configuration.users[i].username = userName;
configuration.users[i].admin = admin;