Adding more minor fixes in the document tool due

skala
Julio Montoya 15 years ago
parent c40e73ad31
commit 8f5cdbf498
  1. 4
      main/document/document.inc.php
  2. 2
      main/document/document.php
  3. 4
      main/document/record_audio.php
  4. 40
      main/inc/lib/document.lib.php
  5. 12
      main/inc/lib/usermanager.lib.php

@ -402,7 +402,7 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0,
$modify_icons .= ' '.Display::return_icon('delete_na.png', get_lang('Delete'),array(), 22);
} else {
if ($is_certificate_mode) {
$modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&selectcat='.$gradebook_category.'">'.Display::return_icon('edit.png', get_lang('Modify'),'',22).'</a>';
$modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&curdirpath=/certificates&selectcat='.$gradebook_category.'">'.Display::return_icon('edit.png', get_lang('Modify'),'',22).'</a>';
} else {
if (api_get_session_id()) {
if ($document_data['session_id'] == api_get_session_id()) {
@ -429,7 +429,7 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0,
if ($is_certificate_mode) {
//$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$parent_id.'&amp;move='.$document_id.$req_gid.'&selectcat='.$gradebook_category.'">'.Display::return_icon('move.png', get_lang('Move'),array(), 22).'</a>';
$modify_icons .= '&nbsp;'.Display::return_icon('move_na.png', get_lang('Move'),array(), 22).'</a>';
$modify_icons .= '&nbsp;'.Display::return_icon($visibility_icon.'.png', get_lang('Move'),array(), 22).'</a>';
$modify_icons .= '&nbsp;'.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'),array(), 22).'</a>';
Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'),array(), 22).'</a>';
} else {
if (api_get_session_id()) {

@ -112,7 +112,7 @@ $current_folder_id = $document_id;
if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates' && isset($_GET['set_preview']) && $_GET['set_preview'] == strval(intval($_GET['set_preview']))) {
if (isset($_GET['set_preview'])) {
// Generate document HTML
$content_html = DocumentManager::replace_user_info_into_html(api_get_course_id());
$content_html = DocumentManager::replace_user_info_into_html(api_get_course_id(), true);
$new_content_html = $content_html;

@ -28,10 +28,6 @@ $nameTools = get_lang('VoiceRecord');
api_protect_course_script();
api_block_anonymous_users();
if (!isset($_GET['id'])) {
api_not_allowed(true);
}
$document_data = DocumentManager::get_document_data_by_id($_GET['id'], api_get_course_id());
$document_id = $document_data['id'];
$dir = $document_data['path'];

@ -1175,7 +1175,7 @@ class DocumentManager {
* @param string The course id
* @return int The default certificate id
*/
function get_default_certificate_id ($course_id) {
function get_default_certificate_id($course_id) {
$tbl_category=Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$session_id=api_get_session_id();
if ($session_id==0 || is_null($session_id)) {
@ -1185,8 +1185,7 @@ class DocumentManager {
} else {
$sql_session='';
}
$sql='SELECT document_id FROM '.$tbl_category.'
WHERE course_code="'.Database::escape_string($course_id).'" '.$sql_session;
$sql='SELECT document_id FROM '.$tbl_category.' WHERE course_code="'.Database::escape_string($course_id).'" '.$sql_session;
$rs=Database::query($sql);
$row=Database::fetch_array($rs);
return $row['document_id'];
@ -1197,37 +1196,34 @@ class DocumentManager {
* @param string The course id
* @return string The html content of the certificate
*/
function replace_user_info_into_html($course_id) {
global $_course;
function replace_user_info_into_html($course_id, $is_preview = false) {
$course_info = api_get_course_info($course_id);
$tbl_document=Database::get_course_table(TABLE_DOCUMENT,$course_info['dbName']);
$tbl_document=Database::get_course_table(TABLE_DOCUMENT, $course_info['dbName']);
$document_id=self::get_default_certificate_id($course_id);
$sql='SELECT path FROM '.$tbl_document.' WHERE id="'.Database::escape_string($document_id).'" ';
$sql = 'SELECT path FROM '.$tbl_document.' WHERE id="'.Database::escape_string($document_id).'" ';
$rs=Database::query($sql);
$rs = Database::query($sql);
$new_content = '';
if (Database::num_rows($rs)) {
$row=Database::fetch_array($rs);
$filepath = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document'.$row['path'];
if (is_file($filepath)) {
$my_content_html=file_get_contents($filepath);
}
$all_user_info=self::get_all_info_to_certificate();
if (is_file($filepath)) {
$my_content_html=file_get_contents($filepath);
}
$all_user_info=self::get_all_info_to_certificate($is_preview);
$info_to_be_replaced_in_content_html=$all_user_info[0];
$info_to_replace_in_content_html=$all_user_info[1];
$new_content=str_replace($info_to_be_replaced_in_content_html,$info_to_replace_in_content_html,$my_content_html);
}
return $new_content;
}
$new_content=str_replace($info_to_be_replaced_in_content_html,$info_to_replace_in_content_html, $my_content_html);
}
return $new_content;
}
/**
* return all content to replace and all content to be replace
*/
function get_all_info_to_certificate() {
function get_all_info_to_certificate($is_preview = false) {
$info_list = array();
$user_id = api_get_user_id();
$course_id = api_get_course_id();
@ -1259,7 +1255,11 @@ class DocumentManager {
if (!empty($date_certificate)) {
$date_long_certificate = api_convert_and_format_date($date_certificate);
}
if ($is_preview) {
$date_long_certificate = api_convert_and_format_date(api_get_utc_datetime());
}
//replace content
$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))',

@ -3224,7 +3224,7 @@ class UserManager
* @param int The user id
* @return array if there is not information return false
*/
public function get_info_gradebook_certificate($course_code,$user_id) {
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();
@ -3235,12 +3235,12 @@ class UserManager
$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)
$rs = Database::query($sql);
if (Database::num_rows($rs) > 0) {
$row = Database::fetch_array($rs,'ASSOC');
return $row;
else
return false;
}
return false;
}
/**

Loading…
Cancel
Save