xoops-cvs2

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html/include
In directory usw-pr-cvs1:/tmp/cvs-serv27472

Modified Files:
	common.php 
Log Message:
no message

Index: common.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/common.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** common.php	23 Aug 2002 05:12:42 -0000	1.6
--- common.php	18 Sep 2002 11:01:21 -0000	1.7
***************
*** 48,54 ****
   
  	// uncomment the following lines to show all warning messages (for debug)
! 	if ( $xoopsConfig['debug_mode'] == 1 ) {
  		error_reporting (2039);
! 	}
  	set_magic_quotes_runtime(0);
  	// #################### Include global config files ##################
--- 48,54 ----
   
  	// uncomment the following lines to show all warning messages (for debug)
! 	//if ( $xoopsConfig['debug_mode'] == 1 ) {
  		error_reporting (2039);
! 	//}
  	set_magic_quotes_runtime(0);
  	// #################### Include global config files ##################
***************
*** 95,108 ****
  	}
  
! 	// #################### Connect to DB ##################
! 	include(XOOPS_ROOT_PATH."/class/".$xoopsConfig['database'].".php");
  
! 	if ( $xoopsConfig['prefix'] && $xoopsConfig['dbhost'] && isset($xoopsConfig['dbuname']) && isset($xoopsConfig['dbpass']) && $xoopsConfig['dbname'] ) {
! 		$xoopsDB = new Database();
! 		if ( $xoopsConfig['debug_mode'] ==1 ) {
! 			$xoopsDB->setDebug(true); 
! 		}
! 		$xoopsDB->setPrefix($xoopsConfig['prefix']);
! 		$xoopsDB->connect($xoopsConfig['dbhost'], $xoopsConfig['dbuname'], $xoopsConfig['dbpass'], $xoopsConfig['dbname'], $xoopsConfig['db_pconnect']);
  	}
  	// ############## Login a user with a valid session ##############
--- 95,107 ----
  	}
  
! 	include_once(XOOPS_ROOT_PATH.'/class/xoopslogger.php');
! 	$xoopsLogger =& XoopsLogger::getInstance();
! 	$xoopsLogger->startTime();
  
! 	// #################### Connect to DB ##################
! 	if (defined('XOOPS_DB_PREFIX') && defined('XOOPS_DB_HOST') && defined('XOOPS_DB_USER') && defined('XOOPS_DB_PASS') && defined('XOOPS_DB_NAME')) {
! 		include(XOOPS_ROOT_PATH.'/class/'.XOOPS_DB_TYPE.'.php');
! 		$xoopsDB =& Database::getInstance();
! 		$xoopsDB->setPrefix(XOOPS_DB_PREFIX);
  	}
  	// ############## Login a user with a valid session ##############
***************
*** 128,135 ****
  	}
  
! 	$xoopsMyts = new MyTextSanitizer();
! 	if ( !empty($xoopsConfig['allow_image']) ) {
! 		$xoopsMyts->setAllowImage(true);
! 	}
  	
  	if ( file_exists("xoops_version.php") ) {
--- 127,133 ----
  	}
  
! 	//if ( !empty($xoopsConfig['allow_image']) ) {
! 	//	$xoopsMyts->setAllowImage(true);
! 	//}
  	
  	if ( file_exists("xoops_version.php") ) {
***************
*** 145,149 ****
  		}
  		if ( $xoopsUser ) {
! 			if ( !XoopsGroup::checkRight("module", $xoopsModule->mid(), $xoopsUser->groups()) ) {
  				redirect_header(XOOPS_URL."/",1,_NOPERM);
  				exit();
--- 143,147 ----
  		}
  		if ( $xoopsUser ) {
! 			if ( !XoopsGroup::checkRight("module", $xoopsModule->mid(), $xoopsUser->getGroups()) ) {
  				redirect_header(XOOPS_URL."/",1,_NOPERM);
  				exit();