WebGUI 3.3.0 release
This commit is contained in:
parent
40bb7fed59
commit
80f7752f32
41 changed files with 1662 additions and 402 deletions
|
|
@ -16,6 +16,7 @@ use WebGUI::Attachment;
|
|||
use WebGUI::DateTime;
|
||||
use WebGUI::Form;
|
||||
use WebGUI::International;
|
||||
use WebGUI::Paginator;
|
||||
use WebGUI::Privilege;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Shortcut;
|
||||
|
|
@ -56,9 +57,11 @@ sub www_addImageSave {
|
|||
my ($imageId, $file);
|
||||
if (WebGUI::Privilege::isInGroup(4)) {
|
||||
$imageId = getNextId("imageId");
|
||||
$file = WebGUI::Attachment::save("filename","images",$imageId);
|
||||
$file = WebGUI::Attachment->new("newFile","images",$imageId);
|
||||
$file->save("filename");
|
||||
WebGUI::SQL->write("insert into images values ($imageId, ".quote($session{form}{name}).
|
||||
", ".quote($file).", ".quote($session{form}{parameters}).", $session{user}{userId}, ".
|
||||
", ".quote($file->getFilename).", ".quote($session{form}{parameters}).
|
||||
", $session{user}{userId}, ".
|
||||
quote($session{user}{username}).", ".time().")");
|
||||
return www_listImages();
|
||||
} else {
|
||||
|
|
@ -86,8 +89,10 @@ sub www_deleteImage {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_deleteImageConfirm {
|
||||
my ($image);
|
||||
if (WebGUI::Privilege::isInGroup(4)) {
|
||||
WebGUI::Attachment::deleteSubmission("images",$session{form}{iid});
|
||||
$image = WebGUI::Attachment->new("","images",$session{form}{iid});
|
||||
$image->deleteNode;
|
||||
WebGUI::SQL->write("delete from images where imageId=$session{form}{iid}");
|
||||
return www_listImages();
|
||||
} else {
|
||||
|
|
@ -98,7 +103,6 @@ sub www_deleteImageConfirm {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_deleteImageFile {
|
||||
if (WebGUI::Privilege::isInGroup(4)) {
|
||||
WebGUI::Attachment::deleteSubmission("images",$session{form}{iid});
|
||||
WebGUI::SQL->write("update images set filename='' where imageId=$session{form}{iid}");
|
||||
return www_editImage();
|
||||
} else {
|
||||
|
|
@ -108,10 +112,11 @@ sub www_deleteImageFile {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_editImage {
|
||||
my ($output, %data);
|
||||
my ($output, %data, $image);
|
||||
tie %data, 'Tie::CPHash';
|
||||
if (WebGUI::Privilege::isInGroup(4)) {
|
||||
%data = WebGUI::SQL->quickHash("select * from images where imageId=$session{form}{iid}");
|
||||
$image = WebGUI::Attachment->new($data{filename},"images",$data{imageId});
|
||||
$output = helpLink(20);
|
||||
$output .= '<h1>'.WebGUI::International::get(382).'</h1>';
|
||||
$output .= formHeader();
|
||||
|
|
@ -135,9 +140,7 @@ sub www_editImage {
|
|||
$output .= formSave();
|
||||
$output .= '</table></form>';
|
||||
if ($data{filename} ne "") {
|
||||
$output .= '<p>'.WebGUI::International::get(390).'<p><img src="'.
|
||||
$session{setting}{attachmentDirectoryWeb}.'/images/'.$session{form}{iid}.
|
||||
'/'.$data{filename}.'">';
|
||||
$output .= '<p>'.WebGUI::International::get(390).'<p><img src="'.$image->getURL.'">';
|
||||
}
|
||||
return $output;
|
||||
} else {
|
||||
|
|
@ -147,15 +150,17 @@ sub www_editImage {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_editImageSave {
|
||||
my ($file);
|
||||
my ($file, $sqlAdd);
|
||||
if (WebGUI::Privilege::isInGroup(4)) {
|
||||
$file = WebGUI::Attachment::save("filename","images",$session{form}{iid});
|
||||
if ($file ne "") {
|
||||
$file = ", filename=".quote($file);
|
||||
$file = WebGUI::Attachment->new("","images",$session{form}{iid});
|
||||
$file->save("filename");
|
||||
if ($file->getFilename) {
|
||||
$sqlAdd = ", filename=".quote($file->getFilename);
|
||||
}
|
||||
WebGUI::SQL->write("update images set name=".quote($session{form}{name}).
|
||||
$file.", parameters=".quote($session{form}{parameters}).", userId=$session{user}{userId}, ".
|
||||
" username=".quote($session{user}{username}).", dateUploaded=".time()." where imageId=$session{form}{iid}");
|
||||
$sqlAdd.", parameters=".quote($session{form}{parameters}).", userId=$session{user}{userId}, ".
|
||||
" username=".quote($session{user}{username}).
|
||||
", dateUploaded=".time()." where imageId=$session{form}{iid}");
|
||||
return www_listImages();
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
|
|
@ -164,7 +169,7 @@ sub www_editImageSave {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_listImages {
|
||||
my ($output, $sth, %data, @row, $dataRows, $prevNextBar, $i, $search, $isAdmin);
|
||||
my ($output, $sth, %data, @row, $image, $p, $i, $search, $isAdmin);
|
||||
tie %data, 'Tie::CPHash';
|
||||
if (WebGUI::Privilege::isInGroup(4)) {
|
||||
$output = helpLink(26);
|
||||
|
|
@ -173,27 +178,30 @@ sub www_listImages {
|
|||
$output .= '<a href="'.WebGUI::URL::page('op=addImage').'">'.WebGUI::International::get(395).'</a>';
|
||||
$output .= '</td>'.formHeader().'<td align="right">';
|
||||
$output .= WebGUI::Form::hidden("op","listImages");
|
||||
$output .= WebGUI::Form::text("keyword",20,50);
|
||||
$output .= WebGUI::Form::text("keyword",20,50,$session{form}{keyword});
|
||||
$output .= WebGUI::Form::submit(WebGUI::International::get(170));
|
||||
$output .= '</td></form></tr></table><p>';
|
||||
if ($session{form}{keyword} ne "") {
|
||||
$search = " where (name like '%".$session{form}{keyword}.
|
||||
"%' or username like '%".$session{form}{keyword}.
|
||||
"%' or filename like '%".$session{form}{keyword}."%') ";
|
||||
}
|
||||
$isAdmin = WebGUI::Privilege::isInGroup(3);
|
||||
$sth = WebGUI::SQL->read("select * from images $search order by name");
|
||||
while (%data = $sth->hash) {
|
||||
$image = WebGUI::Attachment->new($data{filename},"images",$data{imageId});
|
||||
$row[$i] = '<tr class="tableData"><td>';
|
||||
if ($session{user}{userId} == $data{userId} || $isAdmin) {
|
||||
$row[$i] .= '<a href="'.WebGUI::URL::page('op=deleteImage&iid='.$data{imageId}).
|
||||
'"><img src="'.$session{setting}{lib}.'/delete.gif" border=0></a>';
|
||||
$row[$i] .= '<a href="'.WebGUI::URL::page('op=editImage&iid='.$data{imageId}).
|
||||
'"><img src="'.$session{setting}{lib}.'/edit.gif" border=0></a>';
|
||||
} else {
|
||||
$row[$i] .= '<a href="'.WebGUI::URL::page('op=viewImage&iid='.$data{imageId}).
|
||||
'"><img src="'.$session{setting}{lib}.'/view.gif" border=0></a>';
|
||||
}
|
||||
$row[$i] .= '<a href="'.WebGUI::URL::page('op=viewImage&iid='.$data{imageId}).
|
||||
'"><img src="'.$session{setting}{lib}.'/view.gif" border=0></a>';
|
||||
$row[$i] .= '</td>';
|
||||
$row[$i] .= '<td><a href="'.WebGUI::URL::page('op=viewImage&iid='.$data{imageId}).
|
||||
'"><img src="'.$image->getThumbnail.'" border="0"></a>';
|
||||
$row[$i] .= '<td>'.$data{name}.'</td>';
|
||||
$row[$i] .= '<td>'.$data{username}.'</td>';
|
||||
$row[$i] .= '<td>'.WebGUI::DateTime::epochToHuman($data{dateUploaded},"%M/%D/%y").'</td>';
|
||||
|
|
@ -201,11 +209,11 @@ sub www_listImages {
|
|||
$i++;
|
||||
}
|
||||
$sth->finish;
|
||||
($dataRows, $prevNextBar) = paginate(50,WebGUI::URL::page('op=listImages'),\@row);
|
||||
$p = WebGUI::Paginator->new(WebGUI::URL::page('op=listImages'),\@row);
|
||||
$output .= '<table border=1 cellpadding=5 cellspacing=0 align="center">';
|
||||
$output .= $dataRows;
|
||||
$output .= $p->getPage($session{form}{pn});
|
||||
$output .= '</table>';
|
||||
$output .= $prevNextBar;
|
||||
$output .= $p->getBarTraditional($session{form}{pn});
|
||||
return $output;
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
|
|
@ -214,10 +222,11 @@ sub www_listImages {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_viewImage {
|
||||
my ($output, %data);
|
||||
my ($output, %data, $image);
|
||||
tie %data, 'Tie::CPHash';
|
||||
if (WebGUI::Privilege::isInGroup(4)) {
|
||||
%data = WebGUI::SQL->quickHash("select * from images where imageId=$session{form}{iid}");
|
||||
$image = WebGUI::Attachment->new($data{filename},"images",$data{imageId});
|
||||
$output .= '<h1>'.WebGUI::International::get(396).'</h1>';
|
||||
$output .= '<a href="'.WebGUI::URL::page('op=listImages').'">'.WebGUI::International::get(397).'</a>';
|
||||
$output .= '<table>';
|
||||
|
|
@ -229,8 +238,7 @@ sub www_viewImage {
|
|||
$output .= tableFormRow(WebGUI::International::get(388),
|
||||
WebGUI::DateTime::epochToHuman($data{dateUploaded},"%M/%D/%y"));
|
||||
$output .= '</table>';
|
||||
$output .= '<p><img src="'.$session{setting}{attachmentDirectoryWeb}.'/images/'.$session{form}{iid}.
|
||||
'/'.$data{filename}.'">';
|
||||
$output .= '<p><img src="'.$image->getURL.'">';
|
||||
return $output;
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue