Changeset 587

Show
Ignore:
Timestamp:
06/14/06 10:31:31
Author:
douglm
Message:

Some extra validation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEUpdateAGAction.java

    r550 r587  
    6666import org.bedework.webadmin.PEActionForm; 
    6767import org.bedework.webcommon.BwSession; 
     68import org.bedework.webcommon.BwWebUtil; 
    6869 
    6970import edu.rpi.sss.util.Util; 
    …… 
    108109    } 
    109110 
    110     Groups adgrps = form.fetchSvci().getGroups(); 
     111    CalSvcI svci = form.fetchSvci(); 
     112 
     113    Groups adgrps = svci.getGroups(); 
    111114    form.assignChoosingGroup(false); // reset 
    112115    boolean add = form.getAddingAdmingroup(); 
    …… 
    119122    } 
    120123 
    121     CalSvcI svci = form.fetchSvci(); 
    122  
    123124    if (request.getParameter("addGroupMember") != null) { 
    124125      /** Add a user to the group we are updating. 
    125126       */ 
    126       String mbr = form.getUpdGroupMember(); 
     127      String mbr = BwWebUtil.checkNull(form.getUpdGroupMember()); 
    127128      if (mbr == null) { 
    128129        return "continue"; 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/BwWebUtil.java

    r532 r587  
    5555package org.bedework.webcommon; 
    5656 
     57import org.bedework.appcommon.CheckData; 
    5758import org.bedework.calfacade.BwDateTime; 
    5859import org.bedework.calfacade.BwEvent; 
    …… 
    194195    } 
    195196 
    196     if (ev.getSummary() == null) { 
     197    if (publicEvent && (ev.getSummary() == null)) { 
    197198      err.emit("org.bedework.validation.error.notitle"); 
    198199      ok = false; 
    …… 
    239240    } 
    240241 
     242    if (!CheckData.checkTransparency(ev.getTransparency())) { 
     243      err.emit("org.bedework.validation.error.badtransparency", 
     244               ev.getTransparency()); 
     245      ok = false; 
     246    } 
     247 
     248    if (!CheckData.checkStatus(ev.getStatus())) { 
     249      err.emit("org.bedework.validation.error.badstatus", 
     250               ev.getStatus()); 
     251      ok = false; 
     252    } 
     253 
    241254    if (ok) { 
    242255      BwEventUtil.setDates(svci.getTimezones(), ev, start, end, dur); 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/misc/UploadAction.java

    r577 r587  
    9898    String transparency = getReqPar(request, "transparency"); 
    9999    if (!CheckData.checkTransparency(transparency)) { 
    100       form.getErr().emit("org.bedework.client.error.badtransparency", transparency); 
     100      form.getErr().emit("org.bedework.validation.error.badtransparency", transparency); 
    101101      return "retry"; 
    102102    } 
    …… 
    104104    String status = getReqPar(request, "status"); 
    105105    if (!CheckData.checkStatus(status)) { 
    106       form.getErr().emit("org.bedework.client.error.badstatus", status); 
     106      form.getErr().emit("org.bedework.validation.error.badstatus", status); 
    107107      return "retry"; 
    108108    }