In addition to this, /admin/settings.php?section=calendar allows administrators to specify the number of days as a string and doesn't limit them to 21 days.

As a result, an administrator could increase the lookahead (and maxdays) to greater than the maximum and thereby cause this issue for all users.

This commit cherry-picks cleanly to 2.0 and 2.1 branches

There are several options for this fix:

• convert the lookahead and maxdays to text boxes on the calendar/preferences_form.php definition;
• increase the lookahead option in the calendar/preferences_form.php definition; and convert these options to dropdowns in /admin/settings.php?section=calendar; or
• only increase the lookahead option in the calendar/preferences_form.php definition and ignore the text box issue

I've gone for the middle option. I looked at converting the definition to use text boxes but wasn't happy with the result (mainly style-related).

I also looked at modifying the drop down to give options like:

• 1 day
• 2 days
• 3 days
• 1 week
• 2 weeks
• 3 weeks
• 1 month

But getting the plurals to work and translate nicely feels like a deal-breaker to me.

Thanks for suggesting that and providing a solution. I'll see if I can get a peer reviewer for you.

Hi, Rosie.

As you've been working on the calendar lately, could you peer review this issue?

Thanks for providing the patch, Andrew
I agree that there should be some synchronization between admin and user calendar settings. But, I don't agree with the patch provided by you.
Adding Sam, to provide some feedback on this.

Hello Andrew,

Just had word with Sam and Martin. Your patch seems Great, it's just that we can increase the range to 99 (i.e 1 to 99) for "Upcoming events look-ahead".
Can you please update your patch, so that I can push it for integration review

Thanks for reporting the issue and providing solution for it.

Patch updated as per your request - Changed from 21 days to 99.

This should still cherry-pick cleanly to stable branches

Thanks Andrew for providing spot-on patch
Pushing this for integration review.

@Integrator's:
Please cherry-pick this on 2.x stable branches.

Thanks everyone!
This has been integrated now

Tested during integration

The master fixes corresponding to this issue have been sent upstream. Fixes for other branches (19, 20, 21 stable) will be sent in the very-next days.

Thanks for the hard work! Closing, ciao