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

WebGUI 3.6.5 release

Browse source
This commit is contained in:
JT Smith 2002-04-06 03:32:00 +00:00
parent 11ab194b7a
commit bb66c11a6a
15 changed files with 917 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Macro/Include.pm
View file

@ -22,10 +22,14 @@ sub _replacement {
$temp = "SECURITY VIOLATION";
} else {
$file = FileHandle->new($param[0],"r");
while (<$file>) {
$temp .= $_;
if ($file) {
while (<$file>) {
$temp .= $_;
}
$file->close;
} else {
$temp = "INCLUDED FILE DOES NOT EXIST";
}
$file->close;
}
return $temp;
}

11
lib/WebGUI/Operation/Page.pm
View file

@ -96,7 +96,8 @@ sub www_addPage {
sub www_addPageSave {
my ($urlizedTitle, $nextSeq, $parentId, $menuTitle);
if (WebGUI::Privilege::canEditPage()) {
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from page where parentId=$session{page}{pageId}");
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from page where parentId=$session{page}{pageId}");
$nextSeq += 1;
if ($session{form}{title} eq "") {
$session{form}{title} = "no title";
}
@ -242,7 +243,10 @@ sub www_editPageSave {
if ($session{form}{title} eq "") {
$session{form}{title} = "no title";
}
$urlizedTitle = WebGUI::URL::makeUnique(WebGUI::URL::urlize($session{form}{urlizedTitle}));
$urlizedTitle = WebGUI::URL::makeUnique(
WebGUI::URL::urlize($session{form}{urlizedTitle}),
$session{page}{pageId}
);
WebGUI::SQL->write("update page set title=".quote($session{form}{title}).", styleId=$session{form}{styleId}, ownerId=$session{form}{ownerId}, ownerView=$session{form}{ownerView}, ownerEdit=$session{form}{ownerEdit}, groupId='$session{form}{groupId}', groupView=$session{form}{groupView}, groupEdit=$session{form}{groupEdit}, worldView=$session{form}{worldView}, worldEdit=$session{form}{worldEdit}, metaTags=".quote($session{form}{metaTags}).", urlizedTitle='$urlizedTitle', defaultMetaTags='$session{form}{defaultMetaTags}', template='$session{form}{template}', menuTitle=".quote($session{form}{menuTitle}).", synopsis=".quote($session{form}{synopsis})." where pageId=$session{page}{pageId}");
if ($session{form}{recurseStyle} eq "yes") {
_recursivelyChangeStyle($session{page}{pageId});
@ -292,7 +296,8 @@ sub www_movePageUp {
#-------------------------------------------------------------------
sub www_pastePage {
my ($output, $nextSeq);
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from page where parentId=$session{page}{pageId}");
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from page where parentId=$session{page}{pageId}");
$nextSeq += 1;
if (WebGUI::Privilege::canEditPage()) {
WebGUI::SQL->write("update page set parentId=$session{page}{pageId}, sequenceNumber='$nextSeq' where pageId=$session{form}{pageId}");
_reorderPages($session{page}{pageId});

6
lib/WebGUI/Operation/Statistics.pm
View file

@ -124,9 +124,11 @@ sub www_viewStatistics {
$output .= '<tr><td class="tableHeader">'.WebGUI::International::get(145).'</td><td class="tableData">'.$WebGUI::VERSION.' ('.WebGUI::International::get(349).': '.$version.')</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from userSession");
$output .= '<tr><td class="tableHeader">'.WebGUI::International::get(146).'</td><td class="tableData">'.$data.' (<a href="'.WebGUI::URL::page("op=viewActiveSessions").'">'.WebGUI::International::get(423).'</a> / <a href="'.WebGUI::URL::page("op=viewLoginHistory").'">'.WebGUI::International::get(424).'</a>)</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*)+1 from page where parentId>25");
($data) = WebGUI::SQL->quickArray("select count(*) from page where parentId>25");
$data += 1;
$output .= '<tr><td class="tableHeader">'.WebGUI::International::get(147).'</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*)-1 from widget");
($data) = WebGUI::SQL->quickArray("select count(*) from widget");
$data -= 1;
$output .= '<tr><td class="tableHeader">'.WebGUI::International::get(148).'</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from style where styleId>25");
$output .= '<tr><td class="tableHeader">'.WebGUI::International::get(427).'</td><td class="tableData">'.$data.'</td></tr>';

1
lib/WebGUI/Style.pm
View file

@ -19,6 +19,7 @@ use WebGUI::SQL;
#-------------------------------------------------------------------
sub getStyle {
my ($header, $footer, @style, %style);
tie %style, 'Tie::CPHash';
if ($session{form}{makePrintable}) {
%style = WebGUI::SQL->quickHash("select header,footer,styleSheet from style where styleId=3");
$header = '<html><!-- WebGUI '.$session{wg}{version}.' -->'."\n";

5
lib/WebGUI/URL.pm
View file

@ -48,9 +48,10 @@ sub gateway {
#-------------------------------------------------------------------
sub makeUnique {
my ($url, $test);
my ($url, $test, $pageId);
$url = $_[0];
while (($test) = WebGUI::SQL->quickArray("select urlizedTitle from page where urlizedTitle='$url'")) {
$pageId = $_[1] || "new";
while (($test) = WebGUI::SQL->quickArray("select urlizedTitle from page where urlizedTitle='$url' and pageId<>'$pageId'")) {
if ($url =~ /(.*)(\d+$)/) {
$url = $1.($2+1);
} elsif ($test ne "") {

6
lib/WebGUI/Widget.pm
View file

@ -40,7 +40,8 @@ sub _reorderWidgets {
sub create {
my ($widgetId, $nextSeq);
$widgetId = getNextId("widgetId");
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from widget where pageId=$_[0]");
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from widget where pageId=$_[0]");
$nextSeq += 1;
WebGUI::SQL->write("insert into widget values ($widgetId, $_[0], '$_[1]', '$nextSeq', ".quote($_[2]).", '$_[3]', ".quote($_[4]).", '$_[5]', ".time().", '$session{user}{userId}', 0, 0, '$_[6]')");
return $widgetId;
}
@ -180,7 +181,8 @@ sub www_moveUp {
sub www_paste {
my ($output, $nextSeq);
if (WebGUI::Privilege::canEditPage()) {
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from widget where pageId=$session{page}{pageId}");
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from widget where pageId=$session{page}{pageId}");
$nextSeq += 1;
WebGUI::SQL->write("update widget set pageId=$session{page}{pageId}, sequenceNumber='$nextSeq' where widgetId=$session{form}{wid}");
_reorderWidgets($session{page}{pageId});
return "";

2
lib/WebGUI/Widget/Article.pm
View file

@ -312,7 +312,7 @@ sub www_editSave {
}
$attachment = WebGUI::Attachment->new("",$session{form}{wid});
$attachment->save("attachment");
if ($attachment ne "") {
if ($attachment->getFilename ne "") {
$sqlAdd .= ', attachment='.quote($attachment->getFilename);
}
WebGUI::SQL->write("update Article set alignImage=".quote($session{form}{alignImage}).

3
lib/WebGUI/Widget/DownloadManager.pm
View file

@ -213,7 +213,8 @@ sub www_addDownloadSave {
$alt1->save("alternateVersion1");
$alt2 = WebGUI::Attachment->new("",$session{form}{wid},$downloadId);
$alt2->save("alternateVersion2");
($sequenceNumber) = WebGUI::SQL->quickArray("select count(*)+1 from DownloadManager_file where widgetId=$session{form}{wid}");
($sequenceNumber) = WebGUI::SQL->quickArray("select count(*) from DownloadManager_file where widgetId=$session{form}{wid}");
$sequenceNumber += 1;
WebGUI::SQL->write("insert into DownloadManager_file values (".
$downloadId.
", ".$session{form}{wid}.

3
lib/WebGUI/Widget/FAQ.pm
View file

@ -129,7 +129,8 @@ sub www_addQuestion {
sub www_addQuestionSave {
my ($questionId, $nextSeq);
if (WebGUI::Privilege::canEditPage()) {
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from FAQ_question where widgetId=$session{form}{wid}");
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from FAQ_question where widgetId=$session{form}{wid}");
$nextSeq += 1;
$questionId = getNextId("questionId");
WebGUI::SQL->write("insert into FAQ_question values ($session{form}{wid}, $questionId, ".quote($session{form}{question}).", ".quote($session{form}{answer}).", '$nextSeq')");
return www_edit();

3
lib/WebGUI/Widget/LinkList.pm
View file

@ -134,7 +134,8 @@ sub www_addLink {
sub www_addLinkSave {
my ($linkId, $nextSeq);
if (WebGUI::Privilege::canEditPage()) {
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from LinkList_link where widgetId=$session{form}{wid}");
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from LinkList_link where widgetId=$session{form}{wid}");
$nextSeq += 1;
$linkId = getNextId("linkId");
WebGUI::SQL->write("insert into LinkList_link values ($session{form}{wid}, $linkId, ".quote($session{form}{name}).", ".quote($session{form}{url}).", ".quote($session{form}{description}).", '$nextSeq', '$session{form}{newWindow}')");
return www_edit();

1
lib/WebGUI/Widget/MessageBoard.pm
View file

@ -364,7 +364,6 @@ sub www_view {
WebGUI::International::get(17,$namespace).'</a></td></tr></table>';
$html .= '<table border=0 cellpadding=2 cellspacing=1 width="100%">';
$html .= '<tr><td class="tableHeader">'.WebGUI::International::get(229).'</td><td class="tableHeader">'.WebGUI::International::get(15,$namespace).'</td><td class="tableHeader">'.WebGUI::International::get(18,$namespace).'</td><td class="tableHeader">'.WebGUI::International::get(19,$namespace).'</td><td class="tableHeader">'.WebGUI::International::get(20,$namespace).'</td></tr>';
#$sth = WebGUI::SQL->read("select messageId,subject,count(*)-1,username,dateOfPost,max(dateOfPost),max(messageId) from discussion where widgetId=$_[0] group by rid order by messageId desc");
$sth = WebGUI::SQL->read("select messageId,subject,username,dateOfPost,userId from discussion where widgetId=$_[0] and pid=0 order by messageId desc");
while (@data = $sth->array) {
$data[1] = WebGUI::HTML::filter($data[1],'all');