navigation cleanup

public/src/modules/helpers.js

@@ -17,10 +17,6 @@
 		var item = data.navigation[index],
 			properties = item.properties;
 
-		if (!item.enabled) {
-			return false;
-		}
-
 		if (properties) {
 			if (properties.loggedIn && !data.loggedIn ||
 				properties.adminOnly && !data.isAdmin ||

src/controllers/admin.js

@@ -246,7 +246,7 @@ adminController.sounds.get = function(req, res, next) {
 };
 
 adminController.navigation.get = function(req, res, next) {
-	require('../navigation/admin').get(function(err, data) {
+	require('../navigation/admin').getAdmin(function(err, data) {
 		if (err) {
 			return next(err);
 		}

src/navigation/admin.js

@@ -33,13 +33,21 @@ admin.save = function(data, callback) {
 	], callback);
 };
 
-admin.get = function(callback) {
+admin.getAdmin = function(callback) {
 	async.parallel({
-		enabled: require('./index').get,
+		enabled: admin.get,
 		available: getAvailable
 	}, callback);
 };
 
+admin.get = function(callback) {
+	db.getSortedSetRange('navigation:enabled', 0, -1, function(err, data) {
+		callback(err, data.map(function(item, idx) {
+			return JSON.parse(item)[idx];
+		}));
+	});
+};
+
 function getAvailable(callback) {
 	var core = require('../../install/data/navigation.json').map(function(item) {
 		item.core = true;

src/navigation/index.js

@@ -3,15 +3,29 @@
 
 var navigation = {},
 	plugins = require('../plugins'),
-	db = require('../database');
+	db = require('../database'),
+	admin = require('./admin'),
+	translator = require('../../public/src/translator');
 
 
 navigation.get = function(callback) {
-	db.getSortedSetRange('navigation:enabled', 0, -1, function(err, data) {
-		callback(err, data.map(function(item, idx) {
-			return JSON.parse(item)[idx];
-		}));
-	});
+	admin.get(function(err, data) {
+		callback(err, data
+			.filter(function(item) {
+				return item.enabled;
+			})
+			.map(function(item) {
+				console.log(item);
+				for (var i in item) {
+					if (item.hasOwnProperty(i)) {
+						console.log(item[i]);
+						item[i] = translator.unescape(item[i]);
+					}
+				}
+
+				return item;
+			}));
+	})
 };