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

Browse Source
skala
Yannick Warnier 15 years ago
parent 99f1917541 2ae18fd886
commit 23900fe094
8 changed files with 70 additions and 32 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. 5
      main/admin/career_dashboard.php
  2. 10
      main/admin/careers.php
  3. 4
      main/admin/promotions.php
  4. 2
      main/admin/settings.php
  5. 23
      main/course_info/infocours.php
  6. 20
      main/inc/ajax/model.ajax.php
  7. 4
      main/inc/lib/career.lib.php
  8. 34
      main/inc/lib/pdf.lib.php

5
main/admin/career_dashboard.php
Unescape View File

@ -38,7 +38,7 @@ echo '</div>';
$career = new Career(); $career = new Career();
$careers = $career->get_all(); $careers = $career->get_all(array('status = ?'=>1)); //only status =1
$column_count = 3; $column_count = 3;
$i = 0; $i = 0;
$grid_js = ''; $grid_js = '';
@ -52,6 +52,9 @@ if (!empty($careers)) {
$promotion_array = array(); $promotion_array = array();
if (!empty($promotions)) { if (!empty($promotions)) {
foreach($promotions as $promotion_item) { foreach($promotions as $promotion_item) {
if (!$promotion_item['status']) {
continue; //avoid status = 0
}
//Getting all sessions from this promotion //Getting all sessions from this promotion
$sessions = SessionManager::get_all_sessions_by_promotion($promotion_item['id']); $sessions = SessionManager::get_all_sessions_by_promotion($promotion_item['id']);

10
main/admin/careers.php
Unescape View File

@ -49,8 +49,8 @@ $columns = array(get_lang('Name'), get_lang('Description'), get_lang('Act
//Column config //Column config
$column_model = array( $column_model = array(
array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'), array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'),
array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left'), array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left','sortable'=>'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter') array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
); );
//Autowidth //Autowidth
$extra_params['autowidth'] = 'true'; $extra_params['autowidth'] = 'true';
@ -119,11 +119,11 @@ if (isset($_GET['action']) && $_GET['action'] == 'add') {
if ($check) { if ($check) {
$values = $form->exportValues(); $values = $form->exportValues();
$career->update_all_promotion_status_by_career_id($values['id'],$values['status']); $career->update_all_promotion_status_by_career_id($values['id'],$values['status']);
$res = $career->update($values); $res = $career->update($values);
if ($values['status']) { if ($values['status']) {
Display::display_confirmation_message(sprintf(get_lang('CareerXArchived'), $values['name']), false); Display::display_confirmation_message(sprintf(get_lang('CareerXUnarchived'), $values['name']), false);
} else { } else {
Display::display_confirmation_message(sprintf(get_lang('CareerXUnarchived'), $values['name']), false); Display::display_confirmation_message(sprintf(get_lang('CareerXArchived'), $values['name']), false);
} }
} }
Security::clear_token(); Security::clear_token();

4
main/admin/promotions.php
Unescape View File

@ -55,8 +55,8 @@ $columns = array(get_lang('Name'),get_lang('Career'),get_lang('Descriptio
$column_model = array( $column_model = array(
array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'), array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'),
array('name'=>'career', 'index'=>'career', 'width'=>'100', 'align'=>'left'), array('name'=>'career', 'index'=>'career', 'width'=>'100', 'align'=>'left'),
array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left'), array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left','sortable'=>'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter'), array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false'),
); );
$extra_params['autowidth'] = 'true'; //use the width of the parent $extra_params['autowidth'] = 'true'; //use the width of the parent
//$extra_params['editurl'] = $url; //use the width of the parent //$extra_params['editurl'] = $url; //use the width of the parent

2
main/admin/settings.php
Unescape View File

@ -374,7 +374,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
$url = PDF::get_watermark($course_code); $url = PDF::get_watermark($course_code);
$form->addElement('file', 'pdf_export_watermark_path', get_lang('AddWaterMark')); $form->addElement('file', 'pdf_export_watermark_path', get_lang('AddWaterMark'));
if ($url != false) { if ($url != false) {
$delete_url = '<a href="?delete_watermark">'.Display::return_icon('delete.gif',get_lang('DelImage'), get_lang('DelImage')).'</a>'; $delete_url = '<a href="?delete_watermark">'.Display::return_icon('delete.png',get_lang('DelImage')).'</a>';
$form->addElement('html', '<a href="'.$url.'">'.$url.' '.$delete_url.'</a>'); $form->addElement('html', '<a href="'.$url.'">'.$url.' '.$delete_url.'</a>');
} }
$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif'); $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');

23
main/course_info/infocours.php
Unescape View File

@ -56,6 +56,16 @@ if (!$is_allowedToEdit) {
api_not_allowed(true); api_not_allowed(true);
} }
$show_delete_watermark_text_message = false;
if (api_get_setting('pdf_export_watermark_by_course') == 'true') {
if (isset($_GET['delete_watermark'])) {
PDF::delete_watermark($course_code);
$show_delete_watermark_text_message = true;
}
}
$table_course_category = Database :: get_main_table(TABLE_MAIN_CATEGORY); $table_course_category = Database :: get_main_table(TABLE_MAIN_CATEGORY);
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER); $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
$tbl_admin = Database :: get_main_table(TABLE_MAIN_ADMIN); $tbl_admin = Database :: get_main_table(TABLE_MAIN_ADMIN);
@ -138,11 +148,11 @@ $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
$form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types); $form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
if (api_get_setting('pdf_export_watermark_by_course') == 'true') { if (api_get_setting('pdf_export_watermark_by_course') == 'true') {
$url = PDF::get_watermark($course_code); $url = PDF::get_watermark($course_code);
$form->add_textfield('pdf_export_watermark_text', get_lang('PDFWaterMarkHeader'), false, array('size' => '60')); $form->add_textfield('pdf_export_watermark_text', get_lang('PDFExportWatermarkTextTitle'), false, array('size' => '60'));
$form->addElement('file', 'pdf_export_watermark_path', get_lang('AddWaterMark')); $form->addElement('file', 'pdf_export_watermark_path', get_lang('AddWaterMark'));
if ($url != false) { if ($url != false) {
$delete_url = '<a href="?delete_watermark">'.Display::return_icon('delete.gif',get_lang('DelImage'), get_lang('DelImage')).'</a>'; $delete_url = '<a href="?delete_watermark">'.Display::return_icon('delete.png',get_lang('DelImage')).'</a>';
$form->addElement('html', '<div class="row"><div class="formw"><a href="'.$url.'">'.$url.' '.$delete_url.'</a></div></div>'); $form->addElement('html', '<div class="row"><div class="formw"><a href="'.$url.'">'.$url.' '.$delete_url.'</a></div></div>');
} }
$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif'); $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
@ -378,12 +388,9 @@ if ($form->validate() && is_settings_editable()) {
/* Header */ /* Header */
Display :: display_header($nameTools, MODULE_HELP_NAME); Display :: display_header($nameTools, MODULE_HELP_NAME);
if ($show_delete_watermark_text_message) {
if (isset($_GET['delete_watermark'])) {
PDF::delete_watermark($course_code);
Display :: display_normal_message(get_lang('FileDeleted')); Display :: display_normal_message(get_lang('FileDeleted'));
} }
//api_display_tool_title($nameTools); //api_display_tool_title($nameTools);
if (isset($_GET['action']) && $_GET['action'] == 'show_message') { if (isset($_GET['action']) && $_GET['action'] == 'show_message') {
Display :: display_normal_message(get_lang('ModifDone')); Display :: display_normal_message(get_lang('ModifDone'));

20
main/inc/ajax/model.ajax.php
Unescape View File

@ -76,13 +76,31 @@ switch ($action) {
$sidx = 'name'; $sidx = 'name';
} }
$result = Database::select('*', $obj->table, array('order'=>"$sidx $sord", 'LIMIT'=> "$start , $limit")); $result = Database::select('*', $obj->table, array('order'=>"$sidx $sord", 'LIMIT'=> "$start , $limit"));
$new_result = array();
foreach($result as $item) {
if (!$item['status']) {
$item['name'] = '<font style="color:#AAA">'.$item['name'].'</font>';
}
$new_result[] = $item;
}
$result = $new_result;
break; break;
case 'get_promotions': case 'get_promotions':
$columns = array('name', 'career', 'description', 'actions'); $columns = array('name', 'career', 'description', 'actions');
if(!in_array($sidx, $columns)) { if(!in_array($sidx, $columns)) {
$sidx = 'name'; $sidx = 'name';
} }
$result = Database::select('p.id,p.name, p.description, c.name as career', "$obj->table p LEFT JOIN ".Database::get_main_table(TABLE_CAREER)." c ON c.id = p.career_id ", array('order' =>"$sidx $sord", 'LIMIT'=> "$start , $limit")); $result = Database::select('p.id,p.name, p.description, c.name as career, p.status', "$obj->table p LEFT JOIN ".Database::get_main_table(TABLE_CAREER)." c ON c.id = p.career_id ", array('order' =>"$sidx $sord", 'LIMIT'=> "$start , $limit"));
$new_result = array();
foreach($result as $item) {
if (!$item['status']) {
$item['name'] = '<font style="color:#AAA">'.$item['name'].'</font>';
}
$new_result[] = $item;
}
$result = $new_result;
break; break;
case 'get_usergroups': case 'get_usergroups':
$columns = array('name', 'users', 'courses','sessions','actions'); $columns = array('name', 'users', 'courses','sessions','actions');

4
main/inc/lib/career.lib.php
Unescape View File

@ -24,8 +24,8 @@ class Career extends Model {
$this->table = Database::get_main_table(TABLE_CAREER); $this->table = Database::get_main_table(TABLE_CAREER);
} }
public function get_all() { public function get_all($where_conditions = array()) {
return Database::select('*',$this->table, array('order' =>'name ASC')); return Database::select('*',$this->table, array('where'=>$where_conditions,'order' =>'name ASC'));
} }
/** /**

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

@ -272,13 +272,9 @@ class PDF {
$web_path = false; $web_path = false;
if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') { if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
$course_info = api_get_course_info($course_code); $course_info = api_get_course_info($course_code);
$store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/pdf_watermark.png'; // course path $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
if (file_exists($store_path)) { if (file_exists($store_path)) {
$web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/pdf_watermark.png'; $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';
} else {
$store_path = api_get_path(SYS_CODE_PATH).'default_course_document/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
if (file_exists($store_path))
$web_path = api_get_path(WEB_CODE_PATH).'default_course_document/'.api_get_current_access_url_id().'_pdf_watermark.png';
} }
} else { } else {
$store_path = api_get_path(SYS_CODE_PATH).'default_course_document/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
@ -297,7 +293,7 @@ class PDF {
public function delete_watermark($course_code = null) { public function delete_watermark($course_code = null) {
if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') { if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
$course_info = api_get_course_info($course_code); $course_info = api_get_course_info($course_code);
$store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/pdf_watermark.png'; // course path $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
} else { } else {
$store_path = api_get_path(SYS_CODE_PATH).'default_course_document/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
} }
@ -315,7 +311,7 @@ class PDF {
if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') { if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
$course_info = api_get_course_info($course_code); $course_info = api_get_course_info($course_code);
$store_path = api_get_path(SYS_COURSE_PATH).$course_info['path']; // course path $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path']; // course path
$web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'pdf_watermark.png'; $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/pdf_watermark.png';
} else { } else {
$store_path = api_get_path(SYS_CODE_PATH).'default_course_document'; // course path $store_path = api_get_path(SYS_CODE_PATH).'default_course_document'; // course path
$web_path = api_get_path(WEB_CODE_PATH).'default_course_document/'.api_get_current_access_url_id().'_pdf_watermark.png'; $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/'.api_get_current_access_url_id().'_pdf_watermark.png';
@ -455,15 +451,29 @@ class PDF {
//Adding watermark //Adding watermark
if (api_get_setting('pdf_export_watermark_enable') == 'true') { if (api_get_setting('pdf_export_watermark_enable') == 'true') {
$watermark_file = self::get_watermark($course_code); $watermark_file = self::get_watermark($course_code);
if (!empty($watermark_file)) {
if ($watermark_file) {
//http://mpdf1.com/manual/index.php?tid=269&searchstring=watermark //http://mpdf1.com/manual/index.php?tid=269&searchstring=watermark
$this->pdf->SetWatermarkImage($watermark_file); $this->pdf->SetWatermarkImage($watermark_file);
$this->pdf->showWatermarkImage = true; $this->pdf->showWatermarkImage = true;
} else {
$watermark_file = self::get_watermark(null);
if ($watermark_file) {
$this->pdf->SetWatermarkImage($watermark_file);
$this->pdf->showWatermarkImage = true;
}
}
if ($course_code) {
$watermark_text = api_get_course_setting('pdf_export_watermark_text');
if (empty($watermark_text)) {
$watermark_text = api_get_setting('pdf_export_watermark_text');
}
} else {
$watermark_text = api_get_setting('pdf_export_watermark_text');
} }
$watermark_text = api_get_setting('pdf_export_watermark_text');
if (!empty($watermark_text)) { if (!empty($watermark_text)) {
$this->pdf->SetWatermarkText(strcode2utf($watermark_text)); $this->pdf->SetWatermarkText(strcode2utf($watermark_text),0.1);
$this->pdf->showWatermarkText = true; $this->pdf->showWatermarkText = true;
} }
} }

Write Preview
Loading…
Cancel
Save