merge

1 files changed, 11 insertions, 7 deletions

diff --git a/server/lib/util.js b/server/lib/util.js
index 791d3e2..86fbdcc 100644
--- a/server/lib/util.js
+++ b/server/lib/util.js
@@ -5,19 +5,24 @@ var whitespace = new RegExp('\\s', 'g')
 var whitespaceHead = /^\s+/
 var whitespaceTail = /\s+$/
 var nonAlphanumerics = new RegExp('[^-_a-zA-Z0-9]', 'g')
+var nonNumerics = new RegExp('[^0-9]', 'g')
 var consecutiveDashes = new RegExp("-+", 'g')
 var entities = new RegExp("[<>&]", 'g')
 
 var util = {}
 
-util.trim = function (s){ return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"") }
-
+util.trim = function (s){
+  return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"")
+}
 util.slugify = function (s){
 	return (s || "").toLowerCase().replace(whitespace,"-").replace(nonAlphanumerics, '-').replace(consecutiveDashes,"-")
 }
 util.sanitize = function (s){
 	return (s || "").replace(entities, "")
 }
+util.sanitizeNumber = function (s){
+	return (s || "").replace(nonNumerics, "")
+}
 util.escape = function (s){
 	return (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
 }
@@ -30,8 +35,9 @@ util.capitalizeWord = function (s) {
 util.escapeRegExp = function (s) {
 	return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&")
 }
-
-
+util.htmlize = function(s) {
+  return s.replace(/\n/g,"<br>")
+}
 util.cleanQuery = function (query) {
 	var update = _.extend({}, query);
 	delete update._id;
@@ -41,12 +47,10 @@ util.cleanQuery = function (query) {
 	delete update.created_by;
 	return update;
 }
-
 util.ip2num = function(dot) {
-	var d = dot.split('.');
+	var d = (dot || "127.0.0.1").split('.');
 	return ((((((+d[0])*256)+(+d[1]))*256)+(+d[2]))*256)+(+d[3]);
 }
-
 util.num2ip = function(num) {
   if (! num) return ""
 	var d = num % 256;