web/modules/grail/Grail/Frame.pm | 27 --
web/modules/rhn/RHN/DB/Server.pm | 81 ------
web/modules/sniglets/Sniglets/HTML.pm | 17 -
web/modules/sniglets/Sniglets/Profiles.pm | 183 --------------
web/modules/sniglets/Sniglets/Servers.pm | 349 ----------------------------
web/modules/sniglets/Sniglets/Users.pm | 18 -
web/modules/sniglets/Sniglets/XMLRPCTest.pm | 66 -----
7 files changed, 741 deletions(-)
New commits:
commit dcb989ad7494d78f886b8f59bfb496870d821b6a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:47:05 2009 +0100
grail-dynamic-canvas not used anywhere, removing, as well as dynamic_canvas_handler.
diff --git a/web/modules/grail/Grail/Frame.pm b/web/modules/grail/Grail/Frame.pm
index 860fa22..873f8ad 100644
--- a/web/modules/grail/Grail/Frame.pm
+++ b/web/modules/grail/Grail/Frame.pm
@@ -27,7 +27,6 @@ sub register_tags {
$pxt->register_tag("grail-early-canvas" => \&canvas_handler,
-101);
$pxt->register_tag("grail-canvas-template" =>
\&canvas_template_handler, 100);
$pxt->register_tag("grail-canvas-replacement" =>
\&canvas_replacement_handler, 50);
- $pxt->register_tag("grail-dynamic-canvas" =>
\&dynamic_canvas_handler, -150);
}
sub register_callbacks {
@@ -52,23 +51,6 @@ sub canvas_handler {
return $canvas->render($pxt, -mode => "render_canvas", -params => [
$params{mode}, $params{__block__} ]);
}
-sub dynamic_canvas_handler {
- my $pxt = shift;
- my %params = @_;
-
- my $canvas = new Grail::Canvas;
-
- my $replacements = $pxt->pnotes('canvas_replacements') || {};
-
- if ($params{mode} and exists $replacements->{$params{mode}}) {
- $params{__block__} = $replacements->{$params{mode}};
- return $canvas->render($pxt, -mode => "render_canvas", -params =>
[ $params{mode}, $params{__block__} ]);
- }
- else {
- return $canvas->render($pxt, -mode => "render_dynamic_canvas",
-params => [ $params{mode}, $params{__block__} ]);
- }
-}
-
sub canvas_replacement_handler {
my $pxt = shift;
my %params = @_;
commit 198a61ed424e437173e4838ed16ed24a89019199
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:46:24 2009 +0100
grail-canvas-template-hack not used anywhere, removing.
diff --git a/web/modules/grail/Grail/Frame.pm b/web/modules/grail/Grail/Frame.pm
index 36366f2..860fa22 100644
--- a/web/modules/grail/Grail/Frame.pm
+++ b/web/modules/grail/Grail/Frame.pm
@@ -26,7 +26,6 @@ sub register_tags {
$pxt->register_tag("grail-canvas" => \&canvas_handler, -100);
$pxt->register_tag("grail-early-canvas" => \&canvas_handler,
-101);
$pxt->register_tag("grail-canvas-template" =>
\&canvas_template_handler, 100);
- $pxt->register_tag("grail-canvas-template-hack" =>
\&canvas_template_handler, 100);
$pxt->register_tag("grail-canvas-replacement" =>
\&canvas_replacement_handler, 50);
$pxt->register_tag("grail-dynamic-canvas" =>
\&dynamic_canvas_handler, -150);
}
commit afe80957d3642c8de5bfce55ca8947de7484309c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:45:33 2009 +0100
grail-title not used anywhere, removing, as well as title_handler.
diff --git a/web/modules/grail/Grail/Frame.pm b/web/modules/grail/Grail/Frame.pm
index baedb3b..36366f2 100644
--- a/web/modules/grail/Grail/Frame.pm
+++ b/web/modules/grail/Grail/Frame.pm
@@ -24,7 +24,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag("grail-canvas" => \&canvas_handler, -100);
- $pxt->register_tag("grail-title" => \&title_handler, -100);
$pxt->register_tag("grail-early-canvas" => \&canvas_handler,
-101);
$pxt->register_tag("grail-canvas-template" =>
\&canvas_template_handler, 100);
$pxt->register_tag("grail-canvas-template-hack" =>
\&canvas_template_handler, 100);
@@ -54,13 +53,6 @@ sub canvas_handler {
return $canvas->render($pxt, -mode => "render_canvas", -params => [
$params{mode}, $params{__block__} ]);
}
-sub title_handler {
- my $pxt = shift;
- my %params = @_;
-
- return "<TITLE>" . ($pxt->pnotes('page_title') ||
$params{__block__}) . "</TITLE>";
-}
-
sub dynamic_canvas_handler {
my $pxt = shift;
my %params = @_;
commit bcc513416ecbbaf50eb324c84163627904291c0f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:44:22 2009 +0100
rhn-user-default-system-groups-form not used anywhere, removing, as well as
default_system_groups.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 56bb925..ae41897 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -62,8 +62,6 @@ sub register_tags {
$pxt->register_tag('rhn-user-site-view' => \&user_site_view);
$pxt->register_tag('rhn-user-login' => \&rhn_user_login);
-
- $pxt->register_tag('rhn-user-default-system-groups-form' =>
\&default_system_groups);
}
sub register_callbacks {
@@ -1270,22 +1268,6 @@ sub rhn_user_login {
return $user->login;
}
-sub default_system_groups {
- my $pxt = shift;
- my %attr = @_;
-
- my $form = build_default_system_groups_form($pxt, %attr);
- my $rform = $form->realize;
- undef $form;
-
- Sniglets::Forms::load_params($pxt, $rform);
-
- my $style = new Sniglets::Forms::Style;
- my $html = $rform->render($style);
-
- return $html;
-}
-
sub default_system_groups_cb {
my $pxt = shift;
commit 37af489fef5f5119ca40e43a90c2ba1e5354e79b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:40:54 2009 +0100
rhn-profile-sync-confirm not used anywhere, removing, as well as
profile_sync_confirm.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 66d5a4b..84b4ea3 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,7 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-sync-confirm' =>
\&profile_sync_confirm);
}
sub register_callbacks {
@@ -131,38 +130,6 @@ sub profile_delete_cb {
$pxt->redirect($redir, ($sid ? (sid => $sid) : ()));
}
-sub profile_sync_confirm {
- my $pxt = shift;
- my %params = @_;
-
- my $copy = $params{__block__};
-
- my $source;
- my $source_profile_id = $pxt->param('prid');
- my $source_system_id = $pxt->param('sid_1');
-
- my $victim = RHN::Server->lookup(-id => $pxt->param('sid'));
-
- if ($source_profile_id) {
- $source = RHN::Profile->lookup(-id => $source_profile_id);
- }
- elsif ($source_system_id) {
- $source = RHN::Server->lookup(-id => $source_system_id);
- }
- else {
- die 'no source for sync operation?';
- }
-
-
- my %subst;
- $subst{source} = $source->name;
- $subst{victim} = $victim->name;
-
- $copy = PXT::Utils->perform_substitutions($copy, \%subst);
-
- return $copy;
-}
-
sub sync_server_cb {
my $pxt = shift;
my $missing_packages_option = shift || '';
commit f1151301bc4477265558b639142d61a65add6cd0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:40:13 2009 +0100
rhn-profile-or-system-details not used anywhere, removing, as well as
profile_or_system_details.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 475980b..66d5a4b 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,8 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-or-system-details' =>
\&profile_or_system_details, -5);
-
$pxt->register_tag('rhn-profile-sync-confirm' =>
\&profile_sync_confirm);
}
@@ -57,39 +55,6 @@ sub profile_edit_cb {
$pxt->redirect("details.pxt", prid => $profile->id);
}
-sub profile_or_system_details {
- my $pxt = shift;
- my %params = @_;
-
- my $sid = $pxt->param('sid_1') || '';
- my $prid = $pxt->param('prid') || '';
-
- throw "Either (sid_1) or (prid) param required" unless ($sid || $prid);
-
- my %subst;
-
- if ($sid) {
- my $system = RHN::Server->lookup(-id => $sid);
- throw "no valid server" unless $system;
-
- $subst{profile_or_system_name} = $system->name;
- $subst{profile_or_system_description} = $system->description;
- }
- else {
- my $profile = RHN::Profile->lookup(-id => $prid);
- throw "No valid profile" unless $profile;
-
- $subst{profile_or_system_name} = $profile->name;
- $subst{profile_or_system_description} = $profile->description;
- }
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- my $block = PXT::Utils->perform_substitutions($params{__block__}, \%subst);
-
- return $block;
-}
-
sub create_profile_from_system_cb {
my $pxt = shift;
commit 9c090cedae16003a0ecf492249cdc0e6fa9a0e88
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:39:38 2009 +0100
rhn-profile-edit not used anywhere, removing, as well as profile_edit.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 61c7afb..475980b 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,8 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-edit' => \&profile_edit);
-
$pxt->register_tag('rhn-profile-or-system-details' =>
\&profile_or_system_details, -5);
$pxt->register_tag('rhn-profile-sync-confirm' =>
\&profile_sync_confirm);
@@ -48,20 +46,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:create_profile_from_system_cb' =>
\&create_profile_from_system_cb);
}
-sub profile_edit {
- my $pxt = shift;
- my %params = @_;
-
- my $profile = RHN::Profile->lookup(-id => $pxt->param('prid'));
-
- my $block = $params{__block__};
- my %subst;
- $subst{profile_name} = $profile->name;
- $subst{profile_description} = $profile->description;
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
sub profile_edit_cb {
my $pxt = shift;
commit 58dd3a2b9e3a8ef0491e879ade7644c30e88b8b0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:38:54 2009 +0100
rhn-profile-name not used anywhere, removing, as well as profile_name.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 1aa6122..61c7afb 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,7 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-name' => \&profile_name, -2);
$pxt->register_tag('rhn-profile-edit' => \&profile_edit);
$pxt->register_tag('rhn-profile-or-system-details' =>
\&profile_or_system_details, -5);
@@ -49,23 +48,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:create_profile_from_system_cb' =>
\&create_profile_from_system_cb);
}
-sub profile_name {
- my $pxt = shift;
- my %params = @_;
-
- my $prid = $params{prid} || $pxt->param('prid');
-
- throw 'No profile id' unless $prid;
-
- $pxt->user->verify_system_profile_access($prid)
- or $pxt->redirect('/errors/permission.pxt');
-
- my $block = $params{__block__};
- my $p = RHN::Profile->lookup(-id => $prid);
-
- return PXT::Utils->escapeHTML($p->name);
-}
-
sub profile_edit {
my $pxt = shift;
my %params = @_;
commit 2974faad9d2b832c0d524f672171986ccd859337
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:37:01 2009 +0100
rhn-compat-system-select not used anywhere, removing, as well as
compat_system_select.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index a8b8ffe..1aa6122 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,7 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-compat-system-select' =>
\&compat_system_select);
$pxt->register_tag('rhn-profile-name' => \&profile_name, -2);
$pxt->register_tag('rhn-profile-edit' => \&profile_edit);
@@ -201,30 +200,6 @@ sub profile_delete_cb {
$pxt->redirect($redir, ($sid ? (sid => $sid) : ()));
}
-sub compat_system_select {
- my $pxt = shift;
- my %params = @_;
-
- my $sid = $pxt->param('sid');
- my $ret = $params{__block__};
-
- my $empty_msg = $params{empty_message} || '';
- throw 'param empty_message needed but not provided.'
- unless $empty_msg;
-
- my @systems = RHN::Server->compatible_with_server($sid, $pxt->user->id,
$pxt->user->org_id);
- my @options = map { [ PXT::Utils->escapeHTML($_->[1] || ''), $_->[0],
0 ] } @systems;
-
- if (@options) {
- $ret =~ s/\{system_select\}/PXT::HTML->select(-name => 'sid_1',
-options => \@options)/e;
- }
- else {
- $ret = $empty_msg;
- }
-
- return $ret;
-}
-
sub profile_sync_confirm {
my $pxt = shift;
my %params = @_;
commit ee95841a1277d1999a7cc79acc0a6009c9baf4ae
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:36:10 2009 +0100
rhn-compat-profile-select not used anywhere, removing, as well as
compat_profile_select.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 62c8dee..a8b8ffe 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,7 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-compat-profile-select' =>
\&compat_profile_select);
$pxt->register_tag('rhn-compat-system-select' =>
\&compat_system_select);
$pxt->register_tag('rhn-profile-name' => \&profile_name, -2);
$pxt->register_tag('rhn-profile-edit' => \&profile_edit);
@@ -202,30 +201,6 @@ sub profile_delete_cb {
$pxt->redirect($redir, ($sid ? (sid => $sid) : ()));
}
-sub compat_profile_select {
- my $pxt = shift;
- my %params = @_;
-
- my $sid = $pxt->param('sid');
- my $ret = $params{__block__};
-
- my $empty_msg = $params{empty_message} || '';
- throw 'param empty_message needed but not provided.'
- unless $empty_msg;
-
- my @profiles = RHN::Profile->compatible_with_server($sid,
$pxt->user->org_id);
- my @options = map { [ PXT::Utils->escapeHTML($_->[1] || ''), $_->[0],
0 ] } @profiles;
-
- if (@options) {
- $ret =~ s/\{profile_select\}/PXT::HTML->select(-name => 'prid',
-options => \@options)/e;
- }
- else {
- $ret = $empty_msg;
- }
-
- return $ret;
-}
-
sub compat_system_select {
my $pxt = shift;
my %params = @_;
commit 0a085d1550da42694b747db31a68e0ea3f4f93ce
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:35:26 2009 +0100
rhn-profile-create-from-system not used anywhere, removing, as well as
profile_create_from_system.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 3b727de..62c8dee 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,8 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-create-from-system' =>
\&profile_create_from_system);
-
$pxt->register_tag('rhn-compat-profile-select' =>
\&compat_profile_select);
$pxt->register_tag('rhn-compat-system-select' =>
\&compat_system_select);
$pxt->register_tag('rhn-profile-name' => \&profile_name, -2);
@@ -128,35 +126,6 @@ sub profile_or_system_details {
return $block;
}
-sub profile_create_from_system {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my %subst;
-
- my $system = RHN::Server->lookup(-id => $pxt->param('sid'));
-
- throw 'no system.' unless $system;
-
- $subst{profile_create_name} =
- PXT::HTML->text(-name => 'name',
- -value => "Profile of " . PXT::Utils->escapeHTML($system->name
|| ''),
- -maxlength => 128,
- -size => 48);
-
- $subst{profile_create_description} =
- PXT::HTML->textarea(-name => 'description',
- -value => "Profile made from " .
PXT::Utils->escapeHTML($system->name || ''),
- -rows => 6,
- -cols => 48,
- -wrap => 'VIRTUAL');
-
- $block = PXT::Utils->perform_substitutions($block, \%subst);
-
- return $block;
-}
-
sub create_profile_from_system_cb {
my $pxt = shift;
commit 01cb9ba98ef7f160b6d0eda413ed2bf81ba5ba02
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:32:24 2009 +0100
Package Sniglets::XMLRPCTest is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/XMLRPCTest.pm
b/web/modules/sniglets/Sniglets/XMLRPCTest.pm
deleted file mode 100644
index e0e24de..0000000
--- a/web/modules/sniglets/Sniglets/XMLRPCTest.pm
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-
-package Sniglets::XMLRPCTest;
-
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc("listdir", \&listdir_xmlrpc);
-}
-
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_tag("listdir", \&listdir_tag);
-}
-
-sub listdir_tag {
- my $pxt = shift;
-
- my $ret;
-
- foreach my $dir (generate_dir_listing($pxt->param("dir") ||
"/tmp")) {
- $ret .= "$dir->[0]<br>";
- }
-
- return $ret;
-}
-
-# return a list of files in a dir, w/o extra info
-sub listdir_xmlrpc {
- my $pxt = shift;
- my $dir = shift;
-
- return map { $_->[0] } generate_dir_listing($dir);
-}
-
-# return a list of files in a dir, including stat() info
-sub generate_dir_listing {
- my $dir = shift;
-
- opendir D, $dir
- or die "can't open dir: $!";
- my @dir = readdir D;
- closedir D;
-
- return map { [ $_, stat("$dir/$_") ] } @dir;
-}
-
-1;
commit e2ec07971885dd3c54d429e46ee3db3f9214190a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:28:44 2009 +0100
rhn-server-virtualization-guest-details not used anywhere, removing, as well as
server_virtualization_details.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 0cdeaa7..5d74233 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -82,8 +82,6 @@ sub register_tags {
$pxt->register_tag('rhn-system-activation-key-form' =>
\&system_activation_key_form);
$pxt->register_tag('rhn-remote-command-form' =>
\&remote_command_form);
-
- $pxt->register_tag('rhn-server-virtualization-guest-details' =>
\&server_virtualization_details, 2);
}
sub register_callbacks {
@@ -655,47 +653,6 @@ sub server_history_event_details {
return $params{__block__};
}
-sub server_virtualization_details {
- my $pxt = shift;
- my %params = @_;
- my $ret = '';
-
- my $server = $pxt->pnotes('server');
-
- throw "No server." unless $server;
-
- my %subst;
-
- my $virt_details = $server->virtual_guest_details();
-
- return unless $virt_details;
-
- my $block = $params{__block__};
-
- $subst{virtualization_type} = $virt_details->{TYPE_NAME} || "None";
- $subst{virtualization_uuid} = $virt_details->{UUID} || "Unknown";
- $subst{virtualization_host} = "Unknown";
-
- if ($virt_details->{HOST_SYSTEM_ID}) {
- if ($pxt->user->verify_system_access($virt_details->{HOST_SYSTEM_ID})) {
- $subst{virtualization_host} =
- PXT::HTML->link2(text => $virt_details->{HOST_SYSTEM_NAME},
- url => "/rhn/systems/details/Overview.do?sid=" .
$virt_details->{HOST_SYSTEM_ID});
-
- }
- else {
- $subst{virtualization_host} = sprintf("%s (%d)",
- $virt_details->{HOST_SYSTEM_NAME},
- $virt_details->{HOST_SYSTEM_ID});
-
- }
- }
-
- my $html = PXT::Utils->perform_substitutions($block, \%subst);
-
- return $html;
-}
-
sub base_entitlement {
my $pxt = shift;
my $server = shift;
commit c9aa23c535c88926a4cc44566c1255e5f9430439
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:27:41 2009 +0100
rhn-check-config-client not used anywhere, removing, as well as check_config_client.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 777ef81..0cdeaa7 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -81,8 +81,6 @@ sub register_tags {
$pxt->register_tag('rhn-system-pending-actions-count' =>
\&system_pending_actions_count);
$pxt->register_tag('rhn-system-activation-key-form' =>
\&system_activation_key_form);
- $pxt->register_tag('rhn-check-config-client' =>
\&check_config_client);
-
$pxt->register_tag('rhn-remote-command-form' =>
\&remote_command_form);
$pxt->register_tag('rhn-server-virtualization-guest-details' =>
\&server_virtualization_details, 2);
@@ -1778,20 +1776,6 @@ sub ks_session_redir {
return;
}
-sub check_config_client {
- my $pxt = shift;
-
- my $server = RHN::Server->lookup(-id => $pxt->param('sid'));
-
- # can't just push_message since there are odd redirects going on with the navi
selected node code
- if (not $server->client_capable('configfiles.deploy')) {
- return '<div class="local-alert">This system does not have the
"rhncfg-actions" package; scheduled actions will fail until it is
installed.</div>';
- }
- else {
- return '';
- }
-}
-
sub remote_command_form {
my $pxt = shift;
my %attr = @_;
commit d61bc4f67743fa135dc03e22774dcbe589754e45
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:26:03 2009 +0100
rhn-entitlement-count not used anywhere, removing, as well as entitlement_count.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index d03ced6..777ef81 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -78,7 +78,6 @@ sub register_tags {
$pxt->register_tag('rhn-proxy-entitlement-form' =>
\&proxy_entitlement_form);
- $pxt->register_tag('rhn-entitlement-count' => \&entitlement_count);
$pxt->register_tag('rhn-system-pending-actions-count' =>
\&system_pending_actions_count);
$pxt->register_tag('rhn-system-activation-key-form' =>
\&system_activation_key_form);
@@ -1552,74 +1551,6 @@ sub system_base_channel_select {
-options => \@options);
}
-sub entitlement_count {
- my $pxt = shift;
- my %params = @_;
-
- my $ent_data = $pxt->user->org->entitlement_data;
-
- my ($ret, $ret_wg, $ret_prov, $ret_mon, $ret_nonlinux);
-
- $ret = <<EOQ;
-<h3>Base Entitlements</h3>
-<div class="page-content">
-EOQ
-
- if (not PXT::Config->get("satellite")) {
- $ret .= sprintf('%s Service: You have <strong>%d
subscription%s</strong>',
- $pxt->user->org->basic_slot_name(),
- $ent_data->{sw_mgr_entitled}->{max},
- $ent_data->{sw_mgr_entitled}->{max} == 1 ? '' : 's',
- );
- $ret .= sprintf(', and you have <strong>%d system%s
subscribed</strong>.<br/>',
- $ent_data->{sw_mgr_entitled}->{used},
- $ent_data->{sw_mgr_entitled}->{used} == 1 ? '' : 's');
- }
-
- $ret_wg .= sprintf('Management Service: You have <strong>%d
subscription%s</strong>',
- $ent_data->{enterprise_entitled}->{max},
- $ent_data->{enterprise_entitled}->{max} == 1 ? '' : 's');
-
- $ret_wg .= sprintf(', and you have <strong>%d system%s
subscribed</strong>.<br/>',
- $ent_data->{enterprise_entitled}->{used},
- $ent_data->{enterprise_entitled}->{used} == 1 ? '' : 's');
-
- $ret_prov .= sprintf('Provisioning Service: You have <strong>%d
subscription%s</strong>',
- $ent_data->{provisioning_entitled}->{max},
- $ent_data->{provisioning_entitled}->{max} == 1 ? '' : 's');
- $ret_prov .= sprintf(', and you have <strong>%d system%s
subscribed</strong>.<br/>',
- $ent_data->{provisioning_entitled}->{used},
- $ent_data->{provisioning_entitled}->{used} == 1 ? '' :
's');
-
- $ret_mon .= sprintf('Monitoring Service: You have <strong>%d
subscription%s</strong>',
- $ent_data->{monitoring_entitled}->{max},
- $ent_data->{monitoring_entitled}->{max} == 1 ? '' : 's');
- $ret_mon .= sprintf(', and you have <strong>%d system%s
subscribed</strong>.<br/>',
- $ent_data->{monitoring_entitled}->{used},
- $ent_data->{monitoring_entitled}->{used} == 1 ? '' : 's');
-
- if ($ent_data->{enterprise_entitled}->{max} > 0) {
- $ret .= $ret_wg;
- }
-
- $ret .= "</div>\n";
- if ($ent_data->{provisioning_entitled}->{max} > 0 or
- $ent_data->{monitoring_entitled}->{max} > 0) {
- $ret .= <<EOQ;
-<h3>Add-On Entitlements</h3>
-<div class="page-content">
-EOQ
- if ($ent_data->{provisioning_entitled}->{max} > 0) {
- $ret .= $ret_prov;
- }
- if ($ent_data->{monitoring_entitled}->{max} > 0) {
- $ret .= $ret_mon;
- }
- $ret .= "</div>\n";
- }
- return $ret;
-}
-
sub delete_servers_cb {
my $pxt = shift;
commit 36a8a639adade862be388959b6325f99d2f9fa87
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:22:18 2009 +0100
Removal of server_status_interface makes last_checked_in_days_ago and
applicable_errata_counts unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 41bcb43..3c03a0e 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -502,29 +502,6 @@ EOQ
}
}
-sub last_checked_in_days_ago {
- my $self = shift;
-
- my $dbh = RHN::DB->connect();
- my $query;
- my $sth;
-
- $query = <<EOQ;
-SELECT sysdate - checkin
- FROM rhnServerInfo
- WHERE server_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- my @columns;
- @columns = $sth->fetchrow;
- $sth->finish;
-
- return $columns[0];
-}
-
sub is_proxy {
my $self = shift;
@@ -1077,28 +1054,6 @@ EOQ
}
-sub applicable_errata_counts {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth;
-
- my $query = <<EOQ;
-SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, OUTDATED_PACKAGES
- FROM rhnServerOverview
- WHERE org_id = ?
- AND server_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->org_id, $self->id);
-
- my $row = $sth->fetchrow_hashref;
- $sth->finish;
-
- return $row;
-}
-
sub system_list_count {
my $class = shift;
my $user_id = shift;
commit 0bc67e37547699ae93b96f084e092a7494555559
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:18:12 2009 +0100
rhn-server-status-interface not used anywhere, removing, as well as
server_status_interface.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 6973a04..d03ced6 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -74,8 +74,6 @@ sub register_tags {
$pxt->register_tag('rhn-server-history-event-details' =>
\&server_history_event_details);
- $pxt->register_tag('rhn-server-status-interface' =>
\&server_status_interface, 10);
-
$pxt->register_tag('rhn-system-base-channel-select' =>
\&system_base_channel_select);
$pxt->register_tag('rhn-proxy-entitlement-form' =>
\&proxy_entitlement_form);
@@ -465,45 +463,6 @@ sub server_name {
return PXT::Utils->escapeHTML($server->name);
}
-sub server_status_interface {
- my $pxt = shift;
- my %params = @_;
-
- my $system = $pxt->pnotes('server');
- die "no system!" unless $system;
-
- my $data = $system->applicable_errata_counts();
-
- $data->{ID} = $system->id;
- $data->{IS_ENTITLED} = $system->is_entitled;
- $data->{LAST_CHECKIN_DAYS_AGO} = $system->last_checked_in_days_ago;
- $data->{LOCKED} = $system->check_lock;
-
- my $session = RHN::Kickstart::Session->lookup(-sid => $system->id, -org_id
=> $pxt->user->org_id, -soft => 1);
- my $state = $session ? $session->session_state_label : '';
- $data->{KICKSTART_SESSION_ID} = ($session and $state ne 'complete' and
$state ne 'failed') ? $session->id : undef;
-
- my $subst = system_status_info($pxt->user, $data);
-
- if ($subst->{link}) {
- $subst->{message} = "(" . PXT::HTML->link($subst->{link},
$subst->{message}) . ")";
- }
-
- if ($subst->{image_medium}) {
- $subst->{image_medium} = PXT::HTML->img(-src => $subst->{image_medium},
-alt => $subst->{status_str}, -title => $subst->{status_str});
- }
-
- if ($subst->{image}) {
- $subst->{image} = PXT::HTML->img(-src => $subst->{image}, -alt =>
$subst->{status_str}, -title => $subst->{status_str});
- }
-
- my $block = $params{__block__};
-
- $block = PXT::Utils->perform_substitutions($block, $subst);
-
- return $block;
-}
-
# not a sniglet
sub system_status_info {
my $user = shift;
commit 9bcf32837e7db2e5056a21b9215af1968d4cc5bd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:16:24 2009 +0100
rhn-tri-state-system-entitlement-list not used anywhere, removing, as well as
tri_state_system_entitlement_list.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 0326541..6973a04 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -60,7 +60,6 @@ sub register_tags {
$pxt->register_tag('rhn-server-name' => \&server_name, 2);
$pxt->register_tag('rhn-tri-state-system-pref-list' =>
\&tri_state_system_pref_list);
- $pxt->register_tag('rhn-tri-state-system-entitlement-list' =>
\&tri_state_system_entitlement_list);
$pxt->register_tag('rhn-server-hardware-profile' =>
\&server_hardware_profile);
$pxt->register_tag('rhn-dmi-info' => \&server_dmi_info, 1);
@@ -1460,34 +1459,6 @@ sub tri_state_system_pref_list {
return $html;
}
-sub tri_state_system_entitlement_list {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $html = '';
-
- my $counter = 1;
-
- my @all_entitlements =
RHN::Entitlements->valid_system_entitlements_for_org($pxt->user->org_id);
- my @addon_entitlements = grep { $_->{IS_BASE} eq 'N' } @all_entitlements;
-
- foreach my $ent (@addon_entitlements) {
- $counter++;
- my %subst;
-
- $subst{entitlement_name} = $ent->{LABEL};
- $subst{entitlement_label} = $pxt->user->org->slot_name($ent->{LABEL});
- $subst{class} = ($counter % 2) ? "list-row-even" :
"list-row-odd";
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- $html .= PXT::Utils->perform_substitutions($block, \%subst);
- }
-
- return $html;
-}
-
sub ssm_change_system_prefs_cb {
my $pxt = shift;
commit 79bc62ae52fb3589700e5e08472f1941c708ac61
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:15:10 2009 +0100
rhn-server-child-channels not used anywhere, removing, as well as
server_child_channels.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 53dec4a..0326541 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -56,8 +56,6 @@ sub register_tags {
$pxt->register_tag('rhn-up2date-at-least' => \&up2date_at_least);
- $pxt->register_tag('rhn-server-child-channels' =>
\&server_child_channels, 3);
-
$pxt->register_tag('rhn-server-prefs-conf-list' =>
\&server_prefs_conf_list);
$pxt->register_tag('rhn-server-name' => \&server_name, 2);
@@ -209,27 +207,6 @@ sub up2date_at_least {
return '';
}
-# gets the channels from server_base_channel via pnote, 3rd link in chain.
-sub server_child_channels {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $server_channels = $pxt->pnotes('server_channels');
- PXT::Debug->log_dump(7, \$server_channels);
- my $ret = '';
- foreach my $sc (grep { defined $_->{PARENT_CHANNEL} } @{$server_channels}) {
- my %subst = (child_channel_name => PXT::Utils->escapeHTML($sc->{NAME} ||
''), child_channel_id => $sc->{ID});
- PXT::Debug->log_dump(\%subst);
- $ret .= PXT::Utils->perform_substitutions($block, \%subst);
- }
-
- PXT::Debug->log(7, "server channels: $ret");
-
- return $ret;
-}
-
sub proxy_entitlement_form {
my $pxt = shift;
my %params = @_;
commit ab66b829c69bcbd54af1959847548bb4452a52a5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:14:32 2009 +0100
rhn-server-base-channel not used anywhere, removing, as well as server_base_channel.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 9384849..53dec4a 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -56,7 +56,6 @@ sub register_tags {
$pxt->register_tag('rhn-up2date-at-least' => \&up2date_at_least);
- $pxt->register_tag('rhn-server-base-channel' =>
\&server_base_channel, 2);
$pxt->register_tag('rhn-server-child-channels' =>
\&server_child_channels, 3);
$pxt->register_tag('rhn-server-prefs-conf-list' =>
\&server_prefs_conf_list);
@@ -210,20 +209,6 @@ sub up2date_at_least {
return '';
}
-# gets the channels from the admin_server_edit_form via pnote, 2nd link in chain.
-sub server_base_channel {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $server_channels = $pxt->pnotes('server_channels');
-
- my ($base_channel) = grep { not defined $_->{PARENT_CHANNEL} }
@{$server_channels};
- $block = PXT::Utils->perform_substitutions($block, {base_id =>
$base_channel->{ID}, base_name => PXT::Utils->escapeHTML($base_channel->{NAME}
|| '')});
- return $block;
-}
-
# gets the channels from server_base_channel via pnote, 3rd link in chain.
sub server_child_channels {
my $pxt = shift;
commit 970416782f145ac478b89bd1ff62ca7b6343c08c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:13:35 2009 +0100
rhn-resubscribe-* not used anywhere, removing, as well as resubscribe*_warning_sdc.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 0200390..9384849 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -56,8 +56,6 @@ sub register_tags {
$pxt->register_tag('rhn-up2date-at-least' => \&up2date_at_least);
- $pxt->register_tag('rhn-resubscribe-warning-sdc' =>
\&resubscribe_warning_sdc, 3);
- $pxt->register_tag('rhn-resubscribe-base-warning-sdc' =>
\&resubscribe_base_warning_sdc, 3);
$pxt->register_tag('rhn-server-base-channel' =>
\&server_base_channel, 2);
$pxt->register_tag('rhn-server-child-channels' =>
\&server_child_channels, 3);
@@ -157,29 +155,6 @@ sub osa_ping_cb {
$pxt->redirect('/rhn/systems/details/Overview.do?sid=' . $sid .
"&message=system.osad.pinged&messagep1=" . $server->name);
}
-sub resubscribe_warning_sdc {
- my $pxt = shift;
- my %params = @_;
-
- if ($pxt->pnotes('resubscribe_warning')) {
- return $params{__block__};
- }
-
- return '';
-}
-
-sub resubscribe_base_warning_sdc {
- my $pxt = shift;
- my %params = @_;
-
- if ($pxt->pnotes('resubscribe_base_warning')) {
- return $params{__block__};
- }
-
- return '';
-}
-
-
sub system_pending_actions_count {
my $pxt = shift;
my %params = @_;
commit fb0b59de533c854ba6159253ef7b3d4c9db335f1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:10:53 2009 +0100
Removal of server_child_channel_interface makes user_server_channels_info unused,
removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 1776956..41bcb43 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -1566,42 +1566,6 @@ EOS
}
}
-# return a server's channels in the context of a user...
-# (if unsubscribed, could this user resubscribe the channel?)
-sub user_server_channels_info {
- my $self = shift;
- my $user_id = shift;
-
- my $dbh = RHN::DB->connect;
- my $query = <<EOQ;
-SELECT C.id,
- C.label,
- C.name,
- C.summary,
- (SELECT 1
- FROM rhnUserChannel
- WHERE user_id = WC.id
- AND channel_id = C.id
- AND role = 'subscribe') AS RESUBSCRIBABLE
- FROM rhnChannel C,
- rhnServerChannel SC,
- web_contact WC
- WHERE WC.id = :user_id
- AND C.id = SC.channel_id
- AND SC.server_id = :server_id
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(server_id => $self->id, user_id => $user_id);
-
- my @ret;
- while (my $row = $sth->fetchrow_hashref) {
- push @ret, $row;
- }
-
- return @ret;
-}
-
sub server_channels {
my $self = shift;
commit f33244a69e2a3e9e661293990ceb5a422f6629dc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:09:52 2009 +0100
rhn-server-child-channel-interface not used anywhere, removing, as well as
server_child_channel_interface.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 7c79c4f..0200390 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -56,7 +56,6 @@ sub register_tags {
$pxt->register_tag('rhn-up2date-at-least' => \&up2date_at_least);
- $pxt->register_tag('rhn-server-child-channel-interface' =>
\&server_child_channel_interface, -1);
$pxt->register_tag('rhn-resubscribe-warning-sdc' =>
\&resubscribe_warning_sdc, 3);
$pxt->register_tag('rhn-resubscribe-base-warning-sdc' =>
\&resubscribe_base_warning_sdc, 3);
$pxt->register_tag('rhn-server-base-channel' =>
\&server_base_channel, 2);
@@ -271,93 +270,6 @@ sub server_child_channels {
return $ret;
}
-sub server_child_channel_interface {
- my $pxt = shift;
- my %params = @_;
-
- my $server_id = $pxt->param('sid');
-
- my $server = RHN::Server->lookup(-id => $server_id);
- my $base_chan_id = $server->base_channel_id();
-
- my $block = $params{__block__};
-
- my @server_channels = $server->user_server_channels_info($pxt->user->id);
-
- # save a lookup for subscribed channels for use in loop below... important in warning
resubscription...
- my %subscribed = map { $_->{ID} => 1 } @server_channels;
-
- my @subscribable_channels = RHN::Channel->subscribable_channels(server_id =>
$server_id,
- user_id => $pxt->user->id,
- base_channel_id => $base_chan_id);
-
- my %sat_channels = map { $_ => 1 } RHN::Channel->rhn_satellite_channels();
- my %proxy_channels = map { $_ => 1 } RHN::Channel->rhn_proxy_channels();
-
- # filter out proxy and satellite channels, they're handled by seperate interface,
- # and filter out the base channel as well...
- my @channels = grep { not exists $sat_channels{$_->{ID}} and not exists
$proxy_channels{$_->{ID}} and $_->{ID} ne $base_chan_id}
- (@server_channels, @subscribable_channels);
-
- $pxt->pnotes(child_channels_total => scalar @channels);
-
- $block =~ m/<child_channel>(.*?)<\/child_channel>/ism;
- my $child_channel_block = $1;
-
- $child_channel_block =~ m/<gpg_key>(.*?)<\/gpg_key>/ism;
- my $gpg_key_block = $1;
-
- my $child_channels_html = '';
-
- # determines whether we render the guts of rhn-resubscribe-warning
- my $resubscribe_warning;
-
- foreach my $channel (sort { $a->{NAME} cmp $b->{NAME} } @channels) {
- my $current = $child_channel_block;
- my $current_gpg = '';
-
- my %subs;
- $subs{checkbox} = PXT::HTML->checkbox(-name => "child_channel",
- -value => PXT::Utils->escapeHTML($channel->{ID} || ''),
- -checked => ((grep { $_->{LABEL} eq $channel->{LABEL} } @server_channels)
? 1 : 0));
-
- $subs{channel_id} = PXT::Utils->escapeHTML($channel->{ID});
- $subs{channel_name} = PXT::Utils->escapeHTML($channel->{NAME});
- $subs{channel_summary} = PXT::Utils->escapeHTML($channel->{SUMMARY});
- $subs{resubscribe_warning} = '';
-
- if ($subscribed{$channel->{ID}} and not $channel->{RESUBSCRIBABLE}) {
-
- # we'll need to show warning text...
- $resubscribe_warning = 1;
-
- $subs{resubscribe_warning} = PXT::HTML->img(-src =>
'/img/rhn-listicon-alert.gif',
- -title => 'Resubscription Warning',
- );
-
- $subs{resubscribe_warning} = "<span
class=\"resubscribe-warning\">$subs{resubscribe_warning}</span>";
- }
-
- $current = PXT::Utils->perform_substitutions($current, \%subs);
-
- if ($channel->{GPG_KEY_URL}) {
- $current_gpg = $gpg_key_block;
- $current_gpg =~
s{\{gpg_key_url\}}{$pxt->derelative_url("/network/software/channels/details.pxt?cid="
. $channel->{ID}, 'https')}eg;
- }
-
- $current =~ s{<gpg_key>.*?</gpg_key>}{$current_gpg}gis;
- $child_channels_html .= $current;
- }
-
- $block =~ s{<child_channel>.*?</child_channel>}{$child_channels_html}is;
-
- $pxt->pnotes('resubscribe_warning' => 1) if $resubscribe_warning;
- $pxt->pnotes('server_details_subscribable_child_channels_seen' => scalar
@channels);
-
- return $block;
-}
-
-
sub proxy_entitlement_form {
my $pxt = shift;
my %params = @_;
commit e12f741f62147fd4e4981070a1461ff2df4142bc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:02:31 2009 +0100
rhn-html-meta-refresh not used anywhere, removing, that rhn_html_meta_refresh does not
exist anyway.
diff --git a/web/modules/sniglets/Sniglets/HTML.pm
b/web/modules/sniglets/Sniglets/HTML.pm
index f99a031..020fead 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -42,7 +42,6 @@ sub register_tags {
$pxt->register_tag("rhn-checkable", \&rhn_checkable, 10);
$pxt->register_tag("rhn-autorefresh-widget",
\&rhn_autorefresh_widget);
- $pxt->register_tag("rhn-html-meta-refresh", \&rhn_html_meta_refresh);
$pxt->register_tag("rhn-return-link", \&return_link);
}
commit aabb9f3549f135d99a65822b103f4b3fbe21baf6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 08:59:19 2009 +0100
rhn-help-link not used anywhere, removing, as well as rhn_help_link.
diff --git a/web/modules/sniglets/Sniglets/HTML.pm
b/web/modules/sniglets/Sniglets/HTML.pm
index f7a4962..f99a031 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -29,7 +29,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag("rhn-help", \&rhn_help);
- $pxt->register_tag("rhn-help-link", \&rhn_help_link);
$pxt->register_tag("rhn-if-var", \&if_var, -5);
$pxt->register_tag("rhn-unless-var", \&unless_var, -5);
@@ -160,21 +159,6 @@ sub rhn_help {
-satellite => $params{satellite});
}
-sub rhn_help_link {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $guide = $params{guide} || '';
- my $href = $params{href} || '';
-
- return render_help_link(-user => $pxt->user,
- -guide => $guide,
- -href => $href,
- -block => $block,
- -satellite => $params{satellite});
-}
-
sub render_help_link {
my %params = validate(@_, {-user => 1, -guide => 0, -href => 1, -block =>
0, -satellite => 0});
my $user = $params{-user};