composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°880: fix the bugfix [r5737]

Browse Source 
- previous bugfix altered the cron frequency, this is not the desired behaviour, now the conf alter the lifetime of drafts's attachments
- apply for both inline images and attachments

SVN:trunk[5795]
This commit is contained in:
Bruno Da Silva
2018-05-16 13:03:15 +00:00
parent 7fb3d133e3
commit 02315b8aa1
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.class.inc.php
View File

@@ -1053,9 +1053,9 @@ class Config
'source_of_value' => '',
'show_in_conf_sample' => true,
),
'inline_image_garbage_collector_interval' => array(
'draft_attachments_lifetime' => array(
'type' => 'integer',
'description' => 'Frequency (in seconds) at which the inline image garbage collector will run.',
'description' => 'Lifetime (in seconds) of drafts\' attachments and inline images: after this duration, the garbage collector will delete them.',
'default' => 3600,
'value' => '',
'source_of_value' => '',

8
core/inlineimage.class.inc.php
View File

@@ -497,10 +497,10 @@ EOF
*/
class InlineImageGC implements iBackgroundProcess
{
public function GetPeriodicity()
{
return MetaModel::GetConfig()->Get('inline_image_garbage_collector_interval'); // run every definied time
}
public function GetPeriodicity()
{
return 3600; // Runs every hour
}
public function Process($iTimeLimit)
{

2
datamodels/2.x/itop-attachments/ajax.attachment.php
View File

@@ -67,7 +67,7 @@ try
{
$oDoc = utils::ReadPostedDocument('file');
$oAttachment = MetaModel::NewObject('Attachment');
$oAttachment->Set('expire', time() + 3600); // one hour...
$oAttachment->Set('expire', time() + MetaModel::GetConfig()->Get('draft_attachments_lifetime'));
$oAttachment->Set('temp_id', $sTempId);
$oAttachment->Set('item_class', $sObjClass);
$oAttachment->SetDefaultOrgId();

2
datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
View File

@@ -1455,7 +1455,7 @@ class ObjectController extends AbstractController
{
$oDocument = utils::ReadPostedDocument($sFieldName);
$oAttachment = MetaModel::NewObject('Attachment');
$oAttachment->Set('expire', time() + 3600); // one hour...
$oAttachment->Set('expire', time() + MetaModel::GetConfig()->Get('draft_attachments_lifetime')); // one hour...
$oAttachment->Set('temp_id', $sTempId);
$oAttachment->Set('item_class', $sObjectClass);
$oAttachment->SetDefaultOrgId();

4
pages/ajax.render.php
View File

@@ -2386,7 +2386,7 @@ EOF
$aDimensions = null;
$oDoc = InlineImage::ResizeImageToFit($oDoc, $aDimensions);
$oAttachment = MetaModel::NewObject('InlineImage');
$oAttachment->Set('expire', time() + 3600); // one hour...
$oAttachment->Set('expire', time() + MetaModel::GetConfig()->Get('draft_attachments_lifetime'));
$oAttachment->Set('temp_id', $sTempId);
$oAttachment->Set('item_class', $sObjClass);
$oAttachment->SetDefaultOrgId();
@@ -2427,7 +2427,7 @@ EOF
$aDimensions = null;
$oDoc = InlineImage::ResizeImageToFit($oDoc, $aDimensions);
$oAttachment = MetaModel::NewObject('InlineImage');
$oAttachment->Set('expire', time() + 3600); // one hour...
$oAttachment->Set('expire', time() + MetaModel::GetConfig()->Get('draft_attachments_lifetime'));
$oAttachment->Set('temp_id', $sTempId);
$oAttachment->Set('item_class', $sObjClass);
$oAttachment->SetDefaultOrgId();