mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 22:27:34 +02:00
Code Issues Releases Wiki Activity

Changed how duplicate file=names are handled during batch import

Browse Source
This commit is contained in:
CaMer0n
2012-04-23 20:24:24 +00:00
parent f7ada45093
commit 72267ae458
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
e107_admin/image.php
View File

@@ -524,7 +524,7 @@ class media_admin_ui extends e_admin_ui
} }
function getPath($mime,$owner='_common') function getPath($mime)
{ {
$mes = e107::getMessage(); $mes = e107::getMessage();
@@ -536,20 +536,9 @@ class media_admin_ui extends e_admin_ui
return FALSE; return FALSE;
} }
$dir = $this->mimePaths[$pmime].$owner; $dir = $this->mimePaths[$pmime].date("Y-m");
if(!is_dir($dir)) // Owner Directory if(!is_dir($dir))
{
if(!mkdir($dir, 0755))
{
$mes->add("Couldn't create folder ($dir).", E_MESSAGE_ERROR);
return FALSE;
};
}
$dir .= "/".date("Y-m");
if(!is_dir($dir)) // Dated Directory
{ {
if(!mkdir($dir, 0755)) if(!mkdir($dir, 0755))
{ {
@@ -638,7 +627,7 @@ class media_admin_ui extends e_admin_ui
</tbody> </tbody>
</table> </table>
<div class='buttons-bar center'> <div class='buttons-bar center'>
Import into Category: ".$frm->selectbox('batch_category',$this->ownercats); Import into Category: ".$frm->selectbox('batch_category',$this->cats);
$waterMarkPath = e_THEME.e107::getPref('sitetheme')."/images/watermark.png"; $waterMarkPath = e_THEME.e107::getPref('sitetheme')."/images/watermark.png";
@@ -737,9 +726,7 @@ class media_admin_ui extends e_admin_ui
$mes->add("Couldn't get file info from : ".$oldpath, E_MESSAGE_ERROR); $mes->add("Couldn't get file info from : ".$oldpath, E_MESSAGE_ERROR);
} }
list($owner,$category) = explode("|",$_POST['batch_category']); $newpath = $this->getPath($f['mime']).'/'.$file;
$newpath = $this->getPath($f['mime'],$owner).'/'.$file;
$newname = $tp->toDB($_POST['batch_import_name'][$key]); $newname = $tp->toDB($_POST['batch_import_name'][$key]);
$newdiz = $tp->toDB($_POST['batch_import_diz'][$key]); $newdiz = $tp->toDB($_POST['batch_import_diz'][$key]);
@@ -751,8 +738,9 @@ class media_admin_ui extends e_admin_ui
if(file_exists($newpath) || $sql->db_Select("core_media","media_url = '".$tp->createConstants($newpath,'rel')."' LIMIT 1") ) if(file_exists($newpath) || $sql->db_Select("core_media","media_url = '".$tp->createConstants($newpath,'rel')."' LIMIT 1") )
{ {
$mes->addWarning($newpath." already exists and was ignored during import."); $mes->addWarning($newpath." already exists and was renamed during import.");
continue; $file = $f['pathinfo']['filename']."_.".$f['pathinfo']['extension'];
$newpath = $this->getPath($f['mime']).'/'.$file;
} }
@@ -762,7 +750,7 @@ class media_admin_ui extends e_admin_ui
$insert = array( $insert = array(
'media_caption' => $newdiz, 'media_caption' => $newdiz,
'media_description' => '', 'media_description' => '',
'media_category' => $category, 'media_category' => $_POST['batch_category'],
'media_datestamp' => $f['modified'], 'media_datestamp' => $f['modified'],
'media_url' => $tp->createConstants($newpath,'rel'), 'media_url' => $tp->createConstants($newpath,'rel'),
'media_userclass' => 0, 'media_userclass' => 0,