Changeset 287

Timestamp:

05/26/08 11:45:16 (16 years ago)

Author:

niltonneto

Message:

Verificar Wiki/Trac? do módulo.

Location:

trunk/instant_messenger

Files:

• controller.php (modified) (2 diffs)
• controller.xml (deleted)
• inc/Controller.class.php (added)
• inc/Jabber.abstract.php (modified) (1 diff)
• inc/Jabberd2.abstract.php (modified) (7 diffs)
• inc/Socket.abstract.php (modified) (1 diff)
• inc/class.Jabber.inc.php (added)
• inc/class.Ujabber.inc.php (modified) (6 diffs)
• inc/class.db_im.inc.php (modified) (1 diff)
• inc/class.ldap_im.inc.php (modified) (1 diff)
• inc/controller.xml (added)
• inc/im_acl.inc.php (modified) (1 diff)
• inc/im_sessions.inc.php (modified) (2 diffs)
• inc/load_lang.php (modified) (1 diff)
• inc/teste.php (added)
• js/build_win.js (modified) (3 diffs)
• js/build_win.packer.js (deleted)
• js/client.js (modified) (7 diffs)
• js/client.packer.js (deleted)
• js/client_old.js (added)
• js/connector.packer.js (deleted)
• js/cookies_im.packer.js (deleted)
• js/dragdrop.packer.js (deleted)
• js/fcommon.packer.js (deleted)
• js/functions.js (modified) (9 diffs)
• js/functions.packer.js (deleted)
• js/images.js (modified) (1 diff)
• js/images.packer.js (deleted)
• js/jabber.js (modified) (5 diffs)
• js/jabber.packer.js (deleted)
• js/load.packer.js (deleted)
• js/menu_action.packer.js (deleted)
• js/templates.js (modified) (6 diffs)
• js/templates.packer.js (deleted)
• js/xtools.packer.js (deleted)
• templates/default/css/chat.css (modified) (1 diff)
• templates/default/images/logo.gif (added)
• templates/default/images/server_connect.png (added)
• webjabber/bkp.webjabber.c (added)
• webjabber/webjabber (modified) (previous)
• webjabber/webjabber.c (modified) (4 diffs)
• xsl/chat.xsl (modified) (2 diffs)
• xsl/disconnected.xsl (modified) (1 diff)

trunk/instant_messenger/controller.php

@@ -1 +1 @@
 <?php
