Fixing certification html generation now we print the date

main/gradebook/gradebook.php

@@ -390,9 +390,7 @@ if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
 											   . '&search='.Security::remove_XSS($_POST['keyword']));
 	exit;
 }
-// --------------------------------------------------------------------------------
+// DISPLAY HEADERS AND MESSAGES                           -
-// -                       DISPLAY HEADERS AND MESSAGES                           -
-// --------------------------------------------------------------------------------
 
 if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
 	if (isset ($_GET['studentoverview'])) {
@@ -465,9 +463,7 @@ if (isset ($warning_message)) {
 if (isset ($move_form)) {
 	Display :: display_normal_message($move_form->toHtml(),false);
 }
-// --------------------------------------------------------------------------------
+// LOAD DATA & DISPLAY TABLE                             -
-// -                        LOAD DATA & DISPLAY TABLE                             -
-// --------------------------------------------------------------------------------
 $is_platform_admin= api_is_platform_admin();
 $is_course_admin= api_is_allowed_to_create_course();
 //load data for category, evaluation and links

main/inc/lib/document.lib.php

@@ -1227,8 +1227,7 @@ class DocumentManager {
       /**
        * return all content to replace and all content to be replace
        */
-      function get_all_info_to_certificate () {
+    function get_all_info_to_certificate() {
-        global $charset, $dateFormatLong;
         $info_list	= array();
         $user_id	= api_get_user_id();
         $course_id	= api_get_course_id();
@@ -1237,23 +1236,23 @@ class DocumentManager {
         $organization_name = api_get_setting('Institution');
         $portal_name       = api_get_setting('siteName');
 
-        //info extra user data
+        //Extra user data information
-        $extra_user_info_data = UserManager::get_extra_user_data($user_id,false,false);
+        $extra_user_info_data = UserManager::get_extra_user_data($user_id, false, false, false, true);
 
-        //info student
+        //Student information
-        $user_info 	= api_get_user_info($user_id);
+        $user_info 	    = api_get_user_info($user_id);
-        $first_name = $user_info['firstname'];
+        $first_name     = $user_info['firstname'];
-        $last_name 	= $user_info['lastname'];
+        $last_name 	    = $user_info['lastname'];
-        $official_code = $user_info['official_code'];
+        $official_code  = $user_info['official_code'];
 
-        //info teacher
+        //Teacher information
         $info_teacher_id = UserManager::get_user_id_of_course_admin_or_session_admin($course_id);
         $teacher_info = api_get_user_info($info_teacher_id);
         $teacher_first_name = $teacher_info['firstname'];
         $teacher_last_name = $teacher_info['lastname'];
 
         // info gradebook certificate
-        $info_grade_certificate = UserManager::get_info_gradebook_certificate($course_id,$user_id);
+        $info_grade_certificate = UserManager::get_info_gradebook_certificate($course_id, $user_id);        
 
         $date_certificate = $info_grade_certificate['created_at'];
         $date_long_certificate = '';
@@ -1265,10 +1264,11 @@ class DocumentManager {
         $info_to_replace_in_content_html = array($first_name,$last_name,$organization_name,$portal_name,$teacher_first_name,$teacher_last_name, $official_code, $date_long_certificate);
         $info_to_be_replaced_in_content_html= array('((user_firstname))','((user_lastname))','((gradebook_institution))',
                                                     '((gradebook_sitename))','((teacher_firstname))','((teacher_lastname))','((official_code))','((date_certificate))');
-
+        if (!empty($extra_user_info_data)) {
-        foreach ($extra_user_info_data as $key_extra=>$value_extra) {
+            foreach ($extra_user_info_data as $key_extra=>$value_extra) {                  
-            $info_to_be_replaced_in_content_html[]='(('.strtolower($key_extra).'))';
+                $info_to_be_replaced_in_content_html[]='(('.strtolower($key_extra).'))';
-            $info_to_replace_in_content_html[]=$value_extra;
+                $info_to_replace_in_content_html[]=$value_extra;
+            }
         }
         $info_list[]=$info_to_be_replaced_in_content_html;
         $info_list[]=$info_to_replace_in_content_html;

main/inc/lib/usermanager.lib.php

@@ -3227,9 +3227,14 @@ class UserManager
 	public function get_info_gradebook_certificate($course_code,$user_id) {
 	  	$tbl_grade_certificate 	= Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
 	  	$tbl_grade_category 	= Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
-	  	$session_id = api_get_session_id();
+	  	$session_id             = api_get_session_id();
 	  	
-	  	$sql='SELECT * FROM '.$tbl_grade_certificate.' WHERE cat_id= (SELECT id FROM '.$tbl_grade_category.' WHERE course_code = "'.Database::escape_string($course_code).'" AND session_id = '.$session_id.' LIMIT 1 )  AND user_id='.Database::escape_string($user_id);
+	  	if (empty($session_id)) {
+	  	    $session_condition = ' AND (session_id = "" OR session_id = 0 OR session_id IS NULL )';
+	  	} else {
+	  	    $session_condition = " AND session_id = $session_condition";
+	  	}	  	
+	  	$sql='SELECT * FROM '.$tbl_grade_certificate.' WHERE cat_id= (SELECT id FROM '.$tbl_grade_category.' WHERE course_code = "'.Database::escape_string($course_code).'" '.$session_condition.' LIMIT 1 ) AND user_id='.Database::escape_string($user_id);
 	  	$rs = Database::query($sql);
 	  	$row= Database::fetch_array($rs,'ASSOC');	  	
 	  	if (Database::num_rows($rs) > 0)