Julio Montoya 13 years ago
parent
commit
fc6c214e2f
2 changed files with 17 additions and 3 deletions
  1. 1 1
      main/admin/class_information.php
  2. 16 2
      main/exercice/exercise_report.php

+ 1 - 1
main/admin/class_information.php

@@ -54,7 +54,7 @@ if (count($users) > 0) {
     $table_header[] = array ('', false);
     $data = array();
     foreach($users as $index => $user) {
-        $username = sprintf(get_lang('LoginX'), $user['username']);
+        $username = api_htmlentities(sprintf(get_lang('LoginX'), $user['username']), ENT_QUOTES);
         $row = array ();
         $row[] = $user['official_code'];
         if ($is_western_name_order) {

+ 16 - 2
main/exercice/exercise_report.php

@@ -352,8 +352,8 @@ if ($is_allowedToEdit || $is_tutor) {
 //Column config
 	$column_model   = array(
                         array('name'=>'firstname',      'index'=>'firstname',		'width'=>'50',   'align'=>'left', 'search' => 'true'),                        
-                        array('name'=>'lastname',		'index'=>'lastname',		'width'=>'50',   'align'=>'left', 'search' => 'true'),
-                        array('name'=>'login',			'index'=>'username',		'width'=>'40',   'align'=>'left', 'search' => 'true'),
+                        array('name'=>'lastname',		'index'=>'lastname',		'width'=>'50',   'align'=>'left', 'formatter'=>'action_formatter', 'search' => 'true'),
+                        array('name'=>'login',          'hidden'=> 'true',          'index'=>'username',        'width'=>'40',   'align'=>'left', 'search' => 'true'),
                         array('name'=>'group',			'index'=>'s',				'width'=>'40',   'align'=>'left', 'search' => 'false'),
                         array('name'=>'duration',       'index'=>'exe_duration',	'width'=>'30',   'align'=>'left', 'search' => 'true'),
                         array('name'=>'start_date',		'index'=>'start_date',		'width'=>'60',   'align'=>'left', 'search' => 'true'),                        
@@ -395,6 +395,20 @@ $extra_params['excel'] = 'excel';
 
 $extra_params['rowList'] = array(10, 20 ,30);
 
+$action_links = '
+    // add username as title in lastname filed - ref 4226
+    function action_formatter(cellvalue, options, rowObject) {
+        // rowObject is firstname,lastname,login,... get the third word
+        var loginx = "'.api_htmlentities(sprintf(get_lang("LoginX"),":::"), ENT_QUOTES).'";
+        var tabLoginx = loginx.split(/:::/);
+        // tabLoginx[0] is before and tabLoginx[1] is after :::
+        // may be empty string but is defined
+        return "<span title=\""+tabLoginx[0]+rowObject[2]+tabLoginx[1]+"\">"+cellvalue+"</span>";
+    }
+';
+
+
+
 ?>
 <script>
 $(function() {