From cdcfc56713e3084532716c84fbcba458acb04f92 Mon Sep 17 00:00:00 2001 From: ywarnier Date: Thu, 21 Apr 2011 14:55:56 -0500 Subject: [PATCH] Minor - removed notices --- main/document/create_audio.php | 4 +++- main/document/document.inc.php | 36 ++++++++++++++++++--------------- main/document/slideshow.inc.php | 5 +++-- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/main/document/create_audio.php b/main/document/create_audio.php index 8788916aaa..8de0570ac2 100644 --- a/main/document/create_audio.php +++ b/main/document/create_audio.php @@ -382,6 +382,7 @@ function downloadMP3_google($filepath, $dir){ if(!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) { return; } + global $_course, $_user; $clean_title=trim($_POST['title']); $clean_text=trim($_POST['text']); @@ -438,6 +439,7 @@ function downloadMP3_pediaphone($filepath, $dir){ if(!isset($_POST['lang']) && !isset($_POST['text']) && !isset($_POST['title']) && !isset($filepath) && !isset($dir)) { return; } + global $_course, $_user; $clean_title=trim($_POST['title']); $clean_text=trim($_POST['text']); if(empty($clean_title) || empty($clean_text)){ @@ -484,7 +486,7 @@ function downloadMP3_pediaphone($filepath, $dir){ $url_pediaphon='http://www.pediaphon.org/~bischoff/radiopedia/sprich_multivoice_fr.cgi'; } - file_put_contents($documentPath, file_get_contents($url_pediaphon."?stimme=".$clean_voice."&inputtext=".urlencode($clean_text)."&speed=".$clean_speed."&go=Sprich"));///speed + file_put_contents($documentPath, file_get_contents($url_pediaphon."?stimme=".$clean_voices."&inputtext=".urlencode($clean_text)."&speed=".$clean_speed."&go=Sprich"));///speed //add document to database $current_session_id = api_get_session_id(); $groupId=$_SESSION['_gid']; diff --git a/main/document/document.inc.php b/main/document/document.inc.php index 0920e1f837..b4d169b543 100755 --- a/main/document/document.inc.php +++ b/main/document/document.inc.php @@ -110,7 +110,7 @@ function create_document_link($document_data, $show_as_icon = false) { $use_document_title = api_get_setting('use_document_title'); // Get the title or the basename depending on what we're using - if ($use_document_title == 'true' && $id['title'] != '') { + if ($use_document_title == 'true' && $document_data['title'] != '') { $title = $document_data['title']; } else { $title = basename($document_data['title']); @@ -170,7 +170,7 @@ function create_document_link($document_data, $show_as_icon = false) { if ($path == '/shared_folder') { $tooltip_title_alt = get_lang('UserFolders'); } elseif(strstr($path, 'shared_folder_session_')) { - $tooltip_title_alt = get_lang('UserFolders').' ('.api_get_session_name($current_session_id).')'; + $tooltip_title_alt = get_lang('UserFolders').' ('.api_get_session_name().')'; } elseif(strstr($tooltip_title, 'sf_user_')) { $userinfo = Database::get_user_info_from_id(substr($tooltip_title, 8)); $tooltip_title_alt = get_lang('UserFolder').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']); @@ -409,27 +409,29 @@ 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 = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + // gradebook category doesn't seem to be taken into account + //$modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; } else { if (api_get_session_id()) { if ($document_data['session_id'] == api_get_session_id()) { if ($extension=='svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; } elseif($extension=='png' || $extension=='jpg' || $extension=='jpeg' || $extension=='bmp' || $extension=='gif' ||$extension=='pxd' && api_get_setting('enabled_support_pixlr') == 'true'){ - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; } else { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; } } else { $modify_icons .= ' '.Display::return_icon('edit_na.png', get_lang('Edit'),array(), 22).''; } } else { if ($extension=='svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; } elseif($extension=='png' || $extension=='jpg' || $extension=='jpeg' || $extension=='bmp' || $extension=='gif' ||$extension=='pxd' && api_get_setting('enabled_support_pixlr') == 'true'){ - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; } else { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; } } } @@ -441,12 +443,12 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0, } else { if (api_get_session_id()) { if ($document_data['session_id'] == api_get_session_id()) { - $modify_icons .= ' '.Display::return_icon('move.png', get_lang('Move'),array(), 22).''; + $modify_icons .= ' '.Display::return_icon('move.png', get_lang('Move'),array(), 22).''; } else { $modify_icons .= ' '.Display::return_icon('move_na.png', get_lang('Move'),array(), 22).''; } } else { - $modify_icons .= ' '.Display::return_icon('move.png', get_lang('Move'),array(), 22).''; + $modify_icons .= ' '.Display::return_icon('move.png', get_lang('Move'),array(), 22).''; } if (api_is_allowed_to_edit() || api_is_platform_admin()) { if ($visibility_icon=='invisible'){ @@ -454,7 +456,7 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0, }else{ $tip_visibility=get_lang('Hide'); } - $modify_icons .= ' '.Display::return_icon($visibility_icon.'.png', $tip_visibility,'',22).''; + $modify_icons .= ' '.Display::return_icon($visibility_icon.'.png', $tip_visibility,'',22).''; } } @@ -462,19 +464,21 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0, $modify_icons .= ' '.Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'),array(), 22); } else { if (isset($_GET['curdirpath']) && $_GET['curdirpath']=='/certificates' && DocumentManager::get_default_certificate_id(api_get_course_id())==$id) { - $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; + //$modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; + $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; } else { if ($is_certificate_mode) { - $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; + //$modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; + $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; } else { if (api_get_session_id()) { if ($document_data['session_id'] == api_get_session_id()) { - $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; + $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; } else { $modify_icons .= ' '.Display::return_icon('delete_na.png', get_lang('ThisFolderCannotBeDeleted'),array(), 22); } } else { - $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; + $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('Delete'),array(), 22).''; } } } diff --git a/main/document/slideshow.inc.php b/main/document/slideshow.inc.php index ff396ca54f..79f0bcc527 100755 --- a/main/document/slideshow.inc.php +++ b/main/document/slideshow.inc.php @@ -57,8 +57,9 @@ function resize_image($image, $target_width, $target_height, $slideshow = 0) { $result[] = $new_sizes['height']; $result[] = $new_sizes['width']; } else { - $result[] = $image_height; - $result[] = $image_width; + $size = api_getimagesize($image); + $result[] = $size[1]; + $result[] = $size[0]; } return $result; }