Changeset 483

Show
Ignore:
Timestamp:
05/16/06 09:07:36
Author:
douglm
Message:

Fix bug in access routines - missed privNone flag out of defs.
Fix stylesheet to use correct freebusy flag F not f

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/PrivilegeDefs.java

    r448 r483  
    181181 
    182182    'U',     // privUnlock 
     183 
     184    'N',     // privNone 
    183185  }; 
    184186 

  • trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java

    r464 r483  
    6464import org.apache.commons.httpclient.HostConfiguration; 
    6565import org.apache.commons.httpclient.HttpMethod; 
     66import org.apache.commons.httpclient.URI; 
     67import org.apache.commons.httpclient.protocol.Protocol; 
     68import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; 
     69import org.apache.commons.httpclient.protocol.SSLProtocolSocketFactory; 
    6670 
    6771import sun.misc.BASE64Encoder; 
    …… 
    8791   */ 
    8892  public CaldavClientIo(String host, int port, boolean debug) throws Throwable { 
     93    this(host, port, false, debug); 
     94  } 
     95 
     96    /** 
     97     * @param host 
     98     * @param port 
     99     * @param secure 
     100     * @param debug 
     101     * @throws Throwable 
     102     */ 
     103  public CaldavClientIo(String host, int port, boolean secure, 
     104                        boolean debug) throws Throwable { 
    89105    if (httpManager == null) { 
    90106      httpManager = new HttpManager("org.bedework.http.client.caldav.CaldavClient"); 
    …… 
    93109    HostConfiguration config = new HostConfiguration(); 
    94110 
    95     config.setHost(host, port); 
     111    if (secure) { 
     112      ProtocolSocketFactory pfact = new SSLProtocolSocketFactory(); 
     113      Protocol pr = new Protocol("https", pfact, port); 
     114      Protocol.registerProtocol( "https", pr); 
     115 
     116      config.setHost(host, port, pr); 
     117    } else { 
     118      config.setHost(host, port); 
     119    } 
     120    /* 
     121    if (secure) { 
     122      config.setHost(new URI("https://" + host + ":" + port, false)); 
     123    } else { 
     124      config.setHost(new URI("http://" + host + ":" + port, false)); 
     125    } 
     126    */ 
     127 
    96128    client = (CaldavClient)httpManager.getClient(config); 
    97129 
    …… 
    136168      sz = content.length; 
    137169    } 
    138      
     170 
    139171    System.out.println("About to send request: method=" + method + 
    140172                       " contentLen=" + contentLen + 
    141173                       " content.length=" + sz); 
    142      
     174 
    143175    client.setMethodName(method, url); 
    144176 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r482 r483  
    22452245        <p> 
    22462246          Access rights:<br/> 
    2247           <input type="radio" value="f" name="how" checked="checked"/> view my free/busy<br/> 
     2247          <input type="radio" value="F" name="how" checked="checked"/> view my free/busy<br/> 
    22482248          <input type="radio" value="d" name="how"/> default (reset access) 
    22492249        </p>