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

Fix PHP warnings

Browse Source
1.10.x
Julio 10 years ago
parent 41fe5e14f7
commit e1f414e930
3 changed files with 27 additions and 29 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. 2
      main/document/edit_draw.php
  2. 27
      main/inc/lib/javascript/svgedit/extensions/savefile_config.php
  3. 27
      main/inc/lib/svg-edit/extensions/savefile_config.php

2
main/document/edit_draw.php
Unescape View File

@ -131,7 +131,7 @@ if (api_browser_support('svg')) {
$langsvgedit = api_get_language_isocode();
$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
$svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
$svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
?>
<script>
document.write('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');

27
main/inc/lib/javascript/svgedit/extensions/savefile_config.php
Unescape View File

@ -12,10 +12,9 @@
* @since 25/september/2010
*/
//Chamilo load libraries
require_once '../../../../../inc/global.inc.php';
//Add security from Chamilo
// Add security from Chamilo
api_protect_course_script();
api_block_anonymous_users();
@ -25,15 +24,15 @@ if(!isset($_POST['output_svg']) && !isset($_POST['output_png'])) {
}
$file = '';
$suffix = isset($_POST['output_svg'])?'svg':'png';
$suffix = isset($_POST['output_svg']) ? 'svg' : 'png';
if(isset($_POST['filename']) && strlen($_POST['filename']) > 0) {
if (isset($_POST['filename']) && strlen($_POST['filename']) > 0) {
$file = $_POST['filename'];
} else {
$file = 'image';
}
if($suffix == 'svg') {
if ($suffix == 'svg') {
$mime = 'image/svg+xml';
$contents = rawurldecode($_POST['output_svg']);
} else {
@ -44,27 +43,27 @@ if($suffix == 'svg') {
}
//get SVG-Edit values
$filename=$file;//from svg-edit
$extension=$suffix;// from svg-edit
$content=$contents;//from svg-edit
$filename = $file;//from svg-edit
$extension = $suffix;// from svg-edit
$content = $contents;//from svg-edit
$title = Database::escape_string(str_replace('_',' ',$filename));
//get Chamilo variables
if(!isset($_SESSION['draw_dir']) && !isset($_SESSION['whereami'])) {
if (!isset($_SESSION['draw_dir']) && !isset($_SESSION['whereami'])) {
api_not_allowed();//from Chamilo
die();
}
$current_session_id = api_get_session_id();
$groupId = api_get_group_id();
$relativeUrlPath=$_SESSION['draw_dir'];
$currentTool=$_SESSION['whereami'];
$groupId = api_get_group_id();
$relativeUrlPath = $_SESSION['draw_dir'];
$currentTool = $_SESSION['whereami'];
$dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$saveDir=$dirBaseDocuments.$_SESSION['draw_dir'];
//a bit title security
// a bit title security
$filename = addslashes(trim($filename));
$filename = Security::remove_XSS($filename);
@ -95,7 +94,7 @@ if (phpversion() >= '5.3' && extension_loaded('fileinfo')) {
*/
//checks if the file exists, then rename the new
if (file_exists($saveDir.'/'.$filename.$i.'.'.$extension) && $currentTool=='document/createdraw') {
if (file_exists($saveDir.'/'.$filename.'.'.$extension) && $currentTool=='document/createdraw') {
$message = get_lang('FileExistsChangeToSave');
$params = array(
'message' => $message,

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

@ -12,10 +12,9 @@
* @since 25/september/2010
*/
//Chamilo load libraries
require_once '../../../../../inc/global.inc.php';
//Add security from Chamilo
// Add security from Chamilo
api_protect_course_script();
api_block_anonymous_users();
@ -25,15 +24,15 @@ if(!isset($_POST['output_svg']) && !isset($_POST['output_png'])) {
}
$file = '';
$suffix = isset($_POST['output_svg'])?'svg':'png';
$suffix = isset($_POST['output_svg']) ? 'svg' : 'png';
if(isset($_POST['filename']) && strlen($_POST['filename']) > 0) {
if (isset($_POST['filename']) && strlen($_POST['filename']) > 0) {
$file = $_POST['filename'];
} else {
$file = 'image';
}
if($suffix == 'svg') {
if ($suffix == 'svg') {
$mime = 'image/svg+xml';
$contents = rawurldecode($_POST['output_svg']);
} else {
@ -44,27 +43,27 @@ if($suffix == 'svg') {
}
//get SVG-Edit values
$filename=$file;//from svg-edit
$extension=$suffix;// from svg-edit
$content=$contents;//from svg-edit
$filename = $file;//from svg-edit
$extension = $suffix;// from svg-edit
$content = $contents;//from svg-edit
$title = Database::escape_string(str_replace('_',' ',$filename));
//get Chamilo variables
if(!isset($_SESSION['draw_dir']) && !isset($_SESSION['whereami'])) {
if (!isset($_SESSION['draw_dir']) && !isset($_SESSION['whereami'])) {
api_not_allowed();//from Chamilo
die();
}
$current_session_id = api_get_session_id();
$groupId = api_get_group_id();
$relativeUrlPath=$_SESSION['draw_dir'];
$currentTool=$_SESSION['whereami'];
$groupId = api_get_group_id();
$relativeUrlPath = $_SESSION['draw_dir'];
$currentTool = $_SESSION['whereami'];
$dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$saveDir=$dirBaseDocuments.$_SESSION['draw_dir'];
//a bit title security
// a bit title security
$filename = addslashes(trim($filename));
$filename = Security::remove_XSS($filename);
@ -95,7 +94,7 @@ if (phpversion() >= '5.3' && extension_loaded('fileinfo')) {
*/
//checks if the file exists, then rename the new
if (file_exists($saveDir.'/'.$filename.$i.'.'.$extension) && $currentTool=='document/createdraw') {
if (file_exists($saveDir.'/'.$filename.'.'.$extension) && $currentTool=='document/createdraw') {
$message = get_lang('FileExistsChangeToSave');
$params = array(
'message' => $message,

Write Preview
Loading…
Cancel
Save