Changeset 350

Timestamp:

02/23/08 14:01:21 (16 years ago)

Author:

sacha

Message:

Jabber Notifications - Minor fixes, code cleaning in the Jabber client library

Location:

plugins/jabberNotifications

Files:

• _define.php (modified) (2 diffs)
• class.jabbernotifier.php (modified) (3 diffs)
• lib/class_Jabber.php (modified) (22 diffs)
• locales/fr/main.po (modified) (1 diff)
• test.php (modified) (2 diffs)

plugins/jabberNotifications/_define.php

@@ -4 +4 @@
  *  This is Jabber Notifications, a plugin for Dotclear 2      *
  *                                                             *
- *  Copyright (c) 2007                                         *
+ *  Copyright (c) 2007,2008                                    *
  *  Oleksandr Syenchuk, Olivier Tétard and contributors.       *
  *                                                             *
@@ -21 +21 @@
      /* Description*/    "Jabber notifications for new comments",
      /* Author */        "Oleksandr Syenchuk",
-     /* Version */       '2.4-beta1',
+     /* Version */       '2.5',
      /* Permissions */   'usage,contentadmin'
 );

plugins/jabberNotifications/class.jabbernotifier.php

@@ -56 +56 @@
      {
           if (is_array($to)) {
-               foreach ($to as $v) {
+               foreach ($to as $v)
+               {
                     if (is_string($v) && trim($v)) {
                          $this->dest[] = $v;
@@ -98 +99 @@
           if ($this->j->connect($timeout)) {
                $this->j->execute($timeout);
-               if (!$this->done) {
+               $this->j->disconnect();
+               if (!$this->done && $this->status == 'ok') {
                     $this->status = 'notDone';
                }
@@ -108 +110 @@
      public function handleConnected()
      {
-          if (!$this->j->login($this->user,$this->pass)) {
+          if (!$this->j->login()) {
                $this->status = 'loginFailure';
           }

plugins/jabberNotifications/lib/class_Jabber.php

@@ -26 +26 @@
 class Jabber
 {
-     public $use_msg_composing = true;
-     public $use_msg_delivered = false;
-     public $use_msg_displayed = false;
-     public $use_msg_offline = false;
-
-     public $_server_host = '';
      public $_server_ip = '';
-     public $_server_port = 5222;
      public $_connect_timeout = 4;
-     public $_username = '';
-     public $_password = '';
-     public $_resource = '';
 
      public $_iq_version_name = 'Jabber Notifications';
@@ -67 +57 @@
      // event will be fired)
      public $handle_services_internally = false;
-
-     // If true, the server software name and version will automatically be queried
-     // and stored in $this->server_software and $this->server_version at login
-     public $auto_server_identify = true;
-     
-     public $server_software = '';
-     public $server_version = '';
-     public $server_os = '';
      
      public $protocol_version = false; // set this to an XMPP protocol revision to include it in the <stream:stream> tag
@@ -82 +64 @@
      private $jid;
      private $password;
+     private $resource;
      
      private $username;
@@ -87 +70 @@
      private $con;
      
-     public function __construct($host,$port,$jid,$password,$con='')
-     {
-          $this->_unique_counter = 0;
+     public function __construct($host,$port,$jid,$password,$con='',$resource='blog')
+     {
           $this->xml = new XMLParser();
           
@@ -95 +77 @@
           $this->port = (int) $port;
           $this->password = $password;
+          $this->resource = $resource;
           
           $pos = strpos($jid,'@');
           if ($pos === false) {
-               $this->jid = $jid.'@'.$this->host;
+               $this->jid = $jid.'@'.$this->host.'/'.$resource;
                $this->server = $host;
                $this->username = $jid;
           }
           else {
-               $this->jid = $jid;
+               $this->jid = $jid.'/'.$resource;
                $this->server = substr($jid,$pos+1);
                $this->username = substr($jid,0,$pos);
@@ -154 +137 @@
      }
      
-     private static function wait()
-     {
-          # Experimental sleeptime value
-          $sleeptime = 10000;
+     private static function wait($sleeptime=10000)
+     {
           usleep($sleeptime);
      }
 
      // returns a unique ID to be sent with packets
-     function _unique_id($prefix) {
-          $this->_unique_counter++;
-          return $prefix."_" . md5(time() . $_SERVER['REMOTE_ADDR'] . $this->_unique_counter);
+     function _unique_id($prefix)
+     {
+          return $prefix.'_'.md5(uniqid(mt_rand()));
      }
 
@@ -188 +169 @@
      // A "connected" event is also fired when the server responds to our <stream> packet.
      //
-     // $server_host     - Hostname of your Jabber server (portion after the "@" in your JID)
-     // $server_port     - Port for your Jabber server
-     // $connect_timeout - Maximum number of seconds to wait for a connection
+     // $con_timeout - Maximum number of seconds to wait for a connection
      // $alternate_ip    - If $server_host does not resolve to your Jabber server's IP,
      //                    specify the correct IP to connect to here
@@ -200 +179 @@
           
           $this->_connection = new $connector();
-          $this->_server_host = $this->host;
-          $this->_server_port = $this->port;
           $this->_server_ip = $alternate_ip ? $alternate_ip : $this->host;
           $this->_connect_timeout = (int) $con_timeout;
@@ -215 +192 @@
      
      function _connect_socket() {
-          if ($this->_connection->socket_open($this->con.$this->_server_ip,$this->_server_port,$this->_connect_timeout)) {
+          if ($this->_connection->socket_open($this->con.$this->_server_ip,$this->port,$this->_connect_timeout)) {
                $this->_send("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
                
@@ -231 +208 @@
      function disconnect()
      {
-          $this->_send("</stream:stream>");
+          $this->_send('</stream:stream>');
           
           return $this->_connection->socket_close();
      }
      
-     
      # Logs in to the server
-     function login($username,$password,$resource='blog')
-     {
-          if (!($username && $password)) {
-               return false;
-          }
-          
-          // setup handler to automatically respond to the request
+     function login()
+     {
+          # setup handler to automatically respond to the request
           $auth_id  = $this->_unique_id('auth');
           $this->_set_iq_handler('_on_authentication_methods',$auth_id,'result');
           $this->_set_iq_handler('_on_authentication_result',$auth_id,'error');
           
-          // prepare our shiny new JID
-          $this->_username = $this->username;
-          $this->_password = $password;
-          $this->_resource = $resource;
-          $this->jid = $this->_username.'@'.$this->_server_host.'/'.$this->_resource;
-          
-          // request available authentication methods
-          $payload  = '<username>'.$this->_username.'</username>';
-          $packet   = $this->_send_iq(NULL,'get',$auth_id,'jabber:iq:auth',$payload);
+          # request available authentication methods
+          $payload  = '<username>'.$this->username.'</username>';
+          $packet   = $this->_send_iq(null,'get',$auth_id,'jabber:iq:auth',$payload);
           
           return true;
@@ -282 +248 @@
           $thread = $this->xmlentities($thread);
           
-          $xml = "<message to='".$to."' type='".$type."' id='".$id."'>\n";
+          $xml = '<message to="'.$to.'" type="'.$type.'" id="'.$id.'">';
           
           if ($subject)  $xml .= "<subject>".$subject."</subject>\n";
@@ -322 +288 @@
                     if (!empty($packet['iq'])) {
                          $this->_handle_iq($packet);
-                    }
-                    elseif (!empty($packet['message'])) {
-                         $this->_handle_message($packet);
-                    }
-                    elseif (!empty($packet['presence'])) {
-                         $this->_handle_presence($packet);
                     }
                     elseif (!empty($packet['stream:stream'])) {
@@ -423 +383 @@
      }
      
-     function varset($v)
-     {
-          return is_string($v) ? strlen($v)>0 : !empty($v);
-     }
-     
-     // handle Message packets
-     function _handle_message(&$packet) {
-          // events that we recognize
-          $events = array("composing","offine","delivered","displayed");
-          
-          // grab the message details
-          $type = $packet['message']['@']['type'];
-          if (!$type) $type = "chat";
-
-          $from = $packet['message']['@']['from'];
-          $to = $packet['message']['@']['to'];
-          $id = $packet['message']['@']['id'];
-          
-          list($f_username,$f_domain,$f_resource) = $this->_split_jid($from);
-          $from_jid = ($f_username?"{$f_username}@":"").$f_domain;
-          
-          $body = $packet['message']['#']['body'][0]['#'];
-          $subject = $packet['message']['#']['subject'][0]['#'];
-          $thread = $packet['message']['#']['thread'][0]['#'];
-          
-          // handle extended message info (to a certain extent, anyway)...
-          // if any of the tags in $events are passed under an x element in the
-          // jabber:x:event namespace, $extended[tagname] is set to TRUE
-          $extended = false;
-          $extended_id = NULL;
-          $x = $packet['message']['#']['x'];
-          
-          if (is_array($x)) {
-               foreach ($x as $key=>$element) {
-                    if ($element['@']['xmlns']=="jabber:x:event") {
-                         foreach ($element['#'] as $tag=>$element_content) {
-                              if (in_array($tag,$events)) {
-                                   $extended[$tag] = true;
-                              }
-                              if ($tag=="id") {
-                                   $extended_id = is_array($element_content)
-                                        ? $element_content['0']['#'] : null;
-                                   if (!$extended) $extended = array();
-                              }
-                         }
-                    }
-               }
-          }
-          
-          // if a message contains an x tag in the jabber:x:event namespace,
-          // and doesn't contain a body or subject, then it's an event notification
-          if (!$this->varset($body) && !$this->varset($subject) && is_array($extended)) {
-               
-               // is this a composing event (which needs special handling)?
-               if ($extended['composing']) {
-                    $this->_call_handler("msgevent_composing_start",$from);
-                    $this->roster[$from_jid]["composing"] = true;
-               } else {
-                    if ($this->roster[$from_jid]["composing"]) {
-                         $this->_call_handler("msgevent_composing_stop",$from);
-                         $this->roster[$from_jid]["composing"] = false;
-                    }
-               }
-
-               foreach ($extended as $event=>$value) {
-                    $this->_call_handler("msgevent_$event",$from);
-               }
-               
-               // don't process the rest of the message event, as it's not really a message
-               return;
-          }
-          
-          
-          // process the message
-          switch($type) {
-               case "error":
-                    $this->_handle_error(&$packet);
-                    break;
-               case "groupchat":
-                    $this->_call_handler("message_groupchat",$packet);
-                    break;
-               case "headline":
-                    $this->_call_handler("message_headline",$from,$to,$body,$subject,$x,$packet);
-                    break;
-               case "chat":
-               case "normal":
-               default:
-                    if ($this->roster[$from_jid]["composing"]) $this->roster[$from_jid]["composing"] = false;
-                    if (($type!="chat") && ($type!="normal")) $type = "normal";
-                    $this->_call_handler("message_$type",$from,$to,$body,$subject,$thread,$id,$extended,$packet);
-                    break;
-                    
-          }
-     }
-     
-     // handle Presence packets
-     function _handle_presence(&$packet) {
-          $type = $packet['presence']['@']['type'];
-          if (!$type) $type = "available";
-
-          $from = $packet['presence']['@']['from'];
-          
-          list($f_username,$f_domain,$f_resource) = $this->_split_jid($from);
-          $from_jid = ($f_username?"{$f_username}@":"").$f_domain;
-          
-          $is_service = (!strlen($f_username));
-
-          $exists = ($is_service && $this->handle_services_internally) ? isset($this->services[$from_jid]) : isset($this->roster[$from_jid]);
-          
-          $nothing = false;
-          $rosteritem = &$nothing;
-          
-          if ($exists) {
-               if ($is_service && $this->handle_services_internally) {
-                    $use_services_array = true;
-                    $rosteritem = &$this->services[$from_jid];
-               } else {
-                    $use_services_array = false;
-                    $rosteritem = &$this->roster[$from_jid];
-               }
-          } else {
-               // Ignore roster updates for JIDs not in our roster, except
-               // for subscription requests...
-               
-               if ($type=="available") {
-                    // ... but make note of the presence of non-roster items here, in case
-                    // the roster item is sent AFTER the presence packet... then we can apply the
-                    // presence when the roster item is received
-                    $show = $this->_show($packet['presence']['#']['show'][0]['#']);
-                    $this->presence_cache[$from_jid] = array(
-                         "status"=>$packet['presence']['#']['status'][0]['#'],
-                         "show"=>$show ? $show : "on"
-                    );
-                    
-                    return;
-               }
-               
-               if ($type!="subscribe") {
-                    return;
-               }
-          }
-          $call_update = false;
-
-          switch($type) {
-               case "error":
-                    $this->_handle_error(&$packet);
-                    break;
-               case "probe":
-                    $this->_call_handler('probe',$packet);
-                    break;
-               case "subscribe":
-                    // note: $rosteritem is not set here
-                    $this->_call_handler('subscribe',$packet);
-                    break;
-               case "subscribed":
-                    $this->_call_handler('subscribed',$packet);
-                    break;
-               case "unsubscribe":
-                    $this->_call_handler('unsubscribe',$packet);
-                    break;
-               case "unsubscribed":
-                    $this->_call_handler('unsubscribed',$packet);
-                    break;
-               case "unavailable":
-                    $rosteritem["show"] = "off";
-                    $call_update = true;
-                    break;
-               case "available":
-                    $rosteritem["status"] = $packet['presence']['#']['status'][0]['#'];
-                    $show = $this->_show($packet['presence']['#']['show'][0]['#']);
-                    $rosteritem["show"] = $show ? $show : "on"; // away, chat, xa, dnd, or "" = online
-
-                    $call_update = true;
-                    break;
-          }
-          if ($call_update) {
-               if ($use_services_array) {
-                    $this->_call_handler("serviceupdate",$from,false);
-               } else {
-                    $this->_call_handler("rosterupdate",$from,false);
-               }
-          }
-     }
      
      // handle Stream packets
@@ -638 +415 @@
           $auth_id = $packet['iq']['@']['id'];
           
-          //*
           if (isset($packet['iq']['#']['query'][0]['#']['digest'])) {
                $this->_sendauth_digest($auth_id);
@@ -645 +421 @@
                $this->_sendauth_plaintext($auth_id);
           }
-          
-          //*/
-          //$this->_sendauth_digest($auth_id);
-          //$this->_sendauth_plaintext($auth_id);
           
           $this->_set_iq_handler("_on_authentication_result",$auth_id);
@@ -659 +431 @@
           
           if ($result_type=="result") {
-               if ($this->auto_server_identify) $this->request_version($this->_server_host);
-               
                $this->_call_handler("authenticated");
                $this->_authenticated = true;
@@ -666 +436 @@
                $this->_handle_iq_error(&$packet,"authfailure");
           }
-     }
-     
-     // receives the results of a service browse query
-     function _on_browse_result(&$packet) {
-          $packet_type = $packet['iq']['@']['type'];
-          
-          // did we get a result?  if so, process it, and remember the service list  
-          if ($packet_type=="result") {
-               
-               $this->services = array();
-
-               if ($packet['iq']['#']['service']) {
-                    // Jabberd uses the 'service' element
-                    $servicekey = $itemkey = 'service';
-               } elseif ($packet['iq']['#']['item']) {
-                    // Older versions of Merak use 'item'
-                    $servicekey = $itemkey = 'item';
-               } elseif ($packet['iq']['#']['query']) {
-                    // Newer versions of Merak use 'query'
-                    $servicekey = 'query';
-                    $itemkey = 'item';
-               } else {
-                    // try to figure out what to use
-                    $k = array_keys($packet['iq']['#']);
-                    $servicekey = $k[0];
-                    if (!$servicekey) return;
-               }
-               // if the item key is incorrect, try to figure that out as well
-               if ($packet['iq']['#'][$servicekey] && !$packet['iq']['#'][$servicekey][0]['#'][$itemkey]) {
-                    $k = array_keys($packet['iq']['#'][$servicekey][0]['#']);
-                    $itemkey = $k[0];
-               }
-               
-               $number_of_services = count($packet['iq']['#'][$servicekey][0]['#'][$itemkey]);
-
-               $services_updated = false;
-               for ($a = 0; $a < $number_of_services; $a++)
-               {
-                    $svc = &$packet['iq']['#'][$servicekey][0]['#'][$itemkey][$a];
-
-                    $jid = strtolower($svc['@']['jid']);
-                    $is_new = !isset($this->services[$jid]);
-                    $this->services[$jid] = array(     
-                                                       "type"              => strtolower($svc['@']['type']),
-                                                       "status"       => "Offline",
-                                                       "show"              => "off",
-                                                       "name"              => $svc['@']['name']
-                    );
-                    $number_of_namespaces = count($packet['iq']['#'][$servicekey][0]['#'][$itemkey][$a]['#']['ns']);
-                    for ($b = 0; $b < $number_of_namespaces; $b++) {
-                              $this->services[$jid]['namespaces'][$b] = $packet['iq']['#'][$servicekey][0]['#'][$itemkey][$a]['#']['ns'][$b]['#'];
-                    }
-
-                    if ($this->service_single_update) {
-                         $services_updated = true;
-                    } else {
-                         $this->_call_handler("serviceupdate",$jid,$is_new);
-                    }
-               }
-               
-               if ($this->service_single_update && $services_updated) {
-                    $this->_call_handler("serviceupdate",NULL,$is_new);
-               }
-               
-          // choke on error
-          } elseif ($packet_type=="error") {
-               $this->_handle_iq_error($packet);
-               
-          // confusion sets in
-          }
-     }
-     
-     // request software version from a JabberID
-     function request_version($jid) {
-          // setup handler to automatically respond to the request (it would anyway,
-          // because of how we handle version packets, but... hey, why not be thorough)
-          $ver_id   = $this->_unique_id("ver");
-          $this->_set_iq_handler("_handle_version_packet",$ver_id,"result");
-
-          return $this->_send_iq($jid, 'get', $ver_id, "jabber:iq:version");         
      }
      
@@ -754 +444 @@
           $packetid = $packet['iq']['@']['id'];
 
-          if ($packet_type=="result") {
-               // did we get a result?  if so, process it, and update the contact's version information
-               $jid = $this->_bare_jid($from);
-               
-               $version = &$packet['iq']['#']['query'][0]['#'];
-               if ($jid==$this->_server_host) {
-                    //$this->server_software = $version['name'][0]['#'];
-                    //$this->server_version = $version['version'][0]['#'];
-                    //$this->server_os = $version['os'][0]['#'];
-                    
-                    $this->is_merak = strtolower(substr($this->server_software,0,5))=="merak";
-               } elseif ($this->roster[$jid]) {
-                    $this->roster[$jid]["version"] = $version;
-               }
-
-               $this->_call_handler("rosterupdate",$jid,false);
-
-          } elseif ($packet_type=="get") {
+          if ($packet_type=="get") {
                // did we get an inquiry?  if so, send our version info
                $payload  = "<name>{$this->_iq_version_name}</name><version>{$this->_iq_version_version}</version>";
@@ -789 +462 @@
           $packetid = $packet['iq']['@']['id'];
 
-          if ($packet_type=="result") {
-               // did we get a result?  if so, process it, and update the contact's time information
-               $jid = $this->_bare_jid($from);
-               
-               $timeinfo = &$packet['iq']['#']['query'][0]['#'];
-               $this->roster[$jid]["time"] = $timeinfo;
-
-               $this->_call_handler("rosterupdate",$jid,false);
-          } elseif ($packet_type=="get") {
+          if ($packet_type=="get") {
                // did we get an inquiry?  if so, send our time info
                $utc = gmdate('Ymd\TH:i:s');
@@ -810 +475 @@
           
           return true;
-     }
-
-     
-     function _on_private_data(&$packet) {
-          $packet_type = $packet['iq']['@']['type'];
-          if ($packet_type == 'result') {
-
-               $rootnode = $packet['iq']['#']['query'][0]['#'];
-               unset($rootnode[0]);
-               $rootnode = array_shift($rootnode);
-               $data = $rootnode[0];
-               $namespace = $data['@']['xmlns'];
-               $rawvalues = $data['#'];
-               
-               $values = array();
-               if (is_array($rawvalues)) {
-                    foreach ($rawvalues as $k=>$v) {
-                         $values[$k] = $v[0]['#'];
-                    }
-               }
-               
-               $this->_call_handler("privatedata",$packet['iq']['@']['id'],$namespace,$values);
-               
-          } elseif ($packet_type == 'error' && isset($packet['iq']['#']['error'][0]['#'])) {
-               $this->_handle_iq_error(&$packet,"privatedatafailure");
-          } else {
-               $this->_call_handler("privatedatafailure",-2,"Unrecognized response from server");
-          }                   
      }
 
@@ -871 +508 @@
      
      
-     
      // ==== Authentication Methods ===========================================================
 
-     function _sendauth_digest($auth_id) {
-
-          $payload = "<username>{$this->_username}</username>
-     <resource>{$this->_resource}</resource>
-     <digest>" . sha1($this->_stream_id . $this->_password) . "</digest>";
-
-          $this->_send_iq(NULL, 'set', $auth_id, "jabber:iq:auth", $payload);
-     }
-
-     function _sendauth_plaintext($auth_id) {
-
-          $payload = "<username>{$this->_username}</username>
-     <password>{$this->_password}</password>
-     <resource>{$this->_resource}</resource>";
-
-          $this->_send_iq(NULL, 'set', $auth_id, "jabber:iq:auth", $payload);
+     function _sendauth_digest($auth_id)
+     {
+          $payload =
+          '<username>'.$this->username.'</username>'.
+          '<resource>'.$this->resource.'</resource>'.
+          '<digest>'.sha1($this->_stream_id.$this->password).'</digest>';
+          
+          $this->_send_iq(null,'set',$auth_id,'jabber:iq:auth',$payload);
+     }
+
+     function _sendauth_plaintext($auth_id)
+     {
+          $payload = 
+          '<username>'.$this->username.'</username>'.
+          '<resource>'.$this->resource.'</resource>'.
+          '<password>'.$this->password.'</password>';
+          
+          $this->_send_iq(null,'set',$auth_id,'jabber:iq:auth',$payload);
      }    
 
 
-     // ==== Helper Methods ===================================================================
-     
-     function _show($show) {
-          // off is not valid, but is used internally
-          $valid_shows = array("","away","chat","dnd","xa","off");
-          if (!in_array($show,$valid_shows)) $show = "";
-          
-          return $show;
-     }
-     
-     function standardize_transport($transport,$force=true) {
-          $transports = array("msn","aim","yim","icq","jab");
-          if (!in_array($transport,$transports)) {
-               if ($transport=="aol") {
-                    $transport = "aim";
-               } elseif ($transport=="yahoo") {
-                    $transport = "yim";
-               } else {
-                    if ($force) $transport = "jab";
-               }
-          }
-          return $transport;
-     }
-          
-     function get_transport($domain) {
-          $transport = $this->services[$domain]["type"];
-          return $this->standardize_transport($transport);
-     }
-
-
-
-
-
      // ==== Packet Handling & Connection Methods =============================================
 
      // generates and transmits an IQ packet
-     function _send_iq($to = NULL, $type = 'get', $id = NULL, $xmlns = NULL, $payload = NULL, $from = NULL) {
+     function _send_iq($to=null,$type='get',$id=null,$xmlns=null,$payload=null,$from=null)
+     {
           if (!preg_match("/^(get|set|result|error)$/", $type)) {
-               unset($type);
-
                return false;
-          
-          } elseif ($id && $xmlns) {
-               $xml = "<iq type='$type' id='$id'";
-               $xml .= ($to) ? " to='$to'" : '';
-               $xml .= ($from) ? " from='$from'" : '';
-               $xml .= ">
-     <query xmlns='$xmlns'>
-          $payload
-     </query>
-</iq>";
-
+          }
+          elseif ($id && $xmlns) {
+               $xml =
+               '<iq type="'.$type.'" id="'.$id.'"'.($to ? ' to="'.$to.'"' : '').($from ? ' from="'.$from.'"' : '').'>'.
+               '    <query xmlns="'.$xmlns.'">'.$payload.'</query>'.
+               '</iq>';
+               
                return $this->_send($xml);
           }
@@ -950 +550 @@
                return false;
           }
-     }    
-     
-     
-     // writes XML data to the socket; trims and UTF8 encodes $xml before
-     // sending unless $pristine is true
-     function _send($xml,$pristine = false) {
-          // need UTF8 encoding to prevent character coding issues when
-         // users enter international characters
-         /*
-         if (!$pristine) {
-               $xml = trim(utf8_encode($xml));
-          if (!$xml) return false;
-         }
-         */
-          if(strlen($xml)==0) return true;
-          
-          $res = $this->_connection->socket_write($xml);
-
-          return $res;
-     }    
-     
-     
+     }
+     
+     // writes XML data to the socket
+     function _send($xml)
+     {
+          if (empty($xml)) {
+               return true;
+          }
+          
+          return $this->_connection->socket_write($xml);
+     }
      
      function _receive() {

plugins/jabberNotifications/locales/fr/main.po

@@ -195 +195 @@
 msgstr "Connexion sécurisée :"
 
+msgid "None"
+msgstr "Aucune"

plugins/jabberNotifications/test.php

@@ -9 +9 @@
 $host = 'host';
 $port = 5222;
-$con = 'ssl://'; # or '' or 'tls://'
+$con = ''; # or 'ssl://' or 'tls://'
 $user = 'user@server';
 $pass = 'pass';
@@ -64 +64 @@
      public function handleConnected()
      {
-          $this->j->login($this->user,$this->pass);
+          $this->j->login();
           echo "[I] Logged in\n";
      }