Index: cgiirc.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cgiirc/cgiirc.info,v retrieving revision 1.1 diff -u -p -r1.1 cgiirc.info --- cgiirc.info 19 Dec 2007 19:07:23 -0000 1.1 +++ cgiirc.info 4 Feb 2009 14:25:48 -0000 @@ -1,6 +1,7 @@ name = cgiirc description = Embeds the CGI:IRC client into drupal - +core = 6.x +php = 4.x version = "0.5.9" project = "cgiirc" Index: cgiirc.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cgiirc/cgiirc.module,v retrieving revision 1.6 diff -u -p -r1.6 cgiirc.module --- cgiirc.module 6 Feb 2008 22:56:16 -0000 1.6 +++ cgiirc.module 4 Feb 2009 14:25:48 -0000 @@ -4,8 +4,8 @@ /** * This is a Dupal hack for CGI:IRC */ -function cgiirc_help($section = 'admin/help#cgiirc') { - switch ($section) { +function cgiirc_help($path, $arg) { + switch ($path) { case 'admin/help#cgiirc': $output = t("
This module will display an IRC chatroom to users with the correct permissions.
@@ -103,27 +103,22 @@ function cgiirc_admin() { /** * Implementation of hook_menu(). */ -function cgiirc_menu($may_cache) { - global $user; +function cgiirc_menu() { $items = array(); - if ($may_cache) { - - $items[] = array( - 'path' => 'admin/settings/cgiirc', - 'title' => t("CGIIRC Settings"), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('cgiirc_admin'), - 'access' => user_access('access administration pages'), - 'type' => MENU_NORMAL_ITEM, - 'weight' => 0); - - $items[] = array( - 'path' => 'cgiirc', - 'title' => t(variable_get("cgiirc_nav_link", "IRC Chat")), - 'callback' => 'cgiirc_page', - 'access' => user_access('access irc'), - 'weight' => 0); - } + $items['admin/settings/cgiirc'] = array( + 'title' => 'CGIIRC Settings', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('cgiirc_admin'), + 'access arguments' => array('administer site configuration'), + 'type' => MENU_NORMAL_ITEM, + 'weight' => 0 + ); + $items['cgiirc'] = array( + 'title' => variable_get('cgiirc_nav_link', 'IRC Chat'), + 'page callback' => 'cgiirc_page', + 'access arguments' => array('access irc'), + 'weight' => 0 + ); return $items; } @@ -132,6 +127,9 @@ function cgiirc_menu($may_cache) { */ function cgiirc_page() { global $user; + + $cgiirc_path = $base_url . drupal_get_path('module','cgiirc'); + $cgiirc_server = variable_get('cgiirc_server',''); $cgiirc_room = variable_get('cgiirc_room',''); $cgiirc_port = variable_get('cgiirc_port',''); @@ -140,7 +138,7 @@ global $user; $cgiirc_height = variable_get('cgiirc_height',''); $output = "