mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core/includes mx_functions.php,1.97,1.98

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

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25933

Modified Files:
	mx_functions.php 
Log Message:
fix

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** mx_functions.php	18 Oct 2008 11:46:32 -0000	1.97
--- mx_functions.php	26 Oct 2008 04:00:48 -0000	1.98
***************
*** 966,970 ****
  		if( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, "Couldn't get list of groups", '', __LINE__, __FILE__, $sql);
  		}
  
--- 966,970 ----
  		if( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, "Couldn't get list of groups", '', __LINE__, __FILE__, $sql);
  		}
  

[mxbb-commits] core/includes/sessions/phpbb3 core.php,1.14,1.15

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

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25825

Modified Files:
	core.php 
Log Message:
get all grops exept both and guests

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** core.php	4 Oct 2008 07:04:25 -0000	1.14
--- core.php	26 Oct 2008 04:00:04 -0000	1.15
***************
*** 809,816 ****
  	function generate_group_select_sql()
  	{
! 		$sql = "SELECT group_id, group_name
! 			FROM " . GROUPS_TABLE . "
! 			WHERE group_name NOT IN ('BOTS', 'GUESTS')
! 			ORDER BY group_name ASC";
  		return $sql;
  	}
--- 809,817 ----
  	function generate_group_select_sql()
  	{
! 		// Get us all the groups exept bots and guests
! 		$sql = "SELECT g.group_id, g.group_name, g.group_type
! 			FROM " . GROUPS_TABLE . " g
! 			WHERE g.group_name NOT IN ('BOTS', 'GUESTS')
! 			ORDER BY g.group_type ASC, g.group_name";			
  		return $sql;
  	}

[mxbb-commits] mx_pafiledb/pafiledb/modules pa_email.php, 1.21, 1.22

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

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25286

Modified Files:
	pa_email.php 
Log Message:
is not id but file_id

Index: pa_email.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_email.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** pa_email.php	21 Sep 2008 14:25:29 -0000	1.21
--- pa_email.php	26 Oct 2008 03:52:28 -0000	1.22
***************
*** 170,174 ****
  				$emailer->reset();
  
! 				$message = $lang['Econf'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( 'action=file&id=' . $file_id ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_forum'], '<a href="' . mx_append_sid( $mx_root_path . 'index.' . $phpEx ) . '">', '</a>' );
  				mx_message_die( GENERAL_MESSAGE, $message );
  			}
--- 170,174 ----
  				$emailer->reset();
  
! 				$message = $lang['Econf'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( 'action=file&file_id=' . $file_id ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_forum'], '<a href="' . mx_append_sid( $mx_root_path . 'index.' . $phpEx ) . '">', '</a>' );
  				mx_message_die( GENERAL_MESSAGE, $message );
  			}

[mxbb-commits] core/includes mx_functions_style.php,1.102,1.103

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

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10862

Modified Files:
	mx_functions_style.php 
Log Message:
fix

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** mx_functions_style.php	9 Oct 2008 02:41:36 -0000	1.102
--- mx_functions_style.php	25 Oct 2008 22:37:55 -0000	1.103
***************
*** 796,800 ****
  					break;
  					case 'phpbb2':
! 						$style = $mx_request_vars->post('user_style', MX_TYPE_INT, $this->data['user_style']);
  					break;				
  					case 'phpbb3':
--- 796,816 ----
  					break;
  					case 'phpbb2':
! 						$user_style = $mx_request_vars->post('user_style', MX_TYPE_INT, $this->data['user_style']);
! 						//If user have other style in mxp then the one from phpBB not to have forum page and modules graphics will be messaed up
! 						//Anonymouse users should see all block graphic corect
! 						//Query MXP style_id corepondent to phpBB themes_id 
! 						$sql = "SELECT m.themes_id 
! 							FROM " . MX_THEMES_TABLE . " AS m, " . THEMES_TABLE . " AS t 
! 							WHERE t.themes_id = " . (int) $user_style . " 
! 								AND t.template_name = m.template_name"; 
! 
! 						if ($row = $db->sql_fetchrow($db->sql_query($sql))) 
! 						{ 
! 							$style = $row['themes_id']; //User style 
! 						}             
! 						else 
! 						{ 
! 							$style = $portal_config['default_style'];                
! 						}                     
  					break;				
  					case 'phpbb3':

[mxbb-commits] mx_counter mx_counter.php,1.3,1.4

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

Update of /cvsroot/mxbb/mx_counter
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17797

Modified Files:
	mx_counter.php 
Log Message:
fix

Index: mx_counter.php
===================================================================
RCS file: /cvsroot/mxbb/mx_counter/mx_counter.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_counter.php	19 Jun 2008 10:49:19 -0000	1.3
--- mx_counter.php	25 Oct 2008 02:40:41 -0000	1.4
***************
*** 91,97 ****
  
  		$numdigits = strlen($newcount);
  
  		//set each digit to default 0
! 		for ($a=0;$a<$digits;$a++)
  		{
  			$img[$a] = "$imagedirectory";
--- 91,99 ----
  
  		$numdigits = strlen($newcount);
+ 		
+ 		$digits = ($digits < $numdigits) ? $numdigits : $digits;
  
  		//set each digit to default 0
! 		for ($a=0; $a<$digits; $a++)
  		{
  			$img[$a] = "$imagedirectory";

[mxbb-commits] mx_contact/admin admin_mass_newsletter.php,1.1,1.2

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

Update of /cvsroot/mxbb/mx_contact/admin
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25837

Modified Files:
	admin_mass_newsletter.php 
Log Message:


Index: admin_mass_newsletter.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/admin/admin_mass_newsletter.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_mass_newsletter.php	4 Oct 2008 08:03:18 -0000	1.1
--- admin_mass_newsletter.php	23 Oct 2008 02:36:53 -0000	1.2
***************
*** 227,248 ****
  		}
  
! 		/*
! 		$sendloops = ceil((count($bcc_list)-1)/500); 
! 		$sendstart = 0; 
! 		for ($j = 0; $j <= $sendloops; $j++) 
! 		{ 
! 			$emailer = new emailer($board_config['smtp_delivery']);
  		
- 			$emailer->from($board_config['board_email']);
- 			$emailer->replyto($board_config['board_email']);
- 	
- 			for ($i = $sendstart; ($i < count($bcc_list)) && ($i < ($sendstart + 500)); $i++) 
- 			{
- 				$emailer->bcc($bcc_list[$i]);
- 			}
- 			
- 			$sendstart = $sendstart + 500; 
- 		} 
- 		*/
  		
  		$email_headers = 'Return-Path: ' . $userdata['board_email'] . "\nFrom: " . $board_config['board_email'] . "\n";
--- 227,233 ----
  		}
  
! 
! 		$emailer = new emailer($board_config['smtp_delivery']);
  		
  		
  		$email_headers = 'Return-Path: ' . $userdata['board_email'] . "\nFrom: " . $board_config['board_email'] . "\n";

[mxbb-commits] mx_contact/includes contact_attach.php,1.1,1.2

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

Update of /cvsroot/mxbb/mx_contact/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16917

Modified Files:
	contact_attach.php 
Log Message:


Index: contact_attach.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/includes/contact_attach.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** contact_attach.php	12 Dec 2007 18:41:43 -0000	1.1
--- contact_attach.php	22 Oct 2008 23:50:09 -0000	1.2
***************
*** 34,38 ****
  	//
  	$attachment = !empty($attachment) ? strtolower(urlencode(basename($HTTP_POST_FILES['attachment']['name']))) : '';
! 	$attach = $server_url . $script_path . "/" . trim($contact_config['contact_file_root']) . "/" . decode_ip($user_ip) . "/" . $attachment;
  }
  else
--- 34,38 ----
  	//
  	$attachment = !empty($attachment) ? strtolower(urlencode(basename($HTTP_POST_FILES['attachment']['name']))) : '';
! 	$attach = $server_url . $script_path . "/" . trim($contact_config['contact_file_root']) . "/" . contact_contact_decode_ip($user_ip) . "/" . $attachment;
  }
  else
***************
*** 48,55 ****
  	// Generate a random Filename
  	$attachment = !empty($attachment) ? strtolower(md5(mt_rand() * time())  . "." . $extn) : '';
! 	$attach = $server_url . $script_path . "/" . trim($contact_config['contact_file_root']) . "/" . decode_ip($user_ip) . "/" . $attachment;
  }
  
! $delete_link = sprintf("\n" . $lang['Remove_file'], $server_url . $script_name . "?delete=" . decode_ip($user_ip) . "/" . $attachment . "\n");
  
  //
--- 48,55 ----
  	// Generate a random Filename
  	$attachment = !empty($attachment) ? strtolower(md5(mt_rand() * time())  . "." . $extn) : '';
! 	$attach = $server_url . $script_path . "/" . trim($contact_config['contact_file_root']) . "/" . contact_decode_ip($user_ip) . "/" . $attachment;
  }
  
! $delete_link = sprintf("\n" . $lang['Remove_file'], $server_url . $script_name . "?delete=" . contact_decode_ip($user_ip) . "/" . $attachment . "\n");
  
  //
***************
*** 126,130 ****
  		$CF_general_message = 1;
  	}
! 	elseif(file_exists(@phpbb_realpath($phpbb_root_path . $contact_config['contact_file_root'] . "/" . decode_ip($user_ip) . "/" . $attachment)))
  	{
  		$CF_attach_file_exists = $_br . $lang['Attach-File_exists'];
--- 126,130 ----
  		$CF_general_message = 1;
  	}
! 	elseif(file_exists(@phpbb_realpath($phpbb_root_path . $contact_config['contact_file_root'] . "/" . contact_decode_ip($user_ip) . "/" . $attachment)))
  	{
  		$CF_attach_file_exists = $_br . $lang['Attach-File_exists'];
***************
*** 253,257 ****
  	error_check();
  
! 	if(!file_exists(@phpbb_realpath($module_root_path . $contact_config['contact_file_root'] . "/" . decode_ip($user_ip))))
  	{
  		if(!file_exists(@phpbb_realpath($module_root_path . $contact_config['contact_file_root'] . "/")))
--- 253,257 ----
  	error_check();
  
! 	if(!file_exists(@phpbb_realpath($module_root_path . $contact_config['contact_file_root'] . "/" . contact_decode_ip($user_ip))))
  	{
  		if(!file_exists(@phpbb_realpath($module_root_path . $contact_config['contact_file_root'] . "/")))
***************
*** 262,273 ****
  				@fclose($fd);
  		}
! 		@mkdir($module_root_path . $contact_config['contact_file_root'] . "/" . decode_ip($user_ip), 0755);
  	}
  
  	if(@is_uploaded_file($HTTP_POST_FILES['attachment']['tmp_name']))
  	{
! 		@move_uploaded_file($HTTP_POST_FILES['attachment']['tmp_name'],  $module_root_path . $contact_config['contact_file_root'] . "/" . decode_ip($user_ip) . "/" . $attachment);
  
! 		$fa =	@fopen($module_root_path . $contact_config['contact_file_root'] . "/" . decode_ip($user_ip) . "/index.html", 'a');
  			@fclose($fa);
  
--- 262,273 ----
  				@fclose($fd);
  		}
! 		@mkdir($module_root_path . $contact_config['contact_file_root'] . "/" . contact_decode_ip($user_ip), 0755);
  	}
  
  	if(@is_uploaded_file($HTTP_POST_FILES['attachment']['tmp_name']))
  	{
! 		@move_uploaded_file($HTTP_POST_FILES['attachment']['tmp_name'],  $module_root_path . $contact_config['contact_file_root'] . "/" . contact_decode_ip($user_ip) . "/" . $attachment);
  
! 		$fa =	@fopen($module_root_path . $contact_config['contact_file_root'] . "/" . contact_decode_ip($user_ip) . "/index.html", 'a');
  			@fclose($fa);
  

[mxbb-commits] mx_contact mx_newsletter.php,1.2,1.3

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

Update of /cvsroot/mxbb/mx_contact
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16753

Modified Files:
	mx_newsletter.php 
Log Message:


Index: mx_newsletter.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/mx_newsletter.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mx_newsletter.php	22 Oct 2008 23:45:17 -0000	1.2
--- mx_newsletter.php	22 Oct 2008 23:47:29 -0000	1.3
***************
*** 242,246 ****
  	if($contact_config['contact_permit_attachments'] == 1)
  	{
! 		require($module_root_path . 'includes/contact_attach'.$phpEx);
  	}
  	// Stage 5
--- 242,246 ----
  	if($contact_config['contact_permit_attachments'] == 1)
  	{
! 		require($module_root_path . 'includes/contact_attach.'.$phpEx);
  	}
  	// Stage 5

[mxbb-commits] mx_contact mx_newsletter.php,1.1,1.2

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

Update of /cvsroot/mxbb/mx_contact
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16651

Modified Files:
	mx_newsletter.php 
Log Message:
fix

Index: mx_newsletter.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/mx_newsletter.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_newsletter.php	4 Oct 2008 08:03:20 -0000	1.1
--- mx_newsletter.php	22 Oct 2008 23:45:17 -0000	1.2
***************
*** 242,246 ****
  	if($contact_config['contact_permit_attachments'] == 1)
  	{
! 		require($module_root_path . 'includes/newsletter_attach.'.$phpEx);
  	}
  	// Stage 5
--- 242,246 ----
  	if($contact_config['contact_permit_attachments'] == 1)
  	{
! 		require($module_root_path . 'includes/contact_attach'.$phpEx);
  	}
  	// Stage 5

[mxbb-commits] core/includes mx_functions.php,1.96,1.97

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

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8974

Modified Files:
	mx_functions.php 
Log Message:
function update_portal_backend() fixed to keep curent utf status with internal backend if user plan to install phpbb3

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** mx_functions.php	4 Oct 2008 18:01:29 -0000	1.96
--- mx_functions.php	18 Oct 2008 11:46:32 -0000	1.97
***************
*** 2463,2467 ****
  	*/	
  	
! 	$new_backend = ($new_backend) ? $new_backend  : 'internal';	
  	
  	$process_msgs[] = 'Writing config ...<br />';
--- 2463,2481 ----
  	*/	
  	
! 	$new_backend = ($new_backend) ? $new_backend  : 'internal';
! 	
! 	switch ($new_backend)
! 	{
! 		case 'internal':
! 		case 'phpbb2':
! 
! 			$utf_status = defined('UTF_STATUS') ? UTF_STATUS : $new_backend;
! 		break;
! 
! 		case 'phpbb3':
! 
! 			$utf_status = $new_backend;
! 		break;
! 	}	
  	
  	$process_msgs[] = 'Writing config ...<br />';
***************
*** 2476,2480 ****
  	$config_data .= '$'."dbpasswd = '$dbpasswd';\n\n";
  	$config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n";
! 	$config_data .= "define('UTF_STATUS', '$new_backend');\n\n";	
  	$config_data .= "define('MX_INSTALLED', true);\n\n";
  	$config_data .= '?' . '>';	// Done this to prevent highlighting editors getting confused!
--- 2490,2494 ----
  	$config_data .= '$'."dbpasswd = '$dbpasswd';\n\n";
  	$config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n";
! 	$config_data .= "define('UTF_STATUS', '$utf_status');\n\n";	
  	$config_data .= "define('MX_INSTALLED', true);\n\n";
  	$config_data .= '?' . '>';	// Done this to prevent highlighting editors getting confused!

[mxbb-commits] mx_pafiledb/pafiledb/admin admin_ug_auth_manage.php, 1.10, 1.11

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

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/admin
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7462

Modified Files:
	admin_ug_auth_manage.php 
Log Message:
select all groups phpbb2 and phpbb3

Index: admin_ug_auth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_ug_auth_manage.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** admin_ug_auth_manage.php	16 Oct 2008 22:57:34 -0000	1.10
--- admin_ug_auth_manage.php	16 Oct 2008 23:37:18 -0000	1.11
***************
*** 78,86 ****
  			if ( $mode == 'user' )
  			{
! 				$sql = "SELECT g.group_id
! 					FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 					WHERE ug.user_id = $user_id
! 					AND g.group_id = ug.group_id
! 					AND g.group_single_user = '1'";
  				if ( !( $result = $db->sql_query( $sql ) ) )
  				{
--- 78,105 ----
  			if ( $mode == 'user' )
  			{
! 				switch (PORTAL_BACKEND)
! 				{
! 					case 'internal':
! 					case 'phpbb2':
! 						
! 						$sql = "SELECT g.group_id
! 							FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 							WHERE ug.user_id = $user_id
! 								AND g.group_id = ug.group_id
! 								AND g.group_single_user = '1'";					
! 								
! 					break;
! 
! 					case 'phpbb3':
! 						
! 						$sql = "SELECT g.group_id
! 							FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 								LEFT JOIN " . USERS_TABLE . " u ON (ug.group_id = u.group_id)
! 							WHERE ug.user_id = $user_id
! 								AND g.group_id = ug.group_id";						
! 								
! 					break;
! 				}			
! 			
  				if ( !( $result = $db->sql_query( $sql ) ) )
  				{
***************
*** 105,109 ****
  			}
  
! 			$sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = " . true : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id";
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
--- 124,143 ----
  			}
  
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 				case 'phpbb2':
! 					
! 					$sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = " . true : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id";					
! 							
! 				break;
! 
! 				case 'phpbb3':
! 					
! 					$sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g LEFT JOIN " . USERS_TABLE . " u ON (ug.group_id = u.group_id) WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id" : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id";						
! 							
! 				break;
! 			}			
! 			
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
***************
*** 244,252 ****
  			if ( $mode == 'global_user' )
  			{
! 				$sql = "SELECT g.group_id
! 					FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 					WHERE ug.user_id = $user_id
! 					AND g.group_id = ug.group_id
! 					AND g.group_single_user = '1'";
  				if ( !( $result = $db->sql_query( $sql ) ) )
  				{
--- 278,306 ----
  			if ( $mode == 'global_user' )
  			{
! 			
! 				switch (PORTAL_BACKEND)
! 				{
! 					case 'internal':
! 					case 'phpbb2':
! 					
! 						$sql = "SELECT g.group_id
! 							FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 							WHERE ug.user_id = $user_id
! 								AND g.group_id = ug.group_id
! 								AND g.group_single_user = '1'";						
! 							
! 					break;
! 
! 					case 'phpbb3':
! 					
! 						$sql = "SELECT g.group_id
! 							FROM " . GROUPS_TABLE . " g
! 								LEFT JOIN " . USER_GROUP_TABLE . " ug ON (ug.group_id = g.group_id)
! 							WHERE ug.user_id = " . $user_id . "
! 							ORDER BY g.group_type DESC, g.group_id DESC";						
! 							
! 					break;
! 				}								
! 					
  				if ( !( $result = $db->sql_query( $sql ) ) )
  				{
***************
*** 384,389 ****
  			// Front end
  
! 			$sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE ";
! 			$sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id";
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
--- 438,468 ----
  			// Front end
  
! 				
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 				case 'phpbb2':
! 				
! 					$sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user 
! 						FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug 
! 						WHERE ";
! 
! 					$sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id";						
! 						
! 				break;
! 
! 				case 'phpbb3':
! 				
! 					$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
! 						FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
! 						WHERE ";
! 						
! 					$sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id" : "ug.group_id = $group_id AND u.user_id = ug.user_id";
! 					
! 					$sql .= " ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean";						
! 						
! 				break;
! 			}				
! 				
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
***************
*** 396,401 ****
  			}
  			$db->sql_freeresult( $result );
  
- 			$sql = ( $mode == 'user' ) ? "SELECT aa.*, g.group_single_user FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = 1" : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id";
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
--- 475,504 ----
  			}
  			$db->sql_freeresult( $result );
+ 			
+ 			switch (PORTAL_BACKEND)
+ 			{
+ 				case 'internal':
+ 				case 'phpbb2':
+ 				
+ 					$sql = ( $mode == 'user' ) ? "SELECT aa.*, g.group_single_user FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = 1" : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id";					
+ 				break;
+ 
+ 				case 'phpbb3':
+ 				
+ 					$sql_user = 'SELECT aa.*, g.group_name, g.group_id, g.group_type
+ 						FROM ' . GROUPS_TABLE . ' g, ' . PA_AUTH_ACCESS_TABLE . ' aa
+ 							LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id)
+ 						WHERE ug.user_id = ' . $user_id . '
+ 							AND g.group_id = aa.group_id
+ 						ORDER BY g.group_type DESC, g.group_id DESC';
+ 
+ 					$sql_group = 'SELECT * 
+ 						FROM ' . PA_AUTH_ACCESS_TABLE . ' 
+ 						WHERE group_id = ' . $group_id;				
+ 
+ 					$sql = ( $mode == 'user' ) ? $sql_user : $sql_group;											
+ 				break;
+ 			}			
  
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
***************
*** 598,607 ****
  
  			if ( $mode == 'global_user' )
! 			{
! 				$sql = "SELECT g.group_id
! 					FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 					WHERE ug.user_id = $user_id
! 					AND g.group_id = ug.group_id
! 					AND g.group_single_user = '1'";
  				if ( !( $result = $db->sql_query( $sql ) ) )
  				{
--- 701,727 ----
  
  			if ( $mode == 'global_user' )
! 			{		
! 				switch (PORTAL_BACKEND)
! 				{
! 					case 'internal':
! 
! 					case 'phpbb2':
! 						$sql = "SELECT g.group_id
! 							FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 							WHERE ug.user_id = $user_id
! 								AND g.group_id = ug.group_id
! 								AND g.group_single_user = '1'";						
! 					break;
! 
! 					case 'phpbb3':
! 					
! 						$sql = "SELECT g.group_id
! 							FROM " . GROUPS_TABLE . " g
! 								LEFT JOIN " . USER_GROUP_TABLE . " ug ON (ug.group_id = g.group_id)
! 							WHERE ug.user_id = " . $user_id . "
! 							ORDER BY g.group_type DESC, g.group_id DESC";						
! 					break;
! 				}								
! 					
  				if ( !( $result = $db->sql_query( $sql ) ) )
  				{
***************
*** 613,618 ****
  			}
  
! 			$sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE ";
! 			$sql .= ( $mode == 'global_user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id";
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
--- 733,773 ----
  			}
  
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 
! 				case 'phpbb2':
! 					$sql_user = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user 
! 						FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug 
! 						WHERE u.user_id = $user_id 
! 							AND ug.user_id = u.user_id 
! 							AND g.group_id = ug.group_id"
! 					$sql_group = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user 
! 						FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug 
! 						WHERE g.group_id = $group_id 
! 							AND ug.group_id = g.group_id 
! 							AND u.user_id = ug.user_id"; 							
! 
! 				break;
! 
! 				case 'phpbb3':
! 					$sql_user = 'SELECT u.*, g.group_name, g.group_id, g.group_type
! 						FROM ' . USERS_TABLE . ' u, ' . GROUPS_TABLE . ' g
! 							LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id)
! 						WHERE u.user_id = ' . $user_id . '
! 							AND ug.user_id = u.user_id 
! 						ORDER BY g.group_type DESC, g.group_id DESC';
! 
! 					$sql_group = 'SELECT u.*, g.group_name, g.group_id, g.group_type
! 						FROM ' . USERS_TABLE . ' u, ' . GROUPS_TABLE . ' g
! 							LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id)
! 						WHERE g.group_id = ' . $group_id . '
! 							AND ug.user_id = u.user_id 
! 						ORDER BY g.group_type DESC, g.group_id DESC';
! 				break;
! 			}				
! 
! 			$sql = ( $mode == 'global_user' ) ? $sql_user : $sql_group;				
! 			
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
***************
*** 626,631 ****
  			$db->sql_freeresult( $result );
  
! 			$sql = ( $mode == 'global_user' ) ? "SELECT aa.*, g.group_single_user FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = 1 AND aa.cat_id = '0'" : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id AND cat_id = '0'";
! 			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
  				mx_message_die( GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql );
--- 781,819 ----
  			$db->sql_freeresult( $result );
  
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 
! 				case 'phpbb2':
! 					$sql_user = "SELECT aa.*, g.group_single_user 
! 						FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g 
! 						WHERE ug.user_id = $user_id 
! 							AND g.group_id = ug.group_id 
! 							AND aa.group_id = ug.group_id 
! 							AND g.group_single_user = 1 
! 							AND aa.cat_id = '0'" 		
! 
! 				break;
! 
! 				case 'phpbb3':
! 					$sql_user = "SELECT aa.*, g.group_id 
! 						FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u 
! 						WHERE ug.user_id = $user_id 
! 							AND u.group_id = ug.group_id
! 							AND g.group_id = ug.group_id 
! 							AND aa.group_id = ug.group_id
! 							AND aa.cat_id = 0
! 						ORDER BY g.group_type DESC, g.group_id DESC";
! 				break;
! 			}
! 			
! 			$sql_group = 'SELECT * 
! 				FROM ' . PA_AUTH_ACCESS_TABLE . ' 
! 				WHERE group_id = ' . $group_id . '
! 					AND cat_id = 0';
! 					
! 			$sql = ($mode == 'global_user') ? $sql_user : $sql_group;					
! 			
! 			if ( !($result = $db->sql_query($sql)) )
  			{
  				mx_message_die( GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql );

[mxbb-commits] mx_pafiledb/pafiledb/admin admin_ug_auth_manage.php, 1.9, 1.10

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

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/admin
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5410

Modified Files:
	admin_ug_auth_manage.php 
Log Message:
select all groups phpbb2 and phpbb3

Index: admin_ug_auth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_ug_auth_manage.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin_ug_auth_manage.php	15 Jul 2008 22:07:06 -0000	1.9
--- admin_ug_auth_manage.php	16 Oct 2008 22:57:34 -0000	1.10
***************
*** 822,843 ****
  			else
  			{
! 				$sql = "SELECT group_id, group_name
! 					FROM " . GROUPS_TABLE . "
! 					WHERE group_single_user <> " . true;
! 				if ( !( $result = $db->sql_query( $sql ) ) )
  				{
! 					mx_message_die( GENERAL_ERROR, "Couldn't get group list", "", __LINE__, __FILE__, $sql );
! 				}
  
! 				if ( $row = $db->sql_fetchrow( $result ) )
! 				{
! 					$select_list = '<select name="' . POST_GROUPS_URL . '">';
! 					do
! 					{
! 						$select_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
! 					}
! 					while ( $row = $db->sql_fetchrow( $result ) );
! 					$select_list .= '</select>';
  				}
  
  				$template->assign_vars( array( 'S_AUTH_SELECT' => $select_list ) );
--- 822,877 ----
  			else
  			{
! 			
! 				switch (PORTAL_BACKEND)
  				{
! 					case 'internal':
  
! 					case 'phpbb2':
! 					
! 						// Get us all the groups
! 						$sql = "SELECT group_id, group_name
! 							FROM " . GROUPS_TABLE . "
! 							WHERE group_single_user <> " . true;
! 						if ( !( $result = $db->sql_query( $sql ) ) )
! 						{
! 							mx_message_die( GENERAL_ERROR, "Couldn't get group list", "", __LINE__, __FILE__, $sql );
! 						}
! 
! 						if ( $row = $db->sql_fetchrow( $result ) )
! 						{
! 							$select_list = '<select name="' . POST_GROUPS_URL . '">';
! 							do
! 							{
! 								$select_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
! 							}
! 							while ( $row = $db->sql_fetchrow( $result ) );
! 							$select_list .= '</select>';
! 						}
! 					break;
! 
! 					case 'phpbb3':
! 
! 						// Get us all the groups
! 						$sql = 'SELECT g.group_id, g.group_name, g.group_type
! 							FROM ' . GROUPS_TABLE . ' g
! 							ORDER BY g.group_type ASC, g.group_name';
! 						if ( !( $result = $db->sql_query( $sql ) ) )
! 						{
! 							mx_message_die( GENERAL_ERROR, "Couldn't get group list", "", __LINE__, __FILE__, $sql );
! 						}
! 
! 						if ( $row = $db->sql_fetchrow( $result ) )
! 						{
! 							$select_list = '<select name="' . POST_GROUPS_URL . '">';
! 							do
! 							{
! 								$select_list .= ($row['group_type'] == GROUP_SPECIAL) ? '<option value="' . $row['group_id'] . '">' . $user->lang['G_' . $row['group_name']] . '</option>' : '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
! 							}
! 							while ( $row = $db->sql_fetchrow( $result ) );
! 							$select_list .= '</select>';
! 						}
! 					break;
  				}
+ 			
  
  				$template->assign_vars( array( 'S_AUTH_SELECT' => $select_list ) );

[mxbb-commits] mx_pafiledb/pafiledb/includes functions.php, 1.51, 1.52

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

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27713

Modified Files:
	functions.php 
Log Message:
set_config() update

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** functions.php	7 Oct 2008 04:24:51 -0000	1.51
--- functions.php	15 Oct 2008 16:41:22 -0000	1.52
***************
*** 31,53 ****
  	 * @param unknown_type $config_value
  	 */
! 	function set_config( $config_name, $config_value )
  	{
! 		global $pafiledb_cache, $pafiledb_config, $db;
! 
! 		$sql = "UPDATE " . PA_CONFIG_TABLE . " SET
! 			config_value = '" . str_replace( "\'", "''", $config_value ) . "'
! 			WHERE config_name = '$config_name'";
  
! 		if ( !$db->sql_query( $sql ) )
! 		{
! 			mx_message_die( GENERAL_ERROR, "Failed to update pafiledb configuration for $config_name", "", __LINE__, __FILE__, $sql );
! 		}
  
! 		if ( !$db->sql_affectedrows() && !isset( $pafiledb_config[$config_name] ) )
  		{
! 			$sql = 'INSERT INTO ' . PA_CONFIG_TABLE . " (config_name, config_value)
! 				VALUES ('$config_name', '" . str_replace( "\'", "''", $config_value ) . "')";
! 
! 			if ( !$db->sql_query( $sql ) )
  			{
  				mx_message_die( GENERAL_ERROR, "Failed to update pafiledb configuration for $config_name", "", __LINE__, __FILE__, $sql );
--- 31,48 ----
  	 * @param unknown_type $config_value
  	 */
! 	function set_config($config_name, $config_value)
  	{
! 		global $db, $pafiledb_cache, $pafiledb_config;
  
! 		$sql = 'UPDATE ' . PA_CONFIG_TABLE . "
! 			SET config_value = '" . $db->sql_escape($config_value) . "'
! 			WHERE config_name = '" . $db->sql_escape($config_name) . "'";
  
! 		if (!@$db->sql_query($sql) && !isset($pafiledb_config[$config_name]))
  		{
! 			$sql = 'INSERT INTO ' . PA_CONFIG_TABLE . ' ' . $db->sql_build_array('INSERT', array(
! 				'config_name'	=> $config_name,
! 				'config_value'	=> $config_value));
! 			if (!@$db->sql_query($sql))
  			{
  				mx_message_die( GENERAL_ERROR, "Failed to update pafiledb configuration for $config_name", "", __LINE__, __FILE__, $sql );

[mxbb-commits] mx_pafiledb db_install.php,1.38,1.39

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

Update of /cvsroot/mxbb/mx_pafiledb
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17827

Modified Files:
	db_install.php 
Log Message:
schema fix for pafiledb to allow fresh install on mysqli, based on someting I write for phpbb.ro

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/db_install.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** db_install.php	5 Jul 2008 21:57:31 -0000	1.38
--- db_install.php	14 Oct 2008 11:38:57 -0000	1.39
***************
*** 61,114 ****
  		// Table structure for table `pa_cat`
  		"CREATE TABLE " . $mx_table_prefix . "pa_cat (
! 			  cat_id int(10) NOT NULL auto_increment,
! 			  cat_name text,
! 			  cat_desc text,
! 			  cat_parent int(50) default NULL,
! 			  parents_data text NOT NULL default '',
! 			  cat_order int(50) default NULL,
! 			  cat_allow_file tinyint(2) NOT NULL default '0',
! 
! 			  cat_allow_comments tinyint(2) NOT NULL default '-1',
! 			  internal_comments tinyint(2) NOT NULL default '-1',
! 			  autogenerate_comments tinyint(2) NOT NULL default '-1',
! 			  comments_forum_id mediumint(8) NOT NULL DEFAULT '-1',
! 
! 		      cat_allow_ratings tinyint(2) NOT NULL default '-1',
! 
! 		      show_pretext tinyint(2) NOT NULL default '-1',
! 
! 			  notify tinyint(2) NOT NULL default '-1',
! 			  notify_group mediumint(8) NOT NULL default '-1',
! 
! 			  cat_files mediumint(8) NOT NULL default '-1',
! 			  cat_last_file_id mediumint(8) unsigned NOT NULL default '0',
! 			  cat_last_file_name varchar(255) NOT NULL default '',
! 			  cat_last_file_time INT(50) UNSIGNED NOT NULL default '0',
! 
! 			  auth_view tinyint(2) NOT NULL default '0',
! 			  auth_read tinyint(2) NOT NULL default '0',
! 			  auth_view_file tinyint(2) NOT NULL default '0',
! 			  auth_edit_file tinyint(2) NOT NULL default '0',
! 			  auth_delete_file tinyint(2) NOT NULL default '2',
! 			  auth_upload tinyint(2) NOT NULL default '0',
! 			  auth_download tinyint(2) NOT NULL default '0',
! 			  auth_rate tinyint(2) NOT NULL default '0',
! 			  auth_email tinyint(2) NOT NULL default '0',
! 			  auth_view_comment tinyint(2) NOT NULL default '0',
! 			  auth_post_comment tinyint(2) NOT NULL default '0',
! 			  auth_edit_comment tinyint(2) NOT NULL default '0',
! 			  auth_delete_comment tinyint(2) NOT NULL default '0',
! 			  auth_approval tinyint(2) NOT NULL default '0',
! 			  auth_approval_edit tinyint(2) NOT NULL default '0',
! 
! 			  PRIMARY KEY  (cat_id),
! 			  KEY cat_order (cat_order)
!  		)",
  
  		//
  		// Insert
  		//
! 		"INSERT INTO " . $mx_table_prefix . "pa_cat VALUES (1, 'My Category', '',                      '', '', '', 0, '-1', '-1', '-1', '-1', '-1', '-1', '-1', '-1', '-1', 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)",
! 		"INSERT INTO " . $mx_table_prefix . "pa_cat VALUES (2, 'Test Cagegory', 'Just a test category', 1, '', '', 1, '-1', '-1', '-1', '-1', '-1', '-1', '-1', '-1', '-1', 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)",
  
  		// --------------------------------------------------------
--- 61,106 ----
  		// Table structure for table `pa_cat`
  		"CREATE TABLE " . $mx_table_prefix . "pa_cat (
! 		  `cat_id` int(10) NOT NULL auto_increment,
! 		  `cat_name` mediumtext,
! 		  `cat_desc` mediumtext,
! 		  `cat_parent` int(50) default NULL,
! 		  `parents_data` mediumtext,
! 		  `cat_order` int(50) default NULL,
! 		  `cat_allow_file` tinyint(2) NOT NULL default '0',
! 		  `cat_allow_ratings` tinyint(2) NOT NULL default '-1',
! 		  `cat_allow_comments` tinyint(2) NOT NULL default '-1',
! 		  `cat_files` mediumint(8) NOT NULL default '-1',
! 		  `cat_last_file_id` mediumint(8) unsigned NOT NULL default '0',
! 		  `cat_last_file_name` varchar(255) default NULL,
! 		  `cat_last_file_time` int(50) unsigned NOT NULL default '0',
! 		  `auth_view` tinyint(2) NOT NULL default '0',
! 		  `auth_read` tinyint(2) NOT NULL default '0',
! 		  `auth_view_file` tinyint(2) NOT NULL default '0',
! 		  `auth_edit_file` tinyint(2) NOT NULL default '0',
! 		  `auth_delete_file` tinyint(2) NOT NULL default '2',
! 		  `auth_upload` tinyint(2) NOT NULL default '0',
! 		  `auth_download` tinyint(2) NOT NULL default '0',
! 		  `auth_rate` tinyint(2) NOT NULL default '0',
! 		  `auth_email` tinyint(2) NOT NULL default '0',
! 		  `auth_view_comment` tinyint(2) NOT NULL default '0',
! 		  `auth_post_comment` tinyint(2) NOT NULL default '0',
! 		  `auth_edit_comment` tinyint(2) NOT NULL default '0',
! 		  `auth_delete_comment` tinyint(2) NOT NULL default '0',
! 		  `auth_approval` tinyint(2) NOT NULL default '0',
! 		  `internal_comments` tinyint(2) NOT NULL default '-1',
! 		  `autogenerate_comments` tinyint(2) NOT NULL default '-1',
! 		  `comments_forum_id` mediumint(8) NOT NULL default '-1',
! 		  `show_pretext` tinyint(2) NOT NULL default '-1',
! 		  `notify` tinyint(2) NOT NULL default '-1',
! 		  `notify_group` mediumint(8) NOT NULL default '-1',
! 		  `auth_approval_edit` tinyint(2) NOT NULL default '0',
! 		  PRIMARY KEY  (`cat_id`)
! 		) ENGINE=MyISAM", 
  
  		//
  		// Insert
  		//
! 		"INSERT INTO " . $mx_table_prefix . "pa_cat (`cat_id`, `cat_name`, `cat_desc`, `cat_parent`, `parents_data`, `cat_order`, `cat_allow_file`, `cat_allow_ratings`, `cat_allow_comments`, `cat_files`, `cat_last_file_id`, `cat_last_file_name`, `cat_last_file_time`, `auth_view`, `auth_read`, `auth_view_file`, `auth_edit_file`, `auth_delete_file`, `auth_upload`, `auth_download`, `auth_rate`, `auth_email`, `auth_view_comment`, `auth_post_comment`, `auth_edit_comment`, `auth_delete_comment`, `auth_approval`, `internal_comments`, `autogenerate_comments`, `comments_forum_id`, `show_pretext`, `notify`, `notify_group`, `auth_approval_edit`) VALUES(1, 'My Category', '', 0, '', 0, 0, -1, -1, -1, 0, '-1', 0, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)",
! 		"INSERT INTO " . $mx_table_prefix . "pa_cat (`cat_id`, `cat_name`, `cat_desc`, `cat_parent`, `parents_data`, `cat_order`, `cat_allow_file`, `cat_allow_ratings`, `cat_allow_comments`, `cat_files`, `cat_last_file_id`, `cat_last_file_name`, `cat_last_file_time`, `auth_view`, `auth_read`, `auth_view_file`, `auth_edit_file`, `auth_delete_file`, `auth_upload`, `auth_download`, `auth_rate`, `auth_email`, `auth_view_comment`, `auth_post_comment`, `auth_edit_comment`, `auth_delete_comment`, `auth_approval`, `internal_comments`, `autogenerate_comments`, `comments_forum_id`, `show_pretext`, `notify`, `notify_group`, `auth_approval_edit`) VALUES(2, 'Test Cagegory', 'Just a test category', 1, '', 0, 1, -1, -1, -1, 0, '-1', 0, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)",		
  
  		// --------------------------------------------------------
***************
*** 161,188 ****
  		// Table structure for table `phpbb_pa_comments`
  		"CREATE TABLE " . $mx_table_prefix . "pa_comments (
! 			  comments_id int(10) NOT NULL auto_increment,
! 			  file_id int(10) NOT NULL default '0',
! 			  comments_text text NOT NULL,
! 			  comments_title text NOT NULL,
! 			  comments_time int(50) NOT NULL default '0',
! 			  comment_bbcode_uid varchar(10) default NULL,
! 			  poster_id mediumint(8) NOT NULL default '0',
! 			  PRIMARY KEY  (comments_id),
! 			  KEY comments_id (comments_id),
! 			  FULLTEXT KEY comment_bbcode_uid (comment_bbcode_uid)
! 		)",
! 
! 		// --------------------------------------------------------
! 		// Table structure for table `phpbb_pa_custom`
! 		"CREATE TABLE " . $mx_table_prefix . "pa_custom (
! 			  custom_id int(50) NOT NULL auto_increment,
! 			  custom_name text NOT NULL,
! 			  custom_description text NOT NULL,
! 			  data text NOT NULL,
! 			  field_order int(20) NOT NULL default '0',
! 			  field_type tinyint(2) NOT NULL default '0',
! 			  regex varchar(255) NOT NULL default '',
! 			  PRIMARY KEY  (custom_id)
! 		)",
  
  		// --------------------------------------------------------
--- 153,167 ----
  		// Table structure for table `phpbb_pa_comments`
  		"CREATE TABLE " . $mx_table_prefix . "pa_comments (
! 			  `comments_id` int(10) NOT NULL auto_increment,
! 			  `file_id` int(10) NOT NULL default '0',
! 			  `comments_text` mediumtext,
! 			  `comments_title` mediumtext,
! 			  `comments_time` int(50) NOT NULL default '0',
! 			  `comment_bbcode_uid` varchar(10) default NULL,
! 			  `poster_id` mediumint(8) NOT NULL default '0',
! 			  PRIMARY KEY  (`comments_id`),
! 			  KEY `comments_id` (`comments_id`),
! 			  FULLTEXT KEY `comment_bbcode_uid` (`comment_bbcode_uid`)
! 		) ENGINE=MyISAM",
  
  		// --------------------------------------------------------

[mxbb-commits] core/templates/prosilver/theme/images whosonline.gif, NONE, 1.1

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

Update of /cvsroot/mxbb/core/templates/prosilver/theme/images
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23508/theme/images

Added Files:
	whosonline.gif 
Log Message:
for compatibility with some modules who require this image

--- NEW FILE: whosonline.gif ---
(This appears to be a binary file; contents omitted.)

[mxbb-commits] core/templates/prosilver prosilver.cfg,1.9,1.10

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

Update of /cvsroot/mxbb/core/templates/prosilver
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23508

Modified Files:
	prosilver.cfg 
Log Message:
for compatibility with some modules who require this image

Index: prosilver.cfg
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/prosilver.cfg,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** prosilver.cfg	6 Sep 2008 04:42:33 -0000	1.9
--- prosilver.cfg	14 Oct 2008 05:40:59 -0000	1.10
***************
*** 67,70 ****
--- 67,71 ----
  $mx_images['mx_graphics']['phpbb_icons'] 	= !empty($current_template_path) && file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( !empty($cloned_template_path) && file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" :  $default_template_path . "/images");
  $mx_images['mx_graphics']['mx_icons']		= !empty($current_template_path) && file_exists( $mx_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( !empty($cloned_template_path) && file_exists( $mx_root_path . $cloned_template_path . "/images" ) ? cloned_template_path . "/images" :  $default_template_path . "/images");
+ $mx_images['mx_graphics']['theme_icons'] 	= file_exists( $mx_root_path . $current_template_path . "/theme/images" ) ? $current_template_path . "/theme/images" : ( file_exists( $mx_root_path . $cloned_template_path . "/theme/images" ) ? $cloned_template_path . "/theme/images" : $default_template_path . "/theme/images" );
  
  //
***************
*** 78,81 ****
--- 79,83 ----
  $current_template_phpbb_images 				= PHPBB_URL . $mx_images['mx_graphics']['phpbb_icons']; // phpBB graphics template
  $current_template_theme_images 				= PORTAL_URL . $mx_images['mx_graphics']['mx_icons'];
+ $current_template_style_images 				= PORTAL_URL . $mx_images['mx_graphics']['theme_icons'];
  
  //
***************
*** 259,262 ****
  // Online Block
  //
! $mx_images['mx_who_is_online'] =  "$current_template_theme_images/whosonline.gif";
  ?>
--- 261,264 ----
  // Online Block
  //
! $mx_images['mx_who_is_online'] =  "$current_template_style_images/whosonline.gif";
  ?>

[mxbb-commits] core/modules/mx_users/admin admin_groupcp.php, 1.6, 1.7 admin_prune_users.php, 1.4, 1.5 admin_userlist.php, 1.4, 1.5

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

Update of /cvsroot/mxbb/core/modules/mx_users/admin
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20838

Modified Files:
	admin_groupcp.php admin_prune_users.php admin_userlist.php 
Log Message:


Index: admin_prune_users.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_prune_users.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_prune_users.php	30 Sep 2008 07:04:54 -0000	1.4
--- admin_prune_users.php	14 Oct 2008 04:46:52 -0000	1.5
***************
*** 346,351 ****
  			{
  
! 			include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! 			$emailer = new emailer($board_config['smtp_delivery']);
  
  			$emailer->from($board_config['board_email']);
--- 346,351 ----
  			{
  
! 			include($mx_root_path . 'includes/mx_functions_emailer.'.$phpEx);
! 			$emailer = new mx_emailer($board_config['smtp_delivery']);
  
  			$emailer->from($board_config['board_email']);

Index: admin_groupcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_groupcp.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_groupcp.php	30 Sep 2008 07:04:54 -0000	1.6
--- admin_groupcp.php	14 Oct 2008 04:46:52 -0000	1.7
***************
*** 727,732 ****
  						$group_name = $group_name_row['group_name'];
  
! 						include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! 						$emailer = new emailer($board_config['smtp_delivery']);
  
  						$emailer->from($board_config['board_email']);
--- 727,732 ----
  						$group_name = $group_name_row['group_name'];
  
! 						include($mx_root_path . 'includes/mx_functions_emailer.'.$phpEx);
! 						$emailer = new mx_emailer($board_config['smtp_delivery']);
  
  						$emailer->from($board_config['board_email']);

Index: admin_userlist.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_userlist.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_userlist.php	30 Sep 2008 07:04:55 -0000	1.4
--- admin_userlist.php	14 Oct 2008 04:46:52 -0000	1.5
***************
*** 554,559 ****
  			$group_id = $mx_request_vars->post(POST_GROUPS_URL, MX_TYPE_INT);
  
! 			include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! 			$emailer = new emailer($board_config['smtp_delivery']);
  
  			$i = 0;
--- 554,559 ----
  			$group_id = $mx_request_vars->post(POST_GROUPS_URL, MX_TYPE_INT);
  
! 			include($mx_root_path . 'includes/mx_functions_emailer.'.$phpEx);
! 			$emailer = new mx_emailer($board_config['smtp_delivery']);
  
  			$i = 0;

[mxbb-commits] core/includes mx_functions_tools.php,1.46,1.47

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

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20706

Modified Files:
	mx_functions_tools.php 
Log Message:


Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** mx_functions_tools.php	14 Oct 2008 04:41:42 -0000	1.46
--- mx_functions_tools.php	14 Oct 2008 04:43:40 -0000	1.47
***************
*** 1979,1983 ****
  	function _mailer()
  	{
! 	   global $db, $lang, $user_ip, $board_config, $userdata, $phpbb_root_path, $phpEx, $mx_bbcode;
  
  	   //
--- 1979,1983 ----
  	function _mailer()
  	{
! 	   global $db, $lang, $user_ip, $board_config, $userdata, $phpbb_root_path, $mx_root_path, $phpEx, $mx_bbcode;
  
  	   //

[mxbb-commits] core/includes mx_functions_tools.php,1.45,1.46

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

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20650

Modified Files:
	mx_functions_tools.php 
Log Message:


Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** mx_functions_tools.php	4 Oct 2008 07:04:25 -0000	1.45
--- mx_functions_tools.php	14 Oct 2008 04:41:42 -0000	1.46
***************
*** 2040,2045 ****
  	    // Include and initiate mailer
  	    //
! 	    include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! 	    $emailer = new emailer($board_config['smtp_delivery']);
  
  	    //
--- 2040,2045 ----
  	    // Include and initiate mailer
  	    //
! 	    include($mx_root_path . 'includes/mx_functions_emailer.'.$phpEx);
! 	    $emailer = new mx_emailer($board_config['smtp_delivery']);
  
  	    //

[mxbb-commits] mx_glance/templates/_core glance_body.tpl,1.2,1.3

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

Update of /cvsroot/mxbb/mx_glance/templates/_core
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25018/templates/_core

Modified Files:
	glance_body.tpl 
Log Message:
fix

Index: glance_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_glance/templates/_core/glance_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** glance_body.tpl	24 Jan 2008 18:51:07 -0000	1.2
--- glance_body.tpl	12 Oct 2008 01:28:42 -0000	1.3
***************
*** 1,3 ****
! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;">
  	<!-- BEGIN no_glance_news_and_recent -->
  	<tr>
--- 1,4 ----
! <div class="textbody">
! <table cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;">
  	<!-- BEGIN no_glance_news_and_recent -->
  	<tr>
***************
*** 83,85 ****
  	</tr>
  	<!-- END switch_glance_recent -->
! </table>
\ No newline at end of file
--- 84,87 ----
  	</tr>
  	<!-- END switch_glance_recent -->
! </table>
! </div>
\ No newline at end of file

[mxbb-commits] mx_glance mx_glance.php,1.20,1.21

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

Update of /cvsroot/mxbb/mx_glance
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25018

Modified Files:
	mx_glance.php 
Log Message:
fix

Index: mx_glance.php
===================================================================
RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mx_glance.php	20 Jul 2008 00:58:38 -0000	1.20
--- mx_glance.php	12 Oct 2008 01:28:41 -0000	1.21
***************
*** 978,982 ****
  		'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'],
  		'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'],  
! 		'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ),
  		'L_BACK_TO_TOP' => ( !empty($lang['Back_to_top']) ? $lang['Back_to_top'] : 'Back to Top' )
  ));
--- 978,982 ----
  		'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'],
  		'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'],  
! 		'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '90%' ),
  		'L_BACK_TO_TOP' => ( !empty($lang['Back_to_top']) ? $lang['Back_to_top'] : 'Back to Top' )
  ));

[mxbb-commits] mx_glance/templates/subsilver2 glance_body.html, 1.1, 1.2

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

Update of /cvsroot/mxbb/mx_glance/templates/subsilver2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25018/templates/subsilver2

Modified Files:
	glance_body.html 
Log Message:
fix

Index: glance_body.html
===================================================================
RCS file: /cvsroot/mxbb/mx_glance/templates/subsilver2/glance_body.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** glance_body.html	24 Jan 2008 18:51:08 -0000	1.1
--- glance_body.html	12 Oct 2008 01:28:42 -0000	1.2
***************
*** 1,3 ****
! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;">
  	<!-- BEGIN no_glance_news_and_recent -->
  	<tr>
--- 1,4 ----
! <div class="textbody">
! <table cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;">
  	<!-- BEGIN no_glance_news_and_recent -->
  	<tr>
***************
*** 83,85 ****
  	</tr>
  	<!-- END switch_glance_recent -->
! </table>
\ No newline at end of file
--- 84,87 ----
  	</tr>
  	<!-- END switch_glance_recent -->
! </table>
! </div>
\ No newline at end of file

[mxbb-commits] mx_contact/language/lang_romanian lang_main.php, 1.1, 1.2

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

Update of /cvsroot/mxbb/mx_contact/language/lang_romanian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9320

Modified Files:
	lang_main.php 
Log Message:
fix

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/language/lang_romanian/lang_main.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lang_main.php	4 Oct 2008 08:03:20 -0000	1.1
--- lang_main.php	11 Oct 2008 04:15:03 -0000	1.2
***************
*** 20,30 ****
   ***************************************************************************/
  
! $lang['Contact_intro'] = 'Dacã aveþi comentarii, feedback sau sugestii referitoare la acest site, vã rugãm sã folosiþi acest formular pentru a contacta direct.';
  $lang['Newsletter_intro'] = 'Informatii prin email.';
  
  $lang['Username'] = 'Username';
! $lang['Real_name'] = 'Numele ºi Prenumele Dvs. ';
  $lang['Rname_require'] = 'Numele Dvs *';
! $lang['Institution'] = 'Instituþia';
  $lang['Explain_institution'] = '';
  $lang['Phone'] = 'Nr.de telefon';
--- 20,30 ----
   ***************************************************************************/
  
! $lang['Contact_intro'] = 'Dacă aveţi comentarii, feedback sau sugestii referitoare la acest site, vă rugăm să folosiţi acest formular pentru a contacta direct.';
  $lang['Newsletter_intro'] = 'Informatii prin email.';
  
  $lang['Username'] = 'Username';
! $lang['Real_name'] = 'Numele şi Prenumele Dvs. ';
  $lang['Rname_require'] = 'Numele Dvs *';
! $lang['Institution'] = 'Instituţia';
  $lang['Explain_institution'] = '';
  $lang['Phone'] = 'Nr.de telefon';
***************
*** 40,72 ****
  $lang['Agreement_explain'] = 'Da, doresc sa primesc si pe viitor articole (Debifati daca nu sunteti de acord)';
  
! $lang['Feedback'] = 'Aþi primit Feedback';
  
! $lang['Real_name_explain'] = 'Introduceþi numele dumneavoastrã de aici. Acest lucru ne ajutã sã vã contactãm.';
! $lang['Explain_email'] = 'Introduceþi adresa de e-mail aici. Acesta este utilizat în cazul în care avem nevoie sã vã rãspundem.';
! $lang['Comments_explain'] = 'Introduceþi comentariile sau feedback-ul dumneavoastrã aici.';
! $lang['Flood_explain'] = '<br /><br />Acest formular are un sistem de control împotriva flood-ului. Puteþi sã trimiteþi formularul doar o datã la fiecare %s %s.';
! $lang['Comments_limit'] = '<br /><br />Administratorul a stabilit un maxim de %s caractere permise în mesaj.';
  $lang['Attachment_explain'] = 'Post an attachment here, if required, and it will be received by the board Admin. Only files that are %sKb or lower are allowed.';
  
  $lang['Guest'] = 'Vizitator';
! $lang['Notify_IP'] = 'IP-ul Dvs. va fi logat pentru mãsuri de siguranþã.';
! $lang['Fields_required'] = 'Câmpurile cu * sunt obligatorii.';
  $lang['Contact_form'] = 'Contact Form';
  $lang['Newsletter_form'] = 'VA RUGAM SA COMPLETATI INFORMATIILE DE MAI JOS';
  $lang['Newsletter_explain'] = 'daca doriti sa primiti pe viitor cataloage si oferte.';
! $lang['Empty'] = 'Nu se specificã';
  
  $lang['hours'] = 'ore';
! $lang['hour'] = 'orã';
  
  $lang['Chars'] = ' caractere';
  
  $lang['Captcha_code'] = 'Captcha *';
! $lang['Captcha_code_explain'] = 'The rugãm confirmã codul din imagine. Acest lucru este necesar pentru a descuraja spamboþii.';
  
! $lang['Page_Not_Authorised']    	= 'Ne pare rãu, dar nu eºti autorizat sã accesezi aceastã paginã.';
! $lang['Execution_Stats'] 			= 'Pagina a generat %s querie - Timpul generãrii: %s secunde';
! $lang['Redirect_login']    			= 'Click %sAici%s sã te logezi.';
! $lang['Show_admin_options']    		= 'Aratã/Ascunde Opþiunile Admin pe Paginã: ';
  $lang['Block_updated_date'] 		= 'Updatat ';
  $lang['Block_updated_by'] 			= 'de ';
--- 40,72 ----
  $lang['Agreement_explain'] = 'Da, doresc sa primesc si pe viitor articole (Debifati daca nu sunteti de acord)';
  
! $lang['Feedback'] = 'AÅ£i primit Feedback';
  
! $lang['Real_name_explain'] = 'Introduceţi numele dumneavoastră de aici. Acest lucru ne ajută să vă contactăm.';
! $lang['Explain_email'] = 'Introduceţi adresa de e-mail aici. Acesta este utilizat în cazul în care avem nevoie să vă răspundem.';
! $lang['Comments_explain'] = 'Introduceţi comentariile sau feedback-ul dumneavoastră aici.';
! $lang['Flood_explain'] = '<br /><br />Acest formular are un sistem de control împotriva flood-ului. Puteţi să trimiteţi formularul doar o dată la fiecare %s %s.';
! $lang['Comments_limit'] = '<br /><br />Administratorul a stabilit un maxim de %s caractere permise în mesaj.';
  $lang['Attachment_explain'] = 'Post an attachment here, if required, and it will be received by the board Admin. Only files that are %sKb or lower are allowed.';
  
  $lang['Guest'] = 'Vizitator';
! $lang['Notify_IP'] = 'IP-ul Dvs. va fi logat pentru măsuri de siguranţă.';
! $lang['Fields_required'] = 'Câmpurile cu * sunt obligatorii.';
  $lang['Contact_form'] = 'Contact Form';
  $lang['Newsletter_form'] = 'VA RUGAM SA COMPLETATI INFORMATIILE DE MAI JOS';
  $lang['Newsletter_explain'] = 'daca doriti sa primiti pe viitor cataloage si oferte.';
! $lang['Empty'] = 'Nu se specifică';
  
  $lang['hours'] = 'ore';
! $lang['hour'] = 'oră';
  
  $lang['Chars'] = ' caractere';
  
  $lang['Captcha_code'] = 'Captcha *';
! $lang['Captcha_code_explain'] = 'The rugăm confirmă codul din imagine. Acest lucru este necesar pentru a descuraja spamboţii.';
  
! $lang['Page_Not_Authorised']    	= 'Ne pare rău, dar nu eşti autorizat să accesezi această pagină.';
! $lang['Execution_Stats'] 			= 'Pagina a generat %s querie - Timpul generării: %s secunde';
! $lang['Redirect_login']    			= 'Click %sAici%s să te logezi.';
! $lang['Show_admin_options']    		= 'Arată/Ascunde Opţiunile Admin pe Pagină: ';
  $lang['Block_updated_date'] 		= 'Updatat ';
  $lang['Block_updated_by'] 			= 'de ';
***************
*** 81,88 ****
  //
  $lang['Rname-Empty'] = 'Numele real nu a fost furnizat.';
! $lang['Comments-Empty'] = 'Câmpul de comentarii nu a fost complectat.';
! $lang['Comments_exceeded'] = 'Mesajul dvs. este mai mare decât este permis.';
! $lang['Email-Empty'] = 'Câmpul pentru e-mail nu a fost completat.';
! $lang['Email-Check'] = 'Adresa de e-mail care aþi furnizato nu a fost valabilã.';
  $lang['Attach-File_exists'] = 'A file already exists with that name from your IP Address.';
  $lang['Attach-Too_big'] = 'The attachment you tried to send was too big. Make sure its %sKb or lower.';
--- 81,88 ----
  //
  $lang['Rname-Empty'] = 'Numele real nu a fost furnizat.';
! $lang['Comments-Empty'] = 'Câmpul de comentarii nu a fost complectat.';
! $lang['Comments_exceeded'] = 'Mesajul dvs. este mai mare decât este permis.';
! $lang['Email-Empty'] = 'Câmpul pentru e-mail nu a fost completat.';
! $lang['Email-Check'] = 'Adresa de e-mail care aţi furnizato nu a fost valabilă.';
  $lang['Attach-File_exists'] = 'A file already exists with that name from your IP Address.';
  $lang['Attach-Too_big'] = 'The attachment you tried to send was too big. Make sure its %sKb or lower.';
***************
*** 96,108 ****
  $lang['Image_error'] = 'Upload Error - Unable to process this image!';
  $lang['Image_zip'] = 'Please zip this type of image before sending it.';
! $lang['Code_Empty'] = 'Nu aþi confirmat codul din imagine!';
! $lang['Code_Wrong'] = 'Codul care le-aþi introdus a fost incorect!';
  
! $lang['Contact_error'] = '<b>A apãrut o eroare la încercarea de a trimite feedback-ul dvs.!</b>';
  $lang['Contact_success'] = '<b>Mesajul dvs. a fost trimis cu succes!</b>';
  
! $lang['Click_return_form'] = '<br /><br />Faceþi clic %sAici%s pentru a reveni la formular.';
  
! $lang['Contact_Disabled'] = 'Formularul nu este disponibil în prezent.';
  
  //
--- 96,108 ----
  $lang['Image_error'] = 'Upload Error - Unable to process this image!';
  $lang['Image_zip'] = 'Please zip this type of image before sending it.';
! $lang['Code_Empty'] = 'Nu aţi confirmat codul din imagine!';
! $lang['Code_Wrong'] = 'Codul care le-aţi introdus a fost incorect!';
  
! $lang['Contact_error'] = '<b>A apărut o eroare la încercarea de a trimite feedback-ul dvs.!</b>';
  $lang['Contact_success'] = '<b>Mesajul dvs. a fost trimis cu succes!</b>';
  
! $lang['Click_return_form'] = '<br /><br />Faceţi clic %sAici%s pentru a reveni la formular.';
  
! $lang['Contact_Disabled'] = 'Formularul nu este disponibil în prezent.';
  
  //
***************
*** 206,214 ****
  $lang['Thank_none'] = 'Nici unul';
  $lang['Thank_members'] = 'Membrii';
! $lang['Thank_all'] = 'Toþi';
! $lang['Thankyou_limit'] = 'Ne pare rãu, nu putem accepta mai cereri de la aceastã adresã de e-mail pentru 24 de ore.';
  
  //Mass News
! $lang['All_subcribers'] = 'Toþi abonaþii';
  $lang['newsletter_mass_Explain'] = 'Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. <br />
  This modified script will send the emails in several batches. This should circumvent timeout and server-load issues. The status of the mass mail sending will be saved in the db. You can close the window, when you want to pause mass-mail-sending (the current batch will be sent out). You can later simply continue where you left off.';
--- 206,214 ----
  $lang['Thank_none'] = 'Nici unul';
  $lang['Thank_members'] = 'Membrii';
! $lang['Thank_all'] = 'Toţi';
! $lang['Thankyou_limit'] = 'Ne pare rău, nu putem accepta mai cereri de la această adresă de e-mail pentru 24 de ore.';
  
  //Mass News
! $lang['All_subcribers'] = 'Toţi abonaţii';
  $lang['newsletter_mass_Explain'] = 'Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. <br />
  This modified script will send the emails in several batches. This should circumvent timeout and server-load issues. The status of the mass mail sending will be saved in the db. You can close the window, when you want to pause mass-mail-sending (the current batch will be sent out). You can later simply continue where you left off.';

[mxbb-commits] mx_chatbox/admin admin_chatbox.php, NONE, 1.1 index_chatbox.php, NONE, 1.1

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

Update of /cvsroot/mxbb/mx_chatbox/admin
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8783/admin

Added Files:
	admin_chatbox.php index_chatbox.php 
Log Message:
fixed version

--- NEW FILE: index_chatbox.php ---
<?php
/** ------------------------------------------------------------------------
 *		Subject				: mxBB - a fully modular portal and CMS (for phpBB) 
 *		Author				: Jon Ohlsson and the mxBB Team
 *		Credits				: The phpBB Group & Marc Morisette
 *		Copyright          	: (C) 2002-2005 mxBB Portal
 *		Email             	: jo...@mx...
 *		Project site		: www.mxbb-portal.com
 * -------------------------------------------------------------------------
 * 
 *    $Id: index_chatbox.php,v 1.1 2008/10/11 04:04:34 orynider Exp $
 */

/**
 * This program is free software; you can redistribute it and/or modify
 *    it under the terms of the GNU General Public License as published by
 *    the Free Software Foundation; either version 2 of the License, or
 *    (at your option) any later version.
 */

/**
 * mxNN Notes:
 *    This file is borrowed from phpBB, with some modifications
 */

//
// Security and Page header
//
define('IN_PORTAL', 1);
$mx_root_path = './../';
require($mx_root_path . 'extension.inc');
$no_page_header = TRUE;
require('./pagestart.' . $phpEx);


// ------------------------------
// DEBUG ONLY ;-)
//
//error_reporting(E_ALL);
// ------------------------------


// ---------------
// Begin functions
//
function inarray($needle, $haystack)
{
	for( $i = 0; $i < sizeof($haystack); $i++ )
	{
		if( $haystack[$i] == $needle )
		{
			return true;
		}
	}
	return false;
}
function read_admin($dir_module)
{
	global $phpEx, $template, $lang;

	$module = array();
	if( $dir = @opendir($dir_module) )
	{
		$setmodules = 1;
		while( $file = @readdir($dir) )
		{
			if( preg_match("/^admin_.*?\." . $phpEx . "$/", $file) )
			{
				include($dir_module . '/' . $file);
			}
		}
		@closedir($dir);
		unset($setmodules);
	}
	return $module;
}
//
// End functions
// -------------

//
// Generate relevant output
//
if( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' )
{
	include('./page_header_admin.'.$phpEx);

	$template->set_filenames(array(
		'body' => 'admin/index_navigate.tpl')
	);
	
$admincp_nav_icon_url = PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/';	

	$template->assign_vars(array(
		'U_PHPBB_ROOT_PATH' => PHPBB_URL,
		'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,
		"U_PORTAL_INDEX" => mx_append_sid(PORTAL_URL . "index.$phpEx"),
		"L_PORTAL_INDEX" => $lang['Portal_index'],
		"L_PREVIEW_PORTAL" => $lang['Preview_portal'],

		"U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"),
		"U_ADMIN_INDEX" => mx_append_sid("index.$phpEx?pane=right"),
//+MOD: DHTML Menu for ACP
		'COOKIE_NAME'	=> $board_config['cookie_name'],
		'COOKIE_PATH'	=> $board_config['cookie_path'],
		'COOKIE_DOMAIN'	=> $board_config['cookie_domain'],
		'COOKIE_SECURE'	=> $board_config['cookie_secure'],
		'IMG_URL_CONTRACT' => $admincp_nav_icon_url . 'contract.gif',
		'IMG_URL_EXPAND' => $admincp_nav_icon_url . 'expand.gif',		
//-MOD: DHTML Menu for ACP
		"L_FORUM_INDEX" => $lang['Main_index'],
		"L_ADMIN_INDEX" => $lang['Admin_Index'],
		"L_PREVIEW_FORUM" => $lang['Preview_forum'])
	);

	//
	// Read Portal configuration
	//

	// MX Addon ------------------------------------
	$module_portal = read_admin('.');
	$template->assign_block_vars('module_portal', array(
		'L_MX_PORTAL' => $lang['MX_Portal']
	));
	// END ------------------------------------------

	ksort($module_portal);

//+MOD: DHTML Menu for ACP
	$menu_cat_id = 0;
//-MOD: DHTML Menu for ACP
	
	while( list($cat, $action_array) = each($module_portal) )
	{
		$cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat);

		$template->assign_block_vars('module_portal.catrow', array(
//+MOD: DHTML Menu for ACP
			'MENU_CAT_ID' => $menu_cat_id,
			'MENU_CAT_ROWS' => count($action_array),
//-MOD: DHTML Menu for ACP				
			'ADMIN_CATEGORY' => $cat)
		);

		ksort($action_array);

		$row_count = 0;
		while( list($action, $file) = each($action_array) )
		{
			$row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2'];
			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];

			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);

			$template->assign_block_vars('module_portal.catrow.modulerow', array(
				"ROW_COLOR" => "#" . $row_color,
				"ROW_CLASS" => $row_class,
//+MOD: DHTML Menu for ACP
				'ROW_COUNT' => $row_count,
//-MOD: DHTML Menu for ACP
				"ADMIN_MODULE" => $action,
				"U_ADMIN_MODULE" => mx_append_sid(PORTAL_URL . $file)
			));
			$row_count++;
		}
//+MOD: DHTML Menu for ACP
		$menu_cat_id++;
//-MOD: DHTML Menu for ACP		
	}

	// MX ADDON
	// Include PHPBB Administration
	// -------------------------------------------------------------------------------
	$module_phpbb = read_admin($phpbb_root_path . 'admin/');
	$template->assign_block_vars('module_phpbb', array(
		'L_PHPBB' => $lang['Phpbb']
	));

	ksort($module_phpbb);

//+MOD: DHTML Menu for ACP
	$menu_cat_id = 0;
//-MOD: DHTML Menu for ACP
	
	while( list($cat, $action_array) = each($module_phpbb) )
	{
		$cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat);

		$template->assign_block_vars('module_phpbb.catrow', array(
//+MOD: DHTML Menu for ACP
			'MENU_CAT_ID' => $menu_cat_id,
			'MENU_CAT_ROWS' => count($action_array),
//-MOD: DHTML Menu for ACP		
			'ADMIN_CATEGORY' => $cat)
		);

		ksort($action_array);

		$row_count = 0;
		while( list($action, $file) = each($action_array) )
		{
			$row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2'];
			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];

			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);

			$template->assign_block_vars('module_phpbb.catrow.modulerow', array(
				"ROW_COLOR" => "#" . $row_color,
				"ROW_CLASS" => $row_class,
//+MOD: DHTML Menu for ACP
				'ROW_COUNT' => $row_count,
//-MOD: DHTML Menu for ACP				
				"ADMIN_MODULE" => $action,
				"U_ADMIN_MODULE" => mx_append_sid(PHPBB_URL . 'admin/' . $file))
			);
			$row_count++;
		}
