This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new c515c17d Simplify - use common library method
c515c17d is described below
commit c515c17d38b9b817b223750c0261b58326a8306b
Author: Sebb <[email protected]>
AuthorDate: Wed Feb 8 16:55:35 2023 +0000
Simplify - use common library method
---
www/board/agenda/models/reporter.rb | 2 +-
www/board/agenda/routes.rb | 4 ++--
www/board/agenda/views/actions/post.json.rb | 2 +-
www/board/agenda/views/actions/reporter.json.rb | 2 +-
www/fundraising/invoice.cgi | 2 +-
www/officers/acreq.cgi | 2 +-
www/officers/list-traffic.cgi | 2 +-
www/officers/unlistedclas.cgi | 2 +-
www/secretary/public-names.cgi | 2 +-
www/secretary/response-time.cgi | 2 +-
www/treasurer/bill-upload.cgi | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/www/board/agenda/models/reporter.rb
b/www/board/agenda/models/reporter.rb
index 4bcd2ad9..93a74bee 100644
--- a/www/board/agenda/models/reporter.rb
+++ b/www/board/agenda/models/reporter.rb
@@ -91,7 +91,7 @@ class Reporter
# filter drafts based on user visibility
user = env.respond_to?(:user) && ASF::Person.find(env.user)
- unless !user or user.asf_member? or ASF.pmc_chairs.include? user
+ unless !user or user.asf_chair_or_member?
projects = user.committees.map(&:name)
results[:drafts].keep_if do |attach, draft|
projects.include? draft[:project]
diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb
index 2e524e23..94dd81f2 100755
--- a/www/board/agenda/routes.rb
+++ b/www/board/agenda/routes.rb
@@ -389,7 +389,7 @@ get %r{/(\d\d\d\d-\d\d-\d\d).json} do |date|
# filter list for non-PMC chairs and non-officers
user = env.respond_to?(:user) && ASF::Person.find(env.user)
- unless !user or user.asf_member? or ASF.pmc_chairs.include? user
+ unless !user or user.asf_chair_or_member?
status 206 # Partial Content
committees = user.committees.map(&:display_name)
agenda = agenda.select {|item| committees.include? item['title']}
@@ -489,7 +489,7 @@ get '/json/historical-comments' do
user = env.respond_to?(:user) && ASF::Person.find(env.user)
comments = HistoricalComments.comments
- unless !user or user.asf_member? or ASF.pmc_chairs.include? user
+ unless !user or user.asf_chair_or_member?
status 206 # Partial Content
committees = user.committees.map(&:display_name)
comments = comments.select do |project, _list|
diff --git a/www/board/agenda/views/actions/post.json.rb
b/www/board/agenda/views/actions/post.json.rb
index d9773b8c..2facd850 100644
--- a/www/board/agenda/views/actions/post.json.rb
+++ b/www/board/agenda/views/actions/post.json.rb
@@ -18,7 +18,7 @@ attach = nil
# Determine if user is authorized
user = ASF::Person.find(env.user)
-member_or_officer = (user.asf_member? or ASF.pmc_chairs.include? user)
+member_or_officer = (user.asf_chair_or_member?)
real_web_server = env.password
alternate_credentials = (real_web_server and not member_or_officer) ?
[['--username', 'whimsysvn']] : nil
diff --git a/www/board/agenda/views/actions/reporter.json.rb
b/www/board/agenda/views/actions/reporter.json.rb
index e7f7c63a..447cf84a 100644
--- a/www/board/agenda/views/actions/reporter.json.rb
+++ b/www/board/agenda/views/actions/reporter.json.rb
@@ -1,7 +1,7 @@
# ASF members and PMC chairs can post anything, everybody else can only post
# to updates for the PMCs that they belong to.
user = env.respond_to?(:user) && ASF::Person.find(env.user)
-unless !user or user.asf_member? or ASF.pmc_chairs.include? user
+unless !user or user.asf_chair_or_member?
projects = user.committees.map(&:name)
@report_status.each do |project, status|
unless projects.include? project
diff --git a/www/fundraising/invoice.cgi b/www/fundraising/invoice.cgi
index 46b41eb5..335d64ed 100755
--- a/www/fundraising/invoice.cgi
+++ b/www/fundraising/invoice.cgi
@@ -7,7 +7,7 @@ require "yaml"
require 'whimsy/asf'
user = ASF::Person.new($USER)
-unless user.asf_member? or ASF.pmc_chairs.include? user
+unless user.asf_chair_or_member?
print "Status: 401 Unauthorized\r\n"
print "WWW-Authenticate: Basic realm=\"ASF Members and Officers\"\r\n\r\n"
exit
diff --git a/www/officers/acreq.cgi b/www/officers/acreq.cgi
index d5b05f2c..f6df1cb8 100755
--- a/www/officers/acreq.cgi
+++ b/www/officers/acreq.cgi
@@ -10,7 +10,7 @@ require 'mail'
require 'date'
user = ASF::Auth.decode(env = {})
-unless user.asf_member? or ASF.pmc_chairs.include? user
+unless user.asf_chair_or_member?
print "Status: 401 Unauthorized\r\n"
print "WWW-Authenticate: Basic realm=\"ASF Members and Officers\"\r\n\r\n"
exit
diff --git a/www/officers/list-traffic.cgi b/www/officers/list-traffic.cgi
index cce8c188..06bc9341 100755
--- a/www/officers/list-traffic.cgi
+++ b/www/officers/list-traffic.cgi
@@ -12,7 +12,7 @@ require 'mail'
require '../../tools/mboxhdr2csv.rb'
user = ASF::Person.new($USER)
-unless user.asf_member? or ASF.pmc_chairs.include? user
+unless user.asf_chair_or_member?
print "Status: 401 Unauthorized\r\n"
print "WWW-Authenticate: Basic realm=\"ASF Members and Officers\"\r\n\r\n"
exit
diff --git a/www/officers/unlistedclas.cgi b/www/officers/unlistedclas.cgi
index a21353fc..7c65337c 100755
--- a/www/officers/unlistedclas.cgi
+++ b/www/officers/unlistedclas.cgi
@@ -9,7 +9,7 @@ require 'whimsy/asf/forms'
require 'whimsy/asf/rack'
user = ASF::Auth.decode({})
-unless user.asf_member? or ASF.pmc_chairs.include? user
+unless user.asf_chair_or_member?
print "Status: 401 Unauthorized\r\n"
print "WWW-Authenticate: Basic realm=\"ASF Members and Officers\"\r\n\r\n"
exit
diff --git a/www/secretary/public-names.cgi b/www/secretary/public-names.cgi
index af1df58f..8f3e83d8 100755
--- a/www/secretary/public-names.cgi
+++ b/www/secretary/public-names.cgi
@@ -8,7 +8,7 @@ require 'ruby2js/filter/functions'
# only available to ASF members and PMC chairs
user = ASF::Person.new($USER)
-unless user.asf_member? or ASF.pmc_chairs.include? user
+unless user.asf_chair_or_member?
print "Status: 401 Unauthorized\r\n"
print "WWW-Authenticate: Basic realm=\"ASF Members and Officers\"\r\n\r\n"
exit
diff --git a/www/secretary/response-time.cgi b/www/secretary/response-time.cgi
index 0a1a4e49..1b2918e6 100755
--- a/www/secretary/response-time.cgi
+++ b/www/secretary/response-time.cgi
@@ -7,7 +7,7 @@ require 'wunderbar/jquery'
# only available to ASF members and PMC chairs
user = ASF::Person.new($USER)
-unless user.asf_member? or ASF.pmc_chairs.include? user
+unless user.asf_chair_or_member?
print "Status: 401 Unauthorized\r\n"
print "WWW-Authenticate: Basic realm=\"ASF Members and Officers\"\r\n\r\n"
exit
diff --git a/www/treasurer/bill-upload.cgi b/www/treasurer/bill-upload.cgi
index 76802275..62d38d04 100755
--- a/www/treasurer/bill-upload.cgi
+++ b/www/treasurer/bill-upload.cgi
@@ -10,7 +10,7 @@ require 'escape'
user = ASF::Person.new($USER)
-unless user.asf_member? or ASF.pmc_chairs.include? user
+unless user.asf_chair_or_member?
print "Status: 401 Unauthorized\r\n"
print "WWW-Authenticate: Basic realm=\"ASF Members and Officers\"\r\n\r\n"
exit
