mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core/includes/shared/phpbb3/includes/auth - New directory

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes/auth
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32503/auth

Log Message:
Directory /cvsroot/mxbb/core/includes/shared/phpbb3/includes/auth added to the repository

[mxbb-commits] core/templates/subsilver2 subsilver2.cfg,1.11,1.12

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/subsilver2
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32260

Modified Files:
	subsilver2.cfg 
Log Message:
some fixes for ascareus backend

Index: subsilver2.cfg
===================================================================
RCS file: /cvsroot/mxbb/core/templates/subsilver2/subsilver2.cfg,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** subsilver2.cfg	18 May 2014 06:26:47 -0000	1.11
--- subsilver2.cfg	19 May 2014 18:15:22 -0000	1.12
***************
*** 30,35 ****
  //
  // Do not alter this line!
! //
! define(MX_TEMPLATE_CONFIG, true);
  $mx_template_config = true;
  
--- 30,34 ----
  //
  // Do not alter this line!
! //define(MX_TEMPLATE_CONFIG, true);
  $mx_template_config = true;
  
***************
*** 235,264 ****
  $images['voting_graphic'][4] = "$current_template_addon_images/voting_bar.gif";
  
! //
! // Define common theme colors (if not present in db)
! //
! $template_config_row['body_bgcolor'] = "FFFFFF";
! $template_config_row['body_text'] = "383B3F";
! $template_config_row['body_link'] = "006699";
! $template_config_row['body_vlink'] = "006699";
! $template_config_row['body_alink'] = "006699";
! $template_config_row['body_hlink'] = "f3a625";
! $template_config_row['tr_color1'] = "F7EEEE"; // row1
! $template_config_row['tr_color2'] = "FBF4F4"; // row2
! $template_config_row['tr_color3'] = "f1f1f1"; // row3
! $template_config_row['th_color1'] = "FFA34F"; // bodyline border color
! $template_config_row['th_color2'] = "333333"; // forumline border color
! $template_config_row['th_color3'] = "d1d7dc"; // boxes border color
! $template_config_row['td_color1'] = "F7EEEE"; // code/quote boxes background
! $template_config_row['td_color2'] = "FBF4F4"; // post box background
! $template_config_row['fontface1'] = "Verdana,Arial,Helvetica,sans-serif";
! $template_config_row['fontface2'] = "Trebuchet MS";
! $template_config_row['fontface3'] = "Courier, \'Courier New\', sans-serif";
! $template_config_row['fontsize3'] = "12";
! $template_config_row['fontcolor1'] = "383B3F"; // Main font color
! $template_config_row['fontcolor2'] = "726363";
! $template_config_row['fontcolor3'] = "FFA34F";
! 
! 
  /********************************************************************************\
  | CORE Images
--- 234,261 ----
  $images['voting_graphic'][4] = "$current_template_addon_images/voting_bar.gif";
  
! /*
! * Define common theme colors (if not present in db)
! */
! $theme['body_bgcolor'] = "FFFFFF";
! $theme['body_text'] = "383B3F";
! $theme['body_link'] = "006699";
! $theme['body_vlink'] = "006699";
! $theme['body_alink'] = "006699";
! $theme['body_hlink'] = "f3a625";
! $theme['tr_color1'] = "F7EEEE"; // row1
! $theme['tr_color2'] = "FBF4F4"; // row2
! $theme['tr_color3'] = "f1f1f1"; // row3
! $theme['th_color1'] = "FFA34F"; // bodyline border color
! $theme['th_color2'] = "333333"; // forumline border color
! $theme['th_color3'] = "d1d7dc"; // boxes border color
! $theme['td_color1'] = "F7EEEE"; // code/quote boxes background
! $theme['td_color2'] = "FBF4F4"; // post box background
! $theme['fontface1'] = "Verdana,Arial,Helvetica,sans-serif";
! $theme['fontface2'] = "Trebuchet MS";
! $theme['fontface3'] = "Courier, \'Courier New\', sans-serif";
! $theme['fontsize3'] = "12";
! $theme['fontcolor1'] = "383B3F"; // Main font color
! $theme['fontcolor2'] = "726363";
! $theme['fontcolor3'] = "FFA34F";
  /********************************************************************************\
  | CORE Images

[mxbb-commits] core/modules/mx_phpbb3blocks/includes phpbb3blocks_constants.php, 1.5, 1.6

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32081

Modified Files:
	phpbb3blocks_constants.php 
Log Message:
some fixes for ascareus backend

Index: phpbb3blocks_constants.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes/phpbb3blocks_constants.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** phpbb3blocks_constants.php	28 Jun 2013 15:37:22 -0000	1.5
--- phpbb3blocks_constants.php	19 May 2014 18:15:12 -0000	1.6
***************
*** 15,21 ****
  }
  
! if ( PORTAL_BACKEND != 'phpbb3' )
  {
! 	mx_message_die(GENERAL_MESSAGE, 'There are blocks on this page designed for MX-Publisher with phpBB3 backend, thus not compatible with current setup.');
  }
  
--- 15,31 ----
  }
  
! switch (PORTAL_BACKEND)
  {
! 	case 'internal':
! 	case 'smf2':
! 	case 'phpbb2':
! 		mx_message_die(GENERAL_MESSAGE, 'There are blocks on this page designed for MX-Publisher with phpBB3 backend, thus not compatible with current setup.');
! 	break;
! 	
! 	case 'phpbb3':
! 	case 'olympus':
! 	case 'ascraeus':
! 	
! 	break;
  }
  

[mxbb-commits] core/modules/mx_coreblocks mx_login.php, 1.16, 1.17 mx_online.php, 1.38, 1.39

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31842

Modified Files:
	mx_login.php mx_online.php 
Log Message:
some fixes for ascareus backend

Index: mx_login.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_login.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mx_login.php	18 May 2014 06:24:56 -0000	1.16
--- mx_login.php	19 May 2014 18:14:57 -0000	1.17
***************
*** 10,14 ****
  */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");
--- 10,14 ----
  */
  
! if(!defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");
***************
*** 16,20 ****
  
  $template->set_filenames(array(
! 	'body_login' => 'mx_login.tpl')
  );
  
--- 16,20 ----
  
  $template->set_filenames(array(
! 	'body_login' => 'mx_login.html')
  );
  
***************
*** 31,45 ****
  ));
  
- //
  // Login box?
! //
! if ( !$userdata['session_logged_in'] )
  {
  	$template->assign_block_vars('switch_user_logged_out', array());
! 
! 	//
  	// Allow autologin?
! 	//
! 	if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'] )
  	{
  		$template->assign_block_vars('switch_allow_autologin', array());
--- 31,41 ----
  ));
  
  // Login box?
! if (!$userdata['session_logged_in'])
  {
  	$template->assign_block_vars('switch_user_logged_out', array());
! 	
  	// Allow autologin?
! 	if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'])
  	{
  		$template->assign_block_vars('switch_allow_autologin', array());

Index: mx_online.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** mx_online.php	18 May 2014 06:24:56 -0000	1.38
--- mx_online.php	19 May 2014 18:14:57 -0000	1.39
***************
*** 34,38 ****
  $l_online_users = '';
  
! //if (defined('SHOW_ONLINE'))
  {
  	switch (PORTAL_BACKEND)
--- 34,38 ----
  $l_online_users = '';
  
! if (defined('SHOW_ONLINE'))
  {
  	switch (PORTAL_BACKEND)
***************
*** 42,62 ****
  				FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  				WHERE u.user_id = s.session_user_id
! 					AND s.session_time >= ".( time() - 300 ) . "
  				ORDER BY u.username ASC, s.session_ip ASC";
! 			break;
  		case 'phpbb2':
  			$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
  				FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  				WHERE u.user_id = s.session_user_id
! 					AND s.session_time >= ".( time() - 300 ) . "
  				ORDER BY u.username ASC, s.session_ip ASC";
! 			break;
  		case 'phpbb3':
  			$sql = "SELECT u.user_id, u.username, u.user_regdate, u.user_birthday, u.user_allow_viewonline, u.user_type, u.user_colour, s.session_autologin, s.session_ip
  				FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  				WHERE u.user_id = s.session_user_id
! 					AND s.session_time >= ".( time() - 300 ) . "
  				ORDER BY u.username ASC, s.session_ip ASC";
! 			break;
  	}
  
--- 42,72 ----
  				FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  				WHERE u.user_id = s.session_user_id
! 					AND s.session_time >= ".(time() - 300) . "
  				ORDER BY u.username ASC, s.session_ip ASC";
! 		break;		
! 		case 'smf2':
! 			//To do:
! 			/** a query or we can use a session method		
! 			$sql = "SELECT u.id_member as u.user_id, u.member_name as u.username, u.id_group as u.user_level, s.session_id, s.data,
! 				FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
! 				WHERE u.id_member > -1
! 					AND s.last_update >= ".(time() - 300) . "
! 				ORDER BY u.member_name ASC, s.session_id ASC";
! 			**/
! 		break;
  		case 'phpbb2':
  			$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
  				FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  				WHERE u.user_id = s.session_user_id
! 					AND s.session_time >= ".(time() - 300) . "
  				ORDER BY u.username ASC, s.session_ip ASC";
! 		break;
  		case 'phpbb3':
  			$sql = "SELECT u.user_id, u.username, u.user_regdate, u.user_birthday, u.user_allow_viewonline, u.user_type, u.user_colour, s.session_autologin, s.session_ip
  				FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  				WHERE u.user_id = s.session_user_id
! 					AND s.session_time >= ".(time() - 300) . "
  				ORDER BY u.username ASC, s.session_ip ASC";
! 		break;
  	}
  
***************
*** 72,76 ****
  	$prev_user_ip = $prev_session_ip = '';
  
! 	while( $row = $db->sql_fetchrow($result) )
  	{
  		// User is logged in and therefor not a guest
--- 82,86 ----
  	$prev_user_ip = $prev_session_ip = '';
  
! 	while($row = $db->sql_fetchrow($result))
  	{
  		// User is logged in and therefor not a guest
***************
*** 81,112 ****
  			{
  				$style_color = '';
! 
  				switch (PORTAL_BACKEND)
  				{
  					case 'internal':
  					case 'phpbb2':
! 
! 					if ( $row['user_level'] == ADMIN )
! 					{
! 						$row['username'] = '<b>' . $row['username'] . '</b>';
! 						$style_color = 'style="color:#' . $theme['fontcolor3'] . '"';
! 					}
! 					else if ( $row['user_level'] == MOD )
! 					{
! 						$row['username'] = '<b>' . $row['username'] . '</b>';
! 						$style_color = 'style="color:#' . $theme['fontcolor2'] . '"';
! 					}
! 
  					break;
! 
  					case 'phpbb3':
  						$style_color = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : '';
- 
  					break;
  				}
! 
  				switch (PORTAL_BACKEND)
  				{
  					case 'internal':
  						$user_online_link = '<a href="' . PORTAL_URL . '"' . $style_color .'><i>' . $row['username'] . '</i></a>';
  						$logged_hidden_online++;
--- 91,123 ----
  			{
  				$style_color = '';
! 				//switch only supported  phpBB backends here
  				switch (PORTAL_BACKEND)
  				{
  					case 'internal':
+ 					case 'smf2':					
  					case 'phpbb2':
! 						if ( $row['user_level'] == ADMIN )
! 						{
! 							$row['username'] = '<b>' . $row['username'] . '</b>';
! 							$style_color = 'style="color:#' . $theme['fontcolor3'] . '"';
! 						}
! 						else if ( $row['user_level'] == MOD )
! 						{
! 							$row['username'] = '<b>' . $row['username'] . '</b>';
! 							$style_color = 'style="color:#' . $theme['fontcolor2'] . '"';
! 						}
  					break;
! 					
  					case 'phpbb3':
+ 					case 'olympus':
+ 					case 'ascraeus':					
  						$style_color = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : '';
  					break;
  				}
! 				
  				switch (PORTAL_BACKEND)
  				{
  					case 'internal':
+ 					case 'smf2':					
  						$user_online_link = '<a href="' . PORTAL_URL . '"' . $style_color .'><i>' . $row['username'] . '</i></a>';
  						$logged_hidden_online++;
***************
*** 116,121 ****
  						$logged_hidden_online++;
  					break;
! 
  					case 'phpbb3':
  						if ($row['user_allow_viewonline'])
  						{
--- 127,134 ----
  						$logged_hidden_online++;
  					break;
! 					
  					case 'phpbb3':
+ 					case 'olympus':
+ 					case 'ascraeus':
  						if ($row['user_allow_viewonline'])
  						{
***************
*** 130,134 ****
  					break;
  				}
! 
  				if ( $row['user_allow_viewonline'] || $mx_user->data['user_level'] == ADMIN )
  				{
--- 143,147 ----
  					break;
  				}
! 				
  				if ( $row['user_allow_viewonline'] || $mx_user->data['user_level'] == ADMIN )
  				{
***************
*** 146,150 ****
  			}
  		}
- 
  		$prev_session_ip = $row['session_ip'];
  	}
--- 159,162 ----
***************
*** 155,166 ****
  		$online_userlist = $lang['None'];
  	}
! 	$online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . ' ' . $online_userlist;
! 
  	$total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
  
! 	if ( $total_online_users > $board_config['record_online_users'])
  	{
  		$board_config['record_online_users'] = $total_online_users;
  		$board_config['record_online_date'] = time();
  		switch (PORTAL_BACKEND)
  		{
--- 167,179 ----
  		$online_userlist = $lang['None'];
  	}
! 	
! 	$online_userlist = ((isset($forum_id)) ? $lang['Browsing_forum'] : $lang['Registered_users']) . ' ' . $online_userlist;
  	$total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
  
! 	if ($total_online_users > $board_config['record_online_users'])
  	{
  		$board_config['record_online_users'] = $total_online_users;
  		$board_config['record_online_date'] = time();
+ 		
  		switch (PORTAL_BACKEND)
  		{
***************
*** 170,199 ****
  				        record_online_date = '" . $board_config['record_online_date'] . "'
  				     WHERE portal_id = 1";
! 
! 				if ( !$db->sql_query($sql) )
  				{
  					mx_message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql);
  				}
! 
  				$portal_config['record_online_users'] = $total_online_users;
  				$portal_config['record_online_date'] = $board_config['record_online_date'];
! 				$mx_cache->put( 'mxbb_config', $portal_config );
! 				break;
  			case 'phpbb2':
  			case 'phpbb3':
  				$sql = "UPDATE " . CONFIG_TABLE . "
  					SET config_value = '$total_online_users'
! 					WHERE config_name = 'record_online_users'";
! 
! 				if ( !$db->sql_query($sql) )
  				{
  					mx_message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql);
  				}
! 
  				$sql = "UPDATE " . CONFIG_TABLE . "
  					SET config_value = '" . $board_config['record_online_date'] . "'
  					WHERE config_name = 'record_online_date'";
! 
! 				if ( !$db->sql_query($sql,300) )
  				{
  					mx_message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql);
--- 183,211 ----
  				        record_online_date = '" . $board_config['record_online_date'] . "'
  				     WHERE portal_id = 1";
! 				if (!$db->sql_query($sql))
  				{
  					mx_message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql);
  				}
! 				
  				$portal_config['record_online_users'] = $total_online_users;
  				$portal_config['record_online_date'] = $board_config['record_online_date'];
! 				$mx_cache->put('mxbb_config', $portal_config);
! 			break;
! 			
  			case 'phpbb2':
  			case 'phpbb3':
  				$sql = "UPDATE " . CONFIG_TABLE . "
  					SET config_value = '$total_online_users'
! 					WHERE config_name = 'record_online_users'";			
! 				if (!$db->sql_query($sql))
  				{
  					mx_message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql);
  				}
! 				
  				$sql = "UPDATE " . CONFIG_TABLE . "
  					SET config_value = '" . $board_config['record_online_date'] . "'
  					WHERE config_name = 'record_online_date'";
! 					
! 				if (!$db->sql_query($sql, 300))
  				{
  					mx_message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql);
***************
*** 201,206 ****
  				$board_config['record_online_users'] = $total_online_users;
  				$board_config['record_online_date'] = $board_config['record_online_date'];
! 				$mx_cache->put( 'phpbb_config', $board_config );
! 				break;
  		}
  	}
--- 213,218 ----
  				$board_config['record_online_users'] = $total_online_users;
  				$board_config['record_online_date'] = $board_config['record_online_date'];
! 				$mx_cache->put('phpbb_config', $board_config);
! 			break;
  		}
  	}
***************
*** 282,287 ****
  		$newest_uid = $newest_userdata['user_id'];
  	break;
! 
  	case 'phpbb3':
  		$newest_username = $board_config['newest_username'];
  		$newest_uid = $board_config['newest_user_id'];
--- 294,306 ----
  		$newest_uid = $newest_userdata['user_id'];
  	break;
! 	
! 	case 'smf2':
! 		$newest_username = $board_config['latestRealName'];
! 		$newest_uid = $board_config['latestMember'];
! 	break;
! 	
  	case 'phpbb3':
+ 	case 'olympus':
+ 	case 'ascraeus':
  		$newest_username = $board_config['newest_username'];
  		$newest_uid = $board_config['newest_user_id'];
***************
*** 294,303 ****
  	case 'internal':
  	case 'phpbb2':	
! 		if ( $newest_userdata['user_level'] == ADMIN )
  		{
  			$newest_color = $theme['fontcolor3'];
  			$newest_username = '<b>' . $newest_username . '</b>';
  		}
! 		else if ( $newest_userdata['user_level'] == MOD )
  		{
  			$newest_color = $theme['fontcolor2'];
--- 313,322 ----
  	case 'internal':
  	case 'phpbb2':	
! 		if ($newest_userdata['user_level'] == ADMIN)
  		{
  			$newest_color = $theme['fontcolor3'];
  			$newest_username = '<b>' . $newest_username . '</b>';
  		}
! 		else if ($newest_userdata['user_level'] == MOD)
  		{
  			$newest_color = $theme['fontcolor2'];
***************
*** 308,313 ****
--- 327,342 ----
  		$newest_user = "The newest registered user is " . $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color);
  	break;
+ 	
+ 	case 'smf2':	
+ 		$newest_color = $theme['fontcolor3'];
+ 		$newest_username = '<b>' . $newest_username . '</b>';
+ 		$newest_style_color = 'style="color:#' . $newest_color . '"';
+ 		//This is not used in internal mode template, but here only added
+ 		$newest_user = sprintf("tr()The newest registered user is ", $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color));
+ 	break;	
  
  	case 'phpbb3':
+ 	case 'olympus':
+ 	case 'ascraeus':
  		$newest_color = $board_config['newest_user_colour'];
  		$newest_style_color = ($newest_color) ? ' style="color:#' . $newest_color . '" class="username-coloured"' : '';
***************
*** 346,350 ****
  	case 'internal':
  	case 'phpbb2':
! 
  	break;
  
--- 375,379 ----
  	case 'internal':
  	case 'phpbb2':
! 	case 'smf2':
  	break;
  
***************
*** 382,389 ****
--- 411,421 ----
  	case 'internal':
  	case 'phpbb2':
+ 	case 'smf2':	
  		$legend .= (($legend != '') ? ', ' : '') . '[' . sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>') . ']  [' . sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>') . ']';
  	break;
  
  	case 'phpbb3':
