From 9ce55624dd5037d77473c70f541aa1bbb31f9850 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sat, 8 Jun 2002 16:32:26 +0000 Subject: [PATCH] Image names uploaded through the image manager are now guaranteed unique. --- lib/WebGUI/Operation/Image.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/WebGUI/Operation/Image.pm b/lib/WebGUI/Operation/Image.pm index 687a7beca..b58f7674a 100644 --- a/lib/WebGUI/Operation/Image.pm +++ b/lib/WebGUI/Operation/Image.pm @@ -107,7 +107,7 @@ sub www_editImage { #------------------------------------------------------------------- sub www_editImageSave { - my ($file, $sqlAdd); + my ($file, $sqlAdd, $test); if (WebGUI::Privilege::isInGroup(4)) { if ($session{form}{iid} eq "new") { $session{form}{iid} = getNextId("imageId"); @@ -118,6 +118,13 @@ sub www_editImageSave { if ($file->getFilename) { $sqlAdd = ", filename=".quote($file->getFilename); } + while (($test) = WebGUI::SQL->quickArray("select name from images where name='$session{form}{name}'")) { + if ($session{form}{name} =~ /(.*)(\d+$)/) { + $session{form}{name} = $1.($2+1); + } elsif ($test ne "") { + $session{form}{name} .= "2"; + } + } WebGUI::SQL->write("update images set name=".quote($session{form}{name}). $sqlAdd.", parameters=".quote($session{form}{parameters}).", userId=$session{user}{userId}, ". " username=".quote($session{user}{username}).