//+MOD: DHTML Menu for ACP
		$menu_cat_id++;
//-MOD: DHTML Menu for ACP		
	}

	//
	// Read Portal Module Configuration
	//
	$sql = "SELECT *
		FROM " . MODULE_TABLE . "
		WHERE module_include_admin = 1
		ORDER BY module_name";

	if( !($q_modules = $db->sql_query($sql)) )
	{
		mx_message_die(GENERAL_ERROR, "Could not query modules information", '', __LINE__, __FILE__, $sql);
	}

	if( $total_modules = $db->sql_numrows($q_modules) )
	{
		$module_rows = $db->sql_fetchrowset($q_modules);
	}

	$module_mx = array();
	for( $module_cnt = 0; $module_cnt < $total_modules; $module_cnt++ )
	{
		$module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/";
		$module_mx = array_merge_recursive($module_mx, read_admin($module_path_admin));
	}
	$template->assign_block_vars('module_mx', array(
		'L_MX_MODULES' => $lang['MX_Modules'])
	);

	ksort($module_mx);
	
//+MOD: DHTML Menu for ACP
	$menu_cat_id = 0;
//-MOD: DHTML Menu for ACP
	
	while( list($cat, $action_array) = each($module_mx) )
	{
		$cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat);

		$template->assign_block_vars('module_mx.catrow', array(
//+MOD: DHTML Menu for ACP
			'MENU_CAT_ID' => $menu_cat_id,
			'MENU_CAT_ROWS' => count($action_array),
//-MOD: DHTML Menu for ACP			
			'ADMIN_CATEGORY' => $cat)
		);

		ksort($action_array);

		$row_count = 0;
		while( list($action, $file) = each($action_array) )
		{
			$row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2'];
			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];

			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);

			$template->assign_block_vars('module_mx.catrow.modulerow', array(
				"ROW_COLOR" => "#" . $row_color,
				"ROW_CLASS" => $row_class,
//+MOD: DHTML Menu for ACP
				'ROW_COUNT' => $row_count,
//-MOD: DHTML Menu for ACP				

				"ADMIN_MODULE" => $action,
				"U_ADMIN_MODULE" => mx_append_sid(PORTAL_URL . $file))
			);
			$row_count++;
		}