-
-class Controller
-{
-        const __CONTROLLER_SECURITY__                           = 'controller-security';
-        const __CONTROLLER_CONTENTES__                          = 'controller-contentes';
-        const __CONTROLLER_SECTIONS__                           = 'controller-sections';
-
-        const __STRING_ACCESS__                                         = 'string-access';
-        const __STRING_DELIMITER__                                      = 'string-delimiter';
-
-        const __CONTROLLER_CONTENTES_ITEM__                     = 'item';
-        const __CONTROLLER_CONTENTES_ITEM_PARAM__       = 'param';
-        const __CONTROLLER_CONTENTES_ITEM_SECTION__     = 'section';
-
-        const __CONTROLLER_SECTIONS_ITEM__                      = 'item';
-
-        public function __construct()
-        {
-                $this->dom = new DOMDocument;
-                $this->dom->preserveWhiteSpace = FALSE;
-                $this->dom->load('controller.xml');
-
-                $this->controller_security = $this->dom->getElementsByTagName(self::__CONTROLLER_SECURITY__);
-                ( $this->controller_security->length === (int)0 )
-                        and die(__CLASS__ . ' [ ERROR #0 ] :: the tag "' . self::__CONTROLLER_SECURITY__ . '" does not exist');
-                ( $this->controller_security->length === (int)1 )
-                        or die(__CLASS__ . ' [ ERROR #1 ] :: exists more of a tag "' . self::__CONTROLLER_SECURITY__ . '"');
-
-                $this->controller_contentes = $this->dom->getElementsByTagName(self::__CONTROLLER_CONTENTES__);
-                ( $this->controller_contentes->length === (int)0 )
-                        and die(__CLASS__ . ' [ ERROR #2 ] :: the tag "' . self::__CONTROLLER_CONTENTES__ . '" does not exist');
-                ( $this->controller_contentes->length === (int)1 )
-                        or die(__CLASS__ . ' [ ERROR #3 ] :: exists more of a tag "' . self::__CONTROLLER_CONTENTES__ . '"');
-                $this->controller_contentes = $this->controller_contentes->item(0);
-
-                $this->controller_sections = $this->dom->getElementsByTagName("controller-sections");
-                ( $this->controller_sections->length === (int)0 )
-                        and die(__CLASS__ . ' [ ERROR #4 ] :: the tag "' . self::__CONTROLLER_SECTIONS__ . '" does not exist');
-                ( $this->controller_sections->length === (int)1 )
-                        or die(__CLASS__ . ' [ ERROR #5 ] :: exists more of a tag "' . self::__CONTROLLER_SECTIONS__ . '"');
-                $this->controller_sections = $this->controller_sections->item(0);
-
-                $this->string_access = $this->controller_security->item(0)->getElementsByTagName(self::__STRING_ACCESS__);
-                ( $this->string_access->length === (int)0 )
-                        and die(__CLASS__ . ' [ ERROR #6 ] :: the tag "' . self::__STRING_ACCESS__ . '" does not exist');
-                ( $this->string_access->length === (int)1 )
-                        or die(__CLASS__ . ' [ ERROR #7 ] :: exists more of a tag "' . self::__STRING_ACCESS__ . '"');
-                $this->string_access = $this->string_access->item(0)->nodeValue;
-
-                $this->string_delimiter = $this->controller_security->item(0)->getElementsByTagName(self::__STRING_DELIMITER__);
-                ( $this->string_delimiter->length === (int)0 )
-                        and die(__CLASS__ . ' [ ERROR #8 ] :: the tag "' . self::__STRING_DELIMITER__ . '" does not exist');
-                ( $this->string_delimiter->length === (int)1 )
-                        or die(__CLASS__ . ' [ ERROR #9 ] :: exists more of a tag "' . self::__STRING_DELIMITER__ . '"');
-                $this->string_delimiter = $this->string_delimiter->item(0)->nodeValue;
-        }
-
-        public function exec(array &$pRequest)
-        {
-                ( $pRequest[$this->string_access] )
-                        or die(__CLASS__ . ' [ ERROR #10 ] :: bad string action argument');
-
-                list($section_name, $ref, $alias) = explode($this->string_delimiter, $pRequest[$this->string_access]);
-                unset($pRequest[$this->string_access]);
-
-                $contents_itens = $this->controller_contentes->getElementsByTagName(self::__CONTROLLER_CONTENTES_ITEM__);
-
-                for ( $i = 0; $i < $contents_itens->length && $contents_itens->item($i)->getAttribute(self::__CONTROLLER_CONTENTES_ITEM_PARAM__) != $section_name; $i++ );
-                ( !($i < $contents_itens->length) )
-                        and die(__CLASS__ . ' [ ERROR #11 ] :: invalid section "' . $section_name . '"');
-
-                $section_name = $contents_itens->item($i)->getAttribute(self::__CONTROLLER_CONTENTES_ITEM_SECTION__);
-
-                $section = $this->controller_sections->getElementsByTagName($section_name);
-                ( $section->length === (int)0 )
-                        and die(__CLASS__ . ' [ ERROR #12 ] :: the tag "' . $section_name . '" does not exist');
-                ( $section->length === (int)1 )
-                        or die(__CLASS__ . ' [ ERROR #13 ] :: exists more of a tag "' . $section_name . '"');
-                $section = $section->item(0);
-
-                $section_itens = $section->getElementsByTagName(self::__CONTROLLER_SECTIONS_ITEM__);
-
-                if ( empty($alias) && $alias !== '0' )
-                        for ( $i = 0; $i < $section_itens->length && $section_itens->item($i)->getAttribute('ref') != $ref; $i++ );
-                else
-                        for ( $i = 0; $i < $section_itens->length && ( $section_itens->item($i)->getAttribute('ref') != $ref || $section_itens->item($i)->getAttribute('alias') !== $alias); $i++ );
-
-                ( !($i < $section_itens->length) )
-                        and die(__CLASS__ . ' [ ERROR #14 ] :: invalid reference "' . $ref . '"');
-
-                $path = $section_itens->item($i)->getAttribute('path')
-                        or $path = $section->getAttribute('path')
-                        or die(__CLASS__ . ' [ ERROR #15 ] :: bad path argument');
-
-                $prefix = $section_itens->item($i)->getAttribute('prefix')
-                        or $prefix = $section->getAttribute('prefix');
-
-                $suffix = $section_itens->item($i)->getAttribute('suffix')
-                        or $suffix = $section->getAttribute('suffix')
-                        or die(__CLASS__ . ' [ ERROR #16 ] :: bad suffix argument');
-
-                $this->$section_name(array("pSectionItem" => $section_itens->item($i), "pPath" => $path, "pPrefix" => $prefix, "pSuffix" => $suffix, "pRequest" => $pRequest));
-        }
-
-        private final function php()
-        {
-                $params = func_get_args();
-                extract($params[0]);
-
-                $class = $pSectionItem->getAttribute('class')
-                        and $method = $pSectionItem->getAttribute('method')
-                        or die(__CLASS__ . ' [ ERROR #17 ] :: bad class or method argument');
-
-                $file = "{$pPath}/{$pPrefix}{$class}{$pSuffix}";
-
-                file_exists($file)
-                        or die(__CLASS__ . ' [ ERROR #18 ] :: the file that has the class was not opened');
-
-                require_once $file;
-
-                $obj = new $class;
-
-                if ( $pRequest )
-                        $result = $obj -> $method($pRequest);
-                else
-                        $result = $obj -> $method();
-
-                printf("%s", $result);
-        }
-
-        private final function js()
-        {
-                $params = func_get_args();
-                extract($params[0]);
-
-                $js = $pSectionItem->getAttribute('js')
-                        or die(__CLASS__ . ' [ ERROR #18 ] :: bad js argument');
-
-                $file = "{$pPath}/{$pPrefix}{$js}{$pSuffix}";
-
-                file_exists($file)
-                        or die(__CLASS__ . ' [ ERROR #19 ] :: the file that has the class was not opened');
-
-                $packed_file = "{$pPath}/{$pPrefix}{$js}.packer{$pSuffix}";
-
-                (
-                        file_exists($packed_file)
-                        and filemtime($packed_file) > filemtime($file)
-                        and $packed = file_get_contents($packed_file)
-                )
-                or
-                (
-                        $packer = new JavaScriptPacker(file_get_contents($file), 'High ASCII', true, true)
-                        and $packed = $packer->pack()
-                        and file_put_contents($packed_file, $packed)
-                );
-
-                printf("%s", $packed);
-        }
-}
-
-class JavaScriptPacker
-{
-        const IGNORE = '$1';
-
-        private $_script = '';
-        private $_encoding = 62;
-        private $_fastDecode = true;
-        private $_specialChars = false;
-
-        private $_parsers = array();
-
-        private $LITERAL_ENCODING = array(
-                'None' => 0,
-                'Numeric' => 10,
-                'Normal' => 62,
-                'High ASCII' => 95
-        );
-
-        public function __construct ($pScript, $pEncoding = 62, $pFastDecode = true, $pSpecialChars = false)
-        {
-                $this->_script = $pScript . "\n";
-                if ( array_key_exists($pEncoding, $this->LITERAL_ENCODING) )
-                        $pEncoding = $this->LITERAL_ENCODING[$pEncoding];
-
-                $this->_encoding = min((int)$pEncoding, 95);
-                $this->_fastDecode = $pFastDecode;
-                $this->_specialChars = $pSpecialChars;
-        }
-
-        public function pack()
-        {
-                $this->_addParser('_basicCompression');
-
-                if ( $this->_specialChars )
-                        $this->_addParser('_encodeSpecialChars');
-
-                if ( $this->_encoding )
-                        $this->_addParser('_encodeKeywords');
-
-                return $this->_pack($this->_script);
-        }
-
-        private function _pack($script)
-        {
-                for ( $i = 0; isset($this->_parsers[$i]); $i++ )
-                        $script = call_user_func(array(&$this,$this->_parsers[$i]), $script);
-
-                return $script;
-        }
-
-        // keep a list of parsing functions, they'll be executed all at once
-        private function _addParser($parser)
-        {
-                $this->_parsers[] = $parser;
-        }
-
-        // zero encoding - just removal of white space and comments
-        private function _basicCompression($script)
-        {
-                $parser = new ParseMaster();
-                // make safe
-                $parser->escapeChar = '\\';
-                // protect strings
-                $parser->add('/\'[^\'\\n\\r]*\'/', self::IGNORE);
-                $parser->add('/"[^"\\n\\r]*"/', self::IGNORE);
-                // remove comments
-                $parser->add('/\\/\\/[^\\n\\r]*[\\n\\r]/', ' ');
-                $parser->add('/\\/\\*[^*]*\\*+([^\\/][^*]*\\*+)*\\//', ' ');
-                // protect regular expressions
-                $parser->add('/\\s+(\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/g?i?)/', '$2'); // IGNORE
-                $parser->add('/[^\\w\\x24\\/\'"*)\\?:]\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/g?i?/', self::IGNORE);
-                // remove: ;;; doSomething();
-                if ($this->_specialChars) $parser->add('/;;;[^\\n\\r]+[\\n\\r]/');
-                // remove redundant semi-colons
-                $parser->add('/\\(;;\\)/', self::IGNORE); // protect for (;;) loops
-                $parser->add('/;+\\s*([};])/', '$2');
-                // apply the above
-                $script = $parser->exec($script);
-
-                // remove white-space
-                $parser->add('/(\\b|\\x24)\\s+(\\b|\\x24)/', '$2 $3');
-                $parser->add('/([+\\-])\\s+([+\\-])/', '$2 $3');
-                $parser->add('/\\s+/', '');
-                // done
-                return $parser->exec($script);
-        }
-
-        private function _encodeSpecialChars($script)
-        {
-                $parser = new ParseMaster();
-                // replace: $name -> n, $$name -> na
-                $parser->add('/((\\x24+)([a-zA-Z$_]+))(\\d*)/',
-                                         array('fn' => '_replace_name')
-                );
-                // replace: _name -> _0, double-underscore (__name) is ignored
-                $regexp = '/\\b_[A-Za-z\\d]\\w*/';
-                // build the word list
-                $keywords = $this->_analyze($script, $regexp, '_encodePrivate');
-                // quick ref
-                $encoded = $keywords['encoded'];
-
-                $parser->add($regexp,
-                        array(
-                                'fn' => '_replace_encoded',
-                                'data' => $encoded
-                        )
-                );
-                return $parser->exec($script);
-        }
-
-        private function _encodeKeywords($script) {
-                // escape high-ascii values already in the script (i.e. in strings)
-                if ($this->_encoding > 62)
-                        $script = $this->_escape95($script);
-                // create the parser
-                $parser = new ParseMaster();
-                $encode = $this->_getEncoder($this->_encoding);
-                // for high-ascii, don't encode single character low-ascii
-                $regexp = ($this->_encoding > 62) ? '/\\w\\w+/' : '/\\w+/';
-                // build the word list
-                $keywords = $this->_analyze($script, $regexp, $encode);
-                $encoded = $keywords['encoded'];
-
-                // encode
-                $parser->add($regexp,
-                        array(
-                                'fn' => '_replace_encoded',
-                                'data' => $encoded
-                        )
-                );
-                if (empty($script)) return $script;
-                else {
-                        //$res = $parser->exec($script);
-                        //$res = $this->_bootStrap($res, $keywords);
-                        //return $res;
-                        return $this->_bootStrap($parser->exec($script), $keywords);
-                }
-        }
-
-        private function _analyze($script, $regexp, $encode) {
-                // analyse
-                // retreive all words in the script
-                $all = array();
-                preg_match_all($regexp, $script, $all);
-                $_sorted = array(); // list of words sorted by frequency
-                $_encoded = array(); // dictionary of word->encoding
-                $_protected = array(); // instances of "protected" words
-                $all = $all[0]; // simulate the javascript comportement of global match
-                if (!empty($all)) {
-                        $unsorted = array(); // same list, not sorted
-                        $protected = array(); // "protected" words (dictionary of word->"word")
-                        $value = array(); // dictionary of charCode->encoding (eg. 256->ff)
-                        $this->_count = array(); // word->count
-                        $i = count($all); $j = 0; //$word = null;
-                        // count the occurrences - used for sorting later
-                        do {
-                                --$i;
-                                $word = '$' . $all[$i];
-                                if (!isset($this->_count[$word])) {
-                                        $this->_count[$word] = 0;
-                                        $unsorted[$j] = $word;
-                                        // make a dictionary of all of the protected words in this script
-                                        //  these are words that might be mistaken for encoding
-                                        //if (is_string($encode) && method_exists($this, $encode))
-                                        $values[$j] = call_user_func(array(&$this, $encode), $j);
-                                        $protected['$' . $values[$j]] = $j++;
-                                }
-                                // increment the word counter
-                                $this->_count[$word]++;
-                        } while ($i > 0);
-                        // prepare to sort the word list, first we must protect
-                        //  words that are also used as codes. we assign them a code
-                        //  equivalent to the word itself.
-                        // e.g. if "do" falls within our encoding range
-                        //      then we store keywords["do"] = "do";
-                        // this avoids problems when decoding
-                        $i = count($unsorted);
-                        do {
-                                $word = $unsorted[--$i];
-                                if (isset($protected[$word]) /*!= null*/) {
-                                        $_sorted[$protected[$word]] = substr($word, 1);
-                                        $_protected[$protected[$word]] = true;
-                                        $this->_count[$word] = 0;
-                                }
-                        } while ($i);
-
-                        // sort the words by frequency
-                        // Note: the javascript and php version of sort can be different :
-                        // in php manual, usort :
-                        // " If two members compare as equal,
-                        // their order in the sorted array is undefined."
-                        // so the final packed script is different of the Dean's javascript version
-                        // but equivalent.
-                        // the ECMAscript standard does not guarantee this behaviour,
-                        // and thus not all browsers (e.g. Mozilla versions dating back to at
-                        // least 2003) respect this.
-                        usort($unsorted, array(&$this, '_sortWords'));
-                        $j = 0;
-                        // because there are "protected" words in the list
-                        //  we must add the sorted words around them
-                        do {
-                                if (!isset($_sorted[$i]))
-                                        $_sorted[$i] = substr($unsorted[$j++], 1);
-                                $_encoded[$_sorted[$i]] = $values[$i];
-                        } while (++$i < count($unsorted));
-                }
-                return array(
-                        'sorted'  => $_sorted,
-                        'encoded' => $_encoded,
-                        'protected' => $_protected);
-        }
-
-        private $_count = array();
-        private function _sortWords($match1, $match2) {
-                return $this->_count[$match2] - $this->_count[$match1];
-        }
-
-        // build the boot function used for loading and decoding
-        private function _bootStrap($packed, $keywords) {
-                $ENCODE = $this->_safeRegExp('$encode\\($count\\)');
-
-                // $packed: the packed script
-                $packed = "'" . $this->_escape($packed) . "'";
-
-                // $ascii: base for encoding
-                $ascii = min(count($keywords['sorted']), $this->_encoding);
-                if ($ascii == 0) $ascii = 1;
-
-                // $count: number of words contained in the script
-                $count = count($keywords['sorted']);
-
-                // $keywords: list of words contained in the script
-                foreach ($keywords['protected'] as $i=>$value) {
-                        $keywords['sorted'][$i] = '';
-                }
-                // convert from a string to an array
-                ksort($keywords['sorted']);
-                $keywords = "'" . implode('|',$keywords['sorted']) . "'.split('|')";
-
-                $encode = ($this->_encoding > 62) ? '_encode95' : $this->_getEncoder($ascii);
-                $encode = $this->_getJSFunction($encode);
-                $encode = preg_replace('/_encoding/','$ascii', $encode);
-                $encode = preg_replace('/arguments\\.callee/','$encode', $encode);
-                $inline = '\\$count' . ($ascii > 10 ? '.toString(\\$ascii)' : '');
-
-                // $decode: code snippet to speed up decoding
-                if ($this->_fastDecode) {
-                        // create the decoder
-                        $decode = $this->_getJSFunction('_decodeBody');
-                        if ($this->_encoding > 62)
-                                $decode = preg_replace('/\\\\w/', '[\\xa1-\\xff]', $decode);
-                        // perform the encoding inline for lower ascii values
-                        elseif ($ascii < 36)
-                                $decode = preg_replace($ENCODE, $inline, $decode);
-                        // special case: when $count==0 there are no keywords. I want to keep
-                        //  the basic shape of the unpacking funcion so i'll frig the code...
-                        if ($count == 0)
-                                $decode = preg_replace($this->_safeRegExp('($count)\\s*=\\s*1'), '$1=0', $decode, 1);
-                }
-
-                // boot function
-                $unpack = $this->_getJSFunction('_unpack');
-                if ($this->_fastDecode) {
-                        // insert the decoder
-                        $this->buffer = $decode;
-                        $unpack = preg_replace_callback('/\\{/', array(&$this, '_insertFastDecode'), $unpack, 1);
-                }
-                $unpack = preg_replace('/"/', "'", $unpack);
-                if ($this->_encoding > 62) { // high-ascii
-                        // get rid of the word-boundaries for regexp matches
-                        $unpack = preg_replace('/\'\\\\\\\\b\'\s*\\+|\\+\s*\'\\\\\\\\b\'/', '', $unpack);
-                }
-                if ($ascii > 36 || $this->_encoding > 62 || $this->_fastDecode) {
-                        // insert the encode function
-                        $this->buffer = $encode;
-                        $unpack = preg_replace_callback('/\\{/', array(&$this, '_insertFastEncode'), $unpack, 1);
-                } else {
-                        // perform the encoding inline
-                        $unpack = preg_replace($ENCODE, $inline, $unpack);
-                }
-                // pack the boot function too
-                $unpackPacker = new JavaScriptPacker($unpack, 0, false, true);
-                $unpack = $unpackPacker->pack();
-
-                // arguments
-                $params = array($packed, $ascii, $count, $keywords);
-                if ($this->_fastDecode) {
-                        $params[] = 0;
-                        $params[] = '{}';
-                }
-                $params = implode(',', $params);
-
-                // the whole thing
-                return 'eval(' . $unpack . '(' . $params . "))\n";
-        }
-
-        private $buffer;
-        private function _insertFastDecode($match) {
-                return '{' . $this->buffer . ';';
-        }
-        private function _insertFastEncode($match) {
-                return '{$encode=' . $this->buffer . ';';
-        }
-
-        // mmm.. ..which one do i need ??
-        private function _getEncoder($ascii) {
-                return $ascii > 10 ? $ascii > 36 ? $ascii > 62 ?
-                       '_encode95' : '_encode62' : '_encode36' : '_encode10';
-        }
-
-        // zero encoding
-        // characters: 0123456789
-        private function _encode10($charCode) {
-                return $charCode;
-        }
-
-        // inherent base36 support
-        // characters: 0123456789abcdefghijklmnopqrstuvwxyz
-        private function _encode36($charCode) {
-                return base_convert($charCode, 10, 36);
-        }
-
-        // hitch a ride on base36 and add the upper case alpha characters
-        // characters: 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
-        private function _encode62($charCode) {
-                $res = '';
-                if ($charCode >= $this->_encoding) {
-                        $res = $this->_encode62((int)($charCode / $this->_encoding));
-                }
-                $charCode = $charCode % $this->_encoding;
-
-                if ($charCode > 35)
-                        return $res . chr($charCode + 29);
-                else
-                        return $res . base_convert($charCode, 10, 36);
-        }
-
-        // use high-ascii values
-        // characters: ¡¢£€¥Š§š©ª«¬­®¯°±²³Žµ¶·ž¹º»ŒœŸ¿ÀÁÂÃÄÃ
-ÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßà áâãÀåÊçÚéêëìíîïðñòóÎõö÷ÞùúûÌÜß
-        private function _encode95($charCode) {
-                $res = '';
-                if ($charCode >= $this->_encoding)
-                        $res = $this->_encode95($charCode / $this->_encoding);
-
-                return $res . chr(($charCode % $this->_encoding) + 161);
-        }
-
-        private function _safeRegExp($string) {
-                return '/'.preg_replace('/\$/', '\\\$', $string).'/';
-        }
-
-        private function _encodePrivate($charCode) {
-                return "_" . $charCode;
-        }
-
-        // protect characters used by the parser
-        private function _escape($script) {
-                return preg_replace('/([\\\\\'])/', '\\\$1', $script);
-        }
-
-        // protect high-ascii characters already in the script
-        private function _escape95($script) {
-                return preg_replace_callback(
-                        '/[\\xa1-\\xff]/',
-                        array(&$this, '_escape95Bis'),
-                        $script
-                );
-        }
-        private function _escape95Bis($match) {
-                return '\x'.((string)dechex(ord($match)));
-        }
-
-
-        private function _getJSFunction($aName) {
-                if (defined('self::JSFUNCTION'.$aName))
-                        return constant('self::JSFUNCTION'.$aName);
-                else
-                        return '';
-        }
-
-        // JavaScript Functions used.
-        // Note : In Dean's version, these functions are converted
-        // with 'String(aFunctionName);'.
-        // This internal conversion complete the original code, ex :
-        // 'while (aBool) anAction();' is converted to
-        // 'while (aBool) { anAction(); }'.
-        // The JavaScript functions below are corrected.
-
-        // unpacking function - this is the boot strap function
-        //  data extracted from this packing routine is passed to
-        //  this function when decoded in the target
-        // NOTE ! : without the ';' final.
-        const JSFUNCTION_unpack =
-
-'function($packed, $ascii, $count, $keywords, $encode, $decode) {
-    while ($count--) {
-        if ($keywords[$count]) {
-            $packed = $packed.replace(new RegExp(\'\\\\b\' + $encode($count) + \'\\\\b\', \'g\'), $keywords[$count]);
-        }
-    }
-    return $packed;
-}';
-/*
-'function($packed, $ascii, $count, $keywords, $encode, $decode) {
-    while ($count--)
-        if ($keywords[$count])
-            $packed = $packed.replace(new RegExp(\'\\\\b\' + $encode($count) + \'\\\\b\', \'g\'), $keywords[$count]);
-    return $packed;
-}';
-*/
-
-        // code-snippet inserted into the unpacker to speed up decoding
-        const JSFUNCTION_decodeBody =
-//_decode = function() {
-// does the browser support String.replace where the
-//  replacement value is a function?
-
-'    if (!\'\'.replace(/^/, String)) {
-        // decode all the values we need
-        while ($count--) {
-            $decode[$encode($count)] = $keywords[$count] || $encode($count);
-        }
-        // global replacement function
-        $keywords = [function ($encoded) {return $decode[$encoded]}];
-        // generic match
-        $encode = function () {return \'\\\\w+\'};
-        // reset the loop counter -  we are now doing a global replace
-        $count = 1;
-    }
-';
-//};
-/*
-'       if (!\'\'.replace(/^/, String)) {
-        // decode all the values we need
-        while ($count--) $decode[$encode($count)] = $keywords[$count] || $encode($count);
-        // global replacement function
-        $keywords = [function ($encoded) {return $decode[$encoded]}];
-        // generic match
-        $encode = function () {return\'\\\\w+\'};
-        // reset the loop counter -  we are now doing a global replace
-        $count = 1;
-    }';
-*/
-
-         // zero encoding
-         // characters: 0123456789
-         const JSFUNCTION_encode10 =
-'function($charCode) {
-    return $charCode;
-}';//;';
-
-         // inherent base36 support
-         // characters: 0123456789abcdefghijklmnopqrstuvwxyz
-         const JSFUNCTION_encode36 =
-'function($charCode) {
-    return $charCode.toString(36);
-}';//;';
-
-        // hitch a ride on base36 and add the upper case alpha characters
-        // characters: 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
-        const JSFUNCTION_encode62 =
-'function($charCode) {
-    return ($charCode < _encoding ? \'\' : arguments.callee(parseInt($charCode / _encoding))) +
-    (($charCode = $charCode % _encoding) > 35 ? String.fromCharCode($charCode + 29) : $charCode.toString(36));
-}';
-
-        // use high-ascii values
-        // characters: ¡¢£€¥Š§š©ª«¬­®¯°±²³Žµ¶·ž¹º»ŒœŸ¿ÀÁÂÃÄÃ
-ÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßà áâãÀåÊçÚéêëìíîïðñòóÎõö÷ÞùúûÌÜß
-        const JSFUNCTION_encode95 =
-'function($charCode) {
-    return ($charCode < _encoding ? \'\' : arguments.callee($charCode / _encoding)) +
-        String.fromCharCode($charCode % _encoding + 161);
-}';
-
-}
-
-
-class ParseMaster {
-        public $ignoreCase = false;
-        public $escapeChar = '';
-
-        // constants
-        const EXPRESSION = 0;
-        const REPLACEMENT = 1;
-        const LENGTH = 2;
-
-        // used to determine nesting levels
-        private $GROUPS = '/\\(/';//g
-        private $SUB_REPLACE = '/\\$\\d/';
-        private $INDEXED = '/^\\$\\d+$/';
-        private $TRIM = '/([\'"])\\1\\.(.*)\\.\\1\\1$/';
-        private $ESCAPE = '/\\\./';//g
-        private $QUOTE = '/\'/';
-        private $DELETED = '/\\x01[^\\x01]*\\x01/';//g
-
-        public function add($expression, $replacement = '') {
-                // count the number of sub-expressions
-                //  - add one because each pattern is itself a sub-expression
-                $length = 1 + preg_match_all($this->GROUPS, $this->_internalEscape((string)$expression), $out);
-
-                // treat only strings $replacement
-                if (is_string($replacement)) {
-                        // does the pattern deal with sub-expressions?
-                        if (preg_match($this->SUB_REPLACE, $replacement)) {
-                                // a simple lookup? (e.g. "$2")
-                                if (preg_match($this->INDEXED, $replacement)) {
-                                        // store the index (used for fast retrieval of matched strings)
-                                        $replacement = (int)(substr($replacement, 1)) - 1;
-                                } else { // a complicated lookup (e.g. "Hello $2 $1")
-                                        // build a function to do the lookup
-                                        $quote = preg_match($this->QUOTE, $this->_internalEscape($replacement))
-                                                 ? '"' : "'";
-                                        $replacement = array(
-                                                'fn' => '_backReferences',
-                                                'data' => array(
-                                                        'replacement' => $replacement,
-                                                        'length' => $length,
-                                                        'quote' => $quote
-                                                )
-                                        );
-                                }
-                        }
-                }
-                // pass the modified arguments
-                if (!empty($expression)) $this->_add($expression, $replacement, $length);
-                else $this->_add('/^$/', $replacement, $length);
-        }
-
-        public function exec($string) {
-                // execute the global replacement
-                $this->_escaped = array();
-
-                // simulate the _patterns.toSTring of Dean
-                $regexp = '/';
-                foreach ($this->_patterns as $reg) {
-                        $regexp .= '(' . substr($reg[self::EXPRESSION], 1, -1) . ')|';
-                }
-                $regexp = substr($regexp, 0, -1) . '/';
-                $regexp .= ($this->ignoreCase) ? 'i' : '';
-
-                $string = $this->_escape($string, $this->escapeChar);
-                $string = preg_replace_callback(
-                        $regexp,
-                        array(
-                                &$this,
-                                '_replacement'
-                        ),
-                        $string
-                );
-                $string = $this->_unescape($string, $this->escapeChar);
-
-                return preg_replace($this->DELETED, '', $string);
-        }
-
-        public function reset() {
-                // clear the patterns collection so that this object may be re-used
-                $this->_patterns = array();
-        }
-
-        // private
-        private $_escaped = array();  // escaped characters
-        private $_patterns = array(); // patterns stored by index
-
-        // create and add a new pattern to the patterns collection
-        private function _add() {
-                $arguments = func_get_args();
-                $this->_patterns[] = $arguments;
-        }
-
-        // this is the global replace function (it's quite complicated)
-        private function _replacement($arguments) {
-                if (empty($arguments)) return '';
-
-                $i = 1; $j = 0;
-                // loop through the patterns
-                while (isset($this->_patterns[$j])) {
-                        $pattern = $this->_patterns[$j++];
-                        // do we have a result?
-                        if (isset($arguments[$i]) && ($arguments[$i] != '')) {
-                                $replacement = $pattern[self::REPLACEMENT];
-
-                                if (is_array($replacement) && isset($replacement['fn'])) {
-
-                                        if (isset($replacement['data'])) $this->buffer = $replacement['data'];
-                                        return call_user_func(array(&$this, $replacement['fn']), $arguments, $i);
-
-                                } elseif (is_int($replacement)) {
-                                        return $arguments[$replacement + $i];
-
-                                }
-                                $delete = ($this->escapeChar == '' ||
-                                           strpos($arguments[$i], $this->escapeChar) === false)
-                                        ? '' : "\x01" . $arguments[$i] . "\x01";
-                                return $delete . $replacement;
-
-                        // skip over references to sub-expressions
-                        } else {
-                                $i += $pattern[self::LENGTH];
-                        }
-                }
-        }
-
-        private function _backReferences($match, $offset) {
-                $replacement = $this->buffer['replacement'];
-                $quote = $this->buffer['quote'];
-                $i = $this->buffer['length'];
-                while ($i) {
-                        $replacement = str_replace('$'.$i--, $match[$offset + $i], $replacement);
-                }
-                return $replacement;
-        }
-
-        private function _replace_name($match, $offset){
-                $length = strlen($match[$offset + 2]);
-                $start = $length - max($length - strlen($match[$offset + 3]), 0);
-                return substr($match[$offset + 1], $start, $length) . $match[$offset + 4];
-        }
-
-        private function _replace_encoded($match, $offset) {
-                return $this->buffer[$match[$offset]];
-        }
-
-
-        // php : we cannot pass additional data to preg_replace_callback,
-        // and we cannot use &$this in create_function, so let's go to lower level
-        private $buffer;
-
-        // encode escaped characters
-        private function _escape($string, $escapeChar) {
-                if ($escapeChar) {
-                        $this->buffer = $escapeChar;
-                        return preg_replace_callback(
-                                '/\\' . $escapeChar . '(.)' .'/',
-                                array(&$this, '_escapeBis'),
-                                $string
-                        );
-
-                } else {
-                        return $string;
-                }
-        }
-        private function _escapeBis($match) {
-                $this->_escaped[] = $match[1];
-                return $this->buffer;
-        }
-
-        // decode escaped characters
-        private function _unescape($string, $escapeChar) {
-                if ($escapeChar) {
-                        $regexp = '/'.'\\'.$escapeChar.'/';
-                        $this->buffer = array('escapeChar'=> $escapeChar, 'i' => 0);
-                        return preg_replace_callback
-                        (
-                                $regexp,
-                                array(&$this, '_unescapeBis'),
-                                $string
-                        );
-
-                } else {
-                        return $string;
-                }
-        }
-        private function _unescapeBis() {
-                if (!empty($this->_escaped[$this->buffer['i']])) {
-                         $temp = $this->_escaped[$this->buffer['i']];
-                } else {
-                        $temp = '';
-                }
-                $this->buffer['i']++;
-                return $this->buffer['escapeChar'] . $temp;
-        }
-
-        private function _internalEscape($string) {
-                return preg_replace($this->ESCAPE, '', $string);
-        }
-}
 
 $request_method = '_' . $_SERVER['REQUEST_METHOD'];
