web/html/forms/edit_template_string.xml | 13 -
web/modules/sniglets/Sniglets/Actions.pm | 129 ---------------
web/modules/sniglets/Sniglets/AppInstall.pm | 1
web/modules/sniglets/Sniglets/Debug.pm | 52 ------
web/modules/sniglets/Sniglets/ErrataEditor.pm | 187 ----------------------
web/modules/sniglets/Sniglets/Forms.pm | 66 -------
web/modules/sniglets/Sniglets/MonitoringConfig.pm | 119 --------------
web/modules/sniglets/Sniglets/Packages.pm | 2
web/modules/sniglets/Sniglets/Sets.pm | 57 ------
web/modules/sniglets/Sniglets/Template.pm | 68 --------
10 files changed, 694 deletions(-)
New commits:
commit fa292a7ae2d69b5a873eac866430b66960d886be
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:27:04 2009 +0100
rhn-package-name not used anywhere, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm
b/web/modules/sniglets/Sniglets/Packages.pm
index ad777ae..6554388 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -38,8 +38,6 @@ sub register_tags {
$pxt->register_tag('rhn-package-details' => \&package_details);
$pxt->register_tag('rhn-package-change-log' =>
\&package_change_log);
- # for above the tabs...
- $pxt->register_tag('rhn-package-name' => sub {
(shift)->pnotes('package_name') },2);
$pxt->register_tag('rhn-unknown-package-nvre' =>
\&unknown_package_nvre);
commit b29f834b5ea1cd683e1025d5bc3bf0ccae48d1e6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:23:45 2009 +0100
Package Sniglets::Template is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Template.pm
b/web/modules/sniglets/Sniglets/Template.pm
deleted file mode 100644
index ec1579f..0000000
--- a/web/modules/sniglets/Sniglets/Template.pm
+++ /dev/null
@@ -1,68 +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::Template;
-
-use RHN::Exception qw/throw/;
-
-use RHN::TemplateString;
-
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_tag("rhn-template-replace", \&template_replace);
- $pxt->register_tag("rhn-template-block", \&template_block);
-
-}
-
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
-}
-
-sub template_replace {
- my $pxt = shift;
- my %params = @_;
-
- unless (PXT::Config->get('satellite')) {
- return $params{__block__};
- }
-
- my $label = $params{label};
-
- throw "No label." unless $label;
-
- return RHN::TemplateString->get_string(-label => $label);
-}
-
-sub template_block {
- my $pxt = shift;
- my %params = @_;
-
- unless (PXT::Config->get('satellite')) {
- return '';
- }
-
- my %subst = RHN::TemplateString->load_all;
-
- PXT::Utils->escapeHTML_multi(\%subst);
- return PXT::Utils->perform_substitutions($params{__block__}, \%subst);
-}
-
-1;
commit d6df88f923419066d0d2fc99de4f4b1769aafafe
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:23:09 2009 +0100
Package Sniglets::Debug is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Debug.pm
b/web/modules/sniglets/Sniglets/Debug.pm
deleted file mode 100644
index 835333c..0000000
--- a/web/modules/sniglets/Sniglets/Debug.pm
+++ /dev/null
@@ -1,52 +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.
-#
-
-package Sniglets::Debug;
-
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_tag("rhn-debug-dump" => \&dump);
-}
-
-sub dump {
- my $pxt = shift;
-
- my @ret;
- push @ret, map { "$_ => " . $pxt->{apr}->$_() } qw/as_string
hostname location/;
- push @ret, map { "$_ => " . $pxt->{apr}->server->$_() }
qw/server_hostname/;
- push @ret, map { "$_ => " . $pxt->{apr}->connection->$_() }
qw/remote_ip remote_host/;
-
- my @params = $pxt->{apr}->param();
- my $params = "form variables =>\n";
- foreach my $param (@params) {
- $params .= "\t$param: " . join(', ',
$pxt->{apr}->param($param)) . "\n";
- }
- push(@ret, $params);
-
- my $subp_env = $pxt->{apr}->subprocess_env('HTTPS');
- push @ret, "SSL => $subp_env" if (defined($subp_env));
-
- push @ret, map { "pxt => " . Data::Dumper->Dump([$pxt])} 1;
- push @ret, map { "pxt_ssl_$_ => " . $pxt->$_()} qw/ssl_available
ssl_request/;
- push @ret, map { "pxt_derelative($_) => " . $pxt->derelative_url($_)}
- ("/foo.txt", "bar.txt");
-
-
- return join("", map { "<pre>$_</pre>\n" } @ret);
-}
-
-1;
commit 1cd64af09ad4eb99cc4712db66ff43d2cb6dff38
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:22:28 2009 +0100
rhn-render-form not used anywhere, removing, as well as render_form and prepare_form.
diff --git a/web/modules/sniglets/Sniglets/Forms.pm
b/web/modules/sniglets/Sniglets/Forms.pm
index d3433c1..4a65cd7 100644
--- a/web/modules/sniglets/Sniglets/Forms.pm
+++ b/web/modules/sniglets/Sniglets/Forms.pm
@@ -33,8 +33,6 @@ use PXT::ACL;
sub register_tags {
my $class = shift;
my $pxt = shift;
-
- $pxt->register_tag("rhn-render-form", \&render_form);
}
sub register_callbacks {
@@ -44,70 +42,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:catch_form', \&catch_form_cb);
}
-sub render_form {
- my $pxt = shift;
- my %params = @_;
-
- my $rform = prepare_form($pxt, %params);
-
- my $style = new Sniglets::Forms::Style;
- my $html = $rform->render($style);
-
- return $html;
-}
-
-sub prepare_form {
- my $pxt = shift;
- my %params = @_;
-
- my $file = File::Spec->catfile($pxt->document_root, $params{file});
-
- my $pform = RHN::Form::Parser->parse_file($file);
-
- throw "'$pform' is not a RHN::Form::ParsedForm"
- unless (ref $pform && $pform->isa('RHN::Form::ParsedForm'));
-
- my $file_widget = new RHN::Form::Widget::Hidden(label => 'form_file',
- default => $file);
-
- $pform->add_widget($file_widget);
-
- my $acl_parser = new PXT::ACL (mixins => [ $pform->acl_mixins ]);
-# remove widgets based upon ACLs
- foreach my $widget ($pform->widgets) {
- next unless $widget->acl;
-
- if (not $acl_parser->eval_acl($pxt, $widget->acl)) {
- $pform->remove_widget($widget->label);
- }
- }
-
- my $rform = $pform->realize; #A realized form, ready to render
- undef $pform;
-
- my $source = $rform->lookup_value('source');
-
- if ($source) {
- my $id_formvar = $rform->lookup_value('id_formvar');
-
- eval "use $source";
- die $@ if $@;
-
- my $obj = $source->lookup(-id => $pxt->passthrough_param($id_formvar));
-
- foreach my $widget ($rform->widgets) {
- my $label = $widget->label;
- if ($obj->can($label)) {
- $widget->raw_value($obj->$label());
- }
- }
- }
-
- my $errors = load_params($pxt, $rform);
-
- return $rform;
-}
-
sub catch_form_cb {
my $pxt = shift;
commit 1178ac7b91ed1235d78773245fa200fb7770fa61
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:20:30 2009 +0100
edit_template_string.xml is not used anywhere, removing as dead code.
diff --git a/web/html/forms/edit_template_string.xml
b/web/html/forms/edit_template_string.xml
deleted file mode 100644
index 678fbfd..0000000
--- a/web/html/forms/edit_template_string.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
- <rhn-form name="Edit String" label="edit_template_string"
action="edit.pxt" method="post">
- <widget type="literal" name="Category:"
label="category_label" />
- <widget type="literal" name="Label:" label="label"
/>
- <widget type="literal" name="Description:"
label="description" />
- <widget type="textarea" name="Value:" label="value"
rows="4" cols="60" />
- <widget type="hidden" label="pxt:trap"
default="rhn:catch_form" />
- <widget type="hidden" label="source"
default="RHN::TemplateString" />
- <widget type="hidden" label="id_formvar"
default="string_id" />
- <widget type="hidden" label="string_id" />
- <widget type="hidden" label="url"
default="/internal/satellite/string_manager/index.pxt" />
- <widget type="submit" label="Submit"
default="Submit"/>
-</rhn-form>
commit 298fcd34fc5bedecb9b1b5b4bdd3a9f271e71cd9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:17:16 2009 +0100
Package Sniglets::MonitoringConfig is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/MonitoringConfig.pm
b/web/modules/sniglets/Sniglets/MonitoringConfig.pm
deleted file mode 100644
index c64edbc..0000000
--- a/web/modules/sniglets/Sniglets/MonitoringConfig.pm
+++ /dev/null
@@ -1,119 +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::MonitoringConfig;
-
-use Data::Dumper;
-
-use RHN::MonitoringConfigMacro;
-use RHN::SatInstall;
-use RHN::ProxyInstall;
-
-use Sniglets::Forms;
-
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_tag("rhn-editable-monitoring-macros",
\&editable_macros);
- $pxt->register_tag("rhn-squelch-notifications",
\&squelch_notifications);
-}
-
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:monitoring-config-edit-cb' =>
\&update_cb);
-}
-
-
-sub squelch_notifications {
- my $pxt = shift;
-
- my $am_squelched = RHN::MonitoringConfigMacro->are_notifications_squelched();
-
- return PXT::HTML->checkbox(-name => 'squelch',
- -value => 1,
- -checked => ($am_squelched ? 1 : 0));
-}
-
-#####################
-sub editable_macros {
-#####################
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $html;
-
- my $macros = RHN::MonitoringConfigMacro->load_editable_macros();
-
- foreach my $macro (@$macros) {
- my $row = $block;
- $row =~ s/{macro_name}/$macro->name()/eg;
- $row =~ s/{macro_definition}/$macro->definition()/eg;
- $row =~ s/{macro_description}/$macro->description()/eg;
- $html .= $row;
- }
-
- return $html;
-}
-
-###############
-sub update_cb {
-###############
- my $pxt = shift;
-
- # Fetch current values to compare against submitted values
- my $macros = RHN::MonitoringConfigMacro->load_editable_macros();
-
- foreach my $macro (@$macros) {
- my $mname = $macro->name();
- my $olddef = $macro->definition();
- my $newdef = $pxt->dirty_param($mname);
-
- if ($olddef ne $newdef) {
- $macro->definition($newdef);
- $macro->update($pxt->user->login) or die "Couldn't update macro:
$!";
- }
- }
-
- if (PXT::Config->get('is_monitoring_scout')) {
- RHN::SatInstall->restart_satellite(-delay => 0,
- -service => 'MonitoringScout');
- }
-
- RHN::SatInstall->restart_satellite(-delay => 5,
- -service => 'Monitoring');
-
- $pxt->push_message(site_info => 'Configuration updated, Monitoring services
restarted.');
-
- my $proxy_config_aid =
RHN::ProxyInstall->push_monitoring_config_changes($pxt->user);
-
- if ($proxy_config_aid) {
- $pxt->push_message(site_info => <<EOQ);
-A Monitoring Proxy configuration update has been
-<strong><a
href="/rhn/schedule/ActionDetails.do?aid=$proxy_config_aid">scheduled</a></strong>.
-EOQ
- }
-
- return;
-}
-
-
-
-1;
commit 2d49448ed9a446897029cb74a893e2d2cb0decec
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:13:04 2009 +0100
rhn-appinstall-progress not used anywhere, removing that appinstall_progress does not
exist anyway.
diff --git a/web/modules/sniglets/Sniglets/AppInstall.pm
b/web/modules/sniglets/Sniglets/AppInstall.pm
index dbaa000..127fb81 100644
--- a/web/modules/sniglets/Sniglets/AppInstall.pm
+++ b/web/modules/sniglets/Sniglets/AppInstall.pm
@@ -36,7 +36,6 @@ sub register_tags {
$pxt->register_tag("rhn-appinstall-start", \&appinstall_start);
$pxt->register_tag("rhn-appinstall-check-requirements",
\&appinstall_check_requirements);
- $pxt->register_tag("rhn-appinstall-progress", \&appinstall_progress);
$pxt->register_tag("rhn-appinstall-ts-and-cs",
\&appinstall_ts_and_cs);
$pxt->register_tag("rhn-appinstall-engine", \&appinstall_engine);
}
commit 63be56fd9c0b1bed2c9af59fb9f413180da2b704
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:09:51 2009 +0100
Package Sniglets::Actions is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Actions.pm
b/web/modules/sniglets/Sniglets/Actions.pm
deleted file mode 100644
index d8a6fe7..0000000
--- a/web/modules/sniglets/Sniglets/Actions.pm
+++ /dev/null
@@ -1,129 +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::Actions;
-
-use Carp;
-use Data::Dumper;
-
-use RHN::User;
-use RHN::Action;
-use PXT::Utils;
-
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_tag('rhn-action-details', \&action_details);
- $pxt->register_tag('rhn-action-name', \&action_name, 2);
-}
-
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
-}
-
-sub action_name {
- my $pxt = shift;
-
- my $aid = $pxt->param('aid');
-
- die "no action id!" unless $aid;
-
- my $action_name = $pxt->pnotes('action_name');
-
- return $action_name if $action_name;
-
- my $action = RHN::Action->lookup(-id => $aid);
- # this should change once we add in support for named actions...
- $action_name = $action->name;
- $action_name = $action->action_type_name unless $action_name;
-
- $pxt->pnotes(action_name => $action_name);
-
- return $action_name;
-}
-
-sub action_details {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__} || "";
-
- my $action_id = $pxt->param('aid');
- croak "No action id!" unless $action_id;
-
- my $action = RHN::Action->lookup(-id => $action_id);
- croak "Failed to load action!" unless $action;
-
- my $notes = '';
-
- if ($action->name) {
- $pxt->pnotes(action_name => $action->name);
- }
- else {
- $pxt->pnotes(action_name => $action->action_type_name);
- }
-
- my %subst;
-
- $subst{action_type} = $action->action_type_name;
- $subst{action_scheduler} = $action->action_scheduler_login;
- $subst{action_earliest_action} =
$pxt->user->convert_time($action->earliest_action);
- $subst{action_in_progress_count} = $action->action_in_progress_count;
- $subst{action_successful_count} = $action->action_successful_count;
- $subst{action_failed_count} = $action->action_failed_count;
- $subst{action_total_count} = $action->action_total_count;
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- if ($subst{action_failed_count} > 0) {
- $notes .= sprintf('<strong><a
href="/rhn/schedule/FailedSystems.do?aid=%d">%d
system%s</a></strong> failed to complete this
action.<br/><br/>', $action_id, $subst{action_failed_count},
$subst{action_failed_count} == 1 ? '' : 's');
- }
-
- if ($subst{action_successful_count} > 0) {
- $notes .= sprintf('<strong><a
href="/rhn/schedule/CompletedSystems.do?aid=%d">%d
system%s</a></strong> successfully completed this
action.<br/><br/>', $action_id, $subst{action_successful_count},
$subst{action_successful_count} == 1 ? '' : 's');
- }
-
- # hack to show errata info straight on this page,
- # assumes that only 1 errata per scheduled action
- if ($action->action_type_label eq 'errata.update') {
- my @errata = $action->associated_errata;
- my $errata = RHN::Errata->lookup(-id => $errata[0]);
-
- if ($errata) {
- $notes .= sprintf('<strong><a
href="/network/errata/details/Details.do?eid=%d">%s</a></strong><br/><br/>',
$errata->id, $errata->advisory);
- $notes .= "<strong>" . $errata->synopsis .
"</strong><br/><br/>";
- $notes .= $errata->advisory_type . "<br/><br/>";
- $notes .= PXT::HTML->htmlify_text($errata->topic || '') .
"<br/>";
- $notes .= PXT::HTML->htmlify_text($errata->description || '') .
"<br/>";
- }
- }
-
- if ($action->action_type_label eq 'script.run') {
- $notes .= sprintf(<<EOQ, $action->script_username,
PXT::HTML->htmlify_text($action->script_script));
-Run as: <strong>%s</strong><br/><br/>
-<div style="padding-left:
1em"><code>%s</code></div><br/>
-EOQ
- }
-
- $subst{action_notes} = $notes || '(none)'; # don't escapeHTML notes
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
-1;
commit cb6197ae71e5c4fe139762fd468309389a7008af
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:07:34 2009 +0100
rhn-errata-editor-channel-options not used anywhere, removing, as well as
errata_channel_options.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm
b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index f973b49..590a7c6 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -28,8 +28,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-errata-editor-channel-options' =>
\&errata_channel_options);
-
$pxt->register_tag('rhn-if-errata-package-list-modified' =>
\&if_errata_package_list_modified);
$pxt->register_tag('rhn-if-var' => \&if_var, -5);
@@ -510,71 +508,6 @@ sub update_errata_cache {
$pxt->redirect($pxt->uri . "?eid=$eid");
}
-sub errata_channel_options {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $html;
-
- my $eid = $pxt->param('eid');
- return unless $eid;
-
- my @related_channels;
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- if ($errata->isa('RHN::DB::ErrataTmp')) {
- @related_channels = RHN::ErrataTmp->related_channels_owned_by_org($eid,
$pxt->user->org_id);
- }
- else {
- @related_channels = RHN::Errata->channels($eid);
- }
-
- my @selected = @related_channels;
- my @owned_channels = RHN::Channel->channels_owned_by_org($pxt->user->org_id);
-
- unless (scalar @owned_channels) {
- $pxt->push_message(site_info => "Your organization does not own any
channels capable of supporting errata. You must create at least one channel before you
can publish an errata.");
- my $redir = $params{no_channels_redirect};
- throw "param 'no_channels_redirect' needed but not provided."
unless $redir;
- $pxt->redirect($redir);
- }
-
- foreach my $channel (@owned_channels) {
- my $copy = $block;
- my $checked = 0;
-
- $channel->[1] =~ /channel_(\d+)/;
- my $channel_id = $1;
-
- next unless (RHN::Channel->channel_type_capable($channel_id, 'errata'));
-
- if (grep { $_ == $channel_id } @selected) {
- $checked = 1;
- }
-
- my $package_count = scalar($errata->channel_packages_in_errata($channel_id));
- my $packages_link = '0';
-
- if ($package_count) {
- $packages_link = sprintf(qq(<a
href="/network/errata/manage/errata_channel_intersection.pxt?cid=%d&eid=%d">%d</a>),
$channel_id, $eid, $package_count);
- }
-
- my %subs;
- $subs{channel_id} = $channel_id;
- $subs{channel_name} = PXT::Utils->escapeHTML($channel->[0]);
- $subs{checked} = $checked ? '1' : '';
- $subs{packages_in_errata_and_channel} = $packages_link;
-
- $copy = PXT::Utils->perform_substitutions($copy, \%subs);
-
- $html .= $copy;
- }
-
- return $html;
-}
-
sub if_var {
my $pxt = shift;
my %attr = @_;
commit f04ac87d4f3eaf1f4ab6e37c8eea9447d364d73a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:06:11 2009 +0100
rhn-edit-errata-form not used anywhere, removing, as well as errata_edit.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm
b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 4a2ecc8..f973b49 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -28,8 +28,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-edit-errata-form' => \&errata_edit);
-
$pxt->register_tag('rhn-errata-editor-channel-options' =>
\&errata_channel_options);
$pxt->register_tag('rhn-if-errata-package-list-modified' =>
\&if_errata_package_list_modified);
@@ -123,124 +121,6 @@ my $errata_data = {
edit => 0 } };
-sub errata_edit {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
- my $html;
-
- my $eid = $pxt->param('eid') || 0;
-
- if ($eid) {
- throw "user '" . $pxt->user->id . "' does not own errata
'$eid'"
- unless $pxt->user->verify_errata_admin($eid);
- load_package_set($pxt->user->id, $eid);
- }
-
- my %subs;
-
- $block =~ m(\{errata_edit:template\}(.*)\{/errata_edit:template\})s;
- my $template = $1;
-
- my $errata;
-
- # editing an existing errata
- if ($eid) {
- $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- foreach my $field (@errata_fields) {
- my $value;
-
- if ($field eq 'keywords') {
- $value = join(", ", $errata->keywords);
- }
- elsif ($field eq 'buglist') {
- my @bugs = RHN::Utils->parameterize([ $errata->bugs_fixed, ['',
''] ], 'id', 'summary');
-
- foreach my $bug (@bugs) {
- $value .= "ID: " . PXT::HTML->text(-name =>
"errata_buglist_" . $bug->{id} . "_id",
- -value => $bug->{id},
- -size => 6);
- $value .= "\n<br/>\n";
- $value .= "Summary: " . PXT::HTML->text(-name =>
"errata_buglist_" . $bug->{id} . "_summary",
- -value => PXT::Utils->escapeHTML($bug->{summary} || ''),
- -size => 60);
-
- if ($bug->{id}) {
- $value .= sprintf('<A
HREF="edit.pxt?eid=%d&bug_id=%d&pxt:trap=rhn:errata_editor:delete_bug">delete</A>',
$errata->id, $bug->{id});
- $value .= "<hr />\n";
- }
- else {
- $value .= PXT::HTML->submit(-value => 'Submit');
- }
- }
- }
- else {
- $value = $errata->$field() || $pxt->dirty_param("errata_$field") ||
$errata_data->{$field}->{default} || '';
- }
- $errata_data->{$field}{value} = $value;
- }
- }
- # creating a new errata
- else {
-
- foreach my $field (@errata_fields) {
-
- if ($field eq 'buglist') {
- my $value = "ID: " . PXT::HTML->text(-name =>
"errata_buglist__id",
- -value => '',
- -size => 6);
- $value .= "Summary: " . PXT::HTML->text(-name =>
"errata_buglist__summary",
- -value => '',
- -size => 60);
- $errata_data->{$field}->{value} = $value;
- }
- else {
- $errata_data->{$field}->{value} =
PXT::Utils->escapeHTML($pxt->dirty_param("errata_$field") ||
$errata_data->{$field}->{default} || '');
- }
- }
- }
-
- foreach my $field (@errata_fields) {
- my $data = $errata_data->{$field};
-
- next unless $data->{display};
-
- $subs{field_name} = $data->{display};
- $subs{field_value} = $data->{value} || '';
- $subs{req_star} = $data->{required} ? '<span
class="required-form-field">*</span>' : '';
-
- if ($data->{edit} eq 'text') {
- $subs{field_form_elem} = PXT::HTML->text(-name =>
"errata_${field}",
- -value => PXT::Utils->escapeHTML($data->{value}),
- -size => $data->{size},
- -maxlength => $data->{maxlength});
- }
- elsif ($data->{edit} eq 'textarea') {
- $subs{field_form_elem} = PXT::HTML->textarea(-name =>
"errata_${field}",
- -value => PXT::Utils->escapeHTML($data->{value}),
- -rows => $data->{rows},
- -cols => $data->{cols});
- }
- elsif ($data->{edit} eq 'select') {
- my @options = map { [ $_->[0], $_->[0], $_->[0] eq $data->{value} ] }
@{$data->{options}};
- $subs{field_form_elem} = PXT::HTML->select(-name =>
"errata_${field}",
- -options => [ @options ]);
- }
- else {
- $subs{field_form_elem} = $data->{value};
- }
-
- $html .= PXT::Utils->perform_substitutions($template, \%subs);
- }
-
- $block =~ s(\{errata_edit:template\}(.*)\{/errata_edit:template\})($html)s;
- $block =~ s/\{eid\}/ref $errata ? $errata->id : 0/eg;
- $block =~ s(<if_eid>(.*)</if_eid>)(ref $errata ? $1 : '')esg;
-
- return $block;
-}
-
sub errata_edit_cb {
my $pxt = shift;
commit a2e52d41b07ba7f023d1de1e4237d3aad7888bb4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:03:47 2009 +0100
rhn-xml-checker not used anywhere, removing, as well as xml_checker.
diff --git a/web/modules/sniglets/Sniglets/Sets.pm
b/web/modules/sniglets/Sniglets/Sets.pm
index 09195c3..c320bf7 100644
--- a/web/modules/sniglets/Sniglets/Sets.pm
+++ b/web/modules/sniglets/Sniglets/Sets.pm
@@ -28,7 +28,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag('rhn-set-totals' => \&set_totals);
- $pxt->register_tag('rhn-xml-checker' => \&xml_checker);
}
sub register_callbacks {
@@ -79,60 +78,4 @@ sub clear_set_cb {
$pxt->redirect($pxt->param('set_clear_redirect') || $pxt->uri);
}
-sub xml_checker {
- my $pxt = shift;
-
- $pxt->manual_content(1);
- $pxt->no_cache(1);
- $pxt->content_type('text/xml');
- $pxt->send_http_header;
-
- my %set_var_map = ( system_list => "sid" );
- my $set_label = $pxt->dirty_param('set_label');
-
- if (not $set_label or not exists $set_var_map{$set_label}) {
- $pxt->print("INVALID SET");
- return;
- }
-
- my $set = new RHN::DB::Set $set_label, $pxt->user->id;
-
- my @which = $pxt->param($set_var_map{$set_label});
-
- if ($pxt->dirty_param("checked") and
$pxt->dirty_param("checked") eq "on") {
- $set->immediate_add(@which);
- }
- else {
- $set->immediate_remove(@which);
- }
- RHN::DB->connect->commit;
-
- my $count = $set->element_count;
- my $header_message;
-
- if ($count == 0) {
- $header_message = 'No systems selected';
- }
- elsif ($count == 1) {
- $header_message = '1 system selected';
- }
- else {
- $header_message = "$count systems selected";
- }
-
- my $pagination_message = "($count selected)";
-
- my $ret = <<EOS;
-<?xml version="1.0" encoding="utf-8"?>
-
-<ssm-data>
- <ssm-count-header-message>$header_message</ssm-count-header-message>
-
<ssm-count-pagination-message>$pagination_message</ssm-count-pagination-message>
- <ssm-count>$count</ssm-count>
-</ssm-data>
-EOS
-
- $pxt->print($ret);
-}
-
1;