- use $dms->contentDir instead of $settings->_contentDir where ever possible

This commit is contained in:
steinm 2011-01-28 07:37:00 +00:00
parent cfb360e45d
commit 4481185dab

View File

@ -27,25 +27,25 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
} }
// Adds file header to the tar file, it is used before adding file content. /**
// f: file resource (provided by eg. fopen) * Adds file header to the tar file, it is used before adding file content.
// phisfn: path to file * code by calmarius at nospam dot atw dot hu
// archfn: path to file in archive, directory names must be followed by '/' *
// code by calmarius at nospam dot atw dot hu * @param resource $f file resource (provided by eg. fopen)
function TarAddHeader($f,$phisfn,$archfn) * $param string $phisfn path to file
{ * $param string $archfn path to file in archive, directory names must
* be followed by '/'
*/
function TarAddHeader($f,$phisfn,$archfn) { /* {{{ */
$info=stat($phisfn); $info=stat($phisfn);
$ouid=sprintf("%6s ", decoct($info[4])); $ouid=sprintf("%6s ", decoct($info[4]));
$ogid=sprintf("%6s ", decoct($info[5])); $ogid=sprintf("%6s ", decoct($info[5]));
$omode=sprintf("%6s ", decoct(fileperms($phisfn))); $omode=sprintf("%6s ", decoct(fileperms($phisfn)));
$omtime=sprintf("%11s", decoct(filemtime($phisfn))); $omtime=sprintf("%11s", decoct(filemtime($phisfn)));
if (@is_dir($phisfn)) if (@is_dir($phisfn)) {
{
$type="5"; $type="5";
$osize=sprintf("%11s ", decoct(0)); $osize=sprintf("%11s ", decoct(0));
} } else {
else
{
$type=''; $type='';
$osize=sprintf("%11s ", decoct(filesize($phisfn))); $osize=sprintf("%11s ", decoct(filesize($phisfn)));
clearstatcache(); clearstatcache();
@ -72,20 +72,16 @@ function TarAddHeader($f,$phisfn,$archfn)
fwrite($f,$bdchecksum,8); fwrite($f,$bdchecksum,8);
fwrite($f,$chunkafterCS,356); fwrite($f,$chunkafterCS,356);
return true; return true;
} } /* }}} */
// Writes file content to the tar file must be called after a TarAddHeader // Writes file content to the tar file must be called after a TarAddHeader
// f:file resource provided by fopen // f:file resource provided by fopen
// phisfn: path to file // phisfn: path to file
// code by calmarius at nospam dot atw dot hu // code by calmarius at nospam dot atw dot hu
function TarWriteContents($f,$phisfn) function TarWriteContents($f,$phisfn) { /* {{{ */
{ if (@is_dir($phisfn)) {
if (@is_dir($phisfn))
{
return; return;
} } else {
else
{
$size=filesize($phisfn); $size=filesize($phisfn);
$padding=$size % 512 ? 512-$size%512 : 0; $padding=$size % 512 ? 512-$size%512 : 0;
$f2=fopen($phisfn,"rb"); $f2=fopen($phisfn,"rb");
@ -93,18 +89,17 @@ function TarWriteContents($f,$phisfn)
$pstr=sprintf("a%d",$padding); $pstr=sprintf("a%d",$padding);
fwrite($f,pack($pstr,'')); fwrite($f,pack($pstr,''));
} }
} } /* }}} */
// Adds 1024 byte footer at the end of the tar file // Adds 1024 byte footer at the end of the tar file
// f: file resource // f: file resource
// code by calmarius at nospam dot atw dot hu // code by calmarius at nospam dot atw dot hu
function TarAddFooter($f) function TarAddFooter($f) { /* {{{ */
{
fwrite($f,pack('a1024','')); fwrite($f,pack('a1024',''));
} } /* }}} */
// thanks to Doudoux // thanks to Doudoux
function getFolderPathPlainAST($folder) { function getFolderPathPlainAST($folder) { /* {{{ */
$path=""; $path="";
$folderPath = $folder->getPath(); $folderPath = $folder->getPath();
for ($i = 0; $i < count($folderPath); $i++) { for ($i = 0; $i < count($folderPath); $i++) {
@ -112,41 +107,37 @@ function getFolderPathPlainAST($folder) {
if ($i+1 < count($folderPath)) $path .= "/"; if ($i+1 < count($folderPath)) $path .= "/";
} }
return $path; return $path;
} } /* }}} */
function createFolderTar($folder,$ark) function createFolderTar($folder,$ark) { /* {{{ */
{ global $human_readable,$dms;
global $settings,$human_readable;
$documents=$folder->getDocuments(); $documents=$folder->getDocuments();
foreach ($documents as $document){ foreach ($documents as $document){
if (file_exists($settings->_contentDir.$document->getDir())){ if (file_exists($dms->contentDir.$document->getDir())){
if ($human_readable){ if ($human_readable){
// create an archive containing the files with original names and DMS path // create an archive containing the files with original names and DMS path
// thanks to Doudoux // thanks to Doudoux
$latestContent = $document->getLatestContent(); $latestContent = $document->getLatestContent();
if (is_object($latestContent)) if (is_object($latestContent)) {
{
TarAddHeader( TarAddHeader(
$ark, $ark,
$settings->_contentDir.$latestContent->getDir().$latestContent->getVersion().$latestContent->getFileType(), $dms->contentDir.$latestContent->getDir().$latestContent->getVersion().$latestContent->getFileType(),
getFolderPathPlainAST($folder)."/".$document->getID()."_".mydmsDecodeString($latestContent->getOriginalFileName())); getFolderPathPlainAST($folder)."/".$document->getID()."_".mydmsDecodeString($latestContent->getOriginalFileName()));
TarWriteContents($ark, $settings->_contentDir.$latestContent->getDir().$latestContent->getVersion().$latestContent->getFileType()); TarWriteContents($ark, $dms->contentDir.$latestContent->getDir().$latestContent->getVersion().$latestContent->getFileType());
} }
}else{ } else {
// create a server backup archive // create a server backup archive
$handle = opendir($settings->_contentDir.$document->getDir()); $handle = opendir($dms->contentDir.$document->getDir());
while ($entry = readdir($handle) ) while ($entry = readdir($handle) ) {
{ if (!is_dir($dms->contentDir.$document->getDir().$entry)){
if (!is_dir($settings->_contentDir.$document->getDir().$entry)){
TarAddHeader($ark,$settings->_contentDir.$document->getDir().$entry,$document->getDir().$entry); TarAddHeader($ark,$dms->contentDir.$document->getDir().$entry,$document->getDir().$entry);
TarWriteContents($ark,$settings->_contentDir.$document->getDir().$entry); TarWriteContents($ark,$dms->contentDir.$document->getDir().$entry);
} }
} }
closedir($handle); closedir($handle);
@ -160,7 +151,7 @@ function createFolderTar($folder,$ark)
return false; return false;
return true; return true;
} } /* }}} */
if (!isset($_GET["targetidform2"]) || !is_numeric($_GET["targetidform2"]) || intval($_GET["targetidform2"])<1) { if (!isset($_GET["targetidform2"]) || !is_numeric($_GET["targetidform2"]) || intval($_GET["targetidform2"])<1) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_folder_id")); UI::exitError(getMLText("admin_tools"),getMLText("invalid_folder_id"));