[mxbb-commits] mx_pjirc db_install.php, 1.1, 1.2 db_upgrade.php, 1.1, 1.2 pjirc_chat.php, 1.2, 1.3 pjirc_front.php, 1.1, 1.2

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

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

Modified Files:
	db_install.php db_upgrade.php pjirc_chat.php pjirc_front.php 
Log Message:
new features, adminCP releated.

Index: pjirc_chat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_chat.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pjirc_chat.php	19 Jun 2007 01:45:37 -0000	1.2
--- pjirc_chat.php	10 Jul 2007 02:38:59 -0000	1.3
***************
*** 38,41 ****
--- 38,42 ----
    include_once($mx_module_path .'includes/common.'.$phpEx);
  
+ /*
  if ( !$userdata['session_logged_in'] )
  {
***************
*** 43,50 ****
--- 44,80 ----
  	exit;
  }
+ */
+ 
    //
    // End session management
    //
  
+ // 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);
  
***************
*** 56,60 ****
  );
  
! $nick = str_replace(" ", "_", $userdata['username']);
  
  $template->assign_vars(array(
--- 86,98 ----
  );
  
! if ( $userdata['session_logged_in'] )
! {
! 	$nick = str_replace(" ", "_", $userdata['username']);
! }
! else
! {
! 	$nick = 'Guest';
! }
! 
  
  $template->assign_vars(array(

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/db_install.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** db_install.php	7 Jun 2007 00:08:30 -0000	1.1
--- db_install.php	10 Jul 2007 02:38:59 -0000	1.2
***************
*** 34,38 ****
  }
  
! $mx_module_version = '1.0.0';
  $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>';
  
--- 34,38 ----
  }
  
! $mx_module_version = '1.0.1';
  $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>';
  
***************
*** 88,91 ****
--- 88,95 ----
  	$sql[] = "INSERT INTO " . $mx_table_prefix . "pjirc_config ( config_name , config_value ) VALUES ('show_chanlist', 'true')";
  
+ 	$sql[] = "INSERT INTO " . $mx_table_prefix . "pjirc_config ( config_name , config_value ) VALUES ('irc_allow_guests', '0')";
+ 	$sql[] = "INSERT INTO " . $mx_table_prefix . "pjirc_config ( config_name , config_value ) VALUES ('irc_guestname', 'Guest')";
+ 
+ 
  	$sql[] = "UPDATE " . $mx_table_prefix . "module" . "
  				    SET module_version  = '" . $mx_module_version . "',

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/db_upgrade.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** db_upgrade.php	7 Jun 2007 00:08:31 -0000	1.1
--- db_upgrade.php	10 Jul 2007 02:38:59 -0000	1.2
***************
*** 31,47 ****
  }
  
! $mx_module_version = '1.0.0';
  $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>';
  
- $message = "<b>Upgrading!</b><br/><br/>";
- 
  $sql = array();
  
! $sql[] = "UPDATE " . $mx_table_prefix . "module" . "
! 			    SET module_version  = '" . $mx_module_version . "',
! 			      module_copy  = '" . $mx_module_copy . "'
! 			    WHERE module_id = '" . $mx_module_id . "'";
  
! $message .= mx_do_install_upgrade( $sql );
  
  echo "<br /><br />";
--- 31,86 ----
  }
  
! $mx_module_version = '1.0.1';
  $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>';
  
  $sql = array();
  
