Index: /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/applet/Jeti.java
===================================================================
--- /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/applet/Jeti.java	(revision 1136)
+++ /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/applet/Jeti.java	(revision 1198)
@@ -102,5 +102,5 @@
 			public void run()
 			{
-
+	
 				String server = new String(applet.getParameter("SERVER"));
 				String portText = new String(applet.getParameter("PORT"));
@@ -118,5 +118,5 @@
 				String language = new String(applet.getParameter("LANGUAGE"));
 				String javaPlugins = new String(applet.getParameter("JAVAPLUGINS"));
-
+				
 				/**
 				 * @Author : Alexandre Correia - alexandrecorreia@celepar.pr.gov.br
Index: /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/images/status.cfg
===================================================================
--- /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/images/status.cfg	(revision 1014)
+++ /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/images/status.cfg	(revision 1198)
@@ -1,9 +1,9 @@
 default
+status/ask question.gif
+status/away away.png
 status/chat chat.png
 status/dnd dnd.png
-status/away away.png
-status/xa xa.png
 status/invisible invisible.png
 status/offline unavailable.png
 status/online available.png
-status/ask question.gif
+status/xa xa.png
Index: /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/images/StatusIcons.java
===================================================================
--- /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/images/StatusIcons.java	(revision 1091)
+++ /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/images/StatusIcons.java	(revision 1198)
@@ -8,18 +8,11 @@
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-import javax.xml.parsers.SAXParser;
 
 import nu.fw.jeti.jabber.JIDStatus;
 import nu.fw.jeti.jabber.elements.Presence;
 
-/**
- * @author Alexandre Correia
- * 
- */
-
 public class StatusIcons
 {
 	private static Map statusIcons;
-	private SAXParser parser;
 
 	public StatusIcons()
@@ -120,9 +113,9 @@
 		catch(EOFException e)
 		{
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 		catch (IOException e2)
 		{
-		    e2.printStackTrace();
+		    //e2.printStackTrace();
 		}
 	}
Index: /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/images/images.cfg
===================================================================
--- /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/images/images.cfg	(revision 1014)
+++ /branches/2.0/jabberit_messenger/java_source/src/nu/fw/jeti/images/images.cfg	(revision 1198)
@@ -2,6 +2,6 @@
 arrowUp pijlomhoog.gif
 arrowDown pijlomlaag.gif
-status/unknown question.gif
-multiple multiple.gif
 jeti jeti.png
 keys keys.png
+multiple multiple.gif
+status/unknown question.gif
Index: anches/2.0/jabberit_messenger/java_source/src/ConvertLogs.java
===================================================================
--- /branches/2.0/jabberit_messenger/java_source/src/ConvertLogs.java	(revision 1014)
+++ 	(revision )
@@ -1,278 +1,0 @@
-/* 
- *	Jeti, a Java Jabber client, Copyright (C) 2004 E.S. de Boer  
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *	GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *	For questions, comments etc, 
- *	use the website at http://jeti.jabberstudio.org
- *  or mail me at eric@jeti.tk or Jabber at jeti@jabber.org
- *
- *	Created on 2-mei-2004
- */
- 
-import java.io.*;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import javax.swing.JOptionPane;
-import javax.swing.ProgressMonitor;
-
-/**
- * @author E.S. de Boer
- *
- */
-public class ConvertLogs
-{
-	
-	private static SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy",Locale.US);
-	private static Map  map = new HashMap();
-	private static String path;
-	
-	public static void main(String[] args)
-	{
-		getPath();
-		indexDirectory(new File(path + "logs"));
-		saveLogs();
-		System.exit(0);
-	}
-	
-	private static String getPath()
-	{
-		// Now, search for and get the URL for this class.
-		URL url = ConvertLogs.class.getResource("ConvertLogs.class");
-		//System.out.println(url);
-		String urlString = null;
-
-		try
-		{ //remove %20 from program files etc
-			urlString = URLDecoder.decode(url.toString(), "UTF8"); //encode if to url? probaly not
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		} //1.2 error
-
-		//System.out.println(url.getPath()  ); //werkt niet in 1.2
-		//System.out.println(url);
-		if (url.getProtocol().equals("jar"))
-		{
-			// Strip off JarURL-specific syntax.
-			urlString = urlString.substring(4);
-			urlString = urlString.substring(0, urlString.lastIndexOf("!"));
-			urlString = urlString.substring(0, urlString.lastIndexOf("/") + 1);
-		}
-		else urlString = ".....e:\\data\\java\\jeti\\";//urlString.substring(0, urlString.lastIndexOf("/jeti") + 1);
-		//System.out.println("df" + urlString);
-		path = urlString.substring(5);
-		return urlString;
-		/*
-		try
-		{
-			localURL = new URL(urlString);
-		}
-		catch (MalformedURLException ex)
-		{
-			ex.printStackTrace();
-		}
-		if(System.getProperty("file.separator").equals("/"))//unix? if mac then bug
-		{
-			path = urlString.substring(5);
-		}
-		else path = urlString.substring(6);
-		path = path.replace('/',File.separatorChar);
-		System.out.println(path);
-		System.out.println(urlString);
-		System.out.println(localURL);
-		*/
-	}
-
-	private static void indexDirectory(File dir) 
-	{
-		File[] files = dir.listFiles();
-		if(files==null)System.exit(1);
-		ProgressMonitor progress = new ProgressMonitor(null,"Indexing log files","", 0, files.length);
-		for (int i=0; i < files.length; i++) 
-	    {
-			if(progress.isCanceled()) break;
-			File f = files[i];
-			String name = f.getName();
-			//System.out.println(name);
-			if (name.endsWith(".txt")) 
-	        {
-				int atLocation = name.indexOf("@");
-				if (atLocation<0)
-				{//no @ do nothing with it
-					continue;
-				}
-				progress.setNote(name);
-	        	progress.setProgress(i);
-	        	if(name.startsWith("msn.",atLocation+1))
-	        	{
-	        		readLog(f,name.substring(0,atLocation),"msn");
-	        		
-	        	}
-	        	else if(name.startsWith("icq.",atLocation+1))
-	        	{
-	        		readLog(f,name.substring(0,atLocation),"icq");
-	        		
-	        	}
-	        	else if(name.startsWith("aim.",atLocation+1))
-	        	{
-	        		readLog(f,name.substring(0,atLocation),"aim");
-	        		
-	        	}
-	        	//else readLog(f,name.substring(0,atLocation),name.substring(atLocation+1,name.length()-4));
-	         }
-	    }
-		progress.close();
-	}
-	
-	private static void readLog(File file, String adres, String type)
-	{
-		String name = adres +"@"+ type +".txt";
-		
-		BufferedReader log=null;
-		try
-		{
-			log = new BufferedReader(new FileReader(file));
-			parseLog(log,name);
-		}
-		catch (FileNotFoundException e2)
-		{
-			return;
-		}
-		catch (IOException e2)
-		{
-			e2.printStackTrace();
-		}
-		finally
-		{
-			if(log!=null)
-				try
-				{
-					log.close();
-				}
-				catch (IOException e1)
-				{
-					e1.printStackTrace();
-				}
-		}
-		file.delete();
-	}
-	
-	
-	
-	private static void parseLog(BufferedReader reader, String name) throws IOException
-	{
-		StringBuffer text=null;
-		String line;
-		Date date=null;
-		List adresList =(List) map.get(name);
-		if(adresList==null)
-		{
-			adresList = new ArrayList();
-			map.put(name,adresList);
-		}
-		while((line = reader.readLine()) !=null)
-		{
-			if(line.equals("")) continue;
-			else if(line.startsWith("----------------") && line.length() > 50  && line.endsWith("----------------"))
-			{
-				String temp = line.substring(16);
-				temp = temp.substring(0,temp.length()- 16);
-				try
-				{
-					Date newdate = dateFormat.parse(temp);
-					//System.out.println(date);
-					if(text!=null)
-					{
-						adresList.add(new DateText(date, text.toString()));
-					}
-					text = new StringBuffer();
-					date = newdate;
-				} catch (ParseException e2)
-				{
-					text.append(line + System.getProperty("line.separator"));
-				}
-				//System.out.println(date);
-			}
-			else text.append(line + System.getProperty("line.separator"));
-		}
-		adresList.add(new DateText(date, text.toString()));
-	}
-	
-	private static void saveLogs()
-	{
-		for(Iterator i=map.entrySet().iterator();i.hasNext();)
-		{
-			Map.Entry entry = (Map.Entry)i.next();
-			String filename = (String) entry.getKey();
-			List texts = (List) entry.getValue();
-			Collections.sort(texts);
-			
-			String file = path + "logs" + File.separator + filename;
-			PrintWriter log=null;
-			try
-			{
-				log = new PrintWriter(new BufferedOutputStream(new FileOutputStream(file, true)), true);
-			}
-			catch (IOException e2)
-			{
-				e2.printStackTrace();
-				log.close();
-				continue;
-			}
-			for(Iterator j = texts.iterator();j.hasNext();)
-			{
-				((DateText)j.next()).save(log);
-			}
-			log.close();
-		}
-	}
-}
-
-class DateText implements Comparable
-{
-	private Date date;
-	private String text;
-	
-	public DateText(Date date, String text)
-	{
-		this.date = date;
-		this.text = text;
-	}
-	
-	public int compareTo(Object o)
-	{
-		return date.compareTo(((DateText)o).date);
-	}
-	
-	public void save(PrintWriter log)
-	{
-		log.println();
-		log.println("----------------" + date.toString() + "----------------");
-		log.println();
-		log.println(text);
-	}
-}
-/*
- * Overrides for emacs
- * Local variables:
- * tab-width: 4
- * End:
- */
Index: anches/2.0/jabberit_messenger/java_source/src/IM.java
===================================================================
--- /branches/2.0/jabberit_messenger/java_source/src/IM.java	(revision 1014)
+++ 	(revision )
@@ -1,102 +1,0 @@
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Frame;
-import java.awt.Label;
-import java.awt.Window;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-
-
-/**
- * remote Load jeti
- * use it to load jeti from network 
- * or on a multi user system
- * (only config files and logs are stored localy)
- */
-public class IM extends Window
-{
-	private Label from;
-	
-	public IM(Frame frame)
-	{
-		super(frame);
-		Label label = new Label("Jeti is Loading...");
-		label.setFont(new java.awt.Font("Serif", 1, 40)); 
-		label.setBackground(new Color(150,150,255));
-		add(label,BorderLayout.CENTER);
-		from = new Label("Loading");
-		from.setBackground(new Color(255,255,150));
-		add(from,BorderLayout.SOUTH); 
-		pack();
-		setLocationRelativeTo(null);
-	}
-	
-	
-    public static void main(String[] args) 
-    {
-		String path = System.getProperty("user.dir");
-		path = path.replace('\\','/');
-		path = "file:/" + path + "/";
-		System.out.println(path);
-//    	try
-//		{
-//			//System.out.println(args[0]);
-//			//
-//			System.out.println(new File(".").toURL());// getCanonicalPath());
-//		}
-//		catch (IOException e1)
-//		{
-//			// TODO Auto-generated catch block
-//			e1.printStackTrace();
-//		}
-		//if(true) return;
-    	Frame frame = new Frame();
-    	IM im = new IM(frame);
-    	im.show();
-		URL url = null;
-		URL url2[] = new URL[1];
-		try {
-			//url = new URL ("file:/e:/data/java/jeti/");
-			//url = new URL ("file:/z:/data/java/2m/classes/");
-			//url = new URL ("http://192.168.100.2/~eric/");
-		    url = new URL(args[0]);
-
-		   url2[0] = new URL (url + "Jeti.jar");
-		   im.from.setText("from: " + url2[0].toString());
-		   //url2[0] = url;
-		   System.out.println(url2[0]);
-		} catch (MalformedURLException e) 
-		{
-			im.from.setText(e.getMessage());
-			e.printStackTrace();
-		}
-		URLClassLoader loader = new URLClassLoader(url2);
-		Class start = null;
-		
-//		String path = null;
-//		URL urlPath =null;
-//		urlPath = IM.class.getResource("IM.class");
-//		try{//remove %20 from program files etc
-//			path = URLDecoder.decode(urlPath.toString(),"UTF8");//encode if to url? probaly not
-//		}catch (Exception e){e.printStackTrace();}//1.2 error + 1.4
-//		path = path.substring(0,path.lastIndexOf("/")+1);
-
-		try{
-			start = loader.loadClass("nu.fw.jeti.backend.Start");
-			Method m = start.getMethod("remoteLoad",new Class[]{java.net.URL.class,String.class});
-			m.invoke(null,new Object[]{url,path});
-		}catch(Exception e){e.printStackTrace();}
-		im.dispose();
-		frame.dispose();  
-    }
-}
-
-/*
- * Overrides for emacs
- * Local variables:
- * tab-width: 4
- * End:
- */
Index: /branches/2.0/jabberit_messenger/xsl/list_ldap_contacts.xsl
===================================================================
--- /branches/2.0/jabberit_messenger/xsl/list_ldap_contacts.xsl	(revision 946)
+++ /branches/2.0/jabberit_messenger/xsl/list_ldap_contacts.xsl	(revision 1198)
@@ -27,8 +27,8 @@
 				<b><xsl:value-of select="name(..)"/></b>
 				<br/><xsl:value-of select="cn" />
-				<br/><xsl:value-of select="mail" />
 				<br/>
 				<br/>
 				<label style="color:blue;cursor:pointer;">Adicionar Contato</label>
+				<br/>
 			</span>
 		</xsl:for-each>
Index: /branches/2.0/jabberit_messenger/inc/webservice.php
===================================================================
--- /branches/2.0/jabberit_messenger/inc/webservice.php	(revision 1139)
+++ /branches/2.0/jabberit_messenger/inc/webservice.php	(revision 1198)
@@ -15,5 +15,5 @@
 	private $conn;
 	private $contextLdap;
-	private $userDn;	
+	private $userLDAP;	
 	private $jabberName = null;
 	private $passwd;
@@ -21,4 +21,6 @@
 	private $refer;
 	private $serverLdap;
+	private $fileLdapInternal = false;
+	private $fileLdapExternal = false;
 	
 	function __construct()
@@ -32,9 +34,11 @@
 			$this->serverLdap	= $handle['serverLdap'];
 			$this->contextLdap	= $handle['contextLdap'];
-			$this->userDn		= $handle['user'];
+			$this->userLDAP		= $handle['user'];
 			$this->passwd		= $handle['password'];
 			
 			$this->refer  	= true;
 			$this->version3 = true;
+			
+			$this->fileLdapInternal = true;
 		}
 	}
