openfirst-cvscommit

[<dav...@us...>]

Update of /cvsroot/openfirst/projects
In directory sc8-pr-cvs1:/tmp/cvs-serv5832

Modified Files:
	groups.php updates.php viewmembers.php 
Log Message:
Fixed commands to use ofirst database functions instead of mysql.

Index: groups.php
===================================================================
RCS file: /cvsroot/openfirst/projects/groups.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** groups.php	12 Oct 2003 23:39:14 -0000	1.12
--- groups.php	13 Oct 2003 23:37:52 -0000	1.13
***************
*** 127,131 ****
  		  // If administrator is logged in then show the admin edit option
  		  if($user->membertype == "administrator"){ ?>
! 		  <td id="adminmenu" background="/openfirst/images/back-admin.png"><p align="center"><a href="admin/editgroups.php?GroupID=<?php echo $groups->ID; ?>">Edit</a></p></td>';
            <?php }
  		  ?>
--- 127,131 ----
  		  // If administrator is logged in then show the admin edit option
  		  if($user->membertype == "administrator"){ ?>
! 		  <td id="adminmenu" background="/openfirst/images/back-admin.png"><p align="center"><a href="admin/editgroups.php?GroupID=<?php echo $groups->ID; ?>">Edit</a></p></td>
            <?php }
  		  ?>

Index: updates.php
===================================================================
RCS file: /cvsroot/openfirst/projects/updates.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** updates.php	3 Oct 2003 02:16:39 -0000	1.6
--- updates.php	13 Oct 2003 23:37:52 -0000	1.7
***************
*** 30,35 ****
    include("../config/globals.php");
  
!   $mailgroupquery = mysql_query("SELECT * FROM ofirst_members WHERE ProjectsUpdates = 'On'") or die(mysql_error());
!   while($mailgroup = mysql_fetch_object($mailgroupquery)){
    
    if(! isset($mailgroup->email)){
--- 30,35 ----
    include("../config/globals.php");
  
!   $mailgroupquery = ofirst_dbquery("SELECT * FROM ofirst_members WHERE ProjectsUpdates = 'On'") or die(mysql_error());
!   while($mailgroup = ofirst_dbfetch_object($mailgroupquery)){
    
    if(! isset($mailgroup->email)){
***************
*** 53,58 ****
  
    // Run through the current list of groups to preview there related information
!     $groupquery = mysql_query("SELECT * FROM ofirst_projects_groups");
!     while($group = mysql_fetch_object($groupquery)){
  
    $message .= "<table width='100%' border='0' cellspacing='0' cellpadding='6'>
--- 53,58 ----
  
    // Run through the current list of groups to preview there related information
!     $groupquery = ofirst_dbquery("SELECT * FROM ofirst_projects_groups");
!     while($group = ofirst_dbfetch_object($groupquery)){
  
    $message .= "<table width='100%' border='0' cellspacing='0' cellpadding='6'>
***************
*** 72,77 ****
  
    // Listed the newly added projects for this day
!   $projectquery = mysql_query("SELECT * FROM ofirst_projects_projects WHERE GroupID = '".$group->ID."'"); 
!   while($project = mysql_fetch_object($projectquery)){
  
       if(date('F j, Y',time()) == date("F j, Y",$project->Dates)){
--- 72,77 ----
  
    // Listed the newly added projects for this day
!   $projectquery = ofirst_dbquery("SELECT * FROM ofirst_projects_projects WHERE GroupID = '".$group->ID."'"); 
!   while($project = ofirst_dbfetch_object($projectquery)){
  
       if(date('F j, Y',time()) == date("F j, Y",$project->Dates)){
***************
*** 91,99 ****
  
    // List the newly added tasks for this day
!   $taskquery = mysql_query("SELECT * FROM ofirst_projects_tasks WHERE GroupID = '".$group->ID."'"); 
!   while($task = mysql_fetch_object($taskquery)){
    
!     $taskprojquery = mysql_query("SELECT ProjectName FROM ofirst_projects_projects WHERE ID = '".$task->ProjectID."'");
!     $taskproject = mysql_fetch_object($taskprojquery);
  	
  	if(date('F j, Y',time()) == date("F j, Y",$task->Dates)){
--- 91,99 ----
  
    // List the newly added tasks for this day
!   $taskquery = ofirst_dbquery("SELECT * FROM ofirst_projects_tasks WHERE GroupID = '".$group->ID."'"); 
!   while($task = ofirst_dbfetch_object($taskquery)){
    
!     $taskprojquery = ofirst_dbquery("SELECT ProjectName FROM ofirst_projects_projects WHERE ID = '".$task->ProjectID."'");
!     $taskproject = ofirst_dbfetch_object($taskprojquery);
  	
  	if(date('F j, Y',time()) == date("F j, Y",$task->Dates)){
***************
*** 112,123 ****
  
    // List the newly added notes for this day
!   $notequery = mysql_query("SELECT * FROM ofirst_projects_notes WHERE GroupID = '".$group->ID."'"); 
!   while($note = mysql_fetch_object($notequery)){
    
!     $noteprojquery = mysql_query("SELECT ProjectName FROM ofirst_projects_projects WHERE ID = '".$note->ProjectID."'");
!     $noteproject = mysql_fetch_object($noteprojquery);
  
!     $notetasquery = mysql_query("SELECT * FROM ofirst_projects_tasks WHERE ID = '".$note->TaskID."'");
!     $notetask = mysql_fetch_object($notetasquery);
  	
  	if(date('F j, Y',time()) == date('F j, Y',$note->Dates)){
--- 112,123 ----
  
    // List the newly added notes for this day
!   $notequery = ofirst_dbquery("SELECT * FROM ofirst_projects_notes WHERE GroupID = '".$group->ID."'"); 
!   while($note = ofirst_dbfetch_object($notequery)){
    
!     $noteprojquery = ofirst_dbquery("SELECT ProjectName FROM ofirst_projects_projects WHERE ID = '".$note->ProjectID."'");
!     $noteproject = ofirst_dbfetch_object($noteprojquery);
  
!     $notetasquery = ofirst_dbquery("SELECT * FROM ofirst_projects_tasks WHERE ID = '".$note->TaskID."'");
!     $notetask = ofirst_dbfetch_object($notetasquery);
  	
  	if(date('F j, Y',time()) == date('F j, Y',$note->Dates)){

Index: viewmembers.php
===================================================================
RCS file: /cvsroot/openfirst/projects/viewmembers.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** viewmembers.php	12 Oct 2003 23:41:31 -0000	1.1
--- viewmembers.php	13 Oct 2003 23:37:52 -0000	1.2
***************
*** 35,40 ****
    } else {
    
!   $group_query = mysql_query("SELECT * FROM ofirst_projects_groups");
!   $group = mysql_fetch_object($group_query);
  
  ?>
--- 35,40 ----
    } else {
    
!   $group_query = ofirst_dbquery("SELECT * FROM ofirst_projects_groups");
!   $group = ofirst_dbfetch_object($group_query);
  
  ?>
***************
*** 52,57 ****
      foreach($assigned as $assign){
  
! 	  $member_query = mysql_query("SELECT * FROM ofirst_members WHERE user = '".$assign."'");
! 	  $member = mysql_fetch_object($member_query);
  	  
        echo "<td>$assign</td>";
--- 52,57 ----
      foreach($assigned as $assign){
  
! 	  $member_query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user = '".$assign."'");
! 	  $member = ofirst_dbfetch_object($member_query);
  	  
        echo "<td>$assign</td>";