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

Removed privilege overrides.

Browse source
This commit is contained in:
JT Smith 2003-02-03 04:31:55 +00:00
parent 918da0ac3d
commit ad66fc2b0b
8 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/gotcha.txt
View file

@ -16,6 +16,11 @@ save you many hours of grief.
user interface. You may remove any config file variables
you were previously using to configure it.
* The privilege overrides have been removed from the settings. They
are now redundant with the advent of groups of groups.
Therefore if you were making use of this functionality,
you'll need to start using groups of groups instead.
4.9.4
--------------------------------------------------------------------

17
docs/upgrades/upgrade_5.0.3-5.1.0.sql
View file

@ -71,6 +71,23 @@ alter table page drop column worldView;
alter table page drop column worldEdit;
alter table page drop column ownerView;
alter table page drop column ownerEdit;
delete from help where helpId=48 and namespace='WebGUI';
delete from international where namespace='WebGUI' and internationalId=109;
delete from international where namespace='WebGUI' and internationalId=110;
delete from international where namespace='WebGUI' and internationalId=111;
delete from international where namespace='WebGUI' and internationalId=112;
delete from international where namespace='WebGUI' and internationalId=113;
delete from international where namespace='WebGUI' and internationalId=114;
delete from international where namespace='WebGUI' and internationalId=115;
delete from international where namespace='WebGUI' and internationalId=711;
delete from international where namespace='WebGUI' and internationalId=710;
delete from international where namespace='WebGUI' and internationalId=713;
delete from international where namespace='WebGUI' and internationalId=708;
delete from international where namespace='WebGUI' and internationalId=709;
delete from international where namespace='WebGUI' and internationalId=714;
delete from settings where name='styleManagersGroup';
delete from settings where name='templateManagersGroup';

2
lib/WebGUI/HTMLForm.pm
View file

