Should I be using strpos($CFG->httpswwwroot, 'https:') === 0 instead of isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'?

Anyone have any views on this?

Cheers,
Tony

Hello Tony,

You should be using (strpos($CFG->wwwroot, 'https://') === 0
$CFG->httpswwwroot will be disappearing in the future (to try and remove confusion.) There is an issue about creating a function for this sort of thing (MDL-28484) but this has yet to be integrated.

Could you also please mention that you need to configure the reCAPTCHA public and private key in the pre-requisites section of your testing instructions?

Besides that everything else looks good.

Thanks for the fix.

Thanks Adrian - I've updated the code to reflect this.

I did make a mental note to include the reCAPTCHA key configuration and then promptly forgot to mention it.

Hi Tony,
thank you very much for your work .
Best regards
Andreas

Thanks Tony,

Submitting for integration.

I'm assigning this to Damyon coz it seems he already has integrated it. Can you confirm, plz, that the fix has landed also to supported stables? Fill the versions appropriately. TIA!

Yes - (my bad). This looks correct and has been integrated to 25, 26 and master. (25 and 26 were cherry-picks from the master branch).

It is better if we have separate git branches for the stables, because it implies the developer has tested the fix on stables before sending it to integration.

I've added diff URLs for the 2.5 and 2.6 backports and also rebased master.

Passes. Tested in 25, 26 and master

I won't be saying "Thanks!" this week. I'm tired of it.

For the good (and the bad), your code is now part of Moodle, the best LMS in the world. Hope you are contributing for that to continue being a fact (and not the opposite), sincerely.

Just closing this as fixed, ciao

PS: Just a bit of black/cruel humor, sorry, LOL!