? pjirc_head_6.patch ? pjirc/license.txt Index: pjirc.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc.info,v retrieving revision 1.1 diff -u -p -r1.1 pjirc.info --- pjirc.info 6 Mar 2007 09:36:11 -0000 1.1 +++ pjirc.info 30 Dec 2008 16:51:12 -0000 @@ -1,2 +1,4 @@ +; $Id$ name = pjirc description = Embeds the PJRIC client into drupal +core = 6.x Index: pjirc.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc.module,v retrieving revision 1.3 diff -u -p -r1.3 pjirc.module --- pjirc.module 23 Mar 2007 21:42:30 -0000 1.3 +++ pjirc.module 30 Dec 2008 16:51:13 -0000 @@ -1,4 +1,9 @@ This module will display an IRC chatroom to users with the correct permissions.

+

This module will display an IRC chatroom to users with the correct permissions.

To enable its use, a user needs the \"access pjirc\" permission.

-

You can set the server, room and guest name from the pjirc settings page.

+

You can set the server, room and guest name from the pjirc settings page.

To enable its use, a user needs the \"access irc\" permission.

", - array("%permissions" => url("admin/user/permission"), "%settings" => url("admin/settings/pjirc"), "%pjirc" => url("pjirc"))); + array("!permissions" => url("admin/user/permission"), "!settings" => url("admin/settings/pjirc"), "!pjirc" => url("pjirc"))); break; case 'admin/modules#description': $output = t("Allows you to have an IRC page using PJIRC."); @@ -23,9 +28,8 @@ function pjirc_help($section = 'admin/he /** * Implementation of hook_perm(). */ -function pjirc_perm() -{ - return array ("access irc"); +function pjirc_perm() { + return array('access irc'); } /** @@ -36,7 +40,7 @@ function pjirc_admin() { $form['pjirc_nav_link'] = array( '#type' => 'textfield', '#title' => t('Navigation link text'), - '#default_value' => variable_get('pjirc_nav_link','chatroom'), + '#default_value' => variable_get('pjirc_nav_link', 'chatroom'), '#size' => 80, '#maxlength' => 300, '#description' => t('The text that will be shown in the navigation link'), @@ -45,7 +49,7 @@ function pjirc_admin() { $form['pjirc_nick'] = array( '#type' => 'textfield', '#title' => t('Guest Nick Name'), - '#default_value' => variable_get('pjirc_nick','Guest'), + '#default_value' => variable_get('pjirc_nick', 'Guest'), '#size' => 20, '#maxlength' => 255, '#description' => t('The username assigned to guests who have not logged into Drupal'), @@ -54,7 +58,7 @@ function pjirc_admin() { $form['pjirc_server'] = array( '#type' => 'textfield', '#title' => t('IRC Server'), - '#default_value' => variable_get('pjirc_server','irc.freenode.net'), + '#default_value' => variable_get('pjirc_server', 'irc.freenode.net'), '#size' => 20, '#maxlength' => 255, '#description' => t('The IP address or hostname of the IRC server you are connecting to.'), @@ -76,27 +80,23 @@ function pjirc_admin() { /** * Implementation of hook_menu(). */ -function pjirc_menu($may_cache) { - global $user; - $items = array(); - if ($may_cache) { +function pjirc_menu() { + $items['admin/settings/pjirc'] = array( + 'title' => 'PJIRC Settings', + 'description' => 'Configure params about IRC chat settings.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('pjirc_admin'), + 'access arguments' => array('access administration pages'), + 'type' => MENU_NORMAL_ITEM, + 'weight' => 0 + ); - $items[] = array( - 'path' => 'admin/settings/pjirc', - 'title' => t("PJIRC Settings"), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('pjirc_admin'), - 'access' => user_access('access administration pages'), - 'type' => MENU_NORMAL_ITEM, - 'weight' => 0); - - $items[] = array( - 'path' => 'pjirc', - 'title' => t(variable_get("pjirc_nav_link", "chatroom")), - 'callback' => 'pjirc_page', - 'access' => user_access('access irc'), - 'weight' => 0); - } + $items['pjirc'] = array( + 'title' => variable_get("pjirc_nav_link", "chatroom"), + 'page callback' => 'pjirc_page', + 'access arguments' => array('access irc'), + 'weight' => 0 + ); return $items; } @@ -104,18 +104,19 @@ function pjirc_menu($may_cache) { * Menu callback; displays a Drupal page PJIRC chatroom. */ function pjirc_page() { - $pjirc_nick = $user->uid ? $user->name : variable_get('pjirc_nick','Guest'); - $pjirc_server = variable_get('pjirc_server',''); - $pjirc_room = variable_get('pjirc_room',''); + global $user; + $pjirc_nick = $user->uid ? $user->name : variable_get('pjirc_nick', 'Guest'); + $pjirc_server = variable_get('pjirc_server', ''); + $pjirc_room = variable_get('pjirc_room', ''); $output = "
\n"; - $output .= "\n"; + $output .= "\n"; $output .= "\n"; - $output .= "\n"; - $output .= "\n"; + $output .= "\n"; + $output .= "\n"; $output .= "\n"; $output .= "\n"; - $output .= "\n"; - $output .= "\n"; + $output .= "\n"; + $output .= "\n"; $output .= "\n"; $output .= "\n"; $output .= "\n"; @@ -155,11 +156,10 @@ function pjirc_page() { $output .= "\n"; $output .= "

If the applet does not display then click here to download a Java client.\n"; $output .= "

You can also connect using any IRC client (such as MIRC) using the following:
\n"; - $output .= "HOST: ".$pjirc_server."\n"; - $output .= "CHANNEL: ".$pjirc_room."\n"; + $output .= "HOST: ". $pjirc_server ."\n"; + $output .= "CHANNEL: ". $pjirc_room ."\n"; $output .= "\n"; print theme('page', $output); } -?> Index: pjirc/AppletWithJS.html =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/AppletWithJS.html,v retrieving revision 1.2 diff -u -p -r1.2 AppletWithJS.html --- pjirc/AppletWithJS.html 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/AppletWithJS.html 30 Dec 2008 16:51:13 -0000 @@ -9,7 +9,7 @@ - + Index: pjirc/HeavyApplet.html =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/HeavyApplet.html,v retrieving revision 1.2 diff -u -p -r1.2 HeavyApplet.html --- pjirc/HeavyApplet.html 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/HeavyApplet.html 30 Dec 2008 16:51:13 -0000 @@ -9,7 +9,7 @@ - + Index: pjirc/IRCApplet.class =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/IRCApplet.class,v retrieving revision 1.2 diff -u -p -r1.2 IRCApplet.class Binary files /tmp/cvsxfwF4V and IRCApplet.class differ Index: pjirc/NormalApplet.html =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/NormalApplet.html,v retrieving revision 1.2 diff -u -p -r1.2 NormalApplet.html --- pjirc/NormalApplet.html 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/NormalApplet.html 30 Dec 2008 16:51:13 -0000 @@ -9,7 +9,7 @@ - + Index: pjirc/SimpleApplet.html =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/SimpleApplet.html,v retrieving revision 1.2 diff -u -p -r1.2 SimpleApplet.html --- pjirc/SimpleApplet.html 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/SimpleApplet.html 30 Dec 2008 16:51:13 -0000 @@ -9,10 +9,12 @@ - + + +
Index: pjirc/english.lng =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/english.lng,v retrieving revision 1.2 diff -u -p -r1.2 english.lng --- pjirc/english.lng 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/english.lng 30 Dec 2008 16:51:14 -0000 @@ -75,8 +75,7 @@ 0506 [SERVER_LOGIN] Logging in... 0507 [SERVER_DISCONNECTED] Disconnected from %1 0508 [SERVER_ERROR] Error : %1 -0509 [SERVER_AUTOREJOIN_ATTEMPT] Attempting to rejoin channel %1... -050a [SERVER_AUTOREJOIN_FAILED] Unable to rejoin channel %1 + 071a [GUI_CHANGE_NICK] Change nick to 071b [GUI_COPY_WINDOW] Copy text Index: pjirc/french.lng =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/french.lng,v retrieving revision 1.2 diff -u -p -r1.2 french.lng --- pjirc/french.lng 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/french.lng 30 Dec 2008 16:51:14 -0000 @@ -68,15 +68,13 @@ 0406 [ABOUT_GPL] Ce programme est sous license GPL 0501 [SERVER_UNABLE_TO_CONNECT] Impossible de se connecter : %1 -0502 [SERVER_UNABLE_TO_CONNECT_STILL] Impossible de se connecter à %1, déjà en train d'essayer de se connecter à %2 +0502 [SERVER_UNABLE_TO_CONNECT_STILL] Impssible de se connecter à %1, déjà en train d'essayer de se connecter à %2 0503 [SERVER_DISCONNECTING] Déconnexion de %1 0504 [SERVER_CONNECTING] Connexion... 0505 [SERVER_NOT_CONNECTED] Non connecté 0506 [SERVER_LOGIN] Enregistrement... 0507 [SERVER_DISCONNECTED] Déconnecté de %1 0508 [SERVER_ERROR] Erreur : %1 -0509 [SERVER_AUTOREJOIN_ATTEMPT] Tentative de retour sur le canal %1... -050a [SERVER_AUTOREJOIN_FAILED] Impossible de rejoindre le canal %1 071a [GUI_CHANGE_NICK] Modifier le nick 071b [GUI_COPY_WINDOW] Copier le texte Index: pjirc/irc-unsigned.jar =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/irc-unsigned.jar,v retrieving revision 1.2 diff -u -p -r1.2 irc-unsigned.jar Binary files /tmp/cvsalS21n and irc-unsigned.jar differ Index: pjirc/irc.cab =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/irc.cab,v retrieving revision 1.2 diff -u -p -r1.2 irc.cab Binary files /tmp/cvsUnsvrS and irc.cab differ Index: pjirc/irc.jar =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/irc.jar,v retrieving revision 1.2 diff -u -p -r1.2 irc.jar Binary files /tmp/cvs35CmRm and irc.jar differ Index: pjirc/pixx-french.lng =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/pixx-french.lng,v retrieving revision 1.2 diff -u -p -r1.2 pixx-french.lng --- pjirc/pixx-french.lng 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/pixx-french.lng 30 Dec 2008 16:51:41 -0000 @@ -55,7 +55,7 @@ 870c [GUI_TIME] Heure 870d [GUI_FINGER] Infos 870e [GUI_RETREIVING_FILE] Reçoit le fichier (%1 octets) -870f [GUI_SENDING_FILE] Envoie le fichier (%1 octets) +870f [GUI_SENDING_FILE] Envoit le fichier (%1 octets) 8710 [GUI_TERMINATED] %1 terminé 8711 [GUI_FAILED] %1 échec 8712 [GUI_CLOSE] Fermer Index: pjirc/pixx-readme.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/pixx-readme.txt,v retrieving revision 1.2 diff -u -p -r1.2 pixx-readme.txt --- pjirc/pixx-readme.txt 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/pixx-readme.txt 30 Dec 2008 16:51:41 -0000 @@ -301,11 +301,6 @@ undock : undock the active source color %c : set the current color to %c. For instance /color 4,2 bold %b : set the bold status, with %b being either 1 or 0. underline %u : set the underline status, with %u being either 1 or 0. -focus %type %source : set the focus to the given source -highlight %word : add the given word into the highlight word list. Only - has effect if highlight is set to true. -unhighlight %word : remove the given word from the highlight word list. Only - has effect if highlight is set to true. Contacts -------- Index: pjirc/pixx.cab =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/pixx.cab,v retrieving revision 1.2 diff -u -p -r1.2 pixx.cab Binary files /tmp/cvs8hZ78P and pixx.cab differ Index: pjirc/pixx.jar =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/pixx.jar,v retrieving revision 1.2 diff -u -p -r1.2 pixx.jar Binary files /tmp/cvs1PolAk and pixx.jar differ Index: pjirc/pjirc.cfg =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/pjirc.cfg,v retrieving revision 1.2 diff -u -p -r1.2 pjirc.cfg --- pjirc/pjirc.cfg 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/pjirc.cfg 30 Dec 2008 16:51:45 -0000 @@ -18,7 +18,7 @@ # Mandatory parameters : nick=Plouf -fullname=PJIRC user +name=PJIRC user host=www.diboo.net gui=pixx Index: pjirc/readme.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/readme.txt,v retrieving revision 1.2 diff -u -p -r1.2 readme.txt --- pjirc/readme.txt 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/readme.txt 30 Dec 2008 16:51:46 -0000 @@ -77,11 +77,10 @@ Applet html fragment Using signed mode and the Pixx GUI, the following minimal applet fragment should work just fine : - + - + @@ -167,9 +166,9 @@ Mandatory parameters will tell the applet to use nicks such as Guest47 - fullname : "real" user name, sent to IRC server. + name : "real" user name, sent to IRC server. Example : - + host : IRC server host. Example : @@ -239,8 +238,8 @@ Optional parameters Example : - aslunknown : set the string corresponding to the unknown gender in the full - ---------- name for asl parsing. Default value is "x". + aslunknown : set the string corresponding to the unknown gender in the full name + ---------- for asl parsing. Default value is "x". Example : @@ -433,19 +432,7 @@ Optional parameters Example - autorejoin : enables the automatic channel rejoin when kicked out. By default, - ---------- autorejoin is disabled. - Example - - - initX : set the Xth initial command to be executed when the applet starts - ----- up. This is usefull when several servers needs to be automatically - joined. - - Example - - Style parameters ---------------- @@ -466,8 +453,7 @@ the engine package. All 'Style' paramete Example : - + sourcefontruleN : set the Nth source font rule. Rule syntax is ---------------- "type name fontname fontsize". @@ -501,10 +487,8 @@ the engine package. All 'Style' paramete 771 : Bottom right Example : - - + + bitmapsmileys : enable or disable bitmap smileys. Once enabled, bitmaps are ------------- defined via the smiley parameter. By default, bitmap smileys @@ -570,50 +554,36 @@ JavaScript support PJIRC is designed to support events from the "outside". The applet supports the following methods : - void sendString(String str) : - send the given string to the server, through the current source - interpretor. For instance, you can bring the channel list window by - calling sendString("/list") + void sendString(String str) : send the given string to the server, through + the current source interpretor. For instance, + you can bring the channel list window by + calling sendString("/list") - void setFieldText(String txt) : - set the textfield content. + void setFieldText(String txt) : set the textfield content. - String getFieldText() : - get the textfield content. setFieldText and getFieldText can be combined - to append text for the user. For instance, adding a smiley can be done - using setFieldText(getFieldText()+':)') + String getFieldText() : get the textfield content. setFieldText and + getFieldText can be combined to append text for the + user. For instance, adding a smiley can be done using + setFieldText(getFieldText()+':)') - void validateText() : - validate the current textfield content, as if the user pressed the return - key. - - void requestSourceFocus() : - request the active source to gain focus. - - void sendPluginEvent(String pluginName,Object event) : - send the given event value to the given plugin. - - Object getPluginValue(String pluginName,Object valueName) : - Get the plugin value from the given plugin name. - - void requestSourceFocus(String serverName,String type,String name) : - request the given source to gain focus. If serverName is empty, the first - source matching the type and name will receive focus regardless of its - server. - - void sendString(String serverName,String type,String name,String cmd) : - send the given string to the server, through the given source - interpretor. If serverName is empty, the first source matching the type - and name will receive the string, regardless of its server. + void validateText() : validate the current textfield content, as if the user + pressed the return key. + + void requestSourceFocus() : request the active source to gain focus. + + void sendPluginEvent(String pluginName,Object event) : send the given event + value to the given + plugin. + + Object getPluginValue(String pluginName,Object valueName) : Get the plugin + value from the + given plugin + name. - IRCApplication getIRCApplication() : - get the IRCApplication. For advanced use only. - Minimal html fragment --------------------- - + @@ -661,16 +631,12 @@ query %nick : query the given nickname quit [%message] : same as disconnect, but with the given message raw %command : send a raw command to the server server %host [%port [%password]] : connect to the given server -sound %soundfile : play the given sound on the client and all other clients on - the source +sound %soundfile : play the given sound on the client and all other clients on the source sleep %millis : freeze the interpretor for the given amount of milliseconds topic %channel %topic : change the given channel's topic unignore %nick : unignore the specified nick unload %plugin : unload the specified plugin url %url [%target] : open the given url on a new browser window -onserver %server command : execute the following command only if the source - server matches the specified one. This is usefull when used with the - commandX parameters. Contacts -------- @@ -678,5 +644,4 @@ Contacts PJIRC is developped by Plouf - plouf@pjirc.com Have a look at http://www.pjirc.com/ for news about PJIRC. PJIRC has an official italian website on http://www.pjirc.it -PJIRC has a CVS repository at SourceForge : - http://sourceforge.net/projects/pjirc +PJIRC has a CVS repository at SourceForge - http://sourceforge.net/projects/pjirc Index: pjirc/securedirc-unsigned.cab =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/securedirc-unsigned.cab,v retrieving revision 1.2 diff -u -p -r1.2 securedirc-unsigned.cab Binary files /tmp/cvsOy2wXN and securedirc-unsigned.cab differ Index: pjirc/securedirc.cab =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/securedirc.cab,v retrieving revision 1.2 diff -u -p -r1.2 securedirc.cab Binary files /tmp/cvsDmMEri and securedirc.cab differ Index: pjirc/versions.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pjirc/pjirc/versions.txt,v retrieving revision 1.2 diff -u -p -r1.2 versions.txt --- pjirc/versions.txt 19 Oct 2006 18:26:25 -0000 1.2 +++ pjirc/versions.txt 30 Dec 2008 16:51:48 -0000 @@ -254,18 +254,3 @@ Version history 2.1.1 : 29/11/2004 ----- Fix : applet not working on Microsoft Java Virtual Machine - - 2.2.0 : 13/06/2005 - ----- - Fix : DCC file transfert might fail due to "file size equals -1" issue - Fix : Idle information reports wrong information when idle time is greater than one hour - new "onserver" and "init" commands - added auto-rejoin channel when kicked support - joining an already-joined channel prompts it instead of just ignoring the command - the highliht list is now dynamically configurable by the user - several javascript support enhancements - several PDK enhancements - - 2.2.1 : 20/06/2005 - ----- - Fix : when kicked using the autorejoin mode, all nicknames are reported twice or more in the channel nickname list.