gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 15:12:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix mass import from file system

Browse Source
This commit is contained in:
Uwe Steinmann 2016-05-04 13:09:13 +02:00
parent 0501900a28
commit 058acc313a
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
op/op.ImportFS.php
View File

@ -13,8 +13,7 @@ if (!isset($_GET["targetid"]) || !is_numeric($_GET["targetid"]) || $_GET["target
$targetid = $_GET["targetid"];
$folder = $dms->getFolder($targetid);
if (!is_object($folder)) {
echo "Could not find specified folder\n";
exit(1);
UI::exitError(getMLText("admin_tools"),getMLText("invalid_target_folder"));
}
if ($folder->getAccessMode($user) < M_READWRITE) {
@ -30,7 +29,7 @@ if(!is_dir($dirname)) {
}
function import_folder($dirname, $folder) { /* {{{ */
global $user;
global $user, $doccount, $foldercount;
$d = dir($dirname);
$sequence = 1;
@ -56,27 +55,40 @@ function import_folder($dirname, $folder) { /* {{{ */
if (is_bool($lastDotIndex) && !$lastDotIndex) $filetype = ".";
else $filetype = substr($path, $lastDotIndex);
echo $mimetype." - ".$filetype." - ".$path."\n";
$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
// echo $mimetype." - ".$filetype." - ".$path."\n";
if($res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
$categories, $filetmp, $name,
$filetype, $mimetype, $sequence, $reviewers,
$approvers, $reqversion, $version_comment);
if (is_bool($res) && !$res) {
echo "Could not add document to folder\n";
exit(1);
$approvers, $reqversion, $version_comment)) {
$doccount++;
} else {
return false;
}
set_time_limit(1200);
set_time_limit(30);
} elseif(is_dir($path)) {
$name = basename($path);
$newfolder = $folder->addSubFolder($name, '', $user, $sequence);
import_folder($path, $newfolder);
if($newfolder = $folder->addSubFolder($name, '', $user, $sequence)) {
$foldercount++;
if(!import_folder($path, $newfolder))
return false;
} else {
return false;
}
}
$sequence++;
}
}
return true;
} /* }}} */
header("Content-Type: text/plain");
import_folder($dirname, $folder);
$foldercount = $doccount = 0;
if($newfolder = $folder->addSubFolder($_GET["dropfolderfileform1"], '', $user, 1)) {
if(!import_folder($dirname, $newfolder))
$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_importfs')));
else
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_importfs', array('docs'=>$doccount, 'folders'=>$foldercount))));
} else {
$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_importfs')));
}
header("Location:../out/out.ViewFolder.php?folderid=".$newfolder->getID());

4
views/bootstrap/class.ImportFS.php
View File

@ -52,12 +52,12 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
$this->contentContainerStart();
print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
print "<div class=\"control-group\"><label class=\"control-label\"></label><div class=\"controls\">";
print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('choose_target_folder')."</label><div class=\"controls\">";
$this->printFolderChooserHtml("form1",M_READWRITE);
print "</div></div>";
if($dropfolderdir) {
print "<div class=\"control-group\"><label class=\"control-label\">";
printMLText("dropfolder_file");
printMLText("dropfolder_folder");
echo ": ";
print "</label><div class=\"controls\">";
/* Setting drop folder dir to "" will force to take the default from settings.xml */