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

Customize presentation of accept/decline buttons in iMip mail #12392

Merged
merged 7 commits into from
Aug 15, 2019
Merged

Customize presentation of accept/decline buttons in iMip mail #12392

merged 7 commits into from
Aug 15, 2019

Commits on Feb 28, 2019

  1. Customize presentation of accept/decline buttons in iMip mail

    Fix Issue #11230
    Only present accept/decline button links in iMip mail for REQUEST, not CANCEL or others.
    
    Fix Issue #12156
    Implement config setting "dav.invitation_link_recipients", to control
    which invitation recipients see accept/decline button links.  The
    default, for public internet facing servers, is to always include
    them.  For a server on a private intranet, this setting can be set
    to the email addresses or email domains of users whose browsers can
    access the nextcloud server referenced by those accept/decline
    button links. It can also be set to "false" to exclude the links
    from all requests.
    
    Signed-off-by: Brad Rubenstein <brad@wbr.tech>
    Brad Rubenstein committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    31a25dc View commit details
    Browse the repository at this point in the history
  2. corrected sample config

    Signed-off-by: Brad Rubenstein <brad@wbr.tech>
    Brad Rubenstein committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    15400dd View commit details
    Browse the repository at this point in the history
  3. Respect RSVP parameter for attendees when adding accept/decline buttons.

    If RSVP=TRUE parameter is FALSE or absent for an ATTENDEE, then do no
    present accept/decline buttons. The organizer isn't asking for an RSVP.
    
    Signed-off-by: Brad Rubenstein <brad@wbr.tech>
    Brad Rubenstein committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    6421e30 View commit details
    Browse the repository at this point in the history
  4. Revert 3ff3ed0c56 case-insensitive compares.

    My oops.  The comparisons, which are copied from the IMipPlugin shipped with sabre-io/dav,
    do not need to be case insensitive because the sender and recipient names are normalized by sabre,
    (see calls to getNormalizedValue in voboject/lib/ITip/Broker.php).
    
    Signed-off-by: Brad Rubenstein <brad@wbr.tech>
    Brad Rubenstein committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    79d20e4 View commit details
    Browse the repository at this point in the history
  5. IMipPlugin: Added unit test for dav.invitation_link_recipients support

    Existing tests required modification to correctly mock up the new config
    parameter fetch, and to set the RSVP flag for attendees (since the test
    was detecting token generation, and we no longer generate tokens when
    no RSVP is requested by the client or sent by nextcloud).
    
    Signed-off-by: Brad Rubenstein <brad@wbr.tech>
    Brad Rubenstein committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    1dbda26 View commit details
    Browse the repository at this point in the history
  6. IMipPlugin: DRY up - move common test set-up into setUp function

    Signed-off-by: Brad Rubenstein <brad@wbr.tech>
    Brad Rubenstein committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    1a29239 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2019

  1. Move dav.invitation_link_recipients from getSystemValue to getAppValue

    Per @georgehrke change request for PR #12392, instead of setting
    dav.invitation_link_recipients in the system config.php file, we
    set it in the database table oc_appconfig.
    
    Furthermore, the value of the config variable is always a string:
    'yes' to include links in imip mail, 'no' to exclude them, or a
    comma-separated list of email addresses and/or domains for which
    they should be included.  If not specified in oc_appconfig, the
    default is 'yes'.
    
    Signed-off-by: brad2014 <brad2014@users.noreply.github.com>
    brad2014 committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    8d8bcea View commit details
    Browse the repository at this point in the history