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

[ 1457777 ] 6.99: Can't modify non-lvalue subroutine call

Browse source
This commit is contained in:
JT Smith 2006-04-28 18:55:20 +00:00
parent 89e1d83d0f
commit 7921c7a708
8 changed files with 36 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -296,9 +296,6 @@ sub getListTemplateVars {
my @fieldLoop;
$var->{"back.url"} = $self->getFormUrl;
$var->{"back.label"} = $i18n->get('go to form');
#$var->{"entryId"} = $self->getId;
#$var->{"delete.url"} = $self->getUrl.";func=deleteAllEntries";
#$var->{"delete.label"} = $i18n->get(91);
my $fields = $self->session->db->read("select DataForm_fieldId,name,label,isMailField,type from DataForm_field
where assetId=".$self->session->db->quote($self->getId)." order by sequenceNumber");
while (my $field = $fields->hashRef) {
@ -385,7 +382,6 @@ sub getRecordTemplateVars {
my $i18n = WebGUI::International->new($self->session,"Asset_DataForm");
$var->{error_loop} = [] unless (exists $var->{error_loop});
$var->{canEdit} = ($self->canEdit);
#$var->{"entryList.url"} = $self->getUrl('func=view;entryId=list');
$var->{"entryList.url"} = $self->getListUrl;
$var->{"entryList.label"} = $i18n->get(86);
$var->{"export.tab.url"} = $self->getUrl('func=exportTab');
@ -530,9 +526,10 @@ sub prepareView {
# this one is so nutz that we don't even bother preparing, we just execute the whole thing
my $passedVars = shift;
##Priority encoding
if ( $self->session->form->process("mode") eq "form") {
my $mode = $self->session->stow->get("mode") || $self->session->form->param("mode");
if ( $mode eq "form") {
$self->{_view} = $self->viewForm($passedVars);
} elsif ( $self->session->form->process("mode") eq "list") {
} elsif ( $mode eq "list") {
$self->{_view} = $self->viewList;
} elsif( $self->defaultViewForm ) {
$self->{_view} = $self->viewForm($passedVars);
@ -717,8 +714,7 @@ sub www_deleteAllEntries {
return $self->session->privilege->insufficient() unless $self->canEdit;
my $assetId = $self->session->form->process("entryId");
$self->deleteCollateral("DataForm_entry","assetId",$assetId);
$self->session->form->process("entryId") = 'list';
return "";
$self->session->stow->set("mode","list");
}
#-------------------------------------------------------------------
@ -736,8 +732,7 @@ sub www_deleteEntry {
return $self->session->privilege->insufficient() unless $self->canEdit;
my $entryId = $self->session->form->process("entryId");
$self->deleteCollateral("DataForm_entry","DataForm_entryId",$entryId);
$self->session->form->process("entryId") = 'list';
return "";
$self->session->stow->set("mode","list");
}
#-------------------------------------------------------------------

30
lib/WebGUI/Asset/Wobject/Product.pm
View file

@ -520,9 +520,10 @@ sub processPropertiesFromFormPost {
#-------------------------------------------------------------------
sub www_editBenefit {
my $self = shift;
my $bid = shift || $self->session->form->process("bid");
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($data, $f, $benefits);
$data = $self->getCollateral("Product_benefit","Product_benefitId",$self->session->form->process("bid"));
$data = $self->getCollateral("Product_benefit","Product_benefitId",$bid);
my $i18n = WebGUI::International->new($self->session,'Asset_Product');
$f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden(
@ -554,23 +555,22 @@ sub www_editBenefit {
sub www_editBenefitSave {
my $self = shift;
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->session->form->process("benefit") = $self->session->form->process("benefit_new") if ($self->session->form->process("benefit_new") ne "");
$self->setCollateral("Product_benefit", "Product_benefitId", {
Product_benefitId => $self->session->form->process("bid"),
benefit => $self->session->form->process("benefit")
benefit => $self->session->form->process("benefit","combo")
});
return "" unless($self->session->form->process("proceed"));
$self->session->form->process("bid") = "new";
return $self->www_editBenefit();
return $self->www_editBenefit("new");
}
#-------------------------------------------------------------------
sub www_editFeature {
my $self = shift;
my $fid = shift || $self->session->form->process("fid");
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($data, $f, $features);
$data = $self->getCollateral("Product_feature","Product_featureId",$self->session->form->process("fid"));
$data = $self->getCollateral("Product_feature","Product_featureId",$fid);
my $i18n = WebGUI::International->new($self->session,'Asset_Product');
$f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden(
@ -602,23 +602,22 @@ sub www_editFeature {
sub www_editFeatureSave {
my $self = shift;
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->session->form->process("feature") = $self->session->form->process("feature_new") if ($self->session->form->process("feature_new") ne "");
$self->setCollateral("Product_feature", "Product_featureId", {
Product_featureId => $self->session->form->process("fid"),
feature => $self->session->form->process("feature")
feature => $self->session->form->process("feature","combo")
});
return "" unless($self->session->form->process("proceed"));
$self->session->form->process("fid") = "new";
return $self->www_editFeature();
return $self->www_editFeature("new");
}
#-------------------------------------------------------------------
sub www_editSpecification {
my $self = shift;
my $sid = shift || $self->session->form->process("sid");
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($data, $f, $hashRef);
my $i18n = WebGUI::International->new($self->session,'Asset_Product');
$data = $self->getCollateral("Product_specification","Product_specificationId",$self->session->form->process("sid"));
$data = $self->getCollateral("Product_specification","Product_specificationId",$sid);
$f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden(
-name => "sid",
@ -663,18 +662,15 @@ sub www_editSpecification {
sub www_editSpecificationSave {
my $self = shift;
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->session->form->process("name") = $self->session->form->process("name_new") if ($self->session->form->process("name_new") ne "");
$self->session->form->process("units") = $self->session->form->process("units_new") if ($self->session->form->process("units_new") ne "");
$self->setCollateral("Product_specification", "Product_specificationId", {
Product_specificationId => $self->session->form->process("sid"),
name => $self->session->form->process("name"),
value => $self->session->form->process("value"),
units => $self->session->form->process("units")
value => $self->session->form->process("value","combo"),
units => $self->session->form->process("units","combo")
});
return "" unless($self->session->form->process("proceed"));
$self->session->form->process("sid") = "new";
return $self->www_editSpecification();
return $self->www_editSpecification("new");
}
#-------------------------------------------------------------------

13
lib/WebGUI/Asset/Wobject/StockData.pm
View file

@ -129,19 +129,6 @@ sub _appendZero {
return $num;
}
#-------------------------------------------------------------------
=head2 _clearStockEditSession ( )
Clears the session variables from session used by the stock list edit form
=cut
sub _clearStockEditSession {
my $self = shift;
$self->session->form->process("symbol") = "";
$self->session->form->process("stockId") = "";
}
#-------------------------------------------------------------------
=head2 _convertToEpoch (date,time)

4
lib/WebGUI/AssetMetaData.pm
View file

@ -238,9 +238,9 @@ sub www_editMetaDataFieldSave {
return $ac->render($i18n->get("errorEmptyField"),$i18n->get('Edit Metadata'));
}
if($self->session->form->process("fid") eq 'new') {
$self->session->form->process("fid") = $self->session->id->generate();
my $fid = $self->session->id->generate();
$self->session->db->write("insert into metaData_properties (fieldId, fieldName, defaultValue, description, fieldType, possibleValues) values (".
$self->session->db->quote($self->session->form->process("fid")).",".
$self->session->db->quote($fid).",".
$self->session->db->quote($self->session->form->process("fieldName")).",".
$self->session->db->quote($self->session->form->process("defaultValue")).",".
$self->session->db->quote($self->session->form->process("description")).",".

9
lib/WebGUI/Auth/LDAP.pm
View file

@ -198,6 +198,8 @@ sub authenticate {
#-------------------------------------------------------------------
sub createAccount {
my $self = shift;
my $message = shift;
my $confirm = shift || $self->session->form->process("confirm");
my $vars;
if ($self->session->user->userId ne "1") {
return $self->displayAccount;
@ -210,7 +212,7 @@ sub createAccount {
$self->{_connection} = WebGUI::LDAPLink->new($self->session,$self->session->form->process("connection"))->get;
}
my $connection = $self->{_connection};
$vars->{'create.message'} = $_[0] if ($_[0]);
$vars->{'create.message'} = $message if ($message);
my $i18n = WebGUI::International->new($self->session,"AuthLDAP");
$vars->{'create.form.ldapConnection.label'} = $i18n->get("ldapConnection");
@ -226,7 +228,7 @@ sub createAccount {
$vars->{'create.form.password'} = WebGUI::Form::password($self->session,{"name"=>"authLDAP_identifier","value"=>$self->session->form->process("authLDAP_identifier")});
$vars->{'create.form.password.label'} = $connection->{ldapPasswordName};
$vars->{'create.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"confirm","value"=>$self->session->form->process("confirm")});
$vars->{'create.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"confirm","value"=>$confirm});
return $self->SUPER::createAccount("createAccountSave",$vars);
}
@ -274,8 +276,7 @@ sub createAccountSave {
return $self->createAccount("<h1>".$i18n->get(70)."</h1>".$error) unless ($error eq "");
#If Email address is not unique, a warning is displayed
if($warning ne "" && !$self->session->form->process("confirm")){
$self->session->form->process("confirm") = 1;
return $self->createAccount('<li>'.$i18n->get(1078).'</li>');
return $self->createAccount('<li>'.$i18n->get(1078).'</li>', 1);
}
my $properties;

17
lib/WebGUI/Auth/WebGUI.pm
View file

@ -161,6 +161,8 @@ sub authenticate {
#-------------------------------------------------------------------
sub createAccount {
my $self = shift;
my $message = shift;
my $confirm = shift || $self->session->form->process("confirm");
my $vars;
if ($self->session->user->userId ne "1") {
return $self->displayAccount;
@ -168,7 +170,7 @@ sub createAccount {
return $self->displayLogin;
}
my $i18n = WebGUI::International->new($self->session);
$vars->{'create.message'} = $_[0] if ($_[0]);
$vars->{'create.message'} = $message if ($message);
$vars->{useCaptcha} = $self->session->setting->get("webguiUseCaptcha");
if ($vars->{useCaptcha}) {
use WebGUI::Form::Captcha;
@ -182,7 +184,7 @@ sub createAccount {
$vars->{'create.form.password.label'} = $i18n->get(51);
$vars->{'create.form.passwordConfirm'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifierConfirm"});
$vars->{'create.form.passwordConfirm.label'} = $i18n->get(2,'AuthWebGUI');
$vars->{'create.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"confirm","value"=>$self->session->form->process("confirm")});
$vars->{'create.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"confirm","value"=>$confirm});
$vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery");
$vars->{'recoverPassword.url'} = $self->session->url->page('op=auth;method=recoverPassword');
$vars->{'recoverPassword.label'} = $i18n->get(59);
@ -221,8 +223,7 @@ sub createAccountSave {
#If Email address is not unique, a warning is displayed
if($warning ne "" && !$self->session->form->process("confirm")){
$self->session->form->process("confirm") = 1;
return $self->createAccount('<li>'.$i18n->get(1078).'</li>');
return $self->createAccount('<li>'.$i18n->get(1078).'</li>', 1);
}
my $properties;
@ -499,9 +500,8 @@ sub login {
if($self->getSetting("passwordTimeout") && $userData->{passwordTimeout}){
my $expireTime = $userData->{passwordLastUpdated} + $userData->{passwordTimeout};
if ($self->session->datetime->time() >= $expireTime){
$self->session->form->process("uid") = $self->userId;
$self->logout;
return $self->resetExpiredPassword;
return $self->resetExpiredPassword($self->userId);
}
}
@ -585,6 +585,7 @@ sub recoverPasswordFinish {
#-------------------------------------------------------------------
sub resetExpiredPassword {
my $self = shift;
my $uid = shift || $self->session->form->process("uid");
my $vars;
my $i18n = WebGUI::International->new($self->session);
@ -593,7 +594,7 @@ sub resetExpiredPassword {
$vars->{'expired.form.header'} = "\n\n".WebGUI::Form::formHeader($self->session,{});
$vars->{'expired.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"op","value"=>"auth"});
$vars->{'expired.form.hidden'} .= WebGUI::Form::hidden($self->session,{"name"=>"method","value"=>"resetExpiredPasswordSave"});
$vars->{'expired.form.hidden'} .= WebGUI::Form::hidden($self->session,{"name"=>"uid","value"=>$self->session->form->process("uid")});
$vars->{'expired.form.hidden'} .= WebGUI::Form::hidden($self->session,{"name"=>"uid","value"=>$uid});
$vars->{'expired.form.oldPassword'} = WebGUI::Form::password($self->session,{"name"=>"oldPassword"});
$vars->{'expired.form.oldPassword.label'} = $i18n->get(10,'AuthWebGUI');
@ -614,7 +615,6 @@ sub resetExpiredPasswordSave {
$u = WebGUI::User->new($self->session,$self->session->form->process("uid"));
my $i18n = WebGUI::International->new($self->session);
$self->session->form->process("username") = $u->username;
$error .= $self->error if(!$self->authenticate($u->username,$self->session->form->process("oldPassword")));
$error .= '<li>'.$i18n->get(5,'AuthWebGUI').'</li>' if($self->session->form->process("identifier") eq "password");
@ -695,7 +695,6 @@ sub updateAccount {
if(!$error){
if($username){
$u->username($username);
$self->session->form->process("uid") = $u->userId;
}
if($password){
my $userData = $self->getParams;

1
lib/WebGUI/Operation/LDAPLink.pm
View file

@ -98,7 +98,6 @@ sub www_copyLDAPLink {
$db{ldapLinkId} = "new";
$db{ldapLinkName} = "Copy of ".$db{ldapLinkName};
$session->db->setRow("ldapLink","ldapLinkId",\%db);
$session->form->process("op") = "listLDAPLinks";
return www_listLDAPLinks($session);
}

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

@ -253,8 +253,7 @@ sub www_editProductSave {
skuTemplate => $session->form->process("skuTemplate"),
});
$session->form->process("productId") = $product->get('productId');
return WebGUI::Operation::execute($session,'manageProduct');
return www_manageProduct($session, $product->get('productId'));
}
#-------------------------------------------------------------------
@ -803,13 +802,13 @@ The current WebGUI session object.
sub www_manageProduct {
my $session = shift;
my ($productId, $product, $output, $parameter, $option, $optionId, $i18n);
my ($product, $output, $parameter, $option, $optionId, $i18n);
return $session->privilege->insufficient unless ($session->user->isInGroup(14));
$i18n = WebGUI::International->new($session, "ProductManager");
$productId = $session->form->process("productId") || $session->scratch->get('managingProduct');
my $productId = shift || $session->form->process("productId") || $session->scratch->get('managingProduct');
return WebGUI::Operation::execute($session,'listProducts') if ($productId eq 'new' || !$productId);
$session->scratch->set('managingProduct', $productId);