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

WebGUI 3.6.3 release

Browse source
This commit is contained in:
JT Smith 2002-03-29 03:35:00 +00:00
parent a389e8ff95
commit 9454a7c8ec
11 changed files with 87 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI.pm
View file

@ -1,5 +1,5 @@
package WebGUI;
our $VERSION = "3.6.2";
our $VERSION = "3.6.3";
#-------------------------------------------------------------------
# WebGUI is Copyright 2001-2002 Plain Black Software.

7
lib/WebGUI/Operation/Package.pm
View file

@ -34,7 +34,7 @@ sub _duplicateWidgets {
#-------------------------------------------------------------------
sub _recursePageTree {
my ($a, %package, %newParent, $newPageId, $test, $urlizedTitle);
my ($a, %package, %newParent, $newPageId, $urlizedTitle);
tie %newParent, 'Tie::CPHash';
tie %package, 'Tie::CPHash';
%newParent = WebGUI::SQL->quickHash("select * from page where pageId=$_[1]");
@ -42,10 +42,7 @@ sub _recursePageTree {
$a = WebGUI::SQL->read("select * from page where parentId=$_[0]");
while (%package = $a->hash) {
$newPageId = getNextId("pageId");
$urlizedTitle = $package{urlizedTitle};
while (($test) = WebGUI::SQL->quickArray("select urlizedTitle from page where urlizedTitle='$urlizedTitle'")) {
$urlizedTitle .= 2;
}
$urlizedTitle = WebGUI::URL::makeUnique($package{urlizedTitle});
WebGUI::SQL->write("insert into page values ($newPageId,$_[1],".quote($package{title}).",$newParent{styleId},$session{user}{userId},$newParent{ownerView},$newParent{ownerEdit},$newParent{groupId},$newParent{groupView},$newParent{groupEdit},$newParent{worldView},$newParent{worldEdit},$package{sequenceNumber},".quote($package{metaTags}).",".quote($urlizedTitle).",$package{defaultMetaTags},".quote($package{template}).",".quote($package{menuTitle}).",".quote($package{synopsis}).")");
_recursePageTree($package{pageId},$newPageId);
}

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

@ -94,7 +94,7 @@ sub www_addPage {
#-------------------------------------------------------------------
sub www_addPageSave {
my ($urlizedTitle, $test, $nextSeq, $parentId, $menuTitle);
my ($urlizedTitle, $nextSeq, $parentId, $menuTitle);
if (WebGUI::Privilege::canEditPage()) {
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from page where parentId=$session{page}{pageId}");
if ($session{form}{title} eq "") {
@ -110,10 +110,7 @@ sub www_addPageSave {
} else {
$menuTitle = $session{form}{menuTitle};
}
$urlizedTitle = WebGUI::URL::urlize($session{form}{title});
while (($test) = WebGUI::SQL->quickArray("select urlizedTitle from page where urlizedTitle='$urlizedTitle'")) {
$urlizedTitle .= 2;
}
$urlizedTitle = WebGUI::URL::makeUnique(WebGUI::URL::urlize($session{form}{title}));
WebGUI::SQL->write("insert into page values (".getNextId("pageId").", $parentId, ".quote($session{form}{title}).", $session{page}{styleId}, $session{user}{userId}, $session{page}{ownerView}, $session{page}{ownerEdit}, $session{page}{groupId}, $session{page}{groupView}, $session{page}{groupEdit}, $session{page}{worldView}, $session{page}{worldEdit}, '$nextSeq', ".quote($session{form}{metaTags}).", '$urlizedTitle', '$session{form}{defaultMetaTags}', '$session{form}{template}', ".quote($menuTitle).", ".quote($session{form}{synopsis}).")");
return "";
} else {
@ -245,10 +242,7 @@ sub www_editPageSave {
if ($session{form}{title} eq "") {
$session{form}{title} = "no title";
}
$urlizedTitle = WebGUI::URL::urlize($session{form}{urlizedTitle});
while (($test) = WebGUI::SQL->quickArray("select urlizedTitle from page where urlizedTitle='$urlizedTitle' and pageId<>$session{page}{pageId}")) {
$urlizedTitle .= 2;
}
$urlizedTitle = WebGUI::URL::makeUnique(WebGUI::URL::urlize($session{form}{urlizedTitle}));
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});

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

@ -76,7 +76,7 @@ sub www_viewLoginHistory {
tie %data, 'Tie::CPHash';
if (WebGUI::Privilege::isInGroup(3)) {
$output = '<h1>'.WebGUI::International::get(426).'</h1>';
$sth = WebGUI::SQL->read("select * from users,userLoginLog where users.userId=userLoginLog.userId order by userLoginLog.timeStamp");
$sth = WebGUI::SQL->read("select * from users,userLoginLog where users.userId=userLoginLog.userId order by userLoginLog.timeStamp desc");
while (%data = $sth->hash) {
$data{username} = 'unknown user' if ($data{userId} == 0);
$row[$i] = '<tr class="tableData"><td>'.$data{username}.' ('.$data{userId}.')</td>';
@ -96,7 +96,7 @@ sub www_viewLoginHistory {
$output .= '<td>'.WebGUI::International::get(433).'</td></tr>';
$output .= $p->getPage($session{form}{pn});
$output .= '</table>';
$output .= $p->getBarTraditional($session{form}{pn});
$output .= $p->getBar($session{form}{pn});
} else {
$output = WebGUI::Privilege::adminOnly();
}

4
lib/WebGUI/Operation/Style.pm
View file

@ -75,7 +75,7 @@ sub www_copyStyle {
#-------------------------------------------------------------------
sub www_deleteStyle {
my ($output);
if ($session{form}{sid} < 26) {
if ($session{form}{sid} < 26 && $session{form}{sid} > 0) {
return WebGUI::Privilege::vitalComponent();
} elsif (WebGUI::Privilege::isInGroup(5)) {
$output .= helpLink(4);
@ -94,7 +94,7 @@ sub www_deleteStyle {
#-------------------------------------------------------------------
sub www_deleteStyleConfirm {
if ($session{form}{sid} < 26) {
if ($session{form}{sid} < 26 || $session{form}{sid} > 0) {
return WebGUI::Privilege::vitalComponent();
} elsif (WebGUI::Privilege::isInGroup(5)) {
WebGUI::SQL->write("delete from style where styleId=".$session{form}{sid});

15
lib/WebGUI/URL.pm
View file

@ -13,6 +13,7 @@ package WebGUI::URL;
use strict;
use URI::Escape;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::Utility;
#-------------------------------------------------------------------
@ -45,6 +46,20 @@ sub gateway {
return $url;
}
#-------------------------------------------------------------------
sub makeUnique {
my ($url, $test);
$url = $_[0];
while (($test) = WebGUI::SQL->quickArray("select urlizedTitle from page where urlizedTitle='$url'")) {
if ($url =~ /(.*)(\d+$)/) {
$url = $1.($2+1);
} elsif ($test ne "") {
$url .= "2";
}
}
return $url;
}
#-------------------------------------------------------------------
sub page {
my ($url);

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

@ -482,7 +482,7 @@ sub www_viewSubmission {
#---content
if ($submission{image} ne "") {
$file = WebGUI::Attachment->new($submission{image},$session{form}{wid},$session{form}{sid});
$output .= '<img src="'.$file->getURL.'" hspace=3 align="right">';
$output .= '<img src="'.$file->getURL.'"><p>';
}
if ($submission{convertCarriageReturns}) {
$submission{content} =~ s/\n/\<br\>/g;