Changeset 21
- Timestamp:
- 01/23/06 15:59:57
- Files:
-
- trunk/calendar3/common/src/edu/rpi/sss/util/jsp/UtilAbstractAction.java (modified) (2 diffs)
- trunk/calendar3/webadmin/war/docs/prefs/modPrefs.jsp (modified) (1 diff)
- trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/FetchPrefsAction.java (modified) (3 diffs)
- trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/common/src/edu/rpi/sss/util/jsp/UtilAbstractAction.java
r2 r21 55 55 package edu.rpi.sss.util.jsp; 56 56 57 import edu.rpi.sss.util.Util; 57 58 import edu.rpi.sss.util.log.HttpAppLogger; 58 59 import edu.rpi.sss.util.servlets.HttpServletUtils; … … 1100 1101 } 1101 1102 1103 /** Get a request parameter stripped of white space. Return null for zero 1104 * length. 1105 * 1106 * @param req 1107 * @param name name of parameter 1108 * @return String value 1109 */ 1110 protected String getReqPar(HttpServletRequest req, String name) throws Throwable { 1111 return Util.checkNull(req.getParameter(name)); 1112 } 1113 1102 1114 /** Get an integer valued request parameter. 1103 1115 * trunk/calendar3/webadmin/war/docs/prefs/modPrefs.jsp
r17 r21 8 8 9 9 <page>modPrefs</page> 10 <bean:define id="user " name="peForm" property="userPreferences"/>10 <bean:define id="userPrefs" name="peForm" property="userPreferences"/> 11 11 <prefs> 12 <user>< /user>13 < view><bean:write name="user" property="view"/></view>14 < viewPeriod><bean:write name="user" property="viewPeriod"/></viewPeriod>15 <skin ><bean:write name="user" property="skin"/></skin>16 <skinStyle><bean:write name="user " property="skinStyle"/></skinStyle>12 <user><bean:write name="userPrefs" property="owner.account"/></user> 13 <preferredView><bean:write name="userPrefs" property="preferredView"/></preferredView> 14 <preferredViewPeriod><bean:write name="userPrefs" property="preferredViewPeriod"/></preferredViewPeriod> 15 <skinName><bean:write name="userPrefs" property="skinName"/></skinName> 16 <skinStyle><bean:write name="userPrefs" property="skinStyle"/></skinStyle> 17 17 </prefs> 18 18 trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/FetchPrefsAction.java
r17 r21 56 56 57 57 import org.bedework.calfacade.BwUser; 58 import org.bedework.calfacade.svc.BwPreferences;59 58 import org.bedework.calsvci.CalSvcI; 60 59 import org.bedework.webcommon.BwAbstractAction; … … 88 87 BwSession sess, 89 88 BwActionFormBase form) throws Throwable { 90 if ( form.getGuest()) {89 if (!form.getUserAuth().isSuperUser()) { 91 90 return "noAccess"; // First line of defence 92 91 } … … 94 93 CalSvcI svc = form.getCalSvcI(); 95 94 96 BwPreferences prefs; 97 98 String str = request.getParameter("user"); 99 if (str != null) { 100 if (!form.getUserAuth().isSuperUser()) { 101 return "noAccess"; // First line of defence 102 } 103 BwUser user = svc.findUser(str); 104 if (user == null) { 105 form.getErr().emit("org.bedework.client.error.nosuchuserid", str); 106 return "notFound"; 107 } 108 prefs = svc.getUserPrefs(user); 109 } else { 110 prefs = svc.getUserPrefs(); 95 String str = getReqPar(request, "user"); 96 if (str == null) { 97 return "success"; 111 98 } 112 99 113 form.setUserPreferences(prefs); 100 BwUser user = svc.findUser(str); 101 if (user == null) { 102 form.getErr().emit("org.bedework.client.error.nosuchuserid", str); 103 return "notFound"; 104 } 105 106 form.setUserPreferences(svc.getUserPrefs(user)); 114 107 115 108 return "success"; trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java
r2 r21 93 93 BwSession sess, 94 94 BwActionFormBase form) throws Throwable { 95 if ( form.getGuest()) {95 if (!form.getUserAuth().isSuperUser()) { 96 96 return "noAccess"; // First line of defence 97 97 } … … 99 99 CalSvcI svc = form.getCalSvcI(); 100 100 101 BwPreferences prefs; 102 103 String str = request.getParameter("user"); 104 if (str != null) { 105 if (!form.getUserAuth().isSuperUser()) { 106 return "noAccess"; // First line of defence 107 } 108 BwUser user = svc.findUser(str); 109 if (user == null) { 110 form.getErr().emit("org.bedework.client.notfound", str); 111 return "notFound"; 112 } 113 prefs = svc.getUserPrefs(user); 114 } else { 115 prefs = svc.getUserPrefs(); 101 String str = getReqPar(request, "user"); 102 if (str == null) { 103 form.getErr().emit("org.bedework.client.notfound", str); 104 return "notFound"; 116 105 } 117 106 118 str = request.getParameter("view"); 107 BwUser user = svc.findUser(str); 108 if (user == null) { 109 form.getErr().emit("org.bedework.client.notfound", str); 110 return "notFound"; 111 } 112 113 BwPreferences prefs = svc.getUserPrefs(user); 114 115 str = getReqPar(request, "view"); 119 116 if (str != null) { 120 117 if (svc.findView(str) == null) { … … 126 123 } 127 124 128 str = request.getParameter("viewPeriod");125 str = getReqPar(request, "viewPeriod"); 129 126 if (str != null) { 130 127 prefs.setPreferredViewPeriod(form.validViewPeriod(str)); 131 128 } 132 129 133 str = request.getParameter("skin");130 str = getReqPar(request, "skin"); 134 131 if (str != null) { 135 132 prefs.setSkinName(str); 136 133 } 137 134 138 str = request.getParameter("skinStyle");135 str = getReqPar(request, "skinStyle"); 139 136 if (str != null) { 140 137 prefs.setSkinStyle(str);
