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

Adding uncommited fixes

Browse Source
This commit is contained in:
Romain Neutron
2011-12-15 12:45:59 +01:00
parent eeb9fa0d47
commit 62deb6f4bf
3 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/mail.class.php
View File

@@ -255,8 +255,7 @@ class mail
$mail->ConfirmReadingTo = $reading_confirm_to; $mail->ConfirmReadingTo = $reading_confirm_to;
} }
$mail->MsgHTML(strip_tags($body)); $mail->MsgHTML(strip_tags($body, '<div><br>'));
// $mail->MsgHTML(p4string::cleanTags($body));
foreach ($files as $f) foreach ($files as $f)
{ {

17
lib/classes/module/prod.class.php
View File

@@ -49,7 +49,7 @@ class module_prod
'sbas_id' => $sbas_id 'sbas_id' => $sbas_id
); );
foreach($user->ACL()->get_granted_base(array(), array($databox->get_sbas_id())) as $coll) foreach ($user->ACL()->get_granted_base(array(), array($databox->get_sbas_id())) as $coll)
{ {
$selected = ($searchSet && $selected = ($searchSet &&
isset($searchSet->bases) && isset($searchSet->bases) &&
@@ -75,12 +75,19 @@ class module_prod
else else
$dates[$id] = array('sbas' => array($sbas_id), 'fieldname' => $name); $dates[$id] = array('sbas' => array($sbas_id), 'fieldname' => $name);
} }
if (isset($fields[$name]))
{
$fields[$name]['sbas'][] = $sbas_id;
}
else else
{ {
if (isset($fields[$name])) $fields[$name] = array(
$fields[$name]['sbas'][] = $sbas_id; 'sbas' => array($sbas_id)
else , 'fieldname' => $name
$fields[$name] = array('sbas' => array($sbas_id), 'fieldname' => $name, 'id' => $id); , 'type' => $meta->get_type()
, 'id' => $id
);
} }
} }

59
lib/classes/searchEngine/adapter/phrasea/engine.class.php
View File

@@ -56,7 +56,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract
/** /**
* *
* @var boolean * @var searchEngine_options
*/ */
protected $options = false; protected $options = false;
@@ -142,6 +142,8 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract
*/ */
public function set_options(searchEngine_options $options) public function set_options(searchEngine_options $options)
{ {
$this->options = $options;
$this->opt_search_type = (int) $options->get_search_type(); $this->opt_search_type = (int) $options->get_search_type();
$this->opt_bases = $options->get_bases(); $this->opt_bases = $options->get_bases();
$this->opt_fields = $options->get_fields(); $this->opt_fields = $options->get_fields();
@@ -394,34 +396,37 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract
$total_time = 0; $total_time = 0;
$sort = '';
if($this->options->get_sortby())
{
switch($this->options->get_sortord())
{
case searchEngine_options::SORT_MODE_ASC:
$sort = '+';
break;
case searchEngine_options::SORT_MODE_DESC:
default:
$sort = '-';
break;
}
$sort .= '0' . $this->options->get_sortby();
}
foreach ($this->queries as $sbas_id => $qry) foreach ($this->queries as $sbas_id => $qry)
{ {
if ($this->opt_search_type == 1) $this->results[$sbas_id] = phrasea_query2(
{ $session->get_ses_id()
$this->results[$sbas_id] = phrasea_query2( , $sbas_id
$session->get_ses_id() , $this->colls[$sbas_id]
, $sbas_id , $this->arrayq[$sbas_id]
, $this->colls[$sbas_id] , $registry->get('GV_sit')
, $this->arrayq[$sbas_id] , (string) $session->get_usr_id()
, $registry->get('GV_sit') , false
, (string) $session->get_usr_id() , $this->opt_search_type == 1 ? PHRASEA_MULTIDOC_REGONLY : PHRASEA_MULTIDOC_DOCONLY
, false , $sort
, PHRASEA_MULTIDOC_REGONLY );
);
}
else
{
$this->results[$sbas_id] = phrasea_query2(
$session->get_ses_id()
, $sbas_id
, $this->colls[$sbas_id]
, $this->arrayq[$sbas_id]
, $registry->get('GV_sit')
, (string) $session->get_usr_id()
, false
, PHRASEA_MULTIDOC_DOCONLY
);
}
$total_time += $this->results[$sbas_id]['time_all']; $total_time += $this->results[$sbas_id]['time_all'];
if ($this->results[$sbas_id]) if ($this->results[$sbas_id])