@@ -55,9 +59,9 @@
 
 		// Bind as Admin
-		if($this->userDn && $this->passwd && !ldap_bind($this->conn, $this->userDn, $this->passwd))
+		if( $this->userLDAP && $this->passwd && !ldap_bind($this->conn, $this->userLDAP . "," . $this->contextLdap, $this->passwd) )
 			return False;
 		
 		// Bind as Anonymous
-		if(!$this->userDn && !$this->passwd && !@ldap_bind($this->conn))
+		if( !$this->userLDAP && !$this->passwd && !@ldap_bind($this->conn) )
 			return False;
 	}
@@ -65,21 +69,26 @@
 	private final function ldapConnectExternal($pHostJabber)
 	{
-		require_once('confLDAPExternal.php');
-		$handle   = unserialize(base64_decode($LDAP_EXTERNAL));
-
-		foreach($handle as $itens)
-			if(trim($pHostJabber) == $itens['jabberName'])
-			{
-				$this->jabberName	= $itens['jabberName'];
-				$this->serverLdap	= $itens['serverLdap'];
-				$this->contextLdap	= $itens['contextLdap'];
-				$this->userDn		= $itens['user'];
-				$this->passwd		= $itens['password'];
-			}		
-
-		$this->refer  	= true;
-		$this->version3 = true;
-		
-		$this->ldapConnect();
+		if( file_exists('confLDAPExternal.php'))
+		{
+			require_once('confLDAPExternal.php');
+			$handle   = unserialize(base64_decode($LDAP_EXTERNAL));
+	
+			foreach($handle as $itens)
+				if(trim($pHostJabber) == $itens['jabberName'])
+				{
+					$this->jabberName	= $itens['jabberName'];
+					$this->serverLdap	= $itens['serverLdap'];
+					$this->contextLdap	= $itens['contextLdap'];
+					$this->userLDAP		= $itens['user'];
+					$this->passwd		= $itens['password'];
+				}		
+	
+			$this->refer  	= true;
+			$this->version3 = true;
+			
+			$this->ldapConnect();
+			
+			$this->fileLdapExternal = true;
+		}
 	}
 	
