Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 34 additions & 2 deletions site/app/controllers/admin/UsersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,46 @@ public function ajaxGetSubmittyUsers() {
$this->core->getOutput()->renderJsonSuccess($user_information);
}

<<<<<<< HEAD
#[Route("/api/{semester}/{course}/users/add", methods: ["POST"])]
function ajaxAddUserCourse(string $semester, string $course): JsonResponse {
$values = [
'user_id',
'user_numeric_id',
'user_pronouns',
'user_givenname',
'user_familyname',
'user_email',
'user_email_secondary',
'user_numeric_id',
'display_pronouns',
'registered_section',
'rotating_section',
'user_group',
'edit_user',
];
if (!FileUtils::arrayKeysExist($values, array_keys($_POST))) {
return JsonResponse::getErrorResponse('All required keys are not present', ['required_keys' => $values]);
}
$user = $this->core->getQueries()->getUserById($_POST['user_id']);
if ($user !== null){
return JsonResponse::getErrorResponse('User already exists!');
}
$this->updateUser($semester, $course, $type);
}

/**
* @Route("/courses/{semester}/{course}/users", methods={"POST"})
*/
public function updateUser(string $semester, string $course, $type = 'users') {
=======
#[Route("/courses/{_semester}/{_course}/users", methods: ["POST"])]
public function updateUser($type = 'users') {
>>>>>>> origin/main
$return_url = $this->core->buildCourseUrl([$type]) . '#user-' . $_POST['user_id'];
$authentication = $this->core->getAuthentication();
$use_database = $authentication instanceof DatabaseAuthentication;
$_POST['user_id'] = trim($_POST['user_id']);
$semester = $this->core->getConfig()->getTerm();
$course = $this->core->getConfig()->getCourse();

if (empty($_POST['user_id'])) {
$this->core->addErrorMessage("User ID cannot be empty");
Expand Down
4 changes: 4 additions & 0 deletions site/app/libraries/FileUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ public static function getAllFiles(string $dir, array $skip_files = [], bool $fl
return $return;
}

public static function arrayKeysExist($keys, $search) {
return (0 === count(array_diff($keys, $search)));
}

/**
* Recursively goes through a directory deleting everything in it before deleting the folder itself. Returns
* true if successful, false otherwise.
Expand Down
5 changes: 5 additions & 0 deletions site/app/libraries/database/DatabaseQueries.php
Original file line number Diff line number Diff line change
Expand Up @@ -6091,6 +6091,11 @@ public function insertNewGradeInquiryPost($grade_inquiry_id, $user_id, $content,
return $this->course_db->getLastInsertId();
}

public function addUser($user_details){
$this->submitty_db->query("INSERT INTO users(user_id, user_numeric_id, user_givenname, user_preferred_givenname, user_familyname, user_preferred_familyname, user_email, user_password, user_access_level) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", $user_details);
return $user_details[0];
}

public function getGradeInquiryPost($post_id) {
$this->course_db->query(
"SELECT * FROM grade_inquiry_discussion WHERE id = ?",
Expand Down