oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

converting assets to new session system

Browse source
This commit is contained in:
JT Smith 2006-01-02 03:12:54 +00:00
parent 0d8833512c
commit 2866a2c873
34 changed files with 1099 additions and 1099 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/WebGUI/Asset/File/Image.pm
View file

@ -70,7 +70,7 @@ sub definition {
properties=>{
thumbnailSize=>{
fieldType=>'integer',
defaultValue=>$session{setting}{thumbnailSize}
defaultValue=>$self->session->setting->get("thumbnailSize")
},
parameters=>{
fieldType=>'textarea',
@ -148,7 +148,7 @@ sub getEditForm {
sub getIcon {
my $self = shift;
my $small = shift;
return $session{config}{extrasURL}.'/assets/image.gif' unless ($small);
return $self->session->config->get("extrasURL").'/assets/image.gif' unless ($small);
$self->SUPER::getIcon(1);
}
@ -196,10 +196,10 @@ sub processPropertiesFromFormPost {
$self->update({parameters=>$parameters.' alt="'.$self->get("title").'"'});
}
my $storage = $self->getStorageLocation;
$self->generateThumbnail($session{setting}{maxImageSize});
$self->generateThumbnail($self->session->setting->get("maxImageSize"));
$storage->deleteFile($self->get("filename"));
$storage->renameFile('thumb-'.$self->get("filename"),$self->get("filename"));
$self->generateThumbnail($session{form}{thumbnailSize});
$self->generateThumbnail($self->session->form->process("thumbnailSize"));
}
#-------------------------------------------------------------------
@ -242,8 +242,8 @@ sub www_edit {
sub www_resize {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
if ($session{form}{newWidth} || $session{form}{newHeight}) {
$self->getStorageLocation->resize($self->get("filename"),$session{form}{newWidth},$session{form}{newHeight});
if ($self->session->form->process("newWidth") || $self->session->form->process("newHeight")) {
$self->getStorageLocation->resize($self->get("filename"),$self->session->form->process("newWidth"),$self->session->form->process("newHeight"));
$self->setSize($self->getStorageLocation->getFileSize($self->get("filename")));
}
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=edit'),WebGUI::International::get("edit image","Asset_Image"));
@ -286,7 +286,7 @@ A web executable method that redirects the user to the specified page, or displa
sub www_view {
my $self = shift;
if ($session{var}{adminOn}) {
if ($self->session->var->get("adminOn")) {
return $self->www_edit;
}
my $storage = $self->getStorageLocation;

30
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -60,18 +60,18 @@ sub unzip {
if($filename =~ m/\.zip/i){
my $zip = Archive::Zip->new();
unless ($zip->read($filename) == $zip->AZ_OK){
WebGUI::ErrorHandler::warn(WebGUI::International::get("zip_error","Asset_ZipArchive"));
$self->session->errorHandler->warn(WebGUI::International::get("zip_error","Asset_ZipArchive"));
return 0;
}
$zip->extractTree();
} elsif($filename =~ m/\.tar/i){
Archive::Tar->extract_archive($filepath.'/'.$filename,1);
if (Archive::Tar->error){
WebGUI::ErrorHandler::warn(Archive::Tar->error);
$self->session->errorHandler->warn(Archive::Tar->error);
return 0;
}
} else{
WebGUI::ErrorHandler::warn(WebGUI::International::get("bad_archive","Asset_ZipArchive"));
$self->session->errorHandler->warn(WebGUI::International::get("bad_archive","Asset_ZipArchive"));
}
return 1;
@ -179,8 +179,8 @@ If this evaluates to True, then the smaller icon is returned.
sub getIcon {
my $self = shift;
my $small = shift;
return $session{config}{extrasURL}.'/assets/ziparchive.gif' unless ($small);
return $session{config}{extrasURL}.'/assets/small/ziparchive.gif';
return $self->session->config->get("extrasURL").'/assets/ziparchive.gif' unless ($small);
return $self->session->config->get("extrasURL").'/assets/small/ziparchive.gif';
}
@ -201,22 +201,22 @@ sub processPropertiesFromFormPost {
my $file = $self->get("filename");
#return unless $file;
unless($session{form}{showPage}) {
unless($self->session->form->process("showPage")) {
$storage->delete;
WebGUI::SQL->write("update FileAsset set filename=NULL where assetId=".quote($self->getId));
WebGUI::Session::setScratch("za_error",WebGUI::International::get("za_show_error","Asset_ZipArchive"));
$self->session->db->write("update FileAsset set filename=NULL where assetId=".$self->session->db->quote($self->getId));
$self->session->scratch->set("za_error",WebGUI::International::get("za_show_error","Asset_ZipArchive"));
return;
}
unless($file =~ m/\.tar/i || $file =~ m/\.zip/i) {
$storage->delete;
WebGUI::SQL->write("update FileAsset set filename=NULL where assetId=".quote($self->getId));
WebGUI::Session::setScratch("za_error",WebGUI::International::get("za_error","Asset_ZipArchive"));
$self->session->db->write("update FileAsset set filename=NULL where assetId=".$self->session->db->quote($self->getId));
$self->session->scratch->set("za_error",WebGUI::International::get("za_error","Asset_ZipArchive"));
return;
}
unless ($self->unzip($storage,$self->get("filename"))) {
WebGUI::ErrorHandler::warn(WebGUI::International::get("unzip_error","Asset_ZipArchive"));
$self->session->errorHandler->warn(WebGUI::International::get("unzip_error","Asset_ZipArchive"));
}
}
@ -256,12 +256,12 @@ used to show the file to administrators.
sub view {
my $self = shift;
my %var = %{$self->get};
#WebGUI::ErrorHandler::warn($self->getId);
#$self->session->errorHandler->warn($self->getId);
$var{controls} = $self->getToolbar;
if($session{scratch}{za_error}) {
$var{error} = $session{scratch}{za_error};
if($self->session->scratch->get("za_error")) {
$var{error} = $self->session->scratch->get("za_error");
}
WebGUI::Session::deleteScratch("za_error");
$self->session->scratch->delete("za_error");
my $storage = $self->getStorageLocation;
if($self->get("filename") ne "") {
$var{fileUrl} = $storage->getUrl($self->get("showPage"));