openfirst-cvscommit

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

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

Modified Files:
	editgroups.php edittasks.php 
Log Message:
Minor changes, getting closer to the final commits to making this module complete. These commits are just smaller minor changes.

Index: editgroups.php
===================================================================
RCS file: /cvsroot/openfirst/projects/admin/editgroups.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editgroups.php	12 Oct 2003 23:41:04 -0000	1.1
--- editgroups.php	13 Oct 2003 03:32:33 -0000	1.2
***************
*** 61,78 ****
  	$group = mysql_fetch_object($group_query);
  
!   if(isset($_POST['removemoderators'])){
!     $newmod = $group->Moderators;
! 	$assigned = explode(",",$group->Members);
!     foreach($assigned as $assign){
! 	  if(isset($_POST[$assign])){
! 	    unset($assigned[array_search("$assign",$assigned)]);
! 		echo "<br>User $assign removed!";
! 	  }
!     }
! 	$assigned = implode(",",$assigned);
! 	mysql_query("UPDATE ofirst_projects_groups SET Moderators = '$assigned' WHERE ID = '".$_GET['GroupID']."';") or die(mysql_error());
    	
  	$group_query = mysql_query("SELECT * FROM ofirst_projects_groups WHERE ID = '".$_GET['GroupID']."'");
  	$group = mysql_fetch_object($group_query);
    
    }
--- 61,83 ----
  	$group = mysql_fetch_object($group_query);
  
!   if(isset($_POST['editmods'])){
! 
! 	mysql_query("UPDATE ofirst_projects_groups SET Moderators = '".$_POST['moderators']."' WHERE ID = '".$_GET['GroupID']."';") or die(mysql_error());
!   	
! 	$group_query = mysql_query("SELECT * FROM ofirst_projects_groups WHERE ID = '".$_GET['GroupID']."'");
! 	$group = mysql_fetch_object($group_query);
! 	
! 	echo "<br>Moderators list has been updated!";
!   
!   }
! 
!   if(isset($_POST['editmembers'])){
! 
! 	mysql_query("UPDATE ofirst_projects_groups SET Members = '".$_POST['members']."' WHERE ID = '".$_GET['GroupID']."';");
    	
  	$group_query = mysql_query("SELECT * FROM ofirst_projects_groups WHERE ID = '".$_GET['GroupID']."'");
  	$group = mysql_fetch_object($group_query);
+ 	
+ 	echo "<br>Members list has been updated!";
    
    }
***************
*** 80,86 ****
  ?>
  <h2>Edit Group <font color="red"><?php echo $group->GroupName; ?></font></h2>
  <form action="editgroups.php?GroupID=<?php echo $_GET['GroupID']; ?>" method="POST">
    <p>
!     <textarea name="textarea" cols="60" rows="10"><?php echo $group->Members; ?></textarea>
    </p>
    <p>
--- 85,110 ----
  ?>
  <h2>Edit Group <font color="red"><?php echo $group->GroupName; ?></font></h2>
+ <table width="600">
+   <tr>
+     <td>To edit the users assigned to this group you must add/remove user names
+       from the boxes below. User names should be separated by a comma ie. jsomebody,mnobody,ahypithetical
+       etc. No spaces should be added either. </td>
+   </tr>
+ </table>
+ <p>&nbsp;</p>
  <form action="editgroups.php?GroupID=<?php echo $_GET['GroupID']; ?>" method="POST">
+   <p><strong>Group Moderator List </strong></p>
    <p>
!     <textarea name="moderators" cols="60" rows="10" id="moderators"><?php echo $group->Members; ?></textarea>
! </p>
!   <p>
!     <input name="editmods" type="submit" id="editmods" value="Edit Moderators">
!   </p>
!   <p><strong>Group Member List</strong>   </p>
!   <p>
!     <textarea name="members" cols="60" rows="10" id="members"><?php echo $group->Members; ?></textarea> 
!     </p>
!   <p>
!     <input name="editmembers" type="submit" id="editmembers" value="Edit Members">
    </p>
    <p>