@@ -855 +16 @@
                 return false;
 }
+
+require_once dirname(__FILE__) . '/inc/Controller.class.php';
+
 $controller = new Controller;
-$controller->exec($$request_method);
+printf("%s", $controller->exec($$request_method));
 
 exit(0);

trunk/instant_messenger/inc/Jabber.abstract.php

@@ -79 +79 @@
         }
 
-        protected function connect($pUser = false, $pPassword = false, $pConnectionType = false)
+        protected function connect($pUser = false, $pPassword = false, $pConnectionType = false, $pWebjabber = false )
         { 
                 try
                 {
-                        $_connect = $this->_connect($pUser, $pPassword, $pConnectionType);
+                        $_connect = $this->_connect($pUser, $pPassword, $pConnectionType, $pWebjabber );
 
                         if ( !$_connect )

trunk/instant_messenger/inc/Jabberd2.abstract.php

@@ -69 +69 @@
                 else
                 {
-                        if ( $this->writeSocket($this->iq('set', $addid, NULL, NULL, "jabber:iq:roster", $newcontact)) )
+                        if ( $this->iq('set', $addid, NULL, NULL, "jabber:iq:roster", $newcontact) )
                                 $this->getContacts();
-                                echo "OK";
+                        echo "OK";
                 }
         }
@@ -96 +96 @@
                         else
                         {
-                                $this->writeSocket($this->iq('get', $vcard, $jid, NULL, "vcard-temp", "<vCard xmlns='vcard-temp'/>"));
+                                $this->iq('get', $vcard, $jid, NULL, "vcard-temp", "<vCard xmlns='vcard-temp'/>");
                         }
                 }
