lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change in document wrapper to download files in bittorrent directory

Browse Source
This commit is contained in:
Laurent Destailleur 2009-02-24 22:52:55 +00:00
parent 6a0877fe6a
commit b84a0fefbe
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/document.php
View File

@ -398,7 +398,9 @@ if ($modulepart)
if ($modulepart == 'bittorrent') if ($modulepart == 'bittorrent')
{ {
$accessallowed=1; $accessallowed=1;
$original_file=DOL_DATA_ROOT.'/bittorrent/files/'.$original_file; $dir='files';
if ($type == 'application/x-bittorrent') $dir='torrents';
$original_file=DOL_DATA_ROOT.'/bittorrent/'.$dir.'/'.$original_file;
$sqlprotectagainstexternals = ''; $sqlprotectagainstexternals = '';
} }
} }

27
htdocs/lib/files.lib.php
View File

@ -41,10 +41,10 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
$loaddate=$mode?true:false; $loaddate=$mode?true:false;
$loadsize=$mode?true:false; $loadsize=$mode?true:false;
// Clean parameters // Clean parameters
$path=eregi_replace('[\\/]+$','',$path); $path=eregi_replace('[\\/]+$','',$path);
if (! is_dir($path)) return array(); if (! is_dir($path)) return array();
if ($dir = opendir($path)) if ($dir = opendir($path))
@ -53,11 +53,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
while (false !== ($file = readdir($dir))) while (false !== ($file = readdir($dir)))
{ {
$qualified=1; $qualified=1;
// Check if file is qualified // Check if file is qualified
if (eregi('^\.',$file)) $qualified=0; if (eregi('^\.',$file)) $qualified=0;
if ($excludefilter && eregi($excludefilter,$file)) $qualified=0; if ($excludefilter && eregi($excludefilter,$file)) $qualified=0;
if ($qualified) if ($qualified)
{ {
// Check whether this is a file or directory and whether we're interested in that type // Check whether this is a file or directory and whether we're interested in that type
@ -66,7 +66,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
// Add entry into file_list array // Add entry into file_list array
if ($loaddate || $sortcriteria == 'date') $filedate=filemtime($path."/".$file); if ($loaddate || $sortcriteria == 'date') $filedate=filemtime($path."/".$file);
if ($loadsize || $sortcriteria == 'size') $filesize=filesize($path."/".$file); if ($loadsize || $sortcriteria == 'size') $filesize=filesize($path."/".$file);
if (! $filter || eregi($filter,$path.'/'.$file)) if (! $filter || eregi($filter,$path.'/'.$file))
{ {
$file_list[] = array( $file_list[] = array(
@ -76,7 +76,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
"size" => $filesize "size" => $filesize
); );
} }
// if we're in a directory and we want recursive behavior, call this function again // if we're in a directory and we want recursive behavior, call this function again
if ($recursive) if ($recursive)
{ {
@ -101,7 +101,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
} }
} }
closedir($dir); closedir($dir);
// Obtain a list of columns // Obtain a list of columns
$myarray=array(); $myarray=array();
foreach ($file_list as $key => $row) foreach ($file_list as $key => $row)
@ -110,7 +110,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
} }
// Sort the data // Sort the data
array_multisort($myarray, $sortorder, $file_list); array_multisort($myarray, $sortorder, $file_list);
return $file_list; return $file_list;
} }
else else
@ -121,7 +121,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
/** /**
* \brief Compare 2 files * \brief Compare 2 files
* *
* @param unknown_type $a File 1 * @param unknown_type $a File 1
* @param unknown_type $b File 2 * @param unknown_type $b File 2
* @return int 1, 0, 1 * @return int 1, 0, 1
@ -130,12 +130,12 @@ function dol_compare_file($a, $b)
{ {
global $sortorder; global $sortorder;
global $sortfield; global $sortfield;
$sortorder=strtoupper($sortorder); $sortorder=strtoupper($sortorder);
if ($sortorder == 'ASC') { $retup=-1; $retdown=1; } if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
else { $retup=1; $retdown=-1; } else { $retup=1; $retdown=-1; }
if ($sortfield == 'name') if ($sortfield == 'name')
{ {
if ($a->name == $b->name) return 0; if ($a->name == $b->name) return 0;
@ -176,6 +176,7 @@ function dol_mimetype($file)
if (eregi('\.tiff$',$file)) $mime='image/tiff'; if (eregi('\.tiff$',$file)) $mime='image/tiff';
if (eregi('\.vcs$',$file)) $mime='text/calendar'; if (eregi('\.vcs$',$file)) $mime='text/calendar';
if (eregi('\.ics$',$file)) $mime='text/calendar'; if (eregi('\.ics$',$file)) $mime='text/calendar';
if (eregi('\.torrent$',$file)) $mime='application/x-bittorrent';
if (eregi('\.(mp3|ogg|au)$',$file)) $mime='audio'; if (eregi('\.(mp3|ogg|au)$',$file)) $mime='audio';
if (eregi('\.(avi|mvw|divx|xvid)$',$file)) $mime='video'; if (eregi('\.(avi|mvw|divx|xvid)$',$file)) $mime='video';
if (eregi('\.(zip|rar|gz|tgz|z|cab|bz2)$',$file)) $mime='archive'; if (eregi('\.(zip|rar|gz|tgz|z|cab|bz2)$',$file)) $mime='archive';
@ -202,7 +203,7 @@ function dol_dir_is_emtpy($folder)
return true; return true;
else else
return false; return false;
closedir($handle); closedir($handle);
} }
else else