diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 6c3861dc0..7da60a445 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -22,6 +22,8 @@ - fix [ 1165373 ] sort templates into folders by namespace under ImportNode - fix [ 1118789 ] 6.2.11 - L_loginBox display with empty 1st param [colink] - fix [ 1165635 ] IndexedSearch - double toolbar in AdminMode [mwilson] + - fix [ 1165598 ] Auth module numeric comparisons against Ids + - Fixed a bunch of Collaboration System template problems. 6.5.2 diff --git a/docs/upgrades/upgrade_6.5.2-6.5.3.pl b/docs/upgrades/upgrade_6.5.2-6.5.3.pl index 9ea0513ae..faf4bc364 100644 --- a/docs/upgrades/upgrade_6.5.2-6.5.3.pl +++ b/docs/upgrades/upgrade_6.5.2-6.5.3.pl @@ -21,7 +21,8 @@ WebGUI::Session::open("../..",$configFile); #-------------------------------------------- print "\tSorting templates under the Import Node into folders by namespace.\n" unless ($quiet); my ($templateFolder) = WebGUI::SQL->quickArray("select assetId from asset where parentId='PBasset000000000000002' and className='WebGUI::Asset::Wobject::Folder' and title='Templates' limit 1"); -my $namespacesQuery = "select distinct template.namespace from asset, template where asset.parentId='".$templateFolder."' and asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' order by template.namespace"; +$templateFolder ||= 'PBasset000000000000002'; +my $namespacesQuery = "select distinct template.namespace from asset, template where asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' order by template.namespace"; my $parent = WebGUI::Asset->new($templateFolder); my $sth = WebGUI::SQL->read($namespacesQuery); my $folder; @@ -43,7 +44,7 @@ while (my $namespace = $sth->hashRef) { groupIdEdit=>'3', description=>'' }); - my $templatesquery = "select * from asset, template where asset.parentId='".$templateFolder."' and asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' and template.namespace='".$namespace->{namespace}."' order by title asc"; + my $templatesquery = "select * from asset, template where asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' and template.namespace='".$namespace->{namespace}."' order by title asc"; my $newParentId = $folder->getId; my $sth2 = WebGUI::SQL->read($templatesquery); my $first = 1; @@ -81,4 +82,4 @@ sub getNextLineage { my $rank = substr($startLineage,$depth,6); my $parentLineage = substr($startLineage,0,$depth); return $parentLineage.sprintf("%06d",($rank+1)); -} \ No newline at end of file +} 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 fab0c8565..2a8d87774 100644 --- a/docs/upgrades/upgrade_6.5.2-6.5.3.sql +++ b/docs/upgrades/upgrade_6.5.2-6.5.3.sql @@ -1,11 +1,12 @@ 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='\">\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\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\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'; +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 \r\n
\r\n\r\n\r\n\r\n

\r\n \r\n\r\n' assetId='PBtmpl0000000000000029'; +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 \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n\r\n\r\n\r\n

