Cleaning minor errors ( semicolons, ... )

api/controllers/ActionController.js

@@ -19,7 +19,7 @@
  * @param {} callback
  * @return 
  */
-var haveRights = function(action, user,callback){
+function haveRights(action, user,callback){
 	Action.findOne({id : action, user: user}, function(err, action){
 		if(err) return callback(err);
 

api/controllers/AlarmController.js

@@ -94,7 +94,7 @@ module.exports = {
 		AlarmService.destroyAlarm(req.param('id'), function(err,alarm){
 			if(err) return res.json(err);
 
-			res.json(alarm)
+			res.json(alarm);
 		});
 	}
 };

api/controllers/HouseController.js

@@ -155,17 +155,17 @@ module.exports = {
    * @return 
    */
   getrelationhouse: function(req,res,next){
-                var request = "SELECT userhouserelation.id AS id, user.id AS userId, CONCAT(user.firstname, ' ', user.lastname) as userName, house.id as houseId, house.name as houseName, userhouserelationtype "
+                var request = "SELECT userhouserelation.id AS id, user.id AS userId, CONCAT(user.firstname, ' ', user.lastname) as userName, house.id as houseId, house.name as houseName, userhouserelationtype ";
                 request+= "FROM userhouserelation ";
                 request+= "JOIN user ON (userhouserelation.user = user.id) ";
                 request+= "JOIN house ON (userhouserelation.house = house.id) ";
                 request+= "WHERE house IN ( SELECT house FROM userhouserelation WHERE userhouserelationtype = 1 ";
                 request+= "AND user = ?) ";
 
-                UserHouseRelation.query(request,[req.session.User.id], function UserHouseRelation(err,UserHouseRelation){
+                UserHouseRelation.query(request,[req.session.User.id], function UserHouseRelation(err,userHouseRelation){
                     if(err) res.json(err);
 
-                    res.json(UserHouseRelation);
+                    res.json(userHouseRelation);
                 });
   },
 

api/controllers/LauncherController.js

@@ -37,7 +37,7 @@ function haveRights(launcher, user,callback){
  * @param {} callback
  * @return 
  */
-var haveRightsAction = function(action, user,callback){
+function haveRightsAction (action, user,callback){
 	Action.findOne({id : action, user: user}, function(err, action){
 		if(err) return callback(err);
 
@@ -53,7 +53,7 @@ var haveRightsAction = function(action, user,callback){
  * @param {} callback
  * @return 
  */
-var haveRightsState = function(state, user,callback){
+function haveRightsState(state, user,callback){
 	State.findOne({id : state, user: user}, function(err, state){
 		if(err) return callback(err);
 

api/controllers/RoomController.js

@@ -21,12 +21,12 @@
  * @param {} callback
  * @return 
  */
-var haveRights = function (user,room,callback){
+function haveRights (user,room,callback){
 	Room.findOne({id:room}, function(err, room){
 		if(err) callback(err);
 
 		if(!room){
-			callback(false,false)
+			callback(false,false);
 		}else{
 			UserHouseRelation.findOne({house: room.house, user: user, userhouserelationtype: sails.config.userhouserelationtype.Admin }, function(err, userHouseRelation){
 		          if(err) callback(err);

api/controllers/ScriptController.js

@@ -18,7 +18,7 @@
  */
 function validFileName(name){
 	var reg = /[a-zA-Z0-9]+\.js$/;
-	return reg.test(name)
+	return reg.test(name);
 }
 
 function stringifyError (err, filter, space) {

api/controllers/SessionController.js

@@ -80,7 +80,7 @@ module.exports = {
 			var usernamePasswordRequiredError = [{
 				name: 'usernamePasswordRequired',
 				message: 'You must enter both a username and password.'
-			}]
+			}];
 
 			req.flash('error', usernamePasswordRequiredError);
 			return res.redirect('/login');
@@ -97,7 +97,7 @@ module.exports = {
 				var noAccountError = [{
 					name: 'noAccount',
 					message: 'The email address ' + req.param('email') + ' not found.'
-				}]
+				}];
 
 				req.flash('error', noAccountError);
 
@@ -114,7 +114,7 @@ module.exports = {
 					var usernamePasswordMismatchError = [{
 						name: 'usernamePasswordMismatch',
 						message: 'Invalid username and password combination.'
-					}]
+					}];
 					req.flash('error', usernamePasswordMismatchError);
 					res.redirect('/login');
 					return;

api/controllers/StateController.js

@@ -17,7 +17,7 @@
  * @param {} callback
  * @return 
  */
-var haveRights = function(state, user,callback){
+function haveRights(state, user,callback){
 	State.findOne({id : state, user: user}, function(err, state){
 		if(err) return callback(err);
 

api/controllers/TimerController.js

@@ -26,7 +26,7 @@ module.exports = {
 	 */
 	create:function(req,res,next){
 		if(!req.param('duration'))
-			return res.json('Missing parametres')
+			return res.json('Missing parametres');
 
 		// defaults name
 		var name = 'Timer';

api/models/Alarm.js

@@ -20,7 +20,7 @@ module.exports = {
     // new time type because time does not exist in sails
     time: function(time){
       var re = /^[0-2]\d:[0-5]\d$/  ;
-      return (time != '' && time.match(re));
+      return (time !== '' && time.match(re));
     },
   },
 

api/models/Contact.js

@@ -33,7 +33,7 @@ module.exports = {
     },
 
     fullname: function() {
-      return this.firstname + ' ' + this.lastname
+      return this.firstname + ' ' + this.lastname;
     },
 
   	email:{

api/models/House.js

@@ -95,9 +95,9 @@ module.exports = {
       var checkifAllDestroyed = function(){
         if(nbOk == values.length*nbThingsToDestroy)
             next();
-      }
+      };
 
-      if(values.length == 0)
+      if(values.length === 0)
           return next();
 
       for(i = 0; i<values.length;i++){

api/models/Room.js

@@ -73,9 +73,9 @@ module.exports = {
 
         if(nbOk == values.length*nbThingsToDestroy)
             next();
-    }
+    };
 
-    if(values.length == 0)
+    if(values.length === 0)
         return next();
 
     for(i = 0; i<values.length;i++){

api/models/Timer.js

@@ -21,7 +21,7 @@ module.exports = {
     time: function(time){
       re = /^[0-2]\d:[0-5]\d$/  ;
 
-      	return (time != '' && time.match(re));
+      	return (time !== '' && time.match(re));
     },
   },
 

api/models/User.js

@@ -29,7 +29,7 @@ module.exports = {
     },
 
     fullname: function() {
-      return this.firstname + ' ' + this.lastname
+      return this.firstname + ' ' + this.lastname;
     },
 
   	email:{

api/policies/checkForeignActionToken.js

@@ -18,4 +18,4 @@ module.exports = function(req, res, next) {
 		return next();
 	else
 		res.forbidden('Foreign Action Token is not valid');
-}
+};

api/policies/isMachineMaster.js

@@ -17,4 +17,4 @@ module.exports = function(req, res, next) {
 		return next();
 	else
 		res.forbidden('This is not a master, just a slave executing orders.');
-}
+};

api/policies/sameNetwork.js

@@ -37,7 +37,7 @@ module.exports = function(req, res, next) {
 							callback(err, true);
 						});
 					}else
-						callback(null, false)
+						callback(null, false);
 			    }
 			], function (err, result) {
 				if(err) sails.log.warn('sameNetworkPolicies : ' + err);

api/services/AlarmService.js

@@ -50,7 +50,7 @@ function getActualDate (){
 	month = twoDigit(month);
 	day = twoDigit(day);
 	return year + '-' + month + '-' + day;
-};
+}
 
 
 /**

api/services/CalendarService.js

@@ -22,7 +22,7 @@ module.exports = {
 		request += "JOIN calendarlist ON(calendarevent.calendar = calendarlist.id) ";
 		request += "WHERE user = ? ";
 		request += "AND start > SYSDATE() ";
-		request += "AND calendarlist.active = 1 "
+		request += "AND calendarlist.active = 1 ";
 		request += "ORDER BY start ";
 		request += "LIMIT 0,1 ";
 

api/services/DistanceService.js

@@ -14,7 +14,7 @@
  * @return BinaryExpression
  */
 function deg2rad (deg) {
-		  return deg * (Math.PI/180)
+	return deg * (Math.PI/180);
 }
 
 module.exports = {

api/services/GoogleMapsService.js

@@ -27,10 +27,11 @@ module.exports = {
         gm.directions(start, end , 
         function(err, data){
             if(err) return callback(err);
+
             // calculate the duration in seconds
-            var duration = data['routes'][0]['legs'][0]['duration']['value'];
+            var duration = data.routes[0].legs[0].duration.value;
             callback(null, duration);
         });
 
     }
-}
+};

api/services/HouseService.js

@@ -19,7 +19,7 @@ module.exports = {
 	 */
 	getHouseWhereUserAdmin: function(userId, callback){
 		var request = 'SELECT house FROM userhouserelation ';
-		request += 'WHERE user = ? '
+		request += 'WHERE user = ? ';
 		request += 'AND userhouserelationtype = ?';
 
 		UserHouseRelation.query(request, [userId, sails.config.userhouserelationtype.Admin], function(err, houses){
@@ -47,7 +47,7 @@ module.exports = {
 		Motion.query(request,[houseId], function(err, motions){
 			if(err) return callback(err);
 
-			callback(null, (motions.length == 0))
+			callback(null, (motions.length === 0));
 		});
 	},
 
@@ -203,7 +203,7 @@ module.exports = {
 				if(err) return callback(err);
 
 				// if the user has no houses.. he is not a home because he has no one, so callback false
-				if(userHouseRelations.length == 0) return callback(null, false);
+				if(userHouseRelations.length === 0) return callback(null, false);
 
 				// houseWhereHeIs will store the result
 				var houseWhereHeIs = null;
@@ -212,7 +212,7 @@ module.exports = {
 				async.each(userHouseRelations, function(userHouseRelation, callback){
 						HouseService.habitantsWhoCanBeAtHome(userHouseRelation.house.id, function(err, userPossiblyAtHome){
 							// if no user can possibly be at home, there is nobody there
-							if(userPossiblyAtHome.length == 0)
+							if(userPossiblyAtHome.length === 0)
 								callback();
 							// else if there is only one user at home
 							else if(userPossiblyAtHome.length == 1){

api/services/InstallationService.js

@@ -83,7 +83,7 @@ module.exports = {
 			.exec(function(err, eventtypes){
 				if(err) return callback(err);
 
-				if(eventtypes.length == 0){
+				if(eventtypes.length === 0){
 					importAndInjectEventTypes(callback);
 				}else{
 					callback(null);
@@ -102,7 +102,7 @@ module.exports = {
 			.exec(function(err, actiontypes){
 				if(err) return callback(err);
 
-				if(actiontypes.length == 0){
+				if(actiontypes.length === 0){
 					importAndInjectActionTypes(callback);
 				}else{
 					callback(null);
@@ -121,7 +121,7 @@ module.exports = {
 			.exec(function(err, launchertypes){
 				if(err) return callback(err);
 
-				if(launchertypes.length == 0){
+				if(launchertypes.length === 0){
 					importAndInjectLauncherTypes(callback);
 				}else{
 					callback(null);

api/services/MachineService.js

@@ -22,10 +22,10 @@ module.exports = {
 
 			if(machines.length == 1)
 				return callback(null, machines[0].house);
-			else if(machines.length == 0)
+			else if(machines.length === 0)
 				return callback('MachineService : getMyHouse : I don\'t know in which house I live :( ');
 			else
-				return callback('MachineService : getMyHouse : A machine can\'t be at multiple place at once ! :D ')
+				return callback('MachineService : getMyHouse : A machine can\'t be at multiple place at once ! :D ');
 		});
 	}