xoops-cvs2

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

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

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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** common.php	18 Sep 2002 11:39:42 -0000	1.8
--- common.php	18 Sep 2002 23:41:18 -0000	1.9
***************
*** 38,42 ****
  
  	// ################# Include version info file ##############
! 	include(XOOPS_ROOT_PATH."/include/version.php");
  
  	// for older versions...will be DEPRECATED!
--- 38,42 ----
  
  	// ################# Include version info file ##############
! 	include_once(XOOPS_ROOT_PATH."/include/version.php");
  
  	// for older versions...will be DEPRECATED!
***************
*** 53,57 ****
  	set_magic_quotes_runtime(0);
  	// #################### Include global config files ##################
! 	include(XOOPS_ROOT_PATH."/modules/system/cache/config.php");
  
  	// ############## Include blocks construction class file ##############
--- 53,57 ----
  	set_magic_quotes_runtime(0);
  	// #################### Include global config files ##################
! 	include_once(XOOPS_ROOT_PATH."/modules/system/cache/config.php");
  
  	// ############## Include blocks construction class file ##############
***************
*** 60,66 ****
  	// #################### Include site-wide lang file ##################
  	if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/global.php") ) {
! 		include(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/global.php");
  	} else {
! 		include(XOOPS_ROOT_PATH."/language/english/global.php");
  	}
  
--- 60,66 ----
  	// #################### Include site-wide lang file ##################
  	if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/global.php") ) {
! 		include_once(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/global.php");
  	} else {
! 		include_once(XOOPS_ROOT_PATH."/language/english/global.php");
  	}
  
***************
*** 68,74 ****
  	if ( isset($xoopsOption['pagetype']) ) {
  		if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/".$xoopsOption['pagetype'].".php") ) {
! 			include(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/".$xoopsOption['pagetype'].".php");
  		} else {
! 			include(XOOPS_ROOT_PATH."/language/english/".$xoopsOption['pagetype'].".php");
  		}
  	}
--- 68,74 ----
  	if ( isset($xoopsOption['pagetype']) ) {
  		if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/".$xoopsOption['pagetype'].".php") ) {
! 			include_once(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/".$xoopsOption['pagetype'].".php");
  		} else {
! 			include_once(XOOPS_ROOT_PATH."/language/english/".$xoopsOption['pagetype'].".php");
  		}
  	}
***************
*** 101,105 ****
  	// #################### 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);
--- 101,105 ----
  	// #################### 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_once(XOOPS_ROOT_PATH.'/class/'.XOOPS_DB_TYPE.'.php');
  		$xoopsDB =& Database::getInstance();
  		$xoopsDB->setPrefix(XOOPS_DB_PREFIX);
***************
*** 118,122 ****
  
  	// ############## Include common functions file ##############
! 	include(XOOPS_ROOT_PATH."/include/functions.php");
  
  
--- 118,122 ----
  
  	// ############## Include common functions file ##############
! 	include_once(XOOPS_ROOT_PATH."/include/functions.php");
  
  
***************
*** 137,143 ****
  		$xoopsModule = XoopsModule::getByDirname($module_dir);
  		if ( !$xoopsModule || !$xoopsModule->isActivated() ) {
! 			include(XOOPS_ROOT_PATH."/header.php");
  			echo "<h4>"._MODULENOEXIST."</h4>";
! 			include(XOOPS_ROOT_PATH."/footer.php");
  			exit();
  		}
--- 137,143 ----
  		$xoopsModule = XoopsModule::getByDirname($module_dir);
  		if ( !$xoopsModule || !$xoopsModule->isActivated() ) {
! 			include_once(XOOPS_ROOT_PATH."/header.php");
  			echo "<h4>"._MODULENOEXIST."</h4>";
! 			include_once(XOOPS_ROOT_PATH."/footer.php");
  			exit();
  		}
***************
*** 154,161 ****
  		}
  		if ( file_exists(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/".$xoopsConfig['language']."/main.php") ) {
! 			include(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/".$xoopsConfig['language']."/main.php");
  		} else {
  			if ( file_exists(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/english/main.php") ) {
! 				include(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/english/main.php");
  			}
  		}
--- 154,161 ----
  		}
  		if ( file_exists(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/".$xoopsConfig['language']."/main.php") ) {
! 			include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/".$xoopsConfig['language']."/main.php");
  		} else {
  			if ( file_exists(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/english/main.php") ) {
! 				include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/english/main.php");
  			}
  		}