Index: edittasks.php
===================================================================
RCS file: /cvsroot/openfirst/projects/admin/edittasks.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** edittasks.php	12 Oct 2003 23:41:04 -0000	1.1
--- edittasks.php	13 Oct 2003 03:32:33 -0000	1.2
***************
*** 28,36 ****
  
    // Include globals and set header condense (not coded yet)
!   include("../config/globals.php");
    $header_condense = true;
    include($header);
    
! 
      // Remove button process
      if(isset($_POST['remove'])){
--- 28,40 ----
  
    // Include globals and set header condense (not coded yet)
!   include("../../config/globals.php");
    $header_condense = true;
    include($header);
    
!   // Check if user is a member
!   if(! isset($user->user)){
!     showlogin();
!   } else {
!  
      // Remove button process
      if(isset($_POST['remove'])){
***************
*** 45,50 ****
        ofirst_dbquery("DELETE FROM ofirst_projects_tasks WHERE ID = '".$_POST['task']."'") or die(ofirst_dberror());
        ofirst_dbquery("DELETE FROM ofirst_projects_notes WHERE TaskID = '".$_POST['task']."'") or die(ofirst_dberror());
-       ofirst_dbquery("DELETE FROM ofirst_projects_tasks WHERE TaskID = '".$_POST['task']."'") or die(ofirst_dberror());
-       ofirst_dbquery("DELETE FROM ofirst_projects_projects WHERE TaskID = '".$_POST['task']."'") or die(ofirst_dberror());
  
        echo "<br><br>Task removed! [ <a href='tasks.php?GroupID=".$_GET['GroupID']."&ProjectID=".$_GET['ProjectID']."'>Projects</a> ]<br><br>";
--- 49,52 ----
***************
*** 53,60 ****
      }
  
  
  
  ?>
! <h2>Task Edit</h2>
  <?php
   } include($footer);
--- 55,96 ----
      }
  
+ 	$task_query = mysql_query("SELECT * FROM ofirst_projects_tasks WHERE ID = '".$_GET['TaskID']."'");
+ 	$task = mysql_fetch_object($task_query);
  
+   if(isset($_POST['editmembers'])){
+ 
+ 	mysql_query("UPDATE ofirst_projects_tasks SET Assigned = '".$_POST['members']."' WHERE ID = '".$_GET['TaskID']."';");
+   	
+ 	$task_query = mysql_query("SELECT * FROM ofirst_projects_tasks WHERE ID = '".$_GET['TaskID']."'");
+ 	$task = mysql_fetch_object($group_query);
+ 	
+ 	echo "<br>Members list has been updated!";
+   
+   }
  
  ?>
! <h2>Edit Task <font color="red"><?php echo $task->TaskName; ?></font></h2>
! <h2><font color="red"></font></h2>
! <table width="600">
!   <tr>
!     <td>To edit the users assigned to this task you must add/remove user names
!       from the boxes below. User names should be separated by a comma ie. jsomebody,mnobody,ahypithetical
!       etc. No spaces should be added either. </td>
!   </tr>
! </table>
! <p>&nbsp;</p>
! <form action="editgroups.php?GroupID=<?php echo $_GET['GroupID']; ?>" method="POST">
!   <p><strong>Group Member List</strong> </p>
!   <p>
!     <textarea name="members" cols="60" rows="10" id="members"><?php echo $task->Assigned; ?></textarea>
!   </p>
!   <p>
!     <input name="editmembers" type="submit" id="editmembers" value="Edit Members">
!   </p>
!   <p>
!     <input name="confirm" type="checkbox" id="confirm" value="checkbox">
!     Remove this task and all its related data from the database.
!     <input name="remove" type="submit" id="remove" value="Remove Task">
! </form>
  <?php
   } include($footer);