//+MOD: DHTML Menu for ACP
		$menu_cat_id++;
//-MOD: DHTML Menu for ACP			
	}
	// -----------------------------------------------------------------------------------
	// END MX ADDON
	// -----------------------------------------------------------------------------------
	$template->pparse('body');

	include('./page_footer_admin.'.$phpEx);
}
elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
{

	include('./page_header_admin.'.$phpEx);

	$template->set_filenames(array(
		"body" => "admin/index_body.tpl")
	);

	$template->assign_vars(array(
		// MX Addon
		'U_PHPBB_ROOT_PATH' => PHPBB_URL,
		'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,
		// END
		"L_WELCOME" => $lang['Welcome_phpBB'],
		"L_ADMIN_INTRO" => $lang['Admin_intro'],
		"L_FORUM_STATS" => $lang['Forum_stats'],
		"L_WHO_IS_ONLINE" => $lang['Who_is_Online'],
		"L_USERNAME" => $lang['Username'],
		"L_LOCATION" => $lang['Location'],
		"L_LAST_UPDATE" => $lang['Last_updated'],
		"L_IP_ADDRESS" => $lang['IP_Address'],
		"L_STATISTIC" => $lang['Statistic'],
		"L_VALUE" => $lang['Value'],
		"L_NUMBER_POSTS" => $lang['Number_posts'],
		"L_POSTS_PER_DAY" => $lang['Posts_per_day'],
		"L_NUMBER_TOPICS" => $lang['Number_topics'],
		"L_TOPICS_PER_DAY" => $lang['Topics_per_day'],
		"L_NUMBER_USERS" => $lang['Number_users'],
		"L_USERS_PER_DAY" => $lang['Users_per_day'],
		"L_BOARD_STARTED" => $lang['Board_started'],
		"L_AVATAR_DIR_SIZE" => $lang['Avatar_dir_size'],
		"L_DB_SIZE" => $lang['Database_size'],
		"L_FORUM_LOCATION" => $lang['Forum_Location'],
		"L_STARTED" => $lang['Login'],
		"L_GZIP_COMPRESSION" => $lang['Gzip_compression'])
	);

	//
	// Get forum statistics
	//
	$total_posts = get_db_stat('postcount');
	$total_users = get_db_stat('usercount');
	$total_topics = get_db_stat('topiccount');

	$start_date = create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']);

	$boarddays = ( time() - $board_config['board_startdate'] ) / 86400;

	$posts_per_day = sprintf("%.2f", $total_posts / $boarddays);
	$topics_per_day = sprintf("%.2f", $total_topics / $boarddays);
	$users_per_day = sprintf("%.2f", $total_users / $boarddays);

	$avatar_dir_size = 0;

	if ($avatar_dir = @opendir($phpbb_root_path . $board_config['avatar_path']) )
	{
		while( $file = @readdir($avatar_dir) )
		{
			if( $file != "." && $file != ".." )
			{
				$avatar_dir_size += @filesize($phpbb_root_path . $board_config['avatar_path'] . "/" . $file);
			}
		}
		@closedir($avatar_dir);

		//
		// This bit of code translates the avatar directory size into human readable format
		// Borrowed the code from the PHP.net annoted manual, origanally written by:
		// Jesse (je...@je...)
		//
		if($avatar_dir_size >= 1048576)
		{
			$avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB";
		}
		else if($avatar_dir_size >= 1024)
		{
			$avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB";
		}
		else
		{
			$avatar_dir_size = $avatar_dir_size . " Bytes";
		}

	}
	else
	{ 
		// Couldn't open Avatar dir.
		$avatar_dir_size = $lang['Not_available'];
	}

	if($posts_per_day > $total_posts)
	{
		$posts_per_day = $total_posts;
	}

	if($topics_per_day > $total_topics)
	{
		$topics_per_day = $total_topics;
	}

	if($users_per_day > $total_users)
	{
		$users_per_day = $total_users;
	}

	//
	// DB size ... MySQL only
	//
	// This code is heavily influenced by a similar routine
	// in phpMyAdmin 2.2.0
	//
	if( preg_match("/^mysql/", SQL_LAYER) )
	{
		$sql = "SELECT VERSION() AS mysql_version";
		if($result = $db->sql_query($sql))
		{
			$row = $db->sql_fetchrow($result);
			$version = $row['mysql_version'];

			if( preg_match("/^(3\.23|4\.)/", $version) )
			{
				$db_name = ( preg_match("/^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)/", $version) ) ? "`$dbname`" : $dbname;

				$sql = "SHOW TABLE STATUS
					FROM " . $db_name;
				if($result = $db->sql_query($sql))
				{
					$tabledata_ary = $db->sql_fetchrowset($result);

					$dbsize = 0;
					for($i = 0; $i < count($tabledata_ary); $i++)
					{
						if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" )
						{
							if( $table_prefix != "" )
							{
								if( strstr($tabledata_ary[$i]['Name'], $table_prefix) )
								{
									$dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
								}
							}
							else
							{
								$dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
							}
						}
					}
				} // Else we couldn't get the table status.
			}
			else
			{
				$dbsize = $lang['Not_available'];
			}
		}
		else
		{
			$dbsize = $lang['Not_available'];
		}
	}
	else if( preg_match("/^mssql/", SQL_LAYER) )
	{
		$sql = "SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize
			FROM sysfiles";
		if( $result = $db->sql_query($sql) )
		{
			$dbsize = ( $row = $db->sql_fetchrow($result) ) ? intval($row['dbsize']) : $lang['Not_available'];
		}
		else
		{
			$dbsize = $lang['Not_available'];
		}
	}
	else
	{
		$dbsize = $lang['Not_available'];
	}

	if ( is_integer($dbsize) )
	{
		if( $dbsize >= 1048576 )
		{
			$dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 ));
		}
		else if( $dbsize >= 1024 )
		{
			$dbsize = sprintf("%.2f KB", ( $dbsize / 1024 ));
		}
		else
		{
			$dbsize = sprintf("%.2f Bytes", $dbsize);
		}
	}

	$template->assign_vars(array(
		"NUMBER_OF_POSTS" => $total_posts,
		"NUMBER_OF_TOPICS" => $total_topics,
		"NUMBER_OF_USERS" => $total_users,
		"START_DATE" => $start_date,
		"POSTS_PER_DAY" => $posts_per_day,
		"TOPICS_PER_DAY" => $topics_per_day,
		"USERS_PER_DAY" => $users_per_day,
		"AVATAR_DIR_SIZE" => $avatar_dir_size,
		"DB_SIZE" => $dbsize,
		"GZIP_COMPRESSION" => ( $board_config['gzip_compress'] ) ? $lang['ON'] : $lang['OFF'])
	);
	//
	// End forum statistics
	//

	//
	// Get users online information.
	//
	$sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page, s.session_logged_in, s.session_ip, s.session_start
		FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
		WHERE s.session_logged_in = " . TRUE . "
			AND u.user_id = s.session_user_id
			AND u.user_id <> " . ANONYMOUS . "
			AND s.session_time >= " . ( time() - 300 ) . " 
		ORDER BY u.user_session_time DESC";
	if(!$result = $db->sql_query($sql))
	{
		mx_message_die(GENERAL_ERROR, "Couldn't obtain regd user/online information.", "", __LINE__, __FILE__, $sql);
	}
	$onlinerow_reg = $db->sql_fetchrowset($result);

	$sql = "SELECT session_page, session_logged_in, session_time, session_ip, session_start   
		FROM " . SESSIONS_TABLE . "
		WHERE session_logged_in = 0
			AND session_time >= " . ( time() - 300 ) . "
		ORDER BY session_time DESC";
	if(!$result = $db->sql_query($sql))
	{
		mx_message_die(GENERAL_ERROR, "Couldn't obtain guest user/online information.", "", __LINE__, __FILE__, $sql);
	}
	$onlinerow_guest = $db->sql_fetchrowset($result);

	$sql = "SELECT forum_name, forum_id
		FROM " . FORUMS_TABLE;
	if($forums_result = $db->sql_query($sql))
	{
		while($forumsrow = $db->sql_fetchrow($forums_result))
		{
			$forum_data[$forumsrow['forum_id']] = $forumsrow['forum_name'];
		}
	}
	else
	{
		mx_message_die(GENERAL_ERROR, "Couldn't obtain user/online forums information.", "", __LINE__, __FILE__, $sql);
	}

	$reg_userid_ary = array();

	if( count($onlinerow_reg) )
	{
		$registered_users = 0;

		for($i = 0; $i < count($onlinerow_reg); $i++)
		{
			if( !inarray($onlinerow_reg[$i]['user_id'], $reg_userid_ary) )
			{
				$reg_userid_ary[] = $onlinerow_reg[$i]['user_id'];

				$username = $onlinerow_reg[$i]['username'];

				if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
				{
					$registered_users++;
					$hidden = FALSE;
				}
				else
				{
					$hidden_users++;
					$hidden = TRUE;
				}

				if( $onlinerow_reg[$i]['user_session_page'] < 1 )
				{
					switch($onlinerow_reg[$i]['user_session_page'])
					{
						case PAGE_INDEX:
							$location = $lang['Forum_index'];
							$location_url = "index.$phpEx?pane=right";
							break;
						case PAGE_POSTING:
							$location = $lang['Posting_message'];
							$location_url = "index.$phpEx?pane=right";
							break;
						case PAGE_LOGIN:
							$location = $lang['Logging_on'];
							$location_url = "index.$phpEx?pane=right";
							break;
						case PAGE_SEARCH:
							$location = $lang['Searching_forums'];
							$location_url = "index.$phpEx?pane=right";
							break;
						case PAGE_PROFILE:
							$location = $lang['Viewing_profile'];
							$location_url = "index.$phpEx?pane=right";
							break;
						case PAGE_VIEWONLINE:
							$location = $lang['Viewing_online'];
							$location_url = "index.$phpEx?pane=right";
							break;
						case PAGE_VIEWMEMBERS:
							$location = $lang['Viewing_member_list'];
							$location_url = "index.$phpEx?pane=right";
							break;
						case PAGE_PRIVMSGS:
							$location = $lang['Viewing_priv_msgs'];
							$location_url = "index.$phpEx?pane=right";
							break;
						case PAGE_FAQ:
							$location = $lang['Viewing_FAQ'];
							$location_url = "index.$phpEx?pane=right";
							break;
						default:
							//+MOD: ViewOnline extension for mxBB Portal Pages
							$mx_viewonline_info = mx_get_viewonline_info($onlinerow_reg[$i]['user_session_page']);
							if( $mx_viewonline_info !== false )
							{
								list($location, $location_url) = $mx_viewonline_info;
								break;
							}
							//-MOD: ViewOnline extension for mxBB Portal Pages
							$location = $lang['Forum_index'];
							$location_url = "index.$phpEx?pane=right";
					}
				}
				else
				{
					$location_url = mx_append_sid(PHPBB_URL . "admin_forums.$phpEx?mode=editforum&amp;" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['user_session_page']);
					$location = $forum_data[$onlinerow_reg[$i]['user_session_page']];
				}

				$row_color = ( $registered_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
				$row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];

				$reg_ip = decode_ip($onlinerow_reg[$i]['session_ip']);

				$template->assign_block_vars("reg_user_row", array(
					"ROW_COLOR" => "#" . $row_color,
					"ROW_CLASS" => $row_class,
					"USERNAME" => $username,
					"STARTED" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['session_start'], $board_config['board_timezone']),
					"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['user_session_time'], $board_config['board_timezone']),
					"FORUM_LOCATION" => $location,
					"IP_ADDRESS" => $reg_ip,

					"U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$reg_ip",
					"U_USER_PROFILE" => mx_append_sid(PHPBB_URL . "admin_users.$phpEx?mode=edit&amp;" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),
					"U_FORUM_LOCATION" => mx_append_sid($location_url))
				);
			}
		}

	}
	else
	{
		$template->assign_vars(array(
			"L_NO_REGISTERED_USERS_BROWSING" => $lang['No_users_browsing'])
		);
	} 

	//
	// Guest users
	//
	if( count($onlinerow_guest) )
	{
		$guest_users = 0;

		for($i = 0; $i < count($onlinerow_guest); $i++)
		{
			$guest_userip_ary[] = $onlinerow_guest[$i]['session_ip'];
			$guest_users++; 

			if( $onlinerow_guest[$i]['session_page'] < 1 )
			{
				switch( $onlinerow_guest[$i]['session_page'] )
				{
					case PAGE_INDEX:
						$location = $lang['Forum_index'];
						$location_url = "index.$phpEx?pane=right";
						break;
					case PAGE_POSTING:
						$location = $lang['Posting_message'];
						$location_url = "index.$phpEx?pane=right";
						break;
					case PAGE_LOGIN:
						$location = $lang['Logging_on'];
						$location_url = "index.$phpEx?pane=right";
						break;
					case PAGE_SEARCH:
						$location = $lang['Searching_forums'];
						$location_url = "index.$phpEx?pane=right";
						break;
					case PAGE_PROFILE:
						$location = $lang['Viewing_profile'];
						$location_url = "index.$phpEx?pane=right";
						break;
					case PAGE_VIEWONLINE:
						$location = $lang['Viewing_online'];
						$location_url = "index.$phpEx?pane=right";
						break;
					case PAGE_VIEWMEMBERS:
						$location = $lang['Viewing_member_list'];
						$location_url = "index.$phpEx?pane=right";
						break;
					case PAGE_PRIVMSGS:
						$location = $lang['Viewing_priv_msgs'];
						$location_url = "index.$phpEx?pane=right";
						break;
					case PAGE_FAQ:
						$location = $lang['Viewing_FAQ'];
						$location_url = "index.$phpEx?pane=right";
						break;
					default:
						//+MOD: ViewOnline extension for mxBB Portal Pages
						$mx_viewonline_info = mx_get_viewonline_info($onlinerow_guest[$i]['session_page']);
						if( $mx_viewonline_info !== false )
						{
							list($location, $location_url) = $mx_viewonline_info;
							break;
						}
						//-MOD: ViewOnline extension for mxBB Portal Pages
						$location = $lang['Forum_index'];
						$location_url = "index.$phpEx?pane=right";
				}
			}
			else
			{
				$location_url = mx_append_sid(PHPBB_URL . "admin_forums.$phpEx?mode=editforum&amp;" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']);
				$location = $forum_data[$onlinerow_guest[$i]['session_page']];
			}

			$row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
			$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];

			$guest_ip = decode_ip($onlinerow_guest[$i]['session_ip']);

			$template->assign_block_vars("guest_user_row", array(
				"ROW_COLOR" => "#" . $row_color,
				"ROW_CLASS" => $row_class,
				"USERNAME" => $lang['Guest'],
				"STARTED" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_start'], $board_config['board_timezone']),
				"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']),
				"FORUM_LOCATION" => $location,
				"IP_ADDRESS" => $guest_ip,

				"U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$guest_ip",
				"U_FORUM_LOCATION" => mx_append_sid($location_url))
			);
		}

	}
	else
	{
		$template->assign_vars(array(
			"L_NO_GUESTS_BROWSING" => $lang['No_users_browsing'])
		);
	}
	
	/* Begin phpBB version check code block */
	$current_phpbb_version = explode('.', '2' . $board_config['version']);
	$minor_phpbb_revision = (int) $current_phpbb_version[2];

	$errno = 0;
	$errstr = $phpbb_version_info = '';

	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr, 10))
	{
		@fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n");
		@fputs($fsock, "HOST: www.phpbb.com\r\n");
		@fputs($fsock, "Connection: close\r\n\r\n");

		$get_info = false;
		while (!@feof($fsock))
		{
			if ($get_info)
			{
				$phpbb_version_info .= @fread($fsock, 1024);
			}
			else
			{
				if (@fgets($fsock, 1024) == "\r\n")
				{
					$get_info = true;
				}
			}
		}
		@fclose($fsock);

		$phpbb_version_info = explode("\n", $phpbb_version_info);
		$latest_phpbb_head_revision = (int) $phpbb_version_info[0];
		$latest_phpbb_minor_revision = (int) $phpbb_version_info[2];
		$latest_phpbb_version = (int) $phpbb_version_info[0] . '.' . (int) $phpbb_version_info[1] . '.' . (int) $phpbb_version_info[2];

		if ($latest_phpbb_head_revision == 2 && $minor_phpbb_revision == $latest_phpbb_minor_revision)
		{
			$phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>';
		}
		else
		{
			$phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
			$phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';
		}
	}
	else
	{
		if ($errstr)
		{
			$phpbb_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
		}
		else
		{
			$phpbb_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
		}
	}
	
	$phpbb_version_info .= '<p>' . $lang['Mailing_list_subscribe_reminder'] . '</p>';
	
	/* End phpBB version check code block */
	
	
	/* Begin mxBB version check code block */
	$current_mxbb_version = explode('.', $portal_config['portal_version']);
	$minor_mxbb_revision = (int) $current_mxbb_version[2];

	$errno = 0;
	$errstr = $mxbb_version_info = '';

	if ($fsock = @fsockopen('www.mx-system.com', 80, $errno, $errstr))
	{
		@fputs($fsock, "GET /updatecheck/28x.txt HTTP/1.1\r\n");
		@fputs($fsock, "HOST: www.mx-system.com\r\n");
		@fputs($fsock, "Connection: close\r\n\r\n");

		$get_info = false;
		while (!@feof($fsock))
		{
			if ($get_info)
			{
				$mxbb_version_info .= @fread($fsock, 1024);
			}
			else
			{
				if (@fgets($fsock, 1024) == "\r\n")
				{
					$get_info = true;
				}
			}
		}
		@fclose($fsock);
		
		$mxbb_version_info = explode("\n", $mxbb_version_info);
		$latest_mxbb_head_revision = (int) $mxbb_version_info[0];
		$latest_mxbb_minor_revision = (int) $mxbb_version_info[2];
		$latest_mxbb_version = (int) $mxbb_version_info[0] . '.' . (int) $mxbb_version_info[1] . '.' . (int) $mxbb_version_info[2];

		if ($minor_mxbb_revision == $latest_mxbb_minor_revision)
		{
			$mxbb_version_info = '<p style="color:green">' . $lang['mxBB_Version_up_to_date'] . '</p>';
		}
		else
		{
			$mxbb_version_info = '<p style="color:red">' . $lang['mxBB_Version_outdated'];
			$mxbb_version_info .= '<br />' . sprintf($lang['mxBB_Latest_version_info'], $latest_mxbb_version) . sprintf($lang['mxBB_Current_version_info'], $portal_config['portal_version']) . '</p>';
		}
	}
	else
	{
		if ($errstr)
		{
			$mxbb_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
		}
		else
		{
			$mxbb_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
		}
	}
	
	$mxbb_version_info .= '<p>' . $lang['mxBB_Mailing_list_subscribe_reminder'] . '</p>';
	
