web/html/network/account/activation_keys/.htaccess | 20 --
web/html/network/account/activation_keys/packages.pxt | 31 ---
web/html/network/components/address_list.pxi | 16 --
web/html/network/errata/manage/errata_cache_update.pxi | 17 --
web/modules/rhn/RHN/DB/Package.pm | 8 -
web/modules/rhn/RHN/DB/Token.pm | 135 -----------------
web/modules/sniglets/Sniglets/ActivationKeys.pm | 51 ------
web/modules/sniglets/Sniglets/ErrataEditor.pm | 25 ---
web/modules/sniglets/Sniglets/Users.pm | 73 ---------
9 files changed, 376 deletions(-)
New commits:
commit 8601c1bb452b92016bc11bee34b5830b60453d3d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:48:39 2009 +0100
Removal of errata_cache_update.pxi made rhn-if-errata-package-list-modified and
if_errata_package_list_modified not used, removing.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm
b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 8d91682..bf12bc3 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-if-errata-package-list-modified' =>
\&if_errata_package_list_modified);
-
$pxt->register_tag('rhn-if-var' => \&if_var, -5);
$pxt->register_tag('rhn-unless-var' => \&unless_var, -5);
}
@@ -87,27 +85,4 @@ sub unless_var {
}
-sub if_errata_package_list_modified {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $eid = $pxt->param('eid');
- return unless $eid;
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- return if $errata->isa('RHN::DB::ErrataTmp'); #don't cache temp errata!
-
- my $package_list_edited =
$pxt->session->get('errata_package_list_edited');
- my $edited = $package_list_edited->{$eid} || 0;
-
- if ((time - $edited) < 3600) {
- return $block;
- }
-
- return '';
-}
-
1;
commit 6732ea153fee095a909e85b767ef9dcdf7fb9fb3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:47:31 2009 +0100
errata/manage/errata_cache_update.pxi not used from anywhere, removing.
diff --git a/web/html/network/errata/manage/errata_cache_update.pxi
b/web/html/network/errata/manage/errata_cache_update.pxi
deleted file mode 100644
index a8ffb3e..0000000
--- a/web/html/network/errata/manage/errata_cache_update.pxi
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
- <pxt-use class="Sniglets::ErrataEditor" />
-
-<rhn-if-errata-package-list-modified>
- <div class="page-summary">
-<pxt-formvar>
- <span style="color: green">
- <p>The list of packages associated with this errata has been modified
recently.</p>
- <p>These changes will not immediately be available to systems to which this
errata applies. The changes will become available approximately 10 minutes after they are
made. Or, you can <a
href="/network/errata/manage/edit.pxt?pxt:trap=rhn:update_errata_cache&eid={formvar:eid}">commit
your changes immediately</a> when you are finished editing this errata.</p>
- </span>
-</pxt-formvar>
- </div>
-</rhn-if-errata-package-list-modified>
-
-</pxt-passthrough>
\ No newline at end of file
commit 840c06c508e0c890e20b5432023b0f7f22e45bf8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:43:13 2009 +0100
Removal of address_list.pxi made rhn-user-site-view and user_site_view unused,
removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 4bc7c62..9fbcd13 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -59,8 +59,6 @@ sub register_tags {
$pxt->register_tag('rhn-require' => \&rhn_require, -1000);
- $pxt->register_tag('rhn-user-site-view' => \&user_site_view);
-
$pxt->register_tag('rhn-user-login' => \&rhn_user_login);
}
@@ -369,77 +367,6 @@ sub rhn_login_cb {
}
-sub user_site_view {
- my $pxt = shift;
- my %params = @_;
-
- my $uid = $pxt->param('uid') || $pxt->pnotes('uid') ||
$pxt->user->id;
- my $user = RHN::User->lookup(-id => $uid);
-
- die "no user" unless $user;
-
- if ($pxt->user->org_id != $user->org_id) {
- Carp::cluck "Orgs for admin user edit mistatch (admin:
@{[$pxt->user->org_id]} != @{[$user->org_id]}";
- $pxt->redirect("/errors/permission.pxt");
- }
-
- if ($uid != $pxt->user->id and not $pxt->user->is('org_admin')) {
- Carp::cluck "Non-orgadmin attempting to edit another's record";
- $pxt->redirect("/errors/permission.pxt");
- }
-
- $pxt->pnotes(user_name => $user->login);
-
- my $type = uc $params{type} || $pxt->dirty_param('type') ||
$pxt->pnotes('type') || 'M';
- my $block = $params{__block__};
- my ($site) = $user->sites($type);
-
- unless ($site && $site->site_city && $site->site_state &&
$site->site_zip) {
- #($site) = $user->sites('M');
- my $link =
PXT::HTML->link("edit_address.pxt?type=$type&uid=$uid", 'Add this
address');
- my $html = qq(<div>\n<strong>(Address not filled
out)</strong></div>);
- $html .= qq(<div>\n$link\n</div>\n);
-
- return $html;
- }
-
- if ($user->id == $pxt->user->id) {
- if ($type eq 'M' and $pxt->uri =~ m(/network/account/edit_address.pxt) and
$site and ($site->site_city eq '.' or $site->site_address1 eq '.'))
{
- $pxt->push_message(site_info => 'Please take a moment and complete the
information below for our records.');
-
- $site->$_('')
- foreach qw/site_address1 site_address2 site_address3 site_city site_state site_zip
site_fax site_phone/;
- }
- }
-
- my %subst;
-
- my $site_addr = '';
- $site_addr .= $site->$_() ? PXT::Utils->escapeHTML($site->$_()) . '<br
/>' : ''
- foreach qw/site_address1 site_address2 site_address3/;
-
- $subst{site_address} = $site_addr;
-
- my $site_city = $site->site_city() || '';
- my $site_state = $site->site_state() || '';
- my $site_zip = $site->site_zip() || '';
-
- my $site_city_state_zip = $site_city ne '' ? "$site_city,
$site_state" : $site_state;
- $site_city_state_zip .= $site_zip ? " $site_zip" : '';
-
- $subst{site_city_state_zip} = PXT::Utils->escapeHTML($site_city_state_zip);
-
- $subst{user_id} = $user->id;
-
- $subst{site_type} = $type;
-
- $subst{$_} = $site->$_() ? PXT::Utils->escapeHTML($site->$_()) || '' :
''
- foreach qw/site_phone site_fax/;
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
-
sub user_prefs_edit_cb {
my $pxt = shift;
commit 30dadc516f2819fcab6a8803e05f112297932845
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:41:29 2009 +0100
address_list.pxi not used anywhere, removing.
diff --git a/web/html/network/components/address_list.pxi
b/web/html/network/components/address_list.pxi
deleted file mode 100644
index b2f2c11..0000000
--- a/web/html/network/components/address_list.pxi
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::HTML" />
-
-<rhn-user-site-view>
- <div>{site_address} {site_city_state_zip}</div>
- <div>Phone: {site_phone}</div>
- <div>Fax: {site_fax}</div>
- <div>
- <a
href="edit_address.pxt?type={site_type}&uid={user_id}">Edit this
address</a>
- </div>
-</rhn-user-site-view>
-
-</pxt-passthrough>
-
commit ab2dbe8765c937777c4360968774379a4d28690e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:38:44 2009 +0100
Removal of clone_token made set_config_channels not used, removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index 591316e..96cf778 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -165,40 +165,6 @@ sub fancy_packages {
return @$data;
}
-sub set_config_channels {
- my $self = shift;
- my @config_channels = @_;
-
- my $dbh = RHN::DB->connect;
- my $query;
- my $sth;
-
- $query = <<EOQ;
-DELETE FROM rhnRegTokenConfigChannels RTCC
- WHERE RTCC.token_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- $query = <<EOQ;
-INSERT INTO rhnRegTokenConfigChannels
- (token_id, config_channel_id, position)
- VALUES (?, ?, ?)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- my $counter = 1;
- foreach my $ns_id (@config_channels) {
- $sth->execute($self->id, $ns_id, $counter);
- $counter++;
- }
-
- $sth->finish;
- $dbh->commit;
-}
-
sub groups {
my $self = shift;
commit 86856884df032fbea76a51db6faff6e7c9f5a190
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:38:15 2009 +0100
Removal of clone_token made set_groups not used, removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index fc94b56..591316e 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -267,38 +267,6 @@ EOQ
return;
}
-sub set_groups {
- my $self = shift;
- my @groups = @_;
-
- my $dbh = RHN::DB->connect;
- my $query;
- my $sth;
-
- $query = <<EOQ;
-DELETE FROM rhnRegTokenGroups RTG
- WHERE RTG.token_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- $query = <<EOQ;
-INSERT INTO rhnRegTokenGroups
- (token_id, server_group_id)
- VALUES (?, ?)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- foreach my $group (@groups) {
- $sth->execute($self->id, $group);
- }
-
- $sth->finish;
- $dbh->commit;
-}
-
sub lookup {
my $class = shift;
my %params = validate(@_, { id => 0, sid => 0, token => 0 });
commit 70f05c317789f5d3ba16dc060af6aa1e4ccd1dc9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:36:44 2009 +0100
Removal of clone_token made create_new_key not used, removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index cdb05ee..fc94b56 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -625,18 +625,4 @@ sub org_default {
return $hit ? 1 : 0;
}
-sub create_new_key {
- my $self = shift;
-
- my $new_key = $self->generate_random_key;
-
- while (my $existing = RHN::Token->lookup(-token => $new_key)) {
- $new_key = $self->generate_random_key;
- }
-
- $self->activation_key_token($new_key);
-
- return $new_key;
-}
-
1;
commit d34fbc4be233742d5099598922c75f8f9e375e1f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:34:37 2009 +0100
Removal of edit_token_packages_cb and clone_token makes set_packages unused,
removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index 9f03293..cdb05ee 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -199,39 +199,6 @@ EOQ
$dbh->commit;
}
-sub set_packages {
- my $self = shift;
- my @packages = @_;
-
- my $dbh = RHN::DB->connect;
- my $query;
- my $sth;
-
- $query = <<EOQ;
-DELETE FROM rhnRegTokenPackages RTP
- WHERE RTP.token_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- $query = <<EOQ;
-INSERT INTO rhnRegTokenPackages
- (token_id, name_id)
- VALUES (?, ?)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- foreach my $pid (@packages) {
- next unless $pid;
- $sth->execute($self->id, $pid);
- }
-
- $sth->finish;
- $dbh->commit;
-}
-
sub groups {
my $self = shift;
commit bf30b4c8c5d72b273806a1a30bf1bab105007ab4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:33:47 2009 +0100
clone_token is not used anywhere, removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index 5df8b21..9f03293 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -672,26 +672,4 @@ sub create_new_key {
return $new_key;
}
-sub clone_token {
- my $self = shift;
-
- my $other = RHN::Token->create_token;
-
- foreach my $field ($t->method_names, map { lc } @ak_fields) {
- next if ($field eq 'id');
- $other->$field($self->$field);
- }
-
- $other->create_new_key;
-
- $other->commit;
-
- $other->set_channels(-channels => [ $self->channels ]);
- $other->set_groups($self->groups);
- $other->set_config_channels($self->config_channels);
- $other->set_packages($self->packages);
-
- return $other;
-}
-
1;
commit 5f4d33db7f9bb19753d38963cbba03329569665b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:32:52 2009 +0100
Removal of edit_token_packages_cb makes lookup_package_name_id unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index ed7f33d..52d92e8 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -1400,14 +1400,6 @@ EOQ
}
-sub lookup_package_name_id {
- my $class = shift;
- my $name = shift;
-
- my $dbh = RHN::DB->connect;
- return $dbh->call_function('lookup_package_name', $name);
-}
-
sub is_package_in_channel {
my $class = shift;
my %params = validate(@_, { evr_id => 0, name_id => 0, id => 0, cid => 1
});
commit 3c267c4837fc23ca73e312e27a44c6e011e83576
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:32:08 2009 +0100
Removal of packages.pxt makes rhn:edit_token_packages_cb and edit_token_packages_cb
unused, removing.
diff --git a/web/modules/sniglets/Sniglets/ActivationKeys.pm
b/web/modules/sniglets/Sniglets/ActivationKeys.pm
index 6b2d5fe..076ae95 100644
--- a/web/modules/sniglets/Sniglets/ActivationKeys.pm
+++ b/web/modules/sniglets/Sniglets/ActivationKeys.pm
@@ -43,7 +43,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
$pxt->register_callback('rhn:edit_token_channels_cb' =>
\&edit_token_channels_cb);
- $pxt->register_callback('rhn:edit_token_packages_cb' =>
\&edit_token_packages_cb);
}
@@ -154,37 +153,6 @@ sub create_token {
return $token;
}
-sub edit_token_packages_cb {
- my $pxt = shift;
-
- my $tid = $pxt->param('tid');
- my $token = RHN::Token->lookup(-id => $tid);
-
- my $pkg_string = $pxt->dirty_param('packages');
- $pkg_string =~ s(\r)()g;
- # remove whitespace from beginning and end
- $pkg_string =~ s/^\s+//;
- $pkg_string =~ s/\s+$//;
- my @package_names = split /\n+/, $pkg_string;
-
- my %seen;
- my @packages;
- for my $name (@package_names) {
- if (exists $seen{$name}) {
- $pxt->push_message(local_alert => "Package '$name' appears
multiple times.");
- return;
- }
- $seen{$name}++;
-
- my $pkg_id = RHN::Package->lookup_package_name_id($name);
-
- push @packages, $pkg_id;
- }
-
- $token->set_packages(@packages);
- $pxt->push_message(site_info => sprintf('Activation Key
<strong>%s</strong> has been modified.',
PXT::Utils->escapeHTML($token->note)));
-}
-
sub token_details {
my $pxt = shift;
my %attr = @_;
commit 9f5cef94d28275e1c27f62873f2ee4b20d20162c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:30:08 2009 +0100
Removal of packages.pxt makes rhn-token-packages and edit_token_packages unused,
removing.
diff --git a/web/modules/sniglets/Sniglets/ActivationKeys.pm
b/web/modules/sniglets/Sniglets/ActivationKeys.pm
index b046955..6b2d5fe 100644
--- a/web/modules/sniglets/Sniglets/ActivationKeys.pm
+++ b/web/modules/sniglets/Sniglets/ActivationKeys.pm
@@ -37,7 +37,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag('rhn-token-details' => \&token_details);
$pxt->register_tag('rhn-token-channels' => \&edit_token_channels);
- $pxt->register_tag('rhn-token-packages' => \&edit_token_packages);
}
sub register_callbacks {
@@ -155,24 +154,6 @@ sub create_token {
return $token;
}
-sub edit_token_packages {
- my $pxt = shift;
-
- my $tid = $pxt->param('tid');
- my $token = RHN::Token->lookup(-id => $tid);
-
- my @packages = $token->fancy_packages;
- my $pkg_count = scalar @packages;
- my $pkg_string = join("\n", map { $_->{NAME} } @packages);
-
- my $widget = new RHN::Form::Widget::TextArea(name => 'Packages',
- label => 'packages',
- cols => 64,
- rows => $pkg_count < 4 ? 6 : $pkg_count + 1,
- default => ($pkg_string || ''));
- return $widget->render;
-}
-
sub edit_token_packages_cb {
my $pxt = shift;
commit 5770b1b790ff67400b7071ae527b56049d07f6bb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:27:31 2009 +0100
The file namespaces.pxt does not exist, no need to have it in .htaccess, removing.
diff --git a/web/html/network/account/activation_keys/.htaccess
b/web/html/network/account/activation_keys/.htaccess
index e06c00e..cabe5cd 100644
--- a/web/html/network/account/activation_keys/.htaccess
+++ b/web/html/network/account/activation_keys/.htaccess
@@ -8,13 +8,3 @@ require acl user_role(activation_key_admin);
org_entitlement(sw_mgr_enterprise)
-<Files namespaces.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
commit b73dfc725d0a37d1df471ebb2c083cea5d0ec901
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:26:19 2009 +0100
activation_keys/packages.pxt not referenced from anywhere, replaced by
activationkeys/packages/Packages.do, removing.
diff --git a/web/html/network/account/activation_keys/.htaccess
b/web/html/network/account/activation_keys/.htaccess
index a57bf0d..e06c00e 100644
--- a/web/html/network/account/activation_keys/.htaccess
+++ b/web/html/network/account/activation_keys/.htaccess
@@ -8,16 +8,6 @@ require acl user_role(activation_key_admin);
org_entitlement(sw_mgr_enterprise)
-<Files packages.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
<Files namespaces.pxt>
AuthType Basic
AuthName "RHN Org Admin Area"
diff --git a/web/html/network/account/activation_keys/packages.pxt
b/web/html/network/account/activation_keys/packages.pxt
deleted file mode 100644
index e6f7ea4..0000000
--- a/web/html/network/account/activation_keys/packages.pxt
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::ActivationKeys" />
- <pxt-use class="Sniglets::Lists" />
-
- <grail-canvas-template base="/templates/c.pxt"
mode="main_canvas">
-
- <pxt-include file="top.pxi" />
-
-<div class="page-summary">
- <p>Any system registered with this activation key will have the following
packages installed, if those packages are available. List packages by name only, one per
line.</p>
-</div>
-
- <h2>Enter package names below</h2>
- <pxt-form method="post" name="edit_token_packages">
- <rhn-token-packages />
-
- <input type="hidden" name="pxt:trap"
value="rhn:edit_token_packages_cb" />
-
- <div align="right">
- <hr />
- <input type="submit" name="Update Key" value="Update
Key" />
- </div>
-
- <pxt-hidden name="tid" />
- </pxt-form>
-
- </grail-canvas-template>
-</pxt-passthrough>