diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/fulltext.php | 50 | ||||
| -rw-r--r-- | inc/media.php | 12 |
2 files changed, 56 insertions, 6 deletions
diff --git a/inc/fulltext.php b/inc/fulltext.php index b10cbde8e..a0be280bf 100644 --- a/inc/fulltext.php +++ b/inc/fulltext.php @@ -153,6 +153,56 @@ function ft_backlinks($id){ } /** + * Returns the pages that use a given media file + * + * Does a quick lookup with the fulltext index, then + * evaluates the instructions of the found pages + * + * Aborts after $max found results + */ +function ft_mediause($id,$max){ + global $conf; + $swfile = DOKU_INC.'inc/lang/'.$conf['lang'].'/stopwords.txt'; + $stopwords = @file_exists($swfile) ? file($swfile) : array(); + + if(!$max) $max = 1; // need to find at least one + + $result = array(); + + // quick lookup of the mediafile + $media = noNS($id); + $matches = idx_lookup(idx_tokenizer($media,$stopwords)); + $docs = array_keys(ft_resultCombine(array_values($matches))); + if(!count($docs)) return $result; + + // go through all found pages + $found = 0; + $pcre = preg_quote($media,'/'); + foreach($docs as $doc){ + $ns = getNS($doc); + preg_match_all('/\{\{([^|}]*'.$pcre.'[^|}]*)(|[^}]+)?\}\}/i',rawWiki($doc),$matches); + foreach($matches[1] as $img){ + $img = trim($img); + if(preg_match('/^https?:\/\//i',$img)) continue; // skip external images + list($img) = explode('?',$img); // remove any parameters + resolve_mediaid($ns,$img,$exists); // resolve the possibly relative img + + if($img == $id){ // we have a match + $result[] = $doc; + $found++; + break; + } + } + if($found >= $max) break; + } + + sort($result); + return $result; +} + + + +/** * Quicksearch for pagenames * * By default it only matches the pagename and ignores the diff --git a/inc/media.php b/inc/media.php index efa200d4c..663a35051 100644 --- a/inc/media.php +++ b/inc/media.php @@ -27,13 +27,10 @@ function media_filesinuse($data,$id){ echo '<p>'.hsc($lang['ref_inuse']).'</p>'; $hidden=0; //count of hits without read permission - usort($data,'sort_search_fulltext'); foreach($data as $row){ - if(auth_quickaclcheck($row['id']) >= AUTH_READ){ + if(auth_quickaclcheck($row) >= AUTH_READ && isVisiblePage($row)){ echo '<div class="search_result">'; - echo '<span class="mediaref_ref">'.$row['id'].'</span>'; - echo ': <span class="search_cnt">'.$row['count'].' '.$lang['hits'].'</span><br />'; - echo '<div class="search_snippet">'.$row['snippet'].'</div>'; + echo '<span class="mediaref_ref">'.hsc($row).'</span>'; echo '</div>'; }else $hidden++; @@ -142,6 +139,7 @@ function media_metaform($id,$auth){ echo '</form>'.NL; } + /** * Handles media file deletions * @@ -156,9 +154,11 @@ function media_delete($id,$auth){ global $conf; global $lang; + // check for references if needed $mediareferences = array(); if($conf['refcheck']){ - search($mediareferences,$conf['datadir'],'search_reference',array('query' => $id)); + require_once(DOKU_INC.'inc/fulltext.php'); + $mediareferences = ft_mediause($id,$conf['refshow']); } if(!count($mediareferences)){ |