--- pjirc.module	Fri Mar 23 22:42:30 2007
+++ pjirc.module	Fri Apr 11 10:37:24 2008
@@ -7,11 +7,11 @@
   switch ($section) {
     case 'admin/help#pjirc':
       $output = t("
-          <p>This module will display an <a href=\"%pjirc\">IRC chatroom</a> to users with the correct <a href=\"%permissions\">permissions</a>.</p>
+          <p>This module will display an <a href=\"!pjirc\">IRC chatroom</a> to users with the correct <a href=\"!permissions\">permissions</a>.</p>
           <p>To enable its use, a user needs the \"access pjirc\" permission.</p>
-          <p>You can set the server, room and guest name from the <a href=\"%settings\">pjirc settings page</a>.</p>
+          <p>You can set the server, room and guest name from the <a href=\"!settings\">pjirc settings page</a>.</p>
           <p>To enable its use, a user needs the \"access irc\" permission.</p>",
-         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.");
@@ -76,27 +76,24 @@
 /**
  * Implementation of hook_menu().
  */
-function pjirc_menu($may_cache) {
-  global $user;
+function pjirc_menu() {
+//  global $user;
   $items = array();
-  if ($may_cache) {
 
-    $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'),
+    $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' => 'pjirc',
+    $items['pjirc'] = array(
       'title' => t(variable_get("pjirc_nav_link", "chatroom")),
-      'callback' => 'pjirc_page',
-      'access' => user_access('access irc'),
+      'page callback' => 'pjirc_page',
+      'access arguments' => array('access irc'),
       'weight'   => 0);
-  }
   return $items;
 }
 
@@ -104,11 +101,13 @@
  * Menu callback; displays a Drupal page PJIRC chatroom.
  */
 function pjirc_page() {
+  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  = "<div align=\"center\">\n";
-  $output .= "<applet codebase=modules/pjirc/pjirc/ code=IRCApplet.class archive=\"irc.jar,pixx.jar\" width=500 height=400>\n";
+  $output .= "<applet codebase=\"". drupal_get_path('module','pjirc') ."/pjirc/\" code=IRCApplet.class archive=\"irc.jar,pixx.jar\" width=500 height=400>\n";
   $output .= "<param name=\"CABINETS\" value=\"irc.cab,securedirc.cab,pixx.cab\">\n";
   $output .= "<param name=\"nick\" value=\"".$pjirc_nick."\">\n";
   $output .= "<param name=\"alternatenick\" value=\"".$pjirc_nick."???\">\n";