[Openfirst-cvscommit] base/config first.php,1.47,1.48 globals.tpl,1.2,1.3

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

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

Modified Files:
	first.php globals.tpl 
Log Message:
Removed any remenents of PEAR support, because there isn't any

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** first.php	13 Mar 2005 01:19:58 -0000	1.47
--- first.php	13 Mar 2005 01:27:50 -0000	1.48
***************
*** 43,47 ****
     $sqlpassword = $_POST["sqlpassword"];
     $sqldatabase = $_POST["sqldatabase"];
-    $peardb = $_POST['peardb'];
     include_once("./dbase.php");
     if(function_exists("ofirst_dbconnect") == false) {
--- 43,46 ----
***************
*** 77,84 ****
       $cookielogins = ((isset($_POST["cookielogins"]) && $_POST["cookielogins"]=="yes") ? true : false);
       $allowreg = ((isset($_POST["allowreg"]) && $_POST["allowreg"]=="yes") ? true : false);
-      if(! isset($_POST["peardb"])) { $_POST["peardb"] = false; }
  
       $find = array('%DBTYPE%',
-                    '%PEAR%',
                     '%OS%',
                     '%ENCRYPT%',
--- 76,81 ----
***************
*** 100,104 ****
       
       $replace = array(GetVarValue($_POST['dbasetype']),
-                       GetVarValue($_POST['peardb']),
                        GetVarValue($_POST['ostype']),
                        GetVarValue($_POST['encryption']),
--- 97,100 ----
***************
*** 181,193 ****
     } 
     
-    $fd = explode(($windows ? ';' : ':'), ini_get('include_path'));
- 
-    $peardb = false;
-    foreach($fd as $d) {
-      if(file_exists("$d/DB.php")) {
-        $peardb = true;
-      }
-    }
- 
     $sqlhost = 'localhost';
     if(ini_get('mysql.default_host') != '') {
--- 177,180 ----
***************
*** 246,267 ****
        <td>Database Type
        <?php
-  if ($peardb) {
-    echo ("<br />The PEAR Database Abstraction layer exists and will be used.");
-  }
  ?>
        </td>
!       <td><?php
!  if(! $peardb) {
! ?>
!         <input type='hidden' name='peardb' value='false'>
!         <select name="dbasetype">
!           <option value="mysql" selected="selected">MySQL</option>
!           <option value="mssql">Microsoft SQL</option>
!           <option value="odbc">ODBC</option>
!         </select>
! 
!   <?php
!  } else {
! ?>
          <input type='hidden' name='peardb' value='true'>
          <select name="dbasetype">
--- 233,239 ----
        <td>Database Type
        <?php
  ?>
        </td>
!       <td>
          <input type='hidden' name='peardb' value='true'>
          <select name="dbasetype">
***************
*** 280,286 ****
            <option value="sybase">Sybase (through PEAR DB)</option>
           </select>
-   <?php
-  }
- ?>
      <tr>
        <td>Title of Website</td>
--- 252,255 ----

Index: globals.tpl
===================================================================
RCS file: /cvsroot/openfirst/base/config/globals.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** globals.tpl	29 Dec 2004 22:03:20 -0000	1.2
--- globals.tpl	13 Mar 2005 01:27:50 -0000	1.3
***************
*** 9,13 ****
   */
   $dbasetype = %DBTYPE%;
-  $peardb = %PEAR%;
   $ostype = %OS%;
    if ($ostype == "windows") {
--- 9,12 ----