@@ -113 +113 @@
                 else
                 {
-                        $this->writeSocket($this->iq('set', $id, NULL, NULL, "vcard-temp", "<vCard xmlns='vcard-temp'>".$NewVcard['vcard']."</vCard>"));
+                        $this->iq('set', $id, NULL, NULL, "vcard-temp", "<vCard xmlns='vcard-temp'>".$NewVcard['vcard']."</vCard>");
                         echo "OK";
                 }
@@ -124 +124 @@
                         return "disconnected";
                         
-                if ( $this->writeSocket($this->iq('set',$delid,NULL,NULL,"jabber:iq:roster","<item jid='".$pContact['jid']."' subscription='remove'/>")) )
+                if ( $this->iq('set',$delid,NULL,NULL,"jabber:iq:roster","<item jid='".$pContact['jid']."' subscription='remove'/>") )
                         if ( $this->subscription($pContact['jid'],"unsubscribed") )
                                 echo "OK";
@@ -141 +141 @@
                         return true;
                 }
+        }
+
+        final function compression()
+        {
+                $compress = "<compress xmlns='http://jabber.org/protocol/compress'><method>zlib</method></compress>";   
+                $this->writeSocket($compress);
         }
 
@@ -164 +170 @@
                 $id = "last_time_user";
                 $jid = ( trim($pUser['jid']) == "this" ) ? $this->_user . '@' . $this->_server : $pUser['jid'];
