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

Feature #2044 rename api function support_svg by api_support_svg, add some messages error

Browse Source
skala
Juan Carlos Raña 15 years ago
parent ec81bf5e8a
commit e336f49c21
8 changed files with 52 additions and 69 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. 28
      main/document/create_drawing.php
  2. 4
      main/document/document.inc.php
  3. 2
      main/document/document.php
  4. 34
      main/document/edit_drawing.php
  5. 2
      main/inc/lib/main_api.lib.php
  6. 22
      main/inc/lib/svg-edit/extensions/fileopen.php
  7. 27
      main/inc/lib/svg-edit/extensions/filesave.php
  8. 2
      main/newscorm/resourcelinker.inc.php

28
main/document/create_drawing.php
Unescape View File

@ -28,9 +28,17 @@ $nameTools = get_lang('Draw');
api_protect_course_script();
api_block_anonymous_users();
if (!isset($_GET['dir'])){
api_not_allowed(true);
}
/* Constants and variables */
//path for svg-edit save
$_SESSION['draw_dir']=Security::remove_XSS($_GET['dir']);
if($_SESSION['draw_dir']=='/'){
$_SESSION['draw_dir']='';
}
$dir = isset($_GET['dir']) ? Security::remove_XSS($_GET['dir']) : Security::remove_XSS($_POST['dir']);
$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@ -117,13 +125,6 @@ if (isset ($group)) {
}
$dir_acum .= $dir_array[$i].'/';
}
//path for svg-edit save
$_SESSION['draw_dir']=Security::remove_XSS($_GET['dir']);
if($_SESSION['draw_dir']=='/'){
$_SESSION['draw_dir']='';
}
//
Display :: display_header($nameTools, 'Doc');
@ -131,8 +132,15 @@ echo '<div class="actions">';
echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['dir']).'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview')).get_lang('BackTo').' '.get_lang('DocumentsOverview').'</a>';
echo '</div>';
echo '<iframe style=\'height: 500px; width: 100%;\' scrolling=\'no\' frameborder=\'0\' src=\''.api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php\'>';
echo '</iframe>';
if (api_support_svg()){
echo '<iframe style=\'height: 500px; width: 100%;\' scrolling=\'no\' frameborder=\'0\' src=\''.api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php\'>';
echo '</iframe>';
}else{
Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
}
Display :: display_footer();
?>

4
main/document/document.inc.php
Unescape View File

