Skip to content

Fix empty faculty ID #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlbooker merged 1 commit into from
Sep 13, 2025
Merged

Fix empty faculty ID #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 91 additions & 53 deletions class/Command/SaveInternship.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@
class SaveInternship
{

public function __construct()
{

}
public function __construct() {}

private function rerouteWithError($url, $errorMessage)
{
Expand All @@ -64,7 +61,7 @@ public function execute()

// We don't want to do certain things like state change or error checks if this is an ajax request.
$isAjax = false;
if(\Canopy\Request::isAjax()){
if (\Canopy\Request::isAjax()) {
$isAjax = true;
}

Expand All @@ -79,24 +76,34 @@ public function execute()
$url = 'index.php?module=intern&action=ShowInternship';
$url .= '&missing=' . implode('+', $missing);

$this->rerouteWithError($url,
'Please fill in the highlighted fields.');
$this->rerouteWithError(
$url,
'Please fill in the highlighted fields.'
);
}

// Sanity check student email
if (isset($_REQUEST['student_email']) && preg_match("/@/",
$_REQUEST['student_email'])) {
if (isset($_REQUEST['student_email']) && preg_match(
"/@/",
$_REQUEST['student_email']
)) {
$url = 'index.php?module=intern&action=ShowInternship&missing=student_email';
$this->rerouteWithError($url,
"The student's email address is invalid. No changes were saved. Enter only the username portion of the student's email address. The '@appstate.edu' portion is not necessary.");
$this->rerouteWithError(
$url,
"The student's email address is invalid. No changes were saved. Enter only the username portion of the student's email address. The '@appstate.edu' portion is not necessary."
);
}

// Sanity check student zip
if (isset($_REQUEST['student_zip']) && $_REQUEST['student_zip'] != "" && !preg_match('/^[\d]{5}$|^[\d]{5}-[\d]{4}$/',
$_REQUEST['student_zip'])) {
if (isset($_REQUEST['student_zip']) && $_REQUEST['student_zip'] != "" && !preg_match(
'/^[\d]{5}$|^[\d]{5}-[\d]{4}$/',
$_REQUEST['student_zip']
)) {
$url = 'index.php?module=intern&action=ShowInternship&missing=student_zip';
$this->rerouteWithError($url,
"The student's zip code is invalid. No changes were saved. The zip code should be 5 digits (no letters, spaces, or punctuation), OR use the extended nine digit form (e.g. 28608-1234).");
$this->rerouteWithError(
$url,
"The student's zip code is invalid. No changes were saved. The zip code should be 5 digits (no letters, spaces, or punctuation), OR use the extended nine digit form (e.g. 28608-1234)."
);
}

// Course start date must be before end date
Expand All @@ -105,52 +112,68 @@ public function execute()
$end = strtotime($_REQUEST['end_date']);

if ($start >= $end) {
if(!$isAjax){
if (!$isAjax) {
$url = 'index.php?module=intern&action=ShowInternship&missing=start_date+end_date';
// Restore the values in the fields the user already entered
unset($_POST['start_date']);
unset($_POST['end_date']);
$this->rerouteWithError($url,
'The internship start date must be before the end date.');
$this->rerouteWithError(
$url,
'The internship start date must be before the end date.'
);
}
}
}

// Sanity check internship location zip, allows a-z or A-Z if international
if ((isset($_REQUEST['loc_zip']) && $_REQUEST['loc_zip'] != "") && !is_numeric($_REQUEST['loc_zip'])) {
if (!($_REQUEST['location'] == 'international' && preg_match('/[\w]/',
$_REQUEST['loc_zip']))) {
if (!($_REQUEST['location'] == 'international' && preg_match(
'/[\w]/',
$_REQUEST['loc_zip']
))) {
$url = 'index.php?module=intern&action=ShowInternship&missing=loc_zip';
$this->rerouteWithError($url,
"The internship location's zip code is invalid. No changes were saved. Zip codes should be 5 digits only (no letters, spaces, or punctuation).");
$this->rerouteWithError(
$url,
"The internship location's zip code is invalid. No changes were saved. Zip codes should be 5 digits only (no letters, spaces, or punctuation)."
);
}
}

// Sanity check internship acency zip, allows a-z or A-Z if international
if ((isset($_REQUEST['agency_zip']) && $_REQUEST['agency_zip'] != "") && !is_numeric($_REQUEST['agency_zip'])) {
if (!($_REQUEST['location'] == 'international' && preg_match('/[\w]/',
$_REQUEST['agency_zip']))) {
if (!($_REQUEST['location'] == 'international' && preg_match(
'/[\w]/',
$_REQUEST['agency_zip']
))) {
$url = 'index.php?module=intern&action=ShowInternship&missing=agency_zip';
$this->rerouteWithError($url,
"The agency's zip code is invalid. No changes were saved. Zip codes should be 5 digits only (no letters, spaces, or punctuation).");
$this->rerouteWithError(
$url,
"The agency's zip code is invalid. No changes were saved. Zip codes should be 5 digits only (no letters, spaces, or punctuation)."
);
}
}

// Sanity check internship agency supervisor zip, allows a-z or A-Z if international
if ((isset($_REQUEST['agency_sup_zip']) && $_REQUEST['agency_sup_zip'] != "") && !is_numeric($_REQUEST['agency_sup_zip'])) {
if (!($_REQUEST['location'] == 'international' && preg_match('/[\w]/',
$_REQUEST['agency_sup_zip']))) {
if (!($_REQUEST['location'] == 'international' && preg_match(
'/[\w]/',
$_REQUEST['agency_sup_zip']
))) {
$url = 'index.php?module=intern&action=ShowInternship&missing=agency_sup_zip';
$this->rerouteWithError($url,
"The agency supervisor's zip code is invalid. No changes were saved. Zip codes should be 5 digits only (no letters, spaces, or punctuation).");
$this->rerouteWithError(
$url,
"The agency supervisor's zip code is invalid. No changes were saved. Zip codes should be 5 digits only (no letters, spaces, or punctuation)."
);
}
}

// Sanity check course number
if ((isset($_REQUEST['course_no']) && $_REQUEST['course_no'] != '') && (strlen($_REQUEST['course_no']) > 20 || !is_numeric($_REQUEST['course_no']))) {
$url = 'index.php?module=intern&action=ShowInternship&missing=course_no';
$this->rerouteWithError($url,
"The course number provided is invalid. No changes were saved. Course numbers should be less than 20 digits (no letters, spaces, or punctuation).");
$this->rerouteWithError(
$url,
"The course number provided is invalid. No changes were saved. Course numbers should be less than 20 digits (no letters, spaces, or punctuation)."
);
}

\PHPWS_DB::begin();
Expand All @@ -172,8 +195,10 @@ public function execute()
$i->form_token = uniqid();
} else {
// Form token doesn't match, so show a nice error message
$this->rerouteWithError('index.php?module=intern&action=ShowInternship',
'Some else has modified this internship while you were working. In order to not overwrite their changes, your changes were not saved.');
$this->rerouteWithError(
'index.php?module=intern&action=ShowInternship',
'Some else has modified this internship while you were working. In order to not overwrite their changes, your changes were not saved.'
);
}

// Load the student object
Expand All @@ -183,10 +208,12 @@ public function execute()
$student = null;

//$this->rerouteWithError('index.php?module=intern&action=ShowInternship', "We couldn't find a matching student in Banner. Your changes were saved, but this student probably needs to contact the Registrar's Office to re-enroll.");
\NQ::close();
\NQ::close();
}

$i->faculty_id = isset($_REQUEST['faculty_id']) ? $_REQUEST['faculty_id'] : null;
// Faculty ID must exist and not be empty, otherwise we set it to null to avoid DB foreign key errors
// This can happen if the user selects the blank option in the faculty dropdown
$i->faculty_id = (isset($_REQUEST['faculty_id']) && $_REQUEST['faculty_id'] !== '') ? $_REQUEST['faculty_id'] : null;

$i->department_id = $_REQUEST['department'];
$i->start_date = !empty($_REQUEST['start_date']) ? strtotime($_REQUEST['start_date']) : 0;
Expand Down Expand Up @@ -217,7 +244,7 @@ public function execute()
}

// Address, city, zip are always set (no matter domestic or international)
if(isset($_POST['location_type'])){
if (isset($_POST['location_type'])) {
$i->location_type = $_POST['location_type'];
} else {
// For internships created before location_type field existed, there won't
Expand Down Expand Up @@ -294,7 +321,7 @@ public function execute()
}
$i->student_zip = $_REQUEST['student_zip'];

if(\Current_User::isDeity() && $internSettings->getMultiCampusEnabled()){
if (\Current_User::isDeity() && $internSettings->getMultiCampusEnabled()) {
$i->campus = $_REQUEST['campus'];
}

Expand Down Expand Up @@ -333,21 +360,21 @@ public function execute()

/************
* International Certification
*/
if($internSettings->getRequireIntlCertification()){
*/
if ($internSettings->getRequireIntlCertification()) {
// Check if this has changed from non-certified->certified so we can log it later
if($i->oied_certified == 0 && $_POST['oied_certified_hidden'] == 'true'){
if ($i->oied_certified == 0 && $_POST['oied_certified_hidden'] == 'true') {
// note the change for later
$oiedCertified = true;
}else{
} else {
$oiedCertified = false;
}

if($_POST['oied_certified_hidden'] == 'true'){
if ($_POST['oied_certified_hidden'] == 'true') {
$i->oied_certified = 1;
}else if($_POST['oied_certified_hidden'] == 'false'){
} else if ($_POST['oied_certified_hidden'] == 'false') {
$i->oied_certified = 0;
}else{
} else {
$i->oied_certified = 0;
}
} else {
Expand Down Expand Up @@ -430,7 +457,7 @@ public function execute()
/** *************************
* State/Workflow Handling *
* ************************* */
if(!$isAjax){
if (!$isAjax) {
$t = \Intern\WorkflowTransitionFactory::getTransitionByName($_POST['workflow_action']);
$workflow = new \Intern\WorkflowController($i, $t);
try {
Expand All @@ -444,14 +471,23 @@ public function execute()
// Create a ChangeHisotry for the International certification.
if ($oiedCertified) {
$currState = WorkflowStateFactory::getState($i->getStateName());
$ch = new ChangeHistory($i, \Current_User::getUserObj(), time(),
$currState, $currState, 'Certified by OIED');
$ch = new ChangeHistory(
$i,
\Current_User::getUserObj(),
time(),
$currState,
$currState,
'Certified by OIED'
);
$ch->save();

// Notify the faculty member that OIED has certified the internship
if ($i->getFaculty() != null) {
$email = new \Intern\Email\OIEDCertifiedEmail(\Intern\InternSettings::getInstance(),
$i, $term);
$email = new \Intern\Email\OIEDCertifiedEmail(
\Intern\InternSettings::getInstance(),
$i,
$term
);
$email->send();
}
}
Expand All @@ -469,8 +505,11 @@ public function execute()
} else {
// Otherwise, redirect to the internship edit view
// Show message if user edited internship
\NQ::simple('intern', \Intern\UI\NotifyUI::SUCCESS,
'Saved internship for ' . $i->getFullName());
\NQ::simple(
'intern',
\Intern\UI\NotifyUI::SUCCESS,
'Saved internship for ' . $i->getFullName()
);
\NQ::close();

return \PHPWS_Core::reroute('index.php?module=intern&action=ShowInternship&internship_id=' . $i->id);
Expand Down Expand Up @@ -510,5 +549,4 @@ private static function trimField(string $info)
$info = preg_replace('!\s+!', ' ', $info);
return $info;
}

}
10 changes: 1 addition & 9 deletions class/Internship.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,16 +253,8 @@ public function getDb()
*/
public function save()
{
if ($this->faculty_id === '') {
$this->faculty_id = null;
}

$db = $this->getDb();
try {
$result = $db->saveObject($this);
} catch (\Exception $e) {
exit($e->getMessage());
}
$result = $db->saveObject($this);

if (\PHPWS_Error::logIfError($result)) {
throw new \Exception($result->toString());
Expand Down