[Phpfreechat-svn] SF.net SVN: phpfreechat: [803] trunk
Status: Beta
Brought to you by:
kerphi
Menu
▾
▴
[Phpfreechat-svn] SF.net SVN: phpfreechat: [803] trunk
|
From: <ke...@us...> - 2006-10-04 01:48:38
|
Revision: 803
http://svn.sourceforge.net/phpfreechat/?rev=803&view=rev
Author: kerphi
Date: 2006-09-30 15:07:15 -0700 (Sat, 30 Sep 2006)
Log Message:
-----------
[en] User's metadata implementation : it make possible to build customized user profiles by sending your own metadata for each connected users and to display it as you want in the user's box. This release add two commands : "/whois nickname" used to query the user's metadata list and "/who channel" used internal to get the channel user list. For example: now the server admins can have customized user icon (thanks to Johnny Philavanh for his sponsoring : $400 USD). [14h]
[fr] Impl?\195?\169mentation des m?\195?\169ta donn?\195?\169es utilisateur : cela rend possible les profils utilisateurs personnalis?\195?\169s, on peut associer une information ?\195?\160 un utilisateur, r?\195?\169cup?\195?\169rer cette information cot?\195?\169 client et afficher une interface en cons?\195?\169quence. Deux nouvelles commandes ont ?\195?\169t?\195?\169 ajout?\195?\169 : "/whois pseudonyme" permet de r?\195?\169cup?\195?\169rer la liste des m?\195?\169ta donn?\195?\169es de l'utilisateur identifi?\195?\169 par son pseudonyme, et "/who channel" qui permet de r?\195?\169cup?\195?\169rer la liste des utilisateurs d'un channel. Par exemple : il est maintenant possible d'afficher une image diff?\195?\169rente pour les administrateurs du chat (merci ?\195?\160 Johnny Philavanh pour sa donation de $400 USD). [14h]
Modified Paths:
--------------
trunk/src/client/chat.js.tpl.php
trunk/src/client/pfcclient.js
trunk/src/commands/connect.class.php
trunk/src/commands/deop.class.php
trunk/src/commands/identify.class.php
trunk/src/commands/join.class.php
trunk/src/commands/nick.class.php
trunk/src/commands/op.class.php
trunk/src/commands/privmsg.class.php
trunk/src/commands/update.class.php
trunk/src/pfccommand.class.php
trunk/src/pfccontainer.class.php
trunk/src/pfcglobalconfig.class.php
trunk/src/phpfreechat.class.php
trunk/themes/default/images/ch-active.gif
trunk/themes/default/images/ch.gif
trunk/themes/default/images/clock-on.gif
trunk/themes/default/images/pv-active.gif
trunk/themes/default/images/pv.gif
trunk/themes/default/images/user.gif
trunk/themes/default/style.css
Added Paths:
-----------
trunk/lib/json/
trunk/lib/json/JSON.php
trunk/lib/json/LICENSE
trunk/src/commands/who.class.php
trunk/src/commands/who2.class.php
trunk/src/commands/whois.class.php
trunk/src/commands/whois2.class.php
trunk/themes/default/images/close-whoisbox.gif
trunk/themes/default/images/openpv.gif
trunk/themes/default/images/user-admin.gif
Removed Paths:
-------------
trunk/src/commands/getonlinenick.class.php
trunk/testcase/cmd_error.php
trunk/testcase/cmd_nick.php
trunk/testcase/cmd_send.php
Added: trunk/lib/json/JSON.php
===================================================================
--- trunk/lib/json/JSON.php (rev 0)
+++ trunk/lib/json/JSON.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -0,0 +1,806 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Converts to and from JSON format.
+ *
+ * JSON (JavaScript Object Notation) is a lightweight data-interchange
+ * format. It is easy for humans to read and write. It is easy for machines
+ * to parse and generate. It is based on a subset of the JavaScript
+ * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
+ * This feature can also be found in Python. JSON is a text format that is
+ * completely language independent but uses conventions that are familiar
+ * to programmers of the C-family of languages, including C, C++, C#, Java,
+ * JavaScript, Perl, TCL, and many others. These properties make JSON an
+ * ideal data-interchange language.
+ *
+ * This package provides a simple encoder and decoder for JSON notation. It
+ * is intended for use with client-side Javascript applications that make
+ * use of HTTPRequest to perform server communication functions - data can
+ * be encoded into JSON notation for use in a client-side javascript, or
+ * decoded from incoming Javascript requests. JSON format is native to
+ * Javascript, and can be directly eval()'ed with no further parsing
+ * overhead
+ *
+ * All strings should be in ASCII or UTF-8 format!
+ *
+ * LICENSE: Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met: Redistributions of source code must retain the
+ * above copyright notice, this list of conditions and the following
+ * disclaimer. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * @category
+ * @package Services_JSON
+ * @author Michal Migurski <mik...@te...>
+ * @author Matt Knapp <mdknapp[at]gmail[dot]com>
+ * @author Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
+ * @copyright 2005 Michal Migurski
+ * @version CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
+ */
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_SLICE', 1);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_STR', 2);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_ARR', 3);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_OBJ', 4);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_CMT', 5);
+
+/**
+ * Behavior switch for Services_JSON::decode()
+ */
+define('SERVICES_JSON_LOOSE_TYPE', 16);
+
+/**
+ * Behavior switch for Services_JSON::decode()
+ */
+define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
+
+/**
+ * Converts to and from JSON format.
+ *
+ * Brief example of use:
+ *
+ * <code>
+ * // create a new instance of Services_JSON
+ * $json = new Services_JSON();
+ *
+ * // convert a complexe value to JSON notation, and send it to the browser
+ * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
+ * $output = $json->encode($value);
+ *
+ * print($output);
+ * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
+ *
+ * // accept incoming POST data, assumed to be in JSON notation
+ * $input = file_get_contents('php://input', 1000000);
+ * $value = $json->decode($input);
+ * </code>
+ */
+class Services_JSON
+{
+ /**
+ * constructs a new JSON instance
+ *
+ * @param int $use object behavior flags; combine with boolean-OR
+ *
+ * possible values:
+ * - SERVICES_JSON_LOOSE_TYPE: loose typing.
+ * "{...}" syntax creates associative arrays
+ * instead of objects in decode().
+ * - SERVICES_JSON_SUPPRESS_ERRORS: error suppression.
+ * Values which can't be encoded (e.g. resources)
+ * appear as NULL instead of throwing errors.
+ * By default, a deeply-nested resource will
+ * bubble up with an error, so all return values
+ * from encode() should be checked with isError()
+ */
+ function Services_JSON($use = 0)
+ {
+ $this->use = $use;
+ }
+
+ /**
+ * convert a string from one UTF-16 char to one UTF-8 char
+ *
+ * Normally should be handled by mb_convert_encoding, but
+ * provides a slower PHP-only method for installations
+ * that lack the multibye string extension.
+ *
+ * @param string $utf16 UTF-16 character
+ * @return string UTF-8 character
+ * @access private
+ */
+ function utf162utf8($utf16)
+ {
+ // oh please oh please oh please oh please oh please
+ if(function_exists('mb_convert_encoding')) {
+ return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+ }
+
+ $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+
+ switch(true) {
+ case ((0x7F & $bytes) == $bytes):
+ // this case should never be reached, because we are in ASCII range
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0x7F & $bytes);
+
+ case (0x07FF & $bytes) == $bytes:
+ // return a 2-byte UTF-8 character
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0xC0 | (($bytes >> 6) & 0x1F))
+ . chr(0x80 | ($bytes & 0x3F));
+
+ case (0xFFFF & $bytes) == $bytes:
+ // return a 3-byte UTF-8 character
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0xE0 | (($bytes >> 12) & 0x0F))
+ . chr(0x80 | (($bytes >> 6) & 0x3F))
+ . chr(0x80 | ($bytes & 0x3F));
+ }
+
+ // ignoring UTF-32 for now, sorry
+ return '';
+ }
+
+ /**
+ * convert a string from one UTF-8 char to one UTF-16 char
+ *
+ * Normally should be handled by mb_convert_encoding, but
+ * provides a slower PHP-only method for installations
+ * that lack the multibye string extension.
+ *
+ * @param string $utf8 UTF-8 character
+ * @return string UTF-16 character
+ * @access private
+ */
+ function utf82utf16($utf8)
+ {
+ // oh please oh please oh please oh please oh please
+ if(function_exists('mb_convert_encoding')) {
+ return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+ }
+
+ switch(strlen($utf8)) {
+ case 1:
+ // this case should never be reached, because we are in ASCII range
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return $utf8;
+
+ case 2:
+ // return a UTF-16 character from a 2-byte UTF-8 char
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0x07 & (ord($utf8{0}) >> 2))
+ . chr((0xC0 & (ord($utf8{0}) << 6))
+ | (0x3F & ord($utf8{1})));
+
+ case 3:
+ // return a UTF-16 character from a 3-byte UTF-8 char
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr((0xF0 & (ord($utf8{0}) << 4))
+ | (0x0F & (ord($utf8{1}) >> 2)))
+ . chr((0xC0 & (ord($utf8{1}) << 6))
+ | (0x7F & ord($utf8{2})));
+ }
+
+ // ignoring UTF-32 for now, sorry
+ return '';
+ }
+
+ /**
+ * encodes an arbitrary variable into JSON format
+ *
+ * @param mixed $var any number, boolean, string, array, or object to be encoded.
+ * see argument 1 to Services_JSON() above for array-parsing behavior.
+ * if var is a strng, note that encode() always expects it
+ * to be in ASCII or UTF-8 format!
+ *
+ * @return mixed JSON string representation of input var or an error if a problem occurs
+ * @access public
+ */
+ function encode($var)
+ {
+ switch (gettype($var)) {
+ case 'boolean':
+ return $var ? 'true' : 'false';
+
+ case 'NULL':
+ return 'null';
+
+ case 'integer':
+ return (int) $var;
+
+ case 'double':
+ case 'float':
+ return (float) $var;
+
+ case 'string':
+ // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+ $ascii = '';
+ $strlen_var = strlen($var);
+
+ /*
+ * Iterate over every character in the string,
+ * escaping with a slash or encoding to UTF-8 where necessary
+ */
+ for ($c = 0; $c < $strlen_var; ++$c) {
+
+ $ord_var_c = ord($var{$c});
+
+ switch (true) {
+ case $ord_var_c == 0x08:
+ $ascii .= '\b';
+ break;
+ case $ord_var_c == 0x09:
+ $ascii .= '\t';
+ break;
+ case $ord_var_c == 0x0A:
+ $ascii .= '\n';
+ break;
+ case $ord_var_c == 0x0C:
+ $ascii .= '\f';
+ break;
+ case $ord_var_c == 0x0D:
+ $ascii .= '\r';
+ break;
+
+ case $ord_var_c == 0x22:
+ case $ord_var_c == 0x2F:
+ case $ord_var_c == 0x5C:
+ // double quote, slash, slosh
+ $ascii .= '\\'.$var{$c};
+ break;
+
+ case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+ // characters U-00000000 - U-0000007F (same as ASCII)
+ $ascii .= $var{$c};
+ break;
+
+ case (($ord_var_c & 0xE0) == 0xC0):
+ // characters U-00000080 - U-000007FF, mask 110XXXXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+ $c += 1;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+
+ case (($ord_var_c & 0xF0) == 0xE0):
+ // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}));
+ $c += 2;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+
+ case (($ord_var_c & 0xF8) == 0xF0):
+ // characters U-00010000 - U-001FFFFF, mask 11110XXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}),
+ ord($var{$c + 3}));
+ $c += 3;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+
+ case (($ord_var_c & 0xFC) == 0xF8):
+ // characters U-00200000 - U-03FFFFFF, mask 111110XX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}),
+ ord($var{$c + 3}),
+ ord($var{$c + 4}));
+ $c += 4;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+
+ case (($ord_var_c & 0xFE) == 0xFC):
+ // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}),
+ ord($var{$c + 3}),
+ ord($var{$c + 4}),
+ ord($var{$c + 5}));
+ $c += 5;
+ $utf16 = $this->utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+ }
+ }
+
+ return '"'.$ascii.'"';
+
+ case 'array':
+ /*
+ * As per JSON spec if any array key is not an integer
+ * we must treat the the whole array as an object. We
+ * also try to catch a sparsely populated associative
+ * array with numeric keys here because some JS engines
+ * will create an array with empty indexes up to
+ * max_index which can cause memory issues and because
+ * the keys, which may be relevant, will be remapped
+ * otherwise.
+ *
+ * As per the ECMA and JSON specification an object may
+ * have any string as a property. Unfortunately due to
+ * a hole in the ECMA specification if the key is a
+ * ECMA reserved word or starts with a digit the
+ * parameter is only accessible using ECMAScript's
+ * bracket notation.
+ */
+
+ // treat as a JSON object
+ if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+ $properties = array_map(array($this, 'name_value'),
+ array_keys($var),
+ array_values($var));
+
+ foreach($properties as $property) {
+ if(Services_JSON::isError($property)) {
+ return $property;
+ }
+ }
+
+ return '{' . join(',', $properties) . '}';
+ }
+
+ // treat it like a regular array
+ $elements = array_map(array($this, 'encode'), $var);
+
+ foreach($elements as $element) {
+ if(Services_JSON::isError($element)) {
+ return $element;
+ }
+ }
+
+ return '[' . join(',', $elements) . ']';
+
+ case 'object':
+ $vars = get_object_vars($var);
+
+ $properties = array_map(array($this, 'name_value'),
+ array_keys($vars),
+ array_values($vars));
+
+ foreach($properties as $property) {
+ if(Services_JSON::isError($property)) {
+ return $property;
+ }
+ }
+
+ return '{' . join(',', $properties) . '}';
+
+ default:
+ return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+ ? 'null'
+ : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
+ }
+ }
+
+ /**
+ * array-walking function for use in generating JSON-formatted name-value pairs
+ *
+ * @param string $name name of key to use
+ * @param mixed $value reference to an array element to be encoded
+ *
+ * @return string JSON-formatted name-value pair, like '"name":value'
+ * @access private
+ */
+ function name_value($name, $value)
+ {
+ $encoded_value = $this->encode($value);
+
+ if(Services_JSON::isError($encoded_value)) {
+ return $encoded_value;
+ }
+
+ return $this->encode(strval($name)) . ':' . $encoded_value;
+ }
+
+ /**
+ * reduce a string by removing leading and trailing comments and whitespace
+ *
+ * @param $str string string value to strip of comments and whitespace
+ *
+ * @return string string value stripped of comments and whitespace
+ * @access private
+ */
+ function reduce_string($str)
+ {
+ $str = preg_replace(array(
+
+ // eliminate single line comments in '// ...' form
+ '#^\s*//(.+)$#m',
+
+ // eliminate multi-line comments in '/* ... */' form, at start of string
+ '#^\s*/\*(.+)\*/#Us',
+
+ // eliminate multi-line comments in '/* ... */' form, at end of string
+ '#/\*(.+)\*/\s*$#Us'
+
+ ), '', $str);
+
+ // eliminate extraneous space
+ return trim($str);
+ }
+
+ /**
+ * decodes a JSON string into appropriate variable
+ *
+ * @param string $str JSON-formatted string
+ *
+ * @return mixed number, boolean, string, array, or object
+ * corresponding to given JSON input string.
+ * See argument 1 to Services_JSON() above for object-output behavior.
+ * Note that decode() always returns strings
+ * in ASCII or UTF-8 format!
+ * @access public
+ */
+ function decode($str)
+ {
+ $str = $this->reduce_string($str);
+
+ switch (strtolower($str)) {
+ case 'true':
+ return true;
+
+ case 'false':
+ return false;
+
+ case 'null':
+ return null;
+
+ default:
+ $m = array();
+
+ if (is_numeric($str)) {
+ // Lookie-loo, it's a number
+
+ // This would work on its own, but I'm trying to be
+ // good about returning integers where appropriate:
+ // return (float)$str;
+
+ // Return float or int, as appropriate
+ return ((float)$str == (integer)$str)
+ ? (integer)$str
+ : (float)$str;
+
+ } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+ // STRINGS RETURNED IN UTF-8 FORMAT
+ $delim = substr($str, 0, 1);
+ $chrs = substr($str, 1, -1);
+ $utf8 = '';
+ $strlen_chrs = strlen($chrs);
+
+ for ($c = 0; $c < $strlen_chrs; ++$c) {
+
+ $substr_chrs_c_2 = substr($chrs, $c, 2);
+ $ord_chrs_c = ord($chrs{$c});
+
+ switch (true) {
+ case $substr_chrs_c_2 == '\b':
+ $utf8 .= chr(0x08);
+ ++$c;
+ break;
+ case $substr_chrs_c_2 == '\t':
+ $utf8 .= chr(0x09);
+ ++$c;
+ break;
+ case $substr_chrs_c_2 == '\n':
+ $utf8 .= chr(0x0A);
+ ++$c;
+ break;
+ case $substr_chrs_c_2 == '\f':
+ $utf8 .= chr(0x0C);
+ ++$c;
+ break;
+ case $substr_chrs_c_2 == '\r':
+ $utf8 .= chr(0x0D);
+ ++$c;
+ break;
+
+ case $substr_chrs_c_2 == '\\"':
+ case $substr_chrs_c_2 == '\\\'':
+ case $substr_chrs_c_2 == '\\\\':
+ case $substr_chrs_c_2 == '\\/':
+ if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
+ ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
+ $utf8 .= $chrs{++$c};
+ }
+ break;
+
+ case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
+ // single, escaped unicode character
+ $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
+ . chr(hexdec(substr($chrs, ($c + 4), 2)));
+ $utf8 .= $this->utf162utf8($utf16);
+ $c += 5;
+ break;
+
+ case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+ $utf8 .= $chrs{$c};
+ break;
+
+ case ($ord_chrs_c & 0xE0) == 0xC0:
+ // characters U-00000080 - U-000007FF, mask 110XXXXX
+ //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 2);
+ ++$c;
+ break;
+
+ case ($ord_chrs_c & 0xF0) == 0xE0:
+ // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 3);
+ $c += 2;
+ break;
+
+ case ($ord_chrs_c & 0xF8) == 0xF0:
+ // characters U-00010000 - U-001FFFFF, mask 11110XXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 4);
+ $c += 3;
+ break;
+
+ case ($ord_chrs_c & 0xFC) == 0xF8:
+ // characters U-00200000 - U-03FFFFFF, mask 111110XX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 5);
+ $c += 4;
+ break;
+
+ case ($ord_chrs_c & 0xFE) == 0xFC:
+ // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $c, 6);
+ $c += 5;
+ break;
+
+ }
+
+ }
+
+ return $utf8;
+
+ } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+ // array, or object notation
+
+ if ($str{0} == '[') {
+ $stk = array(SERVICES_JSON_IN_ARR);
+ $arr = array();
+ } else {
+ if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+ $stk = array(SERVICES_JSON_IN_OBJ);
+ $obj = array();
+ } else {
+ $stk = array(SERVICES_JSON_IN_OBJ);
+ $obj = new stdClass();
+ }
+ }
+
+ array_push($stk, array('what' => SERVICES_JSON_SLICE,
+ 'where' => 0,
+ 'delim' => false));
+
+ $chrs = substr($str, 1, -1);
+ $chrs = $this->reduce_string($chrs);
+
+ if ($chrs == '') {
+ if (reset($stk) == SERVICES_JSON_IN_ARR) {
+ return $arr;
+
+ } else {
+ return $obj;
+
+ }
+ }
+
+ //print("\nparsing {$chrs}\n");
+
+ $strlen_chrs = strlen($chrs);
+
+ for ($c = 0; $c <= $strlen_chrs; ++$c) {
+
+ $top = end($stk);
+ $substr_chrs_c_2 = substr($chrs, $c, 2);
+
+ if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+ // found a comma that is not inside a string, array, etc.,
+ // OR we've reached the end of the character list
+ $slice = substr($chrs, $top['where'], ($c - $top['where']));
+ array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
+ //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+ if (reset($stk) == SERVICES_JSON_IN_ARR) {
+ // we are in an array, so just push an element onto the stack
+ array_push($arr, $this->decode($slice));
+
+ } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+ // we are in an object, so figure
+ // out the property name and set an
+ // element in an associative array,
+ // for now
+ $parts = array();
+
+ if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+ // "name":value pair
+ $key = $this->decode($parts[1]);
+ $val = $this->decode($parts[2]);
+
+ if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+ $obj[$key] = $val;
+ } else {
+ $obj->$key = $val;
+ }
+ } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+ // name:value pair, where name is unquoted
+ $key = $parts[1];
+ $val = $this->decode($parts[2]);
+
+ if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+ $obj[$key] = $val;
+ } else {
+ $obj->$key = $val;
+ }
+ }
+
+ }
+
+ } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+ // found a quote, and we are not inside a string
+ array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+ //print("Found start of string at {$c}\n");
+
+ } elseif (($chrs{$c} == $top['delim']) &&
+ ($top['what'] == SERVICES_JSON_IN_STR) &&
+ ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
+ // found a quote, we're in a string, and it's not escaped
+ // we know that it's not escaped becase there is _not_ an
+ // odd number of backslashes at the end of the string so far
+ array_pop($stk);
+ //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+
+ } elseif (($chrs{$c} == '[') &&
+ in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+ // found a left-bracket, and we are in an array, object, or slice
+ array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
+ //print("Found start of array at {$c}\n");
+
+ } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+ // found a right-bracket, and we're in an array
+ array_pop($stk);
+ //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+ } elseif (($chrs{$c} == '{') &&
+ in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+ // found a left-brace, and we are in an array, object, or slice
+ array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
+ //print("Found start of object at {$c}\n");
+
+ } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+ // found a right-brace, and we're in an object
+ array_pop($stk);
+ //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+ } elseif (($substr_chrs_c_2 == '/*') &&
+ in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+ // found a comment start, and we are in an array, object, or slice
+ array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
+ $c++;
+ //print("Found start of comment at {$c}\n");
+
+ } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
+ // found a comment end, and we're in one now
+ array_pop($stk);
+ $c++;
+
+ for ($i = $top['where']; $i <= $c; ++$i)
+ $chrs = substr_replace($chrs, ' ', $i, 1);
+
+ //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+ }
+
+ }
+
+ if (reset($stk) == SERVICES_JSON_IN_ARR) {
+ return $arr;
+
+ } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+ return $obj;
+
+ }
+
+ }
+ }
+ }
+
+ /**
+ * @todo Ultimately, this should just call PEAR::isError()
+ */
+ function isError($data, $code = null)
+ {
+ if (class_exists('pear')) {
+ return PEAR::isError($data, $code);
+ } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
+ is_subclass_of($data, 'services_json_error'))) {
+ return true;
+ }
+
+ return false;
+ }
+}
+
+if (class_exists('PEAR_Error')) {
+
+ class Services_JSON_Error extends PEAR_Error
+ {
+ function Services_JSON_Error($message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null)
+ {
+ parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+ }
+ }
+
+} else {
+
+ /**
+ * @todo Ultimately, this class shall be descended from PEAR_Error
+ */
+ class Services_JSON_Error
+ {
+ function Services_JSON_Error($message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null)
+ {
+
+ }
+ }
+
+}
+
+?>
Added: trunk/lib/json/LICENSE
===================================================================
--- trunk/lib/json/LICENSE (rev 0)
+++ trunk/lib/json/LICENSE 2006-09-30 22:07:15 UTC (rev 803)
@@ -0,0 +1,21 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: trunk/src/client/chat.js.tpl.php
===================================================================
--- trunk/src/client/chat.js.tpl.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/client/chat.js.tpl.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -2,6 +2,7 @@
<?php $nick = $u->nick != "" ? addslashes($u->nick) : addslashes($c->nick); ?>
var pfc_nickname = '<?php echo ($GLOBALS["output_encoding"]=="UTF-8" ? $nick : iconv("UTF-8", $GLOBALS["output_encoding"],$nick)); ?>';
+var pfc_nickid = '<?php echo $u->nickid; ?>';
var pfc_version = '<?php echo $version; ?>';
var pfc_clientid = '<?php echo md5(uniqid(rand(), true)); ?>';
var pfc_title = '<?php echo addslashes($title); ?>';
@@ -93,6 +94,7 @@
"Click here to send your message", // _pfc
"Send", // _pfc
"You are not allowed to speak to yourself", // _pfc
+ "Close", // _pfc
);
foreach($labels_to_load as $l)
{
@@ -126,6 +128,9 @@
'images/bt_mail.gif',
'images/bt_color.gif',
'images/color_transparent.gif',
+ 'images/close-whoisbox.gif',
+ 'images/openpv.gif',
+ 'images/user-admin.gif',
);
foreach($fileurl_to_load as $f)
Modified: trunk/src/client/pfcclient.js
===================================================================
--- trunk/src/client/pfcclient.js 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/client/pfcclient.js 2006-09-30 22:07:15 UTC (rev 803)
@@ -19,7 +19,11 @@
// load the resources manager (labels and urls)
this.res = new pfcResource();
- this.nickname = pfc_nickname;
+ this.nickname = pfc_nickname;
+ this.nickid = pfc_nickid;
+ this.usermeta = $H();
+ this.chanmeta = $H();
+ this.nickwhoisbox = $H();
// this array contains all the sent command
// used the up and down key to navigate in the history
@@ -286,6 +290,8 @@
{
this.el_handle.innerHTML = param;
this.nickname = param;
+ this.usermeta[this.nickid]['nick'] = param;
+ this.updateNickBox(this.nickid);
// clear the possible error box generated by the bellow displayMsg(...) function
this.clearError(Array(this.el_words));
@@ -379,11 +385,100 @@
{
this.displayMsg( cmd, param );
}
+ else if (cmd == "whois" || cmd == "whois2")
+ {
+ var nickid = param['nickid'];
+ if (resp == "ok")
+ {
+ this.usermeta[nickid] = $H(param);
+ this.updateNickBox(nickid);
+ this.updateNickWhoisBox(nickid);
+ }
+ if (cmd == "whois")
+ {
+ // display the whois info
+ var um = this.getAllUserMeta(nickid);
+ var um_keys = um.keys();
+ var msg = '';
+ for (var i=0; i<um_keys.length; i++)
+ {
+ var k = um_keys[i];
+ var v = um[k];
+ if (v && k != 'nickid'
+ && k != 'floodtime'
+ && k != 'flood_nbmsg'
+ && k != 'flood_nbchar'
+ )
+ msg = msg + '<strong>' + k + '</strong>: ' + v + '<br/>';
+ }
+ this.displayMsg( cmd, msg );
+ }
+ }
+ else if (cmd == "who" || cmd == "who2")
+ {
+ var chan = param['chan'];
+ var chanid = param['chanid'];
+ var meta = $H(param['meta']);
+
+ if (resp == "ok")
+ {
+ this.chanmeta[chanid] = meta;
+
+ // send /whois commands for unknown users
+ for (var i=0; i<meta['users']['nickid'].length; i++)
+ {
+ var nickid = meta['users']['nickid'][i];
+ var nick = meta['users']['nick'][i];
+ var um = this.getAllUserMeta(nickid);
+ if (!um) this.sendRequest('/whois2', nick);
+ }
+
+ // update the nick list display on the current channel
+ this.updateNickListBox(chanid);
+ }
+
+ if (cmd == "who")
+ {
+ // display the whois info
+ var cm = this.getAllChanMeta(chanid);
+ var cm_keys = cm.keys();
+ var msg = '';
+ for (var i=0; i<cm_keys.length; i++)
+ {
+ var k = cm_keys[i];
+ var v = cm[k];
+ if (k != 'users')
+ {
+ msg = msg + '<strong>' + k + '</strong>: ' + v + '<br/>';
+ }
+ }
+ this.displayMsg( cmd, msg );
+ }
+ }
else
alert(cmd + "-"+resp+"-"+param);
},
+ getAllUserMeta: function(nickid)
+ {
+ return this.usermeta[nickid];
+ },
+ getUserMeta: function(nickid, key)
+ {
+ return this.usermeta[nickid][key];
+ },
+
+ getAllChanMeta: function(chanid)
+ {
+ return this.chanmeta[chanid];
+ },
+
+ getChanMeta: function(chanid, key)
+ {
+ return this.chanmeta[chanid][key];
+ },
+
doSendMessage: function()
{
var w = this.el_words;
@@ -757,64 +852,33 @@
this.el_words.focus();
},
+ updateNickBox: function(nickid)
+ {
+ // @todo optimize this function because it is called lot of times so it could cause CPU consuming on client side
+ var chanids = this.chanmeta.keys();
+ for(var i = 0; chanids.length > i; i++)
+ {
+ this.updateNickListBox(chanids[i]);
+ }
+ },
+
/**
* fill the nickname list with connected nicknames
*/
- updateNickList: function(tabid,lst)
+ updateNickListBox: function(chanid)
{
- // alert('updateNickList: tabid='+tabid+"-lst="+lst.inspect());
- //var tabid = hex_md5(_to_utf8("ch_"+recipient));
-
- this.nicklist[tabid] = lst;
- var nicks = lst;
- var nickdiv = this.gui.getOnlineContentFromTabId(tabid).firstChild;
+ var nickidlst = this.chanmeta[chanid]['users']['nickid'];
+ var nickdiv = this.gui.getOnlineContentFromTabId(chanid).firstChild;
var ul = document.createElement('ul');
- for (var i=0; i<nicks.length; i++)
+ ul.setAttribute('class', 'pfc_nicklist');
+ ul.setAttribute('className', 'pfc_nicklist'); // IE6
+ for (var i=0; i<nickidlst.length; i++)
{
- var li = document.createElement('li');
- if (nicks[i] != this.nickname)
- {
- // this is someone -> create a privmsg link
- var img = document.createElement('img');
- img.setAttribute('src', this.res.getFileUrl('images/user.gif'));
- img.alt = this.res.getLabel('Private message');
- img.title = img.alt;
- img.style.marginRight = '5px';
- var a = document.createElement('a');
- a.setAttribute('href', '');
- a.pfc_nick = nicks[i];
- a.onclick = function(){pfc.sendRequest('/privmsg', this.pfc_nick); return false;}
- a.appendChild(img);
- li.appendChild(a);
- }
- else
- {
- // this is myself -> do not create a privmsg link
- var img = document.createElement('img');
- img.setAttribute('src', this.res.getFileUrl('images/user-me.gif'));
- img.alt = '';
- img.title = img.alt;
- img.style.marginRight = '5px';
- li.appendChild(img);
- }
-
+ var nickid = nickidlst[i];
- // nobr is not xhtml valid but it's a workeround
- // for IE which doesn't support 'white-space: pre' css rule
- var nobr = document.createElement('nobr');
- var span = document.createElement('span');
- span.pfc_nick = nicks[i];
- span.onclick = function(){pfc.insert_text(this.pfc_nick+", ","",false); return false;}
- span.appendChild(document.createTextNode(nicks[i]));
- span.setAttribute('class', 'pfc_nickmarker pfc_nick_'+ hex_md5(_to_utf8(nicks[i])));
- span.setAttribute('className', 'pfc_nickmarker pfc_nick_'+ hex_md5(_to_utf8(nicks[i]))); // for IE6
-
- // Element.addClassName(span, 'pfc_nickmarker');
- // Element.addClassName(span, 'pfc_nick_'+ hex_md5(_to_utf8(nicks[i])));
- nobr.appendChild(span);
- li.appendChild(nobr);
- li.style.borderBottom = '1px solid #AAA';
-
+ var li = this.buildNickItem(nickid);
+ li.setAttribute('class', 'pfc_nickitem_'+nickid);
+ li.setAttribute('className', 'pfc_nickitem_'+nickid); // IE6
ul.appendChild(li);
}
var fc = nickdiv.firstChild;
@@ -824,7 +888,151 @@
nickdiv.appendChild(ul,fc);
this.colorizeNicks(nickdiv);
},
+
+ getNickWhoisBox: function(nickid)
+ {
+ if (!this.nickwhoisbox[nickid])
+ this.updateNickWhoisBox(nickid);
+ return this.nickwhoisbox[nickid];
+ },
+
+ updateNickWhoisBox: function(nickid)
+ {
+ var div = document.createElement('div');
+ div.setAttribute('class', 'pfc_nickwhois');
+ div.setAttribute('className', 'pfc_nickwhois'); // for IE6
+
+ var ul = document.createElement('ul');
+ div.appendChild(ul);
+
+ // add the close button
+ var li = document.createElement('li');
+ li.setAttribute('class', 'pfc_nickwhois_close');
+ li.setAttribute('className', 'pfc_nickwhois_close'); // for IE6
+ ul.appendChild(li);
+ var a = document.createElement('a');
+ a.setAttribute('href', '');
+ a.pfc_parent = div;
+ a.onclick = function(evt){
+ this.pfc_parent.style.display = 'none';
+ return false;
+ }
+ var img = document.createElement('img');
+ img.setAttribute('src', this.res.getFileUrl('images/close-whoisbox.gif'));
+ img.alt = document.createTextNode(this.res.getLabel('Close'));
+ a.appendChild(img);
+ li.appendChild(a);
+
+ // add the privmsg link (do not add it if this button is yourself)
+ if (pfc.getUserMeta(nickid,'nick') != this.nickname)
+ {
+ var li = document.createElement('li');
+ li.setAttribute('class', 'pfc_nickwhois_pv');
+ li.setAttribute('className', 'pfc_nickwhois_pv'); // for IE6
+ ul.appendChild(li);
+ var a = document.createElement('a');
+ a.setAttribute('href', '');
+ a.pfc_nickid = nickid;
+ a.pfc_parent = div;
+ a.onclick = function(evt){
+ var nick = pfc.getUserMeta(this.pfc_nickid,'nick');
+ pfc.sendRequest('/privmsg', nick);
+ this.pfc_parent.style.display = 'none';
+ return false;
+ }
+ var img = document.createElement('img');
+ img.setAttribute('src', this.res.getFileUrl('images/openpv.gif'));
+ img.alt = document.createTextNode(this.res.getLabel('Private message'));
+ a.appendChild(img);
+ a.appendChild(document.createTextNode(this.res.getLabel('Private message')));
+ li.appendChild(a);
+ }
+
+
+ // add the whois information table
+ var table = document.createElement('table');
+// table.setAttribute('cellspacing',0);
+// table.setAttribute('cellpadding',0);
+// table.setAttribute('border',0);
+ var tbody = document.createElement('tbody');
+ table.appendChild(tbody);
+ var um = this.getAllUserMeta(nickid);
+ var um_keys = um.keys();
+ var msg = '';
+ for (var i=0; i<um_keys.length; i++)
+ {
+ var k = um_keys[i];
+ var v = um[k];
+ if (v && k != 'nickid'
+ && k != 'floodtime'
+ && k != 'flood_nbmsg'
+ && k != 'flood_nbchar'
+ )
+ {
+ var tr = document.createElement('tr');
+ var td1 = document.createElement('td');
+ td1.setAttribute('class', 'pfc_nickwhois_c1');
+ td1.setAttribute('className', 'pfc_nickwhois_c1'); // for IE6
+ var td2 = document.createElement('td');
+ td2.setAttribute('class', 'pfc_nickwhois_c2');
+ td2.setAttribute('className', 'pfc_nickwhois_c2'); // for IE6
+ td1.appendChild(document.createTextNode(k));
+ td2.appendChild(document.createTextNode(v));
+ tr.appendChild(td1);
+ tr.appendChild(td2);
+ tbody.appendChild(tr);
+ }
+ }
+ div.appendChild(table);
+
+ this.nickwhoisbox[nickid] = div;
+ },
+
+ buildNickItem: function(nickid)
+ {
+ var nick = this.getUserMeta(nickid, 'nick');
+ var isadmin = this.getUserMeta(nickid, 'isadmin');
+ var li = document.createElement('li');
+
+ var img = document.createElement('img');
+ if (isadmin)
+ img.setAttribute('src', this.res.getFileUrl('images/user-admin.gif'));
+ else
+ img.setAttribute('src', this.res.getFileUrl('images/user.gif'));
+ img.style.marginRight = '5px';
+ img.setAttribute('class', 'pfc_nickbutton');
+ img.setAttribute('className', 'pfc_nickbutton'); // for IE6
+ img.pfc_nick = nick;
+ img.pfc_nickid = nickid;
+ img.onclick = function(evt){
+ var d = pfc.getNickWhoisBox(this.pfc_nickid);
+ document.body.appendChild(d);
+ d.style.display = 'block';
+ d.style.zIndex = '400';
+ d.style.position = 'absolute';
+ d.style.left = (evt.pageX-5)+'px';
+ d.style.top = (evt.pageY-5)+'px';
+ return false;
+ }
+ li.appendChild(img);
+
+ // nobr is not xhtml valid but it's a workeround
+ // for IE which doesn't support 'white-space: pre' css rule
+ var nobr = document.createElement('nobr');
+ var span = document.createElement('span');
+ span.setAttribute('class', 'pfc_nickmarker pfc_nick_'+nickid);
+ span.setAttribute('className', 'pfc_nickmarker pfc_nick_'+nickid); // for IE6
+ span.pfc_nick = nick;
+ span.pfc_nickid = nickid;
+ span.onclick = function(){pfc.insert_text(this.pfc_nick+", ","",false); return false;}
+ span.appendChild(document.createTextNode(nick));
+ nobr.appendChild(span);
+ li.appendChild(nobr);
+ li.style.borderBottom = '1px solid #AAA';
+ return li;
+ },
+
/**
* clear the nickname list
*/
@@ -1136,7 +1344,6 @@
var loginlogout_icon = $('pfc_loginlogout');
if (this.isconnected)
{
- // this.updateNickList(this.nicklist);
loginlogout_icon.src = this.res.getFileUrl('images/logout.gif');
loginlogout_icon.alt = this.res.getLabel('Disconnect');
loginlogout_icon.title = loginlogout_icon.alt;
Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/commands/connect.class.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -54,15 +54,22 @@
// setup some user meta
$nickid = $u->nickid;
// store the user ip
- $ct->setUserMeta($nickid, 'ip', $_SERVER["REMOTE_ADDR"]);
+ $ip = $_SERVER["REMOTE_ADDR"];
+ if ($ip == "::1") $ip = "127.0.0.1"; // fix for konqueror & localhost
+ $ct->setUserMeta($nickid, 'ip', $ip);
// store the admin flag
$ct->setUserMeta($nickid, 'isadmin', $isadmin);
-
+ // store the customized nick metadata
+ foreach($c->nickmeta as $k => $v)
+ $ct->setUserMeta($nickid, $k, $v);
+
// register the user (and his metadata) in the allready joined channel
foreach( $u->channels as $id => $chan )
$ct->createNick($chan["recipient"], $u->nick, $u->nickid);
foreach( $u->privmsg as $id => $pv )
$ct->createNick($pv["recipient"], $u->nick, $u->nickid);
+
+ $this->forceWhoisReload($u->nick);
// connect to the server
$xml_reponse->addScript("pfc.handleResponse('connect', 'ok', '');");
Modified: trunk/src/commands/deop.class.php
===================================================================
--- trunk/src/commands/deop.class.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/commands/deop.class.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -27,6 +27,8 @@
$container =& $c->getContainerInstance();
$nicktodeopid = $container->getNickId($nicktodeop);
$container->setUserMeta($nicktodeopid, 'isadmin', false);
+
+ $this->forceWhoisReload($nicktodeop);
}
}
Deleted: trunk/src/commands/getonlinenick.class.php
===================================================================
--- trunk/src/commands/getonlinenick.class.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/commands/getonlinenick.class.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -1,54 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__)."/../pfccommand.class.php");
-
-class pfcCommand_getonlinenick extends pfcCommand
-{
- function run(&$xml_reponse, $p)
- {
- $clientid = $p["clientid"];
- $param = $p["param"];
- $sender = $p["sender"];
- $recipient = $p["recipient"];
- $recipientid = $p["recipientid"];
-
- $c =& $this->c;
- $container =& $c->getContainerInstance();
-
- // get the cached nickname list
- $nicklist_sid = "pfc_nicklist_".$c->getId()."_".$clientid."_".$recipientid;
- $oldnicklist = isset($_SESSION[$nicklist_sid]) ? $_SESSION[$nicklist_sid] : array();
-
- // get the real nickname list
- $users = $container->getOnlineNick($recipient);
- $nicklist = array();
- if (isset($users["nick"]))
- foreach($users["nick"] as $n)
- $nicklist[] = $n;
- sort($nicklist);
-
- if ($oldnicklist != $nicklist) // check if the nickname list must be updated on the client side
- {
- $_SESSION[$nicklist_sid] = $nicklist;
-
- if ($c->debug)
- {
- $nicklist2 = implode(",",$nicklist);
- pxlog("/getonlinenick (nicklist updated - nicklist=".$nicklist2.")", "chat", $c->getId());
- }
-
- // build and send the nickname list
- $js = "";
- foreach ($nicklist as $nick)
- {
- $nickname = addslashes($nick); // must escape ' charactere for javascript string
- $js .= "'".$nickname."',";
- }
- $js = substr($js, 0, strlen($js)-1); // remove last ','
- $xml_reponse->addScript("pfc.updateNickList('".$recipientid."',Array(".$js."));");
- }
-
- }
-}
-
-?>
\ No newline at end of file
Modified: trunk/src/commands/identify.class.php
===================================================================
--- trunk/src/commands/identify.class.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/commands/identify.class.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -57,9 +57,10 @@
if ($isadmin)
{
// ok the current user is an admin, just save the isadmin flag in the metadata
- $container =& $c->getContainerInstance();
- $container->setUserMeta($u->nickid, 'isadmin', $isadmin);
-
+ $ct =& $c->getContainerInstance();
+ $ct->setUserMeta($u->nickid, 'isadmin', $isadmin);
+ $this->forceWhoisReload($u->nick);
+
$msg .= _pfc("Succesfully identified");
$xml_reponse->addScript("pfc.handleResponse('".$this->name."', 'ok', '".$msg."');");
}
Modified: trunk/src/commands/join.class.php
===================================================================
--- trunk/src/commands/join.class.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/commands/join.class.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -44,10 +44,6 @@
$u->channels[$chanid]["name"] = $channame;
$u->saveInCache();
- // clear the cached nicknames list for the given channel
- $nicklist_sid = "pfc_nicklist_".$c->getId()."_".$clientid."_".$chanid;
- $_SESSION[$nicklist_sid] = NULL;
-
// show a join message
$cmdp = $p;
$cmdp["param"] = _pfc("%s joins %s",$u->nick, $channame);
Modified: trunk/src/commands/nick.class.php
===================================================================
--- trunk/src/commands/nick.class.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/commands/nick.class.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -48,6 +48,7 @@
$container->changeNick($newnick, $oldnick);
$u->nick = $newnick;
$u->saveInCache();
+ $this->forceWhoisReload($u->nick);
// notify all the joined channels/privmsg
$cmdp = $p;
@@ -86,6 +87,7 @@
$u->nick = $newnick;
$u->active = true;
$u->saveInCache();
+ $this->forceWhoisReload($u->nick);
$xml_reponse->addScript("pfc.handleResponse('nick', 'connected', '".addslashes($newnick)."');");
Modified: trunk/src/commands/op.class.php
===================================================================
--- trunk/src/commands/op.class.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/commands/op.class.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -33,6 +33,8 @@
$container =& $c->getContainerInstance();
$nicktoopid = $container->getNickId($nicktoop);
$container->setUserMeta($nicktoopid, 'isadmin', true);
+
+ $this->forceWhoisReload($nicktoop);
}
}
Modified: trunk/src/commands/privmsg.class.php
===================================================================
--- trunk/src/commands/privmsg.class.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/commands/privmsg.class.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -73,10 +73,6 @@
$u->privmsg[$pvrecipientid]["pvnickid"] = $pvnickid;
$u->saveInCache();
- // clear the cached nicknames list for the given channel
- $nicklist_sid = "pfc_nicklist_".$c->getId()."_".$clientid."_".$pvrecipientid;
- $_SESSION[$nicklist_sid] = NULL;
-
// reset the message id indicator
// i.e. be ready to re-get all last posted messages
$from_id_sid = "pfc_from_id_".$c->getId()."_".$clientid."_".$pvrecipientid;
Modified: trunk/src/commands/update.class.php
===================================================================
--- trunk/src/commands/update.class.php 2006-09-30 19:39:55 UTC (rev 802)
+++ trunk/src/commands/update.class.php 2006-09-30 22:07:15 UTC (rev 803)
@@ -37,8 +...
[truncated message content] |
