social_stream 0.12.8 → 0.12.9

data/presence/app/assets/javascripts/chat_utilities.js

@@ -0,0 +1,71 @@
+////////////////////
+//Test functions
+////////////////////
+
+function log(msg) {
+    //console.log(msg)
+}
+
+
+////////////////////
+//Blink page title when focus lost on new messages
+////////////////////
+
+var chatFocus;
+
+function onChatBlur() {
+  chatFocus = false;
+};
+
+function onChatFocus(){
+  stopBlink();
+  titles = []; //Remove titles after StopBlink!
+  chatFocus = true;
+};
+
+function initFocusListeners(){
+  if (/*@cc_on!@*/false) { // check for Internet Explorer
+    document.onfocusin = onFocus;
+    document.onfocusout = onBlur;
+  } else {
+    window.onfocus = onChatFocus;
+    window.onblur =  onChatBlur;
+  }
+}
+
+
+var blinkTimer;
+var titles=[];
+
+function blinkTitle(titles,index){
+  $(document).attr("title", titles[index]);
+  index = (index+1)%titles.length
+  blinkTimer=setTimeout(function(){blinkTitle(titles,index)}, 2000);
+}
+
+function stopBlink(){
+  clearTimeout(blinkTimer);
+  if (titles.length > 0) {
+    $(document).attr("title", titles[0]);
+  }
+}
+
+function blinkTitleOnMessage(username){
+  if (!chatFocus){
+    if (titles.length==0){
+      titles.push($(document).attr("title"))
+    }
+    if (titles.indexOf(username) == -1){
+      titles.push(username + " says...")
+    }
+    stopBlink();
+    blinkTitle(titles,titles.length-1);
+  }
+}
+
+
+////////////////////
+//Next features...
+////////////////////
+
+

data/presence/app/assets/javascripts/chat_window_manager.js

