Changeset 446

Show
Ignore:
Timestamp:
05/04/06 10:26:02
Author:
douglm
Message:

Check access to calendar when url supplied
Allow super user to update groups classes from admin client.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/BwSubscription.java

    r445 r446  
    293293   */ 
    294294  public static BwSubscription makeSubscription(BwCalendar val) { 
    295     BwSubscription sub = new BwSubscription(); 
    296  
    297     sub.setName(val.getName()); 
    298     sub.setUri(CalFacadeDefs.bwUriPrefix + val.getPath()); 
    299     sub.setDisplay(true); 
    300     sub.setAffectsFreeBusy(true); 
    301     sub.setInternalSubscription(true); 
    302     sub.setCalendar(val); 
    303     sub.setInternalSubscription(true); 
    304     sub.setEmailNotifications(false); 
    305  
    306     return sub; 
     295    return makeSubscription(val, val.getPath(), true, true, false); 
    307296  } 
    308297 
    …… 
    353342    sub.setName(name); 
    354343    sub.setUri(url); 
    355     sub.setInternalSubscription(false); 
     344    sub.setInternalSubscription(url.startsWith(CalFacadeDefs.bwUriPrefix)); 
    356345    sub.setDisplay(display); 
    357346    sub.setAffectsFreeBusy(affectsFreeBusy); 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/system/UpdateSysparsAction.java

    r85 r446  
    9999    boolean changed = false; 
    100100 
    101     String str = getReqPar(request, "defaultUserViewName"); 
     101    String str = getReqPar(request, "updateCancelled"); 
     102    if (str != null) { 
     103      // refetch 
     104      form.setSyspars(svci.getSyspars()); 
     105      return "cancelled"; 
     106    } 
     107 
     108    str = getReqPar(request, "admingroupsClass"); 
     109    if (str != null) { 
     110      syspars.setAdmingroupsClass(str); 
     111      changed = true; 
     112    } 
     113 
     114    str = getReqPar(request, "usergroupsClass"); 
     115    if (str != null) { 
     116      syspars.setUsergroupsClass(str); 
     117      changed = true; 
     118    } 
     119 
     120    str = getReqPar(request, "defaultUserViewName"); 
    102121    if (str != null) { 
    103122      syspars.setDefaultUserViewName(str); 
    …… 
    129148    } 
    130149 
    131     str = getReqPar(request, "updateCancelled"); 
    132     if (str != null) { 
    133       // refetch 
    134       form.setSyspars(svci.getSyspars()); 
    135       return "cancelled"; 
    136     } 
    137  
    138150    if (!changed) { 
    139151      return "nochange"; 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/InitSubscribeAction.java

    r436 r446  
    108108 
    109109      sub = BwSubscription.makeSubscription(calUri, null, false, false, false); 
     110 
     111      /* Try to access the calendar */ 
     112      if (svc.getSubCalendar(sub) == null) { 
     113        // Assume no access 
     114        form.getErr().emit("org.bedework.client.error.noaccess"); 
     115        return "noAccess"; 
     116      } 
    110117    } else { 
    111118      cal = svc.getCalendar(calPath);