Bug #3646 and Issue #306 - Gradebook tool (Part 1) and Assignments tool: Fixing person name order to be dependable on the internationalization settings.

main/gradebook/lib/be/studentpublicationlink.class.php

@@ -168,7 +168,7 @@ class StudentPublicationLink extends AbstractLink
     		$sql1='SELECT firstname, lastname FROM '.Database::get_main_table(TABLE_MAIN_USER)." WHERE user_id = '".((int)$stud_id)."'";
      		$query = api_sql_query($sql1,__FILE__,__LINE__);
 			$student = Database::fetch_array($query);
-    		$sql .= ' AND author = '."'".Database::escape_string($student['firstname'].' '.$student['lastname'])."'";
+    		$sql .= ' AND author = '."'".Database::escape_string(api_get_person_name($student['firstname'], $student['lastname'], null, null, $course_info['course_language']))."'";
     	}
     	// order by id, that way the student's first attempt is accessed first
 		$sql .= ' ORDER BY id';

main/work/work.lib.php

@@ -164,7 +164,7 @@ function display_user_link($user_id, $name='')
 		$result=api_sql_query($sql,__FILE__,__LINE__);
 		$row=Database::fetch_array($result);
 		if ($name=='') {
-			return "<a href=\"../user/userInfo.php?cidReq=".api_get_course_id()."&gradebook=$gradebook&origin=&uInfo=".$row['user_id']."\">".$row['firstname']." ".$row['lastname']."</a>";
+			return "<a href=\"../user/userInfo.php?cidReq=".api_get_course_id()."&gradebook=$gradebook&origin=&uInfo=".$row['user_id']."\">".api_get_person_name($row['firstname'], $row['lastname'])."</a>";
 		} else {
 			return "<a href=\"../user/userInfo.php?cidReq=".api_get_course_id()."&gradebook=$gradebook&origin=&uInfo=".$user_id."\">".$name."</a>";
 		}

main/work/work.php

@@ -816,7 +816,7 @@ if ($ctok==$_POST['sec_token']) { //check the token inserted into the form
 					$title = $_FILES['file']['name'];
 				}
 				//if (!$authors) {
-				$authors = $currentUserFirstName . " " . $currentUserLastName;
+			$authors = api_get_person_name($currentUserFirstName, $currentUserLastName);
 				//}
 				// compose a unique file name to avoid any conflict
 				$new_file_name = uniqid('') . $new_file_name;
@@ -1157,7 +1157,7 @@ if ($is_course_member) {
 		//$titleAuthors = $form->addElement('text', 'authors', get_lang("Authors"), 'style="width: 350px;"');
 
 		//if (empty ($authors)) {
-		$authors = $_user['firstName'] . " " . $_user['lastName'];
+		$authors = api_get_person_name($_user['firstName'], $_user['lastName']);
 		//}
 
 		//$defaults["authors"] = ($edit ? stripslashes($workAuthor) : stripslashes($authors));
@@ -1368,15 +1368,15 @@ if ($cur_dir_path == '/') {
 
 if (!$display_upload_form && !$display_tool_options) {
 	$add_query = '';	
-	$sql = "SELECT concat(user.firstname,' ',user.lastname) FROM $table_user user, $table_course_user course_user
+	$sql = "SELECT user.firstname, user.lastname FROM $table_user user, $table_course_user course_user
 			  WHERE course_user.user_id=user.user_id AND course_user.course_code='".api_get_course_id()."' AND course_user.status='1'";
 	$res = api_sql_query($sql,__FILE__,__LINE__);
 	$admin_course = '';
 	while($row = Database::fetch_row($res)) {
-		$admin_course .='\''.$row[0].'\','; 	
+		$admin_course .='\''.api_get_person_name($row[0], $row[1]).'\','; 	
 	}
 	if(!$is_allowed_to_edit && $is_special==true) { 
-		$add_query = ' AND author IN('.$admin_course.'\''.$_user['firstName'].' '.$_user['lastName'].'\')';
+		$add_query = ' AND author IN('.$admin_course.'\''.api_get_person_name($_user['firstName'], $_user['lastName']).'\')';
 	}
 	if($is_allowed_to_edit && $is_special==true) {