[Upcase-project-cvs] UpCase/lib uc_page.php,1.1.1.1,1.2

[<jhe...@us...>]

Update of /cvsroot/upcase-project/UpCase/lib
In directory usw-pr-cvs1:/tmp/cvs-serv2379

Modified Files:
	uc_page.php 
Log Message:
Use global config object


Index: uc_page.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/lib/uc_page.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** uc_page.php	16 Jul 2002 15:31:56 -0000	1.1.1.1
--- uc_page.php	5 Aug 2002 08:35:02 -0000	1.2
***************
*** 1,7 ****
  <?php
! include_once("config/uc_config.inc");
  include_once("lib/uc_sql.php");
- include_once("lib/uc_accounts.php");
- include_once("lib/uc_login.php");
  include_once("lib/uc_object.php");
  include_once("lib/uc_session.php");
--- 1,5 ----
  <?php
! include_once("uc_config.inc");
  include_once("lib/uc_sql.php");
  include_once("lib/uc_object.php");
  include_once("lib/uc_session.php");
***************
*** 19,22 ****
--- 17,21 ----
  		global $REQUEST_URI;
  		global $uc_info;
+ 		global $ucConfig;
  
  		$this->oid = $pageId;
***************
*** 28,32 ****
  		// Open the session
  		$this->session = new UcSession($this->path);
! 		$this->session->lang = $uc_config["defaultlang"];
  
  		if (!$pageId)
--- 27,31 ----
  		// Open the session
  		$this->session = new UcSession($this->path);
! 		$this->session->lang = $ucConfig->defaultlang;
  
  		if (!$pageId)
***************
*** 77,81 ****
  		
  		// get user's secondary groups gid
! 		$userGroups = array_keys($user->groups);
  
  		// add the user's primary group gid
--- 76,80 ----
  		
  		// get user's secondary groups gid
! 		$userGroups = $user->groups;
  
  		// add the user's primary group gid
***************
*** 84,88 ****
  		// set the lang for this user
  		$uc_lang = $user->lang;
- 		
  		// is it an admin ?
  		if (in_array(0, $userGroups))
--- 83,86 ----