[Etest-cvs] etest/administrator admin_edit_classes.php,1.1,1.2 admin_edit_students.php,1.2,1.3 admin_edit_teachers.php,1.1,1.2 admin_home.php,1.6,1.7 admin_submit_class.php,1.2,1.3 admin_submit_student.php,1.3,1.4 admin_submit_teacher.php,1.1,1.2

[<cpj...@pr...>]

Update of /cvsroot/etest/etest/administrator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26820/administrator

Modified Files:
	admin_edit_classes.php admin_edit_students.php 
	admin_edit_teachers.php admin_home.php admin_submit_class.php 
	admin_submit_student.php admin_submit_teacher.php 
Log Message:
updated querys to use DB_prefix -- craig

Index: admin_edit_classes.php
===================================================================
RCS file: /cvsroot/etest/etest/administrator/admin_edit_classes.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_edit_classes.php	16 Dec 2003 17:39:58 -0000	1.1
--- admin_edit_classes.php	2 Feb 2004 15:37:21 -0000	1.2
***************
*** 29,33 ****
    //connect to mySQL database
    require('../includes/db_connect.php');
!   $allcourses = mysql_query("select * from course order by course_code", $db) or die('Cannot retrieve existing courses' . mysql_error());
    while ($row = mysql_fetch_array($allcourses))
    {
--- 29,33 ----
    //connect to mySQL database
    require('../includes/db_connect.php');
!   $allcourses = mysql_query("select * from ".$DB_prefix."_course order by course_code", $db) or die('Cannot retrieve existing courses' . mysql_error());
    while ($row = mysql_fetch_array($allcourses))
    {
***************
*** 45,47 ****
  </form>
  
! <?php require(INCLUDES_PATH."html_footer.php"); ?>
\ No newline at end of file
--- 45,47 ----
  </form>
  
! <?php require(INCLUDES_PATH."html_footer.php"); ?>

Index: admin_edit_students.php
===================================================================
RCS file: /cvsroot/etest/etest/administrator/admin_edit_students.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_edit_students.php	10 Dec 2003 18:11:41 -0000	1.2
--- admin_edit_students.php	2 Feb 2004 15:37:21 -0000	1.3
***************
*** 29,33 ****
    //connect to mySQL database
    require('../includes/db_connect.php');
!   $allstudents = mysql_query("select * from student order by student_code", $db) or die('Cannot retrieve existing students' . mysql_error());
    while ($row = mysql_fetch_array($allstudents))
    {
--- 29,33 ----
    //connect to mySQL database
    require('../includes/db_connect.php');
!   $allstudents = mysql_query("select * from ".$DB_prefix."_student order by student_code", $db) or die('Cannot retrieve existing students' . mysql_error());
    while ($row = mysql_fetch_array($allstudents))
    {
***************
*** 44,46 ****
     </form>
  
! <?php require(INCLUDES_PATH."html_footer.php"); ?>
\ No newline at end of file
--- 44,46 ----
     </form>
  
! <?php require(INCLUDES_PATH."html_footer.php"); ?>

Index: admin_edit_teachers.php
===================================================================
RCS file: /cvsroot/etest/etest/administrator/admin_edit_teachers.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_edit_teachers.php	12 Dec 2003 18:55:49 -0000	1.1
--- admin_edit_teachers.php	2 Feb 2004 15:37:21 -0000	1.2
***************
*** 31,35 ****
    //connect to mySQL database
    require('../includes/db_connect.php');
!   $allteachers = mysql_query("select * from instructor order by inst_code", $db) or die('Cannot retrieve existing teachers' . mysql_error());
    while ($row = mysql_fetch_array($allteachers))
    {
--- 31,35 ----
    //connect to mySQL database
    require('../includes/db_connect.php');
!   $allteachers = mysql_query("select * from ".$DB_prefix."_instructor order by inst_code", $db) or die('Cannot retrieve existing teachers' . mysql_error());
    while ($row = mysql_fetch_array($allteachers))
    {
***************
*** 46,48 ****
     </form>
  
! <?php require(INCLUDES_PATH."html_footer.php"); ?>
\ No newline at end of file
--- 46,48 ----
     </form>
  
! <?php require(INCLUDES_PATH."html_footer.php"); ?>

Index: admin_home.php
===================================================================
RCS file: /cvsroot/etest/etest/administrator/admin_home.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_home.php	10 Dec 2003 18:46:53 -0000	1.6
--- admin_home.php	2 Feb 2004 15:37:21 -0000	1.7
***************
*** 44,48 ****
                $password = addslashes($_POST['password']);
             $password = md5($password);
! 	   $query = "SELECT * FROM administrator WHERE admin_code = '$username' AND admin_password = '$password'";
             $result = mysql_query($query, $db) or die('Cannot run login query ' . mysql_error());
             //store the user as a valid user
--- 44,48 ----
                $password = addslashes($_POST['password']);
             $password = md5($password);
! 	   $query = "SELECT * FROM ".$DB_prefix."_administrator WHERE admin_code = '$username' AND admin_password = '$password'";
             $result = mysql_query($query, $db) or die('Cannot run login query ' . mysql_error());
             //store the user as a valid user

Index: admin_submit_class.php
===================================================================
RCS file: /cvsroot/etest/etest/administrator/admin_submit_class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_submit_class.php	17 Dec 2003 17:57:59 -0000	1.2
--- admin_submit_class.php	2 Feb 2004 15:37:21 -0000	1.3
***************
*** 47,51 ****
        $classcode = $_POST["courses"];
        require('../includes/db_connect.php');
!       $classinfo = mysql_query("select * from course where course_code='$classcode'",$db) or die('Cannot retrieve existing class'.mysql_error());
        $row = mysql_fetch_array($classinfo);
        if($row)
--- 47,51 ----
        $classcode = $_POST["courses"];
        require('../includes/db_connect.php');
!       $classinfo = mysql_query("select * from ".$DB_prefix."_course where course_code='$classcode'",$db) or die('Cannot retrieve existing class'.mysql_error());
        $row = mysql_fetch_array($classinfo);
        if($row)
***************
*** 64,68 ****
      <tr><td valign='top'>Sections:</td><td><select size='15' name='class_sections'>
  <?php
!     $sectioninfo = mysql_query("select * from section s,instructor i where s.course_code='$classcode' and s.inst_code = i.inst_code",$db) or die('Cannot retrieve existing sections'.mysql_error());
      while ($row = mysql_fetch_array($sectioninfo))
      {
--- 64,68 ----
      <tr><td valign='top'>Sections:</td><td><select size='15' name='class_sections'>
  <?php
!     $sectioninfo = mysql_query("select * from ".$DB_prefix."_section s,".$DB_prefix."_instructor i where s.course_code='$classcode' and s.inst_code = i.inst_code",$db) or die('Cannot retrieve existing sections'.mysql_error());
      while ($row = mysql_fetch_array($sectioninfo))
      {
***************
*** 96,100 ****
      <tr><td>Instructor Name:</td><td><select name='instcode'>
  <?php
!     $instinfo = mysql_query("select * from instructor order by inst_code",$db) or die('Cannot retrieve existing teachers'.mysql_error());
      while ($row = mysql_fetch_array($instinfo))
      {
--- 96,100 ----
      <tr><td>Instructor Name:</td><td><select name='instcode'>
  <?php
!     $instinfo = mysql_query("select * from ".$DB_prefix."_instructor order by inst_code",$db) or die('Cannot retrieve existing teachers'.mysql_error());
      while ($row = mysql_fetch_array($instinfo))
      {
***************
*** 123,127 ****
  
        //get current teacher
!       $instresult = mysql_query("select * from section where course_code='$classcode' and section_code='$sectionnum'",$db) or
                     die('Cannot retrieve existing section'.mysql_error());
        $row = mysql_fetch_array($instresult);
--- 123,127 ----
  
        //get current teacher
!       $instresult = mysql_query("select * from ".$DB_prefix."_section where course_code='$classcode' and section_code='$sectionnum'",$db) or
                     die('Cannot retrieve existing section'.mysql_error());
        $row = mysql_fetch_array($instresult);
***************
*** 138,142 ****
        <tr><td>Instructor Name:</td><td><select name='instcode'>
    <?php
!       $instinfo = mysql_query("select * from instructor order by inst_code",$db) or die('Cannot retrieve existing teachers'.mysql_error());
        while ($row = mysql_fetch_array($instinfo))
        {
--- 138,142 ----
        <tr><td>Instructor Name:</td><td><select name='instcode'>
    <?php
!       $instinfo = mysql_query("select * from ".$DB_prefix."_instructor order by inst_code",$db) or die('Cannot retrieve existing teachers'.mysql_error());
        while ($row = mysql_fetch_array($instinfo))
        {
***************
*** 168,172 ****
        $sectioncode = $_POST["class_sections"];
  
!       $sectioninfo = mysql_query("select * from enroll where course_code = '$classcode' and section_code='$sectioncode'",$db) or die('Cannot retrieve enrollment'.mysql_error());
        if(mysql_num_rows($sectioninfo)<=0)
        {
--- 168,172 ----
        $sectioncode = $_POST["class_sections"];
  
!       $sectioninfo = mysql_query("select * from ".$DB_prefix."_enroll where course_code = '$classcode' and section_code='$sectioncode'",$db) or die('Cannot retrieve enrollment'.mysql_error());
        if(mysql_num_rows($sectioninfo)<=0)
        {
***************
*** 194,198 ****
      $coursecode = $_POST["coursecode"];
      $sectioncode = $_POST["sectioncode"];
!     mysql_query("delete from section where course_code='$coursecode' and section_code='$sectioncode'",$db) or die('Cannot delete sections'.mysql_error());
      echo "Section Information deleted";
    }
--- 194,198 ----
      $coursecode = $_POST["coursecode"];
      $sectioncode = $_POST["sectioncode"];
!     mysql_query("delete from ".$DB_prefix."_section where course_code='$coursecode' and section_code='$sectioncode'",$db) or die('Cannot delete sections'.mysql_error());
      echo "Section Information deleted";
    }
***************
*** 213,221 ****
      else //everything was entered
      {
!       $classinfo = mysql_query("select * from section where course_code='$classcode' and section_code='$sectionnum'",$db) or die('Cannot retrieve class information'.mysql_error());
        //add section
        if(mysql_num_rows($classinfo)<=0)
        {
!         mysql_query("insert into section (course_code,section_code,inst_code)
                              values('$classcode','$sectionnum','$instcode')",$db) or die('Cannot add section'.mysql_error());
  
--- 213,221 ----
      else //everything was entered
      {
!       $classinfo = mysql_query("select * from ".$DB_prefix."_section where course_code='$classcode' and section_code='$sectionnum'",$db) or die('Cannot retrieve class information'.mysql_error());
        //add section
        if(mysql_num_rows($classinfo)<=0)
        {
!         mysql_query("insert into ".$DB_prefix."_section (course_code,section_code,inst_code)
                              values('$classcode','$sectionnum','$instcode')",$db) or die('Cannot add section'.mysql_error());
  
***************
*** 224,228 ****
        else //modify section
        {
!         mysql_query("update section set inst_code = '$instcode' where course_code='$classcode' and section_code='$sectionnum'",$db) or die('Cannot update section'.mysql_error());
          printf("Successful Section Update");
        }
--- 224,228 ----
        else //modify section
        {
!         mysql_query("update ".$DB_prefix."_section set inst_code = '$instcode' where course_code='$classcode' and section_code='$sectionnum'",$db) or die('Cannot update section'.mysql_error());
          printf("Successful Section Update");
        }
***************
*** 242,250 ****
      else //everything was entered
      {
!       $classinfo = mysql_query("select * from course where course_code='$classcode'",$db) or die('Cannot retrieve class information'.mysql_error());
        //add class
        if(mysql_num_rows($classinfo)<=0)
        {
!         mysql_query("insert into course (course_code,course_name,course_max_sections)
                              values('$classcode','$classname','10')",$db) or die('Cannot add class'.mysql_error());
  
--- 242,250 ----
      else //everything was entered
      {
!       $classinfo = mysql_query("select * from ".$DB_prefix."_course where course_code='$classcode'",$db) or die('Cannot retrieve class information'.mysql_error());
        //add class
        if(mysql_num_rows($classinfo)<=0)
        {
!         mysql_query("insert into ".$DB_prefix."_course (course_code,course_name,course_max_sections)
                              values('$classcode','$classname','10')",$db) or die('Cannot add class'.mysql_error());
  
***************
*** 253,257 ****
        else //modify class
        {
!         mysql_query("update course set course_name = '$classname' where course_code='$classcode'",$db) or die('Cannot update class'.mysql_error());
          printf("Successful Class Update");
        }
--- 253,257 ----
        else //modify class
        {
!         mysql_query("update ".$DB_prefix."_course set course_name = '$classname' where course_code='$classcode'",$db) or die('Cannot update class'.mysql_error());
          printf("Successful Class Update");
        }
***************
*** 269,276 ****
        $courses = $_POST["courses"];
  
!       $sectioninfo = mysql_query("select * from enroll where course_code = '$courses'",$db) or die('Cannot retrieve enrollment'.mysql_error());
        if(mysql_num_rows($sectioninfo)<=0)
        {
!         $courseinfo = mysql_query("select * from course where course_code='$courses'",$db) or die('Cannot retrieve existing course'.mysql_error());
          $row = mysql_fetch_array($courseinfo);
          if($row)
--- 269,276 ----
        $courses = $_POST["courses"];
  
!       $sectioninfo = mysql_query("select * from ".$DB_prefix."_enroll where course_code = '$courses'",$db) or die('Cannot retrieve enrollment'.mysql_error());
        if(mysql_num_rows($sectioninfo)<=0)
        {
!         $courseinfo = mysql_query("select * from ".$DB_prefix."_course where course_code='$courses'",$db) or die('Cannot retrieve existing course'.mysql_error());
          $row = mysql_fetch_array($courseinfo);
          if($row)
***************
*** 301,306 ****
      require('../includes/db_connect.php');
      $coursecode = $_POST["coursecode"];
!     mysql_query("delete from section where course_code='$coursecode'",$db) or die('Cannot delete sections'.mysql_error());
!     mysql_query("delete from course where course_code='$coursecode'",$db) or die('Cannot delete course'.mysql_error());
      echo "Class Information deleted";
    }
--- 301,306 ----
      require('../includes/db_connect.php');
      $coursecode = $_POST["coursecode"];
!     mysql_query("delete from ".$DB_prefix."_section where course_code='$coursecode'",$db) or die('Cannot delete sections'.mysql_error());
!     mysql_query("delete from ".$DB_prefix."_course where course_code='$coursecode'",$db) or die('Cannot delete course'.mysql_error());
      echo "Class Information deleted";
    }
***************
*** 310,312 ****
    }
  ?>
! <?php require(INCLUDES_PATH."html_footer.php"); ?>
\ No newline at end of file
--- 310,312 ----
    }
  ?>
! <?php require(INCLUDES_PATH."html_footer.php"); ?>

Index: admin_submit_student.php
===================================================================
RCS file: /cvsroot/etest/etest/administrator/admin_submit_student.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin_submit_student.php	12 Dec 2003 18:55:03 -0000	1.3
--- admin_submit_student.php	2 Feb 2004 15:37:21 -0000	1.4
***************
*** 40,44 ****
  <?php
      require('../includes/db_connect.php');
!     $allcourses = mysql_query("select * from section order by course_code,section_code", $db) or die('Cannot retrieve existing course sections' . mysql_error());
      while ($row = mysql_fetch_array($allcourses))
      {
--- 40,44 ----
  <?php
      require('../includes/db_connect.php');
!     $allcourses = mysql_query("select * from ".$DB_prefix."_section order by course_code,section_code", $db) or die('Cannot retrieve existing course sections' . mysql_error());
      while ($row = mysql_fetch_array($allcourses))
      {
***************
*** 62,66 ****
        $students = $_POST["students"];
        require('../includes/db_connect.php');
!       $studentinfo = mysql_query("select * from student where student_code='$students'",$db) or die('Cannot retrieve existing student'.mysql_error());
        $row = mysql_fetch_array($studentinfo);
        if($row)
--- 62,66 ----
        $students = $_POST["students"];
        require('../includes/db_connect.php');
!       $studentinfo = mysql_query("select * from ".$DB_prefix."_student where student_code='$students'",$db) or die('Cannot retrieve existing student'.mysql_error());
        $row = mysql_fetch_array($studentinfo);
        if($row)
***************
*** 76,80 ****
  
        //create a string containing all enrolled courses in format coursecode-section,coursecode-section,etc.
!       $enrollinfo = mysql_query("select * from enroll where student_code='$students'",$db) or die('Cannot retrieve enrollment'.mysql_error());
        $enrolllist = '';
        while($row = mysql_fetch_array($enrollinfo))
--- 76,80 ----
  
        //create a string containing all enrolled courses in format coursecode-section,coursecode-section,etc.
!       $enrollinfo = mysql_query("select * from ".$DB_prefix."_enroll where student_code='$students'",$db) or die('Cannot retrieve enrollment'.mysql_error());
        $enrolllist = '';
        while($row = mysql_fetch_array($enrollinfo))
***************
*** 96,100 ****
  <?php
  
!     $allcourses = mysql_query("select * from section order by course_code,section_code", $db) or die('Cannot retrieve existing course sections' . mysql_error());
      while ($row = mysql_fetch_array($allcourses))
      {
--- 96,100 ----
  <?php
  
!     $allcourses = mysql_query("select * from ".$DB_prefix."_section order by course_code,section_code", $db) or die('Cannot retrieve existing course sections' . mysql_error());
      while ($row = mysql_fetch_array($allcourses))
      {
***************
*** 130,134 ****
      else //everything was entered
      {
!       $studentinfo = mysql_query("select * from student where student_code='$studentcode'",$db) or die('Cannot retrieve student information'.mysql_error());
        //add student
        if(mysql_num_rows($studentinfo)<=0)
--- 130,134 ----
      else //everything was entered
      {
!       $studentinfo = mysql_query("select * from ".$DB_prefix."_student where student_code='$studentcode'",$db) or die('Cannot retrieve student information'.mysql_error());
        //add student
        if(mysql_num_rows($studentinfo)<=0)
***************
*** 145,149 ****
          else //password checked out
          {
!           mysql_query("insert into student (student_code,student_firstname,student_lastname,student_password)
                                values('$studentcode','$firstname','$lastname',md5($password))",$db) or die('Cannot add student'.mysql_error());
  
--- 145,149 ----
          else //password checked out
          {
!           mysql_query("insert into ".$DB_prefix."_student (student_code,student_firstname,student_lastname,student_password)
                                values('$studentcode','$firstname','$lastname',md5($password))",$db) or die('Cannot add student'.mysql_error());
  
***************
*** 153,157 ****
              $coursedesc = substr($courseval,0,$pos);
              $coursesec = substr($courseval,$pos+1);
!             mysql_query("insert into enroll (course_code,section_code,student_code) values('$coursedesc','$coursesec','$studentcode')",$db) or die('Cannot enroll student'.mysql_error());
            }
            printf("Successful Student Addition");
--- 153,157 ----
              $coursedesc = substr($courseval,0,$pos);
              $coursesec = substr($courseval,$pos+1);
!             mysql_query("insert into ".$DB_prefix."_enroll (course_code,section_code,student_code) values('$coursedesc','$coursesec','$studentcode')",$db) or die('Cannot enroll student'.mysql_error());
            }
            printf("Successful Student Addition");
***************
*** 163,171 ****
          if(($password=='') || ($passwordconfirm==''))
          {
!           mysql_query("update student set student_firstname = '$firstname', student_lastname='$lastname' where student_code='$studentcode'",$db) or die('Cannot update student'.mysql_error());
          }
          else //update password also
          {
!           mysql_query("update student set student_firstname = '$firstname', student_lastname='$lastname', student_password = md5($password) where student_code='$studentcode'",$db) or die('Cannot update student'.mysql_error());
          }
  
--- 163,171 ----
          if(($password=='') || ($passwordconfirm==''))
          {
!           mysql_query("update ".$DB_prefix."_student set student_firstname = '$firstname', student_lastname='$lastname' where student_code='$studentcode'",$db) or die('Cannot update student'.mysql_error());
          }
          else //update password also
          {
!           mysql_query("update ".$DB_prefix."_student set student_firstname = '$firstname', student_lastname='$lastname', student_password = md5($password) where student_code='$studentcode'",$db) or die('Cannot update student'.mysql_error());
          }
  
***************
*** 180,184 ****
            if(!in_array($courseval,$_POST["courses"]))
            {
!             mysql_query("delete from enroll where student_code='$studentcode'
                                  and course_code='$coursecode' and section_code='$sectioncode'",$db) or
                          die('Cannot clear enrollments'.mysql_error());
--- 180,184 ----
            if(!in_array($courseval,$_POST["courses"]))
            {
!             mysql_query("delete from ".$DB_prefix."_enroll where student_code='$studentcode'
                                  and course_code='$coursecode' and section_code='$sectioncode'",$db) or
                          die('Cannot clear enrollments'.mysql_error());
***************
*** 192,199 ****
            $coursecode = substr($courseval,0,$pos);
            $sectioncode = substr($courseval,$pos+1);
!           $enrolllist = mysql_query("select * from enroll where student_code='$studentcode' and course_code='$coursecode' and section_code='$sectioncode'",$db) or die('Cannot retrieve enrollments'.mysql_error());
            //if not already enrolled then enroll
            if(mysql_num_rows($enrolllist)<=0)
!             mysql_query("insert into enroll (course_code,section_code,student_code) values('$coursecode','$sectioncode','$studentcode')",$db) or die('Cannot enroll student'.mysql_error());
          }
          printf("Successful Student Update");
--- 192,199 ----
            $coursecode = substr($courseval,0,$pos);
            $sectioncode = substr($courseval,$pos+1);
!           $enrolllist = mysql_query("select * from ".$DB_prefix."_enroll where student_code='$studentcode' and course_code='$coursecode' and section_code='$sectioncode'",$db) or die('Cannot retrieve enrollments'.mysql_error());
            //if not already enrolled then enroll
            if(mysql_num_rows($enrolllist)<=0)
!             mysql_query("insert into ".$DB_prefix."_enroll (course_code,section_code,student_code) values('$coursecode','$sectioncode','$studentcode')",$db) or die('Cannot enroll student'.mysql_error());
          }
          printf("Successful Student Update");
***************
*** 211,215 ****
        $students = $_POST["students"];
        require('../includes/db_connect.php');
!       $studentinfo = mysql_query("select * from student where student_code='$students'",$db) or die('Cannot retrieve existing student'.mysql_error());
        $row = mysql_fetch_array($studentinfo);
        if($row)
--- 211,215 ----
        $students = $_POST["students"];
        require('../includes/db_connect.php');
!       $studentinfo = mysql_query("select * from ".$DB_prefix."_student where student_code='$students'",$db) or die('Cannot retrieve existing student'.mysql_error());
        $row = mysql_fetch_array($studentinfo);
        if($row)
***************
*** 238,244 ****
      require('../includes/db_connect.php');
      $students = $_POST["studentcode"];
!     mysql_query("delete from completedtests where student_code=$students",$db) or die('Cannot delete student tests'.mysql_error());
!     mysql_query("delete from enroll where student_code=$students",$db) or die('Cannot delete student enrollment'.mysql_error());
!     mysql_query("delete from student where student_code=$students",$db) or die('Cannot delete student information'.mysql_error());
      echo "Student Information deleted";
    }
--- 238,244 ----
      require('../includes/db_connect.php');
      $students = $_POST["studentcode"];
!     mysql_query("delete from ".$DB_prefix."_completedtests where student_code=$students",$db) or die('Cannot delete student tests'.mysql_error());
!     mysql_query("delete from ".$DB_prefix."_enroll where student_code=$students",$db) or die('Cannot delete student enrollment'.mysql_error());
!     mysql_query("delete from ".$DB_prefix."_student where student_code=$students",$db) or die('Cannot delete student information'.mysql_error());
      echo "Student Information deleted";
    }
***************
*** 249,251 ****
  ?>
  
! <?php require(INCLUDES_PATH."html_footer.php"); ?>
\ No newline at end of file
--- 249,251 ----
  ?>
  
! <?php require(INCLUDES_PATH."html_footer.php"); ?>

Index: admin_submit_teacher.php
===================================================================
RCS file: /cvsroot/etest/etest/administrator/admin_submit_teacher.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_submit_teacher.php	12 Dec 2003 18:55:49 -0000	1.1
--- admin_submit_teacher.php	2 Feb 2004 15:37:21 -0000	1.2
***************
*** 51,55 ****
        $teachers = $_POST["teachers"];
        require('../includes/db_connect.php');
!       $teacherinfo = mysql_query("select * from instructor where inst_code='$teachers'",$db) or die('Cannot retrieve existing teacher'.mysql_error());
        $row = mysql_fetch_array($teacherinfo);
        if($row)
--- 51,55 ----
        $teachers = $_POST["teachers"];
        require('../includes/db_connect.php');
!       $teacherinfo = mysql_query("select * from ".$DB_prefix."_instructor where inst_code='$teachers'",$db) or die('Cannot retrieve existing teacher'.mysql_error());
        $row = mysql_fetch_array($teacherinfo);
        if($row)
***************
*** 96,100 ****
      else //everything was entered
      {
!       $teacherinfo = mysql_query("select * from instructor where inst_code='$instcode'",$db) or die('Cannot retrieve teacher information'.mysql_error());
        //add teacher
        if(mysql_num_rows($teacherinfo)<=0)
--- 96,100 ----
      else //everything was entered
      {
!       $teacherinfo = mysql_query("select * from ".$DB_prefix."_instructor where inst_code='$instcode'",$db) or die('Cannot retrieve teacher information'.mysql_error());
        //add teacher
        if(mysql_num_rows($teacherinfo)<=0)
***************
*** 112,116 ****
          {
            $password = md5($password);
!           mysql_query("insert into instructor (inst_code,inst_firstname,inst_lastname,inst_password)
                                values('$instcode','$firstname','$lastname','$password')",$db) or die('Cannot add teacher'.mysql_error());
  
--- 112,116 ----
          {
            $password = md5($password);
!           mysql_query("insert into ".$DB_prefix."_instructor (inst_code,inst_firstname,inst_lastname,inst_password)
                                values('$instcode','$firstname','$lastname','$password')",$db) or die('Cannot add teacher'.mysql_error());
  
***************
*** 123,132 ****
          if(($password=='') || ($passwordconfirm==''))
          {
!           mysql_query("update instructor set inst_firstname = '$firstname', inst_lastname='$lastname' where inst_code='$instcode'",$db) or die('Cannot update teacher'.mysql_error());
          }
          else //update password also
          {
            $password = md5($password);
!           mysql_query("update instructor set inst_firstname = '$firstname', inst_lastname='$lastname', inst_password = '$password' where inst_code='$instcode'",$db) or die('Cannot update teacher'.mysql_error());
          }
          printf("Successful Teacher Update");
--- 123,132 ----
          if(($password=='') || ($passwordconfirm==''))
          {
!           mysql_query("update ".$DB_prefix."_instructor set inst_firstname = '$firstname', inst_lastname='$lastname' where inst_code='$instcode'",$db) or die('Cannot update teacher'.mysql_error());
          }
          else //update password also
          {
            $password = md5($password);
!           mysql_query("update ".$DB_prefix."_instructor set inst_firstname = '$firstname', inst_lastname='$lastname', inst_password = '$password' where inst_code='$instcode'",$db) or die('Cannot update teacher'.mysql_error());
          }
          printf("Successful Teacher Update");
***************
*** 144,150 ****
        $teachers = $_POST["teachers"];
        require('../includes/db_connect.php');
!       $course = mysql_query("select * from section s, enroll e where s.course_code = e.course_code
                  and s.section_code = e.section_code and s.inst_code='$teachers'",$db) or die('Cannot check enrollment for teachers sections'.mysql_error());
!       $test = mysql_query("select * from section s,test t where s.course_code = t.course_code
                  and s.section_code = t.section_code and s.inst_code='$teachers'",$db) or die('Cannot check tests for teachers sections'.mysql_error());
  
--- 144,150 ----
        $teachers = $_POST["teachers"];
        require('../includes/db_connect.php');
!       $course = mysql_query("select * from ".$DB_prefix."_section s, ".$DB_prefix."_enroll e where s.course_code = e.course_code
                  and s.section_code = e.section_code and s.inst_code='$teachers'",$db) or die('Cannot check enrollment for teachers sections'.mysql_error());
!       $test = mysql_query("select * from ".$DB_prefix."_section s,".$DB_prefix."_test t where s.course_code = t.course_code
                  and s.section_code = t.section_code and s.inst_code='$teachers'",$db) or die('Cannot check tests for teachers sections'.mysql_error());
  
***************
*** 152,156 ****
        if((mysql_num_rows($course)<=0) && (mysql_num_rows($test)<=0))
        {
!         $teacherinfo = mysql_query("select * from instructor where inst_code='$teachers'",$db) or die('Cannot retrieve existing teacher'.mysql_error());
          $row = mysql_fetch_array($teacherinfo);
          if($row)
--- 152,156 ----
        if((mysql_num_rows($course)<=0) && (mysql_num_rows($test)<=0))
        {
!         $teacherinfo = mysql_query("select * from ".$DB_prefix."_instructor where inst_code='$teachers'",$db) or die('Cannot retrieve existing teacher'.mysql_error());
          $row = mysql_fetch_array($teacherinfo);
          if($row)
***************
*** 182,187 ****
      require('../includes/db_connect.php');
      $teachers = $_POST["instcode"];
!     mysql_query("delete from section where inst_code=$teachers",$db) or die('Cannot delete teacher courses'.mysql_error());
!     mysql_query("delete from instructor where inst_code=$teachers",$db) or die('Cannot delete teacher information'.mysql_error());
      echo "Teacher Information deleted";
    }
--- 182,187 ----
      require('../includes/db_connect.php');
      $teachers = $_POST["instcode"];
!     mysql_query("delete from ".$DB_prefix."_section where inst_code=$teachers",$db) or die('Cannot delete teacher courses'.mysql_error());
!     mysql_query("delete from ".$DB_prefix."_instructor where inst_code=$teachers",$db) or die('Cannot delete teacher information'.mysql_error());
      echo "Teacher Information deleted";
    }
***************
*** 191,193 ****
    }
  ?>
! <?php require(INCLUDES_PATH."html_footer.php"); ?>
\ No newline at end of file
--- 191,193 ----
    }
  ?>
! <?php require(INCLUDES_PATH."html_footer.php"); ?>