/* End mxBB version check code block */
	

	$template->assign_vars(array(
		'MXBB_VERSION_INFO'		=> $mxbb_version_info,
		'PHPBB_VERSION_INFO'	=> $phpbb_version_info,
		'L_VERSION_INFORMATION'	=> $lang['Version_information'])
	);

	
	$template->pparse("body");

	include('./page_footer_admin.'.$phpEx);

}
else
{ 
	//
	// Generate frameset
	//
	$template->set_filenames(array(
		"body" => "admin/index_frameset.tpl")
	);

	$template->assign_vars(array(
		"S_FRAME_NAV" => mx_append_sid("left.html?pane=left"),
		"S_FRAME_MAIN" => mx_append_sid("../modules/mx_chatbox/admin/admin_chatbox.$phpEx?action=cat_manage")) 
	);

	header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
	header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");

	$template->pparse("body");

	$db->sql_close();
	exit;

}

?>
--- NEW FILE: admin_chatbox.php ---
<?php
/***************************************************************************
 *							admin_chatbox.php
 *							-----------------
 *	begin				: July, 2003
 *	copyright			: (c) 2003 Marc Ferran
 *	email				: markus_petrux at phpmix dot com
 *	module				: mx_chatbox
 *	file contents		: ChatBox settings.
 *
 ***************************************************************************/

