diff --git a/html/inc/prefs_project.inc b/html/inc/prefs_project.inc index 1eed324255..38e1a774d7 100644 --- a/html/inc/prefs_project.inc +++ b/html/inc/prefs_project.inc @@ -141,7 +141,7 @@ $privacy_pref_descs = array ( // table and extract those consent types with enabled=1 and // privacypref=1. $privacy_consent_descs = array(); -$_consenttypes = BoincConsentType::enum("enabled=1 AND privacypref=1", "ORDER BY protect DESC"); +$_consenttypes = BoincConsentType::enum("enabled=1 AND privacypref=1", "ORDER BY project_specific ASC"); foreach ($_consenttypes as $ct) { $privacy_consent_descs[] = new PREF_CONSENT( tra($ct->description), diff --git a/html/ops/db_update.php b/html/ops/db_update.php index 167125f6ea..5e5bf7356c 100644 --- a/html/ops/db_update.php +++ b/html/ops/db_update.php @@ -1190,7 +1190,7 @@ function update_9_12_2018() { shortname varchar(255) not null, description varchar(255) not null, enabled integer not null, - protect integer not null, + project_specific integer not null, privacypref integer not null, primary key (id), index consent_name (shortname) diff --git a/html/ops/manage_consent_types.php b/html/ops/manage_consent_types.php index 516a36dfb6..c8d65929d5 100644 --- a/html/ops/manage_consent_types.php +++ b/html/ops/manage_consent_types.php @@ -44,7 +44,7 @@ function add_consenttype() { } BoincConsentType::insert( - "(shortname, description) VALUES ('$shortname', '$description')" + "(shortname, description, project_specific) VALUES ('$shortname', '$description', 1)" ); echo "

Consent Type added.

"; @@ -73,17 +73,17 @@ function mct_toggle_field($field) { // Builds the form for managing consent types function mct_show_form() { - $_consenttypes = BoincConsentType::enum(null, "ORDER BY protect DESC"); + $_consenttypes = BoincConsentType::enum(null, "ORDER BY project_specific ASC"); if (!in_rops()) { - echo "'Protected' consent types are defined by BOINC. You may add project-specific consent types using this form. (Unprotected consent types are defined here by this project.)"; + echo "ProjectSpecific=0 consent types are defined by BOINC. You may add and remove project-specific consent types using this form."; } start_table(""); table_header( "Name", "Description", "Enabled", - "Protected", + "ProjectSpecific", "PrivacyPrefs", "" ); @@ -111,8 +111,8 @@ function mct_show_form() { echo " $ct->enabled"; } - // Protect(ed) consent type - echo " $ct->protect"; + // Project_specific) consent type + echo " $ct->project_specific"; // Privacypref toggle if (!in_rops()) { @@ -127,8 +127,8 @@ function mct_show_form() { echo " $ct->privacypref"; } - // Delete (if not protected) - if (!in_rops() and !($ct->protect)) { + // Delete (if project_specific) + if (!in_rops() and ($ct->project_specific)) { echo ""; } else {