+ 	case 'olympus':
+ 	case 'ascraeus':
  		while ($row = $db->sql_fetchrow($result))
  		{
***************
*** 410,416 ****
--- 442,451 ----
  	case 'internal':
  	case 'phpbb2':
+ 	case 'smf2':	
  	break;
  
  	case 'phpbb3':
+ 	case 'olympus':
+ 	case 'ascraeus':
  		if ($board_config['load_birthdays'] && $board_config['allow_birthdays'])
  		{
***************
*** 421,429 ****
  					AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
  			$result = $db->sql_query($sql);
! 
  			while ($row = $db->sql_fetchrow($result))
  			{
  				$birthday_list .= (($birthday_list != '') ? ', ' : '') . $mx_backend->get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
- 
  				if ($age = (int) substr($row['user_birthday'], -4))
  				{
--- 456,463 ----
  					AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
  			$result = $db->sql_query($sql);
! 			
  			while ($row = $db->sql_fetchrow($result))
  			{
  				$birthday_list .= (($birthday_list != '') ? ', ' : '') . $mx_backend->get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
  				if ($age = (int) substr($row['user_birthday'], -4))
  				{
***************
*** 481,489 ****
  	{
  		case 'internal':
! 
! 			break;
  		default:
  			$template->assign_block_vars("switch_phpbb", array());
- 
  	}
  
--- 515,524 ----
  	{
  		case 'internal':
! 		case 'smf2':
! 		
! 		break;
! 		
  		default:
  			$template->assign_block_vars("switch_phpbb", array());
  	}
  

[mxbb-commits] core/admin admin_mx_portal.php,1.52,1.53

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31805/admin

Modified Files:
	admin_mx_portal.php 
Log Message:
some fixes for ascareus backend

Index: admin_mx_portal.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** admin_mx_portal.php	28 Jun 2013 15:32:37 -0000	1.52
--- admin_mx_portal.php	19 May 2014 18:14:40 -0000	1.53
***************
*** 96,100 ****
  
  	$sql = "UPDATE  " . PORTAL_TABLE . " SET " . $db->sql_build_array('UPDATE', $new);
- 
  	if( !($db->sql_query($sql)) )
  	{
--- 96,99 ----
***************
*** 103,109 ****
  
  	$message = update_portal_backend($new['portal_backend']) ? "The CMS configuration file was upgraded ...<br /><br />" : update_portal_backend($new['portal_backend']);
! 
  	$mx_cache->put('mxbb_config', $new);
! 
  	$message .= $lang['Portal_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_portal_config'], "<a href=\"" . mx_append_sid("admin_mx_portal.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>");
  
--- 102,108 ----
  
  	$message = update_portal_backend($new['portal_backend']) ? "The CMS configuration file was upgraded ...<br /><br />" : update_portal_backend($new['portal_backend']);
! 	
  	$mx_cache->put('mxbb_config', $new);
! 	
  	$message .= $lang['Portal_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_portal_config'], "<a href=\"" . mx_append_sid("admin_mx_portal.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>");
  
***************
*** 120,124 ****
  $portal_config['override_user_style'] = $portal_config['override_user_style'] == -1 ? $board_config['override_user_style'] : $portal_config['override_user_style'];
  
! $portal_backend_select = get_list_static('portal_backend', array('internal' => 'Internal', 'phpbb2' => 'phpBB2', 'phpbb3' => 'phpBB3'), $portal_config['portal_backend']);
  
  $style_select = mx_style_select($portal_config['default_style'], 'mx_default_style');
--- 119,123 ----
  $portal_config['override_user_style'] = $portal_config['override_user_style'] == -1 ? $board_config['override_user_style'] : $portal_config['override_user_style'];
  
! $portal_backend_select = get_list_static('portal_backend', array('internal' => 'Internal', 'phpbb2' => 'phpBB2', 'phpbb3' => 'phpBB3', 'olympus' => 'Olympus', 'ascraeus' => 'Ascraeus', 'smf2' => 'SMF2', 'mybb' => 'myBB'), $portal_config['portal_backend']);
  
  $style_select = mx_style_select($portal_config['default_style'], 'mx_default_style');

[mxbb-commits] core/modules/mx_phpbb3blocks/language/lang_romanian index.htm, NONE, 1.1 lang_admin.php, NONE, 1.1 lang_main.php, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/language/lang_romanian
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27417

Added Files:
	index.htm lang_admin.php lang_main.php 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

--- NEW FILE: lang_main.php ---
<?php
/**
*
* @package MX-Publisher Module - mx_phpbb2blocks
* @version $Id: lang_main.php,v 1.1 2014/05/18 06:27:19 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

//
// The format of this file is:
//
// ---> $lang['message'] = 'text';
//
// Specify your language character encoding... [optional]
//
// setlocale(LC_ALL, 'en');

//
// Last Message Block
//
$lang['Latest_Post']               	= 'Last Message Post';

//
// Statistics Block
//
$lang['Statistics'] 				= 'Statistics';
$lang['Rank'] 						= 'Rank';
$lang['Percent'] 					= 'Percent';
$lang['Graph'] 						= 'Graph';
$lang['Uses'] 						= 'Uses';
$lang['Board_Up_Days'] 				= 'Board Up Days';
$lang['Latest_Reg_User'] 			= 'Latest User Registered';
$lang['Latest_Reg_User_Date'] 		= 'Latest User Registered Date';
$lang['Most_Ever_Online'] 			= 'Most Users Ever Online';
$lang['Most_Ever_Online_Date'] 		= 'Most Users Ever Online Date';

$lang['Admin_Stats'] 				= 'Administrative Statistics';
$lang['Top_Posting_Users'] 			= 'Top Posting Users';
$lang['Most_Active_Topics'] 		= 'Most Active Topics';
$lang['Most_Viewed_Topics'] 		= 'Most Viewed Topics';
$lang['Top_Smilies'] 				= 'Top Used Smilies';
//Announce
$lang['POST_IMG'] 					= 'Post';
$lang['POST_NEWS'] 					= 'News';
$lang['POST_NEWS_GLOBAL'] 			= 'Global News';
$lang['POST_NEW_IMG'] 				= 'Post New';
$lang['POST_NEW_HOT_IMG'] 			= 'Post New Hot';
$lang['POST_LOCKED_IMG'] 			= 'Post Locked';
$lang['POST_REPLY'] 				= 'Post a reply';
$lang['PRINT_IT'] 					= 'Print it';
$lang['PROFILE_SMALL'] 				= 'UCP';
$lang['POST_ANNOUNCEMENT_NEW'] 		= 'New Announcement';
$lang['POST_ANNOUNCEMENT'] 			= 'Announcement';
$lang['POSTED_BY'] 					= 'Posted by';
$lang['PRINT_IT'] 					= 'Print it';
$lang['VIEW_FULL_ARTICLE']			= 'Read full article';
//
// Polls
//
$lang['Surveys_Polls']          	= 'Surveys/Polls';
$lang['Already_voted']          	= 'You have already voted';
$lang['Click_view_voted']       	= 'Click %sHere%s to view the results';
//
// These Language Variables are only used if the Attachment Mod is installed
//
$lang['Disk_usage'] 				= 'Disk Usage';
//Activity stats block
$lang['USERS_24HOUR_TOTAL']     = '%d Users active over the last 24 hours';
$lang['24HOUR_TOPICS']          = 'New Topics <strong>%d</strong>';
$lang['24HOUR_POSTS']          	= 'New Posts <strong>%d</strong>';
$lang['24HOUR_USERS']          	= 'New users <strong>%d</strong>';
$lang['24HOUR_STATS']          	= 'Activity over the last 24 hours';
//
// That's all Folks!
// -------------------------------------------------
?>
--- NEW FILE: lang_admin.php ---
<?php
/**
*
* @package MX-Publisher Module - mx_phpbb2blocks
* @version $Id: lang_admin.php,v 1.1 2014/05/18 06:27:19 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

//
// The format of this file is:
//
// ---> $lang["message"] = "text";
//
// Specify your language character encoding... [optional]
//
// setlocale(LC_ALL, "en");

//
// Last Message Post
//
$lang['Last_Msg_forum']            		= "Source Forums";
$lang['Last_Msg_forum_explain']    		= "- You may do multiple selections<br />* If none is selected, all authorized forums vill be visible";
$lang['Last_Msg_Display_Icon_View']   	= "Display Icon for 'Go to last message'";
$lang['Last_Msg_Display_Last_Author'] 	= "Display Last Post";
$lang['Last_Msg_Display_Author']      	= "Display Author Name";
$lang['Last_Msg_Settings']         		= "Configuration for Last Message Post Module:";

$lang['Last_Msg_Settings']         		= "Configuration for Last Message Post Module:";

$lang['Last_Msg_Number_Title']     		= "Number of Posts to display:";
$lang['Last_Msg_Display_Date']     		= "Display Date?";
$lang['Last_Msg_Title_Length']     		= "Title length (max. characters):";

$lang['Last_Msg_Title_Length_Info']		= "";
$lang['Last_Msg_Display_Forum']    		= "Display Forum Name?";

$lang['Last_Msg_Align']            		= "Title Align:" ;

$lang['Last_Msg_Align_Left']       		= "left";
$lang['Last_Msg_Align_Right']      		= "right";
$lang['Last_Msg_Align_Center']     		= "center";

$lang['Last_Msg_Target']           		= "Target:";
$lang['Last_Msg_Target_1']         		= "New Window";
$lang['Last_Msg_Target_2']         		= "Current Window";

$lang['msg_filter_date']			= "Filter by time";
$lang['msg_filter_date_explain']	= "- Show posts from last week, month, year...";

//
// Announcement
//
$lang['announce_nbr_display']		= "Maximum Number of Messages to Display";
$lang['announce_nbr_days']			= "Number of Days to Display Messages";
$lang['announce_img']				= "Announcement Image";
$lang['announce_img_sticky']		= "Sticky Image";
$lang['announce_img_normal']		= "Normal Message Image";
$lang['announce_img_global']		= "Global Announcement Image";
$lang['announce_display']			= "Display Announcement(s) messages in this Block";
$lang['announce_display_sticky']	= "Display Sticky(ies) in this Block";
$lang['announce_display_normal']	= "Display Normal message(s) in this Block";
$lang['announce_display_global']	= "Display Global Announcements in this Block";
$lang['announce_forum']				= "Source Forums";
$lang['announce_truncate']			= "Truncate Announce Length";
$lang['announce_forum_explain']		= "- You may make multiple selections. For example, hold down the CTRL button on your keyboard while clicking extra selections.<br />* If nothing is selected, all authorized forums will be visible";

//
// Polls
//
$lang['Poll_Display']				= "Which Poll do you want to display?";
$lang['poll_forum']					= "Source Forums";
$lang['poll_forum_explain']			= "- You may make multiple selections<br />* If nothing is selected, all authorized forums will be visible";
$lang['Not_Specified']				= "Not Specified";

//
// That's all Folks!
// -------------------------------------------------

?>
--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

[mxbb-commits] core/includes/shared/smf2/includes smf_2_api.php, NONE, 1.1 smf_2_integration_hooks.php, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/smf2/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27402

Added Files:
	smf_2_api.php smf_2_integration_hooks.php 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

--- NEW FILE: smf_2_integration_hooks.php ---
<?php
/**
 * Simple Machines Forum(SMF) Integration Hooks for SMF 2.0
 *
 * Use this to integrate your SMF version 2.0 forum with 3rd party software
 * If you need help using this script or integrating your forum with other
 * software, feel free to email an...@r2...
 *
 * @package   SMF 2.0 Integration Hooks
 * @author    Simple Machines http://www.simplemachines.org
 * @author    Andre Nickatina <an...@r2...>
 * @copyright 2011 Simple Machines
 * @link      http://www.simplemachines.org Simple Machines
 * @link      http://www.r2bconcepts.com Red2Black Concepts
 * @license   http://www.simplemachines.org/about/smf/license.php BSD
 * @version   0.1.1
 *
 * NOTICE OF LICENSE
 ***********************************************************************************
 * This file, and ONLY this file is released under the terms of the BSD License.   *
 *                                                                                 *
 * Redistribution and use in source and binary forms, with or without              *
 * modification, are permitted provided that the following conditions are met:     *
 *                                                                                 *
 * Redistributions of source code must retain the above copyright notice, this     *
 * list of conditions and the following disclaimer.                                *
 * Redistributions in binary form must reproduce the above copyright notice, this  *
 * list of conditions and the following disclaimer in the documentation and/or     *
 * other materials provided with the distribution.                                 *
 * Neither the name of Simple Machines LLC nor the names of its contributors may   *
 * be used to endorse or promote products derived from this software without       *
 * specific prior written permission.                                              *
 *                                                                                 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"     *
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE       *
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE      *
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE        *
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR             *
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE *
 * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)     *
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT      *
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT   *
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
 **********************************************************************************/

/*
    This file includes functions that may help integration with other scripts
 	and programs. It defines several functions that are called
 	during SMF runtime. These functions are:
 	
    void smf_pre_load_function()
    - This hook is started immediately after the integrate_pre_include hook

    void smf_activate_function(string $username)
    - This hook is started in two instances.  Whenever the administrator approves
      members, each of those members' usernames is passed to the hook function
      for activation in the integrated system as well. The first instance is in
      the SMF admin panel, and the second is in the user profile
    
    void smf_change_member_data_function(array $memberNames, string $var, string $data)
    - This hook is started just before any changes are made to users profiles.
      It is started when an admin is changing multiple users in the admin panel,
      and also when a user is changing his own profile
      
    void smf_create_topic_function(array $msgOptions, array $topicOptions, array $posterOptions)
    - This hook is started right after a new topic post is entered into the SMF
      database. It passes all relevant posting information out to the integration
      hook function
    
	void smf_delete_member_function(int $id_member)
	- This hook is started just before a user is deleted from SMF
	
	void smf_exit_function(bool $do_footer && !WIRELESS)
	- This hook is started just before SMF exits. This hook is extremely important
      for true bridges, because in certain circumstances, the forum can becomes
      unwrapped from the integrated context without this hook. It will execute
      whatever code is in the hook function before exiting PHP
	
	string smf_fix_url_function(string $current_url)
	- This hook is started only in XML feeds. It expects a URL, and is expected
      to return an alternative URL based on the one passed to it
      
    void smf_load_theme_function()
    - This hook is started after SMF has defined its template layers, but before
      the template layers are used. It gives the integration a chance to alter
      the template layers before they are used
	
	void smf_login_function(string $user_settings['memberName'], string $_REQUEST['hash_passwrd'], int $modsettings['cookieTime'])
	- This hook is started after authentication in SMF, but before setting the SMF
      cookie. It's main use is setting the login cookie of an alternative system.
      Because the user is already authenticated in SMF at this point, there is
      very little need for further authentication checks
	
	void smf_logout_function(string $user_settings['memberName'])
	- This hook is started before the user entry is deleted from the SMF log
      online table, and the SMF cookie is dropped
	
	bool smf_outgoing_email_function(string $subject, string $message, string $headers)
	- This hook is started just before the output of the email is modified for sending.
      The message body is still plain text at this point
      
    void smf_output_error_function(string $message, string $error_type, int $error_level, string $file, int $line)
    - This hook is started after an error message is generated in SMF, but before
      SMF displays it
	
	void smf_personal_message_function(array $recipients, string $from['username'], string $subject, string $message)
	- This hook is started just before an SMF Personal Message is sent. It passes
      an array of recipients, the username of the sender, the subject, and the
      message body
	
	void smf_redirect_function(string $setLocation, bool $refresh)
	- This hook is started just before SMF redirects after a form submission.
      To avoid resubmission of form data, SMF uses its own redirect system. The
      $setLocation variable will be the URL to which to redirect, and the $refresh
      variable is a boolean determining whether a page refresh should be done
      after loading
	
	void smf_register_function(array $regOptions, array $theme_vars)
	- This hook is started just before a user is entered into SMF. It is one of the
      more powerful integration hooks, passing all necessary variables in an array
      for use in the integrated system
	
	void smf_reset_pass_function(string $old_username, string $new_username, string $password)
	- This hook is started only when a username or password is changed in SMF

	bool smf_validate_login_function(string $_REQUEST['user'], string $_REQUEST['hash_passwrd'], int $modsettings['cookieTime'])
	- This hook is started before checking for a valid SMF user on login. This
      gives the integrated application a chance to use the login credentials
      before SMF does. Something to keep in mind is that SMF hashes the password
      in SHA1 on the client side, so an unhashed password is not available to
      this function. A value of true or false returned from the function will
      continue as normal, and a value of 'retry' will redisplay the login form,
      with the message "Password security has recently been upgraded. Please login again."
	
    bool smf_verify_password_function(string $username, string $password)
    - This hook is started only when sensitive information may be getting changed.
      It is called when a user is changing his email address, and when an admin is
      using the SMF admin panel.  It validates the username and password against
      the integrated system before proceeding.  SMF expects a value of true if the
      authentication passes, and false if it fails

    int smf_verify_user_function()
    - This hook is started before checking the SMF cookie for a valid user.
      A valid SMF $ID_MEMBER is expected back from the hook function, or SMF
      will assume it should check the SMF cookie instead
    
    array smf_whos_online_function(array $actions)
    - This hook is started during the process of figuring out what each user is
      doing for the Whos online list. It expects text back depending on the
      variables in the query string of the page the user is viewing, which should
      all be passed in the $actions array
      
    array smf_session_save_function()
    - Not a hook, just a function to save your SMF session data and shut down the
      SMF session
      
    void smf_session_restore_function()
    - Not a hook. Use to reopen an SMF session (if you ended it) before your function ends.
      I just restores the $_SESSION variables and calls loadSession; might be unneccessary
 	
*/

//define the integration functions, comment out the ones you don't need
define('SMF_INTEGRATION_SETTINGS',
    serialize( array(
        /*
          This is the very first integration hook encountered in the workflow.
          It is started immediately after the loading of the SMF settings.
          So, if you need to include some scripting at the beginning of SMF,
          this can be done with this hook in a separate file, without any need
          for modifying the SMF code
        */
    //  'integrate_pre_include'        => 'somefile.php',
    //
    //   Hook Name                         Function Name (defined below)
        'integrate_pre_load'           => 'smf_pre_load_function',
        'integrate_activate'           => 'smf_activate_function',
	    'integrate_change_member_data' => 'smf_change_member_data_function',
	    'integrate_create_topic'       => 'smf_create_topic_function',
	    'integrate_delete_member'      => 'smf_delete_member_function',
	    'integrate_exit'               => 'smf_exit_function',
	    'integrate_fix_url'            => 'smf_fix_url_function',
        'integrate_load_theme'         => 'smf_load_theme_function',
	    'integrate_login'              => 'smf_login_function',
	    'integrate_logout'             => 'smf_logout_function',
	    'integrate_outgoing_email'     => 'smf_outgoing_email_function',
	    'integrate_personal_message'   => 'smf_personal_message_function',
	    'integrate_redirect'           => 'smf_redirect_function',
	    'integrate_register'           => 'smf_register_function',
	    'integrate_reset_pass'         => 'smf_reset_pass_function',
	    'integrate_validate_login'     => 'smf_validate_login_function',
        'integrate_verify_password'    => 'smf_verify_password_function',
        'integrate_verify_user'        => 'smf_verify_user_function',
        'integrate_whos_online'        => 'smf_whos_online_function',
    ))
);

/**
 * Pre load
 *
 * This hook is started immediately after the integrate_pre_include hook.
 * It serves much of the same type of purpose, but it calls a function rather
 * than including a file.
 *
 * Example of use: Modifying SMF settings to match those of an integrated system.
 *
 * @access       public
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_pre_load_function()
{
}

/**
 * Activate new member
 *
 * This hook is started in two instances. Whenever the administrator approves
 * members, each of those members' usernames is passed to the hook function for
 * activation in the integrated system as well. The first instance is in the
 * SMF admin panel, and the second is in the user profile.
 *
 * Example of use: A user has registered, and is awaiting admin approval of his
 * account to use both SMF and the integrated application.
 *
 * @access       public
 * @param        string $username the username of the member to activate
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_activate_function($username)
{
}

/**
 * Change member data
 *
 * This hook is started just before any changes are made to users profiles.
 * It is started when an admin is changing multiple users in the admin panel,
 * and also when a user is changing his own profile.
 * The $var array is similar to the $regOptions array in the integrate_register
 * hook. It contains all of the key names for the fields to be changed. The $data
 * array will contain the associated values for those keys.
 *
 * Example of use: A user changes his profile information, and that information
 * needs to be passed to the integrated system.
 *
 * @access       public
 * @param        int || int array $memberNames the member id(s) to be updated
 * @param        string $var the member data column to be updated ex. 'gender'
 * @param        string $data the data to be changed
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_change_member_data_function($memberNames, $var, $data)
{
}

/**
 * Create topic
 *
 * This hook is started right after a new topic post is entered into the SMF
 * database. It passes all relevant posting information out to the integration
 * hook function.
 *
 * Example of use: The forum has a "News" board, and all new topics posted in
 * that board are also news articles on the front page of a CMS.
 *
 * @access       public
 * @param        array $msgOptions
 * @param        array $topicOptions
 * @param        array $posterOptions
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_create_topic_function($msgOptions, $topicOptions, $posterOptions)
{
}

/**
 * Delete member
 *
 * This hook is started just before a user is deleted from SMF.
 *
 * Example of use: A user has deleted his account, or the admin has deleted a
 * user's account, and the account needs to be deleted in the integrated system
 * as well.
 *
 * @access       public
 * @param        int $id_member the member id
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_delete_member_function($id_member)
{
}

/**
 * Exit SMF
 *
 * This hook is started just before SMF exits. This hook is extremely important
 * for true bridges, because in certain circumstances, the forum can becomes
 * unwrapped from the integrated context without this hook. It will execute
 * whatever code is in the hook function before exiting PHP.
 *
 * Example of use: SMF is wrapped in a CMS, and the CMS needs to finish off its
 * execution before exit.
 *
 * @access       public
 * @param        bool $do_footer && !WIRELESS
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_exit_function($do_footer)
{
}

/**
 * Fix url
 *
 * This hook is started only in XML feeds. It expects a URL, and is expected to
 * return an alternative URL based on the one passed to it.
 *
 * Example of use: SMF is wrapped in a CMS, and the URL of the wrapped CMS needs
 * to appear in outgoing RSS feeds.
 *
 * @access       public
 * @param        string $currentUrl the current url
 * @return       string the modified url
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_fix_url_function($currentUrl)
{
}

/**
 * Load theme
 *
 * This hook is started after SMF has defined its template layers, but before
 * the template layers are used. It gives the integration a chance to alter the
 * template layers before they are used.
 *
 * Example of use: The forum is wrapped in a CMS, so the HTML headers need to
 * be omitted to remain W3C compliant.
 *
 * @access       public
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_load_theme_function()
{
}

/**
 * Login member
 *
 * This hook is started after authentication in SMF, but before setting the SMF
 * cookie. It's main use is setting the login cookie of an alternative system.
 * Because the user is already authenticated in SMF at this point, there is very
 * little need for further authentication checks.
 *
 * Example of use: A user has logged into SMF, and should also be logged into
 * the integrated system at the same time.
 *
 * @access       public
 * @param        string $memberName the members' SMF username
 * @param        string $hash_password the password already hashed
 * @param        string $cookieTime ($modsettings['cookieTime'])
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_login_function($memberName, $hash_password, $cookieTime)
{
}

/**
 * Logout member
 *
 * This hook is started before the user entry is deleted from the SMF log online
 * table, and the SMF cookie is dropped.
 *
 * Example of use: A user has logged out of SMF, and should also be logged out
 * of the integrated system at the same time.
 *
 * @access       public
 * @param        string $memberName the members' SMF username
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_logout_function($memberName)
{
}

/**
 * Outgoing email
 *
 * This hook is started just before the output of the email is modified for
 * sending. The message body is still plain text at this point.
 *
 * Example of use: The forum is wrapped in a CMS, so all of the URLs in outgoing
 * emails need to be rewritten to point to the CMS.
 *
 * @access       public
 * @param        string $subject the message subject
 * @param        string $message the message body (plain text)
 * @param        string $headers the email headers
 * @return       bool (false will cancel sending)
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_outgoing_email_function($subject, $message, $headers)
{
}

/**
 * Personal message
 *
 * This hook is started just before an SMF Personal Message is sent. It passes
 * an array of recipients, the username of the sender, the subject, and the
 * message body.
 *
 * Example of use: A user sends a PM, and that PM should appear in the integrated
 * system as well as SMF's PM system.
 *
 * @access       public
 * @param        array $recipients the usernames of the recipients
 * @param        string $from the username of the sender
 * @param        string $subject the personal message subject
 * @param        string $message the personal message
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_personal_message_function($recipients, $from, $subject, $message)
{
}

/**
 * Redirect
 *
 * This hook is started just before SMF redirects after a form submission. To
 * avoid resubmission of form data, SMF uses its own redirect system. The
 * $setLocation variable will be the URL to which to redirect, and the $refresh
 * variable is a boolean determining whether a page refresh should be done after
 * loading.
 *
 * Example of use: Similarly to the integrate_outgoing_email function above,
 * this can be used to rewrite redirection URLs back to a wrapped CMS page.
 *
 * @access       public
 * @param        string $setLocation the url to redirect to
 * @param        bool $refresh whether a page refresh should be done after loading
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_redirect_function($setLocation, $refresh)
{
}

/**
 * Register new member
 *
 * This hook is started just before a user is entered into SMF. It is one of the
 * more powerful integration hooks, passing all necessary variables in an array
 * for use in the integrated system.
 *
 * The $regOptions array by default will contain the following keys:
 *   memberName
 *   emailAddress
 *   passwd (SHA1 hash)
 *   passwordSalt
 *   posts
 *   dateRegistered
 *   memberIP
 *   memberIP2
 *   validation_code
 *   realName
 *   personalText
 *   pm_email_notify
 *   ID_THEME
 *   ID_POST_GROUP
 *
 * It is important to note that all text values will already be enclosed in single
 * quotes for ease of use in queries. More fields are available, and more are
 * added with the addition of mods like the Custom Profile Fields mod.
 *
 * Example of use: A user has registered in SMF, or an admin has created a user
 * in the SMF admin panel, and the user needs to be created in the integrated
 * system as well.
 *
 * @access       public
 * @param        array $regOptions the registration options (shown above)
 * @param        array $theme_vars the theme variables
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_register_function($regOptions, $theme_vars)
{
}

/**
 * Change username or password
 *
 * This hook is started only when a username or password is changed in SMF.
 *
 * Example of use: A user changes his password, so the password also needs to
 * change in the integrated system.
 *
 * @access       public
 * @param        type [$varname] description
 * @return       type description
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_reset_pass_function($oldUsername, $newUsername, $password)
{
}

/**
 * Validate login
 *
 * This hook is started before checking for a valid SMF user on login. This gives
 * the integrated application a chance to use the login credentials before SMF
 * does. Something to keep in mind is that SMF hashes the password in SHA1 on
 * the client side, so an unhashed password is not available to this function.
 *
 * A value of true or false returned from the function will continue as normal,
 * and a value of 'retry' will redisplay the login form, with the message
 * "Password security has recently been upgraded.  Please login again."
 *
 * Example of use: A user that exists in the integrated application but not in
 * SMF is attempting to login, so needs to be migrated to SMF before SMF has
 * a chance to authenticate. Something to keep in mind here is that SMF can
 * authenticate with many other types of hashes, so the hashed passwords of
 * other systems can typically be written directly to the SMF members table,
 * with the hook returning 'retry', which will automatically invoke SMF to
 * rewrite to its own hash on the second login attempt.
 *
 * @access       public
 * @param        string $username ($_REQUEST['user']) the members' username
 * @param        string $hash_password ($_REQUEST['hash_passwrd'])
 * @param        int $cookieTime ($modsettings['cookieTime'])
 * @return       bool || string 'retry'
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_validate_login_function($username, $hash_password, $cookieTime)
{
}

/**
 * Verify password in integrated system
 *
 * This hook is started only when sensitive information may be getting changed.
 * It is called when a user is changing his email address, and when an admin is
 * using the SMF admin panel. It validates the username and password against the
 * integrated system before proceeding. SMF expects a value of true if the
 * authentication passes, and false if it fails.
 *
 * Example of use: You want an added layer of security to authenticate user
 * changes and SMF admin panel access.
 *
 * @access       public
 * @param        string $username the members' username
 * @param        string $password this might be plain text OR SHA1 hashed depending
 *               on where it's called from. Use strlen($password) == 40 to check I guess
 * @return       bool whether the login passes the integrated systems' authentication
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_verify_password_function()
{
}

/**
 * Verify user
 *
 * This hook is started before checking the SMF cookie for a valid user. A valid
 * SMF $ID_MEMBER is expected back from the hook function, or SMF will assume
 * it should check the SMF cookie instead.
 *
 * Example of use: User is logged into a CMS, but not into SMF, so we want to
 * auto-login to SMF without the SMF cookie.
 *
 * @access       public
 * @return       int $id_member a valid SMF member id
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_verify_user_function()
{
}

/**
 * Who's online
 *
 * This hook is started during the process of figuring out what each user is doing
 * for the Whos Online list. It expects text back depending on the variables in
 * the query string of the page the user is viewing, which should all be passed
 * in the $actions array.
 *
 * Example of use: A user is accessing a page in an integrated system, and that
 * page should be reported correctly in the Whos online.
 *
 * @access       public
 * @param        array $actions the actions being performed
 * @return       array $data the corresponding results to display in Who's Online list
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_whos_online_function($actions)
{
}

/**
 * Session save and close
 *
 * This function was designed to save your SMF session data and end the session.
 * It will store the saved session information in an array it returns. This way
 * you can stop your session and use your integrated system, which might require
 * it's own session, or mess with the SMF session. You can use the session restore
 * function afterwards to restore the saved session data.
 *
 * Example of use: Your integrated system requires a session and you don't want
 * your SMF session to screw it up or vice versa. You use this function to save
 * your SMF session and restore it after you finish manipulating the other system.
 *
 * @access       public
 * @return       array $data the session data
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_session_save_function()
{
    $data = array();
    $data['SESSION']         = $_SESSION;

    //just in case
    $sessionId               = session_id();
    $sessionName             = session_name();
    $cookieParams            = session_get_cookie_params();
    $sessionSavePath         = session_save_path();
    $data['sessionId']       = $sessionId;
    $data['sessionName']     = $sessionName;
    $data['cookieParams']    = $cookieParams;
    $data['sessionSavePath'] = $sessionSavePath;

    //kill it
    if ('' != session_id()) {
        session_write_close();
    }

    $_SESSION = array();
    unset($_SESSION);

    return $data;
}

/**
 * Session restore
 *
 * This function was designed to restore your SMF session data.
 *
 * Example of use: You're done manipulating your integrated system and now you
 * want to restore SMF's session and get back to business as usual without any
 * session verification errors or dropped session/lost data
 *
 * @access       public
 * @param        array $data the session data to restore
 * @return       void
 * @link         http://www.r2bconcepts.com Red2Black Concepts
 * @since        0.1.0
 */
function smf_session_restore_function($data=array())
{
    //make sure our other session is closed now
    if ('' != session_id()) {
        session_write_close();
    }
    //put everything back where we found it
    session_set_cookie_params($data['cookieParams']['lifetime'], $data['cookieParams']['path'], $data['cookieParams']['domain'], $data['cookieParams']['secure'], $data['cookieParams']['httponly']);
    session_save_path($data['sessionSavePath']);
    session_name($data['sessionName']);
    session_id($data['sessionId']);
    session_set_save_handler('sessionOpen', 'sessionClose', 'sessionRead', 'sessionWrite', 'sessionDestroy', 'sessionGC');
    //resume the session
    session_start();

    //put the session variables back
    $_SESSION = $data['SESSION'];

    //restore php.ini settings and hopefully fix anything we missed
    loadSession();
}

?>

--- NEW FILE: smf_2_api.php ---
<?php

/**
 * Simple Machines Forum(SMF) API for SMF 2.0
 *
 * Use this to integrate your SMF version 2.0 forum with 3rd party software
 * If you need help using this script or integrating your forum with other
 * software, feel free to contact an...@r2...
 *
 * @package   SMF 2.0 API
 * @author    Simple Machines http://www.simplemachines.org
 * @author    Andre Nickatina <an...@r2...>
 * @copyright 2011 Simple Machines
 * @link      http://www.simplemachines.org Simple Machines
 * @link      http://www.r2bconcepts.com Red2Black Concepts
 * @license   http://www.simplemachines.org/about/smf/license.php BSD
 * @version   0.1.2
 *
 * NOTICE OF LICENSE
[...3273 lines suppressed...]

/**
 * A replacement for unserialize that returns whether it worked and
 * populates the unserialized variable by reference.
 *
 * @author walf
 * @link   http://www.php.net/manual/pt_BR/function.unserialize.php#105500
 * @param  string $serialized the serialized data
 * @param  array $into the variable to hold the unserialized array
 * @return bool whether the data was unserialized or not
 * @since  0.1.2
 */
function funserialize($serialized, &$into) {
    static $sfalse;
    if ($sfalse === null)
        $sfalse = serialize(false);
    $into = @unserialize($serialized);
    return $into !== false || rtrim($serialized) === $sfalse;
    //whitespace at end of serialized var is ignored by PHP
}

[mxbb-commits] core/includes/sessions/smf2 auth.php, NONE, 1.1 bbcode.php, NONE, 1.1 constants.php, NONE, 1.1 core.php, NONE, 1.1 functions.php, NONE, 1.1 login.php, NONE, 1.1 readme.html, NONE, 1.1 session.php, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/smf2
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27354

Added Files:
	auth.php bbcode.php constants.php core.php functions.php 
	login.php readme.html session.php 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

--- NEW FILE: login.php ---
<?php
/**
*
* @package MX-Publisher Core
* @version $Id: login.php,v 1.1 2014/05/18 06:26:59 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if ( !defined('IN_PORTAL') )
{
	die("Hacking attempt");
}

if ($mx_request_vars->is_request('login') && (!$userdata['session_logged_in'] || $mx_request_vars->is_post('admin')) )
{
	$username = $mx_request_vars->is_post('username') ? phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : '';
	$password = $mx_request_vars->post('password', MX_TYPE_NO_TAGS);
	// Set the randomly generated code.
	if (!isset($_SESSION['session_var']))
	{
		$_SESSION['session_value'] = md5(session_id() . mt_rand());
		$_SESSION['session_var'] = substr(preg_replace('~^\d+~', '', sha1(mt_rand() . session_id() . mt_rand())), 0, rand(7, 12));
	}
	$sc = isset($_SESSION['session_value']) ? $_SESSION['session_value'] : '';

	$sql = "SELECT *
		FROM " . USERS_TABLE . "
		WHERE member_name = '" . str_replace("\\'", "''", $username) . "'";

	if ( !($result = $db->sql_query($sql) ) )
	{
		mx_message_die(GENERAL_ERROR, 'Error in obtaining userdata', '', __LINE__, __FILE__, $sql);
	}

	if( $row = $db->sql_fetchrow($result) )
	{
		if( $row['id_group'] != ADMIN && $board_config['board_disable'] )
		{
			mx_redirect(mx_append_sid("index.$phpEx", false));

		}
		else
		{
			// If the last login is more than x minutes ago, then reset the login tries/time
			if (isset($_SESSION['failed_login']) && ($board_config['failed_login_threshold'] * 3 >= $_SESSION['failed_login']))
			{
				$db->sql_query('UPDATE ' . USERS_TABLE . ' SET last_login = 0 WHERE user_id = ' . $row['user_id']);
				// Reset the login threshold.					
				unset($_SESSION['failed_login']);					
			}
			
			// Check to see if user is allowed to login again... if his tries are exceeded			
			if (isset($_SESSION['failed_login']) && ($_SESSION['failed_login'] >= $board_config['failed_login_threshold'] * 3))
			{
				// Reset the login threshold.					
				mx_message_die(GENERAL_MESSAGE, sprintf($lang['Login_attempts_exceeded'], $board_config['max_login_attempts'], $board_config['login_reset_time']));				
			}

			// Figure out the password using SMF's encryption - if what they typed is right.
			/*
			if (isset($password) && strlen($password) == 40)
			{
				// Needs upgrading?
				if (strlen($user_settings['passwd']) != 40)
				{
				}			
			}
			*/
			
			// Challenge passed.
			if ($password == sha1($row['passwd'] . $sc) && $row['is_activated'])
			{			
				$sha_passwd = $row['passwd'];
				//if( md5($password) == $row['passwd'] && $row['user_active'] )
				//{
				$autologin = $mx_request_vars->is_post('autologin');
				
				$admin = $mx_request_vars->is_post('admin');
				$session_id = $mx_user->session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin);
				
				// Reset login tries
				$db->sql_query('UPDATE ' . USERS_TABLE . ' SET last_login = 0 WHERE user_id = ' . $row['user_id']);
				
				if($session_id)
				{
					$fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&amp;', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx";
					$url = $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS);
					$url = ( !empty($url) ) ? str_replace('&amp;', '&', $url) : $fromurl;
					mx_redirect(mx3_append_sid($url, false, false, $session_id));
				}
				else
				{
					mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", "", __LINE__, __FILE__);
				}
			}
			// Only store a failed login attempt for an active user - inactive users can't login even with a correct password
			elseif($row['is_activated'])
			{
				// Save login tries and last login
				if ($row['id_member'] != ANONYMOUS)
				{
					$sql = 'UPDATE ' . USERS_TABLE . '
						SET last_login = ' . time() . '
						WHERE id_member = ' . $row['id_member'];
					$db->sql_query($sql);
				}
				
				$redirect = $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS);
				if (!empty($redirect))
				{
					$redirect = str_replace('&amp;', '&', $redirect);
					$redirect = str_replace('?', '&', $redirect);
				}
				if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r"))
				{
					mx_message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.');
				}
				
				$template->assign_vars(array(
					'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
				);

				$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], "<a href=\"login.$phpEx?redirect=$redirect\">", '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>');
				mx_message_die(GENERAL_MESSAGE, $message);
			}
		}
	}
	else
	{
		$redirect = $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS);
		if (!empty($redirect))
		{
			$redirect = str_replace('&amp;', '&', $redirect);
			$redirect = str_replace('?', '&', $redirect);
		}

		if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r"))
		{
			mx_message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.');
		}

		$template->assign_vars(array(
			'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
		);

		$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], "<a href=\"login.$phpEx?redirect=$redirect\">", '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid("index.$phpEx") . '">', '</a>');
		mx_message_die(GENERAL_MESSAGE, $message);
	}
}
else if ($mx_request_vars->is_request('logout') && $userdata['session_logged_in'] )
{
	// session id check
	if ($sid == '' || $sid != $userdata['session_id'])
	{
		mx_message_die(GENERAL_ERROR, 'Invalid_session');
	}

	if( $userdata['session_logged_in'] )
	{
		$mx_user->session_end($userdata['session_id'], $userdata['user_id']);
	}

	if (!$mx_request_vars->is_empty_request('redirect'))
	{
		$fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&amp;', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx";
		$url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&amp;', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : $fromurl;
		mx_redirect(mx3_append_sid($url, false, false, $session_id));
	}
	else
	{
		mx_redirect(mx_append_sid("index.$phpEx", false));
	}
}
else
{
	$url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&amp;', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : "index.$phpEx";
	mx_redirect(mx_append_sid($url, false));
}
?>
--- NEW FILE: functions.php ---
<?php
/**
*
* @package Auth
* @version $Id: functions.php,v 1.1 2014/05/18 06:26:59 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if ( !defined( 'IN_PORTAL' ) )
{
	die( "Hacking attempt" );
}

/**
* Olympus Parse cfg file
*/
function mx_parse_cfg_file($filename, $lines = false)
{
	$parsed_items = array();

	if ($lines === false)
	{
		$lines = file($filename);
	}

	foreach ($lines as $line)
	{
		$line = trim($line);

		if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false)
		{
			continue;
		}

		// Determine first occurrence, since in values the equal sign is allowed
		$key = strtolower(trim(substr($line, 0, $delim_pos)));
		$value = trim(substr($line, $delim_pos + 1));

		if (in_array($value, array('off', 'false', '0')))
		{
			$value = false;
		}
		else if (in_array($value, array('on', 'true', '1')))
		{
			$value = true;
		}
		else if (!trim($value))
		{
			$value = '';
		}
		else if (($value[0] == "'" && $value[sizeof($value) - 1] == "'") || ($value[0] == '"' && $value[sizeof($value) - 1] == '"'))
		{
			$value = substr($value, 1, sizeof($value)-2);
		}

		$parsed_items[$key] = $value;
	}

	return $parsed_items;
}

