social_stream 0.11.7 → 0.11.8

data/base/vendor/assets/javascripts/jquery.ae.image.resize.js

@@ -0,0 +1,69 @@
+(function( $ ) {
+
+  $.fn.aeImageResize = function( params ) {
+
+    var aspectRatio = 0
+      // Nasty I know but it's done only once, so not too bad I guess
+      // Alternate suggestions welcome :)
+      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
+      ;
+
+    // We cannot do much unless we have one of these
+    if ( !params.height && !params.width ) {
+      return this;
+    }
+
+    // Calculate aspect ratio now, if possible
+    if ( params.height && params.width ) {
+      aspectRatio = params.width / params.height;
+    }
+
+    // Attach handler to load
+    // Handler is executed just once per element
+    // Load event required for Webkit browsers
+    return this.one( "load", function() {
+
+      // Remove all attributes and CSS rules
+      this.removeAttribute( "height" );
+      this.removeAttribute( "width" );
+      this.style.height = this.style.width = "";
+
+      var imgHeight = this.height
+        , imgWidth = this.width
+        , imgAspectRatio = imgWidth / imgHeight
+        , bxHeight = params.height
+        , bxWidth = params.width
+        , bxAspectRatio = aspectRatio;
+				
+      // Work the magic!
+      // If one parameter is missing, we just force calculate it
+      if ( !bxAspectRatio ) {
+        if ( bxHeight ) {
+          bxAspectRatio = imgAspectRatio + 1;
+        } else {
+          bxAspectRatio = imgAspectRatio - 1;
+        }
+      }
+
+      // Only resize the images that need resizing
+      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
+
+        if ( imgAspectRatio > bxAspectRatio ) {
+          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
+        } else {
+          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
+        }
+
+        this.height = bxHeight;
+        this.width = bxWidth;
+      }
+    })
+    .each(function() {
+
+      // Trigger load event (for Gecko and MSIE)
+      if ( this.complete || isIE6 ) {
+        $( this ).trigger( "load" );
+      }
+    });
+  };
+})( jQuery );

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

@@ -1,3 +1,2 @@
 //= require jquery.jplayer
-//= require_tree .
-//= require jquery.lightbox-with-resize-plugin
+//= require_tree .

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.3.2".freeze
+    VERSION = "0.3.3".freeze
   end
 end

data/documents/lib/social_stream/toolbar_config/documents.rb

@@ -1,24 +1,6 @@
 module SocialStream
   module ToolbarConfig
     module Documents
-      def home_toolbar_items
-        items = super
-
-        # FIXME: insert
-        items << {
-          :key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t('resource.mine'),
-          :url => "#",
-          :options => {:link => {:id => "resources_menu"}},
-          :items => [
-            {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => documents_path},
-            {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => pictures_path},
-            {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => videos_path},
-            {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => audios_path}
-          ]
-        }
-      end
-
       def profile_toolbar_items(subject = current_subject)
         items = super
 

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.20')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.22')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.13".freeze
+    VERSION = "0.0.15".freeze
   end
 end

data/events/lib/social_stream/toolbar_config/events.rb

@@ -1,18 +1,6 @@
 module SocialStream
   module ToolbarConfig
     module Events
-      def home_toolbar_items
-        items = super
-
-        items.find{ |i| i[:key] == :resources }[:items].unshift({
-          :key => :resources_events,
-          :name => image_tag("btn/btn_event.png")+t('conference.title'),
-          :url => events_path
-        })
-
-        items
-      end
-
       def profile_toolbar_items(subject = current_subject)
         items = super
 

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.21')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.22')
   s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
 
   # Development Gem dependencies

data/events/vendor/assets/stylesheets/jquery.ad-gallery.css

