5 commits - schema/spacewalk web/modules
by Jan Pazdziora
schema/spacewalk/oracle/packages/packages.deps | 1
schema/spacewalk/postgres/packages/packages.deps | 1
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 27 ------------
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 23 ----------
web/modules/sniglets/Sniglets/Org.pm | 31 --------------
5 files changed, 83 deletions(-)
New commits:
commit 4a6f63f103cbe71d4cf2f90fb92e4550f59ab100
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:55:57 2009 +0100
Previous removal made use RHN::Kickstart::IPRange obsolete, removing.
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index 4d97bd2..e5702b9 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -23,7 +23,6 @@ use RHN::DataSource::Simple;
use RHN::Exception qw/throw/;
use RHN::Token;
use RHN::Kickstart;
-use RHN::Kickstart::IPRange;
use RHN::Kickstart::Session;
use RHN::Utils;
commit df9577f02d6f8ca28d2eeb925fede3feca939abb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:54:45 2009 +0100
rhn-listview mode ip_ranges_for_org not used, making ip_ranges_provider and query ip_ranges_for_org 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 4be8867..d002b5c 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -289,18 +289,6 @@ SELECT KSS.id, S.name AS system_name
</elaborator>
</mode>
-<mode name="ip_ranges_for_org">
- <query params="org_id">
- SELECT IPR.org_id || IPR.min || IPR.max AS ID,
- IPR.org_id, IPR.min, IPR.max,
- KS.id AS kickstart_id, KS.label
- FROM rhnKickstartIPRange IPR, rhnKSData KS
- WHERE IPR.org_id = :org_id
- AND KS.id = IPR.kickstart_id
-ORDER BY IPR.min
- </query>
-</mode>
-
<mode name="kickstart_session_history">
<query params="kssid">
SELECT KSH.id,
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index 209f343..4d97bd2 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -105,10 +105,6 @@ sub _register_modes {
-datasource => RHN::DataSource::General->new,
-provider => \&kickstart_sessions_provider);
- Sniglets::ListView::List->add_mode(-mode => "ip_ranges_for_org",
- -datasource => RHN::DataSource::General->new,
- -provider => \&ip_ranges_provider);
-
Sniglets::ListView::List->add_mode(-mode => "kickstart_session_history",
-datasource => RHN::DataSource::General->new,
-provider => \&session_history_provider);
@@ -231,21 +227,6 @@ sub kickstart_sessions_provider {
return (%ret);
}
-sub ip_ranges_provider {
- my $self = shift;
- my $pxt = shift;
-
- my %ret = $self->default_provider($pxt);
-
- foreach my $row (@{$ret{data}}) {
- my $range = new RHN::Kickstart::IPRange(-min => $row->{MIN}, -max => $row->{MAX});
-
- $row->{RANGE} = sprintf('<tt>%s - %s</tt>', $range->min, $range->max);
- }
-
- return (%ret);
-}
-
sub session_history_provider {
my $self = shift;
my $pxt = shift;
commit a25b1a89c5f2e8d1e89742ece271bb58871d3bcb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:53:24 2009 +0100
rhn-listview mode private_kstrees_for_user not used, making query private_kstrees_for_user 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 c948356..4be8867 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -252,21 +252,6 @@ ORDER BY KTT.id, KT.label
</query>
</mode>
-<mode name="private_kstrees_for_user">
- <query params="user_id">
-SELECT KT.id, KT.base_path, KT.channel_id, KT.label, KT.boot_image,
- UAC.channel_name, UAC.channel_label,
- KTT.label AS KSTREE_TYPE_LABEL, KTT.name AS KSTREE_TYPE_NAME
- FROM rhnKSTreeType KTT, rhnKickstartableTree KT, web_contact wc, rhnUserAvailableChannels UAC
- WHERE UAC.user_id = :user_id
- AND wc.id = :user_id
- AND KT.channel_id = UAC.channel_id
- AND KTT.id = KT.kstree_type
- AND KT.org_id = wc.org_id
-ORDER BY KTT.id, KT.label
- </query>
-</mode>
-
<mode name="kickstart_sessions_for_org">
<query params="org_id, days">
SELECT KSS.id,
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index f074061..209f343 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -109,9 +109,6 @@ sub _register_modes {
-datasource => RHN::DataSource::General->new,
-provider => \&ip_ranges_provider);
- Sniglets::ListView::List->add_mode(-mode => "private_kstrees_for_user",
- -datasource => RHN::DataSource::General->new);
-
Sniglets::ListView::List->add_mode(-mode => "kickstart_session_history",
-datasource => RHN::DataSource::General->new,
-provider => \&session_history_provider);
commit b13c8ca1020618cf3958790e66135a8085696089
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:48:50 2009 +0100
rhn_external_api does not seem to exist, removing dead deps.
diff --git a/schema/spacewalk/oracle/packages/packages.deps b/schema/spacewalk/oracle/packages/packages.deps
index 9c36e7b..a074659 100644
--- a/schema/spacewalk/oracle/packages/packages.deps
+++ b/schema/spacewalk/oracle/packages/packages.deps
@@ -49,7 +49,6 @@ rhn_entitlements.pkb :: rhnServerGroupType rhnServerGroup rhnServerGroupMembe
rhn_entitlements.pks :: rhnServerGroupType
rhn_exception.pkb :: rhnException
rhn_exception.pks :: rhnException
-rhn_external_api.pkb :: web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
rhn_quota web_contact web_customer \
web_user_order web_user_order_line \
diff --git a/schema/spacewalk/postgres/packages/packages.deps b/schema/spacewalk/postgres/packages/packages.deps
index 071eae6..1ca1a4d 100644
--- a/schema/spacewalk/postgres/packages/packages.deps
+++ b/schema/spacewalk/postgres/packages/packages.deps
@@ -48,7 +48,6 @@ rhn_entitlements.pkb :: rhnServerGroupType rhnServerGroup rhnServerGroupMembe
rhn_entitlements.pks :: rhnServerGroupType
rhn_exception.pkb :: rhnException
rhn_exception.pks :: rhnException
-rhn_external_api.pkb :: web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
rhn_quota web_contact web_customer \
web_user_order web_user_order_line \
commit 2dedb37117990d457f973c9f3b9fc8674aed1367
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:44:27 2009 +0100
Removal of cert_info made render_channel_rows obsolete, removing.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index 6b9b8da..1570c78 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -107,37 +107,6 @@ sub get_service_map {
}
-sub render_channel_rows {
- my $channels = shift;
- my $prefix = shift;
- my $render_zero_quant = shift;
- my $counter = 1;
- my $ret = "";
-
- foreach my $label (sort keys %{$channels}) {
- $counter++;
- my $row_class = ($counter % 2) ? "list-row-even" : "list-row-odd";
- my $quant = $channels->{$label}->{QUANT};
- my $id = $channels->{$label}->{ID};
- if ($render_zero_quant or $quant > 0) {
- $ret .= "<tr class=\"" . $row_class . "\"><td>" . $label . "</td><td align=\"center\">" . $quant . "</td><td align=\"center\">";
- if ($label eq 'rhn-tools') {
- $ret .= "$quant\n";
- $ret .= "<input type=\"hidden\" name=\"" . $prefix . "_" . $id . "_quant\" value=\"" . $quant . "\"/>\n";
- }
- else {
- $ret .= "<input size=\"5\" type=\"text\" name=\"" . $prefix . "_" . $id . "_quant\" value=\"" . $quant . "\"/>\n";
- }
- $ret .= "<input type=\"hidden\" name=\"" . $prefix . "\" value=\"$id\"/>";
- $ret .= "<input type=\"hidden\" name=\"" . $prefix . "_" . $id . "_label\" value=\"" . $label . "\"/>\n";
- $ret .= "<input type=\"hidden\" name=\"" . $prefix . "_" . $id . "_oldquant\" value=\"" . $quant . "\"/>\n";
- $ret .= "</td></tr>\n";
- }
- }
-
- return $ret;
-}
-
# render the page that lets user view cert data
sub cert_text {
my $pxt = shift;
14 years, 5 months
2 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/Org.pm | 40 -----------------------------------
web/modules/sniglets/Sniglets/Org.pm | 1
2 files changed, 41 deletions(-)
New commits:
commit 1fed3b9ee37a72328db2d9a46a13c6139c514b39
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:38:41 2009 +0100
Removal of cert_info made ent_cert_channels obsolete, removing.
diff --git a/web/modules/rhn/RHN/DB/Org.pm b/web/modules/rhn/RHN/DB/Org.pm
index c68d4e5..864432a 100644
--- a/web/modules/rhn/RHN/DB/Org.pm
+++ b/web/modules/rhn/RHN/DB/Org.pm
@@ -1435,46 +1435,6 @@ EOQ
}
-# get the entitled channel families available for
-# an org's cert
-sub ent_cert_channels {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $stmt = <<EOQ;
-SELECT
- cf.id id,
- cf.name name,
- cf.label label,
- ocfp.max_members quantity
-FROM rhnChannelFamily cf,
- rhnOrgChannelFamilyPermissions ocfp
-WHERE 1=1
- and ocfp.org_id = :org_id
- and cf.org_id is null
- and ocfp.channel_family_id = cf.id
-EOQ
-
- foreach my $skip_clause (@skip_cert_channels) {
- $stmt .= " and cf.label not like '$skip_clause'";
- }
-
- my $sth = $dbh->prepare($stmt);
-
- $sth->execute_h(org_id => $self->id);
-
- my @result;
-
- while ( my (@data) = $sth->fetchrow ) {
- push ( @result, \@data );
- }
-
- $sth->finish;
-
- return @result;
-
-}
-
# Get options defined for this Org's list of monitoring Scouts
sub get_scout_options {
my $self = shift;
commit 8cad3f9f35c51ae3b15752bce47372295e295152
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:36:50 2009 +0100
Removal of cert_info made use HTTP::Date obsolete, removing.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index 3899185..6b9b8da 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -18,7 +18,6 @@ use strict;
package Sniglets::Org;
use POSIX qw/strftime/;
-use HTTP::Date qw(time2str str2time);
use RHN::Channel;
use RHN::API::Types;
use RHN::SatelliteCert;
14 years, 5 months
Changes to 'refs/tags/spacewalk-backend-0.8.8-1'
by Michael Mraka
Tag 'spacewalk-backend-0.8.8-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-12-11 15:40 +0000
Tagging package [spacewalk-backend] version [0.8.8-1] in directory [backend/].
Changes since spacewalk-backend-0.8.7-1:
Jan Pazdziora (46):
Table web_customer_product does not exist in Spacewalk 0.7, removing deads deps.
Table web_cp_service_line does not exist in Spacewalk 0.7, removing deads deps.
The server.rhnItem seems to be dead code in Spacewalk 0.7, removing.
The push-product.py script was using rhnService* tables that do not exists in Spacewalk 0.7, removing as dead code.
The disabled_error_msg and disabled_freeloader_msg strings do not seem to be used anywhere, removing as dead code.
Remove this spelling of Morocco.
Specify source as utf-8, otherwise
Change caused by make update-po run in backend/po.
View web_customer_orders does not exist in Spacewalk 0.7, removing; also removing purchase_history query.
Removing network/sales as it only had .htaccess talking about purchase_history.pxt, which did not exist.
rhn-purchase-history-summary not used anywhere, removing, as well as purchase_history_summary.
purchase_history not used, removing, as well as purchase_history_provider.
Previous cleanup made RHN::Catalog unused, removing as dead code.
rhn-cert-info not used anywhere, makes cert_info obsolete as well, removing.
lookup_company_name not used anywyere, removing as dead code.
calc_cert_expiration not used anywyere, removing as dead code.
Previous change made server_group_type_ids_by_label obsolete, removing as dead code.
Previous change made family_details_by_label obsolete, removing as dead code.
sat_channel_by_version not used anywyere, removing as dead code.
Previous change made satellite_channel_versions obsolete, removing as dead code.
Previous change made satellite_channels_by_version obsolete, removing as dead code; throw the %sat_chans_by_version in (out) as well.
Table rh_product does not exist in Spacewalk 0.7, removing deads deps.
View rhnExpiringTrialMail does not exist in Spacewalk 0.7, removing deads deps.
View rhnFreeErrataMail does not exist in Spacewalk 0.7, removing deads deps.
Nothing named rhnService* does seem to exist, removing dead deps.
View rhnUserAvailableUpgrades does not exist, removing dead deps.
rhn-system-group-list-summary not used anywhere, makes system_group_list_summary obsolete as well, removing.
rhn-errata-list-summary not used anywhere, makes errata_list_summary obsolete as well, removing.
rhn-system-name not used anywhere, makes system_name obsolete as well, removing.
rhn-time-period-selector not used anywhere, makes time_selector obsolete as well, removing.
Local variables not used anywhere (for $time_slots due to time_selector removal), removing as dead code.
The faq_list mode not used anywhere, removing as dead code.
Remove dead navigation definitions, not referenced from anywhere.
rhn-listview mode user_emailaddress_log not used, making emailaddress_provider and query user_emailaddress_log obsolete as well, removing.
The email.verify.body trans-unit is not used anywhere, removing as dead text.
The confirm_email.pxt is not used anywhere, removing.
Removal of confirm_email.pxt makes rhn-email-confirmation unused, also obsoletes rhn_email_confirmation, removing.
Removal of rhn_email_confirmation made verify_email_address unused, removing.
Sniglets::Inspector is not used anywhere, removing as dead code.
queue_for_cheetah is not used anywhere, removing as dead code.
rhn-admin-user-edit-form not used anywhere, makes admin_user_edit_form obsolete as well, removing.
create_gritch_destination is dead code, removing.
Removal of create_gritch_destination makes set_first_gritch_destination obsolete, removing.
Previous removal make find_mailable_address obsolete.
Previous removal made email_addresses_by_types obsolate, removing.
Removing functions that were dead code, or obsoleted by previous removal.
Michael Mraka (9):
use getFileChecksum from spacewalk.common.checksum
store every package in self.package only once
simplified channel list unification
replaced computeMD5sum with spacewalk.common.checksum.getFileChecksum
_postprocessPackageNEVRA and _postprocessPackage have to be called together
removed dead code
fixed rhnlint.py for checksums
removing dead code
Automatic commit of package [spacewalk-backend] release [0.8.8-1].
---
backend/common/rhnLib.py | 12
backend/po/Makefile | 2
backend/po/en.po | 1058 +++++-----
backend/po/ro.po | 946 ++++----
backend/po/server.pot | 936 ++++----
backend/satellite_tools/disk_dumper/iss.py | 14
backend/satellite_tools/reposync.py | 5
backend/server/Makefile | 1
backend/server/handlers/xmlrpc/country.py | 1
backend/server/handlers/xp/rhnlint.py | 22
backend/server/importlib/backend.py | 37
backend/server/importlib/errataImport.py | 21
backend/server/importlib/importLib.py | 2
backend/server/importlib/packageImport.py | 1
backend/server/rhnHandler.py | 27
backend/server/rhnItem.py | 425 ----
backend/spacewalk-backend.spec | 7
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 37
rel-eng/packages/spacewalk-backend | 2
schema/spacewalk/common/tables/tables.deps | 3
schema/spacewalk/common/views/views.deps | 29
schema/spacewalk/oracle/packages/packages.deps | 17
schema/spacewalk/postgres/packages/packages.deps | 17
schema/util/scripts/push-product.py | 260 --
web/html/confirm_email.pxt | 17
web/html/nav/install.xml | 5
web/html/nav/snapshot_detail.xml | 12
web/html/nav/support_tools.xml | 10
web/html/nav/support_user_details.xml | 4
web/html/network/sales/.htaccess | 9
web/modules/rhn/RHN/Catalog.pm | 130 -
web/modules/rhn/RHN/DB/Channel.pm | 62
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 38
web/modules/rhn/RHN/DB/EmailAddress.pm | 123 -
web/modules/rhn/RHN/DB/Org.pm | 60
web/modules/rhn/RHN/DB/SatInstall.pm | 33
web/modules/rhn/RHN/DB/Server.pm | 58
web/modules/rhn/RHN/DB/User.pm | 88
web/modules/sniglets/Sniglets/Inspector.pm | 569 -----
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 94
web/modules/sniglets/Sniglets/Lists.pm | 124 -
web/modules/sniglets/Sniglets/Org.pm | 189 -
web/modules/sniglets/Sniglets/Users.pm | 207 -
43 files changed, 1543 insertions(+), 4171 deletions(-)
---
14 years, 5 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4c4d5599350f67c0c40641e8502d1efe8c8c41ad
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 16:40:44 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.8.8-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 15d2703..64093a6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.7
+Version: 0.8.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -597,6 +597,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Dec 11 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.8-1
+- removed a lot of dead code
+- fixed getFileChecksum usage
+- SHA256 fixes
* Thu Dec 10 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.7-1
- added support for uploading SHA256 rpms
- 541078 - rhn-satellite-exporter --start-date and --end-date issues fixed
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 16bd313..e4551ff 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.7-1 backend/
+0.8.8-1 backend/
14 years, 5 months
8 commits - backend/common backend/satellite_tools backend/server
by Michael Mraka
backend/common/rhnLib.py | 12 ---------
backend/satellite_tools/disk_dumper/iss.py | 14 +---------
backend/satellite_tools/reposync.py | 5 +--
backend/server/handlers/xp/rhnlint.py | 22 +++++++++--------
backend/server/importlib/backend.py | 37 -----------------------------
backend/server/importlib/errataImport.py | 21 +++++-----------
backend/server/importlib/importLib.py | 2 -
backend/server/importlib/packageImport.py | 1
8 files changed, 23 insertions(+), 91 deletions(-)
New commits:
commit 9137f758a01e2ccf05cab80cd53ba450972bed05
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 15:07:51 2009 +0100
removing dead code
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index 1975a86..cbb33b5 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -372,43 +372,6 @@ class Backend:
return row['id']
- def ovalFileMD5sumCheck(self, erratum):
- """
- When oval file is dumped on to RHN filesystem
- check if file exists and verifies their md5sum
-
- XXX:: as we create these files on RHN itself
- this call is not used. But leaving it here
- in case we decide to change it.
- """
- if not erratum:
- return None
-
- sql = """
- select c.checksum md5sum
- from rhnErrataFile ef,
- rhnErrata e,
- rhnChecksum c
- where ef.filename = :filename
- and e.advisory_name = :aname
- and ef.errata_id = e.id
- and ef.checksum_id = c.id
- """
-
- h = self.dbmodule.prepare(sql)
- h.execute(filename = erratum['filename'], \
- aname = erratum['advisory_name'])
- row = h.fetchone_dict()
-
- #file does'nt exist proceed to populate.
- if not row:
- return 1
- #file exists, check if md5's are same
- if erratum['md5sum'] == row['md5sum']:
- return 1
- return 0
-
-
def processBugzillaPaths(self, hash):
if not hash:
return
commit 3581efa67be5c7e9e500919a264b3ff3d6f60caa
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 14:56:37 2009 +0100
fixed rhnlint.py for checksums
diff --git a/backend/server/handlers/xp/rhnlint.py b/backend/server/handlers/xp/rhnlint.py
index b20ff1c..f879d02 100644
--- a/backend/server/handlers/xp/rhnlint.py
+++ b/backend/server/handlers/xp/rhnlint.py
@@ -45,7 +45,7 @@ class RHNLint(RPC_Base):
log_debug(1, info)
- testMD5sums(info, results)
+ testChecksums(info, results)
testObsoletes(info, results)
testDependencies(info, results)
@@ -274,11 +274,11 @@ def testDependencies(info, results):
return
-# test to insure that no package with the same nvre but different md5 sum is in the db...
+# test to insure that no package with the same nvre but different checksum is in the db...
# basically, complains if someone just resigns a package w/out bumping release
#
# NOTE: currently, only cares about packages w/ org_id in (null, your_org)
-def testMD5sums(info, results):
+def testChecksums(info, results):
packages = info.get('packages')
@@ -286,10 +286,11 @@ def testMD5sums(info, results):
header = package['header']
filename = package['filename']
query = """
- select pn.name || '-' || pe.evr.as_vre_simple() nvre, c.checksum md5sum,
+ select pn.name || '-' || pe.evr.as_vre_simple() nvre,
+ c.checksum_type, c.checksum,
p.org_id org_id, p.build_host buildhost, p.build_time buildtime
from rhnPackageArch pa, rhnPackageName pn, rhnPackageEVR pe,
- rhnPackage p, rhnChecksum c
+ rhnPackage p, rhnChecksumView c
where pn.name = :name
and pe.version = :version
and pe.release = :release
@@ -297,7 +298,7 @@ def testMD5sums(info, results):
and pn.id = p.name_id
and pe.id = p.evr_id
and p.checksum_id = c.id
- and c.checksum != :md5sum
+ and not (c.checksum = :checksum and c.checksum_type = :checksum_type)
and (p.org_id is null or p.org_id = :org_id)
and pa.label = :arch
and p.package_arch_id = pa.id
@@ -307,7 +308,8 @@ def testMD5sums(info, results):
'version':header['version'],
'release':header['release'],
'epoch':header['epoch'],
- 'md5sum':package['md5sum'],
+ 'checksum':package['checksum'][1],
+ 'checksum_type':package['checksum'][0],
'org_id':info['org_id'],
'arch':header['arch'],
}
@@ -343,10 +345,10 @@ def testMD5sums(info, results):
if len(different_fields) > 0:
further_info = "It's probably a different/recompiled package:\n%s" % string.join(different_fields, "\n")
else:
- further_info = "only MD5 sums differ, packages probably was just resigned"
+ further_info = "only checksums differ, packages probably was just resigned"
- results[filename].append("\nAlready found with an md5 sum of %s%s\n%s"
- % (row['md5sum'], org_str, further_info))
+ results[filename].append("\nAlready found with a checksum of %s:%s %s\n%s"
+ % (row['checksum_type'], row['checksum'], org_str, further_info))
return
commit bb1c812156b7ac5cb2532d7ca9ddf348b71fad29
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 14:44:13 2009 +0100
removed dead code
rhnLib contained 2 different versions of rfc822time(), former was never used
diff --git a/backend/common/rhnLib.py b/backend/common/rhnLib.py
index 1ff84ee..77ca78e 100644
--- a/backend/common/rhnLib.py
+++ b/backend/common/rhnLib.py
@@ -61,18 +61,6 @@ def setHeaderValue(mp_table, name, values):
mp_table[name] = str(values)
-def rfc822time(arg):
- """
- Return time as a string formatted such as: 'Wed, 23 Jun 2001 23:08:35 GMT'.
- """
- format = "%a, %d %b %Y %H:%M:%S GMT"
- if type(arg) in (types.ListType, types.TupleType):
- # Already a list
- return time.strftime(format, arg)
- # Assume it's a float
- return time.strftime(format, time.gmtime(arg))
-
-
rfc822_days = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun')
rfc822_mons = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', \
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec')
commit 907ab3de5dad17a616b18a769b3616ebaadb5ff9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 14:39:03 2009 +0100
_postprocessPackageNEVRA and _postprocessPackage have to be called together
so make it one function
diff --git a/backend/server/importlib/errataImport.py b/backend/server/importlib/errataImport.py
index 1648152..03e556e 100644
--- a/backend/server/importlib/errataImport.py
+++ b/backend/server/importlib/errataImport.py
@@ -230,7 +230,6 @@ class ErrataImport(GenericPackageImport):
continue
self._postprocessPackageNEVRA(package)
- self._postprocessPackage(package)
# Check the uniqueness
nevrao = tuple(get_nevrao(package))
diff --git a/backend/server/importlib/importLib.py b/backend/server/importlib/importLib.py
index 0e19e4b..787fdf1 100644
--- a/backend/server/importlib/importLib.py
+++ b/backend/server/importlib/importLib.py
@@ -706,8 +706,6 @@ class GenericPackageImport(Import):
package['name_id'], package['evr_id'], package['package_arch_id'] = nevra
package['nevra_id'] = nevra_dict[nevra]
-
- def _postprocessPackage(self, package):
package['checksum_id'] = self.checksums[package['checksum']]
# Exceptions
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index 5044c84..b7975d0 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -71,7 +71,6 @@ class ChannelPackageSubscription(GenericPackageImport):
if package.ignored:
continue
self._postprocessPackageNEVRA(package)
- self._postprocessPackage(package)
if not CFG.ENABLE_NVREA:
# nvrea disabled, skip checksum
nevrao = (
commit e61a6e9fc71609f504efb37b0487393a622aee43
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 14:32:04 2009 +0100
replaced computeMD5sum with spacewalk.common.checksum.getFileChecksum
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index 509362b..fb8255e 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -31,6 +31,7 @@ from iss_ui import UI
from iss_actions import ActionDeps
import shutil
import iss_isos
+from spacewalk.common import checksum
class ISSError(Exception):
def __init__(self, msg, tb):
@@ -1124,7 +1125,7 @@ class ExporterMain:
for file in os.listdir(iso_output):
if self.options.make_isos != "dvds":
if file != "MD5SUM":
- md5_val = computeMD5sum(os.path.join(iso_output, file))
+ md5_val = checksum.getFileChecksum('md5', (os.path.join(iso_output, file)))
md5str = "%s %s\n" % (md5_val, file)
f.write(md5str)
f.close()
@@ -1178,17 +1179,6 @@ def compress_file(file):
# removed the old file
os.unlink(file)
-def computeMD5sum(filename):
- """Compute MD5 checksum for the file
- """
- import md5
- m = md5.new()
- fileobj = open(filename)
- filedata = fileobj.read()
- fileobj.close()
- m.update(filedata)
- return m.hexdigest()
-
if __name__ == "__main__":
em = ExporterMain()
em.main()
commit a3d5ad294e1d604bc9706ceb8a3b5c26bc220e13
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 13:39:23 2009 +0100
simplified channel list unification
diff --git a/backend/server/importlib/errataImport.py b/backend/server/importlib/errataImport.py
index ac0e8c3..1648152 100644
--- a/backend/server/importlib/errataImport.py
+++ b/backend/server/importlib/errataImport.py
@@ -57,16 +57,13 @@ class ErrataImport(GenericPackageImport):
self._processPackage(package)
# Process channels
- channels = []
channelHash = {}
for channel in errata['channels']:
channelName = channel['label']
- if not channelHash.has_key(channelName):
- channels.append(channel)
- channelHash[channelName] = None
+ channelHash[channelName] = channel
self.channels[channelName] = None
# Replace the channel list with the unique one
- errata['channels'] = channels
+ errata['channels'] = channelHash.values()
def _preprocessErratumCVE(self, erratum):
# Build the CVE dictionary
commit d76ced37a91317d5e20039f551582e5c800b2207
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 11:58:19 2009 +0100
store every package in self.package only once
diff --git a/backend/server/importlib/errataImport.py b/backend/server/importlib/errataImport.py
index 434bf57..ac0e8c3 100644
--- a/backend/server/importlib/errataImport.py
+++ b/backend/server/importlib/errataImport.py
@@ -24,7 +24,7 @@ class ErrataImport(GenericPackageImport):
def __init__(self, batch, backend, queue_timeout=600):
GenericPackageImport.__init__(self, batch, backend)
# A composite key of the name, evr, arch plus org_id
- self.packages = []
+ self.packages = {}
self.ignoreMissing = 0
self.cve = {}
self.queue_timeout = queue_timeout
@@ -88,8 +88,8 @@ class ErrataImport(GenericPackageImport):
package = f.get('pkgobj')
if package:
self._processPackage(package)
- if not package in self.packages:
- self.packages.append(package)
+ nevrao = tuple(get_nevrao(package))
+ self.packages[nevrao] = package
#elif f['file_type'] == 'SRPM':
# # XXX misa: do something here
# pass
@@ -129,7 +129,7 @@ class ErrataImport(GenericPackageImport):
#fix oval info to populate the relevant dbtables
self._fix_erratum_oval_info(erratum)
- self.backend.lookupPackages(self.packages, self.ignoreMissing)
+ self.backend.lookupPackages(self.packages.values(), self.ignoreMissing)
for erratum in self.batch:
self._fix_erratum_packages(erratum)
self._fix_erratum_file_channels(erratum)
@@ -232,7 +232,6 @@ class ErrataImport(GenericPackageImport):
# Skip it
continue
- oldpackage = package.copy()
self._postprocessPackageNEVRA(package)
self._postprocessPackage(package)
@@ -248,9 +247,7 @@ class ErrataImport(GenericPackageImport):
# And put this package both in the local and in the global hash
packageHash[nevrao] = package
- # replace old package with new
- idx = self.packages.index(oldpackage)
- self.packages[idx] = package
+ self.packages[nevrao] = package
erratum['packages'] = packageHash
commit 1acfe9ac28d11cafab6a67801e4d5c0725cec20a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 09:22:40 2009 +0100
use getFileChecksum from spacewalk.common.checksum
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 8006b08..3e2f61e 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -15,10 +15,9 @@
#
import sys, os, time, grp
from optparse import OptionParser
-from common import rhnLib
from server import rhnPackage, rhnSQL, rhnChannel, rhnPackageUpload
from common import CFG, initCFG, rhnLog, fetchTraceback
-from spacewalk.common import rhn_rpm
+from spacewalk.common import rhn_rpm, checksum
from spacewalk.common.rhn_mpm import InvalidPackageError
from server.importlib.importLib import IncompletePackage
from server.importlib.backendOracle import OracleBackend
@@ -151,7 +150,7 @@ class RepoSync:
header, payload_stream, header_start, header_end = \
rhnPackageUpload.load_package(temp_file)
checksum_type = header.checksum_type()
- package.checksum = (checksum_type, rhnLib.getFileChecksum(
+ package.checksum = (checksum_type, checksum.getFileChecksum(
checksum_type, file=temp_file))
pid = rhnPackage.get_package_for_checksum(
self.channel['org_id'], package.checksum)
14 years, 5 months
4 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/EmailAddress.pm | 104 ---------------------------------
web/modules/rhn/RHN/DB/SatInstall.pm | 33 ----------
web/modules/rhn/RHN/DB/User.pm | 55 -----------------
3 files changed, 192 deletions(-)
New commits:
commit 1b6b6e80b1d649f3f7f82e17dbacec55c258b93c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:33:56 2009 +0100
Removing functions that were dead code, or obsoleted by previous removal.
diff --git a/web/modules/rhn/RHN/DB/EmailAddress.pm b/web/modules/rhn/RHN/DB/EmailAddress.pm
index 73ab0fc..740b9de 100644
--- a/web/modules/rhn/RHN/DB/EmailAddress.pm
+++ b/web/modules/rhn/RHN/DB/EmailAddress.pm
@@ -152,19 +152,6 @@ sub commit {
delete $self->{":modified:"};
}
-sub next_action_seconds {
- my $self = shift;
- my $delay = shift;
-
- if (not defined $delay) {
- $self->next_action(undef);
- }
- else {
- my $when = time + $delay;
- $self->next_action(strftime("%Y-%m-%d %H:%M:%S", localtime $when));
- }
-}
-
sub state {
my $self = shift;
return $self->mail_state_label if not @_;
@@ -182,95 +169,4 @@ sub state {
$self->state_id($id);
}
-sub email_address_states {
- my $class = shift;
-
- my $dbh = RHN::DB->connect;
-
- my $query = <<EOQ;
-SELECT label
- FROM rhnEmailAddressState
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute;
-
- my $labels = [ ];
-
- while (my ($label) = $sth->fetchrow) {
- push @{$labels}, $label;
- }
-
- return $labels;
-}
-
-sub delete_self {
- my $self = shift;
- my %params = validate(@_, {-transaction => 0});
- my $dbh = $params{-transaction} || RHN::DB->connect;
-
- my $query = <<EOQ;
-DELETE
- FROM rhnEmailAddress
- WHERE id = :id
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(id => $self->id);
-
- $dbh->commit unless $params{-transaction};
-}
-
-sub delete_other_addresses {
- my $self = shift;
- my %params = validate(@_, {-transaction => 0});
- my $dbh = $params{-transaction} || RHN::DB->connect;
-
- my $query = <<EOQ;
-DELETE
- FROM rhnEmailAddress
- WHERE id <> :id
- AND user_id = :user_id
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(id => $self->id, user_id => $self->user_id);
-
- $dbh->commit unless $params{-transaction};
-}
-
-sub reset_email {
- my $class = shift;
- my $user = shift;
- my $state = shift || 'unverified';
-
- throw "No user." unless (ref $user and $user->isa('RHN::DB::User'));
-
- my $new_address = $user->email;
- my @addresses = $user->email_addresses;
- $_->delete_self foreach (@addresses);
- my $email = $class->create;
- $email->address($new_address);
- $email->user_id($user->id);
- $email->state($state);
- $email->commit;
-
- return $email;
-}
-
-sub log_sent_email {
- my $class = shift;
- my %params = validate(@_, {-reason => 1, -address => 1, -user_id => 1});
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOS);
-INSERT INTO rhnEmailAddressLog
- (user_id, address, reason, created)
-VALUES
- (:user_id, :address, :reason, sysdate)
-EOS
- $sth->execute_h(user_id => $params{-user_id}, address => $params{-address}, reason => $params{-reason});
- $dbh->commit;
-}
-
1;
commit 69dcc234775e817220c887967214bf7b981a1fc8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:32:45 2009 +0100
Previous removal made email_addresses_by_types obsolate, removing.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 76c400f..b92f1c8 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -2563,44 +2563,6 @@ EOQ
return @sids;
}
-# give it one or more types and it will give you objects of those
-# types. in multiple, it returns in order of the types specified, so
-# you can cascade through preferred choices, etc
-sub email_addresses_by_types {
- my $self_or_class = shift;
- my $id;
-
- if (ref $self_or_class) {
- $id = $self_or_class->id;
- }
- else {
- $id = shift;
- }
-
- my @types = @_;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT id
- FROM rhnEmailAddress
- WHERE user_id = :user_id
- AND state_id = rhn_bel.lookup_email_state(:type)
-ORDER BY MODIFIED DESC
-EOQ
-
- my @ret;
-
- for my $type (@types) {
- $sth->execute_h(user_id => $id, type => $type);
-
- while (my ($id) = $sth->fetchrow) {
- push @ret, RHN::EmailAddress->lookup(-id => $id);
- }
- }
-
- return @ret;
-}
-
sub email_addresses {
my $self_or_class = shift;
my $id;
commit ec1c93714ee9afc1e5439b3a46a02f721af5f225
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:30:09 2009 +0100
Previous removal make find_mailable_address obsolete.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 0b7bb46..76c400f 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -2631,23 +2631,6 @@ EOQ
return @ret;
}
-sub find_mailable_address {
- my $self = shift;
-
- my ($address) = $self->email_addresses_by_types(qw/verified unverified pending pending_warned needs_verifying/);
-
- if (not $address and $self->email) {
- $address = RHN::EmailAddress->create();
- $address->user_id($self->id);
- $address->state('unverified');
- $address->next_action_seconds(undef);
- $address->address($self->email);
- $address->commit;
- }
-
- return $address;
-}
-
sub delete_nonverified_addresses {
my $self = shift;
my %params = validate(@_, {transaction => 0});
commit a0a729a0945f0e7d5925ad8870e3d38244ae1cc1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:28:39 2009 +0100
Removal of create_gritch_destination makes set_first_gritch_destination obsolete, removing.
diff --git a/web/modules/rhn/RHN/DB/SatInstall.pm b/web/modules/rhn/RHN/DB/SatInstall.pm
index aa30940..cee1b95 100644
--- a/web/modules/rhn/RHN/DB/SatInstall.pm
+++ b/web/modules/rhn/RHN/DB/SatInstall.pm
@@ -389,37 +389,4 @@ EOQ
return @rows;
}
-sub set_first_gritch_destination {
- my $class = shift;
- my $uid = shift;
-
- throw "No user id" unless $uid;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
- SELECT CM.recid,
- CM.method_name,
- WC.org_id
- FROM web_contact WC, rhn_contact_methods CM
- WHERE CM.contact_id = WC.id
- AND WC.id = :user_id
-ORDER BY CM.recid
-EOQ
-
- $sth->execute_h(user_id => $uid);
-
- my $row = $sth->fetchrow_hashref;
- $sth->finish;
-
- my %gritch_conf =
- (GRITCH_TARGETDESTNAME => $row->{METHOD_NAME},
- GRITCH_TARGETDESTID => $row->{RECID},
- GRITCH_TARGETCUST => $row->{ORG_ID},
- );
-
- $class->update_monitoring_config(\%gritch_conf);
-
- return;
-}
-
1;
14 years, 5 months
9 commits - java/code web/html web/modules
by Jan Pazdziora
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"
</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;
14 years, 5 months
2 commits - web/html web/modules
by Jan Pazdziora
web/html/nav/install.xml | 5 -----
web/html/nav/snapshot_detail.xml | 12 ------------
web/html/nav/support_tools.xml | 10 ----------
web/html/nav/support_user_details.xml | 4 ----
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 3 ---
5 files changed, 34 deletions(-)
New commits:
commit f216e23823070c76ff1a920af531ce33f84d43ed
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:54:11 2009 +0100
Remove dead navigation definitions, not referenced from anywhere.
diff --git a/web/html/nav/install.xml b/web/html/nav/install.xml
deleted file mode 100644
index f228a2f..0000000
--- a/web/html/nav/install.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<rhn-navi-tree xmlns:xi="http://www.w3.org/2001/XInclude" label="install" title-depth="0">
- <rhn-tab name="Install" url="/index.pxt">
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/nav/snapshot_detail.xml b/web/html/nav/snapshot_detail.xml
deleted file mode 100644
index 3e7ec7f..0000000
--- a/web/html/nav/snapshot_detail.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="system_detail" invisible="1" title-depth="1">
- <formvar name="sid" />
- <formvar name="ss_id" />
-
- <rhn-tab name="Rollback" url="/network/systems/details/history/snapshots/rollback.pxt" />
- <rhn-tab name="Groups" url="/network/systems/details/history/snapshots/groups.pxt" />
- <rhn-tab name="Channels" url="/network/systems/details/history/snapshots/channels.pxt" />
- <rhn-tab name="Packages" url="/network/systems/details/history/snapshots/packages.pxt" />
- <rhn-tab name="Config Files" url="/network/systems/details/history/snapshots/config.pxt" />
- <rhn-tab name="Config Channels" url="/network/systems/details/history/snapshots/namespaces.pxt" />
-</rhn-navi-tree>
diff --git a/web/html/nav/support_tools.xml b/web/html/nav/support_tools.xml
deleted file mode 100644
index 6e52f34..0000000
--- a/web/html/nav/support_tools.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<rhn-navi-tree label="support_tools" formvar="support_org_id" title-depth="1">
- <rhn-tab name="Details" url="/internal/support/org_details.pxt" />
- <rhn-tab name="Systems" url="/internal/support/org_systems.pxt">
- <rhn-tab-url>/internal/support/org_system.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Users" url="/internal/support/org_users.pxt">
- <rhn-tab-url>/internal/support/org_user.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Entitlements" url="/internal/support/org_entitlements.pxt" />
-</rhn-navi-tree>
diff --git a/web/html/nav/support_user_details.xml b/web/html/nav/support_user_details.xml
deleted file mode 100644
index 0927f10..0000000
--- a/web/html/nav/support_user_details.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<rhn-navi-tree label="support_user_details" formvar="support_uid" title-depth="1">
- <rhn-tab name="Details" url="/internal/support/org_user.pxt" />
- <rhn-tab name="Email Address State Log" url="/internal/support/user_emailaddress_log.pxt" />
-</rhn-navi-tree>
commit 3309717284232a3e3bf1f7710dcf4960a39047ed
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:43:45 2009 +0100
The faq_list mode not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index 3ca6ff9..8215b31 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -89,9 +89,6 @@ sub _register_modes {
-provider => \&activation_key_provider,
-action_callback => \&activation_key_cb);
- Sniglets::ListView::List->add_mode(-mode => "faq_list",
- -datasource => RHN::DataSource::General->new);
-
Sniglets::ListView::List->add_mode(-mode => "user_emailaddress_log",
-datasource => RHN::DataSource::General->new,
-provider => \&emailaddress_provider);
14 years, 5 months
web/modules
by Jan Pazdziora
web/modules/sniglets/Sniglets/Lists.pm | 28 ----------------------------
1 file changed, 28 deletions(-)
New commits:
commit 426027e3f1c30a2699f71dd17c79073c0bc0b304
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:37:47 2009 +0100
Local variables not used anywhere (for $time_slots due to time_selector removal), removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Lists.pm b/web/modules/sniglets/Sniglets/Lists.pm
index 4174fc2..bac4c86 100644
--- a/web/modules/sniglets/Sniglets/Lists.pm
+++ b/web/modules/sniglets/Sniglets/Lists.pm
@@ -266,32 +266,4 @@ sub pathinfo_list_mode {
return $html;
}
-my @sort_columns = ( { value => 'FB.created',
- label => 'Date', },
- { value => 'BASIC_SLOTS',
- label => 'Update Slots', },
- { value => 'ENTERPRISE_SLOTS',
- label => 'Management Slots', },
- );
-
-my @sort_orders = ( { value => 'DESC',
- label => 'Descending', },
- { value => 'ASCENDING',
- label => 'Ascending', },
- );
-
-my $time_slots = [
- { label => '5 Minutes',
- value => 5 },
- { label => 'Hour',
- value => 60 },
- { label => 'Day',
- value => 1440 },
- { label => 'Week',
- value => 10080 },
- { label => 'Month',
- value => 40320 },
- ];
-
-
1;
14 years, 5 months
4 commits - web/modules
by Jan Pazdziora
web/modules/sniglets/Sniglets/Lists.pm | 77 ---------------------------------
1 file changed, 77 deletions(-)
New commits:
commit 42a2179a0baa2108654f0d1163b2e67ba1ae056f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:32:09 2009 +0100
rhn-time-period-selector not used anywhere, makes time_selector obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Lists.pm b/web/modules/sniglets/Sniglets/Lists.pm
index b23272d..4174fc2 100644
--- a/web/modules/sniglets/Sniglets/Lists.pm
+++ b/web/modules/sniglets/Sniglets/Lists.pm
@@ -49,8 +49,6 @@ sub register_tags {
$pxt->register_tag('rhn-pathinfo-list-mode', \&pathinfo_list_mode, -5);
- $pxt->register_tag('rhn-time-period-selector', \&time_selector);
-
$pxt->register_tag('rhn-list-legend' => \&list_legend, 200);
}
@@ -296,27 +294,4 @@ my $time_slots = [
];
-sub time_selector {
- my $pxt = shift;
- my %params = @_;
-
- my $formvar = $params{formvar};
- throw "No formvar specified." unless $formvar;
-
- my $current = $pxt->dirty_param($formvar) || $params{default};
- throw "No default value." unless $current;
-
- my $ret = PXT::HTML->form_start(-method => 'POST');
-
- $ret .= PXT::HTML->select(-name => $formvar,
- -options => [ map { [ $_->{label}, $_->{value}, $_->{value} == $current ] }
- @{$time_slots} ] );
-
- $ret .= PXT::HTML->submit(-name => 'Submit',
- -value => 'Submit');
-
- $ret .= PXT::HTML->form_end;
- return $ret;
-}
-
1;
commit 704ee2af0bcfd39a5915ccd5223cf12bd62ee42a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:30:56 2009 +0100
rhn-system-name not used anywhere, makes system_name obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Lists.pm b/web/modules/sniglets/Sniglets/Lists.pm
index 4a43b16..b23272d 100644
--- a/web/modules/sniglets/Sniglets/Lists.pm
+++ b/web/modules/sniglets/Sniglets/Lists.pm
@@ -49,7 +49,6 @@ sub register_tags {
$pxt->register_tag('rhn-pathinfo-list-mode', \&pathinfo_list_mode, -5);
- $pxt->register_tag('rhn-system-name', \&system_name, -5);
$pxt->register_tag('rhn-time-period-selector', \&time_selector);
$pxt->register_tag('rhn-list-legend' => \&list_legend, 200);
@@ -269,25 +268,6 @@ sub pathinfo_list_mode {
return $html;
}
-sub system_name {
- my $pxt = shift;
- my %params = @_;
-
- my $sid = $params{sid} || $pxt->param('sid');
- die "no server id" unless $sid;
-
- $pxt->user->verify_system_access($sid)
- or $pxt->redirect('/errors/permission.pxt');
-
- my $server = RHN::Server->lookup(-id => $sid);
- die "no valid server" unless $server;
-
- my %subst;
-
- $subst{system_name} = PXT::Utils->escapeHTML($server->name);
- return PXT::Utils->perform_substitutions($params{__block__}, \%subst);
-}
-
my @sort_columns = ( { value => 'FB.created',
label => 'Date', },
{ value => 'BASIC_SLOTS',
commit 2b4041b629cb5194f526b1bbb4f618de3ce24294
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:14:19 2009 +0100
rhn-errata-list-summary not used anywhere, makes errata_list_summary obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Lists.pm b/web/modules/sniglets/Sniglets/Lists.pm
index 18477c6..4a43b16 100644
--- a/web/modules/sniglets/Sniglets/Lists.pm
+++ b/web/modules/sniglets/Sniglets/Lists.pm
@@ -49,7 +49,6 @@ sub register_tags {
$pxt->register_tag('rhn-pathinfo-list-mode', \&pathinfo_list_mode, -5);
- $pxt->register_tag('rhn-errata-list-summary', \&errata_list_summary, 5);
$pxt->register_tag('rhn-system-name', \&system_name, -5);
$pxt->register_tag('rhn-time-period-selector', \&time_selector);
@@ -270,21 +269,6 @@ sub pathinfo_list_mode {
return $html;
}
-sub errata_list_summary {
- my $pxt = shift;
- my %attr = @_;
-
- my $summary = $pxt->pnotes('errata_summary');
-
- my $html = '';
-
- if ($summary) {
- $html = PXT::Utils->perform_substitutions($attr{__block__}, $summary);
- }
-
- return $html;
-}
-
sub system_name {
my $pxt = shift;
my %params = @_;
commit 25fdfb74e2fc56bbf2201e28f1df5361f5d95e20
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:12:57 2009 +0100
rhn-system-group-list-summary not used anywhere, makes system_group_list_summary obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Lists.pm b/web/modules/sniglets/Sniglets/Lists.pm
index 5d357d1..18477c6 100644
--- a/web/modules/sniglets/Sniglets/Lists.pm
+++ b/web/modules/sniglets/Sniglets/Lists.pm
@@ -50,7 +50,6 @@ sub register_tags {
$pxt->register_tag('rhn-pathinfo-list-mode', \&pathinfo_list_mode, -5);
$pxt->register_tag('rhn-errata-list-summary', \&errata_list_summary, 5);
- $pxt->register_tag('rhn-system-group-list-summary', \&system_group_list_summary, 5);
$pxt->register_tag('rhn-system-name', \&system_name, -5);
$pxt->register_tag('rhn-time-period-selector', \&time_selector);
@@ -286,21 +285,6 @@ sub errata_list_summary {
return $html;
}
-sub system_group_list_summary {
- my $pxt = shift;
- my %attr = @_;
-
- my $summary = $pxt->pnotes('system_group_list_summary');
-
- my $html = '';
-
- if ($summary) {
- $html = PXT::Utils->perform_substitutions($attr{__block__}, $summary);
- }
-
- return $html;
-}
-
sub system_name {
my $pxt = shift;
my %params = @_;
14 years, 5 months