mrlan
/
LRR
3
0
Fork 2
Code Issues Pull Requests 7 Projects Releases Wiki Activity

Merge pull request #47 from lanlab-org/Hui-BugBatchFixesSeptember2020 

Hui bug batch fixes September 2020
SIMPLICITY_Bug-189_Course_Delete_btn
Software Project Management 2020-09-29 17:42:24 +08:00 committed by GitHub
parent b37df84b72 f01de2b618
commit 3abda541dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 73 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Course.php
View File

@ -1,4 +1,3 @@
<?php <?php
$page='Courses+'; $page='Courses+';
include 'Header.php'; include 'Header.php';
@ -235,7 +234,12 @@ if(mysqli_num_rows($result)==0)
</div> </div>
<div id="menu3" class="container tab-pane"><br> <div id="menu3" class="container tab-pane"><br>
<?php <?php
$group_id=$_SESSION['group_id'];
$group_id = $_SESSION['group_id'];
if($group_id==""){$group_id=-1;} // This fixes "Submitted report not shown" http://118.25.96.118/bugzilla/show_bug.cgi?id=176
$resultx = mysqli_query($con,"SELECT Lab_Report_ID,Marks, `Course_ID`, `Posted_Date`, `Deadline`, `Instructions`, lab_reports_table.Title, `Attachment_link_1`, `Attachment_link_2`, `Attachment_link_3`, `Attachment_link_4` $resultx = mysqli_query($con,"SELECT Lab_Report_ID,Marks, `Course_ID`, `Posted_Date`, `Deadline`, `Instructions`, lab_reports_table.Title, `Attachment_link_1`, `Attachment_link_2`, `Attachment_link_3`, `Attachment_link_4`
FROM `lab_reports_table` FROM `lab_reports_table`
@ -243,7 +247,7 @@ $resultx = mysqli_query($con,"SELECT Lab_Report_ID,Marks, `Course_ID`, `Posted_
. " where Status='Pending' and (Student_id=$student_id or Course_Group_id=$group_id) and Course_ID=$course_id) ORDER by Lab_Report_ID DESC"); . " where Status='Pending' and (Student_id=$student_id or Course_Group_id=$group_id) and Course_ID=$course_id) ORDER by Lab_Report_ID DESC");
if(mysqli_num_rows($resultx)==0) if(mysqli_num_rows($resultx)==0)
{ {
echo "You have no Lab report submissions in this course"; echo "You have no lab report submissions in this course.";
} else { while($row = mysqli_fetch_assoc($resultx)) { } else { while($row = mysqli_fetch_assoc($resultx)) {
$lab_repo_id=$row['Lab_Report_ID']; $lab_repo_id=$row['Lab_Report_ID'];

71
Courses.php
View File

@ -1,6 +1,3 @@
<?php <?php
@ -100,7 +97,7 @@ New Date/Time <br><input type="date" name="date" required=""> <input type="time"
<div class='alert> <a href='~\..\Courses.php?course=$url'> <div class='panel'> <div class='alert> <a href='~\..\Courses.php?course=$url'> <div class='panel'>
($code) - $name ($code) - $name
<br> <span style='font-size:8pt'>Faculty : $faculty Year : $academic Lecturer :$lecturer </span> <br> <span style='font-size:8pt'>Faculty: $faculty | Year: $academic | Lecturer: $lecturer </span>
</div></a> </div></a>
<hr></div></div> <div class='row' style='width:80%;margin:auto; text-align:left;'> <hr></div></div> <div class='row' style='width:80%;margin:auto; text-align:left;'>
"; ";
@ -108,7 +105,7 @@ New Date/Time <br><input type="date" name="date" required=""> <input type="time"
echo "<div class='col-md-5'>"; echo "<div class='col-md-5'>";
} }
// ------------------------------Editing Lab Assignment by Lecture------------------------------------ // ------------------------------Editing Lab Assignment by Lecturer ------------------------------------
if($_GET['act']=="edit"){ if($_GET['act']=="edit"){
@ -117,40 +114,41 @@ New Date/Time <br><input type="date" name="date" required=""> <input type="time"
while($row1 = mysqli_fetch_assoc($result1)) { while($row1 = mysqli_fetch_assoc($result1)) {
$Deadline = $row1['Deadline']; $Deadline = $row1['Deadline'];
// $datetime = explode(" ", $Deadline); explode() is another famous way of spliting a string from the database $_SESSION['Date'] = trim( strstr($Deadline, ' ', true) );
// $_SESSION['Date'] = $datetime[0]; $_SESSION['Time'] = trim( strstr($Deadline, ' ') );
// $_SESSION['Time'] = $datetime[1]; $_SESSION['Instructions'] = $row1['Instructions'];
$_SESSION['Date'] = strstr($Deadline, ' ', true); $_SESSION['Title'] = $row1['Title'];
$_SESSION['Time'] = strstr($Deadline, ' '); $_SESSION['Marks'] = $row1['Marks'];
$_SESSION['Instructions']=$row1['Instructions']; $_SESSION['Type'] = $row1['Type'];
$_SESSION['Title']=$row1['Title'];
$_SESSION['Marks']=$row1['Marks'];
$_SESSION['Type']=$row1['Type'];
} }
if(isset($_POST['frm_uploadlab'])){
$deadlinedate=$_POST["deadlinedate"];
$deadlinetime=$_POST["deadlinetime"];
$instructions=$_POST["instructions"];
$title=$_POST["title"];
$marks=$_POST["marks"];
$Deadline = $deadlinedate." ".$deadlinetime;
$date= date("Y-m-d H:i");
$sql = "UPDATE `lab_reports_table` SET `Deadline` = ('" . $Deadline . "'), `Instructions` = ('" . $instructions . "'), `Title` = ('" . $title . "'), `Marks` = ('" . $marks . "') WHERE `lab_reports_table`.`Lab_Report_ID` = '$getid'"; if(isset($_POST['frm_uploadlab'])){
$deadlinedate = trim( $_POST["deadlinedate"] ); // remove spaces
$deadlinetime = trim( $_POST["deadlinetime"] ); // remove spaces
$instructions = $_POST["instructions"];
$title = $_POST["title"];
$marks = $_POST["marks"];
$type = $_POST["type"];
$Deadline = $deadlinedate." ".$deadlinetime;
$date = date("Y-m-d H:i");
$sql = "UPDATE `lab_reports_table` SET `Deadline` = ('" . $Deadline . "'), `Instructions` = ('" . $instructions . "'), `Title` = ('" . $title . "'), `Marks` = ('" . $marks . "'), `Type` = ('" . $type . "') WHERE `lab_reports_table`.`Lab_Report_ID` = '$getid'";
if ($con->query($sql) === TRUE) { if ($con->query($sql) === TRUE) {
$_SESSION["info_Updated"]="Information Updated Successfull"; $_SESSION["info_Updated"]="Assignment information updated successfully.";
} else { } else {
echo "Error: " . $sql . "<br>" . $con->error; // echo "Error: " . $sql . "<br>" . $con->error;
echo "Serious error happened whiling updating assignment information.";
} }
} }
if( $_SESSION['user_type']=="Lecturer"){ if( $_SESSION['user_type']=="Lecturer"){
$Date=$_SESSION['Date']; $Date = $_SESSION['Date'];
$Time=$_SESSION['Time']; $Time = $_SESSION['Time'];
$Instructions=$_SESSION['Instructions']; $Instructions = $_SESSION['Instructions'];
$Title=$_SESSION['Title']; $Title = $_SESSION['Title'];
$Marks=$_SESSION['Marks']; $Marks = $_SESSION['Marks'];
$Type = $_SESSION['Type'];
echo " <h3><a href='Courses.php?course=".$url."'> Editing Lab Assignment </a></h3>"; echo " <h3><a href='Courses.php?course=".$url."'> Editing Lab Assignment </a></h3>";
?> ?>
@ -184,9 +182,16 @@ Attachment 3
Attachment 4 Attachment 4
<input type='file' name='attachment4' placeholder='Attachment 4' class='form-control' > <input type='file' name='attachment4' placeholder='Attachment 4' class='form-control' >
<br> <br>
Submission Type <input type='radio' name='type' value='Individual' required=''> Invidual
<input type='radio' name='type' required='' value='Group'> Group <?php
if ($Type == "Individual") {
echo "Submission Type <input type='radio' name='type' value='Individual' checked /> Invidual <input type='radio' name='type' value='Group' /> Group";
} else {
echo "Submission Type <input type='radio' name='type' value='Individual' /> Invidual <input type='radio' name='type' value='Group' checked> Group";
}
?>
<hr> <hr>
<input type='submit' class='btn btn-primary' value='Post Lab Assignment'><br> <input type='submit' class='btn btn-primary' value='Post Lab Assignment'><br>
</form><br><br><br><br> </form><br><br><br><br>

11
Script.php
View File

@ -105,9 +105,12 @@ if (!empty($_POST["frm_signup_1"])) {
$_SESSION['user_fullname'] = $fullname; $_SESSION['user_fullname'] = $fullname;
$_SESSION['user_type'] = "Student"; $_SESSION['user_type'] = "Student";
$_SESSION['user_email'] = $email; $_SESSION['user_email'] = $email;
// check confirmed password // check confirmed password
if ( strcasecmp( $password, $confirmpassword ) != 0 ){ if ( strcasecmp( $password, $confirmpassword ) != 0 ){
$_SESSION['info_signup2']="Password confirmation failed."; $_SESSION['info_signup2']="Password confirmation failed.";
$_SESSION['user_fullname'] = null;
$_SESSION['user_type'] = null;
header("Location: signup.php"); header("Location: signup.php");
return; return;
} }
@ -126,8 +129,8 @@ if (!empty($_POST["frm_signup_1"])) {
$containsAll = $upperLetter && $smallLetter && $containsDigit && $containsSpecial; $containsAll = $upperLetter && $smallLetter && $containsDigit && $containsSpecial;
// check for strong password // check for strong password
if($containsAll < 8) { if(! $containsAll) {
$_SESSION['info_signup2']="Password must have at least characters that include letters, numbers and sepcial characters."; $_SESSION['info_signup2'] = "Password must have at least characters that include lowercase letters, uppercase letters, numbers and sepcial characters (e.g., !?.,*^).";
header("Location: signup.php"); header("Location: signup.php");
return; return;
} }
@ -136,7 +139,9 @@ if (!empty($_POST["frm_signup_1"])) {
"SELECT * FROM Users_Table WHERE email='$email'"); "SELECT * FROM Users_Table WHERE email='$email'");
if(mysqli_num_rows($result)!=0) if(mysqli_num_rows($result)!=0)
{ {
$_SESSION["info_signup2"]="Email adress : ".$email." already in use."; $_SESSION["info_signup2"]="Email adress ".$email." already in use.";
$_SESSION['user_fullname'] = null;
$_SESSION['user_type'] = null;
header("Location: signup.php"); header("Location: signup.php");
return; return;
} }

4
index.php
View File

@ -35,10 +35,10 @@ session_start();
<form method="post" action="Script.php" name="frm_login"> <form method="post" action="Script.php" name="frm_login">
<input type="hidden" name="frm_login" value="true"/> <input type="hidden" name="frm_login" value="true"/>
Student ID / Email Student ID / Email
<input type="text" name="user" placeholder="Email / Student Number" class="form-control"> <input type="text" name="user" placeholder="Email / Student Number" class="form-control" required="required" />
Password Password
<input type="password" class="form-control" name="password" placeholder="password"> <input type="password" class="form-control" name="password" placeholder="password" required="required" />
<br> <br>
<input type="submit" class="btn btn-primary" value="Login"><br> <a href="recover_password.php" style="font-weight:normal;color:orange">Reset my password</a> <input type="submit" class="btn btn-primary" value="Login"><br> <a href="recover_password.php" style="font-weight:normal;color:orange">Reset my password</a>

2
logout.php
View File

@ -1,6 +1,6 @@
<?php <?php
// Destory sessions & refiret to index // Destory sessions & redirect to index
session_destroy(); session_destroy();
session_unset(); session_unset();

20
signup.php
View File

@ -6,7 +6,6 @@
* and open the template in the editor. * and open the template in the editor.
*/ */
include 'Header.php'; include 'Header.php';
?> ?>
@ -21,27 +20,30 @@ include 'Header.php';
<div class="list-group-item"> <div class="list-group-item">
<div class="panel-body"> <div class="panel-body">
<form method="post" action="Script.php" > <form method="post" action="Script.php" >
<input type="hidden" name="frm_signup_2" value="true"/> <input type="hidden" name="frm_signup_2" value="true"/>
Full Name Full Name
<input type="text" name="fullname" placeholder="Your Full Name" class="form-control" value="<?php echo $_SESSION['user_fullname']; ?>"> <input type="text" name="fullname" placeholder="Your Full Name" class="form-control" value="<?php echo $_SESSION['user_fullname']; ?>" required="required"/>
Email Email
<input type="text" name="email" placeholder="Email" class="form-control" value="<?php echo $_SESSION['user_email']; ?>"> <input type="text" name="email" placeholder="Email" class="form-control" value="<?php echo $_SESSION['user_email']; ?>" required="required" />
Password Password
<input type="password" class="form-control" name="password" placeholder="password"> <input type="password" class="form-control" name="password" placeholder="password" required="required" />
Confirm Password
<input type="password" class="form-control" name="confirmpassword" placeholder="Confirm password">
<br>
<input type="submit" class="btn btn-primary" value="Sign up">
Confirm Password
<input type="password" class="form-control" name="confirmpassword" placeholder="Confirm password" required="required" />
<br>
<input type="submit" class="btn btn-primary" value="Sign up">
<?php <?php
error_reporting(E_ALL); error_reporting(E_ALL);
if(isset($_SESSION['info_signup2'])) { if(isset($_SESSION['info_signup2'])) {
echo '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['info_signup2'].'</div>'; echo '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['info_signup2'].'</div>';
$_SESSION['info_signup2']=null; $_SESSION['info_signup2'] = null;
} }
?> ?>