\r\n \r\n\r\n' assetId='PBtmpl0000000000000068'; diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index 27c1a21e6..e2d279cf8 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -900,6 +900,7 @@ sub www_edit { } $var{'form.footer'} = WebGUI::Form::formFooter(); $var{usePreview} = $self->getThread->getParent->get("usePreview"); + $var{'user.isModerator'} = $self->getThread->getParent->canModerate; $var{'user.isVisitor'} = ($session{user}{userId} eq '1'); $var{'visitorName.form'} = WebGUI::Form::text({ name=>"visitorName", @@ -966,13 +967,17 @@ sub www_edit { name=>'contentType', value=>$self->getValue("contentType") || "mixed" }); + my $startDate = $self->get("startDate"); + $startDate = WebGUI::DateTime::setToEpoch($session{form}{startDate}) if ($session{form}{startDate}); $var{'startDate.form'} = WebGUI::Form::dateTime({ name => 'startDate', - value => $self->getValue("startDate") + value => $startDate }); + my $endDate = $self->get("endDate"); + $endDate = WebGUI::DateTime::setToEpoch($session{form}{endDate}) if ($session{form}{endDate}); $var{'endDate.form'} = WebGUI::Form::dateTime({ name => 'endDate', - value => $self->getValue("endDate") + value => $endDate }); $self->getThread->getParent->appendTemplateLabels(\%var); return $self->getThread->getParent->processStyle($self->processTemplate(\%var,$self->getThread->getParent->get("postFormTemplateId"))); diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 23502c928..638ee8697 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -158,6 +158,7 @@ sub appendTemplateLabels { $var->{'startDate.label'} = $i18n->get("start date"); $var->{"stick.label"} = $i18n->get("sticky"); $var->{"status.label"} = $i18n->get("status"); + $var->{"synopsis.label"} = $i18n->get("synopsis"); $var->{"thumbnail.label"} = $i18n->get("thumbnail"); $var->{"title.label"} = $i18n->get("title"); $var->{"layout.threaded.label"} = $i18n->get("threaded"); diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm index 5db34596b..f0fbd7b6e 100644 --- a/lib/WebGUI/Asset/Wobject/WSClient.pm +++ b/lib/WebGUI/Asset/Wobject/WSClient.pm @@ -7,6 +7,7 @@ use SOAP::Lite; use Storable; use WebGUI::Cache; use WebGUI::ErrorHandler; +use WebGUI::HTTP; use WebGUI::International; use WebGUI::Macro; use WebGUI::Paginator; @@ -514,9 +515,8 @@ sub view { if ($session{'config'}{'soapHttpHeaderOverride'} && $self->get("httpHeader")) { - $session{'header'}{'mimetype'} = $self->get("httpHeader"); - WebGUI::ErrorHandler::warn("changed mimetype: " . - $session{'header'}{'mimetype'}); + WebGUI::HTTP::setMimeType($self->get("httpHeader")); + WebGUI::ErrorHandler::warn("changed mimetype: " . $session{'header'}{'mimetype'}); } # Note, we still process our template below even though it will never diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index 9d5c1fa59..a29bdb203 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -61,7 +61,7 @@ sub _isDuplicateUsername { my $self = shift; my $username = shift; #Return false if the user is already logged in, but not changing their username. - return 0 if($self->userId != 1 && $session{user}{username} eq $username); + return 0 if($self->userId ne "1" && $session{user}{username} eq $username); my ($otherUser) = WebGUI::SQL->quickArray("select count(*) from users where username=".quote($username)); return 0 if !$otherUser; $self->error('
  • '.WebGUI::International::get(77).' "'.$username.'too", "'.$username.'2", '.'"'.$username.'_'.WebGUI::DateTime::epochToHuman(time(),"%y").'"'); @@ -81,7 +81,7 @@ sub _isValidUsername { my $username = shift; my $error = ""; - return 1 if($self->userId != 1 && $session{user}{username} eq $username); + return 1 if($self->userId ne "1" && $session{user}{username} eq $username); if ($username =~ /^\s/ || $username =~ /\s$/) { $error .= '
  • '.WebGUI::International::get(724); diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm index 4e2edafd6..8667607c4 100644 --- a/lib/WebGUI/Auth/LDAP.pm +++ b/lib/WebGUI/Auth/LDAP.pm @@ -172,7 +172,7 @@ sub authenticate { sub createAccount { my $self = shift; my $vars; - if ($session{user}{userId} != 1) { + if ($session{user}{userId} ne "1") { return $self->displayAccount; } elsif (!$session{setting}{anonymousRegistration}) { return $self->displayLogin; @@ -268,7 +268,7 @@ sub displayAccount { sub displayLogin { my $self = shift; my $vars; - return $self->displayAccount($_[0]) if ($self->userId != 1); + return $self->displayAccount($_[0]) if ($self->userId ne "1"); $vars->{'login.message'} = $_[0] if ($_[0]); return $self->SUPER::displayLogin("login",$vars); } diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index 454c97894..df843bc43 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -158,7 +158,7 @@ sub authenticate { sub createAccount { my $self = shift; my $vars; - if ($session{user}{userId} != 1) { + if ($session{user}{userId} ne "1") { return $self->displayAccount; } elsif (!$session{setting}{anonymousRegistration}) { return $self->displayLogin; @@ -190,7 +190,7 @@ sub createAccount { sub createAccountSave { my $self = shift; - return $self->displayAccount if ($session{user}{userId} != 1); + return $self->displayAccount if ($session{user}{userId} ne "1"); my $username = $session{form}{'authWebGUI.username'}; my $password = $session{form}{'authWebGUI.identifier'}; @@ -290,7 +290,7 @@ sub displayAccount { sub displayLogin { my $self = shift; my $vars; - return $self->displayAccount($_[0]) if ($self->userId != 1); + return $self->displayAccount($_[0]) if ($self->userId ne "1"); $vars->{'login.message'} = $_[0] if ($_[0]); $vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery"); $vars->{'recoverPassword.url'} = WebGUI::URL::page('op=auth&method=recoverPassword'); @@ -494,7 +494,7 @@ sub new { #------------------------------------------------------------------- sub recoverPassword { my $self = shift; - return $self->displayLogin if($self->userId != 1); + return $self->displayLogin if($self->userId ne "1"); my $template = 'Auth/WebGUI/Recovery'; my $vars; $vars->{title} = WebGUI::International::get(71); diff --git a/lib/WebGUI/i18n/English/Collaboration.pm b/lib/WebGUI/i18n/English/Collaboration.pm index ef744c476..57191f19c 100644 --- a/lib/WebGUI/i18n/English/Collaboration.pm +++ b/lib/WebGUI/i18n/English/Collaboration.pm @@ -236,6 +236,11 @@ our $I18N = { lastUpdated => 1109696029, }, + 'synopsis' => { + message => q|Synopsis|, + lastUpdated => 1109696029, + }, + 'start date' => { message => q|Start Date|, lastUpdated => 1109696029,