Merge pull request 'Fix typos listed in Bug 519.' (#54) from Bug519-Hui into master
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/54Bug469-Hui
						commit
						f4c373611b
					
				|  | @ -90,12 +90,12 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") { | ||||||
|       ?>
 |       ?>
 | ||||||
|           <form method="post" action="Script.php" id="create_account_form"> |           <form method="post" action="Script.php" id="create_account_form"> | ||||||
|             <input type="hidden" name="frm_createlecturrer" value="true" required="" /> |             <input type="hidden" name="frm_createlecturrer" value="true" required="" /> | ||||||
|             Full_Name |             Full Name | ||||||
|             <input type="text" name="fullname" placeholder="Full Name" class="form-control" required=""> |             <input type="text" name="fullname" placeholder="Full Name" class="form-control" required=""> | ||||||
|             Email |             Email | ||||||
|             <input type="text" name="email" placeholder="Email / Student Number" class="form-control" required=""> |             <input type="text" name="email" placeholder="Email / Student Number" class="form-control" required=""> | ||||||
| 
 | 
 | ||||||
|             Passport_Number / ID (Used as Intial Password) |             Passport Number / ID (Used as Initial Password) | ||||||
|             <input type="text" class="form-control" name="passport" placeholder="Passport No./ID" required=""> |             <input type="text" class="form-control" name="passport" placeholder="Passport No./ID" required=""> | ||||||
|             <br> User Type : |             <br> User Type : | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										14
									
								
								Courses.php
								
								
								
								
							
							
						
						
									
										14
									
								
								Courses.php
								
								
								
								
							|  | @ -153,14 +153,14 @@ New Date/Time <br><input type="date" name="date" required=""> <input type="time" | ||||||
|                     <input type='hidden' name='course_id' value='<?php echo "$id" ?>' required=''/> |                     <input type='hidden' name='course_id' value='<?php echo "$id" ?>' required=''/> | ||||||
|                     <input type='hidden' name='url' value='<?php echo ".$course_url." ?>' required=''/> |                     <input type='hidden' name='url' value='<?php echo ".$course_url." ?>' required=''/> | ||||||
|             |             | ||||||
|                     Dealine Date/Time |                     Deadline Date/Time | ||||||
|                         <div class='row'>  |                         <div class='row'>  | ||||||
|                     <div class='col-md-7'><input type='date' id='date' name='deadlinedate' placeholder='' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Date : ""; ?>"> </div> |                     <div class='col-md-7'><input type='date' id='date' name='deadlinedate' placeholder='' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Date : ""; ?>"> </div> | ||||||
|                     <div class='col-md-5'> <input type='text' id='time' class='form-control' name='deadlinetime' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Time : ""; ?>"> </div>  |                     <div class='col-md-5'> <input type='text' id='time' class='form-control' name='deadlinetime' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Time : ""; ?>"> </div>  | ||||||
|                     </div> |                     </div> | ||||||
| 
 | 
 | ||||||
|                     Title |                     Title | ||||||
|                         <input type='text'  name='title' placeholder='Ttle' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Title : ""; ?>"> |                         <input type='text'  name='title' placeholder='Title' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Title : ""; ?>"> | ||||||
|                     Instructions |                     Instructions | ||||||
|                         <textarea  name='instructions' placeholder='Assignment Instructions' class='form-control' required='' ><?php echo isset($_GET['act']) && $_GET['act']=='edit' ? $Instructions : ''; ?></textarea>
 |                         <textarea  name='instructions' placeholder='Assignment Instructions' class='form-control' required='' ><?php echo isset($_GET['act']) && $_GET['act']=='edit' ? $Instructions : ''; ?></textarea>
 | ||||||
|                     Marks |                     Marks | ||||||
|  | @ -181,9 +181,9 @@ New Date/Time <br><input type="date" name="date" required=""> <input type="time" | ||||||
| 
 | 
 | ||||||
| <?php | <?php | ||||||
|                     if ($Type == "Individual") { |                     if ($Type == "Individual") { | ||||||
|                         echo "Submission Type  <input type='radio' name='type' value='Individual' checked /> Invidual  <input type='radio' name='type' value='Group' /> Group"; |                         echo "Submission Type  <input type='radio' name='type' value='Individual' checked /> Individual  <input type='radio' name='type' value='Group' /> Group"; | ||||||
|                     } else { |                     } else { | ||||||
|                         echo "Submission Type  <input type='radio' name='type' value='Individual' /> Invidual  <input type='radio' name='type' value='Group' checked> Group"; |                         echo "Submission Type  <input type='radio' name='type' value='Individual' /> Individual  <input type='radio' name='type' value='Group' checked> Group"; | ||||||
|                     }		  |                     }		  | ||||||
|                     ?>
 |                     ?>
 | ||||||
| 
 | 
 | ||||||
|  | @ -213,14 +213,14 @@ New Date/Time <br><input type="date" name="date" required=""> <input type="time" | ||||||
|                     <input type='hidden' name='course_id' value='<?php echo "$id" ?>' required=''/> |                     <input type='hidden' name='course_id' value='<?php echo "$id" ?>' required=''/> | ||||||
|                     <input type='hidden' name='url' value='<?php echo ".$course_url." ?>' required=''/> |                     <input type='hidden' name='url' value='<?php echo ".$course_url." ?>' required=''/> | ||||||
|                       |                       | ||||||
|                     Dealine Date/Time |                     Deadline Date/Time | ||||||
|                         <div class='row'>  |                         <div class='row'>  | ||||||
|                     <div class='col-md-7'><input type='date' id='date' name='deadlinedate' placeholder='' class='form-control' required='' value=""> </div> |                     <div class='col-md-7'><input type='date' id='date' name='deadlinedate' placeholder='' class='form-control' required='' value=""> </div> | ||||||
|                     <div class='col-md-5'> <input type='time' class='form-control' name='deadlinetime' value=""> </div>  |                     <div class='col-md-5'> <input type='time' class='form-control' name='deadlinetime' value=""> </div>  | ||||||
|                     </div> |                     </div> | ||||||
| 
 | 
 | ||||||
|                     Title |                     Title | ||||||
|                         <input type='text'  name='title' placeholder='Ttle' class='form-control' required='' value=""> |                         <input type='text'  name='title' placeholder='Title' class='form-control' required='' value=""> | ||||||
|                     Instructions |                     Instructions | ||||||
|                         <textarea  name='instructions' placeholder='Assignment Instructions' class='form-control' required='' value=""></textarea> |                         <textarea  name='instructions' placeholder='Assignment Instructions' class='form-control' required='' value=""></textarea> | ||||||
|                     Marks |                     Marks | ||||||
|  | @ -238,7 +238,7 @@ New Date/Time <br><input type="date" name="date" required=""> <input type="time" | ||||||
|                     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 |                     Submission Type  <input type='radio' name='type' value='Individual' required=''> Individual | ||||||
| 
 | 
 | ||||||
|                                                 <input type='radio' name='type' value='Group' required=''> Group |                                                 <input type='radio' name='type' value='Group' required=''> Group | ||||||
|                     <hr> |                     <hr> | ||||||
|  |  | ||||||
|  | @ -98,7 +98,7 @@ if (!empty($_POST["form_signup"])) { | ||||||
| 
 | 
 | ||||||
|     // check for strong password
 |     // check for strong password
 | ||||||
|     if (!$containsAll) { |     if (!$containsAll) { | ||||||
|         $_SESSION['info_signup'] = "Password must have at least characters that include lowercase letters, uppercase letters, numbers and sepcial characters (e.g., !?.,*^)."; |         $_SESSION['info_signup'] = "Password must have at least characters that include lowercase letters, uppercase letters, numbers and special characters (e.g., !?.,*^)."; | ||||||
|         header("Location: signup.php"); |         header("Location: signup.php"); | ||||||
|         return; |         return; | ||||||
|     } |     } | ||||||
|  | @ -146,7 +146,7 @@ if (!empty($_POST["frm_login"])) { | ||||||
|     $password = mysqli_real_escape_string($con, $_POST["password"]); |     $password = mysqli_real_escape_string($con, $_POST["password"]); | ||||||
|     $result = mysqli_query($con, "SELECT * FROM users_table WHERE (Student_ID='$user') OR (Email='$user')"); |     $result = mysqli_query($con, "SELECT * FROM users_table WHERE (Student_ID='$user') OR (Email='$user')"); | ||||||
|     if (mysqli_num_rows($result) == 0) { |     if (mysqli_num_rows($result) == 0) { | ||||||
|         $_SESSION["info_login"] = "Inavlid user name information."; |         $_SESSION["info_login"] = "Invalid user name information."; | ||||||
|         echo $_SESSION["info_login"]; |         echo $_SESSION["info_login"]; | ||||||
|         header("Location: index.php"); |         header("Location: index.php"); | ||||||
|     } else { |     } else { | ||||||
|  | @ -1093,7 +1093,7 @@ WHERE lab_report_submissions.Lab_Report_ID='$lab'"; | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     header("Content-type: application/octet-stream"); |     header("Content-type: application/octet-stream"); | ||||||
|     header("Content-Disposition: attachment; filename=$lab_name Garde Sheet.xls"); |     header("Content-Disposition: attachment; filename=$lab_name Grade Sheet.xls"); | ||||||
|     header("Pragma: no-cache"); |     header("Pragma: no-cache"); | ||||||
|     header("Expires: 0"); |     header("Expires: 0"); | ||||||
|     print "$header\n$data"; |     print "$header\n$data"; | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ include 'Header.php'; | ||||||
| <div class="row" style="width:80%;margin:auto;"> | <div class="row" style="width:80%;margin:auto;"> | ||||||
| 
 | 
 | ||||||
|     <div class="col-md-6"> |     <div class="col-md-6"> | ||||||
|         <h1> STUEDNT Account Created , Now you can Browse Course Portals </h1> |         <h1> Student Account Created. Now you can Browse Course Portals </h1> | ||||||
|     </div> |     </div> | ||||||
| 
 | 
 | ||||||
| </div> | </div> | ||||||
		Loading…
	
		Reference in New Issue