Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sorry, unfortunately submitted internal commits from our adaptation here. #334

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ddb5e46
update
AGrillenberger Feb 16, 2023
44b8172
Merge branch 'kohler:master' into edge
AGrillenberger Feb 16, 2023
d2d6f1e
Option to hide conflicting submission details from PC members added
AGrillenberger Mar 28, 2023
bb888f5
add 'all papers' button
AGrillenberger Mar 28, 2023
1190034
small fix
AGrillenberger Mar 28, 2023
0f8849b
addition to "hide conflicting submissions"
AGrillenberger Mar 28, 2023
51c34d7
fix typo
AGrillenberger Mar 28, 2023
56c085b
hide links for conflicting papers
AGrillenberger Mar 28, 2023
e61a765
bug fix for conflict hiding
AGrillenberger Apr 25, 2023
376e804
fix for conflict hiding
AGrillenberger Apr 25, 2023
3abed24
hightlight review pref link
AGrillenberger Apr 25, 2023
c259567
Option to hide general submission button
AGrillenberger Apr 26, 2023
e91795c
Update overview button
AGrillenberger Apr 26, 2023
683f265
automatic overview buttons on homepage
AGrillenberger Apr 26, 2023
37f62f9
ACM export
AGrillenberger Jun 13, 2023
4d4f725
update github pat
AGrillenberger Jun 13, 2023
311c805
fix error reporting
AGrillenberger Jun 13, 2023
e188387
fix error reporting
AGrillenberger Jun 13, 2023
25658e2
update GitHub pat
AGrillenberger Jun 13, 2023
c54c732
up
AGrillenberger Jun 13, 2023
3823b4c
update github auth
AGrillenberger Jun 13, 2023
381322d
update ACM export
AGrillenberger Jun 14, 2023
47e9091
update ACM export
AGrillenberger Jun 14, 2023
fbdf74b
update ACM export
AGrillenberger Jun 14, 2023
06fa2aa
update ACM export
AGrillenberger Jun 14, 2023
51f8b7f
update ACM export
AGrillenberger Jun 14, 2023
7a0e5dc
update ACM export
AGrillenberger Jun 14, 2023
0649d87
update ACM export
AGrillenberger Jun 14, 2023
595c7ef
fix
AGrillenberger Jun 19, 2023
84960ef
fix
AGrillenberger Jun 19, 2023
0198602
update
AGrillenberger Dec 3, 2023
86f9083
fixes
AGrillenberger Feb 13, 2024
ba71494
Merge branch 'edge' of github-hotcrp:AGrillenberger/hotcrp into edge
AGrillenberger Feb 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ filestore
logs
conf/*
Code/options.inc
php_errors.log
1 change: 1 addition & 0 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,4 @@ RewriteRule ^[^/]*(/.*)$ %1.php$1 [L,NE]
# AuthName "HotCRP"
# AuthUserFile FILENAME
# Require valid-user

8 changes: 8 additions & 0 deletions etc/listactions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
"name": "__expand/get-document",
"expand_function": "GetDocument_ListAction::expand2"
},
{
"name": "get/acmxml", "get": true,
"title": "Paper information/ACM Digital Library XML",
"order": 10090,
"allow_if": "manager",
"function": "+GetACMXML_ListAction",
"has_attachments": false
},
{
"name": "get/json", "get": true,
"title": "Paper information/JSON",
Expand Down
66 changes: 66 additions & 0 deletions etc/pages.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,46 @@

{ "name": "index", "alias": "home" },

{ "name": "imprint", "allow_disabled": true },
{
"name": "imprint/sidebar/home", "order": 0,
"print_function": "Home_Page::print_homelink"
},
{
"name": "imprint/head", "order": 1000,
"print_function": "*Imprint_Page::print_head"
},
{
"name": "imprint/content", "order": 1500,
"print_function": "*Imprint_Page::print_content"
},
{
"name": "imprint/sidebar/techinfo", "order": 200,
"print_function": "Home_Page::print_techinfo_sidebar"
},
[ "imprint/sidebar/techinfo/data", 10, "Home_Page::print_techinfo_data" ],
[ "imprint/sidebar/techinfo/imprint", 20, "Home_Page::print_techinfo_imprint" ],

{ "name": "dataprivacy", "allow_disabled": true },
{
"name": "dataprivacy/sidebar/home", "order": 0,
"print_function": "Home_Page::print_homelink"
},
{
"name": "dataprivacy/head", "order": 1000,
"print_function": "*Dataprivacy_Page::print_head"
},
{
"name": "dataprivacy/content", "order": 1500,
"print_function": "*Dataprivacy_Page::print_content"
},
{
"name": "dataprivacy/sidebar/techinfo", "order": 200,
"print_function": "Home_Page::print_techinfo_sidebar"
},
[ "dataprivacy/sidebar/techinfo/data", 10, "Dataprivacy_Page::print_techinfo_data" ],
[ "dataprivacy/sidebar/techinfo/imprint", 20, "Dataprivacy_Page::print_techinfo_imprint" ],


{ "name": "home", "allow_disabled": true },
{
Expand Down Expand Up @@ -86,6 +126,12 @@
"allow_if": "conf.time_all_author_view_decision",
"print_function": "Home_Page::print_info_accepted"
},
{
"name": "home/sidebar/techinfo", "order": 200,
"print_function": "Home_Page::print_techinfo_sidebar"
},
[ "home/sidebar/techinfo/data", 10, "Home_Page::print_techinfo_data" ],
[ "home/sidebar/techinfo/imprint", 20, "Home_Page::print_techinfo_imprint" ],


[ "home/main/message", 1100, "*Home_Page::print_message" ],
Expand Down Expand Up @@ -117,6 +163,10 @@


{ "name": "newaccount", "allow_disabled": true },
{
"name": "newaccount/sidebar/home", "order": 0,
"print_function": "Home_Page::print_homelink"
},
{
"name": "newaccount/request", "order": 100,
"allow_request_if": "anypost",
Expand All @@ -132,6 +182,10 @@


{ "name": "signin", "allow_disabled": true },
{
"name": "signin/sidebar/home", "order": 0,
"print_function": "Home_Page::print_homelink"
},
{
"name": "signin/request", "order": 100,
"allow_request_if": "anypost",
Expand All @@ -157,6 +211,10 @@


{ "name": "signout", "allow_disabled": true },
{
"name": "signout/sidebar/home", "order": 0,
"print_function": "Home_Page::print_homelink"
},
{
"name": "signout/request", "order": 100,
"allow_request_if": "anypost",
Expand All @@ -167,6 +225,10 @@


{ "name": "forgotpassword", "allow_disabled": true },
{
"name": "forgotpassword/sidebar/home", "order": 0,
"print_function": "Home_Page::print_homelink"
},
{
"name": "forgotpassword/request", "order": 100,
"allow_request_if": "anypost",
Expand All @@ -184,6 +246,10 @@


{ "name": "resetpassword", "allow_disabled": true },
{
"name": "resetpassword/sidebar/home", "order": 0,
"print_function": "Home_Page::print_homelink"
},
{
"name": "resetpassword/request", "order": 100,
"request_function": "*Signin_Page::reset_request"
Expand Down
5 changes: 3 additions & 2 deletions etc/settinggroups.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"name": "submissions/deadlines", "order": 20,
"separator_before": true,
"print_function": "Submissions_SettingParser::print_deadlines",
"settings": ["submission_registration", "submission_done", "submission_grace"]
"settings": ["submission_registration", "submission_done", "submission_allowuntagged", "submission_grace"]
},
{
"name": "submissions/updates", "order": 30,
Expand Down Expand Up @@ -139,7 +139,7 @@
"name": "subform/conflicts", "order": 20,
"title": "Conflicts and collaborators",
"print_function": "SubForm_SettingRenderer::print_conflicts",
"settings": ["sf_pc_conflicts", "sf_pc_conflict_types", "sf_collaborators", "conflict_description", "conflict_visibility"]
"settings": ["sf_pc_conflicts", "sf_pc_conflict_types", "sf_collaborators", "conflict_completelyHide", "conflict_description", "conflict_visibility"]
},
{
"name": "options", "group": "subform", "order": 440,
Expand Down Expand Up @@ -208,6 +208,7 @@
"print_function": "Review_SettingParser::print_pc",
"settings": [
"review_self_assign",
"review_identity_nevervisible_for_pc",
"review_identity_visibility_pc",
"review_visibility_pc",
"review_visibility_lead",
Expand Down
16 changes: 16 additions & 0 deletions etc/settinginfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,11 @@
"title": "Collect other conflicts and collaborators",
"type": "checkbox"
},
{
"name": "conflict_completelyhide", "storage": "conflict_completelyhide",
"title": "Hide submission information (title, abstract and PDF) from PC members with conflict",
"type": "checkbox"
},


{
Expand Down Expand Up @@ -522,6 +527,12 @@
"values": [0, 1, 3, 4], "default_value": 0,
"json_values": ["assignment_complete", "all", "assignment_not_incomplete", "all_assignments_complete"]
},
{
"name": "review_identity_nevervisible_for_pc", "storage": "pc_alwaysblind",
"title": "PC can never see anonymous reviewers’ identities (overwrites other related settings)",
"type": "radio",
"values": [0, 1], "default_value": 0
},
{
"name": "review_identity_visibility_pc", "storage": "pc_seeblindrev",
"title": "PC can see anonymous reviewers’ identities",
Expand Down Expand Up @@ -862,6 +873,11 @@
"title": "Submission grace period",
"type": "grace"
},
{
"name": "submission_allowuntagged", "storage": "sub_allowuntagged",
"title": "Allow submissions without one of the tags specified below",
"type": "checkbox"
},
{
"name": "submission_open", "storage": "sub_open",
"title": "Enable submissions",
Expand Down
2 changes: 2 additions & 0 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// index.php -- HotCRP home page
// Copyright (c) 2006-2022 Eddie Kohler; see LICENSE.

$_SERVER["SERVER_PORT"] = "443";

require_once("lib/navigation.php");

/** @param Contact $user
Expand Down
1 change: 1 addition & 0 deletions info.php
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?php phpinfo();
10 changes: 5 additions & 5 deletions lib/navigation.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ function __construct($server) {
}
$this->protocol = $x;
$x .= $this->host ? : "localhost";
if (($port = $server["SERVER_PORT"])
&& $port != $xport
&& strpos($x, ":", 6) === false) {
$x .= ":" . $port;
}
// if (($port = $server["SERVER_PORT"])
// && $port != $xport
// && strpos($x, ":", 6) === false) {
// $x .= ":" . $port;
// }
$this->server = $x;
$this->request_uri = $server["REQUEST_URI"];
$pct = strpos($this->request_uri, "%") !== false;
Expand Down
2 changes: 2 additions & 0 deletions src/contact.php
Original file line number Diff line number Diff line change
Expand Up @@ -4024,6 +4024,8 @@ function can_view_review_identity(PaperInfo $prow, $rbase = null) {
|| ($rbase && $this->is_owned_review($rbase))) {
return true;
}
if($this->conf->settings["pc_alwaysblind"] ?? null)
return false;
$seerevid_setting = $this->seerevid_setting($prow, $rbase, $rights);
return ($rights->allow_pc
&& $seerevid_setting == Conf::PCSEEREV_YES)
Expand Down
8 changes: 7 additions & 1 deletion src/documentinfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,13 @@ function nwords(CheckFormat $cf = null) {

/** @param array{attachment?:bool,no_accel?:bool,cacheable?:bool} $opts
* @return bool */
function download($opts = []) {
function download($opts = [], $user = null) {
if(($this->conf->settings["conflict_completelyhide"] ?? null) && $this->prow->conflictType > 0 && $opts["isAuthor"] != 1 && $opts["isPrivChair"] != 1) {
http_response_code(403);

die('Error 403 - Forbidden');
}

if ($this->size == 0 && !$this->ensure_size()) {
$this->message_set()->warning_at(null, "<0>Empty file");
return false;
Expand Down
Loading