/**
* Add log event
*/
function mx_add_log()
{
	global $db, $mx_user;

	$args = func_get_args();

	$mode			= array_shift($args);
	$reportee_id	= ($mode == 'user') ? intval(array_shift($args)) : '';
	$forum_id		= ($mode == 'mod') ? intval(array_shift($args)) : '';
	$topic_id		= ($mode == 'mod') ? intval(array_shift($args)) : '';
	$action			= array_shift($args);
	$data			= (!sizeof($args)) ? '' : serialize($args);

	$sql_ary = array(
		'user_id'		=> (empty($mx_user->data)) ? ANONYMOUS : $mx_user->data['user_id'],
		'log_ip'		=> $mx_user->ip,
		'log_time'		=> time(),
		'log_operation'	=> $action,
		'log_data'		=> $data,
	);

	switch ($mode)
	{
		case 'admin':
			$sql_ary['log_type'] = LOG_ADMIN;
		break;

		case 'mod':
			$sql_ary += array(
				'log_type'	=> LOG_MOD,
				'forum_id'	=> $forum_id,
				'topic_id'	=> $topic_id
			);
		break;

		case 'user':
			$sql_ary += array(
				'log_type'		=> LOG_USERS,
				'reportee_id'	=> $reportee_id
			);
		break;

		case 'critical':
			$sql_ary['log_type'] = LOG_CRITICAL;
		break;

		default:
			return false;
	}

	$db->sql_query('INSERT INTO ' . LOG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));

	return $db->sql_nextid();
}

