From eb606855bc6b27baf48de76e830f15ce9ffdf191 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Mon, 13 May 2013 14:38:08 -0400
Subject: [PATCH 01/15] updating config defaults to automatically construct
 upload_url

---
 config.default.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config.default.js b/config.default.js
index 69c0d7a9c0..3ebaee8e95 100644
--- a/config.default.js
+++ b/config.default.js
@@ -5,9 +5,6 @@ var config = {
 	// "base_url" is expected to be a publically accessible URL to your NodeBB instance (Default base_url: 'http://localhost', port: '4567')
 	"base_url": "http://localhost",
 	
-	// public url for uploaded files
-	"upload_url": "http://dev.domain.com/uploads/",
-	
 	// relative path for uploads
 	"upload_path": "/uploads/",
 	
@@ -54,5 +51,6 @@ var config = {
 }
 
 config.url = config.base_url + (config.use_port ? ':' + config.port : '') + '/';
+config.upload_url = config.base_url + (config.use_port ? ':' + config.port : '') + '/uploads/';
 
 module.exports = config;
\ No newline at end of file

From 62bffff3c7a89ca90a157662c7498987466f8cfb Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 13 May 2013 15:16:54 -0400
Subject: [PATCH 02/15] forgot to add a ;

---
 src/webserver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver.js b/src/webserver.js
index a5146a2e83..4608a6401d 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -268,7 +268,7 @@ var express = require('express'),
             return;
 		}
 		
-		filename = uid + '-' + filename
+		filename = uid + '-' + filename;
 		var uploadPath = config.upload_path + filename;
 		
 		console.log('trying to upload to : '+ global.configuration['ROOT_DIRECTORY'] + uploadPath);

From 8bb724e9946239dcb12cc927438e23a07ad22cd5 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Mon, 13 May 2013 15:15:59 -0400
Subject: [PATCH 03/15] minor tweaks to config default, and text copy update on
 registration page updated readme to mention the upload_path option

---
 README.md                     | 4 ++++
 config.default.js             | 2 +-
 public/templates/register.tpl | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1553785f39..40485cedae 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,10 @@ The server configuration file (located at `/config.js`) contains default options
 		<td><b>base_url</b></td>
 		<td><i>(Default: 'http://localhost')</i> A web-accessible URL to your app, without the port</td>
 	</tr>
+	<tr>
+		<td><b>upload_path</b></td>
+		<td><i>(Default: '/public/uploads')</i> A relative path (relative to the application's web root) to the uploads folder. Please ensure that Node.js can write to this folder</td>
+	</tr>
 	<tr>
 		<td><b>use_port</b></td>
 		<td><i>(Default: true)</i> Whether or not to include the port number when constructing the url for use in NodeBB. If you are serving NodeBB via a proxy (i.e. nginx), switch this off.
diff --git a/config.default.js b/config.default.js
index 3ebaee8e95..e7a662b76b 100644
--- a/config.default.js
+++ b/config.default.js
@@ -6,7 +6,7 @@ var config = {
 	"base_url": "http://localhost",
 	
 	// relative path for uploads
-	"upload_path": "/uploads/",
+	"upload_path": "/public/uploads/",
 	
 	"use_port": true,
 	"port": 4567,
diff --git a/public/templates/register.tpl b/public/templates/register.tpl
index b21f73a333..d1856915d5 100644
--- a/public/templates/register.tpl
+++ b/public/templates/register.tpl
@@ -9,7 +9,7 @@
 		</form>
 	</div>
 	<div class="well span6 {alternate_logins:display}">
-		<h4>Alternative Logins</h4>
+		<h4>Alternative Registration</h4>
 		<ul class="alt-logins">
 			<li data-url="/auth/twitter" class="twitter {twitter:display}"></li>
 			<li data-url="/auth/google" class="google {google:display}"></li>

From 6942107dd46ad270f963a4d115581ad111cc3762 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 13 May 2013 16:41:28 -0400
Subject: [PATCH 04/15] regen gravatar url when email changes

---
 src/user.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/user.js b/src/user.js
index a557e97a80..2d9a6fa018 100644
--- a/src/user.js
+++ b/src/user.js
@@ -76,8 +76,14 @@ var	config = require('../config.js'),
 		
 		for(var i=0,ii=fields.length; i<ii; ++i) {
 			key = fields[i];
-			if(data[key] !== undefined)
+			if(data[key] !== undefined) {
+				
 				User.setUserField(uid, key, data[key]);
+				
+				if(key === 'email') {
+					User.setUserField(uid, 'gravatarpicture', User.createGravatarURLFromEmail(data[key]));
+				}
+			}
 		}
 	}
 

From 487d7401641e3e3def84a79a9a83d90e9c4256d8 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Mon, 13 May 2013 16:57:47 -0400
Subject: [PATCH 05/15] added client and server validation on registration

---
 public/templates/register.tpl | 43 ++++++++++++++++--
 src/routes/authentication.js  |  3 +-
 src/user.js                   | 83 +++++++++++++++--------------------
 3 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/public/templates/register.tpl b/public/templates/register.tpl
index d1856915d5..875b3bab8d 100644
--- a/public/templates/register.tpl
+++ b/public/templates/register.tpl
@@ -2,9 +2,9 @@
 <div class="row-fluid">
 	<div class="well {register_window:spansize}">
 		<form method="post" action="/register">
-			<label for="email">Email Address</label><input type="email" name="email" placeholder="Enter Email Address" id="email" /> <span id="email-notify" class="label label-important"></span> <br />
+			<label for="email">Email Address</label><input type="email" name="email" placeholder="Enter Email Address" id="email" /> <span id="email-notify" class="label label-important"></span><br />
 			<label for="username">Username</label><input type="text" name="username" placeholder="Enter Username" id="username" /> <span id="username-notify" class="label label-success"></span> <br />
-			<label for="password">Password</label><input type="password" name="password" placeholder="Enter Password" id="password" /><br />
+			<label for="password">Password</label><input type="password" name="password" placeholder="Enter Password" id="password" /> <span id="password-notify" class="label label-important"></span> <br />
 			<button class="btn btn-primary" id="register" type="submit">Register Now</button>
 		</form>
 	</div>
@@ -24,7 +24,8 @@
 		register = document.getElementById('register'),
 		emailEl = document.getElementById('email'),
 		username_notify = document.getElementById('username-notify'),
-		email_notify = document.getElementById('email-notify');
+		email_notify = document.getElementById('email-notify'),
+		password_notify = document.getElementById('password-notify');
 
 	username.onkeyup = function() {
 		if (username.value.length > 2) socket.emit('user.exists', {username: username.value});
@@ -36,6 +37,13 @@
 	emailEl.addEventListener('change', function() {
 		socket.emit('user.email.exists', { email: emailEl.value });
 	}, false);
+	password.addEventListener('keyup', function() {
+		if (password.value.length < 5) {
+			password_notify.innerHTML = 'Password too short';
+		} else {
+			password_notify.innerHTML = '';
+		}
+	}, false);
 
 	ajaxify.register_events(['user.exists', 'user.email.exists']);
 
@@ -63,5 +71,34 @@
 			document.location.href = e.target.getAttribute('data-url');
 		}
 	});
