changed profile page to /users/username

public/templates/footer.tpl

@@ -59,7 +59,7 @@
 				gravatar.src = data['picture']+"?s=24";
 
 
-                $('#user_label').attr('href','/users/'+data.uid+'/'+data['username']);
+                $('#user_label').attr('href','/users/'+data['username']);
 
 				user_label.innerHTML = '';
 				user_label.appendChild(gravatar);

src/webserver.js

@@ -339,20 +339,29 @@ passport.deserializeUser(function(uid, done) {
  			return res.redirect('/403');
 	
 		var requestedUserId = req.user.uid;
-
+		
-		if(req.params.id != req.user.uid)
+		var username = req.params.id;
-			requestedUserId = req.params.id;
+		
-
+		user.get_uid_by_username(username, function(uid) {
-		user.getUserData(requestedUserId, function(data) {
+		
-			if(data)
+			if(uid != req.user.uid)
-			{
+				requestedUserId = uid;
-				data.joindate = utils.relativeTime(data.joindate);
+	
-				data.uid = requestedUserId;
+			user.getUserData(requestedUserId, function(data) {
-				callback({user:data});
+				if(data)
-			}
+				{
-			else
+					data.joindate = utils.relativeTime(data.joindate);
-				callback({user:{}});
+					data.uid = requestedUserId;
+					callback({user:data});
+				}
+				else
+					callback({user:{}});
+			});
+			
 		});
+		
+
+		
 	}
 
 	
@@ -387,27 +396,27 @@ passport.deserializeUser(function(uid, done) {
 			return res.redirect('/403');	
 	});
 
-	app.get('/users/:uid', handleUserProfile);
+	
-	app.get('/users/:uid/:username*', handleUserProfile);
+	app.get('/users/:username*', handleUserProfile);
 	
 
 	function handleUserProfile(req, res) {
-		console.log("OPPA 1");
+		
-		if(req.params.uid == 0) {
+		if(!req.params.username) {
 			res.send("User doesn't exist!");
 			return;
 		}
 
-		user.getUserData(req.params.uid, function(data) {
+		user.get_uid_by_username(req.params.username, function(uid) {
-			if(data) {
+
-				if(req.url.indexOf(data.username) == -1)
+			user.getUserData(uid, function(data) {
-					res.redirect(301, '/users/'+req.params.uid+'/'+data.username);
+				if(data) {
-				else
+					res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("users/'+data.username + '");});</script>' + templates['footer']);
-					res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("users/' + req.params.uid +'/'+data.username + '");});</script>' + templates['footer']);
+				}
-			}
+				else {
-			else {
+					res.send("User doesn't exist! /users/"+req.params.username);
-				res.send("User doesn't exist! /users/"+req.params.uid);
+				}			
-			}			
+			});
 		});
 	}