/**
* Generate sort selection fields
*/
function mx_gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, &$sort_dir, &$s_limit_days, &$s_sort_key, &$s_sort_dir, &$u_sort_param)
{
	global $mx_user;

	$sort_dir_text = array('a' => $mx_user->lang['ASCENDING'], 'd' => $mx_user->lang['DESCENDING']);

	// Check if the key is selectable. If not, we reset to the first key found.
	// This ensures the values are always valid.
	if (!isset($limit_days[$sort_days]))
	{
		@reset($limit_days);
		$sort_days = key($limit_days);
	}

	if (!isset($sort_by_text[$sort_key]))
	{
		@reset($sort_by_text);
		$sort_key = key($sort_by_text);
	}

	if (!isset($sort_dir_text[$sort_dir]))
	{
		@reset($sort_dir_text);
		$sort_dir = key($sort_dir_text);
	}

	$s_limit_days = '<select name="st">';
	foreach ($limit_days as $day => $text)
	{
		$selected = ($sort_days == $day) ? ' selected="selected"' : '';
		$s_limit_days .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>';
	}
	$s_limit_days .= '</select>';

	$s_sort_key = '<select name="sk">';
	foreach ($sort_by_text as $key => $text)
	{
		$selected = ($sort_key == $key) ? ' selected="selected"' : '';
		$s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>';
	}
	$s_sort_key .= '</select>';

	$s_sort_dir = '<select name="sd">';
	foreach ($sort_dir_text as $key => $value)
	{
		$selected = ($sort_dir == $key) ? ' selected="selected"' : '';
		$s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
	}
	$s_sort_dir .= '</select>';

	$u_sort_param = "st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";

	return;
}

