hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1061 from jygaulier/fic-phras-9

Browse Source 
PHRAS-9 #close #time 4h
This commit is contained in:
Nicolas Le Goff
2014-04-23 12:14:59 +02:00
parent a7e1b2dde8 09a199b535
commit 09706a5389
1 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
View File

@@ -811,7 +811,7 @@ class Xmlhttp implements ControllerProviderInterface
public function OpenBranchJson(Application $app, Request $request) public function OpenBranchJson(Application $app, Request $request)
{ {
if (null === $lng = $request->get('lng')) { if (null === ($lng = $request->get('lng'))) {
$data = explode('_', $app['locale']); $data = explode('_', $app['locale']);
if (count($data) > 0) { if (count($data) > 0) {
$lng = $data[0]; $lng = $data[0];
@@ -822,6 +822,16 @@ class Xmlhttp implements ControllerProviderInterface
$sbid = (int) $request->get('sbid'); $sbid = (int) $request->get('sbid');
$lcoll = '';
$collections = $app['authentication']->getUser()->ACL()
->get_granted_base(array(), array($sbid)); // array(), $sbid);
foreach($collections as $collection)
{
$lcoll .= ($lcoll?",":"") . $collection->get_coll_id();
}
$site = $app['phraseanet.configuration']['main']['key'];
$usr_id = $app['authentication']->getUser()->get_id();
$tids = explode('.', $request->get('id')); $tids = explode('.', $request->get('id'));
$thid = implode('.', $tids); $thid = implode('.', $tids);
@@ -836,11 +846,14 @@ class Xmlhttp implements ControllerProviderInterface
if ($lthid == 1) { if ($lthid == 1) {
$dthid = str_replace('.', 'd', $thid); $dthid = str_replace('.', 'd', $thid);
$sql = 'SELECT COUNT(DISTINCT record_id) AS n $sql = 'SELECT COUNT(DISTINCT r.record_id) AS n
FROM thit WHERE value LIKE :like '; FROM (thit AS t INNER JOIN record AS r USING(record_id))
INNER JOIN collusr AS c ON c.site=:site AND c.usr_id=:usr_id AND r.coll_id=c.coll_id
WHERE t.value LIKE :like AND r.coll_id IN('.$lcoll.') AND (r.status^c.mask_xor)&c.mask_and=0';
$sqlparm = array(':like' => $dthid . '%', ':site'=>$site, ':usr_id'=>$usr_id);
$stmt = $connbas->prepare($sql); $stmt = $connbas->prepare($sql);
$stmt->execute(array(':like' => $dthid . '%')); $stmt->execute($sqlparm);
$rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
@@ -849,14 +862,16 @@ class Xmlhttp implements ControllerProviderInterface
} }
$sql = 'SELECT $sql = 'SELECT
SUBSTRING_INDEX(SUBSTR(value, ' . ($lthid + 1) . '), "d", 1) AS k , SUBSTRING_INDEX(SUBSTR(t.value, ' . ($lthid + 1) . '), "d", 1) AS k ,
COUNT(DISTINCT record_id) AS n COUNT(DISTINCT t.record_id) AS n
FROM thit FROM (thit AS t INNER JOIN record AS r USING(record_id))
WHERE value LIKE :like INNER JOIN collusr AS c ON c.site=:site AND c.usr_id=:usr_id AND r.coll_id=c.coll_id
WHERE t.value LIKE :like AND r.coll_id IN('.$lcoll.') AND (r.status^c.mask_xor)&c.mask_and=0
GROUP BY k'; GROUP BY k';
$sqlparm = array(':like' => $dthid . '%', ':site'=>$site, ':usr_id'=>$usr_id);
$stmt = $connbas->prepare($sql); $stmt = $connbas->prepare($sql);
$stmt->execute(array(':like' => $dthid . '%')); $stmt->execute($sqlparm);
$rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
@@ -866,14 +881,16 @@ class Xmlhttp implements ControllerProviderInterface
} elseif (strlen($thid) > 1) { } elseif (strlen($thid) > 1) {
$dthid = str_replace('.', 'd', $thid); $dthid = str_replace('.', 'd', $thid);
$sql = 'SELECT $sql = 'SELECT
SUBSTRING_INDEX(SUBSTR(value, ' . ($lthid) . '), \'d\', 1) AS k , SUBSTRING_INDEX(SUBSTR(t.value, ' . ($lthid) . '), \'d\', 1) AS k ,
COUNT(DISTINCT record_id) AS n COUNT(DISTINCT t.record_id) AS n
FROM thit FROM (thit AS t INNER JOIN record AS r USING(record_id))
WHERE value LIKE :like INNER JOIN collusr AS c ON c.site=:site AND c.usr_id=:usr_id AND r.coll_id=c.coll_id
WHERE t.value LIKE :like AND r.coll_id IN('.$lcoll.') AND (r.status^c.mask_xor)&c.mask_and=0
GROUP BY k'; GROUP BY k';
$sqlparm = array(':like' => $dthid . '%', ':site'=>$site, ':usr_id'=>$usr_id);
$stmt = $connbas->prepare($sql); $stmt = $connbas->prepare($sql);
$stmt->execute(array(':like' => $dthid . '%')); $stmt->execute($sqlparm);
$rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
@@ -882,14 +899,16 @@ class Xmlhttp implements ControllerProviderInterface
} }
$sql = 'SELECT $sql = 'SELECT
SUBSTRING_INDEX(SUBSTR(value, ' . ($lthid + 2) . '), \'d\', 1) AS k , SUBSTRING_INDEX(SUBSTR(t.value, ' . ($lthid + 2) . '), \'d\', 1) AS k ,
COUNT(DISTINCT record_id) AS n COUNT(DISTINCT t.record_id) AS n
FROM thit FROM (thit AS t INNER JOIN record AS r USING(record_id))
WHERE value LIKE :like INNER JOIN collusr AS c ON c.site=:site AND c.usr_id=:usr_id AND r.coll_id=c.coll_id
WHERE t.value LIKE :like AND r.coll_id IN('.$lcoll.') AND (r.status^c.mask_xor)&c.mask_and=0
GROUP BY k'; GROUP BY k';
$sqlparm = array(':like' => $dthid . '%', ':site'=>$site, ':usr_id'=>$usr_id);
$stmt = $connbas->prepare($sql); $stmt = $connbas->prepare($sql);
$stmt->execute(array(':like' => $dthid . '%')); $stmt->execute($sqlparm);
$rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
@@ -979,7 +998,7 @@ class Xmlhttp implements ControllerProviderInterface
$html .= '<UL ' . $field0 . '>' . "\n"; $html .= '<UL ' . $field0 . '>' . "\n";
if ($request->get('sortsy') && $request->get('lng')) { if ($request->get('sortsy') && $lng != '') {
ksort($tts, SORT_STRING); ksort($tts, SORT_STRING);
} elseif ($request->get('type') == 'C') { } elseif ($request->get('type') == 'C') {
$tts = array_reverse($tts); $tts = array_reverse($tts);