@ -16,36 +16,36 @@ require_once __DIR__.'/../inc/global.inc.php';
api_protect_course_script();
api_block_anonymous_users();
if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) {
if ($_user['user_id'] != api_get_user_id() || api_get_user_id() == 0 || $_user['user_id'] == 0) {
api_not_allowed();
die();
}
if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
if (!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
api_not_allowed();
die();
}
if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){
if (!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami'])) {
api_not_allowed();
die();
}
//pixlr return
$filename=Security::remove_XSS($_GET['title']);//The user preferred file name of the image.
$extension=Security::remove_XSS($_GET['type']);//The image type, "pdx", "jpg", "bmp" or "png".
$urlcontents=Security::remove_XSS($_GET['image']);//A URL to the image on Pixlr.com server or the raw file post of the saved image.
$filename = Security::remove_XSS($_GET['title']); //The user preferred file name of the image.
$extension = Security::remove_XSS($_GET['type']); //The image type, "pdx", "jpg", "bmp" or "png".
$urlcontents = Security::remove_XSS($_GET['image']); //A URL to the image on Pixlr.com server or the raw file post of the saved image.
//make variables
$title = Database::escape_string(str_replace('_',' ',$filename));
$title = Database::escape_string(str_replace('_', ' ', $filename));
$current_session_id = api_get_session_id();
$groupId= api_get_group_id();
$relativeUrlPath=$_SESSION['paint_dir'];
$currentTool=$_SESSION['whereami'];
$groupId = api_get_group_id();
$relativeUrlPath = $_SESSION['paint_dir'];
$currentTool = $_SESSION['whereami'];
$dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$saveDir=$dirBaseDocuments.$_SESSION['paint_dir'];
$saveDir = $dirBaseDocuments.$_SESSION['paint_dir'];
$contents = file_get_contents($urlcontents);
@ -71,8 +71,8 @@ $filename = Security::remove_XSS($filename);
$filename = api_replace_dangerous_char($filename);
$filename = disable_dangerous_file($filename);
if (strlen(trim($filename))==0) {
echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
if (strlen(trim($filename)) == 0) {
echo "The title is empty"; //if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
exit;
}
@ -83,11 +83,11 @@ if ($contents === false) {
}
// Extension security
if($extension!= 'jpg' & & $extension!= 'png' & & $extension!= 'pxd'){
if ($extension != 'jpg' & & $extension != 'png' & & $extension != 'pxd') {
die();
}
if($extension=='pxd') {
echo "pxd file type does not supported";// not secure because check security headers and finfo() return Content-Type = application/octet-stream
if ($extension == 'pxd') {
echo "pxd file type does not supported"; // not secure because check security headers and finfo() return Content-Type = application/octet-stream
exit;
}
@ -101,9 +101,9 @@ if ($content_type[0] != "image") {
//Verify that the file is an image. Fileinfo method
$finfo = new finfo(FILEINFO_MIME);
$current_mime=$finfo->buffer($contents);
$current_mime = $finfo->buffer($contents);
finfo_close($finfo);
if(strpos($current_mime, 'image')===false) {
if (strpos($current_mime, 'image') === false) {
echo "Invalid mime type file";
exit;
}
@ -113,46 +113,46 @@ if(strpos($current_mime, 'image')===false) {
$paintFileName = $filename.'.'.$extension;
$title = $title.'.'.$extension;
if($currentTool=='document/createpaint'){
if ($currentTool == 'document/createpaint') {
//check save as and prevent rewrite an older file with same name
if (0 != $groupId){
$group_properties = GroupManager :: get_group_properties($groupId);
if (0 != $groupId) {
$group_properties = GroupManager :: get_group_properties($groupId);
$groupPath = $group_properties['directory'];
} else {
$groupPath ='';
$groupPath = '';
}
if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
if (file_exists($saveDir.'/'.$filename.'.'.$extension)) {
$i = 1;
while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
$paintFileName = $filename . '_' . $i . '.'.$extension;
$title = $filename . '_' . $i . '.'.$extension;
$paintFileName = $filename.'_'.$i.'.'.$extension;
$title = $filename.'_'.$i.'.'.$extension;
}
//
$documentPath = $saveDir.'/'.$paintFileName;
//add new document to disk
file_put_contents( $documentPath, $contents );
file_put_contents($documentPath, $contents);
//add document to database
$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
}elseif($currentTool=='document/editpaint'){
}elseif ($currentTool == 'document/editpaint') {
$documentPath = $saveDir.'/'.$paintFileName;
//add new document to disk
file_put_contents( $documentPath, $contents );
file_put_contents($documentPath, $contents);
//check path
if(!isset($_SESSION['paint_file'])){
if (!isset($_SESSION['paint_file'])) {
api_not_allowed();
die();
}
if($_SESSION['paint_file']==$paintFileName){
if ($_SESSION['paint_file'] == $paintFileName) {
$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
update_existing_document($_course, $document_id, filesize($documentPath), null);
api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
}else{
} else {
//add a new document
$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
@ -161,7 +161,7 @@ if($currentTool=='document/createpaint'){
//delete temporal file
$temp_file_2delete=$_SESSION['temp_realpath_image'];
$temp_file_2delete = $_SESSION['temp_realpath_image'];
unlink($temp_file_2delete);
//Clean sessions and return to Chamilo file list
@ -171,12 +171,12 @@ unset($_SESSION['whereami']);
unset($_SESSION['temp_realpath_image']);
if (!isset($_SESSION['exit_pixlr'])) {
$location=api_get_path(WEB_CODE_PATH).'document/document.php';
$location = api_get_path(WEB_CODE_PATH).'document/document.php';
echo '< script > window . parent . location . href = "'.$location.'" < / script > ';
api_not_allowed(true);
} else {
echo '< div align = "center" style = "padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;" > '.get_lang('PleaseStandBy').'< / div > ';
$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
$location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
echo '< script > window . parent . location . href = "'.$location.'" < / script > ';
unset($_SESSION['exit_pixlr']);
}
Julio Montoya
9 years ago
committed by