+
+	// Form Validation
+	function validateForm() {
+		var validated = true;
+		if (username.value.length < 2) {
+			username_notify.innerHTML = 'Invalid username';
+			username_notify.className = 'label label-important';
+			validated = false;
+		}
+
+		if (password.value.length < 5) {
+			password_notify.innerHTML = 'Password too short';
+			validated = false;
+		} else {
+			password_notify.innerHTML = '';
+		}
+
+		if (email.value.indexOf('@') === -1) {
+			email_notify.innerHTML = 'Invalid email address';
+			validated = false;
+		} else {
+			email_notify.innerHTML = '';
+		}
+
+		return validated;
+	}
+	register.addEventListener('click', function(e) {
+		if (!validateForm()) e.preventDefault();
+	}, false);
 }());
 </script>
\ No newline at end of file
diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index e6d8a93cfe..e9c17d29ea 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -138,9 +138,8 @@
 		}));
 		
 		app.post('/register', function(req, res) {
-			console.log('wtf');
 			user_module.create(req.body.username, req.body.password, req.body.email, function(err, uid) {
-				if (err === null) {
+				if (err === null && uid > 0) {
 					req.login({
 						uid: uid
 					}, function() {
diff --git a/src/user.js b/src/user.js
index a557e97a80..15d3674dfd 100644
--- a/src/user.js
+++ b/src/user.js
@@ -237,60 +237,49 @@ var	config = require('../config.js'),
 
 	User.create = function(username, password, email, callback) {
 
-		if(!username) {
-			console.log("invalid registration data! username ["+username+"], password ["+password+"], email ["+email+"]");
-			return;
-		}
-	
-		// TODO : check if username email is unique!! -baris
-	
+		User.exists(username, function(exists) {
+			if (exists || email.indexOf('@') === -1 || password.length < 5) return callback(null, -1);
 
-		RDB.incr('global:next_user_id', function(err, uid) {
-			RDB.handle(err);
-			
-			console.log("Registering uid : " + uid);
-
-			User.hashPassword(password, function(hash) {
-
-				var gravatar = User.createGravatarURLFromEmail(email);
-
-				RDB.hmset('user:'+uid, {
-					'username' : username,
-					'fullname': '',
-					'location':'',
-					'birthday':'',
-					'website':'',
-					'email' : email,
-					'joindate' : new Date().getTime(),
-					'password' : hash,
-					'picture': gravatar,
-					'gravatarpicture' : gravatar,
-					'uploadedpicture': '',
-					'reputation': 0,
-					'postcount': 0
-				});
+			RDB.incr('global:next_user_id', function(err, uid) {
+				RDB.handle(err);
+				User.hashPassword(password, function(hash) {
+					var gravatar = User.createGravatarURLFromEmail(email);
+
+					RDB.hmset('user:'+uid, {
+						'username' : username,
+						'fullname': '',
+						'location':'',
+						'birthday':'',
+						'website':'',
+						'email' : email,
+						'joindate' : new Date().getTime(),
+						'password' : hash,
+						'picture': gravatar,
+						'gravatarpicture' : gravatar,
+						'uploadedpicture': '',
+						'reputation': 0,
+						'postcount': 0
+					});
+					
+					RDB.set('username:' + username + ':uid', uid);
+					RDB.set('email:' + email +':uid', uid);			
+					
+					if(email)
+						User.sendConfirmationEmail(email);
 				
-				RDB.set('username:' + username + ':uid', uid);
-				RDB.set('email:' + email +':uid', uid);			
+					RDB.incr('usercount', function(err, count) {
+						RDB.handle(err);
 				
-				if(email)
-					User.sendConfirmationEmail(email);
-			
-				RDB.incr('usercount', function(err, count) {
-					RDB.handle(err);
-			
-					io.sockets.emit('user.count', {count: count});
-				});
+						io.sockets.emit('user.count', {count: count});
+					});
 
-				RDB.lpush('userlist', username);
-				io.sockets.emit('user.latest', {username: username});
+					RDB.lpush('userlist', username);
+					io.sockets.emit('user.latest', {username: username});
 
-				callback(null, uid);
-				
+					callback(null, uid);
+				});
 			});
-
 		});
-
 	};
 
 	User.createGravatarURLFromEmail = function(email) {

From d7b6141e31f8406aae8a22c3c3be7aa708b28d03 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 13 May 2013 17:02:10 -0400
Subject: [PATCH 06/15] button to change picture

---
 public/css/style.less            | 1 +
 public/templates/accountedit.tpl | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/css/style.less b/public/css/style.less
index b57ab30238..65cdccb76b 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -386,6 +386,7 @@ footer.footer {
 .user-profile-picture {
    width:128px;
    height:128px;
+   margin-bottom:10px;
 }
 
 .user-8080-picture {
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 2b327d8eab..195f9bbcc0 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -21,7 +21,7 @@
 		    <span class="user-picture-label">Gravatar</span>
    		    <i class='icon-ok icon-2x'></i>
 	    </div>
-	    
+	    <br/>
 	    <div id="uploaded-box">
 		    <img id="user-uploaded-picture" src="" class="img-polaroid user-profile-picture">
 		    <span class="user-picture-label">Uploaded picture</span>
@@ -75,7 +75,7 @@
 
     <div class="account-picture-block text-center">
         <img id="user-current-picture" class="user-profile-picture" src="{user.picture}" /><br/>
-        <a id="changePictureBtn" href="#">change picture</a>
+        <a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
     </div>
   
       

From f662353cbfc1938d9b7224fe932635830eb25826 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Mon, 13 May 2013 17:30:51 -0400
Subject: [PATCH 07/15] fixes to thread avatar on phone

---
 public/css/style.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/css/style.less b/public/css/style.less
index b57ab30238..9206448f4d 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -260,6 +260,11 @@ footer.footer {
 		line-height: 18px;
 		padding: 5px;
 		padding-left: 10px;
+
+		img.hidden-desktop {
+			max-width: 10px;
+			max-height: 10px;
+		}
 	}
 	.post-content {
 		min-height: 50px;

From 901b378912055684645b901e857f7b055fff3c87 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 13 May 2013 17:40:14 -0400
Subject: [PATCH 08/15] css fix

---
 public/templates/accountedit.tpl | 107 ++++++++++++++++---------------
 src/webserver.js                 |   6 +-
 2 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 195f9bbcc0..f2ed3d5e70 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -73,57 +73,62 @@
         <span class="pull-right"><a href="/users/{user.username}/edit">edit</a></span>
     </div>
 
-    <div class="account-picture-block text-center">
-        <img id="user-current-picture" class="user-profile-picture" src="{user.picture}" /><br/>
-        <a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
-    </div>
-  
-      
-     <div class="inline-block">
-         <form class='form-horizontal'>
-             <div class="control-group">
-                <label class="control-label" for="inputEmail">Email</label>
-                <div class="controls">
-                  <input type="text" id="inputEmail" placeholder="Email" value="{user.email}">
-                </div>
-              </div>
-              
-              <div class="control-group">
-                <label class="control-label" for="inputFullname">Full Name</label>
-                <div class="controls">
-                  <input type="text" id="inputFullname" placeholder="Full Name" value="{user.fullname}">
-                </div>
-              </div>
-              
-               <div class="control-group">
-                <label class="control-label" for="inputWebsite">Website</label>
-                <div class="controls">
-                  <input type="text" id="inputWebsite" placeholder="http://website.com" value="{user.website}">
-                </div>
-              </div>
-             
-              <div class="control-group">
-                <label class="control-label" for="inputLocation">Location</label>
-                <div class="controls">
-                  <input type="text" id="inputLocation" placeholder="Location" value="{user.location}">
-                </div>
-              </div>
-              
-              <div class="control-group">
-                <label class="control-label" for="inputBirthday">Birthday</label>
-                <div class="controls">
-                  <input type="text" id="inputBirthday" placeholder="dd/mm/yyyy" value="{user.birthday}">
-                </div>
-              </div>
-             
-             <input type="hidden" id="inputUID" value="{user.uid}">
-             
-              <div class="form-actions">
-                <a id="submitBtn" href="" class="btn btn-primary">Save changes</a>
-                <a href="/users/{user.username}" class="btn">Cancel</a>
-            </div>
-              
-         </form>
+	<div class="row-fluid">
+		<div class="span3" style="text-align: center; margin-bottom:20px;">
+		    <div class="account-picture-block text-center">
+		        <img id="user-current-picture" class="user-profile-picture" src="{user.picture}" /><br/>
+		        <a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
+		    </div>
+		</div>
+	      
+		<div class="span9">
+		     <div class="inline-block">
+		         <form class='form-horizontal'>
+		             <div class="control-group">
+		                <label class="control-label" for="inputEmail">Email</label>
+		                <div class="controls">
+		                  <input type="text" id="inputEmail" placeholder="Email" value="{user.email}">
+		                </div>
+		              </div>
+		              
+		              <div class="control-group">
+		                <label class="control-label" for="inputFullname">Full Name</label>
+		                <div class="controls">
+		                  <input type="text" id="inputFullname" placeholder="Full Name" value="{user.fullname}">
+		                </div>
+		              </div>
+		              
+		               <div class="control-group">
+		                <label class="control-label" for="inputWebsite">Website</label>
+		                <div class="controls">
+		                  <input type="text" id="inputWebsite" placeholder="http://website.com" value="{user.website}">
+		                </div>
+		              </div>
+		             
+		              <div class="control-group">
+		                <label class="control-label" for="inputLocation">Location</label>
+		                <div class="controls">
+		                  <input type="text" id="inputLocation" placeholder="Location" value="{user.location}">
+		                </div>
+		              </div>
+		              
+		              <div class="control-group">
+		                <label class="control-label" for="inputBirthday">Birthday</label>
+		                <div class="controls">
+		                  <input type="text" id="inputBirthday" placeholder="mm/dd/yyyy" value="{user.birthday}">
+		                </div>
+		              </div>
+		             
+		             <input type="hidden" id="inputUID" value="{user.uid}">
+		             
+		              <div class="form-actions">
+		                <a id="submitBtn" href="" class="btn btn-primary">Save changes</a>
+		                <a href="/users/{user.username}" class="btn">Cancel</a>
+		            </div>
+		              
+		         </form>
+		    </div>
+	    </div>
     </div>
     
     <!-- how to pass data to the script ?? -->
diff --git a/src/webserver.js b/src/webserver.js
index 4608a6401d..7cb4904b37 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -347,7 +347,11 @@ var express = require('express'),
 				if(data)
 				{
 					data.joindate = utils.relativeTime(data.joindate);
-					data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();;
+					data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();
+
+					console.log(data.birthday);
+					console.log(new Date(data.birthday).getFullYear());
+
 					data.uid = uid;
 					
 					callback({

From 0bb0fd5789ff4aba91a9e3ec7d1af69a47fe154c Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 13 May 2013 17:40:51 -0400
Subject: [PATCH 09/15] removed debug console.logs

---
 src/webserver.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/webserver.js b/src/webserver.js
index 7cb4904b37..557b399218 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -348,10 +348,6 @@ var express = require('express'),
 				{
 					data.joindate = utils.relativeTime(data.joindate);
 					data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();
-
-					console.log(data.birthday);
-					console.log(new Date(data.birthday).getFullYear());
-
 					data.uid = uid;
 					
 					callback({

From d564811b71bca3b93c4913780f1b1f596414b57b Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 14 May 2013 11:32:37 -0400
Subject: [PATCH 10/15] fixed the data passing to accountedit.tpl

---
 public/templates/account.tpl     | 25 ++++++++--------
 public/templates/accountedit.tpl | 49 +++++++++++---------------------
 src/webserver.js                 |  9 +++---
 3 files changed, 33 insertions(+), 50 deletions(-)

diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 5b870e6c59..06f9ad4a73 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -6,48 +6,47 @@
         <p></p>
     </div>
 
-	<!-- BEGIN user -->
-	
+
 	<div class="account-username-box">
-		<span class="account-username"><a href="/users/{user.username}">{user.username}</a></span>
-		<span id="editLink" class="pull-right"><a href="/users/{user.username}/edit">edit</a></span>
+		<span class="account-username"><a href="/users/{username}">{username}</a></span>
+		<span id="editLink" class="pull-right"><a href="/users/{username}/edit">edit</a></span>
 	</div>
 		
 	<div class="account-picture-block">
-		<img src="{user.picture}?s=128" class="user-profile-picture"/>
+		<img src="{picture}" class="user-profile-picture"/>
 	</div>
 	
 	<div class="account-bio-block">
 		<span class="account-bio-label">email</span>
-		<span>{user.email}</span>
+		<span>{email}</span>
 		<br/>
 		
 		<span class="account-bio-label">full name</span>
-        <span>{user.fullname}</span>
+        <span>{fullname}</span>
         <br/>
         
         <span class="account-bio-label">website</span>
-        <span><a href="{user.website}">{user.website}</a></span>
+        <span><a href="{user.website}">{website}</a></span>
         <br/>
 		
 		<span class="account-bio-label">location</span>
-        <span>{user.location}</span>
+        <span>{location}</span>
         <br/>
         
         <span class="account-bio-label">age</span>
-        <span>{user.age}</span>
+        <span>{age}</span>
         <br/>
 		
 		<span class="account-bio-label">member for</span>
-		<span>{user.joindate}</span>
+		<span>{joindate}</span>
 		<br/>
 
 		<span class="account-bio-label">reputation</span>
-		<span id='reputation'>{user.reputation}</span>
+		<span id='reputation'>{reputation}</span>
 		<br/>		
 		
 		<span class="account-bio-label">posts</span>
-		<span id='postcount'>{user.postcount}</span>
+		<span id='postcount'>{postcount}</span>
 	</div>
 	 
    
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index f2ed3d5e70..a61c081a67 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -6,7 +6,6 @@
         <strong></strong>
         <p></p>
     </div>
-
  
 	<!-- Change Picture Modal -->
 	<div id="change-picture-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -64,19 +63,16 @@
 	    <button id="pictureUploadSubmitBtn" class="btn btn-primary">Upload Picture</button>
 	  </div>
 	</div>
-
-
-    <!-- BEGIN user -->
     
     <div class="account-username-box">
-        <span class="account-username"><a href="/users/{user.username}">{user.username}</a></span>
-        <span class="pull-right"><a href="/users/{user.username}/edit">edit</a></span>
+        <span class="account-username"><a href="/users/{username}">{username}</a></span>
+        <span class="pull-right"><a href="/users/{username}/edit">edit</a></span>
     </div>
 
 	<div class="row-fluid">
 		<div class="span3" style="text-align: center; margin-bottom:20px;">
 		    <div class="account-picture-block text-center">
-		        <img id="user-current-picture" class="user-profile-picture" src="{user.picture}" /><br/>
+		        <img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br/>
 		        <a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
 		    </div>
 		</div>
@@ -87,63 +83,56 @@
 		             <div class="control-group">
 		                <label class="control-label" for="inputEmail">Email</label>
 		                <div class="controls">
-		                  <input type="text" id="inputEmail" placeholder="Email" value="{user.email}">
+		                  <input type="text" id="inputEmail" placeholder="Email" value="{email}">
 		                </div>
 		              </div>
 		              
 		              <div class="control-group">
 		                <label class="control-label" for="inputFullname">Full Name</label>
 		                <div class="controls">
-		                  <input type="text" id="inputFullname" placeholder="Full Name" value="{user.fullname}">
+		                  <input type="text" id="inputFullname" placeholder="Full Name" value="{fullname}">
 		                </div>
 		              </div>
 		              
 		               <div class="control-group">
 		                <label class="control-label" for="inputWebsite">Website</label>
 		                <div class="controls">
-		                  <input type="text" id="inputWebsite" placeholder="http://website.com" value="{user.website}">
+		                  <input type="text" id="inputWebsite" placeholder="http://website.com" value="{website}">
 		                </div>
 		              </div>
 		             
 		              <div class="control-group">
 		                <label class="control-label" for="inputLocation">Location</label>
 		                <div class="controls">
-		                  <input type="text" id="inputLocation" placeholder="Location" value="{user.location}">
+		                  <input type="text" id="inputLocation" placeholder="Location" value="{location}">
 		                </div>
 		              </div>
 		              
 		              <div class="control-group">
 		                <label class="control-label" for="inputBirthday">Birthday</label>
 		                <div class="controls">
-		                  <input type="text" id="inputBirthday" placeholder="mm/dd/yyyy" value="{user.birthday}">
+		                  <input type="text" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}">
 		                </div>
 		              </div>
 		             
-		             <input type="hidden" id="inputUID" value="{user.uid}">
+		             <input type="hidden" id="inputUID" value="{uid}">
 		             
 		              <div class="form-actions">
 		                <a id="submitBtn" href="" class="btn btn-primary">Save changes</a>
-		                <a href="/users/{user.username}" class="btn">Cancel</a>
+		                <a href="/users/{username}" class="btn">Cancel</a>
 		            </div>
 		              
 		         </form>
 		    </div>
 	    </div>
-    </div>
-    
-    <!-- how to pass data to the script ?? -->
-	<div id="user-data-picture" class="hide">{user.picture}</div>
-	<div id="user-data-gravatarpicture" class="hide">{user.gravatarpicture}</div>
-	<div id="user-data-uploadedpicture" class="hide">{user.uploadedpicture}</div>
-
-    
-    <!-- END user -->
-
+    </div>  
 </div>
 
+<script type="text/javascript">
 
 
-<script type="text/javascript">
+var gravatarPicture = '{gravatarpicture}';
+var uploadedPicture = '{uploadedpicture}';
 
 $(document).ready(function() {
  
@@ -180,7 +169,7 @@ $(document).ready(function() {
  				$('#user-current-picture').attr('src', imageUrlOnServer);
  				$('#user-uploaded-picture').attr('src', imageUrlOnServer);
  				
-				$('#user-data-uploadedpicture').html(imageUrlOnServer);        
+				uploadedPicture = imageUrlOnServer;        
  								
 				setTimeout(function() {
 					hideAlerts();
@@ -253,10 +242,6 @@ $(document).ready(function() {
     });
     
     function updateImages() {
-    	
-		var currentPicture = $('#user-current-picture').attr('src');
-    	var gravatarPicture = $('#user-data-gravatarpicture').html();        
-		var uploadedPicture = $('#user-data-uploadedpicture').html();        
 
 		if(gravatarPicture) {
         	$('#user-gravatar-picture').attr('src', gravatarPicture);
@@ -313,9 +298,9 @@ $(document).ready(function() {
         	changeUserPicture(selectedImageType);
         	
         	if(selectedImageType == 'gravatar')
-		        $('#user-current-picture').attr('src', $('#user-data-gravatarpicture').html());		
+		        $('#user-current-picture').attr('src', gravatarPicture);		
 			else if(selectedImageType == 'uploaded')
-		        $('#user-current-picture').attr('src', $('#user-data-uploadedpicture').html());						
+		        $('#user-current-picture').attr('src', uploadedPicture);						
         }
     	
 	});
diff --git a/src/webserver.js b/src/webserver.js
index 557b399218..c288a828ec 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -350,11 +350,10 @@ var express = require('express'),
 					data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();
 					data.uid = uid;
 					
-					callback({
-						yourid: (req.user)?req.user.uid : 0,
-						theirid: uid,
-						user: data
-					});
+					data.yourid = (req.user)?req.user.uid : 0;
+					data.theirid = uid;
+					
+					callback(data);
 				}
 				else
 					callback({user:{}});

From c351d83418217258d804132376c87cb376d45533 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Tue, 14 May 2013 12:04:38 -0400
Subject: [PATCH 11/15] added popstate functionality

---
 public/src/ajaxify.js   | 17 ++++++++++++-----
 public/src/templates.js |  4 +---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index e83d16fbf4..2b5698fef6 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -21,11 +21,13 @@ var ajaxify = {};
 
 
 	window.onpopstate = function(event) {
-		// this breaks reloading and results in ajaxify.go calling twice, believe it messes around with sockets. ill come back for you later bitchez
-		// ajaxify.go(document.location.href.replace(rootUrl +'/', ''));
+		console.log('popstate called:', event);
+		if (event !== null && event.state && event.state.url) ajaxify.go(event.state.url, null, null, true);
 	};
 
-	ajaxify.go = function(url, callback, custom_tpl) {
+	ajaxify.go = function(url, callback, template, quiet) {
+		console.log('go', url, quiet);
+		// "quiet": If set to true, will not call pushState
 
 		// leave room and join global
 		app.enter_room('global');
@@ -41,7 +43,12 @@ var ajaxify = {};
 		}
 		
 		if (templates[tpl_url]) {
-			window.history.pushState({}, url, "/" + url);
+			if (quiet !== true) {
+				console.log('pushing state');
+				window.history.pushState({
+					"url": url
+				}, url, "/" + url);
+			}
 
 			jQuery('#footer').fadeOut(100);
 			jQuery('#content').fadeOut(100);
@@ -55,7 +62,7 @@ var ajaxify = {};
 				}
 				
 				jQuery('#content, #footer').fadeIn(200);
-			}, custom_tpl);
+			}, url, template);
 			
 			
 			return true;
diff --git a/public/src/templates.js b/public/src/templates.js
index 95c7f76566..de538645e8 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -160,14 +160,12 @@ var templates = {};
 
 }());
 
-function load_template(callback, custom_tpl) {
+function load_template(callback, url, template) {
 	var location = document.location || window.location,
 		rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : '');
 
-	var url = location.href.replace(rootUrl +'/', '');
 	url = (url === '' || url === '/') ? 'home' : url;
 
-
 	jQuery.get(API_URL + url, function(data) {
 
 		var tpl = templates.get_custom_map(url);

From 4c324664fa14b9b32dadd3a87410c8e5b468ca90 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 14 May 2013 12:13:29 -0400
Subject: [PATCH 12/15] removed global modules

---
 app.js              | 33 ++++++++-------------
 src/routes/admin.js |  9 ++++--
 src/templates.js    |  5 +++-
 src/user.js         |  4 ++-
 src/webserver.js    | 23 ++++++++-------
 src/websockets.js   | 72 ++++++++++++++++++++++++---------------------
 6 files changed, 77 insertions(+), 69 deletions(-)

diff --git a/app.js b/app.js
index 0aa624af0e..767c86bfb5 100644
--- a/app.js
+++ b/app.js
@@ -1,41 +1,34 @@
-var modules = {
-    	user: require('./src/user.js'),
-        topics: require('./src/topics.js'),
-        posts: require('./src/posts.js'),
-        categories: require('./src/categories.js'),
-    	templates: require('./src/templates.js'),
-    	webserver: require('./src/webserver.js'),
-    	websockets: require('./src/websockets.js'),
-        fs: require('fs')
-    }
-
-    DEVELOPMENT = true;
+var topics = require('./src/topics.js'),
+    posts = require('./src/posts.js'),
+    categories = require('./src/categories.js'),
+    templates = require('./src/templates.js'),
+    webserver = require('./src/webserver.js'),
+    websockets = require('./src/websockets.js'),
+    fs = require('fs');
 
+DEVELOPMENT = true;
 
 global.configuration = {};
-global.modules = modules;
-
 
 (function(config) {
     config['ROOT_DIRECTORY'] = __dirname;
 
-	modules.templates.init();
-	modules.websockets.init();
-	
+	templates.init();
+	websockets.init();
 
 
     //setup scripts to be moved outside of the app in future.
     function setup_categories() {
         console.log('Checking categories...');
-        modules.categories.get(function(data) {
+        categories.get(function(data) {
             if (data.categories.length === 0) {
                 console.log('Setting up default categories...');
 
-                modules.fs.readFile(config.ROOT_DIRECTORY + '/install/data/categories.json', function(err, categories) {
+                fs.readFile(config.ROOT_DIRECTORY + '/install/data/categories.json', function(err, categories) {
                     categories = JSON.parse(categories);
                     
                     for (var category in categories) {
-                        modules.categories.create(categories[category]);
+                        categories.create(categories[category]);
                     }
                 });
 
diff --git a/src/routes/admin.js b/src/routes/admin.js
index d222a2446a..aeabfc6d48 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -1,4 +1,7 @@
 
+var user = require('./../user.js'),
+	topics = require('./../topics.js');
+
 (function(Admin) {
 	Admin.create_routes = function(app) {
 
@@ -29,7 +32,7 @@
 					if (req.params.tab == 'search') {
 						res.send(JSON.stringify({search_display: 'block', users: []}))
 					} else {
-						global.modules.user.getUserList(function(data){
+						user.getUserList(function(data){
 							res.send(JSON.stringify({search_display: 'none', users:data}));
 						});
 					}
@@ -39,13 +42,13 @@
 					if (req.params.tab == 'disabled') {
 						res.send(JSON.stringify({categories: []}));
 					} else {
-						global.modules.categories.get(function(data) {
+						categories.get(function(data) {
 							res.send(JSON.stringify(data));
 						});
 					}
 					break;
 				case 'topics' :
-					global.modules.topics.get(function(data) {
+					topics.get(function(data) {
 						res.send(JSON.stringify(data));
 					});
 					break;
diff --git a/src/templates.js b/src/templates.js
index 4fc25a72b1..b9b97571c9 100644
--- a/src/templates.js
+++ b/src/templates.js
@@ -1,3 +1,6 @@
+var fs = require('fs');
+
+
 // to be deprecated in favour of client-side only templates.
 
 (function(Templates) {
@@ -7,7 +10,7 @@
 	function loadTemplates(templatesToLoad) {
 		for (var t in templatesToLoad) {
 			(function(file) {
-				modules.fs.readFile(global.configuration.ROOT_DIRECTORY + '/public/templates/' + file + '.tpl', function(err, html) {
+				fs.readFile(global.configuration.ROOT_DIRECTORY + '/public/templates/' + file + '.tpl', function(err, html) {
 					var template = function() {
 						this.toString = function() {
 							return this.html;
diff --git a/src/user.js b/src/user.js
index 32e18715a7..5a2cc51cb7 100644
--- a/src/user.js
+++ b/src/user.js
@@ -1,4 +1,6 @@
-var	config = require('../config.js'),
+
+
+var config = require('../config.js'),
 	utils = require('./utils.js'),
 	RDB = require('./redis.js'),
 	crypto = require('crypto'),
diff --git a/src/webserver.js b/src/webserver.js
index c288a828ec..5586c8526e 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -8,6 +8,9 @@ var express = require('express'),
 	redisServer = redis.createClient(config.redis.port, config.redis.host, config.redis.options),
 	
 	user = require('./user.js'),
+	categories = require('./categories.js'),
+	posts = require('./posts.js'),
+	topics = require('./topics.js'),
 	utils = require('./utils.js'),
 	fs = require('fs'),
 	admin = require('./routes/admin.js'),
@@ -40,11 +43,11 @@ var express = require('express'),
 		if (/^\/api\//.test(req.url)) return next();
 
 		if (req.user && req.user.uid) {
-			global.modules.user.session_ping(req.sessionID, req.user.uid);
+			user.session_ping(req.sessionID, req.user.uid);
 		}
 
 		// (Re-)register the session as active
-		global.modules.user.active.register(req.sessionID);
+		user.active.register(req.sessionID);
 
 		next();
 	});
@@ -98,7 +101,7 @@ var express = require('express'),
 	function api_method(req, res) {		
 		switch(req.params.method) {
 			case 'home' :
-					global.modules.categories.get(function(data) {
+					categories.get(function(data) {
 						res.send(JSON.stringify(data));
 					});
 				break;
@@ -147,27 +150,27 @@ var express = require('express'),
 					res.send(JSON.stringify(data));
 				break;
 			case 'topic' :
-					global.modules.posts.get(function(data) {
+					posts.get(function(data) {
 						res.send(JSON.stringify(data));
 					}, req.params.id, (req.user) ? req.user.uid : 0);
 				break;
 			case 'category' :
-					global.modules.topics.get(function(data) {
+					topics.get(function(data) {
 						res.send(JSON.stringify(data));
 					}, req.params.id, (req.user) ? req.user.uid : 0);
 				break;
 			case 'latest' :
-					global.modules.topics.get(function(data) {
+					topics.get(function(data) {
 						res.send(JSON.stringify(data));
 					});
 				break;
 			case 'popular' :
-					global.modules.topics.get(function(data) {
+					topics.get(function(data) {
 						res.send(JSON.stringify(data));
 					});
 				break;
 			case 'active' :
-					global.modules.topics.get(function(data) {
+					topics.get(function(data) {
 						res.send(JSON.stringify(data));
 					});
 				break;
@@ -189,7 +192,7 @@ var express = require('express'),
 					
 				break;
 			case 'confirm':
-					global.modules.user.email.confirm(req.params.id, function(data) {
+					user.email.confirm(req.params.id, function(data) {
 						if (data.status === 'ok') {
 							res.send(JSON.stringify({
 								'alert-class': 'alert-success',
@@ -436,7 +439,7 @@ var express = require('express'),
 	}
 
 	app.get('/test', function(req, res) {
-		global.modules.posts.getRawContent(11, function(post) {
+		posts.getRawContent(11, function(post) {
 			res.send(JSON.stringify(post));
 		});
 	});
diff --git a/src/websockets.js b/src/websockets.js
index e2fdfa0a62..cd15e5f81f 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -1,16 +1,20 @@
 var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 	cookie = require('cookie'),
 	connect = require('connect'),
-	config = require('../config.js');
-
+	config = require('../config.js'),
+	user = require('./user.js'),
+	posts = require('./posts.js'),
+	topics = require('./topics.js'),
+	categories = require('./categories.js'),
+	templates = require('./templates.js');
+	
 (function(io) {
-	var	modules = null,
-			users = {},
+	var	users = {},
 			rooms = {}
 
 	global.io = io;
 	module.exports.init = function() {
-		modules = global.modules;
+		
 	}
 
 	// Adapted from http://howtonode.org/socket-io-auth
@@ -30,7 +34,7 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 		// Otherwise, continue unimpeded.
 		var sessionID = handshakeData.sessionID;
 		
-		global.modules.user.get_uid_by_session(sessionID, function(userId) {
+		user.get_uid_by_session(sessionID, function(userId) {
 			if (userId)
 			{
 				users[sessionID] = userId;
@@ -50,7 +54,7 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 
 		if (DEVELOPMENT === true) {
 			// refreshing templates
-			modules.templates.init();
+			templates.init();
 		}
 		
 		/*process.on('uncaughtException', function(err) {
@@ -93,7 +97,7 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 			}
 
 
-			modules.user.get_usernames_by_uids(uids, function(usernames) {
+			user.get_usernames_by_uids(uids, function(usernames) {
 				io.sockets.in(data.enter).emit('api:get_users_in_room', {
 					usernames: usernames,
 					uids: uids,
@@ -111,7 +115,7 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 		socket.on('api:updateHeader', function(data) {
 			if(uid) {
 						
-				modules.user.getUserFields(uid, data.fields, function(fields) {
+				user.getUserFields(uid, data.fields, function(fields) {
 					fields.uid = uid;
 					socket.emit('api:updateHeader', fields);
 				});
@@ -128,107 +132,107 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 		});
 		
 		socket.on('user.exists', function(data) {
-			modules.user.exists(data.username, function(exists){
+			user.exists(data.username, function(exists){
 				socket.emit('user.exists', {exists: exists});
 			});
 		});
 
 		socket.on('user.count', function(data) {
-			modules.user.count(socket, data);
+			user.count(socket, data);
 		});
 
 		socket.on('user.latest', function(data) {
-			modules.user.latest(socket, data);
+			user.latest(socket, data);
 		});
 
 		socket.on('user.email.exists', function(data) {
-			modules.user.email.exists(socket, data.email);
+			user.email.exists(socket, data.email);
 		});
 
 		socket.on('user:reset.send', function(data) {
-			modules.user.reset.send(socket, data.email);
+			user.reset.send(socket, data.email);
 		});
 
 		socket.on('user:reset.valid', function(data) {
-			modules.user.reset.validate(socket, data.code);
+			user.reset.validate(socket, data.code);
 		});
 
 		socket.on('user:reset.commit', function(data) {
-			modules.user.reset.commit(socket, data.code, data.password);
+			user.reset.commit(socket, data.code, data.password);
 		});
 
 		socket.on('api:topics.post', function(data) {
-			modules.topics.post(socket, uid, data.title, data.content, data.category_id);
+			topics.post(socket, uid, data.title, data.content, data.category_id);
 		});
 
 		socket.on('api:posts.reply', function(data) {
-			modules.posts.reply(socket, data.topic_id, uid, data.content);
+			posts.reply(socket, data.topic_id, uid, data.content);
 		});
 
 		socket.on('api:user.active.get', function() {
-			modules.user.active.get();
+			user.active.get();
 		});
 
 		socket.on('api:posts.favourite', function(data) {
-			modules.posts.favourite(io, data.pid, data.room_id, uid);
+			posts.favourite(io, data.pid, data.room_id, uid);
 		});
 
 		socket.on('api:posts.unfavourite', function(data) {
-			modules.posts.unfavourite(io, data.pid, data.room_id, uid);
+			posts.unfavourite(io, data.pid, data.room_id, uid);
 		});
 
 		socket.on('api:user.active.get_record', function() {
-			modules.user.active.get_record(socket);
+			user.active.get_record(socket);
 		});
 
 		socket.on('api:topic.delete', function(data) {
-			modules.topics.delete(data.tid, uid, socket);
+			topics.delete(data.tid, uid, socket);
 		});
 
 		socket.on('api:topic.restore', function(data) {
-			modules.topics.restore(data.tid, uid, socket);
+			topics.restore(data.tid, uid, socket);
 		});
 
 		socket.on('api:topic.lock', function(data) {
-			modules.topics.lock(data.tid, uid, socket);
+			topics.lock(data.tid, uid, socket);
 		});
 
 		socket.on('api:topic.unlock', function(data) {
-			modules.topics.unlock(data.tid, uid, socket);
+			topics.unlock(data.tid, uid, socket);
 		});
 
 		socket.on('api:topic.pin', function(data) {
-			modules.topics.pin(data.tid, uid, socket);
+			topics.pin(data.tid, uid, socket);
 		});
 
 		socket.on('api:topic.unpin', function(data) {
-			modules.topics.unpin(data.tid, uid, socket);
+			topics.unpin(data.tid, uid, socket);
 		});
 
 		socket.on('api:categories.get', function() {
-			modules.categories.get(function(categories) {
+			categories.get(function(categories) {
 				socket.emit('api:categories.get', categories);
 			});
 		});
 
 		socket.on('api:topic.move', function(data) {
-			modules.topics.move(data.tid, data.cid, socket);
+			topics.move(data.tid, data.cid, socket);
 		});
 
 		socket.on('api:posts.getRawPost', function(data) {
-			modules.posts.getRawContent(data.pid, socket);
+			posts.getRawContent(data.pid, socket);
 		});
 
 		socket.on('api:posts.edit', function(data) {
-			modules.posts.edit(uid, data.pid, data.content);
+			posts.edit(uid, data.pid, data.content);
 		});
 
 		socket.on('api:posts.delete', function(data) {
-			modules.posts.delete(uid, data.pid);
+			posts.delete(uid, data.pid);
 		});
 
 		socket.on('api:posts.restore', function(data) {
-			modules.posts.restore(uid, data.pid);
+			posts.restore(uid, data.pid);
 		});
 	});
 	

From 613b53ac3d40a812e68d8db9564f3c4fb94667dc Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Tue, 14 May 2013 12:20:33 -0400
Subject: [PATCH 13/15] removing console logs

---
 public/src/ajaxify.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 2b5698fef6..b2941529fc 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -26,7 +26,6 @@ var ajaxify = {};
 	};
 
 	ajaxify.go = function(url, callback, template, quiet) {
-		console.log('go', url, quiet);
 		// "quiet": If set to true, will not call pushState
 
 		// leave room and join global
@@ -44,7 +43,6 @@ var ajaxify = {};
 		
 		if (templates[tpl_url]) {
 			if (quiet !== true) {
-				console.log('pushing state');
 				window.history.pushState({
 					"url": url
 				}, url, "/" + url);

From b429a31f6b4ebbd3f8a8cd109eaf3ef5450725f6 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 14 May 2013 12:26:26 -0400
Subject: [PATCH 14/15] more clean up

---
 app.js            | 6 +-----
 src/websockets.js | 8 +++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 767c86bfb5..498fe85203 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,4 @@
-var topics = require('./src/topics.js'),
-    posts = require('./src/posts.js'),
-    categories = require('./src/categories.js'),
+var categories = require('./src/categories.js'),
     templates = require('./src/templates.js'),
     webserver = require('./src/webserver.js'),
     websockets = require('./src/websockets.js'),
@@ -14,8 +12,6 @@ global.configuration = {};
     config['ROOT_DIRECTORY'] = __dirname;
 
 	templates.init();
-	websockets.init();
-
 
     //setup scripts to be moved outside of the app in future.
     function setup_categories() {
diff --git a/src/websockets.js b/src/websockets.js
index cd15e5f81f..043ebbc6e7 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -1,4 +1,5 @@
-var	SocketIO = require('socket.io').listen(global.server,{log:false}),
+
+var SocketIO = require('socket.io').listen(global.server,{log:false}),
 	cookie = require('cookie'),
 	connect = require('connect'),
 	config = require('../config.js'),
@@ -13,9 +14,6 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 			rooms = {}
 
 	global.io = io;
-	module.exports.init = function() {
-		
-	}
 
 	// Adapted from http://howtonode.org/socket-io-auth
 	io.set('authorization', function(handshakeData, accept) {
@@ -51,7 +49,7 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 		var hs = socket.handshake;
 		
 		var uid = users[hs.sessionID];
-
+		
 		if (DEVELOPMENT === true) {
 			// refreshing templates
 			templates.init();

From 188b1d5ada1286b20144826abb475594dadb38a0 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 14 May 2013 13:04:12 -0400
Subject: [PATCH 15/15] for andrew

---
 app.js                       |  2 +-
 public/templates/account.tpl |  2 +-
 src/routes/user.js           | 95 ++++++++++++++++++++++++++++++++++++
 src/webserver.js             | 60 +++--------------------
 4 files changed, 104 insertions(+), 55 deletions(-)
 create mode 100644 src/routes/user.js

diff --git a/app.js b/app.js
index 498fe85203..5f5d16ac8d 100644
--- a/app.js
+++ b/app.js
@@ -11,7 +11,7 @@ global.configuration = {};
 (function(config) {
     config['ROOT_DIRECTORY'] = __dirname;
 
-	templates.init();
+    templates.init();
 
     //setup scripts to be moved outside of the app in future.
     function setup_categories() {
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 06f9ad4a73..58c4cad975 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -26,7 +26,7 @@
         <br/>
         
         <span class="account-bio-label">website</span>
-        <span><a href="{user.website}">{website}</a></span>
+        <span><a href="{website}">{website}</a></span>
         <br/>
 		
 		<span class="account-bio-label">location</span>
diff --git a/src/routes/user.js b/src/routes/user.js
new file mode 100644
index 0000000000..06c9613777
--- /dev/null
+++ b/src/routes/user.js
@@ -0,0 +1,95 @@
+
+
+var user = require('./../user.js');
+
+
+(function(User) {
+	User.create_routes = function(app) {
+
+		
+		app.get('/uid/:uid', function(req, res) {
+		
+			if(!req.params.uid)
+				return res.redirect('/403');
+			
+			user.getUserData(req.params.uid, function(data){
+				if(data)
+					res.send(data);
+				else
+					res.send("User doesn't exist!");
+			});
+			
+		});
+
+		app.get('/users', function(req, res) {
+
+			user.getUserList(function(data) {
+
+				res.send(templates['header'] + app.create_route("users", "users") + templates['footer']);
+
+			});
+			
+		});
+
+		app.get('/users/:username*', function(req, res) {
+			if(!req.params.username) {
+				res.send("User doesn't exist!");
+				return;
+			}
+
+			user.get_uid_by_username(req.params.username, function(uid) {
+				
+				if(!uid) {
+					res.redirect('/403');
+					return;
+				}
+				
+				user.getUserData(uid, function(data) {
+					if(data) {
+						res.send(templates['header'] + app.create_route('users/'+data.username, 'account')  + templates['footer']);
+					}
+					else {
+						res.redirect('/403');
+					}			
+				});
+			});		
+		});
+		
+/*
+		function api_method(req, res) {
+			switch(req.params.method) {
+				case 'users' :
+					if (req.params.tab == 'search') {
+						res.send(JSON.stringify({search_display: 'block', users: []}))
+					} else {
+						user.getUserList(function(data){
+							res.send(JSON.stringify({search_display: 'none', users:data}));
+						});
+					}
+					
+					break;
+				case 'categories':
+					if (req.params.tab == 'disabled') {
+						res.send(JSON.stringify({categories: []}));
+					} else {
+						categories.get(function(data) {
+							res.send(JSON.stringify(data));
+						});
+					}
+					break;
+				case 'topics' :
+					topics.get(function(data) {
+						res.send(JSON.stringify(data));
+					});
+					break;
+				default :
+					res.send('{}');
+			}
+		}
+
+		app.get('/api/admin/:method/:tab?*', api_method);
+		app.get('/api/admin/:method*', api_method);*/
+	};
+
+
+}(exports));
\ No newline at end of file
diff --git a/src/webserver.js b/src/webserver.js
index 5586c8526e..ef7dbe4901 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -8,12 +8,14 @@ var express = require('express'),
 	redisServer = redis.createClient(config.redis.port, config.redis.host, config.redis.options),
 	
 	user = require('./user.js'),
+
 	categories = require('./categories.js'),
 	posts = require('./posts.js'),
 	topics = require('./topics.js'),
 	utils = require('./utils.js'),
 	fs = require('fs'),
 	admin = require('./routes/admin.js'),
+	userRoute = require('./routes/user.js'),
 	auth = require('./routes/authentication.js');
 
 
@@ -54,7 +56,7 @@ var express = require('express'),
 	
 	auth.create_routes(app);
 	admin.create_routes(app);
-
+	userRoute.create_routes(app);
 
 
 	app.create_route = function(url, tpl) { // to remove
@@ -343,7 +345,7 @@ var express = require('express'),
 	function get_account_fn(req, res, callback) {
 		
 		var username = req.params.id;
-		
+		console.log("derp");
 		user.get_uid_by_username(username, function(uid) {
 	
 			user.getUserData(uid, function(data) {
@@ -351,6 +353,9 @@ var express = require('express'),
 				{
 					data.joindate = utils.relativeTime(data.joindate);
 					data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();
+					console.log(data.age);
+					if(data.age === null)
+						data.age = 0;
 					data.uid = uid;
 					
 					data.yourid = (req.user)?req.user.uid : 0;
@@ -370,31 +375,7 @@ var express = require('express'),
 			callback({users:data});
 		});
 	}
-
 	
-	app.get('/uid/:uid', function(req, res) {
-		
-		if(!req.params.uid)
-			return res.redirect('/403');
-		
-		user.getUserData(req.params.uid, function(data){
-			if(data)
-				res.send(data);
-			else
-				res.send("User doesn't exist!");
-		});
-		
-	});
-
-	app.get('/users', function(req, res) {
-
-		user.getUserList(function(data){
-
-			res.send(templates['header'] + app.create_route("users", "users") + templates['footer']);
-
-		});
-		
-	});
 
 	app.get('/users/:uid/edit', function(req, res){
 		
@@ -409,34 +390,7 @@ var express = require('express'),
 				return res.redirect('/403');
 		});	
 	});
-
 	
-	app.get('/users/:username*', handleUserProfile);
-	
-	function handleUserProfile(req, res) {
-		
-		if(!req.params.username) {
-			res.send("User doesn't exist!");
-			return;
-		}
-
-		user.get_uid_by_username(req.params.username, function(uid) {
-			
-			if(!uid) {
-				res.redirect('/403');
-				return;
-			}
-			
-			user.getUserData(uid, function(data) {
-				if(data) {
-					res.send(templates['header'] + app.create_route('users/'+data.username, 'account')  + templates['footer']);
-				}
-				else {
-					res.redirect('/403');
-				}			
-			});
-		});
-	}
 
 	app.get('/test', function(req, res) {
 		posts.getRawContent(11, function(post) {