/**
* Get username details for placing into templates.
*
* @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour) or full (for obtaining a html string representing a coloured link to the users profile).
* @param int $user_id The users id
* @param string $username The users name
* @param string $username_colour The users colour
* @param string $guest_username optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then.
* @param string $custom_profile_url optional parameter to specify a profile url. The user id get appended to this url as &amp;u={user_id}
*
* @return string A string consisting of what is wanted based on $mode.
*/
function mx_get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
{
	global $smf_root_path, $phpEx, $mx_user, $phpbb_auth;

	$profile_url = '';
	$username_colour = ($username_colour) ? '#' . $username_colour : '';

	if ($guest_username === false)
	{
		$username = ($username) ? $username : $mx_user->lang['GUEST'];
	}
	else
	{
		$username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $mx_user->lang['GUEST']);
	}

	// Only show the link if not anonymous
	if ($user_id && $user_id != ANONYMOUS)
	{
		// Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
		// For all others the link leads to a login page or the profile.
		if ($mx_user->data['user_id'] != ANONYMOUS && !$phpbb_auth->acl_get('u_viewprofile'))
		{
			$profile_url = '';
		}
		else
		{
			$profile_url = ($custom_profile_url !== false) ? $custom_profile_url : mx3_append_sid("{$smf_root_path}memberlist.$phpEx", 'mode=viewprofile');
			$profile_url .= '&amp;u=' . (int) $user_id;
		}
	}
	else
	{
		$profile_url = '';
	}

	switch ($mode)
	{
		case 'profile':
			return $profile_url;
		break;

		case 'username':
			return $username;
		break;

		case 'colour':
			return $username_colour;
		break;

		case 'full':
		default:

			$tpl = '';
			if (!$profile_url && !$username_colour)
			{
				$tpl = '{USERNAME}';
			}
			else if (!$profile_url && $username_colour)
			{
				$tpl = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>';
			}
			else if ($profile_url && !$username_colour)
			{
				$tpl = '<a href="{PROFILE_URL}">{USERNAME}</a>';
			}
			else if ($profile_url && $username_colour)
			{
				$tpl = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>';
			}

			return str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), $tpl);
		break;
	}
}
?>
--- NEW FILE: core.php ---
<?php
/**
*
* @package Auth
* @version $Id: core.php,v 1.1 2014/05/18 06:26:59 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if (!defined('IN_PORTAL'))
{
	die("Hacking attempt");
}

// don't do anything if SMF is already loaded
if (defined('SMF'))
{
[...1298 lines suppressed...]

	}

	/**
	 * Enter description here...
	 *
	 * @return unknown
	 */
	function backend_version_check()
	{
		return '';
	}

}

//
// Now load some bbcodes, to be extended for this backend (see below)
//
include_once($mx_root_path . 'includes/sessions/smf2/bbcode.'.$phpEx); // BBCode associated functions
?>
--- NEW FILE: constants.php ---
<?php
/**
*
* @package Style
* @version $Id: constants.php,v 1.1 2014/05/18 06:26:59 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if ( !defined('IN_PHPBB') )
{
	die("Hacking attempt");
}

// Debug Level
//@define('DEBUG', 1); // Debugging on
@define('DEBUG', 0); // Debugging off

// User Levels <- Do not change the values of USER or ADMIN
@define('DELETED', -1);
@define('ANONYMOUS', 0);
@define('GUEST', 0);
@define('USER', 0);
@define('ADMIN', 1);
@define('MOD', 2);

// User related
@define('USER_ACTIVATION_NONE', 0);
@define('USER_ACTIVATION_SELF', 1);
@define('USER_ACTIVATION_ADMIN', 2);

@define('USER_AVATAR_NONE', 0);
@define('USER_AVATAR_UPLOAD', 1);
@define('USER_AVATAR_REMOTE', 2);
@define('USER_AVATAR_GALLERY', 3);

// Group settings
@define('GROUP_OPEN', 0);
@define('GROUP_CLOSED', 1);
@define('GROUP_HIDDEN', 2);

// Forum state
@define('FORUM_UNLOCKED', 0);
@define('FORUM_LOCKED', 1);

// Topic status
@define('TOPIC_UNLOCKED', 0);
@define('TOPIC_LOCKED', 1);
@define('TOPIC_MOVED', 2);
@define('TOPIC_WATCH_NOTIFIED', 1);
@define('TOPIC_WATCH_UN_NOTIFIED', 0);

// Topic types
@define('POST_NORMAL', 0);
@define('POST_STICKY', 1);
@define('POST_ANNOUNCE', 2);
@define('POST_GLOBAL_ANNOUNCE', 3);

// SQL codes
@define('BEGIN_TRANSACTION', 1);
@define('END_TRANSACTION', 2);

// Error codes
@define('GENERAL_MESSAGE', 200);
@define('GENERAL_ERROR', 202);
@define('CRITICAL_MESSAGE', 203);
@define('CRITICAL_ERROR', 204);

// Private messaging
@define('PRIVMSGS_READ_MAIL', 0);
@define('PRIVMSGS_NEW_MAIL', 1);
@define('PRIVMSGS_SENT_MAIL', 2);
@define('PRIVMSGS_SAVED_IN_MAIL', 3);
@define('PRIVMSGS_SAVED_OUT_MAIL', 4);
@define('PRIVMSGS_UNREAD_MAIL', 5);

// URL PARAMETERS
@define('POST_TOPIC_URL', 't');
@define('POST_CAT_URL', 'c');
@define('POST_FORUM_URL', 'f');
@define('POST_USERS_URL', 'u');
@define('POST_POST_URL', 'p');
@define('POST_GROUPS_URL', 'g');

// Session parameters
@define('SESSION_METHOD_COOKIE', 100);
@define('SESSION_METHOD_GET', 101);

// Page numbers for session handling
@define('PAGE_INDEX', 0);
@define('PAGE_LOGIN', -1);
@define('PAGE_SEARCH', -2);
@define('PAGE_REGISTER', -3);
@define('PAGE_PROFILE', -4);
@define('PAGE_VIEWONLINE', -6);
@define('PAGE_VIEWMEMBERS', -7);
@define('PAGE_FAQ', -8);
@define('PAGE_POSTING', -9);
@define('PAGE_PRIVMSGS', -10);
@define('PAGE_GROUPCP', -11);
@define('PAGE_TOPIC_OFFSET', 5000);

// Auth settings
@define('AUTH_LIST_ALL', 0);
@define('AUTH_ALL', 0);

@define('AUTH_REG', 1);
@define('AUTH_ACL', 2);
@define('AUTH_MOD', 3);
@define('AUTH_ADMIN', 5);

@define('AUTH_VIEW', 1);
@define('AUTH_READ', 2);
@define('AUTH_POST', 3);
@define('AUTH_REPLY', 4);
@define('AUTH_EDIT', 5);
@define('AUTH_DELETE', 6);
@define('AUTH_ANNOUNCE', 7);
@define('AUTH_STICKY', 8);
@define('AUTH_POLLCREATE', 9);
@define('AUTH_VOTE', 10);
@define('AUTH_ATTACH', 11);

// Table names
//@define('CONFIRM_TABLE', $table_prefix.'confirm');
//@define('AUTH_ACCESS_TABLE', $table_prefix.'auth_access');
//@define('BANLIST_TABLE', $table_prefix.'banlist');
//@define('CATEGORIES_TABLE', $table_prefix.'categories');
@define('CONFIG_TABLE', $table_prefix.'settings');
//@define('DISALLOW_TABLE', $table_prefix.'disallow');
//@define('FORUMS_TABLE', $table_prefix.'forums');
@define('GROUPS_TABLE', $mx_table_prefix.'groups');
//@define('POSTS_TABLE', $table_prefix.'posts');
//@define('POSTS_TEXT_TABLE', $table_prefix.'posts_text');
//@define('PRIVMSGS_TABLE', $table_prefix.'privmsgs');
//@define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text');
//@define('PRIVMSGS_IGNORE_TABLE', $table_prefix.'privmsgs_ignore');
//@define('PRUNE_TABLE', $table_prefix.'forum_prune');
//@define('RANKS_TABLE', $table_prefix.'ranks');
//@define('SEARCH_TABLE', $table_prefix.'search_results');
//@define('SEARCH_WORD_TABLE', $table_prefix.'search_wordlist');
//@define('SEARCH_MATCH_TABLE', $table_prefix.'search_wordmatch');
@define('SESSIONS_TABLE', $table_prefix.'sessions');
@define('SESSIONS_KEYS_TABLE', $mx_table_prefix.'sessions_keys');
@define('SMILIES_TABLE', $mx_table_prefix.'smilies');
//@define('THEMES_TABLE', $table_prefix.'themes');
//@define('THEMES_NAME_TABLE', $table_prefix.'themes_name');
//@define('TOPICS_TABLE', $table_prefix.'topics');
//@define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch');
@define('USER_GROUP_TABLE', $mx_table_prefix.'user_group');
@define('USERS_TABLE', $table_prefix.'members');
@define('WORDS_TABLE', $mx_table_prefix.'words');
//@define('VOTE_DESC_TABLE', $table_prefix.'vote_desc');
//@define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results');
//@define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
?>
--- NEW FILE: bbcode.php ---
<?php
/**
*
* @package Functions_phpBB
* @version $Id: bbcode.php,v 1.1 2014/05/18 06:26:59 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if (!defined('IN_PORTAL'))
{
	exit;
}

//
// Now load some bbcodes, to be extended for this backend (see below)
//
include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions

/**
 * MXP BBcodes
 * @package MX-Publisher
 */