@ -125,7 +125,7 @@ function create_document_link($www, $title, $path, $filetype, $size, $visibility
$ext = strtolower($ext[sizeof($ext) - 1]);
// "htmlfiles" are shown in a frameset
if ($ext == 'htm' || $ext == 'html' || $ext == 'gif' || $ext == 'jpg' || $ext == 'jpeg' || $ext == 'png' || $ext == 'pdf' || $ext == 'swf' || $ext == 'mp3' || ($ext == 'svg' || $ext =='svgz' && support_svg())) {
if ($ext == 'htm' || $ext == 'html' || $ext == 'gif' || $ext == 'jpg' || $ext == 'jpeg' || $ext == 'png' || $ext == 'pdf' || $ext == 'swf' || $ext == 'mp3' || ($ext == 'svg' || $ext =='svgz' && api_support_svg())) {
$url = 'showinframes.php?'.api_get_cidreq().'&amp;file='.$url_path.$req_gid;
} else {
// url-encode for problematic characters (we may not call them dangerous characters...)
@ -300,7 +300,7 @@ function build_edit_icons($curdirpath, $type, $path, $visibility, $id, $is_templ
if ($is_certificate_mode) {
$modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'&selectcat='.$gradebook_category.'"><img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="" /></a>';
}else {
if($extension=='svg' && support_svg()){
if($extension=='svg' && api_support_svg()){
$modify_icons = '<a href="edit_drawing.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'"><img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="" /></a>';
}else{
$modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'"><img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="" /></a>';

2
main/document/document.php
Unescape View File

@ -822,7 +822,7 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
<?php
// Create new draw
if (support_svg()){
if (api_support_svg()){
?>
<a href="create_drawing.php?<?php echo api_get_cidreq(); ?>&dir=<?php echo $curdirpathurl.$req_gid; ?>">
<?php Display::display_icon('draw_new.png', get_lang('Draw')); echo get_lang('Draw'); ?></a>&nbsp;

34
main/document/edit_drawing.php
Unescape View File

@ -22,9 +22,24 @@ $this_section = SECTION_COURSES;
require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
//
api_protect_course_script();
api_block_anonymous_users();
if (!isset($_GET['curdirpath']) || !isset($_GET['file'])){
api_not_allowed(true);
}
/* Constants & Variables */
//path for svg-edit save
$_SESSION['draw_dir']=Security::remove_XSS($_GET['curdirpath']);
if($_SESSION['draw_dir']=='/'){
$_SESSION['draw_dir']='';
}
$_SESSION['draw_file']=basename(Security::remove_XSS($_GET['file']));
//
$get_file = Security::remove_XSS($_GET['file']);
$file = basename($get_file);
@ -89,23 +104,22 @@ if (!$is_allowedToEdit) {
api_not_allowed(true);
}
event_access_tool(TOOL_DOCUMENT);
//path for svg-edit save
$_SESSION['draw_dir']=Security::remove_XSS($_GET['curdirpath']);
if($_SESSION['draw_dir']=='/'){
$_SESSION['draw_dir']='';
}
$_SESSION['draw_file']=basename(Security::remove_XSS($_GET['file']));
Display :: display_header($nameTools, 'Doc');
echo '<div class="actions">';
echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview')).get_lang('BackTo').' '.get_lang('DocumentsOverview').'</a>';
echo '</div>';
echo '<iframe style=\'height: 500px; width: 100%;\' scrolling=\'no\' frameborder=\'0\' src=\''.api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?url=../../../../courses/'.$courseDir.$dir.$file.'\'>';
echo '</iframe>';
if (api_support_svg()){
echo '<iframe style=\'height: 500px; width: 100%;\' scrolling=\'no\' frameborder=\'0\' src=\''.api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?url=../../../../courses/'.$courseDir.$dir.$file.'\'>';
echo '</iframe>';
}else{
Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
}
Display::display_footer();
?>

2
main/inc/lib/main_api.lib.php
Unescape View File

@ -4648,7 +4648,7 @@ function api_get_template($path_type = 'rel') {
*
* @author Juan Carlos Raña Trabado
*/
function support_svg() {
function api_support_svg() {
$browser_info = get_browser($_SERVER["HTTP_USER_AGENT"], true);
//print_r($browser_info);
if (($browser_info[browser]=='IE' && $browser_info[majorver]>8) || ($browser_info[browser]=='Firefox' && $browser_info[majorver]>1)||($browser_info[browser]=='Safari' && $browser_info[majorver]>3) || $browser_info[browser]=='Chrome' || ($browser_info[browser]=='Opera' && $browser_info[majorver]>9)){

22
main/inc/lib/svg-edit/extensions/fileopen.php
Unescape View File

@ -17,29 +17,9 @@ require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
api_protect_course_script();
api_block_anonymous_users();
//Adding Chamilo style because Display :: display_error_message() dont run well.
?>
<style type="text/css">
<!--
.error-message {
position: relative;
margin-top: 10px;
margin-bottom: 10px;
border-width: 1px;
border-style: solid;
-moz-border-radius: 10px;
padding: 6px;
border: 1px solid #FF0000;
color: #440000;
background-color: #FFD1D1;
min-height: 30px;
}
-->
</style>
<?php
if(!isset($_FILES['svg_file']['tmp_name'])) {
echo '<div class="error-message">'. get_lang('lang_no_access_here').'</div>';// from Chamilo
api_not_allowed(false);//from Chamilo
die();
}
?>

27
main/inc/lib/svg-edit/extensions/filesave.php
Unescape View File

@ -19,29 +19,8 @@ require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
api_protect_course_script();
api_block_anonymous_users();
//Adding Chamilo style because Display :: display_error_message() dont run well.
?>
<style type="text/css">
<!--
.error-message {
position: relative;
margin-top: 10px;
margin-bottom: 10px;
border-width: 1px;
border-style: solid;
-moz-border-radius: 10px;
padding: 6px;
border: 1px solid #FF0000;
color: #440000;
background-color: #FFD1D1;
min-height: 30px;
}
-->
</style>
<?php
if(!isset($_POST['output_svg']) && !isset($_POST['output_png'])) {
echo '<div class="error-message">'. get_lang('lang_no_access_here').'</div>';// from Chamilo
api_not_allowed(false);//from Chamilo
die();
}
@ -81,7 +60,8 @@ $title = Database::escape_string(str_replace('_',' ',$filename));
if(!isset($_SESSION['draw_dir']) ||!isset($_SESSION['whereami']) )
{
die();
api_not_allowed(false);//from Chamilo
die();
}
$current_session_id = api_get_session_id();
@ -136,6 +116,7 @@ if($currentTool=='document/createdraw'){
//check path
if(!isset($_SESSION['draw_file'])){
api_not_allowed(false);//from Chamilo
die();
}
if($_SESSION['draw_file']==$drawFileName){

2
main/newscorm/resourcelinker.inc.php
Unescape View File

@ -271,7 +271,7 @@ function display_addedresource_link($type, $id, $style = '') {
$ext = explode('.', $filename);
$ext = strtolower($ext[sizeof($ext)-1]);
$myrow['path'] = rawurlencode($myrow['path']);
if (support_svg()){
if (api_support_svg()){
$in_frames = in_array($ext, array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png', 'svg','svgz'));
}else{
$in_frames = in_array($ext, array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png'));

Write Preview
Loading…
Cancel
Save