@ -1527,7 +1527,7 @@ sub template {
rearrange([qw(name value label namespace afterEdit extras uiLevel)], @p);
if (_uiLevelChecksOut($uiLevel)) {
$label = $label || WebGUI::International::get(356);
if (WebGUI::Privilege::isInGroup($session{setting}{templateManagersGroup})) {
if (WebGUI::Privilege::isInGroup(8)) {
#disabled until we can resolve the "new" wobject problem
#if ($afterEdit) {
# $subtext = '<a href="'.WebGUI::URL::page("op=editTemplate&tid=".$value."&namespace=".$namespace

4
lib/WebGUI/Macro/AdminBar.pm
View file

@ -81,7 +81,7 @@ sub _replacement {
%hash
);
}
if (WebGUI::Privilege::isInGroup($session{setting}{styleManagersGroup},$session{user}{userId})) {
if (WebGUI::Privilege::isInGroup(5,$session{user}{userId})) {
%hash = (
WebGUI::URL::page('op=listStyles')=>WebGUI::International::get(6),
%hash
@ -93,7 +93,7 @@ sub _replacement {
%hash
);
}
if (WebGUI::Privilege::isInGroup($session{setting}{templateManagersGroup},$session{user}{userId})) {
if (WebGUI::Privilege::isInGroup(8,$session{user}{userId})) {
%hash = (
WebGUI::URL::page('op=listTemplates')=>WebGUI::International::get(508),
%hash

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

@ -290,7 +290,7 @@ sub www_editPage {
-uiLevel=>5
);
%hash = WebGUI::SQL->buildHash("select styleId,name from style where name<>'Reserved' order by name");
if (WebGUI::Privilege::isInGroup($session{setting}{styleManagersGroup})) {
if (WebGUI::Privilege::isInGroup(5)) {
$subtext = ' &nbsp; <a href="'.WebGUI::URL::page('op=listStyles')
.'">'.WebGUI::International::get(6).'</a>';
} else {

16
lib/WebGUI/Operation/Settings.pm
View file

@ -150,21 +150,6 @@ sub www_editMiscSettings {
return _submenu($output);
}
#-------------------------------------------------------------------
sub www_editPrivilegeSettings {
WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
my ($output, $f);
$output .= helpIcon(48);
$output .= '<h1>'.WebGUI::International::get(710).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->hidden("op","saveSettings");
$f->group("styleManagersGroup",WebGUI::International::get(713),[$session{setting}{styleManagersGroup}]);
$f->group("templateManagersGroup",WebGUI::International::get(714),[$session{setting}{templateManagersGroup}]);
$f->submit;
$output .= $f->print;
return _submenu($output);
}
#-------------------------------------------------------------------
sub www_manageSettings {
WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
@ -176,7 +161,6 @@ sub www_manageSettings {
$output .= '<li><a href="'.WebGUI::URL::page('op=editContentSettings').'">'.WebGUI::International::get(525).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editMessagingSettings').'">'.WebGUI::International::get(133).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editMiscSettings').'">'.WebGUI::International::get(140).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editPrivilegeSettings').'">'.WebGUI::International::get(710).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editProfileSettings').'">'.WebGUI::International::get(308).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editUserSettings').'">'.WebGUI::International::get(117).'</a>';
$output .= '</ul>';

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

@ -43,7 +43,7 @@ sub _submenu {
#-------------------------------------------------------------------
sub www_copyStyle {
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup($session{setting}{styleManagersGroup}));
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup(5));
my (%style);
%style = WebGUI::SQL->quickHash("select * from style where styleId=$session{form}{sid}");
WebGUI::SQL->write("insert into style (styleId,name,body,styleSheet) values (".getNextId("styleId").",
@ -53,7 +53,7 @@ sub www_copyStyle {
#-------------------------------------------------------------------
sub www_deleteStyle {
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup($session{setting}{styleManagersGroup}));
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup(5));
return WebGUI::Privilege::vitalComponent() if ($session{form}{sid} < 1000 && $session{form}{sid} > 0);
my ($output);
$output .= helpIcon(4);
@ -69,7 +69,7 @@ sub www_deleteStyle {
#-------------------------------------------------------------------
sub www_deleteStyleConfirm {
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup($session{setting}{styleManagersGroup}));
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup(5));
return WebGUI::Privilege::vitalComponent() if ($session{form}{sid} < 1000 && $session{form}{sid} > 0);
WebGUI::SQL->write("delete from style where styleId=".$session{form}{sid});
WebGUI::SQL->write("update page set styleId=2 where styleId=".$session{form}{sid});
@ -78,7 +78,7 @@ sub www_deleteStyleConfirm {
#-------------------------------------------------------------------
sub www_editStyle {
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup($session{setting}{styleManagersGroup}));
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup(5));
my ($output, %style, $f);
tie %style, 'Tie::CPHash';
if ($session{form}{sid} eq "new") {
@ -103,7 +103,7 @@ sub www_editStyle {
#-------------------------------------------------------------------
sub www_editStyleSave {
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup($session{setting}{styleManagersGroup}));
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup(5));
if ($session{form}{sid} eq "new") {
$session{form}{sid} = getNextId("styleId");
WebGUI::SQL->write("insert into style (styleId) values ($session{form}{sid})");
@ -116,7 +116,7 @@ sub www_editStyleSave {
#-------------------------------------------------------------------
sub www_listStyles {
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup($session{setting}{styleManagersGroup}));
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup(5));
my ($output, $sth, @data, @row, $i, $p);
$output = helpIcon(9);
$output .= '<h1>'.WebGUI::International::get(157).'</h1>';

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

@ -53,7 +53,7 @@ sub _submenu {
#-------------------------------------------------------------------
sub www_copyTemplate {
my (%template);
if (WebGUI::Privilege::isInGroup($session{setting}{templateManagersGroup})) {
if (WebGUI::Privilege::isInGroup(8)) {
%template = WebGUI::SQL->quickHash("select * from template where templateId=$session{form}{tid} and namespace=".quote($session{form}{namespace}));
WebGUI::SQL->write("insert into template (templateId,name,template,namespace)
values (".getNextId("templateId").",
@ -70,7 +70,7 @@ sub www_deleteTemplate {
my ($output);
if ($session{form}{tid} < 1000 && $session{form}{tid} > 0) {
return WebGUI::Privilege::vitalComponent();
} elsif (WebGUI::Privilege::isInGroup($session{setting}{templateManagersGroup})) {
} elsif (WebGUI::Privilege::isInGroup(8)) {
$output .= helpIcon(35);
$output .= '<h1>'.WebGUI::International::get(42).'</h1>';
$output .= WebGUI::International::get(502).'<p>';
@ -91,7 +91,7 @@ sub www_deleteTemplateConfirm {
my ($a, $pageId);
if ($session{form}{tid} < 1000 && $session{form}{tid} > 1000) {
return WebGUI::Privilege::vitalComponent();
} elsif (WebGUI::Privilege::isInGroup($session{setting}{templateManagersGroup})) {
} elsif (WebGUI::Privilege::isInGroup(8)) {
if ($session{form}{namespace} eq "Page") {
$a = WebGUI::SQL->read("select * from page where templateId=".$session{form}{tid});
while (($pageId) = $a->array) {
@ -112,7 +112,7 @@ sub www_deleteTemplateConfirm {
sub www_editTemplate {
my ($output, $namespaces, %template, $f);
tie %template, 'Tie::CPHash';
if (WebGUI::Privilege::isInGroup($session{setting}{templateManagersGroup})) {
if (WebGUI::Privilege::isInGroup(8)) {
if ($session{form}{tid} eq "new" || $session{form}{tid} eq "") {
if ($session{form}{namespace} eq "Page") {
$template{template} = "<table>\n <tr>\n <td>\n\n<tmpl_var page.position1>\n\n".
@ -155,7 +155,7 @@ sub www_editTemplate {
#-------------------------------------------------------------------
sub www_editTemplateSave {
if (WebGUI::Privilege::isInGroup($session{setting}{templateManagersGroup})) {
if (WebGUI::Privilege::isInGroup(8)) {
if ($session{form}{tid} eq "new") {
($session{form}{tid}) = WebGUI::SQL->quickArray("select max(templateId)
from template where namespace=".quote($session{form}{namespace}));
@ -186,7 +186,7 @@ sub www_editTemplateSave {
#-------------------------------------------------------------------
sub www_listTemplates {
my ($output, $sth, @data, @row, $i, $p, $where);
if (WebGUI::Privilege::isInGroup($session{setting}{templateManagersGroup})) {
if (WebGUI::Privilege::isInGroup(8)) {
$where = "where namespace=".quote($session{form}{namespace}) if ($session{form}{namespace});
$output = helpIcon(33);
$output .= '<h1>'.WebGUI::International::get(506).'</h1>';