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

Always show the gallery icon see BT#8825

Browse Source
1.9.x
Julio Montoya 12 years ago
parent 23bf3a966f
commit 444dfd9519
4 changed files with 122 additions and 146 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/document/document.php
  2. 52
      main/document/document_slideshow.inc.php
  3. 182
      main/document/slideshow.php
  4. 29
      main/document/slideshowoptions.php

5
main/document/document.php
Unescape View File

@ -25,9 +25,7 @@
*
* @package chamilo.document
*/
/**
* Code
*/
use \ChamiloSession as Session;
// Language files that need to be included
$language_file = array('document', 'slideshow', 'gradebook', 'create_course');
@ -1649,7 +1647,6 @@ if (!is_null($documentAndFolders)) {
}
}
// Slideshow by Patrick Cool, May 2004
require 'document_slideshow.inc.php';
if ($image_present && !isset($_GET['keyword'])) {
$actions .= Display::url(

52
main/document/document_slideshow.inc.php
Unescape View File

@ -45,8 +45,9 @@ if (count($array_to_search) > 0) {
}
}
$image_present = 0;
// Always show gallery.
$image_present = 1;
/*
if (isset($all_files) && is_array($all_files) && count($all_files) > 0) {
foreach ($all_files as & $file) {
$slideshow_extension = strrchr($file, '.');
@ -56,7 +57,8 @@ if (isset($all_files) && is_array($all_files) && count($all_files) > 0) {
break;
}
}
}
}*/
$tablename_column = isset($_GET['tablename_column']) ? Security::remove_XSS($_GET['tablename_column']) : 0;
if ($tablename_column == 0) {
@ -69,32 +71,32 @@ $tablename_direction = isset($_GET['tablename_direction']) ? Security::remove_XS
$image_files_only = sort_files($array_to_search);
$_SESSION['image_files_only'] = $image_files_only;
function sort_files($table) {
global $tablename_direction, $accepted_extensions;
$temp = array();
function sort_files($table)
{
global $tablename_direction, $accepted_extensions;
$temp = array();
foreach ($table as & $file_array) {
if ($file_array['filetype'] == 'file') {
$slideshow_extension = strrchr($file_array['path'], '.');
foreach ($table as & $file_array) {
if ($file_array['filetype'] == 'file') {
$slideshow_extension = strrchr($file_array['path'], '.');
$slideshow_extension = strtolower($slideshow_extension);
if (in_array($slideshow_extension, $accepted_extensions)) {
$start_date = isset($file_array['insert_date']) ? $file_array['insert_date'] : null;
$temp[] = array('file', basename($file_array['path']), $file_array['size'], $start_date);
}
}
}
if (in_array($slideshow_extension, $accepted_extensions)) {
$start_date = isset($file_array['insert_date']) ? $file_array['insert_date'] : null;
$temp[] = array('file', basename($file_array['path']), $file_array['size'], $start_date);
}
}
}
if ($tablename_direction == 'DESC') {
usort($temp, 'rsort_table');
} else {
usort($temp, 'sort_table');
}
if ($tablename_direction == 'DESC') {
usort($temp, 'rsort_table');
} else {
usort($temp, 'sort_table');
}
$final_array = array();
foreach ($temp as & $file_array) {
$final_array[] = $file_array[1];
}
$final_array = array();
foreach ($temp as & $file_array) {
$final_array[] = $file_array[1];
}
return $final_array;
}

182
main/document/slideshow.php
Unescape View File

@ -6,15 +6,10 @@
* @author Juan Carlos Raña Trabado herodoto@telefonica.net January 2008
* @package chamilo.document
*/
/**
* Code
*/
// Language files that need to be included
$language_file = array('slideshow', 'document');
require_once '../inc/global.inc.php';
api_protect_course_script();
$noPHP_SELF = true;
@ -22,7 +17,7 @@ $path = Security::remove_XSS($_GET['curdirpath']);
$pathurl = urlencode($path);
$slide_id = Security::remove_XSS($_GET['slide_id']);
if(empty($slide_id)) {
if (empty($slide_id)) {
$edit_slide_id = 1;
} else {
$edit_slide_id = $slide_id;
@ -34,20 +29,16 @@ if ($path != '/') {
$folder = '/';
}
$sys_course_path = api_get_path(SYS_COURSE_PATH);
// Including the functions for the slideshow
require_once 'slideshow.inc.php';
// Breadcrumb navigation
$url = 'document.php?curdirpath='.$pathurl;
$originaltoolname = get_lang('Documents');
$_course = api_get_course_info();
$interbreadcrumb[] = array('url' => Security::remove_XSS($url), 'name' => $originaltoolname);
// Because $nametools uses $_SERVER['PHP_SELF'] for the breadcrumbs instead of $_SERVER['REQUEST_URI'], I had to
// bypass the $nametools thing and use <b></b> tags in the $interbreadcrump array
//$url = 'slideshow.php?curdirpath='.$pathurl;
$originaltoolname = get_lang('SlideShow');
//$interbreadcrumb[] = array('url'=>$url, 'name' => $originaltoolname);
Display :: display_header($originaltoolname, 'Doc');
@ -64,14 +55,11 @@ if ($slide_id != 'all') {
}
$total_slides = count($image_files_only);
?>
<script language="JavaScript" type="text/javascript">
<!--
<script type="text/javascript">
function MM_openBrWindow(theURL,winName,features) { //v2.0
window.open(theURL,winName,features);
}
//-->
</script>
<div class="actions">
<?php
@ -87,7 +75,8 @@ if ($slide_id != 'all') {
$first = '<img src="'.api_get_path(WEB_IMG_PATH).'action_first_na.png">';
} else {
$imgp = 'action_prev.png';
$first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'"><img src="'.api_get_path(WEB_IMG_PATH).'action_first.png" title="'.get_lang('FirstSlide').'" alt="'.get_lang('FirstSlide').'"></a>';
$first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'">
<img src="'.api_get_path(WEB_IMG_PATH).'action_first.png" title="'.get_lang('FirstSlide').'" alt="'.get_lang('FirstSlide').'"></a>';
}
// First slide
@ -123,7 +112,6 @@ if ($slide_id != 'all') {
// Last slide
echo $last;
echo '</div>';
}
}
@ -151,11 +139,8 @@ echo '<br />';
// If we come from slideshowoptions.php we sessionize (new word !!! ;-) the options
if (isset($_POST['Submit'])) {
// We come from slideshowoptions.php
//$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']);
$_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']);
if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') {
//echo "resizing";
$_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']);
@ -178,34 +163,33 @@ if (isset($_SESSION["image_resizing"]) && $_SESSION["image_resizing"] == "resiz
// This is for viewing all the images in the slideshow as thumbnails.
$image_tag = array ();
if ($slide_id == 'all') {
// Config for make thumbnails
$allowed_thumbnail_types = array('jpg','jpeg','gif','png');
// Config for make thumbnails
$allowed_thumbnail_types = array('jpg', 'jpeg', 'gif', 'png');
$max_thumbnail_width = 100;
$max_thumbnail_height = 100;
$png_compression = 0;//0(none)-9
$jpg_quality = 75;//from 0 to 100 (default is 75). More quality less compression
$directory_thumbnails=$sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
$directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
//Other parameters only for show tumbnails
$row_items = 4;//only in slideshow.php
$number_image = 7;//num icons cols to show
$thumbnail_width_frame=$max_thumbnail_width;//optional $max_thumbnail_width+x
$thumbnail_height_frame=$max_thumbnail_height;
// Create the template_thumbnails folder (if no exist)
if (!file_exists($directory_thumbnails)) {
@mkdir($directory_thumbnails, api_get_permissions_for_new_directories());
}
/*
//
//disabled by now, because automatic mode is heavy for server (scandir), only manual
//
// Delete orphaned thumbnails
$directory_images=$sys_course_path.$_course['path'].'/document'.$folder;
$all_thumbnails = scandir($directory_thumbnails);
@ -220,7 +204,7 @@ if ($slide_id == 'all') {
}
}
*/
// check files and thumbnails
if (is_array($image_files_only)) {
@ -231,12 +215,14 @@ if ($slide_id == 'all') {
if (file_exists($image)) {
//check thumbnail
$imagetype = explode(".", $image);
$imagetype = strtolower($imagetype[count($imagetype)-1]);//or check $imagetype = image_type_to_extension(exif_imagetype($image), false);
//or check $imagetype = image_type_to_extension(exif_imagetype($image), false);
$imagetype = strtolower($imagetype[count($imagetype)-1]);
if(in_array($imagetype,$allowed_thumbnail_types)) {
if (!file_exists($image_thumbnail)){
$original_image_size = api_getimagesize($image);//run each once we view thumbnails is too heavy, then need move into !file_exists($image_thumbnail, and only run when haven't the thumbnail
//run each once we view thumbnails is too heavy, then need move into !file_exists($image_thumbnail, and only run when haven't the thumbnail
$original_image_size = api_getimagesize($image);
switch($imagetype) {
case 'gif':
$source_img = imagecreatefromgif($image);
@ -251,22 +237,28 @@ if ($slide_id == 'all') {
$source_img = imagecreatefrompng($image);
break;
}
$new_thumbnail_size = api_calculate_image_size($original_image_size['width'], $original_image_size['height'], $max_thumbnail_width, $max_thumbnail_height);
$new_thumbnail_size = api_calculate_image_size(
$original_image_size['width'],
$original_image_size['height'],
$max_thumbnail_width,
$max_thumbnail_height
);
if($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
$new_thumbnail_size['width']=$original_image_size['width'];
$new_thumbnail_size['height']=$original_image_size['height'];
}
$crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
// preserve transparency
if($imagetype == "png"){
imagesavealpha($crop, true);
$color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
imagefill($crop, 0, 0, $color);
imagefill($crop, 0, 0, $color);
}
if ($imagetype == "gif") {
$transindex = imagecolortransparent($source_img);
$palletsize = imagecolorstotal($source_img);
@ -280,9 +272,20 @@ if ($slide_id == 'all') {
}
//resampled image
imagecopyresampled($crop,$source_img,0,0,0,0,$new_thumbnail_size['width'],$new_thumbnail_size['height'],$original_image_size['width'],$original_image_size['height']);
switch($imagetype) {
imagecopyresampled(
$crop,
$source_img,
0,
0,
0,
0,
$new_thumbnail_size['width'],
$new_thumbnail_size['height'],
$original_image_size['width'],
$original_image_size['height']
);
switch ($imagetype) {
case 'gif':
imagegif($crop,$image_thumbnail);
break;
@ -296,46 +299,43 @@ if ($slide_id == 'all') {
imagepng($crop,$image_thumbnail,$png_compression);
break;
}
//clean memory
imagedestroy($crop);
imagedestroy($crop);
}//end !exist thumbnail
//show thumbnail and link
$one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
$image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
}
else{
} else {
//if images aren't support by gd (not gif, jpg, jpeg, png)
if ($imagetype=="bmp"){
$original_image_size = getimagesize($image);// use getimagesize instead api_getimagesize($image); becasuse api_getimagesize doesn't support bmp files. Put here for each show, only for a few bmp files isn't heavy
if($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
if ($imagetype=="bmp") {
// use getimagesize instead api_getimagesize($image); becasuse api_getimagesize doesn't support bmp files. Put here for each show, only for a few bmp files isn't heavy
$original_image_size = getimagesize($image);
if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
$thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
$image_height = $thumbnail_size['height'];
$image_width = $thumbnail_size['width'];
}
else{
} else {
$image_height=$original_image_size[0];
$image_width=$original_image_size[1];
}
}
else{
} else {
//example for svg files,...
$image_width=$max_thumbnail_width;
$image_height=$max_thumbnail_height;
}
$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
$image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
$image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
}//end allowed image types
}//end if exist file image
}//end foreach
}//end image files only
// Creating the table
$html_table = '';
echo '<table align="center" width="760px" border="0" cellspacing="10">';
@ -350,7 +350,7 @@ if ($slide_id == 'all') {
echo '<td>';
//TODO:move styles to css files and center image vertical
?>
<style>
div.thumbnail:hover {
border-color: #0088cc;
@ -360,8 +360,8 @@ if ($slide_id == 'all') {
box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
}
</style>
<?php
<?php
echo '<div class="thumbnail" style="text-align: center; margin:5px; padding:9px; height:'.$thumbnail_height_frame.'px; width:'.$thumbnail_width_frame.'px">';
echo '<a href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">'.$image_tag[$p].'</a>';
echo '</div>';
@ -371,24 +371,21 @@ if ($slide_id == 'all') {
}
echo '</tr>';
}
echo '</table>';
echo '</table>';
}//end slide==all
/* ONE AT A TIME VIEW */
$course_id = api_get_course_int_id();
// This is for viewing all the images in the slideshow one at a time.
if ($slide_id != 'all') {
if (file_exists($image)) {
if ($slide_id != 'all' && !empty($image_files_only)) {
if (file_exists($image) && is_file($image)) {
$image_height_width = resize_image($image, $target_width, $target_height);
$image_height = $image_height_width[0];
$image_width = $image_height_width[1];
$height_width_tags = null;
if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
$height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"';
@ -401,7 +398,8 @@ if ($slide_id != 'all') {
} else {
$pathpart = $path.'/';
}
$sql = "SELECT * FROM $tbl_documents WHERE c_id = $course_id AND path='".Database::escape_string($pathpart.$image_files_only[$slide])."'";
$sql = "SELECT * FROM $tbl_documents
WHERE c_id = $course_id AND path='".Database::escape_string($pathpart.$image_files_only[$slide])."'";
$result = Database::query($sql);
$row = Database::fetch_array($result);
@ -423,35 +421,34 @@ if ($slide_id != 'all') {
}
list($width, $height) = getimagesize($image);
//auto resize
if($_SESSION["image_resizing"]!="noresizing" && $_SESSION["image_resizing"]!="resizing" ){
if ($_SESSION["image_resizing"]!="noresizing" && $_SESSION["image_resizing"]!="resizing" ) {
?>
<script type="text/javascript">
var initial_width='<?php echo $width; ?>';
var initial_height='<?php echo $height; ?>';
var height = window.innerHeight -320;
var width = window.innerWidth -360;
if (initial_height>height || initial_width>width) {
start_width=width;
start_height=height;
}
else{
} else {
start_width=initial_width;
start_height=initial_height;
}
document.write ('<img id="image" src="<?php echo 'download.php?doc_url='.$path.'/'.$image_files_only[$slide]; ?>" width="'+start_width+'" height="'+start_height+'" border="0" alt="<?php echo $image_files_only[$slide] ;?>">');
document.write('<img id="image" src="<?php echo 'download.php?doc_url='.$path.'/'.$image_files_only[$slide]; ?>" width="'+start_width+'" height="'+start_height+'" border="0" alt="<?php echo $image_files_only[$slide] ;?>">');
function resizeImage() {
var resize_factor_width = width / initial_width;
var resize_factor_height = height / initial_height;
var delta_width = width - initial_width * resize_factor_height;
var delta_height = height - initial_height * resize_factor_width;
if (delta_width > delta_height) {
width = Math.ceil(initial_width * resize_factor_height);
height= Math.ceil(initial_height * resize_factor_height);
@ -464,13 +461,13 @@ if ($slide_id != 'all') {
width = Math.ceil(width);
height = Math.ceil(height);
}
document.getElementById('image').style.height = height +"px";
document.getElementById('image').style.width = width +"px";
document.getElementById('td_image').style.background='none';
document.getElementById('image').style.visibility='visible';
};
if (initial_height>height || initial_width>width) {
document.getElementById('image').style.visibility='hidden';
document.getElementById('td_image').style.background='url(../img/loadingAnimation.gif) center no-repeat';
@ -480,12 +477,10 @@ if ($slide_id != 'all') {
</script>
<?php
}
else{
} else {
echo "<img src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">";
}
echo '</a>';
echo '</td>';
echo '</tr>';
@ -515,8 +510,7 @@ if ($slide_id != 'all') {
$resize_info = get_lang('Resizing').'<br />';
$resize_widht = $_SESSION["image_resizing_width"].' x ';
$resize_height = $_SESSION['image_resizing_height'];
}
elseif($_SESSION['image_resizing'] != 'noresizing'){
} elseif($_SESSION['image_resizing'] != 'noresizing'){
$resize_info = get_lang('Resizing').'<br />';
$resize_widht = get_lang('Auto').' x ';
$resize_height = get_lang('Auto');
@ -534,6 +528,8 @@ if ($slide_id != 'all') {
} else {
Display::display_warning_message(get_lang('FileNotFound'));
}
} else {
Display::display_warning_message(get_lang('NoDataAvailable'));
}
Display :: display_footer();

29
main/document/slideshowoptions.php
Unescape View File

@ -20,16 +20,10 @@
* On this page the options of the slideshow can be set: maintain the original file
* or resize the file to a given width.
*/
/**
* Code
*/
// Language files that need to be included
$language_file = array('slideshow', 'document');
require_once '../inc/global.inc.php';
api_protect_course_script();
$path = Security::remove_XSS($_GET['curdirpath']);
@ -51,7 +45,6 @@ $originaltoolname = '<b>'.get_lang('SlideshowOptions').'</b>';
$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname );
Display::display_header($originalToolName, 'Doc');
$image_resizing = isset($_SESSION['image_resizing']) ? $_SESSION['image_resizing'] : null;
?>
@ -66,9 +59,7 @@ $image_resizing = isset($_SESSION['image_resizing']) ? $_SESSION['image_resizing
-->
</style>
<script language="JavaScript" type="text/javascript">
<!--
<script type="text/javascript">
function enableresizing() { //v2.0
document.options.width.disabled=false;
document.options.width.className='enabled_input';
@ -81,18 +72,13 @@ function disableresizing() { //v2.0
document.options.height.disabled=true;
document.options.height.className='disabled_input';
}
window.onload = <?php echo $image_resizing == 'resizing' ? 'enableresizing' : 'disableresizing'; ?>;
//-->
</script>
<?php
echo '<div class="actions">';
echo '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png',get_lang('BackTo').' '.get_lang('SlideShow'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
?>
@ -107,14 +93,11 @@ echo '</div>';
}
?>>
<?php echo get_lang('NoResizing');?>
</div>
<div><?php echo get_lang('NoResizingComment');?>
</div>
</div>
<div>
<div class="label">
<input class="checkbox" name="radio_resizing" type="radio" onClick="disableresizing()" value="autoresizing" <?php
@ -123,17 +106,15 @@ echo '</div>';
}
?>>
<?php echo get_lang('ResizingAuto');?>
</div>
<div><?php echo get_lang('ResizingAutoComment');?>
</div>
</div>
</div>
<div>
<div class="label">
<input class="checkbox" name="radio_resizing" type="radio" onClick="javascript: enableresizing();" value="resizing" <?php
if ($image_resizing == 'resizing') {
echo ' checked';
$width = $_SESSION['image_resizing_width'];

Write Preview
Loading…
Cancel
Save