Merge

main/admin/user_edit.php

@@ -324,10 +324,16 @@ if ($expiration_date == '0000-00-00 00:00:00') {
 }
 $form->setDefaults($user_data);
 
+$error_drh = false;
 // Validate form
 if ( $form->validate()) {
+	
 	$user = $form->exportValues();
+	$is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']);
 	
+	if ($user['status'] == DRH && $is_user_subscribed_in_course) {
+		$error_drh = true;	
+	} else {		
 		$picture_element = & $form->getElement('picture');
 		$picture = $picture_element->getValue();
 	
@@ -417,10 +423,16 @@ if ( $form->validate()) {
 		$tok = Security::get_token();
 		header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')).'&sec_token='.$tok);
 		exit();				
+	}
 }
 
 Display::display_header($tool_name);
 
+if ($error_drh) {	
+	$err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager');
+	Display::display_error_message($err_msg);	
+}
+
 // USER PICTURE
 $image_path = UserManager::get_user_picture_path_by_id($user_id,'web');
 $image_dir = $image_path['dir'];

main/inc/lib/course.lib.php

@@ -801,19 +801,24 @@ class CourseManager {
 	*/
 
 	/**
-	 * Return course info array of virtual course
+	 * Check if user is subscribed inside a course
-	 *
+	 * @param 	int		User id
-	 * @param $user_id, the id (int) of the user
+	 * @param	string	Course code, if this parameter is null, it'll check for all courses
-	 * @param $course_info, array with info about the course (comes from course table)
+	 * @param	bool	True for checking inside sessions too, by default is not checked 
-	 *
+	 * @return 	bool 	true if the user is registered in the course, false otherwise
-	 * @return true if the user is registered in the course, false otherwise
 	 */
-	public static function is_user_subscribed_in_course($user_id, $course_code, $in_a_session = false) {
+	public static function is_user_subscribed_in_course($user_id, $course_code = null, $in_a_session = false) {
+		
 		$user_id = intval($user_id);
+		
+		$condition_course = '';
+		if (isset($course_code)) {
 			$course_code = Database::escape_string($course_code);
+			$condition_course = ' AND course_code = "'.$course_code.'" ';
+		}
 		
 		$result = Database::fetch_array(Database::query("SELECT * FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
-				WHERE user_id = $user_id AND relation_type<>".COURSE_RELATION_TYPE_RRHH." AND course_code = '$course_code'"));
+				WHERE user_id = $user_id AND relation_type<>".COURSE_RELATION_TYPE_RRHH." $condition_course "));
 		if (!empty($result)) {
 			return true; // The user has been registered in this course.
 		}
@@ -823,12 +828,12 @@ class CourseManager {
 		}
 
 		if (Database::num_rows(Database::query('SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
-				' WHERE id_user = '.$user_id.' AND course_code="'.$course_code.'"')) > 0) {
+				' WHERE id_user = '.$user_id.' '.$condition_course.' ')) > 0) {
 			return true;
 		}
 
 		if (Database::num_rows(Database::query('SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
-				' WHERE id_user = '.$user_id.' AND status=2 AND course_code="'.$course_code.'"')) > 0) {
+				' WHERE id_user = '.$user_id.' AND status=2 '.$condition_course.' ')) > 0) {
 			return true;
 		}