java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 37
web/html/confirm_email.pxt | 17
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 10
web/modules/rhn/RHN/DB/EmailAddress.pm | 19
web/modules/rhn/RHN/DB/User.pm | 33
web/modules/sniglets/Sniglets/Inspector.pm | 569
----------
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 18
web/modules/sniglets/Sniglets/Users.pm | 207
---
8 files changed, 910 deletions(-)
New commits:
commit 224fcf2f5b19ec7ff25d524e021770436398a750
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:26:14 2009 +0100
create_gritch_destination is dead code, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 3747a5a..913f033 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -1809,39 +1809,4 @@ sub build_default_system_groups_form {
return $form;
}
-sub create_gritch_destination {
- my $user = shift;
-
- my $cmethod = RHN::ContactMethod->create;
- my $cgroup = RHN::ContactGroup->create;
-
- my $name = 'Panic Destination';
- my $email = $user->find_mailable_address->address;
- my $use_pager_type = 0;
-
- $cmethod->contact_id($user->id);
- $cmethod->method_name($name);
- $cmethod->last_update_user($user->id);
-
- my $method_type_info = RHN::ContactMethod->get_method_type_info("Email");
- $cmethod->pager_email(undef);
- $cmethod->email_address($email);
- $cmethod->method_type_id($method_type_info->{method_type_id});
- $cmethod->notification_format_id($method_type_info->{method_format_id});
-
- $cgroup->strategy_id($method_type_info->{strategy_id});
- $cgroup->notification_format_id($method_type_info->{group_format_id});
- $cgroup->contact_group_name($name);
- $cgroup->customer_id($user->org->id);
- $cgroup->last_update_user($user->id);
-
- $cmethod->commit;
- $cgroup->commit;
- $cgroup->set_groups_methods($user->id, $cmethod->recid);
-
- RHN::SatInstall->set_first_gritch_destination($user->id);
-
- return;
-}
-
1;
commit 3bd2606da4a3f40f606479d8511f4d4f33847902
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:24:58 2009 +0100
rhn-admin-user-edit-form not used anywhere, makes admin_user_edit_form obsolete as
well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 1137b35..3747a5a 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -56,7 +56,6 @@ sub register_tags {
$pxt->register_tag('public-secure-links-if-logged-in' =>
\&secure_links_if_logged_in, 101);
$pxt->register_tag('rhn-user-info' => \&rhn_user_info);
- $pxt->register_tag('rhn-admin-user-edit-form' =>
\&admin_user_edit_form);
$pxt->register_tag('rhn-admin-user-site-edit-form' =>
\&admin_user_site_edit_form);
$pxt->register_tag('rhn-login-form', \&rhn_login_form);
@@ -762,139 +761,6 @@ sub rhn_logout_xmlrpc {
$pxt->clear_session;
}
-sub admin_user_edit_form {
- my $pxt = shift;
- my %params = @_;
-
- my $uid = $pxt->param('uid');
- my $user;
- my $editing_self;
-
-# Either editing the user from the 'uid' param, or the current user
- if ($uid and not $pxt->dirty_param('editing_self')) {
- $user = RHN::User->lookup(-id => $uid);
- }
- else {
- $editing_self = 1;
- $user = $pxt->user;
- $pxt->param(uid => $user->id); # prepare_form() needs this
- $pxt->cleanse_param('uid');
- }
-
- $pxt->redirect('/errors/permission.pxt') unless
$pxt->user->can_modify_user($user);
-
- my $rform = Sniglets::Forms::prepare_form($pxt, %params);
-
- if ($editing_self) {
- if ($user->first_names eq 'Valued' || $user->last_name eq
'Customer') {
- $pxt->push_message(site_info => 'Please take a moment and complete the
information below for our records.');
-
- $rform->lookup_widget('first_names')->value('');
- $rform->lookup_widget('last_name')->value('');
- }
- $rform->action('/network/account/details.pxt');
- $rform->lookup_widget('editing_self')->value(1);
- $rform->remove_widget('user_groups');
- $rform->remove_widget('use_pam_authentication');
- }
-
- my @role_labels = $user->role_labels;
-
- if (@role_labels and $rform->lookup_widget('user_type')) {
- $rform->lookup_widget('user_type')->value(join(", ",
@role_labels));
- }
-
- $rform->lookup_widget('user_password')->value('*' x 12);
- $rform->lookup_widget('user_password_confirm')->value('*' x 12);
-
- my $email = $user->find_mailable_address;
- my $email_verification_status = $email ? $email->address : '(none)';
-
- if (PXT::Config->get('satellite')) {
- my $user_id_param = $editing_self ? "" : "?uid=" . $user->id;
- $email_verification_status .= "<br />" .
- PXT::HTML->link("change-email.pxt$user_id_param",
"Change.");
- }
- else {
- my $user_id_param = $editing_self ? "" : "?uid=" . $user->id;
-
- if ($email and $email->state eq 'verified') {
- $email_verification_status .= " - Confirmed.";
- my @pending = grep { $_->state ne 'verified' }
$user->email_addresses;
- if (@pending) {
- $email_verification_status .= "<br />Pending change to " .
$pending[0]->address . ".";
- }
-
- $email_verification_status .= "<br />" .
- PXT::HTML->link("change-email.pxt$user_id_param", "Change");
- }
- else {
- $email_verification_status .= " - Unconfirmed.";
-
- $email_verification_status .= "<br />" .
- PXT::HTML->link("change-email.pxt$user_id_param", "Confirm");
- }
- }
-
-
$rform->lookup_widget('email_address')->value($email_verification_status);
-
- my $roles_widget = $rform->lookup_widget('user_groups');
- if ($roles_widget) {
- my @groups = $user->group_list_for_user;
- my @selected_groups;
-
- # roles that an org admin inherits if they exist in the org.
- my @inherited_roles = qw/activation_key_admin channel_admin config_admin
monitoring_admin system_group_admin /;
-
- foreach my $group (@groups) {
- next if $group->[3] eq 'org_applicant';
-
- if ((grep { $group->[3] eq $_ } @inherited_roles) and
$user->is('org_admin')) {
- $roles_widget->add_option({value => $group->[1], #group id
- label => $group->[2] . ' - [ Admin Access ]', #group name
- disabled => 1,
- });
- # also push it onto the list so the checkbox is always on, even when disabled
- push(@selected_groups, $group->[1]);
- }
- elsif ($group->[3] eq 'rhn_support' and
$user->is('cert_admin')) {
- $roles_widget->add_option({value => $group->[1], #group id
- label => $group->[2], #group name
- disabled => 1,
- });
- push(@selected_groups, $group->[1]);
- }
- else {
- $roles_widget->add_option({value => $group->[1], #group id
- label => $group->[2], #group name
- disabled => 0,
- });
- }
-
- push(@selected_groups, $group->[1]) if $group->[0]; #user has permissions to
group
- }
-
- $roles_widget->value(\@selected_groups);
- }
-
- my $created = $pxt->user->convert_time($user->created());
- my $last_logged_in = $user->last_logged_in ?
$pxt->user->convert_time($user->last_logged_in) : undef;
-
- $rform->lookup_widget('user_created')->value($created);
- $rform->lookup_widget('last_login')->value($last_logged_in);
-
- if (my $pam_widget = $rform->lookup_widget('use_pam_authentication')) {
- if ($user->get_pref('use_pam_authentication') eq 'Y') {
- $pam_widget->checked(1);
- }
- }
-
- my $style = new Sniglets::Forms::Style;
- my $html = $rform->render($style);
-
- return $html;
-}
-
sub admin_user_edit_cb {
my $pxt = shift;
commit 92ced2b496a0a647ac1e5ab30ea8eafb43c51be3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:22:32 2009 +0100
queue_for_cheetah is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 58bc5aa..0b7bb46 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -184,39 +184,6 @@ EOQ
return $ret;
}
-# used during deactivation process, ensures people get
-# removed from cheetah mailer...
-sub queue_for_cheetah {
- my $self = shift;
- my %params = validate(@_, {user_id => 0, transaction => 0});
-
- my $user;
- if (not ref $self) {
- die "no user id and not a user object method call" unless
$params{user_id};
-
- $user = RHN::User->lookup(-id => $params{user_id});
- }
- else {
- $user = $self;
- }
-
- my $dbh = $params{transaction} || RHN::DB->connect();
-
- my $mailable_address = $user->find_mailable_address;
- my $email_addy = $mailable_address ? $mailable_address->address : undef;
-
- if ($email_addy) {
- my $sth = $dbh->prepare("INSERT INTO cheetah_unsubscribe (address) VALUES
(?)");
- $sth->execute($email_addy);
- }
-
- unless ($params{transaction}) {
- $dbh->commit;
- }
-
- return $email_addy;
-}
-
# walks a user's sets to ensure nothing has corrupted them... hopefully isn't too
expensive
sub cleanse_sets {
my $self = shift;
commit aaaad21b880dbae9319d600a760494badc9c5a61
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:19:37 2009 +0100
Sniglets::Inspector is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Inspector.pm
b/web/modules/sniglets/Sniglets/Inspector.pm
deleted file mode 100644
index 884c486..0000000
--- a/web/modules/sniglets/Sniglets/Inspector.pm
+++ /dev/null
@@ -1,569 +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::Inspector;
-use strict;
-
-use RHN::User;
-use Sniglets::Servers;
-use Sniglets::Users;
-use RHN::Exception;
-use RHN::DB::Inspector;
-use RHN::Server;
-use RHN::Utils;
-use PXT::Utils;
-use RHN::Org;
-use RHN::EmailAddress;
-
-use RHN::Form::Widget::Submit;
-
-use POSIX qw/strftime/;
-
-my $MAX_DIGIT_LENGTH = 15;
-
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_tag('inspector-user-disable-toggle-button' =>
\&disable_toggle_button);
-
- $pxt->register_tag('inspector-org-details' => \&org_details);
-
- $pxt->register_tag('inspector-server-history-event-details' =>
\&server_history_event_details);
- $pxt->register_tag('inspector-system-details' => \&system_details);
-
- $pxt->register_tag('inspector-user-details' => \&user_details);
- $pxt->register_tag('inspector-user-site-details' =>
\&user_site_details);
- $pxt->register_tag('inspector-email-state-details' =>
\&email_state_details);
-
- $pxt->register_tag('inspector-org-ep-entitlement-history' =>
\&org_ep_entitlement_history);
- $pxt->register_tag('inspector-org-sg-entitlement' =>
\&org_sg_entitlement);
-
- $pxt->register_tag('inspector-reload' => \&inspector_reload, -100);
-}
-
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('inspector:find_org_cb' => \&find_org_cb);
-
- $pxt->register_callback('inspector:disable_user_toggle_cb' =>
\&disable_user_toggle_cb);
-
- $pxt->register_callback('inspector:daemon_state_cb' =>
\&daemon_state_cb);
-}
-
-sub disable_toggle_button {
- my $pxt = shift;
-
- my $s_uid = $pxt->param('support_uid');
- my $s_u = RHN::User->lookup(-id => $s_uid);
-
- my $next_possible_status = $s_u->is_disabled() ? 'enable' :
'disable';
-
- return PXT::HTML->submit(-name => $next_possible_status,
- -value => (ucfirst($next_possible_status) . " User"),
- );
-}
-
-sub inspector_reload {
- my $pxt = shift;
- my %params = @_;
-
- my $uid = $pxt->param('support_uid');
- my $org_id = $pxt->param('support_org_id');
-
- return if ($uid and $org_id);
-
- my $user = RHN::User->lookup(-id => $uid);
-
- $org_id = $user->org->id;
- my $redir = $pxt->uri .
"?support_uid=${uid}&support_org_id=${org_id}";
- $pxt->redirect($redir);
-
- return;
-}
-
-sub server_history_event_details {
- my $pxt = shift;
- my %params = @_;
-
- my ($sid, $hid) = ($pxt->param('support_sid'),
$pxt->param('support_hid'));
- throw "need server and history ids!" unless ($sid && $hid);
-
-
- my $server = RHN::Server->lookup(-id => $sid);
- my $event = RHN::Server->lookup_server_event($sid, $hid);
-
- return PXT::Utils->perform_substitutions($params{__block__},
$event->render($pxt->user));
-}
-
-sub org_sg_entitlement {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $org_id = $pxt->param('support_org_id');
-
- my $org = RHN::Org->lookup(-id => $org_id);
- die "no org" unless $org;
-
- my @basic_entitlement_counts = $org->entitlement_counts('sw_mgr_entitled');
- my @workgroup_entitlement_counts =
$org->entitlement_counts('enterprise_entitled');
- my @provisioning_entitlement_counts =
$org->entitlement_counts('provisioning_entitled');
-
- my %subst;
-
- $subst{basic_used} = $basic_entitlement_counts[0] || 0;
- $subst{basic_total} = $basic_entitlement_counts[1] || 0;
- $subst{workgroup_used} = $workgroup_entitlement_counts[0] || 0;
- $subst{workgroup_total} = $workgroup_entitlement_counts[1] || 0;
- $subst{provisioning_used} = $provisioning_entitlement_counts[0] || 0;
- $subst{provisioning_total} = $provisioning_entitlement_counts[1] || 0;
-
- $block = PXT::Utils->perform_substitutions($block, \%subst);
-
- return $block;
-}
-
-sub org_ep_entitlement_history {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $org_id = $pxt->param('support_org_id');
- my $org = RHN::Org->lookup(-id => $org_id);
- die "no org" unless $org;
-
- return Sniglets::Users->org_entitlement_history($org, $block);
-}
-
-sub disable_user_toggle_cb {
- my $pxt = shift;
-
-
- my $s_uid = $pxt->param('support_uid');
- die "no support user id" unless $s_uid;
- my $s_u = RHN::User->lookup(-id => $s_uid);
- die "no support user" unless $s_u;
-
- my $message;
-
- if ($pxt->dirty_param("enable")) {
- $s_u->enable_user($pxt->user->id);
- $message = "User <strong>" . $s_u->login . "</strong>
enabled.";
- }
- elsif ($pxt->dirty_param("disable")){
- $s_u->disable_user($pxt->user->id);
- $message = "User <strong>" . $s_u->login . "</strong>
disabled.";
- }
- else {
- warn Data::Dumper->Dump([($pxt->params)]);
- }
-
- $pxt->push_message(site_info => $message) if (defined $message);
-
- return;
-}
-
-sub find_org_cb {
- my $pxt = shift;
- my $search_type = $pxt->dirty_param('search_type');
-
- die "missing search type!" unless $search_type;
-
- my $search_str = $pxt->dirty_param('search_str');
-
- unless ($search_str) {
- $pxt->push_message(local_alert => 'No search string entered.');
- $pxt->redirect('/internal/support/index.pxt');
- }
-
- $search_str =~ s/^\s+//;
- $search_str =~ s/\s+$//;
-
- my $org;
-
- if ($search_type eq 'org_id') {
- if ($search_str =~ /\D/) {
- $pxt->push_message(local_alert => 'Non-numeric org id entered.');
- return;
- }
- elsif (my $org = RHN::Org->lookup(-id => substr($search_str, 0,
$MAX_DIGIT_LENGTH))) {
- my $redir = $pxt->dirty_param('org_redirect') || '';
- throw "param org_redirect needed but not provided" unless $redir;
- $pxt->redirect($redir . '?support_org_id=' . $org->id);
- }
- else {
- $pxt->push_message(local_info => 'Org not found');
- }
- }
- elsif ($search_type eq 'org_oracle_customer_num') {
- if ($search_str =~ /\D/) {
- $pxt->push_message(local_alert => 'Non-numeric Oracle customer number
entered.');
- return;
- }
- elsif (my $org = RHN::Org->lookup(-customer_number => substr($search_str, 0,
$MAX_DIGIT_LENGTH))) {
- my $redir = $pxt->dirty_param('org_redirect') || '';
- throw "param org_redirect needed but not provided" unless $redir;
- $pxt->redirect($redir . '?support_org_id=' . $org->id);
- }
- else {
- $pxt->push_message(local_info => 'Org not found');
- }
- }
- elsif ($search_type eq 'user') {
- my $user = find_user($search_str);
- if ($user) {
- my $redir = $pxt->dirty_param('user_redirect') ||
'/internal/support/org_user.pxt';
- $pxt->redirect($redir . '?support_org_id=' . $user->org_id .
'&support_uid=' . $user->id);
- }
- else {
- my $redir = $pxt->dirty_param('user_search_redirect') || '';
- throw "param user_search_redirect needed but not provided" unless
$redir;
- $pxt->redirect($redir . '?search_type=user&search_str=' .
PXT::Utils->escapeURI($search_str));
- }
- }
- elsif ($search_type eq 'system') {
- my $server;
- eval {
- unless ($search_str =~ m/\D/) {
- $search_str = substr($search_str, 0, $MAX_DIGIT_LENGTH);
- }
- $server = RHN::Server->lookup(-id => $search_str);
- };
-
- if ($@ and catchable($@)) {
- my $E = $@;
-
- unless ($E->is_rhn_exception('server_does_not_exist')) {
- throw $E;
- }
- }
-
- if (!$server) {
- my $redir = $pxt->dirty_param('system_search_redirect') || '';
- throw "param system_search_redirect needed but not provided" unless
$redir;
- $pxt->redirect($redir . '?search_type=system&search_str=' .
PXT::Utils->escapeURI($search_str));
- }
- else {
- my $redir = $pxt->dirty_param('system_redirect') || '';
- throw "param system_redirect needed but not provided" unless $redir;
-
- $pxt->redirect($redir . '?support_org_id=' . $server->org_id .
'&support_sid=' . $server->id);
- }
- }
-}
-
-sub find_user {
- my $user_string = shift;
-
- my $user;
-
- # contains a non-digit? then it's a login
- if ($user_string =~ /\D/) {
- $user = RHN::User->lookup(-username => $user_string);
- }
- else {
- # joek is an evil man...
- $user_string = substr($user_string, 0, $MAX_DIGIT_LENGTH);
- $user = RHN::User->lookup(-id => $user_string);
- }
-
- return $user;
-# if ($user) {
-# return $user
-# }
-# else {
-# my @possible_users = RHN::DB::Inspector->find_org_by_user($user_string);
-# }
-}
-
-sub system_details {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $server = RHN::Server->lookup(-id => $pxt->param('support_sid'));
- throw "no server" unless $server;
-
- $pxt->pnotes(server => $server);
-
- my %subst;
-
- $subst{"server_$_"} = PXT::Utils->escapeHTML($server->$_() ||
'')
- foreach qw/id digital_server_id cpu_arch_name os release name description info org_id
memory_swap memory_ram cpu_bogomips cpu_family cpu_nrcpu cpu_mhz created/;
-
- my $ent = $server->is_entitled || 'none';
- if ($ent eq 'none') {
- $subst{server_entitled} = 'None';
- }
- elsif ($ent eq 'sw_mgr_entitled') {
- $subst{server_entitled} = 'Update Service';
- }
- elsif ($ent eq 'enterprise_entitled') {
- $subst{server_entitled} = 'Management Service';
- }
- elsif ($ent eq 'provisioning_entitled') {
- $subst{server_entitled} = 'Provisioning Service';
- }
-
- $subst{server_last_checkin} = $server->checkin() || '';
-
- my @channels = $server->server_channel_tree;
-
- # filter out unsubscribed child channels of this server's base channel
- my @subscribed_child_channels;
- foreach my $child_channel (@{$channels[2]}) {
- push @subscribed_child_channels, $child_channel if ($child_channel->[2] eq 1);
- }
- $channels[2] = \@subscribed_child_channels;
-
- my $channels;
- if (@channels) {
- $channels = "<a
href=\"/network/software/channels/details.pxt?cid=$channels[0]\">$channels[1]</a><br
/>\n";
-
- if (@{$channels[2]}) {
- foreach my $i (0..$#{$channels[2]}) {
- my $max = ' ';
-
- if (defined $channels[2]->[$i]->[3] and defined $channels[2]->[$i]->[4]) {
- my $total = $channels[2]->[$i]->[4] + $channels[2]->[$i]->[3];
- $max = " ($channels[2]->[$i]->[3] of $total subscriptions used)";
- }
-
- $channels .= '<img src="/img/branch.gif" />' . "<a
href=\"/network/software/channels/details.pxt?cid=$channels[2]->[$i]->[0]\">$channels[2]->[$i]->[1]</a>$max<br
/>\n";
- }
- }
- $channels .= "\n";
- }
-
- $channels ||= '(no channels)';
- $subst{channel_list} = $channels;
-
- my @rhn_packages = $server->rhn_packages;
- $subst{server_rhn_packages} = join("<br \/>\n", map { $_->[0] }
@rhn_packages);
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
-sub user_details {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
-
- my $uid = $pxt->param('support_uid');
-
- my $user = RHN::User->lookup(-id => $uid);
-
- if (not $user) {
- if ($pxt->dirty_param('login_or_id')) {
- return "No user found.";
- }
- else {
- return "Enter the user's login or id above.";
- }
- }
-
- my %subst;
-
- $subst{"user_$_"} = $user->$_() || ''
- foreach qw/id first_names last_name login email company title org_id
last_logged_in/;
-
- $subst{"user_$_"} = '*' x 24
- foreach qw/passwd passwd_confirm/;
-
- my @role_labels;
- @role_labels = $user->role_labels;
-
- $subst{user_type} = @role_labels ? join(", ", @role_labels) :
'(none)';
- $subst{org_name} = $user->org->name;
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- $subst{user_group_selectbox} =
Sniglets::Users::group_checkboxes("user_groups", $user);
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
-sub user_site_details {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
-
- my $uid = $pxt->param('support_uid');
-
- my $user = RHN::User->lookup(-id => $uid);
- my $ret;
-
- foreach my $site (sort { $a->site_type cmp $b->site_type } $user->sites) {
- next unless ($site && $site->isa('RHN::DB::UserSite'));
-
- my %subst;
- $subst{$_} = $site->$_() || ''
- foreach qw/site_address1 site_address2 site_address3 site_city site_state site_zip
site_fax site_phone site_country site_id site_type/;
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- $ret .= PXT::Utils->perform_substitutions($block, \%subst);
- }
-
- return $ret;
-}
-
-my $pump_states = [
- { label => 'Now',
- value => 0 },
- { label => '5 Minutes hence',
- value => 5 },
- { label => '1 Hour hence',
- value => 60 },
- { label => '1 Day hence',
- value => 1440 },
- { label => '1 Week hence',
- value => 10080 },
- { label => '1 Month hence',
- value => 40320 },
- ];
-
-sub email_state_details {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
-
- my $uid = $pxt->param('support_uid');
-
- my $user = RHN::User->lookup(-id => $uid);
-
- my @addresses = $user->email_addresses;
-
- my $ret;
-
- my $email_address_states = RHN::EmailAddress->email_address_states;
-
- foreach my $address (@addresses) {
- my $subst = { };
-
- $subst->{email_address} = $address->address || '';
- $subst->{email_id} = $address->id || '';
- $subst->{email_next_action} = $address->next_action || '(none
scheduled)';
- $subst->{send_verify_message} = '';
- $subst->{verify_address} = '';
-
- PXT::Utils->escapeHTML_multi($subst);
-
- $subst->{delete_email} = PXT::HTML->submit(-name => 'delete_email_'
. $address->id,
- -value => 'Delete Address');
-
- if (grep { $address->state eq $_ } qw/unverified pending pending_warned
needs_verifying/) {
- $subst->{send_verify_message} = PXT::HTML->submit(-name =>
'email_request_verification_' . $address->id,
- -value => 'Send Verification E-Mail');
- $subst->{verify_address} = PXT::HTML->submit(-name =>
'email_verify_' . $address->id,
- -value => 'Verify Address');
- $subst->{email_state} = 'unverified'
- }
- else {
- $subst->{email_state} = 'verified'
- }
-
-
- if ($address->next_action) {
- $subst->{email_next_action_select} =
- PXT::HTML->select(-name => 'email_next_action_' . $address->id,
- -size => 1,
- -options => [ map { [ $_->{label}, $_->{value},
- defined $_->{value} eq 'NO_CHANGE' ] }
- ( { label => $address->next_action || '(none scheduled)',
- value => 'NO_CHANGE' }, @{$pump_states} ) ] );
-
- $subst->{email_next_action_select} .=
- PXT::HTML->submit(-name => 'Go',
- -value => 'Go');
- }
- else {
- $subst->{email_next_action_select} = '(none scheduled)';
- }
-
- $ret .= PXT::Utils->perform_substitutions($block, $subst);
- }
-
- unless ($ret) {
- $ret = PXT::HTML->submit(-name => 'generate_email',
- -value => 'Generate From User Site Data');
- }
-
- return $ret;
-}
-
-sub org_details {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
-
- my $org_id = $pxt->param('support_org_id');
- my $org = RHN::Org->lookup(-id => $org_id);
-
- my %subst;
-
- $subst{"org_$_"} = $org->$_() || ''
- foreach qw/id name password oracle_customer_id oracle_customer_number customer_type
created modified/;
-
- $subst{org_paying_customer} = $org->is_paying_customer ? 'Yes' :
'No';
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
-sub daemon_state_cb {
- my $pxt = shift;
-
- my $update_erratacache = $pxt->dirty_param('update_erratacache_now');
-
- if ($update_erratacache) {
- my @sids = map { $_->[0] } RHN::Org->servers_in_org($pxt->user->org_id,
qw/ID/);
-
- foreach my $sid (@sids) {
- RHN::Server->schedule_errata_cache_update($pxt->user->org_id, $sid);
- }
- }
-
- return;
-}
-
-sub send_user_deleted_notice {
- my $pxt = shift;
- my $user = shift;
-
- my $letter = new RHN::Postal;
- $letter->template('internal/user_deleted_notice.xml');
-
- $letter->set_tag('org_id' => $user->org_id);
- $letter->set_tag('user_id' => $user->id);
- $letter->set_tag('user_login' => $user->login);
-
- $letter->set_tag('support_user_login' => $pxt->user->login);
- $letter->render;
- my $mail = PXT::Config->get('traceback_mail');
- $letter->to($mail);
- $letter->wrap_body;
- $letter->send;
-
- return;
-}
-
-1;
commit 4d19c908963e32e92613f4b19250ae11b9e2e373
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:15:49 2009 +0100
Removal of rhn_email_confirmation made verify_email_address unused, removing.
diff --git a/web/modules/rhn/RHN/DB/EmailAddress.pm
b/web/modules/rhn/RHN/DB/EmailAddress.pm
index 02dfce8..73ab0fc 100644
--- a/web/modules/rhn/RHN/DB/EmailAddress.pm
+++ b/web/modules/rhn/RHN/DB/EmailAddress.pm
@@ -239,25 +239,6 @@ EOQ
$dbh->commit unless $params{-transaction};
}
-sub verify_email_address {
- my $self = shift;
-
- my $user = RHN::User->lookup(-id => $self->user_id);
- my ($verified) = $user->email_addresses_by_types('verified');
- if ($verified and $verified->address eq $self->address) {
- if ($self->state ne 'verified') {
- $self->delete_self;
- }
- warn sprintf("address id %d already verified", $self->id);
- return;
- }
-
- $self->delete_other_addresses;
- $self->state('verified');
- $self->next_action_seconds(undef);
- $self->commit;
-}
-
sub reset_email {
my $class = shift;
my $user = shift;
commit 89c353abd45abca6ffb27076be7508db886e8f18
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:14:00 2009 +0100
Removal of confirm_email.pxt makes rhn-email-confirmation unused, also obsoletes
rhn_email_confirmation, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 2ad038f..1137b35 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -85,7 +85,6 @@ sub register_tags {
$pxt->register_tag('rhn-if-server-groups' => \&if_server_groups);
- $pxt->register_tag('rhn-email-confirmation' =>
\&rhn_email_confirmation);
$pxt->register_tag('rhn-user-login' => \&rhn_user_login);
$pxt->register_tag('rhn-user-default-system-groups-form' =>
\&default_system_groups);
@@ -1822,43 +1821,6 @@ sub if_server_groups {
return $block;
}
-sub rhn_email_confirmation {
- my $pxt = shift;
- my %params = @_;
-
- my $confirm_code = $pxt->path_info;
- if (not $confirm_code) {
- return "The URL you have pasted is incorrect. Some e-mail programs can break
the URL into multiple lines. Please ensure that the URL is complete, and try
again.";
- }
- my ($empty, $address_id, $hmac_digest) = split m(/), $confirm_code;
-
- if ($hmac_digest eq RHN::SessionSwap->rhn_hmac_data($address_id)) {
- my $address = RHN::EmailAddress->lookup(-id => $address_id, -soft => 1);
- if (not $address) {
- return sprintf("That email address cannot be confirmed; please %s the address
you would like to be confirmed.",
- PXT::HTML->link("/network/account/change-email.pxt",
"resubmit"));
- }
- $address->verify_email_address;
-
- my $user = RHN::User->lookup(-id => $address->user_id);
- $user->email($address->address);
- my ($marketting_site) = $user->sites('M');
- if ($marketting_site) {
- $marketting_site->site_email($address->address);
- $marketting_site->commit;
- }
-
- $user->commit;
-
- $pxt->push_message(site_info => sprintf("Thank you, the email address
<strong>%s</strong> has been confirmed.",
PXT::Utils->escapeHTML($address->address)));
-
- $pxt->redirect('/confirm_email_success.pxt');
- }
- else {
- return "The URL you have pasted is incorrect; please try again. Some e-mail
programs can break the URL into multiple lines. Please ensure that the URL is complete,
and try again.";
- }
-}
-
sub rhn_user_login {
my $pxt = shift;
commit 56122e4ef3915311727c3f2ae26ed8e8e3c47a8f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:12:33 2009 +0100
The confirm_email.pxt is not used anywhere, removing.
diff --git a/web/html/confirm_email.pxt b/web/html/confirm_email.pxt
deleted file mode 100644
index d81f30b..0000000
--- a/web/html/confirm_email.pxt
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Users" />
-
- <grail-canvas-template base="/templates/c.pxt"
mode="main_canvas">
-
- <h1><pxt-config var="product_name" /> Email
Confirmation</h1>
- <div class="page-summary">
- <p>
- <rhn-email-confirmation />
- </p>
- </div>
-
- </grail-canvas-template>
-</pxt-passthrough>
commit d865a355fb7496bed57a79b539b2a73e5bab2d54
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:11:04 2009 +0100
The email.verify.body trans-unit is not used anywhere, removing as dead text.
diff --git
a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
index afddce9..ee93e7a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
@@ -14,43 +14,6 @@
http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd&q...
</context-group>
</trans-unit>
-<!-- Verify Email email -->
- <trans-unit id="email.verify.body">
-<source>Dear @@PRODUCT_NAME@@ User,
-
-This email is sent to validate the email address that you have
-provided for your Red Hat login. Your Red Hat login, in combination
-with an active Red Hat subscription, provides you with access to
-systems management capabilities through @@PRODUCT_NAME@@.
-
-To ensure the security of the account information associated with your
-Red Hat login, please take a moment to click the link below
-and verify that we have the correct email address. If you do not
-confirm your email address, your Red Hat login will eventually be
-deactivated.
-
-To confirm your email address, please visit the following URL:
-
-{0}
-
-Thank you for using @@PRODUCT_NAME@@.
-{1}
-
-{2}</source>
- <context-group name="ctx">
- <context
context-type="sourcefile">/rhn/account/ChangeEmail.do</context>
- <context
context-type="sourcefile">/users/ChangeEmail.do</context>
- <context context-type="paramnotes">vist the following URL:
-
https://rhn.redhat.com/confirm_email.pxt/123452/317c9c3729b9be21ab13be286...
- Thank you for using @@PRODUCT_NAME@@.
- --the @@PRODUCT_NAME@@ Team
- Account Information:
- Your @@PRODUCT_NAME@@ login: mdputter
- Your @@PRODUCT_NAME@@ email address: mdputter(a)myhog.com
- </context>
- </context-group>
- </trans-unit>
-
<!-- New Account Email -->
<trans-unit id="email.newaccount.subject">
<source>Your @@PRODUCT_NAME@@ Account is ready</source>
commit 401c2507d6a6d19bc7623ab582c6dedbc0f2a5e1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:01:02 2009 +0100
rhn-listview mode user_emailaddress_log not used, making emailaddress_provider and
query user_emailaddress_log obsolete as well, removing.
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index e0f1228..c948356 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -150,16 +150,6 @@ ORDER BY RT.note, RT.id
</query>
</mode>
-<mode name="user_emailaddress_log">
- <query params="support_uid">
-SELECT EAL.user_id, WC.login, EAL.address, EAL.reason, TO_CHAR(EAL.created,
'YYYY-MM-DD HH24:MI:SS') as created
- FROM Web_Contact WC, rhnEmailAddressLog EAL
- WHERE EAL.user_id = :support_uid
- AND WC.id = EAL.user_id
-ORDER BY EAL.created DESC
- </query>
-</mode>
-
<mode name="template_strings">
<query params="">
SELECT TS.id, TC.label as CATEGORY_LABEL, TS.label, TS.value
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index 8215b31..f074061 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -89,10 +89,6 @@ sub _register_modes {
-provider => \&activation_key_provider,
-action_callback => \&activation_key_cb);
- Sniglets::ListView::List->add_mode(-mode => "user_emailaddress_log",
- -datasource => RHN::DataSource::General->new,
- -provider => \&emailaddress_provider);
-
Sniglets::ListView::List->add_mode(-mode => "template_strings",
-datasource => RHN::DataSource::General->new);
@@ -147,20 +143,6 @@ sub system_notes_provider {
return (%ret);
}
-sub emailaddress_provider {
- my $self = shift;
- my $pxt = shift;
-
- my %ret = $self->default_provider($pxt);
-
- foreach my $event (@{$ret{data}}) {
- $event->{REASON} ||= '';
- $event->{REASON} =~ s|payloader/||g;
- }
-
- return (%ret);
-}
-
sub activation_key_provider {
my $self = shift;
my $pxt = shift;