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

Fix various issues on shared hosting #7059

Merged

Conversation

respencer
Copy link
Contributor

Description & Issue number it closes

  • Fix mod_rewrite detection on shared hosting
  • Fix formatting of apache_get_modules notice
  • Make said notice easier to translate
  • Add more gettext fields
  • Clean up
  • Attempt to exclude .htaccess from change validation (it frequently needs to be changed on shared hosting)

Resolves #7056

Screenshots (if appropriate)

How to test the changes?

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

src/ChurchCRM/Service/AppIntegrityService.php Outdated Show resolved Hide resolved
}

$logger->debug('Integrity check result file not found at: ' . $integrityCheckFile);

AppIntegrityService::$IntegrityCheckDetails = new \stdClass();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use a structured object instead of a generic stdclass?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately I don't know what exactly you want here instead.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of using \stdClass, we should make a new IntegrityCheckResults class with all of the expected fields. Right now, any field can be added to this plain stdclass and each of it's properties are undocumented, which makes it difficult to see what is being used and where.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(we can defer this change if you want but if we do, can you make a Github issue for tracking?)

src/v2/templates/admin/debug.php Outdated Show resolved Hide resolved
src/v2/templates/admin/debug.php Outdated Show resolved Hide resolved
src/v2/templates/admin/debug.php Outdated Show resolved Hide resolved
src/ChurchCRM/Service/AppIntegrityService.php Show resolved Hide resolved
src/ChurchCRM/Service/AppIntegrityService.php Outdated Show resolved Hide resolved
src/ChurchCRM/Service/AppIntegrityService.php Outdated Show resolved Hide resolved
src/ChurchCRM/Service/AppIntegrityService.php Outdated Show resolved Hide resolved
src/ChurchCRM/Service/AppIntegrityService.php Show resolved Hide resolved
src/ChurchCRM/Service/AppIntegrityService.php Outdated Show resolved Hide resolved
src/ChurchCRM/Service/AppIntegrityService.php Outdated Show resolved Hide resolved
src/v2/templates/admin/debug.php Outdated Show resolved Hide resolved
@respencer respencer force-pushed the 7056-fix-issues-on-shared-hosting branch from 3018c73 to a76bc5f Compare June 12, 2024 13:12
@respencer respencer marked this pull request as ready for review June 12, 2024 13:12
@respencer respencer requested a review from a team as a code owner June 12, 2024 13:12
@respencer respencer requested review from DawoudIO, grayeul, DAcodedBEAT and MrClever and removed request for a team June 12, 2024 13:12
@respencer respencer force-pushed the 7056-fix-issues-on-shared-hosting branch from a76bc5f to 8ad2d8c Compare June 12, 2024 13:23
@respencer respencer force-pushed the 7056-fix-issues-on-shared-hosting branch from 8ad2d8c to a6194d9 Compare June 12, 2024 14:12
@DAcodedBEAT DAcodedBEAT added this to the 5.9.0 milestone Jun 12, 2024
@DAcodedBEAT DAcodedBEAT added Code Smell php Pull requests that update Php code labels Jun 12, 2024
@DAcodedBEAT DAcodedBEAT merged commit 025dbc9 into ChurchCRM:master Jun 12, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Smell php Pull requests that update Php code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 issues on cPanel based hosting
3 participants