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

Hot spot improve code

Browse Source 
- Remove use of globals
- New function getHotSpotFolderInCourse()
- resizePicture() function is private
- image resize is executed after the uploadPicture function
- format code
remotes/angel/1.11.x
jmontoyaa 8 years ago
parent a9c582955d
commit e5f386c719
3 changed files with 69 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. 24
      main/exercise/Annotation.php
  2. 14
      main/exercise/hotspot.class.php
  3. 100
      main/exercise/question.class.php

24
main/exercise/Annotation.php
Unescape View File

@ -69,32 +69,24 @@ class Annotation extends Question
/**
* @param FormValidator $form
* @param null $objExercise
* @return null|false
* @return bool
*/
public function processCreation($form, $objExercise = null)
{
$fileInfo = $form->getSubmitValue('imageUpload');
$courseInfo = api_get_course_info();
parent::processCreation($form, $objExercise);
if (!empty($fileInfo['tmp_name'])) {
$this->uploadPicture($fileInfo['tmp_name'], $fileInfo['name']);
$documentPath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
$picturePath = $documentPath.'/images';
// fixed width ang height
if (!file_exists($picturePath.'/'.$this->picture)) {
return false;
$result = $this->uploadPicture($fileInfo['tmp_name']);
if ($result) {
$this->weighting = $form->getSubmitValue('weighting');
$this->save();
return true;
}
$this->resizePicture('width', 800);
$this->weighting = $form->getSubmitValue('weighting');
$this->save();
return true;
return false;
}
return false;
}
/**

14
main/exercise/hotspot.class.php
Unescape View File

@ -76,27 +76,23 @@ class HotSpot extends Question
/**
* @param FormValidator $form
* @param null $objExercise
* @return null|false
* @return bool
*/
public function processCreation($form, $objExercise = null)
{
$file_info = $form->getSubmitValue('imageUpload');
$_course = api_get_course_info();
parent::processCreation($form, $objExercise);
if (!empty($file_info['tmp_name'])) {
$this->uploadPicture($file_info['tmp_name'], $file_info['name']);
$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$picturePath = $documentPath.'/images';
// fixed width ang height
if (file_exists($picturePath.'/'.$this->getPictureFilename())) {
$this->resizePicture('width', 800);
$result = $this->uploadPicture($file_info['tmp_name']);
if ($result) {
$this->save();
return true;
} else {
return false;
}
}
return false;
}
function createAnswersForm($form)

100
main/exercise/question.class.php
Unescape View File

@ -266,7 +266,7 @@ abstract class Question
public function selectPicturePath()
{
if (!empty($this->picture)) {
return api_get_path(WEB_COURSE_PATH).$this->course['path'].'/document/images/'.$this->getPictureFilename();
return api_get_path(WEB_COURSE_PATH).$this->course['directory'].'/document/images/'.$this->getPictureFilename();
}
return '';
@ -576,50 +576,53 @@ abstract class Question
}
}
/**
* Get default hot spot folder in documents
* @return string
*/
public function getHotSpotFolderInCourse()
{
if (empty($this->course) || empty($this->course['directory'])) {
// Stop everything if course is not set.
api_not_allowed();
}
$pictureAbsolutePath = api_get_path(SYS_COURSE_PATH).$this->course['directory'].'/document/images/';
$picturePath = basename($pictureAbsolutePath);
if (!is_dir($picturePath)) {
create_unexisting_directory(
$this->course,
api_get_user_id(),
0,
0,
0,
dirname($pictureAbsolutePath),
'/'.$picturePath,
$picturePath
);
}
return $pictureAbsolutePath;
}
/**
* adds a picture to the question
*
* @param string $Picture - temporary path of the picture to upload
* @param string $PictureName - Name of the picture
* @param string $picturePath
* @param string $picture - temporary path of the picture to upload
*
* @return boolean - true if uploaded, otherwise false
*
* @author Olivier Brouckaert
*/
public function uploadPicture($Picture, $PictureName, $picturePath = null)
public function uploadPicture($picture)
{
if (empty($picturePath)) {
global $picturePath;
}
if (!file_exists($picturePath)) {
if (mkdir($picturePath, api_get_permissions_for_new_directories())) {
// document path
$documentPath = api_get_path(SYS_COURSE_PATH).$this->course['path'].'/document';
$path = str_replace($documentPath, '', $picturePath);
$title_path = basename($picturePath);
$doc_id = add_document(
$this->course,
$path,
'folder',
0,
$title_path
);
api_item_property_update(
$this->course,
TOOL_DOCUMENT,
$doc_id,
'FolderCreated',
api_get_user_id()
);
}
}
$picturePath = $this->getHotSpotFolderInCourse();
// if the question has got an ID
if ($this->id) {
$pictureFilename = self::generatePictureName();
$img = new Image($Picture);
$img = new Image($picture);
$img->send_image($picturePath.'/'.$pictureFilename, -1, 'jpg');
$document_id = add_document(
$this->course,
@ -628,16 +631,25 @@ abstract class Question
filesize($picturePath.'/'.$pictureFilename),
$pictureFilename
);
$this->picture = $document_id;
if ($document_id) {
return api_item_property_update(
$this->picture = $document_id;
if (!file_exists($picturePath.'/'.$pictureFilename)) {
return false;
}
api_item_property_update(
$this->course,
TOOL_DOCUMENT,
$document_id,
'DocumentAdded',
api_get_user_id()
);
$this->resizePicture('width', 800);
return true;
}
}
@ -668,9 +680,9 @@ abstract class Question
*
* @author Toon Keppens
*/
public function resizePicture($Dimension, $Max)
private function resizePicture($Dimension, $Max)
{
global $picturePath;
$picturePath = $this->getHotSpotFolderInCourse();
// if the question has an ID
if ($this->id) {
@ -734,7 +746,7 @@ abstract class Question
*/
public function removePicture()
{
global $picturePath;
$picturePath = $this->getHotSpotFolderInCourse();
// if the question has got an ID and if the picture exists
if ($this->id) {
@ -803,17 +815,17 @@ abstract class Question
* For example, if we first show a confirmation box.
*
* @author Olivier Brouckaert
* @param string $Picture - temporary path of the picture to move
* @param string $PictureName - Name of the picture
* @param string $picture - temporary path of the picture to move
* @param string $pictureName - Name of the picture
*/
public function setTmpPicture($Picture, $PictureName)
public function setTmpPicture($picture, $pictureName)
{
global $picturePath;
$PictureName = explode('.', $PictureName);
$Extension = $PictureName[sizeof($PictureName) - 1];
$picturePath = $this->getHotSpotFolderInCourse();
$pictureName = explode('.', $pictureName);
$Extension = $pictureName[sizeof($pictureName) - 1];
// saves the picture into a temporary file
@move_uploaded_file($Picture, $picturePath . '/tmp.' . $Extension);
@move_uploaded_file($picture, $picturePath . '/tmp.' . $Extension);
}
/**

Write Preview
Loading…
Cancel
Save