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

web: add options for not collecting or showing URL and country #2906

Merged
merged 2 commits into from
Dec 17, 2018

Conversation

davidpanderson
Copy link
Contributor

Add constants NO_USER_URL and NO_USER_COUNTRY.
If you set these to true (in project.inc)
there will be no query or display of user web site URL and user country, respectively.

Add constants NO_USER_URL and NO_USER_COUNTRY.
If you set these to true (in project.inc)
there will be no query or display of user web site URL
and user country, respectively.
@TheAspens
Copy link
Member

@davidpanderson - I'm starting to test this. One request though. The two new flags you create are 'negative' flags. NO_USER_URL and NO_USER_COUNTRY which makes the logic in the if statements reads as if ( !NO_USER_COUNTRY ) then ......

Could you use USER_COUNTRY and USER_URL instead so that the logic will read if ( USER_COUNTRY) then.... which is easier to read.

@TheAspens
Copy link
Member

Another question, shouldn't db_dump be changed also since it exports user country and user url as well? If it does, should the config option be moved into the project config.xml file?

@TheAspens TheAspens self-assigned this Dec 13, 2018
@davidpanderson
Copy link
Contributor Author

I made it negative so that projects won't see a change in behavior.

@TheAspens
Copy link
Member

You can preserve the existing behavior by changing this (from boinc/util.inc)

if (!defined('NO_USER_COUNTRY')) {
    define('NO_USER_COUNTRY', 0);
}
if (!defined('NO_USER_URL')) {
    define('NO_USER_URL', 0);
}

to

if (!defined('USER_COUNTRY')) {
    define('USER_COUNTRY', 1);
}
if (!defined('USER_URL')) {
    define('USER_URL', 1);
}

Also - what about db_purge?

@TheAspens
Copy link
Member

sorry - not db_purge - I meant db_dump.l

@JuhaSointusalo
Copy link
Contributor

Now that we have server releases it is ok to make changes that require projects to take action. All you need to do is make sure those changes are properly documented in release notes.

- Put flags in config.xml instead of project.inc
- Make them positive instead of negative
- make db_dump respect them.
@davidpanderson
Copy link
Contributor Author

I changed things as Kevin requested.

@TheAspens
Copy link
Member

Looks good thanks for the changes!

@TheAspens TheAspens self-requested a review December 17, 2018 19:25
@TheAspens TheAspens merged commit ebb1f71 into master Dec 17, 2018
@ChristianBeer ChristianBeer deleted the dpa_no_url_country branch February 2, 2019 10:13
@AenBleidd AenBleidd added this to the Server Release 1.2.0 milestone Aug 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants