web/modules/sniglets/Sniglets/Org.pm | 110 -----------------------------------
1 file changed, 110 deletions(-)
New commits:
commit 8e9a7405b366e8626e65f01435cede609cb7548f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:52:42 2009 +0100
Previous removals made download_cert and create_cert_text unused, removing as dead
code.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index 6c7995b..ceae42a 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -106,66 +106,6 @@ sub get_service_map {
}
-# create the actual cert xml given the cert_info session data
-sub create_cert_text {
- my $pxt = shift;
- my $data = shift;
- my %cert_info = %{$data};
-
- my $cert = new RHN::SatelliteCert;
-
- my $owner = $cert_info{meta_info}->{owner};
- my $issued = $cert_info{meta_info}->{issued};
- my $expires = $cert_info{meta_info}->{expires};
-
- $cert->set_field(product => "RHN-SATELLITE-001");
- $cert->set_field(owner => $owner);
- $cert->set_field(issued => $issued);
- $cert->set_field(expires => $expires);
- $cert->set_field('generation',
RHN::SatelliteCert->current_generation());
-
- my $existing_channels = get_channel_family_map($pxt->user->id,
'new_cert_channel_set');
- foreach my $label (sort keys %{$existing_channels}) {
- my $quant = $existing_channels->{$label}->{QUANT};
- if ($quant > 0) {
- $cert->set_channel_family($label, $quant);
- }
- }
-
- my $additional_channels = get_channel_family_map($pxt->user->id,
'new_cert_add_channel_set');
- foreach my $label (sort keys %{$additional_channels}) {
- my $quant = $additional_channels->{$label}->{QUANT};
- if ($quant > 0) {
- $cert->set_channel_family($label, $quant);
- }
- }
-
- my %slot_names = (
- 'enterprise_entitled' => 'slots',
- 'provisioning_entitled' => 'provisioning-slots',
- 'nonlinux_entitled' => 'nonlinux-slots',
- 'monitoring_entitled' => 'monitoring-slots');
-
-
- my $services = get_service_map($pxt->user->id);
- foreach my $label (sort keys %{$services}) {
- my $quant = $services->{$label}->{QUANT};
- # logic per bz #132461 and bz #164662
- if ($label eq 'enterprise_entitled' and
$cert_info{'meta_info'}->{'version'} < 4.0) {
- $quant += $services->{'provisioning_entitled'}->{QUANT};
- }
- if ($quant > 0) {
- my $slot_name = $slot_names{$label};
- $cert->set_field($slot_name => $quant);
- }
- }
-
- $cert->set_field("satellite-version" =>
$cert_info{'meta_info'}->{'version'});
-
- return $cert->to_string();
-}
-
-
sub cert_text_cb {
my $pxt = shift;
@@ -187,23 +127,4 @@ sub cert_text_cb {
}
}
-sub download_cert {
- my $pxt = shift;
- my $data = shift;
- my %cert_info = %{$data};
-
- $pxt->manual_content(1);
- $pxt->content_type('application/octet-stream');
-
- my $filename = $cert_info{'meta_info'}->{'owner'} .
".cert";
- $filename =~s/ /-/g;
- $filename = lc($filename);
-
- $pxt->header_out('Content-disposition', "attachment; filename=" .
$filename);
-
- # better mime type to force download of plain text?
- $pxt->send_http_header;
- $pxt->print (create_cert_text($pxt, \%cert_info));
-}
-
1;
commit a6426a7c7afa10de4dc212f4a67711da9cff64d2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:47:39 2009 +0100
rhn-cert-text not used anywhere, removing, as well as cert_text.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index 1570c78..6c7995b 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -29,7 +29,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-cert-text' => \&cert_text);
$pxt->register_tag('rhn-org-entitlement-name' =>
\&org_entitlement_name, -5);
}
@@ -107,36 +106,6 @@ sub get_service_map {
}
-# render the page that lets user view cert data
-sub cert_text {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
-
- my $support_org_id = $pxt->param('support_org_id');
- my $data = $pxt->session->get('new_cert_info');
- my %cert_info;
- if ($data and $data->{'meta_info'}->{'support_org_id'} eq
$support_org_id) {
- %cert_info = %{$data};
- }
- else {
- reset_form($pxt);
- croak "No cert data!";
- }
-
- my %subs;
- $subs{support_org_id} = $support_org_id;
-
- # do the opening and meta info
- my $cert_text = create_cert_text($pxt, \%cert_info);
-
- $cert_text=~s/>/>/g;
- $cert_text=~s/</</g;
- $subs{cert_text} = $cert_text;
- $block = PXT::Utils->perform_substitutions($block, \%subs);
- return $block;
-}
-
# create the actual cert xml given the cert_info session data
sub create_cert_text {
my $pxt = shift;
Show replies by date