/***************************************************************************
 *
 *	This program is free software; you can redistribute it and/or modify
 *	it under the terms of the GNU General Public License as published by
 *	the Free Software Foundation; either version 2 of the License, or
 *	(at your option) any later version.
 *
 ***************************************************************************/

/***************************************************************************
 * History:
 *
 *	2003/07/18 (markus_petrux)
 *	- MX001: Script created.
 *
 ***************************************************************************/

// ======================================================
//			[ ADMINCP COMMON INITIALIZATION ]
// ======================================================

//
// Add our entry to the Administration Control Panel...
//
if( !empty($setmodules) )
{
	$module['ChatBox']['Settings'] = 'modules/mx_chatbox/admin/' . @basename(__FILE__);
	return;
}

//
// Setup basic portal stuff...
//
define('IN_PORTAL', true);
$mx_root_path = '../../../';
$module_root_path = "../";

//
// Security and page header...
//
$phpEx = substr(strrchr(__FILE__, '.'), 1);
require($mx_root_path . '/admin/pagestart.'.$phpEx);

//
// Include common module stuff...
//
require($module_root_path . 'includes/common.'.$phpEx);

//
// Send page header...
//
include_once($mx_root_path . 'admin/page_header_admin.'.$phpEx);


// ======================================================
//			[ MAIN PROCESS ]
// ======================================================

