Revert permissions changes in PR 302

1.9.x
Yannick Warnier 12 years ago
parent b49f970bf1
commit c45e9274cd
  1. 4
      main/course_info/infocours.php
  2. 9
      main/inc/lib/course.lib.php
  3. 4
      main/inc/lib/main_api.lib.php

@ -121,9 +121,9 @@ if ($form->validate() && is_settings_editable()) {
// Display course picture // Display course picture
$course_path = api_get_path(SYS_COURSE_PATH).$currentCourseRepository; // course path $course_path = api_get_path(SYS_COURSE_PATH).$currentCourseRepository; // course path
if (file_exists($course_path.'/course-pic300x180.png')) { if (file_exists($course_path.'/course-pic85x85.png')) {
$course_web_path = api_get_path(WEB_COURSE_PATH).$currentCourseRepository; // course web path $course_web_path = api_get_path(WEB_COURSE_PATH).$currentCourseRepository; // course web path
$course_medium_image = $course_web_path.'/course-pic300x180.png?'.rand(1, 1000); // redimensioned image 85x85 $course_medium_image = $course_web_path.'/course-pic85x85.png?'.rand(1, 1000); // redimensioned image 85x85
$image_html = '<div class="row"><div class="formw"><img src="'.$course_medium_image.'" /></div></div>'; $image_html = '<div class="row"><div class="formw"><img src="'.$course_medium_image.'" /></div></div>';
} }
$form->addElement('html', $image_html); $form->addElement('html', $image_html);

@ -3194,7 +3194,7 @@ class CourseManager
$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
$course_image = $store_path.'/course-pic.png'; // image name for courses $course_image = $store_path.'/course-pic.png'; // image name for courses
$course_medium_image = $store_path.'/course-pic300x180.png'; $course_medium_image = $store_path.'/course-pic85x85.png';
//$extension = strtolower(substr(strrchr($filename, '.'), 1)); //$extension = strtolower(substr(strrchr($filename, '.'), 1));
if (file_exists($course_image)) { if (file_exists($course_image)) {
@ -3206,12 +3206,13 @@ class CourseManager
$my_course_image = new Image($source_file); $my_course_image = new Image($source_file);
$result = $my_course_image->send_image($course_image, -1, 'png'); $result = $my_course_image->send_image($course_image, -1, 'png');
//Redimension image to 100x85 //Redimension image to 100x85 (should be 85x85 but 100x85 visually gives
// better results for most images people put as course icon)
if ($result) { if ($result) {
$medium = new Image($course_image); $medium = new Image($course_image);
//$picture_infos = $medium->get_image_size(); //$picture_infos = $medium->get_image_size();
$medium->resize(300, 180, 0, false); $medium->resize(100, 85, 0, false);
$medium->send_image($store_path.'/course-pic300x180.png', -1, 'png'); $medium->send_image($store_path.'/course-pic85x85.png', -1, 'png');
} }
return $result; return $result;
} }

@ -1512,8 +1512,8 @@ function api_format_course_array($course_data) {
$_course['add_teachers_to_sessions_courses'] = $course_data['add_teachers_to_sessions_courses']; $_course['add_teachers_to_sessions_courses'] = $course_data['add_teachers_to_sessions_courses'];
} }
if (file_exists(api_get_path(SYS_COURSE_PATH).$course_data['directory'].'/course-pic300x180.png')) { if (file_exists(api_get_path(SYS_COURSE_PATH).$course_data['directory'].'/course-pic85x85.png')) {
$url_image = api_get_path(WEB_COURSE_PATH).$course_data['directory'].'/course-pic300x180.png'; $url_image = api_get_path(WEB_COURSE_PATH).$course_data['directory'].'/course-pic85x85.png';
} else { } else {
$url_image = api_get_path(WEB_IMG_PATH).'without_picture.png'; $url_image = api_get_path(WEB_IMG_PATH).'without_picture.png';
} }

Loading…
Cancel
Save