[Openfirst-cvscommit] base/config first.php,1.37,1.37.2.1 auth.php,1.15,NONE dbase.php,1.10,NONE footers.php,1.10,NONE globals.php,1.3,NONE globals-default.php,1.3,NONE headers.php,1.19,NONE

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

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

Modified Files:
      Tag: REL1_1_BRANCH
	first.php 
Removed Files:
      Tag: REL1_1_BRANCH
	auth.php dbase.php footers.php globals.php globals-default.php 
	headers.php 
Log Message:
Directory restructuring

--- auth.php DELETED ---

--- globals-default.php DELETED ---

--- headers.php DELETED ---

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -d -r1.37 -r1.37.2.1
*** first.php	12 Apr 2004 19:44:08 -0000	1.37
--- first.php	24 Aug 2005 21:35:04 -0000	1.37.2.1
***************
*** 38,42 ****
  
   if(isset($_POST["ostype"])) {
!    include_once("./dbase.php");
     $sqlserver = $_POST["sqlserver"];
     $sqluser = $_POST["sqluser"];
--- 38,42 ----
  
   if(isset($_POST["ostype"])) {
!    include_once("../includes/dbase.php");
     $sqlserver = $_POST["sqlserver"];
     $sqluser = $_POST["sqluser"];
***************
*** 55,60 ****
     // They have submitted the form, write a new globals.php file and test
     // options.
!    if(is_writable("./globals.php")) {
!      $of = fopen("./globals.php", "w");
       if(isset($_POST["cookielogins"])&&$_POST["cookielogins"]=="yes"){
         $cookielogins="";
--- 55,60 ----
     // They have submitted the form, write a new globals.php file and test
     // options.
!    if(is_writable("../includes/globals.php")) {
!      $of = fopen("../includes/globals.php", "w");
       if(isset($_POST["cookielogins"])&&$_POST["cookielogins"]=="yes"){
         $cookielogins="";
***************
*** 193,197 ****
  ?>");
     fclose($of);
!    include("../config/globals.php");
     include("$header");
     echo("<h1>openFIRST Software Configured</h1>
--- 193,197 ----
  ?>");
     fclose($of);
!    include("../includes/globals.php");
     include("$header");
     echo("<h1>openFIRST Software Configured</h1>
***************
*** 205,212 ****
     die(include("$footer"));
   } else {
!    if(is_readable("config/headers.php")) {
!      include("config/headers.php");
     } else {
!      include("../config/headers.php");
     }
     echo("<h1>System Configuration Error</h1>
--- 205,212 ----
     die(include("$footer"));
   } else {
!    if(is_readable("style/headers.php")) {
!      include("style/headers.php");
     } else {
!      include("../style/headers.php");
     }
     echo("<h1>System Configuration Error</h1>
***************
*** 222,229 ****
   }
  } else {
!  if(is_readable("config/headers.php")) {
!    include("config/headers.php");
   } else {
!    include("../config/headers.php");
   }
   // User is visiting the configuration page, present them with a form
--- 222,229 ----
   }
  } else {
!  if(is_readable("style/headers.php")) {
!    include("style/headers.php");
   } else {
!    include("../style/headers.php");
   }
   // User is visiting the configuration page, present them with a form
***************
*** 422,429 ****
  <?php
   }
!  if(is_readable("config/footers.php")) {
!    include("config/footers.php");
   } else {
!    include("../config/footers.php");
   }
  ?>
--- 422,429 ----
  <?php
   }
!  if(is_readable("style/footers.php")) {
!    include("style/footers.php");
   } else {
!    include("../style/footers.php");
   }
  ?>

--- globals.php DELETED ---

--- footers.php DELETED ---

--- dbase.php DELETED ---