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

more guid stuff

Browse source
This commit is contained in:
JT Smith 2004-08-12 22:40:38 +00:00
parent c60613ac2c
commit 22994e8373
20 changed files with 126 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lib/WebGUI/Operation/Clipboard.pm
View file

@ -79,19 +79,19 @@ sub www_deleteClipboardItemConfirm {
if ( ($session{setting}{sharedClipboard} eq "1") || (WebGUI::Grouping::isInGroup(3)) ) {
WebGUI::SQL->write("update wobject set pageId=3, "
."bufferDate=".time().", "
."bufferUserId=".$session{user}{userId} .", "
."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 "
."where pageId=2 "
."and wobjectId=" . $session{form}{wid}
."and wobjectId=" . quote($session{form}{wid})
);
} else {
WebGUI::SQL->write("update wobject set pageId=3, "
."bufferDate=".time().", "
."bufferUserId=".$session{user}{userId} .", "
."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 "
."where pageId=2 "
."and wobjectId=" . $session{form}{wid} ." "
."and bufferUserId=".$session{user}{userId}
."and wobjectId=" . quote($session{form}{wid}) ." "
."and bufferUserId=".quote($session{user}{userId})
);
}
WebGUI::ErrorHandler::audit("moved wobject ". $session{form}{wid} ." from clipboard to trash");
@ -99,15 +99,15 @@ sub www_deleteClipboardItemConfirm {
if ( ($session{setting}{sharedClipboard} eq "1") || (WebGUI::Grouping::isInGroup(3)) ) {
WebGUI::SQL->write("update page set parentId=3, "
."bufferDate=".time().", "
."bufferUserId=".$session{user}{userId} .", "
."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 "
."where parentId=2 "
."and pageId=".$session{form}{pageId}
."and pageId=".quote($session{form}{pageId})
);
} else {
WebGUI::SQL->write("update page set parentId=3, "
."bufferDate=".time().", "
."bufferUserId=".$session{user}{userId} .", "
."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 "
."where parentId=2 "
."and pageId=".$session{form}{pageId} ." "
@ -154,28 +154,28 @@ sub www_emptyClipboardConfirm {
if ($allUsers eq "1") {
WebGUI::SQL->write("update page set parentId=3, "
."bufferDate=".time().", "
."bufferUserId=".$session{user}{userId} .", "
."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 "
."where parentId=2 ");
WebGUI::SQL->write("update wobject set pageId=3, "
."bufferDate=".time().", "
."bufferUserId=".$session{user}{userId} .", "
."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 "
."where pageId=2 ");
WebGUI::ErrorHandler::audit("emptied clipboard to trash");
} else {
WebGUI::SQL->write("update page set parentId=3, "
."bufferDate=".time().", "
."bufferUserId=".$session{user}{userId} .", "
."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 "
."where parentId=2 "
."and bufferUserId=".$session{user}{userId});
."and bufferUserId=".quote($session{user}{userId}));
WebGUI::SQL->write("update wobject set pageId=3, "
."bufferDate=".time().", "
."bufferUserId=".$session{user}{userId} .", "
."bufferUserId=".quote($session{user}{userId}) .", "
."bufferPrevId=2 "
."where pageId=2 "
."and bufferUserId=".$session{user}{userId});
."and bufferUserId=".quote($session{user}{userId}));
WebGUI::ErrorHandler::audit("emptied user clipboard to trash");
}
WebGUI::Session::refreshPageInfo($session{page}{pageId});
@ -209,7 +209,7 @@ sub www_manageClipboard {
} else {
$sth = WebGUI::SQL->read("select pageId,title,urlizedTitle,bufferUserId,bufferDate,bufferPrevId "
."from page where parentId=2 and bufferUserId="
. $session{user}{userId} . " order by bufferDate");
. quote($session{user}{userId}) . " order by bufferDate");
}
while (@data = $sth->array) {
my ($pageId,$title,$urlizedTitle,$bufferUserId,$bufferDate,$bufferPrevId,$url,$htmlData);
@ -220,7 +220,7 @@ sub www_manageClipboard {
$bufferUserId = $data[3];
if ($bufferUserId ne "") {
my ($bufferUsername) = WebGUI::SQL->quickArray("select username from users where userId=".$bufferUserId);
my ($bufferUsername) = WebGUI::SQL->quickArray("select username from users where userId=".quote($bufferUserId));
$bufferUserId = '<a href="' .WebGUI::URL::page('op=viewProfile&uid='.$bufferUserId) .'">'
.$bufferUsername .'</a>';
}
@ -228,7 +228,7 @@ sub www_manageClipboard {
$bufferPrevId = $data[5];
if ($bufferPrevId ne "") {
($bufferPrevId,$url) = WebGUI::SQL->quickArray("select title,urlizedTitle "
."from page where pageId=".$bufferPrevId);
."from page where pageId=".quote($bufferPrevId));
if ($url ne "") {
$bufferPrevId = '<a href="'. WebGUI::URL::gateway($url) .'">' .$bufferPrevId .'</a>';
}
@ -261,7 +261,7 @@ sub www_manageClipboard {
} else {
$sth = WebGUI::SQL->read("select wobjectId,namespace,title,bufferUserId,bufferDate,bufferPrevId "
. "from wobject where pageId=2 and bufferUserId="
. $session{user}{userId} ." order by bufferDate");
. quote($session{user}{userId}) ." order by bufferDate");
}
while (@data = $sth->array) {
my ($wobjectId,$namespace,$title,$bufferUserId,$bufferDate,$bufferPrevId,$url,$htmlData);
@ -274,7 +274,7 @@ sub www_manageClipboard {
$bufferPrevId = $data[5];
if ($bufferPrevId ne "") {
($bufferPrevId,$url) = WebGUI::SQL->quickArray("select title,urlizedTitle "
."from page where pageId=".$bufferPrevId);
."from page where pageId=".quote($bufferPrevId));
if ($url ne "") {
$bufferPrevId = '<a href="'. WebGUI::URL::gateway($url) .'">' .$bufferPrevId .'</a>';
}
@ -283,7 +283,7 @@ sub www_manageClipboard {
$bufferUserId = $data[3];
if ($bufferUserId ne "") {
my ($bufferUsername) = WebGUI::SQL->quickArray("select username from users where userId=".$bufferUserId);
my ($bufferUsername) = WebGUI::SQL->quickArray("select username from users where userId=".quote($bufferUserId));
$bufferUserId = '<a href="' .WebGUI::URL::page('op=viewProfile&uid='.$bufferUserId) .'">'
.$bufferUsername .'</a>';
}

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

@ -13,6 +13,7 @@ package WebGUI::Operation::Package;
use Exporter;
use strict qw(vars subs);
use WebGUI::Icon;
use WebGUI::Id;
use WebGUI::Page;
use WebGUI::Privilege;
use WebGUI::Session;
@ -26,7 +27,7 @@ our @EXPORT = qw(&www_deployPackage );
sub _duplicateWobjects {
my (%properties);
tie %properties, 'Tie::CPHash';
my $sth = WebGUI::SQL->read("select * from wobject where pageId=$_[0] order by sequenceNumber");
my $sth = WebGUI::SQL->read("select * from wobject where pageId=".quote($_[0])." order by sequenceNumber");
while (my $wobject = $sth->hashRef) {
my $cmd = "WebGUI::Wobject::".${$wobject}{namespace};
my $load = "use ".$cmd;
@ -43,12 +44,12 @@ sub _recursePageTree {
my ($a, %package, %newParent, $newPageId, $sequenceNumber, $urlizedTitle);
tie %newParent, 'Tie::CPHash';
tie %package, 'Tie::CPHash';
%newParent = WebGUI::SQL->quickHash("select * from page where pageId=$_[1]");
%newParent = WebGUI::SQL->quickHash("select * from page where pageId=".quote($_[1]));
_duplicateWobjects($_[0],$_[1]);
($sequenceNumber) = WebGUI::SQL->quickArray("select max(sequenceNumber) from page where parentId=$_[1]");
$a = WebGUI::SQL->read("select * from page where parentId=$_[0] order by sequenceNumber");
($sequenceNumber) = WebGUI::SQL->quickArray("select max(sequenceNumber) from page where parentId=".quote($_[1]));
$a = WebGUI::SQL->read("select * from page where parentId=".quote($_[0])." order by sequenceNumber");
while (%package = $a->hash) {
$newPageId = getNextId("pageId");
$newPageId = WebGUI::Id::generate();
$sequenceNumber++;
$urlizedTitle = WebGUI::Page::makeUnique($package{urlizedTitle});
WebGUI::SQL->write("insert into page (
@ -82,7 +83,7 @@ sub _recursePageTree {
wobjectPrivileges
) values (
$newPageId,
$_[1],
".quote($_[1]).",
".quote($package{title}).",
$newParent{styleId},
$session{user}{userId},
@ -107,7 +108,7 @@ sub _recursePageTree {
$package{newWindow},
$package{cacheTimeout},
$package{cacheTimeoutVisitor},
$package{printableStyleId},
".quote($package{printableStyleId}).",
$package{wobjectPrivileges}
)");
_recursePageTree($package{pageId},$newPageId);

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

@ -215,7 +215,7 @@ sub _traversePageTree {
.moveRightIcon(sprintf('op=moveTreePageRight&pageId=%s',$currentPageId), $currentUrlizedTitle)
.editIcon('op=editPage', $currentUrlizedTitle)
.' <a href="'.WebGUI::URL::gateway($currentUrlizedTitle).'">'.$currentPage->get('title').'</a><br>';
$wobjects = WebGUI::SQL->read("select * from wobject where pageId=$currentPageId");
$wobjects = WebGUI::SQL->read("select * from wobject where pageId=".quote($currentPageId));
while (%wobject = $wobjects->hash) {
$output .= $spacer x $options->{_depth} . $spacer
.wobjectIcon()
@ -338,7 +338,7 @@ sub www_editPage {
if ($buildFromPage == 0) {
$buildFromPage = $session{setting}{defaultPage};
}
%page = WebGUI::SQL->quickHash("select * from page where pageId=$buildFromPage");
%page = WebGUI::SQL->quickHash("select * from page where pageId=".quote($buildFromPage));
$page{templateId} = 1;
$page{pageId} = "new";
$page{title} = $page{menuTitle} = $page{urlizedTitle} = $page{synopsis} = '';
@ -349,7 +349,7 @@ sub www_editPage {
$page{redirectURL} = "";
} else {
%page = %{$session{page}};
($childCount) = WebGUI::SQL->quickArray("select count(*) from page where parentId=$page{pageId}");
($childCount) = WebGUI::SQL->quickArray("select count(*) from page where parentId=".quote($page{pageId}));
}
$page{endDate} = (addToDate(time(),10)) if ($page{endDate} < 0);
$output = helpIcon("page add/edit");
@ -487,9 +487,9 @@ sub www_editPage {
if (WebGUI::Grouping::isInGroup(3)) {
my $contentManagers = WebGUI::Grouping::getUsersInGroup(4,1);
push (@$contentManagers, $session{user}{userId});
$clause = "userId in (".join(",",@$contentManagers).")";
$clause = "userId in (".quoteAndJoin($contentManagers).")";
} else {
$clause = "userId=$page{ownerId}";
$clause = "userId=".quote($page{ownerId});
}
my $users = WebGUI::SQL->buildHashRef("select userId,username from users where $clause order by username");
$f->getTab("privileges")->select(
@ -598,7 +598,7 @@ sub www_editPageSave {
synopsis => $session{form}{synopsis}
});
unless ($session{form}{pageId} == 'new') {
WebGUI::SQL->write("update wobject set templatePosition=1 where pageId=$session{form}{pageId}
WebGUI::SQL->write("update wobject set templatePosition=1 where pageId=".quote($session{form}{pageId})."
and templatePosition>".WebGUI::Page::countTemplatePositions($session{form}{templateId}));
}
_recursivelyChangeProperties($page) if ($session{form}{recursePrivs} || $session{form}{recurseStyle});

2
lib/WebGUI/Operation/Profile.pm
View file

@ -98,7 +98,7 @@ sub getRequiredProfileFields {
sub isDuplicateEmail {
my $email = shift;
my ($otherEmail) = WebGUI::SQL->quickArray("select count(*) from userProfileData where fieldName='email' and fieldData = ".quote($email)." and userId <> ".$session{user}{userId});
my ($otherEmail) = WebGUI::SQL->quickArray("select count(*) from userProfileData where fieldName='email' and fieldData = ".quote($email)." and userId <> ".quote($session{user}{userId}));
return ($otherEmail > 0);
}

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

@ -174,25 +174,25 @@ sub www_viewStatistics {
$version = '<a href="http://files.plainblack.com/downloads/'.$rev[0].'.x.x/webgui-'.$version.'.tar.gz">'.$version.'</a>';
}
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(349).':</td><td class="tableData">'.$version.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from page where parentId>1000 and parentId<>3");
($data) = WebGUI::SQL->quickArray("select count(*) from page where parentId<>3");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(147).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from page where parentId>1000 and parentId=0");
($data) = WebGUI::SQL->quickArray("select count(*) from page where parentId=0");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(795).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from page where parentId=5");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(794).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from wobject where wobjectId > 0 and pageId<>3");
($data) = WebGUI::SQL->quickArray("select count(*) from wobject where pageId<>3");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(148).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from template where templateId>1000 and namespace='style'");
($data) = WebGUI::SQL->quickArray("select count(*) from template where namespace='style'");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(427).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from template where templateId>1000 and namespace<>'style'");
($data) = WebGUI::SQL->quickArray("select count(*) from template where namespace<>'style'");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(792).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from collateral");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(793).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from userSession");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(146).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from users where userId>25");
($data) = WebGUI::SQL->quickArray("select count(*) from users");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(149).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from groups where groupId>25");
($data) = WebGUI::SQL->quickArray("select count(*) from groups");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(89).':</td><td class="tableData">'.$data.'</td></tr>';
$output .= '</table>';
return _submenu($output);

36
lib/WebGUI/Operation/Trash.pm
View file

@ -37,10 +37,10 @@ sub _purgeUserTrash {
#WebGUI::ErrorHandler::audit("emptying user trash");
# Delete wobjects
$b = WebGUI::SQL->read("select * from wobject where pageId=3 and bufferUserId=" . $userId);
$b = WebGUI::SQL->read("select * from wobject where pageId=3 and bufferUserId=" . quote($userId));
while ($base = $b->hashRef) {
$extended = WebGUI::SQL->quickHashRef("select * from ".$base->{namespace}."
where wobjectId=".$base->{wobjectId});
where wobjectId=".quote($base->{wobjectId}));
%properties = (%{$base}, %{$extended});
$cmd = "WebGUI::Wobject::".$properties{namespace};
my $load = "use ".$cmd;
@ -68,10 +68,10 @@ sub _purgeUserTrash {
sub _purgeWobject {
my (%properties, $base, $extended, $b, $wobjectId, $namespace, $w, $cmd);
tie %properties, 'Tie::CPHash';
$b = WebGUI::SQL->read("select * from wobject where wobjectId=$_[0]");
$b = WebGUI::SQL->read("select * from wobject where wobjectId=".quote($_[0]));
while ($base = $b->hashRef) {
$extended = WebGUI::SQL->quickHashRef("select * from ".$base->{namespace}."
where wobjectId=".$base->{wobjectId});
where wobjectId=".quote($base->{wobjectId}));
%properties = (%{$base}, %{$extended});
$cmd = "WebGUI::Wobject::".$properties{namespace};
my $load = "use ".$cmd;
@ -87,10 +87,10 @@ sub _purgeWobject {
sub _purgeWobjects {
my (%properties, $base, $extended, $b, $wobjectId, $namespace, $w, $cmd);
tie %properties, 'Tie::CPHash';
$b = WebGUI::SQL->read("select * from wobject where pageId=$_[0]");
$b = WebGUI::SQL->read("select * from wobject where pageId=".quote($_[0]));
while ($base = $b->hashRef) {
$extended = WebGUI::SQL->quickHashRef("select * from ".$base->{namespace}."
where wobjectId=".$base->{wobjectId});
where wobjectId=".quote($base->{wobjectId}));
%properties = (%{$base}, %{$extended});
$cmd = "WebGUI::Wobject::".$properties{namespace};
my $load = "use ".$cmd;
@ -105,11 +105,11 @@ sub _purgeWobjects {
#-------------------------------------------------------------------
sub _recursePageTree {
my ($a, $pageId);
$a = WebGUI::SQL->read("select pageId from page where parentId=$_[0]");
$a = WebGUI::SQL->read("select pageId from page where parentId=".quote($_[0]));
while (($pageId) = $a->array) {
_recursePageTree($pageId);
_purgeWobjects($pageId);
WebGUI::SQL->write("delete from page where pageId=$pageId");
WebGUI::SQL->write("delete from page where pageId=".quote($pageId));
}
$a->finish;
}
@ -138,14 +138,14 @@ sub www_cutTrashItem {
if ($session{form}{wid} ne "") {
if ( ($session{setting}{sharedTrash} ne "1") && (!(WebGUI::Grouping::isInGroup(3)) ) ) {
my ($bufferUserId) = WebGUI::SQL->quickArray("select bufferUserId from wobject "
."where wobjectId=" .$session{form}{wid});
."where wobjectId=" .quote($session{form}{wid}));
return WebGUI::Privilege::insufficient() unless ($bufferUserId eq $session{user}{userId});
}
WebGUI::SQL->write("update wobject set pageId=2, "
."bufferUserId=". $session{user}{userId} .", "
."bufferUserId=". quote($session{user}{userId}) .", "
."bufferDate=". time() .", "
."bufferPrevId=3 "
."where wobjectId=" .$session{form}{wid});
."where wobjectId=" .quote($session{form}{wid}));
WebGUI::ErrorHandler::audit("moved wobject ". $session{form}{wid} ." from trash to clipboard");
} elsif ($session{form}{pageId} ne "") {
my $page = WebGUI::Page->getPage($session{form}{pageId});
@ -195,7 +195,7 @@ sub www_deleteTrashItemConfirm {
_purgeWobject($session{form}{wid});
} else {
my ($bufferUserId) = WebGUI::SQL->quickArray("select bufferUserId from wobject "
."where wobjectId=" .$session{form}{wid});
."where wobjectId=" .quote($session{form}{wid}));
return WebGUI::Privilege::insufficient() unless ($bufferUserId eq $session{user}{userId});
_purgeWobject($session{form}{wid});
}
@ -298,7 +298,7 @@ sub www_manageTrash {
} else {
$sth = WebGUI::SQL->read("select pageId,title,urlizedTitle,bufferUserId,bufferDate,bufferPrevId "
."from page where parentId=3 and bufferUserId="
. $session{user}{userId} . " order by bufferDate");
. quote($session{user}{userId}) . " order by bufferDate");
}
while (@data = $sth->array) {
my ($pageId,$title,$urlizedTitle,$bufferUserId,$bufferDate,$bufferPrevId,$url,$htmlData);
@ -309,7 +309,7 @@ sub www_manageTrash {
$bufferUserId = $data[3];
if ($bufferUserId ne "") {
my ($bufferUsername) = WebGUI::SQL->quickArray("select username from users where userId=".$bufferUserId);
my ($bufferUsername) = WebGUI::SQL->quickArray("select username from users where userId=".quote($bufferUserId));
$bufferUserId = '<a href="' .WebGUI::URL::page('op=viewProfile&uid='.$bufferUserId) .'">'
.$bufferUsername .'</a>';
}
@ -317,7 +317,7 @@ sub www_manageTrash {
$bufferPrevId = $data[5];
if ($bufferPrevId ne "") {
($bufferPrevId,$url) = WebGUI::SQL->quickArray("select title,urlizedTitle "
."from page where pageId=".$bufferPrevId);
."from page where pageId=".quote($bufferPrevId));
if ($url ne "") {
$bufferPrevId = '<a href="'. WebGUI::URL::gateway($url) .'">' .$bufferPrevId .'</a>';
}
@ -350,7 +350,7 @@ sub www_manageTrash {
} else {
$sth = WebGUI::SQL->read("select wobjectId,namespace,title,bufferUserId,bufferDate,bufferPrevId "
. "from wobject where pageId=3 and bufferUserId="
. $session{user}{userId} ." order by bufferDate");
. quote($session{user}{userId}) ." order by bufferDate");
}
while (@data = $sth->array) {
my ($wobjectId,$namespace,$title,$bufferUserId,$bufferDate,$bufferPrevId,$url,$htmlData);
@ -363,7 +363,7 @@ sub www_manageTrash {
$bufferPrevId = $data[5];
if ($bufferPrevId ne "") {
($bufferPrevId,$url) = WebGUI::SQL->quickArray("select title,urlizedTitle "
."from page where pageId=".$bufferPrevId);
."from page where pageId=".quote($bufferPrevId));
if ($url ne "") {
$bufferPrevId = '<a href="'. WebGUI::URL::gateway($url) .'">' .$bufferPrevId .'</a>';
}
@ -372,7 +372,7 @@ sub www_manageTrash {
$bufferUserId = $data[3];
if ($bufferUserId ne "") {
my ($bufferUsername) = WebGUI::SQL->quickArray("select username from users where userId=".$bufferUserId);
my ($bufferUsername) = WebGUI::SQL->quickArray("select username from users where userId=".quote($bufferUserId));
$bufferUserId = '<a href="' .WebGUI::URL::page('op=viewProfile&uid='.$bufferUserId) .'">'
.$bufferUsername .'</a>';
}

8
lib/WebGUI/Operation/User.pm
View file

@ -86,7 +86,7 @@ sub doUserSearch {
my $sql = "select users.userId, users.username, users.status, users.dateCreated, users.lastUpdated,
email.fieldData as email from users left join userProfileData email on users.userId=email.userId and email.fieldName='email'
where $selectedStatus and (users.username like ".$keyword." or email.fieldData like ".$keyword.")
and users.userId not in (".join(",",@{$userFilter}).") order by users.username";
and users.userId not in (".quoteAndJoin($userFilter).") order by users.username";
if ($returnPaginator) {
my $p = WebGUI::Paginator->new(WebGUI::URL::page($op));
$p->setDataByQuery($sql);
@ -272,7 +272,7 @@ sub www_deleteGrouping {
sub www_deleteUser {
my ($output);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
if ($session{form}{uid} < 26) {
if ($session{form}{uid} == 1 || $session{form}{uid} == 3) {
return WebGUI::Privilege::vitalComponent();
} else {
$output .= helpIcon("user delete");
@ -290,7 +290,7 @@ sub www_deleteUser {
sub www_deleteUserConfirm {
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($u);
if ($session{form}{uid} < 26) {
if ($session{form}{uid} == 1 || $session{form}{uid} == 3) {
return WebGUI::Privilege::vitalComponent();
} else {
$u = WebGUI::User->new($session{form}{uid});
@ -504,7 +504,7 @@ sub www_editUserProfile {
$f = WebGUI::HTMLForm->new;
$f->hidden("op","editUserProfileSave");
$f->hidden("uid",$session{form}{uid});
%user = WebGUI::SQL->buildHash("select fieldName,fieldData from userProfileData where userId=$session{form}{uid}");
%user = WebGUI::SQL->buildHash("select fieldName,fieldData from userProfileData where userId=".quote($session{form}{uid}));
$a = WebGUI::SQL->read("select * from userProfileField,userProfileCategory
where userProfileField.profileCategoryId=userProfileCategory.profileCategoryId
order by userProfileCategory.sequenceNumber,userProfileField.sequenceNumber");