openfirst-cvscommit — Notify subscribers of changes to files in CVS.

[Openfirst-cvscommit] forum index.php,1.11,1.12 thread.php,1.9,1.10

[Greg I. <i-...@us...>]

Update of /cvsroot/openfirst/forum
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12088/forum

Modified Files:
	index.php thread.php 
Log Message:
Optimized database code

Index: thread.php
===================================================================
RCS file: /cvsroot/openfirst/forum/thread.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** thread.php	6 Jan 2004 14:54:18 -0000	1.9
--- thread.php	11 Apr 2004 16:34:41 -0000	1.10
***************
*** 26,30 ****
   *
   */
!   define("posts_page",10); // Define number of posts to show
    include("../config/globals.php");
    include($header);
--- 26,32 ----
   *
   */
! 
!   //modify this constant to change the number of posts per page
!   define("posts_page",10);
    include("../config/globals.php");
    include($header);
***************
*** 106,112 ****
        echo '<a href="' . $basepath . '/forum/editpost.php?id=' . $msg->ID . '&threadid=' . $thread . '">Edit</a></td></tr></table><br />';
  
-       $query = ofirst_dbquery("SELECT * FROM ofirst_forumposts WHERE ReplyTo=$thread ORDER BY DatePosted");
-       $num=ofirst_dbnum_rows($query);
- 
        $page = 0;
        if (isset($_GET["page"])) {
--- 108,111 ----
***************
*** 121,125 ****
          $page = 0;
        }
! 
        if ($num != 0) {
          echo('<div><a href="'.$basepath.'/forum/newpost.php?forumid='.urlencode($forum).'&replyto='.$reply.'">New Reply</a></div><br>');
--- 120,128 ----
          $page = 0;
        }
!       
!       $query = ofirst_dbquery("SELECT * FROM ofirst_forumposts WHERE ReplyTo=$thread");
!       $num=ofirst_dbnum_rows($query);
!       $query = ofirst_dbquery("SELECT * FROM ofirst_forumposts WHERE ReplyTo=$thread ORDER BY DatePosted LIMIT " . posts_page . ' OFFSET ' . ($page * posts_page));
!       
        if ($num != 0) {
          echo('<div><a href="'.$basepath.'/forum/newpost.php?forumid='.urlencode($forum).'&replyto='.$reply.'">New Reply</a></div><br>');
***************
*** 133,144 ****
  
          echo "</th></tr>";
!         // Skip records
!         for($i=0; $i < $page * posts_page; $i++) {
!           if (!ofirst_dbfetch_object($query)) {
!             break;
!           }
!         }
!         for ($i=0; $i < posts_page; $i++) {
!           if ($msg=ofirst_dbfetch_object($query)) {
              echo '<tr><td width=200 valign=top class=sub>' . userdetails($msg->Author) . "<div>Date: $msg->DatePosted</div></td>";
              echo "<td valign=top>";
--- 136,140 ----
  
          echo "</th></tr>";
!         while ($msg=ofirst_dbfetch_object($query)) {
              echo '<tr><td width=200 valign=top class=sub>' . userdetails($msg->Author) . "<div>Date: $msg->DatePosted</div></td>";
              echo "<td valign=top>";
***************
*** 164,170 ****
              }
              echo '<a href="' . $basepath . '/forum/editpost.php?id=' . $msg->ID . '&threadid=' . $thread . '">Edit</a></td></tr>';
-           } else {
-             break;
-           }
          }
          echo '<tr><th colspan=2><div style="font-size:12px" align=right> ';
--- 160,163 ----

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/forum/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** index.php	25 Dec 2003 18:52:53 -0000	1.11
--- index.php	11 Apr 2004 16:34:41 -0000	1.12
***************
*** 26,29 ****
--- 26,31 ----
   *
   */
+ 
+   //modify this constant to change the number of topics per page
    define("posts_page",10);
    include("../config/globals.php");
***************
*** 120,133 ****
          $page=0;
        }
!       $query = ofirst_dbquery("SELECT ID,Title,Author,DatePosted FROM ofirst_forumposts WHERE forum='" . $forum . "' AND ReplyTo = 0 ORDER BY DatePosted DESC");
        $num = ofirst_dbnum_rows($query);
        if ($num != 0) {
-         // Skip records
-         for($i=0; $i < $page * posts_page; $i++){
-           if (! ofirst_dbfetch_object($query)) {
-             break;
-           }
-         }
- 
          echo "<table width=600><tr><th colspan=3>" . ucfirst($cat->name) . "</th></tr>";
          echo "<tr><td class=sub width=400><b>Topic</b></td><td class=sub><b>Author</b></td><td class=sub><b>Date</b></td></tr>";
--- 122,130 ----
          $page=0;
        }
!       $query = ofirst_dbquery("SELECT ID FROM ofirst_forumposts WHERE forum='" . $forum . "' AND ReplyTo = 0");
        $num = ofirst_dbnum_rows($query);