@@ -0,0 +1,138 @@
+////////////////////
+//Chat functions
+////////////////////
+
+var nBox = 0;
+var maxBox = 5;
+var chatBoxWidth = 230;
+var visibleChatBoxes = new Array();
+var chatBoxSeparation = chatBoxWidth+12;
+
+
+function createChatBox(guest_slug,guest_name,guest_jid,user_name,user_jid){
+		
+		//Create chatbox for new conversations
+		//Open chatbox for old conversations
+			
+		//Box Variable name = getChatVariableFromSlug(guest_slug)
+    if (typeof window[getChatVariableFromSlug(guest_slug)] == 'undefined') {
+			
+          //Add div with id = guest_slug
+          $("#chat_divs").append("<div id=" + guest_slug + " name=" + guest_name + "></div>")
+					
+					//Add CSS [...]
+          
+					
+					//Offset Management for new box
+					boxParams = getBoxParams();
+					var offset = boxParams[0];
+					var position = boxParams[1];
+					
+	
+          window[getChatVariableFromSlug(guest_slug)] = $("#" + guest_slug).chatbox({id: user_name, 
+                              user:{key : "value"},
+															hidden: false,
+															offset: offset, // relative to right edge of the browser window
+                              width: chatBoxWidth, // width of the chatbox
+                              title : guest_name,
+															position: position,
+															priority: visibleChatBoxes.length+1,
+															boxClosed: function(id) {
+                                
+																position = $("#" + guest_slug).chatbox("option", "position");
+																
+																for (i=position+1;i<visibleChatBoxes.length+1;i++){
+																	visibleChatBoxes[i-1].chatbox("option", "offset", visibleChatBoxes[i-1].chatbox("option", "offset") - chatBoxSeparation);
+																	visibleChatBoxes[i-1].chatbox("option", "position", visibleChatBoxes[i-1].chatbox("option", "position") - 1 );
+                                }
+																
+																visibleChatBoxes.splice(position-1,1);
+																$("#" + guest_slug).chatbox("option", "hidden", true);
+																nBox--;
+															},
+															
+                              messageSent : function(id, user, msg) {
+																  rotatePriority(guest_slug);
+                                  $("#" + guest_slug).chatbox("option", "boxManager").addMsg(id, getParsedContent(msg,true));
+                                  sendChatMessage(user_jid,guest_jid,msg);
+                              }});
+															
+					visibleChatBoxes[position-1] = window[getChatVariableFromSlug(guest_slug)];				
+															
+		      return true;
+					
+    } else {
+			
+			    if (visibleChatBoxes.indexOf(window[getChatVariableFromSlug(guest_slug)]) == -1) {
+						
+						//Offset Management for old box
+						boxParams = getBoxParams();
+            var offset = boxParams[0];
+            var position = boxParams[1];
+		
+            window[getChatVariableFromSlug(guest_slug)].chatbox("option", "offset", offset);
+            window[getChatVariableFromSlug(guest_slug)].chatbox("option", "position", position);
+            visibleChatBoxes[position-1] = window[getChatVariableFromSlug(guest_slug)];
+					}  
+					
+					window[getChatVariableFromSlug(guest_slug)].chatbox("option", "hidden", false);
+			    return false;
+		}
+		
+}
+
+function getBoxParams(){
+	
+	var boxParams = new Array(2);
+	
+		if (nBox==maxBox){
+			//Select box to replaced
+			replaced = visibleChatBoxes[getBoxIndexToReplace()];           
+			replaced.chatbox("option", "hidden", true)
+			index = visibleChatBoxes.indexOf(replaced);
+			boxParams[0] = replaced.chatbox("option", "offset")
+			boxParams[1] = replaced.chatbox("option", "position")
+		} else {
+		  nBox++;
+		  boxParams[0] = (nBox-1)*(chatBoxSeparation);
+		  boxParams[1] = nBox;
+		}
+		
+		return boxParams
+}
+
+
+function getBoxIndexToReplace(){
+
+	tmp = visibleChatBoxes[0];
+	for (i=0;i<visibleChatBoxes.length;i++){
+    if (visibleChatBoxes[i].chatbox("option", "priority") > tmp.chatbox("option", "priority")) {
+			tmp = visibleChatBoxes[i];
+	  }
+  }
+	
+	return visibleChatBoxes.indexOf(tmp);
+}
+
+
+function rotatePriority(guest_slug){
+	priority = $("#" + guest_slug).chatbox("option", "priority")
+	if(priority>1){		
+			for (i=0;i<visibleChatBoxes.length;i++){
+        if(visibleChatBoxes[i].chatbox("option", "priority")<priority){
+					visibleChatBoxes[i].chatbox("option", "priority",visibleChatBoxes[i].chatbox("option", "priority")+1);
+				}
+      }		
+			$("#" + guest_slug).chatbox("option", "priority", 1);		
+	}	
+}
+
+
+function getChatVariableFromSlug(slug){
+	return "slug_" + slug;
+}
+
+
+function getSlugFromChatVariable(variable){
+	return variable.split("_")[1];
+}

data/presence/app/assets/javascripts/social_stream-presence.js

@@ -1,2 +1,5 @@
 //= require jquery
+//= require strophe
+//= require jquery.tools.tooltip
+//= require jquery.ui.chatbox
 //= require_tree .

data/presence/app/assets/javascripts/store.js

@@ -2,13 +2,6 @@
 //Store password with session storage
 ////////////////////
 
