[Openfirst-cvscommit] base/config first.php,1.37.2.1,1.37.2.2

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

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

Modified Files:
      Tag: REL1_1_BRANCH
	first.php 
Log Message:
No More PEAR!

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -C2 -d -r1.37.2.1 -r1.37.2.2
*** first.php	24 Aug 2005 21:35:04 -0000	1.37.2.1
--- first.php	24 Aug 2005 21:51:07 -0000	1.37.2.2
***************
*** 68,72 ****
       }
  
-      if(! isset($_POST["peardb"])) { $_POST["peardb"] = false; }
  
       fputs($of, "<?php
--- 68,71 ----
***************
*** 80,84 ****
   */
   \$dbasetype = \"" . $_POST["dbasetype"] . "\";
-  \$peardb = " . $_POST["peardb"] . ";
   \$ostype = '" . $_POST["ostype"] . "';
    if (\$ostype == \"windows\") {
--- 79,82 ----
***************
*** 104,112 ****
   \$sqlconnection = ofirst_dbconnect(\"\$sqlserver\",\"\$sqluser\",\"\$sqlpassword\");
   
!  if(\$peardb) { 
!    \$sqlconnection = ofirst_select_db(\$sqldatabase);
!  } else {
!    ofirst_select_db(\$sqldatabase);
!  }
   
   $cookielogins
--- 102,106 ----
   \$sqlconnection = ofirst_dbconnect(\"\$sqlserver\",\"\$sqluser\",\"\$sqlpassword\");
   
!  ofirst_select_db(\$sqldatabase);
   
   $cookielogins
***************
*** 263,279 ****
      </tr>
      <tr> 
!       <td>Database Type
!       <?php
!         $fd = explode(";", ini_get('include_path'));
!         $peardb = false;
!         foreach($fd as $d) {
!           if(file_exists($d . "/DB.php")) {
!             echo ("<br>The PEAR Database Abstraction layer exists and will be used.");
!             $peardb = true;
!           }
!         }
! ?>
!       </td>
!       <td><?php if(! $peardb) { ?>
          <input type='hidden' name='peardb' value='false'>
          <select name="dbasetype">
--- 257,262 ----
      </tr>
      <tr> 
!       <td>Database Type</td>
!       <td>
          <input type='hidden' name='peardb' value='false'>
          <select name="dbasetype">
***************
*** 282,304 ****
            <option value="odbc">ODBC</option>
          </select> 
-   
-   <?php } else { ?>
-         <input type='hidden' name='peardb' value='true'>
-         <select name="dbasetype">
-           <option value="dbase">dBase (through PEAR DB)</option>
-           <option value="fbsql">FrontBase (through PEAR DB)</option>
-           <option value="ibase">InterBase (through PEAR DB)</option>
-           <option value="ifx">Informix (through PEAR DB)</option>
-           <option value="msql">Mini SQL (through PEAR DB)</option>
-           <option value="mssql">Microsoft SQL Server (through PEAR DB)</option>
-           <option value="mysql">MySQL (for servers running MySQL &lt;= 4.0) (through PEAR DB)</option>
-           <option value="mysqli">MySQL (for servers running MySQL &gt;= 4.1) (through PEAR DB)</option>
-           <option value="oci8">Oracle 7/8/9 (through PEAR DB)</option>
-           <option value="odbc">ODBC (Open Database Connectivity) (through PEAR DB)</option>
-           <option value="pgsql">PostgreSQL (through PEAR DB)</option>
-           <option value="sqlite">SQLite (through PEAR DB)</option>
-           <option value="sybase">Sybase (through PEAR DB)</option>
-          </select>
-   <?php } ?>
      <tr> 
        <td>Title of Website</td>
--- 265,268 ----