+       $query = ofirst_dbquery("SELECT ID,Title,Author,DatePosted FROM ofirst_forumposts WHERE forum='" . $forum . "' AND ReplyTo = 0 ORDER BY DatePosted DESC LIMIT " . posts_page . ' OFFSET ' . ($page * posts_page));
+       
        if ($num != 0) {
          echo "<table width=600><tr><th colspan=3>" . ucfirst($cat->name) . "</th></tr>";
          echo "<tr><td class=sub width=400><b>Topic</b></td><td class=sub><b>Author</b></td><td class=sub><b>Date</b></td></tr>";

[Openfirst-cvscommit] base/config first.php,1.35,1.36

[Greg I. <i-...@us...>]

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

Modified Files:
	first.php 
Log Message:
Fixed typos that prevented the script from running

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** first.php	9 Apr 2004 20:55:04 -0000	1.35
--- first.php	11 Apr 2004 16:18:52 -0000	1.36
***************
*** 80,84 ****
   */
   \$dbasetype = \"" . $_POST["dbasetype"] . "\";
!  \$peardb = \"" . $_POST["peardb"] . "\";
   \$ostype = '" . $_POST["ostype"] . "';
    if (\$ostype == \"windows\") {
--- 80,84 ----
   */
   \$dbasetype = \"" . $_POST["dbasetype"] . "\";
!  \$peardb = " . $_POST["peardb"] . ";
   \$ostype = '" . $_POST["ostype"] . "';
    if (\$ostype == \"windows\") {
***************
*** 173,177 ****
              // Declare important variables so that headers can pick them up and preview them
  
!             \$adminnav = str_replace(\"\\\$basepath\", \$basepath, \$module->adminnavigation) . " <a href='http://bugzilla.openfirst.org'>Report Bug</a>";
              \$subnav = str_replace(\"\\\$basepath\", \$basepath, \$module->modulenavigation);
  
--- 173,177 ----
              // Declare important variables so that headers can pick them up and preview them
  
!             \$adminnav = str_replace(\"\\\$basepath\", \$basepath, \$module->adminnavigation) . \" <a href='http://bugzilla.openfirst.org'>Report Bug</a>\";
              \$subnav = str_replace(\"\\\$basepath\", \$basepath, \$module->modulenavigation);
  
***************
*** 276,281 ****
            <option value="odbc">ODBC</option>
          </select> 
! 	
! 	<?php } else { ?>
          <input type='hidden' name='peardb' value='true'>
          <select name="dbasetype">
--- 276,281 ----
            <option value="odbc">ODBC</option>
          </select> 
!   
!   <?php } else { ?>
          <input type='hidden' name='peardb' value='true'>
          <select name="dbasetype">
***************
*** 294,298 ****
            <option value="sybase">Sybase (through PEAR DB)</option>
           </select>
! 	<?php } ?>
      <tr> 
        <td>Title of Website</td>
--- 294,298 ----
            <option value="sybase">Sybase (through PEAR DB)</option>
           </select>
!   <?php } ?>
      <tr> 
        <td>Title of Website</td>

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

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

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

Modified Files:
	version.php 
Log Message:
Avoid parsing files which are symbolic links to avoid too many levels of symbolic links error (fixes bug id #111)

Index: version.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/version.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** version.php	9 Apr 2004 21:12:14 -0000	1.6
--- version.php	9 Apr 2004 21:33:27 -0000	1.7
***************
*** 67,71 ****
  if(function_exists("glob")) {
    foreach (rglob("..", "*") as $filename) {
!     if(is_file($filename)) {
        $mod = str_replace("../", "", $filename);
        $mod = substr($mod, 0, strpos($mod, "/", 2));
--- 67,71 ----
  if(function_exists("glob")) {
    foreach (rglob("..", "*") as $filename) {
!     if(is_file($filename) && ! is_link($filename)) {
        $mod = str_replace("../", "", $filename);
        $mod = substr($mod, 0, strpos($mod, "/", 2));

[Openfirst-cvscommit] base/config version.php,1.5,1.6

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

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

Modified Files:
	version.php 
Log Message:
Stop following of symbolic links for directories

Index: version.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/version.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** version.php	28 Dec 2003 21:36:51 -0000	1.5
--- version.php	9 Apr 2004 21:12:14 -0000	1.6
***************
*** 43,48 ****
  
       foreach (glob("$sDir/*", GLOB_ONLYDIR) as $sSubDir) {
!        $aSubFiles = rglob($sSubDir, $sPattern, $nFlags);
!        $aFiles = array_merge($aFiles, $aSubFiles);
       }
  
--- 43,51 ----
  
       foreach (glob("$sDir/*", GLOB_ONLYDIR) as $sSubDir) {
!        // Do not follow symbolic links, as this can cause infinite recursion as this can cause infinite recursion if a link within a directory points to its parent.
!        if(! is_link($sSubDir)) {
!          $aSubFiles = rglob($sSubDir, $sPattern, $nFlags);
!          $aFiles = array_merge($aFiles, $aSubFiles);
!        }
       }
  

[Openfirst-cvscommit] base/config first.php,1.34,1.35

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

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

Modified Files:
	first.php 
Log Message:
Add link to report bugs to all admin menus.  Hopefully this will cause bugs to be reported closer to their discovery time.

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** first.php	9 Apr 2004 20:00:09 -0000	1.34
--- first.php	9 Apr 2004 20:55:04 -0000	1.35
***************
*** 173,177 ****
              // Declare important variables so that headers can pick them up and preview them
  
!             \$adminnav = str_replace(\"\\\$basepath\", \$basepath, \$module->adminnavigation);
              \$subnav = str_replace(\"\\\$basepath\", \$basepath, \$module->modulenavigation);
  
--- 173,177 ----
              // Declare important variables so that headers can pick them up and preview them
  
!             \$adminnav = str_replace(\"\\\$basepath\", \$basepath, \$module->adminnavigation) . " <a href='http://bugzilla.openfirst.org'>Report Bug</a>";
              \$subnav = str_replace(\"\\\$basepath\", \$basepath, \$module->modulenavigation);
  

[Openfirst-cvscommit] members/admin editmember.php,1.8,1.9

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

Update of /cvsroot/openfirst/members/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11384

Modified Files:
	editmember.php 
Log Message:
Fix editing of users to work properly and not mysteriously reset passwords (Also closes bug id #84)

Index: editmember.php
===================================================================
RCS file: /cvsroot/openfirst/members/admin/editmember.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** editmember.php	18 Feb 2004 18:05:19 -0000	1.8
--- editmember.php	9 Apr 2004 20:38:39 -0000	1.9
***************
*** 16,23 ****
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
--- 16,19 ----
***************
*** 36,61 ****
    
    // Check if user has entered a user to edit
!   if (! isset($_GET['user'])){
      echo "<br><br>You must select a user from the member list to edit! [ <a href='index.php'>Member List</a> ]<br><br>";
! 	die(include("$footer"));
    }
  
!     if (isset($_POST["firstname"]) == true) {
!   
!         if (isset($_POST["ndivision"]) == true && $_POST["ndivision"] != "") {
!           $_POST["division"] = $_POST["ndivision"];
!           $q = ofirst_dbquery("INSERT INTO ofirst_divisions (division) VALUES ('" . $_POST["division"] . "');");
!           $q = ofirst_dbquery("UPDATE ofirst_divisions SET description='" . $_POST["divisiondescription"] . "' WHERE division='" . $_POST["division"] . "';");
!         }
  
!        if (isset($_POST["cellphonesms"]) && $_POST["cellphonesms"] == "0") { 
!          $_POST["cellphonesms"] = true; 
!          $edituser->cellphonesms = "1";
!        } else { 
!          $_POST["cellphonesms"] = false; 
!          $edituser->cellphonesms = "0";
!        }
    
!        $query = ofirst_dbquery("UPDATE ofirst_members SET
                     firstname='" . $_POST["firstname"] . "',
                     lastname='" . $_POST["lastname"] . "',
--- 32,56 ----
    
    // Check if user has entered a user to edit
!   if (! isset($_GET['user'])) {
      echo "<br><br>You must select a user from the member list to edit! [ <a href='index.php'>Member List</a> ]<br><br>";
!     die(include_once("$footer"));
    }
  
!   if (isset($_POST["firstname"]) == true) {
!     if (isset($_POST["ndivision"]) == true && $_POST["ndivision"] != "") {
!       $_POST["division"] = $_POST["ndivision"];
!       ofirst_dbquery("INSERT INTO ofirst_divisions (division) VALUES ('" . $_POST["division"] . "');");
!       ofirst_dbquery("UPDATE ofirst_divisions SET description='" . $_POST["divisiondescription"] . "' WHERE division='" . $_POST["division"] . "';");
!     }
  
!     if (isset($_POST["cellphonesms"]) && $_POST["cellphonesms"] == "0") { 
!       $_POST["cellphonesms"] = true; 
!       $edituser->cellphonesms = "1";
!     } else { 
!       $_POST["cellphonesms"] = false; 
!       $edituser->cellphonesms = "0";
!     }
    
!     ofirst_dbquery("UPDATE ofirst_members SET
                     firstname='" . $_POST["firstname"] . "',
                     lastname='" . $_POST["lastname"] . "',
***************
*** 72,86 ****
                     cellphonenumber='" . $_POST["cellphonenumber"] . "',
                     cellphonecarrier='" . $_POST["cellphonecarrier"] . "',
! 				   password = '" . cryptpassword($_POST["password"], $encryption) . "',
                     cellphonesms='" . $_POST["cellphonesms"] . "'  WHERE user='".$_POST['user']."';");
  
!           $query = ofirst_dbquery("UPDATE ofirst_members SET password='" . cryptpassword($_POST["password"], $encryption) ."' WHERE user='".$_GET['user']."';");
!  
!       echo("<br><font color='green'>Profile updated.</font>");
      }
! 	
! 	$edituser_query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user = '".$_GET['user']."';");
! 	$edituser = ofirst_dbfetch_object($edituser_query);
! ?>
  <h1>Edit Member Account</h1>
  <p><a href="<?php echo $basepath; ?>/members/admin/">Back to Member List</a></p>
--- 67,84 ----
                     cellphonenumber='" . $_POST["cellphonenumber"] . "',
                     cellphonecarrier='" . $_POST["cellphonecarrier"] . "',
!                    password = '" . cryptpassword($_POST["password"], $encryption) . "',
                     cellphonesms='" . $_POST["cellphonesms"] . "'  WHERE user='".$_POST['user']."';");
  
!     // Update password only if it's been entered
!     if(isset($_POST["password"]) && $_POST["password"] != "") {
!       ofirst_dbquery("UPDATE ofirst_members SET password='" . cryptpassword($_POST["password"], $encryption) ."' WHERE user='".$_GET['user']."';");
      }
!     echo("<br><font color='green'>Profile updated.</font>");
!   }
! 
!   $edituser_query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user = '".$_GET['user']."';");
!   $edituser = ofirst_dbfetch_object($edituser_query);
! 
! ?> 
  <h1>Edit Member Account</h1>
  <p><a href="<?php echo $basepath; ?>/members/admin/">Back to Member List</a></p>

[Openfirst-cvscommit] base/config first.php,1.33,1.34 dbase.php,1.8,1.9

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

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

Modified Files:
	first.php dbase.php 
Log Message:
Begin steps toward adding full support for PEAR Database Abstraction Layer.  What needs to be done before full support will exist is dbase.php must actually use PEAR if it's present (ie, mappings have to be updated to accomodate the new PEAR options).  As of this commit, PEAR isn't actually used, however, it is checked for, and setup-- but uses the openFIRST mappings, rather than the PEAR DB mappings.  Soon someone should add the PEAR logo to the openFIRST site :-)

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** first.php	9 Apr 2004 17:50:46 -0000	1.33
--- first.php	9 Apr 2004 20:00:09 -0000	1.34
***************
*** 67,70 ****
--- 67,73 ----
         $allowreg='$regenabled=false;';
       }
+ 
+      if(! isset($_POST["peardb"])) { $_POST["peardb"] = false; }
+ 
       fputs($of, "<?php
  /*
***************
*** 77,80 ****
--- 80,84 ----
   */
   \$dbasetype = \"" . $_POST["dbasetype"] . "\";
+  \$peardb = \"" . $_POST["peardb"] . "\";
   \$ostype = '" . $_POST["ostype"] . "';
    if (\$ostype == \"windows\") {
***************
*** 253,262 ****
      </tr>
      <tr> 
!       <td>Database Type</td>
!       <td><select name="dbasetype">
            <option value="mysql" selected="selected">MySQL</option>
            <option value="mssql">Microsoft SQL</option>
            <option value="odbc">ODBC</option>
          </select> 
      <tr> 
        <td>Title of Website</td>
--- 257,298 ----
      </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">
            <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">
+           <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>
***************
*** 268,272 ****
      </tr>
      <tr> 
!       <td>Database Server Address</td>
        <td><input type="text" name="sqlserver" value="<?php 
          if(ini_get("mysql.default_host") != "") {
--- 304,308 ----
      </tr>
      <tr> 
!      <td>Database Server Address</td>
        <td><input type="text" name="sqlserver" value="<?php 
          if(ini_get("mysql.default_host") != "") {

Index: dbase.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/dbase.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dbase.php	24 Aug 2003 18:51:04 -0000	1.8
--- dbase.php	9 Apr 2004 20:00:10 -0000	1.9
***************
*** 32,39 ****
    if(isset($dbasetype) == false) { $dbasetype = "mysql"; }
  
    // Wrapper for database selection.
    function ofirst_dbconnect($server = "", $username = "", $password = "",
                              $newlink = "", $intclientflags = "") {
!     global $dbasetype;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_connect") == false) {
--- 32,44 ----
    if(isset($dbasetype) == false) { $dbasetype = "mysql"; }
  
+   if($peardb) {
+     // Include the PEAR Database Abstraction Layer
+     include_once("DB.php");
+   }
+   
    // Wrapper for database selection.
    function ofirst_dbconnect($server = "", $username = "", $password = "",
                              $newlink = "", $intclientflags = "") {
!     global $dbasetype, $peardb;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_connect") == false) {
***************
*** 66,70 ****
  
    function ofirst_select_db($databasename, $linkidentifier = "") {
!     global $dbasetype;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_select_db") == false) {
--- 71,75 ----
  
    function ofirst_select_db($databasename, $linkidentifier = "") {
!     global $dbasetype, $peardb;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_select_db") == false) {
***************
*** 90,94 ****
  
    function ofirst_dberrno($linkidentifier = "") {
!     global $dbasetype;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_errno") == false) {
--- 95,99 ----
  
    function ofirst_dberrno($linkidentifier = "") {
!     global $dbasetype, $peardb;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_errno") == false) {
***************
*** 119,123 ****
  
    function ofirst_dberror($linkidentifier = "") {
!     global $dbasetype;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_error") == false) {
--- 124,128 ----
  
    function ofirst_dberror($linkidentifier = "") {
!     global $dbasetype, $peardb;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_error") == false) {
***************
*** 148,152 ****
  
    function ofirst_dbquery($string, $linkidentifier = "", $batchsize = "") {
!     global $dbasetype;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_query") == false) {
--- 153,157 ----
  
    function ofirst_dbquery($string, $linkidentifier = "", $batchsize = "") {
!     global $dbasetype, $peardb;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_query") == false) {
***************
*** 180,184 ****
  
    function ofirst_dbfetch_object($resource, $rownumber = "") {
!     global $dbasetype;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_fetch_object") == false) {
--- 185,189 ----
  
    function ofirst_dbfetch_object($resource, $rownumber = "") {
!     global $dbasetype, $peardb;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_fetch_object") == false) {
***************
*** 206,210 ****
  
    function ofirst_dbnum_rows($resource) {
!     global $dbasetype;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_num_rows") == false) {
--- 211,215 ----
  
    function ofirst_dbnum_rows($resource) {
!     global $dbasetype, $peardb;
      if($dbasetype == "mysql") {
        if(function_exists("mysql_num_rows") == false) {

[Openfirst-cvscommit] photogallery/admin editphoto.php,1.8,1.9

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

Update of /cvsroot/openfirst/photogallery/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21474/admin

Modified Files:
	editphoto.php 
Log Message:
Commit outstanding changes for viewphoto.php and admin/editphoto.php both of which should make it more bearable to work with large quantities of images.

Index: editphoto.php
===================================================================
RCS file: /cvsroot/openfirst/photogallery/admin/editphoto.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** editphoto.php	28 Feb 2004 02:12:17 -0000	1.8
--- editphoto.php	9 Apr 2004 18:51:52 -0000	1.9
***************
*** 31,34 ****
--- 31,39 ----
      die(include_once($footer));
    }
+ 
+   if(! isset($_GET["ID"])) {
+     echo("You must specify a picture to edit. [ <a href='admin.php'>Admin Main</a> ]");
+     die(include_once($footer));
+   }
   
    // Get information relating to this particular image
***************
*** 106,113 ****
--- 111,126 ----
    </tr>
  </table><br>
+ <?php
+   if(file_exists("../gallery/$gallery->GalleryName/thumbs/" . $_GET["PHOTO"])) {
+     echo("<a href=\"../gallery/$gallery->GalleryName/" . $_GET["PHOTO"] . "\"><img src=\"../gallery/$gallery->GalleryName/thumbs/" . $_GET["PHOTO"] . "\"></a>");
+   } else {
+ ?>
  <img src="../gallery/<?php echo $gallery->GalleryName; ?>/<?php echo $_GET['PHOTO']; ?>" width="300" height="225"><br>
    <br>
    [ <a href="makethumb.php?ID=<?php echo $_GET['ID']; ?>&PHOTO=<?php echo $_GET['PHOTO']; ?>">Make 
    Thumbnail</a> ]
+ <?php
+   }
+ ?>
  <form action='editphoto.php?ID=<?php echo $_GET['ID']; ?>&PHOTO=<?php echo $_GET['PHOTO']; ?>' method='POST'>
    <table width="456">

[Openfirst-cvscommit] photogallery viewphoto.php,1.15,1.16

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

Update of /cvsroot/openfirst/photogallery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21474

Modified Files:
	viewphoto.php 
Log Message:
Commit outstanding changes for viewphoto.php and admin/editphoto.php both of which should make it more bearable to work with large quantities of images.

Index: viewphoto.php
===================================================================
RCS file: /cvsroot/openfirst/photogallery/viewphoto.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** viewphoto.php	28 Feb 2004 02:12:17 -0000	1.15
--- viewphoto.php	9 Apr 2004 18:51:52 -0000	1.16
***************
*** 137,141 ****
    $dirlocate = $gallerydir.$gallery->GalleryName."/";
    echo "<a href='" . $dirlocate . $_GET['PHOTO'] . "'>
! <img width='400' src='".$dirlocate.$_GET['PHOTO']."'>
  <br>View image alone</a>";
  ?>
--- 137,141 ----
    $dirlocate = $gallerydir.$gallery->GalleryName."/";
    echo "<a href='" . $dirlocate . $_GET['PHOTO'] . "'>
! <img width='400' src=\"".$dirlocate.$_GET['PHOTO']."\">
  <br>View image alone</a>";
  ?>

[Openfirst-cvscommit] guestbook signthanks.php,1.12,1.13

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

Update of /cvsroot/openfirst/guestbook
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17756

Modified Files:
	signthanks.php 
Log Message:
Prevent DoS on guestbook by requiring fields to be filled in.  This is in direct response to the attacks on portperryrobotics.ca using a Java-based program running on a remote server to post blank data directly to signthanks.php

Index: signthanks.php
===================================================================
RCS file: /cvsroot/openfirst/guestbook/signthanks.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** signthanks.php	24 Dec 2003 19:05:54 -0000	1.12
--- signthanks.php	9 Apr 2004 18:31:29 -0000	1.13
***************
*** 29,32 ****
--- 29,40 ----
    include_once("../config/globals.php");
    include_once("$header");
+ 
+   if(! isset($_POST["guest"]) && ! isset($_POST["email"]) && !isset($_POST["icq"]) && ! isset($_POST["aim"]) && ! isset($_POST["msn"])
+ && ! isset($_POST["yim"]) && ! isset($_POST["irc"]) && !
+ isset($_POST["webpage"]) && ! isset($_POST["location"]) && !
+ isset($_POST["comment"])) {
+     echo("You must fill in at least some fields to sign the guest book");
+     die(include_once($footer));
+   }
  ?>
  <h1>Sign Guest Book - Complete</h1>

[Openfirst-cvscommit] feedback index.php,1.17,1.18

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

Update of /cvsroot/openfirst/feedback
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14156

Modified Files:
	index.php 
Log Message:
Set default type of message to be comment.  Fixes bug id #108

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/feedback/index.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** index.php	24 Dec 2003 18:22:18 -0000	1.17
--- index.php	9 Apr 2004 18:13:42 -0000	1.18
***************
*** 102,105 ****
--- 102,106 ----
          // Mail who they wish to contact.
          if (isset($user->user)) { $isuser = "registered user"; } else { $isuser = "unregistered user"; }
+         if(! isset($_POST["type"])) { $_POST["type"] = "comment"; }
          if (function_exists("multipartmail")) { 
            multipartmail($_POST["to"], "Feedback: $isuser " . $_POST["type"], $_POST["message"]

[Openfirst-cvscommit] base/config index.php,1.8,1.9

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

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

Modified Files:
	index.php 
Log Message:
Add security warnings if an insecure setup is detected.

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.php	5 Apr 2004 10:34:26 -0000	1.8
--- index.php	9 Apr 2004 18:00:43 -0000	1.9
***************
*** 40,43 ****
--- 40,51 ----
  </table>
  
+ <?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>");
+   }
+ ?>
+ 
  <table>
   <tr>

[Openfirst-cvscommit] base/config first.php,1.32,1.33

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

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

Modified Files:
	first.php 
Log Message:
Fix bug in mysql settings.

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** first.php	9 Apr 2004 17:25:50 -0000	1.32
--- first.php	9 Apr 2004 17:50:46 -0000	1.33
***************
*** 39,46 ****
   if(isset($_POST["ostype"])) {
     include_once("./dbase.php");
!    $sqlserver = '" . $_POST["sqlserver"] . "';
!    $sqluser = '" . $_POST["sqluser"] . "';
!    $sqlpassword = '" . $_POST["sqlpassword"] . "';
!    $sqldatabase = '" . $_POST["sqldatabase"] . "';
     if(function_exists("ofirst_dbconnect") == false) {
       die("Your version of PHP has not been compiled with MySQL support, therefore the openFIRST web portal system cannot run on this system.  Please contact your system administrator to request MySQL support for your version of PHP.");
--- 39,46 ----
   if(isset($_POST["ostype"])) {
     include_once("./dbase.php");
!    $sqlserver = $_POST["sqlserver"];
!    $sqluser = $_POST["sqluser"];
!    $sqlpassword = $_POST["sqlpassword"];
!    $sqldatabase = $_POST["sqldatabase"];
     if(function_exists("ofirst_dbconnect") == false) {
       die("Your version of PHP has not been compiled with MySQL support, therefore the openFIRST web portal system cannot run on this system.  Please contact your system administrator to request MySQL support for your version of PHP.");

[Openfirst-cvscommit] base/config first.php,1.31,1.32

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

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

Modified Files:
	first.php 
Log Message:
Update first.php to have more advanced guessing at configuration settings for OS and database connections.  This should make setup simplier and more friendly overall.

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** first.php	5 Apr 2004 11:16:01 -0000	1.31
--- first.php	9 Apr 2004 17:25:50 -0000	1.32
***************
*** 240,246 ****
        <td>Operating System of Web Server</td>
        <td><select name="ostype">
!           <option value="unix" selected="selected">UNIX</option>
!           <option value="windows">Windows</option>
!         </select> <font size="2">(UNIX includes variants, such as Linux, Mac OS 
          X, and BeOS) </font></td>
      </tr>
--- 240,253 ----
        <td>Operating System of Web Server</td>
        <td><select name="ostype">
! <?php
!    if (isset($_ENV["OS"]) && strpos(" " . $_ENV["OS"], "Windows")) {
!      echo("<option value='unix'>UNIX</option>
!            <option value='windows' selected='selected'>Windows</option>");
!    } else {
!      echo("<option value='unix' selected='selected'>UNIX</option>
!            <option value='windows'>Windows</option>");
!    }
! ?>
!       </select> <font size="2">(UNIX includes variants, such as Linux, Mac OS 
          X, and BeOS) </font></td>
      </tr>
***************
*** 262,274 ****
      <tr> 
        <td>Database Server Address</td>
!       <td><input type="text" name="sqlserver" value="localhost" /></td>
      </tr>
      <tr> 
        <td>Database User Name</td>
!       <td><input type="text" name="sqluser" value="sqluser" /></td>
      </tr>
      <tr> 
        <td>Database User Password</td>
!       <td><input type="password" name="sqlpassword" /></td>
      </tr>
      <tr> 
--- 269,294 ----
      <tr> 
        <td>Database Server Address</td>
!       <td><input type="text" name="sqlserver" value="<?php 
!         if(ini_get("mysql.default_host") != "") {
!           echo(ini_get("mysql.default_host"));
!         } else {
!           echo("localhost");
!         }?>" /></td>
      </tr>
      <tr> 
        <td>Database User Name</td>
!       <td><input type="text" name="sqluser" value="<?php 
!         if(ini_get("mysql.default_user") != "") {
!           echo(ini_get("mysql.default_user"));
!         } else {
!           echo("sqluser");
!         }?>" /></td>
      </tr>
      <tr> 
        <td>Database User Password</td>
!       <td><input type="password" name="sqlpassword" value="<?php 
!         if(ini_get("mysql.default_password") != "") {
!           echo(ini_get("mysql.default_password"));
!         }?>" /></td>
      </tr>
      <tr> 

[Openfirst-cvscommit] logger index.php,1.11,1.12 rawdata.php,1.11,1.12

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

Update of /cvsroot/openfirst/logger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6673

Modified Files:
	index.php rawdata.php 
Log Message:
Change database query to reflect ANSI standard (ref: http://dotgeek.org/guruarticles.php?guru=view&id=27)

Index: rawdata.php
===================================================================
RCS file: /cvsroot/openfirst/logger/rawdata.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rawdata.php	24 Dec 2003 19:32:20 -0000	1.11
--- rawdata.php	7 Apr 2004 11:46:22 -0000	1.12
***************
*** 47,51 ****
    }
  
!   $query = ofirst_dbquery("SELECT * FROM ofirst_logger LIMIT $min,$max");
    $amount = ofirst_dbnum_rows($query);
  
--- 47,51 ----
    }
  
!   $query = ofirst_dbquery("SELECT * FROM ofirst_logger LIMIT $min OFFSET $max");
    $amount = ofirst_dbnum_rows($query);
  

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/logger/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** index.php	24 Dec 2003 19:32:20 -0000	1.11
--- index.php	7 Apr 2004 11:46:21 -0000	1.12
***************
*** 47,51 ****
    }
  
!   $query = ofirst_dbquery("SELECT * FROM ofirst_logger GROUP BY `IPAddress` ORDER BY `ID` DESC LIMIT $min,$max");
    $amount = ofirst_dbnum_rows($query);
  
--- 47,51 ----
    }
  
!   $query = ofirst_dbquery("SELECT * FROM ofirst_logger GROUP BY `IPAddress` ORDER BY `ID` DESC LIMIT $min OFFSET $max");
    $amount = ofirst_dbnum_rows($query);
  

[Openfirst-cvscommit] emoticon emoticonf.php,1.13,1.14

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

Update of /cvsroot/openfirst/emoticon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6493

Modified Files:
	emoticonf.php 
Log Message:
Change database query to reflect ANSI standard (ref: http://dotgeek.org/guruarticles.php?guru=view&id=27)

Index: emoticonf.php
===================================================================
RCS file: /cvsroot/openfirst/emoticon/emoticonf.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** emoticonf.php	24 Dec 2003 18:05:50 -0000	1.13
--- emoticonf.php	7 Apr 2004 11:45:12 -0000	1.14
***************
*** 50,54 ****
    function emoticon_preview ($limit = 5, $start = 0) {
      global $basepath;
!     $query = ofirst_dbquery("SELECT * FROM ofirst_emoticon LIMIT $start,$limit");
      echo "<table><th>Emoticons</th><th></th>";
      while ($emot = ofirst_dbfetch_object($query)) {
--- 50,54 ----
    function emoticon_preview ($limit = 5, $start = 0) {
      global $basepath;
!     $query = ofirst_dbquery("SELECT * FROM ofirst_emoticon LIMIT $start OFFSET $limit");
      echo "<table><th>Emoticons</th><th></th>";
      while ($emot = ofirst_dbfetch_object($query)) {

[Openfirst-cvscommit] guestbook index.php,1.13,1.14

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

Update of /cvsroot/openfirst/guestbook
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3312

Modified Files:
	index.php 
Log Message:
Change database query to reflect ANSI standard (ref: http://dotgeek.org/guruarticles.php?guru=view&id=27)

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/guestbook/index.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** index.php	14 Feb 2004 16:52:08 -0000	1.13
--- index.php	7 Apr 2004 11:32:29 -0000	1.14
***************
*** 42,46 ****
          </form>");
  
!   $query = "SELECT * FROM ofirst_guestbook ORDER BY guest LIMIT " . $_GET["start"] . ", " . $_GET["perpage"] . ";";
    $result = ofirst_dbquery($query);
  
--- 42,46 ----
          </form>");
  
!   $query = "SELECT * FROM ofirst_guestbook ORDER BY guest LIMIT " . $_GET["start"] . " OFFSET " . $_GET["perpage"] . ";";
    $result = ofirst_dbquery($query);
  

[Openfirst-cvscommit] base/config first.php,1.30,1.31

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

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

Modified Files:
	first.php 
Log Message:
Fix bug in last commit

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** first.php	5 Apr 2004 11:13:46 -0000	1.30
--- first.php	5 Apr 2004 11:16:01 -0000	1.31
***************
*** 43,48 ****
     $sqlpassword = '" . $_POST["sqlpassword"] . "';
     $sqldatabase = '" . $_POST["sqldatabase"] . "';
!    if(function_exists(\"ofirst_dbconnect\") == false) {
!      die(\"Your version of PHP has not been compiled with MySQL support, therefore the openFIRST web portal system cannot run on this system.  Please contact your system administrator to request MySQL support for your version of PHP.\");
     }
     $sqlconnection = ofirst_dbconnect("$sqlserver","$sqluser","$sqlpassword");
--- 43,48 ----
     $sqlpassword = '" . $_POST["sqlpassword"] . "';
     $sqldatabase = '" . $_POST["sqldatabase"] . "';
!    if(function_exists("ofirst_dbconnect") == false) {
!      die("Your version of PHP has not been compiled with MySQL support, therefore the openFIRST web portal system cannot run on this system.  Please contact your system administrator to request MySQL support for your version of PHP.");
     }
     $sqlconnection = ofirst_dbconnect("$sqlserver","$sqluser","$sqlpassword");

[Openfirst-cvscommit] base/config first.php,1.29,1.30

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

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

Modified Files:
	first.php 
Log Message:
Add functionality to create a database if it does not already exist, and the user information given has sufficient database access to do so.

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** first.php	5 Apr 2004 10:26:40 -0000	1.29
--- first.php	5 Apr 2004 11:13:46 -0000	1.30
***************
*** 38,41 ****
--- 38,56 ----
  
   if(isset($_POST["ostype"])) {
+    include_once("./dbase.php");
+    $sqlserver = '" . $_POST["sqlserver"] . "';
+    $sqluser = '" . $_POST["sqluser"] . "';
+    $sqlpassword = '" . $_POST["sqlpassword"] . "';
+    $sqldatabase = '" . $_POST["sqldatabase"] . "';
+    if(function_exists(\"ofirst_dbconnect\") == false) {
+      die(\"Your version of PHP has not been compiled with MySQL support, therefore the openFIRST web portal system cannot run on this system.  Please contact your system administrator to request MySQL support for your version of PHP.\");
+    }
+    $sqlconnection = ofirst_dbconnect("$sqlserver","$sqluser","$sqlpassword");
+ 
+    /* Create database if it does not already exist */
+    ofirst_dbquery("CREATE DATABASE IF NOT EXISTS $sqldatabase;");
+ 
+    ofirst_select_db($sqldatabase);
+ 
     // They have submitted the form, write a new globals.php file and test
     // options.
***************
*** 65,72 ****
    if (\$ostype == \"windows\") {
      ini_set(\"include_path\",\"../config/;.\");
!     include('dbase.php');
    } else {
      ini_set(\"include_path\",\"../config/:.\");
!     include('dbase.php');
    }
  
--- 80,87 ----
    if (\$ostype == \"windows\") {
      ini_set(\"include_path\",\"../config/;.\");
!     include_once('dbase.php');
    } else {
      ini_set(\"include_path\",\"../config/:.\");
!     include_once('dbase.php');
    }
  
***************
*** 258,263 ****
      </tr>
      <tr> 
!       <td>Database Name<br> <font size="1">(this database must already exist, 
!         it will not be automatically created)</font></td>
        <td><input type="text" name="sqldatabase" value="openfirst" /></td>
      </tr>
--- 273,278 ----
      </tr>
      <tr> 
!       <td>Database Name<br> <font size="1">(if this database does not already exist, the user entered above
!        must have access to create it)</font></td>
        <td><input type="text" name="sqldatabase" value="openfirst" /></td>
      </tr>

[Openfirst-cvscommit] base/config index.php,1.7,1.8

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

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

Modified Files:
	index.php 
Log Message:
Add openFIRST project stats to statistics table, properly close html tags

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.php	5 Apr 2004 10:26:50 -0000	1.7
--- index.php	5 Apr 2004 10:34:26 -0000	1.8
***************
*** 33,36 ****
--- 33,37 ----
  ?>
  <h1>openFIRST Configuration Area</h1>
+ 
  <table width="50%">
    <tr> 
***************
*** 39,50 ****
  </table>
  
- <?php
-  // The statistics feature is loosely inspired by that of phpBB.
- 
-  if($dbasetype == "mysql" || $dbasetype == "mssql") { ?>
  <table>
   <tr>
    <th colspan="2">Statistics</th>
   </tr>
   <tr>
    <th>Database Version</th><td>
--- 40,50 ----
  </table>
  
  <table>
   <tr>
    <th colspan="2">Statistics</th>
   </tr>
+ <?php
+  // The statistics feature is loosely inspired by that of phpBB.
+  if($dbasetype == "mysql" || $dbasetype == "mssql") { ?>
   <tr>
    <th>Database Version</th><td>
***************
*** 73,78 ****
    }
  ?>
! </table>
  <?php } ?>
  
  <br>
--- 73,83 ----
    }
  ?>
!   </td>
!  </tr>
  <?php } ?>
+  <tr><th>openFIRST Project Statistics</th><td>
+  <?php include_once("http://bugzilla.openfirst.org/openfirst/bugcrushers.php"); ?>
+ </td></tr>
+ </table>
  
  <br>

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

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

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

Modified Files:
	index.php 
Log Message:
Add encryption selection option to setup, show database statistics if they are supported by the database server type which is selected (currently supports mysql and mssql); this functionality is based loosely on the phpBB statistics

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** index.php	1 Nov 2003 18:16:07 -0000	1.6
--- index.php	5 Apr 2004 10:26:50 -0000	1.7
***************
*** 38,41 ****
--- 38,80 ----
    </tr>
  </table>
+ 
+ <?php
+  // The statistics feature is loosely inspired by that of phpBB.
+ 
+  if($dbasetype == "mysql" || $dbasetype == "mssql") { ?>
+ <table>
+  <tr>
+   <th colspan="2">Statistics</th>
+  </tr>
+  <tr>
+   <th>Database Version</th><td>
+ <?php
+   if($dbasetype == "mysql") { 
+     $v = ofirst_dbfetch_object(ofirst_dbquery("SELECT VERSION() AS mysql_version"));
+     echo("MySQL $v->mysql_version");
+   } elseif($dbasetype == "mssql") {
+     echo("Microsoft SQL Server");
+   }
+ ?></td>
+  </tr>
+  <tr>
+   <th>Database Size</th><td>
+ <?php
+   if($dbasetype == "mysql") {
+     $dbsize = 0;
+     $dq = ofirst_dbquery("SHOW TABLE STATUS FROM $sqldatabase");
+     while($d = ofirst_dbfetch_object($dq)) {
+       $dbsize += $d->Data_length + $d->Index_length;
+     }
+     echo (int) (($dbsize + 0.5) / 1024 * 10) / 10 . " KB";
+   } elseif($dbasetype == "mssql") {
+     $s = ofirst_dbfetch_object(ofirst_dbquery("SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize FROM sysfiles"));
+     echo (int) (( $s->dbsize + 0.5) / 1024 * 10) / 10 . " KB";
+   }
+ ?>
+ </table>
+ <?php } ?>
+ 
+ <br>
  <table width="50%">
    <tr> 

[Openfirst-cvscommit] base/config first.php,1.28,1.29

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

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

Modified Files:
	first.php 
Log Message:
Add encryption selection option to setup, show database statistics if they are supported by the database server type which is selected (currently supports mysql and mssql); this functionality is based loosely on the phpBB statistics

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** first.php	27 Dec 2003 00:15:00 -0000	1.28
--- first.php	5 Apr 2004 10:26:40 -0000	1.29
***************
*** 70,73 ****
--- 70,76 ----
      include('dbase.php');
    }
+ 
+  \$encryption = '" . $_POST["encryption"] . "';
+ 
   \$title = '" . $_POST["title"] . "';
   \$version = '" . $_POST["version"] . "';
***************
*** 296,299 ****
--- 299,314 ----
      </tr>
      <tr> 
+       <td>Type of encryption to use on database passwords?<br>
+        <font size="1">If you are migrating from an existing system, this should be the same encryption 
+         style that system uses, otherwise all users will have to reset their password; otherwise, in 
+         most cases the default option is fine.</font></td>
+     <td>
+      <select name="encryption">
+       <option value='md5' selected='selected'>MD5 Message-Digest Algorithm</option>
+       <option value='crypt'>Standard Unix DES-based encryption algorthm</option>
+       <option value='crc32'>crc32 Polynomial</option>
+       <option value='sha1'>US Secure Hash Algorithm 1 (sha1)</option>
+      </select>
+     </td></tr>
        <td>Allow openFIRST users to save their passwords?<br> <font size="1">This feature uses cookies to
        automatically log in users into the openFIRST portal.</font></td>

[Openfirst-cvscommit] downloads getfile.php,1.4,1.5

[<i-...@us...>]

Update of /cvsroot/openfirst/downloads
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23216/downloads

Modified Files:
	getfile.php 
Log Message:
Added a content-disposition header to downloads from database. This will provide the right filename and extension for browsers.

Index: getfile.php
===================================================================
RCS file: /cvsroot/openfirst/downloads/getfile.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** getfile.php	8 Jan 2004 01:19:13 -0000	1.4
--- getfile.php	29 Feb 2004 20:54:28 -0000	1.5
***************
*** 34,38 ****
    }
  
!   $query=ofirst_dbquery("SELECT FileData,mime,hits FROM ofirst_downloads WHERE ID='".$id."';");
  
    if (ofirst_dbnum_rows($query)==0){
--- 34,38 ----
    }
  
!   $query=ofirst_dbquery("SELECT Title,ext,FileData,mime,hits FROM ofirst_downloads WHERE ID='".$id."';");
  
    if (ofirst_dbnum_rows($query)==0){
***************
*** 47,50 ****
--- 47,51 ----
      } else{
        header("Content-type: ".$file->mime);
+       header('Content-Disposition: attachment, filename="'.$file->Title.'.'.$file->ext.'"');
        echo(base64_decode($file->FileData));
      }

[Openfirst-cvscommit] members profile.php,1.23,1.24

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

Update of /cvsroot/openfirst/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11908

Modified Files:
	profile.php 
Log Message:
Add message for situation where there is no user matching a requested ID.

Index: profile.php
===================================================================
RCS file: /cvsroot/openfirst/members/profile.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** profile.php	23 Dec 2003 16:22:59 -0000	1.23
--- profile.php	28 Feb 2004 02:54:25 -0000	1.24
***************
*** 16,23 ****
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
--- 16,19 ----
***************
*** 126,129 ****
--- 122,128 ----
      // Collect information to display in persons profile
      $query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user='" . $_GET["id"] . "';");
+     if(ofirst_dbnum_rows($query) == 0) { 
+       echo("There is no user matching your request.");
+     }
      while($q = ofirst_dbfetch_object($query)) {
  

[Openfirst-cvscommit] members/admin index.php,1.4,1.5

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

Update of /cvsroot/openfirst/members/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9383

Modified Files:
	index.php 
Log Message:
Add some order to things.

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/members/admin/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.php	24 Dec 2003 17:35:08 -0000	1.4
--- index.php	28 Feb 2004 02:38:51 -0000	1.5
***************
*** 16,23 ****
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
--- 16,19 ----
***************
*** 50,54 ****
  <?php
    // List divisions
!   $member_query = ofirst_dbquery("SELECT * FROM ofirst_members;");
    while($member = ofirst_dbfetch_object($member_query)) {
  ?>
--- 46,50 ----
  <?php
    // List divisions
!   $member_query = ofirst_dbquery("SELECT * FROM ofirst_members ORDER BY user;");
    while($member = ofirst_dbfetch_object($member_query)) {
  ?>