-$(document).ready(function () {
-		$('.storePass').bind('click', function () {
-         storePassword();
-    });
-});
-
-
 function storePassword() {
 	
 	  //Dont store password if cookie authentication is enable

data/presence/app/assets/javascripts/xmpp_client_management.js.erb

@@ -0,0 +1,304 @@
+////////////////////
+//Hash table
+////////////////////
+var statusMessage = new Array();
+statusMessage[''] = "";
+statusMessage['chat'] = "";
+statusMessage['away'] = "Away";
+statusMessage['xa'] = "Away";
+statusMessage['dnd'] = "Busy";
+
+
+
+////////////////////
+//Connect functions
+////////////////////
+
+function connectToServerWithCookie(){
+    try {
+      connection = new Strophe.Connection(BOSH_SERVICE);
+      connection.connect(user_jid, cookie, onConnect);
+    } catch (err) {
+      //"Handle errors"
+      return false;
+    }
+}
+
+//Password: Get from chatPassword param if exists, instead try to get from sessionStorage.
+function connectToServerWithPassword(chatPassword){
+    
+    //Get Password
+    if ((chatPassword!=null)&&(chatPassword!="")){
+      var password = chatPassword;
+    } else if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)) {
+      var password = sessionStorage.getItem("ss_user_pass");
+    } else {
+      return false;
+    }
+    
+    try {
+        //Connect actual user to the chat
+        connection = new Strophe.Connection(BOSH_SERVICE);
+        connection.connect(user_jid, password, onConnect);
+    } catch (err) {
+        //"Handle errors"
+        return false;
+    }
+
+    return true;
+}
+
+////////
+//Auth Methods
+///////
+function authByCookie(){
+  var authMethod = '<%= SocialStream::Presence.auth_method %>';
+  return authMethod=="cookie";
+}
+
+function authByPassword(){
+  var authMethod = '<%= SocialStream::Presence.auth_method %>';
+  return authMethod=="password";
+}
+
+function ifCookie(){
+  return (!(typeof cookie == 'undefined'))
+}
+
+
+////////////////////
+//Stanza management using Strophe
+////////////////////
+
+//Global variables
+var userStatus = "chat";
+var awayTimerPeriod = 16000;
+var timerPeriod = 5000;
+var refreshMinTime = 3*timerPeriod;
+var awayTime = 300000;
+var awayCounter = 0;
+var timerCounter = 0;
+var connection = null;
+var userConnected = false;
+var reconnectAttempts = 3;
+var awayTimer;
+var timer;
+var requestContacts=false;
+var cyclesToRefresh = (refreshMinTime/timerPeriod);
+
+
+function onConnect(status) {
+	
+	//Status.ERROR An error has occurred
+	//Status.CONNECTING The connection is currently being made
+	//Status.CONNFAIL The connection attempt failed
+	//Status.AUTHENTICATING The connection is authenticating
+	//Status.AUTHFAIL The authentication attempt failed
+	//Status.CONNECTED  The connection has succeeded
+	//Status.DISCONNECTED The connection has been terminated
+	//Status.DISCONNECTING  The connection is currently being terminated
+	//Status.ATTACHED The connection has been attached
+	
+	log('Strophe onConnect callback call with status ' + status);
+	
+	if (status == Strophe.Status.ATTACHED){
+		log('Strophe connection attached');
+		return;
+	} 
+	
+	if (status == Strophe.Status.AUTHENTICATING ){
+    log('Strophe connection AUTHENTICATING');
+		return;
+  }
+	
+	if (status == Strophe.Status.CONNECTING) {
+     log('Strophe is connecting.');
+		 return;
+  } 
+		
+	clearTimeout(initialTimer);
+		
+	if (status == Strophe.Status.CONNFAIL) {
+   log('Strophe failed to connect.');
+   userConnected = false;
+   setTimeout ("onReconnect()", 3000);
+  } else if (status == Strophe.Status.AUTHFAIL) {
+   log('Strophe authentication fail.');
+	   if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)){
+	    sessionStorage.setItem("ss_user_pass",null);
+	   }
+   userConnected = false;
+  } else if (status == Strophe.Status.ERROR) {
+   log('Strophe error.');
+   userConnected = false;
+  } else if (status == Strophe.Status.DISCONNECTED) {
+   log('Strophe is disconnected.');
+   userConnected = false;
+	 clearTimeout(awayTimer);
+   setTimeout ("onReconnect()", 3000);
+  } else if (status == Strophe.Status.CONNECTED) {
+   log('Strophe is connected.');
+   log('Presenze stanza send for:' + connection.jid);
+   connection.addHandler(onMessage, null, 'message', null, null,  null);
+	 connection.addHandler(onPresence, null, 'presence', null, null,  null); 
+   //addHandler:(callback, namespace to match, stanza name, stanza type, stanza id , stanza from, options)
+   sendStatus(userStatus);
+   userConnected = true;
+   awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
+	 timer = setInterval("timerFunction()", timerPeriod);
+  }
+	
+	updateChatWindow();
+}
+
+function onReconnect(){
+	if ((connection != null)&&(!userConnected)) {
+		if (reconnectAttempts>0) {
+			reconnectAttempts--;
+			
+			if (authByCookie()){
+        //Authentication by cookie
+        connectToServerWithCookie(); 
+      } else {
+        //Authentication by password
+        connectToServerWithPassword(null);
+      }
+      setTimeout ("onReconnect()", 9000);
+		} else {
+			//Notify issue to Rails App Server?
+		}
+	}
+}
+
+
+////////
+//Manage Message stanzas
+///////
+function onMessage(msg) {
+    var to = msg.getAttribute('to');
+    var from = msg.getAttribute('from');
+    var type = msg.getAttribute('type');
+    var elems = msg.getElementsByTagName('body');
+
+    if (type == "chat" && elems.length > 0) {
+	
+			var body = elems[0];
+			var from_slug = from.split("@")[0];
+			var from_name = $("#" + from_slug).attr("name");
+			var from_jid = from_slug + "@" + domain;
+		
+		
+		  if (typeof ($('div.user_presence[slug=' + from_slug + ']').attr('name')) == 'undefined') {
+				//No connectionBox for this user!
+		    var from_name = from_slug;
+				refreshChatWindow();
+		  } else {
+				showConnectionBoxFromSlug(from_slug);
+		    var from_name = $('div.user_presence[slug=' + from_slug + ']').attr('name');
+		  }
+			
+			if (createChatBox(from_slug,from_name,from_jid,user_name,user_jid)) {
+			} else {
+        window[getChatVariableFromSlug(from_slug)].chatbox("option", "boxManager").toggleBox(true);
+			}
+			
+			var content = getParsedContent(Strophe.getText(body),false)
+			//Send message to chatBox and post-message functions.					
+			$("#" + from_slug).chatbox("option", "boxManager").addMsg(from_name, content);
+			rotatePriority(from_slug);
+			blinkTitleOnMessage(from_name);
+			if (mustPlaySoundForChatWindow(window[getChatVariableFromSlug(from_slug)])){
+          playSound("onMessageAudio");
+      }
+			
+    }
+
+    // we must return true to keep the handler alive.  
+    // returning false would remove it after it finishes.
+    return true;
+}
+
+
+////////
+//Manage Presence stanzas
+///////
+function onPresence(presence) {
+	 
+	  //Check presence stanza type
+		ptype = $(presence).attr('type');
+				
+		switch (ptype){
+			case undefined:
+			 processAvailablePresenceStanza(presence)
+			 break;
+			case "available":
+			  processAvailablePresenceStanza(presence)
+        break;
+			case "unavailable":
+        processUnavailablePresenceStanza(presence)
+        break;
+			default : 
+			  //Stanza type not recognize
+				processAvailablePresenceStanza(presence)
+		}
+				  
+	return true;
+} 
+
+
+function processAvailablePresenceStanza(presence){
+	from = $(presence).attr('from');
+  slug = from.split("@")[0];
+	
+	if (slug != user_slug) {
+		if (getConnectionBoxFromSlug(slug)!=null){
+			status = $(presence).find('show').text(); 
+      setUserIconStatus(slug, status);
+			if (cacheConnectedUsers.indexOf(slug) != -1) {
+	  	  showConnectionBoxFromSlug(slug);
+	    }	
+	  } else {
+	    setTimeout("refreshChatWindow()", 3000);
+	  }
+  }		
+}
+
+function processUnavailablePresenceStanza(presence){
+	from = $(presence).attr('from');
+  slug = from.split("@")[0];
+	
+	if (slug != user_slug) {
+	  if (getConnectionBoxFromSlug(slug)!=null){
+	    hideConnectionBoxFromSlug(slug)
+	  }
+  }
+}
+
+////////
+//Send Message stanzas
+///////
+function sendChatMessage(from,to,text){
+    var type = "chat";
+    var body= $build("body");
+    body.t(text);
+    var message = $msg({to: to, from: from, type: 'chat'}).cnode(body.tree());
+    connection.send(message.tree());	  	
+		resumeAwayTimerIfAway();
+		return true;
+}
+
+
+////////
+//Send Presence stanzas with status
+///////
+function sendStatus(status){
+    if (status in statusMessage){
+      //Send status to the XMPP Server
+      var pres = $pres()
+      .c('status')
+      .t(statusMessage[status]).up() //Status message
+      .c('show')
+      .t(status);
+       connection.send(pres.tree());
+    }
+}