@@ -86,7 +86,7 @@
       }
       * html .ad-gallery .ad-image-wrapper .ad-image .ad-image-description {
         background: none;
-        filter:progid:DXImageTransform.Microsoft.AlphaImageLoader (enabled=true, sizingMethod=scale, src='opa75.png');
+        filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=scale, src='opa75.png');
       }
         .ad-gallery .ad-image-wrapper .ad-image .ad-image-description .ad-description-title {
           display: block;

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.11.7".freeze
+  VERSION = "0.11.8".freeze
 end

data/presence/Rakefile

@@ -1 +1,8 @@
 require 'bundler/gem_tasks'
+
+# Modify this gem's tags
+class Bundler::GemHelper
+  def version_tag
+    "presence#{version}"
+  end
+end

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

@@ -241,6 +241,12 @@ function initAndPlaySound(sound){
 //Chat view jquery
 ////////////////////
 
+function initDelegates(){
+  $('.user_presence').delegate( '.user_presence a[title]', 'hover', function(){ 
+    e.preventDefault();
+  });
+}
+
 function setUserFunctions(){
 	
 	$("div.user_presence").click(function(event, ui){
@@ -254,7 +260,6 @@ function setUserFunctions(){
 	  };
 	});
 	
-	
 	//JQuery DropdwanStatus
 	
 	$(".dropdown dt a").click(function(event) {
@@ -326,7 +331,8 @@ function refreshChatWindow(){
 function updateChatWindow(){
 	timerCounter=0;
 	log("updateChatWindow()");
-  $.post("/chatWindow", { userConnected: userConnected }, function(data){ 
+  $.post("/chatWindow", { userConnected: userConnected }, function(data){
+			$(".tooltip").hide() //Prevent tooltips
       $("#chat_partial").html(data);
       if (userConnected) {
         $(".user_presence a[title]").tooltip();

data/presence/app/views/xmpp/_chat.html.erb

@@ -52,6 +52,7 @@
 			}
 			initialTimer = setTimeout("updateChatWindow()", 15000);
       initAudio();
+			initDelegates();
 		});
 		
 	</script>

data/presence/app/views/xmpp/_chat_contacts.html.erb

@@ -28,7 +28,7 @@
 				  <%@contacts.each do |contact| %>
 							<div class="user_presence" name='<%=contact.name%>' slug='<%=contact.slug%>'>
 								<a title='<%=contact.name%>' class="presence_user_link" width="28">
-								  <%=image_tag(contact.logo.url, :alt => contact.name , :title => contact.name, :size => "28x28")%>
+								  <%=image_tag(contact.logo.url, :alt => contact.name , :size => "28x28")%>
 									<% if contact.user.status %>
 									<%=image_tag("status/" + contact.user.status + ".png", :class => "presence_status") %></a>
 									<% end %>

data/presence/ejabberd/conf/ejabberd.cfg

@@ -88,7 +88,7 @@
 %% You can define one or several, for example:
 %% {hosts, ["example.net", "example.com", "example.org"]}.
 %%
-{hosts, ["trapo"]}.
+{hosts, ["localhost"]}.
 
 %%
 %% route_subdomains: Delegate subdomains to other XMPP servers.
@@ -376,7 +376,7 @@
 %%
 %%{acl, admin, {user, "aleksey", "localhost"}}.
 %%{acl, admin, {user, "ermine", "example.org"}}.
-{acl, admin, {user, "admin", "trapo"}}.
+{acl, admin, {user, "admin", "localhost"}}.
 
 %%
 %% Blocked users

data/presence/ejabberd/conf/ssconfig.cfg

@@ -1,5 +1,8 @@
 #Social Stream Presence: ejabberd config
 
+#Ejabberd node server domain
+server_domain=localhost
+
 #Scripts Path
 scripts_path=/home/aldo/ejabberd-2.1.8_scripts
 

data/presence/ejabberd/ejabberd_scripts/authentication_script

@@ -37,12 +37,12 @@ $sspass = getOption("ss_password=")
 def auth(username, password)
 
   #[TEST ONLY] Allow everybody
-  return true
+  #return true
 
   #[TEST] Admin password
-  if username == "admin" and password == "pass"
-    return true
-  end
+  #if username == "admin" and password == "pass"
+  #  return true
+  #end
 
   #Social Stream password
   if username == $sslogin and password == $sspass

data/presence/ejabberd/ejabberd_scripts/emanagement

@@ -0,0 +1,245 @@
+#!/usr/bin/env ruby
+
+#Ejabberd Management script
+#New features for management and maintenance ejabberd
+#@author Aldo
+
+require 'logger'
+
+path = "/var/log/ejabberd/scripts.log"
+file = File.open(path, File::WRONLY | File::APPEND | File::CREAT)
+file.sync = true
+$logger = Logger.new(file)
+$logger.level = Logger::DEBUG
+
+def getOption(option)
+  File.open('/etc/ejabberd/ssconfig.cfg', 'r') do |f1|  
+    while line = f1.gets  
+      line = line.gsub(/\n/,'')
+      if line.match(/^#/)
+        #Comments
+      elsif line.match(/^#{option}/)
+        return line.gsub(/#{option}/,'')
+      end  
+    end  
+  end
+  return "Undefined"
+end
+
+def ejabberdLog(text)
+	$logger.info "Ejabberd Management Script: " + text
+end
+
+#Configuration variables
+$domain = getOption("server_domain=")
+
+PARAMS_FOR_COMMANDS = {
+'getRoster' => 1,
+'removeBuddyFromRoster' => 2,
+'addBuddyToRoster' => 5,
+'removeRoster' => 1,
+'getBuddysFromRoster' => 1,
+'setBidireccionalBuddys' => 4,
+'help' => 0,
+'getUserResource' => 1,
+'sendMessageToUser' => 3,
+'sendPresence' => 2,
+'unsetPresence' => 1,
+'setPresence' => 1,
+'removeAllRosters' => 0,
+}
+
+SYNTAX_FOR_COMMANDS = {
+'getRoster' => "getRoster username",
+'removeBuddyFromRoster' => "removeBuddyFromRoster username buddy",
+'addBuddyToRoster' => "addBuddyToRoster username buddy buddyNick buddyGroup subscription_type",
+'removeRoster' => "removeRoster username",
+'getBuddysFromRoster' => "getBuddysFromRoster roster",
+'setBidireccionalBuddys' => "setBidireccionalBuddys usernameA usernameB nickA nickB",
+'getUserResource' => "getUserResource username",
+'sendMessageToUser' => "sendMessageToUser from_name to_name msg",
+'sendPresence' => 'sendPresence username show',
+'unsetPresence' => 'unsetPresence username',
+'setPresence' => 'setPresence username',
+'removeAllRosters' => 'removeAllRosters'
+}
+
+def log(msg)
+	logWithTitle(msg,nil)
+end
+
+def logWithTitle(msg,title)
+	puts "------------------------"
+	if title
+		puts ("<<<" + title + ">>>")
+	end
+	puts msg
+	puts "------------------------"
+end
+
+
+def getRoster(username)
+	command = "ejabberdctl get_roster " + username  + " " + $domain
+	%x[#{command}];
+end
+
+def removeBuddyFromRoster(username,buddy)
+	command = "ejabberdctl delete_rosteritem " + username + " " + $domain + " " + buddy + " " + $domain
+	%x[#{command}];
+end
+
+def addBuddyToRoster(username,buddy,buddyNick,buddyGroup,subscription_type)
+	command = "ejabberdctl add-rosteritem " + username + " " + $domain + " " + buddy + " " + $domain + " \\'" + buddyNick + "\\' " + buddyGroup + " " + subscription_type
+	%x[#{command}];
+end
+
+def removeRoster(username)
+	user_roster = getRoster(username);
+	user_buddys = getBuddysFromRoster(user_roster);
+	user_buddys.each do |buddy|
+		removeBuddyFromRoster(username,buddy)
+	end
+	return "Done"
+end
+
+def removeAllRosters()
+	command = "ejabberdctl process_rosteritems delete any any any any"
+	%x[#{command}];
+	return "Done";
+end
+
+def getBuddysFromRoster(roster)
+	buddys = []
+        lines = roster.split("\n")
+	lines.each do |line|
+		buddys << line.split("@")[0]
+	end
+	buddys
+end
+
+def setBidireccionalBuddys(usernameA,usernameB,nickA,nickB)
+	#addBuddyToRoster(username,buddy,buddyNick,buddyGroup,subscription_type)
+	addBuddyToRoster(usernameA,usernameB,nickB,"SocialStream","both")
+	addBuddyToRoster(usernameB,usernameA,nickA,"SocialStream","both")
+	sendPresence(usernameA,"chat")
+	sendPresence(usernameB,"chat")
+	return "Done"
+end
+
+def sendStanzaUserMessage(username,msg)
+	resource = getUserResource(username);
+	stanza = "\\<\\'message\\'\\>\\<\\'body\\'\\>\\'" + msg + "\\'\\<\\'/body\\'\\>\\<\\'/message\\'\\>"
+	command = "ejabberdctl send_stanza_c2s " + username + " " + $domain + " " + resource + " " + stanza
+	puts "Executing: " + command
+	%x[#{command}];
+	return "Done"
+end
+
+
+def sendPresence(username,show)
+	sendPresenceWithShow(username,username,show)
+end
+
+def unsetPresence(username)
+	sendPresenceStanzaWithType(username,username,"unavailable")
+end
+
+def setPresence(username)
+	sendPresenceStanzaWithType(username,username,"available")
+end
+
+def sendPresenceWithShow(from_name,to_name,show)
+	puts from_name
+	resource = getUserResource(from_name);
+	puts resource
+	from_sid = from_name + "@" + $domain;
+	to_sid = to_name + "@" + $domain;   
+	pres_stanza = "\\<\\'presence from=\\'\\\"\\'" + from_sid + "\\'\\\"\\' to=\\'\\\"\\'" + to_sid + "\\'\\\"\\>\\<\\'show\\'\\>\\'" + show + "\\'\\<\\'/show\\'\\>\\<\\'/presence\\'\\>" 
+	command = "ejabberdctl send_stanza_c2s " + from_name + " " + $domain + " " + resource + " " + pres_stanza
+	puts "Executing: " + command
+	%x[#{command}];
+	return "Done"
+end
+
+def sendPresenceStanzaWithType(from_name,to_name,presence_type)
+	resource = getUserResource(from_name);
+	from_sid = from_name + "@" + $domain;
+	to_sid = to_name + "@" + $domain;
+	pres_stanza = "\\<\\'presence type=\\'\\\"\\'" + presence_type + "\\'\\\"\\' from=\\'\\\"\\'" + from_sid + "\\'\\\"\\' to=\\'\\\"\\'" + to_sid + "\\'\\\"\\>\\<\\'/presence\\'\\>" 
+	command = "ejabberdctl send_stanza_c2s " + from_name + " " + $domain + " " + resource + " " + pres_stanza
+	puts "Executing: " + command
+	%x[#{command}];
+	return "Done"
+end
+
+def sendMessageToUser(from_name,to_name,msg)
+	from_sid = from_name + "@" + $domain;
+	to_sid = to_name + "@" + $domain;
+	command = "ejabberdctl send_message_chat " + from_sid + " " + to_sid + " " + "\\'" + msg + "\\'";
+	puts "Executing: " + command
+	%x[#{command}];
+	return "Done"
+end
+
+def getUserResource(username)
+	command = "ejabberdctl connected-users"
+	output = %x[#{command}];
+        lines = output.split("\n");
+	lines.each do |line|
+		if line.split("@")[0] == username
+			#puts "Find " + username
+			s = line.split("@")[1];
+			resource = s.split("/")[1];
+			return resource;	
+		end
+	end
+	return username + " no have any active session"
+end
+
+def help
+	log("Command list")
+	SYNTAX_FOR_COMMANDS.values.each do |command|
+		puts command
+	end
+	puts ""
+end
+
+log("Init Ejabberd Maintenance script")
+
+begin
+	if ARGV[0] and PARAMS_FOR_COMMANDS.keys.include?(ARGV[0])
+		if (ARGV.length == (PARAMS_FOR_COMMANDS[ARGV[0]]+1))
+
+			ejabberdLog("Executing (#{ARGV[0]})")
+
+			length = ARGV.length;
+			case length
+			when 1
+			  puts send(ARGV[0])
+			when 2
+			  puts send(ARGV[0],ARGV[1])
+			when 3
+			  puts send(ARGV[0],ARGV[1],ARGV[2])
+			when 4
+			  puts send(ARGV[0],ARGV[1],ARGV[2],ARGV[3])
+			when 5
+			  puts send(ARGV[0],ARGV[1],ARGV[2],ARGV[3],ARGV[4])
+			when 6
+			  puts send(ARGV[0],ARGV[1],ARGV[2],ARGV[3],ARGV[4],ARGV[5])
+			else
+			  puts send(ARGV[0],ARGV)
+			end
+			puts ""
+		else 
+			log("Error: Params required for command " + (ARGV[0]).to_s() + ": " + (PARAMS_FOR_COMMANDS[ARGV[0]]).to_s())
+			log("Use 'help' to get information about command syntax")
+		end
+	else
+		
+		log("Error: Command not recognized")
+		log("Use 'help' to get information about command syntax")
+	end
+rescue
+	puts "Parametros incorrectos"
+end
+