Menu
▾
▴
cobricks-cvscommit — Information about commits to the CVS repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(11) |
Mar
(106) |
Apr
(146) |
May
(79) |
Jun
(233) |
Jul
(218) |
Aug
(160) |
Sep
(155) |
Oct
(80) |
Nov
(176) |
Dec
(115) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(77) |
Feb
(106) |
Mar
(10) |
Apr
(54) |
May
(29) |
Jun
(29) |
Jul
(65) |
Aug
(80) |
Sep
|
Oct
(42) |
Nov
(45) |
Dec
(33) |
| 2006 |
Jan
(49) |
Feb
(52) |
Mar
(8) |
Apr
(3) |
May
(108) |
Jun
(43) |
Jul
(13) |
Aug
(1) |
Sep
(58) |
Oct
(66) |
Nov
(70) |
Dec
(115) |
| 2007 |
Jan
(26) |
Feb
(3) |
Mar
(17) |
Apr
(1) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael K. <ko...@us...> - 2006-05-30 14:07:16
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7372/cobricks Log Message: Directory /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:06:35
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6901/tum Log Message: Directory /cvsroot/cobricks/drehscheibe-in/src/de/tum added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:05:43
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6462/de Log Message: Directory /cvsroot/cobricks/drehscheibe-in/src/de added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-30 06:54:42
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2415 Modified Files: PortalManagerImpl.java PortalRequest.java Log Message: Index: PortalManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- PortalManagerImpl.java 29 May 2006 15:57:29 -0000 1.81 +++ PortalManagerImpl.java 30 May 2006 06:54:40 -0000 1.82 @@ -973,6 +973,11 @@ protected void initVelocityRootContext() { if (velocityRootContext==null) { + // is platform initialization already finished? + Object tmpo = coreManager. + getComponentDirectory().getPresenter("portalPresenter"); + if (tmpo == null) return; + velocityRootContext = new VelocityContext(); // add all manager objects ComponentDirectory componentDirectory = Index: PortalRequest.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- PortalRequest.java 29 May 2006 15:57:29 -0000 1.18 +++ PortalRequest.java 30 May 2006 06:54:40 -0000 1.19 @@ -167,12 +167,12 @@ * any adaptation to the user) */ protected VelocityContext - getUserSpecificRootContext(VelocityContext velocityContext, - PortalUser portalUser) + getUserSpecificRootContext(VelocityContext vContext, + PortalUser portalUser) { - if (portalUser == null) return velocityContext; + if (portalUser == null) return vContext; // TBD - return velocityContext; + return vContext; } |
|
From: Michael K. <ko...@us...> - 2006-05-29 15:58:20
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28195 Modified Files: PageAccessHandler.java PortalManager.java PortalManagerImpl.java PortalPresenter.java PortalRequest.java PortalServlet.java PortalServletAdaptor.java Log Message: Index: PortalManager.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManager.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- PortalManager.java 10 Feb 2006 11:36:15 -0000 1.20 +++ PortalManager.java 29 May 2006 15:57:29 -0000 1.21 @@ -47,6 +47,7 @@ public PortalObject getObject(String pagePath, String pageName); public PortalObject getObject(int itemid); + public String getPageContent(String filename, PortalRequest portalRequest); public void saveFileToFilesystem(String pagepath, String pagename, byte barr[]); Index: PortalManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- PortalManagerImpl.java 29 May 2006 05:40:45 -0000 1.80 +++ PortalManagerImpl.java 29 May 2006 15:57:29 -0000 1.81 @@ -282,6 +282,44 @@ /** + * Get the content of a page referenced directly or indirectly from + * the current context (use the correct language etc ...) + */ + public String getPageContent(String filename, PortalRequest portalRequest) + { + String pagePath = null; + String pageName = null; + String lang = portalRequest.getLang(); + if (filename.startsWith("/")) { + int pos = filename.lastIndexOf("/"); + pagePath = filename.substring(0, pos+1); + pageName = filename.substring(pos+1); + } else { + pagePath = portalRequest.getPagePath(); + if (filename.indexOf("/")>-1) { + int pos = filename.lastIndexOf("/"); + pagePath = pagePath + "/" + filename.substring(0, pos); + pageName = filename.substring(pos+1); + } else { + pageName = filename; + } + } + PortalObject o = getObject(pagePath, pageName); + if (!(o instanceof PortalPage)) { + logger.warn("Wrong type of portal object for " + +pagePath+pageName+": "+o.getClass().getName()); + return ""; + } + PortalPage page = (PortalPage)o; + Map pc = page.getStringPageContent(lang); + if (pc == null || pc.size()<1) + return ""; + String pageLang = (String)pc.keySet().iterator().next(); + return (String)pc.get(pageLang); + } + + + /** * Try to load the contents for the given itemid from the database. */ public PortalObject loadObjectFromDatabase(int itemid) Index: PortalServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServlet.java,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- PortalServlet.java 10 Feb 2006 11:36:15 -0000 1.46 +++ PortalServlet.java 29 May 2006 15:57:29 -0000 1.47 @@ -226,6 +226,7 @@ // delete all SPSessions for the user, otherwise there are problems // if the user logs in again via the same SP + /* LAIdffBridge bridge = LAIdffBridge.getSingleInstance(); IdentityProvider idp = (IdentityProvider) bridge.getCurrentIDP(portalRequest); @@ -242,7 +243,7 @@ + args); bridge.removeProviderSessions(args); } - + */ // end - Liberty Alliance Single Sign On // everything went well ... Index: PortalPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPresenter.java,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- PortalPresenter.java 29 May 2006 05:40:45 -0000 1.39 +++ PortalPresenter.java 29 May 2006 15:57:29 -0000 1.40 @@ -177,39 +177,13 @@ public String parse(String filename, PortalRequest portalRequest) { logger.debug("parse("+filename+")"); - String pagePath = null; - String pageName = null; - String lang = portalRequest.getLang(); - if (filename.startsWith("/")) { - int pos = filename.lastIndexOf("/"); - pagePath = filename.substring(0, pos+1); - pageName = filename.substring(pos+1); - } else { - pagePath = portalRequest.getPagePath(); - if (filename.indexOf("/")>-1) { - int pos = filename.lastIndexOf("/"); - pagePath = pagePath + "/" + filename.substring(0, pos); - pageName = filename.substring(pos+1); - } else { - pageName = filename; - } - } - PortalObject o = portalManager.getObject(pagePath, pageName); - if (!(o instanceof PortalPage)) { - logger.warn("Wrong type of portal object for " - +pagePath+pageName+": "+o.getClass().getName()); - return ""; - } - PortalPage page = (PortalPage)o; - Map pc = page.getStringPageContent(lang); - if (pc == null || pc.size()<1) - return ""; - String pageLang = (String)pc.keySet().iterator().next(); - String pageContent = (String)pc.get(pageLang); + + String pageContent = + portalManager.getPageContent(filename, portalRequest); try { StringWriter sw = new StringWriter(); Velocity.evaluate(portalRequest.getVelocityContext(), sw, - pageName, pageContent); + "", pageContent); return sw.toString(); } catch (Exception e) { logger.error(LogUtil.ex("Failed parsing template.", e)); @@ -373,6 +347,14 @@ return result; } + public Object getContextObject(String aname, + org.apache.velocity.context.Context context) + { + org.apache.velocity.context.AbstractContext acontext = + (org.apache.velocity.context.AbstractContext)context; + return acontext.get(aname); + } + /** * Return a PortalPage object by the itemid which is given as String @@ -803,7 +785,6 @@ String content) { MailUtil.sendMail(null, toaddr, null, null, subject, content); - logger.info("sending email to "+toaddr); return "sent email to "+toaddr; } @@ -811,7 +792,6 @@ String content, String fromaddr) { MailUtil.sendMail(null, toaddr, fromaddr, null, subject, content); - logger.info("sending email to "+toaddr); return "sent mail to "+toaddr; } Index: PageAccessHandler.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PageAccessHandler.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- PageAccessHandler.java 29 May 2006 05:40:45 -0000 1.6 +++ PageAccessHandler.java 29 May 2006 15:57:29 -0000 1.7 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2005 Cobricks Group. All rights reserved. + * Copyright (c) 2003-2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software @@ -40,8 +40,10 @@ static final String domain = "page"; static final String[] domainactions = - { "create","update","delete","read","admin" }; + { "*","create","update","delete","read","admin" }; static final String[][] domainactionattrs = { + // * + { "adminAttribute" }, // create { "adminAttribute" }, // update Index: PortalRequest.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- PortalRequest.java 29 May 2006 05:40:45 -0000 1.17 +++ PortalRequest.java 29 May 2006 15:57:29 -0000 1.18 @@ -107,6 +107,17 @@ } if (session!=null) session.setAttribute("velocityContext", velocityContext); + String tmps = getHttpServletRequest().getRequestURL().toString(); + if (tmps != null && tmps.length()>0) { + int pos = tmps.indexOf("//"); + if (pos > -1) { + pos = tmps.indexOf("/", pos+2); + if (pos > -1) { + velocityContext.put("portal_baseurl", + tmps.substring(0,pos+1)); + } + } + } } else { // check if context has user information set if (portalUser != null) { Index: PortalServletAdaptor.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServletAdaptor.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- PortalServletAdaptor.java 10 Feb 2006 11:36:15 -0000 1.18 +++ PortalServletAdaptor.java 29 May 2006 15:57:29 -0000 1.19 @@ -79,6 +79,10 @@ servletContext.getAttribute("cobricks.properties"); coreManager = (CoreManager) servletContext.getAttribute("cobricks.coremanager"); + if (coreManager == null) { + logger.error("CoreManager not initialized!!!"); + return; + } // check if platform was initialized correctly if (platformInitialized == false) { |
|
From: Michael K. <ko...@us...> - 2006-05-29 15:57:25
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28165 Modified Files: FormConstants.java User.java UserManagerImpl.java UserPresenter.java UserServlet.java UserroleAccessHandler.java userontology.xml Log Message: Index: UserPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserPresenter.java,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- UserPresenter.java 12 Mar 2006 22:57:55 -0000 1.33 +++ UserPresenter.java 29 May 2006 15:57:12 -0000 1.34 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 Cobricks Group. All rights reserved. + * Copyright (c) 2004-2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software @@ -299,7 +299,7 @@ int count = 0; Map conditions = new HashMap(); - conditions.put("1", "="); + conditions.put("1", "~"); conditions.put("2", "~"); conditions.put("3", ">"); conditions.put("4", "<"); @@ -417,43 +417,41 @@ for (Iterator i = attributes.entrySet().iterator(); i.hasNext();) { Map.Entry attr = (Map.Entry)i.next(); String attributeName = (String)attr.getKey(); - if (!attributeName.equalsIgnoreCase(User.BUDDYLIST) - && !attributeName.equalsIgnoreCase(User.INTERESTS) - && !attributeName.equalsIgnoreCase(User.PASSWORDCRYPT)) { + && !attributeName.equalsIgnoreCase(User.INTERESTS) + && !attributeName.equalsIgnoreCase(User.PASSWORDCRYPT)) { try { attributeDescriptor = attributeDescriptorManager - .getAttributeDescriptorFor(attributeName); + .getAttributeDescriptorFor(attributeName); } catch (Exception e) { } - + String aname = attributeName; attributeName = printDescription(userid, attributeName, lang); if (attributeName==null || attributeName.length()<1) attributeName = aname; - + OntologyDataType userSet = new OntologyDataType("user[]"); - OntologyDataType categorySet = new OntologyDataType( - "category[]"); - + OntologyDataType categorySet = + new OntologyDataType("category[]"); + if (!sets) { if (!((attributeDescriptor.getOntologyDataType() - .getTypeName().equals(userSet)) - || (attributeDescriptor.getOntologyDataType() - .getTypeName() - .equals(categorySet)))) { + .getTypeName().equals(userSet)) + || (attributeDescriptor.getOntologyDataType() + .getTypeName() + .equals(categorySet)))) { names.add(attributeName); if (attributeDescriptor.getOntologyDataType().isSet()){ - String help = attr.getValue().toString(); - String stringValue = help.substring(1, (help.length() - 1)); + String stringValue = + user.getAttributeAsString(attributeName); values.add(stringValue); } - else{ + else { values.add(attr.getValue()); } } } - } } } @@ -476,9 +474,9 @@ Object attrvalue = null; User currentUser = userManager.getUser(userid); String userclass = currentUser.getAttributeAsString(User.USERCLASS); - UserProfileModel profileModel = userManager.getProfileModel(userclass); + UserProfileModel profileModel = + userManager.getProfileModel(userclass); OntologyClassAttr attribute = profileModel.getAttribute(attrname); - if (attribute == null) { if (attrname.equalsIgnoreCase(User.USERLOGIN)) { return "<input name=\"userlogin\" value=\"" @@ -502,7 +500,6 @@ OntologyDataType attrDataType = attributeDescriptor.getOntologyDataType(); - if ((attrDataType.getTypeName().equalsIgnoreCase("string") || attrDataType.getTypeName().equalsIgnoreCase("date") || attrDataType.getTypeName().equalsIgnoreCase("int")) @@ -531,10 +528,6 @@ sb.append(" value = \""); if (currentUser.getAttribute(attrname) != null) { attrvalue = currentUser.getAttributeAsString(attrname); - if (attrDataType.isSet()) { - attrvalue = ((String)attrvalue). - substring(1,(((String)attrvalue).length() - 1)); - } sb.append(attrvalue); } sb.append("\" >"); @@ -570,9 +563,8 @@ } sb.append(">"); sb.append(aValue); - sb.append(" "); } - sb.append("<select/>"); + sb.append("</select>"); } result = sb.toString(); Index: FormConstants.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/FormConstants.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- FormConstants.java 11 Jun 2004 11:38:32 -0000 1.5 +++ FormConstants.java 29 May 2006 15:57:12 -0000 1.6 @@ -24,9 +24,6 @@ public static final String EMAIL = "email"; public static final String USERCLASS = "userclass"; public static final String REGISTER_CMD = "register"; - public static final String EMAIL_SUBJECT = "email_subject"; - public static final String EMAIL_TEXT = "email_text"; - public static final String EMAIL_TEXT_1 = "email_text_1"; public static final int USER_ID_MIN_LENGTH = 5; public static final int USER_ID_MAX_LENGTH = 20; public static final int NAME_MIN_LENGTH = 1; Index: UserroleAccessHandler.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserroleAccessHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- UserroleAccessHandler.java 20 Dec 2005 18:10:24 -0000 1.4 +++ UserroleAccessHandler.java 29 May 2006 15:57:12 -0000 1.5 @@ -128,7 +128,8 @@ if (perm.contains(user, domain, action, attrs)) return true; } - return false; + return false; + } } Index: UserManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- UserManagerImpl.java 8 May 2006 07:48:00 -0000 1.61 +++ UserManagerImpl.java 29 May 2006 15:57:12 -0000 1.62 @@ -64,8 +64,9 @@ * @version $Date$ */ -public class UserManagerImpl extends ComponentManagerAdaptor implements - UserManager { +public class UserManagerImpl extends ComponentManagerAdaptor + implements UserManager +{ static Logger logger = Logger.getLogger(UserManagerImpl.class); @@ -992,9 +993,10 @@ * @return DOCUMENT_ME! */ public boolean checkPermission(int userid, String domain, String action, - Map attrs) { + Map attrs) + { logger.info("checkPermission(" + userid + "," + domain + "," + action - + "," + attrs + ")"); + + "," + attrs + ")"); return accessControl.checkPermission(userid, domain, action, attrs); } @@ -1312,6 +1314,7 @@ if (tablename.equals("user_main")) newmaintable = true; } else if (res == -2) { + logger.info("Found need to update table "+tablename); if (!dbAccess.updateTable(tablename)) { logger.error("Updating table " + tablename + " failed."); } @@ -1361,6 +1364,7 @@ accessControl .addAccessPermission(roleid, "category", "*", null); accessControl.addAccessPermission(roleid, "context", "*", null); + accessControl.addAccessPermission(roleid, "page", "*", null); } catch (Exception e) { logger.warn("Failed creating admin role: " + e.toString()); } Index: UserServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserServlet.java,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- UserServlet.java 24 Jan 2006 06:50:40 -0000 1.40 +++ UserServlet.java 29 May 2006 15:57:12 -0000 1.41 @@ -224,7 +224,8 @@ throws Exception { // is userlogin provided - String userLogin = prequest.getRequestParameter(FormConstants.USERLOGIN); + String userLogin = + prequest.getRequestParameter(FormConstants.USERLOGIN); if ((userLogin == null) || (userLogin.length() < 1)) { prequest.setReturnCode(1000); return "error"; @@ -272,7 +273,7 @@ return "error"; } } - else if (aname.equals("basic.contact-priv.online.email")) { + else if (aname.equals(User.EMAIL)) { // the length of email must be between 6 and 30 characters if ((avalue.length() < FormConstants.EMAIL_MIN_LENGTH) || (avalue.length() > FormConstants.EMAIL_MAX_LENGTH)) { @@ -331,9 +332,9 @@ } String attrnames = prequest.getRequestParameter("attrnames"); if (attrnames == null || attrnames.length()<1) - attrnames = prequest.getRequestParameter("anames"); + attrnames = prequest.getRequestParameter("anames"); if (attrnames != null) { - st = new StringTokenizer(attrnames, ", "); + st = new StringTokenizer(attrnames, ", []"); while (st.hasMoreTokens()) { String anameWeb = st.nextToken(); String aname = anameWeb.replace('_', '.'); @@ -351,23 +352,20 @@ } u.setUserLogin(userLogin); - if (!direct) { + if (!direct) { + logger.debug("creating and sending password"); // 1. create password 2. send password 3. store passwd // in user object Object passwd = userManager.generateCredentials(); - String smtphost = coreManager. - getProperty("message.email.smtphost"); - if ((smtphost == null) || (smtphost.trim().length() < 1)) { - logger.warn("no SMTP host defined"); - } - String fromAddr = - coreManager.getProperty("message.email.defaultfrom"); String emailAddr = - prequest.getRequestParameter("basic.contact-priv.online.email"); + prequest. + getRequestParameter("basic_contact-priv_online_email"); String subjectOfMail = - prequest.getRequestParameter(FormConstants.EMAIL_SUBJECT); - String contentOfMail = - prequest.getRequestParameter(FormConstants.EMAIL_TEXT); + prequest.getRequestParameter("email_subject"); + String fname = + prequest.getRequestParameter("email_textsource"); + String contentOfMail = + portalManager.getPageContent(fname, prequest); StringWriter w = new StringWriter(); VelocityContext context = new VelocityContext(); // copy request parameters to context @@ -375,12 +373,12 @@ Iterator i = map.keySet().iterator(); while (i.hasNext()) { String aname = (String)i.next(); - context.put(aname, map.get(aname)); + context.put(aname, prequest.getRequestParameter(aname)); } context.put("passwd", passwd); Velocity.evaluate(context, w, "", contentOfMail); try { - MailUtil.sendMail(smtphost, emailAddr, fromAddr, + MailUtil.sendMail(null, emailAddr, null, null, subjectOfMail, w.toString()); } catch (Exception e) { logger.error(LogUtil.ex("Error sending email.", e)); @@ -474,7 +472,8 @@ } } - String userLogin = prequest.getRequestParameter(FormConstants.USERLOGIN); + String userLogin = + prequest.getRequestParameter(FormConstants.USERLOGIN); String email = prequest.getRequestParameter(FormConstants.EMAIL); // exists the user with this userlogin and email??? @@ -484,50 +483,42 @@ //1. creating password 2. sending password 3. crypting password // and updating of the entry in user_main for corresponding user if (u != null) { - Object pswd = userManager.generateCredentials(); - String smtphost = coreManager.getProperty( - "message.email.smtphost"); - - if ((smtphost == null) || (smtphost.trim().length() < 1)) { - logger.warn("no SMTP host defined"); - } - - String fromAddr = coreManager.getProperty( - "message.email.defaultfrom"); + Object passwd = userManager.generateCredentials(); String emailAddr = email; - String subjectOfMail = prequest.getRequestParameter(FormConstants.EMAIL_SUBJECT); - String contentOfMail = prequest.getRequestParameter(FormConstants.EMAIL_TEXT) - + userLogin - + prequest.getRequestParameter(FormConstants.EMAIL_TEXT_1) - + pswd; - - //emailAddr = email + String subjectOfMail = + prequest.getRequestParameter("email_subject"); + String fname = + prequest.getRequestParameter("email_textsource"); + String contentOfMail = + portalManager.getPageContent(fname, prequest); + StringWriter w = new StringWriter(); + VelocityContext context = new VelocityContext(); + // copy request parameters to context + Map map = prequest.getRequestParameters(); + Iterator i = map.keySet().iterator(); + while (i.hasNext()) { + String aname = (String)i.next(); + context.put(aname, prequest.getRequestParameter(aname)); + } + context.put("passwd", passwd); + Velocity.evaluate(context, w, "", contentOfMail); try { - MailUtil.sendMail(smtphost, emailAddr, fromAddr, - subjectOfMail, contentOfMail); + MailUtil.sendMail(null, emailAddr, null, null, + subjectOfMail, w.toString()); } catch (Exception e) { logger.error("Error by mail sending ", e); } - - logger.debug("PASSWORD in forgot password is: " + pswd); - u.setCredentials(userManager, pswd); - - logger.debug("after e-mail sending"); - + u.setCredentials(userManager, passwd); prequest.setReturnCode(2001); - return "success"; } else { - //user with userlogin exists, try another userlogin! velocity - logger.info("user with userlogin not exists!"); + logger.info("user with userlogin does not exist!"); prequest.setReturnCode(1020); - return "error"; } } catch (UserExistsException e1) { try { prequest.setReturnCode(1020); - return "error"; } catch (Exception e) { logger.error(e); @@ -702,7 +693,8 @@ List anames = new ArrayList(); Map avalues = new HashMap(); String stringAnames = prequest.getRequestParameter("anames"); - StringTokenizer commaTokenizer = new StringTokenizer(stringAnames.trim(), ","); + StringTokenizer commaTokenizer = + new StringTokenizer(stringAnames.trim(), ", []"); while (commaTokenizer.hasMoreTokens()) { String anameWeb = commaTokenizer.nextToken().trim(); String aname = anameWeb.replace('_', '.'); @@ -1298,7 +1290,6 @@ String perms[] = prequest.getRequestParameterValues("perms"); if (perms != null) { - logger.info("!!!"+perms); for (int i = 0; i < perms.length; i++) { try { int tmpInt = Integer.parseInt(perms[i]); Index: userontology.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/userontology.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- userontology.xml 18 Oct 2005 23:54:19 -0000 1.11 +++ userontology.xml 29 May 2006 15:57:12 -0000 1.12 @@ -17,8 +17,7 @@ <attr name="basic.personal.imageuri" type="string(100)"> <description lang="de">Image URI</description> <description lang="en">Image URI</description> - </attr> - + </attr> <attr name="basic.personal.rfidsnr" type="string(50)"> <description lang="de">RFID Seriennummer</description> <description lang="en">RFID Serialnumber</description> @@ -30,8 +29,7 @@ <attr name="basic.personal.readernr" type="string(50)"> <description lang="de">RFID Reader Nummer</description> <description lang="de">RFID Reader Number</description> - </attr> - + </attr> <attr name="basic.personal.foafuri" type="string(100)"> <description lang="de">FOAF URI</description> <description lang="en">FOAF URI</description> @@ -56,8 +54,7 @@ <description lang="de">Position (gml:Point)</description> <description lang="en">Position (gml:Point)</description> </attr> - - + <attr name="basic.contact-priv.postal.comment" type="string(50)"/> <attr name="basic.contact-priv.postal.street" type="string(50)"> <description lang="de">Strasse</description> @@ -154,27 +151,6 @@ <attr name="app.org.cobricks.emailprefix" type="string(15)"/> - -</class> - -<class name="universityuser" parent="user"> - - <attr name="basic.university.status" type="string(10)"> - <description lang="de">Universitaet Status</description> - <description lang="en">University Status</description> - <value>professor</value> - <value>staff</value> - <value>student</value> - <value>alumni</value> - <value>other</value> - </attr> - <attr name="basic.university.graduation" type="int"> - <description lang="en">Graduation</description> - </attr> - <attr name="basic.university.subject" type="string(30)"> - <description lang="de">Hauptfach</description> - <description lang="en">Major subject</description> - </attr> </class> </userontology> Index: User.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/User.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- User.java 20 Dec 2005 18:10:24 -0000 1.28 +++ User.java 29 May 2006 15:57:12 -0000 1.29 @@ -114,6 +114,16 @@ return userlogin; } + public String getEmail() + { + String tmps = (String)getAttribute("basic.contact.online.email"); + if (tmps == null) + tmps = (String)getAttribute("basic.contact-home.online.email"); + if (tmps == null) + tmps = (String)getAttribute("basic.contact-work.online.email"); + return tmps; + } + public void setUserLogin(String userlogin) { this.userlogin = userlogin; |
|
From: Michael K. <ko...@us...> - 2006-05-29 10:58:28
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/5.5/webapps In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4407/webapps Log Message: Directory /cvsroot/cobricks/drehscheibe-in/tomcat/5.5/webapps added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-29 10:58:14
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/5.0/webapps In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4064/webapps Log Message: Directory /cvsroot/cobricks/drehscheibe-in/tomcat/5.0/webapps added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-29 10:58:13
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/5.5/conf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4374/conf Log Message: Directory /cvsroot/cobricks/drehscheibe-in/tomcat/5.5/conf added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-29 10:58:06
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/5.0/conf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4035/conf Log Message: Directory /cvsroot/cobricks/drehscheibe-in/tomcat/5.0/conf added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-29 10:57:41
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/5.5 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4002/5.5 Log Message: Directory /cvsroot/cobricks/drehscheibe-in/tomcat/5.5 added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-29 10:57:34
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/5.0 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3970/5.0 Log Message: Directory /cvsroot/cobricks/drehscheibe-in/tomcat/5.0 added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-29 10:56:31
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/conf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3551 Removed Files: catalina.policy catalina.properties server.xml tomcat-users.xml web.xml Log Message: --- catalina.policy DELETED --- --- web.xml DELETED --- --- server.xml DELETED --- --- tomcat-users.xml DELETED --- --- catalina.properties DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-05-29 10:53:56
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/webapps/manager/web-inf/lib In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2462/lib Removed Files: catalina-manager.jar Log Message: --- catalina-manager.jar DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-05-29 10:53:56
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/webapps/manager/web-inf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2462 Removed Files: web.xml Log Message: --- web.xml DELETED --- |
|
From: Philipp H. <p-...@us...> - 2006-05-29 09:15:34
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31183/src/org/cobricks/item Modified Files: ItemManager.java Log Message: added createItem(Map, User) to interface Index: ItemManager.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemManager.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ItemManager.java 29 May 2006 05:35:25 -0000 1.30 +++ ItemManager.java 29 May 2006 09:15:19 -0000 1.31 @@ -78,6 +78,18 @@ Item createItem(Map attrs) throws CobricksException; /** + * + * @see ItemManager#createItem(Map) + * + * @param attrs The attributes for the new item + * @param creator The user who creates the new item. + * @return Newly instantiated item or null if an error occurs. + * @throws CobricksException This can be thrown if there was an internal + * XML database exception while handling this request. + */ + Item createItem(Map attrs, User creator) throws CobricksException; + + /** * The same as getItem(int), but with additional user information - * access right checking with given user id. * @see ItemManager#getItem(int) |
|
From: Philipp H. <p-...@us...> - 2006-05-29 09:14:36
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/category/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30787/src/org/cobricks/category/db Modified Files: category.xml Log Message: In ontology the length of item/category-clas is 50 in DB it was 15. I changed the DB to varchar(50) Index: category.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/db/category.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- category.xml 2 May 2006 11:55:07 -0000 1.2 +++ category.xml 29 May 2006 09:14:27 -0000 1.3 @@ -4,7 +4,7 @@ <column name="catid" type="int" primarykey="true"/> <column name="globalid" type="varchar(64)" notnull="true"/> - <column name="categoryclass" type="varchar(30)"/> + <column name="categoryclass" type="varchar(50)"/> <column name="creatorid" type="int"/> <column name="creationtime" type="timestamp"/> <column name="updaterid" type="int"/> |
|
From: Philipp H. <p-...@us...> - 2006-05-29 09:14:31
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30787/src/org/cobricks/item/db Modified Files: item.xml Log Message: In ontology the length of item/category-clas is 50 in DB it was 15. I changed the DB to varchar(50) Index: item.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/db/item.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- item.xml 27 May 2006 08:47:35 -0000 1.2 +++ item.xml 29 May 2006 09:14:26 -0000 1.3 @@ -4,7 +4,7 @@ <column name="itemid" type="int" primarykey="true"/> <column name="globalid" type="varchar(64)" notnull="true"/> - <column name="itemclass" type="varchar(30)"/> + <column name="itemclass" type="varchar(50)"/> <column name="creationtime" type="timestamp"/> <column name="updatetime" type="timestamp"/> <column name="starttime" type="timestamp"/> |
|
From: Michael K. <ko...@us...> - 2006-05-29 08:46:35
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18647 Modified Files: course.xml course_date.xml course_lecturer.xml course_module.xml course_prog.xml course_progrel.xml Log Message: Index: course_date.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course_date.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- course_date.xml 24 Jun 2004 06:55:37 -0000 1.1 +++ course_date.xml 29 May 2006 08:46:30 -0000 1.2 @@ -5,6 +5,7 @@ <column name="did" type="int" primarykey="true"/> <column name="cid" type="int" notnull="true"/> <column name="dtype" type="char(1)"/> + <!-- 0=standard, 1=exercise, 2=central exercise --> <column name="dcycle" type="int"/> <!-- 0=single/dayly, 1=weekly, 2=biweekly --> <column name="dstartdate" type="date"/> Index: course_prog.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course_prog.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- course_prog.xml 24 Jun 2004 06:55:37 -0000 1.1 +++ course_prog.xml 29 May 2006 08:46:30 -0000 1.2 @@ -6,7 +6,6 @@ <column name="cpname" type="varchar(200)"/> <column name="cpname_en" type="varchar(200)"/> <column name="cplabel" type="varchar(20)"/> - <column name="cpsubproglabel" type="varchar(10)"/> <column name="cpcomment" type="varchar(250)"/> </tablelayout> Index: course.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- course.xml 22 Aug 2005 13:52:06 -0000 1.4 +++ course.xml 29 May 2006 08:46:30 -0000 1.5 @@ -12,22 +12,28 @@ <column name="cname_en" type="varchar(150)"/> <column name="ccomment" type="varchar(255)"/> <column name="clang" type="char(2)"/> - <column name="cgroup" type="int"/> <!--cgroup is categoryid --> <column name="curl" type="varchar(200)"/> - <column name="cparticipants" type="int"/> + <column name="ccapacity" type="int"/> <column name="cectscredits" type="float(6)"/> - + + <column name="cexaminerid" type="int"/> + <!-- reference to lecturer --> + <column name="chours_lec" type="int"/> <column name="chours_ex" type="int"/> <column name="chours_sem" type="int"/> <column name="chours_lab" type="int"/> + <column name="ctarget" type="text"/> + <column name="ctarget_en" type="text"/> <column name="ccontent" type="text"/> <column name="ccontent_en" type="text"/> <column name="cprerequ" type="text"/> <column name="cprerequ_en" type="text"/> - <column name="cprerequcert" type="text"/> - <column name="cprerequcert_en" type="text"/> + <column name="ccert" type="text"/> + <column name="ccert_en" type="text"/> + <column name="cdidactics" type="text"/> + <column name="cdidactics_en" type="text"/> <column name="clastupdateuserid" type="int"/> <column name="clastupdate" type="timestamp"/> Index: course_lecturer.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course_lecturer.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- course_lecturer.xml 13 Dec 2005 09:05:02 -0000 1.4 +++ course_lecturer.xml 29 May 2006 08:46:30 -0000 1.5 @@ -10,10 +10,12 @@ <column name="llastname" type="varchar(20)"/> <column name="lurl" type="varchar(200)"/> <column name="limageurl" type="varchar(200)"/> - <column name="lgroup" type="int"/> <column name="lextid" type="varchar(40)"/> <column name="lhidden" type="int"/> + + <column name="luserid" type="int"/> + <!-- reference to cobricks user --> <index name="courselecturer_lid" unique="unique"> <colname>lid</colname> Index: course_progrel.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course_progrel.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- course_progrel.xml 22 Aug 2005 13:52:06 -0000 1.2 +++ course_progrel.xml 29 May 2006 08:46:30 -0000 1.3 @@ -7,6 +7,7 @@ <column name="cpstartsem" type="int"/> <column name="cpendsem" type="int"/> <column name="cptype" type="varchar(2)"/> + <column name="cpcomment" type="text"/> </tablelayout> </table> Index: course_module.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course_module.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- course_module.xml 22 Aug 2005 13:52:06 -0000 1.1 +++ course_module.xml 29 May 2006 08:46:30 -0000 1.2 @@ -3,8 +3,8 @@ <tablelayout> <column name="cmid" type="int" primarykey="true"/> - <column name="cmparentid" type="int"/> - + <column name="cmsid" type="varchar(10)" /> + <column name="cmname" type="varchar(200)"/> <column name="cmname_en" type="varchar(200)"/> <column name="cmshortname" type="varchar(30)"/> @@ -16,20 +16,28 @@ <column name="cmhours_sem" type="int"/> <column name="cmhours_lab" type="int"/> + <column name="cmtarget" type="text"/> + <column name="cmtarget_en" type="text"/> <column name="cmcontent" type="text"/> <column name="cmcontent_en" type="text"/> <column name="cmprerequ" type="text"/> <column name="cmprerequ_en" type="text"/> - <column name="cmprerequcert" type="text"/> - <column name="cmprerequcert_en" type="text"/> + <column name="cmcert" type="text"/> + <column name="cmcert_en" type="text"/> + <column name="cmdidactics" type="text"/> + <column name="cmdidactics_en" type="text"/> <column name="cmimport" type="int"/> <column name="cmhidden" type="int"/> - <!-- 0=confirmed/show, 1=outdated/hidden, 2=not confirmed/hidden --> - <column name="cmcycle" type="int"/> - <column name="cmappdate" type="timestamp"/> - <column name="cmapplicant" type="varchar(150)"/> - <column name="cmexaminer" type="varchar(150)"/> + <!-- 0=confirmed/show, 1=archived/hidden, 2=not confirmed/hidden --> + <column name="cmcycle" type="varchar(10)"/> + + <column name="cmcapacity" type="int"/> + <column name="cmresponsible" type="int"/> + <!-- reference to lecturer --> + <column name="cmcomment" type="text"/> + + <column name="cmaddxml" type="text"/> <index name="coursemodule_cmid" unique="unique"> <colname>cmid</colname> |
|
From: Michael K. <ko...@us...> - 2006-05-29 07:37:24
|
Update of /cvsroot/cobricks/drehscheibe-in/web/WEB-INF In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23532/WEB-INF Modified Files: server-config.wsdd web.xml Log Message: Index: server-config.wsdd =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/WEB-INF/server-config.wsdd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- server-config.wsdd 3 Aug 2004 08:29:52 -0000 1.1 +++ server-config.wsdd 29 May 2006 07:37:16 -0000 1.2 @@ -1,100 +1,121 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns="http://xml.apache.org/axis/wsdd/" - xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"> - - <globalConfiguration> - <parameter name="adminPassword" value="joshua"/> - <parameter name="attachments.Directory" - value="build/webapps/ROOT/WEB-INF/attachments"/> - <parameter name="attachments.implementation" - value="org.apache.axis.attachments.AttachmentsImpl"/> - <parameter name="sendXsiTypes" value="true"/> - <parameter name="sendMultiRefs" value="true"/> - <parameter name="sendXMLDeclaration" value="true"/> - <parameter name="axis.sendMinimizedElements" value="true"/> - - <requestFlow> - <handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="session"/> - </handler> - <handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="request"/> - <parameter name="extension" value=".jwr"/> - </handler> - </requestFlow> - </globalConfiguration> - <handler name="LocalResponder" - type="java:org.apache.axis.transport.local.LocalResponder"/> - <handler name="URLMapper" - type="java:org.apache.axis.handlers.http.URLMapper"/> - <handler name="Authenticate" - type="java:org.cobricks.core.ws.AxisHTTPAuthenticationHandler"/> - - <service name="AdminService" provider="java:MSG"> - <parameter name="allowedMethods" value="AdminService"/> - <parameter name="enableRemoteAdmin" value="false"/> - <parameter name="className" value="org.apache.axis.utils.Admin"/> - <namespace>http://xml.apache.org/axis/wsdd/</namespace> - </service> - <service name="Version" provider="java:RPC"> - <parameter name="allowedMethods" value="getVersion"/> - <parameter name="className" value="org.apache.axis.Version"/> - </service> - - <service name="cobricksUser" provider="java:CobricksRPC"> - <parameter name="allowedMethods" - value="getUser getUserAsXml searchUsers"/> - <parameter name="className" - value="org.cobricks.user.UserManagerWS"/> - <parameter name="scope" value="application"/> - <requestFlow name="checks"> - <handler type="Authenticate"/> - </requestFlow> - <beanMapping qname="cuser:User" xmlns:cuser="urn://cobricks.org/user" - languageSpecificType="java:org.cobricks.user.User"/> - </service> - - <service name="cobricksItem" provider="java:CobricksRPC"> - <parameter name="allowedMethods" - value="getItem getItemAsXml searchItems"/> - <parameter name="className" - value="org.cobricks.item.ItemManagerWS"/> - <parameter name="scope" value="application"/> - <requestFlow name="checks"> - <handler type="Authenticate"/> - </requestFlow> - <!-- beanMapping qname="citem:Item" xmlns:citem="urn://cobricks.org/item" - languageSpecificType="java:org.cobricks.item.Item"/ --> - <typeMapping qname="citem:Item" xmlns:citem="urn://cobricks.org/item" - languageSpecificType="java:org.cobricks.item.Item" - serializer="org.cobricks.item.ws.ItemSerializerFactory" - deserializer="org.cobricks.item.ws.ItemDeserializerFactory" - encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </service> - - <service name="cobricksCourse" provider="java:CobricksRPC"> - <parameter name="allowedMethods" - value="getCourse getCourseAsXml searchCourses"/> - <parameter name="className" - value="org.cobricks.course.CourseManagerWS"/> - <parameter name="scope" value="application"/> - <requestFlow name="checks"> - <handler type="Authenticate"/> - </requestFlow> - </service> - - - <transport name="http"> - <requestFlow> - <handler type="URLMapper"/> - <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> - </requestFlow> - </transport> - - <transport name="local"> - <responseFlow> - <handler type="LocalResponder"/> - </responseFlow> - </transport> - -</deployment> +<?xml version="1.0" encoding="UTF-8"?> +<deployment xmlns="http://xml.apache.org/axis/wsdd/" + xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"> + + <globalConfiguration> + <parameter name="adminPassword" value="joshua"/> + <parameter name="attachments.Directory" + value="build/webapps/ROOT/WEB-INF/attachments"/> + <parameter name="attachments.implementation" + value="org.apache.axis.attachments.AttachmentsImpl"/> + <parameter name="sendXsiTypes" value="true"/> + <parameter name="sendMultiRefs" value="true"/> + <parameter name="sendXMLDeclaration" value="true"/> + <parameter name="axis.sendMinimizedElements" value="true"/> + <parameter name="dotNetSoapEncFix" value="true"/> + + <requestFlow> + <handler type="java:org.apache.axis.handlers.JWSHandler"> + <parameter name="scope" value="session"/> + </handler> + <handler type="java:org.apache.axis.handlers.JWSHandler"> + <parameter name="scope" value="request"/> + <parameter name="extension" value=".jwr"/> + </handler> + </requestFlow> + </globalConfiguration> + <handler name="LocalResponder" + type="java:org.apache.axis.transport.local.LocalResponder"/> + <handler name="URLMapper" + type="java:org.apache.axis.handlers.http.URLMapper"/> + <handler name="Authenticate" + type="java:org.cobricks.core.ws.AxisHTTPAuthenticationHandler"/> + + <service name="AdminService" provider="java:MSG"> + <parameter name="allowedMethods" value="AdminService"/> + <parameter name="enableRemoteAdmin" value="false"/> + <parameter name="className" value="org.apache.axis.utils.Admin"/> + <namespace>http://xml.apache.org/axis/wsdd/</namespace> + </service> + <service name="Version" provider="java:RPC"> + <parameter name="allowedMethods" value="getVersion"/> + <parameter name="className" value="org.apache.axis.Version"/> + </service> + + <service name="cobricksUser" provider="java:CobricksRPC"> + <parameter name="allowedMethods" + value="getUser getUserAsXml searchUsers getUserImage updateUser getAllUserID getProfile"/> + <parameter name="className" + value="org.cobricks.user.UserManagerWS"/> + <parameter name="scope" value="application"/> + <requestFlow name="checks"> + <handler type="Authenticate"/> + </requestFlow> + <beanMapping qname="citem:Item" xmlns:citem="urn://cobricks.org/item" + languageSpecificType="java:org.cobricks.item.Item"/> + <beanMapping qname="cuser:User" xmlns:cuser="urn://cobricks.org/user" + languageSpecificType="java:org.cobricks.user.User"/> + <beanMapping qname="ccategory:Category" xmlns:ccategory="urn://cobricks.org/category" + languageSpecificType="java:org.cobricks.category.Category"/> + </service> + + <service name="cobricksItem" provider="java:CobricksRPC"> + <parameter name="allowedMethods" + value="getItem getItemAsXml searchItems"/> + <parameter name="className" + value="org.cobricks.item.ItemManagerWS"/> + <parameter name="scope" value="application"/> + <requestFlow name="checks"> + <handler type="Authenticate"/> + </requestFlow> + <beanMapping qname="citem:Item" xmlns:citem="urn://cobricks.org/item" + languageSpecificType="java:org.cobricks.item.Item"/> + <beanMapping qname="cuser:User" xmlns:cuser="urn://cobricks.org/user" + languageSpecificType="java:org.cobricks.user.User"/> + <beanMapping qname="ccategory:Category" xmlns:ccategory="urn://cobricks.org/category" + languageSpecificType="java:org.cobricks.category.Category"/> + </service> + + <service name="cobricksCategory" provider="java:CobricksRPC"> + <parameter name="allowedMethods" + value="getCategory"/> + <parameter name="className" + value="org.cobricks.category.CategoryManagerWS"/> + <parameter name="scope" value="application"/> + <requestFlow name="checks"> + <handler type="Authenticate"/> + </requestFlow> + <beanMapping qname="citem:Item" xmlns:citem="urn://cobricks.org/item" + languageSpecificType="java:org.cobricks.item.Item"/> + <beanMapping qname="cuser:User" xmlns:cuser="urn://cobricks.org/user" + languageSpecificType="java:org.cobricks.user.User"/> + <beanMapping qname="ccategory:Category" xmlns:ccategory="urn://cobricks.org/category" + languageSpecificType="java:org.cobricks.category.Category"/> + </service> + + <service name="cobricksCourse" provider="java:CobricksRPC"> + <parameter name="allowedMethods" + value="getCourse getCourseAsXml searchCourses"/> + <parameter name="className" + value="org.cobricks.course.CourseManagerWS"/> + <parameter name="scope" value="application"/> + <requestFlow name="checks"> + <handler type="Authenticate"/> + </requestFlow> + </service> + + + <transport name="http"> + <requestFlow> + <handler type="URLMapper"/> + <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> + </requestFlow> + </transport> + + <transport name="local"> + <responseFlow> + <handler type="LocalResponder"/> + </responseFlow> + </transport> + +</deployment> Index: web.xml =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/WEB-INF/web.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- web.xml 3 Aug 2004 08:29:52 -0000 1.1 +++ web.xml 29 May 2006 07:37:16 -0000 1.2 @@ -1,273 +1,310 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> - -<web-app> - - <display-name>Cobricks-2</display-name> - <description> - Cobricks-2 Default Application - </description> - - - <servlet> - <servlet-name>InitServlet</servlet-name> - <servlet-class>org.cobricks.portal.InitServlet</servlet-class> - <load-on-startup /> - </servlet> - - - <servlet> - <servlet-name>CoreServlet</servlet-name> - <servlet-class>org.cobricks.core.CoreServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>PortalServlet</servlet-name> - <servlet-class>org.cobricks.portal.PortalServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>UserServlet</servlet-name> - <servlet-class>org.cobricks.user.UserServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>ItemServlet</servlet-name> - <servlet-class>org.cobricks.item.ItemServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>CategoryServlet</servlet-name> - <servlet-class>org.cobricks.category.CategoryServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>ContextServlet</servlet-name> - <servlet-class>org.cobricks.context.ContextServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>MessageServlet</servlet-name> - <servlet-class>org.cobricks.message.MessageServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>CourseServlet</servlet-name> - <servlet-class>org.cobricks.course.CourseServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>VotingServlet</servlet-name> - <servlet-class>org.cobricks.voting.VotingServlet</servlet-class> - </servlet> - - - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>/</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>default</servlet-name> - <url-pattern>*.gif</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>default</servlet-name> - <url-pattern>*.png</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>default</servlet-name> - <url-pattern>*.jpg</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>default</servlet-name> - <url-pattern>*.tif</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>default</servlet-name> - <url-pattern>*.pdf</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>CoreServlet</servlet-name> - <url-pattern>/CORE</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>*.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>*.html.en</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>*.html.de</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>*.xml</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>*.wml</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>*.wml.*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>*.txt</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>*.ics</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>/PORTAL</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>UserServlet</servlet-name> - <url-pattern>/USER</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>ItemServlet</servlet-name> - <url-pattern>/ITEM</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>CategoryServlet</servlet-name> - <url-pattern>/CATEGORY</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>ContextServlet</servlet-name> - <url-pattern>/CONTEXT</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>MessageServlet</servlet-name> - <url-pattern>/MESSAGE</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>CourseServlet</servlet-name> - <url-pattern>/COURSE</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>VotingServlet</servlet-name> - <url-pattern>/VOTING</url-pattern> - </servlet-mapping> - - - <session-config> - <session-timeout>30</session-timeout> <!-- 30 minutes --> - </session-config> - - - <!-- configuration from axis 1.1 web application --> - - <servlet> - <servlet-name>AxisServlet</servlet-name> - <display-name>Apache-Axis Servlet</display-name> - <servlet-class> - org.cobricks.core.ws.AxisServlet - <!-- org.apache.axis.transport.http.AxisServlet --> - </servlet-class> - </servlet> - - <servlet> - <servlet-name>AdminServlet</servlet-name> - <display-name>Axis Admin Servlet</display-name> - <servlet-class> - org.apache.axis.transport.http.AdminServlet - </servlet-class> - <load-on-startup>100</load-on-startup> - </servlet> - - <servlet> - <servlet-name>SOAPMonitorService</servlet-name> - <display-name>SOAPMonitorService</display-name> - <servlet-class> - org.apache.axis.monitor.SOAPMonitorService - </servlet-class> - <init-param> - <param-name>SOAPMonitorPort</param-name> - <param-value>5001</param-value> - </init-param> - <load-on-startup>100</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/servlet/AxisServlet</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>*.jws</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/services/*</url-pattern> - </servlet-mapping> - - <!-- - <servlet-mapping> - <servlet-name>SOAPMonitorService</servlet-name> - <url-pattern>/SOAPMonitor</url-pattern> - </servlet-mapping> - --> - - <servlet-mapping> - <servlet-name>AdminServlet</servlet-name> - <url-pattern>/servlet/AdminServlet</url-pattern> - </servlet-mapping> - - <!-- currently the W3C havent settled on a media type for WSDL; - http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft - for now we go with the basic 'it's XML' response --> - <mime-mapping> - <extension>wsdl</extension> - <mime-type>text/xml</mime-type> - </mime-mapping> - - <mime-mapping> - <extension>xsd</extension> - <mime-type>text/xml</mime-type> - </mime-mapping> - - - <welcome-file-list> - <welcome-file>index.html</welcome-file> - <welcome-file>index.html.en</welcome-file> - <welcome-file>index.html.de</welcome-file> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - - - <filter> - <filter-name>multipartFilter</filter-name> - <filter-class>org.cobricks.portal.MultipartFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>multipartFilter</filter-name> - <url-pattern>/USER</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>multipartFilter</filter-name> - <url-pattern>/ITEM</url-pattern> - </filter-mapping> - -</web-app> - +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> + +<web-app> + + <display-name>Drehscheibe</display-name> + <description> + Informatik Drehscheibe www.in.tum.de + </description> + + + <servlet> + <servlet-name>InitServlet</servlet-name> + <servlet-class>org.cobricks.portal.InitServlet</servlet-class> + <load-on-startup /> + </servlet> + + + <servlet> + <servlet-name>CoreServlet</servlet-name> + <servlet-class>org.cobricks.core.CoreServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>PortalServlet</servlet-name> + <servlet-class>org.cobricks.portal.PortalServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>UserServlet</servlet-name> + <servlet-class>org.cobricks.user.UserServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>ItemServlet</servlet-name> + <servlet-class>org.cobricks.item.ItemServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>CategoryServlet</servlet-name> + <servlet-class>org.cobricks.category.CategoryServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>ContextServlet</servlet-name> + <servlet-class>org.cobricks.context.ContextServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>MessageServlet</servlet-name> + <servlet-class>org.cobricks.message.MessageServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>CourseServlet</servlet-name> + <servlet-class>org.cobricks.course.CourseServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>VotingServlet</servlet-name> + <servlet-class>org.cobricks.voting.VotingServlet</servlet-class> + </servlet> + + + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>default</servlet-name> + <url-pattern>*.js</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>CoreServlet</servlet-name> + <url-pattern>/CORE</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>*.html</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>*.html.en</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>*.html.de</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>*.xml</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>*.wml</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>*.wml.*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>*.txt</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>*.ics</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/PORTAL</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>UserServlet</servlet-name> + <url-pattern>/USER</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>ItemServlet</servlet-name> + <url-pattern>/ITEM</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>CategoryServlet</servlet-name> + <url-pattern>/CATEGORY</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>ContextServlet</servlet-name> + <url-pattern>/CONTEXT</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>MessageServlet</servlet-name> + <url-pattern>/MESSAGE</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>CourseServlet</servlet-name> + <url-pattern>/COURSE</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>VotingServlet</servlet-name> + <url-pattern>/VOTING</url-pattern> + </servlet-mapping> + + + <session-config> + <session-timeout>30</session-timeout> <!-- 30 minutes --> + </session-config> + + + <!-- configuration from axis 1.1 web application --> + + <servlet> + <servlet-name>AxisServlet</servlet-name> + <display-name>Apache-Axis Servlet</display-name> + <servlet-class> + org.cobricks.core.ws.AxisServlet + <!-- org.apache.axis.transport.http.AxisServlet --> + </servlet-class> + </servlet> + + <servlet> + <servlet-name>AdminServlet</servlet-name> + <display-name>Axis Admin Servlet</display-name> + <servlet-class> + org.apache.axis.transport.http.AdminServlet + </servlet-class> + <load-on-startup>100</load-on-startup> + </servlet> + + <servlet> + <servlet-name>SOAPMonitorService</servlet-name> + <display-name>SOAPMonitorService</display-name> + <servlet-class> + org.apache.axis.monitor.SOAPMonitorService + </servlet-class> + <init-param> + <param-name>SOAPMonitorPort</param-name> + <param-value>5001</param-value> + </init-param> + <load-on-startup>100</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>AxisServlet</servlet-name> + <url-pattern>/servlet/AxisServlet</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>AxisServlet</servlet-name> + <url-pattern>*.jws</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>AxisServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + + <!-- + <servlet-mapping> + <servlet-name>SOAPMonitorService</servlet-name> + <url-pattern>/SOAPMonitor</url-pattern> + </servlet-mapping> + --> + + <servlet-mapping> + <servlet-name>AdminServlet</servlet-name> + <url-pattern>/servlet/AdminServlet</url-pattern> + </servlet-mapping> + + + <!-- needed for supporting WebDAV access to items and portal pages --> + <!-- make sure that not only the class WebdavServlet is available in + the classpath, but also the Catalina servlet and helper classes - + this can be achieved by copying the contents of the + $CATALINA-HOME/server/libs directory into the libs directory + of the web application --> + <!-- + <servlet> + <servlet-name>webdav</servlet-name> + <servlet-class>org.cobricks.portal.WebdavServlet</servlet-class> + <init-param> + <param-name>debug</param-name> + <param-value>0</param-value> + </init-param> + <init-param> + <param-name>listings</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>readonly</param-name> + <param-value>false</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>webdav</servlet-name> + <url-pattern>/webdav/*</url-pattern> + </servlet-mapping> + --> + + + <!-- currently the W3C havent settled on a media type for WSDL; + http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft + for now we go with the basic 'it's XML' response --> + <mime-mapping> + <extension>wsdl</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <mime-mapping> + <extension>xsd</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.html.en</welcome-file> + <welcome-file>index.html.de</welcome-file> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + + + <filter> + <filter-name>multipartFilter</filter-name> + <filter-class>org.cobricks.portal.MultipartFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>multipartFilter</filter-name> + <url-pattern>/PORTAL</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>multipartFilter</filter-name> + <url-pattern>/USER</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>multipartFilter</filter-name> + <url-pattern>/ITEM</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>multipartFilter</filter-name> + <url-pattern>/CATEGORY</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>multipartFilter</filter-name> + <url-pattern>/CONTEXT</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>multipartFilter</filter-name> + <url-pattern>/MESSAGE</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>multipartFilter</filter-name> + <url-pattern>/COURSE</url-pattern> + </filter-mapping> + + +</web-app> + |
Update of /cvsroot/cobricks/drehscheibe-in/web In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23532 Modified Files: index.html.de logout.html.de notfound.html pagefooter.html pageheader.html.de style.css Added Files: navigation.html.de noacccess.html Removed Files: communities.html.de navigation-main.html.de studiosity.html.de Log Message: Index: pagefooter.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/pagefooter.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pagefooter.html 3 Sep 2004 10:24:41 -0000 1.5 +++ pagefooter.html 29 May 2006 07:37:16 -0000 1.6 @@ -1,5 +1,5 @@ - +</td> </tr> </table> Index: logout.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/logout.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- logout.html.de 3 Sep 2004 10:24:41 -0000 1.3 +++ logout.html.de 29 May 2006 07:37:16 -0000 1.4 @@ -1,10 +1,10 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) -<TD valign=top> - <P>Die Login-Information im Browser sollte jetzt gelscht sein.</P> - <P>Bitte wechseln Sie jetzt zu einer beliebigen Seite oder <A - href="/user/login.html.de">melden Sie sich erneut - an</A>. - </P> -</TD> -#parse ( "pagefooter.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) + +<P>Die Login-Information im Browser sollte jetzt gelöscht sein.</P> + +<P>Bitte wechseln Sie jetzt zu einer beliebigen Seite oder <A + href="/user/login.html.de">melden Sie sich erneut an</A>. +</P> + +$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) --- communities.html.de DELETED --- --- NEW FILE: noacccess.html --- (This appears to be a binary file; contents omitted.) --- navigation-main.html.de DELETED --- Index: pageheader.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/pageheader.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pageheader.html.de 3 Sep 2004 10:24:41 -0000 1.1 +++ pageheader.html.de 29 May 2006 07:37:16 -0000 1.2 @@ -1,18 +1,18 @@ <html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1"> - <title>TU - München</title> - $portalPresenter.printHeader($portalRequest) - <link rel="stylesheet" type="text/css" href="/style.css"> - </head> +<head> +<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1"> +<title>TU - München</title> +$portalPresenter.printHeader($portalRequest) +<link rel="stylesheet" type="text/css" href="$contextPath/style.css"> +</head> - <body bgcolor="#ffffff" topmargin="1" leftmargin="3" marginwidth="3" marginheight="1"> - #set ( $print = "$!print" ) - #if ( $print != "true" ) +<body bgcolor="#ffffff" topmargin="1" leftmargin="3" marginwidth="3" marginheight="1"> +#set ( $print = "$!print" ) +#if ( $print != "true" ) - <TABLE cellSpacing=4 cellPadding=4 width="100%" border=0> - <TBODY> - <TR> +<TABLE cellSpacing=4 cellPadding=4 width="100%" border=0> +<TBODY> +<TR> <TD vAlign=center align=left> <A href="/index.html.de"><IMG height=50 src="/images/abakus50x50.gif" width=50 border=0></A> </TD> @@ -50,9 +50,9 @@ <A href="/communities.html.de">Communities</A> - <A href="/calender.html.de">Kalender</A> - <A href="/doku/index.html.de">Hilfe</A> - - <A href="/PORTAL?cmd=logout"><img src="/images/arrow.png" width="10" height="9" border="0">Logout</a> + <A href="/PORTAL?cmd=logout">Logout</a> - <div style="margin:2px;">$portalPresenter.printLang($portalRequest)</div> + <div style="margin:2px;">$portalPresenter.printLang($portalRequest)</div> #else <TD align=left> <A href="/user/login.html.de"><B>Login</B></A> @@ -84,4 +84,5 @@ </font> <table width ="100%" border=0 cellSpacing=1 cellPadding=15> - +<tr> +$portalPresenter.parse("navigation.html.de",$portalRequest) Index: style.css =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- style.css 3 Sep 2004 10:24:41 -0000 1.3 +++ style.css 29 May 2006 07:37:16 -0000 1.4 @@ -1,242 +1,244 @@ -BODY { - FONT-STYLE: normal; FONT-FAMILY: Arial,Helvetica,Sans-Serif; BACKGROUND-COLOR: #ffffff; TEXT-ALIGN: left -} -P { - FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -B { - FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -TD { - FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -LI { - FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -UL { - FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -:link { - COLOR: #0075ba; FONT-FAMILY: Arial, Helvetica, Sans-Serif; TEXT-DECORATION: none -} -A:visited { - COLOR: #0075ba; FONT-FAMILY: Arial, Helvetica, Sans-Serif; TEXT-DECORATION: none -} -A:active { - COLOR: red; FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -H2 { - COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -H3 { - COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -H4 { - COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -H5 { - COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -H6 { - COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif -} -H1 { - FONT-WEIGHT: bold -} -H1.title { - FONT-WEIGHT: normal; FONT-SIZE: large; COLOR: #808080; FONT-FAMILY: Arial, Helvetica, Sans-Serif; TEXT-DECORATION: none -} -H2 { - FONT-WEIGHT: bold -} -H3 { - FONT-WEIGHT: bold -} -H4 { - FONT-WEIGHT: bold -} -A.name { - COLOR: #0075ba; TEXT-DECORATION: none -} -A.nav { - COLOR: #ffffff; TEXT-DECORATION: none -} -A.nav:active { - COLOR: #ffffff; TEXT-DECORATION: none -} -A.nav:visited { - COLOR: #ffffff; TEXT-DECORATION: none -} -A.sub { - COLOR: #0075ba; TEXT-DECORATION: none -} -A.sub:visited { - COLOR: #0075ba; TEXT-DECORATION: none -} -A.hnav { - COLOR: #0075ba; TEXT-DECORATION: none -} -A.hover { - TEXT-DECORATION: underline -} -A.navtop { - COLOR: #0075ba; TEXT-DECORATION: none -} -A.navsub { - COLOR: #0075ba; TEXT-DECORATION: none -} -A.navsub:visited { - COLOR: #0075ba; TEXT-DECORATION: none -} -DIV.sub { - COLOR: #0075ba; TEXT-DECORATION: none -} -DIV.forsch { - WIDTH: 86%; align: justify -} -DIV.lehre { - WIDTH: 86%; BACKGROUND-COLOR: #dddddd; align: justify -} -UL.circle { - LIST-STYLE-TYPE: circle -} -P.pubTag { - FONT-WEIGHT: bold -} -SPAN.pubTag { - FONT-WEIGHT: bold -} -SPAN.pubThe { - FONT-STYLE: italic -} -.color1 { - COLOR: #ffffff; BACKGROUND-COLOR: #0075ba -} -.color2 { - COLOR: #0075ba; BACKGROUND-COLOR: #dddddd -} -.color3 { - COLOR: #000000; BACKGROUND-COLOR: #dddddd -} -.unav { - FONT-FAMILY: Arial, Helvetica -} -.a { - FONT-FAMILY: Arial, Helvetica -} -.small { - FONT-SIZE: small -} -.small { - FONT-SIZE: small -} -.smala { - FONT-SIZE: small -} -P.verantwortlicher { - MARGIN-TOP: 50px; FONT-SIZE: small; COLOR: #000000 -} -A.extern { - BACKGROUND-POSITION: left 50%; PADDING-LEFT: 20px; BACKGROUND-IMAGE: url(/images/extpfeil.gif); BACKGROUND-REPEAT: no-repeat +BODY { + FONT-STYLE: normal; FONT-FAMILY: Arial,Helvetica,Sans-Serif; BACKGROUND-COLOR: #ffffff; TEXT-ALIGN: left +} +P { + FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +B { + FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +TD { + FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +LI { + FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +UL { + FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +:link { + COLOR: #0075ba; FONT-FAMILY: Arial, Helvetica, Sans-Serif; TEXT-DECORATION: none +} +A:visited { + COLOR: #0075ba; FONT-FAMILY: Arial, Helvetica, Sans-Serif; TEXT-DECORATION: none +} +A:active { + COLOR: red; FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +H2 { + COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +H3 { + COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +H4 { + COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +H5 { + COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +H6 { + COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif +} +H1 { + COLOR: #000000; FONT-FAMILY: Arial, Helvetica, Sans-Serif; + FONT-WEIGHT: bold; FONZ-SIZE: large; +} +H1.title { + FONT-WEIGHT: normal; FONT-SIZE: large; COLOR: #808080; FONT-FAMILY: Arial, Helvetica, Sans-Serif; TEXT-DECORATION: none +} +H2 { + FONT-WEIGHT: bold +} +H3 { + FONT-WEIGHT: bold +} +H4 { + FONT-WEIGHT: bold +} +A.name { + COLOR: #0075ba; TEXT-DECORATION: none +} +A.nav { + COLOR: #ffffff; TEXT-DECORATION: none +} +A.nav:active { + COLOR: #ffffff; TEXT-DECORATION: none +} +A.nav:visited { + COLOR: #ffffff; TEXT-DECORATION: none +} +A.sub { + COLOR: #0075ba; TEXT-DECORATION: none +} +A.sub:visited { + COLOR: #0075ba; TEXT-DECORATION: none +} +A.hnav { + COLOR: #0075ba; TEXT-DECORATION: none +} +A.hover { + TEXT-DECORATION: underline +} +A.navtop { + COLOR: #0075ba; TEXT-DECORATION: none +} +A.navsub { + COLOR: #0075ba; TEXT-DECORATION: none +} +A.navsub:visited { + COLOR: #0075ba; TEXT-DECORATION: none +} +DIV.sub { + COLOR: #0075ba; TEXT-DECORATION: none +} +DIV.forsch { + WIDTH: 86%; align: justify +} +DIV.lehre { + WIDTH: 86%; BACKGROUND-COLOR: #dddddd; align: justify +} +UL.circle { + LIST-STYLE-TYPE: circle +} +P.pubTag { + FONT-WEIGHT: bold +} +SPAN.pubTag { + FONT-WEIGHT: bold +} +SPAN.pubThe { + FONT-STYLE: italic +} +.color1 { + COLOR: #ffffff; BACKGROUND-COLOR: #0075ba +} +.color2 { + COLOR: #0075ba; BACKGROUND-COLOR: #dddddd +} +.color2b { + COLOR: #0075ba; BACKGROUND-COLOR: #ffffff +} +.color3 { + COLOR: #000000; BACKGROUND-COLOR: #dddddd +} +.unav { + FONT-FAMILY: Arial, Helvetica +} +.a { + FONT-FAMILY: Arial, Helvetica +} +.small { + FONT-SIZE: small +} +.small { + FONT-SIZE: small +} +P.verantwortlicher { + MARGIN-TOP: 50px; FONT-SIZE: small; COLOR: #000000 +} +A.extern { + BACKGROUND-POSITION: left 50%; PADDING-LEFT: 20px; BACKGROUND-IMAGE: url(/images/extpfeil.gif); BACKGROUND-REPEAT: no-repeat +} + +/* stuff from mytum ... */ + +div.box { + margin: 0px; + padding-bottom: 8px; +} +div.box .header { + background-color: #366DE0; + padding: 0; + margin: 0; +} +div.box h5 { + background-color: #366DE0; + padding: 2px 8px; + color: white; + font: bold 90% Verdana, Helvetica, Arial, sans-serif; + margin-bottom: 1px; +} +div.box .title { + width: 140px; + background-color: #366DE0; + border-bottom: none !important; + padding: 2px 8px; + color: white; + font: bold 100% Verdana, Helvetica, Arial, sans-serif; + display: block; + margin-bottom: 1px solid white; +} +div.box .title img { + padding: 0; + margin: 0; + float: right; +} +div.box .body { + background-color: #F8F8F8; + padding: 8px; + color: #333333; + font: 80% Verdana, Helvetica, Arial, sans-serif; + border-collapse: collapse; + border: 1px solid #666666; + text-align: left; +} +div.box .body2 { + background-color: #F8F8F8; + padding: 8px; + color: #333333; + font: 80% Verdana, Helvetica, Arial, sans-serif; + border: 1px solid #666666; + text-align: left; +} +div.box .content { + padding: 0.5em 0em 0.5em 0em; +} +div.box .notlast { + border-bottom: 1px dotted #B1C7F3; +} +div.box .last { +} +.boxNavHeadline { +} +.boxNavElement { + xwhite-space: nowrap; + margin: 0.4em 0em; +} +.boxDetails { + text-align: right; + color: #666666; +} + +.cal { + border: 1px solid #8cacbb; + margin: 1em 0em; + font-size: 9px; + font-family: Verdana, Helvetica, Geneva, clean, Swiss, SunSans-Regulars-Regular, sans-serif; + line-height: 10px; +} +.cal a { + font-size: 9px; + line-height: 10px; + text-decoration: none; +} +.cal a:hover { + text-decoration: none; +} +.cal th { + background-color: #dee7ec; + font-weight: bold; + text-align: center; + padding: 2px; +} +.cal td { + background-color: transparent; + width: 1.0em; + text-align: right; + padding: 2px; + font-size: 9px; + line-height: 10px; } -/* stuff from mytum ... */ - -div.box { - margin: 0px; - padding-bottom: 8px; -} -div.box .header { - background-color: #366DE0; - padding: 0; - margin: 0; -} -div.box h5 { - background-color: #366DE0; - padding: 2px 8px; - color: white; - font: bold 90% Verdana, Helvetica, Arial, sans-serif; - margin-bottom: 1px; -} -div.box .title { - width: 140px; - background-color: #366DE0; - border-bottom: none !important; - padding: 2px 8px; - color: white; - font: bold 100% Verdana, Helvetica, Arial, sans-serif; - display: block; - margin-bottom: 1px solid white; -} -div.box .title img { - padding: 0; - margin: 0; - float: right; -} -div.box .body { - background-color: #F8F8F8; - padding: 8px; - color: #333333; - font: 80% Verdana, Helvetica, Arial, sans-serif; - border-collapse: collapse; - border: 1px solid #666666; - text-align: left; -} -div.box .body2 { - background-color: #F8F8F8; - padding: 8px; - color: #333333; - font: 80% Verdana, Helvetica, Arial, sans-serif; - border: 1px solid #666666; - text-align: left; -} -div.box .content { - padding: 0.5em 0em 0.5em 0em; -} -div.box .notlast { - border-bottom: 1px dotted #B1C7F3; -} -div.box .last { -} -.boxNavHeadline { -} -.boxNavElement { - xwhite-space: nowrap; - margin: 0.4em 0em; -} -.boxDetails { - text-align: right; - color: #666666; -} - -.cal { - border: 1px solid #8cacbb; - margin: 1em 0em; - font-size: 9px; - font-family: Verdana, Helvetica, Geneva, clean, Swiss, SunSans-Regulars-Regular, sans-serif; - line-height: 10px; -} -.cal a { - font-size: 9px; - line-height: 10px; - text-decoration: none; -} -.cal a:hover { - text-decoration: none; -} -.cal th { - background-color: #dee7ec; - font-weight: bold; - text-align: center; - padding: 2px; -} -.cal td { - background-color: transparent; - width: 1.0em; - text-align: right; - padding: 2px; - font-size: 9px; - line-height: 10px; -} .cal .weekdays td { background-color: #dee7ec; border: 1px solid #8cacbb; @@ -244,26 +246,27 @@ text-align: center; padding: 2px; } -.cal .event { - background-color: #dee7ec; - font-weight: bold; -} -.cal .todayevent { - background-color: #dee7ec; - border: 1px solid #ffa500; - font-weight: bold; -} -.cal .todaynoevent { - border-collapse: collapse; - border: 1px solid #ffa500; -} -/* Messages (errors, warnings, .infos) generated by the server: */ - -.error { - color: red; - font-weight: bold; -} -.info { - color: green; - font-weight: bold; +.cal .event { + background-color: #dee7ec; + font-weight: bold; +} +.cal .todayevent { + background-color: #dee7ec; + border: 1px solid #ffa500; + font-weight: bold; +} +.cal .todaynoevent { + border-collapse: collapse; + border: 1px solid #ffa500; +} + +/* Messages (errors, warnings, .infos) generated by the server: */ + +.error { + color: red; + font-weight: bold; +} +.info { + color: green; + font-weight: bold; } \ No newline at end of file Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/index.html.de,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- index.html.de 17 Feb 2005 14:38:28 -0000 1.13 +++ index.html.de 29 May 2006 07:37:16 -0000 1.14 @@ -1,77 +1,36 @@ +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) - <div class="info"> -<td valign=top> +<div class="info"> #if ($returnCode == 2010) <div class="info"> Der Benutzer $auserlogin wurde erfolgreich gelöscht. </div> #end -<table width="100%" border="0"> - <tr width="100%"> - <td width="50%"> - <h1 class=title>Willkommen an der Fakultät für Informatik!</h1> - <hr noshade="true" size="1"> - <P><FONT color=#808080 size=+1>STUDIUM</FONT> - <P>Die <A - href="http://www.tum.de/studium/termine/studienjahr0304_de.tuml" - target=_blank>Vorlesungszeit des Sommersemesters 2004</A> beginnt am - Montag, den 19.04.2004 und endet am Freitag, den 23.07.2004. - <P>Auf dieser Website finden Sie unter anderem Informationen über - <UL> - <LI><A href="/studium/vvindex.html.de">alle - Lehrveranstaltungen,</A> - <LI><A href="/schulportal/ziel.html.de">das - Studienziel Informatik und die verschiedenen Studiengänge,</A> - <LI><A - href="/schulportal/bewerbung.html.de">Bewerbung - um einen Studienplatz,</A> - <LI><A - href="/schulportal/foerderung.html.de">Förderprogramme - für Begabte.</A> </LI></UL> - <P> +<table width="100%" border="0"> +<tr width="100%"> +<td width="50%"> +<h1 class=title>Willkommen an der Fakultät für Informatik!</h1> +<hr noshade="true" size="1"> - <P><FONT color=#808080 size=+1>FAKULTÃT</FONT> - <TABLE cellSpacing=0 cellPadding=0 border=0> - <TBODY> - <TR> - <TD><IMG hspace=5 - src="images/garching03.jpg" vspace=5> </TD> - <TD align=left><A - href="/info/garching.html.de">Campus - Garching</A> - <UL> - <LI><A class=sub - href="/info/adresse.html.de">Adresse</A> - <LI><A class=sub - href="/info/anfahrt.html.de">Anfahrt</A> - <LI><A class=sub - href="/info/campus-plan.html.de">Campusplan</A> +<P>Diese Test-Plattform unterstützt momentan nur die +Benutzerverwaltung und das Course Management (Verwaltung von +Lehrveranstaltungen und Modulen). Bei allen Daten handelt es sich nur +um Testdaten, die bei der Migration der Live-Plattform wieder gelöscht +werden.</p> - <LI><A class=sub - href="/info/gebaeude-plan.html.de">Gebäudeplan</A> - </LI></UL> - <UL> - <LI><A href="http://www.studentenwerk.mhn.de/mensa/">Mensa - des Studentenwerks</A> - <LI><A - href="http://wwwrbg.in.tum.de/kontakt/FMI_Bistro/aktuell.html">Cafeteria - im FMI-Bau</A> </LI></UL></TD></TR></TBODY></TABLE> - <P><FONT color="#808080" size=+1>DREHSCHEIBE</FONT> <BR>Der <FONT - color=#808080>WAP-Zugang</FONT> zu einem Teil der Informationen und - Funktionalitäten der Drehscheibe ist jetzt im Beta-Test. Mehr dazu - unter <A href="/doku/wap">/doku/wap</A>! - <P></P> +<ul> +<li><a href="course/">Course Management</a> +<p> +<li><a href="ADMIN/">Plattform-Administration</a> +</ul> </td> - <td width="50%" valign="top"> <table width="100%" border=0> - <tbody> +<tbody> <tr> <td> <table cellSpacing=0 cellPadding=5 width="100%" border=0> @@ -161,15 +120,4 @@ </tr> </table> - - <CENTER> - <FORM action=/servlet/Search mode="post">Suche nach <INPUT name=query> in - <SELECT name=search> <OPTION value=1 selected>Ankündigungen<OPTION - value=2>Lehrveranstaltungen<OPTION value=3>Personen<OPTION - value=4>Räumen<OPTION value=5>Web-Seiten</OPTION></SELECT> <INPUT type=submit value=Suchen name=suche> </FORM> - <P>Student in München? Dann schaut doch mal auf <A - href="/studiosity.html.de">http://www.in.tum.de/studiosity.html</A> - vorbei ... </CENTER></P> - -</td> -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: notfound.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/notfound.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- notfound.html 12 Jan 2005 15:51:57 -0000 1.2 +++ notfound.html 29 May 2006 07:37:16 -0000 1.3 @@ -1,9 +1,8 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) -<td valign=top> +$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) + <h1>404 ... Page not found</h1> -</td> +<p>Die angeforderte Seite konnte leider nicht gefunden werden.</p> -#parse ( "pagefooter.html.de" ) +$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) --- NEW FILE: navigation.html.de --- <TD vAlign=top width=150 bgColor=#e0e0e0 > <BR><A class=hnav href="/index.html.de"><B>HOME</B></A><BR> <A class=sub href="/schulportal/index.html.de">Schulportal</A><BR><BR><A class=hnav href="/studium/index.html.de"><B>STUDIUM</B></A><BR> <A class=sub href="http://www3.in.tum.de/studienberatung/index.html" target=_blank>Studienberatung</A><BR> <A class=sub href="http://wwwsbs.in.tum.de/internationales/" target=_blank>Internationales</A><BR> <A class=sub href="/studium/informatik/index.html.de">Informatik</A><BR> <A class=sub href="/studium/bioinformatik/index.html.de">Bioinformatik</A><BR> <A class=sub href="/studium/wirtschaftsinformatik/index.html.de">Wirtschaftsinformatik</A><BR> <A class=sub href="/studium/angewandt/index.html.de">Angewandte Informatik</A><BR> <A class=sub href="/studium/vvindex.html.de">Vorlesungen</A><BR> <A class=sub href="/studium/skripte.html.de">Skripte</A><BR><BR><A class=hnav href="/forschung/index.html.de"><B>FORSCHUNG</B></A><BR> <A class=sub href="/forschung/uebersicht.html.de">Schwerpunkte</A><BR> <A class=sub href="/forschung/projekte.html.de">Projekte</A><BR> <A class=sub href="/forschung/publikationen.html.de">Publikationen</A><BR> <A class=sub href="/info/stellen.html.de">Stellenangebote</A><BR><BR><A class=hnav href="/fakultaet/index.html.de"><B>FAKULTÄT</B></A><BR> <A class=sub href="/fakultaet/dekanat.html.de">Dekanat</A><BR> <A class=sub href="/fakultaet/lehrstuehle.html.de">Lehrstühle</A><BR> <A class=sub href="/fakultaet/professoren.html.de">Professoren</A><BR> <A class=sub href="/fakultaet/mitarbeiter.html.de">MitarbeiterInnen</A><BR> <A class=sub href="/fakultaet/fest/index.html.de">Festveranstaltungen</A><BR> <A class=sub href="/fakultaet/kolloquien/index.html.de">Kolloquium</A><BR><BR><A class=sub href="/dienste/index.html.de"><B>DIENSTE</B></A><BR> <A class=sub href="http://wwwrbg.in.tum.de/" target=_blank>Rechenbetrieb</A><BR> <A class=sub href="/dienste/bibliotheken.html.de">Bibliotheken</A><BR> <A class=sub href="/dienste/index.html.de">Servicebüros</A><BR><BR><A class=sub href="/info/index.html.de"><B>INFORMATION</B></A><BR> <A class=sub href="/fakultaet/adresse.html.de">Adresse,</A> <A class=sub href="/info/anfahrt.html.de">Anfahrt</A><BR> <A class=sub href="/info/leo.html.de">LEO, </A><A class=sub href="/info/links.html.de">Links</A><BR> <A class=sub href="/info/stellen.html.de">Jobs</A><BR><BR><A class=sub href="/alumni/index.html.de"><B>ALUMNI</B></A><BR> <A class=sub href="/alumni/adressbuch.html.de">Adressbuch</A><BR> <A class=sub href="/servlet/User_Profil?cmd=class">Jahrgangslisten</A><BR> <HR> <BR><A class=hnav href="/about.html.de">Impressum</A><BR><A class=hnav href="mailto:dre...@in...">Feedback</A><BR> #if ($!userLogin != "anonymous") <P><A class=hnav href="/admin/index.html.de">Admin</A><BR> #else #end <IMG src="/images/spacer160.gif" width=150><BR> </TD> <td valign=top> --- studiosity.html.de DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-05-29 07:30:21
|
Update of /cvsroot/cobricks/drehscheibe-in/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20389 Modified Files: login-success.html.de login.html.de register.html.de Log Message: Index: login-success.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login-success.html.de,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- login-success.html.de 8 Oct 2004 12:10:48 -0000 1.6 +++ login-success.html.de 29 May 2006 07:30:17 -0000 1.7 @@ -1,26 +1,26 @@ - #parse ( "pageheader.html.de" ) - #parse ( "navigation-main.html.de" ) -<td valign=top> - - - <H2>Hallo <b>$luserlogin</b>,</H2> - <P>Das Anmelden war erfolgreich.</P> - <P>Als registrierter Benutzer können Sie jetzt folgende Funktionen - ausführen:</P> - <P> - <UL> - <LI><A href="/user/user.html.de">Benutzerprofil - und Interessenseinstellungen editieren</A> - <LI><A - href="/user/user-search.html.de">Adressbuch durchsuchen</A> - <P></P> - <LI><A - href="/servlet/Veranstaltung_Query">Stundenplan - anlegen</A> - <LI><A href="/servlet/Timetable">Stundenplan - einsehen</A> - <LI><A href="/user/calender.html.de">Terminkalender</A> +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) + +<h1>Hallo <b>$luserlogin</b>,</h1> + +<p>Das Anmelden war erfolgreich.</p> + +<p>Als registrierter Benutzer können Sie jetzt folgende Funktionen +ausführen:</P> +<p> +<ul> +<li><a href="/course/">Course Management</a> +<p> +<li><a href="/user/user.html.de">Benutzerprofil + und Interessenseinstellungen editieren</a> +<li><a href="/user/user-search.html.de">Adressbuch durchsuchen</a> +<p></p> + <LI><A + href="/servlet/Veranstaltung_Query">Stundenplan + anlegen</A> + <LI><A href="/servlet/Timetable">Stundenplan + einsehen</A> + <LI><A href="/user/calender.html.de">Terminkalender</A> <P></P> <LI><A href="https://www.in.tum.de/servlet/Item_Pflege?cmd=createitem&typeid=1">Mitteilungen @@ -34,18 +34,6 @@ <LI><A href="/community/create.html.de">Communities anlegen</A> - <P></P> - <LI><A - href="https://www.in.tum.de/servlet/MyDrehscheibe">Personalisierte - Seite</A> </LI></UL> - <P></P></TD> +</ul> - - - - - - - - -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: login.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login.html.de,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- login.html.de 5 Oct 2004 15:36:14 -0000 1.5 +++ login.html.de 29 May 2006 07:30:17 -0000 1.6 @@ -1,7 +1,6 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-alumni.html.de" ) -<td valign=top> +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) + <h1>Login</h1> #if ($returnCode > 2000) @@ -23,8 +22,10 @@ <p class="standard">Bitte geben Sie Ihren Benutzernamen und das für diesen Benutzernamen gewählte Passwort ein um sich -anzumelden. Falls Sie noch keine Kennung auf dieser Plattform -eingerichtet haben, dann können Sie das jetzt in der <a +anzumelden. Sie können dabei sowohl lokale Kennungen nutzen als +auch Ihre mytum-Kennung. Falls Sie noch keine Kennung auf dieser +Plattform oder auf dem mytum-Portal eingerichtet haben, dann +können Sie ersters jetzt in der <a href="/user/register.html.de">Benutzerregistrierung</a> tun.</p> <quote> @@ -42,44 +43,37 @@ </form> </quote> -<P>Falls Sie Ihr Passwort vergessen haben, dann können Sie es ber - folgendes Formular aktualisieren und an Ihre E-Mail-Adresse senden lassen - (falls Sie im Profil eine E-Mail-Adresse angegeben haben). Sollten Sie - keine E-Mail-Adresse angegeben haben oder sollten Sie sowohl Loginnamen - als auch E-Mail-Adresse vergessen haben, dann müssen Sie sich an den - Administrator der Plattform wenden: dre...@in....</P> - <P> - <INPUT TYPE=hidden NAME=cmd VALUE=forgotPassword /> +<p>  -<input type="hidden" name="userclass" value="universityuser" /> +<p>Falls Sie Ihr Passwort vergessen haben, dann können Sie es +über folgendes Formular neu setzen und an Ihre E-Mail-Adresse +senden lassen (falls Sie im Profil eine E-Mail-Adresse angegeben +haben). Sollten Sie keine E-Mail-Adresse angegeben haben oder sollten +Sie sowohl Loginnamen als auch E-Mail-Adresse vergessen haben, dann +müssen Sie sich an den Administrator der Plattform wenden (siehe +Impressum).</p> +<p><INPUT TYPE=hidden NAME=cmd VALUE=forgotPassword /> +<input type="hidden" name="userclass" value="universityuser" /> <input type="hidden" name="cmd.success" value="/user/login.html.de" /> <input type="hidden" name="cmd.error" value="/user/login.html.de" /> - <TABLE BORDER=0> - <tr> - <TD>Loginname*:</TD><TD><input name="auserlogin" size=20 value="$!auserlogin"></td> - </tr> - <tr> - <TD>E-Mail*:</TD><TD><input name="email" size=20 value="$!email"></td> - </tr> - <tr> - <br> - <td colspan = "2" align="left">Mit * gekennzeichnete Felder sind Pflichtfelder.</td> - </tr> - </table> - </p> - #set ($login = "$!auserlogin") - <p><input type=submit value="Neues Passwort anfordern"/></p> - <p> - Nach dem Überprüfen Ihrer Angaben werden Ihnen Ihre Zugangsdaten - für die Cobricks Plattform an die angegebene E-Mail-Adresse geschickt. - </p> +<table border="0"> +<tr><td>Loginname*:</td><td><input name="auserlogin" size=20 value="$!auserlogin"></td></tr> +<tr><td>E-Mail*:</TD><TD><input name="email" size=20 value="$!email"></td></tr> +<tr><td colspan = "2" align="left">Mit * gekennzeichnete Felder sind Pflichtfelder.</td></tr> +</table> +</p> - <input type="hidden" name="email_subject" value="Cobricks Passwort" /> - <input type=hidden name="email_text" value="Hiermit bekommen Sie Ihre Zugangsdaten fuer die Cobricks Plattform. Ihr Benutzername ist " /> - <input type=hidden name="email_text_1" value =". Ihr Passwort lautet " /> +#set ($login = "$!auserlogin") +<p><input type=submit value="Neues Passwort anfordern"/></p> + +<p>Nach dem Überprüfen Ihrer Angaben werden Ihnen Ihre Zugangsdaten +für die Plattform an die angegebene E-Mail-Adresse geschickt.</p> + +<input type="hidden" name="email_subject" value="Cobricks Passwort" /> +<input type=hidden name="email_text" value="Hiermit bekommen Sie Ihre Zugangsdaten fuer die Cobricks Plattform. Ihr Benutzername ist " /> +<input type=hidden name="email_text_1" value =". Ihr Passwort lautet " /> </form> </td> - -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: register.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/register.html.de,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- register.html.de 26 Oct 2004 10:37:22 -0000 1.6 +++ register.html.de 29 May 2006 07:30:17 -0000 1.7 @@ -1,105 +1,150 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) -<td valign=top> -<h1>Registrieren / Daten freigeben</h1> +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) +<h1>Benutzerregistrierung</h1> +#if (($returnCode >= 1000) && ($returnCode <=1020)) + #if ($returnCode == 1000) + <font color="red"> + Loginname ist ein Pflichtfeld! + </font> + #end + #if ($returnCode == 1001) + <div class="error"> + Länge des Loginnamens muss mindestens 6 und + höchstens 20 Symbolen sein. + </div> + #end + #if ($returnCode == 1009) + <p> + <div class="error"> + Der Loginname darf keine Leerzeichen + oder Sonderzeichen (Ausnahme ".", "-" und "_") enthalten. + </div> + </p> + + #end + #if ($returnCode == 1002) + <div class="error"> + Vorname ist ein Pflichtfeld! + </div> + #end + #if ($returnCode == 1003) + <div class="error"> + Vorname muss mindestens 1 und höchstens 20 Symbolen sein. + </div> + #end + #if ($returnCode == 1004) + <div class="error"> + Lastname ist ein Pflichtfeld! + </div> + #end + #if ($returnCode == 1005) + <div class="error"> + Lastname muss mindestens 1 und höchstens 20 Symbolen sein. + </div> + #end + #if ($returnCode == 1006) + <div class="error"> + E-Mail ist ein Pflichtfeld! + </div> + #end + #if ($returnCode == 1007) + <div class="error"> + E-Mail ist nicht gültig + </div> + <br> + <div class="error"> + E-Mail muss mindestens 6 und höchstens 30 Symbolen sein. + </div> + #end + -#if (($returnCode >= 1000) && ($returnCode <=1030)) -<p> -<div class="error">Fehler: -#if ($returnCode == 1000) -Kein Loginname angegeben. -#end -#if ($returnCode == 1001) -Der Loginname muss zwischen 5 und 20 Zeichen lang sein. -#end -#if ($returnCode == 1009) -Der Loginname darf keine Leerzeichen oder Sonderzeichen (ausser ".", "-" und "_") -enthalten. -#end -#if ($returnCode == 1002) -Für die Attribute <i>E-Mail:</i> müssen Werte angegeben werden. -#end -#if ($returnCode == 1003) -Der Wert für das Attribute <i>$aname</i> muss zwischen 1 und 20 Zeichen -lang sein. -#end -#if ($returnCode == 1007) -Die E-Mail-Adresse ist nicht gültig. -#end -#if ($returnCode == 1020) -Der Loginname <i>$auserlogin</i> ist bereits vergeben. -#end -#if ($returnCode == 1030) -Die beiden Angaben für das Passwort sind entweder leer oder nicht -identisch. -#end -</div> -</p> + #if ($returnCode == 1020) + <p><div class="error"> + Benutzer mit login <i>$auserlogin</i> existiert bereits. + </div> + </p> + #end + <br> + Bitte versuchen Sie noch ein mal! #else -#set ( $privat_contact_online_emailbounced = "1" ) -#set ( $mm_oeffentlich_online_email = "true" ) -#set ( $mm_privat_online_email = "false" ) - + <p> + Wenn Sie bereits eine Kennung auf dieser Plattform haben, dann + können Sie sich über das Login-Formular auf der linken Seite + anmelden. + </p> + <p> + Um sich als neuer Benutzer auf dieser Plattform zu registrieren, + wählen Sie im nachfolgenden Formular zuerst einen Benutzernamen und + geben Sie eine gültige E-Mail-Adresse an. Bei einer erfolgreichen + Anmeldung wird Ihr Anfangs-Passwort an die angegebene E-Mail-Adresse + geschickt. + </p> + <p> + Die Länge des <b><font color="black">Loginnames</font></b> + muss zwischen 6 und 20 Symbolen sein. + Der Loginname darf keine Leerzeichen + oder Sonderzeichen (Ausnahme ".", "-" und "_") enthalten. + </p> #end -<H1 class=title>Benutzer registrieren</H1> - <P> - <P>Wenn Sie ein neues Benutzerprofil erzeugen wollen, dann wählen Sie - einen beliebigen Loginnamen (ohne Leerzeichen oder Sonderzeichen). Bitte - beachten Sie, dass Sie dieses Portal auch mit Ihrer Kennung auf dem <A - href="http://portal.mytum.de/">MyTUM-Portal</A> benutzen können - in - diesem Fall brauchen Sie keine neue Kennung einrichten, sondern machen - einfach mit dem <A href="/user/login.html.de">Login</A> - weiter. - <P>Das Passwort wird benutzt, damit Sie sich für Ãnderungen - authentifizieren knnen - Bitte benutzen Sie dafür nicht Ihr aktuelles - Unix- oder Windows-Passwort!</P> -<form action="/USER" method="post" enctype="multipart/form-data"> -<INPUT TYPE="hidden" NAME="cmd" VALUE="registerd" /> -<input type="hidden" name="attrrequ" value="basic_contact-priv_online_email" /> -<input type="hidden" name="attrnames" value="basic_personal_firstname,basic_personal_lastname,basic_contact-priv_online_email" /> -<input type="hidden" name="userclass" value="user" /> -<input type="hidden" name="cmd.success" value="/user/user-register-success.html.de" /> -<input type="hidden" name="cmd.error" value="/user/register.html.de" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> - -<table border="0"> -<tbody> - -<tr><td> -<span>Benutzername:</span> -</td><td> -<input type="text" name="auserlogin" value="$!auserlogin" size="20"> (muss angegegeben werden)<br> +##if () -</td><td> - -</td></tr> +<form action="/USER" method=post> -<tr><td> -<span>E-Mail:</span> -</td><td> -<input type="text" name="basic_contact-priv_online_email" value="$!basic_contact-priv_online_email" size="20"> (muss angegegeben werden)<br> +<p> +<INPUT TYPE=hidden NAME=cmd VALUE=register /> -</td><td> - -</td></tr> +<input type="hidden" name="attrnames" value="basic_university_status,basic_personal_title" /> +<input type="hidden" name="userclass" value="universityuser" /> -<tr><td> -<span>Passwort:</span> -</td><td> -<input type="password" name="passwd" value="$!passwd" size="20"><br> -<input type="password" name="passwd2" value="$!passwd2" size="20"> -<em> (Bestätigung)</em> -</td></tr> +<input type="hidden" name="cmd.success" value="/user/register-success.html" /> +<input type="hidden" name="cmd.error" value="/user/register.html" /> +<TABLE BORDER=0> + <tr> + <TD>Gewünschter Loginname*:</TD><TD><input name="auserlogin" size=20 value="$!auserlogin"></td> + </tr> + <tr> + <TD>Vorname*:</TD><TD><input name="firstname" size=20 value="$!firstname"></td> + </tr> + <tr> + <TD>Nachname*:</TD><TD><input name="lastname" size=20 value="$!lastname"></td> + </tr> + <tr> + <TD>E-Mail*:</TD><TD><input name="email" size=20 value="$!email"></td> + </tr> + <tr> + <TD>Status:</TD><TD> + #set ( $tmpstatus = "$!basic_university_status" ) + #set ($auserclass = "$!userclass") + <select width ="20" name="basic_university_status"> + #foreach( $i in $userManager.getProfileModel("universityuser").getAttribute("basic.university.status").getValues() ) + #if ( $i == $tmpstatus ) + <option value="$i" selected="true">$i + #else + <option value="$i">$i + #end + #end + </select></td> + -<tr><td> -<input type="submit" value="Registrieren"> -</td></tr> -</tbody></table> + </tr> + <tr> + <TD>Title:</TD><TD><input name="basic_title" size=20 value="$!basic_title"></td> + </tr> + + <tr> + <br> + <td colspan = "2" align="left">Mit * gekennzeichnete Felder sind Pflichtfelder.</td> + </tr> +</table> +</p> +#set ($login = "$!auserlogin") +<p><input type=submit value="Registrieren"></p> + <input type="hidden" name="email_subject" value="Cobricks Registrierung" /> + <input type=hidden name="email_text" value=" Sie haben sich bei der Cobricks Plattform registriert. Ihr Benutzername ist " /> + <input type=hidden name="email_text_1" value =". Ihr Passwort lautet " /> </form> -</td> -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-05-29 07:19:41
|
Update of /cvsroot/cobricks/drehscheibe-in/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15553 Added Files: navigation.html.de register-success.html.de search.html.de Log Message: --- NEW FILE: register-success.html.de --- $portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) <h1>User Registration</h1> <p>Thank you for registering <i>$firstname $lastname</i> <br> Your login name is <b>$auserlogin</b>.</p> <p> Your password will be sent to the email address <b>$email</b>. </p> $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) --- NEW FILE: search.html.de --- #parse ( "pageheader.html" ) <h1>Benutzersuche</h1> <form action="search.html" method="get"> <INPUT TYPE="hidden" NAME="cmd" VALUE="search" /> #set ( $tmp = "$!auserlogin$!firstname$!lastname" ) #if ( $tmp != "") #set ($attrsInit = true) Suche nach Benutzern mit Suchkriterien #else #set ($attrsInit = false) Liste aller Benutzer : #end <ul> #if ($auserlogin.length() > 0) <li>Loginname: #if ($compare_func_auserlogin == "2") like '$!auserlogin' #else ist gleich '$!auserlogin' #end </li> #end #if ($firstname.length() > 0) <li>Vorname: #if ($compare_func_firstname == "2") like '$!firstname' #else ist gleich '$!firstname' #end </li> #end #if ($lastname.length() > 0) <li>Nachname: #if ($compare_func_lastname == "2") like '$!lastname' #else ist gleich '$!lastname' #end </li> #end </ul> #set ($localCount = 0) #set ( $login = "$!auserlogin" ) #set ( $fname = "$!firstname" ) #set ( $lname = "$!lastname" ) #set ( $loginCond = "$!compare_func_auserlogin" ) #set ( $fnameCond = "$!compare_func_firstname" ) #set ( $lnameCond = "$!compare_func_lastname" ) #set ( $listNames = ["auserlogin", "basic.personal.firstname", "basic.personal.lastname"]) #set ( $listConditions = [$loginCond, $fnameCond, $lnameCond] ) #set ( $listValues = [$login, $fname, $lname] ) #set ($orFlag = false) #if ("$!SearchLogik" == "or") #set ($orFlag = true) #end #set ($sortBy = "$!sort") #set ($result = $userPresenter.searchUsers($!listNames, $!listConditions, $!listValues, $!orFlag, $!sortBy, -1, "user")) #if (($result)) #if ($attrsInit == true) <p> <div class="info">Die Suche hat $result.size() Ergebnisse gebracht.</div> </p> #end #else <p> <div class="info">Die Suche hat leider keine Ergebnisse gebracht.</div> Versuchen Sie bitte einen oder mehrere Suchkriterien zu ändern. </p> #end <table width="100%"> <tr bgcolor="#dfdfdf"> <td> <b>Benutzer Login</b> </td> <td> <b>Name</b> </td> <td> <b>E-Mail</b> </td> </tr> #set( $number = 0 ) #foreach ($i in $result) #set ($uId = $i.getUserId()) <tr bgcolor = "#dfdfdf"> #set( $number = $number + 1 ) <td> #set ($imageuri = "") #set ($imageuri = $i.getAttribute("basic.personal.imageuri")) #if ("$!imageuri"!="") <img src="$imageuri" width="16"> #end <a href="card.html?auserlogin=$i.getUserLogin()"> $i.getUserLogin()</a> </td> <td> $i.getName() </td> <td> $!i.getAttribute("basic.contact.online.email") </td> </tr> #end #if ($number == 0) <tr><td>Keine Suchergebnisse.</td></tr> #end </table> <p> In die Textfelder unten bitte die Werte der Suchkriterien eingeben. Falls nötig, eine Liste von möglichen Werten durch Kommas getrennt eingeben. Wenn Sie eine Liste von möglichen Werten eingeben, dann kann die dazugehörige Vergleichsfunktion nur "ist gleich" sein. </p> ##<input type="hidden" name="first" value="$!first" /> <table border="0"> <tr> <TD>Loginname:</TD> <TD><input name="auserlogin" size=20 value="$!auserlogin"></td> <td> <select width="15" name="compare_func_auserlogin" > <option value="1">ist gleich <option value="2">like </select> </td> </tr> <tr> <TD>Vorname:</TD><TD><input name="firstname" size=20 value="$!firstname"></td> <td> <select width="15" name="compare_func_firstname" > <option value="1">ist gleich <option value="2">like </select> </td> </tr> <tr> <TD>Nachname:</TD><TD><input name="lastname" size=20 value="$!lastname"></td> <td> <select width="15" name="compare_func_lastname" > <option value="1">ist gleich <option value="2">like </select> </td> </tr> <tr> <td> Sortieren nach: </td> <td> <select width="40" name="sort" > <option value="1">Loginname <option value="2">Nachname <option value="3">Vorname <option value="4">Status <option value="5">E-Mail <option value="6>Title </select> </td> <td width="100"></td> </tr> </table> <TABLE BORDER="0"> <tr> <td> <input type="radio" name="SearchLogik" value="or"> ODER </td> <td> <input type="radio" name="SearchLogik" value="and" checked> UND </td> <td> </td> </tr> </table> <p><input type="submit" value="Suchen"></p> </form> #parse ( "pagefooter.html" ) --- NEW FILE: navigation.html.de --- <TD valign=top width=150 bgColor=#e0e0e0 > <BR><A class=hnav href="/index.html.de"><B>HOME</B></A><BR> <A class=sub href="/schulportal/index.html.de">Schulportal</A><BR><BR><A class=hnav href="/studium/index.html.de"><B>STUDIUM</B></A><BR> <A class=sub href="http://www3.in.tum.de/studienberatung/index.html" target=_blank>Studienberatung</A><BR> <A class=sub href="http://wwwsbs.in.tum.de/internationales/" target=_blank>Internationales</A><BR> <A class=sub href="/studium/informatik/index.html.de">Informatik</A><BR> <A class=sub href="/studium/bioinformatik/index.html.de">Bioinformatik</A><BR> <A class=sub href="/studium/wirtschaftsinformatik/index.html.de">Wirtschaftsinformatik</A><BR> <A class=sub href="/studium/angewandt/index.html.de">Angewandte Informatik</A><BR> <A class=sub href="/studium/vvindex.html.de">Vorlesungen</A><BR> <A class=sub href="/studium/skripte.html.de">Skripte</A><BR><BR><A class=hnav href="/forschung/index.html.de"><B>FORSCHUNG</B></A><BR> <A class=sub href="/forschung/uebersicht.html.de">Schwerpunkte</A><BR> <A class=sub href="/forschung/projekte.html.de">Projekte</A><BR> <A class=sub href="/forschung/publikationen.html.de">Publikationen</A><BR> <A class=sub href="/info/stellen.html.de">Stellenangebote</A><BR><BR><A class=hnav href="/fakultaet/index.html.de"><B>FAKULTÄT</B></A><BR> <A class=sub href="/fakultaet/dekanat.html.de">Dekanat</A><BR> <A class=sub href="/fakultaet/lehrstuehle.html.de">Lehrstühle</A><BR> <A class=sub href="/fakultaet/professoren.html.de">Professoren</A><BR> <A class=sub href="/fakultaet/mitarbeiter.html.de">MitarbeiterInnen</A><BR> <A class=sub href="/fakultaet/fest/index.html.de">Festveranstaltungen</A><BR> <A class=sub href="/fakultaet/kolloquien/index.html.de">Kolloquium</A><BR><BR><A class=sub href="/dienste/index.html.de"><B>DIENSTE</B></A><BR> <A class=sub href="http://wwwrbg.in.tum.de/" target=_blank>Rechenbetrieb</A><BR> <A class=sub href="/dienste/bibliotheken.html.de">Bibliotheken</A><BR> <A class=sub href="/dienste/index.html.de">Servicebüros</A><BR><BR><A class=sub href="/info/index.html.de"><B>INFORMATION</B></A><BR> <A class=sub href="/fakultaet/adresse.html.de">Adresse,</A> <A class=sub href="/info/anfahrt.html.de">Anfahrt</A><BR> <A class=sub href="/info/leo.html.de">LEO, </A><A class=sub href="/info/links.html.de">Links</A><BR> <A class=sub href="/info/stellen.html.de">Jobs</A><BR><BR><A class=sub href="/alumni/index.html.de"><B>ALUMNI</B></A><BR> <A class=sub href="/alumni/adressbuch.html.de">Adressbuch</A><BR> <A class=sub href="/servlet/User_Profil?cmd=class">Jahrgangslisten</A><BR> <HR> <BR><A class=hnav href="/about.html.de">Impressum</A><BR><A class=hnav href="mailto:dre...@in...">Feedback</A><BR> #if ($!userLogin != "anonymous") <P><A class=hnav href="/admin/index.html.de">Admin</A><BR> #else #end <IMG src="/images/spacer160.gif" width=150><BR> </TD> <td valign=top> |
|
From: Michael K. <ko...@us...> - 2006-05-29 07:18:08
|
Update of /cvsroot/cobricks/cobricks2/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14796 Modified Files: index.html register.html.de search.html.de Added Files: login-success.html.de login.html.de navigation.html.de register-success.html.de Log Message: Index: index.html =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/index.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- index.html 27 Aug 2004 06:41:17 -0000 1.10 +++ index.html 29 May 2006 07:18:03 -0000 1.11 @@ -1,7 +1,5 @@ -#parse ( "pageheader.html" ) - -<em><a href="index.html">User Component</a></em> +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) <h1>User Component</h1> @@ -54,5 +52,4 @@ <li><a href="role-create.html">Create User Access Role</a> </ul> - -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) --- NEW FILE: login-success.html.de --- $portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) <h1>Hallo <b>$luserlogin</b>,</h1> <p>Das Anmelden war erfolgreich.</p> <p>Als registrierter Benutzer können Sie jetzt folgende Funktionen ausführen:</P> <p> <ul> <li><a href="/course/">Course Management</a> <p> <li><a href="/user/user.html.de">Benutzerprofil und Interessenseinstellungen editieren</a> <li><a href="/user/user-search.html.de">Adressbuch durchsuchen</a> <p></p> <LI><A href="/servlet/Veranstaltung_Query">Stundenplan anlegen</A> <LI><A href="/servlet/Timetable">Stundenplan einsehen</A> <LI><A href="/user/calender.html.de">Terminkalender</A> <P></P> <LI><A href="https://www.in.tum.de/servlet/Item_Pflege?cmd=createitem&typeid=1">Mitteilungen publizieren</A> <LI><A href="https://www.in.tum.de/servlet/Item_Pflege?cmd=createitem&typeid=2">Terminankündigungen publizieren</A> <P></P> <LI><A href="/community/read.html.de">Communities anzeigen</A> <LI><A href="/community/create.html.de">Communities anlegen</A> </ul> $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) --- NEW FILE: login.html.de --- $portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) <h1>Login</h1> #if ($returnCode > 2000) <div class="error"> #if ($returnCode == 2001) Der Benutzerlogin "$luserlogin" ist nicht definiert. #end #if ($returnCode == 2002) Das angegebene Passwort für den Benutzerlogin "$luserlogin" ist nicht korrekt. #end #if ($returnCode > 2002) Fehler beim Anmelden. #end #if ($returnCode == 1006) E-mail ist ein Pflichtfeld! #end </div> #end <p class="standard">Bitte geben Sie Ihren Benutzernamen und das für diesen Benutzernamen gewählte Passwort ein um sich anzumelden. Sie können dabei sowohl lokale Kennungen nutzen als auch Ihre mytum-Kennung. Falls Sie noch keine Kennung auf dieser Plattform oder auf dem mytum-Portal eingerichtet haben, dann können Sie ersters jetzt in der <a href="/user/register.html.de">Benutzerregistrierung</a> tun.</p> <quote> <form name="loginForm" action="/PORTAL" method="post"> <INPUT TYPE="hidden" NAME="cmd" VALUE="login"> <INPUT TYPE="hidden" NAME="cmd.success" VALUE="/user/login-success.html.de"> <INPUT TYPE="hidden" NAME="cmd.error" VALUE="/user/login.html.de"> <INPUT TYPE="hidden" NAME="redirect" VALUE="$!redirect"> Login<br> <input title="Benutzername" size="20" name="luserlogin" type="text" value="$!luserlogin"><br> Password<br> <input title="Passwort" size="16" name="luserpw" type="password"> <input class="submit" title="Login" value="Anmelden" type="submit"><br> <input type=checkbox name="autologin" value="auto"> Anmeldung (in Session-Cookie) merken </form> </quote> <p>  <p>Falls Sie Ihr Passwort vergessen haben, dann können Sie es über folgendes Formular neu setzen und an Ihre E-Mail-Adresse senden lassen (falls Sie im Profil eine E-Mail-Adresse angegeben haben). Sollten Sie keine E-Mail-Adresse angegeben haben oder sollten Sie sowohl Loginnamen als auch E-Mail-Adresse vergessen haben, dann müssen Sie sich an den Administrator der Plattform wenden (siehe Impressum).</p> <p><INPUT TYPE=hidden NAME=cmd VALUE=forgotPassword /> <input type="hidden" name="userclass" value="universityuser" /> <input type="hidden" name="cmd.success" value="/user/login.html.de" /> <input type="hidden" name="cmd.error" value="/user/login.html.de" /> <table border="0"> <tr><td>Loginname*:</td><td><input name="auserlogin" size=20 value="$!auserlogin"></td></tr> <tr><td>E-Mail*:</TD><TD><input name="email" size=20 value="$!email"></td></tr> <tr><td colspan = "2" align="left">Mit * gekennzeichnete Felder sind Pflichtfelder.</td></tr> </table> </p> #set ($login = "$!auserlogin") <p><input type=submit value="Neues Passwort anfordern"/></p> <p>Nach dem Überprüfen Ihrer Angaben werden Ihnen Ihre Zugangsdaten für die Plattform an die angegebene E-Mail-Adresse geschickt.</p> <input type="hidden" name="email_subject" value="Cobricks Passwort" /> <input type=hidden name="email_text" value="Hiermit bekommen Sie Ihre Zugangsdaten fuer die Cobricks Plattform. Ihr Benutzername ist " /> <input type=hidden name="email_text_1" value =". Ihr Passwort lautet " /> </form> </td> $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) --- NEW FILE: register-success.html.de --- $portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) <h1>User Registration</h1> <p>Thank you for registering <i>$firstname $lastname</i> <br> Your login name is <b>$auserlogin</b>.</p> <p> Your password will be sent to the email address <b>$email</b>. </p> $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: search.html.de =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/search.html.de,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- search.html.de 11 Aug 2004 15:12:28 -0000 1.11 +++ search.html.de 29 May 2006 07:18:03 -0000 1.12 @@ -23,7 +23,7 @@ #else ist gleich '$!auserlogin' #end - </td> + </li> #end #if ($firstname.length() > 0) <li>Vorname: @@ -32,7 +32,7 @@ #else ist gleich '$!firstname' #end - </td> + </li> #end #if ($lastname.length() > 0) <li>Nachname: @@ -41,7 +41,7 @@ #else ist gleich '$!lastname' #end - </td> + </li> #end </ul> @@ -70,13 +70,13 @@ #if (($result)) #if ($attrsInit == true) <p> - hat $result.size() Ergebnisse gebracht + <div class="info">Die Suche hat $result.size() Ergebnisse gebracht.</div> </p> #end #else <p> - <div class="info">Suche hat leider keine Ergebnisse gebracht.</div> + <div class="info">Die Suche hat leider keine Ergebnisse gebracht.</div> Versuchen Sie bitte einen oder mehrere Suchkriterien zu ändern. </p> #end --- NEW FILE: navigation.html.de --- <TD valign=top width=150 bgColor=#e0e0e0 > <BR><A class=hnav href="/index.html.de"><B>HOME</B></A><BR> <A class=sub href="/schulportal/index.html.de">Schulportal</A><BR><BR><A class=hnav href="/studium/index.html.de"><B>STUDIUM</B></A><BR> <A class=sub href="http://www3.in.tum.de/studienberatung/index.html" target=_blank>Studienberatung</A><BR> <A class=sub href="http://wwwsbs.in.tum.de/internationales/" target=_blank>Internationales</A><BR> <A class=sub href="/studium/informatik/index.html.de">Informatik</A><BR> <A class=sub href="/studium/bioinformatik/index.html.de">Bioinformatik</A><BR> <A class=sub href="/studium/wirtschaftsinformatik/index.html.de">Wirtschaftsinformatik</A><BR> <A class=sub href="/studium/angewandt/index.html.de">Angewandte Informatik</A><BR> <A class=sub href="/studium/vvindex.html.de">Vorlesungen</A><BR> <A class=sub href="/studium/skripte.html.de">Skripte</A><BR><BR><A class=hnav href="/forschung/index.html.de"><B>FORSCHUNG</B></A><BR> <A class=sub href="/forschung/uebersicht.html.de">Schwerpunkte</A><BR> <A class=sub href="/forschung/projekte.html.de">Projekte</A><BR> <A class=sub href="/forschung/publikationen.html.de">Publikationen</A><BR> <A class=sub href="/info/stellen.html.de">Stellenangebote</A><BR><BR><A class=hnav href="/fakultaet/index.html.de"><B>FAKULTÄT</B></A><BR> <A class=sub href="/fakultaet/dekanat.html.de">Dekanat</A><BR> <A class=sub href="/fakultaet/lehrstuehle.html.de">Lehrstühle</A><BR> <A class=sub href="/fakultaet/professoren.html.de">Professoren</A><BR> <A class=sub href="/fakultaet/mitarbeiter.html.de">MitarbeiterInnen</A><BR> <A class=sub href="/fakultaet/fest/index.html.de">Festveranstaltungen</A><BR> <A class=sub href="/fakultaet/kolloquien/index.html.de">Kolloquium</A><BR><BR><A class=sub href="/dienste/index.html.de"><B>DIENSTE</B></A><BR> <A class=sub href="http://wwwrbg.in.tum.de/" target=_blank>Rechenbetrieb</A><BR> <A class=sub href="/dienste/bibliotheken.html.de">Bibliotheken</A><BR> <A class=sub href="/dienste/index.html.de">Servicebüros</A><BR><BR><A class=sub href="/info/index.html.de"><B>INFORMATION</B></A><BR> <A class=sub href="/fakultaet/adresse.html.de">Adresse,</A> <A class=sub href="/info/anfahrt.html.de">Anfahrt</A><BR> <A class=sub href="/info/leo.html.de">LEO, </A><A class=sub href="/info/links.html.de">Links</A><BR> <A class=sub href="/info/stellen.html.de">Jobs</A><BR><BR><A class=sub href="/alumni/index.html.de"><B>ALUMNI</B></A><BR> <A class=sub href="/alumni/adressbuch.html.de">Adressbuch</A><BR> <A class=sub href="/servlet/User_Profil?cmd=class">Jahrgangslisten</A><BR> <HR> <BR><A class=hnav href="/about.html.de">Impressum</A><BR><A class=hnav href="mailto:dre...@in...">Feedback</A><BR> #if ($!userLogin != "anonymous") <P><A class=hnav href="/admin/index.html.de">Admin</A><BR> #else #end <IMG src="/images/spacer160.gif" width=150><BR> </TD> <td valign=top> Index: register.html.de =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/register.html.de,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- register.html.de 10 Nov 2004 15:18:53 -0000 1.9 +++ register.html.de 29 May 2006 07:18:03 -0000 1.10 @@ -1,10 +1,8 @@ -#parse ( "pageheader.html" ) - -<em><a href="index.html">User Component</a> -<a href="register.html">Registrierung</a></em> +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) <h1>Benutzerregistrierung</h1> + #if (($returnCode >= 1000) && ($returnCode <=1020)) #if ($returnCode == 1000) <font color="red"> @@ -149,5 +147,4 @@ <input type=hidden name="email_text_1" value =". Ihr Passwort lautet " /> </form> - -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-05-29 07:14:51
|
Update of /cvsroot/cobricks/drehscheibe-in/web/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13562 Added Files: cm.html.en cmcreateres.html.de cmupdateemail.html.de Log Message: --- NEW FILE: cmcreateres.html.de --- $portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) <h1>Modul anlegen/beantragen</h1> #set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) #if ( $auserid == 0 ) $portalPresenter.parse("$!contextPath/pagelogin.html.de",$portalRequest) #else #set ( $auser = $userManager.getUser($auserid)) #set ( $tmps = $userPresenter.checkRole("$auserid", "admin-course") ) #if ( "$!tmps" != "true" ) <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte um Module anzulegen. Wenn Sie die entsprechenden Rechte benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else #set ( $acc = "course" ) #set ( $tmps = $userPresenter.checkRole("$auserid", "admin-module") ) #if ( "$!tmps" == "true" ) #set ( $acc = "module" ) #end #if ("$!acc"=="module") <p>Es wurde ein Modul mit folgenden Daten angelegt und der Prüfungsausschuss per E-Mail darüber informiert:</p> #else <p>Es wurde ein Modul mit folgenden Daten beantragt und der Prüfungsausschuss per E-Mail darüber informiert um das Modul zur Nutzung freizugeben:</p> #end #set( $cm = $coursePresenter.getCourseModule($cmid) ) <table border="0"> <tr> <td>SID</td> <td>$!cmsid</td> </tr> <tr> <td>Name</td> <td>$!cmname</td> </tr> <tr> <td>Name (englisch)</td> <td>$!cmname_en</td> </tr> <tr> <td>Kurzname</td> <td>$!cmshortname</td> </tr> <tr> <td>Typ</td> <td>$!cmtype</td> </tr> <tr> <td>ECTS Credits</td> <td>$!cmectscredits</td> </tr> <tr> <td>Semesterwochenstunden</td> <td>$!cmhours_lec V + $!cmhours_ex Ü + $!cmhours_sem S + $!cmhours_lab P</td> </tr> <tr> <td>Teilnehmerzahl</td> <td>$!cmcapacity</td> </tr> <tr> <td>Inhalt</td> <td>$!cmcontent</td> </tr> <tr> <td>Inhalt (englisch)</td> <td>$!cmcontent_en</td> </tr> <tr> <td>Voraussetzungen</td> <td>$!cmprerequ</td> </tr> <tr> <td>Voraussetzungen (englisch)</td> <td>$!cmprerequ_en</td> </tr> <tr> <td>Schein(voraussetzungen)</td> <td>$!cmcert</td> </tr> <tr> <td>Schein(voraussetzungen) (englisch)</td> <td>$!cmcert_en</td> </tr> <tr> <td>Didaktik</td> <td>$!cmdidactics</td> </tr> <tr> <td>Didaktik (englisch)</td> <td>$!cmdidactics_en</td> </tr> <tr> <td>Modulverantwortlicher</td> <td>$!courseManager.getLecturer($cm.getResponsible()).getName2()</td> </tr> <tr> <td>Kommentar</td> <td>$!cmcomment</td> </tr> </table> #if ("$!acc"=="module") #set ( $tmps = $portalPresenter.sendEmail("ko...@in...","[Drehscheibe] Modul angelegt","cmcreateres.txt",$portalRequest) ) #else #set ( $tmps = $portalPresenter.sendEmail("ko...@in...","[Drehscheibe] Modulantrag","cmcreateres.txt",$portalRequest) ) #end <p><a href="/course/index.html">zurück zur Course Management Übersicht</a></p> #end #end $portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) --- NEW FILE: cm.html.en --- $portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) #if ( "$!cmid" == "" ) #if ( "$!id" != "" ) #set( $cm = $coursePresenter.getCourseModuleBySId($id) ) #end #else #set( $cm = $coursePresenter.getCourseModule($cmid) ) #end <h1>Module $cm.getSId()</h1> #set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) #set ( $auser = $userManager.getUser($auserid)) #set ( $acc = $userPresenter.checkRole("$auserid", "admin-course") ) <a href="cm.html.de?id=$cm.getSId()">Show German version of this module description</a> <p> <table border="1"> <tr> <td valign=top>Title (German)</td> <td>$!cm.getName()</td> </tr> <tr> <td valign=top>Title</td> <td>$!cm.getNameEn()</td> </tr> <tr> <td>Short title</td> <td>$!cm.getShortName()</td> </tr> <tr> <td>Type</td> <td>$cm.getType() </td> </tr> #set ( $tmps = "$cm.getHidden()" ) #if ( $tmps != "0" ) <tr> <td>Visibility</td> <td> #if ( $tmps == "1" ) <font color="red">archived/not visible</font> #elseif ( $tmps == "2" ) <font color="red">not confirmed/not visible</font> #end </td> </tr> #end <tr> <td>Hours per term</td> <td>$coursePresenter.printSWS($cm)</td> </tr> <tr> <td>ECTS Credits</td> <td>$!cm.getEctsCredits()</td> </tr> <tr> <td>Cycle</td> <td>$cm.getCycle()</td> </tr> <tr> <td valign="top">Programs</td> <td> <table border="1"> <tr> <td><em>Program</em></td> <td><em></em></td> <td><em>Comment</em></td> </tr> #set ( $courseTempProgRel = $cm.getProgramRel() ) #set ($j = 0) #foreach ( $cmpr in $courseTempProgRel ) #set ($j = $j + 1) <tr><td> $!cmpr.getProgram().getNameEn() </td><td> $cmpr.getType() </td><td> $!cmpr.getComment() </td> </tr> #end </table> </td> </tr> <tr> <td valign="top">Responsible for module</td> <td>$!courseManager.getLecturer($cm.getResponsible()).getName()</td> </tr> <tr> <td valign="top">Content</td> <td>$!cm.getContent("en")</td> </tr> <tr> <td valign="top">Learning target</td> <td>$!cm.getTarget("en")</td> </tr> <tr> <td valign="top">Prerequisites</td> <td>$coursePresenter.printPrerequ($cm)</td> </tr> <tr> <td valign="top">Certificate</td> <td>$coursePresenter.printCert($cm)</td> </tr> <tr> <td valign="top">Didactics</td> <td>$!cm.getDidactics()</td> </tr> <tr> <td valign="top">Comment</td> <td>$!cm.getComment()</td> </tr> #set ( $tmps = "" ) #set ( $tmps = $cm.getImport() ) #if ( "$!tmps" == "1" ) <tr> <td>Imported</td> <td> <font color="blue">yes</font> </td> </tr> #end #if ( "$!acc" == "true" ) <tr> <td valign="top">additional attributes</td> <td>$!cm.getAttribute("cmaddxml")</td> </tr> #end </table> #if ( "$!acc" == "true" ) <p align="right"> <a href="/course/cmupdate.html?cmid=$cm.getId()">edit module</a> </p> #end <p> <a href="csearch.html?cmid=$cm.getId()">Show lectures for this module</a> $portalPresenter.parse("$contextPath/pagefooter.html.en",$portalRequest) --- NEW FILE: cmupdateemail.html.de --- $portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) <h1>Modul aktualisieren</h1> #set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) #if ( $auserid == 0 ) $portalPresenter.parse("$!contextPath/pagelogin.html.de",$portalRequest) #else #set ( $auser = $userManager.getUser($auserid)) #set ( $tmps = $userPresenter.checkRole("$auserid", "admin-course") ) #if ( "$!tmps" != "true" ) <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte um Module zu aktualisieren. Wenn Sie die entsprechenden Rechte benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else #set( $cm = $coursePresenter.getCourseModule($cmid) ) <p>Folgende Wünsche zur Änderung des Moduls $cm.getName() ($cm.getSId()) wurde per E-Mail an den Prüfungsausschuss weitergeleitet:</p> <pre> $!cmupdate </pre> #set ($tmps = $portalPresenter.sendEmail("$!portal_drehscheibe_courseemail","[Drehscheibe] Moduldatenaenderung gewuenscht","cmupdateres2.txt",$portalRequest)) #end $portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) |
