From cbb08765685f75c1de9160b71a60a2e3a1d380a6 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Wed, 31 Jul 2002 03:35:34 +0000 Subject: [PATCH] Temp Fix for people who are used to Content Managers being able to manage images. --- lib/WebGUI/Macro/AdminBar.pm | 7 ++++++- lib/WebGUI/Operation/Image.pm | 20 ++++++++++---------- lib/WebGUI/Operation/Settings.pm | 2 ++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm index da9c8aa5d..5df2a128e 100644 --- a/lib/WebGUI/Macro/AdminBar.pm +++ b/lib/WebGUI/Macro/AdminBar.pm @@ -68,7 +68,6 @@ sub _replacement { %hash = ( 'http://validator.w3.org/check?uri=http%3A%2F%2F'.$session{env}{SERVER_NAME}. WebGUI::URL::page()=>WebGUI::International::get(399), - WebGUI::URL::page('op=listImages')=>WebGUI::International::get(394), WebGUI::URL::page('op=viewPageTree')=>WebGUI::International::get(447), %hash ); @@ -91,6 +90,12 @@ sub _replacement { %hash ); } + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages},$session{user}{userId})) { + %hash = ( + WebGUI::URL::page('op=listImages')=>WebGUI::International::get(394), + %hash + ); + } %hash = ( WebGUI::URL::page('op=viewHelpIndex')=>WebGUI::International::get(13), %hash diff --git a/lib/WebGUI/Operation/Image.pm b/lib/WebGUI/Operation/Image.pm index b3ce9c889..09d4217c7 100644 --- a/lib/WebGUI/Operation/Image.pm +++ b/lib/WebGUI/Operation/Image.pm @@ -31,7 +31,7 @@ our @EXPORT = qw(&www_editImage &www_editImageSave &www_viewImage &www_deleteIma #------------------------------------------------------------------- sub www_deleteImage { my ($output); - if (WebGUI::Privilege::isInGroup(9)) { + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages})) { $output .= helpIcon(23); $output .= '

'.WebGUI::International::get(42).'

'; $output .= WebGUI::International::get(392).'

'; @@ -49,7 +49,7 @@ sub www_deleteImage { #------------------------------------------------------------------- sub www_deleteImageConfirm { my ($image); - if (WebGUI::Privilege::isInGroup(9)) { + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages})) { $image = WebGUI::Attachment->new("","images",$session{form}{iid}); $image->deleteNode; WebGUI::SQL->write("delete from images where imageId=$session{form}{iid}"); @@ -61,7 +61,7 @@ sub www_deleteImageConfirm { #------------------------------------------------------------------- sub www_deleteImageFile { - if (WebGUI::Privilege::isInGroup(9)) { + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages})) { WebGUI::SQL->write("update images set filename='' where imageId=$session{form}{iid}"); return www_editImage(); } else { @@ -73,7 +73,7 @@ sub www_deleteImageFile { sub www_editImage { my ($output, %data, $image, $f, $imageGroupId); tie %data, 'Tie::CPHash'; - if (WebGUI::Privilege::isInGroup(9)) { + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages})) { if ($session{form}{iid} eq "new") { $imageGroupId = $session{form}{gid}; } else { @@ -110,7 +110,7 @@ sub www_editImage { #------------------------------------------------------------------- sub www_editImageSave { my ($file, $sqlAdd, $test); - if (WebGUI::Privilege::isInGroup(9)) { + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages})) { if ($session{form}{iid} eq "new") { $session{form}{iid} = getNextId("imageId"); WebGUI::SQL->write("insert into images (imageId) values ($session{form}{iid})"); @@ -144,7 +144,7 @@ sub www_listImages { my ($f, $output, $sth, %data, @row, $image, $p, $i, $search, $search_group, $imageGroupId, $isImageManager, $imageGroupParentId); tie %data, 'Tie::CPHash'; if (WebGUI::Privilege::isInGroup(4)) { - $isImageManager = WebGUI::Privilege::isInGroup(9); + $isImageManager = WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages}); if($session{form}{gid} ne "") { $imageGroupId = $session{form}{gid}; } else { @@ -271,7 +271,7 @@ sub www_viewImage { #------------------------------------------------------------------- sub www_deleteImageGroup { my ($output); - if (WebGUI::Privilege::isInGroup(9)) { + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages})) { $output .= helpIcon(23); $output .= '

'.WebGUI::International::get(42).'

'; $output .= WebGUI::International::get(544).'

'; @@ -290,7 +290,7 @@ sub www_deleteImageGroup { sub www_deleteImageGroupConfirm { my ($image, %data); tie %data, 'Tie::CPHash'; - if (WebGUI::Privilege::isInGroup(9)) { + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages})) { %data = WebGUI::SQL->quickHash("select parentId from imageGroup where imageGroupId=$session{form}{gid}"); WebGUI::SQL->write("update images set imageGroupId=$data{parentId} where imageGroupId=$session{form}{gid}"); WebGUI::SQL->write("update imageGroup set parentId=$data{parentId} where parentId=$session{form}{gid}"); @@ -307,7 +307,7 @@ sub www_editImageGroup { my ($output, %data, %parent_data, $image, $f); tie %data, 'Tie::CPHash'; tie %parent_data, 'Tie::CPHash'; - if (WebGUI::Privilege::isInGroup(9)) { + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages})) { if ($session{form}{gid} eq "new") { } else { @@ -335,7 +335,7 @@ sub www_editImageGroup { #------------------------------------------------------------------- sub www_editImageGroupSave { my ($test); - if (WebGUI::Privilege::isInGroup(9)) { + if (WebGUI::Privilege::isInGroup($session{setting}{groupToManageImages})) { if ($session{form}{gid} eq "new") { $session{form}{gid} = getNextId("imageGroupId"); WebGUI::SQL->write("insert into imageGroup (imageGroupId) values ($session{form}{gid})"); diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm index 038ccc82a..c2e7eb72e 100644 --- a/lib/WebGUI/Operation/Settings.pm +++ b/lib/WebGUI/Operation/Settings.pm @@ -137,6 +137,7 @@ sub www_editContentSettings { $f->integer("textAreaCols",WebGUI::International::get(464),$session{setting}{textAreaCols}); $f->integer("textBoxSize",WebGUI::International::get(465),$session{setting}{textBoxSize}); $f->select("richEditor",\%editor,WebGUI::International::get(496),[$session{setting}{richEditor}]); + $f->group("groupToManageImages",'Group To Manage Images',[$session{setting}{groupToManageImages}]); $f->submit; $output .= $f->print; } else { @@ -148,6 +149,7 @@ sub www_editContentSettings { #------------------------------------------------------------------- sub www_editContentSettingsSave { if (WebGUI::Privilege::isInGroup(3)) { + _saveSetting("groupToManageImages"); _saveSetting("addEditStampToPosts"); _saveSetting("defaultPage"); _saveSetting("notFoundPage");