//
// Read the module settings...
//
$sql = "SELECT * FROM ".CHATBOX_CONFIG_TABLE;
if(!$result = $db->sql_query($sql))
{
	mx_message_die(GENERAL_ERROR, "Couldn't query chatbox config table", "", __LINE__, __FILE__, $sql);
}
while( $row = $db->sql_fetchrow($result) )
{
	$config_name = $row['config_name'];
	$config_value = $row['config_value'];
	$default_config[$config_name] = $config_value;

	$new[$config_name] = ( isset($HTTP_POST_VARS[$config_name]) ) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name];
	if( isset($HTTP_POST_VARS['submit']) )
	{
		$sql = "UPDATE ".CHATBOX_CONFIG_TABLE.
			" SET config_value = '" . str_replace("\'", "''", $new[$config_name]) . "'" .
			" WHERE config_name = '$config_name'";
		if( !$db->sql_query($sql) )
		{
			mx_message_die(GENERAL_ERROR, "Failed to update chatbox configuration for $config_name", "", __LINE__, __FILE__, $sql);
		}
	}
}

//
// If the form was submitted, display the update successful message...
//
if( isset($HTTP_POST_VARS['submit']) )
{
	$message = $lang['ChatBox_Settings_updated'] .
		'<br /><br />' .
		sprintf($lang['ChatBox_Settings_return'], '<a href="' . mx_append_sid("admin_chatbox.$phpEx") . '">', '</a>') .
		'<br /><br />' .
		sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>');
	mx_message_die(GENERAL_MESSAGE, $message);
}

