hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-11 16:59:15 +01:00
parent ab4e1f39e6 9560192996
commit b774bfce9d
12 changed files with 131 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Helper/User/Edit.php
View File

@@ -569,7 +569,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
$parm = $request->get_parms_from_serialized_datas($infos, 'user_infos');
if (!\mail::validateEmail($parm['email']))
if ($parm['email'] && !\mail::validateEmail($parm['email']))
throw new \Exception_InvalidArgument(_('Email addess is not valid'));
$user->set_firstname($parm['first_name'])
@@ -589,7 +589,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
public function apply_template()
{
$appbox = appbox::get_instance();
$appbox = \appbox::get_instance();
$session = $appbox->get_session();
$template = \User_adapter::getInstance($this->request->get('template'), $appbox);

14
lib/classes/record/adapter.class.php
View File

@@ -1145,8 +1145,11 @@ class record_adapter implements record_Interface, cache_cacheableInterface
try
{
$appbox = \appbox::get_instance();
$session = $appbox->get_session();
$connbas = connection::getPDOConnection($this->get_sbas_id());
$sql = 'DELETE FROM subdef WHERE record_id= :record_id AND name=:name';
$stmt = $connbas->prepare($sql);
$stmt->execute(
@@ -1165,7 +1168,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface
(:record_id, :name, :baseurl, :filename,
:width, :height, :mime, :path, :filesize, "1")';
echo "substitute subdef $name with $base_url ".$system_file->getPath()." ".$system_file->getFilename()."<br>";
$stmt = $connbas->prepare($sql);
$stmt->execute(array(
@@ -1183,11 +1185,10 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$sql = 'UPDATE record SET moddate=NOW() WHERE record_id=:record_id';
$stmt = $connbas->prepare($sql);
$stmt->execute(array(':record_id' => $this->get_record_id()));
$stmt->execute();
$stmt->closeCursor();
$this->delete_data_from_cache(self::CACHE_SUBDEFS);
if ($meta_writable)
{
$this->write_metas();
@@ -1199,15 +1200,14 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$type = $name == 'document' ? 'HD' : $name;
$session->get_logger($record->get_databox())
->log($record, Session_Logger::EVENT_SUBSTITUTE, $type, '');
$session->get_logger($this->get_databox())
->log($this, Session_Logger::EVENT_SUBSTITUTE, $type, '');
}
catch (Exception $e)
{
unset($e);
}
return $this;
}

2
lib/classes/set/export.class.php
View File

@@ -106,8 +106,6 @@ class set_export extends set_abstract
if ($record->is_grouping())
{
$xml = $record->get_xml();
foreach ($record->get_children() as $child_basrec)
{
$base_id = $child_basrec->get_base_id();

44
lib/classes/task/period/ftp.class.php
View File

@@ -563,6 +563,49 @@ class task_period_ftp extends task_appboxAbstract
}
}
if ($ftp_export['logfile'])
{
if($this->debug)
echo "\nlogfile \n";
$date = new DateTime();
$remote_file = $date->format('U');
$sql = 'SELECT filename, folder
FROM ftp_export_elements
WHERE ftp_export_id = :ftp_export_id
AND error = "0" AND done="1"';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':ftp_export_id'=>$id));
$rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$stmt->closeCursor();
$buffer = '#transfert finished '.$date->format(DATE_ATOM)."\n\n";
foreach ($rs as $row)
{
$filename = $row['filename'];
$folder = $row['folder'];
$root = $ftp_export['foldertocreate'];
$buffer .= $root .'/'. $folder . $filename . "\n";
}
$tmpfile = $registry->get('GV_RootPath') . 'tmp/tmpftpbuffer'.$date->format('U').'.txt';
file_put_contents($tmpfile, $buffer);
$remotefile = $date->format('U').'-transfert.log';
$ftp_client->chdir($ftp_export["destfolder"]);
$ftp_client->put($remotefile, $tmpfile);
unlink($tmpfile);
}
$ftp_client->close();
unset($ftp_client);
}
@@ -723,6 +766,7 @@ class task_period_ftp extends task_appboxAbstract
_('task::ftp:Status about your FTP transfert from %1$s to %2$s')
, $registry->get('GV_homeTitle'), $ftp_server
);
mail::ftp_sent($sendermail, $subject, $sender_message);
mail::ftp_receive($mail, $receiver_message);

2
lib/conf.d/bases_structure.xml
View File

@@ -2100,7 +2100,7 @@
<name>sendermail</name>
<type>char(255)</type>
<null></null>
<null>YES</null>
<extra></extra>
<default></default>

2
lib/vendor/Silex vendored

Submodule lib/vendor/Silex updated: ffe8f9fc49...95541210d0

2
templates/web/admin/editusers.twig
View File

@@ -438,7 +438,7 @@
</div>
{% if main_user is not empty and main_user.is_template is empty and main_user.is_special is empty %}
<div id="user_infos_tab" class="PNB" style="top:40px;">
<div id="user_infos_tab" class="PNB" style="top:40px;overflow:auto;">
<form id="user_infos_form">
<table>
<tr>

2
templates/web/common/preview.html
View File

@@ -1,7 +1,7 @@
{% import 'common/thumbnail.html' as thumbnail %}
{% if not_wrapped %}
{% if not_wrapped is defined and not_wrapped %}
{% set wrap = false %}
{% else %}
{% set wrap = true %}

53
templates/web/common/technical_datas.twig
View File

@@ -2,18 +2,23 @@
{% if record.is_grouping() == false %}
{% if document.get_width() %}
{% trans 'Largeur' %} :
{{document.get_width()}}
<br />
{% endif %}
{% set document = record.get_subdef('document') %}
{% if document %}
{% if document.get_width() %}
{% trans 'Largeur' %} :
{{document.get_width()}}
<br />
{% endif %}
{% if document.get_height() %}
{% trans 'Hauteur' %} :
{{document.get_height()}}
<br />
{% if document.get_height() %}
{% trans 'Hauteur' %} :
{{document.get_height()}}
<br />
{% endif %}
{% endif %}
{% if record.get_original_name() %}
{% trans 'Nom Original' %} :
{{record.get_original_name() }}
@@ -26,22 +31,26 @@
<br />
{% endif %}
{% if document.get_size() %}
{% trans 'Taille' %} :
{{document.get_size()|formatoctet}}
<br />
{% if document %}
{% if document.get_size() %}
{% trans 'Taille' %} :
{{document.get_size()|formatoctet}}
<br />
{% endif %}
{% endif %}
{% if record.get_type() == 'image' and document.get_width() and document.get_height() %}
{% trans 'Dimensions a l\'impression' %}
<br/>
{% set size_w = (document.get_width() * (254/100) / 300) %}
{% set size_h = (document.get_height() * (254/100) / 300) %}
300 dpi : {{size_w|round(1)}}x{{size_h|round(1)}} cm
{% set size_w = (document.get_width() * (254/100) / 72) %}
{% set size_h = (document.get_height() * (254/100) / 72) %}
<br/> 72 dpi : {{size_w|round(1)}}x{{size_h|round(1)}} cm
{% if document %}
{% if record.get_type() == 'image' and document.get_width() and document.get_height() %}
{% trans 'Dimensions a l\'impression' %}
<br/>
{% set size_w = (document.get_width() * (254/100) / 300) %}
{% set size_h = (document.get_height() * (254/100) / 300) %}
300 dpi : {{size_w|round(1)}}x{{size_h|round(1)}} cm
{% set size_w = (document.get_width() * (254/100) / 72) %}
{% set size_h = (document.get_height() * (254/100) / 72) %}
<br/> 72 dpi : {{size_w|round(1)}}x{{size_h|round(1)}} cm
{% endif %}
{% endif %}
{% if record.get_type() == 'video' %}

4
templates/web/prod/preview/caption.html
View File

@@ -3,7 +3,9 @@
{% if user.ACL().has_right_on_base(record.get_base_id, 'canmodifrecord') %}
<div class="edit_button" style="text-align:right">
<a href="#" onclick="editThis('IMGT','{{record.get_serialize_key()}}');">
<img style="vertical-align:middle" src="/skins/prod/000000/images/ppen_history.gif" /> {% trans 'action : editer' %}</a>
<img style="vertical-align:middle" src="/skins/prod/000000/images/ppen_history.gif" />
{% trans 'action : editer' %}
</a>
</div>
{% endif %}
<div style="text-align:center;">

2
templates/web/prod/preview/short_history.html
View File

@@ -55,7 +55,7 @@
{% endif %}
<span class="actor">
{% if user.ACL().has_right_on_base(record.get_base_id(), 'canreport') %}
{% if done['user'].get_id() != session.get_usr_id() %}
{% if done['user'] and done['user'].get_id() != session.get_usr_id() %}
{% set user_infos = done['user'].get_display_name() %}
{% trans %}report:: par {{ user_infos }}{% endtrans %}
{% endif %}

78
www/client/clientFeedBack.php
View File

@@ -39,7 +39,7 @@ switch ($parm['action'])
$output = module_client::getLanguage($lng);
break;
case 'PREVIEW':
$core = \bootstrap::getCore();
$twig = $core->getTwig();
@@ -55,59 +55,59 @@ switch ($parm['action'])
$train = '';
if ($record->is_from_reg())
$train = $twig->render('prod/preview/reg_train.html',
array(
'record' => $record,
'GV_rollover_reg_preview' => $registry->get('GV_rollover_reg_preview')
)
{
$train = $twig->render('prod/preview/reg_train.html', array(
'record' => $record,
'GV_rollover_reg_preview' => $registry->get('GV_rollover_reg_preview')
)
);
}
if ($record->is_from_basket() && $parm['roll'])
$train = $twig->render('prod/preview/basket_train.html',
array(
'record' => $record,
'GV_rollover_reg_preview' => $registry->get('GV_rollover_reg_preview')
)
{
$train = $twig->render('prod/preview/basket_train.html', array(
'record' => $record,
'GV_rollover_reg_preview' => $registry->get('GV_rollover_reg_preview')
)
);
}
if ($record->is_from_feed())
$train = $twig->render('prod/preview/feed_train.html',
array(
'record' => $record
)
{
$train = $twig->render('prod/preview/feed_train.html', array(
'record' => $record
)
);
}
$output = p4string::jsonencode(array(
"desc" => $twig->render('prod/preview/caption.html',
array(
$output = p4string::jsonencode(
array(
"desc" => $twig->render('prod/preview/caption.html', array(
'record' => $record
, 'highlight' => $parm['query']
, 'searchEngine' => $search_engine
)
)
)
, "html_preview" => $twig->render('common/preview.html',
array('record' => $record)
)
, "others" => $twig->render('prod/preview/appears_in.html',
array(
, "html_preview" => $twig->render('common/preview.html', array('record' => $record)
)
, "others" => $twig->render('prod/preview/appears_in.html', array(
'parents' => $record->get_grouping_parents(),
'baskets' => $record->get_container_baskets(),
'show_tooltips' => $registry->get('GV_rollover_reg_preview')
)
)
)
, "current" => $train
, "history" => $twig->render('prod/preview/short_history.html',
array('record' => $record)
)
, "popularity" => $twig->render('prod/preview/popularity.html',
array('record' => $record)
)
, "tools" => $twig->render('prod/preview/tools.html',
array('record' => $record)
)
, "pos" => $record->get_number()
, "title" => $record->get_title($parm['query'], $search_engine)
));
, "current" => $train
, "history" => $twig->render('prod/preview/short_history.html', array('record' => $record)
)
, "popularity" => $twig->render('prod/preview/popularity.html', array('record' => $record)
)
, "tools" => $twig->render('prod/preview/tools.html', array('record' => $record)
)
, "pos" => $record->get_number()
, "title" => $record->get_title($parm['query'], $search_engine)
)
);
break;
case 'HOME':
@@ -121,7 +121,7 @@ switch ($parm['action'])
break;
case 'BASKUPDATE':
$noview = 0;
$repository = $em->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */