web/modules/rhn/RHN/DB/Server.pm | 33 ------------------------------
web/modules/rhn/RHN/DB/User.pm | 42 ---------------------------------------
2 files changed, 75 deletions(-)
New commits:
commit 1487890c84b411b92715113b3471c4137317061b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 29 12:16:10 2011 +0200
Removal of system_value_edit makes set_custom_value unused, dropping.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 38545a3..36e5283 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -233,21 +233,6 @@ EOQ
return $action;
}
-sub set_custom_value {
- my $self = shift;
-
- foreach my $param (@_) {
- die "$param tainted!" if Scalar::Util::tainted($param);
- }
-
- my %params = validate(@_, {user_id => 1, key_label => 1, value => 0,
transaction => 0} );
-
- my $dbh = $params{transaction} || RHN::DB->connect();
- $dbh->call_procedure('rhn_server.set_custom_value', $self->id,
$params{user_id}, $params{key_label}, $params{value});
-
- $dbh->commit unless $params{transaction};
-}
-
sub bulk_set_custom_value {
my $class = shift;
my %params = validate(@_, {set_label => 1, user_id => 1, key_label => 1, value
=> 0});
commit 866278998b5f7bdfecb368064e2dcb38ccc14606
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 29 12:14:24 2011 +0200
Removal of remove_system_value makes remove_custom_value unused, dropping.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 361afb5..38545a3 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -233,24 +233,6 @@ EOQ
return $action;
}
-sub remove_custom_value {
- my $self = shift;
- my $key_id = shift;
-
- die "no key id" unless $key_id;
-
- my $dbh = RHN::DB->connect();
- my $sth = $dbh->prepare(<<EOQ);
-DELETE FROM rhnServerCustomDataValue
- WHERE server_id = :server_id
- AND key_id = :key_id
-EOQ
-
- $sth->execute_h(server_id => $self->id, key_id => $key_id);
-
- $dbh->commit;
-}
-
sub set_custom_value {
my $self = shift;
commit 21448e8a0f8b33bc27612121f873fcc23867ca03
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 29 12:11:36 2011 +0200
The can_delete_custominfokey no longer used after previous removals, removing.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 9164f67..4d804df 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -1781,48 +1781,6 @@ sub lock_web_contact {
}
-sub can_delete_custominfokey {
- my $self = shift;
- my $key_id = shift;
-
- my $key = RHN::CustomInfoKey->lookup(-id => $key_id);
-
- throw 'no key' unless $key;
-
- return 1 if $self->is('org_admin');
-
-# unless (defined $key->creator_id) {
-# return 0;
-# }
-#
-# unless ($key->creator_id == $self->id) {
-# return 0;
-# }
-
- my $dbh = RHN::DB->connect();
- my $sth = $dbh->prepare(<<EOQ);
-SELECT 1
- FROM rhnServerCustomDataValue SCDV,
- rhnServer S
- WHERE S.org_id = :org_id
- AND S.id = SCDV.server_id
- AND SCDV.key_id = :key_id
- AND NOT EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE user_id = :user_id AND
server_id = S.id)
-EOQ
-
- $sth->execute_h(user_id => $self->id,
- org_id => $self->org_id,
- key_id => $key_id,
- );
-
- my ($row) = $sth->fetchrow;
- $sth->finish;
-
- return 0 if defined $row;
-
- return 1;
-}
-
sub manages_a_channel {
my $self = shift;
Show replies by date