Changes to 'refs/tags/spacewalk-backend-0.8.9-1'
by Michael Mraka
Tag 'spacewalk-backend-0.8.9-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-12-14 10:17 +0000
Tagging package [spacewalk-backend] version [0.8.9-1] in directory [backend/].
Changes since spacewalk-certs-tools-0.8.3-1:
Michael Mraka (2):
fixed NameError: global name 'createPath' is not defined
Automatic commit of package [spacewalk-backend] release [0.8.9-1].
---
backend/satellite_tools/syncLib.py | 1 +
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
14 years, 5 months
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/syncLib.py | 1 +
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 32180b0fccfce9da4a9eff30f396403023f076c5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 14 11:17:07 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.8.9-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 206abfe..5522a81 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.8
+Version: 0.8.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -597,6 +597,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Dec 14 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.9-1
+- fixed satellite-sync errata import
+
* Fri Dec 11 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.8-1
- removed a lot of dead code
- fixed getFileChecksum usage
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e4551ff..7ce7113 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.8-1 backend/
+0.8.9-1 backend/
commit 3bd37562484840b80a13a9ba8d8305bf3d345808
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 14 10:58:32 2009 +0100
fixed NameError: global name 'createPath' is not defined
diff --git a/backend/satellite_tools/syncLib.py b/backend/satellite_tools/syncLib.py
index bc2ca80..5d25c5b 100644
--- a/backend/satellite_tools/syncLib.py
+++ b/backend/satellite_tools/syncLib.py
@@ -25,6 +25,7 @@ from cStringIO import StringIO
# rhn imports:
from common import CFG, log_clean, rhnLib
from common.rhnLog import log_time
+from common.rhnLib import createPath
import messages
14 years, 5 months
Changes to 'refs/tags/spacewalk-certs-tools-0.8.3-1'
by Michael Mraka
Tag 'spacewalk-certs-tools-0.8.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-12-14 09:47 +0000
Tagging package [spacewalk-certs-tools] version [0.8.3-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-backend-0.8.8-1:
Jan Pazdziora (36):
Removal of cert_info made use HTTP::Date obsolete, removing.
Removal of cert_info made ent_cert_channels obsolete, removing.
Removal of cert_info made render_channel_rows obsolete, removing.
rhn_external_api does not seem to exist, removing dead deps.
rhn-listview mode private_kstrees_for_user not used, making query private_kstrees_for_user obsolete as well, removing.
rhn-listview mode ip_ranges_for_org not used, making ip_ranges_provider and query ip_ranges_for_org obsolete as well, removing.
Previous removal made use RHN::Kickstart::IPRange obsolete, removing.
rhn-listview mode kickstart_sessions_for_org not used, making kickstart_sessions_provider and query kickstart_sessions_for_org obsolete as well, removing.
The confirm_email_success.pxt is not used anywhere, removing.
rhn-ftp-download-handler not used anywhere, makes ftp_download_handler obsolete as well, removing.
usage_count not used anywhere, removing as dead code.
Removal of usage_count makes token_usage_count obsolete, removing.
rhn-channel-download-categories not used anywhere, makes channel_download_categories obsolete as well, removing.
rhn-channel-downloads not used anywhere, makes channel_downloads obsolete as well, removing.
Removal of channel_downloads makes choose_download_location dead code, removing.
rhn-recent-iso-channels not used anywhere, makes recent_iso_channels obsolete as well, removing.
rhn-akamai-redirect not used anywhere, makes akamai_redirect obsolete as well, removing.
Removal of ftp_download_handler made send_partial_file dead code, removing.
Removal of ftp_download_handler and akamai_redirect made use RHN::TokenGen::Local not needed, removing.
use RHN::SessionSwap is dead code, it does not export anything and is not called explicitly.
Previous removals made use RHN::DataSource::Channel obsolete but we need RHN::Channel.
rhn-user-info not used anywhere, makes rhn_user_info obsolete as well, removing.
rhn-admin-user-site-edit-form not used anywhere, makes admin_user_site_edit_form obsolete as well, removing.
rhn-logout-form not used anywhere, makes rhn_logout_form obsolete as well, removing.
public-logout-link not used anywhere, makes public_logout_link obsolete as well, removing.
public-login-link not used anywhere, makes public_login_link obsolete as well, removing.
rhn-user-prefs-edit not used anywhere, makes user_prefs_edit obsolete as well, removing.
rhn-system-summary not used anywhere, makes system_summary obsolete as well, removing.
rhn-action-summary not used anywhere, makes action_summary obsolete as well, removing.
rhn-help-link not used anywhere, makes help_link obsolete as well, removing.
rhn-opt-out not used anywhere, makes opt_out obsolete as well, removing.
rhn-toggle-pref not used anywhere, makes toggle_pref obsolete as well, removing.
rhn-if-pref not used anywhere, makes if_pref obsolete as well, removing.
rhn-if-server-groups not used anywhere, makes if_server_groups obsolete as well, removing.
Removing if_server_groups makes servergroup_admin_overview obsolete, removing.
servergroup_admin_overview in ServerGroup is dead code, removing.
Justin Sherrill (1):
545995 - adding package signing key to the package details page
Michael Mraka (5):
removed unnecesssary import
fixed checksum in _diff_packages, _process_package and _get_rel_package_path
python-devel is needed during build
fixed namespace of rhn_rpm
Automatic commit of package [spacewalk-certs-tools] release [0.8.3-1].
---
backend/common/rhnLib.py | 19
backend/satellite_tools/satsync.py | 31
backend/spacewalk-backend.spec | 2
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 5
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6
java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 11
rel-eng/packages/spacewalk-certs-tools | 2
schema/spacewalk/oracle/packages/packages.deps | 1
schema/spacewalk/postgres/packages/packages.deps | 1
spacewalk/certs-tools/rhn_ssl_tool.py | 2
spacewalk/certs-tools/spacewalk-certs-tools.spec | 6
web/html/confirm_email_success.pxt | 20
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 64 -
web/modules/rhn/RHN/DB/Downloads.pm | 15
web/modules/rhn/RHN/DB/Org.pm | 40
web/modules/rhn/RHN/DB/ServerGroup.pm | 18
web/modules/rhn/RHN/DB/User.pm | 30
web/modules/rhn/RHN/TokenGen/Local.pm | 7
web/modules/sniglets/Sniglets/Downloads.pm | 308 -------
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 57 -
web/modules/sniglets/Sniglets/Org.pm | 32
web/modules/sniglets/Sniglets/Users.pm | 438 ----------
22 files changed, 48 insertions(+), 1067 deletions(-)
---
14 years, 5 months
rel-eng/packages spacewalk/certs-tools
by Michael Mraka
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit eb0ee8ea0adff7ae64b5c42662ffd81cb45afac8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 14 10:47:40 2009 +0100
Automatic commit of package [spacewalk-certs-tools] release [0.8.3-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 886d5c2..4e24d8b 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-0.8.2-1 spacewalk/certs-tools/
+0.8.3-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 1931dd1..4553f19 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 0.8.2
+Version: 0.8.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Mon Dec 14 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.3-1
+- fixed namespace of rhn_rpm
+- removed dead code
+
* Mon Dec 07 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.2-1
- moved code from rhnlib to spacewalk-backend-libs
14 years, 5 months
4 commits - backend/common backend/satellite_tools backend/spacewalk-backend.spec spacewalk/certs-tools
by Michael Mraka
backend/common/rhnLib.py | 19 -------------------
backend/satellite_tools/satsync.py | 31 +++++++++++++++++--------------
backend/spacewalk-backend.spec | 2 +-
spacewalk/certs-tools/rhn_ssl_tool.py | 2 +-
4 files changed, 19 insertions(+), 35 deletions(-)
New commits:
commit 1a05ef6b49c6abcd516a9064466988ce22210b88
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 14 10:46:05 2009 +0100
fixed namespace of rhn_rpm
diff --git a/spacewalk/certs-tools/rhn_ssl_tool.py b/spacewalk/certs-tools/rhn_ssl_tool.py
index 3835c28..e3a1f67 100755
--- a/spacewalk/certs-tools/rhn_ssl_tool.py
+++ b/spacewalk/certs-tools/rhn_ssl_tool.py
@@ -50,7 +50,7 @@ from sslToolLib import RhnSslToolException, rotateFile, rhn_popen, cleanupAbsPat
gendir, chdir, getMachineName, fixSerial, TempDir, parseRPMFilename, \
errnoGeneralError, errnoSuccess, maketemp
-from rhn.common.rhn_rpm import hdrLabelCompare, sortRPMs, get_package_header, \
+from spacewalk.common.rhn_rpm import hdrLabelCompare, sortRPMs, get_package_header, \
getInstalledHeader
from sslToolConfig import ConfigFile, figureSerial, getOption, CERT_PATH, \
commit 0583582ef110eebad9a404ff99ceecd48dd463e0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 14 10:12:39 2009 +0100
python-devel is needed during build
this fixes wrong require from 4323a62a6c710fa931a46315be3a6fe2f1b6f914
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 64093a6..206abfe 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -144,6 +144,7 @@ This package contains listener for the Server XML dumper.
%package libs
Summary: Spacewalk server and client tools libraries
Group: Applications/Internet
+BuildRequires: python-devel
%description libs
Libraries required by both Spacewalk server and Spacewalk client tools.
@@ -206,7 +207,6 @@ Requires: %{name}-app = %{version}-%{release}
Requires: %{name}
Requires: spacewalk-certs-tools
Requires: spacewalk-admin >= 0.1.1-0
-Requires: python-devel
Requires: python-gzipstream
Requires: python-hashlib
Requires: PyXML
commit 2cdf87ec78284bd84349571936133bdc8307fa13
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 17:06:21 2009 +0100
fixed checksum in _diff_packages, _process_package and _get_rel_package_path
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 5383582..230d32c 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -833,22 +833,23 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
self._diff_packages()
_query_compare_packages = """
- select p.id, c.checksum md5sum, p.path, p.package_size,
+ select p.id, c.checksum_type, c.checksum, p.path, p.package_size,
TO_CHAR(p.last_modified, 'YYYYMMDDHH24MISS') last_modified
- from rhnPackage p, rhnChecksum c
+ from rhnPackage p, rhnChecksumView c
where p.name_id = lookup_package_name(:name)
and p.evr_id = lookup_evr(:epoch, :version, :release)
and p.package_arch_id = lookup_package_arch(:arch)
and (p.org_id = :org_id or
(p.org_id is null and :org_id is null))
and p.checksum_id = c.id
- and c.checksum =: md5sum
+ and c.checksum = :checksum
+ and c.checksum_type = :checksum_type
"""
# XXX the "is null" condition will have to change in multiorg satellites
def _diff_packages(self):
package_collection = sync_handlers.ShortPackageCollection()
nvrea_keys = ['name', 'epoch', 'version', \
- 'release', 'arch', 'md5sum']
+ 'release', 'arch', 'checksum']
h = rhnSQL.prepare(self._query_compare_packages)
missing_channel_packages = {}
@@ -884,7 +885,10 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
else:
nevra['org_id'] = package['org_id']
- apply(h.execute, (), nevra)
+ params = nevra.copy()
+ params['checksum_type'] = nevra['checksum'][0]
+ params['checksum'] = nevra['checksum'][1]
+ apply(h.execute, (), params)
row = h.fetchone_dict()
# Update the progress bar
pb.addTo(1)
@@ -910,8 +914,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
if ul:
raise RhnSyncException, 'ERROR: incremental dump skipped'
- def _get_rel_package_path(self, nevra, org_id, source=0, md5sum=None):
- checksum = ('md5', md5sum) # FIXME sha256
+ def _get_rel_package_path(self, nevra, org_id, source=0, checksum=None):
return get_package_path(nevra, org_id, prepend=CFG.PREPENDED_DIR,
source=source, checksum=checksum)
@@ -961,7 +964,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
nevra = []
for t in ['name', 'epoch', 'version', 'release', 'arch']:
nevra.append(package[t])
- md5sum = package['md5sum']
+ checksum = package['checksum']
package_size = package['package_size']
if package['org_id'] is not None:
@@ -969,12 +972,12 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
else:
orgid = package['org_id']
- path = self._get_rel_package_path(nevra, orgid, source=source, md5sum=md5sum)
+ path = self._get_rel_package_path(nevra, orgid, source, checksum)
if not row:
# Package is missing completely from the DB
m_channel_packages.append((package_id, path))
(errcode, ret_path) = self._verify_file(path,
- l_timestamp, package_size, ('md5', md5sum)) # FIXME sha256
+ l_timestamp, package_size, checksum)
if errcode == 0:
# Package on the filesystem, and matches
return
@@ -984,7 +987,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
# Package found in the DB
db_timestamp = int(rhnLib.timestamp(row['last_modified']))
- db_md5sum = row['md5sum']
+ db_checksum = (row['checksum_type'], row['checksum'])
db_package_size = row['package_size']
db_path = row['path']
final_path = db_path
@@ -992,7 +995,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
# Check the filesystem
# This is one ugly piece of code
(errcode, ret_path) = self._verify_file(db_path, l_timestamp,
- package_size, ('md5', md5sum)) # FIXME sha256
+ package_size, checksum)
if errcode != 0:
if errcode != 1 or path == db_path:
# Package is modified; fix it
@@ -1001,7 +1004,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
# Package is missing, and the DB path is, for some
# reason, not the same as the computed path.
(errcode, ret_path) = self._verify_file(path,
- l_timestamp, package_size, ('md5', md5sum)) # FIXME sha256
+ l_timestamp, package_size, checksum)
if errcode != 1:
# Use the computed path
final_path = path
@@ -1009,7 +1012,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
# file is modified too; re-download
m_fs_packages.append((package_id, final_path))
- if (l_timestamp <= db_timestamp and md5sum == db_md5sum and
+ if (l_timestamp <= db_timestamp and checksum == db_checksum and
package_size == db_package_size and final_path == db_path):
# Same package
return
commit 00db2ed7deb2e67610fb7b2146ce2311ad4420f6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 11 16:51:05 2009 +0100
removed unnecesssary import
diff --git a/backend/common/rhnLib.py b/backend/common/rhnLib.py
index 77ca78e..2937b32 100644
--- a/backend/common/rhnLib.py
+++ b/backend/common/rhnLib.py
@@ -27,25 +27,6 @@ import urlparse
from common import log_debug, log_error
from spacewalk.common import checksum
-try:
- import hashlib
-except ImportError:
- import md5
- import sha
- from Crypto.Hash import SHA256 as sha256
- class hashlib:
- @staticmethod
- def new(checksum):
- if checksum == 'md5':
- return md5.new()
- elif checksum == 'sha1':
- return sha.new()
- elif checksum == 'sha256':
- return sha256.new()
- else:
- raise ValueError, "Incompatible checksum type"
-
-
def setHeaderValue(mp_table, name, values):
"""
Function that correctly sets headers in an Apache-like table
14 years, 5 months
15 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/ServerGroup.pm | 18 -
web/modules/rhn/RHN/DB/User.pm | 30 --
web/modules/sniglets/Sniglets/Users.pm | 438 ---------------------------------
3 files changed, 486 deletions(-)
New commits:
commit b5aa827ba8941e0e9e553e2bbe82291d7c68910d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:43:51 2009 +0100
servergroup_admin_overview in ServerGroup is dead code, removing.
diff --git a/web/modules/rhn/RHN/DB/ServerGroup.pm b/web/modules/rhn/RHN/DB/ServerGroup.pm
index 92180f0..199e8d8 100644
--- a/web/modules/rhn/RHN/DB/ServerGroup.pm
+++ b/web/modules/rhn/RHN/DB/ServerGroup.pm
@@ -464,24 +464,6 @@ EOQ
return @groups;
}
-sub servergroup_admin_overview {
- my $self = shift;
- my $org_id = shift;
- my $sgid = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOS);
-SELECT wc.id, wc.login,
- NVL((SELECT MAX(1) FROM rhnUserManagedServerGroups USGP WHERE USGP.server_group_id = ? AND USGP.user_id = wc.id), 0)
- FROM web_contact wc
- WHERE wc.org_id = ?
-EOS
-
- $sth->execute($sgid, $org_id);
-
- return $sth->fullfetch;
-}
-
sub intersect_groups {
my $self = shift;
my $user_id = shift;
commit c6992133ffab6b221474388f58f8b418d09ad24f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:43:22 2009 +0100
Removing if_server_groups makes servergroup_admin_overview obsolete, removing.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index b92f1c8..d8e49f6 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -2386,36 +2386,6 @@ sub approve {
return $self->password;
}
-sub servergroup_admin_overview {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
-
- my @params = ($self->id, $self->org_id);
- my $query = <<EOQ;
-SELECT SG.id, SG.name,
- NVL((SELECT MAX(1) FROM rhnUserServerGroupPerms USGP WHERE USGP.server_group_id = SG.id AND USGP.user_id = ?), 0)
- FROM rhnServerGroup SG
- WHERE SG.org_id = ?
- AND SG.group_type IS NULL
-EOQ
-
- if ($self->is('org_admin')) {
- $query = <<EOQ;
-SELECT SG.id, SG.name, 1
- FROM rhnServerGroup SG
- WHERE SG.org_id = ?
- AND SG.group_type IS NULL
-EOQ
- shift @params;
- }
-
- my $sth = $dbh->prepare($query);
- $sth->execute(@params);
-
- return $sth->fullfetch;
-}
-
sub grant_servergroup_permission {
my $self = shift;
my $uid;
commit ec89432bdf362b87985a42c230fa4cdf87f2b316
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:41:58 2009 +0100
rhn-if-server-groups not used anywhere, makes if_server_groups obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 6235061..56bb925 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -61,8 +61,6 @@ sub register_tags {
$pxt->register_tag('rhn-user-site-view' => \&user_site_view);
- $pxt->register_tag('rhn-if-server-groups' => \&if_server_groups);
-
$pxt->register_tag('rhn-user-login' => \&rhn_user_login);
$pxt->register_tag('rhn-user-default-system-groups-form' => \&default_system_groups);
@@ -1251,20 +1249,6 @@ sub check_perms {
return 1;
}
-sub if_server_groups {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my @groups = $pxt->user->servergroup_admin_overview;
- @groups = grep { $_->[2] } @groups;
-
- return unless @groups;
-
- return $block;
-}
-
sub rhn_user_login {
my $pxt = shift;
commit e737c65f066116efa0f579cfd2753a259e7b01f7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:41:17 2009 +0100
rhn-if-pref not used anywhere, makes if_pref obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 7c0c72c..6235061 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -61,8 +61,6 @@ sub register_tags {
$pxt->register_tag('rhn-user-site-view' => \&user_site_view);
- $pxt->register_tag('rhn-if-pref' => \&if_pref, -10);
-
$pxt->register_tag('rhn-if-server-groups' => \&if_server_groups);
$pxt->register_tag('rhn-user-login' => \&rhn_user_login);
@@ -995,28 +993,6 @@ sub rhn_require {
return '';
}
-sub if_pref {
- my $pxt = shift;
- my %attr = @_;
-
- my $pref_name = $attr{name};
- my $pref_val = $attr{value};
-
- my $selected = $pxt->user->get_pref($pref_name);
-
- if (uc($selected) eq uc($pref_val)) {
-
- if (my $file = $attr{file}) {
- return $pxt->include($file);
- }
- else {
- return $attr{__block__};
- }
- }
-
- return;
-}
-
sub toggle_pref_cb {
my $pxt = shift;
commit 9bda7665b7fe276b5ce218e33e497c263ae396f7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:40:35 2009 +0100
rhn-toggle-pref not used anywhere, makes toggle_pref obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 06d59ea..7c0c72c 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -61,7 +61,6 @@ sub register_tags {
$pxt->register_tag('rhn-user-site-view' => \&user_site_view);
- $pxt->register_tag('rhn-toggle-pref' => \&toggle_pref);
$pxt->register_tag('rhn-if-pref' => \&if_pref, -10);
$pxt->register_tag('rhn-if-server-groups' => \&if_server_groups);
@@ -996,42 +995,6 @@ sub rhn_require {
return '';
}
-sub toggle_pref {
- my $pxt = shift;
- my %attr = @_;
-
- my $pref_name = $attr{name};
- my $type = $attr{type};
-
- my @labels = split(/\|/, $attr{labels} . '');
- my @values = split(/\|/, $attr{values} . '');
-
- my %pref_map;
-
- foreach my $val (@values) {
- $pref_map{$val} = shift @labels;
- }
-
- my $selected = $pxt->user->get_pref($pref_name);
-
- my @opts;
-
- foreach my $val (@values) {
- if ($val eq $selected) {
- unshift @opts, $pref_map{$val} . (defined $type ? " $type" : '');
- }
- else {
- my $uri = $pxt->uri;
- push @opts,
- sprintf('(<a href="%s?pxt_trap=rhn:toggle_pref_cb&pref_name=%s&pref_value=%s">View %s</a>)',
- $uri, $pref_name, $val, $pref_map{$val});
- }
- }
-
- my $html = join(' ', @opts);
- return $html;
-}
-
sub if_pref {
my $pxt = shift;
my %attr = @_;
commit 620207743ef473d27b8fd63cba51ad3a893edc62
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:39:24 2009 +0100
rhn-opt-out not used anywhere, makes opt_out obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 6e9dfe7..06d59ea 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -61,8 +61,6 @@ sub register_tags {
$pxt->register_tag('rhn-user-site-view' => \&user_site_view);
- $pxt->register_tag('rhn-opt-out' => \&opt_out);
-
$pxt->register_tag('rhn-toggle-pref' => \&toggle_pref);
$pxt->register_tag('rhn-if-pref' => \&if_pref, -10);
@@ -998,24 +996,6 @@ sub rhn_require {
return '';
}
-sub opt_out {
- my $pxt = shift;
- my %params = @_;
-
- my $user = $pxt->user;
-
- if ($user) {
- $user->contact_email('N');
- $user->set_pref('email_notify', '0');
-
- $user->commit;
- return sprintf "Thank you, the email address '%s' will no longer receive emails.", $user->email;
- }
- else {
- return "Invalid URL.";
- }
-}
-
sub toggle_pref {
my $pxt = shift;
my %attr = @_;
commit 39889db343a2faae660c93d6b02d6b588b0fdf78
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:38:46 2009 +0100
rhn-help-link not used anywhere, makes help_link obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index eef775b..6e9dfe7 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -61,8 +61,6 @@ sub register_tags {
$pxt->register_tag('rhn-user-site-view' => \&user_site_view);
- $pxt->register_tag('rhn-help-link' => \&help_link);
-
$pxt->register_tag('rhn-opt-out' => \&opt_out);
$pxt->register_tag('rhn-toggle-pref' => \&toggle_pref);
@@ -1000,27 +998,6 @@ sub rhn_require {
return '';
}
-sub help_link {
- my $pxt = shift;
- my %params = @_;
-
- my $link;
-
- if ($pxt->user && $pxt->user->org->has_entitlement($params{entitlement})) {
- $link = $params{success_link};
- } else {
- $link = $params{fail_link};
- }
-
- my $text = $params{__block__};
- my $style = $params{style} || '';
-
- return qq(<a href="$link" style="$style">$text</a>)
- if $link;
-
- return '';
-}
-
sub opt_out {
my $pxt = shift;
my %params = @_;
commit cdfcdc77d913710f38831e0ba4761cd7ace7459f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:37:13 2009 +0100
rhn-action-summary not used anywhere, makes action_summary obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 0f9ed0d..eef775b 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -57,8 +57,6 @@ sub register_tags {
$pxt->register_tag('rhn-login-form', \&rhn_login_form);
- $pxt->register_tag('rhn-action-summary' => \&action_summary);
-
$pxt->register_tag('rhn-require' => \&rhn_require, -1000);
$pxt->register_tag('rhn-user-site-view' => \&user_site_view);
@@ -249,63 +247,6 @@ EOB
-sub action_summary {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
-
- my $html;
-
- my $days = $params{days} || 7;
-
- my $action_summary = { };
- @{$action_summary}{qw/failed pending completed total/} = @{$pxt->user->action_summary($days)}[0 .. 3];
-
- my @action_display = ( { label => 'failed',
- name => 'Recently failed actions',
- value => $action_summary->{failed},
- link => '/rhn/schedule/FailedActions.do' },
- { label => 'pending',
- name => 'Pending actions',
- value => $action_summary->{pending},
- link => '/rhn/schedule/PendingActions.do' },
- { label => 'completed',
- name => 'Recently completed actions',
- value => $action_summary->{completed},
- link => '/rhn/schedule/CompletedActions.do' } );
-
- foreach my $attrib (@action_display) {
-
- if (exists $attrib->{test}) {
- next unless $attrib->{test};
- }
- else {
- next unless $attrib->{value};
- }
-
- my $copy = $block;
-
- foreach (qw/name value link/) {
- $copy =~ s/\{attrib_$_\}/$attrib->{$_}/eg;
- }
-
- $html .= $copy;
- }
-
- if ($action_summary->{total} == 0) {
- my $message = $params{no_actions_message};
-
- $html = <<EOQ;
-<tr class="graydata" valign="middle">
-<td colspan="2" align="center"><strong>$message</strong></td>
-</tr>
-EOQ
-
- }
-
- return $html;
-}
-
sub errata_summary {
my $pxt = shift;
my %params = @_;
commit c9eced2e502ebcb80d6651facd5ae64791d3367d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:35:37 2009 +0100
rhn-system-summary not used anywhere, makes system_summary obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 745cc70..0f9ed0d 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -57,7 +57,6 @@ sub register_tags {
$pxt->register_tag('rhn-login-form', \&rhn_login_form);
- $pxt->register_tag('rhn-system-summary' => \&system_summary);
$pxt->register_tag('rhn-action-summary' => \&action_summary);
$pxt->register_tag('rhn-require' => \&rhn_require, -1000);
@@ -250,75 +249,6 @@ EOB
-sub system_summary {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
- my $html;
-
- my $system_summary = { };
-
- @{$system_summary}{qw/total out_of_date unentitled ungrouped inactive/} = @{$pxt->user->system_summary}[0 .. 4];
-
- my @system_display = ( { label => 'total',
- name => 'Total systems',
- value => $system_summary->{total},
- mode => 'SystemList' },
- { label => 'out_of_date',
- name => 'Out of date systems',
- value => $system_summary->{out_of_date},
- mode => 'OutOfDate',
- test => 1 },
- { label => 'unentitled',
- name => 'Unentitled systems',
- value => $system_summary->{unentitled},
- mode => 'Unentitled' },
- { label => 'ungrouped',
- name => 'Ungrouped systems',
- value => $system_summary->{ungrouped},
- mode => 'Ungrouped',
- test => $pxt->user->is('org_admin') && $pxt->user->org->has_entitlement('sw_mgr_enterprise') && $system_summary->{ungrouped} > 0 },
- { label => 'inactive',
- name => 'Inactive systems',
- value => $system_summary->{inactive},
- mode => 'Inactive' } );
-
- foreach my $attrib (@system_display) {
-
- if (exists $attrib->{test}) {
- next unless $attrib->{test};
- }
- else {
- next unless $attrib->{value};
- }
-
- my $copy = $block;
-
- my $link = $params{link_url};
- $link =~ s/\{mode\}/$attrib->{mode}/eg;
-
- $copy =~ s/\{attrib_link\}/$link/;
-
- foreach (qw/name value/) {
- $copy =~ s/\{attrib_$_\}/$attrib->{$_}/eg;
- }
-
- $html .= $copy;
- }
-
- if ($system_summary->{total} == 0) {
- my $message = $params{no_systems_message};
-
- $html = <<EOQ;
-<tr class="graydata" valign="middle">
-<td colspan="2" align="center"><strong>$message</strong></td>
-</tr>
-EOQ
-}
-
- return $html;
-}
-
sub action_summary {
my $pxt = shift;
my %params = @_;
commit 1f1e4fdbf2eb71d1c431ede7e217ef5369b5a1c6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:34:32 2009 +0100
rhn-user-prefs-edit not used anywhere, makes user_prefs_edit obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 328e7ca..745cc70 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -57,8 +57,6 @@ sub register_tags {
$pxt->register_tag('rhn-login-form', \&rhn_login_form);
- $pxt->register_tag('rhn-user-prefs-edit' => \&user_prefs_edit);
-
$pxt->register_tag('rhn-system-summary' => \&system_summary);
$pxt->register_tag('rhn-action-summary' => \&action_summary);
@@ -1066,65 +1064,6 @@ sub timezone_sort {
return @zones;
}
-sub user_prefs_edit {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $user;
- my %subst;
-
- if ($pxt->user->is('org_admin') and $pxt->param('uid')) {
- $user = RHN::User->lookup(-id => $pxt->param('uid'));
- }
- else {
- $user = $pxt->user;
- }
-
- $pxt->pnotes(user_name => $user->login);
-
- $subst{email_checked} = $user->get_pref('email_notify') ? '1' : '';
-
- foreach (qw/contact_email contact_call contact_fax contact_mail/) {
- $subst{$_ .'_checked'} = defined $user->$_() && $user->$_() eq 'Y' ? '1' : '';
- }
-
- $subst{preferred_page_size_select} = PXT::HTML->select(-name => 'preferred_page_size',
- -size => 1,
- -options => [ map { [ $_ * 5, $_ * 5, $user->preferred_page_size == $_ * 5] } 1..10 ] );
-
- my @raw_timezones = PXT::Utils->get_timezones();
- my $now = DateTime->now;
- for my $zone (@raw_timezones) {
- my $tz = new DateTime::TimeZone(name => $zone->{OLSON});
- $zone->{OFFSET} = $tz->offset_for_datetime($now);
- }
- @raw_timezones = Sniglets::Users->timezone_sort(@raw_timezones);
-
- my @timezones;
-
- my $pref = $user->get_pref('timezone_id');
- for my $zone (@raw_timezones) {
- my $hours = int($zone->{OFFSET} / 60 / 60);
- my $minutes = int($zone->{OFFSET} / 60) % 60;
- push @timezones, [ sprintf("(GMT%+03d%02d) %s", $hours, $minutes, $zone->{DESCRIPTION}),
- $zone->{ID},
- $zone->{ID} eq $pref ];
- }
-
- my $time_zone = PXT::HTML->select(-name => 'time_zone',
- -size => 1,
- -options => \@timezones,
- );
-
- $subst{time_zone_select} = $time_zone;
-
- PXT::Debug->log(7, "performing pref substitutuion");
- $block = PXT::Utils->perform_substitutions($block, \%subst);
-
- return $block;
-}
-
sub user_prefs_edit_cb {
my $pxt = shift;
commit 89ebff3d45a67ab3804ba3bca22d8565c971811b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:31:58 2009 +0100
public-login-link not used anywhere, makes public_login_link obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 8b575d8..328e7ca 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -57,8 +57,6 @@ sub register_tags {
$pxt->register_tag('rhn-login-form', \&rhn_login_form);
- $pxt->register_tag('public-login-link', \&public_login_link);
-
$pxt->register_tag('rhn-user-prefs-edit' => \&user_prefs_edit);
$pxt->register_tag('rhn-system-summary' => \&system_summary);
@@ -254,17 +252,6 @@ EOB
-# subtlely different login link behavior, more like www.redhat.com
-# logs you in but returns you to the page.
-sub public_login_link {
- my $pxt = shift;
- my @params = $pxt->param();
-
- my $login_url = PXT::Utils->escapeURI($pxt->uri . (@params ? "?" . join("&", map { $_ . "=" . $pxt->dirty_param($_) } @params) : ""));
- my $login_pxt = $pxt->derelative_url("/errata/login.pxt", 'https');
- return "<a href=\"$login_pxt?url_bounce=$login_url\"><img src=\"/img/homepg_login.gif\" width=\"117\" height=\"21\" border=\"0\" alt=\"login\" /></a>";
-}
-
sub system_summary {
my $pxt = shift;
my %params = @_;
commit 7a95514a05b1feb8455262aa786d1d2bc98d3799
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:31:05 2009 +0100
public-logout-link not used anywhere, makes public_logout_link obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index d313e85..8b575d8 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -57,9 +57,6 @@ sub register_tags {
$pxt->register_tag('rhn-login-form', \&rhn_login_form);
- # for the non-rhn's pages we serve out, little different logout link behavior,
- # more in line w/ www.redhat.com
- $pxt->register_tag('public-logout-link', \&public_logout_link);
$pxt->register_tag('public-login-link', \&public_login_link);
$pxt->register_tag('rhn-user-prefs-edit' => \&user_prefs_edit);
@@ -257,17 +254,6 @@ EOB
-# subtlely different logout link behavior, more like www.redhat.com
-# logs you out but keeps you on the page.
-sub public_logout_link {
- my $pxt = shift;
-
- my $base_url = $pxt->derelative_url($pxt->uri, 'http');
- my $logout_url = $pxt->uri . "?" . join("&", map { $_ . "=" . $pxt->passthrough_param($_) } $pxt->param());
-
- return "<a href=\"$logout_url&pxt:trap=rhn:logout_cb&logout_redirect=$base_url\"><img src=\"/img/homepg_logout.gif\" width=\"71\" height=\"21\" border=\"0\" valign=\"top\" alt=\"logout\" /></a>";
-}
-
# subtlely different login link behavior, more like www.redhat.com
# logs you in but returns you to the page.
sub public_login_link {
commit fa0687eb8681fb9e27b840044812f5a373cd9aea
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:30:00 2009 +0100
rhn-logout-form not used anywhere, makes rhn_logout_form obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 1610c35..d313e85 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-login-form', \&rhn_login_form);
- $pxt->register_tag('rhn-logout-form', \&rhn_logout_form);
# for the non-rhn's pages we serve out, little different logout link behavior,
# more in line w/ www.redhat.com
@@ -530,18 +529,6 @@ sub rhn_login_form {
return $body;
}
-sub rhn_logout_form {
- my $pxt = shift;
- my %params = @_;
-
- my $body = $params{__block__};
- $body = $pxt->prefill_form_values($body);
-
- $body =~ s(\[logout_form_hidden\])(<input type="hidden" name="pxt_trap" value="rhn:logout_cb" />)gmsi;
-
- return $body;
-}
-
sub forgot_password_cb {
my $pxt = shift;
commit 53352caff6b5475a60b8a8f2651e9d663f028891
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:28:39 2009 +0100
rhn-admin-user-site-edit-form not used anywhere, makes admin_user_site_edit_form obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 6d85869..1610c35 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -55,8 +55,6 @@ sub register_tags {
$pxt->register_tag('public-secure-links-if-logged-in' => \&secure_links_if_logged_in, 101);
- $pxt->register_tag('rhn-admin-user-site-edit-form' => \&admin_user_site_edit_form);
-
$pxt->register_tag('rhn-login-form', \&rhn_login_form);
$pxt->register_tag('rhn-logout-form', \&rhn_logout_form);
@@ -849,77 +847,6 @@ sub admin_user_edit_cb {
}
-sub admin_user_site_edit_form {
- my $pxt = shift;
- my %params = @_;
-
- my $uid = $pxt->param('uid') || $pxt->user->id;
- my $user = RHN::User->lookup(-id => $uid);
-
- die "no user" unless $user;
-
- if ($pxt->user->org_id != $user->org_id) {
- Carp::cluck "Orgs for admin user edit mistatch (admin: @{[$pxt->user->org_id]} != @{[$user->org_id]}";
- $pxt->redirect("/errors/permission.pxt");
- }
-
- if ($uid != $pxt->user->id and not $pxt->user->is('org_admin')) {
- Carp::cluck "Non-orgadmin attempting to edit another's record";
- $pxt->redirect("/errors/permission.pxt");
- }
-
- $pxt->pnotes(user_name => $user->login);
-
- my %type_table = (M => "Mailing", B => "Billing", S => "Shipping");
-
- my $type = uc $params{type} || $pxt->dirty_param('type') || 'M';
-
- my $block = $params{__block__};
-
- $block =~ s/\{site_address_type\}/$type_table{$type}/ig;
-
- my ($site) = $user->sites($type);
- ($site) = $user->sites('M')
- unless $site;
-
- if ($site) {
- foreach (qw/site_address1 site_city/) {
- if ($site->$_() eq '.') {
- $site->$_('');
- }
- }
- }
-
- if ($user->id == $pxt->user->id) {
- if ($type eq 'M' and $pxt->uri =~ m(/network/account/edit_address.pxt) and $site and ($site->site_city eq '.' or $site->site_address1 eq '.')) {
- $pxt->push_message(site_info => 'Please take a moment and complete the information below for our records.');
-
- $site->$_('')
- foreach qw/site_address1 site_address2 site_address3 site_city site_state site_zip site_fax site_phone/;
- }
- }
-
- my $sid = defined $site ? $site->site_id : 0;
-
- $block =~ s(\{$_\})(defined $site and defined $site->$_() ? PXT::Utils->escapeHTML($site->$_()) : '')eig
- foreach qw/site_address1 site_address2 site_address3 site_city site_state site_zip site_fax site_phone/;
-
- $block =~ s/\{site_country_selectbox\}/PXT::Utils->country_selectbox("site_country", 'en', $site ? $site->site_country() : 'US')/eig;
-
-
- my $formvars = PXT::HTML->hidden(-name => 'type', -value => $type);
- $formvars .= PXT::HTML->hidden(-name => 'uid', -value => $uid);
- $formvars .= PXT::HTML->hidden(-name => 'pxt:trap', -value => 'rhn:admin_user_site_edit_cb')
- if defined $params{mode} and $params{mode} ne "checkout";
-
- $formvars .= PXT::HTML->hidden(-name => 'redirect_to_main_page', value => 'yes')
- if ($pxt->pnotes('redirect_to_main_page'));
-
- $block =~ s/\{admin_user_formvars\}/$formvars/egi;
-
- return $block;
-}
-
sub user_site_view {
my $pxt = shift;
my %params = @_;
commit 5dc6ebb196cd79437c099fb60c4689090c1e0568
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:27:35 2009 +0100
rhn-user-info not used anywhere, makes rhn_user_info obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 913f033..6d85869 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -55,7 +55,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-site-edit-form' => \&admin_user_site_edit_form);
$pxt->register_tag('rhn-login-form', \&rhn_login_form);
@@ -283,20 +282,6 @@ sub public_login_link {
return "<a href=\"$login_pxt?url_bounce=$login_url\"><img src=\"/img/homepg_login.gif\" width=\"117\" height=\"21\" border=\"0\" alt=\"login\" /></a>";
}
-sub rhn_user_info {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
-
- my %subst;
-
- $subst{login} = $pxt->user->login;
- $subst{email} = $pxt->user->email;
- $subst{created} = $pxt->user->created;
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
sub system_summary {
my $pxt = shift;
my %params = @_;
14 years, 5 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 5 ++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 +++++
java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 11 ++++++++++
3 files changed, 22 insertions(+)
New commits:
commit 6942ba4b6497e562b1c412bf49da1a1cf361e1ac
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Dec 11 11:41:19 2009 -0500
545995 - adding package signing key to the package details page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
index 9bd7cb0..4355221 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
@@ -47,6 +47,7 @@ import javax.servlet.http.HttpServletResponse;
public class PackageDetailsAction extends RhnAction {
private final String PACKAGE_NAME = "package_name";
+ private final String PACKAGE_KEY = "package_key";
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping,
@@ -84,6 +85,10 @@ public class PackageDetailsAction extends RhnAction {
else {
request.setAttribute("type", "rpm");
request.setAttribute(PACKAGE_NAME, pkg.getFilename());
+ if (!pkg.getPackageKeys().isEmpty()) {
+ request.setAttribute(PACKAGE_KEY,
+ pkg.getPackageKeys().iterator().next().getKey());
+ }
}
if (DownloadManager.isFileAvailable(pkg.getPath())) {
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 10d1edb..740caf3 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -8442,6 +8442,12 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="channel.manage.merge.finished">
<source>{0} Package(s) have been added and {1} Package(s) have been removed from the channel.</source>
</trans-unit>
+ <trans-unit id="package.jsp.key">
+ <source>Signing Key</source>
+ </trans-unit>
+ <trans-unit id="package.jsp.key.unkown">
+ <source>(Unknown)</source>
+ </trans-unit>
<trans-unit id="kickstart.cobbler.distro.syncfail">
<source>
The following is a list of errors gathered while Spacewalk attempts to
diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
index 911ec0c..d4aa452 100644
--- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
@@ -57,6 +57,17 @@
</tr>
<tr>
+ <th><bean:message key="package.jsp.key"/>:</th>
+ <c:if test="${package_key != null}">
+ <td><c:out value="${package_key}" /></td>
+ </c:if>
+ <c:if test="${package_key == null}">
+ <td><bean:message key="package.jsp.key.unkown"/></td>
+ </c:if>
+
+ </tr>
+
+ <tr>
<th><bean:message key="package.jsp.md5sum"/>:</th>
<td><c:out value="${pack.checksum}" /></td>
</tr>
14 years, 5 months
9 commits - web/modules
by Jan Pazdziora
web/modules/sniglets/Sniglets/Downloads.pm | 203 -----------------------------
1 file changed, 1 insertion(+), 202 deletions(-)
New commits:
commit ccb0df5cf735020a95535236e542f2c908acfc64
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:24:51 2009 +0100
Previous removals made use RHN::DataSource::Channel obsolete but we need RHN::Channel.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index 5a71d7a..4030d5e 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -21,7 +21,7 @@ use PXT::HTML;
use PXT::Config;
use RHN::TokenGen::Generator;
-use RHN::DataSource::Channel;
+use RHN::Channel;
use File::Spec;
use Params::Validate;
commit 74bea2c7888dc7c669389e2062d6af990e2aa068
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:23:56 2009 +0100
use RHN::SessionSwap is dead code, it does not export anything and is not called explicitly.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index 26be3ea..5a71d7a 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -21,7 +21,6 @@ use PXT::HTML;
use PXT::Config;
use RHN::TokenGen::Generator;
-use RHN::SessionSwap;
use RHN::DataSource::Channel;
use File::Spec;
commit 98b5985daa9bc3d5abe4c0d2ee380b857557cc94
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:22:07 2009 +0100
Removal of ftp_download_handler and akamai_redirect made use RHN::TokenGen::Local not needed, removing.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index 9e842a5..26be3ea 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -21,7 +21,6 @@ use PXT::HTML;
use PXT::Config;
use RHN::TokenGen::Generator;
-use RHN::TokenGen::Local;
use RHN::SessionSwap;
use RHN::DataSource::Channel;
commit 10fb0274a6acb959e086b62512c4e6570b7c7672
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:19:59 2009 +0100
Removal of ftp_download_handler made send_partial_file dead code, removing.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index 4fee652..9e842a5 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -109,37 +109,4 @@ sub ftp_download {
return $ret;
}
-sub send_partial_file {
- my $fh = shift;
- my $filename = shift;
- my $pxt = shift;
- my $header = $pxt->header_in('Range');
- my $range_start = $header;
- my $range_end = $header;
- my $distance = -1;
- my $chunk;
- $range_start =~ s{bytes=([0-9]*)-([0-9]*)}{$1};
- $range_end =~ s{bytes=([0-9]*)-([0-9]*)}{$2};
- if ($range_start eq $header) {
- $range_start =~ s{bytes=([0-9]*)}{$1};
- $range_end = -1;
- }
- if ($range_end > $range_start) {
- $distance = $range_end - $range_start;
- }
- if ($distance > -1) {
- if ($range_start > 0) {
- seek($fh, 0, $range_start);
- }
- read($fh, $chunk, $distance);
- $pxt->header_out('Content-length' => $distance);
- $pxt->send_http_header;
- $pxt->print($chunk);
- }
- else {
- $pxt->header_out('Content-length' => -s $filename);
- $pxt->send_http_header;
- $pxt->sendfile($filename);
- }
-}
1;
commit 071a87b98d332abfaf96a5a4a220b3d055ff0b30
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:16:45 2009 +0100
rhn-akamai-redirect not used anywhere, makes akamai_redirect obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index 73bf89a..4fee652 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -34,7 +34,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag('rhn-ftp-download', \&ftp_download, 4);
- $pxt->register_tag('rhn-akamai-redirect' => \&akamai_redirect);
$pxt->register_tag('rhn-download-package', \&download_package, 1);
}
@@ -110,24 +109,6 @@ sub ftp_download {
return $ret;
}
-sub akamai_redirect {
- my $pxt = shift;
- my $user_id = $pxt->user_id;
-
- my $file_path = $pxt->param('iso_path');
- my $base_url = $pxt->dirty_param('base_url'); #'/download' probably we need this from akamai
- my $location = $pxt->dirty_param('location');
-
- my $expires = time + PXT::Config->get('download_url_lifetime');
- my $file_id = RHN::TokenGen::Local->get_file_id($file_path);
-
- my $redirect_url = RHN::TokenGen::Generator->generate_url($user_id, $file_id, $file_path, $base_url, $location, $expires, $pxt->ssl_available);
-
- $pxt->redirect($redirect_url); #redirect to new tampa/local url
-
- return;
-}
-
sub send_partial_file {
my $fh = shift;
my $filename = shift;
commit b5c10e7fb5e1130d0c92d6b941f8afca6961e03c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:14:57 2009 +0100
rhn-recent-iso-channels not used anywhere, makes recent_iso_channels obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index ef0941c..73bf89a 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -33,39 +33,11 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-recent-iso-channels', \&recent_iso_channels, 1);
$pxt->register_tag('rhn-ftp-download', \&ftp_download, 4);
$pxt->register_tag('rhn-akamai-redirect' => \&akamai_redirect);
$pxt->register_tag('rhn-download-package', \&download_package, 1);
}
-sub recent_iso_channels {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__} || '';
- my $limit = $params{limit};
-
- my @channels = split /\s*,\s*/, PXT::Config->get("popular_iso_channels");
-
- my $ret;
- foreach my $i (0 .. $#channels) {
- last if $limit and $i >= $limit;
- my $channel_id = RHN::Channel->channel_id_by_label($channels[$i]);
- next unless $pxt->user->verify_channel_access($channel_id);
- my $channel = RHN::Channel->lookup(-id => $channel_id);
-
- my %s;
- $s{channel_label} = $channel->label;
- $s{channel_name} = $channel->name;
- PXT::Utils->escapeHTML_multi(\%s);
-
- $ret .= PXT::Utils->perform_substitutions($block, \%s);
- }
-
- return $ret;
-}
-
# non-tag access to RHN download links
sub rhn_download_url {
my $class = shift;
commit ccd30a09b5489de8c6d44e6e184b558128cd5d56
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:14:15 2009 +0100
Removal of channel_downloads makes choose_download_location dead code, removing.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index 5351577..ef0941c 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -66,36 +66,6 @@ sub recent_iso_channels {
return $ret;
}
-# algorithm: sum the config weights of the various locations. pick a
-# random choice in (0 .. $sum - 1). walk the list of choices,
-# subtracting the weight from the choice we made. when the result is
-# negative, we found where in the list of choices our random choice
-# has hit. default to the first choice if somehow this does not work
-# (which it never should, but...).
-
-sub choose_download_location {
- my $class = shift;
- my @locations = @_;
-
- # only one location? use it
- return $locations[0] if @locations == 1;
-
- my @weights = map { PXT::Config->get("download_${_}_weight") || 0 } @locations;
-
- my $sum = 0;
- $sum += $_ for @weights;
- my $choice = int(rand($sum));
-
- for my $i (0 .. $#locations) {
- $choice -= $weights[$i];
- if ($choice < 0) {
- return $locations[$i];
- }
- }
-
- return $locations[0]
-}
-
# non-tag access to RHN download links
sub rhn_download_url {
my $class = shift;
commit 35d40d64c7eaa01ed1fba057ef014dcd80eaf781
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:13:02 2009 +0100
rhn-channel-downloads not used anywhere, makes channel_downloads obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index d2a49eb..5351577 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -33,8 +33,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-channel-downloads' => \&channel_downloads, 3);
-
$pxt->register_tag('rhn-recent-iso-channels', \&recent_iso_channels, 1);
$pxt->register_tag('rhn-ftp-download', \&ftp_download, 4);
$pxt->register_tag('rhn-akamai-redirect' => \&akamai_redirect);
@@ -98,49 +96,6 @@ sub choose_download_location {
return $locations[0]
}
-sub channel_downloads {
- my $pxt = shift;
- my %params = @_;
-
- my $channel = $params{channel};
- my $category = $params{category};
- my $mode = $params{mode};
- my $type = $params{type};
- my $block = $params{__block__};
-
- my $ret;
-
- my $file_ds = new RHN::DataSource::Channel(-mode => $mode);
- my $isos = $file_ds->execute_full(-channel_label => $channel, -download_type => $type);
-
- my $i = 0;
- foreach my $iso (@$isos) {
- next unless $iso->{CATEGORY} eq $category;
- my %s;
-
- $s{download_name} = $iso->{DOWNLOAD_NAME};
- $s{download_path} = $iso->{DOWNLOAD_PATH};
- $s{download_file_id} = $iso->{ID};
- $s{download_size} = PXT::Utils->humanify($iso->{DOWNLOAD_SIZE});
- $s{download_checksum} = $iso->{DOWNLOAD_CHECKSUM};
- $s{download_trclass} = $i++ % 2 ? "#eeeeee" : "#ffffff";
-
- if ($iso->{LOCATIONS} and @{$iso->{LOCATIONS}} > 0) {
- $s{download_location} = Sniglets::Downloads->choose_download_location(@{$iso->{LOCATIONS}});
- }
- else {
- $s{download_location} = "local";
- }
-
- PXT::Utils->escapeHTML_multi(\%s);
-
- $ret .= PXT::Utils->perform_substitutions($block, \%s);
- }
-
- return $ret;
-}
-
-
# non-tag access to RHN download links
sub rhn_download_url {
my $class = shift;
commit 6a971087698cb3e5ec959452d9ebee2db06d593e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:11:27 2009 +0100
rhn-channel-download-categories not used anywhere, makes channel_download_categories obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index c7f206d..d2a49eb 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -33,7 +33,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-channel-download-categories' => \&channel_download_categories, 2);
$pxt->register_tag('rhn-channel-downloads' => \&channel_downloads, 3);
$pxt->register_tag('rhn-recent-iso-channels', \&recent_iso_channels, 1);
@@ -99,49 +98,6 @@ sub choose_download_location {
return $locations[0]
}
-sub channel_download_categories {
- my $pxt = shift;
- my %params = @_;
- my $channel = $params{channel};
- my $block = $params{__block__};
- my $mode = $params{mode};
- my $type = $params{type};
- my $limit = $params{limit};
-
- my %cat_urls;
-
- my $ds = new RHN::DataSource::Channel(-mode => $mode);
- my $cats = $ds->execute_query(-channel_label => $channel, -download_type => $type);
- my $url_ds = new RHN::DataSource::Channel(-mode => 'release_notes_url_by_category');
- my $urls = $url_ds->execute_query(-channel_label => $channel, -download_type => $type);
- for my $row (@$urls) {
- if ($row->{RELEASE_NOTES_URL}) {
- $cat_urls{$row->{CATEGORY}} = $row->{RELEASE_NOTES_URL};
- }
- }
-
- my $ret;
- my $i = 0;
- for my $cat (@$cats) {
- my %s;
- last if $limit and ++$i > $limit;
-
- $s{download_category} = $cat->{CATEGORY};
- $s{download_type} = $type;
- PXT::Utils->escapeHTML_multi(\%s);
-
- if (exists $cat_urls{$cat->{CATEGORY}}) {
- $s{release_notes_url} = '<a href="' . $cat_urls{$cat->{CATEGORY}}
- . '">Release Notes</a>';
- }
- else {
- $s{release_notes_url} = '';
- }
-
- $ret .= PXT::Utils->perform_substitutions($block, \%s);
- } return $ret;
-}
-
sub channel_downloads {
my $pxt = shift;
my %params = @_;
14 years, 5 months
4 commits - web/html web/modules
by Jan Pazdziora
web/html/confirm_email_success.pxt | 20 -----
web/modules/rhn/RHN/DB/Downloads.pm | 15 ----
web/modules/rhn/RHN/TokenGen/Local.pm | 7 -
web/modules/sniglets/Sniglets/Downloads.pm | 105 -----------------------------
4 files changed, 147 deletions(-)
New commits:
commit 268209fea02d83e178b111344b9650056f9021dd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:07:10 2009 +0100
Removal of usage_count makes token_usage_count obsolete, removing.
diff --git a/web/modules/rhn/RHN/DB/Downloads.pm b/web/modules/rhn/RHN/DB/Downloads.pm
index 5ca668b..cd30bf8 100644
--- a/web/modules/rhn/RHN/DB/Downloads.pm
+++ b/web/modules/rhn/RHN/DB/Downloads.pm
@@ -35,21 +35,6 @@ EOQ
$dbh->commit;
}
-sub token_usage_count {
- my $class = shift;
- my $token = shift;
-
- my $dbh = RHN::DB->connect();
- my $sth = $dbh->prepare(<<EOQ);
-SELECT COUNT(1) FROM rhnFileDownload WHERE token = :token
-EOQ
- $sth->execute_h(token => $token);
- my ($ret) = $sth->fetchrow;
- $sth->finish;
-
- return $ret;
-}
-
# bump the order of a given category up in the list
sub bump_channel_category {
my $class = shift;
commit 42d799675226954a29e8b6b2fac73bc6fbcad853
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:06:17 2009 +0100
usage_count not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/TokenGen/Local.pm b/web/modules/rhn/RHN/TokenGen/Local.pm
index 291478a..a3c1472 100644
--- a/web/modules/rhn/RHN/TokenGen/Local.pm
+++ b/web/modules/rhn/RHN/TokenGen/Local.pm
@@ -79,11 +79,4 @@ sub generate_url {
return $uri;
}
-sub usage_count {
- my $self = shift;
-
- my $ret = RHN::DB::Downloads->token_usage_count($self->token_signature);
- return $ret;
-}
-
1;
commit 146990fea37e823c5aa8eae7299af42c5013e0d7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:04:46 2009 +0100
rhn-ftp-download-handler not used anywhere, makes ftp_download_handler obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index 7ab6f62..c7f206d 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -38,7 +38,6 @@ sub register_tags {
$pxt->register_tag('rhn-recent-iso-channels', \&recent_iso_channels, 1);
$pxt->register_tag('rhn-ftp-download', \&ftp_download, 4);
- $pxt->register_tag('rhn-ftp-download-handler' => \&ftp_download_handler);
$pxt->register_tag('rhn-akamai-redirect' => \&akamai_redirect);
$pxt->register_tag('rhn-download-package', \&download_package, 1);
}
@@ -276,110 +275,6 @@ sub akamai_redirect {
return;
}
-sub ftp_download_handler {
- my $pxt = shift;
-
- return if $pxt->method eq 'HEAD'; #firefox somtimes sends a head and get request
-
- my $request_magic;
- my $path_info = $pxt->pnotes('download_path_info') || $pxt->path_info;
- if ($pxt->dirty_param("auth")) {
- $request_magic = $pxt->dirty_param("auth") . $path_info;
- }
- else {
- $request_magic = $path_info;
- }
-
- my ($first_slash, $expires, $given_token, $user_id, $file_id, $path) = split(m(/), $request_magic, 6);
-
- my $computed_token = new RHN::TokenGen::Local(-expires => $expires, -user_id => $user_id,
- -path => $path, -file_id => $file_id);
-
- if ($computed_token->token_signature ne $given_token) {
- $pxt->internal_redirect("/errors/download-mismatch.pxt");
- return;
- }
-
- if (time > $expires or $computed_token->usage_count >= PXT::Config->get('download_token_limit')) {
- $pxt->status(404);
- return $pxt->include("/errors/download-expired.pxt");
- }
-
- # warn "[DOWNLOAD] Initiating download of $path with token $given_token";
-
- my $save_filename = (split m(/), $path)[-1];
-
- my $akamai_cookie = $pxt->cookie('akamai-dps-rhn-id') ? $pxt->cookie('akamai-dps-rhn-id')->value : '';
- if ($file_id > 0) {
- my $location = $pxt->header_in('X-Server-Hostname') || PXT::Config->get('base_domain');
- my @forward_ips = split /,?\s+/, ($pxt->header_in('X-Forwarded-For') || $pxt->connection->remote_ip);
-
- RHN::TokenGen::Local->record_download(-file_id => $file_id, -token => $given_token,
- -location => $location,
- -user_id => $user_id,
- -ip => $forward_ips[0]);
- }
-
- # hey, it's akamai. just return an empty 200 since we satisfied the token checks above
- if ($akamai_cookie eq 'true') {
- $pxt->manual_content(1);
- $pxt->content_type('application/octet-stream');
- $pxt->send_http_header;
-
- return;
- }
-
- if ($pxt->header_in('X-Replace-Content-Active')) {
- $pxt->header_out('X-Replace-Content', $path);
- $pxt->header_out('Content-disposition', "attachment; filename=$save_filename");
- $pxt->content_type('application/octet-stream');
- $pxt->pxt_no_cache(0);
-
- return "You should never see this.";
- }
- elsif (PXT::Config->get('satellite') or PXT::Config->get('development_environment')) {
- my $filename = File::Spec->catfile(PXT::Config->get('mount_point'), $path);
-
- if (-e $filename) {
- $pxt->manual_content(1);
- $pxt->no_cache(1);
-
- $pxt->content_type('application/octet-stream');
- $pxt->header_out('Content-disposition' => "attachment; filename=$save_filename");
-
- #IE fix for their messed up local cache
- if (defined $pxt->header_in('User-Agent') &&
- $pxt->header_in('User-Agent') =~ /MSIE/) {
- $pxt->no_cache(0);
- if ($pxt->protocol =~ /(\d\.\d)/ && $1 >= 1.1) {
- $pxt->header_out('Cache-Control', "max-age=300");
- }
- else {
- $pxt->header_out('Expires', Apache::Util::ht_time(time + 300));
- }
- }
-
- if (defined $pxt->header_in('Range')) {
- my $filehandle;
- open ($filehandle, "$filename") or die "open $filename: $!";
- send_partial_file($filehandle, $filename, $pxt);
- close $filehandle;
- }
- else {
- $pxt->header_out('Content-length' => -s $filename);
- $pxt->send_http_header;
- $pxt->sendfile($filename);
- }
- }
- else {
- die "attempted download $filename doesn't exist!";
- }
- }
- else {
- die "No X-Replace-Content header present; perhaps you aren't running behind an RHN proxy?";
- }
-}
-
sub send_partial_file {
my $fh = shift;
my $filename = shift;
commit 39fb39e7a2c839c2970e7335b3697ff25793d0e0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 17:00:35 2009 +0100
The confirm_email_success.pxt is not used anywhere, removing.
diff --git a/web/html/confirm_email_success.pxt b/web/html/confirm_email_success.pxt
deleted file mode 100644
index daad8b1..0000000
--- a/web/html/confirm_email_success.pxt
+++ /dev/null
@@ -1,20 +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>Thank you for confirming your e-mail address. Now, you can:</p>
-
- <ul style="line-height: 200%">
- <li>Begin using the <a href="/index.pxt"><pxt-config var="product_name" /></a>.</li>
- <li>Review <a href="/rhn/account/UserDetails.do">Your Account</a>.</li>
- </ul>
- </div>
-
- </grail-canvas-template>
-</pxt-passthrough>
14 years, 5 months
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 37 --------------
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 34 ------------
2 files changed, 71 deletions(-)
New commits:
commit 9aa5611b85703c4d8d3c4217f47a5e98173d323e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:58:38 2009 +0100
rhn-listview mode kickstart_sessions_for_org not used, making kickstart_sessions_provider and query kickstart_sessions_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 d002b5c..b30ed2c 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -252,43 +252,6 @@ ORDER BY KTT.id, KT.label
</query>
</mode>
-<mode name="kickstart_sessions_for_org">
- <query params="org_id, days">
- SELECT KSS.id,
- KSS.kickstart_id,
- KSS.org_id,
- KSS.old_server_id,
- KSS.new_server_id,
- KSS.state_id,
- KSSS.label AS state_label,
- KSSS.name AS state_name,
- KSS.action_id,
- TO_CHAR((SELECT MAX(time)
- FROM rhnKickstartSessionHistory KSH
- WHERE KSH.kickstart_session_id = KSS.id), 'YYYY-MM-DD HH24:MI:SS') AS last_action,
- KSS.kstree_id
- FROM rhnKickstartSession KSS,
- rhnKickstartSessionState KSSS
- WHERE KSS.org_id = :org_id
- AND KSSS.id = KSS.state_id
- AND NOT ((KSSS.label = 'failed' OR KSSS.label = 'complete') AND KSS.last_action < sysdate - :days)
-ORDER BY last_action DESC, state_label, KSS.id
- </query>
- <elaborator params="">
-SELECT KSS.id, C.name as dist
- FROM rhnKickstartSession KSS, rhnKickstartableTree KST, rhnChannel C
- WHERE KSS.id IN (%s)
- AND KST.id = KSS.kstree_id
- AND KST.channel_id = C.id
- </elaborator>
- <elaborator params="">
-SELECT KSS.id, S.name AS system_name
- FROM rhnKickstartSession KSS, rhnServer S
- WHERE KSS.id IN (%s)
- AND S.id = KSS.old_server_id
- </elaborator>
-</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 e5702b9..a1d85be 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -100,10 +100,6 @@ sub _register_modes {
-datasource => RHN::DataSource::General->new,
-action_callback => \&kickstart_packages_cb);
- Sniglets::ListView::List->add_mode(-mode => "kickstart_sessions_for_org",
- -datasource => RHN::DataSource::General->new,
- -provider => \&kickstart_sessions_provider);
-
Sniglets::ListView::List->add_mode(-mode => "kickstart_session_history",
-datasource => RHN::DataSource::General->new,
-provider => \&session_history_provider);
@@ -196,36 +192,6 @@ sub kickstarts_for_org_provider {
return (%ret);
}
-sub kickstart_sessions_provider {
- my $self = shift;
- my $pxt = shift;
-
- my %ret = $self->default_provider($pxt, -days => $pxt->dirty_param('days_of_history') || 1);
-
- foreach my $row (@{$ret{data}}) {
-
- if ( exists $row->{LAST_ACTION} ) {
- $row->{LAST_ACTION} = $pxt->user->convert_time($row->{LAST_ACTION});
- }
-
- unless ($row->{SYSTEM_NAME}) {
- $row->{SYSTEM_NAME} = '(New Profile)';
- }
-
- if (not $row->{DIST}) {
- if ($row->{KICKSTART_ID}) {
- my $ks = RHN::Kickstart->lookup(-id => $row->{KICKSTART_ID});
- $row->{DIST} = $ks->dist || '(unknown)';
- }
- else {
- $row->{DIST} = '(unknown)';
- }
- }
- }
-
- return (%ret);
-}
-
sub session_history_provider {
my $self = shift;
my $pxt = shift;
14 years, 5 months