-                $this->writeSocket($this->iq('get', $id, $jid, NULL, "jabber:iq:last"));
+                $this->iq('get', $id, $jid, NULL, "jabber:iq:last");
         }
 
@@ -191 +197 @@
                 else
                 {
-                        $this->writeSocket($this->iq('set', $upid, NULL, NULL, "jabber:iq:roster", $updatecontact));
+                        $this->iq('set', $upid, NULL, NULL, "jabber:iq:roster", $updatecontact);
                         $this->getContacts();
                         echo "OK";

trunk/instant_messenger/inc/Socket.abstract.php

@@ -52 +52 @@
                 set_magic_quotes_runtime(0);
                 $return = @fread($pSocket, $pLength);
+
                 set_magic_quotes_runtime(get_magic_quotes_gpc());
-
 
                 if ( $php_errormsg )

trunk/instant_messenger/inc/class.Ujabber.inc.php

@@ -7 +7 @@
         private $set_presence;
         
-        public final function __construct()
+        public final function __construct($pConnectionType = 'write')
         {       
                 session_start();
-
                 $this->_user     = $_SESSION['phpgw_info']['instant_messenger']['user'];
                 $this->_pass     = $_SESSION['phpgw_info']['instant_messenger']['passwd'];
@@ -17 +16 @@
                 $this->_resource = $_SESSION['phpgw_info']['instant_messenger']['resource_jabber'];
                 $webjabber       = $_SESSION['phpgw_info']['instant_messenger']['webjabber'];
-
                 session_write_close();
 
-                if ( $this->connect($this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port, $this->_pass, 'read/write', $webjabber) )
+                if ( $this->connect($this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port, $this->_pass, $pConnectionType, $webjabber) )
                         $this->connected = true;
                 else
@@ -61 +59 @@
                         while ( ( connection_aborted() === 0 ) && time() - $init < 50 )
                         {
-                                
+                                if( isset($xml) )       
+                                        unset($xml);
+                        
                                 # read from server and write in the client
                                 $xml = $this->readSocket();
-                                //var_dump($xml);
                                 $xml = ( strlen($xml) ) ? $xml : ' ';
+                                //$xml = ( strlen($xml) ) ? $xml : '_##_';
                                 printf("%s", $xml);
                                 ob_flush();
@@ -74 +74 @@
         }
 
-    public final function SendMessage($pSendMessage)
-    {
+        public final function SendMessage($pSendMessage)
+        {
                 if ( !$this->isConnected() )
                         return "disconnected";
@@ -85 +85 @@
                 $pSendMessage['body'] = preg_replace($patterns, $replace, $pSendMessage['body']);
 
-                $_emotions  = '/<img emotion="(\S+)?"[^>]+>/';
+                $_emotions  = '/<img[^>]*emotion="(\S+)?"[^>]*>/'; 
                 $_emotions = preg_match_all($_emotions, $pSendMessage['body'], $emotions);
 
@@ -134 +134 @@
 
                         //retirar a linha abaixo para voltar ao padrão conforme acima
-                        $xml .= "<body>" . $content['body'] . "</body>";
+                        $xml .= "<body><![CDATA[" . htmlentities($content['body']) . "]]></body>";
                         $xml .= $payload;
                         $xml .= "</message>";

trunk/instant_messenger/inc/class.db_im.inc.php

@@ -19 +19 @@
         function db_im()
         {
-                
                 session_start();                
                 $this->db_name = $_SESSION['phpgw_info']['instant_messenger']['server']['db_name'];

trunk/instant_messenger/inc/class.ldap_im.inc.php

@@ -13 +13 @@
                 session_start();
                 $this->ldap_host                = $_SESSION['phpgw_info']['instant_messenger']['server_ldap_jabber'];
-                $this->ldap_context     = $_SESSION['phpgw_info']['instant_messenger']['context_ldap_jabber'];
+                $this->ldap_context             = $_SESSION['phpgw_info']['instant_messenger']['context_ldap_jabber'];
                 $this->user                     = $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber'];
                 $this->password                 = $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber'];
-                $this->jid                              = $_SESSION['phpgw_info']['instant_messenger']['user'];
+                $this->jid                      = $_SESSION['phpgw_info']['instant_messenger']['user'];
                 $this->connect_ldap(true);
                 session_write_close();

trunk/instant_messenger/inc/im_acl.inc.php

@@ -1 +1 @@
 <?php
 
-$size_of_ACL = sizeof($GLOBALS['phpgw_info']['user']['acl']);
+$size_of_acl = sizeof($GLOBALS['phpgw_info']['user']['acl']);
 
-for ( $i = 0; $i < sizeof($GLOBALS['phpgw_info']['user']['acl']); $i++ )
+# percorre a ACL até o fim ou até encontrar a entrada para o módulo de mensagem instantânea
+for ( $i = 0; $i < $size_of_acl && $GLOBALS['phpgw_info']['user']['acl'][$i]['appname'] != 'instant_messenger'; $i++ );
+
+# verifica se foi encontrada a permissão para o módulo de mensagem instantânea
+if ( $GLOBALS['phpgw_info']['user']['acl'][$i]['appname'] == 'instant_messenger' )
 {
-      if ( $GLOBALS['phpgw_info']['user']['acl'][$i]['appname'] == 'instant_messenger')
-      {
-                        $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
-                        $webserver_url = ( !empty($webserver_url) ) ? $webserver_url : '/';
-                        
-                        if ( strrpos($webserver_url, '/') === false || strrpos($webserver_url, '/') != (strlen($webserver_url)-1) )
-                                $webserver_url .= '/';
-                        
-                        $webserver_url = $webserver_url . 'instant_messenger/';
-                        
-                        session_start();
-                        require_once PHPGW_SERVER_ROOT . '/instant_messenger/inc/im_sessions.inc.php';
-                        require_once PHPGW_SERVER_ROOT . '/instant_messenger/inc/load_lang.php';
-                        $_user     = $_SESSION['phpgw_info']['instant_messenger']['user'];
-                        $_pass     = $_SESSION['phpgw_info']['instant_messenger']['passwd'];
-                        $_server   = $_SESSION['phpgw_info']['instant_messenger']['name_jabber'];
-                        $_port     = $_SESSION['phpgw_info']['instant_messenger']['port_jabber'];
-                        $_resource = $_SESSION['phpgw_info']['instant_messenger']['resource_jabber'];
-                        session_write_close();
-                        
-                        $js = array(
-                                'connector',
-                                'xtools',
-                                'jabber',
-                                'client',
-                                'images',
-                                'dragdrop',
-                                'build_win',
-                                'templates',
-                                'fcommon',
-                                'menu_action',
-                                'functions',
-                                'images',
-                                'cookies_im',
-                                'load',
-                        );
-                        
-                        print '<script type="text/javascript">var path_im = "'.$webserver_url.'";</script>';
-                        
-                        foreach ( $js as $key => $val )
-                                print '<script src="' . $webserver_url . 'controller.php?act=j.' . $val . '"></script>';
-                        
-                        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/window.css">';
-                        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/chat.css">';
-                        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/common.css">';
-                        
-                        print '<script type="text/javascript">setTimeout("client()",2000);</script>';
-      }
+        $webserver_url_im = $GLOBALS['phpgw_info']['server']['webserver_url'];
+        $webserver_url_im = ( !empty($webserver_url_im) ) ? $webserver_url_im : '/';
+
+        if ( strrpos($webserver_url_im, '/') === false || strrpos($webserver_url_im, '/') != (strlen($webserver_url_im) - 1) )
+                $webserver_url_im .= '/';
+
+        $webserver_url_im = $webserver_url_im . 'instant_messenger/';
+
+        require_once PHPGW_SERVER_ROOT . '/instant_messenger/inc/im_sessions.inc.php';
+        require_once PHPGW_SERVER_ROOT . '/instant_messenger/inc/load_lang.php';
+
+        $js = array(
+                'connector',
+                'jabber',
+                'xtools',
+                'client',
+                'images',
+                'dragdrop',
+                'build_win',
+                'templates',
+                'fcommon',
+                'menu_action',
+                'functions',
+                'images',
+                'cookies_im',
+                'load',
+        );
+
+        print '<script type="text/javascript">var path_im = "'.$webserver_url_im.'";</script>';
+
+
+        require_once dirname(__FILE__) . '/Controller.class.php';
+
+        $controller = new Controller;
+        $script = '';
+        foreach ( $js as $key => $val )
+        {
+                $val = array('act' => 'j.' . $val);
+                $script .= $controller->exec($val);
+        }
+
+        printf("<script type=\"text/javascript\">%s</script>", $script);
+
+        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url_im . 'templates/default/css/window.css">';
+        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url_im . 'templates/default/css/chat.css">';
+        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url_im . 'templates/default/css/common.css">';
+
+        # trecho de código javascript utilizado para
+        # controle de possí­vel erro no load do script
+        # feito acima e está sendo inserido via PHP
+        # pois é um complemento do procedimento acima
+        $init_client  = '<script type="text/javascript">';
+        $init_client .= '       function im_init(pTimes)';
+        $init_client .= '       {';
+        $init_client .= '               if ( !pTimes )';
+        $init_client .= '                       pTimes = 0;';
+        $init_client .= '               if ( pTimes == 5 )';
+        $init_client .= '                       return false;';
+        $init_client .= '               if ( window.client )';
+        $init_client .= '                       client();';
+        $init_client .= '               else';
+        $init_client .= '                       setTimeout("im_init("+(++pTimes)+")", (pTimes + 1) * 2000);';
+        $init_client .= '       }';
+        $init_client .= '       im_init();';
+        $init_client .= '</script>';
+        printf("%s", $init_client);
 }
 ?>

trunk/instant_messenger/inc/im_sessions.inc.php

@@ -1 +1 @@
 <?php
-
+        
                 $_SESSION['phpgw_info']['instant_messenger']['user']             = $GLOBALS['phpgw_info']['user']['account_lid'];
-                $_SESSION['phpgw_info']['instant_messenger']['user_id']                  = $GLOBALS['phpgw_info']['user']['account_id'];                
+                $_SESSION['phpgw_info']['instant_messenger']['user_id']          = $GLOBALS['phpgw_info']['user']['account_id'];                
                 $_SESSION['phpgw_info']['instant_messenger']['passwd']           = $GLOBALS['phpgw_info']['user']['passwd'];
                 $_SESSION['phpgw_info']['instant_messenger']['name_jabber']      = $GLOBALS['phpgw_info']['server']['name_jabber'];
                 $_SESSION['phpgw_info']['instant_messenger']['port_jabber']      = $GLOBALS['phpgw_info']['server']['port_jabber'];
                 $_SESSION['phpgw_info']['instant_messenger']['resource_jabber']  = $GLOBALS['phpgw_info']['server']['resource_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['tls_jabber']       = $GLOBALS['phpgw_info']['server']['tls_jabber'];
                 
-                $_SESSION['phpgw_info']['instant_messenger']['server_ldap_jabber']   = $GLOBALS['phpgw_info']['server']['server_ldap_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['context_ldap_jabber']  = $GLOBALS['phpgw_info']['server']['context_ldap_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber']     = $GLOBALS['phpgw_info']['server']['user_ldap_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber'] = $GLOBALS['phpgw_info']['server']['password_ldap_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['webjabber']                        = $GLOBALS['phpgw_info']['server']['wejabber'];                
+                $_SESSION['phpgw_info']['instant_messenger']['server_ldap_jabber']      = $GLOBALS['phpgw_info']['server']['server_ldap_jabber'];
+                $_SESSION['phpgw_info']['instant_messenger']['context_ldap_jabber']     = $GLOBALS['phpgw_info']['server']['context_ldap_jabber'];
+                $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber']        = $GLOBALS['phpgw_info']['server']['user_ldap_jabber'];
+                $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber']    = $GLOBALS['phpgw_info']['server']['password_ldap_jabber'];
+                $_SESSION['phpgw_info']['instant_messenger']['webjabber']               = $GLOBALS['phpgw_info']['server']['webjabber'];                
                 
                 $_SESSION['phpgw_info']['instant_messenger']['server']['db_name'] = $GLOBALS['phpgw_info']['server']['db_name'];
@@ -21 +20 @@
                 $_SESSION['phpgw_info']['instant_messenger']['server']['db_pass'] = $GLOBALS['phpgw_info']['server']['db_pass'];
                 $_SESSION['phpgw_info']['instant_messenger']['server']['db_type'] = $GLOBALS['phpgw_info']['server']['db_type'];
-
+                
 ?>

trunk/instant_messenger/inc/load_lang.php

@@ -1 +1 @@
 <?
-if ( !isset($_SESSION['phpgw_info']['instant_messenger']['lang']) || !is_array($_SESSION['phpgw_info']['instant_messenger']['lang']) )
-   if ( file_exists(($fn = dirname(__FILE__) . '/../setup/phpgw_pt-br.lang')) )
-      if ( ($fp = fopen($fn,'r')) )
-      {
-         while ($data = fgets($fp,16000))
-         {
-            list($message_id, $app_name, $null, $content) = explode("\t",substr($data,0,-1));
-            $_SESSION['phpgw_info']['instant_messenger']['lang'][$message_id] = $content;
-         }
-         fclose($fp);
-      }
+
+if ( file_exists(($fn = dirname(__FILE__) . '/../setup/phpgw_pt-br.lang')) )
+        if ( ($fp = fopen($fn,'r')) )
+        {
+                while ($data = fgets($fp,16000))
+                {
+                        list($message_id, $app_name, $null, $content) = explode("\t",substr($data,0,-1));
+                        $LANG_IM[$message_id] = $content;
+                }
+                fclose($fp);
+        }
 
 $script  = '<script>';
 $script .= 'var lang_im = [];';
 
-foreach ( $_SESSION['phpgw_info']['instant_messenger']['lang'] as $key => $value )
+foreach ( $LANG_IM as $key => $value )
    $script .= "lang_im['" . strtolower(addslashes($key)) . "'] = '" . addslashes($value) . "';";
-
-   #$_key = str_replace("'","\'",strtolower($key));
-   #$_val = str_replace("'","\'",$value);
 
 $script .= '</script>';
 
 echo $script;
+
+unset($LANG_IM);
 ?>

trunk/instant_messenger/js/build_win.js

@@ -87 +87 @@
         "window_focus" :  function(pElement)
         {
-                pElement.style.zIndex = ++this.focus;
+                if (! templates.dontFocus)
+                        pElement.style.zIndex = ++this.focus;
+                else
+                        templates.dontFocus = false;
         },
 
@@ -103 +106 @@
                 this.elementM(pId).style.width = window.screen.availWidth - 24;
                 this.elementM(pId).style.height = window.screen.availHeight - 60;
+                
 
                 // _window_body
@@ -110 +114 @@
                 // _window_body_content
                 this.elementC(pId).style.height = '100%';
+                var windowType = this.elementC(pId).firstChild.firstChild.className;
+
+                if (windowType == 'history') // message window
+                {
+                        this.elementC(pId).firstChild.childNodes[0].style.height = '60%';
+                        this.elementC(pId).firstChild.childNodes[0].style.width = '100%';
+                        this.elementC(pId).firstChild.childNodes[1].style.width = '100%';
+                        this.elementC(pId).firstChild.childNodes[2].firstChild.style.width = '100%';
+                }
+                else if (windowType == 'font_menu') // contacts window
+                {
+                        this.elementC(pId).childNodes[1].style.height = '70%';
+                }
+
         },
 

trunk/instant_messenger/js/client.js

@@ -1 @@
-var con = new IMConnector;
+var conn_im = new IMConnector;
 var disconnected = false;
+var validate_data = false;
+var buffer_im = '';
+var xtools_im = null;
+var count_im = 0;
+var activate_timeOut = '';
+
+function clientConnectionIm()
+{
+        if( count_im < 2 )
+        {
+                if( buffer_im.length > 0 )
+                        activate_timeOut = setTimeout('clientConnectionIm()', 5000);
+        
+                count_im++;
+        }
+        else
+        {
+                count_im = 0;
+                buffer_im = 0;
+                clientDisconnectIm();
+                clearTimeout(activate_timeOut);
+                killConnIm();
+        }
+}
+
+function clientDisconnectIm()
+{
+        if( xtools_im == null )
+                 xtools_im = new XTools;
+
+        disconnected = true;
+        var XmlDoc = "<disconnected>" +
+                        "<path>" + path_im + "</path>" +
+                     "</disconnected>";
+        
+        im_window.load('__contacts_im_','instant_messenger_content','<title>.::Expresso Messenger::.</title>','window.xsl','190',true,true,false);
+        im_window.elementC('__contacts_im_').innerHTML  = xtools_im.parse(XmlDoc,'disconnected.xsl');
+        func.byId('im_status_src').src = im_unavailable.src;
+        im.status = 'type=unavailable';
+        im.statusFlag = 'unavailable';                                                                                                  
+        
+        function handler_presence_disconnected()
+        {
+        }
+        conn_im.go('$this.Ujabber.setPresence', {'request' : handler_presence_disconnected }, im.status);
+}
+
+function killConnIm()
+{
+        var i;
+        disconnected = true;
+        
+        for ( i in conn_im.__HTTP__ )
+                conn_im.__HTTP__[i].abort();
+}
 
 function client()
 {
-        var jabber = new Jabber;
-        var buffer = '';
-        var xtools = new XTools;
+        if( jabber == null )
+                var jabber = new Jabber;
+        
+        if( xtools_im == null )
+                xtools_im = new XTools;
 
         function request(data)
@@ -12 +69 @@
                 if ( !disconnected )
                 {
-                        con.go('$this.Ujabber.listen', {'stream':stream, 'request':request});
+                        conn_im.go('$this.Ujabber.listen', {'stream':stream, 'request':request}, 'classConstructor=read');
+                }
+                else
+                {
+                        clientDisconnectIm();
+                        return false;
                 }
         }
@@ -22 +84 @@
                         return pData.replace(/^ +| +$/g, '');
                 }
+
+                function retrim(pData)
+                {
+                        return pData.replace(/(_##_)+\b/g, '');
+                }
+                
                 data = trim(data);
-                if ( data == 'disconnected' || data == '</stream:stream>')
+                
+                if ( data == 'disconnected' || data == '</stream:stream>' )
                 {
-                        disconnected = true;
-                        var XmlDoc = "<disconnected>" +
-                                                        "<path>" + path_im + "</path>" +
-                                                 "</disconnected>";
-
-                        im_window.load('__contacts_im_','instant_messenger_content','<title>.::Expresso Messenger::.</title>','window.xsl','',true,true,false);
-                        im_window.elementC('__contacts_im_').innerHTML  = xtools.parse(XmlDoc,'disconnected.xsl');
-                        func.byId('img_status_im').src = im_unavailable.src;
-                        im.status = 'type=unavailable';
-                        im.statusFlag = 'unavailable';                                  
-
+                        clientDisconnectIm();
+                        return false;
                 }
-                else if ( data.lastIndexOf('>') == data.length - 1)
+                else if ( data.lastIndexOf('>') == data.length - 1 && data.length > 0 )
                 {
-                        if ( buffer.length )
+                        if ( buffer_im.length )
                         {
-                                data = buffer + data;
-                                buffer = '';
+                                data = buffer_im + data;
+                                buffer_im = "";
                         }
 
@@ -62 +122 @@
 
                         var node = xmlDoc.documentElement.firstChild;
-
+                        
                         while ( node )
                         {
                                 try
                                 {
-                                        with ( node )
-                                        {
-                                                jabber.doIt(nodeName, node);
-                                        }
+                                        jabber.doIt(node.nodeName, node);
                                         node = node.nextSibling;
                                 }
                                 catch(e)
                                 {
+                                        alert('erro : ' + e + "\n\n" + e.description);
                                         node = node.nextSibling;
                                 }
@@ -81 +139 @@
                 else
                 {
-                        buffer += data;
+                        data = data.replace(/^ +| +$/g, '');
+                        buffer_im +=  data + " ";
                 }
         }
@@ -87 +146 @@
         function contacts(data)
         {
+                setTimeout('clientConnectionIm()', 3000);
         }
         request();
-        setTimeout("con.go('$this.Ujabber.getContacts', {'request':"+contacts+"})", 3000);
+        setTimeout("conn_im.go('$this.Ujabber.getContacts', {'request':"+contacts+"})", 3000);
 }
 
@@ -99 +159 @@
                 _bkp_onbeforeunload();
 
-        disconnected = true;
-        var i;
-        for ( i in con.__HTTP__ )
-                con.__HTTP__[i].abort();
+        killConnIm();
 };

trunk/instant_messenger/js/functions.js

@@ -27 +27 @@
                 var content = get_Element(pJid);
                 content.innerHTML += "" + this.insertEmoticons(pEmotion);
+                var smileWindow = document.getElementById(pJid+"__button_dest");
+                if (smileWindow.firstChild)
+                        smileWindow.removeChild(smileWindow.firstChild);
         },
 
@@ -88 +91 @@
                 }
                 var content = get_Element(pJid);
-                
+                
+                var colorWindow = document.getElementById(pJid+"__button_dest");
+                if (colorWindow.firstChild) 
+                        colorWindow.removeChild(colorWindow.firstChild);
+
                 if( _font_color = _document.contentWindow.document.getElementById('colors_'+pJid) )
                         content.innerHTML = "<span id='colors_"+pJid+"'style='color:"+pColor+"'>"+_font_color.innerHTML+"</span>";
@@ -346 +353 @@
                         {
                                 var data = eval(XmlData);
+
                                 if( data )
                                 {
                                         if( document.getElementById(pAvatar) != null )
                                         {
-                                                var photo_img = document.getElementById(pAvatar);
-                                                photo_img.src = ( path_im + "inc/class.ldap_im.inc.php?user="+uid ) ? path_im + "inc/class.ldap_im.inc.php?user="+uid : im_photo.src ;
+                                                if( document.getElementById(pAvatar).src )
+                                                {
+                                                        var photo_img = document.getElementById(pAvatar);
+                                                        photo_img.src = ( path_im + "inc/class.ldap_im.inc.php?user="+uid ) ? path_im + "inc/class.ldap_im.inc.php?user="+uid : im_photo.src ;
+                                                }
+                                                else
+                                                {
+                                                        var photo_img = document.getElementById(pAvatar);
+                                                        photo_img.style.backgroundImage = 'url(' + path_im + 'inc/class.ldap_im.inc.php?user='+uid+')';
+                                                }
                                         }               
                                 }
@@ -361 +377 @@
         },
         
-        "newMessageNotification" : function()
-        {
+      "newMessageNotification" : function()
+      {
       if ( !focusFlag )
       {
@@ -455 +471 @@
                 {
                         if(imgStatus != null)
-                                func.byId('im_status_src').src = eval('im_' + imgStatus + '.src');
+                        {
+                                var img_status =  document.getElementById('im_status_src');
+                                img_status.src = eval('im_' + imgStatus + '.src');
+                        }
                 }
                 this.conn.go('$this.Ujabber.setPresence', {'request' : handler_presence}, this.status);
@@ -462 +481 @@
         "remove" : function(pJid)
         {
+                if (pJid == -1)
+                        return false;
                 if(confirm('Deseja excluir o contato ' + pJid + ' ?'))
                 {
@@ -488 +509 @@
                                 if( func.byId(pElement).options[i].selected == true )
                                          Jid = func.byId(pElement).options[i].value;
-                                         
-                if(confirm('Deseja excluir o contato ' + Jid + ' ?'))
-                {
-                        if( Jid && Jid != -1 )
-                        {
+                if (Jid == -1)
+                        return false;
+                else
+                        if(confirm('Deseja excluir o contato ' + Jid + ' ?'))
+                        {
+                                if( Jid && Jid != -1 )
+                                {
                                 function handler_remove(XmlData)
                                 {
@@ -535 +558 @@
                 {
                         if( XmlData != "OK" )
-                                alert('Vcard não cadastrado/atualizado !');
+                                alert('Erro: Vcard não cadastrado/atualizado !');
                         else
                                 alert('Vcard cadastrado/atualizado !');
+                        im_window.window_close('vcard_user_im');
                 }
                 this.conn.go('$this.Ujabber.newVcard',{'request':handler_savevcard},"vcard="+xmlVcard);
@@ -571 +595 @@
                                 im.off_line();
                                 alert('Preferências Salvas !');
+                                im_window.window_close('my_settings_im');
                         }
                 }

trunk/instant_messenger/js/images.js

@@ -29 +29 @@
         var im_group_open = new Image();
         im_group_open.src = path_im + 'templates/default/images/group_open.gif';
-        
+
 // Smiles
 

trunk/instant_messenger/js/jabber.js

@@ -121 +121 @@
                                 var iframe = func.byId('iframe_' + from);
 
-                                //if(func.byId('iframe_' + from) != null)
-                                        //func.byId('iframe_' + from).parentNode.removeChild(func.byId('iframe_' + from));
-
                                 var win;
 
@@ -142 +139 @@
                                         var iframe = document.createElement('iframe');
                                         iframe.id = 'iframe_' + from;
-                                        iframe.style.width = '290px';
-                                        iframe.style.height = '46px';
+                                        iframe.style.width = '240px';
+                                        iframe.style.height = '65px';
                                         iframe.style.border = '0';
                                         iframe.style.margin = '0';
@@ -154 +151 @@
                                         iframe.contentWindow.document.close();
                                         iframe.contentWindow.document.designMode = "On";
+
+                                        function getEnter(e)
+                                        {
+                                                if ( !(e.shiftKey) && (e.keyCode == 13) )
+                                                {
+                                                        if ( e.type.indexOf('keydown') != -1 )
+                                                                im.SendMessage(from);
+                                                        else
+                                                                iframe.contentWindow.document.body.innerHTML = '';
+                                                        return false;
+                                                }
+                                        }
+
+                                        func.attachEvent(iframe.contentWindow, 'onkeydown', getEnter);
+                                        func.attachEvent(iframe.contentWindow, 'onkeyup', getEnter);
 
                                 }
@@ -327 +339 @@
                 function readVcard(pVcard)
                 {
+                        
                         switch(pVcard.getAttribute('id'))
                         {
@@ -338 +351 @@
                                                 {
                                                         if(cc.firstChild.nodeValue)
-                                                                func.byId('im_layer_nickname').innerHTML = cc.firstChild.nodeValue;                                                             
+                                                                func.byId('im_layer_nickname').innerHTML = cc.firstChild.nodeValue;
                                                 }
                                                 cc = cc.nextSibling;

trunk/instant_messenger/js/templates.js

@@ -5 +5 @@
         this.documentMousedown = null;
         this.jabber     = new Jabber;
+        this.dontFocus = false;
 }
 
@@ -73 +74 @@
                         document.getElementById('fast_menu_im').style.position = "absolute";
                 }
-                else
-                        alert('Aguarde carregando lista de contatos ....');
                                         
         },
@@ -123 +122 @@
         
         "options_button_left" : function(pJid)
-        {  
+        {       
                 var _this = this;
-                
+        
                 if(!(im.nickname_contacts[pJid]))
                         im.request_vcard(pJid, false);
@@ -133 +132 @@
                         im_window.load(pJid, 'instant_messenger_content', '<title>.:: Expresso Messenger ::.</title>', 'chat.xsl','310',true,true,true);
                 
-                        func.byId(pJid + '__avatar').src = path_im + "/templates/default/images/photo.png";
 
                         if(func.byId('iframe_' + pJid) != null)
@@ -142 +140 @@
                         var iframe = document.createElement('iframe');
                         iframe.id = 'iframe_' + pJid;
-                        iframe.style.width = '290px';
-                        iframe.style.height = '46px';
+                        iframe.style.width = '240px';
+                        iframe.style.height = '65px';
                         iframe.style.border = '0';
                         iframe.style.margin = '0';
@@ -153 +151 @@
                         iframe.contentWindow.document.write('<html><body id="' + pJid + '" style="margin:0px;padding:0px"></body></html>');
                         iframe.contentWindow.document.close();
+
                         iframe.contentWindow.document.designMode = "On";
                         iframe.contentWindow.focus();
+                        this.dontFocus = true;
+
+                        function getEnter(e)
+                        {
+                                if ( !(e.shiftKey) && (e.keyCode == 13) )
+                                {
+                                        if ( e.type.indexOf('keydown') != -1 )
+                                                im.SendMessage(pJid);
+                                        else
+                                                iframe.contentWindow.document.body.innerHTML = '';
+                                        return false;
+                                }
+                        }
+                        func.attachEvent(iframe.contentWindow, 'onkeydown', getEnter);
+                        func.attachEvent(iframe.contentWindow, 'onkeyup', getEnter);
 
                         im.ldap_photo(pJid + "__avatar");

trunk/instant_messenger/templates/default/css/chat.css

@@ -113 +113 @@
 .messages
 {
-        background: #fff;
+        background-color: #fff;
+        background-position:right !important;
+        background-repeat: no-repeat !important;
+        background-image: url(../images/photo.png);
         border: 1px solid;
         border-color: #b3b3b3 #cecece #cecece #b3b3b3;
-        width:  auto;   /*289px;*/ 
-        height: 46px; 
         cursor: text;
+        height: 65px; 
+        padding-right:50px;
+        width:  auto;
 }
 

trunk/instant_messenger/webjabber/webjabber.c

@@ -817 +817 @@
                 bytes_rcvd_client = (int) NULL,
                 bytes_sent_client = (int) NULL,
-                i;
-
-        //syslog (LOG_INFO, "Reading(fd%d, fd%d)", in_fd, out_fd);
+                i,
+                do_auth = 0;
 
         // @TODO: verificar alocacao buffer
@@ -828 +827 @@
         {
                 bzero(buf_2_jabber, BUF_SIZE);
-                if ( (bytes_rcvd_client = recv (client_fd, buf_2_jabber, BUF_SIZE, 0)) != 0 && strlen(buf_2_client) > 0 )
-                {
-                        // descomentar para ver oq esta passado de informacao
-                        //printf("(jabber/client[#%d])[%d]:\n{\n%s.......\n}\n", client_fd, strlen(buf_2_client), buf_2_client);
+                bytes_rcvd_client = recv (client_fd, buf_2_jabber, BUF_SIZE, 0);
+                if ( (bytes_rcvd_client != 0) && (strlen(buf_2_client) > 0) )
+                {
                         for ( i = 0; i < bytes_rcvd_jabber; i += bytes_sent_client )
                         {
@@ -840 +838 @@
                         }
                 }
+                if ( strlen(buf_2_jabber) > 0 )
+                {
+                        //printf("(client/jabber[#%d])[%d]:\n{\n%s.......\n}\n", jabber_fd, strlen(buf_2_jabber), buf_2_jabber);
+                        if ( strstr(buf_2_jabber, "<?xml") != NULL )
+                                do_auth = 1;
+                }
 
                 bzero(buf_2_client, BUF_SIZE);
-                if ( (bytes_rcvd_jabber = recv (jabber_fd, buf_2_client, BUF_SIZE, 0)) != 0 && strlen(buf_2_jabber) > 0 )
-                {
-                        // descomentar para ver oq esta passado de informacao
-                        //printf("(client/jabber[#%d])[%d]:\n{\n%s.......\n}\n", jabber_fd, strlen(buf_2_jabber), buf_2_jabber);
+                if ( do_auth || read->type == 1 )
+                        bytes_rcvd_jabber = recv (jabber_fd, buf_2_client, BUF_SIZE, 0);
+                else
+                        bytes_rcvd_jabber = -1;
+                if ( (bytes_rcvd_jabber != 0) && (strlen(buf_2_jabber) > 0) )
+                {
                         for ( i = 0; i < bytes_rcvd_client; i += bytes_sent_jabber )
                         {
@@ -854 +860 @@
                         }
                 }
+                if ( strlen(buf_2_client) > 0 )
+                {
+                        //printf("(jabber/client[#%d])[%d]:\n{\n%s.......\n}\n", client_fd, strlen(buf_2_client), buf_2_client);
+                        if ( do_auth && strstr(buf_2_jabber, "<iq xmlns='jabber:client'") != NULL )
+                                do_auth = 0;
+                }
 
                 usleep(500);
-                //sleep(2);
         }
         while ( (bytes_rcvd_client != 0) && (bytes_rcvd_jabber != 0) );

trunk/instant_messenger/xsl/chat.xsl

@@ -25 +25 @@
                         <div id="{name}__window_body_content" class="content">
                                 <div style="margin:3px 3px;">
-                                        <div class="history">
-                                        <div class="avatar" style="margin: 2px; position: absolute; right: 30px; top: 30px;">
-                                                <img id="{name}__avatar"/>
-                                        </div>
-                                        </div>
+                                        <div class="history"></div>
                                         <div class="toolbar_buttons">
                                                 <div id="{name}__button_bold" class="button_bold" onclick="javascript:im.conf_font('{name}','button_bold');"></div>
@@ -40 +36 @@
                                                 <div id="{name}__button_dest"></div>                                            
                                         </div>
-                                        <div class="messages"></div>
+                                        <div id="{name}__avatar" class="messages"></div>
                                 </div>
                         </div>

trunk/instant_messenger/xsl/disconnected.xsl

@@ -5 +5 @@
 <xsl:template match="/disconnected">
         <div class="disconnected">
-                <img src="{path}templates/default/images/logo.png" align="bottom" style="margin:2px"/>
-                <font style="font-weight:bold;margin:5px">Expresso Messenger</font>
-                <br/>
-                <br/>
-                <font style="font-weight:bold;margin:5px"> Aviso : </font>
-                <br/>
-                <br/>
-                <div style="margin:5px"> 
-                        Sua conexão com o 
+                <div style="background:url('{path}templates/default/images/logo.png');width:32px;height:32px;margin:2px"></div>
+                <font style="font-weight:bold;margin:5px"><center>Aviso</center> </font>
+                <div style="margin:5px; font-size: 8pt; font-family: Arial, Verdana, helvetica, sans;">
+                        Sua conexão com o Servidor parou.
                         <br/>
-                        Servidor parou.
+                        Tente novamente ou entre em  
                         <br/>
-                        Tente novamente 
-                        <br/>
-                        ou entre em contato
-                        <br/>
-                        com o Administrador.
+                        contato com o Administrador.
                 </div>
                 <br/>
-                <br/>
-                <img src="{path}templates/default/images/available.gif" />
-                <a href="javascript:disconnected = false; client();"><font style="font-size:7pt;margin:2px">Reconectar ...</font></a>
+                <div onclick="disconnected = false; client();" style="background:url('{path}templates/default/images/server_connect.png') no-repeat;padding-left:16px;height:16px;margin:3px;cursor:pointer">
+                        <font style="font-size:7pt;margin:2px">Reconectar ...</font>
+                </div>
         </div>
 </xsl:template>