web/html/forms/.htaccess | 8
web/html/forms/user_details.xml | 54 --
web/html/forms/user_prefixes.xml | 10
web/modules/grail/Grail/Frame.pm | 16
web/modules/rhn/RHN/DB/Channel.pm | 28 -
web/modules/rhn/RHN/DB/Org.pm | 40 -
web/modules/rhn/RHN/DB/Profile.pm | 19
web/modules/rhn/RHN/DB/User.pm | 194 --------
web/modules/sniglets/Sniglets/Profiles.pm | 97 ----
web/modules/sniglets/Sniglets/Users.pm | 674 ------------------------------
10 files changed, 1140 deletions(-)
New commits:
commit ab7939cf07bb0a60b34f8d1f7318785157dce1f6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:38:28 2009 +0100
grail:canvas_trap_handler not used, removing, as well as canvas_trap_handler.
diff --git a/web/modules/grail/Grail/Frame.pm b/web/modules/grail/Grail/Frame.pm
index 873f8ad..5867931 100644
--- a/web/modules/grail/Grail/Frame.pm
+++ b/web/modules/grail/Grail/Frame.pm
@@ -29,13 +29,6 @@ sub register_tags {
$pxt->register_tag("grail-canvas-replacement" =>
\&canvas_replacement_handler, 50);
}
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('grail:canvas_trap_handler' =>
\&canvas_trap_handler);
-}
-
sub canvas_handler {
my $pxt = shift;
my %params = @_;
@@ -84,13 +77,4 @@ sub canvas_template_handler {
return $pxt->include($file);
}
-sub canvas_trap_handler {
- my $pxt = shift;
-
- $pxt->pnotes($_, $pxt->param($_))
- foreach qw/grail_canvas_handler grail_canvas_formvars/;
-
- $pxt->form_builder_variables(qw/grail_canvas_handler grail_canvas_formvars/);
-}
-
1;
commit dff4a0f4449cc932bfaee5f34ab0b2ba0b3ba74f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:35:58 2009 +0100
timezone_sort not used, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 698d42b..4bc7c62 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -440,37 +440,6 @@ sub user_site_view {
}
-# sort timezones, making the listed ones pop to the top
-sub timezone_sort {
- my $class = shift;
- my @zones = @_;
-
- my $i = 10;
- my %preferred_zones =
- map { $_ => --$i }
- ( "United States (Eastern)",
- "United States (Central)",
- "United States (Indiana)",
- "United States (Mountain)",
- "United States (Arizona)",
- "United States (Pacific)",
- "United States (Alaska)",
- "United States (Hawaii)" );
-
- # now we we-order the timezones based on a random, euro-centric hueristic
- @zones =
- sort {
- my $a_name = $a->{DESCRIPTION};
- my $b_name = $b->{DESCRIPTION};
- my $a_score = $preferred_zones{$a_name} || -1;
- my $b_score = $preferred_zones{$b_name} || -1;
-
- return ($b_score <=> $a_score) || ($a->{OFFSET} <=> $b->{OFFSET})
|| ($a_name cmp $b_name);
- } @zones;
-
- return @zones;
-}
-
sub user_prefs_edit_cb {
my $pxt = shift;
commit 85aa9b4db8e8956de8e66d665a7c6c3fd3619021
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:34:59 2009 +0100
Removal of validate_user made variables @required* and %required* unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index f958340..698d42b 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -440,28 +440,6 @@ sub user_site_view {
}
-my @required_map =
- ( 'login' => 'Username',
- 'password1' => 'Password',
- 'password2' => 'Password Confirmation',
- 'account_type' => 'Account Type',
- 'prefix' => 'Title',
- 'first_names' => 'First Name',
- 'last_name' => 'Last Name',
- 'email' => 'E-mail Address',
- );
-
-unless (PXT::Config->get('satellite')) {
- push @required_map, ('address1' => 'Mailing Address',
- 'city' => 'City',
- 'zip' => 'Zip Code',
- 'phone' => 'Phone');
-
-}
-
-my %required_map = @required_map;
-my @required_fields = map { $_ & 1 ? () : $required_map[$_] } 0..$#required_map;
-
# sort timezones, making the listed ones pop to the top
sub timezone_sort {
my $class = shift;
commit 474163bd98a4f4365fdda752ac4997e096364ef6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:31:50 2009 +0100
validate_user not used, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index b1dbf1f..f958340 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -558,141 +558,6 @@ sub rhn_require {
return '';
}
-sub validate_user {
- my $pxt = shift;
-
- my @param_list = (qw/password1 password2 prefix first_names last_name/,
- qw/genqual parent_company company title phone fax email pin/,
- qw/first_names_ol last_name_ol address1 address2 city state zip country/,
- qw/contact_call contact_email contact_fax contact_mail account_type
education_account/);
-
- my %user_params = map { ("${_}" => ($pxt->dirty_param($_) ||
'')) } @param_list;
- $user_params{login} = $pxt->passthrough_param('login') || '';
-
- $user_params{alt_first_names} = $user_params{first_names};
- $user_params{alt_last_name} = $user_params{last_name};
- $user_params{$_} = $user_params{$_} ? 'Y' : 'N'
- foreach qw/contact_call contact_email contact_fax contact_mail/;
-
- $user_params{$_} =~ s/^\s+// foreach keys %user_params;
- $user_params{$_} =~ s/\s+$// foreach keys %user_params;
-
- my ($min_username, $max_username) = (PXT::Config->get('min_user_len'),
PXT::Config->get('max_user_len'));
-
-
-#-- BEGIN BASIC VALIDATION
- my $validator = 'valid';
-
- if (length $user_params{login} < $min_username) {
- PXT::Debug->log(7, "username too short");
- $pxt->push_message(local_alert =>"Usernames must be no shorter than
$min_username characters.");
- $validator = 'invalid';
- }
- if (length $user_params{login} > $max_username) {
- PXT::Debug->log(7, "username too long");
- $pxt->push_message(local_alert =>"Usernames must be no longer than
$max_username characters.");
- $validator = 'invalid';
- }
-
- if ( ( $user_params{login} !~ /^[\x20-\x7e]+$/ ) or ( $user_params{login} =~
/[&+\s%'`=#"]/ ) ) { #'
- PXT::Debug->log(7, "invalid login chars");
- $pxt->push_message(local_alert =>'The specified user name contains invalid
characters. Please use alphanumeric characters.');
- $validator = 'invalid';
- }
-
- if (not PXT::Config->get('satellite')) {
- if ($user_params{login} =~ /\(a)redhat\.com$/i) {
- $pxt->push_message(local_alert => 'Usernames may not be of the form
"*(a)redhat.com"');
- $validator = 'invalid';
- }
- }
-
- if ($user_params{education_account}) {
- unless ($user_params{company}) {
- $pxt->push_message(local_alert => 'You must enter a school.');
- $validator = 'invalid';
- }
-
- unless ($user_params{title}) {
- $pxt->push_message(local_alert => 'You must enter a grade, year, or
position.');
- $validator = 'invalid';
- }
- }
-
- if ($user_params{account_type} eq 'create_corporate') {
-
- unless ($user_params{company}) {
- $pxt->push_message(local_alert => 'You must enter your company
name.');
- $validator = 'invalid';
- }
- }
-
- my @missing;
- foreach my $field (@required_fields) {
- push @missing, $field if $user_params{$field} =~ /^\s*$/;
- }
-
- if (@missing) {
- my $msg = "The following fields are required to create or modify an account:
<br />";
- if (@missing > 1) {
- $msg .= join(", ", @required_map{@missing[0..$#missing - 1]}) . ",
and " . $required_map{$missing[-1]};
- }
- else {
- $msg .= $required_map{$missing[0]};
- }
-
- PXT::Debug->log(7, "missing fields");
- $pxt->push_message(local_alert =>$msg);
- $validator = 'invalid';
- }
-
- if (not Mail::RFC822::Address::valid($user_params{email})) {
- $pxt->push_message(local_alert =>'Email address is not valid.');
- $validator = 'invalid';
- # no need to display a message twice for invalid and dupe emails.
- }
-
- if ($user_params{country} eq 'US' and not $user_params{state}) {
- PXT::Debug->log(7, "no state");
- $pxt->push_message(local_alert =>'State is required for US
citizens.');
- $validator = 'invalid';
- }
-
- if (length $user_params{password1} < 5) {
- PXT::Debug->log(7, "password short");
- $pxt->push_message(local_alert =>'Passwords must be at least 5 characters
long.');
- $validator = 'invalid';
- }
-
- if (length $user_params{password1} > 32) {
- PXT::Debug->log(7, "password long");
- $pxt->push_message(local_alert =>'Passwords must be shorter than 32
characters long.');
- $validator = 'invalid';
- }
-
- if ($user_params{password1} ne $user_params{password2}) {
- PXT::Debug->log(7, "passwords don't match");
- $pxt->push_message(local_alert =>'Your passwords do not match; please
re-confirm your password of choice.');
- $validator = 'invalid';
- }
-
- if ($user_params{account_type} eq 'into_org') {
- unless ($pxt->user->is('org_admin')) {
- PXT::Debug->log(7, "not an org admin");
- $pxt->push_message(local_alert =>'Only an Org Admin can add a
user');
- $validator = 'invalid';
- }
- }
-
- $user_params{password} = $user_params{password1};
-
- PXT::Debug->log(7, "validator: $validator");
-
- return if $validator eq 'invalid';
-
- return \%user_params;
-}
-
#abstracting permission checking code from rhn_require to here
#takes a 'pxt' and a hash of params, and checks for various states and
permissions
#returns true for success, false for failure
commit f4a691ac8a805c03d945726b4c3f82904f389813
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:17:53 2009 +0100
rhn:accepted not used, removing, as well as tnc_accepted_cb.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 596f57b..b1dbf1f 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -73,15 +73,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:forgot_accounts_cb',
\&forgot_accounts_cb);
$pxt->register_callback('rhn:user_prefs_edit_cb' =>
\&user_prefs_edit_cb);
-
- $pxt->register_callback('rhn:accepted' => \&tnc_accepted_cb);
-}
-
-#Can you see this
-sub tnc_accepted_cb {
- my $pxt = shift;
- $pxt->push_message(site_info => 'Thank you for accepting the Terms and
Conditions!');
- $pxt->redirect("/rhn/YourRhn.do");
}
# secures *all* intraserver links and all links to specified exterior servers
commit fca082d990c16f33e54e2747f784151c3d62b529
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:15:58 2009 +0100
Removal of default_system_groups_cb made set_default_system_groups unused, removing as
dead code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index e9edbaf..5dac40f 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -2514,42 +2514,6 @@ EOQ
return $truth ? 1 : 0;
}
-sub set_default_system_groups {
- my $self = shift;
- my @sgids = grep { $_ } @_;
-
- my $dbh = RHN::DB->connect;
-
- $self->org->owns_server_groups(@sgids)
- or die "Attempt to set system groups (@sgids) for user '" .
$self->id . "' without permission";
-
- my $query =<<EOQ;
-DELETE
- FROM rhnUserDefaultSystemGroups
- WHERE user_id = :user_id
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(user_id => $self->id);
-
- $query =<<EOQ;
-INSERT
- INTO rhnUserDefaultSystemGroups
- (user_id, system_group_id)
-VALUES (:user_id, :sgid)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- foreach my $sgid (@sgids) {
- $sth->execute_h(user_id => $self->id, sgid => $sgid);
- }
-
- $dbh->commit;
-
- return;
-}
-
##
# Sees if user exists in rhnWebContactDisabled view.
# If so, return true(1). Otherwise, the user is an active
commit a9ba672281ee3b7b662e5b0f82b2e6e8cbbf22e7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:15:29 2009 +0100
Removal of default_system_groups_cb made default_system_groups unused, removing as
dead code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 5bbdb4c..e9edbaf 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -2514,29 +2514,6 @@ EOQ
return $truth ? 1 : 0;
}
-sub default_system_groups {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
-
- my $query =<<EOQ;
-SELECT system_group_id
- FROM rhnUserDefaultSystemGroups
- WHERE user_id = :user_id
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(user_id => $self->id);
-
- my @groups;
-
- while (my ($gid) = $sth->fetchrow) {
- push @groups, $gid;
- }
-
- return @groups;
-}
-
sub set_default_system_groups {
my $self = shift;
my @sgids = grep { $_ } @_;
commit 7298ba21505ecaab7a6c03c69cc43ef4fb6a3e36
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:14:09 2009 +0100
rhn:user_default_system_groups_cb not used, removing, as well as
default_system_groups_cb and build_default_system_groups_form.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 1522887..596f57b 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -73,8 +73,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:forgot_accounts_cb',
\&forgot_accounts_cb);
$pxt->register_callback('rhn:user_prefs_edit_cb' =>
\&user_prefs_edit_cb);
-
- $pxt->register_callback('rhn:user_default_system_groups_cb' =>
\&default_system_groups_cb);
$pxt->register_callback('rhn:accepted' => \&tnc_accepted_cb);
}
@@ -833,89 +831,4 @@ sub rhn_user_login {
return $user->login;
}
-sub default_system_groups_cb {
- my $pxt = shift;
-
- my $form = build_default_system_groups_form($pxt);
- my $response = $form->prepare_response;
-
- my $errors = Sniglets::Forms::load_params($pxt, $response);
-
- if (@{$errors}) {
- foreach my $error (@{$errors}) {
- $pxt->push_message(local_alert => $error);
- }
- return;
- }
-
- my @groups = $response->lookup_widget('default_system_groups')->value;
-
- if (ref $groups[0] eq 'ARRAY') {
- @groups = @{$groups[0]};
- }
-
- my $uid = $pxt->param('uid');
- my $user = RHN::User->lookup(-id => $uid);
-
- my @old_groups = $user->default_system_groups;
- $user->set_default_system_groups(@groups);
-
- if (RHN::Utils::sets_differ(\@groups, \@old_groups)) {
- $pxt->push_message(site_info => sprintf('Default system groups updated for
<strong>%s</strong>.', $user->login));
- }
-
- my $url = $pxt->uri;
- $pxt->redirect($url . "?uid=" . $user->id);
-
- return;
-}
-
-sub build_default_system_groups_form {
- my $pxt = shift;
- my %attr = @_;
-
- my $form = new RHN::Form::ParsedForm(name => 'Default System Groups',
- label => 'default_system_groups',
- action => $attr{action},
- );
-
- my $group_selectbox = new RHN::Form::Widget::Select(name => 'Default System
Groups',
- label =>'default_system_groups',
- multiple => 1,
- size => 4);
-
- my $uid = $pxt->param('uid');
- my $user = RHN::User->lookup(-id => $uid);
-
- my $group_perms_ds = new RHN::DataSource::SystemGroup(-mode =>
'user_permissions');
- my $data = $group_perms_ds->execute_full(-formvar_uid => $uid, -org_id =>
$user->org_id);
-
- foreach my $group ( @{$data} ) {
- my $name = $group->{GROUP_NAME};
- my $id = $group->{ID};
-
- if ($group->{HAS_PERMISSION}) {
- $name = '(*) ' . $name;
- }
-
- $group_selectbox->add_option( {value => $id,
- label => $name,
- } );
- }
-
- $group_selectbox->value([ $user->default_system_groups ]);
-
- unless (@{$data}) { #no system groups in org
- $form->add_widget( new RHN::Form::Widget::Literal(name => 'Default System
Groups', value => '<strong>Your organization has no system
groups.</strong>') );
- return $form;
- }
-
- $form->add_widget($group_selectbox);
- $form->add_widget( new RHN::Form::Widget::Hidden(name => 'uid', value
=> $user->id) );
- $form->add_widget( new RHN::Form::Widget::Hidden(name => 'pxt:trap',
value => 'rhn:user_default_system_groups_cb') );
- $form->add_widget( new RHN::Form::Widget::Submit(name => 'Update
Defaults') );
-
- return $form;
-}
-
1;
commit 419453e96464e0ae9b42bc81b7d75dfdf9025882
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:10:38 2009 +0100
Removal of request_account_deactivation_cb made request_deactivation unused, removing
as dead code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 951d30a..5bbdb4c 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -264,18 +264,6 @@ sub delete_user {
}
-# queues up a user to be deleted/disabled
-sub request_deactivation {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare("INSERT INTO rhnUserDeletionQueue (user_id) VALUES
(?)");
-
- $sth->execute($self->id);
- $dbh->commit;
-}
-
-
sub create_custom_data_key {
my $self = shift;
my %params = validate(@_, {label => 1, description => 1});
commit 87ca8874774fc92e4b6a461e53904190bcfa4540
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:09:58 2009 +0100
rhn:request_account_deactivation_cb not used, removing, as well as
request_account_deactivation_cb.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 01b65de..1522887 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -74,7 +74,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:user_prefs_edit_cb' =>
\&user_prefs_edit_cb);
- $pxt->register_callback('rhn:request_account_deactivation_cb' =>
\&request_account_deactivation_cb);
$pxt->register_callback('rhn:user_default_system_groups_cb' =>
\&default_system_groups_cb);
$pxt->register_callback('rhn:accepted' => \&tnc_accepted_cb);
@@ -106,35 +105,6 @@ sub secure_links_if_logged_in {
}
-sub request_account_deactivation_cb {
- my $pxt = shift;
- my $user = $pxt->user;
-
- die "no user!" unless $user;
-
- eval {
- $user->request_deactivation();
- };
-
- if ($@) {
-
- my $E = $@;
-
- if (ref $E and catchable($E) and $E->constraint_value eq
'RHN_UDQUEUE_UID_UQ') {
- $pxt->push_message(site_info => 'We have already logged your deactivation
request and will complete the request as soon as possible.');
- }
- else {
- throw $E;
- }
- }
- else {
- $pxt->push_message(site_info => 'Request for account deactivation
sent.');
- }
-
- $pxt->redirect('/network/account/details.pxt');
-}
-
-
commit 1a0b202541be6e1bf5589bdf7a5233ec6dc98c11
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:09:03 2009 +0100
rhn:delete_user_cb not used, removing, as well as delete_user_cb.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 00762d8..01b65de 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -74,7 +74,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:user_prefs_edit_cb' =>
\&user_prefs_edit_cb);
- $pxt->register_callback('rhn:delete_user_cb' => \&delete_user_cb);
$pxt->register_callback('rhn:request_account_deactivation_cb' =>
\&request_account_deactivation_cb);
$pxt->register_callback('rhn:user_default_system_groups_cb' =>
\&default_system_groups_cb);
@@ -106,45 +105,6 @@ sub secure_links_if_logged_in {
return $params{__block__};
}
-sub delete_user_cb {
- my $pxt = shift;
-
- my $uid = $pxt->param('uid');
- die 'no user id' unless $uid;
-
- if ($uid == $pxt->user->id) {
- $pxt->push_message(local_alert => "You may not delete yourself.");
- $pxt->redirect("/rhn/users/UserDetails.do?uid=$uid");
- }
-
- my $user = RHN::User->lookup(-id => $uid);
- die 'user lookup failed' unless $user;
-
- my $login = $user->login;
-
- eval {
- RHN::User->delete_user($uid);
- };
- if ($@ and catchable($@)) {
- my $E = $@;
-
- if ($E->is_rhn_exception('cannot_delete_user')) {
- $pxt->push_message(local_alert => "Could not delete user
<strong>" . $login . "</strong>.");
- $pxt->redirect("/rhn/users/UserDetails.do?uid=$uid");
- }
- else {
- throw $E;
- }
- }
- else {
- $pxt->push_message(site_info => "Deleted user <strong>" .
$login . "</strong>.");
- }
-
- $pxt->redirect('/rhn/users/index.jsp');
-
- return;
-}
-
sub request_account_deactivation_cb {
my $pxt = shift;
commit 0b18c6523c6719cd058d97541ef3d993e79bd44a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 13:07:43 2009 +0100
Removal of toggle_pref makes rhn:toggle_pref_cb as well as toggle_pref_cb not used,
removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 552da73..00762d8 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -74,10 +74,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:user_prefs_edit_cb' =>
\&user_prefs_edit_cb);
-
- $pxt->register_callback('rhn:toggle_pref_cb' => \&toggle_pref_cb);
-
-
$pxt->register_callback('rhn:delete_user_cb' => \&delete_user_cb);
$pxt->register_callback('rhn:request_account_deactivation_cb' =>
\&request_account_deactivation_cb);
$pxt->register_callback('rhn:user_default_system_groups_cb' =>
\&default_system_groups_cb);
@@ -643,21 +639,6 @@ sub rhn_require {
return '';
}
-sub toggle_pref_cb {
- my $pxt = shift;
-
- my $name = $pxt->dirty_param('pref_name') || '';
- my $value = $pxt->dirty_param('pref_value') || '';
-
- die "rhn:toggle_pref_cb called without proper args ($name, $value)" unless
$name && $value;
-
- $pxt->user->set_pref($name, $value);
-
- $pxt->redirect($pxt->uri);
-
- return;
-}
-
sub validate_user {
my $pxt = shift;
commit fb21a532e75cb386ef0e21ec61129ca28f05021a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:58:24 2009 +0100
Removal of update_site_record and default_bill_address made new_site unused, removing
as dead code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 5b5cfeb..951d30a 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -883,17 +883,6 @@ sub oai_contact_sync {
}
}
-sub new_site {
- my $self = shift;
- my $type = shift;
-
- my $site = bless { }, 'RHN::DB::UserSite';
- $site->{__newly_created__} = 1;
- $site->{__site_id__} = -1;
- $site->site_type($type);
- return $site;
-}
-
# instance OR class method
sub sites {
my $class = shift;
commit fd0938645eb26be51c93c754405784fb0150bc3a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:57:26 2009 +0100
default_bill_address not used anywhere, removing.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index b285bb0..5b5cfeb 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -922,16 +922,6 @@ sub sites {
return @ret;
}
-sub default_bill_address {
- my $self = shift;
-
- my $site = ($self->sites('B'))[0] || ($self->sites('M'))[0] ||
($self->sites('S'))[0];
-
- $site = $self->new_site('B') if not $site;
-
- return $site;
-}
-
# this crap is foobared. unfoobar it later.
sub RHN::DB::UserSite::commit {
commit 18eb709c27c29963d3d5a2e9ea4bc41e4e0581c3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:55:15 2009 +0100
Removal of update_site_record made associated_with_order unused, removing as dead
code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 91404ae..b285bb0 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -992,20 +992,6 @@ sub RHN::DB::UserSite::oai_site_sync {
}
}
-sub RHN::DB::UserSite::associated_with_order {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare("SELECT id FROM web_user_order WHERE web_user_id = ?
AND (bill_to_contact_id = ? OR ship_to_contact_id = ?)");
-
- $sth->execute($self->site_web_user_id, $self->site_id, $self->site_id);
- my ($id) = $sth->fetchrow;
-
- $sth->finish;
-
- return $id ? 1 : 0;
-}
-
sub selection_details {
my $self = shift;
commit 38f633f6979170d97304a1eb4822f9e4134bd7c3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:54:06 2009 +0100
Removal of admin_user_site_edit_cb made update_site_record unused, removing as dead
code.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index acaf7b7..552da73 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -525,91 +525,6 @@ sub user_site_view {
}
-sub update_site_record {
- my $class = shift;
-
- my $pxt = shift;
- my $user = shift;
- my $type = shift;
-
- my $address = $pxt->dirty_param('site_address1') || '';
- if ($address =~ /^\s*$/) {
- $pxt->push_message(local_alert => "You must enter a valid street
address.");
- return;
- }
-
- my $city = $pxt->dirty_param('site_city') || '';
- if ($city =~ /^\s*$/) {
- $pxt->push_message(local_alert => "You must enter a valid city.");
- return;
- }
-
- my $country = $pxt->dirty_param('site_country') || '';
- if ($country =~ /^\s*$/) {
- $pxt->push_message(local_alert => "You must enter a valid
country.");
- return;
- }
-
- my $zip = $pxt->dirty_param('site_zip') || '';
- if ($zip =~ /^\s*$/) {
- $pxt->push_message(local_alert => "You must enter a zipcode.");
- return;
- }
-
- my $state = $pxt->dirty_param('site_state') || '';
- if ($state =~ /^\s*$/) {
- $pxt->push_message(local_alert => "You must enter a state.");
- return;
- }
-
- my $phone = $pxt->dirty_param('site_phone') || '';
- if ($phone =~ /^\s*$/) {
- $pxt->push_message(local_alert => "You must enter a phone number.");
- return;
- }
-
- my ($site) = $user->sites($type);
-
- if ($site) {
- if (($site->site_type eq 'B' or $site->site_type eq 'S') and
$site->associated_with_order()) {
- $site = $user->new_site($type);
- }
- }
- else {
- $site = $user->new_site($type);
- }
-
- my $changed = 0;
- foreach (qw/site_address1 site_address2 site_address3 site_city site_state site_zip
site_country site_zip site_phone site_fax/) {
- my $value = $site->$_() || '';
- if ($value ne ($pxt->dirty_param($_) || '')) {
- $changed = 1;
- if ($_ eq 'site_state') {
- $site->$_(uc $pxt->dirty_param($_))
- }
- else {
- $site->$_($pxt->dirty_param($_))
- }
- }
- }
-
- $site->site_alt_first_names($user->first_names);
- $site->site_alt_last_name($user->last_name);
- my $site_email = $site->site_email || '';
-
- if ($user->email ne $site_email) {
- $site->site_email($user->email);
- $changed = 1;
- }
-
- $site->site_web_user_id($user->id);
- $site->site_type($type);
-
- $site->commit;
-
- return (1, $changed);
-}
-
my @required_map =
( 'login' => 'Username',
'password1' => 'Password',
commit 91691f0486d5e3e3d39e6cab6c5234b96115a0a4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:52:33 2009 +0100
rhn:admin_user_site_edit_cb not used, removing, as well as admin_user_site_edit_cb.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 16fcbd9..acaf7b7 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -72,8 +72,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:forgot_password_cb',
\&forgot_password_cb);
$pxt->register_callback('rhn:forgot_accounts_cb',
\&forgot_accounts_cb);
- $pxt->register_callback('rhn:admin_user_site_edit_cb' =>
\&admin_user_site_edit_cb);
-
$pxt->register_callback('rhn:user_prefs_edit_cb' =>
\&user_prefs_edit_cb);
@@ -612,33 +610,6 @@ sub update_site_record {
return (1, $changed);
}
-sub admin_user_site_edit_cb {
- my $pxt = shift;
-
- my $uid = $pxt->param('uid');
- my $user = RHN::User->lookup(-id => $uid);
-
- my $incomplete = $user->has_incomplete_info;
- my $broken;
- $broken = 1 if $incomplete;
-
- my ($success, $changed) = Sniglets::Users->update_site_record($pxt, $user,
$pxt->dirty_param('type'));
- return unless $success;
-
- $incomplete = $user->has_incomplete_info;
-
- if ($broken and not $incomplete) {
- $pxt->push_message(site_info => 'Thank you for completely filling out your
account information.');
- $pxt->redirect('/network/');
- }
-
- $pxt->push_message(site_info => 'Address changed.');
-
- $pxt->redirect('/network/') if
($pxt->dirty_param('redirect_to_main_page'));
- $pxt->redirect('/network/account/addresses.pxt') if
($pxt->dirty_param('redirect_to_my_addresses'));
- $pxt->redirect('/rhn/users/Addresses.do?uid=' . $user->id) if
($pxt->dirty_param('redirect_to_user_addresses'));
-}
-
my @required_map =
( 'login' => 'Username',
'password1' => 'Password',
commit 783a62c3e98f3932e807f347da4f1da67b7c1edf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:46:51 2009 +0100
Removal of add_users_to_groups made org_applicant_group_from_ugid unused, removing as
dead code.
diff --git a/web/modules/rhn/RHN/DB/Org.pm b/web/modules/rhn/RHN/DB/Org.pm
index 7dccf33..a776387 100644
--- a/web/modules/rhn/RHN/DB/Org.pm
+++ b/web/modules/rhn/RHN/DB/Org.pm
@@ -562,29 +562,6 @@ EOSQL
return ($count, $sec, $bug, $enh);
}
-sub org_applicant_group_from_ugid {
- my $class = shift;
- my $ugid = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT UG1.id
- FROM rhnUserGroupType UGT,
- rhnUserGroup UG1,
- rhnUserGroup UG2
- WHERE UG1.group_type = UGT.id
- AND UGT.label = 'org_applicant'
- AND UG1.org_id = UG2.org_id
- AND UG2.id = ?
-EOQ
-
- $sth->execute($ugid);
- my ($ret) = $sth->fetchrow;
- $sth->finish;
-
- return $ret;
-}
-
sub entitlement_counts {
my $self = shift;
my $entitlement = shift;
commit 35431d25d2dda20654f6b2b6f1dfef219fc6666a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:44:36 2009 +0100
Removal of admin_user_edit_cb made add_users_to_groups unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index f34a2f2..91404ae 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -932,41 +932,6 @@ sub default_bill_address {
return $site;
}
-# Now an object method because we need a user who owns the set
-sub add_users_to_groups {
- my $self = shift;
- my @users = @{+shift};
- my @groups = @{+shift};
- my $pending = shift;
-
- return unless @users and @groups;
-
- my $dbh = RHN::DB->connect;
-
- my $query = "delete from rhnSet where user_id = :user_id and label =
:label";
- my $sth0 = $dbh->prepare($query);
- $sth0->execute_h(user_id => $self->id, label =>
"user_group_list");
-
- my $sth1 = $dbh->prepare(<<EOQ);
-INSERT INTO rhnSet (user_id, label, element, element_two)
- values (:set_owner, 'user_group_list', :user_id, :ugid)
-EOQ
-
- my $pending_group = RHN::Org->org_applicant_group_from_ugid($groups[0]);
-
- foreach my $user_id (@users) {
- foreach my $group_id (@groups) {
- next if ($pending_group and ($group_id == $pending_group) and (!$pending));
- $sth1->execute_h(set_owner => $self->id, user_id => $user_id, ugid
=> $group_id);
- }
- }
-
- $dbh->call_procedure("rhn_user.add_users_to_usergroups", $self->id);
- $sth0->execute_h(user_id => $self->id,
label=>"user_group_list");
-
- $dbh->commit;
-}
-
# this crap is foobared. unfoobar it later.
sub RHN::DB::UserSite::commit {
commit 46a06362b317403cecf18124ceba7bc018b64451
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:43:47 2009 +0100
Removal of admin_user_edit_cb made remove_users_from_groups unused, removing as dead
code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 69981b5..f34a2f2 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -967,36 +967,6 @@ EOQ
$dbh->commit;
}
-# Now an object method because we need a user who owns the set
-sub remove_users_from_groups {
- my $self = shift;
- my @users = @{+shift};
- my @groups = @{+shift};
-
- return unless @users and @groups;
- my $dbh = RHN::DB->connect;
-
- my $query = "delete from rhnSet where user_id = :user_id and label =
:label";
- my $sth0 = $dbh->prepare($query);
- $sth0->execute_h(user_id=>$self->id, label=>"user_group_list");
-
- my $sth1 = $dbh->prepare(<<EOQ);
-INSERT INTO rhnSet (user_id, label, element, element_two)
- values (:owner, 'user_group_list', :user_id, :ugid)
-EOQ
-
- for my $user (@users) {
- for my $group (@groups) {
- $sth1->execute_h(owner=>$self->id, user_id=>$user, ugid=>$group);
- }
- }
-
- $dbh->call_procedure("rhn_user.remove_users_from_servergroups",
$self->id);
-
- $sth0->execute_h(user_id=>$self->id, label=>"user_group_list");
- $dbh->commit;
-}
-
# this crap is foobared. unfoobar it later.
sub RHN::DB::UserSite::commit {
commit 385c0fa91f9ec9908ab5b49e59e5c5f155eae7c9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:42:34 2009 +0100
Removal of group_checkboxes and admin_user_edit_cb made group_list_for_user unused,
removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index cb7daf4..69981b5 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -997,29 +997,6 @@ EOQ
$dbh->commit;
}
-sub group_list_for_user {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $query = <<EOS;
- SELECT MAX(DECODE(user_id, ?, 1, 0)), GROUP_ID, GROUP_NAME, GROUP_TYPE
- FROM rhnUserGroupMembership
- WHERE ORG_ID = ?
-GROUP BY group_id, group_name, group_type
-ORDER BY UPPER(group_name), group_id
-EOS
-
- my $sth = $dbh->prepare($query);
- $sth->execute($self->id, $self->org_id);
-
- my @ret;
- while (my ($user_member, $id, $name, $group_type) = $sth->fetchrow) {
- push @ret, [ $user_member, $id, $name, $group_type ];
- }
-
- return @ret;
-}
-
# this crap is foobared. unfoobar it later.
sub RHN::DB::UserSite::commit {
commit 24f16f4fc9de72e7db40123003b7b37a3c1de60c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 12:41:42 2009 +0100
Removal of Sniglets::Inspector made group_checkboxes unused, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index b7b7576..16fcbd9 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -661,29 +661,6 @@ unless (PXT::Config->get('satellite')) {
my %required_map = @required_map;
my @required_fields = map { $_ & 1 ? () : $required_map[$_] } 0..$#required_map;
-sub group_checkboxes {
- my $formvar = shift;
- my $user = shift;
-
- my @groups = $user->group_list_for_user;
-
- my $ret;
-
- foreach my $line (@groups) {
- next if !$line->[0] and $line->[3] and $line->[3] eq
'org_applicant';
-
- $ret .= PXT::HTML->checkbox(-name => $formvar,
- -value => $line->[1], #group_id
- -checked => $line->[0]); #user has permissions to group
-
- $ret .= $line->[2]; #group_name
-
- $ret .= "<br />\n";
- }
-
- return $ret;
-}
-
# sort timezones, making the listed ones pop to the top
sub timezone_sort {
my $class = shift;
commit 435bb1300957316382fd1f571e4e084fc026d3e3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:46:03 2009 +0100
Removal of user_details.xml made rhn:admin_user_edit_cb, as well as admin_user_edit_cb
unused, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index cbad168..b7b7576 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -72,7 +72,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:forgot_password_cb',
\&forgot_password_cb);
$pxt->register_callback('rhn:forgot_accounts_cb',
\&forgot_accounts_cb);
- $pxt->register_callback('rhn:admin_user_edit_cb' =>
\&admin_user_edit_cb);
$pxt->register_callback('rhn:admin_user_site_edit_cb' =>
\&admin_user_site_edit_cb);
$pxt->register_callback('rhn:user_prefs_edit_cb' =>
\&user_prefs_edit_cb);
@@ -457,109 +456,6 @@ sub rhn_login_cb {
}
-sub admin_user_edit_cb {
- my $pxt = shift;
-
- my $user = Sniglets::Forms::catch_form($pxt);
- return unless $user;
-
- $pxt->redirect("/errors/permission.pxt") unless
$pxt->user->can_modify_user($user);
-
- if ($pxt->dirty_param('user_password_confirm') ne
$pxt->dirty_param('user_password')) {
- $pxt->push_message(local_alert => 'Password and confirmation do not
match');
- return;
- }
-
-# validation done, start modifying
-
-# pam authentication is a satellite feature
- if (PXT::Config->get('pam_auth_service') and not
$pxt->dirty_param('editing_self')) {
- $user->set_pref(use_pam_authentication =>
($pxt->dirty_param('use_pam_authentication') ? 'Y' : 'N'));
- }
- elsif ($pxt->dirty_param('user_password') =~ /[^*]/) { # otherwise, just set
the password
- $user->set_password($pxt->dirty_param('user_password'))
- }
-
- my $url = new URI ($pxt->uri);
-
- eval {
- # Set the user's roles/groups
- if (not $pxt->dirty_param('editing_self') and
$pxt->user->is('org_admin')) {
- my %old_groups = map { $_->[1] => 1 } grep { $_->[0] }
$user->group_list_for_user;
- my %new_groups = map { $_ => 1 } $pxt->dirty_param('user_groups');
-
- my $chan_admin_group = $user->org->user_group_id('channel_admin') ||
0;
- my $conf_admin_group = $user->org->user_group_id('config_admin') ||
0;
-
- if ($user->is('org_admin') and exists ($old_groups{$chan_admin_group}))
{
- $new_groups{$chan_admin_group} = 1;
- }
-
- if ($user->is('org_admin') and exists ($old_groups{$conf_admin_group}))
{
- $new_groups{$conf_admin_group} = 1;
- }
-
- my @remove = grep { not exists $new_groups{$_} } keys %old_groups;
- my @add = grep { not exists $old_groups{$_} } keys %new_groups;
-
- my $admin_group = $user->org->user_group_id('org_admin');
-
- if ($user->is('org_admin') && (grep { $_ == $admin_group}
@remove)) {
- if ($user->org->org_admins == 1) {
- $pxt->push_message(local_alert => 'This user is the last Org Admin for this
Org. You cannot remove him from the Org Admins group.');
- return;
- }
- elsif ($user->id == $pxt->user->id) {
- $pxt->push_message(site_info => "You have removed your Org Admin
privileges.");
- $url->path_query('/rhn/YourRhn.do');
- }
- }
-
- $user->remove_users_from_groups([ $user->id ], \@remove);
- $user->add_users_to_groups([ $user->id ], \@add);
- }
- };
-
- if ($@ and catchable($@)) {
- my $E = $@;
-
- if ($E->is_rhn_exception('usergroup_max_members')) {
- $pxt->push_message(local_alert => "Maximum group membership
exceeded.");
- return;
- }
- else {
- throw $E;
- }
- }
-
-# Set company name
- $user->company($user->org->name)
- if $user->org->customer_type eq 'B';
-
-# set marketing site info
- my ($marketing_site) = $user->sites('M');
- if ($marketing_site) {
- $marketing_site->site_alt_first_names($user->first_names);
- $marketing_site->site_alt_last_name($user->last_name);
-
-# commit changes
- $marketing_site->commit;
- }
-
- $user->commit;
-
- $pxt->push_message(site_info => 'User information updated.');
-
- unless ($pxt->dirty_param('editing_self')) {
- $url->query_form(uid => $user->id);
- }
-
- $url->query_form($url->query_form, rand => int rand 5000000);
-
- $pxt->redirect($url->as_string)
-}
-
-
sub user_site_view {
my $pxt = shift;
my %params = @_;
commit 74811eb5563e233ab5120c16b1b5b6a15eec86cb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:43:29 2009 +0100
Since web/html/network/account/details.pxt is no longer present, /forms is not
referenced, removing.
diff --git a/web/html/forms/.htaccess b/web/html/forms/.htaccess
deleted file mode 100644
index a1f3909..0000000
--- a/web/html/forms/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require no-access
-
diff --git a/web/html/forms/user_details.xml b/web/html/forms/user_details.xml
deleted file mode 100644
index 2d342f7..0000000
--- a/web/html/forms/user_details.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<rhn-form
xmlns:xi="http://www.w3.org/2001/XInclude" name="User
Details" label="user_details" action="index.pxt"
method="post">
- <widget type="literal" name="Company Name"
label="company" />
- <widget type="literal" name="Username" label="login"
/>
- <xi:include href="user_prefixes.xml" />
-<!--
-or:
- <widget type="select" name="Prefix" label="prefix"
/>
-or:
- <widget type="select" name="Prefix" label="prefix"
default="Mr.">
- <opt name="Dr." label="Dr."/>
- <opt name="Hr." label="Hr." />
- <opt name="Miss" label="Miss" />
- <opt name="Mr." label="Mr." />
- <opt name="Mrs." label="Mrs." />
- <opt name="Ms." label="Ms." />
- <opt name="Sr." label="Sr." />
- </widget>
--->
- <widget type="text" name="First name"
label="first_names" size="20">
- <filter type="text" />
- <require response="1" />
- </widget>
- <widget type="text" name="Last name" label="last_name"
size="20">
- <filter type="text" />
- <require response="1" />
- </widget>
- <widget type="text" name="Position" label="title"
size="30">
- <filter type="text" />
- </widget>
- <widget type="literal" name="User Type"
label="user_type" default="(normal user)"
acl="org_entitlement(sw_mgr_enterprise)"/>
- <widget type="checkbox" name="Use PAM"
label="use_pam_authentication" acl="global_config(pam_auth_service)"
default="1"/>
- <widget type="password" name="Password"
label="user_password" size="20" maxlength="32">
- <filter type="password" />
- <require min-length="5" />
- <require max-length="32" />
- </widget>
- <widget type="password" name="Confirm Password"
label="user_password_confirm" size="20" maxlength="32">
- <filter type="password" />
- <require min-length="5" />
- <require max-length="32" />
- </widget>
- <widget type="literal" name="Email"
label="email_address" default="(none)" />
- <widget type="checkbox_group" name="Roles"
label="user_groups"
acl="org_entitlement(sw_mgr_enterprise);user_role(org_admin)"/>
- <widget type="literal" name="Created"
label="user_created" default="(no data)"/>
- <widget type="literal" name="Last Sign In"
label="last_login" default="(never)"/>
-
- <widget type="hidden" label="pxt:trap"
default="rhn:admin_user_edit_cb" />
- <widget type="hidden" label="uid" />
- <widget type="hidden" label="source"
default="RHN::User" />
- <widget type="hidden" label="id_formvar" default="uid"
/>
- <widget type="hidden" label="editing_self" default="0"
/>
- <widget type="submit" label="Update" />
-</rhn-form>
diff --git a/web/html/forms/user_prefixes.xml b/web/html/forms/user_prefixes.xml
deleted file mode 100644
index c216ed5..0000000
--- a/web/html/forms/user_prefixes.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
- <widget type="select" name="Prefix" label="prefix"
default="Mr.">
- <opt value="Dr." label="Dr."/>
- <opt value="Hr." label="Hr." />
- <opt value="Miss" label="Miss" />
- <opt value="Mr." label="Mr." />
- <opt value="Mrs." label="Mrs." />
- <opt value="Ms." label="Ms." />
- <opt value="Sr." label="Sr." />
- </widget>
commit d5742367992f8ec1d4aa6f107b07fcacc761a471
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:36:33 2009 +0100
rhn:logout_cb not used, removing, as well as rhn_logout_cb.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index d0c56a5..cbad168 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -71,8 +71,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:login_cb', \&rhn_login_cb);
$pxt->register_callback('rhn:forgot_password_cb',
\&forgot_password_cb);
$pxt->register_callback('rhn:forgot_accounts_cb',
\&forgot_accounts_cb);
- $pxt->register_callback('rhn:logout_cb', \&rhn_logout_cb);
-
$pxt->register_callback('rhn:admin_user_edit_cb' =>
\&admin_user_edit_cb);
$pxt->register_callback('rhn:admin_user_site_edit_cb' =>
\&admin_user_site_edit_cb);
@@ -458,23 +456,6 @@ sub rhn_login_cb {
}
-sub rhn_logout_cb {
- my $pxt = shift;
-
- $pxt->clear_user;
- $pxt->session->uid(undef);
- $pxt->clear_session;
-
- if ($pxt->dirty_param('logout_redirect')) {
- my @extra_params = grep { $_ ne 'logout_redirect' and $_ ne
'pxt:trap' and $_ ne ''} $pxt->param();
- my $extra_params = @extra_params ? "?" . join("&", map { $_ .
"=" . $pxt->param($_) } @extra_params) : "";
- $pxt->redirect($pxt->dirty_param('logout_redirect') . $extra_params);
- }
- else {
- $pxt->redirect('/rhn/Logout.do');
- }
-}
-
sub admin_user_edit_cb {
my $pxt = shift;
commit a9683d7ca45b20413f54c9837d5daf8159569bb9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:32:45 2009 +0100
Removal of education_cb made enter_edu_holding_pen unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Org.pm b/web/modules/rhn/RHN/DB/Org.pm
index 864432a..7dccf33 100644
--- a/web/modules/rhn/RHN/DB/Org.pm
+++ b/web/modules/rhn/RHN/DB/Org.pm
@@ -1017,23 +1017,6 @@ EOQ
}
-sub enter_edu_holding_pen {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $query = <<EOQ;
-INSERT INTO rhnEduHoldingPen
- (org_id)
-VALUES
- (?)
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- $dbh->commit;
-}
-
# all roles that are available to the org
sub available_roles {
my $self = shift;
commit 3533c55318aaefd788ecd2c3d05f876ec6346255
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:31:44 2009 +0100
rhn:education_cb not used, removing, as well as education_cb.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index 6401b0a..d0c56a5 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -68,8 +68,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:education_cb' => \&education_cb);
-
$pxt->register_callback('rhn:login_cb', \&rhn_login_cb);
$pxt->register_callback('rhn:forgot_password_cb',
\&forgot_password_cb);
$pxt->register_callback('rhn:forgot_accounts_cb',
\&forgot_accounts_cb);
@@ -186,45 +184,6 @@ sub request_account_deactivation_cb {
}
-sub education_cb {
- my $pxt = shift;
-
- eval {
- $pxt->user->org->enter_edu_holding_pen();
- };
- if ($@) {
- my $E = $@;
- if (ref($E) eq 'RHN::Exception') {
- if ($E->constraint_value eq 'RHN_EDU_HP_OID_UQ') {
- $pxt->push_message(local_alert => 'Your application is currently being
processed.');
- return;
- }
- else {
- warn "unknown error in education_cb: " . Data::Dumper->Dump([($@)]);
- die $@;
- }
- }
- else {
- # passthrough, add real error checking later
- die $@;
- }
- }
- else {
- my ($login, $uid, $env, $oid) = ($pxt->user->login, $pxt->user->id,
$pxt->hostname, $pxt->user->org->id);
- RHN::Mail->send(to => PXT::Config->get('education_account_email'),
- subject => "EDUCATION: User $login has subscribed to the education
channels",
- headers => { "X-RHN-Info" =>
"education_account_creation"},
- body => <<EOB);
-
-The user $login (uid $uid, oid $oid) has subscribed to the education
-channels in the $env environment.
-
-EOB
-
- $pxt->redirect("/newlogin/education_pending.pxt");
- }
-}
-
commit 2715827478ec46d24d30061f63f174e863499dfe
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:29:23 2009 +0100
Removal of create_profile_from_system_cb made base_channel_list unused, removing as
dead code.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index caccfda..6956425 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -786,34 +786,6 @@ EOQ
return RHN::Utils->parameterize(\@channels, 'id', 'name');
}
-sub base_channel_list {
- my $class = shift;
- my $org_id = shift;
-
- my $dbh = RHN::DB->connect;
-
- my $query;
- my $sth;
-
- $query = <<EOQ;
-SELECT AC.channel_name, AC.channel_id, AC.channel_arch_id
- FROM rhnAvailableChannels AC
- WHERE AC.org_id = ?
- AND AC.channel_depth = 1
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($org_id);
-
- my @channels;
-
- while (my @row = $sth->fetchrow) {
- push @channels, [ @row ];
- }
-
- return @channels;
-}
-
sub package_groups {
my $class = shift;
my $channel_id = shift;
commit 04174489f0335eb0a3a6998a7e175c2d427a14b0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:26:05 2009 +0100
rhn:create_profile_from_system_cb not used, removing, as well as
create_profile_from_system_cb.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 9333fc1..9ff3869 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -31,65 +31,6 @@ sub register_callbacks {
my $pxt = shift;
$pxt->register_callback('rhn:sync_server_cb' => \&sync_server_cb);
-
- $pxt->register_callback('rhn:create_profile_from_system_cb' =>
\&create_profile_from_system_cb);
-}
-
-sub create_profile_from_system_cb {
- my $pxt = shift;
-
- my $name = $pxt->dirty_param('name');
- my $description = $pxt->dirty_param('description');
-
- unless ($name && $description) {
- $pxt->push_message(local_alert => "A system profile must have both a name
and a description.");
- return
- }
-
- my $profile = RHN::Profile->create;
-
- $profile->org_id($pxt->user->org_id);
- my $system = RHN::Server->lookup(-id => $pxt->param('sid'));
- throw "no system!" unless $system;
-
- unless ($system->base_channel_id) {
- $pxt->push_message(local_alert => "This system must be subscribed to a
base channel before a package profile can be created.");
- return;
- }
-
- $profile->base_channel($system->base_channel_id);
- $profile->$_($pxt->dirty_param($_)) foreach qw/name description/;
-
- throw "profile base channel not in org"
- unless grep { $_->[1] == $profile->base_channel }
- RHN::Channel->base_channel_list($pxt->user->org_id);
-
- eval {
- $profile->commit;
- };
- if ($@) {
- my $E = $@;
- if (ref $E and catchable($E)) {
- if ($E->is_rhn_exception('RHN.RHN_SERVER_PROFILE_NOID_UQ')) {
- $pxt->push_message(local_alert => "A profile with that name already
exists.");
- return;
- }
- else {
- throw $E;
- }
- }
- else {
- die $E;
- }
- }
-
- $profile->copy_from(-sid => $system->id);
-
- $pxt->push_message(site_info => sprintf('Profile
<strong>%s</strong> successfully created from
<strong>%s</strong>.', PXT::Utils->escapeHTML($profile->name),
PXT::Utils->escapeHTML($system->name)));
-
- my $redir = $pxt->dirty_param('redirect_success');
- throw "param 'redirect_success' needed but not provided." unless
$redir;
- $pxt->redirect($redir);
}
sub sync_server_cb {
commit cf9841b396d6e2eec324aec1574b20a929024d3e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:24:11 2009 +0100
register_tags without content can be removed as well.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 80832cf..9333fc1 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -26,12 +26,6 @@ use PXT::Utils;
use Data::Dumper;
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
-}
-
sub register_callbacks {
my $class = shift;
my $pxt = shift;
commit e446de035c4f4077d2d6431e2944d0eb31d42f43
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:23:45 2009 +0100
rhn:profile_edit_cb not used, removing, as well as profile_edit_cb.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 76a3295..80832cf 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -36,23 +36,11 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:profile_edit_cb' => \&profile_edit_cb);
$pxt->register_callback('rhn:sync_server_cb' => \&sync_server_cb);
$pxt->register_callback('rhn:create_profile_from_system_cb' =>
\&create_profile_from_system_cb);
}
-sub profile_edit_cb {
- my $pxt = shift;
-
- my $profile = RHN::Profile->lookup(-id => $pxt->param('prid'));
- $profile->name($pxt->dirty_param('profile_name'));
- $profile->description($pxt->dirty_param('profile_description'));
- $profile->commit;
-
- $pxt->redirect("details.pxt", prid => $profile->id);
-}
-
sub create_profile_from_system_cb {
my $pxt = shift;
commit c39846c65217ce1f1b64289fed9e0b3956aaff1a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:22:22 2009 +0100
Removal of profile_delete_cb made delete_profile unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Profile.pm b/web/modules/rhn/RHN/DB/Profile.pm
index c192f6a..5bdfae1 100644
--- a/web/modules/rhn/RHN/DB/Profile.pm
+++ b/web/modules/rhn/RHN/DB/Profile.pm
@@ -384,25 +384,6 @@ EOS
return @packages;
}
-sub delete_profile {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-DELETE FROM rhnServerProfilePackage WHERE server_profile_id = :prid
-EOQ
-
- $sth->execute_h(prid => $self->id);
-
- $sth = $dbh->prepare(<<EOQ);
-DELETE FROM rhnServerProfile WHERE id = :prid
-EOQ
-
- $sth->execute_h(prid => $self->id);
-
- return;
-}
-
sub load_package_manifest {
my $self = shift;
my $mfst = new RHN::Manifest(-org_id => $self->org_id);
commit 7573fdcb98225c0e901a51899242cd03125f27d2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 11:20:30 2009 +0100
rhn:profile_delete_cb not used, removing, as well as profile_delete_cb.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm
b/web/modules/sniglets/Sniglets/Profiles.pm
index 84b4ea3..76a3295 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -36,7 +36,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:profile_delete_cb' =>
\&profile_delete_cb);
$pxt->register_callback('rhn:profile_edit_cb' => \&profile_edit_cb);
$pxt->register_callback('rhn:sync_server_cb' => \&sync_server_cb);
@@ -111,25 +110,6 @@ sub create_profile_from_system_cb {
$pxt->redirect($redir);
}
-sub profile_delete_cb {
- my $pxt = shift;
-
- my $prid = $pxt->param('prid');
- throw "No profile id" unless $prid;
-
- my $sid = $pxt->param('sid');
-
- my $profile = RHN::Profile->lookup(-id => $prid);
-
- my $name = PXT::Utils->escapeHTML($profile->name);
- $profile->delete_profile;
-
- my $redir = $pxt->dirty_param('delete_success_page');
- throw "param 'delete_success_page' needed but not provided." unless
$redir;
- $pxt->push_message(site_info => "Profile <strong>$name</strong>
deleted.");
- $pxt->redirect($redir, ($sid ? (sid => $sid) : ()));
-}
-
sub sync_server_cb {
my $pxt = shift;
my $missing_packages_option = shift || '';