//
// Prepare and send the settings form...
//
$direction_top    = ( !$new['direction'] ) ? 'checked="checked"' : '';
$direction_bottom = (  $new['direction'] ) ? 'checked="checked"' : '';

$template->set_filenames(array(
	"body" => "admin/chatbox_config_body.tpl")
);

$template->assign_vars(array(
	'S_ACTION'					=> mx_append_sid("admin_chatbox.$phpEx"),
	'L_CHATBOX_SETTINGS'		=> $lang['ChatBox_Settings'],
	'L_CHATBOX_SETTINGS_EXPLAIN' => $lang['ChatBox_Settings_explain'],

	'L_REFRESH_TIME'			=> $lang['ChatBox_refresh_time'],
	'L_REFRESH_TIME_EXPLAIN'	=> $lang['ChatBox_refresh_time_explain'],
	'L_DELETE_TIME'				=> $lang['ChatBox_delete_time'],
	'L_DELETE_TIME_EXPLAIN'		=> $lang['ChatBox_delete_time_explain'],
	'L_OFFLINE_TIME'			=> $lang['ChatBox_offline_time'],
	'L_OFFLINE_TIME_EXPLAIN'	=> $lang['ChatBox_offline_time_explain'],
	'L_AWAY_TIME'				=> $lang['ChatBox_away_time'],
	'L_AWAY_TIME_EXPLAIN'		=> $lang['ChatBox_away_time_explain'],
	'L_STYLESHEET'				=> $lang['ChatBox_stylesheet'],
	'L_STYLESHEET_EXPLAIN'		=> $lang['ChatBox_stylesheet_explain'],
	'L_SHOW_AMOUNT'				=> $lang['ChatBox_show_amount'],
	'L_SHOW_AMOUNT_EXPLAIN'		=> $lang['ChatBox_show_amount_explain'],
	'L_MAX_MSG_LEN'				=> $lang['ChatBox_max_msg_len'],
	'L_MAX_MSG_LEN_EXPLAIN'		=> $lang['ChatBox_max_msg_len_explain'],
	'L_DIRECTION'				=> $lang['ChatBox_direction'],
	'L_DIRECTION_EXPLAIN'		=> $lang['ChatBox_direction_explain'],
	'L_TOP'						=> $lang['Top'],
	'L_BOTTOM'					=> $lang['Bottom'],

	'REFRESH_TIME'				=> $new['refresh_time'],
	'DELETE_TIME'				=> $new['delete_time'],
	'OFFLINE_TIME'				=> $new['offline_time'],
	'AWAY_TIME'					=> $new['away_time'],
	'STYLESHEET'				=> $new['stylesheet'],
	'SHOW_AMOUNT'				=> $new['show_amount'],
	'MAX_MSG_LEN'				=> $new['max_msg_len'],
	'DIRECTION'					=> $new['direction'],

	'S_DIRECTION_TOP'			=> $direction_top,
	'S_DIRECTION_BOTTOM'		=> $direction_bottom,

	'L_SUBMIT'					=> $lang['Submit'],
	'L_RESET'					=> $lang['Reset'])
);

$template->pparse("body");

include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx);

?>

[mxbb-commits] mx_chatbox/templates/images chatbox_front_00.gif, NONE, 1.1 chatbox_front_01.gif, NONE, 1.1 chatbox_front_02.gif, NONE, 1.1 chatbox_front_03.gif, NONE, 1.1 spacer.gif, NONE, 1.1

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

Update of /cvsroot/mxbb/mx_chatbox/templates/images
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8783/templates/images

Added Files:
	chatbox_front_00.gif chatbox_front_01.gif chatbox_front_02.gif 
	chatbox_front_03.gif spacer.gif 
Log Message:
fixed version

--- NEW FILE: spacer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: chatbox_front_03.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: chatbox_front_00.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: chatbox_front_02.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: chatbox_front_01.gif ---
(This appears to be a binary file; contents omitted.)