@@ -161,22 +170,29 @@
 	{
 		$uid = substr($pJid, 0, strpos($pJid,"@"));
+		$return = utf8_encode("Nome : Não Identificado ;Organização : Não Identificado");
 		
 		if( $this->jabberName == (substr($pJid, strpos($pJid, "@") + 1 )))
 		{
 			$this->ldapConnect();
-			
-			if( $this->conn )
-			{
-				$filter = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
-				$justthese = array("uid","cn","dn");
-				$search = ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
-				$entry = ldap_get_entries($this->conn,$search);
-				$cn = $entry[0]['cn'][0];
-				$ou = explode("dc=", $entry[0]['dn']);
-				$ou = explode("ou=",$ou[0]);
-				$ou = array_pop($ou);
-				$dn = strtoupper(substr($ou,0,strlen($ou)-1));
-	
-				$return = utf8_encode("Nome : " . $cn . ";Organização : " . $dn);
+
+			if( $this->fileLdapInternal )
+			{
+				if( $this->conn )
+				{
+					$filter = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
+					$justthese = array("uid","cn","dn");
+					$search = ldap_search( $this->conn, $this->contextLdap, $filter,$justthese);
+					$get_entries = ldap_get_entries( $this->conn, $search);
+		
+					if( $get_entries['count'] > 0 )
+					{					
+						$cn = $get_entries[0]['cn'][0];
+						$ou = explode("dc=", $get_entries[0]['dn']);
+						$ou = explode("ou=",$ou[0]);
+						$ou = array_pop($ou);
+						$dn = strtoupper(substr($ou,0,strlen($ou)-1));
+						$return = utf8_encode("Nome : " . $cn . ";Organização : " . $dn);
+					}
+				}
 			}
 		}
@@ -184,64 +200,64 @@
 		{
 			$this->ldapConnectExternal(substr($pJid, strpos($pJid, "@") + 1 ));
-
-			if( $this->conn )
-			{
-				$filter = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
-				$justthese = array("uid","cn","dn");
-				$search = ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
-				$entry = ldap_get_entries($this->conn,$search);
-				$cn = $entry[0]['cn'][0];
-				$ou = explode("dc=", $entry[0]['dn']);
-				$ou = explode("ou=",$ou[0]);
-				$ou = array_pop($ou);
-				$dn = strtoupper(substr($ou,0,strlen($ou)-1));
-	
-				$return = utf8_encode("Nome : " . $cn . ";Organização : " . $dn);
-			}
-		}
-
-		if( $pCharset === "1" )
+			
+			if( $this->fileLdapExternal )
+			{
+				if( $this->conn )
+				{
+					$filter = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
+					$justthese = array("uid","cn","dn");
+					$search = ldap_search( $this->conn, $this->contextLdap, $filter, $justthese);
+					$get_entries = ldap_get_entries( $this->conn, $search);
+					
+					if( $get_entries['count'] > 0 )
+					{
+						$cn = $get_entries[0]['cn'][0];
+						$ou = explode("dc=", $get_entries[0]['dn']);
+						$ou = explode("ou=",$ou[0]);
+						$ou = array_pop($ou);
+						$dn = strtoupper(substr($ou,0,strlen($ou)-1));
+						$return = utf8_encode("Nome : " . $cn . ";Organização : " . $dn);
+					}
+				}
+			}
+		}
+
+		if( $pCharset === "1" || $pCharset === 1 )
 			return $return;
 		else
 			return mb_convert_encoding($return, "ISO-8859-1", "UTF-8");
 
-		$return = utf8_encode("Nome : Não Identificado ;Organização : Não Identificado");			
-
-		if( $pCharset === 1 )
-			return $return;
-		else
-			return mb_convert_encoding($return, "ISO-8859-1", "UTF-8");
-
-	}
-	
-	public final function getPhotoLdap( $pJid, $pCatalog )
-	{
-		if ( ! $this->jabberName )
-			return false;
-
-		$uid = substr($pJid, 0, strpos($pJid,"@"));
-		
-		if( ($this->jabberName == (substr($pJid, strpos($pJid, "@") + 1 ))) && $pCatalog)
-		{
-			$this->ldapConnect();
-			
-			if( $this->conn )
-			{
-				$filter = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
-				$justthese = array("uid","jpegPhoto");
+	}
+	
+	public final function getPhotoLdap( $pJid , $pLdapInternal )
+	{
+		$uid = substr($pJid, 0, strpos($pJid, "@"));
+
+		if( $pLdapInternal )
+		{
+			if( $this->jabberName == (substr($pJid, strpos($pJid, "@") + 1 )))
+			{
+				if( ! $this->fileLdapInternal )
+					return false;
 				
-				$search = ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
-				$entry1 = ldap_get_entries($this->conn,$search);
-				$entry = ldap_first_entry( $this->conn, $search );
-				if( $entry1['count'] > 0 )
-				{
-					$i = 0;
-					$photo = "";
-					$return_photo = "";
-					$photo = @ldap_get_values_len($this->conn, $entry, 'jpegphoto');
-
-					if ($photo)
-						$return_photo = $photo[0];								
-					return $return_photo;
+				$this->ldapConnect();
+				
+				if( $this->conn )
+				{
+					$filter			= "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
+					$justthese		= array("uid","jpegPhoto");
+					$search			= ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
+					$get_entries	= ldap_get_entries($this->conn,$search);
+					
+					if( $get_entries['count'] > 0 )
+					{
+						$first_entry = ldap_first_entry( $this->conn, $search );
+						$photo = @ldap_get_values_len($this->conn, $first_entry, 'jpegphoto');
+						
+						if ( $photo )
+							return $photo[0];
+						
+						return false;								
+					}
 				}
 			}
@@ -250,5 +266,5 @@
 		{					
 			$jabberName = substr($pJid, strpos($pJid, "@") + 1 );
-			
+
 			if( strpos($jabberName, "/") )
 				$jabberName = substr($jabberName, 0, strpos($jabberName, "/"));
@@ -256,24 +272,27 @@
 			$this->ldapConnectExternal($jabberName);
 
+			if( !$this->fileLdapExternal )
+				return false;
+
 			if( $this->conn )
 			{
-				$filter = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
-				$justthese = array("uid","jpegPhoto");
-				$search = ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
-				$entry1 = ldap_get_entries($this->conn,$search);
-				$entry = ldap_first_entry( $this->conn, $search );
-				if( $entry1['count'] > 0 )
-				{
-					$i = 0;
-					$photo = "";
-					$return_photo = "";
-					$photo = @ldap_get_values_len($this->conn, $entry, 'jpegphoto');
-					if ($photo)
-						$return_photo = $photo[0];								
-					return $return_photo;
+				$filter			= "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
+				$justthese		= array("uid","jpegPhoto");
+				$search			= ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
+				$get_entries	= ldap_get_entries($this->conn,$search);
+				
+				if( $get_entries['count'] > 0 )
+				{
+					$first_entry = ldap_first_entry( $this->conn, $search );
+					$photo = @ldap_get_values_len($this->conn, $first_entry, 'jpegphoto');
+					
+					if ( $photo )
+						return $photo[0];
+					
+					return false;								
 				}
 			}
 		}
-					
+		
 		return false;
 	}
@@ -305,5 +324,5 @@
 }
 
-// Utilizando o serviço Asteriks;
+// Applet - utilizando o serviço Voip;
 if(trim($_REQUEST['javaVoipFrom']) != "" && trim($_REQUEST['javaVoipTo']) != "" )
 {
@@ -314,12 +333,12 @@
 }
 
-// Fotos pelo applet; 
+// Applet - fotos pelo applet; 
 if(trim($_REQUEST['javaPhoto']) != "" )
 {
 	$obj = new webService();
 	$jid = $_REQUEST['javaPhoto'];
-	$jid = strpos($jid, "/") ? substr($jid, 0, strpos($jid, "/")) : $jid;
-	
-	$photo = $obj->getPhotoLdap($jid, true);
+	$jid = ( strpos($jid, "/") !== false ) ? substr($jid, 0, strpos($jid, "/")) : $jid;
+	
+	$photo = $obj->getPhotoLdap( $jid, true );
 	$photoWidth = 70;
 	$photoHeight = 90;
@@ -352,12 +371,12 @@
 	ob_end_clean();
 	printf("%s",base64_encode($imagePhoto));
-	
-}
-
-// Jid pelo applet;
-if(trim($_POST['jid']) != "")
-{
-	$jid = trim($_POST['jid']);
-	$charset = trim($_POST['charset']);
+}
+
+// Applet - jid;
+if(trim($_REQUEST['jid']) != "")
+{
+	
+	$jid = trim($_REQUEST['jid']);
+	$charset = trim($_REQUEST['charset']);
 	$obj = new webService();
 	
@@ -365,5 +384,5 @@
 }
 
-// Fotos pelo php;
+// Php - fotos pelo php;
 if(trim($_REQUEST['phpPhoto']) != "")
 {
Index: /branches/2.0/jabberit_messenger/inc/class.contacts_im.inc.php
===================================================================
--- /branches/2.0/jabberit_messenger/inc/class.contacts_im.inc.php	(revision 991)
+++ /branches/2.0/jabberit_messenger/inc/class.contacts_im.inc.php	(revision 1198)
@@ -34,4 +34,5 @@
 		// Server Name Jabber
 		$this->serverJabber = $_SESSION['phpgw_info']['jabberit_messenger']['name_jabberit'];
+		
 	}
 
@@ -69,5 +70,5 @@
 		// Hosts Jabber
 		$hostsJabber = unserialize($_SESSION['phpgw_info']['jabberit_messenger']['map_org_realm_jabberit']);
-			
+
 		if( is_array($users) )
 		{	
@@ -78,12 +79,14 @@
 					foreach($hostsJabber as $itens)
 					{
-						if( trim($users[$i]['ou']) === trim($itens['org']) && strpos($users[$i]['jid'],"@") === false)
-								$users[$i]['jid'] = $users[$i]['jid']."@".$itens['jabberName'];						
-						else
+						if( trim($users[$i]['ou']) === trim($itens['org']) && strpos($users[$i]['jid'],"@") === false )
 						{
-							if(strpos($users[$i]['jid'],"@") === false)
-									$users[$i]['jid'] = $users[$i]['jid']."@".$this->serverJabber;
+							$users[$i]['jid'] = $users[$i]['jid']."@".$itens['jabberName'];
 						}
 					}
+				}
+
+				if( strpos($users[$i]['jid'],"@") === false )
+				{
+					$users[$i]['jid'] = $users[$i]['jid']."@".$this->serverJabber;
 				}
 			}
@@ -139,5 +142,6 @@
 				$result[] = $this->ldap->getUsersLdapRoot("cn=*".$pName."*", $filter_uid);
         }
-        if(!$this->groupsLocked())
+        
+        if( !$this->groupsLocked() )
 	        $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*");
 
Index: /branches/2.0/jabberit_messenger/inc/class.ldap_im.inc.php
===================================================================
--- /branches/2.0/jabberit_messenger/inc/class.ldap_im.inc.php	(revision 988)
+++ /branches/2.0/jabberit_messenger/inc/class.ldap_im.inc.php	(revision 1198)
@@ -22,5 +22,5 @@
 	private $ldap;
 	private $ldap_context;
-	private $ldap_dn;
+	private $ldap_user;
 	private $ldap_host;
 	private $ldap_org;
@@ -52,5 +52,5 @@
 		$GLOBALS['phpgw_info']['server']['ldap_version3'] = true;
 
-		$this->ldap = $this->common->ldapConnect( $this->ldap_host, $this->ldap_dn, $this->ldap_pass, false );
+		$this->ldap = $this->common->ldapConnect( $this->ldap_host, $this->ldap_user . "," . $this->ldap_context , $this->ldap_pass, false );
 	}
 	
@@ -59,5 +59,5 @@
 		$this->ldap_host 	= (isset($_SESSION['phpgw_info']['jabberit_messenger']['server_ldap_jabberit'])) ? $_SESSION['phpgw_info']['jabberit_messenger']['server_ldap_jabberit'] : $GLOBALS['phpgw_info']['server']['ldap_host'];
 		$this->ldap_context	= (isset($_SESSION['phpgw_info']['jabberit_messenger']['context_ldap_jabberit'])) ? $_SESSION['phpgw_info']['jabberit_messenger']['context_ldap_jabberit'] : $GLOBALS['phpgw_info']['server']['ldap_context'];
-		$this->ldap_dn		= (isset($_SESSION['phpgw_info']['jabberit_messenger']['user_ldap_jabberit'])) ? $_SESSION['phpgw_info']['jabberit_messenger']['user_ldap_jabberit'] : $GLOBALS['phpgw_info']['server']['ldap_root_dn'];
+		$this->ldap_user	= (isset($_SESSION['phpgw_info']['jabberit_messenger']['user_ldap_jabberit'])) ? $_SESSION['phpgw_info']['jabberit_messenger']['user_ldap_jabberit'] : $GLOBALS['phpgw_info']['server']['ldap_root_dn'];
 		$this->ldap_pass	= (isset($_SESSION['phpgw_info']['jabberit_messenger']['password_ldap_jabberit'])) ? $_SESSION['phpgw_info']['jabberit_messenger']['password_ldap_jabberit'] : $GLOBALS['phpgw_info']['server']['ldap_root_pw'];
 
@@ -83,11 +83,11 @@
 
 		// Bind as Admin
-		if($this->ldap_dn && $this->ldap_pass && !ldap_bind($conn, $this->ldap_dn, $this->ldap_pass))
+		if($this->ldap_user && $this->ldap_pass && !ldap_bind($conn, $this->ldap_user . "," .$this->ldap_context, $this->ldap_pass))
 			return false;
 		
 		// Bind as Anonymous
-		if(!$this->ldap_dn && !$this->ldap_pass && !@ldap_bind($conn))
-			return false;
-			
+		if(!$this->ldap_user && !$this->ldap_pass && !@ldap_bind($conn))
+			return false;
+
 		return $conn;
 	}
