[mxbb-commits] mx_pjirc db_install.php, 1.3, 1.4 db_uninstall.php, 1.2, 1.3 db_upgrade.php, 1.3, 1.4 index.php, 1.2, 1.3 pjirc_chat.php, 1.4, 1.5 pjirc_faq.php, 1.2, 1.3 pjirc_front.php, 1.3, 1.4 pjirc_update.php, 1.1, 1.2

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_pjirc
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690

Modified Files:
	db_install.php db_uninstall.php db_upgrade.php index.php 
	pjirc_chat.php pjirc_faq.php pjirc_front.php pjirc_update.php 
Log Message:
upgrade

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	28 Jan 2008 21:59:55 -0000	1.2
--- index.php	9 Feb 2008 11:32:09 -0000	1.3
***************
*** 2,6 ****
  /**
  *
! * @package mxBB Portal Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006 amo,
--- 2,6 ----
  /**
  *
! * @package Mx-Publisher Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006 amo,
***************
*** 9,35 ****
  */
  
!   define('IN_PORTAL', 1);
  
!   //Turn On Error Reporting
!   //error_reporting( E_ALL );
  
!   $mx_root_path = "../../";
!   $mx_module_path = "./";
  
!   $phpEx = substr(strrchr(__FILE__, '.'), 1);
!   include_once($mx_root_path . 'common.'.$phpEx);
  
!   //
!   //Start session management
!   //
!   $mx_user->init($user_ip, PAGE_INDEX);
  
!   define('_PJIRC_CONFIG', true);
!   include_once($mx_module_path .'includes/common.'.$phpEx);
  
  /*
  if ( !$userdata['session_logged_in'] )
  {
! 	mx_redirect(append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/chat.".$phpEx, true));
  	exit;
  }
--- 9,57 ----
  */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
! {
  
! 	define('IN_PORTAL', true);
  
! 	$mx_root_path = "../../";
! 	$module_root_path = "./";
  
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1); 
! 	include_once($mx_root_path . 'common.'.$phpEx);
  
! 	//
! 	// Start session management
! 	//
! 	$mx_user->init($user_ip, PAGE_INDEX);
! 	//
! 	// End session management
! 	//
  
! 	$title = 'Media Player Radio';
! 	$block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' );
! 	$is_block = FALSE;
! }
! else
! {
! 	//
! 	// Read block Configuration
! 	//
! 
! 	$title = $mx_block->block_info['block_title'];
! 	$block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' );
! 
! 	if( is_object($mx_block))
! 	{
! 		$is_block = TRUE;
! 	}
! }
! 
! define('_PJIRC_CONFIG', true);
! include_once($mx_module_path .'includes/common.'.$phpEx);
  
  /*
  if ( !$userdata['session_logged_in'] )
  {
! 	redirect(mx_append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/chat.".$phpEx, true));
  	exit;
  }

Index: pjirc_chat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_chat.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pjirc_chat.php	8 Feb 2008 23:42:59 -0000	1.4
--- pjirc_chat.php	9 Feb 2008 11:32:09 -0000	1.5
***************
*** 2,6 ****
  /**
  *
! * @package mxBB Portal Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006 amo,
--- 2,6 ----
  /**
  *
! * @package Mx-Publisher Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006 amo,
***************
*** 19,45 ****
  ******************************************/
  
!   define('IN_PORTAL', 1);
  
!   //error_reporting( E_ALL );
!   //ini_set( 'display_errors', '1' );
  
!   $mx_root_path = "../../";
!   $mx_module_path = "./";
  
!   $phpEx = substr(strrchr(__FILE__, '.'), 1);
!   include_once($mx_root_path . 'common.'.$phpEx);
  
!   //
!   // Start session management
!   //
!   $mx_user->init($user_ip, PAGE_INDEX);
  
