From f232b6facb7a0ab7003fbcd057991f5f3e561483 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 18 Mar 2005 00:51:38 +0000 Subject: [PATCH] fixed a bunch of CS template problems --- docs/upgrades/upgrade_6.5.2-6.5.3.sql | 6 ++++++ lib/WebGUI/Asset/Post.pm | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/docs/upgrades/upgrade_6.5.2-6.5.3.sql b/docs/upgrades/upgrade_6.5.2-6.5.3.sql index 87d970596..fab0c8565 100644 --- a/docs/upgrades/upgrade_6.5.2-6.5.3.sql +++ b/docs/upgrades/upgrade_6.5.2-6.5.3.sql @@ -2,4 +2,10 @@ insert into webguiVersion values ('6.5.3','upgrade',unix_timestamp()); update template set template='\">\n\n

\n\n\n

\n\n\n\n\n\n\n\n

\n\n\n\n\">\n· \">\n\n· \">\n\n\n· \">\n· \">\n\n

\n\n\n\n \n \n \n \n \n \n \n \n
\n \n \n \n \n \n \n \n \n \n \n \n \n *\n \n
\n \n \n
\n
\n\n\n' where assetId='PBtmpl0000000000000141'; update template set assetId='\">\n\n

\n \n \r\n

\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n \">\r\n · \">\r\n \r\n · \">\r\n \r\n \r\n · \">\r\n · \">\r\n \r\n

\r\n\r\n\r\n\r\n

\r\n \r\n )\" id=\"tab\" class=\"tab\">\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n *\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n\r\n\r\n\r\n' where assetId='PBtmpl0000000000000116'; update template set template = '\">

\r\n

\n

\r\n\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n\r\n\r\n\r\n\r\n
\n\n

\n
\r\n\r\n\r\n\n

\n\n' where assetId='PBtmpl0000000000000029'; +update template set template='\r\n\r\n' where assetId='PBtmpl0000000000000027'; +update template set template='\"> \r\n \r\n

\r\n\r\n\r\n\r\n\r\n\r\n

\r\n\r\n \">\r\n \r\n • \r\n \r\n \">\r\n \r\n \">\r\n \r\n \r\n •\r\n\r\n\">\r\n

\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n\r\n
\">\">\">\">\">
oddThreadevenThread\">\">oddThreadevenThread\">oddThreadevenThread\">\">oddThreadevenThread\" align=\"center\">oddThreadevenThread\" align=\"center\">oddThreadevenThread\" align=\"center\">oddThreadevenThread\"> @ oddThreadevenThread\" style=\"font-size: 11px;\">\r\n \">\r\n by \r\n \r\n \r\n \r\n \">\r\n \r\n on @ \r\n
\r\n\r\n\r\n
\r\n · · \r\n
\r\n\r\n\r\n\r\n' where assetId='PBtmpl0000000000000026'; +update template set template='\"> \r\n \r\n

\r\n\r\n\r\n\r\n\r\n \r\n\r\n\r\n
\r\n

\">

\r\n
\r\n
\r\n \r\n
\r\n \r\n
\r\n
\r\n
\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n
\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n\r\n \r\n\r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n class=\"currentThread\">\r\n \r\n \r\n \r\n \r\n \r\n \r\n
   \">
