[Openfirst-cvscommit] awards index.php,1.19,1.20

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

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

Modified Files:
	index.php 
Log Message:
damn! was using $ofDB!

Changed all instances of $ofDB to $ogDB

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/awards/index.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** index.php	30 Jun 2005 02:28:19 -0000	1.19
--- index.php	30 Jun 2005 03:28:30 -0000	1.20
***************
*** 27,46 ****
    $where = array();
    if (isset($_REQUEST['id'])) {
!     $where[] = $ofDB->quoteField('ID').'='.$ofDB->quoteData($_REQUEST['id']);
    }
    if (isset($_REQUEST['name'])) {
!     $where[] = $ofDB->quoteField('AwardName').'='.$ofDB->quoteData($_REQUEST['name']);
    }
    if (isset($_REQUEST['event'])) {
!     $where[] = $ofDB->quoteField('Event').'='.$ofDB->quoteData($_REQUEST['event']);
    }
    if (isset($_REQUEST['date'])) {
!     $where[] = $ofDB->quoteField('Date').'='.$ofDB->quoteData($_REQUEST['date']);
    }
    if (isset($_REQUEST['recipient'])) {
!     $where[] = $ofDB->quoteField('Recipient').'='.$ofDB->quoteData($_REQUEST['recipient']);
    }
    if (isset($_REQUEST['image'])) {
!     $where[] = $ofDB->quoteField('Image').'='.$ofDB->quoteData($_REQUEST['image']);
    }
    if (isset($_REQUEST['first'])) {
--- 27,46 ----
    $where = array();
    if (isset($_REQUEST['id'])) {
!     $where[] = $ogDB->quoteField('ID').'='.$ogDB->quoteData($_REQUEST['id']);
    }
    if (isset($_REQUEST['name'])) {
!     $where[] = $ogDB->quoteField('AwardName').'='.$ogDB->quoteData($_REQUEST['name']);
    }
    if (isset($_REQUEST['event'])) {
!     $where[] = $ogDB->quoteField('Event').'='.$ogDB->quoteData($_REQUEST['event']);
    }
    if (isset($_REQUEST['date'])) {
!     $where[] = $ogDB->quoteField('Date').'='.$ogDB->quoteData($_REQUEST['date']);
    }
    if (isset($_REQUEST['recipient'])) {
!     $where[] = $ogDB->quoteField('Recipient').'='.$ogDB->quoteData($_REQUEST['recipient']);
    }
    if (isset($_REQUEST['image'])) {
!     $where[] = $ogDB->quoteField('Image').'='.$ogDB->quoteData($_REQUEST['image']);
    }
    if (isset($_REQUEST['first'])) {
***************
*** 48,65 ****
      if (strcasecmp($firstarg, 'yes') == 0 || strcasecmp($firstarg, 'y') == 0 || strcasecmp($firstarg, 1) == 0 || strcasecmp($firstarg, 'true' ) == 0) $first = true;
      if (strcasecmp($firstarg, 'no' ) == 0 || strcasecmp($firstarg, 'n') == 0 || strcasecmp($firstarg, 0) == 0 || strcasecmp($firstarg, 'false') == 0) $first = false;
!     $where[] = $ofDB->quoteField('FIRSTAward').'='.$ofDB->quoteData($first);
    }
    
    
    // Query database for award information
!   $sql = 'SELECT * FROM '.$ofDB->quoteTable('awards').
           ((count($where) > 0) ? ' WHERE '.implode(' OR ', $where) : '').
!          ' ORDER BY '.$ofDB->quoteField('Date').' DESC';
!   $query = $ofDB->query($sql);
    if ($query === false) {
!     echo $ofDB->errorNumber().': '.$ofDB->errorString().'<br />';
      var_dump($sql);
    }
!   $amount = $ofDB->numberOfRows($query);
  ?>
  <h1>Team Awards</h1>
--- 48,65 ----
      if (strcasecmp($firstarg, 'yes') == 0 || strcasecmp($firstarg, 'y') == 0 || strcasecmp($firstarg, 1) == 0 || strcasecmp($firstarg, 'true' ) == 0) $first = true;
      if (strcasecmp($firstarg, 'no' ) == 0 || strcasecmp($firstarg, 'n') == 0 || strcasecmp($firstarg, 0) == 0 || strcasecmp($firstarg, 'false') == 0) $first = false;
!     $where[] = $ogDB->quoteField('FIRSTAward').'='.$ogDB->quoteData($first);
    }
    
    
    // Query database for award information
!   $sql = 'SELECT * FROM '.$ogDB->quoteTable('awards').
           ((count($where) > 0) ? ' WHERE '.implode(' OR ', $where) : '').
!          ' ORDER BY '.$ogDB->quoteField('Date').' DESC';
!   $query = $ogDB->query($sql);
    if ($query === false) {
!     echo $ogDB->errorNumber().': '.$ogDB->errorString().'<br />';
      var_dump($sql);
    }
!   $amount = $ogDB->numberOfRows($query);
  ?>
  <h1>Team Awards</h1>
***************
*** 78,82 ****
  <?php
    // Loop through awards ordered by date
!   while($awards = $ofDB->fetchObject($query)){
  ?>
    <tr valign="top">
--- 78,82 ----
  <?php
    // Loop through awards ordered by date
!   while($awards = $ogDB->fetchObject($query)){
  ?>
    <tr valign="top">
***************
*** 98,102 ****
  <?php
    }
!   $ofDB->freeResult($query);
  
    include_once($Footer);
--- 98,102 ----
  <?php
    }
!   $ogDB->freeResult($query);
  
    include_once($Footer);