data/presence/app/assets/stylesheets/chat.css

@@ -8,6 +8,16 @@
     background:  #CCCCCC;
 }
 
+.ui-state-highlight {
+	background: #CCCCCC;
+	background-color: #CCCCCC;
+	border: 1px solid lightgrey;
+}
+
+.chatWindowhighlighted {
+	color: #CAC8F4;
+}
+
 .ui-chatbox-titlebar {
     padding: 3px 3px 3px 3px;
     height: 20px;
@@ -53,6 +63,28 @@
 }
 
 
+/* Ticks */
+
+.chat-thick {
+	/* Possible background-image for thicks provided by jquery.ui 454545 , 222222 , 888888 , cd0a0a , ... */
+	background-image: url("images/ui-icons_454545_256x240.png");
+	background-repeat: no-repeat;
+  display: block;
+  overflow: hidden;
+  text-indent: -99999px;
+	height: 16px;
+  width: 16px;
+}
+
+.chat-minusthick{
+	background-position: -64px -128px;
+}
+
+.chat-closethick{
+	background-position: -96px -128px;
+}
+
+
 /* Presence Partial */
 
 div.user_presence {
@@ -241,6 +273,14 @@ input.connectChatButton{
 
 /* Chat text style */
 
+.ownChatText {
+  color: #342E82;
+}
+
+.guestChatText {
+  color: #342E82;
+}
+
 .chatImage {
   max-width: 100px;
   max-height: 100px;

data/presence/app/assets/stylesheets/social_stream-presence.css

@@ -1,3 +1,4 @@
 /*
+ *= require jquery.ui.chatbox
  *= require_tree .
  */

data/presence/app/controllers/xmpp_controller.rb

@@ -6,9 +6,7 @@ class XmppController < ApplicationController
   'chat' => 'available', 
   'away' => 'away', 
   'xa' => 'away',
-  'dnd' => 'dnd',
-  #Special status to disable chat
-  'disable' => 'disable'
+  'dnd' => 'dnd'
   }
    
    
@@ -127,16 +125,52 @@ class XmppController < ApplicationController
   
   
   def chatWindow
-    if (current_user) and (current_user.status != 'disable') and (params[:userConnected]=="true")
-      render :partial => 'xmpp/chat_contacts'
+    
+    if current_user and current_user.chat_enabled and (params[:userConnected]=="true")
+      render :partial => 'chat/contacts'
+    elsif current_user and current_user.chat_enabled
+      #User not connected
+      render :partial => 'chat/off'
     else
-      #User not connected or chat desactivated
-      render :partial => 'xmpp/chat_off'
-    end 
+      #User with chat disabled
+      render :text => ''
+    end
   end
     
-
  
+  def updateSettings
+    
+    success = false
+
+    #If no section selected, skips and gives error
+    if params[:settings_section].present?
+      section = params[:settings_section].to_s
+
+      #Updating User Chat settings
+      if section.eql? "chat"
+        if current_user and current_subject and current_subject==current_user
+          current_user.chat_enabled = true if params[:enable_chat].present? and params[:enable_chat].to_s.eql? "true"
+          current_user.chat_enabled = false  if !params[:enable_chat]
+        end
+      end
+
+      #Here sections to add
+      #if section.eql? "section_name"
+      #   blah blah blah
+      #end
+
+      #Was everything ok?
+      success = current_subject.save
+    end
+
+    #Flashing and redirecting
+    if success
+      flash[:success] = t('settings.success')
+    else
+      flash[:error] = t('settings.error')
+    end
+    redirect_to :controller => :settings, :action => :index
+  end
   
   #TEST METHODS
   def active_users

data/presence/app/views/{xmpp/_chat.html.erb → chat/_index.html.erb}

@@ -1,16 +1,6 @@
-<% if current_user and current_subject.subject_type=="User" %>
-	
-	<% content_for :headers do %>
-	  <%= stylesheet_link_tag "chat.css", :media => "screen, projection" %>
-	  <%= javascript_include_tag 'jquery-ui-1.8.14.custom.min'%>
-	  <%= javascript_include_tag 'jquery.ui.chatbox'%>
-	  <%= javascript_include_tag 'jquery.tools.min'%>
-	  <%= javascript_include_tag 'strophe'%>
-	  <%= javascript_include_tag 'xmpp_client'%>
-		<%= javascript_include_tag 'store'%>
-  <% end %>
-		
+<% if current_user and current_user.chat_enabled and current_subject.subject_type=="User" %>
 	
+
 	<script type="text/javascript">
 
     //Global variables
@@ -45,7 +35,7 @@
 			
 
 	<div id="chat_partial">		
-	  <%= render :partial => 'xmpp/chat_connecting' %>
+	  <%= render :partial => 'chat/connecting' %>
 	</div>
 	
 <% end %>