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

bug fixes

Browse source
This commit is contained in:
JT Smith 2005-03-07 19:38:17 +00:00
parent d7d6819204
commit 88c42da7a0
14 changed files with 59 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/AdminConsole.pm
View file

@ -225,7 +225,7 @@ sub getAdminFunction {
},
icon=>"help.gif",
op=>"viewHelpIndex",
group=>"12"
group=>"7"
},
"statistics"=>{
title=>{

23
lib/WebGUI/Asset/Post.pm
View file

@ -455,20 +455,22 @@ sub getThumbnailUrl {
#-------------------------------------------------------------------
sub getUploadControl {
my $self = shift;
my $maxAttachments = $self->getThread->getParent->getValue("attachmentsPerPost");
my $uploadControl;
return undef unless ($maxAttachments);
if ($self->get("storageId")) {
my $i;
foreach my $filename (@{$self->getStorageLocation->getFiles}) {
$uploadControl .= '<a href="'.$self->getStorageLocation->getUrl($filename).'">'.$filename.'</a><br />';
$i++;
}
return $uploadControl unless ($i < $self->getThread->getParent->get("attachmentsPerPost"));
return $uploadControl unless ($i < $maxAttachments);
}
WebGUI::Style::setScript($session{config}{extrasURL}.'/FileUploadControl.js',{type=>"text/javascript"});
$uploadControl .= '<div id="fileUploadControl"> </div>
<script>
var images = new Array();
var fileLimit = '.$self->getThread->getParent->get("attachmentsPerPost").';
var fileLimit = '.$maxAttachments.';
';
opendir(DIR,$session{config}{extrasPath}.'/fileIcons');
my @files = readdir(DIR);
@ -817,15 +819,16 @@ sub www_edit {
.WebGUI::Form::hidden({
name=>"func",
value=>"add"
})
.WebGUI::Form::hidden({
name=>"assetId",
value=>"new"
})
.WebGUI::Form::hidden({
name=>"class",
value=>$session{form}{class}
});
$var{'isNewPost'} = 1;
$var{'form.header'} .= WebGUI::Form::hidden({
name=>"assetId",
value=>"new"
}).WebGUI::Form::hidden({
name=>"class",
value=>$session{form}{class}
});
if ($session{form}{class} eq "WebGUI::Asset::Post") { # new reply
$self->{_thread} = $self->getParent->getThread;
return WebGUI::Privilege::insufficient() unless ($self->getThread->canReply);
@ -859,7 +862,7 @@ sub www_edit {
name=>"subscribe",
value=>$session{form}{subscribe} || 1
});
}
}
$content .= "\n\n".$session{user}{signature} if ($session{user}{signature});
} else { # edit
return WebGUI::Privilege::insufficient() unless ($self->canEdit);

8
lib/WebGUI/Asset/Wobject/Survey.pm
View file

@ -559,10 +559,10 @@ sub view {
while (my %data = $sth->hash) {
push(@edit,{
'question.edit.controls'=>
deleteIcon('func=deleteQuestionConfirm&qid='.$data{Survey_questionId}, $self->getUrl, WebGUI::International::get(44,'Survey')).
editIcon('func=editQuestion&qid='.$data{Survey_questionId}, $self->getUrl).
moveUpIcon('func=moveQuestionUp&qid='.$data{Survey_questionId}, $self->getUrl).
moveDownIcon('func=moveQuestionDown&qid='.$data{Survey_questionId}, $self->getUrl),
deleteIcon('func=deleteQuestionConfirm&qid='.$data{Survey_questionId}, $self->get("url"), WebGUI::International::get(44,'Survey')).
editIcon('func=editQuestion&qid='.$data{Survey_questionId}, $self->get("url")).
moveUpIcon('func=moveQuestionUp&qid='.$data{Survey_questionId}, $self->get("url")).
moveDownIcon('func=moveQuestionDown&qid='.$data{Survey_questionId}, $self->get("url")),
'question.edit.question'=>$data{question},
'question.edit.id'=>$data{Survey_questionId}
});

2
lib/WebGUI/HTMLForm.pm
View file

@ -213,7 +213,7 @@ sub _tableFormRow {
unless ($_[0]->{_noTable}) {
my $class = $_[0]->{_class};
$class = qq| class="$class" | if($class);
return '<tr'.$class.'><td class="formDescription" valign="top">'.$_[1].'</td><td class="tableData">'.$_[2]."</td></tr>\n";
return '<tr'.$class.'><td class="formDescription" valign="top">'.$_[1].'</td><td class="tableData" style="width: 95%;">'.$_[2]."</td></tr>\n";
} else {
return $_[2];
}

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

@ -53,7 +53,7 @@ sub www_auth {
my $auth;
($auth) = WebGUI::SQL->quickArray("select authMethod from users where username=".quote($session{form}{username})) if($session{form}{username});
my $authMethod = getInstance($auth);
my $methodCall = $session{form}{method} || $_[0];
my $methodCall = $session{form}{method} || $_[0] || "init";
if(!$authMethod->isCallable($methodCall)){
WebGUI::ErrorHandler::security("access uncallable auth method on page '".$session{page}{title}."' [".$session{page}{pageId}."].");
return WebGUI::International::get(1077);

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

@ -46,7 +46,7 @@ sub _seeAlso {
#-------------------------------------------------------------------
sub www_viewHelp {
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(7));
my $ac = WebGUI::AdminConsole->new("help");
my $namespace = $session{form}{namespace} || "WebGUI";
my $help = _get($session{form}{hid},$namespace);
@ -63,7 +63,7 @@ sub www_viewHelp {
#-------------------------------------------------------------------
sub www_viewHelpIndex {
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(7));
my %helpIndex;
tie %helpIndex, "Tie::IxHash";
my $i;

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

@ -215,7 +215,7 @@ sub www_editProfileSave {
foreach $fieldName (keys %{$profile}) {
$u->profileField($fieldName,WebGUI::HTML::filter(${$profile}{$fieldName},"javascript"));
}
return WebGUI::Operation::Auth::www_displayAccount();
return WebGUI::Operation::Auth::www_auth();
}
#-------------------------------------------------------------------

2
lib/WebGUI/i18n/English/Asset.pm
View file

@ -501,7 +501,7 @@ each wobject under the tab &quot;Metadata&quot; in the wobject properties.</p>
'493' => {
lastUpdated => 1031514049,
message => q|Back to site.|
}
},
'encrypt page' => {
message => q|Encrypt content?|,
lastUpdated =>1092748557,