[Openfirst-cvscommit] base/config dbase.php,1.6,1.7

[<xt...@us...>]

Update of /cvsroot/openfirst/base/config
In directory sc8-pr-cvs1:/tmp/cvs-serv14109

Modified Files:
	dbase.php 
Log Message:
Fix silly recursive errors causing many problems.

Index: dbase.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/dbase.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dbase.php	24 Aug 2003 03:49:10 -0000	1.6
--- dbase.php	24 Aug 2003 15:01:12 -0000	1.7
***************
*** 1,5 ****
  <?php
  /*
!  *  openFIRST.base - config/functions/dbase.php
   *
   * Copyright (C) 2003,
--- 1,5 ----
  <?php
  /*
!  *  openFIRST.base - config/dbase.php
   *
   * Copyright (C) 2003,
***************
*** 72,78 ****
        }
        if($linkidentifier != "") {
!         return(mysql_select_db($databasename, $linkidentifier));
        } else {
!         return(mysql_select_db($databasename));
        }
      }
--- 72,78 ----
        }
        if($linkidentifier != "") {
!         return(mssql_select_db($databasename, $linkidentifier));
        } else {
!         return(mssql_select_db($databasename));
        }
      }
***************
*** 103,113 ****
      global $dbasetype;
      if($dbasetype == "mysql") {
!       if(function_exists("ofirst_dberror") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
        }
        if($linkidentifier != "") {
!         return(ofirst_dberror($linkidentifier));
        } else {
!         return(ofirst_dberror());
        }
      } elseif ($dbasetype == "mssql") {
--- 103,113 ----
      global $dbasetype;
      if($dbasetype == "mysql") {
!       if(function_exists("mysql_error") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
        }
        if($linkidentifier != "") {
!         return(mysql_error($linkidentifier));
        } else {
!         return(mysql_error());
        }
      } elseif ($dbasetype == "mssql") {
***************
*** 154,158 ****
        return(mysql_fetch_object($resource));
      } elseif($dbasetype == "mssql") {
!       if(function_exists("mssql_query") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
--- 154,158 ----
        return(mysql_fetch_object($resource));
      } elseif($dbasetype == "mssql") {
!       if(function_exists("mssql_fetch_object") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
***************
*** 166,170 ****
      global $dbasetype;
      if($dbasetype == "mysql") {
!       if(function_exists("ofirst_dbnum_rows") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
        }
--- 166,170 ----
      global $dbasetype;
      if($dbasetype == "mysql") {
!       if(function_exists("mysql_num_rows") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
        }