[Openfirst-cvscommit] base/includes globals.php,1.21,1.22

[Jamie <ast...@us...>]

Update of /cvsroot/openfirst/base/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25220/includes

Modified Files:
	globals.php 
Log Message:
-Initialize header variables
-Updated current module handling to match ModuleManager
-Removed commented-out session-releated code.

Index: globals.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/globals.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** globals.php	20 Nov 2005 21:44:20 -0000	1.21
--- globals.php	22 Nov 2005 16:34:07 -0000	1.22
***************
*** 123,126 ****
--- 123,128 ----
  }
  require_once('Skin.php');
+ $ogMoreHeadItems = array();
+ $ogMoreStyles = '';
  
  if (!defined('OPENFIRST_NO_INSTALLATION')) {
***************
*** 141,145 ****
  }
  
- 
  if (!defined('OPENFIRST_INSTALLATION_SCRIPT')) {
    User::SetupSession();
--- 143,146 ----
***************
*** 183,187 ****
        $dir = $mod->dir;
        $module =& $ogModuleManager->addModuleFromDir($dir);
!       if ($dir == $curmodule) $ogCurrentModule =& $module;
        if ($module->getActive()) {
          $dir = $module->getDir();
--- 184,188 ----
        $dir = $mod->dir;
        $module =& $ogModuleManager->addModuleFromDir($dir);
!       if ($dir == $curmodule) $ogModuleManager->setCurrent($dir);
        if ($module->getActive()) {
          $dir = $module->getDir();
***************
*** 198,210 ****
      $ogDB->freeResult($res);
    }
    
-      
- /*  if (!preg_match('/\A[a-zA-Z0-9]+\z/',session_id())) {
-     session_regenerate_id();
-   }*/
-     
    $ogUser->saveData();
- /*  ofDebugVar($_SESSION);
-   ofDebugVar($_COOKIE);*/
    session_write_close();
  }
--- 199,205 ----
      $ogDB->freeResult($res);
    }
+   $ogCurrentModule =& $ogModuleManager->getCurrent();
    
    $ogUser->saveData();
    session_write_close();
  }