java/code/webapp/WEB-INF/nav/channel_detail.xml | 1
web/html/nav/channel_detail.xml | 1
web/html/network/software/channels/download_packages.pxt | 71 ----
web/modules/rhn/RHN/DB/Channel.pm | 16 -
web/modules/rhn/RHN/DB/Errata.pm | 6
web/modules/rhn/RHN/DB/Package.pm | 80 -----
web/modules/sniglets/Sniglets/Downloads.pm | 27 -
web/modules/sniglets/Sniglets/ErrataEditor.pm | 221 ---------------
web/modules/sniglets/Sniglets/Packages.pm | 121 --------
web/modules/sniglets/Sniglets/Sets.pm | 20 -
10 files changed, 564 deletions(-)
New commits:
commit 6b50c7e127f28fe0239b4a3d883160868b998465
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:50:27 2009 +0100
Removal of $errata_data made get_advisory_types unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Errata.pm b/web/modules/rhn/RHN/DB/Errata.pm
index 39642c2..bec1f1d 100644
--- a/web/modules/rhn/RHN/DB/Errata.pm
+++ b/web/modules/rhn/RHN/DB/Errata.pm
@@ -1072,12 +1072,6 @@ EOQ
return @ret;
}
-sub get_advisory_types {
- my $class = shift;
-
- return ( [ "Bug Fix Advisory" ], [ "Product Enhancement Advisory"
], [ "Security Advisory" ] );
-}
-
sub get_product_types {
my $dbh = RHN::DB->connect;
my $query = "SELECT DISTINCT(product) FROM rhnErrata";
commit b90792c898b1c557e40384dd20d5c8e319287c29
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:48:21 2009 +0100
Removal of download_package made latest_package_by_name unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 65d11ba..6ed04ef 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1659,22 +1659,6 @@ EOQ
return ($pid, $path);
}
-sub latest_package_by_name {
- my $self = shift;
- my $name = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT CP.package_id
- FROM rhnChannelNewestPackage CP
- WHERE CP.channel_id = :cid
- AND CP.name_id = LOOKUP_PACKAGE_NAME(:name)
-EOQ
-
- $sth->execute_h(cid => $self->id, name => $name);
- return map { @$_ } $sth->fullfetch;
-}
-
sub latest_package_like {
my $class = shift;
my $cid = shift;
commit 8abd734ebce8db79d3dd50454150e5d8652d938c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:45:50 2009 +0100
Removal of download_package_list made available_package_arches unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index 382b6e1..ed7f33d 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -917,86 +917,6 @@ EOQ
return @res;
}
-sub available_package_arches {
- my $class = shift;
- my $org_id = shift;
- my $set = shift;
- my $cid = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth;
-
- my $filter_str = '';
- my $channel_str = '';
-
- my $org = RHN::Org->lookup(-id => $org_id);
-
- my %addl_params = (org_id => $org_id);
-
- if ($org->server_count > 0) {
- $filter_str = <<EOQ;
-
- AND
- EXISTS (
- SELECT 1
- FROM rhnServer S
- WHERE S.org_id = :org_id
- AND EXISTS (
- SELECT 1
- FROM rhnServerPackageArchCompat SPAC
- WHERE SPAC.server_arch_id = S.server_arch_id
- AND SPAC.package_arch_id = P.package_arch_id
- )
- )
-
-
-EOQ
- }
-
- if ($cid) {
- $channel_str = 'AND CP.channel_id = :cid';
- $addl_params{cid} = $cid;
- }
-
- $sth = $dbh->prepare(<<EOS);
-SELECT P.id, PA.name, PN.name || '-' || PEVR.evr.as_vre_simple(), P.path
- FROM rhnPackageArch PA,
- rhnPackageName PN,
- rhnPackageEVR PEVR,
- rhnPackage P
- WHERE P.id = :id
- AND P.name_id = PN.id
- AND P.evr_id = PEVR.id
- AND EXISTS (
- SELECT 1
- FROM rhnChannelPackage CP,
- rhnChannelPermissions CPerm
- WHERE CPerm.org_id = :org_id
- AND CPerm.channel_id = CP.channel_id
- AND CP.package_id = P.id
- $channel_str
- )
- $filter_str
- AND PA.id = P.package_arch_id
-EOS
-
- my @ret;
- foreach my $evr ($set->contents) {
- $sth->execute_h(id => $evr, %addl_params);
-
- my @arches;
- my $package_name = '';
- while (my ($id, $arch, $pkg_name, $path) = $sth->fetchrow) {
- $package_name = $pkg_name;
- push @arches, [ $id, $arch, $path ];
- }
-
- push @ret, [ $package_name, [ @arches ] ];
- }
-
- return @ret;
-}
-
sub source_rpm_path {
my $self = shift;
commit f731f9d097619230bd94e62ff8c45e1aac0a19ec
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:43:39 2009 +0100
Removal of download_packages.pxt made rhn-must-select-archs and must_select_archs
unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm
b/web/modules/sniglets/Sniglets/Packages.pm
index 527f304..126bf64 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -42,7 +42,6 @@ sub register_tags {
$pxt->register_tag('rhn-unknown-package-nvre' =>
\&unknown_package_nvre);
- $pxt->register_tag('rhn-must-select-archs', \&must_select_archs, 2);
$pxt->register_tag('rhn-upload-answerfile-form' =>
\&upload_answerfile_form);
$pxt->register_tag('rhn-package-raw-pkgmap' => \&raw_pkgmap);
@@ -91,17 +90,6 @@ sub lookup_package_nvre {
return $nvre;
}
-sub must_select_archs {
- my $pxt = shift;
- my %params = @_;
-
- my $hidden_vals = $pxt->pnotes('hidden_vals');
-
- return $hidden_vals unless $pxt->pnotes('must_select_archs');
-
- return $params{__block__} . $hidden_vals;
-}
-
sub package_dependencies {
my $pxt = shift;
my %params = @_;
commit 6d2024dc93824ddbc99d662b8f4cd475c9ab72aa
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:40:48 2009 +0100
rhn:errata_editor:errata_edit_cb not used, removing, as well as errata_edit_cb.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm
b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 590a7c6..0a4c1ee 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -38,7 +38,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:errata_editor:errata_edit_cb' =>
\&errata_edit_cb);
$pxt->register_callback('rhn:errata_editor:errata_publish_cb' =>
\&errata_publish_cb);
$pxt->register_callback('rhn:errata_editor:verify_errata_packages_in_channels'
=> \&verify_errata_packages_in_channels);
$pxt->register_callback('rhn:errata_editor:select_channels_cb' =>
\&select_channels_cb);
@@ -50,226 +49,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:delete_errata_cb' =>
\&delete_errata_cb);
}
-my @errata_fields = qw/id org_id synopsis advisory_name advisory_rel advisory_type
product buglist
- topic description solution keywords refers_to notes/;
-
-my $errata_data = {
- id => {display => 0,
- edit => 0 },
- advisory_name => {display => 'Advisory',
- edit => 'text',
- size => 20,
- maxlength => 27,
- required => 1 },
- advisory_rel => {display => 'Advisory Release',
- edit => 'text',
- size => 4,
- maxlength => 4,
- required => 1,
- default => '1' },
- advisory_type => {display => 'Advisory Type',
- edit => 'select',
- required => 1,
- options => [ RHN::Errata->get_advisory_types ],
- values => [ RHN::Errata->get_advisory_types ] },
- product => {display => 'Product',
- edit => 'text',
- size => 30,
- maxlength => 64,
- required => 1 },
- description => {display => 'Description',
- edit => 'textarea',
- rows => 6,
- cols => 80,
- maxlength => 4000,
- required => 1 },
- synopsis => {display => 'Synopsis',
- edit => 'text',
- size => 60,
- maxlength => 4000,
- required => 1 },
- topic => {display => 'Topic',
- edit => 'textarea',
- rows => 6,
- cols => 80,
- maxlength => 4000,
- required => 1 },
- solution => {display => 'Solution',
- edit => 'textarea',
- rows => 6,
- cols => 80,
- maxlength => 4000,
- required => 1 },
- refers_to => {display => 'References',
- edit => 'textarea',
- rows => 6,
- cols => 40,
- maxlength => 4000 },
- notes => {display => 'Notes',
- edit => 'textarea',
- rows => 6,
- cols => 40,
- maxlength => 4000 },
- keywords => {display => 'Keywords',
- edit => 'text',
- size => 40 },
- buglist => {display => 'Bugs',
- edit => 'special' },
- org_id => {display => 0,
- edit => 0 } };
-
-
-sub errata_edit_cb {
- my $pxt = shift;
-
- my $eid = $pxt->param('eid') || 0;
-
- my $errata;
-
- if ($eid) {
- throw "user '" . $pxt->user->id . "' does not own errata
'$eid'"
- unless $pxt->user->verify_errata_admin($eid);
-
- $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
- }
-
- my $now = RHN::Date->now->short_date;
-
- unless ($eid) {
- $errata = RHN::ErrataTmp->create_errata;
- $errata->org_id($pxt->user->org_id);
- $errata->advisory_name($pxt->dirty_param('errata_advisory_name'));
- $errata->advisory_rel($pxt->dirty_param('errata_advisory_rel'));
- $errata->issue_date($now);
- }
-
- my @errors;
- my @add_bug; #data for a new bug - must be done after commit in the case of a new
errata
- my @update_bugs; #data for old bugs
- my @keywords = (); #keywords
-
- foreach my $field (@errata_fields) {
- my $data = $errata_data->{$field};
-
- next unless $data->{edit};
-
- my $value = $pxt->dirty_param("errata_$field") || '';
- $value =~ s/^\s+//;
- $value =~ s/\s+$//;
-
- if ($data->{required} && !($value)) {
- push @errors, "Required field '$field' is empty.";
- next;
- }
-
- if ($data->{maxlength} and (length($value) > $data->{maxlength})) {
- push @errors, sprintf(q(The %s was %d charactars long. Maximum length is %d
characters.),
- $data->{display}, length($value), $data->{maxlength});
- next;
- }
-
- if ($field eq 'keywords') {
- @keywords = split /\s*,\s*/, $value;
- }
- elsif ($field eq 'buglist') {
-
- foreach my $bug (RHN::Utils->parameterize([ $errata->bugs_fixed ],
'id', 'summary')) { #see if old bugs changed
- my $new_id = $pxt->dirty_param('errata_buglist_' . $bug->{id} .
'_id');
- my $new_summary = $pxt->dirty_param('errata_buglist_' . $bug->{id} .
'_summary') || '';
-
- if ($new_id =~ /\D/) {
- push @errors, "Bug ID's must be numeric";
- next;
- }
-
- unless (($bug->{id} == $new_id) && (($bug->{summary} || '') eq
$new_summary)) {
- push @update_bugs, [ $bug->{id}, $new_id, $new_summary ];
- }
- }
-
- if (my $bug_id = $pxt->dirty_param('errata_buglist__id') || '')
{ #check for a new bug
-
- if ($bug_id =~ /^\d+$/) {
- my $bug_summary = $pxt->dirty_param('errata_buglist__summary') ||
'';
- @add_bug = ($bug_id, $bug_summary);
- }
- else {
- push @errors, "Bug ID's must be numeric";
- }
- }
-
- }
- elsif ($field eq 'advisory_name') {
- unless ($pxt->user->is('rhn_superuser')) {
- if ($value =~ /^(RH)/i) {
- push @errors, "An errata advisory cannot begin with
'<strong>$1</strong>'";
- }
- }
- $errata->advisory_name($value);
- }
- else {
- $errata->$field($value);
- }
- }
-
- unless (@errors) {
- $errata->advisory($errata->advisory_name . '-' .
$errata->advisory_rel);
- $errata->update_date($now);
- eval {
- $errata->commit;
-
- if (@add_bug) {
- $errata->add_bug(@add_bug);
- }
-
- foreach my $bug (@update_bugs) {
- $errata->update_bug( @{$bug} );
- }
-
- $errata->set_keywords(@keywords);
- };
- if ($@) {
- if (ref $@ and catchable($@)) {
- my $E = $@;
-
- if ($E->constraint_value eq 'RHN_ERRATA_ADVISORY_UQ') {
- $pxt->push_message(local_alert => 'An Errata with this advisory label
already exists');
- return;
- }
- elsif ($E->constraint_value eq 'RHN_ERRATA_ADVISORY_NAME_UQ') {
- $pxt->push_message(local_alert => 'An Errata with this advisory name already
exists');
- return;
- }
- elsif ($E->constraint_value eq 'RHN_ERRATATMP_ADVISORY_UQ') {
- $pxt->push_message(local_alert => 'An Errata with this advisory label
already exists');
- return;
- }
- elsif ($E->constraint_value eq 'RHN_ERRATATMP_ADVISORY_NAME_UQ') {
- $pxt->push_message(local_alert => 'An Errata with this advisory name already
exists');
- return;
- }
- else {
- throw $E;
- }
- }
- else {
- die $@;
- }
- }
-
- }
-
- foreach (@errors) {
- $pxt->push_message(local_alert => $_);
- }
-
- unless (@errors) {
- $pxt->redirect($pxt->uri . '?eid=' . $errata->id);
- }
-
- return;
-}
-
sub errata_publish_cb {
my $pxt = shift;
commit 56f60df3f9035b9ecb618a6b6ab35890cb719b2e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:38:54 2009 +0100
Removal of download made rhn:clear_set_cb and clear_set_cb unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Sets.pm
b/web/modules/sniglets/Sniglets/Sets.pm
index c320bf7..a4672e9 100644
--- a/web/modules/sniglets/Sniglets/Sets.pm
+++ b/web/modules/sniglets/Sniglets/Sets.pm
@@ -30,13 +30,6 @@ sub register_tags {
$pxt->register_tag('rhn-set-totals' => \&set_totals);
}
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:clear_set_cb', \&clear_set_cb);
-}
-
sub set_totals {
my $pxt = shift;
my %params = @_;
@@ -65,17 +58,4 @@ sub set_totals {
return $block;
}
-sub clear_set_cb {
- my $pxt = shift;
-
- my $set_label = $pxt->pnotes('set_to_clear') ||
$pxt->dirty_param('selection');
- my $set = RHN::Set->lookup(-label => $set_label, -uid =>
$pxt->user->id);
-
- throw "No valid set!" unless $set;
- $set->empty;
- $set->commit;
-
- $pxt->redirect($pxt->param('set_clear_redirect') || $pxt->uri);
-}
-
1;
commit 755dc96b3df12fe4313f85eecbc03afe4eb7f22b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:37:40 2009 +0100
Removal of download_packages.pxt made rhn:download_packages_cb and
download_packages_cb unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm
b/web/modules/sniglets/Sniglets/Packages.pm
index 914d9bf..527f304 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -53,8 +53,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:download_packages_cb' =>
\&download_packages_cb);
-
$pxt->register_callback('rhn:sscd_confirm_package_upgrades' =>
\&sscd_confirm_package_upgrades_cb);
$pxt->register_callback('rhn:sscd_confirm_package_installations' =>
\&sscd_confirm_package_installations_cb);
$pxt->register_callback('rhn:sscd_confirm_patch_installations' =>
\&sscd_confirm_package_installations_cb);
@@ -104,12 +102,6 @@ sub must_select_archs {
return $params{__block__} . $hidden_vals;
}
-sub download_packages_cb {
- my $pxt = shift;
-
-# $pxt->redirect('/network/packagelist/download_packages.pxt');
-}
-
sub package_dependencies {
my $pxt = shift;
my %params = @_;
commit fd7774f88c74b33a347fda54181ab304050f527d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:29:05 2009 +0100
rhn-download-package not used anywhere, removing, as well as download_package.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm
b/web/modules/sniglets/Sniglets/Downloads.pm
index 4030d5e..61f033b 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -32,7 +32,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag('rhn-ftp-download', \&ftp_download, 4);
- $pxt->register_tag('rhn-download-package', \&download_package, 1);
}
# non-tag access to RHN download links
@@ -43,32 +42,6 @@ sub rhn_download_url {
return ftp_download($params{pxt}, (-location => $params{location}, -path =>
$params{path}, __block__ => $params{label}));
}
-sub download_package {
- my $pxt = shift;
- my %params = validate(@_, { channel => 1, name => 1, __block__ => 1 });
-
- my $cid = RHN::Channel->channel_id_by_label($params{channel});
- my $channel = RHN::Channel->lookup(-id => $cid);
-
- my @pkg_ids = map { $channel->latest_package_by_name($_) } split /,\s*/,
$params{name};
-
- my $ret;
- my $expires = time + PXT::Config->get('download_url_lifetime');
-
- for my $pkg_id (@pkg_ids) {
- my $pkg = RHN::Package->lookup(-id => $pkg_id);
- my $user_id = $pxt->user ? $pxt->user->id : 0;
- my $uri = RHN::TokenGen::Generator->generate_url($user_id, 0, $pkg->path,
"/download", "local", $expires, $pxt->ssl_available);
-
- my $copy = $params{__block__};
- $ret .= PXT::Utils->perform_substitutions($copy,
- { nvre => PXT::HTML->link($uri, join(".", $pkg->nvre,
$pkg->arch_label, "rpm")),
- channel => $channel->name, md5sum => $pkg->md5sum });
- }
-
- return $ret;
-}
-
sub ftp_download {
my $pxt = shift;
my %params = validate(@_, { path => 1, location => { default =>
"local" },
commit 3e53e17b4eca401510fc38db64ce1d1df86b750b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:27:54 2009 +0100
Removal of download_packages.pxt makes rhn-download-package-list and
download_package_list unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm
b/web/modules/sniglets/Sniglets/Packages.pm
index b3258ed..914d9bf 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -42,7 +42,6 @@ sub register_tags {
$pxt->register_tag('rhn-unknown-package-nvre' =>
\&unknown_package_nvre);
- $pxt->register_tag('rhn-download-package-list' =>
\&download_package_list);
$pxt->register_tag('rhn-must-select-archs', \&must_select_archs, 2);
$pxt->register_tag('rhn-upload-answerfile-form' =>
\&upload_answerfile_form);
@@ -105,69 +104,6 @@ sub must_select_archs {
return $params{__block__} . $hidden_vals;
}
-sub download_package_list {
- my $pxt = shift;
- my %params = @_;
-
- my $package_set = RHN::Set->lookup(-label => 'package_downloadable_list',
-uid => $pxt->user->id);
- my $cid = $pxt->param('cid');
-
- my @available_pkg_arches =
RHN::Package->available_package_arches($pxt->user->org_id, $package_set, $cid);
-
- my $hidden_vals = '';
- my $block = $params{__block__};
- my $ret = '';
-
- my $counter = 0;
- my $prefix = "/pub/";
-
- my @files;
- foreach my $package_info (@available_pkg_arches) {
- my $num_arches = @{$package_info->[1]};
- my $current = '';
-
- if ($num_arches > 1) {
- $current = $block;
-
- if ($counter % 2) {
- $current =~ s/{color}/#eeeeee/gism;
- } else {
- $current =~ s/{color}/white/gism;
- }
-
- $current =~ s/\{package_nvre\}/$package_info->[0]/ism;
- my $checkboxes = '';
- my @checkboxes;
- foreach my $arch_pkg (@{$package_info->[1]}) {
- next unless $arch_pkg->[2];
- push @files, "$prefix$arch_pkg->[2]";
- push @checkboxes, "<input type=\"checkbox\"
name=\"filename\" value=\"$prefix$arch_pkg->[2]\"
/> $arch_pkg->[1]";
- $checkboxes[-1] .= PXT::HTML->hidden(-name => "filename_full", -value
=> $prefix . $arch_pkg->[2]);
- }
- $checkboxes = join ("    ", @checkboxes);
- $current =~ s/\{package_checkboxes\}/$checkboxes/ism;
-
- $counter++;
- }
- else {
- if ($package_info->[1]->[0]->[2]) {
- push @files, "$prefix$package_info->[1]->[0]->[2]";
- $hidden_vals .= "<input type=\"hidden\" name=\"filename\"
value=\"$prefix$package_info->[1]->[0]->[2]\" />\n";
- $hidden_vals .= PXT::HTML->hidden(-name => "filename_full", -value =>
$prefix . $package_info->[1]->[0]->[2]);
- }
- }
- $ret .= $current;
- }
-
- my $computed_md5 = Digest::MD5::md5_hex(join(":", sort @files));
- $pxt->pnotes('computed_md5' => $computed_md5);
-
-# return "<pre>Available
packages:\n".Data::Dumper->Dump([(@available_pkg_arches)])."</pre>";
- $pxt->pnotes(must_select_archs => 1) if ($counter > 0);
- $pxt->pnotes(hidden_vals => $hidden_vals);
- return $ret;
-}
-
sub download_packages_cb {
my $pxt = shift;
commit 673b6c3cb99b2bb0b153114af1f784d9979a5aeb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:25:58 2009 +0100
Removal of download_packages.pxt makes rhn-download and download unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm
b/web/modules/sniglets/Sniglets/Packages.pm
index 4aacf1c..b3258ed 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -43,7 +43,6 @@ sub register_tags {
$pxt->register_tag('rhn-unknown-package-nvre' =>
\&unknown_package_nvre);
$pxt->register_tag('rhn-download-package-list' =>
\&download_package_list);
- $pxt->register_tag('rhn-download', \&download, 2);
$pxt->register_tag('rhn-must-select-archs', \&must_select_archs, 2);
$pxt->register_tag('rhn-upload-answerfile-form' =>
\&upload_answerfile_form);
@@ -106,42 +105,6 @@ sub must_select_archs {
return $params{__block__} . $hidden_vals;
}
-sub download {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $url = PXT::Config->get("download_url") ||
"/cgi-bin/download.pl/rhn-packages.tar";
-
- my $redirect =
$pxt->derelative_url("/network/software/packages/download_complete.pxt");
-
- $redirect .=
"?pxt_trap=rhn%3aclear_set_cb&selection=package_installable_list";
-
- my $hidden_package_vars = '';
- my $download_packages = $pxt->pnotes('download_packages');
- my $optional_packages = $pxt->pnotes('optional_packages');
-
- $download_packages = [ ] unless (ref $download_packages eq 'ARRAY');
- $optional_packages = [ ] unless (ref $optional_packages eq 'ARRAY');
-
- foreach my $file (@{$download_packages}) {
- $hidden_package_vars .= PXT::HTML->hidden(-name => 'filename', -value
=> $file);
- }
-
- foreach my $file (@{$optional_packages}, @{$download_packages}) {
- $hidden_package_vars .= PXT::HTML->hidden(-name => 'filename_full',
-value => $file);
- }
-
- $block =~ s/\{token\}/RHN::SessionSwap->encode_data(time,
$pxt->pnotes('computed_md5'))/egi;
- $block =~ s/\{redirect\}/$redirect/egi;
- $block =~ s/\{download_url\}/$url/gi;
- $block =~ s/\{hidden_package_vars\}/$hidden_package_vars/gi;
-
- return $block;
-}
-
-
sub download_package_list {
my $pxt = shift;
my %params = @_;
commit 5138b924a9d47475527ca90470ba0bc75eb55001
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:23:18 2009 +0100
download_packages.pxt was in the second rhn-tab-url in both channel_detail.xmls, and
not referenced from anywhere else, removing.
diff --git a/java/code/webapp/WEB-INF/nav/channel_detail.xml
b/java/code/webapp/WEB-INF/nav/channel_detail.xml
index a80964b..9d34309 100644
--- a/java/code/webapp/WEB-INF/nav/channel_detail.xml
+++ b/java/code/webapp/WEB-INF/nav/channel_detail.xml
@@ -16,7 +16,6 @@
</rhn-tab>
<rhn-tab name="Packages">
<rhn-tab-url>/rhn/channels/ChannelPackages.do</rhn-tab-url>
-
<rhn-tab-url>/network/software/channels/download_packages.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Patches"
acl="channel_packaging_type(sysv-solaris)">
<rhn-tab-url>/network/software/channels/patches.pxt</rhn-tab-url>
diff --git a/web/html/nav/channel_detail.xml b/web/html/nav/channel_detail.xml
index b207119..0a92216 100644
--- a/web/html/nav/channel_detail.xml
+++ b/web/html/nav/channel_detail.xml
@@ -15,7 +15,6 @@
</rhn-tab>
<rhn-tab name="Packages">
<rhn-tab-url>/rhn/channels/ChannelPackages.do</rhn-tab-url>
-
<rhn-tab-url>/network/software/channels/download_packages.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Patches"
acl="channel_packaging_type(sysv-solaris)">
<rhn-tab-url>/network/software/channels/patches.pxt</rhn-tab-url>
diff --git a/web/html/network/software/channels/download_packages.pxt
b/web/html/network/software/channels/download_packages.pxt
deleted file mode 100644
index fa6339c..0000000
--- a/web/html/network/software/channels/download_packages.pxt
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Packages" />
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::Channel" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt"
mode="main_canvas">
-
-<rhn-channel-details>
- <h1><img src="/img/rhn-icon-channels.gif" /> {channel_name}
<rhn-help href="s1-sm-channels-packages.jsp#s4-sm-channel-details-packages"
/></h1>
-</rhn-channel-details>
-
- <rhn-navi-nav prefix="channel_details" depth="0"
file="/nav/channel_detail.xml" style="contentnav" />
-
- <h2><img src="/img/rhn-icon-packages.gif" /> Download
Packages</h2>
-
-<rhn-download>
- <pxt-form method="post" action="{download_url}">
-
- <div class="page-summary">
- <p>To begin the download process, click the button at the bottom of the
page. You will be presented with a dialog box that allows you to choose the directory to
which you wish to save the <strong>rhn-packages.tar</strong> file.</p>
-
- <p>To extract the packages once the download is complete, run the following
from the commandline:</p>
-
- <strong>
- <code>tar -xvf rhn-packages.tar</code>
- </strong>
-
- <p>The packages you have selected will be in the newly created
<code>rhn-packages/</code> directory beneath your current
directory.</p>
-
- </div>
-
-<rhn-must-select-archs>
- <hr />
-
- <p>
- <strong>Note:</strong>   Some of the packages you
have selected have multiple architectures that may be relevant to your registered systems.
To select the desired architecture for the packages to be downloaded, check the desired
architecture(s).
- </p>
-
- <table width="96%" cellspacing="0" cellpadding="0"
class="list" align="center">
- <tr valign="center">
- <th>Package Name</th>
- <th>Arches Available</th>
- </tr>
-
-<rhn-download-package-list>
- <tr bgcolor="{color}">
- <td>{package_nvre}</td>
- <td>{package_checkboxes}</td>
- </tr>
-</rhn-download-package-list>
- </table>
-
-</rhn-must-select-archs>
-
- <br />
- <br />
-
- <input type="submit" name="download_system_packages"
value="Download Selected Packages Now!" />
- <input type="hidden" name="pxt:trap"
value="rhn:download_packages_cb" />
- <input type="hidden" name="token" value="{token}"
/>
-
- </pxt-form>
-
-</rhn-download>
-
- </grail-canvas-template>
-</pxt-passthrough>
-