class mx_bbcode extends bbcode_base
{
	var $smiley_path_url = '';
	var $smiley_root_path =	'';
	var $smilies_path = '';

	var $smiley_url = 'smile_url';
	var $smiley_id = 'smilies_id';
	var $emotion = 'emoticon';

	var $bbcode_uid = '';
	var $bbcode_bitfield = '';
	var $bbcode_cache = array();
	var $bbcode_template = array();

	var $bbcodes = array();

	var $template_bitfield;
	var $template_filename = '';

	function mx_bbcode($bitfield = '')
	{
		global $board_config, $phpbb_root_path;

		if ($bitfield)
		{
			$this->bbcode_bitfield = $bitfield;
			$this->bbcode_cache_init();
		}

		$this->smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed
		$this->smiley_root_path =	$phpbb_root_path; //same here

		$this->smilies_path = str_replace("//", "/", $board_config['smilies_path']);
	}

	/**
	 * bbcode to html.
	 *
	 * Convert the bbcode to html
	 *
	 * @param string $bbtext
	 * @param string $bbcode_uid
	 * @param boolean $smilies_on
	 * @return string
	 */
	function decode($bbtext, $bbcode_uid, $smilies_on = true)
	{
		global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page;

		$mytext = stripslashes($bbtext);
		if (!empty($bbcode_uid))
		{
			$mytext = $this->bbencode_second_pass($mytext, $bbcode_uid);
		}
		if ($smilies_on)
		{
			$mytext = $this->smilies_pass($mytext);
		}
		$mytext = str_replace("\n", "\n<br />\n", $mytext);
		return $this->make_clickable($mytext);
	}

	//
	// This function will prepare a posted message for
	// entry into the database.
	//
	function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid = 0)
	{
		global $board_config, $html_entities_match, $html_entities_replace;

		//
		// Clean up the message
		//
		$message = trim($message);

		if ($html_on)
		{
			// If HTML is on, we try to make it safe
			// This approach is quite agressive and anything that does not look like a valid tag
			// is going to get converted to HTML entities
			$message = stripslashes($message);
			$html_match = '#<[^\w<]*(\w+)((?:"[^"]*"|\'[^\']*\'|[^<>\'"])+)?>#';
			$matches = array();

			$message_split = preg_split($html_match, $message);
			preg_match_all($html_match, $message, $matches);

			$message = '';

			foreach ($message_split as $part)
			{
				$tag = array(array_shift($matches[0]), array_shift($matches[1]), array_shift($matches[2]));
				$message .= preg_replace($html_entities_match, $html_entities_replace, $part) . clean_html($tag);
			}

			$message = addslashes($message);
			$message = str_replace('&quot;', '\&quot;', $message);
		}
		else
		{
			$message = preg_replace($html_entities_match, $html_entities_replace, $message);
		}

		if($bbcode_on && $bbcode_uid != '')
		{
			$message = $this->bbencode_first_pass($message, $bbcode_uid);
		}

		return $message;
	}

	/**
	 * phpBB Smilies pass.
	 *
	 * Hacking smilies_pass from phpbb/includes/bbcode.php
	 *
	 * @param string $message
	 * @return string
	 *
	*/
	function smilies_pass($message)
	{
		static $orig, $repl;
		global $board_config, $mx_root_path, $phpbb_root_path, $phpEx;

		if (!isset($orig))
		{
			global $db;
			$orig = $repl = array();

			$sql = 'SELECT * FROM ' . SMILIES_TABLE;
			if( !$result = $db->sql_query($sql) )
			{
				mx_message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql);
			}

			$smilies = $db->sql_fetchrowset($result);

			if (count($smilies))
			{
				@usort($smilies, 'smiley_sort');
			}

			for ($i = 0; $i < count($smilies); $i++)
			{
				$orig[] = "/(?<=.\W|\W.|^\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/";
				$repl[] = '<img src="' . $this->smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$this->smiley_url] . '" alt="' . $smilies[$i][$this->emotion] . '" border="0" />';
			}
		}

		if (count($orig))
		{
			$message = preg_replace($orig, $repl, ' ' . $message . ' ');
			$message = substr($message, 1, -1);
		}

		return $message;
	}

	/**
	 * Generate smilies.
	 *
	 * Hacking generate_smilies from phpbb/includes/functions_post(ing).php
	 *
	 * @param string $mode
	 * @param integer $page_id
	*
	* Fill smiley templates (or just the variables) with smilies, either in a window or inline
	*/
	function generate_smilies($mode, $forum_id)
	{
		global $mx_page, $board_config, $template, $mx_root_path, $phpbb_root_path, $phpEx;
		global $db, $lang, $images, $theme;
		global $user_ip, $session_length, $starttime;
		global $userdata, $phpbb_auth, $mx_user;

		$inline_columns = 4;
		$inline_rows = 5;
		$window_columns = 8;

		if ($mode == 'window')
		{
			$mx_user->init($user_ip, PAGE_INDEX);

			$gen_simple_header = TRUE;
			$page_title = $lang['Emoticons'];

			include($mx_root_path . 'includes/page_header.'.$phpEx);

			$template->set_filenames(array(
				'smiliesbody' => 'posting_smilies.tpl')
			);
		}

		$sql = "SELECT emoticon, code, smile_url
			FROM " . SMILIES_TABLE . "
			ORDER BY smilies_id";
		if ($result = $db->sql_query($sql))
		{
			$num_smilies = 0;
			$rowset = array();
			while ($row = $db->sql_fetchrow($result))
			{
				if (empty($rowset[$row['smile_url']]))
				{
					$rowset[$row['smile_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code']));
					$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
					$num_smilies++;
				}
			}

			if ($num_smilies)
			{
				$smilies_count = ($mode == 'inline') ? min(19, $num_smilies) : $num_smilies;
				$smilies_split_row = ($mode == 'inline') ? $inline_columns - 1 : $window_columns - 1;

				$s_colspan = 0;
				$row = 0;
				$col = 0;

				while (list($smile_url, $data) = @each($rowset))
				{
					if (!$col)
					{
						$template->assign_block_vars('smilies_row', array());
					}

					$template->assign_block_vars('smilies_row.smilies_col', array(
						'SMILEY_CODE' => $data['code'],
						'SMILEY_IMG' => $this->smiley_path_url  . $board_config['smilies_path'] . '/' . $smile_url,
						'SMILEY_DESC' => $data['emoticon'])
					);

					$s_colspan = max($s_colspan, $col + 1);

					if ($col == $smilies_split_row)
					{
						if ($mode == 'inline' && $row == $inline_rows - 1)
						{
							break;
						}
						$col = 0;
						$row++;
					}
					else
					{
						$col++;
					}
				}

				if ($mode == 'inline' && $num_smilies > $inline_rows * $inline_columns)
				{
					$template->assign_block_vars('switch_smilies_extra', array());

					$template->assign_vars(array(
						'L_MORE_SMILIES' => $lang['More_emoticons'],
						'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", "mode=smilies"))
					);
				}

				$template->assign_vars(array(
					'L_EMOTICONS' => $lang['Emoticons'],
					'L_CLOSE_WINDOW' => $lang['Close_window'],
					'S_SMILIES_COLSPAN' => $s_colspan)
				);
			}
		}

		if ($mode == 'window')
		{
			$template->pparse('smiliesbody');
			include($mx_root_path . 'includes/page_tail.'.$phpEx);
		}
	}
}
?>
--- NEW FILE: session.php ---
<?php
/**
*
* @package Style
* @version $Id: session.php,v 1.1 2014/05/18 06:26:59 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2001 The phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

/**
 * Modifications:
 *
 * Class wrapper
 * mx_dss_rand
 */

