gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base folder can be skipped

Browse Source
This commit is contained in:
Uwe Steinmann 2024-08-16 11:29:30 +02:00
parent 54c7c49137
commit 165a5ef31e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
op/op.ImportFS.php
View File

@ -90,7 +90,7 @@ if(!empty($_GET["dropfolderfileform2"])) {
$colmap[$i] = array("getCategoryData", $colname); $colmap[$i] = array("getCategoryData", $colname);
} elseif(in_array($colname, array('owner'))) { } elseif(in_array($colname, array('owner'))) {
$colmap[$i] = array("getUserData", $colname); $colmap[$i] = array("getUserData", $colname);
} elseif(in_array($colname, array('filename', 'category', 'name', 'comment'))) { } elseif(in_array($colname, array('filename', 'keywords', 'name', 'comment'))) {
$colmap[$i] = array("getBaseData", $colname); $colmap[$i] = array("getBaseData", $colname);
} elseif(substr($colname, 0, 5) == 'attr:') { } elseif(substr($colname, 0, 5) == 'attr:') {
$kk = explode(':', $colname, 2); $kk = explode(':', $colname, 2);
@ -211,10 +211,19 @@ function import_folder($dirname, $folder, $setfiledate, $setfolderdate, $metadat
} /* }}} */ } /* }}} */
$foldercount = $doccount = 0; $foldercount = $doccount = 0;
if($newfolder = $folder->addSubFolder($_GET["dropfolderfileform1"], '', $user, 1)) { if($_GET['createfolder']) {
if($newfolder = $folder->addSubFolder($_GET["dropfolderfileform1"], '', $user, 1)) {
if($setfolderdate) { if($setfolderdate) {
$newfolder->setDate(filemtime($dirname)); $newfolder->setDate(filemtime($dirname));
} }
} else {
$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_importfs')));
}
} else {
$newfolder = $folder;
}
if($newfolder) {
if(!import_folder($dirname, $newfolder, $setfiledate, $setfolderdate, $metadata)) if(!import_folder($dirname, $newfolder, $setfiledate, $setfolderdate, $metadata))
$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_importfs'))); $session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_importfs')));
else { else {
@ -225,8 +234,6 @@ if($newfolder = $folder->addSubFolder($_GET["dropfolderfileform1"], '', $user, 1
} }
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_importfs', array('docs'=>$doccount, 'folders'=>$foldercount)))); $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()); header("Location:../out/out.ViewFolder.php?folderid=".$newfolder->getID());