! //
! // Precheck
! //
! if ( $result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "pjirc_config" ) )
! {
! 	//
! 	// Upgrade checks
! 	//
! 	$upgrade_101 = 0;
  
! 	//
! 	// validate before 1.01
! 	//
! 	$result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "pjirc_config WHERE config_name = 'irc_allow_guests'" );
! 	if ( $db->sql_numrows( $result ) == 0 )
! 	{
! 		$upgrade_101 = 1;
! 	}
! 
! 	$message = "<b>Upgrading!</b><br/><br/>";
! 
! 	if ( $upgrade_101 == 1 )
! 	{
! 		$message .= "<b>Upgrading to v. 1.01...</b><br/><br/>";
! 
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "pjirc_config ( config_name , config_value ) VALUES ('irc_allow_guests', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "pjirc_config ( config_name , config_value ) VALUES ('irc_guestname', 'Guest')";
! 	}
! 	else
! 	{
! 		$message .= "<b>Nothing to upgrade...</b><br/><br/>";
! 	}
! 
! 	$sql[] = "UPDATE " . $mx_table_prefix . "module" . "
! 				    SET module_version  = '" . $mx_module_version . "',
! 				      module_copy  = '" . $mx_module_copy . "'
! 				    WHERE module_id = '" . $mx_module_id . "'";
! 
! 	$message .= mx_do_install_upgrade( $sql );
! }
! else
! {
! 	//
! 	// If not installed
! 	//
! 	$message = "<b>Module is not installed...and thus cannot be upgraded ;)</b><br/><br/>";
! }
  
  echo "<br /><br />";

Index: pjirc_front.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_front.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pjirc_front.php	7 Jun 2007 00:08:35 -0000	1.1
--- pjirc_front.php	10 Jul 2007 02:38:59 -0000	1.2
***************
*** 68,80 ****
  {
  	$isimler[$i++] = $record['username'];
! 	if ($record['username']==$userdata['username'])
  	{
! 	$can_join="no";
! 	}
! 	else
  	{
! 	$can_join="yes";
  	}
  }
  
  $chatters = ( empty($isimler[1]) ? '' :
--- 68,160 ----
  {
  	$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'])
! 			{
! 				$can_join="yes";
! 			}
! 			else
! 			{
! 				$can_join="yes";
! 			}
! 		}
! 		else
! 		{  
! 			if ( $pjirc_config['show_chat_select'] )
! 			{
! 				$can_join="yes";
! 			}
! 			elseif ($record['username']==$userdata['username'])
! 			{
! 				$can_join="no";
! 			}
!         		else
! 			{
! 				$can_join="yes";
! 			}
! 		}                    
!       	}           
!       	else 
  	{
!       		if ( !$userdata['session_logged_in'] ) 
! 		{  
! 			if ($record['username']==$userdata['username'])
! 			{
! 				$can_join="no";
! 			}
! 			else
! 			{
! 				$can_join="no";
! 			}
! 		}
! 		else
! 		{  
! 			if ( $pjirc_config['show_chat_select'] )
! 			{
! 				$can_join="yes";
! 			}
! 			elseif ($record['username']==$userdata['username'])
! 			{
! 				$can_join="no";
! 			}
!         		else
! 			{
! 				$can_join="yes";
! 			}
! 		}
! 
!       	}                                                          
! }
! 
! 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]) ? '' :
***************
*** 95,111 ****
  
  
! if ( !$userdata['session_logged_in'] )
! {
! 	$template->assign_block_vars('switch_user_logged_out', array());
  }
  else
! {
  	if ( $can_join=="no")
  	{
! 	$template->assign_block_vars('switch_user_chatting', array());
  	}
  	else
  	{
! 	$template->assign_block_vars('switch_user_logged_in', array());
  	}
  }
--- 175,200 ----
  
  
! if ( !$userdata['session_logged_in'] ) 
! {  
! 	//$template->assign_block_vars('switch_user_logged_out', array());
! 
! 	if ( $can_join=="no")
! 	{
! 		$template->assign_block_vars('switch_user_logged_out_show_chat_no', array());
! 	}
! 	else
! 	{
! 		$template->assign_block_vars('switch_user_logged_out_show_chat_yes', array());
! 	}
  }
  else
! {  
  	if ( $can_join=="no")
  	{
! 		$template->assign_block_vars('switch_user_chatting', array());
  	}
  	else
  	{
! 		$template->assign_block_vars('switch_user_logged_in', array());
  	}
  }