!   define('_PJIRC_CONFIG', true);
!   include_once($mx_module_path .'includes/common.'.$phpEx);
  
  /*
  if ( !$userdata['session_logged_in'] )
  {
! 	mx_redirect(append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true));
  	exit;
  }
--- 19,67 ----
  ******************************************/
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
! {
  
! 	define('IN_PORTAL', true);
  
! 	$mx_root_path = "../../";
! 	$module_root_path = "./";
  
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1); 
! 	include_once($mx_root_path . 'common.'.$phpEx);
  
! 	//
! 	// Start session management
! 	//
! 	$mx_user->init($user_ip, PAGE_INDEX);
! 	//
! 	// End session management
! 	//
  
! 	$title = 'Media Player Radio';
! 	$block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' );
! 	$is_block = FALSE;
! }
! else
! {
! 	//
! 	// Read block Configuration
! 	//
! 
! 	$title = $mx_block->block_info['block_title'];
! 	$block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' );
! 
! 	if( is_object($mx_block))
! 	{
! 		$is_block = TRUE;
! 	}
! } 
! 
! define('_PJIRC_CONFIG', true);
! include_once($mx_module_path .'includes/common.'.$phpEx);
  
  /*
  if ( !$userdata['session_logged_in'] )
  {
! 	mx_redirect(mx_append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true));
  	exit;
  }
***************
*** 50,81 ****
    //
  
! // Checks if guests are allowed
! if( $pjirc_config['irc_allow_guests'] )
! {
!       	if ( !$userdata['session_logged_in'] )
! 	{
!           	$nick = str_replace(" ", "_", $pjirc_config['irc_guestname']);
!       	}
!       	else
! 	{
!         	$nick = str_replace(" ", "_", $userdata['username']);
        	}
! }
! else
! {
  	if ( !$userdata['session_logged_in'] )
  	{
            	$nick = str_replace(" ", "_", $pjirc_config['irc_guestname']);
  
! 		mx_redirect(append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true));
  		exit;
  	}
!       	else
! 	{
!         	$nick = str_replace(" ", "_", $userdata['username']);
!       	}
  }
  
! $help = append_sid(PORTAL_URL . "modules/mx_pjirc/pjirc_faq.".$phpEx);
  
  $page_title = $lang['Chat_Room'];
--- 72,103 ----
    //
  
! // Checks if guests are allowed 
! if( $pjirc_config['irc_allow_guests'] ) 
! {                           
!       	if ( !$userdata['session_logged_in'] ) 
! 	{  
!           	$nick = str_replace(" ", "_", $pjirc_config['irc_guestname']);           
        	}
!       	else 
! 	{                                                           
!         	$nick = str_replace(" ", "_", $userdata['username']);                         
!       	} 
! } 
! else 
! {  
  	if ( !$userdata['session_logged_in'] )
  	{
            	$nick = str_replace(" ", "_", $pjirc_config['irc_guestname']);
  
! 		mx_redirect(mx_append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true));
  		exit;
  	}
!       	else 
! 	{                                                           
!         	$nick = str_replace(" ", "_", $userdata['username']);                         
!       	}  
  }
  
! $help = mx_append_sid(PORTAL_URL . "modules/mx_pjirc/pjirc_faq.".$phpEx);
  
  $page_title = $lang['Chat_Room'];
***************
*** 105,110 ****
  	'CHANNEL' 			=> $pjirc_config['irc_channel'],
  	'QUIT_MESSAGE' 			=> $pjirc_config['irc_quit'],
! 	 // 'S_QUIT_CHAT'		=> append_sid($module_root_path.'pjirc_drop.'.$phpEx),
! 	'S_QUIT_CHAT'			=> append_sid($module_root_path.'pjirc_update.'.$phpEx),
  	'LANG'				=> $board_config['default_lang'],
  	'HELP' 				=> $help,
--- 127,132 ----
  	'CHANNEL' 			=> $pjirc_config['irc_channel'],
  	'QUIT_MESSAGE' 			=> $pjirc_config['irc_quit'],
! 	 // 'S_QUIT_CHAT'		=> mx_append_sid($module_root_path.'pjirc_drop.'.$phpEx),
! 	'S_QUIT_CHAT'			=> mx_append_sid($module_root_path.'pjirc_update.'.$phpEx),
  	'LANG'				=> $board_config['default_lang'],
  	'HELP' 				=> $help,
***************
*** 134,136 ****
  
  $template->pparse('body');
! ?>
\ No newline at end of file
--- 156,158 ----
  
  $template->pparse('body');
! ?>

Index: pjirc_front.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_front.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pjirc_front.php	8 Feb 2008 23:43:00 -0000	1.3
--- pjirc_front.php	9 Feb 2008 11:32:09 -0000	1.4
***************
*** 2,6 ****
  /**
  *
! * @package mxBB Portal Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006 smartor, amo, OryNider
--- 2,6 ----
  /**
  *
! * @package Mx-Publisher Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006 smartor, amo, OryNider
***************
*** 69,77 ****
  	$isimler[$i++] = $record['username'];
  
! 	// Checks if guests are allowed
! 	if( $pjirc_config['irc_allow_guests'] )
! 	{
!       		if ( !$userdata['session_logged_in'] )
! 		{
  			if ($record['username']==$userdata['username'])
  			{
--- 69,77 ----
  	$isimler[$i++] = $record['username'];
  
! 	// Checks if guests are allowed 
! 	if( $pjirc_config['irc_allow_guests'] ) 
! 	{                           
!       		if ( !$userdata['session_logged_in'] ) 
! 		{  
  			if ($record['username']==$userdata['username'])
  			{
***************
*** 84,88 ****
  		}
  		else
! 		{
  			if ( $pjirc_config['show_chat_select'] )
  			{
--- 84,88 ----
  		}
  		else
! 		{  
  			if ( $pjirc_config['show_chat_select'] )
  			{
***************
*** 97,106 ****
  				$can_join="yes";
  			}
! 		}
!       	}
!       	else
  	{
!       		if ( !$userdata['session_logged_in'] )
! 		{
  			if ($record['username']==$userdata['username'])
  			{
--- 97,106 ----
  				$can_join="yes";
  			}
! 		}                    
!       	}           
!       	else 
  	{
!       		if ( !$userdata['session_logged_in'] ) 
! 		{  
  			if ($record['username']==$userdata['username'])
  			{
***************
*** 113,117 ****
  		}
  		else
! 		{
  			if ( $pjirc_config['show_chat_select'] )
  			{
--- 113,117 ----
  		}
  		else
! 		{  
  			if ( $pjirc_config['show_chat_select'] )
  			{
***************
*** 128,166 ****
  		}
  
!       	}
  }
  
  if (!isset($can_join) || empty($can_join))
  {
! 	if( $pjirc_config['irc_allow_guests'] )
! 	{
!       		if ( !$userdata['session_logged_in'] )
! 		{
  			$can_join="yes";
  		}
  		else
! 		{
  			$can_join="yes";
! 		}
! 	}
! 	else
  	{
!       		if ( !$userdata['session_logged_in'] )
! 		{
  			$can_join="no";
  		}
  		else
! 		{
  			$can_join="yes";
  		}
  	}
  }
! 
  
  $chatters = ( empty($isimler[1]) ? '' :
! 		'<a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a><br />' );
  for($s = 2; $s <= $isimler[0]; $s++)
  {
! 	$chatters .= ', <a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />';
  }
  
--- 128,166 ----
  		}
  
!       	}                                                          
  }
  
  if (!isset($can_join) || empty($can_join))
  {
! 	if( $pjirc_config['irc_allow_guests'] ) 
! 	{ 
!       		if ( !$userdata['session_logged_in'] ) 
! 		{  
  			$can_join="yes";
  		}
  		else
! 		{  
  			$can_join="yes";
! 		}                    
! 	}           
! 	else 
  	{
!       		if ( !$userdata['session_logged_in'] ) 
! 		{  
  			$can_join="no";
  		}
  		else
! 		{ 
  			$can_join="yes";
  		}
  	}
  }
!                          
  
  $chatters = ( empty($isimler[1]) ? '' :
! 		'<a href="' . mx_append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a><br />' );
  for($s = 2; $s <= $isimler[0]; $s++)
  {
! 	$chatters .= ', <a href="' . mx_append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />';
  }
  
***************
*** 175,180 ****
  
  
! if ( !$userdata['session_logged_in'] )
! {
  	//$template->assign_block_vars('switch_user_logged_out', array());
  
--- 175,180 ----
  
  
! if ( !$userdata['session_logged_in'] ) 
! {  
  	//$template->assign_block_vars('switch_user_logged_out', array());
  
***************
*** 189,193 ****
  }
  else
! {
  	if ( $can_join=="no")
  	{
--- 189,193 ----
  }
  else
! {  
  	if ( $can_join=="no")
  	{
***************
*** 217,221 ****
  	'CHATTERS_LIST'			=> $chatters_list,
  	'L_CLICK_TO_JOIN_CHAT'		=> $lang['Click_to_join_chat'],
! 	'S_JOIN_CHAT'         		=> append_sid(PORTAL_URL . 'modules/mx_pjirc/index.php'),
  	'L_LOGIN_TO_JOIN_CHAT'		=> $lang['Login_to_join_chat'],
  	'L_ALREADY_CHATTING'		=> $lang['Already_chatting'],
--- 217,221 ----
  	'CHATTERS_LIST'			=> $chatters_list,
  	'L_CLICK_TO_JOIN_CHAT'		=> $lang['Click_to_join_chat'],
! 	'S_JOIN_CHAT'         		=> mx_append_sid(PORTAL_URL . 'modules/mx_pjirc/index.php'),
  	'L_LOGIN_TO_JOIN_CHAT'		=> $lang['Login_to_join_chat'],
  	'L_ALREADY_CHATTING'		=> $lang['Already_chatting'],
***************
*** 229,231 ****
  
  unset($chatters, $block_config, $sql, $howmanychat, $chatters_list, $block_size, $module_root_path, $isimler, $can_join);
! ?>
\ No newline at end of file
--- 229,231 ----
  
  unset($chatters, $block_config, $sql, $howmanychat, $chatters_list, $block_size, $module_root_path, $isimler, $can_join);
! ?>

Index: pjirc_update.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_update.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pjirc_update.php	7 Jun 2007 00:08:36 -0000	1.1
--- pjirc_update.php	9 Feb 2008 11:32:09 -0000	1.2
***************
*** 2,6 ****
  /**
  *
! * @package mxBB Portal Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006 amo, am...@ho...
--- 2,6 ----
  /**
  *
! * @package Mx-Publisher Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006 amo, am...@ho...

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/db_install.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** db_install.php	8 Feb 2008 23:42:59 -0000	1.3
--- db_install.php	9 Feb 2008 11:32:09 -0000	1.4
***************
*** 2,6 ****
  /**
  *
! * @package mxBB Portal Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006, amo, am...@ho...
--- 2,6 ----
  /**
  *
! * @package Mx-Publisher Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006, amo, am...@ho...
***************
*** 111,113 ****
  echo "</table><br />";
  
! ?>
\ No newline at end of file
--- 111,113 ----
  echo "</table><br />";
  
! ?>

Index: pjirc_faq.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_faq.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pjirc_faq.php	8 Feb 2008 23:42:59 -0000	1.2
--- pjirc_faq.php	9 Feb 2008 11:32:09 -0000	1.3
***************
*** 2,6 ****
  /**
  *
! * @package mxBB Portal Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2001-2007 The phpBB Group, su...@ph...
--- 2,6 ----
  /**
  *
! * @package Mx-Publisher Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2001-2007 The phpBB Group, su...@ph...
***************
*** 13,17 ****
    $mx_root_path = "../../";
    $mx_module_path = "./";
!   $phpEx = substr(strrchr(__FILE__, '.'), 1);
    include_once($mx_root_path . 'common.'.$phpEx);
  
--- 13,17 ----
    $mx_root_path = "../../";
    $mx_module_path = "./";
!   $phpEx = substr(strrchr(__FILE__, '.'), 1); 
    include_once($mx_root_path . 'common.'.$phpEx);
  
***************
*** 19,23 ****
  // Start session management
  //
! $mx_user->init($user_ip, PAGE_INDEX);
  //
  // End session management
--- 19,23 ----
  // Start session management
  //
! $mx_user->init($user_ip, PAGE_INDEX); 
  //
  // End session management
***************
*** 101,105 ****
  				'ROW_COLOR' => '#' . $row_color,
  				'ROW_CLASS' => $row_class,
! 				'FAQ_QUESTION' => $faq_block[$i][$j]['question'],
  				'FAQ_ANSWER' => $faq_block[$i][$j]['answer'],
  
--- 101,105 ----
  				'ROW_COLOR' => '#' . $row_color,
  				'ROW_CLASS' => $row_class,
! 				'FAQ_QUESTION' => $faq_block[$i][$j]['question'], 
  				'FAQ_ANSWER' => $faq_block[$i][$j]['answer'],
  
***************
*** 112,116 ****
  				'FAQ_LINK' => $faq_block[$i][$j]['question'],
  
! 				'U_FAQ_LINK' => append_sid(PORTAL_URL . 'modules/mx_pjirc/pjirc_faq.php' . '#' . $faq_block[$i][$j]['id']) )
  			);
  		}
--- 112,116 ----
  				'FAQ_LINK' => $faq_block[$i][$j]['question'],
  
! 				'U_FAQ_LINK' => mx_append_sid(PORTAL_URL . 'modules/mx_pjirc/pjirc_faq.php' . '#' . $faq_block[$i][$j]['id']) )
  			);
  		}
***************
*** 122,124 ****
  include($mx_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 122,125 ----
  include($mx_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
! 

Index: db_uninstall.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/db_uninstall.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** db_uninstall.php	8 Feb 2008 23:42:59 -0000	1.2
--- db_uninstall.php	9 Feb 2008 11:32:09 -0000	1.3
***************
*** 2,6 ****
  /**
  *
! * @package mxBB Portal Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006, amo, am...@ho...
--- 2,6 ----
  /**
  *
! * @package Mx-Publisher Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2004-2006, amo, am...@ho...
***************
*** 13,17 ****
  {
    $mx_root_path = '../../';
!   $phpEx = substr(strrchr(__FILE__, '.'), 1);
    include($mx_root_path . 'common.'.$phpEx);
  
--- 13,17 ----
  {
    $mx_root_path = '../../';
!   $phpEx = substr(strrchr(__FILE__, '.'), 1); 
    include($mx_root_path . 'common.'.$phpEx);
  
***************
*** 62,64 ****
  echo '<tr><td class="row1"  align="center"><span class="gen">' . $message . '</span></td></tr>';
  echo '</table>&nbsp;<br />';
! ?>
\ No newline at end of file
--- 62,64 ----
  echo '<tr><td class="row1"  align="center"><span class="gen">' . $message . '</span></td></tr>';
  echo '</table>&nbsp;<br />';
! ?>

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/db_upgrade.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** db_upgrade.php	8 Feb 2008 23:42:59 -0000	1.3
--- db_upgrade.php	9 Feb 2008 11:32:09 -0000	1.4
***************
*** 2,6 ****
  /**
  *
! * @package mxBB Portal Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team
--- 2,6 ----
  /**
  *
! * @package Mx-Publisher Module - mx_pjirc
  * @version $Id$
  * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team
***************
*** 90,92 ****
  echo "</table><br />";
  
! ?>
\ No newline at end of file
--- 90,92 ----
  echo "</table><br />";
  
! ?>