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

Add image extra field (in session) as an Asset instead of app/upload

Browse Source
pull/3768/head
Julio Montoya 5 years ago
parent 8fa5f3d611
commit 0f1c8c594f
4 changed files with 43 additions and 42 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. 71
      public/main/inc/lib/extra_field_value.lib.php
  2. 3
      public/main/inc/lib/sessionmanager.lib.php
  3. 4
      public/main/session/session_add.php
  4. 7
      src/CoreBundle/Entity/Asset.php

71
public/main/inc/lib/extra_field_value.lib.php
Unescape View File

@ -2,11 +2,14 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Asset;
use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
use Chamilo\CoreBundle\Entity\ExtraFieldRelTag;
use Chamilo\CoreBundle\Entity\ExtraFieldValues;
use Chamilo\CoreBundle\Entity\Tag;
use Chamilo\CoreBundle\Framework\Container;
use ChamiloSession as Session;
use Symfony\Component\HttpFoundation\File\UploadedFile;
/**
* Class ExtraFieldValue
@ -125,7 +128,7 @@ class ExtraFieldValue extends Model
//only admins should be able to add those values
if (!api_is_platform_admin(true, true)) {
// although if not admin but sent through a CLI script, we should accept it as well
if (PHP_SAPI != 'cli') {
if (PHP_SAPI !== 'cli') {
continue; //not a CLI script, so don't write the value to DB
}
}
@ -133,8 +136,8 @@ class ExtraFieldValue extends Model
}
$field_variable = $fieldDetails['variable'];
if ($onlySubmittedFields && !isset($params['extra_'.$field_variable])) {
$fieldVariableWithExtra = 'extra_'.$field_variable;
if ($onlySubmittedFields && !isset($params[$fieldVariableWithExtra])) {
continue;
}
@ -151,8 +154,8 @@ class ExtraFieldValue extends Model
}
$value = '';
if (isset($params['extra_'.$field_variable])) {
$value = $params['extra_'.$field_variable];
if (isset($params[$fieldVariableWithExtra])) {
$value = $params[$fieldVariableWithExtra];
}
$extraFieldInfo = $this->getExtraField()->get_handler_field_info_by_field_variable($field_variable);
@ -196,7 +199,6 @@ class ExtraFieldValue extends Model
}
$em = Database::getManager();
$currentTags = $em
->getRepository(ExtraFieldRelTag::class)
->findBy([
@ -210,7 +212,6 @@ class ExtraFieldValue extends Model
$em->flush();
$tagValues = is_array($value) ? $value : [$value];
$tags = [];
foreach ($tagValues as $tagValue) {
if (empty($tagValue)) {
continue;
@ -258,7 +259,8 @@ class ExtraFieldValue extends Model
break;
case ExtraField::FIELD_TYPE_FILE_IMAGE:
$fileDir = $fileDirStored = '';
switch ($this->type) {
/*switch ($this->type) {
case 'course':
$fileDir = api_get_path(SYS_UPLOAD_PATH)."courses/";
$fileDirStored = "courses/";
@ -275,31 +277,40 @@ class ExtraFieldValue extends Model
$fileDir = api_get_path(SYS_UPLOAD_PATH).'work/';
$fileDirStored = 'work/';
break;
}
}*/
$fileName = ExtraField::FIELD_TYPE_FILE_IMAGE."_{$params['item_id']}.png";
if (!file_exists($fileDir)) {
mkdir($fileDir, $dirPermissions, true);
}
if (!empty($value['tmp_name']) && isset($value['error']) && 0 == $value['error']) {
// Crop the image to adjust 16:9 ratio
if (isset($params['extra_'.$field_variable.'_crop_result'])) {
$crop = new Image($value['tmp_name']);
$crop->crop($params['extra_'.$field_variable.'_crop_result']);
$file = new UploadedFile($value['tmp_name'], $fileName, null, null, true);
$em = Database::getManager();
$asset = new Asset();
$asset
->setCategory(Asset::EXTRA_FIELD)
->setTitle($fileName)
->setFile($file)
->setCompressed(true)
;
$cropVariable = 'extra_'.$field_variable.'_crop_result';
if (isset($params[$cropVariable])) {
$asset->setCrop($params[$cropVariable]);
}
$em->persist($asset);
$em->flush();
$assetId = $asset->getId();
//$repo = Container::getAssetRepository();
if ($assetId) {
// Crop the image to adjust 16:9 ratio
/*$imageExtraField = new Image($value['tmp_name']);
$imageExtraField->resize(400);
$imageExtraField->send_image($fileDir.$fileName, -1, 'png');*/
$newParams = [
'item_id' => $params['item_id'],
'field_id' => $extraFieldInfo['id'],
'value' => $assetId,
'comment' => $comment,
];
$this->save($newParams);
}
$imageExtraField = new Image($value['tmp_name']);
$imageExtraField->resize(400);
$imageExtraField->send_image($fileDir.$fileName, -1, 'png');
$newParams = [
'item_id' => $params['item_id'],
'field_id' => $extraFieldInfo['id'],
'value' => $fileDirStored.$fileName,
'comment' => $comment,
];
$this->save($newParams);
}
break;
case ExtraField::FIELD_TYPE_FILE:

3
public/main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -298,8 +298,6 @@ class SessionManager
$em = Database::getManager();
$em->persist($session);
$em->flush();
//$session_id = Database::insert($tbl_session, $values);
$session_id = $session->getId();
$duration = (int) $duration;
@ -326,7 +324,6 @@ class SessionManager
$extraFields['item_id'] = $session_id;
$sessionFieldValue = new ExtraFieldValue('session');
$sessionFieldValue->saveFieldValues($extraFields);
/*
Sends a message to the user_id = 1

4
public/main/session/session_add.php
Unescape View File

@ -19,10 +19,6 @@ api_protect_limit_for_session_admin();
$formSent = 0;
$errorMsg = '';
// Crop picture plugin for session images
//$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
//$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
$interbreadcrumb[] = [
'url' => 'session_list.php',
'name' => get_lang('Session list'),

7
src/CoreBundle/Entity/Asset.php
Unescape View File

@ -25,6 +25,7 @@ class Asset
public const SCORM = 'scorm';
public const WATERMARK = 'watermark';
public const CSS = 'css';
public const EXTRA_FIELD = 'extra_field';
/**
* @ORM\Id
@ -108,11 +109,9 @@ class Asset
protected $size;
/**
* @var string
*
* @ORM\Column(name="crop", type="string", length=255, nullable=true)
*/
protected $crop;
protected ?string $crop;
/**
* @var array
@ -188,8 +187,6 @@ class Asset
/**
* @param string $crop
*
* @return $this
*/
public function setCrop($crop): self
{

Write Preview
Loading…
Cancel
Save