\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n
Current\">\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n\r\n \r\n\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n
px;\">\r\n
Current\">\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n\r\n \r\n\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n
\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n
\r\n [ | | ]\r\n
\r\n\r\n\r\n\r\n
\r\n \r\n \">[] \r\n \r\n \r\n \">[] \r\n \r\n \r\n \">[]\r\n \r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n
\r\n\r\n' where assetId='PBtmpl0000000000000032'; +update template set template='\"> \r\n \r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n
\r\n :     [ \"> | \"> ]
\r\n
\r\n \r\n\r\n\r\n\r\n Link Description
\r\n

\r\n\r\n\r\nLink URL
\r\n\">\r\n\r\n\r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n\r\n\r\n\r\n

\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n

\r\n\r\n\r\n\r\n\r\n\r\n \r\n\r\n
\r\n

\r\n
\r\n
\r\n \r\n
\r\n \r\n
\r\n
\r\n
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n class=\"currentThread\">\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
   \">
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Current\">\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
px;\">\r\n
Current\">\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n [ | | ]\r\n
\r\n \r\n \r\n \r\n \r\n\r\n
\r\n \r\n \">[] \r\n \r\n \">[List All Links]\r\n \r\n \">[] \r\n \r\n \r\n \">[]\r\n \r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n
\r\n\r\n\r\n\r\n' where assetId='PBtmpl0000000000000113'; +update template set template='\"> \r\n \r\n

\r\n\r\n\r\n\r\n

\r\n\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n\r\n\r\n\r\n\r\n\r\n\r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n \r\n\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n\r\n\r\n

\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n

\r\n\r\n\r\n\r\n\r\n\r\n \r\n\r\n
\r\n

\r\n
\r\n
\r\n \r\n
\r\n \r\n
\r\n
\r\n
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n class=\"currentThread\">\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
   \">
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Current\">\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
px;\">\r\n
Current\">\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n
\r\n [ | | ]\r\n
\r\n \r\n \r\n \r\n \r\n\r\n
\r\n \r\n \">[] \r\n \r\n \">[]\r\n \r\n \">[] \r\n \r\n \r\n \">[]\r\n \r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n
\r\n\r\n' where assetId='PBtmpl0000000000000067'; +update template set template='\"> \r\n \r\n

\r\n\r\n\r\n

\r\n\r\n\r\n\r\n
\r\n :     [ \"> | \"> ]
\r\n
\r\n \r\n\r\n\r\n\r\n Job Description
\r\n

\r\n\r\n\r\n\r\n Job Requirements
\r\n

\r\n\r\n\r\n\r\n\r\n \r\n \r\n\r\n\r\n \r\n \r\n\r\n\r\n \r\n \r\n\r\n\r\n \r\n \r\n\r\n
Date Posted
Location
Compensation
Views
\r\n\r\n\r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n\r\n\r\n\r\n

\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n

\r\n\r\n\r\n\r\n\r\n\r\n \r\n\r\n
\r\n

\r\n
\r\n
\r\n \r\n
\r\n \r\n
\r\n
\r\n
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n class=\"currentThread\">\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
   \">
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Current\">\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
px;\">\r\n
Current\">\r\n \">\r\n
\r\n \r\n
\r\n
\r\n
\r\n : \r\n \r\n \r\n \r\n \">\r\n \r\n
\r\n :
\r\n
\r\n
\r\n :
\r\n : \r\n \r\n     [ \">1, \">2, \">3, \">4, \">5 ]\r\n \r\n
\r\n \r\n :     [ \"> | \"> ]
\r\n \r\n \r\n :
\r\n \r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n \r\n
\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \">[]\r\n \r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n [ | | ]\r\n
\r\n \r\n \r\n \r\n \r\n\r\n\r\n
\r\n \r\n \">[] \r\n \r\n \">[]\r\n \r\n \">[] \r\n \r\n \r\n \">[]\r\n \r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n \r\n \r\n \">[]\r\n \r\n \">[]\r\n \r\n \r\n
\r\n\r\n' where assetId='PBtmpl0000000000000098'; diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index 3d64bdaff..27c1a21e6 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -361,7 +361,7 @@ sub getSynopsisAndContentFromFormPost { unless ($synopsis) { $body =~ s/\n/\^\-\;/ unless ($body =~ m/\^\-\;/); my @content = split(/\^\-\;/,$body); - $synopsis = WebGUI::HTML::filter($content[0],"none"); + $synopsis = WebGUI::HTML::filter($content[0],"all"); } $body =~ s/\^\-\;/\n/; return ($synopsis,$body); @@ -403,6 +403,7 @@ sub getTemplateVars { $var{'hasRated'} = $self->hasRated; my $gotImage; my $gotAttachment; + @{$var{'attachment_loop'}} = (); unless ($self->get("storageId") eq "") { my $storage = $self->getStorageLocation; foreach my $filename (@{$storage->getFiles}) { @@ -663,7 +664,9 @@ sub processPropertiesFromFormPost { if (defined $filename) { $self->setSize($storage->getFileSize($filename)); $storage->setPrivileges($self->get("ownerUserId"), $self->get("groupIdView"), $self->get("groupIdEdit")); - $storage->generateThumbnail($filename); + foreach my $file (@{$storage->getFiles}) { + $storage->generateThumbnail($file); + } } $session{form}{proceed} = "redirectToParent"; # clear some cache @@ -891,7 +894,7 @@ sub www_edit { $title = $self->getValue("title"); } if ($session{form}{title} || $session{form}{content} || $session{form}{synopsis}) { - $var{'preview.title'} = WebGUI::HTML::filter($session{form}{title},"none"); + $var{'preview.title'} = WebGUI::HTML::filter($session{form}{title},"all"); ($var{'preview.synopsis'}, $var{'preview.content'}) = $self->getSynopsisAndContentFromFormPost; $var{'preview.content'} = $self->formatContent($var{'preview.content'},$session{form}{contentType}); } @@ -920,10 +923,16 @@ sub www_edit { value=>$self->getValue("userDefined".$x) }); } + $title = WebGUI::HTML::filter($title,"all"); + $content = WebGUI::HTML::filter($content,"macros"); $var{'title.form'} = WebGUI::Form::text({ name=>"title", value=>$title }); + $var{'synopsis.form'} = WebGUI::Form::textarea({ + name=>"synopsis", + value=>WebGUI::HTML::filter($self->getValue("synopsis"),"all") + }); $var{'title.form.textarea'} = WebGUI::Form::textarea({ name=>"title", value=>$title