From 4403f71f454d8341fba830db1f0aaf95ef2dc54b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 19 Mar 2013 15:54:58 +0200
Subject: [PATCH] added sanitize and linkify functions. Moved some js to lib/

---
 app/assets/javascripts/{ => lib}/jquery.timeago.js | 0
 app/assets/javascripts/{ => lib}/md5.js            | 0
 app/assets/javascripts/{ => lib}/utf8_encode.js    | 0
 app/assets/javascripts/main.js.coffee              | 8 ++++++++
 app/assets/javascripts/wall.js.coffee              | 3 +--
 5 files changed, 9 insertions(+), 2 deletions(-)
 rename app/assets/javascripts/{ => lib}/jquery.timeago.js (100%)
 rename app/assets/javascripts/{ => lib}/md5.js (100%)
 rename app/assets/javascripts/{ => lib}/utf8_encode.js (100%)

diff --git a/app/assets/javascripts/jquery.timeago.js b/app/assets/javascripts/lib/jquery.timeago.js
similarity index 100%
rename from app/assets/javascripts/jquery.timeago.js
rename to app/assets/javascripts/lib/jquery.timeago.js
diff --git a/app/assets/javascripts/md5.js b/app/assets/javascripts/lib/md5.js
similarity index 100%
rename from app/assets/javascripts/md5.js
rename to app/assets/javascripts/lib/md5.js
diff --git a/app/assets/javascripts/utf8_encode.js b/app/assets/javascripts/lib/utf8_encode.js
similarity index 100%
rename from app/assets/javascripts/utf8_encode.js
rename to app/assets/javascripts/lib/utf8_encode.js
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index 9fbb1a2d..b61df846 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -32,6 +32,14 @@ window.disableButtonIfEmptyField = (field_selector, button_selector) ->
     else
       closest_submit.enable()
 
+window.sanitize = (str) ->
+  return str.replace(/<(?:.|\n)*?>/gm, '')
+
+window.linkify = (str) ->
+  exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig
+  return str.replace(exp,"<a href='$1'>$1</a>")
+
+
 $ ->
   # Click a .one_click_select field, select the contents
   $(".one_click_select").on 'click', -> $(@).select()
diff --git a/app/assets/javascripts/wall.js.coffee b/app/assets/javascripts/wall.js.coffee
index 2b354c32..22a89c35 100644
--- a/app/assets/javascripts/wall.js.coffee
+++ b/app/assets/javascripts/wall.js.coffee
@@ -70,7 +70,7 @@
   
   renderNote: (note) ->
     author = '<strong class="wall-author">' + note.author.name + '</strong>'
-    body = '<span class="wall-text">' + note.body + '</span>'
+    body = '<span class="wall-text">' + linkify(sanitize(note.body)) + '</span>'
     file = ''
     time = '<abbr class="timeago" title="' + note.created_at + '">' + note.created_at + '</time>'
 
@@ -80,4 +80,3 @@
     html = '<li>' + author + body + file + time + '</li>'
 
     $('ul.notes').append(html)
-