Changeset 54

Timestamp:

08/16/07 08:04:37 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk

Files:

• expressoMail1_2/js/InfoContact.js (modified) (1 diff)
• header.inc.php.template (modified) (previous)
• phpgwapi/inc/class.preferences.inc.php (modified) (1 diff)

trunk/expressoMail1_2/js/InfoContact.js

@@ -132 +132 @@
         IM.action_button(event, '1', email ,false);
 }
-emInfoContact.prototype.verifyPermissionIM = function(uid, domain, email){
-
-        var handler_verifyPermissionIM = function(data){
-                if(!data){
-                        alert("Esse usuário ("+uid+") não possui o módulo Expresso IM habilitado");
-                }
-                else
-                        Preferences.updateLoad(''+uid+"@"+domain+'');
-        }
-
-        IM.UserPermission(uid,handler_verifyPermissionIM);
-
-}
 
 emInfoContact.prototype.verifyIM = function(uid, email){
-        if(!window.IM)
-                return  "<br><br>";
 
-        if(!IM.array_users || !IM.array_users.length)
-                return  "<br><br>";
+        if ( !window.IM || !document.getElementById('myStatus') )
+                return  "<br/><br/>";
 
-        var status  = "Not Registered";
-        var subscription = "";
-        var _return      = "";  
-        var jid                  = "";  
-        var array_jid    = null;
+        var status = IM.infoContact(uid);
+        var _return = '<br/><br/>';
 
-        for(i = 1; i <= IM.array_users.length; i++){
-                if(!IM.array_users[i] || !IM.array_users[i].jid)
-                        continue;
+        if ( status )
+        {
+                _return += '<img align="center" src="'+status.src+'" />';
+                _return += '<span onclick="IM.action_button(event,\''+status.jid+'\');"><font size="1" color=';
+                
+                if( status.src != img_unavailable.src)
+                        _return         += '"DARKBLUE"><u style="cursor:pointer;">'+get_lang("User connected")+"</u>";
+                else
+                        _return         += '"BLACK">'+get_lang("User not connected");
 
-                jid = IM.array_users[i].jid;
-                array_jid  = jid.split("@");
-                
-                if(array_jid[0] == uid){
-                        status           = IM.array_users[i].online;
-                        subscription = IM.array_users[i].subscription;
-                        break;
-                }
-                else
-                        jid = uid +"@"+array_jid[1];
-
-        }
-        
-        if(subscription == 'both') {
-                if(status == 1) {
-                        _return = "<br><img align='center' src='../instant_messenger/templates/default/images/online.gif'>";
-                        _return         += "<span title='"+get_lang("Open chat window")+"' style='cursor:pointer' onclick='InfoContact.openChat(event,\""+jid+"\");InfoContact.hide()'><font size=1 color=DARKBLUE><u>"+get_lang("User connected")+"</u></font></span><br>";
-                }
-                else if(status == 0) {
-                        _return = "<br><img align='center' src='../instant_messenger/templates/default/images/offline.gif'>";
-                        _return         += "<span style='cursor:pointer' onclick='InfoContact.hide()'><font size=1 color=BLACK>"+get_lang("User not connected")+"</font></span><br>";
-                }
-        
-        }
-        else if(array_jid != null){
-                _return = "<br><img align='center' src='../instant_messenger/templates/default/images/not_authorized.gif'>";
-                if(subscription == 'from')
-                        _return += "<font size=1 color=BLACK><u>"+ get_lang("User didn't allow you")+"</u></font><br>";
-                else if(subscription == 'to') {
-                        _return += "<span title='"+get_lang("Authorize")+"' style='cursor:pointer' onclick='Preferences.updateLoad(\""+email+"\");InfoContact.hide()'><font size=1 color=BLACK><u>"+ get_lang("You didn't allow")+"</u></font></span><br>";
-                }
-                else
-                        _return += "<span title='"+get_lang("Register user into my IM")+"' style='cursor:pointer' onclick='InfoContact.verifyPermissionIM(\""+ uid +"\",\""+array_jid[1]+"\");InfoContact.hide()'><font size=1 color=BLACK><u>" + get_lang("User not registered")+"</u></font></span><br>";     
+                _return += "</font></span><br />";
         }
 

trunk/phpgwapi/inc/class.preferences.inc.php

@@ -554 +554 @@
                         {
                                 $this->db->transaction_begin();
-                                $this->db->query("DELETE FROM phpgw_preferences WHERE preference_owner='$account_id'",
+                                //$this->db->query("DELETE FROM phpgw_preferences WHERE preference_owner='$account_id'",
+                                $this->db->query("DELETE FROM phpgw_preferences WHERE preference_owner='$account_id' and preference_app <> 'instant_messenger'",
                                         __LINE__,__FILE__
                                 );