/**
[...2081 lines suppressed...]
	// globalize cookies across domains (filter out IP-addresses)?
	if ($global && preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
	{
	    $parsed_url['host'] = '.' . $parts[1];
    }
    // we shouldn't use a host at all if both options are off
	elseif (!$local && !$global) 
	{
		$parsed_url['host'] = '';
    }
	// the host also shouldn't be set if there aren't any dots in it
	elseif (!isset($parsed_url['host']) || strpos($parsed_url['host'], '.') === false) 
	{
		$parsed_url['host'] = '';
    }

	return array($parsed_url['host'], $parsed_url['path'] . '/');
}

?>
--- NEW FILE: readme.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
	<head>
		<title>mxpcms Bridge Installation Guide</title>
		<style type="text/css">
			body
			{
				background-color: #E5E5E8;
				margin: 0px;
				padding: 0px;
			}
			body, td
			{
				color: #000000;
				font-size: small;
				font-family: verdana, sans-serif;
			}
			div#header
			{
				background-image: url('Themes/default/images/catbg.jpg');
				background-repeat: repeat-x;
				background-color: #88A6C0;
				color: white;
				font-family: Georgia, serif;
				font-size: xx-large;
				border-bottom: 1px solid black;
				height: 40px; padding-left:4%; padding-right:4%; padding-top:22px; padding-bottom:12px
			}
			div#content
			{
				padding: 20px 30px;
			}

			div.panel
			{
				border: 1px solid gray;
				background-color: #F6F6F6;
				margin: 1ex 0 3ex 0;
				padding: 1.2ex;
			}
			div.panel h2
			{
				margin: 0;
				margin-bottom: 2ex;
				padding-bottom: 3px;
				border-bottom: 1px dashed black;
				font-size: 14pt;
				font-weight: normal;
			}

			dl
			{
				margin-left: 3ex;
			}
			dt
			{
				font-style: italic;
			}
			dd
			{
				margin-bottom: 1ex;
			}

			div.code
			{
				margin: 1ex 3ex 2ex 3ex;
				padding: 3px;
				background-color: #FAFAFA;
				font-family: monospace;
				overflow: auto;
			}
			div.code span.comment
			{
				font-style: italic;
				color: #000066;
			}
		</style>
	</head>
	<body>
		<div id="header">
			<div title="Millenia">SMF-Mx-Publisher CMS bridge</div>
		</div>
		<div id="content">
			<div class="panel">
				<h2 id="contents">Before you start</h2>

				Make sure you have both MXP-CMS and Simple Machines Forum (SMF) installed. Realize that SMF is not a component, but a stand-alone forum. The bridge will only integrate your SMF-forum with your mxpcms site.<br />
				<b>Please do not remove any of the copyrights of your SMF-forum.</b><br />
				<br />
				Always <b>back up your database</b> and site prior to installations and test any additions you make to your site locally first and do NOT add anything to your live site unless tested thoroughly, extensively, securely and wisely!
				<br />
				Make sure the following folders are writable (chmod 777) before installing the component:
				<br />&nbsp;	/includes<br />&nbsp;	/modules
				<br />&nbsp;	/includes&nbsp;
				<br />&nbsp;    /templates<br />&nbsp;	/admin
			</div>
		</div>
		<div id="content">
			<div class="panel">
				<h2 id="contents">Installing the SMF Bridge Component in MXP-CMS</h2>

				<b>Install unpacking the zip and running the 
                MX-Publisher-IWizard.</b><br /><br />
				Go to your mxpcms admin cpanel.  Go to your Installer menu, and 
                validate your "smf2" installation.<br />
				...<br />
			</div>
		</div>
		<div id="content">
			<div class="panel">
				<h2 id="contents">Configuring the SMF Core Blocks in MXP-CMS</h2>
				<h2 id="contents">
				<b>Change the values in the configuration via the mxpcms backend.</b><br /><br /> 
				It is important you use the absolute path to your SMF installation.  This tells mxpcms where SMF is, so if you get this wrong, mxpcms will not be able to find SMF.<br /><br />
				If you don't know your SMF path, you can find it by following these instructions:<br /><br />
				
				Go to your stand alone SMF forum.  Make sure you are logged in as the administrator.<br />
				Go to the SMF admin panel.<br />
				Click on "Server Settings".<br />
				Your path to SMF will be in the field labelled "SMF Directory".  Copy it from here, and paste it into your bridge config.<br />
				<br />
				There are two formats to display your mxpcms/forum integration: </h2>
				<ul type="none" style="list-style-type: none;">
					<li>&raquo; <b>Wrapped</b><br />
					You are using SMF through the mxpcms bridge. The Forum appears "wrapped" in the mxpcms tables. You might have to make some necessery changes in your theme and template files in order to show a fitting lay-out.</li>
					<li>&raquo; <b>Unwrapped</b><br />
					You are still using SMF through mxpcms, but it doesn't have the look of a wrapped forum. It looks stand-alone, but it is actually loading through mxpcms. This is set in the mxpcms config for the component.
				</ul>
				<br />
				There are several options for the user registration form:  Bridge, SMF, mxpcms default, Community Builder, and mxpcmsCharge.  The bridge registration form looks very much like the default mxpcms registration, but functions quite differently.  If you choose to use this option, make sure to configure the registration component as well.  All registration types will register new users into both mxpcms and SMF, but some users may not appear in SMF until after their first login.
				<br /><br />
			</div>
		</div>
		<div id="content">
			<div class="panel">
				<h2 id="contents">Login Module Options in MXP-CMS</h2>								
				MXP-CMS 4.6 provides a new alternative authentication method, which facilitates the use of the mxpcms default login module with the bridge.<br />
				If you wish to use the mxpcms default login module with the bridge, all you need to do is make sure that the SMF_login mxpcmst is published.<br />
				Despite the fact that if you choose to use the default mxpcms login module, you should still configure the mod_smf_login module.  Some of the options applied in the module's configuration are used elsewhere.<br />
			</div>
		</div>
		<div id="content">
			<div class="panel">
				<h2 id="contents">Separate Databases:</h2>
		
				If you have installed mxpcms and SMF with Fantastico, or you installed them in separate databases intentionally, you will need to grant permission to the database users to access each others' databases.  If you have your forum and CMS installed in separate databases, and you have not granted access properly, you will most likely run into the "_LOGIN_INCOMPLETE" error in mxpcms.
				<br /><br />
				Here's how to grant database permissions:
				<br /><br />
				1) Go to your site's cPanel.  Click on MySQL databases. (Do not Proceed to PhpMyAdmin!)
				<br /><br />
				2) Near the bottom of the page, you will find two dropdown menus side-by-side.  One is labelled "User:" and the other "Db:".
				<br /><br />
				3) In the first dropdown, select your SMF database user, and in the second dropdown, select the  mxpcms database.  Click the button that is labelled "Add User to Db".
				<br /><br />
				4) Now go back to the same page again, and do the same, adding your mxpcms User to your SMF database.
				<br /><br />
				Now you are set up to run your forum and CMS in separate databases.
				<br /><br />
			</div>
		</div>
		<div id="content">
			<div class="panel">
				<h2 id="contents">3rd Party Developer Tabs in Admin Panel</h2>

				This bridge comes with the capability for 3rd party developers to add their own tabs to the bridge config panel.
				
				This can be done by adding a tab file to include by the bridge, and defining it in the bridge config table appropriately.
				
				For example, if you have a component called com_example, and you want to have a tab in the bridge define something in the com_example component, you can create the tab in a file called example_tab.php.  You'll need to add that file to your com_example.xml installer, and also a query to let the bridge config know it's there:
				
				<div class="code">
					INSERT INTO #__smf_config (`variable`, `value1`) VALUES ('3rdPartyTab', 'administrator/components/com_example/example_tab.php')
				</div>
				
				And that's all!  It will be included in the SMF bridge component configuration.
			</div>
		</div>
	</body>
</html>
--- NEW FILE: auth.php ---
<?php
/**
*
* @package Auth
* @version $Id: auth.php,v 1.1 2014/05/18 06:26:59 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if ( !defined( 'IN_PORTAL' ) )
{
	die( "Hacking attempt" );
}


/**
* Permission/Auth class for SMF3 forums
[...961 lines suppressed...]
				$sql = array();

				foreach ($auth_options as $option)
				{
					if (strpos($option, '%') !== false)
					{
						$sql[] = $key . ' ' . $db->sql_like_expression(str_replace('%', $db->any_char, $option));
					}
					else
					{
						$sql[] = $key . " = '" . $db->sql_escape($option) . "'";
					}
				}

				$sql_opts = 'AND (' . implode(' OR ', $sql) . ')';
			}
		}
	}
}
?>

[mxbb-commits] core/templates/subsilver2/admin page_footer.tpl, 1.1, 1.2

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/subsilver2/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27331/admin

Modified Files:
	page_footer.tpl 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: page_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/subsilver2/admin/page_footer.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** page_footer.tpl	16 Jun 2008 19:07:59 -0000	1.1
--- page_footer.tpl	18 May 2014 06:26:47 -0000	1.2
***************
*** 16,20 ****
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>
--- 16,20 ----
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://mxpcms.sourceforge.net/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>

[mxbb-commits] core/templates/subSilver/admin page_footer.tpl, 1.17, 1.18

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/subSilver/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27313/admin

Modified Files:
	page_footer.tpl 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: page_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/page_footer.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** page_footer.tpl	16 Jun 2008 18:30:09 -0000	1.17
--- page_footer.tpl	18 May 2014 06:26:34 -0000	1.18
***************
*** 16,20 ****
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>
--- 16,20 ----
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://mxpcms.sourceforge.net/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>

[mxbb-commits] core/templates/prosilver overall_footer.html, 1.8, 1.9 simple_footer.html, 1.1, 1.2

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/prosilver
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27289

Modified Files:
	overall_footer.html simple_footer.html 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: simple_footer.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/simple_footer.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** simple_footer.html	28 Aug 2008 22:33:35 -0000	1.1
--- simple_footer.html	18 May 2014 06:26:19 -0000	1.2
***************
*** 14,18 ****
  //-->
  
! 	<div class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a>
  		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
  		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
--- 14,18 ----
  //-->
  
! 	<div class="copyright">{POWERED_BY} <a href="http://mxpcms.sourceforge.net/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a>
  		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
  		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->

Index: overall_footer.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_footer.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** overall_footer.html	16 Jun 2008 18:29:58 -0000	1.8
--- overall_footer.html	18 May 2014 06:26:19 -0000	1.9
***************
*** 24,32 ****
  
  <!--
! 	We request you retain the full copyright notice below including the link to www.mx-publisher.com (and www.phpbb.com if you are using MXP with phpbb).
  	This not only gives respect to the large amount of time given freely by the developers
  	but also helps build interest, traffic and use of MXP. If you cannot (for good
  	reason) retain the full copyright we request you at least leave in place the
! 	Powered by MXP line, with MXP linked to www.mx-publisher.com. If you refuse
  	to include even this then support on our forums may be affected.
  
--- 24,32 ----
  
  <!--
! 	We request you retain the full copyright notice below including the link to mxpcms.sourceforge.net (and www.phpbb.com if you are using MXP with phpbb).
  	This not only gives respect to the large amount of time given freely by the developers
  	but also helps build interest, traffic and use of MXP. If you cannot (for good
  	reason) retain the full copyright we request you at least leave in place the
! 	Powered by MXP line, with MXP linked to mxpcms.sourceforge.net. If you refuse
  	to include even this then support on our forums may be affected.
  
***************
*** 34,38 ****
  // -->
  
! 	<div class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a>
  		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
  		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
--- 34,38 ----
  // -->
  
! 	<div class="copyright">{POWERED_BY} <a href="http://mxpcms.sourceforge.net/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a>
  		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
  		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->

[mxbb-commits] core/templates/mxSilver overall_footer.tpl,1.6,1.7

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/mxSilver
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27272

Modified Files:
	overall_footer.tpl 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: overall_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/mxSilver/overall_footer.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** overall_footer.tpl	22 Jan 2010 12:11:45 -0000	1.6
--- overall_footer.tpl	18 May 2014 06:26:09 -0000	1.7
***************
*** 7,20 ****
  {ADMIN_LINK}<br />
  <!--
! 	We request you retain the full copyright notice below including the link to www.mx-publisher.com (and www.phpbb.com if you are using MXP with phpbb).
  	This not only gives respect to the large amount of time given freely by the developers
  	but also helps build interest, traffic and use of MXP. If you cannot (for good
  	reason) retain the full copyright we request you at least leave in place the
! 	Powered by MXP line, with MXP linked to www.mx-publisher.com. If you refuse
  	to include even this then support on our forums may be affected.
  
  	The MX-Publisher Team : 2008 & The phpBB Group : 2002
  // -->
! {POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a>
  </div>
  		</td>
--- 7,20 ----
  {ADMIN_LINK}<br />
  <!--
! 	We request you retain the full copyright notice below including the link to mxpcms.sourceforge.net (and www.phpbb.com if you are using MXP with phpbb).
  	This not only gives respect to the large amount of time given freely by the developers
  	but also helps build interest, traffic and use of MXP. If you cannot (for good
  	reason) retain the full copyright we request you at least leave in place the
! 	Powered by MXP line, with MXP linked to mxpcms.sourceforge.net. If you refuse
  	to include even this then support on our forums may be affected.
  
  	The MX-Publisher Team : 2008 & The phpBB Group : 2002
  // -->
! {POWERED_BY} <a href="http://mxpcms.sourceforge.net/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a>
  </div>
  		</td>

[mxbb-commits] core/templates/mxBase2/admin page_footer.tpl, 1.5, 1.6

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/mxBase2/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27228/admin

Modified Files:
	page_footer.tpl 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: page_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/mxBase2/admin/page_footer.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** page_footer.tpl	16 Jun 2008 18:29:23 -0000	1.5
--- page_footer.tpl	18 May 2014 06:25:55 -0000	1.6
***************
*** 16,20 ****
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>
--- 16,20 ----
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://mxpcms.sourceforge.net/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>

[mxbb-commits] core/templates/mxBase1/admin page_footer.tpl, 1.5, 1.6

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/mxBase1/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27201/admin

Modified Files:
	page_footer.tpl 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: page_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/mxBase1/admin/page_footer.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** page_footer.tpl	16 Jun 2008 18:29:12 -0000	1.5
--- page_footer.tpl	18 May 2014 06:25:43 -0000	1.6
***************
*** 16,20 ****
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>
--- 16,20 ----
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://mxpcms.sourceforge.net/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>

[mxbb-commits] core/templates/_core/admin mainpage_footer.tpl, 1.2, 1.3 page_footer.tpl, 1.5, 1.6

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/_core/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27177/admin

Modified Files:
	mainpage_footer.tpl page_footer.tpl 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: mainpage_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/admin/mainpage_footer.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mainpage_footer.tpl	4 Feb 2008 15:59:56 -0000	1.2
--- mainpage_footer.tpl	18 May 2014 06:25:31 -0000	1.3
***************
*** 1,3 ****
! <div id="page-footer" class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher</a> {MX_VERSION} &copy; 2001-2008 &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION}  &copy; 2000, 2002, 2005, 2007 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a>
  		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
  		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
--- 1,3 ----
! <div id="page-footer" class="copyright">{POWERED_BY} <a href="http://mxpcms.sourceforge.net/" target="_mx-publisher" class="copyright">MX-Publisher</a> {MX_VERSION} &copy; 2001-2008 &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION}  &copy; 2000, 2002, 2005, 2007 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a>
  		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
  		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->

Index: page_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/admin/page_footer.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** page_footer.tpl	16 Jun 2008 18:28:47 -0000	1.5
--- page_footer.tpl	18 May 2014 06:25:31 -0000	1.6
***************
*** 16,20 ****
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>
--- 16,20 ----
  //-->
  
! <div align="center"><span class="copyright">{POWERED_BY} <a href="http://mxpcms.sourceforge.net/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} &copy; 2001-2008 <!-- IF PHPBB_BACKEND --> &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001, 2003 phpBB Group <!-- ENDIF --></span></div>
  <!-- This displays generation info at the bottom of the page -->
  <div align="center"><span class="copyright">{EXECUTION_STATS}</span></div>

[mxbb-commits] core/modules/mx_navmenu/language/lang_greek lang_admin.php, 1.3, 1.4 lang_main.php, 1.2, 1.3

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_greek
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27148/lang_greek

Modified Files:
	lang_admin.php lang_main.php 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_greek/lang_main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lang_main.php	23 Dec 2008 06:02:31 -0000	1.2
--- lang_main.php	18 May 2014 06:25:16 -0000	1.3
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_greek/lang_admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lang_admin.php	2 Jul 2013 02:24:04 -0000	1.3
--- lang_admin.php	18 May 2014 06:25:16 -0000	1.4
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

[mxbb-commits] core/modules/mx_navmenu/language/lang_english lang_admin.php, 1.12, 1.13 lang_main.php, 1.5, 1.6

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_english
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27148/lang_english

Modified Files:
	lang_admin.php lang_main.php 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_english/lang_main.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lang_main.php	4 Feb 2008 16:52:01 -0000	1.5
--- lang_main.php	18 May 2014 06:25:16 -0000	1.6
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_english/lang_admin.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lang_admin.php	2 Jul 2013 02:24:04 -0000	1.12
--- lang_admin.php	18 May 2014 06:25:16 -0000	1.13
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

[mxbb-commits] core/modules/mx_navmenu/includes navmenu_constants.php, 1.4, 1.5 navmenu_functions.php, 1.16, 1.17

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27125/includes

Modified Files:
	navmenu_constants.php navmenu_functions.php 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: navmenu_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** navmenu_functions.php	8 May 2008 18:38:41 -0000	1.16
--- navmenu_functions.php	18 May 2014 06:25:07 -0000	1.17
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 [Martin, Markus, Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 [Martin, Markus, Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: navmenu_constants.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_constants.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** navmenu_constants.php	2 Jul 2013 02:24:04 -0000	1.4
--- navmenu_constants.php	18 May 2014 06:25:07 -0000	1.5
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 [Martin, Markus, Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 [Martin, Markus, Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

[mxbb-commits] core/modules/mx_coreblocks db_install.php, 1.11, 1.12 db_upgrade.php, 1.12, 1.13 mx_blockcp.php, 1.26, 1.27 mx_google.php, 1.12, 1.13 mx_includex.php, 1.16, 1.17 mx_language.php, 1.21, 1.22 mx_login.php, 1.15, 1.16 mx_multiple_blocks.php, 1.13, 1.14 mx_online.php, 1.37, 1.38 mx_search.php, 1.32, 1.33 mx_site_log.php, 1.22, 1.23 mx_theme.php, 1.21, 1.22 mx_virtual.php, 1.1, 1.2

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27072/mx_coreblocks

Modified Files:
	db_install.php db_upgrade.php mx_blockcp.php mx_google.php 
	mx_includex.php mx_language.php mx_login.php 
	mx_multiple_blocks.php mx_online.php mx_search.php 
	mx_site_log.php mx_theme.php mx_virtual.php 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: mx_virtual.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_virtual.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_virtual.php	10 Mar 2008 09:05:24 -0000	1.1
--- mx_virtual.php	18 May 2014 06:24:56 -0000	1.2
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: mx_includex.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mx_includex.php	2 Jun 2013 05:08:10 -0000	1.16
--- mx_includex.php	18 May 2014 06:24:56 -0000	1.17
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: mx_online.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** mx_online.php	6 Nov 2008 00:52:07 -0000	1.37
--- mx_online.php	18 May 2014 06:24:56 -0000	1.38
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/db_upgrade.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** db_upgrade.php	16 Feb 2008 21:42:41 -0000	1.12
--- db_upgrade.php	18 May 2014 06:24:56 -0000	1.13
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */
***************
*** 33,37 ****
  
  $mx_module_version = 'MX-Publisher Core Module';
! $mx_module_copy = 'Original mx-Publisher <i>Core Blocks</i> module by <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  
  $message = "<b>" . $lang['upgrading'] . "!</b><br/><br/>";
--- 33,37 ----
  
  $mx_module_version = 'MX-Publisher Core Module';
! $mx_module_copy = 'Original mx-Publisher <i>Core Blocks</i> module by <a href="http://mxpcms.sourceforge.net" target="_blank">The MX-Publisher Development Team</a>';
  
  $message = "<b>" . $lang['upgrading'] . "!</b><br/><br/>";

Index: mx_login.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_login.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mx_login.php	4 Feb 2008 16:04:31 -0000	1.15
--- mx_login.php	18 May 2014 06:24:56 -0000	1.16
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/db_install.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** db_install.php	16 Feb 2008 21:42:41 -0000	1.11
--- db_install.php	18 May 2014 06:24:56 -0000	1.12
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */
***************
*** 33,37 ****
  
  $mx_module_version = 'MX-Publisher Core Module';
! $mx_module_copy = 'Original MX-Publisher <i>Core Blocks</i> module by <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  
  $message = "<b>" . $lang['fresh_install'] . "!</b><br/><br/>";
--- 33,37 ----
  
  $mx_module_version = 'MX-Publisher Core Module';
