Changeset 769

Show
Ignore:
Timestamp:
12/21/06 15:25:40 (2 years ago)
Author:
sven
Message:

files: fix displaying filesize and mp3 player in folder view for non-owners, and add link from files in search results to their containing folders.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • devel/units/files/folder_view.php

    r690 r769  
    123123            $mimetype = mimeinfo('type',$file->originalname); 
    124124            if ($mimetype == "audio/mpeg" || $mimetype == "audio/mp3") { 
    125                 $filemenu .= "<object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" 
     125                $filemenu .= " <object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" 
    126126codebase=\"http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0\" 
    127 width=\"400\" height=\"15\" > 
     127width=\"17\" height=\"17\" > 
    128128    <param name=\"allowScriptAccess\" value=\"sameDomain\" /> 
    129129    <param name=\"movie\" value=\"" . $CFG->wwwroot . "_files/mp3player/musicplayer.swf?song_url=$filepath&amp;song_title=$filetitle\" /> 
     
    144144    [<a href="{$CFG->wwwroot}_files/action_redirection.php?action=delete_file&amp;delete_file_id={$file->ident}" onclick="return confirm('$areyouSure')">$delete</a>] 
    145145END; 
    146             } else { 
    147                 $filemenu = ""; 
    148146            } 
    149147            $keywords = display_output_field(array("","keywords","file","file",$ident,$file->owner)); 
  • devel/units/files/function_search.php

    r690 r769  
    8888            $run_result .= "<h2>" . sprintf(__gettext("Files owned by %s in category '%s'"), $name, $parameter[1])."</h2>\n"; 
    8989            foreach($files as $file) { 
     90                $menu = '[<a href="' . $CFG->wwwroot . $file->username . "/files/" . (($file->folder > 0) ? $file->folder . '/' : '') . '">' . __gettext("View folder") . '</a>]'; 
    9091                $run_result .= templates_draw(array( 
    9192                                                    'context' => 'file', 
     
    9798                                                    'originalname' => stripslashes($file->originalname), 
    9899                                                    'url' => url.$file->username."/files/".$file->folder."/".$file->ident."/".$file->originalname, 
    99                                                     'menu' => ""
     100                                                    'menu' => $menu
    100101                                                    'icon' => url."_files/file.png", 
    101102                                                    'keywords' => ""