[Openfirst-cvscommit] base/config index.php,1.9,1.9.2.1 install.php,1.17,1.17.2.1 modules.php,1.6,1.6.2.1 version.php,1.7,1.7.2.1

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

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

Modified Files:
      Tag: REL1_1_BRANCH
	index.php install.php modules.php version.php 
Log Message:
including includes/globals.php

Index: install.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/install.php,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** install.php	14 Dec 2003 20:32:29 -0000	1.17
--- install.php	24 Aug 2005 21:43:05 -0000	1.17.2.1
***************
*** 28,32 ****
  // Purpose: set up OpenFIRST modules
  
!   include("../config/globals.php");
    include($header);
  
--- 28,32 ----
  // Purpose: set up OpenFIRST modules
  
!   include("../includes/globals.php");
    include($header);
  

Index: version.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/version.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** version.php	9 Apr 2004 21:33:27 -0000	1.7
--- version.php	24 Aug 2005 21:43:05 -0000	1.7.2.1
***************
*** 28,32 ****
  // Purpose: set up OpenFIRST modules
  
!   include("../config/globals.php");
    include($header);
  
--- 28,32 ----
  // Purpose: set up OpenFIRST modules
  
!   include("../includes/globals.php");
    include($header);
  

Index: modules.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/modules.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** modules.php	13 Sep 2003 15:30:58 -0000	1.6
--- modules.php	24 Aug 2005 21:43:05 -0000	1.6.2.1
***************
*** 28,32 ****
  // Purpose: configure OpenFIRST modules, including their position on menus
  
!   include("../config/globals.php");
    include($header);
  
--- 28,32 ----
  // Purpose: configure OpenFIRST modules, including their position on menus
  
!   include("../includes/globals.php");
    include($header);
  

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/index.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** index.php	9 Apr 2004 18:00:43 -0000	1.9
--- index.php	24 Aug 2005 21:43:05 -0000	1.9.2.1
***************
*** 28,32 ****
    // Purpose: Provide a control center for configuration activities.
  
!  include("./globals.php");
   include($header);
   if(isset($user->user) == true && $user->membertype == "administrator") {
--- 28,32 ----
    // Purpose: Provide a control center for configuration activities.
  
!  include("../includes/globals.php");
   include($header);
   if(isset($user->user) == true && $user->membertype == "administrator") {
***************
*** 41,47 ****
  
  <?php
!   if(is_writable("./globals.php") && file_exists("./first.php")) {
      echo("<p><strong>Warning: </strong> Your globals.php file is writable by the web user.  Also, first.php is still in existance.  After you have setup the openFIRST web portal system, it is safe to remove first.php.  Removing first.php prevents the accidental reset of configuration information and prevents external users from altering your configuration.  For maximal security, you should also change the filesystem permissions so that globals.php is not writable by the web user.");
!   } elseif(is_writable("./globals.php")) {
      echo("<p><strong>Warning: </strong> Your globals.php file is writable by the web user.  For maximal security, you should change the filesystem permissions to correct this.</p>");
    }
--- 41,47 ----
  
  <?php
!   if(is_writable("../includes/globals.php") && file_exists("./first.php")) {
      echo("<p><strong>Warning: </strong> Your globals.php file is writable by the web user.  Also, first.php is still in existance.  After you have setup the openFIRST web portal system, it is safe to remove first.php.  Removing first.php prevents the accidental reset of configuration information and prevents external users from altering your configuration.  For maximal security, you should also change the filesystem permissions so that globals.php is not writable by the web user.");
!   } elseif(is_writable("../includes/globals.php")) {
      echo("<p><strong>Warning: </strong> Your globals.php file is writable by the web user.  For maximal security, you should change the filesystem permissions to correct this.</p>");
    }