! $mx_module_copy = 'Original MX-Publisher <i>Core Blocks</i> module by <a href="http://mxpcms.sourceforge.net" target="_blank">The MX-Publisher Development Team</a>';
  
  $message = "<b>" . $lang['fresh_install'] . "!</b><br/><br/>";

Index: mx_language.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_language.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mx_language.php	9 Feb 2008 12:48:51 -0000	1.21
--- mx_language.php	18 May 2014 06:24:56 -0000	1.22
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: mx_google.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_google.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mx_google.php	4 Feb 2008 16:04:30 -0000	1.12
--- mx_google.php	18 May 2014 06:24:56 -0000	1.13
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: mx_site_log.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mx_site_log.php	31 Oct 2008 18:55:36 -0000	1.22
--- mx_site_log.php	18 May 2014 06:24:56 -0000	1.23
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: mx_multiple_blocks.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_multiple_blocks.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mx_multiple_blocks.php	21 Oct 2012 00:04:11 -0000	1.13
--- mx_multiple_blocks.php	18 May 2014 06:24:56 -0000	1.14
***************
*** 6,10 ****
  * @copyright (c) 2002-2006 [Jon Ohlsson] Mx-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2006 [Jon Ohlsson] Mx-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: mx_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mx_blockcp.php	2 Jul 2013 02:24:03 -0000	1.26
--- mx_blockcp.php	18 May 2014 06:24:56 -0000	1.27
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: mx_search.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** mx_search.php	31 Oct 2008 18:55:36 -0000	1.32
--- mx_search.php	18 May 2014 06:24:56 -0000	1.33
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: mx_theme.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_theme.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mx_theme.php	9 Feb 2008 12:48:51 -0000	1.21
--- mx_theme.php	18 May 2014 06:24:56 -0000	1.22
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

[mxbb-commits] core/install/language/lang_romanian_no_diacritics lang_admin.php, 1.2, 1.3

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/install/language/lang_romanian_no_diacritics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27047

Modified Files:
	lang_admin.php 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/language/lang_romanian_no_diacritics/lang_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lang_admin.php	19 Aug 2008 02:46:23 -0000	1.2
--- lang_admin.php	18 May 2014 06:24:44 -0000	1.3
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

[mxbb-commits] core/install/includes functions_install.php, 1.25, 1.26 template.php, 1.4, 1.5

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/install/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27007/includes

Modified Files:
	functions_install.php template.php 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: template.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/includes/template.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** template.php	4 Feb 2008 15:58:08 -0000	1.4
--- template.php	18 May 2014 06:24:35 -0000	1.5
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */

Index: functions_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** functions_install.php	13 May 2014 17:59:43 -0000	1.25
--- functions_install.php	18 May 2014 06:24:35 -0000	1.26
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net
  *
  */
***************
*** 354,358 ****
  * and identify any problems (eg there are already tables with the names we want to use
  * @param	array	$dbms should be of the format of an element of the array returned by {@link get_available_dbms get_available_dbms()}
! *					necessary extensions should be loaded already
  */
  function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport, $prefix_may_exist = false, $load_dbal = true, $unicode_check = true)
--- 354,358 ----
  * and identify any problems (eg there are already tables with the names we want to use
  * @param	array	$dbms should be of the format of an element of the array returned by {@link get_available_dbms get_available_dbms()}
! * necessary extensions should be loaded already
  */
  function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport, $prefix_may_exist = false, $load_dbal = true, $unicode_check = true)

[mxbb-commits] core/docs index.htm,1.2,1.3

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/docs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26985/docs

Modified Files:
	index.htm 
Log Message:
Experimental smf2 backend files based on smf2 api in shared folder

Index: index.htm
===================================================================
RCS file: /cvsroot/mxbb/core/docs/index.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.htm	21 Jun 2008 22:20:59 -0000	1.2
--- index.htm	18 May 2014 06:24:17 -0000	1.3
***************
*** 7,11 ****
  <meta name="author" content="The MX-Publisher (MXP) Development Team">
  <meta name="copyright" content="The MX-Publisher (MXP) Development Team">
! <link rel="icon" href="http://www.mx-publisher.com/favicon.gif" type="image/gif">
  
  <link rel="stylesheet" href="mxp.css" type="text/css">
--- 7,11 ----
  <meta name="author" content="The MX-Publisher (MXP) Development Team">
  <meta name="copyright" content="The MX-Publisher (MXP) Development Team">
! <link rel="icon" href="http://mxpcms.sourceforge.net/favicon.gif" type="image/gif">
  
  <link rel="stylesheet" href="mxp.css" type="text/css">
***************
*** 40,48 ****
  					<tbody><tr height="80">
  						<td align="left" valign="top" width="25%">
! 							<!--<a href="http://www.mx-publisher.com/index.php"><img src="http://www.mx-publisher.com/templates/subSilver/images/logo.gif" border="0" alt="MX-Publisher" vspace="1"/></a>-->
! 							<a href="http://www.mx-publisher.com/index.php"><img src="images/theme/spacer.gif" alt="MX-Publisher" title="MX-Publisher" border="0" height="75" width="210"></a>
  						</td>
  						<td align="center" valign="middle" width="50%">
! 							<!--<img valign="middle" src="http://www.mx-publisher.com/templates/subSilver/images/page_icons/icon_home.gif" alt="" />&nbsp;&nbsp;<span class="pagetitle">Home</span>-->
  						</td>
  						<td align="right" valign="top" width="25%"><span class="sitetitle">&nbsp;</span></td>
--- 40,48 ----
  					<tbody><tr height="80">
  						<td align="left" valign="top" width="25%">
! 							<!--<a href="http://mxpcms.sourceforge.net/index.php"><img src="http://mxpcms.sourceforge.net/templates/subSilver/images/logo.gif" border="0" alt="MX-Publisher" vspace="1"/></a>-->
! 							<a href="http://mxpcms.sourceforge.net/index.php"><img src="images/theme/spacer.gif" alt="MX-Publisher" title="MX-Publisher" border="0" height="75" width="210"></a>
  						</td>
  						<td align="center" valign="middle" width="50%">
! 							<!--<img valign="middle" src="http://mxpcms.sourceforge.net/templates/subSilver/images/page_icons/icon_home.gif" alt="" />&nbsp;&nbsp;<span class="pagetitle">Home</span>-->
  						</td>
  						<td align="right" valign="top" width="25%"><span class="sitetitle">&nbsp;</span></td>
***************
*** 64,73 ****
  	  	<div class="globalNav">
  		&nbsp;
! 					<span class="genmed"></span> <span class="cat-button-current" onmouseout="this.className='cat-button-current';" onmouseover="this.className='cat-button-current';"><a href="http://www.mx-publisher.com/home" target="" title="This is the startpage">Home</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://www.mx-publisher.com/docs" target="" title="MXP Documentation Page">Docs</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://www.mx-publisher.com/forum" target="" title="This is the phpBB Forum startpage">Forum</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://www.mx-publisher.com/page39" target="" title="Demo">Demo</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://www.mx-publisher.com/download" target="" title="MXP Downloads Page">Download</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://www.mx-publisher.com/contribute" target="" title="Find out how you can help MXP">Contribute</a></span>
  			  	</div>
  	</div>
--- 64,73 ----
  	  	<div class="globalNav">
  		&nbsp;
! 					<span class="genmed"></span> <span class="cat-button-current" onmouseout="this.className='cat-button-current';" onmouseover="this.className='cat-button-current';"><a href="http://mxpcms.sourceforge.net/home" target="" title="This is the startpage">Home</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://mxpcms.sourceforge.net/docs" target="" title="MXP Documentation Page">Docs</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://mxpcms.sourceforge.net/forum" target="" title="This is the phpBB Forum startpage">Forum</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://mxpcms.sourceforge.net/page39" target="" title="Demo">Demo</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://mxpcms.sourceforge.net/download" target="" title="MXP Downloads Page">Download</a></span>
! 					<span class="genmed">|</span> <span class="cat-button" onmouseout="this.className='cat-button';" onmouseover="this.className='cat-button-current';"><a href="http://mxpcms.sourceforge.net/contribute" target="" title="Find out how you can help MXP">Contribute</a></span>
  			  	</div>
  	</div>
***************
*** 78,91 ****
  				<tbody><tr>
  										<td style="border: medium none ;" class="" onmouseout="this.className='';" onmouseover="this.className='nav-button-current';" valign="center">
! 						<img class="mx_icon" src="images/theme/icon_notify.gif" alt="Home" align="absmiddle" border="0">&nbsp;<span class="menu-button"><a href="http://www.mx-publisher.com/news" target="" class="genmed" title="Home">News</a></span>
  					</td>
  										<td style="border: medium none ;" class="" onmouseout="this.className='';" onmouseover="this.className='nav-button-current';" valign="center">
! 						<img class="mx_icon" src="images/theme/icon_message.gif" alt="Home" align="absmiddle" border="0">&nbsp;<span class="menu-button"><a href="http://www.mx-publisher.com/features" target="" class="genmed" title="Features">Features</a></span>
  					</td>
  										<td style="border: medium none ;" class="" onmouseout="this.className='';" onmouseover="this.className='nav-button-current';" valign="center">
! 						<img class="mx_icon" src="images/theme/icon_message.gif" alt="About the Project" align="absmiddle" border="0">&nbsp;<span class="menu-button"><a href="http://www.mx-publisher.com/about" target="" class="genmed" title="About the Project">About</a></span>
  					</td>
  										<td style="border: medium none ;" class="" onmouseout="this.className='';" onmouseover="this.className='nav-button-current';" valign="center">
! 						<img class="mx_icon" src="images/theme/icon_message.gif" alt="About - Terms of Use" align="absmiddle" border="0">&nbsp;<span class="menu-button"><a href="http://www.mx-publisher.com/toe" target="" class="genmed" title="About - Terms of Use">Terms of Use</a></span>
  					</td>
  
--- 78,91 ----
  				<tbody><tr>
  										<td style="border: medium none ;" class="" onmouseout="this.className='';" onmouseover="this.className='nav-button-current';" valign="center">
! 						<img class="mx_icon" src="images/theme/icon_notify.gif" alt="Home" align="absmiddle" border="0">&nbsp;<span class="menu-button"><a href="http://mxpcms.sourceforge.net/news" target="" class="genmed" title="Home">News</a></span>
  					</td>
  										<td style="border: medium none ;" class="" onmouseout="this.className='';" onmouseover="this.className='nav-button-current';" valign="center">
! 						<img class="mx_icon" src="images/theme/icon_message.gif" alt="Home" align="absmiddle" border="0">&nbsp;<span class="menu-button"><a href="http://mxpcms.sourceforge.net/features" target="" class="genmed" title="Features">Features</a></span>
  					</td>
  										<td style="border: medium none ;" class="" onmouseout="this.className='';" onmouseover="this.className='nav-button-current';" valign="center">
! 						<img class="mx_icon" src="images/theme/icon_message.gif" alt="About the Project" align="absmiddle" border="0">&nbsp;<span class="menu-button"><a href="http://mxpcms.sourceforge.net/about" target="" class="genmed" title="About the Project">About</a></span>
  					</td>
  										<td style="border: medium none ;" class="" onmouseout="this.className='';" onmouseover="this.className='nav-button-current';" valign="center">
! 						<img class="mx_icon" src="images/theme/icon_message.gif" alt="About - Terms of Use" align="absmiddle" border="0">&nbsp;<span class="menu-button"><a href="http://mxpcms.sourceforge.net/toe" target="" class="genmed" title="About - Terms of Use">Terms of Use</a></span>
  					</td>
  
***************
*** 110,114 ****
  							<tbody>
  							<tr>
! 								<td class="row1" colspan="2" align="left"><h4>Stable Release</h4><p>MXP 2.8.2</p><p><img src="images/theme/icon_latest_reply.gif" alt="" height="9" width="18">&nbsp;<a href="http://www.mx-publisher.com/download/stable">Download Now</a>!</p><h4>Development Release</h4><p>MXP 3.0.0 b1</p><p><img src="images/theme/icon_latest_reply.gif" alt="" height="9" width="18">&nbsp;<a href="http://www.mx-publisher.com/download/dev">Download Now</a>!</p></td>
  							</tr>
  							</tbody>
--- 110,114 ----
  							<tbody>
  							<tr>
! 								<td class="row1" colspan="2" align="left"><h4>Stable Release</h4><p>MXP 2.8.2</p><p><img src="images/theme/icon_latest_reply.gif" alt="" height="9" width="18">&nbsp;<a href="http://mxpcms.sourceforge.net/download/stable">Download Now</a>!</p><h4>Development Release</h4><p>MXP 3.0.0 b1</p><p><img src="images/theme/icon_latest_reply.gif" alt="" height="9" width="18">&nbsp;<a href="http://mxpcms.sourceforge.net/download/dev">Download Now</a>!</p></td>
  							</tr>
  							</tbody>
***************
*** 154,158 ****
  				The phpBB Group : 2001 - 2008 & MXP Team : 2001 - 2008
  			// -->
! 			Powered by  <a href="http://www.mx-publisher.com/" target="_mx-system" class="copyright">MX-Publisher (MXP)</a>  © 2001-2008 &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a>  © 2001 to 2008 phpBB Group | <a href="http://www.mx-publisher.com/index.php?mx_copy=true" target="_phpbb" class="copyright">About MX-Publisher</a>
  						<div class="pageStats" align="center">This page was updated  2008-06-21 &nbsp;</div>
  					</div>
--- 154,158 ----
  				The phpBB Group : 2001 - 2008 & MXP Team : 2001 - 2008
  			// -->
! 			Powered by  <a href="http://mxpcms.sourceforge.net/" target="_mx-system" class="copyright">MX-Publisher (MXP)</a>  © 2001-2008 &amp; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a>  © 2001 to 2008 phpBB Group | <a href="http://mxpcms.sourceforge.net/index.php?mx_copy=true" target="_phpbb" class="copyright">About MX-Publisher</a>
  						<div class="pageStats" align="center">This page was updated  2008-06-21 &nbsp;</div>
  					</div>

[mxbb-commits] core/modules/mx_phpbb3blocks/language/lang_romanian - New directory

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/language/lang_romanian
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26621/lang_romanian

Log Message:
Directory /cvsroot/mxbb/core/modules/mx_phpbb3blocks/language/lang_romanian added to the repository

[mxbb-commits] core/includes/shared/smf2 index.htm,NONE,1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/smf2
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16127

Added Files:
	index.htm 
Log Message:
Creating folders for SMF Backend

--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

[mxbb-commits] core/includes/shared/smf2/includes index.htm, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/smf2/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16127/includes

Added Files:
	index.htm 
Log Message:
Creating folders for SMF Backend

--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>