chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'AngelFQC-7322' into 1.9.x

Browse Source
1.9.x
Yannick Warnier 11 years ago
parent 01a2ec379e a9800e438c
commit 1e4adb45ca
3 changed files with 25 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 22
      main/gradebook/certificate_template/template.html
  2. 5
      main/inc/lib/document.lib.php
  3. 15
      main/inc/lib/pdf.lib.php

22
main/gradebook/certificate_template/template.html
Unescape View File

@ -4,23 +4,23 @@
</head>
<body style="background-color: #fff;">
<div style="width: 1072px;margin-left: auto;margin-right: auto;">
<div style="background: url('{WEB_CODE_PATH}img/paper.png') repeat;padding: 10px;">
<div style="background: url('{REL_CODE_PATH}img/paper.png') repeat;padding: 10px;">
<table cellpadding="0" cellspacing="0">
<tr>
<td>
<table cellpadding="0" cellspacing="0">
<tr>
<td>
<img src="{WEB_CODE_PATH}img/side-bar.png" alt="Side bar">
<img src="{REL_CODE_PATH}img/side-bar.png" alt="Side bar">
</td>
<td>
<img src="{WEB_CODE_PATH}img/side-top-a.png" alt="Side top element a">
<img src="{REL_CODE_PATH}img/side-top-a.png" alt="Side top element a">
</td>
<td>
<img src="{WEB_CODE_PATH}img/certificate-logo.png" alt="Certificate logo">
<img src="{REL_CODE_PATH}img/certificate-logo.png" alt="Certificate logo">
</td>
<td>
<img src="{WEB_CODE_PATH}img/side-top-b.png" alt="Side top element b">
<img src="{REL_CODE_PATH}img/side-top-b.png" alt="Side top element b">
</td>
</tr>
</table>
@ -30,7 +30,7 @@
<td>
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td><img src="{WEB_CODE_PATH}img/side-bar-button.png" alt="Side bar button"></td>
<td><img src="{REL_CODE_PATH}img/side-bar-button.png" alt="Side bar button"></td>
<td>
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
@ -73,19 +73,19 @@
<table cellpadding="0" cellspacing="0" align="center">
<tr>
<td>
<img src="{WEB_CODE_PATH}img/signature1.png" alt="Signature 1">
<img src="{REL_CODE_PATH}img/signature1.png" alt="Signature 1">
</td>
<td>
<img src="{WEB_CODE_PATH}img/blank.png" alt="blank">
<img src="{REL_CODE_PATH}img/blank.png" alt="blank">
</td>
<td>
<img src="{WEB_CODE_PATH}img/signature2.png" alt="firm02">
<img src="{REL_CODE_PATH}img/signature2.png" alt="firm02">
</td>
<td>
<img src="{WEB_CODE_PATH}img/certified.png" alt="certified">
<img src="{REL_CODE_PATH}img/certified.png" alt="certified">
</td>
<td>
<img src="{WEB_CODE_PATH}img/blank.png" alt="blank">
<img src="{REL_CODE_PATH}img/blank.png" alt="blank">
</td>
<td>
((certificate_barcode))

5
main/inc/lib/document.lib.php
Unescape View File

@ -4455,6 +4455,7 @@ class DocumentManager
public static function generateDefaultCertificate($courseData)
{
global $css, $img_dir, $default_course_dir, $js;
$codePath = api_get_path(REL_CODE_PATH);
$dir = '/certificates';
$title = get_lang('DefaultCertificate');
@ -4467,8 +4468,8 @@ class DocumentManager
$fileType = 'file';
$templateContent = file_get_contents(api_get_path(SYS_CODE_PATH) . 'gradebook/certificate_template/template.html');
$search = array('{CSS}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}', '{WEB_CODE_PATH}');
$replace = array($css.$js, $img_dir, api_get_path(REL_PATH), $default_course_dir, api_get_path(WEB_CODE_PATH));
$search = array('{CSS}', '{IMG_DIR}', '{REL_CODE_PATH}', '{COURSE_DIR}');
$replace = array($css.$js, $img_dir, $codePath, $default_course_dir);
$fileContent = str_replace($search, $replace, $templateContent);

15
main/inc/lib/pdf.lib.php
Unescape View File

@ -242,12 +242,19 @@ class PDF
if (strpos($old_src, 'http') === false) {
if (strpos($old_src, '/main/default_course_document') === false) {
$old_src_fixed = '';
if (api_get_path(REL_PATH) != '/') {
$old_src_fixed = str_replace(api_get_path(REL_PATH).'courses/'.$course_data['path'].'/document/', '', $old_src);
if (strpos($old_src, '/main/img') === false) {
if (api_get_path(REL_PATH) != '/') {
$old_src_fixed = str_replace(api_get_path(REL_PATH).'courses/'.$course_data['path'].'/document/', '', $old_src);
} else {
$old_src_fixed = str_replace('courses/'.$course_data['path'].'/document/', '', $old_src);
}
$new_path = $document_path.$old_src_fixed;
} else {
$old_src_fixed = str_replace('courses/'.$course_data['path'].'/document/', '', $old_src);
$new_path = $old_src;
}
$new_path = $document_path.$old_src_fixed;
$document_html= str_replace($old_src, $new_path, $document_html);
}
} else {

Write Preview
Loading…
Cancel
Save