@@ -96,6 +96,7 @@
 	{
 		$this->ldapRoot();
-
-		if( $this->ldap )	
+		$result_groups = "";
+
+		if( $this->ldap && $pOrg['ou'] != "-1")	
 		{
 			$organization = 'ou=' . $pOrg['ou'] .",". $this->ldap_context;
@@ -114,6 +115,8 @@
 				$result_groups .= "</ldap>";						
 			}
-		}
-
+			
+			return $result_groups;
+		}
+		
 		return $result_groups;
 	}
@@ -140,5 +143,5 @@
 	{
 		$this->ldapRoot();
-	
+		
 		if( $this->ldap )
 		{
@@ -168,5 +171,5 @@
 			$this->ldap_host 	= $confHosts[$i]['serverLdap'];
 			$this->ldap_context = $confHosts[$i]['contextLdap'];
-			$this->ldap_dn		= $confHosts[$i]['user'];
+			$this->ldap_user	= $confHosts[$i]['user'];
 			$this->ldap_org		= $confHosts[$i]['org'];
 			$this->ldap_pass	= $confHosts[$i]['password'];
@@ -179,8 +182,9 @@
 				$justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn","jpegPhoto");								
 				$searchRoot = ( $this->ldap_org != "*" ) ? "ou=".$this->ldap_org.",".$this->ldap_context : $this->ldap_context;
+				
 				$search1 = @ldap_search($conn, $searchRoot, $filter, $justthese, 0, $this->max_result + 1);
 				$entry1 = @ldap_get_entries( $conn, $search1 );
 				$result = $this->resultArray($entry1, $conn );
-
+				
 				if( count($return) > 0 )
 		          	$return = array_merge($return, $result);
Index: /branches/2.0/jabberit_messenger/templates/default/confServersJabber.tpl
===================================================================
--- /branches/2.0/jabberit_messenger/templates/default/confServersJabber.tpl	(revision 946)
+++ /branches/2.0/jabberit_messenger/templates/default/confServersJabber.tpl	(revision 1198)
@@ -18,5 +18,5 @@
 						<input id="organizationLdapJabberit" type="text" size="30" maxlength="30"/>
 						<label style="font-size:7pt !important;color:red;">
-							{lang_Example}&nbsp;.:&nbsp;ORGANIZACAO ( ou específica )&nbsp;&nbsp;ou * ( para todas )
+							{lang_Example}&nbsp;.:&nbsp;ORGANIZACAO&nbsp;&nbsp;(ou = CIA)
 						</label>
 					</td>
Index: /branches/2.0/jabberit_messenger/templates/default/indexIM.tpl
===================================================================
--- /branches/2.0/jabberit_messenger/templates/default/indexIM.tpl	(revision 946)
+++ /branches/2.0/jabberit_messenger/templates/default/indexIM.tpl	(revision 1198)
@@ -81,26 +81,14 @@
 	<br/>
 	<br/>
-    <img src="templates/default/images/adicionar_contato.png" width="247px" height="191px" alt="Adicionar Contato" title="Adicionar Contato" align="left" style="margin-top:5px;"/>
+    <img src="templates/default/images/adicionar_contato.png" width="256px" height="160px" alt="Adicionar Contato" title="Adicionar Contato" align="left" style="margin-top:5px;"/>
     <br clear="all"/>
 	( figura 5 )
     <br/>
 	<br/>
-	<img src="templates/default/images/janela_adicionar_contatos.png" width="452" height="399" style="margin-top:5px;" alt="Adicionar Contato" title="Adicionar Contato"/>
+	<img src="templates/default/images/janela_adicionar_contatos.png" width="451" height="376" style="margin-top:5px;" alt="Adicionar Contato" title="Adicionar Contato"/>
 	<br clear="all"/>
 	( figura 6 )
-	<br/>	
-	<br/>
-	<h3>Adicionando um novo contato por Email</h3>
-	Também existe a opção de adicionar um novo usuário utilizando o seu email para as <span style="color:red; font-weight:bold;">organizações</span> listadas dentro do menu informações, que pode ser acessado clicando na imagem <img src="templates/default/images/view.png">.
-	Para adicionar um novo contato utilizando o seu email, marque a opção ( figura 6.1 ) e informe o email.
-	<b>Esta opção é apenas um informativo e nem todos os usuários possuem acesso a essa funcionalidade</b>. 
 	<br/>
 	<br/>
-	<img src="templates/default/images/janela_adicionar_contatos_email.png" width="452" height="399" style="margin-top:5px;" alt="Adicionar Contato" title="Adicionar Contato"/>
-	<br clear="all"/>
-	( figura 6.1 )
-	
-	<br/>
-
     <h2><a name="menu_right">8. Preferências Avançadas</a></h2>
 	<br/>
Index: /branches/2.0/jabberit_messenger/templates/default/content.html
===================================================================
--- /branches/2.0/jabberit_messenger/templates/default/content.html	(revision 946)
+++ /branches/2.0/jabberit_messenger/templates/default/content.html	(revision 1198)
@@ -82,17 +82,10 @@
     <img src="images/adicionar_contato.png" alt="Adicionar Contato" title="Adicionar Contato" align="bottom" style="margin-top:5px;"/>
    	<br>( figura 5 )
-	<br><br>
-	<img align="bottom" src="images/janela_adicionar_contatos.png" style="margin-top:5px;" alt="Adicionar Contato" title="Adicionar Contato"/>
-	<br/>	
+    <br/>
 	<br/>
-	<h3>Adicionando um novo contato por Email</h3>
-	Também existe a opção de adicionar um novo usuário utilizando o seu email para as <span style="color:red; font-weight:bold;">organizações</span> listadas dentro do menu informações, que pode ser acessado clicando na imagem <img src="images/view.png">.
-	Para adicionar um novo contato utilizando o seu email, marque a opção ( figura 6.1 ) e informe o email.
-	<b>Esta opção é apenas um informativo e nem todos os usuários possuem acesso a essa funcionalidade</b>. 
+	<img src="images/janela_adicionar_contatos.png" width="451" height="376" style="margin-top:5px;" alt="Adicionar Contato" title="Adicionar Contato"/>
+	<br clear="all"/>
+	( figura 6 )
 	<br/>
-	<br/>
-	<img src="images/janela_adicionar_contatos_email.png" width="452" height="399" style="margin-top:5px;" alt="Adicionar Contato" title="Adicionar Contato"/>
-	<br clear="all"/>
-	( figura 6.1 )
 	<br/>
 	</div>
Index: anches/2.0/jabberit_messenger/templates/default/.packer.setup.js
===================================================================
--- /branches/2.0/jabberit_messenger/templates/default/.packer.setup.js	(revision 1130)
+++ 	(revision )
@@ -1,1 +1,0 @@
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(c/a))+String.fromCharCode(c%a+161)};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\[\xa1-\xff]+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp(e(c),'g'),k[c])}}return p}('(©(){¡ ¯=ø ¢Î(\'¢š/\');¡ Ë=ø ¢Ï(\'¢š/\');© ù(Ä){¡ ¢=Ä.É[0];¡ ¬="";±(¡ i=0;i<¢.€.«;i++){¥(¢.€[i].·==\'¢Í\'){¥(¢.€[i].£==-1){Ì(\'¢Ì ¢Œ ¢Ê !\');Ÿ}¬+=¢.€[i].£;¢.€[i].œ[0].õ=³}¥(¢.€[i].·==\'¢Ë\'){¬+=¢.€[i].£+";";¢.€[i].£=\'\'}}¯.²("t.Ž.¢Ð",©(Š){¥(Š){¡ »={\'à\':®(\'¶\'),\'Ô\':®(\'¢Ñ\'),\'¢¶\':®(\'Õ\')};¡ º=§.š(\'¢Ö\');º.Œ.×=Ë.Ó(Š,\'¢Õ.Ï\',»)}},"¢É="+¬)}© ¢¢(Ä){¡ ¢=Ä.É[0];¡ Ö="";±(¡ i=0;i<¢.€.«;i++){¥(¢.€[i].Ù==\'ö\'){¡ Å=¢.€[i].è;Å=Å.å(Å.¢Ò(\'_\')+1);¥(¢.€[i].£!=""&&Û(¢.€[i].£)!=""){§.š(\'¢§\'+Å).Ç.Æ="ë";Ö=¢.€[i].£;¢.€[i].£=\'\'}Á{§.š(\'¢§\'+Å).Ç.Æ="é";Ì(®(\'¢× ¶!\'));Ÿ ž}}}¯.²("t.Ž.¢Å",©(Š){¥(Š){¡ »={\'à\':®(\'¶\'),\'Ô\':®(\'Õ\')};¡ º=§.š(\'¢À\');º.Œ.×=Ë.Ó(Š,\'¢¿.Ï\',»)}},"Ö="+Ö)}© ¢¯(){¥(ª.«>0){¯.²("t.Ž.¢Á",©(Š){¡ Ð=[[\'¿\',\'ü\'],[\'¢±\',\'¢¡\'],[\'È\',\'ÿ\'],[\'Í\',\'ý\'],[\'¢µ\',\'þ\'],[\'ì\',\'¢­\']];Š=Š.¢Š(\';\');±(¡ i=0;i<Š.«;i++){¡ ¬=Š[i].¢Š(\':\');±(¡ j ã Ð)¥(¬[0]==Ð[j][0])§.š(Ð[j][1]).£=¬[1]}},"¢»="+ª[0])}}© ú(Ä){¡ ¢=Ä.É[0];¡ ¬="";¡ Ý=ž;±(¡ i=0;i<¢.€.«;i++){¢°(¢.€[i].Ù){Ø"ö":¥(¢.€[i].£!=""){¬+=¢.€[i].·.ê()+";"+¢ª(¢.€[i].£)+"\\n";§.š(¢.€[i].·+"á").Ç.Æ="ë"}Á ¥(¢.€[i].·.ê()!="¢Ç"){§.š(¢.€[i].·+"á").Ç.Æ="é";Ý=³}Ú;Ø"ì":¥(¢.€[i].£==""){§.š(¢.€[i].·+"á").Ç.Æ="é";Ý=³}Á{¬+=¢.€[i].·.ê()+";"+¢ª(¢.€[i].£)+"\\n";§.š(¢.€[i].·+"á").Ç.Æ="ë"}Ú}}¥(!Ý){¬=¬.å(0,(¬.«-1));¯.²("t.¢í.¢Ø","¢ê="+¬);Ÿ ³}Á{Ì(\'¢é ¢î ¢ï ¢ô ¢ó !\');Ÿ ž}}© Û(£){¡ ¢¬=¢ò.¢ð(¢ñ);¡ æ="";¡ Î=0;¥(Ü<1)Ÿ"";¡ Ü=£?£.«:0;¢ç(Î<Ü){¥(£&&£.¢æ(Î)!=¢¬){æ=£.å(Î,Ü);Ú}Î++}Ÿ æ}© ï(){¡ Â=(ª.«==1)?ª[0]:ž;¡ ¢=Â.É[0];¡ Ñ=ž;¡ ä=\'\';±(¡ i=0;i<¢.€.«;i++){¥(¢.€[i].Ù==\'¢Ù\'){Ñ=³;¥(¢.€[i].è==\'¢®\')ä=¢.€[i].è}}¥(Ñ){¥(Ñ&&ä==\'¢®\')¢¢(Â);Á ù(Â)}Á{¥(Â)ú(Â)}}© ñ(){¡ î=§.š(\'ü\');¡ ç=§.š(\'¢¡\');¡ È=§.š(\'ÿ\');¡ Í=§.š(\'ý\');¡ â=§.š(\'þ\');¡ í=§.š(\'¢­\');¡ ¹=[[\'î\',\'Ò ¢ë ¢â !\'],[\'ç\',\'Ò o ¢¹ ¢º ¢Ÿ ¢³ !\'],[\'È\',\'Ò o ¢¹ ¢º ¢Ÿ ¢· !\'],[\'Í\',\'Ò ¢Œ ¢ã ¢· !\'],[\'â\',\'\'],[\'í\',\'\']];±(¡ i ã ¹){¥(!Û(Þ(¹[i][0]).£)&&Û(¹[i][1])){Ì(¹[i][1]);Þ(¹[i][0]).¢ä();Ÿ ž}}¯.²("t.Ž.¢å",©(Š){¡ »={\'à\':®(\'¶\'),\'Ô\':®(\'¢à ¢³\'),\'¢¶\':®(\'Õ\'),\'¢Ý\':®(\'¢ì\')};¡ º=§.š(\'¢²\');º.Œ.×=Ë.Ó(Š,\'¢².Ï\',»);±(¡ i ã ¹)Þ(¹[i][0]).£=""},"¿="+î.£+"&¢±="+ç.£+"&È="+È.£+"&Í="+Í.£+"&¢µ="+â.£+"&ì="+í.£)}© ¢©(){¡ Ê=§.š(\'¢Ó\');¡ ¶="";±(¡ i=0;i<Ê.œ.«;i++){¥(Ê.œ[i].õ==³&&Ê.œ[i].£!="-1")¶=Ê.œ[i].£}¥(¶){¡ À=§.š(\'¢ž\').£;¡ Ã=§.š(\'Ã\').£;¯.²("t.Ž.¢Ü",©(Š){¥(Š){¡ »={\'à\':®(\'¶\'),\'Ô\':®(\'Õ\')};¡ º=§.š(\'¢œ\');º.Œ.×=Ë.Ó(Š,\'¢œ.Ï\',»)}},"À="+À+"&¢£="+Ã+"&û="+¶)}}© ¢¥(){¥(ª.«>0){¡ ­=ª[0];¡ ¢=ª[1].É[0];¡ £=ž;±(¡ i=0;i<­.œ.«;i++){¥(­.œ[i].õ==³&&­.œ[i].£==\'³\')£=³}±(¡ i=0;i<¢.€.«;i++){¢°(¢.€[i].Ù){Ø\'ö\':Ø\'¢È\':¢.€[i].¢Ž=ž;¥(!£)¢.€[i].¢Ž=³;Ú}}¯.²("t.Ž.¢Ã",©(Š){¥(!Š)Ì(\'¢Ô !\')},"£="+£)}}© ô(){¥(ª.«>0){¡ ÷=ª[0];¡ ò=§.š(÷);¯.²("t.Ž.ô",©(Š){Š=Þ(Š);¥(Š)ò.Œ.ß(ò)},"¢»="+÷)}}© ð(){¥(ª.«>0){¡ ­=§.š(ª[0]);¡ ¿=ª[0];¡ À=§.š(\'¢ž\').£;¡ Ã=§.š(\'Ã\').£;¯.²("t.Ž.¢á",©(Š){¥(Š)­.Œ.ß(­)},"À="+À+"&¢£="+Ã+"&û="+¿)}}© ¢€(){¥(ª.«>0){¡ ­=§.š(ª[0]);¡ ¿=ª[0];¯.²("t.Ž.¢ß",©(Š){¥(Š)­.Œ.ß(­)},"¿="+¿)}}© ó(){¥(ª.«>0){¡ ­=§.š(ª[0]);¡ ¢«=ª[0];¯.²("t.Ž.ó",©(Š){¥(Š)­.Œ.ß(­)},"¢Ú="+¢«)}}© °(){}°.µ.¢Û=¢¯;°.µ.¢Þ=ô;°.µ.¢è=¢€;°.µ.ð=ð;°.µ.¢õ=ó;°.µ.ñ=ñ;°.µ.¢Ä=¢©;°.µ.¢Æ=¢¥;°.µ.ï=ï;¢Â.°=ø °})();',95,180,'var|form|value|elements|if|data|document|getElementById|function|arguments|length|values|element|jabberitGetLang|_0|constructScript|for|go|true|db_im|prototype|Organization|id|false|ArrayConf|Table|_1|parentNode|options|return|org|group|else|doc|gidNumber|pDocument|nameElement|color|style|serverLdap|forms|elementSel|_2|alert|contextLdap|iTemp|xsl|fields|flag|Informe|parse|lang2|Delete|organization|innerHTML|case|type|break|ltrim|v_length|field_blank|eval|removeChild|lang1|__label|userLdap|in|nameForm|substring|strTemp|hostName|name|red|toUpperCase|black|password|pwdLdap|orgLdap|sendf|removeOrgGroupsLocked|setConfServerJabber|elementTableTr|removeParticipantsExternal|removeHostsJabber|selected|text|idElement|new|addLdapAttributes|getInputs|ou|organizationLdapJabberit|contextLdapJabberit|userLdapJabberit|serverLdapJabberit|hostNameJabberit|addParticipantsExternals|gidnumber|removeOrgLdapAttributes|setParticipantsExternal|split|label_|jabberit_messenger|setOrganizationsForGroups|escape|participantsExternal|w_space|passwordLdapJabberit|HiddenJabberitExternals|editHostsJabber|switch|jabberName|tableConfServersJabber|Jabber|disabled|user|lang3|Ldap|nameGroup|nome|do|item|um|tableOrganizationsEnabledGroupsJabberit|servidor|tableExternalParticipants|tableExternalParticipantsJabberit|editHostJabber|window|setUseParticipantsExternal|setOrgFgroups|setOrganization|setPartExternal|JETTI_GROUP_CHAT_SERVER_JABBERIT|button|conf|atributo|organization_ldap_jabberit|Defina|attributes_ldap_list_jabberit|JITConnector|JITXTools|setAttributesLdap|Attribute|indexOf|organizations_ldap_jabberit|Error|tableOrganizations|tableHiddenJabberit|Define|ldapInternal|hidden|participants|editHostsJ|setOuGroupsLocked|lang4|removeHostsJ|removeAttributesLdap|Servers|removeOuGroupsLocked|organizacao|contexto|focus|setHostJabber|charAt|while|removeOrg|Preencha|val|uma|Edit|fileDefine|os|campos|fromCharCode|32|String|vermelho|em|removePartExternal'.split('|'),0,{}))
