[mxbb-commits] core/includes/sessions/phpbb3 constants.php, 1.5, 1.6 core.php, 1.20, 1.21

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

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29641/sessions/phpbb3

Modified Files:
	constants.php core.php 
Log Message:
some fixes I made to the other repository @ mxpcms
Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** core.php	22 Nov 2009 21:59:00 -0000	1.20
--- core.php	23 Apr 2010 19:39:53 -0000	1.21
***************
*** 23,26 ****
--- 23,32 ----
  
  //
+ // Instantiate Dummy phpBB Classes
+ //
+ $phpBB2 = new phpBB2();
+ $phpBB3 = new phpBB3();
+ 
+ //
  // Finally, load some backend specific functions
  //
***************
*** 722,769 ****
  				require $mx_root_path. "includes/sessions/phpbb3/constants.$phpEx";
  			}
- 			
- 			switch (PORTAL_BACKEND)
- 			{
- 				case 'internal':
- 
- 				case 'phpbb2':
- 
- 					$sql = "SELECT *
- 						FROM " . CONFIG_TABLE;
- 
- 					if (!($result = $db->sql_query($sql)))
- 					{
- 						if (!function_exists('mx_message_die'))
- 						{
- 							@die("Couldnt query config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query.");
- 						}
- 						else
- 						{
- 							mx_message_die(GENERAL_ERROR, 'Couldnt query config information, Database connection lost?', '', __LINE__, __FILE__, $sql);
- 						}
- 					}
- 
- 				break;
  
! 				case 'phpbb3':
  
! 					$sql = 'SELECT config_name, config_value
! 						FROM ' . CONFIG_TABLE . '
! 						WHERE is_dynamic = 1';
! 					if (!($result = $db->sql_query($sql)))
! 					{
! 						if (!function_exists('mx_message_die'))
! 						{
! 							@die("Couldnt query config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query.");
! 						}
! 						else
! 						{
! 							mx_message_die(GENERAL_ERROR, 'Couldnt query config information, Database connection lost?', '', __LINE__, __FILE__, $sql);
! 						}
! 					}
! 				break;
  			}
! 			
! 			while ($row = $db->sql_fetchrow($result))
  			{
  				$config[$row['config_name']] = $row['config_value'];
--- 728,748 ----
  				require $mx_root_path. "includes/sessions/phpbb3/constants.$phpEx";
  			}
  
! 			$sql = "SELECT *
! 				FROM " . CONFIG_TABLE;
  
! 			if ( !( $result = $db->sql_query( $sql ) ) )
! 			{
! 				if (!function_exists('mx_message_die'))
! 				{
! 					die("Couldnt query config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query.");
! 				}
! 				else
! 				{
! 					mx_message_die( GENERAL_ERROR, 'Couldnt query config information', '', __LINE__, __FILE__, $sql );
! 				}
  			}
! 
! 			while ( $row = $db->sql_fetchrow($result) )
  			{
  				$config[$row['config_name']] = $row['config_value'];
***************
*** 775,779 ****
  				$mx_cache->put('phpbb_config', $config);
  			}
! 			return ($config);			
  		}
  	}
--- 754,759 ----
  				$mx_cache->put('phpbb_config', $config);
  			}
! 
! 			return ( $config );
  		}
  	}