fix calculation of expiration date if there is a default expiration date...

... set (but not forced) and the user does not want the link to expire.

seems related to #11288

Why only if the expire date is not enforced? Shouldn't we also use the default expire date if it is enforced?

Minor issue: you can combine 207 and 208 to one ``` } else if () {```