cobricks-cvscommit — Information about commits to the CVS repository

[Cobricks-cvscommit] cobricks2/src/org/cobricks/user UserManagerImpl.java UserServlet.java userontology.xml

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29495/org/cobricks/user

Modified Files:
	UserManagerImpl.java UserServlet.java userontology.xml 
Log Message:


Index: UserServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserServlet.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- UserServlet.java	12 Sep 2006 12:41:08 -0000	1.43
+++ UserServlet.java	5 Oct 2006 17:57:50 -0000	1.44
@@ -1152,11 +1152,14 @@
 
             if (!userManager.checkUser(userlogin)) {
                 Map attrs = new HashMap();
+                String tmps = prequest.getRequestParameter("userclass");
+                if (tmps == null) tmps = "user";
+                attrs.put("userclass", tmps);
                 attrs.put(User.FIRSTNAME,
                     prequest.getRequestParameter("firstname"));
                 attrs.put(User.LASTNAME,
                     prequest.getRequestParameter("lastname"));
-                attrs.put(User.EMAIL, prequest.getRequestParameter("email"));
+                attrs.put(User.EMAILP, prequest.getRequestParameter("email"));
 
                 logger.info("- create user");
 

Index: userontology.xml
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/userontology.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- userontology.xml	13 Sep 2006 12:51:23 -0000	1.14
+++ userontology.xml	5 Oct 2006 17:57:50 -0000	1.15
@@ -81,6 +81,10 @@
         <description lang="de">Homepage (privat)</description>
         <description lang="en">Homepage (private)</description>
     </attr>
+    <attr name="basic.contact-priv.online.openbc.name" type="string(100)">
+        <description lang="de">OpenBC Name</description>
+        <description lang="en">OpenBC name</description>
+    </attr>
     <attr name="basic.contact-priv.online.messenger.icq" type="string(100)">
         <description lang="de">ICQ ID</description>
         <description lang="en">ICQ ID</description>

Index: UserManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- UserManagerImpl.java	12 Sep 2006 12:41:08 -0000	1.66
+++ UserManagerImpl.java	5 Oct 2006 17:57:50 -0000	1.67
@@ -2077,8 +2077,8 @@
     private List getUserGraphOutgoingFromDatabase(Integer userid) {
         List result = this.dbAccess.sqlQuery("SELECT DISTINCT " + SINKUSERID
                 + " FROM " + TABLE_USER_ATTRUSER + " WHERE " + User.USERID
-                + "=" + userid + " AND " + ANAME + "=\"" + User.BUDDYLIST
-                + "\"");
+                + "=" + userid + " AND " + ANAME + "='" + User.BUDDYLIST
+                + "'");
         List l = new ArrayList(result.size());
         Iterator i = result.iterator();
         while (i.hasNext()) {
@@ -2094,11 +2094,11 @@
      * @param userid
      * @return List of userids (Integer)
      */
-    private List getUserGraphIncomingFromDatabase(Integer userid) {
-
+    private List getUserGraphIncomingFromDatabase(Integer userid)
+    {
         List result = this.dbAccess.sqlQuery("SELECT DISTINCT " + User.USERID
                 + " FROM " + TABLE_USER_ATTRUSER + " WHERE " + SINKUSERID + "="
-                + userid + " AND " + ANAME + "=\"" + User.BUDDYLIST + "\"");
+                + userid + " AND " + ANAME + "='" + User.BUDDYLIST + "'");
         List l = new ArrayList(result.size());
         Iterator i = result.iterator();
         while (i.hasNext()) {
@@ -2558,7 +2558,7 @@
 
         List result = this.dbAccess.sqlQuery("SELECT DISTINCT " + User.USERID
                 + ", " + SINKUSERID + " FROM " + TABLE_USER_ATTRUSER
-                + " WHERE " + ANAME + "=\"" + User.BUDDYLIST + "\"");
+                + " WHERE " + ANAME + "='" + User.BUDDYLIST + "'");
         this.floydWarshallMatrix = new List[allUserIds.length][allUserIds.length];
 
         logger.debug("FloydMarshall: edges=" + result.size());

[Cobricks-cvscommit] cobricks2/src/org/cobricks/course CourseServlet.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29495/org/cobricks/course

Modified Files:
	CourseServlet.java 
Log Message:


Index: CourseServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseServlet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- CourseServlet.java	11 Jul 2006 10:27:03 -0000	1.21
+++ CourseServlet.java	5 Oct 2006 17:57:50 -0000	1.22
@@ -566,68 +566,72 @@
      * @return "error": In case there are errors, also a context object named
      * errors is set (a Set of InputErrors). "success" If everything is o.k.
      */
-   public String performCreateCourseModule(PortalRequest prequest, 
-                                             PrintWriter out) 
-   {
-       logger.info("performCreateCourseModule");
-
-       PortalUser portalUser = prequest.getPortalUser();
-
-       if (!userManager.getAccessControl().
-           checkPermission(portalUser.getUserId(), 
-                           "coursemodule", "create", null)) {
-           prequest.setReturnCode(2000);
-           return "noaccess";
-       }
-
-       Map attrs = getCourseModuleRequestParameters(prequest);
-
-       // check required attributes
-       String tmps = (String)attrs.remove("_requattrs");
-       if (tmps!=null && tmps.length()>0) {
-           StringBuffer errmsg = new StringBuffer("");
-           StringTokenizer st = new StringTokenizer(tmps, ",");
-           while (st.hasMoreTokens()) {
-               String tmps2 = st.nextToken();
-               Object o = attrs.get(tmps2);
-               if (o==null) {
-                   if (errmsg.length()>0) errmsg.append(", ");
-                   errmsg.append(tmps2);
-               }
-               else if (o instanceof String) {
-                   if ((((String)o).length())<1) {
-                       if (errmsg.length()>0) errmsg.append(", ");
-                       errmsg.append(tmps2);
-                   }
-               }
-           }
-           if (errmsg.length()>0) {
-               prequest.setContextObject("errors", errmsg.toString());
-               prequest.setReturnCode(2090);
-               return "error";
-           }
-       }
-       
-       tmps = (String)attrs.remove("cmresponsiblename");
-       if (tmps != null) {
-           int lid = courseManager.getLecturerIdByName(tmps);
-           if (lid > 0)
-               attrs.put("cmresponsible", new Integer(lid));
-       }
-       
-       try {
-           int cid = courseManager.
-               createCourseModule(attrs, portalUser.getUser());
-           prequest.setReturnCode(1011);
-           return "success";
-       } catch (Exception e) {
-           logger.error("Failed creating coursemodule",e);           
-       }
+    public String performCreateCourseModule(PortalRequest prequest, 
+                                            PrintWriter out) 
+    {
+        logger.info("performCreateCourseModule");
+        
+        PortalUser portalUser = prequest.getPortalUser();
+        
+        if (!userManager.getAccessControl().
+            checkPermission(portalUser.getUserId(), 
+                            "coursemodule", "create", null)) {
+            prequest.setReturnCode(2000);
+            return "noaccess";
+        }
+        
+        Map attrs = getCourseModuleRequestParameters(prequest);
+        
+        // check required attributes
+        String tmps = (String)attrs.remove("_requattrs");
+        if (tmps!=null && tmps.length()>0) {
+            StringBuffer errmsg = new StringBuffer("");
+            StringTokenizer st = new StringTokenizer(tmps, ",");
+            while (st.hasMoreTokens()) {
+                String tmps2 = st.nextToken();
+                Object o = attrs.get(tmps2);
+                if (o==null) {
+                    if (errmsg.length()>0) errmsg.append(", ");
+                    errmsg.append(tmps2);
+                }
+                else if (o instanceof String) {
+                    if ((((String)o).length())<1) {
+                        if (errmsg.length()>0) errmsg.append(", ");
+                        errmsg.append(tmps2);
+                    }
+                }
+            }
+            if (errmsg.length()>0) {
+                prequest.setContextObject("requerrors", errmsg.toString());
+                prequest.setReturnCode(2090);
+                return "error";
+            }
+        }
        
-       prequest.setReturnCode(2100);
+        tmps = (String)attrs.remove("cmresponsiblename");
+        if (tmps != null) {
+            int lid = courseManager.getLecturerIdByName(tmps);
+            if (lid > 0) {
+                attrs.put("cmresponsible", new Integer(lid));
+            } else {
+                logger.warn("did not find module responsible: "+tmps);
+                prequest.setContextObject("resperror", tmps);
+            }
+        }
+        
+        try {
+            int cid = courseManager.
+                createCourseModule(attrs, portalUser.getUser());
+            prequest.setReturnCode(1011);
+            return "success";
+        } catch (Exception e) {
+            logger.error("Failed creating coursemodule",e);           
+        }
        
-       return "error";
-   }
+        prequest.setReturnCode(2100);
+        
+        return "error";
+    }
     
 
     /** 
@@ -645,24 +649,30 @@
         
         // check access rights
         PortalUser portalUser = prequest.getPortalUser();
-        /** TODO        
         if (!userManager.getAccessControl().
             checkPermission(portalUser.getUserId(), 
                             "coursemodule", "update", null)) {
             prequest.setReturnCode(2000);
             return "noaccess";
-        } */
+        }
+
         Map attrs = getCourseModuleRequestParameters(prequest);
+
         String tmps = (String)attrs.remove("cmresponsiblename");
         if (tmps != null) {
             int lid = courseManager.getLecturerIdByName(tmps);
-            if (lid > 0)
+            if (lid > 0) {
                 attrs.put("cmresponsible", new Integer(lid));
+            } else {
+                logger.warn("did not find module responsible: "+tmps);
+                prequest.setContextObject("resperror", tmps);
+            }
         }       
         
         try {
             int cmid = Integer.parseInt(prequest.getRequestParameter("cmid"));
-            courseManager.updateCourseModule(cmid, attrs, portalUser.getUser());
+            courseManager.
+                updateCourseModule(cmid, attrs, portalUser.getUser());
             prequest.setReturnCode(1012);
             return "success";
         } catch (Exception e) {

[Cobricks-cvscommit] cobricks2/src/org/cobricks/core/util DateUtil.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29495/org/cobricks/core/util

Modified Files:
	DateUtil.java 
Log Message:


Index: DateUtil.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util/DateUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DateUtil.java	24 May 2006 09:03:13 -0000	1.4
+++ DateUtil.java	5 Oct 2006 17:57:49 -0000	1.5
@@ -108,6 +108,21 @@
             return dateformatter.parse(s);
         } catch (Exception e) {
         }
+        try {
+            String format = "yyyy-MM-dd HH:mm:ss";
+            if (dateFormatter == null) dateFormatter = new Hashtable();
+            DateFormat dateformatter = (DateFormat)dateFormatter.get(format);
+            if (dateformatter == null) {
+                dateformatter = new SimpleDateFormat(format);
+                dateFormatter.put(format, dateformatter);
+                dateformatter.setTimeZone(TimeZone.getTimeZone("ECT"));
+                //dateformatter.setTimeZone(TimeZone.getDefault());
+            }
+            if (s==null || s.length()<1)
+                return new Date();
+            return dateformatter.parse(s);
+        } catch (Exception e) {
+        }
         return null;
     }
     

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalManagerImpl.java PortalPresenter.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27670

Modified Files:
	PortalManagerImpl.java PortalPresenter.java 
Log Message:


Index: PortalPresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPresenter.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- PortalPresenter.java	5 Oct 2006 15:07:45 -0000	1.46
+++ PortalPresenter.java	5 Oct 2006 15:16:39 -0000	1.47
@@ -194,7 +194,6 @@
     public String parse(String filename, PortalRequest portalRequest)
     {
         logger.debug("parse("+filename+")");
-        
         String pageContent =
             portalManager.getPageContent(filename, portalRequest);
         try {
@@ -213,7 +212,6 @@
                         String defaultfilename)
     {
         logger.debug("parse("+filename+")");
-        
         String pageContent =
             portalManager.getPageContent(filename, portalRequest);
         if (pageContent == null || pageContent.length()<1)

Index: PortalManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- PortalManagerImpl.java	5 Oct 2006 15:07:45 -0000	1.89
+++ PortalManagerImpl.java	5 Oct 2006 15:16:39 -0000	1.90
@@ -286,6 +286,9 @@
     /**
      * Get the content of a page referenced directly or indirectly from
      * the current context (use the correct language etc ...)
+     * @input filename The file name can either be given in an absolute
+     *   manner (e.g. "/pageheader.html") or relative to the folder from
+     *   which the current page has been loaded
      */
     public String getPageContent(String filename, PortalRequest portalRequest)
     {
@@ -620,7 +623,6 @@
                 pageName = pagePath.substring(pos+1);
                 pagePath = pagePath.substring(0, pos+1);
             }
-            portalRequest.setPageName(pagePath, pageName);
             page = (PortalPage)getObject(pagePath, pageName);
             pc = page.getStringPageContent(lang);
             if (pc == null) {

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalManagerImpl.java PortalObject.java PortalPage.java PortalPresenter.java PortalRequest.java PortalServlet.java PortalServletAdaptor.java RequestWrapper.java properties.txt

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23822

Modified Files:
	PortalManagerImpl.java PortalObject.java PortalPage.java 
	PortalPresenter.java PortalRequest.java PortalServlet.java 
	PortalServletAdaptor.java RequestWrapper.java properties.txt 
Log Message:


Index: PortalManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- PortalManagerImpl.java	22 Sep 2006 17:28:57 -0000	1.88
+++ PortalManagerImpl.java	5 Oct 2006 15:07:45 -0000	1.89
@@ -487,7 +487,7 @@
         Object content = page.getPageContent(lang);
         if (content == null) {
             if (!pageName.equals("favicon.ico")) {
-                logger.warn("Failed getting content for page "
+                logger.info("Failed getting content for page "
                             +pagePath+pageName
                             +","+lang+" - sending error 404");
             }
@@ -563,69 +563,56 @@
         }
 
         // versionid of the page
-        Integer versionid = null;
-        // language of the page
-        String pageLanguage = null;
-        
-        String itemclass = null;
-        Ontology ontology = null;
-        OntologyClass ontologyClass = null;
-        OntologyClassAttr ontologyAttr = null;
-        
+        int versionid = -1;
         try {
-            itemclass = (String)page.getAttribute("itemclass");
-
-            // check if the content is versioned
-            ontology = itemManager.getOntology();
-            ontologyClass= ontology.getClass(itemclass);
-            ontologyAttr = ontologyClass.getAttribute("content");
-            
-            // get versionid of page
-            versionid = Integer.
-                valueOf(portalRequest.getRequestParameter("versionid"));
-            // get language of the page
-            pageLanguage = (String)portalRequest.getRequestParameter("lang");
+            versionid =
+                Integer.parseInt((String)portalRequest.
+                                 getRequestParameter("versionid"));
         } catch (Exception e) {
-            versionid = null;
+            versionid = -1;
         }
-        
+
         Map pc = null;
+
+        // check if the content is versioned
+        String itemclass = (String)page.getAttribute("itemclass");
+        Ontology ontology = itemManager.getOntology();
+        OntologyClass ontologyClass = ontology.getClass(itemclass);
         if (wikiOntologyClasses.contains(ontologyClass)) {
             pc = new HashMap();
             String content = null;
-            if (versionid != null) {    
+            if (versionid > 0) {    
                 content = itemManager.
-                    getContentVersion(page.getLocalId(), pageLanguage,
-                                      versionid.intValue());
+                    getContentVersion(page.getLocalId(), lang, versionid);
                 if (content == null) {
-                    pageLanguage = defaultLanguage;
+                    lang = defaultLanguage;
                     content = itemManager.
-                        getContentVersion(page.getLocalId(), defaultLanguage,
-                                          versionid.intValue());
+                        getContentVersion(page.getLocalId(), lang, versionid);
                 }
             } else {
                 content = this.
-                    getHighestContentVersion(page.getLocalId(), pageLanguage);
+                    getHighestContentVersion(page.getLocalId(), lang);
                 if (content == null) {
-                    pageLanguage = defaultLanguage;
+                    lang = defaultLanguage;
                     content = this.
-                        getHighestContentVersion(page.getLocalId(),
-                                                 defaultLanguage);
+                        getHighestContentVersion(page.getLocalId(), lang);
                 }
             }
             if (content != null) {
-                // parse the content
+                // parse the wiki content
                 content = Utility.parse(content);
-                pc.put(pageLanguage, content);
+                pc.put(lang, content);
             }
         } else {
             // get page content
             pc = page.getStringPageContent(lang);
         }
-        
+
+        // no content returned (any language version)?
         if (pc == null || pc.size()<1) {
             logger.warn("Failed getting content for page "+pagePath+pageName
                         +","+lang+" - loading "+notFoundPath);
+            portalRequest.setContextObject("notfoundurl", pagePath+pageName);
             pagePath = notFoundPath;
             pageName = "notfound.html";
             int pos = pagePath.indexOf("/");
@@ -633,6 +620,7 @@
                 pageName = pagePath.substring(pos+1);
                 pagePath = pagePath.substring(0, pos+1);
             }
+            portalRequest.setPageName(pagePath, pageName);
             page = (PortalPage)getObject(pagePath, pageName);
             pc = page.getStringPageContent(lang);
             if (pc == null) {
@@ -640,16 +628,19 @@
                 pc.put("en", "Failed loading "+notFoundPath);
             }
         }  else {
-            // check if the page is from the database and set edit-flag
-            String pageLang = (String)pc.keySet().iterator().next();
-            if (page.isFromDatabase(pageLang)) {
-                portalRequest.setContextObject("pitemid", 
-                              Integer.toString(page.getId()));
-            } 
             // update page read statistics
             portalStats.addPageRead(pagePath, pageName);
         }
+
+        // check if the page is from the database and set edit-flag
         String pageLang = (String)pc.keySet().iterator().next();
+        if (pc.get(lang) != null)
+            pageLang = lang;
+        if (page.isFromDatabase(pageLang)) {
+            portalRequest.
+                setContextObject("pitemid", 
+                                 Integer.toString(page.getId()));
+        } 
         String pageContent = (String)pc.get(pageLang);        
         portalRequest.setPageLang(pageLang);
         try {
@@ -967,22 +958,35 @@
     public void deleteFolder(int cid, User user)
         throws CobricksException 
     {
+        PortalFolder pf = getPortalFolder(cid);
+        if (pf == null) return;
+
         // search for page items in this folder
         String xpath_query = "/item[itemclass~'portalobject'] and "
             + "/item[folders/category/id="+cid + "]";
         List pages = itemManager.searchItems(xpath_query);
-        for (int i = 0; i < pages.size(); i++) {
-            PortalObject p = (PortalObject) pages.get(i);
-            // TBD: remove path from page
+        if (pages != null) {
+            for (int i = 0; i < pages.size(); i++) {
+                // remove path from page
+                PortalObject p = (PortalObject)pages.get(i);
+                p.removePagePath((String)pf.getAttribute("path"), this);
+                Map attrs = new HashMap();
+                attrs.put("folders", p.getAttribute("folders"));
+                updateObject(p.getId(), attrs, user);
+            }
         }
-        PortalFolder pf = getPortalFolder(cid);
-        if (pf == null) return;
+        
+        // remove folder from parent folders children
         PortalFolder parentfolder = getPortalFolder(pf.getParentId());
         Set set = parentfolder.getChildrenIds();
         Integer id = new Integer(pf.getId());
         set.remove(id);
         parentfolder.setChildrenIds(set);
+
+        // remove folder from cache
         removePortalFolderFromCache(pf);
+
+        // and finally delete the category object
         categoryManager.deleteCategory(cid, user);
     }
 

Index: PortalServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServlet.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- PortalServlet.java	22 Sep 2006 17:28:57 -0000	1.49
+++ PortalServlet.java	5 Oct 2006 15:07:45 -0000	1.50
@@ -35,6 +35,7 @@
 import org.cobricks.category.CategoryManagerImpl;
 import org.cobricks.core.ComponentDirectory;
 import org.cobricks.core.ComponentManagerInterface;
+import org.cobricks.core.util.DateUtil;
 import org.cobricks.core.util.LogUtil;
 import org.cobricks.user.User;
 import org.cobricks.user.UserHandler;
@@ -78,6 +79,11 @@
         logger.debug("pagePath="+pagePath+", pageName="+pageName
                      +", lang="+lang);
 
+        // set language cookie if needed
+        if (request.getParameter("lang")!=null) {
+            setCookie("lang", request.getParameter("lang"), response);
+        }
+        
         // process uri redirects
         String redirectUri = portalManager.getRedirect(uri);
         if (redirectUri != null) {
@@ -449,12 +455,20 @@
                 FileItem uploadFile = (FileItem)upload;
                 String contentType = uploadFile.getContentType();
                 int size = (int)uploadFile.getSize();
-                byte[] data = uploadFile.get();
-                String uploadcontent = new String(data);
-                if (uploadcontent != null)
-                    attrs.put("content_"+lang[i], uploadcontent);
+                if (size > 0) {
+                    byte[] data = uploadFile.get();
+                    String uploadcontent = new String(data);
+                    if (uploadcontent != null) {
+                        attrs.put("content_"+lang[i], uploadcontent);
+                    }
+                }
             }
         }
+        String tmps2 = prequest.getRequestParameter("expirationtime");
+        if (tmps2!=null && tmps2.length()>0) {
+            Date tmpdate = DateUtil.string2Date(tmps2);
+            attrs.put("expirationtime", tmpdate);
+        }
 
         String fullcontext = prequest.getRequestParameter("fullcontext");
         if (fullcontext != null) {
@@ -467,14 +481,10 @@
                 String addpath = addpaths[i];
                 if (addpath.trim().length()>0) {
                     logger.info("adding path "+addpath);
-                    Set ppaths = (Set)page.getAttribute("folders");
-                    if (ppaths != null) {
-                        PortalFolder pf = portalManager.getPortalFolder(addpath);
-                        ppaths.add(pf);
-                        page.addPagePath(addpath);
-                    }
+                    page.addPagePath(addpath, portalManager);
                 }
             }
+            attrs.put("folders", page.getAttribute("folders"));
         }
         
         String delpaths[] = prequest.getRequestParameterValues("_delpath");
@@ -483,23 +493,15 @@
                 String delpath = delpaths[i];
                 if (delpath.trim().length()>0) {
                     logger.info("removing path "+delpath);
-                    Set ppaths = (Set)page.getAttribute("folders");
-                    if (ppaths != null) {
-                        PortalFolder pf = portalManager.getPortalFolder(delpath);
-                        if (pf != null) {
-                            ppaths.remove(pf);
-                            ppaths.remove(new Integer(pf.getId()));
-                            page.removePagePath(delpath);
-                        }
-                    }
+                    page.removePagePath(delpath, portalManager);
                 }
             }
+            attrs.put("folders", page.getAttribute("folders"));
         }
                 
         try {
             String newContentVersion = prequest.
-            		getRequestParameter("newContentVersion");
-            
+                getRequestParameter("newContentVersion");            
             newContentVersion = (newContentVersion == null) ? "" : 
                 newContentVersion;
             if(newContentVersion.equals("true")) {
@@ -507,6 +509,7 @@
             } else {
                 attrs.put("newContentVersion", "false");
             }
+            
             portalManager.updateObject(itemid, attrs, portalUser.getUser());
 
             String hostname = request.getRemoteHost();
@@ -751,7 +754,22 @@
     
     public String performDeleteFolder(PortalRequest prequest, PrintWriter out)
     {
-        // TBD
+        String[] sarr = prequest.getRequestParameterValues("cid");
+        if (sarr == null) {
+            prequest.setReturnCode(1012);
+            return "success";
+        }
+	
+        for (int i=0; i<sarr.length; i++) {
+            try {
+                int cid = Integer.parseInt(sarr[i]);
+                portalManager.
+                    deleteFolder(cid, prequest.getPortalUser().getUser());
+            } catch (Exception e) { 
+                logger.error(LogUtil.exception("", e));
+            }
+        }
+        
         prequest.setReturnCode(1105);
         return "success";
     }

Index: properties.txt
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/properties.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- properties.txt	31 Jan 2006 19:50:23 -0000	1.11
+++ properties.txt	5 Oct 2006 15:07:45 -0000	1.12
@@ -42,7 +42,7 @@
 
 #
 portal.notfound.path=/notfound.html
-portal.logout.path=/logout.html
+portal.logout.path=/user/logout.html
 
 #
 # Authentication of users can be switched off - that means that
@@ -75,4 +75,4 @@
 portal.linkabbreviations=wikipedia;google
 
 wikipedia=www.wikipedia.de
-google=www.google.de
\ No newline at end of file
+google=www.google.de

Index: PortalPresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPresenter.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- PortalPresenter.java	14 Sep 2006 12:21:26 -0000	1.45
+++ PortalPresenter.java	5 Oct 2006 15:07:45 -0000	1.46
@@ -411,35 +411,98 @@
     /**
      * Print icons for the other possible language versions
      * of this page.
+     *
+     * If the parameter langs is provided, then always the flags
+     * specified there will be printed (minus the flag of the currently
+     * displayed language) - otherwise the flags of the languages
+     * for which pages are defined are displayed.
+     * Format of langs: comma separated 2-letter language codes
      */
     public String printLang(PortalRequest portalRequest) 
     {
+        return printLang(portalRequest, null);
+    }
+    
+    public String printLang(PortalRequest portalRequest, String langs) 
+    {
+        // first prepare url for language links
+        HttpServletRequest request = portalRequest.getHttpServletRequest();
+        String url = request.getRequestURI();
+        String tmps = request.getQueryString();
+        if (tmps != null) {
+            int pos = tmps.indexOf("lang=");
+            if (pos > -1) {
+                if (pos > 0) {
+                    if (tmps.length()>pos+8) {
+                        tmps = tmps.substring(0, pos)
+                            +tmps.substring(pos+8);
+                    } else {                                    
+                        tmps = tmps.substring(0, pos);
+                        if (tmps.substring(pos-1, pos).
+                            equals("&")) {
+                            tmps = tmps.substring(0, pos-1);
+                        }
+                    }
+                } else {
+                    if (tmps.length()>8) {
+                        tmps = tmps.substring(pos+8);
+                    } else {
+                        tmps = "";
+                    }
+                }
+            }
+        }
+        if (url != null) {
+            // remove language selector at end of file name
+            // (if there is one there)
+            int pos = url.lastIndexOf(".");
+            if (pos > -1 && pos == url.length()-3) {
+                url = url.substring(0, url.length()-3);
+            }
+            // add "index.html" if needed
+            if (url.endsWith("/")) {
+                url += "index.html";
+            }
+        }
+        
+        if (tmps!=null && tmps.trim().length()>0)
+            url += ("?"+tmps+"&lang=");
+        else
+            url += ("?lang=");
+        
         StringBuffer sb = new StringBuffer("");
         String lang = portalRequest.getPageLang();
-        PortalObject page = portalManager.
-            getObject(portalRequest.getPagePath(),
-                      portalRequest.getPageName());
-        if (page!=null && (page instanceof PortalPage)) {
-            List languages = ((PortalPage)page).getLanguages();
+        List languages = null;
+
+        if (langs != null) {
+            languages = new ArrayList();
+            StringTokenizer st = new StringTokenizer(langs,", ");
+            while (st.hasMoreTokens()) {
+                languages.add(st.nextToken());
+            }
+        } else {
+            PortalObject page = portalManager.
+                getObject(portalRequest.getPagePath(),
+                          portalRequest.getPageName());
+            if (page!=null && (page instanceof PortalPage)) {
+                languages = ((PortalPage)page).getLanguages();
+            }
+        }
+
+        if (languages != null) {
             ListIterator i = languages.listIterator();
             while (i.hasNext()) {
-                String tmps = (String)i.next();
-                if (!tmps.equals(lang)) {
+                String ilang = (String)i.next();
+                if (!ilang.equals(lang)) {
                     sb.append("<a href=\"");
-                    sb.append(page.getPagePath());
-                    sb.append(page.getPageName());
-                    sb.append("?lang=");
-                    sb.append(tmps);
-                    String tmps2 = portalRequest.getHttpServletRequest().
-                        getQueryString();
-                    if (tmps2 != null)
-                        sb.append("&").append(tmps2);
+                    sb.append(url);
+                    sb.append(ilang); 
                     sb.append("\">");
                     sb.append("<span style=\"margin:2px;\">"
                               +"<img border=0 alt=\"");
                     sb.append(tmps);
                     sb.append("\" src=\"/images/lang-");
-                    sb.append(tmps);
+                    sb.append(ilang);
                     sb.append(".png\"></span>");
                     sb.append("</a>");
                 }
@@ -512,10 +575,18 @@
 
 
     /**
-     *
+     * Print a clickable path of the current page - if "printPageName"
+     * is not null, then the page name will be printed as last
+     * element of the page
      */
     public String printNavigationPath(PortalRequest portalRequest)
     {
+        return printNavigationPath(portalRequest, null);
+    }
+    
+    public String printNavigationPath(PortalRequest portalRequest,
+                                      String printPageName)
+    {
         StringBuffer result = new StringBuffer("");
         
         HttpServletRequest request = portalRequest.getHttpServletRequest();
@@ -550,7 +621,8 @@
                 result.append(tmpname);
                 result.append("</a>");
             }
-            if (pagename!=null && pagename.length()>0 &&
+            if (printPageName!=null &&
+                pagename!=null && pagename.length()>0 &&
                 (!(pagename.equals("index")))) {
                 result.append(" &rarr; ");
                 result.append("<a href=\"");

Index: PortalObject.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PortalObject.java	30 Aug 2006 10:25:57 -0000	1.5
+++ PortalObject.java	5 Oct 2006 15:07:45 -0000	1.6
@@ -143,15 +143,36 @@
         return pagePath;
     }
 
-    public void addPagePath(String pagePath)
+    public void addPagePath(String pagePath, PortalManager portalManager)
     {
+        // add to folders attribute
+        Set folders = (Set)getAttribute("folders");
+        PortalFolder pf =
+            portalManager.getPortalFolder(pagePath);
+        if (folders == null) {
+            folders = new HashSet();
+            setAttribute("folders", folders);
+        }
+        folders.add(new Integer(pf.getId()));
+        
+        // add to internal cache
         this.pagePaths.add(pagePath);
         if (this.pagePath == null)
             this.pagePath = pagePath;
     }
     
-    public void removePagePath(String pagePath)
+    public void removePagePath(String pagePath, PortalManager portalManager)
     {
+        // remove from folders attribute
+        Set folders = (Set)getAttribute("folders");
+        PortalFolder pf =
+            portalManager.getPortalFolder(pagePath);
+        if (folders != null) {
+            folders.remove(pf);
+            folders.remove(new Integer(pf.getId()));
+        }
+        
+        // remove from internal cache
         this.pagePaths.remove(pagePath);
         if (this.pagePath != null) {
             if (this.pagePath.equals(pagePath)) {

Index: PortalPage.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPage.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- PortalPage.java	10 Feb 2006 11:36:15 -0000	1.24
+++ PortalPage.java	5 Oct 2006 15:07:45 -0000	1.25
@@ -168,7 +168,9 @@
     public String getStringPageContentLang(String lang) 
     {
     	Object content = pageContents.get(lang);
-    	if (content != null) { return content.toString(); }
+    	if (content != null) {
+            return content.toString();
+        }
     	return "";
     }
     

Index: RequestWrapper.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/RequestWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- RequestWrapper.java	10 Aug 2005 13:35:34 -0000	1.3
+++ RequestWrapper.java	5 Oct 2006 15:07:45 -0000	1.4
@@ -78,9 +78,15 @@
             if (item.isFormField()) {
                 addValue(item.getFieldName(), item.getString());
             } else {
-                logger.info("Found FileItem: "+item.getFieldName());
-                request.setAttribute(attribPrefix + item.getFieldName() 
-                                     + attribSuffix, item);
+                if (item != null) {
+                    int size = (int)item.getSize();
+                    if (size > 0) {
+                        logger.info("Found FileItem: "+item.getFieldName());
+                        request.setAttribute(attribPrefix
+                                             + item.getFieldName() 
+                                             + attribSuffix, item);
+                    }
+                }
             }
         }
     }

Index: PortalRequest.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- PortalRequest.java	1 Sep 2006 11:32:50 -0000	1.20
+++ PortalRequest.java	5 Oct 2006 15:07:45 -0000	1.21
@@ -36,7 +36,7 @@
     static Logger logger = Logger.getLogger(PortalRequest.class);
 
     // default language for requests (if nothing else is specified)
-    static final public String DEFAULTLANG = "en";
+    static final public String DEFAULTLANG = "de";
 
     HttpServletRequest request = null;
     HttpServletResponse response = null;
@@ -256,13 +256,14 @@
             StringTokenizer st = new StringTokenizer(acceptlang, " ,");
             lang = st.nextToken();
         }
-        String tmps = getCookie(request, "lang");
         String preferedUserLang = portalUser.getUserPreferedLang();
         if (preferedUserLang != "") 
-            tmps= preferedUserLang;  
+            lang = preferedUserLang;  
+        String tmps = getCookie(request, "lang");
         if (tmps != null) lang = tmps;
-        if (request.getParameter("lang")!=null)
+        if (request.getParameter("lang")!=null) {
             lang = request.getParameter("lang");
+        }
         
         pos = pageName.lastIndexOf(".");
         if (pos > -1) {

Index: PortalServletAdaptor.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServletAdaptor.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- PortalServletAdaptor.java	12 Sep 2006 12:40:50 -0000	1.22
+++ PortalServletAdaptor.java	5 Oct 2006 15:07:45 -0000	1.23
@@ -450,6 +450,20 @@
     /**
      *
      */
+    public void setCookie(String aname, String avalue,
+                          HttpServletResponse response) 
+    {
+	logger.debug("Setting cookie "+aname);
+	Cookie cookie = new Cookie(aname, avalue);
+	cookie.setPath("/");
+	cookie.setMaxAge(-1);
+	response.addCookie(cookie);
+    }
+
+
+    /**
+     *
+     */
     public String performWork(PortalRequest portalRequest, PrintWriter out)
 	throws Exception 
     {

[Cobricks-cvscommit] cobricks2/src/org/cobricks/context Context.java ContextManager.java ContextManagerImpl.java ContextServlet.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/context
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9392

Modified Files:
	Context.java ContextManager.java ContextManagerImpl.java 
	ContextServlet.java 
Log Message:


Index: ContextServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ContextServlet.java	23 Jan 2006 16:06:33 -0000	1.3
+++ ContextServlet.java	5 Oct 2006 14:35:21 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 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
@@ -95,23 +95,23 @@
         }
         Map attrs = new HashMap();
         tmps = prequest.getRequestParameter("aname1");
-        if (tmps==null || tmps.trim().length()<1) {
+        if (tmps!=null && tmps.trim().length()>0) {
             attrs.put(tmps, prequest.getRequestParameter("avalue1"));
         }
         tmps = prequest.getRequestParameter("aname2");
-        if (tmps==null || tmps.trim().length()<1) {
+        if (tmps!=null && tmps.trim().length()>0) {
             attrs.put(tmps, prequest.getRequestParameter("avalue2"));
         }
         tmps = prequest.getRequestParameter("aname3");
-        if (tmps==null || tmps.trim().length()<1) {
+        if (tmps!=null && tmps.trim().length()>0) {
             attrs.put(tmps, prequest.getRequestParameter("avalue3"));
         }
         tmps = prequest.getRequestParameter("aname4");
-        if (tmps==null || tmps.trim().length()<1) {
+        if (tmps!=null && tmps.trim().length()>0) {
             attrs.put(tmps, prequest.getRequestParameter("avalue4"));
         }
         tmps = prequest.getRequestParameter("aname5");
-        if (tmps==null || tmps.trim().length()<1) {
+        if (tmps!=null && tmps.trim().length()>0) {
             attrs.put(tmps, prequest.getRequestParameter("avalue5"));
         }
 

Index: ContextManager.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ContextManager.java	23 Jan 2006 16:06:33 -0000	1.3
+++ ContextManager.java	5 Oct 2006 14:35:21 -0000	1.4
@@ -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
@@ -43,6 +43,10 @@
 	throws Exception;
     public void setContextDestinationIds(int cid, Set destinationids) 
 	throws Exception;
+    public void updateContext(Context c, User updater)
+	throws Exception;
+    public void deleteContext(int cid)
+	throws Exception;
     public void deleteContext(int cid, int userid)
 	throws Exception;
 

Index: Context.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/Context.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Context.java	10 Aug 2005 13:35:33 -0000	1.2
+++ Context.java	5 Oct 2006 14:35:21 -0000	1.3
@@ -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

Index: ContextManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextManagerImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ContextManagerImpl.java	30 May 2006 14:32:00 -0000	1.6
+++ ContextManagerImpl.java	5 Oct 2006 14:35:21 -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
@@ -79,7 +79,8 @@
     public void init(String componentId, String managerId, 
 		     Properties properties, 
 		     CoreManager coreManager, DBAccess dbAccess)
-	throws Exception {
+	throws Exception
+    {
 	super.init(componentId, managerId, properties, coreManager, dbAccess);
 	
 	// load the context ontology
@@ -242,6 +243,7 @@
 			     User creator) 
 	throws Exception
     {
+        logger.error("createContext: "+cattrs.toString());
 	OntologyClass oc = ontology.getClass(classname);
 	if (oc == null)
 	    return 0; // tbd: exception?
@@ -260,6 +262,9 @@
 	attrs.put("destinationtype", new Integer(destinationtype));
 	attrs.put("creatorid", new Integer(creator.getUserId()));
 	attrs.put("creationtime", new Date());
+        Integer cidtmp = (Integer)cattrs.get("cid");
+        if (cidtmp!=null)
+            attrs.put("cid", cidtmp);
 	int cid = dbAccess.sqlInsert("context", attrs);
 
 	// store new context in cache
@@ -290,6 +295,7 @@
 	    Iterator i = cattrs.keySet().iterator();
 	    while (i.hasNext()) {
 		String aname = (String)i.next();
+                logger.error("createContext: "+aname+","+cattrs.get(aname));
 		Map attrs2 = new HashMap();
 		attrs2.put("cid", new Integer(cid));
 		attrs2.put("aname", aname);
@@ -337,16 +343,32 @@
     /**
      *
      */
-    public void deleteContext(int cid) 
+    public void updateContext(Context c, User updater)
 	throws Exception
     {
+        int cid = c.getId();
+        // TBD: do a real update - currently we just delete
+        //    the context and recreate it with the same cid
         deleteContext(cid, -1);
+        Map attrs = c.getAttributes();
+        String classname = c.getContextClass();
+        int sourceid = c.getSourceId();
+        int cidtmp = createContext(classname, sourceid, attrs, null);
     }
 
     
     /**
      *
      */
+    public void deleteContext(int cid) 
+	throws Exception
+    {
+        deleteContext(cid, -1);
+    }
+    
+    /**
+     *
+     */
     public void deleteContext(int cid, int userid) 
 	throws Exception
     {

[Cobricks-cvscommit] drehscheibe-in/src/de/tum/cobricks/user LdapUserHandlerMyTUM.java

[Wolfgang W. <wo...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/user
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32061

Added Files:
	LdapUserHandlerMyTUM.java 
Log Message:


--- NEW FILE: LdapUserHandlerMyTUM.java ---
/*
 * Copyright (c) 2004 Cobricks Group. All rights reserved.
 *
 * This file is part of a free software package; you can redistribute
 * it and/or modify it under the terms of the Cobricks Software Licence;
 * either version 1.0 of the License, or (at your option) any later
 * version (see www.cobricks.org).
 *
 * The above copyright notice and this permission notice shall be
 * included in all copies or substantial portions of the Software.
 */

package de.tum.cobricks.user;

import java.util.*;
import javax.naming.*;
import javax.naming.directory.*;

import org.apache.log4j.Logger;

import org.cobricks.core.CoreManager;
import org.cobricks.core.util.LogUtil;
import org.cobricks.user.*;


/**
 * Basic functionality for a user handler that uses the 
 * Integratum/MyTUM authentication server.
 *
 * init() instantiates a DirContext object (with global security 
 * credentials - properties "*.ldap.security.principal" and 
 * "*.ldap.security.credentials") for searches
 *
 * handleUnknownUser() create a new user object and sets the 
 * attribute "user.EMAIL" (e.g. wo...@my...)
 *
 * handleCheckCredentials() authenticates a user object with the
 * Integratum/MyTUM auth. server. Since we only have "compare"
 * rights, the user handler cannot retrieve user attributes other
 * than the CN.
 * This method also checks whether the user's authOrganisationseinheit
 * contains "Informatik" and her authRolle is "tumMitarbeiter".
 * Of this is the case, the role mitarbeiter is set.
 * This test is done at every (successful) login.
 *
 * Properties for configuring this user handler:
 * user.domain.mytum.de.ldap.providerurl=ldap://auth.tum.de
 * user.domain.mytum.de.ldap.security.principal=cn=Inf-Dreh-DN1,ou=bindDNs,ou=auth,ou=integratum,dc=tum,dc=de
 * user.domain.mytum.de.ldap.security.credentials=<password>
 * user.domain.mytum.de.ldap.rootdn=ou=users,ou=data,ou=prod,ou=auth,ou=integratum,dc=tum,dc=de 
 *
 * @author   mic...@ac..., wo...@in...
 * @version  $Date: 2006/10/04 10:56:27 $
 */

public class LdapUserHandlerMyTUM
    implements UserHandler
{

    static Logger logger = Logger.getLogger(LdapUserHandler.class);

    protected CoreManager coreManager;
    protected UserManager userManager;
    
    protected String domain;

    protected Hashtable env;
    protected DirContext dirContext;
    
    protected String myCN ="";


    /**
     *
     */
    public void init(String domain, CoreManager coreManager)
        throws Exception
    {
        logger.info("initializing LdapUserHandlerMyTUM");
        this.domain = domain;

        this.coreManager = coreManager;
        this.userManager = (UserManager)
            coreManager.getComponentDirectory().getManager("userManager");
        
        env = System.getProperties();
        env.put(Context.INITIAL_CONTEXT_FACTORY,
                "com.sun.jndi.ldap.LdapCtxFactory");
        String providerurl =
            coreManager.getProperty("user.domain."+domain+".ldap.providerurl");
        if (providerurl == null) {
            logger.error("no provider url for LdapUserHandler for domain "
                         +domain);
            return;
        }
        env.put(Context.PROVIDER_URL, providerurl);

        /* specify authentication information */
        env.put(Context.SECURITY_AUTHENTICATION, "simple");
        String securityprincipal =
            coreManager.getProperty("user.domain."+domain
                                    +".ldap.security.principal");
        String securitycredentials =
            coreManager.getProperty("user.domain."+domain
                                    +".ldap.security.credentials");
        env.put(Context.SECURITY_PRINCIPAL, securityprincipal);
        env.put(Context.SECURITY_CREDENTIALS, securitycredentials);
        env.put(Context.SECURITY_PROTOCOL, "ssl");
        
        try {
            // specify the timeout to be 5 seconds
            env.put("com.sun.jndi.ldap.connect.timeout", "5000");
            dirContext = new InitialDirContext(env);
        } catch (Exception e) {
            logger.error(LogUtil.
                         ex("Failed initializing directory context.", e));
            throw e;
        }

        logger.debug("finished initializing LdapUserHandlerMyTUM");
    }

    /**
     *
     */
    public User handleUnknownUser(String userlogin, Object credentials)
    {
        logger.debug("begin handleUnknownUser");
        logger.debug("userlogin = "+userlogin);

        // At this time, no user attributes can be loaded from MyTUM server
        // Therefore, set only MyTUM Email address and create new user instance
        try
        {
           // Do not create user object if credentials are wrong
           if (! checkCredentials (userlogin, credentials.toString()))
           {
              logger.debug("No user object created, wrong credentials");
              return null;
           }
           
           Map attr = new HashMap();
           attr.put(User.EMAIL, userlogin);
           logger.debug("New user with user.EMAIL = "+userlogin);
           User user = userManager.createUser(userlogin, attr);
           user.setCredentials(userManager, credentials);
               
           return user;
        }
        catch (Exception e)
        {
           logger.error(LogUtil.ex("Failed in getUserAttrs("+userlogin+")", e));
        }
        return null;
    }


    /**
     * Load attributes from LDAP directory
     */
     
    // Does not work with MyTUM server, no rights to load attributes
    protected Map getUserAttrs(String userlogin)
    {
       Map result = new HashMap();
       return result;
    }

    
    /**
     *
     */
    public void handleGetUser(User user)
    {
    }


    /**
     *
     */
    public boolean handleCheckCredentials(User user, Object credentials) 
    {
        logger.debug("begin handleCheckCredentials");
        String userlogin = user.getUserLogin();
        
        logger.debug("userlogin =" + userlogin);
        
        if (! checkCredentials (userlogin, credentials.toString()))
           return false;
        
        // User is authenticated, check status (Mitarbeiter Informatik or not)
        // by invoking search method once again
        int userid = user.getUserId();
        
        // Delete Mitarbeiter role first
        AccessControl ac = userManager.getAccessControl();
        AccessRole ar = ac.getAccessRoleByName("mitarbeiter");
        int roleid = ar.getId();
        ac.removeUser(roleid, userid);
        logger.debug("Mitarbeiter role deleted");
        
        // Now search user
        String userbase = coreManager.getProperty("user.domain."+domain
                                    +".ldap.rootdn");
                                    
    	String filter ="(&(&(authlogin=" + userlogin + ")";
    	filter += "(&(authOrganisationseinheit=*Informatik*)(authRolle=tumMitarbeiter*))))";
    	logger.debug("filter = "+filter);
    	String cn="";
    	String[] returnAttribut = {"cn"};
    	    
    	//  Set up the search controls
    	SearchControls ctls = new SearchControls();
    	ctls.setReturningAttributes(returnAttribut);       // Return attrs
    	ctls.setSearchScope(SearchControls.SUBTREE_SCOPE); // 
    	       
    	// Invoke search method to retrieve CN
    	try
    	{
    	    NamingEnumeration answer = dirContext.search(userbase, filter, ctls);    
    	          	      
    	    while ( answer.hasMore())
    	    {
    	       SearchResult sr = (SearchResult)answer.next();    	           
    	       cn = sr.getName();
    	       
    	       logger.debug("cn =" + cn);
    	       
    	       // CN found -> Mitarbeiter
    	       if (cn.equals(myCN))
    	       {
                  // Set Mitarbeiter role
                  ac.addUser(roleid, userid, false);
                  logger.debug("Mitarbeiter role (re-)set");
    	       }
            }
            
            // CN not found with search filter => no Mitarbeiter
        }
        catch (Exception e) { logger.debug("Exception while searching DirContext"); }
        
        return true;
    }
    
    private boolean checkCredentials (String userlogin, String credentials)
    {
        // check authentication
        try
        {
           String userbase = coreManager.getProperty("user.domain."+domain
                                    +".ldap.rootdn");
                                    
    	   String filter ="(authlogin="+userlogin+")";    	           	       
    	   String[] returnAttribut = {"cn"};
    	    
    	   //  Set up the search controls
    	   SearchControls ctls = new SearchControls();
    	   ctls.setReturningAttributes(returnAttribut);       // Return attrs
    	   ctls.setSearchScope(SearchControls.SUBTREE_SCOPE); // 
    	       
    	   // Invoke search method to retrieve CN (needed for authentication)
    	   try
    	   {
    	       NamingEnumeration answer = dirContext.search(userbase, filter, ctls);    
    	           	      
    	       while ( answer.hasMore())
    	       {
    	    	   SearchResult sr = (SearchResult)answer.next();    	           
    	           myCN = sr.getName();
    	           logger.debug("CN= " + myCN);
               }
           }
           catch (Exception e) {}

           // New context to authenticate user
    	   try
    	   {
    	      Hashtable env = new Hashtable();
    	      
              env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
              
              String providerurl = coreManager.getProperty("user.domain."+domain+".ldap.providerurl");
              env.put(Context.PROVIDER_URL, providerurl);
              
              String bindDnUser=myCN+","+userbase;
	      env.put(Context.SECURITY_PRINCIPAL,bindDnUser);
	      
	      env.put(Context.SECURITY_CREDENTIALS, credentials);
	      env.put(Context.SECURITY_AUTHENTICATION, "simple");
	      env.put(Context.SECURITY_PROTOCOL, "ssl");              
              
              DirContext ctxUser = new InitialDirContext(env);
   	   }
    	   catch (AuthenticationException au)
    	   {
    	      logger.debug("Userauthentication failed "+au.getMessage());    	    	   
    	      return false;
    	   }
    	}
        catch (Exception u)
        {
          logger.debug("Userauthentication failed "+u.getMessage());    	    	   
          return false;
        }
        
        return true;
    }
}

[Cobricks-cvscommit] drehscheibe-in/src/de/tum/cobricks/user - New directory

[Wolfgang W. <wo...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/user
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21587/user

Log Message:
Directory /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/user added to the repository

[Cobricks-cvscommit] drehscheibe-in/web/portal edit.html.de

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/web/portal
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv386

Modified Files:
	edit.html.de 
Log Message:


Index: edit.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/portal/edit.html.de,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- edit.html.de	22 Sep 2006 17:45:04 -0000	1.1
+++ edit.html.de	2 Oct 2006 10:27:03 -0000	1.2
@@ -1,38 +1,38 @@
 
-#parse ( "/pageheader.html" )
+$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest)
 
-<h1>Edit Portal Page</h1>
+<h1>Portalseite editieren</h1>
 
 #if ( $returnCode == 1103 )
-<p><div class="success">Successfully updated portal page.</div></p>
+<p><div class="success">Portalseite erfolgreich aktualisiert.</div></p>
 #elseif ( $returnCode == 1101 )
-<p><div class="success">Successfully created portal page.</div></p>
+<p><div class="success">Portalseite erfolgreich angelegt..</div></p>
 #elseif ( $returnCode > 1999 )
-<p><div class="error">Failed updating portal page.
+<p><div class="error">Fehler beim Aktualisieren einer Portalseite.
 #if ($errors)
-<div class="error">The following error(s) ocurred:
+<div class="error">Folgende Fehler sind aufgetreten:
 <ul>#foreach($error in $errors)
 <li>$corePresenter.printErrorMessage($error, "$!lang")</li>
 #end</ul></div><br/>
 #end
 #end
-#if ("$!_submit" == "Reset Page Update History")
+#if ("$!_submit" == "Seitenhistorie zurücksetzen")
 $portalManager.resetPageUpdateHistory($corePresenter.parseInt($itemid))
-<p><div class="success">Reset Page Update History.</div></p>
+<p><div class="success">Seitenhistorie zurückgesetzt.</div></p>
 #end
 
 #set ($acc = $userPresenter.checkPermission("$userId", "page", "update", "itemid=$itemid"))
 #if ($acc == "false")
 
 <div class="error">
-You do not have permission to edit web pages on this site.
+Sie haben nicht ausreichend Rechte um Webseiten auf diesem Portal zu editieren.
 </div>
 
 #else
 
 #set ( $page = $portalPresenter.getPage($itemid) )
 
-<form action="$contextPath/PORTAL" method="post">
+<form action="$contextPath/PORTAL" method="post" enctype="multipart/form-data">
 <input type="hidden" name="cmd" value="update">
 <input type="hidden" name="cmd.success" value="/portal/edit.html">
 <input type="hidden" name="cmd.error" value="/portal/edit.html">
@@ -54,36 +54,36 @@
 </td></tr>
 #if ("$!_submit" == "Add Language")
 #set ( $lg = ${_addlang} )
-#set ( $title = $page.getTitle("$lg") )
+#set ( $title = $page.getAttribute("title_$lg") )
 #set ( $content = $page.getPageContent("$lg") )
 
 <input type="hidden" name="plang" value="$lg">
 <tr><td>
 <table border="1" bgcolor="#eeeeee"><tr><td>
-Title ($lg): <input type="text" name="title_$lg" size="60" value="$!title"><br/>
-Content ($lg):<br>
+Titel ($lg): <input type="text" name="title_$lg" size="60" value="$!title"><br/>
+Inhalt ($lg):<br>
 <textarea name="content_$lg" rows="15" cols="70" wrap="off">
 $!content
 </textarea><br>
-Upload content from file: <input type="file" name="_file$lg"><br/>
+Inhalt aus Datei laden: <input type="file" name="_file$lg"><br/>
 </td></tr></table>
 </td></tr>
 #end
 #set ( $langs = $page.getUsedLanguages() )
 #foreach( $lg in $langs )
 #set ( $title = $page.getAttribute("title_$lg") )
-<!-- #set ( $content = $page.getAttribute("content_$lg") ) -->
-#set ( $content = $itemManager.getContentVersion($itemid, $lg, $versionid) )
+#set ( $title = $page.getTitle("$lg") )
+#set ( $content = $itemPresenter.getContentVersion("$!itemid", $lg, "$!versionid") )
 
 <input type="hidden" name="plang" value="$lg">
 <tr><td>
 <table border="1" bgcolor="#eeeeee"><tr><td>
-Title ($lg): <input type="text" name="title_$lg" size="45" value="$!title"><br/>
-Content ($lg):<br>
+Titel ($lg): <input type="text" name="title_$lg" size="45" value="$!title"><br/>
+Inhalt ($lg):<br>
 <textarea name="content_$lg" rows="15" cols="70">
 $!content
 </textarea><br>
-Upload content from file: <input type="file" name="_file$lg"><br/>
+Inhalt von Datei laden: <input type="file" name="_file$lg"><br/>
 </td></tr></table>
 </td></tr>
 #end
@@ -92,19 +92,19 @@
 <p>
 #if ("wikipage" == $page.getAttribute("ontologyclassname"))
 <p>
-<a href="wikihelp.html" target="_blank">Help for Wiki</a>
+<a href="/portal/wikihelp.html" target="_blank">Hilfe zur Wiki-Sprache</a>
 </p>
 #if ($userId == $page.getAttributeAsString("creator"))
-<input type="checkbox" name="newContentVersion" checked="true" value="true"> Should a new content version be created?
+<input type="checkbox" name="newContentVersion" checked="true" value="true"> Eine neue Version des Inhalts anlegen?
 #else
-<input type="hidden" name="newContentVersion" value="true"> It will be created a new content version
+<input type="hidden" name="newContentVersion" value="true"> Eine neue Version des Inhalts wird angelegt.
 #end
 #end
 </p>
 
-<p><input type="submit" name="_submit" value="Update Page"></p>
+<p><input type="submit" name="_submit" value="Seite aktualisieren"></p>
 
-<p><input type="submit" name="_submit" value="Add Language">
+<p><input type="submit" name="_submit" value="Sprachversion hinzufügen">
 <select name="_addlang"><option value=""></option>
 $portalPresenter.printLanguageOptions($langs)</select>
 </p>
@@ -114,7 +114,7 @@
 <table>
 <tr><td>
 
-<b>Access Restrictions:</b>
+<b>Zugriffsbeschränkungen:</b>
 
 none
 
@@ -123,13 +123,14 @@
 </td></tr>
 <tr><td>
 
-<p>Created<br>$page.getAttributeAsString("creationtime")<br>
-by $userPresenter.getUserLogin($page.getAttribute("creator"))</p>
-<p>Last Modified<br>$page.getAttributeAsString("updatetime")<br>
-by $userPresenter.getUserLogin($page.getAttribute("updater"))</p>
+<p>Angelegt am<br>$page.getAttributeAsString("creationtime")<br>
+von $userPresenter.getUserLogin($page.getAttribute("creator"))</p>
+<p>Letzte Änderung am<br>$page.getAttributeAsString("updatetime")<br>
+von $userPresenter.getUserLogin($page.getAttribute("updater"))</p>
 
-<p>Expires:<br/>
-<input type="text" name="expires" value="$page.getAttributeAsString("expirationtime")" size="18"/></p>
+<p>Verfallsdatum:<br/>
+<input type="text" name="expirationtime" value="$page.getAttributeAsString("expirationtime")" size="18"/><br>
+<font size="-1">(dd.mm.yyyy hh:mm)</font></p>
 
 </td></tr>
 </table>
@@ -140,17 +141,17 @@
 </form>
 </p>
 <p>
-<h3>Page Update History</h3>
+<h3>Änderungshistorie</h3>
 <ul>
 #foreach ( $i in $portalManager.getPageUpdateHistory($corePresenter.parseInt($itemid)) )
-<li>$portalPresenter.formatDate($i.get("accdate")) by $i.get("userid") from $i.get("hostname")
+<li>$portalPresenter.formatDate($i.get("accdate")) durch $userPresenter.getUserLogin($i.get("userid")) von $i.get("hostname")
 #end
 </ul>
 
 <form action="$contextPath/portal/edit.html?itemid=$itemid" method="post">
-<p><input type="submit" name="_submit" value="Reset Page Update History"></p>
+<p><input type="submit" name="_submit" value="Seitenhistorie zurücksetzen"></p>
 </form>
 
 #end
 
-#parse ( "/pagefooter.html" )
+$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

[Cobricks-cvscommit] drehscheibe-in/src/de/tum/cobricks/course importModules.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17458/de/tum/cobricks/course

Modified Files:
	importModules.java 
Log Message:


Index: importModules.java
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course/importModules.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- importModules.java	30 May 2006 14:14:29 -0000	1.1
+++ importModules.java	2 Oct 2006 09:47:14 -0000	1.2
@@ -87,16 +87,16 @@
     {
         // delete all data
         DBAccess dbAccess = coreManager.getDBAccess();
-        //dbAccess.sqlExecute("delete from course_date");
-        //dbAccess.sqlExecute("delete from course_lecturerrel");
+        dbAccess.sqlExecute("delete from course_date");
+        dbAccess.sqlExecute("delete from course_lecturerrel");
         //dbAccess.sqlExecute("delete from course_lecturer");
-        //dbAccess.sqlExecute("delete from course_notes");
+        dbAccess.sqlExecute("delete from course_notes");
         dbAccess.sqlExecute("delete from course_progrel");
         dbAccess.sqlExecute("delete from course_prog");
         //dbAccess.sqlExecute("delete from course_room");
         dbAccess.sqlExecute("delete from course_module");
-        //dbAccess.sqlExecute("delete from course_timetable");
-        //dbAccess.sqlExecute("delete from course");
+        dbAccess.sqlExecute("delete from course_timetable");
+        dbAccess.sqlExecute("delete from course");
         
         // add data
         try {
@@ -225,6 +225,26 @@
                     if (tmps.equals("keine")) tmps = "0";
                     attrs.put("cmectscredits", tmps);
                 }
+                if (tagName.equals("Fachgebiet")) { // z.B. AWR
+                    String tmps = getLeafValue(node);
+                    String attr = (String)attrs.get("cmaddxml");
+                    if (attr==null)
+                        attr = "";
+                    else
+                        attr += "\n";
+                    attr += "<Fachgebiet>"+tmps+"</Fachgebiet>";
+                    attrs.put("cmaddxml", attr);
+                }
+                if (tagName.equals("Bereich")) { // z.B. Info3
+                    String tmps = getLeafValue(node);
+                    String attr = (String)attrs.get("cmaddxml");
+                    if (attr==null)
+                        attr = "";
+                    else
+                        attr += "\n";
+                    attr += "<Bereich>"+tmps+"</Bereich>";
+                    attrs.put("cmaddxml", attr);
+                }
                 if (tagName.equals("Turnus")) {
                     // value="WS","SS","WS,SS"
                     String tmps = getLeafValue(node);
@@ -599,10 +619,8 @@
             logger.error(LogUtil.ex("Failed initializing components.", e));
         }
 
-
         ComponentDirectory cd = coreManager.getComponentDirectory();
-        courseManager = (CourseManager) cd.getManager("courseManager");
-        
+        courseManager = (CourseManager) cd.getManager("courseManager");        
     }
 
     
@@ -626,7 +644,5 @@
         logger.fatal(ex.getLineNumber()+":::"+ex.getMessage());
 
     }
-    
-    
+        
 }
-

[Cobricks-cvscommit] drehscheibe-in/web/item itemsearch.html.de

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/web/item
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31458

Modified Files:
	itemsearch.html.de 
Log Message:


Index: itemsearch.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemsearch.html.de,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- itemsearch.html.de	22 Sep 2006 17:40:53 -0000	1.15
+++ itemsearch.html.de	28 Sep 2006 06:40:39 -0000	1.16
@@ -62,10 +62,10 @@
 <option value="sypro">Ankündigung Systementwicklungsprojekt</option>
 <option value="job">Jobangebot</option>
 <option value="fww">Eintrag Fakultätswegweiser</option>
-<option value="all">-- beliebig --</option>
+<option value="">-- beliebig --</option>
 </select></td></tr>
 <tr><td colspan=2><b>Suchtext:</b></td></tr>
-<tr><td colspan=2><input type="text" name="qtext" size="40"></td></tr>
+<tr><td colspan=2><input type="text" name="qtext" value="$!qtext" size="40"></td></tr>
 <tr><td><b>Nicht älter als:</b></td>
 <td><b>Sortierung:</b></td></tr>
 <tr><td><select size="1" name="qolder">
@@ -88,7 +88,7 @@
 </select>
 </td></tr>
 <tr><td colspan=2><b>Von Benutzer (Loginname):</b></td></tr>
-<tr><td colspan=2><input type="text" name="qcreator" size="20">
+<tr><td colspan=2><input type="text" name="qcreator" value="$!qcreator" size="20">
 </td></tr>
 </table>
 

[Cobricks-cvscommit] drehscheibe-in/web/ADMIN/images - New directory

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/web/ADMIN/images
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17992/images

Log Message:
Directory /cvsroot/cobricks/drehscheibe-in/web/ADMIN/images added to the repository

[Cobricks-cvscommit] drehscheibe-in/web/portal edit.html.de index.html.de

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/web/portal
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17880

Added Files:
	edit.html.de index.html.de 
Log Message:


--- NEW FILE: edit.html.de ---

#parse ( "/pageheader.html" )

<h1>Edit Portal Page</h1>

#if ( $returnCode == 1103 )
<p><div class="success">Successfully updated portal page.</div></p>
#elseif ( $returnCode == 1101 )
<p><div class="success">Successfully created portal page.</div></p>
#elseif ( $returnCode > 1999 )
<p><div class="error">Failed updating portal page.
#if ($errors)
<div class="error">The following error(s) ocurred:
<ul>#foreach($error in $errors)
<li>$corePresenter.printErrorMessage($error, "$!lang")</li>
#end</ul></div><br/>
#end
#end
#if ("$!_submit" == "Reset Page Update History")
$portalManager.resetPageUpdateHistory($corePresenter.parseInt($itemid))
<p><div class="success">Reset Page Update History.</div></p>
#end

#set ($acc = $userPresenter.checkPermission("$userId", "page", "update", "itemid=$itemid"))
#if ($acc == "false")

<div class="error">
You do not have permission to edit web pages on this site.
</div>

#else

#set ( $page = $portalPresenter.getPage($itemid) )

<form action="$contextPath/PORTAL" method="post">
<input type="hidden" name="cmd" value="update">
<input type="hidden" name="cmd.success" value="/portal/edit.html">
<input type="hidden" name="cmd.error" value="/portal/edit.html">
<input type="hidden" name="cmd.noaccess" value="/noaccess.html">
<input type="hidden" name="itemid" value="$itemid">
<input type="hidden" name="path" value="$portalRequest.getPagePath()"/>

<table>
<tr><td width="80%" valign="top">
<table width="100%">
#set ( $name = $page.getPageName() )
<tr><td>
Name: <input type="text" name="name" value="$!name" size="45"/>

<p>
<b>itemclass: $page.getAttribute("ontologyclassname")</b>
</p>

</td></tr>
#if ("$!_submit" == "Add Language")
#set ( $lg = ${_addlang} )
#set ( $title = $page.getTitle("$lg") )
#set ( $content = $page.getPageContent("$lg") )

<input type="hidden" name="plang" value="$lg">
<tr><td>
<table border="1" bgcolor="#eeeeee"><tr><td>
Title ($lg): <input type="text" name="title_$lg" size="60" value="$!title"><br/>
Content ($lg):<br>
<textarea name="content_$lg" rows="15" cols="70" wrap="off">
$!content
</textarea><br>
Upload content from file: <input type="file" name="_file$lg"><br/>
</td></tr></table>
</td></tr>
#end
#set ( $langs = $page.getUsedLanguages() )
#foreach( $lg in $langs )
#set ( $title = $page.getAttribute("title_$lg") )
<!-- #set ( $content = $page.getAttribute("content_$lg") ) -->
#set ( $content = $itemManager.getContentVersion($itemid, $lg, $versionid) )

<input type="hidden" name="plang" value="$lg">
<tr><td>
<table border="1" bgcolor="#eeeeee"><tr><td>
Title ($lg): <input type="text" name="title_$lg" size="45" value="$!title"><br/>
Content ($lg):<br>
<textarea name="content_$lg" rows="15" cols="70">
$!content
</textarea><br>
Upload content from file: <input type="file" name="_file$lg"><br/>
</td></tr></table>
</td></tr>
#end
</table>

<p>
#if ("wikipage" == $page.getAttribute("ontologyclassname"))
<p>
<a href="wikihelp.html" target="_blank">Help for Wiki</a>
</p>
#if ($userId == $page.getAttributeAsString("creator"))
<input type="checkbox" name="newContentVersion" checked="true" value="true"> Should a new content version be created?
#else
<input type="hidden" name="newContentVersion" value="true"> It will be created a new content version
#end
#end
</p>

<p><input type="submit" name="_submit" value="Update Page"></p>

<p><input type="submit" name="_submit" value="Add Language">
<select name="_addlang"><option value=""></option>
$portalPresenter.printLanguageOptions($langs)</select>
</p>

</td><td valign="top">

<table>
<tr><td>

<b>Access Restrictions:</b>

none

<p>&nbsp;</p>

</td></tr>
<tr><td>

<p>Created<br>$page.getAttributeAsString("creationtime")<br>
by $userPresenter.getUserLogin($page.getAttribute("creator"))</p>
<p>Last Modified<br>$page.getAttributeAsString("updatetime")<br>
by $userPresenter.getUserLogin($page.getAttribute("updater"))</p>

<p>Expires:<br/>
<input type="text" name="expires" value="$page.getAttributeAsString("expirationtime")" size="18"/></p>

</td></tr>
</table>

</td></tr>
</table>

</form>
</p>
<p>
<h3>Page Update History</h3>
<ul>
#foreach ( $i in $portalManager.getPageUpdateHistory($corePresenter.parseInt($itemid)) )
<li>$portalPresenter.formatDate($i.get("accdate")) by $i.get("userid") from $i.get("hostname")
#end
</ul>

<form action="$contextPath/portal/edit.html?itemid=$itemid" method="post">
<p><input type="submit" name="_submit" value="Reset Page Update History"></p>
</form>

#end

#parse ( "/pagefooter.html" )

--- NEW FILE: index.html.de ---

$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest)

<h1>Portal</h1>

<p>Als berechtigter Benutzer können Sie Web-Seiten anlegen und
editieren.</p>

<p>Zum Editieren der Seiten wählen Sie bitte einfach den "edit" Link
am Fuss einer editierbaren Seite an.</p>

<p>Zum Anlegen von neuen Seiten und anderen Web-Objekten nutzen Sie
bitte die <a href="/ADMIN/org.cobricks.portal/">Funktionalität im
ADMIN-Bereich.</p>

$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

[Cobricks-cvscommit] drehscheibe-in/web/user logout.html.de login-success.html.de login.html.de user-buddylist-search.html.de user-buddylist.html.de user-interests.html.de user-search.html.de user.html.de

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/web/user
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17110

Modified Files:
	login-success.html.de login.html.de 
	user-buddylist-search.html.de user-buddylist.html.de 
	user-interests.html.de user-search.html.de user.html.de 
Added Files:
	logout.html.de 
Log Message:


Index: user-buddylist.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-buddylist.html.de,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- user-buddylist.html.de	12 Sep 2006 12:45:01 -0000	1.3
+++ user-buddylist.html.de	22 Sep 2006 17:42:27 -0000	1.4
@@ -1,5 +1,5 @@
 
-$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest)
 
 #set ( $auserlogin = "$!auserlogin" )
 #if ( $auserlogin == "" )
@@ -49,7 +49,7 @@
 <p><div class="info">You have added one new member in your buddylist.</div></p>
 #end
 
-<p>Benutzerlogin: $auserlogin</p>
+<p>Loginname: $auserlogin</p>
 
 <form action="/USER" method="post">
 <input type="hidden" name="cmd" value="deleteListMember" />
@@ -85,7 +85,7 @@
 <table width="100%">
   <tr bgcolor="dfdfdf">
       <td width="7%">
-          <b>Löschen</b>
+          <b>Löschen?</b>
       </td>
       <td width="12%">
           <b>Bild</b>
@@ -119,11 +119,11 @@
       </tr>
     #end
     #else
-      <tr><td colspan = "3">Your buddylist has no entries yet. You can fill it using text field below.</td></tr>
+      <tr><td colspan = "3">Ihre Freundesliste hat noch keine Einträge.</td></tr>
   #end
 </table>
 <br>
-<input type="submit" value="Löschen">
+<input type="submit" value="Ausgewählte Eintrage löschen">
 </form>
 
 <p>
@@ -146,7 +146,7 @@
 
 <script type="text/javascript">
 // <!--
-    document.write("<input type=button value=Search onClick=\"window.open('/user/user-buddylist-search.html?print=true&auserlogin=$auserlogin','usersearch','width=500,height=500,scrollbar=yes,menu=no');\">");
+    document.write("<input type=button value=Suche onClick=\"window.open('/user/user-buddylist-search.html?print=true&auserlogin=$auserlogin','usersearch','width=500,height=500,scrollbar=yes,menu=no');\">");
 // -->
 </script>
 
@@ -164,4 +164,4 @@
 
 #end
 
-$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest)

Index: login-success.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login-success.html.de,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- login-success.html.de	29 May 2006 07:30:17 -0000	1.7
+++ login-success.html.de	22 Sep 2006 17:42:27 -0000	1.8
@@ -1,39 +1,23 @@
 
-$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest)
 
 <h1>Hallo <b>$luserlogin</b>,</h1>
 
-<p>Das Anmelden war erfolgreich.</p>
+<p><div class="success">Das Anmelden war erfolgreich.</div></p>
 
 <p>Als registrierter Benutzer k&ouml;nnen Sie jetzt folgende Funktionen 
 ausf&uuml;hren:</P>
 <p>
 <ul>
-<li><a href="/course/">Course Management</a>
-<p>
-<li><a href="/user/user.html.de">Benutzerprofil 
+<li><a href="/user/user.html">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&amp;typeid=1">Mitteilungen 
-        publizieren</A> 
-        <LI><A 
-        href="https://www.in.tum.de/servlet/Item_Pflege?cmd=createitem&amp;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> 
+<li><a href="/user/user-search.html">Benutzer suchen</a>
+<p>
+<li><a href="/item/">Inhaltsmanagement</a> - Ankündigungen, ...
+<p>
+<li><a href="/item/">Portal-Management</a> - Web-Seiten, ...
+<p>
+<li><a href="/course/">Course Management</a> - Lehrveranstaltungen, Module, ...
 </ul>
       
-$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest)

Index: login.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login.html.de,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- login.html.de	12 Sep 2006 12:45:01 -0000	1.8
+++ login.html.de	22 Sep 2006 17:42:27 -0000	1.9
@@ -1,5 +1,5 @@
 
-$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest)
 
 <h1>Login</h1>
 
@@ -36,14 +36,14 @@
 anzumelden. Sie k&ouml;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&ouml;nnen Sie jetzt <a href="/user/register.html.de">eine lokale
+k&ouml;nnen Sie jetzt <a href="/user/register.html">eine lokale
 Kennung anlegen</a>.</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="cmd.success" VALUE="/user/login-success.html">
+<INPUT TYPE="hidden" NAME="cmd.error" VALUE="/user/login.html">
 <INPUT TYPE="hidden" NAME="redirect" VALUE="$!redirect">
 Login<br>
 <input title="Benutzername" size="20" name="luserlogin" type="text" value="$!luserlogin"><br>
@@ -67,10 +67,10 @@
 <p>
 <form action="/USER" method=post>
 <INPUT TYPE=hidden NAME=cmd VALUE="forgotPassword" />
-<input type="hidden" name="cmd.success" value="/user/login.html.de" />
-<input type="hidden" name="cmd.error" value="/user/login.html.de" />
+<input type="hidden" name="cmd.success" value="/user/login.html" />
+<input type="hidden" name="cmd.error" value="/user/login.html" />
 <input type="hidden" name="email_subject" value="Drehscheibe www.in.tum.de Password" />
-<input type="hidden" name="email_textsource" value="/user/forgot_password.txt.de" />
+<input type="hidden" name="email_textsource" value="/user/forgot_password.txt" />
 <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>
@@ -82,6 +82,5 @@
 <p>Nach dem &Uuml;berpr&uuml;fen Ihrer Angaben werden Ihnen Ihre Zugangsdaten 
 f&uuml;r die Plattform an die angegebene E-Mail-Adresse geschickt.</p>
 </form>  
-</td>
 
-$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest)

Index: user.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user.html.de,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- user.html.de	15 Sep 2006 06:38:29 -0000	1.11
+++ user.html.de	22 Sep 2006 17:42:27 -0000	1.12
@@ -1,5 +1,5 @@
 
-$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest)
 
 #set ( $auserlogin = "$!auserlogin" )
 #if ( $auserlogin == "" )
@@ -62,17 +62,13 @@
 <tr bgcolor="#eeeeee">
 <td>
 <table border="0" cellpadding="5pt"><tr><td>
-<em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> -
+<em><a href="user.html?auserlogin=$auserlogin"><b>Basisdaten</b></a> -
 <a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> -
 <a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> -
 <a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td>
 </td></tr></table></td>
 <td align="right">
-<table border="0" cellpadding="5pt"><tr><td>
-<form action="/user/change_password.html" method="get">
-<input type="submit" value="Passwort &auml;ndern" />
-</form>
-<!--<em><a href="change_password.html?auserlogin=$auserlogin">Passwort &auml;ndern</a></em>-->
+<em><a href="change_password.html?auserlogin=$auserlogin">Passwort &auml;ndern</a></em>
 </td></tr></table>
 </td></tr>
 <tr><td colspan="2">
@@ -160,4 +156,4 @@
 #end
 #end
 
-$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest)

Index: user-interests.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-interests.html.de,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- user-interests.html.de	12 Sep 2006 12:45:01 -0000	1.12
+++ user-interests.html.de	22 Sep 2006 17:42:27 -0000	1.13
@@ -1,5 +1,5 @@
 
-$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest)
 
 #set ( $auserlogin = "$!auserlogin" )
 #if ( $auserlogin == "" )
@@ -42,7 +42,7 @@
 <p><div class="info">The new entry has been added to your interests list.</div></p>
 #end
 
-<p>Benutzerlogin: $auserlogin</p>
+<p>Loginname: $auserlogin</p>
 
 <form action="/USER" method="post">
 <input type="hidden" name="cmd" value="deleteListMember" />
@@ -58,7 +58,7 @@
 <td>
 <table border="0" cellpadding="5pt"><tr><td>
 <em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> -
-<a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> -
+<a href="user-interests.html?auserlogin=$auserlogin"><b>Interessen</b></a> -
 <a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> -
 <a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td>
 </td></tr></table></td>
@@ -76,7 +76,7 @@
 
 <br><br>
 <table width="100%">
-  <tr bgcolor="dfdfdf"><td width="7%"><b>Delete</b></td><td width="43%"><b>Name</b></td><td width="50%"><b>Category Class</b></td></tr>
+  <tr bgcolor="dfdfdf"><td width="7%"><b>Löschen?</b></td><td width="43%"><b>Name</b></td><td width="50%"><b>Kategorietyp</b></td></tr>
   #set ($result = $userPresenter.getUserAttrSet($auserid, "interests.categories"))
   #if ($result.size() > 0)  
     #foreach ($i in $result)
@@ -87,11 +87,11 @@
       </tr>
     #end
   #else
-      <tr><td colspan = "3">Your interests list has no entries yet. You can choose it from the list below and add it to your interests list.</td></tr>
+      <tr><td colspan = "3">Ihre Interessenliste hat bisher noch keine Einträge.</td></tr>
   #end
 </table>
 <br>
-<input type="submit" value="Löschen">
+<input type="submit" value="Ausgewählte Einträge löschen">
 </form>
 
 <p>
@@ -106,7 +106,7 @@
 Bitte wählen Sie zusätzliche Interessensgebiete aus folgender Liste aus und
 Klicken Sie den Button "Zur Liste hinzufügen":
 <select name="cid">
-#foreach( $i in  $categoryPresenter.getCategories("", "", "") )
+#foreach( $i in  $categoryPresenter.getCategories("community", "") )
 	<option value="$i.getId()">$!i.getTitle()&nbsp;&nbsp;</option>
 #end
 </select>
@@ -123,4 +123,4 @@
 
 #end
 
-$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest)
+$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest)

--- NEW FILE: logout.html.de ---

$portalPresenter.parse("$!contextPath/pageheader.html",$portalRequest)

<h1>Logout</h1>

<P>Die Login-Information im Browser sollte jetzt gel&ouml;scht sein.</P>

<P>Bitte wechseln Sie jetzt zu einer beliebigen öffentlichen Seite der
Website oder <A href="/user/login.html.de">melden Sie sich erneut
an</A>.  </P>

$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest)

Index: user-search.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-search.html.de,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- user-search.html.de	26 Oct 2004 10:37:22 -0000	1.5
+++ user-search.html.de	22 Sep 2006 17:42:27 -0000	1.6
@@ -1,6 +1,7 @@
-#parse ( "pageheader.html.de" )
-#parse ( "navigation-main.html.de" )
-<td valign=top>
+
+$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest)
+
+<h1>Benutzersuche</h1>
 
 #if ( "$!userLogin" == "anonymous" )
 
@@ -12,29 +13,30 @@
 
 #else
 <p>
-	#if ($returnCode == 1001)
-	<p><div class="error">Benutzer mit userlogin $!newUserLogin existiert nicht, bitte &uuml;berpr&uuml;fen Sie die Schreibweise!</div></p>
-	<p><div class="info">Und versuchen Sie erneut!</div></p>
-	#end
-	#if ($returnCode == 1002)
-	<p><div class="info">Der/die eingegebene Benutzer(-in) ist bereits in Ihrer Buddy List!</div></p>
-	#end
-	#if ($returnCode == 1003)
-	<p><div class="info">Wollten Sie sich selber in Ihre Buddy List aufnehmen? Das geht aber nicht!</div></p>
-	#end
-	#if ($returnCode == 1010)
-	<p><div class="info">Sie haben kein <i>userlogin</i> eingegeben!</div></p>
-	#end
-	#if ($returnCode == 2001)
-	<p><div class="info">Ein neuer Mitglieder/ eine neue Mitgliederin ist Ihrer Buddy List hinzugef&uuml;gt worden.</div></p>
-	#end
+#if ($returnCode == 1001)
+<p><div class="error">Benutzer mit userlogin $!newUserLogin existiert nicht, bitte &uuml;berpr&uuml;fen Sie die Schreibweise!</div></p>
+<p><div class="info">Und versuchen Sie erneut!</div></p>
+#end
+#if ($returnCode == 1002)
+<p><div class="info">Der/die eingegebene Benutzer(-in) ist bereits in Ihrer Buddy List!</div></p>
+#end
+#if ($returnCode == 1003)
+<p><div class="info">Wollten Sie sich selber in Ihre Buddy List aufnehmen? Das geht aber nicht!</div></p>
+#end
+#if ($returnCode == 1010)
+<p><div class="info">Sie haben kein <i>userlogin</i> eingegeben!</div></p>
+#end
+#if ($returnCode == 2001)
+<p><div class="info">Ein neuer Mitglieder/ eine neue Mitgliederin ist Ihrer Buddy List hinzugef&uuml;gt worden.</div></p>
+#end
 
 		
-Hier können sie nach registrierten Benutzern suchen.<br>
-Dabei werden Nachname, Vorname und Login berücksichtigt, soweit diese vom
-jeweiligen Benutzer eingegeben wurden. Die Groß- bzw. Kleinschreibung 
-des Suchtextes wird nicht beachtet. 
-</p>
+<p>Hier können sie nach registrierten Benutzern suchen.</p>
+
+<p>Dabei werden Nachname, Vorname und Login berücksichtigt, soweit
+diese vom jeweiligen Benutzer eingegeben wurden. Die Groß-
+bzw. Kleinschreibung des Suchtextes wird nicht beachtet.</p>
+
 <form action="user-search.html.de" method="post">
 
 <INPUT TYPE="hidden" NAME="cmd" VALUE="search" />
@@ -99,12 +101,8 @@
 
           <a href="/user/card.html.de?auserlogin=$i.getUserLogin()"> $i.getUserLogin()</a>
         </td>
-        <td>       
-        <a href="/USER?cmd=addListMember&cmd.success=/user/user-bannlist.html.de&cmd.error=/user/user-search.html.de&path=$portalRequest.getPagePath()&aname=pim.network.banlist&uid=$i.getUserId()&newUserLogin=$i.getUserLogin()">-->Bannliste</a>
-		
-        </td>
         <td>
-			<a href="/USER?cmd=addListMember&cmd.success=/user/user-roles.html.de&cmd.error=/user/user-search.html.de&path=$portalRequest.getPagePath()&aname=pim.network.buddylist&uid=$i.getUserId()&newUserLogin=$i.getUserLogin()">-->Freundschaftsliste</a>
+<a href="/USER?cmd=addListMember&cmd.success=/user/user-buddylist.html&cmd.error=/user/user-buddylist.html&path=$portalRequest.getPagePath()&aname=pim.network.buddylist&uid=$i.getUserId()&newUserLogin=$i.getUserLogin()">&rarr; Freundschaftsliste</a>
         </td>
       </tr>
   #end
@@ -125,13 +123,7 @@
 <p><input type="submit" value="Suchen"></p>
 </form>					
 
-<p>Eine "Suche nach Bildern" ist im
-<a href="/servlet/User_Profil?cmd=photos&amp;class=all">Photoalbum</a>
-möglich. Eine Suche nach (Abschluss-)Jahrgängen in den
-<a href="/servlet/User_Profil?cmd=class">Jahrgangslisten</a>.</p>
-
 #end	
-</td>
-#parse ( "pagefooter.html" )
 
 
+$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest)

Index: user-buddylist-search.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-buddylist-search.html.de,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- user-buddylist-search.html.de	12 Sep 2006 12:45:01 -0000	1.1
+++ user-buddylist-search.html.de	22 Sep 2006 17:42:27 -0000	1.2
@@ -1,6 +1,5 @@
-#parse ( "pageheader.html" )
 
-<h1>Search user</h1>
+<h1>Benutzersuche</h1>
 
 <form action="user-buddylist-search.html" method=get>
     <input type=hidden name=auserlogin value=$!auserlogin>
@@ -8,36 +7,36 @@
     
     <table border=0>
         <tr>
-            <td>User login</td>
+            <td>Loginname</td>
             <td>
                 <input type=text name=searchUserLogin>
             </td>
         </tr>
         <tr>
-            <td>First name</td>
+            <td>Vorname</td>
             <td>
                 <input type=text name=searchFirstName>
             </td>
         </tr>
         <tr>
-            <td>Last name</td>
+            <td>Nachname</td>
             <td>
                 <input type=text name=searchLastName>
             </td>
         </tr>
         <tr>
-            <td>Sort by</td>
+            <td>Sortieren nach</td>
             <td>
                 <select width="40" name="sort">
-                      <option value="1">Login name</option>
-                      <option value="2">Lastname</option>
-                      <option value="3">Firstname</option>
+                      <option value="1">Loginname</option>
+                      <option value="2">Nachname</option>
+                      <option value="3">Vorname</option>
                   </select>
               </td>
         </select>
         <tr>
             <td>
-                <input type=submit name=cmd value=Search>
+                <input type=submit name=cmd value="Suchen">
             </td>
         </tr>
     </table>
@@ -91,7 +90,7 @@
                 <b>Name</b>
             </td>
             <td>
-                <b>e-mail</b>
+                <b>E-Mail</b>
             </td>
         </tr>
         

[Cobricks-cvscommit] drehscheibe-in/web/item index.html.de template-da.html template-fww.html template-idp.html template-job.html template-odate.html template-sypro.html templateedit-da.html templateedit-fww.html templateedit-idp.html templateedit-job.html templateedit-odate.html templateedit-sypro.html test-rss20.xml test.html.de item.html.de itemcreate.html.de itemsearch.html.de itemupdate.html.de template-date.html template-msg.html template.html index.html.en

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/web/item
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16333

Modified Files:
	item.html.de itemcreate.html.de itemsearch.html.de 
	itemupdate.html.de template-date.html template-msg.html 
	template.html 
Added Files:
	index.html.de template-da.html template-fww.html 
	template-idp.html template-job.html template-odate.html 
	template-sypro.html templateedit-da.html templateedit-fww.html 
	templateedit-idp.html templateedit-job.html 
	templateedit-odate.html templateedit-sypro.html test-rss20.xml 
	test.html.de 
Removed Files:
	index.html.en 
Log Message:


Index: template-date.html
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-date.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- template-date.html	15 Sep 2006 06:38:29 -0000	1.2
+++ template-date.html	22 Sep 2006 17:40:53 -0000	1.3
@@ -81,8 +81,10 @@
 <p>Kategorien, denen die Mitteilung zugeordnet ist:
 <ul>
 #foreach ($c in $item.getAttribute("categories"))
+#if ("$!c"!="0")
  <li>$categoryPresenter.getCategory($c).getTitle("$lang")
 #end
+#end
 #if (!$item.getAttribute("categories"))
  <li>keine Kategorien
 #end

--- NEW FILE: templateedit-da.html ---

<table cellspacing="10">
#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Titel (max. 80-100 Zeichen)</b> (in
<b>$itemPresenter.getLanguageName($lg)</b>)</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput("item", "title_${lg}", $lang, $velocityContext, 1, 50, false)
<br><font size="-1">(bitte möglichst aussagekräftig wählen - also 
  nicht nur "Vortrag" oder "Jobangebot", sondern auch Thema)</font>
</td></tr>
#end

#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Inhalt</b> (in <b>$itemPresenter.getLanguageName($lg)</b>, in HTML, 
 d.h. mit &lt;p&gt;, &lt;br&gt; etc.; keine &lt;table&gt;)
</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput($itemclass, "content_${lg}", $lang, $velocityContext, 15, 80, false)
</td></tr>
#end

<tr><td nowrap align=left colSpan=2>
<b>Zufgriff:</b>
</td></tr>
<tr><td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false)
</td></tr>

<tr>
<td colSpan=2><b>Kategorien:</b></td></tr>
<tr>
<td valign="top">
#set ( $categoryclass = "community" )
<select name="categories" size="10" multiple>
$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories"))
</select>
</td>
<td vAlign=top>Die Kategorien werden dazu benutzt, das
  Item den Interessengebieten von Benutzern und den verschiedenen
  Themenseiten zuzuordnen. Bitte wählen Sie die Communites zu Ihrem
  Item gewissenhaft aus (thematisch passend, nicht zu viele). <a 
  href="/community/read.html.de">Informationen zu den 
  einzelnen Communities</a>. </td>
</tr>

<tr><td nowrap align=left colSpan=2>
<b>Verweis zu weiteren Informationen</b> (URL, optional):
</td></tr>
<tr>
<td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false)
</td></tr>

<tr><td colSpan=2><b>Verfallsdatum:</b></td></tr>
<tr><td colSpan=2>
$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $velocityContext, 1, 20, false)
</td></tr>
</table>
        

--- NEW FILE: templateedit-fww.html ---

<table cellspacing="10">

#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Titel (max. 80-100 Zeichen)</b> (in
<b>$itemPresenter.getLanguageName($lg)</b>)</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput("item", "title_${lg}", $lang, $velocityContext, 1, 50, false)
<br><font size="-1">(bitte möglichst aussagekräftig wählen - also 
  nicht nur "Vortrag" oder "Jobangebot", sondern auch Thema)</font>
</td></tr>
#end

#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Text des FWW-Beitrags</b> (in <b>$itemPresenter.getLanguageName($lg)</b>, in HTML, 
 d.h. mit &lt;p&gt;, &lt;br&gt; etc.; keine &lt;table&gt;)
</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput($itemclass, "content_${lg}", $lang, $velocityContext, 15, 80, false)
</td></tr>
#end

<tr><td nowrap align=left colSpan=2>
<b>Autor:</b>
</td></tr>
<tr>
<td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "author", $lang, $velocityContext, 1, 30, false)
</td></tr>

<tr><td nowrap align=left colSpan=2>
<b>Zufgriff:</b>
</td></tr>
<tr><td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false)
</td></tr>

<tr>
<td colSpan=2><b>Kategorien:</b></td></tr>
<tr>
<td valign="top">
#set ( $categoryclass = "community" )
<select name="categories" size="10" multiple>
$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories"))
</select>
</td>
<td vAlign=top>Unbedingt Kategorie "Fakultäts-Wegweiser MA/IN"
auswählen. Andere Kategorien können zusätzlich ausgewählt werden um
den FWW-Beitrag auch in anderen Listen erscheinen zu lassen.</td>
</tr>

<tr><td nowrap align=left colSpan=2>
<b>Verweis zu weiteren Informationen</b> (URL, optional):
</td></tr>
<tr>
<td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false)
</td></tr>

</table>
        

--- NEW FILE: templateedit-odate.html ---

<table cellspacing="10">
#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Titel (max. 80-100 Zeichen)</b> (in
<b>$itemPresenter.getLanguageName($lg)</b>)</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput("item", "title_${lg}", $lang, $velocityContext, 1, 50, false)
<br><font size="-1">(bitte möglichst aussagekräftig wählen - also 
  nicht nur "Vortrag" oder "Jobangebot", sondern auch Thema)</font>
</td></tr>
#end

<tr><td colSpan=2><b>Anfangstermin:</b></td></tr>
<tr><td colSpan=2>
$itemPresenter.printAttrInput($itemclass, "starttime", $lang, $velocityContext, 1, 20, false)
</td></tr>
<tr><td colSpan=2><b>Endtermin:</b></td></tr>
<tr><td colSpan=2>
$itemPresenter.printAttrInput($itemclass, "endtime", $lang, $velocityContext, 1, 20, false)
</td></tr>

#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Beschreibung</b> (in <b>$itemPresenter.getLanguageName($lg)</b>, in HTML, 
 d.h. mit &lt;p&gt;, &lt;br&gt; etc.; keine &lt;table&gt;)
</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput($itemclass, "content_${lg}", $lang, $velocityContext, 15, 80, false)
</td></tr>
#end

<tr><td nowrap align=left colSpan=2>
<b>Zufgriff:</b>
</td></tr>
<tr><td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false)
</td></tr>

<tr>
<td colSpan=2><b>Kategorien:</b></td></tr>
<tr>
<td valign="top">
#set ( $categoryclass = "community" )
<select name="categories" size="10" multiple>
$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories"))
</select>
</td>
<td vAlign=top>Die Kategorien werden dazu benutzt, das
  Item den Interessengebieten von Benutzern und den verschiedenen
  Themenseiten zuzuordnen. Bitte wählen Sie die Communites zu Ihrem
  Item gewissenhaft aus (thematisch passend, nicht zu viele). <a 
  href="/community/read.html.de">Informationen zu den 
  einzelnen Communities</a>. </td>
</tr>

<tr><td noWrap align=left colSpan=2>
<b>Verweis zu weiteren Informationen</b> (URL, optional):
</td></tr>
<tr><td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false)
</td></tr>

<tr><td colSpan=2><b>Verfallsdatum:</b></td></tr>
<tr><td colSpan=2>
$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $velocityContext, 1, 20, false)
</td></tr>
</table>
        

Index: itemupdate.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemupdate.html.de,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- itemupdate.html.de	15 Sep 2006 06:38:29 -0000	1.2
+++ itemupdate.html.de	22 Sep 2006 17:40:53 -0000	1.3
@@ -7,10 +7,7 @@
 #set ($selectedLangs = [$lang])
 #end
 
-#set ( $auserlogin = "$!auserlogin" )
-#if ( $auserlogin == "" )
 #set ( $auserlogin = $userLogin )
-#end
 #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) )
 #set ( $auser = $userManager.getUser($auserid))
 
@@ -43,7 +40,14 @@
 #end</ul></div><br/>
 #end
 
-#set ($acc = $userPresenter.checkPermission("$userId", "item", "update", "itemid=$itemid"))
+#set ($acc = $userPresenter.checkPermission("$auserid", "item", "update", "itemid=$itemid"))
+#if ($acc != "false")
+#set ( $perm = $item.getAttribute("permission") )
+#if ( "$!perm" == "nur Mitarbeiter" )
+#if ( $userPresenter.checkRole($auserid,"mitarbeiter")=="false" )
+#set ($acc = "false")
+#end
+#end
 #if ($acc == "false")
 
 <div class="error">

--- NEW FILE: template-job.html ---

#set($format = $portalPresenter.getDateTimeFormatter($lang, true))

<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%">
<tr><td>

#set($imageurl = $item.getAttributeAsString("imageurl"))
#if("$!imageurl"!="")
<img align="right" valign="top" width="80" src="$imageurl"/>
#end
	
#set($title = $item.getTitle("$!lang"))
#if("$!title"!="")
<b>$title</b>
#else
<b>$item.getTitle()</b>
<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font>
#end
<br/>

#set($creator = $item.getAttribute("creator"))
#set($creationtime = $item.getAttribute("creationtime"))
#if($creator)
 (von
  <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a>
 #if("$!creationtime"!="")
 , am/um $format.format($creationtime)
 #end
)
#elseif($creationtime)
 (am/um $format.format($creationtime))
#end
<p>

<table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td>
#set($content = $item.getContent("$!lang"))
#if("$content"!="")
<pre>$content
</pre>
#else
$item.getContent()
<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font>
#end
</td></tr></table><br/>

#set($location = $item.getAttributeAsString("location"))
#if("$location"!="")
<b>Ort:</b> $location<br/><br/>
#end
	
#set($expirationtime = $item.getAttribute("expirationtime"))
#if($expirationtime)
Verfallsdatum: $format.format($expirationtime)<br/><br/>
#end
	
#set($uri = $item.getAttributeAsString("url"))
#if("$!uri"!="")
Link zu zusätzlicher Information:<br/>
<a href="$uri">$uri</a><br/><br/>
#end

#set($updater = $item.getAttribute("updater"))
#set($updatetime = $item.getAttribute("updatetime"))
#if($updater)
 Letzte Aktualisierung durch
 <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)">
 $userPresenter.getUserName($updater)</a>
 #if($updatetime)
 , am/um $format.format($updatetime)
 #end
 <br/>
#elseif($updatetime)
 Letzte Aktualisierung am/um $format.format($updatetime)<br/>
#end

<p>Kategorien, denen die Mitteilung zugeordnet ist:
<ul>
#foreach ($c in $item.getAttribute("categories"))
 <li>$categoryPresenter.getCategory($c).getTitle("$lang")
#end
#if (!$item.getAttribute("categories"))
 <li>keine Kategorien
#end
</ul>

</td></tr>
</table>

Index: template-msg.html
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-msg.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- template-msg.html	15 Sep 2006 06:38:29 -0000	1.2
+++ template-msg.html	22 Sep 2006 17:40:53 -0000	1.3
@@ -76,7 +76,9 @@
 <p>Kategorien, denen die Mitteilung zugeordnet ist:
 <ul>
 #foreach ($c in $item.getAttribute("categories"))
- <li>$categoryPresenter.getCategory($c).getTitle("$lang")
+#if ("$!c"!="0")
+ <li>$categoryPresenter.getCategory($c).getTitle("$!lang")
+#end
 #end
 #if (!$item.getAttribute("categories"))
  <li>keine Kategorien

--- NEW FILE: test.html.de ---

$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest)

<h1>Dynamische Inhalte - Testlisten</h1>

<p>Mögliche Funktionen:
<ul>
<li>
<pre>
  itemPresenter.searchItemsByTime(aname, sort, valuelow, valuehigh,
                                   itemclasses, categories, maxrows)
</pre><p>
     Suche Items im Intervall aname = [valuelow, valuehigh]
     mit aname aus der Menge
     (expirationtime, creationtime, starttime, endtime, updatetime)
<p>
     Ausgabe nach aname aufsteigend sortiert (es sei denn sort = "desc")
<p>
<li>
<pre>
  itemPresenter.searchItems(qtext, itemclasses, categories, creator,
                            aname, valuelow, valuehigh, sortby, 
                            maxrows)
</pre><p>
<li>
<pre>
  itemManager.searchItems(xpath)
</pre><p>
</ul>

<table width="100%" border=0>
<tbody>
<tr><td>
<table cellSpacing=0 cellPadding=5 width="100%" border=0>
<tbody>
<tr><td bgColor=#0075ba>
<b><font color=#ffffff>Aktuelle Veranstaltungen</font></b>
</td></tr>
<tr><td bgColor=#dddddd>
<table border=0>
<tbody>
##
## max 10 Items, deren Attribut "starttime" in den nächsten 10 Tagen liegt
##
#set ($iresult = $itemPresenter.searchItemsByTime("starttime","asc","now","now+10", ["tumdate","odate"],[],10))
#if (($iresult))
#foreach ($i in $iresult)
  #set ( $itemclass = $i.getAttribute("itemclass") )
  <tr><td vAlign=top>
  <img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)">
  &nbsp;</td>
  <td>
  <a href="/item/item.html?itemid=$i.getId()">$i.getTitle()</a>
  #if($i.getAttribute("starttime")) 
  [$i.getAttribute("starttime")]
  #end 
   </td></tr>
#end
#end
</tbody></table>
</td></tr></tbody></table>
</td></tr></tbody></table>

<table width="100%" border=0>
<tbody>
<tr><td>
<table cellSpacing=0 cellPadding=5 width="100%" border=0>
<tbody>
<tr><td bgColor=#0075ba>
<b><font color=#ffffff>Neue Mitteilungen</font></b>
</td></tr>
<tr><td bgColor=#dddddd>
<table border=0>
<tbody>
##
## max. 10 Items sortiert nach "creationtime"
##
#set ($iresult = $itemPresenter.searchItemsByTime("creationtime", "desc", "", "now", ["tummsg","tumdate","odate","da","sypro","idp","fww"],[],10))
#if (($iresult))
#foreach ($i in $iresult)
  #set ( $itemclass = $i.getAttribute("itemclass") )
  <tr><td vAlign=top>
  <img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)">
  &nbsp;</td>
  <td>
  <a href="/item/item.html?itemid=$i.getId()">$i.getTitle() xxx</a>
  #if($i.getAttribute("expirationtime")) 
  [$i.getAttribute("expirationtime")]
  #end 
   </td></tr>
#end
#end
</tbody></table>
</td></tr></tbody></table>
</td></tr></tbody></table>

<p>Beispiele für RSS-Feeds:</p>
<ul>
<li><a href="test-rss20.xml">Neue Mitteilungen im Format RSS 2.0</a>
</ul>


$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

--- NEW FILE: template-sypro.html ---

#set($format = $portalPresenter.getDateTimeFormatter($lang, true))

<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%">
<tr><td>

#set($imageurl = $item.getAttributeAsString("imageurl"))
#if("$!imageurl"!="")
<img align="right" valign="top" width="80" src="$imageurl"/>
#end
	
#set($title = $item.getTitle("$!lang"))
#if("$!title"!="")
<b>$title</b>
#else
<b>$item.getTitle()</b>
<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font>
#end
<br/>

#set($creator = $item.getAttribute("creator"))
#set($creationtime = $item.getAttribute("creationtime"))
#if($creator)
 (von
  <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a>
 #if("$!creationtime"!="")
 , am/um $format.format($creationtime)
 #end
)
#elseif($creationtime)
 (am/um $format.format($creationtime))
#end
<p>

<table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td>
#set($content = $item.getContent("$!lang"))
#if("$content"!="")
<pre>$content
</pre>
#else
$item.getContent()
<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font>
#end
</td></tr></table><br/>

#set($location = $item.getAttributeAsString("location"))
#if("$location"!="")
<b>Ort:</b> $location<br/><br/>
#end
	
#set($expirationtime = $item.getAttribute("expirationtime"))
#if($expirationtime)
Verfallsdatum: $format.format($expirationtime)<br/><br/>
#end
	
#set($uri = $item.getAttributeAsString("url"))
#if("$!uri"!="")
Link zu zusätzlicher Information:<br/>
<a href="$uri">$uri</a><br/><br/>
#end

#set($updater = $item.getAttribute("updater"))
#set($updatetime = $item.getAttribute("updatetime"))
#if($updater)
 Letzte Aktualisierung durch
 <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)">
 $userPresenter.getUserName($updater)</a>
 #if($updatetime)
 , am/um $format.format($updatetime)
 #end
 <br/>
#elseif($updatetime)
 Letzte Aktualisierung am/um $format.format($updatetime)<br/>
#end

<p>Kategorien, denen die Mitteilung zugeordnet ist:
<ul>
#foreach ($c in $item.getAttribute("categories"))
 <li>$categoryPresenter.getCategory($c).getTitle("$lang")
#end
#if (!$item.getAttribute("categories"))
 <li>keine Kategorien
#end
</ul>

</td></tr>
</table>

Index: item.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/item.html.de,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- item.html.de	15 Sep 2006 06:38:29 -0000	1.2
+++ item.html.de	22 Sep 2006 17:40:53 -0000	1.3
@@ -13,6 +13,23 @@
 <div class="error">Item mit Identifikator "$!itemid" existiert nicht.</div>
 #else
 
+#set ($acc = "true")
+#set ( $perm = $item.getAttribute("permission") )
+#if ( "$!perm" == "nur Mitarbeiter" )
+#if ( $userPresenter.checkRole($auserid,"mitarbeiter")=="false" )
+#set ($acc = "false")
+#end
+#end
+
+#if ($acc == "false")
+
+<div class="error">
+Sie haben nicht ausreichend Rechte um auf das gewünschte Item mit dem
+Identifikator "$!itemid" zuzugreifen.
+</div>
+
+#else
+
 #set($itemclass = $item.getItemClass())
 #set ( $itemname = $itemManager.getOntology().getClass("$itemclass").getDescription("de") )
 #if ("$!itemname"=="")
@@ -115,4 +132,6 @@
 #end
 #end
 
+#end
+
 $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

--- NEW FILE: index.html.de ---

$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest)

<h1>Dynamische Inhalte</h1>

#if ( $returnCode == 1001 )
<p><div class="success">Item erfolgreich veröffentlicht.</div></p>
#end

<p>Als registrierter Benutzer können Sie Ankündigungen und
Mitteilungen publizieren, die dann an interessierte Benutzer
weitergeleitet werden und in ausgewählten Bereichen dieser Website
dargestellt werden.</p>

<p>Folgende Typen von dynamischen Inhalten können angelegt werden:</p>
<ul>
<li><a href="itemcreate.html?itemclass=tummsg">Mitteilung (tummsg)</a>
<li><a href="itemcreate.html?itemclass=tumdate">Veranstaltungsankündigung (tumdate)</a>
<li><a href="itemcreate.html?itemclass=odate">Offizielle Veranstaltungsankündigung (odate)</a>
<p>
<li><a href="itemcreate.html?itemclass=da">Diplom/Master/Bachelorarbeitsangebot (da)</a>
<li><a href="itemcreate.html?itemclass=idp">IdP-Angebot (idp)</a>
<li><a href="itemcreate.html?itemclass=sypro">Systementwicklungsprojektangebot (sypro)</a>
<p>
<li><a href="itemcreate.html?itemclass=fww">Jobangebot (job)</a>
<p>
<li><a href="itemcreate.html?itemclass=fww">Eintrag in Fakultätswegweiser (fww)</a>
<p>
&nbsp;
<p>
</ul>

<p>Ausserdem können Sie <a href="itemsearch.html">im Bestand der Items
suchen</a>.</p>


$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

Index: itemsearch.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemsearch.html.de,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- itemsearch.html.de	15 Sep 2006 06:38:29 -0000	1.14
+++ itemsearch.html.de	22 Sep 2006 17:40:53 -0000	1.15
@@ -3,17 +3,17 @@
 
 <h1>Inhaltssuche</h1>
 
-#if ("$!xpathquery"!="")
+#if ("$!query"!="")
 
-#set ($iresult = $itemManager.searchItems("$!xpathquery"))
+#set ($iresult = $itemPresenter.searchItems("$!qtext","$!qitemclass","$!qcategory","$!qcreator","creationtime","$!qolder","","$!qsortby",30))
 
 #if ($iresult.isEmpty())
     <h3>Keine Items gefunden.</h3>
-    <b>Es wurden keine Items gefunden, die zu Ihrer Suchanfrage</b>
-   "$xpathquery" <b>passen.</b>
+    <b>Es wurden keine Items gefunden, die zu Ihrer Suchanfrage passen.</b>
+<p>
 #else
     <h3>$iresult.size() Items gefunden</h3>
-    <b>Ihre Suchanfrage</b> "$xpathquery" <b>liefert die folgenden
+    <b>Ihre Suchanfrage liefert die folgenden
       Resultate:</b>
     <ul>
 #foreach ($item in $iresult)
@@ -45,25 +45,55 @@
 
 ## Show a textarea where the user can enter its query
 ## This query is then processed by the ItemServlet
+
+<p>Mit folgendem Formular können Sie die publizierten Inhalte (Items)
+nach verschiedenen Kriterien durchsuchen.</p>
+<p>
 <form action="$contextPath/item/itemsearch.html" method="get">
-    <table>
-        <tr>
-        <td><b>Bitte geben Sie ihre Suchanfrage hier an:</b></td>
-        </tr>
-        <tr>
-        <td><textarea name="xpathquery" cols="80" rows="5"></textarea></td>
-        </tr>
-    </table>
+<input type="hidden" name="query" value="t" />
+<table>
+<tr><td><b>Typ:</b></td></tr>
+<tr><td><select size="1" name="qitemclass">
+<option value="tummsg">Ankündigung</option>
+<option value="tumdate">Terminankündigung</option>
+<option value="odate">Offizielle Terminankündigung</option>
+<option value="da">Ankündigung Diplom/Master/Bachelorarbeit</option>
+<option value="idp">Ankündigung Interdisz. Projekt</option>
+<option value="sypro">Ankündigung Systementwicklungsprojekt</option>
+<option value="job">Jobangebot</option>
+<option value="fww">Eintrag Fakultätswegweiser</option>
+<option value="all">-- beliebig --</option>
+</select></td></tr>
+<tr><td colspan=2><b>Suchtext:</b></td></tr>
+<tr><td colspan=2><input type="text" name="qtext" size="40"></td></tr>
+<tr><td><b>Nicht älter als:</b></td>
+<td><b>Sortierung:</b></td></tr>
+<tr><td><select size="1" name="qolder">
+<option value="">--- beliebig ---</option>
+<option value="now-1">Ein Tag</option>
+<option value="now-14">Eine Woche</option>
+<option value="now-31" selected="true">Ein Monat</option>
+<option value="now-365">Ein Jahr</option>
+</select></td>
+<td><select size="1" name="qsortby">
+<option value="title">Titel</option>
+<option value="author">Autor</option>
+<option value="creationtime">Erstellungsdatum</option>
+<option value="updatetime">Änderungsdatum</option>
+</select></td></tr>
+<tr><td colspan=2><b>In den Kategorien:</b></td></tr>
+<tr><td colspan=2>
+<select size="10" name="qcategory" multiple="true">
+$itemPresenter.getCategoryOptions("community","$lang")
+</select>
+</td></tr>
+<tr><td colspan=2><b>Von Benutzer (Loginname):</b></td></tr>
+<tr><td colspan=2><input type="text" name="qcreator" size="20">
+</td></tr>
+</table>
 
-    <input type="submit" value="Suche durchführen"/>
+<input type="submit" value="Suche durchführen"/>
 </form>
 
-<p>Beispiele für Suchanfragen sind:</p>
-<pre>
-   /item[itemclass='item']
-   /item[itemclass='portalpage' and name='index.html']
-   /item[itemclass='portalpage'] and /item/folders/category/id=12
-</pre>
-
 
 $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

--- NEW FILE: template-odate.html ---

#set($format = $portalPresenter.getDateTimeFormatter($language, true))

<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%">
<tr><td>

#set($imageurl = $item.getAttributeAsString("imageurl"))
#if("$!imageurl"!="")
<img align="right" valign="top" width="80" src="$imageurl"/>
#end
	
#set($title = $item.getTitle("$!lang"))
#if("$!title"!="")
<b>$title</b>
#else
<b>$item.getTitle()</b>
<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font>
#end
<br/>

#set($creator = $item.getAttribute("creator"))
#set($creationtime = $item.getAttribute("creationtime"))
#if($creator)
 (von
  <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a>
 #if("$!creationtime"!="")
 , am/um $format.format($creationtime)
 #end
)
#elseif($creationtime)
 (am/um $format.format($creationtime))
#end
<p>

#set($starttime = $item.getAttribute("starttime"))
#set($endtime = $item.getAttribute("endtime"))
<p>Ab: $format.format($starttime)</p>
<p>Bis: $format.format($endtime)</p>

<table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td>
#set($content = $item.getContent("$!lang"))
#if("$content"!="")
<pre>$content
</pre>
#else
$item.getContent()
<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font>
#end
</td></tr></table><br/>

#set($location = $item.getAttributeAsString("location"))
#if("$location"!="")
<b>Ort:</b> $location<br/><br/>
#end
	
#set($expirationtime = $item.getAttribute("expirationtime"))
#if($expirationtime)
Verfallsdatum: $format.format($expirationtime)<br/><br/>
#end
	
#set($uri = $item.getAttributeAsString("url"))
#if("$!uri"!="")
Link zu zusätzlicher Information:<br/>
<a href="$uri">$uri</a><br/><br/>
#end

#set($updater = $item.getAttribute("updater"))
#set($updatetime = $item.getAttribute("updatetime"))
#if($updater)
 Letzte Aktualisierung durch
 <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)">
 $userPresenter.getUserName($updater)</a>
 #if($updatetime)
 , am/um $format.format($updatetime)
 #end
 <br/>
#elseif($updatetime)
 Letzte Aktualisierung am/um $format.format($updatetime)<br/>
#end

<p>Kategorien, denen die Mitteilung zugeordnet ist:
<ul>
#foreach ($c in $item.getAttribute("categories"))
 <li>$categoryPresenter.getCategory($c).getTitle("$lang")
#end
#if (!$item.getAttribute("categories"))
 <li>keine Kategorien
#end
</ul>

</td></tr>
</table>

--- NEW FILE: templateedit-sypro.html ---

<table cellspacing="10">
#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Titel (max. 80-100 Zeichen)</b> (in
<b>$itemPresenter.getLanguageName($lg)</b>)</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput("item", "title_${lg}", $lang, $velocityContext, 1, 50, false)
<br><font size="-1">(bitte möglichst aussagekräftig wählen - also 
  nicht nur "Vortrag" oder "Jobangebot", sondern auch Thema)</font>
</td></tr>
#end

#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Inhalt</b> (in <b>$itemPresenter.getLanguageName($lg)</b>, in HTML, 
 d.h. mit &lt;p&gt;, &lt;br&gt; etc.; keine &lt;table&gt;)
</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput($itemclass, "content_${lg}", $lang, $velocityContext, 15, 80, false)
</td></tr>
#end

<tr><td nowrap align=left colSpan=2>
<b>Zufgriff:</b>
</td></tr>
<tr><td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false)
</td></tr>

<tr>
<td colSpan=2><b>Kategorien:</b></td></tr>
<tr>
<td valign="top">
#set ( $categoryclass = "community" )
<select name="categories" size="10" multiple>
$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories"))
</select>
</td>
<td vAlign=top>Die Kategorien werden dazu benutzt, das
  Item den Interessengebieten von Benutzern und den verschiedenen
  Themenseiten zuzuordnen. Bitte wählen Sie die Communites zu Ihrem
  Item gewissenhaft aus (thematisch passend, nicht zu viele). <a 
  href="/community/read.html.de">Informationen zu den 
  einzelnen Communities</a>. </td>
</tr>

<tr><td nowrap align=left colSpan=2>
<b>Verweis zu weiteren Informationen</b> (URL, optional):
</td></tr>
<tr>
<td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false)
</td></tr>

<tr><td colSpan=2><b>Verfallsdatum:</b></td></tr>
<tr><td colSpan=2>
$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $velocityContext, 1, 20, false)
</td></tr>
</table>
        

--- NEW FILE: template-idp.html ---

#set($format = $portalPresenter.getDateTimeFormatter($lang, true))

<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%">
<tr><td>

#set($imageurl = $item.getAttributeAsString("imageurl"))
#if("$!imageurl"!="")
<img align="right" valign="top" width="80" src="$imageurl"/>
#end
	
#set($title = $item.getTitle("$!lang"))
#if("$!title"!="")
<b>$title</b>
#else
<b>$item.getTitle()</b>
<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font>
#end
<br/>

#set($creator = $item.getAttribute("creator"))
#set($creationtime = $item.getAttribute("creationtime"))
#if($creator)
 (von
  <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a>
 #if("$!creationtime"!="")
 , am/um $format.format($creationtime)
 #end
)
#elseif($creationtime)
 (am/um $format.format($creationtime))
#end
<p>

<table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td>
#set($content = $item.getContent("$!lang"))
#if("$content"!="")
<pre>$content
</pre>
#else
$item.getContent()
<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font>
#end
</td></tr></table><br/>

#set($location = $item.getAttributeAsString("location"))
#if("$location"!="")
<b>Ort:</b> $location<br/><br/>
#end
	
#set($expirationtime = $item.getAttribute("expirationtime"))
#if($expirationtime)
Verfallsdatum: $format.format($expirationtime)<br/><br/>
#end
	
#set($uri = $item.getAttributeAsString("url"))
#if("$!uri"!="")
Link zu zusätzlicher Information:<br/>
<a href="$uri">$uri</a><br/><br/>
#end

#set($updater = $item.getAttribute("updater"))
#set($updatetime = $item.getAttribute("updatetime"))
#if($updater)
 Letzte Aktualisierung durch
 <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)">
 $userPresenter.getUserName($updater)</a>
 #if($updatetime)
 , am/um $format.format($updatetime)
 #end
 <br/>
#elseif($updatetime)
 Letzte Aktualisierung am/um $format.format($updatetime)<br/>
#end

<p>Kategorien, denen die Mitteilung zugeordnet ist:
<ul>
#foreach ($c in $item.getAttribute("categories"))
 <li>$categoryPresenter.getCategory($c).getTitle("$lang")
#end
#if (!$item.getAttribute("categories"))
 <li>keine Kategorien
#end
</ul>

</td></tr>
</table>

--- NEW FILE: template-da.html ---

#set($format = $portalPresenter.getDateTimeFormatter($lang, true))

<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%">
<tr><td>

#set($imageurl = $item.getAttributeAsString("imageurl"))
#if("$!imageurl"!="")
<img align="right" valign="top" width="80" src="$imageurl"/>
#end
	
#set($title = $item.getTitle("$!lang"))
#if("$!title"!="")
<b>$title</b>
#else
<b>$item.getTitle()</b>
<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font>
#end
<br/>

#set($creator = $item.getAttribute("creator"))
#set($creationtime = $item.getAttribute("creationtime"))
#if($creator)
 (von
  <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a>
 #if("$!creationtime"!="")
 , am/um $format.format($creationtime)
 #end
)
#elseif($creationtime)
 (am/um $format.format($creationtime))
#end
<p>

<table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td>
#set($content = $item.getContent("$!lang"))
#if("$content"!="")
<pre>$content
</pre>
#else
$item.getContent()
<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font>
#end
</td></tr></table><br/>

#set($location = $item.getAttributeAsString("location"))
#if("$location"!="")
<b>Ort:</b> $location<br/><br/>
#end
	
#set($expirationtime = $item.getAttribute("expirationtime"))
#if($expirationtime)
Verfallsdatum: $format.format($expirationtime)<br/><br/>
#end
	
#set($uri = $item.getAttributeAsString("url"))
#if("$!uri"!="")
Link zu zusätzlicher Information:<br/>
<a href="$uri">$uri</a><br/><br/>
#end

#set($updater = $item.getAttribute("updater"))
#set($updatetime = $item.getAttribute("updatetime"))
#if($updater)
 Letzte Aktualisierung durch
 <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)">
 $userPresenter.getUserName($updater)</a>
 #if($updatetime)
 , am/um $format.format($updatetime)
 #end
 <br/>
#elseif($updatetime)
 Letzte Aktualisierung am/um $format.format($updatetime)<br/>
#end

<p>Kategorien, denen die Mitteilung zugeordnet ist:
<ul>
#foreach ($c in $item.getAttribute("categories"))
 <li>$categoryPresenter.getCategory($c).getTitle("$lang")
#end
#if (!$item.getAttribute("categories"))
 <li>keine Kategorien
#end
</ul>

</td></tr>
</table>

--- NEW FILE: template-fww.html ---

#set($format = $portalPresenter.getDateTimeFormatter($lang, true))

<table bgcolot="#dddddd" border="0">
<tr><td><h3>&nbsp;
#set($title = $item.getTitle("$!lang"))
#if("$!title"!="")
$title
#else
$item.getTitle()
#end
&nbsp;</h3>
</td></tr>
</table>

<p>

#set($content = $item.getContent("$!lang"))
#if("$content"!="")
$content
#else
$item.getContent()
#end

<p>

#set($uri = $item.getAttributeAsString("url"))
#if("$!uri"!="")
Verweis zu zusätzlicher Information:<br/>
<a href="$uri">$uri</a><br/><br/>
#end

#set($author = $item.getAttribute("author"))
#set($creationtime = $item.getAttribute("creationtime"))
#set($updatetime = $item.getAttribute("updatetime"))
<b>Ersteintrag:</b> $format.format($creationtime)
<br><b>Letzte Änderung:</b> $format.format($updatetime)
<br><b>Autor:</b> $!author

<p>

<ul>
#foreach ($ia in $item.getAttachments())
<li>$!ia.getTitle() (<a href="/ITEM?cmd=geta&aid=$!ia.getId()">$!ia.getMimeType()</a>): $!ia.getComment() von
  $ia.getPublisherId() - <a href="$contextPath/ITEM?cmd=removeattachment&cmd.success=$contextPath/item/item.html&cmd.error=$contextPath/item/item.html&itemid=$itemid&itemaid=$ia.getId()">löschen</a>
#end
</ul>

<p>

<em>Dieses Item ist Teil des <a
href="/dienste/fww.html">FMI-Wegweisers</a>, einer Sammlung von
Informationen für Mitarbeiter der Fakultäten für Mathematik und
Informatik durch das Servicebüro Personal.</em>

#set ( $itemdisplayattachments = "false" )
#set ( $itemdisplayannotations = "false" )
--- NEW FILE: templateedit-idp.html ---

<table cellspacing="10">
#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Titel (max. 80-100 Zeichen)</b> (in
<b>$itemPresenter.getLanguageName($lg)</b>)</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput("item", "title_${lg}", $lang, $velocityContext, 1, 50, false)
<br><font size="-1">(bitte möglichst aussagekräftig wählen - also 
  nicht nur "Vortrag" oder "Jobangebot", sondern auch Thema)</font>
</td></tr>
#end

#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Inhalt</b> (in <b>$itemPresenter.getLanguageName($lg)</b>, in HTML, 
 d.h. mit &lt;p&gt;, &lt;br&gt; etc.; keine &lt;table&gt;)
</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput($itemclass, "content_${lg}", $lang, $velocityContext, 15, 80, false)
</td></tr>
#end

<tr><td nowrap align=left colSpan=2>
<b>Zufgriff:</b>
</td></tr>
<tr><td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false)
</td></tr>

<tr>
<td colSpan=2><b>Kategorien:</b></td></tr>
<tr>
<td valign="top">
#set ( $categoryclass = "community" )
<select name="categories" size="10" multiple>
$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories"))
</select>
</td>
<td vAlign=top>Die Kategorien werden dazu benutzt, das
  Item den Interessengebieten von Benutzern und den verschiedenen
  Themenseiten zuzuordnen. Bitte wählen Sie die Communites zu Ihrem
  Item gewissenhaft aus (thematisch passend, nicht zu viele). <a 
  href="/community/read.html.de">Informationen zu den 
  einzelnen Communities</a>. </td>
</tr>

<tr><td nowrap align=left colSpan=2>
<b>Verweis zu weiteren Informationen</b> (URL, optional):
</td></tr>
<tr>
<td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false)
</td></tr>

<tr><td colSpan=2><b>Verfallsdatum:</b></td></tr>
<tr><td colSpan=2>
$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $velocityContext, 1, 20, false)
</td></tr>
</table>
        

--- index.html.en DELETED ---

--- NEW FILE: templateedit-job.html ---

<table cellspacing="10">
#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Titel (max. 80-100 Zeichen)</b> (in
<b>$itemPresenter.getLanguageName($lg)</b>)</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput("item", "title_${lg}", $lang, $velocityContext, 1, 50, false)
<br><font size="-1">(bitte möglichst aussagekräftig wählen - also 
  nicht nur "Vortrag" oder "Jobangebot", sondern auch Thema)</font>
</td></tr>
#end

#foreach($lg in $selectedLangs)
<tr><td colspan="2">
<b>Inhalt</b> (in <b>$itemPresenter.getLanguageName($lg)</b>, in HTML, 
 d.h. mit &lt;p&gt;, &lt;br&gt; etc.; keine &lt;table&gt;)
</td></tr>
<tr><td colspan="2">
$itemPresenter.printAttrInput($itemclass, "content_${lg}", $lang, $velocityContext, 15, 80, false)
</td></tr>
#end

<tr><td nowrap align=left colSpan=2>
<b>Zufgriff:</b>
</td></tr>
<tr><td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false)
</td></tr>

<tr>
<td colSpan=2><b>Kategorien:</b></td></tr>
<tr>
<td valign="top">
#set ( $categoryclass = "community" )
<select name="categories" size="10" multiple>
$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories"))
</select>
</td>
<td vAlign=top>Die Kategorien werden dazu benutzt, das
  Item den Interessengebieten von Benutzern und den verschiedenen
  Themenseiten zuzuordnen. Bitte wählen Sie die Communites zu Ihrem
  Item gewissenhaft aus (thematisch passend, nicht zu viele). <a 
  href="/community/read.html.de">Informationen zu den 
  einzelnen Communities</a>. </td>
</tr>

<tr><td nowrap align=left colSpan=2>
<b>Verweis zu weiteren Informationen</b> (URL, optional):
</td></tr>
<tr>
<td noWrap align=left colSpan=2>
$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false)
</td></tr>

<tr><td colSpan=2><b>Verfallsdatum:</b></td></tr>
<tr><td colSpan=2>
$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $velocityContext, 1, 20, false)
</td></tr>
</table>
        

Index: itemcreate.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemcreate.html.de,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- itemcreate.html.de	15 Sep 2006 06:38:29 -0000	1.2
+++ itemcreate.html.de	22 Sep 2006 17:40:53 -0000	1.3
@@ -8,7 +8,6 @@
 #end
 
 #set ( $auserlogin = $userLogin )
-#end
 #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) )
 #set ( $auser = $userManager.getUser($auserid))
 #if ("$!author"=="")
@@ -32,6 +31,16 @@
 #end</ul></div><br/>
 #end
 
+#set ($acc = $userPresenter.checkPermission($auserid, "item", "create", "itemclass=$!itemclass")
+#if ($acc == "false")
+
+<div class="error">
+Sie haben nicht ausreichend Rechte um ein Item des gewünschten Typs
+"$itemclass" zu veröffentlichen.
+</div>
+
+#else
+
 <form action="$contextPath/ITEM" method="post" enctype="multipart/form-data">
 <input type="hidden" name="itemclass" value="${itemclass}"/>
 <input type="hidden" name="cmd" value="createitem"/>
@@ -83,5 +92,6 @@
 
 </form>
 
+#end
 
 $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

--- NEW FILE: test-rss20.xml ---
<?xml version="1.0"?>
<!-- this template shows the items of the selected item-class - should be displayed in RSS format -->
<rss version="2.0">

#set($format = $portalPresenter.getDateTimeFormatter($language, true))

<channel>
    <title>www.in.tum.de Ankündigungen</title>
    <link>http://www.in.tum.de/</link>
    <description>
        Neue Ankündigungen auf dem Portal der Fakultät für Informatik
        der Technischen Universität Monchen.
    </description>
    <language>de</language>
    <image>
        <title>TUM Logo</title>
        <url>http://www.cobricks.org/logo.png</url>
        <link>http://www.cobricks.org/</link>
        <width>100</width>
        <height>100</height>
    </image>
    <managingEditor></managingEditor>
    <webMaster>in...@co...</webMaster>
    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
    <rating>PICS rating of the channel</rating>
    <pubDate>Tue, 30 Nov 2004 00:00:01 GMT</pubDate>
    <lastBuildDate>Tue, 30 Nov 2004 00:00:01 GMT</lastBuildDate>

#set ($iresult = $itemPresenter.searchItemsByTime("creationtime", "desc", "", "now", ["tummsg","tumdate","odate","da","sypro","idp","fww"],[],10))
#foreach ($i in $iresult)
        #set($title = $i.getTitle("de"))
        #set($content = $i.getContent("de"))
        #set($categories = $i.getAttribute("categories"))
        #set($creator = $i.getAttribute("creator"))
        #set($creationtime = $i.getAttribute("creationtime"))
    <item>
        <title>$!title</title>
        <link>http://www.in.tum.de/item/item.html?itemid=$i.getId()</link>
        <description>$!content</description>
<!--        <category>$categories</category> -->
        <author>$userPresenter.getUserName($creator)</author>
        <pubDate>$format.format($creationtime)</pubDate>

    </item>

#end
</channel>
</rss>

Index: template.html
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- template.html	15 Sep 2006 06:38:29 -0000	1.2
+++ template.html	22 Sep 2006 17:40:53 -0000	1.3
@@ -88,7 +88,9 @@
 <p>Kategorien, denen das Item zugeordnet ist:
 <ul>
 #foreach ($c in $standardAttrs.get("categories"))
- <li>$categoryPresenter.getCategory($c).getTitle("$lang")
+#if ("$!c"!="0")
+ <li>$categoryPresenter.getCategory($c).getTitle("$!lang")
+#end
 #end
 #if (!$standardAttrs.get("categories"))
  <li>keine Kategorien

[Cobricks-cvscommit] drehscheibe-in build.xml

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15218

Modified Files:
	build.xml 
Log Message:


Index: build.xml
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build.xml	30 May 2006 14:14:29 -0000	1.4
+++ build.xml	22 Sep 2006 17:37:47 -0000	1.5
@@ -131,10 +131,27 @@
 <target name="dist" depends="compile"
   description="Create binary distribution">
     
-</target>
+  <mkdir  dir="${dist.home}"/>
 
-<target name="distsrc" depends=""
-  description="Create source code distribution">
+  <!-- Create JAR file for classes -->
+  <jar destfile="${dist.home}/drehscheibe.jar">
+    <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" />
+  </jar>
+  
+  <!-- Create JAR file for webspace -->
+  <jar destfile="${dist.home}/webapp.jar"
+       basedir="${build.home}/webapps/${webappname}">
+    <include name="user/**" />
+    <include name="item/**" />
+    <include name="portal/**" />
+    <include name="course/**" />
+    <include name="ADMIN/**" />
+    <!--
+    <include name="notfound.html.de" />
+    <include name="noaccess.html.de" />
+    <include name="noaccess-expired.html.de" />
+    -->
+  </jar>
   
 </target>
 
@@ -358,10 +375,24 @@
 <target name="moduleimport" depends="compile">
   <java fork="yes" classname="de.tum.cobricks.course.importModules" 
         classpathref="exec.classpath">
-      <arg line="build/webapps/ROOT/WEB-INF/conf Module_060510.xml"/>
+      <jvmarg value="-Dfile.encoding=utf-8"/>
+      <arg line="build/webapps/ROOT/WEB-INF/conf Module_060628.xml"/>
+  </java>
+</target>
+
+<target name="m" depends="compile">
+  <java fork="yes" classname="de.tum.cobricks.course.importModulesOld" 
+        classpathref="exec.classpath">
+      <jvmarg value="-Dfile.encoding=utf-8"/>
+      <arg line="build/webapps/ROOT/WEB-INF/conf NeueModule_060706.xml"/>
   </java>
 </target>
 
+<target name="migrate" depends="compile">
+  <java fork="yes"
+      classname="org.cobricks.util.migration.MigrationTool" maxmemory="512M"
+        classpathref="exec.classpath">
+  </java>
+</target>
 
 </project>
-

[Cobricks-cvscommit] cobricks2/src/org/cobricks/category CategoryManagerImpl.java CategoryServlet.java properties.txt

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/category
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11807/org/cobricks/category

Modified Files:
	CategoryManagerImpl.java CategoryServlet.java properties.txt 
Log Message:


Index: CategoryManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/CategoryManagerImpl.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- CategoryManagerImpl.java	13 Sep 2006 12:51:23 -0000	1.30
+++ CategoryManagerImpl.java	22 Sep 2006 17:28:54 -0000	1.31
@@ -63,7 +63,7 @@
     /**
      * The default value for the object cache - used in case no property is found
      */
-    private static final int DEFAULT_CACHE_SIZE = 200;
+    private static final int DEFAULT_CACHE_SIZE = 1250;
 
     // attributes that are stored in the categories table
     private static final String[] TABLE_MAIN_ATTRIBUTES = {
@@ -747,8 +747,9 @@
                 HashMap dbattrs = new HashMap();
                 dbattrs.put("catid",new Integer(catid));
                 dbattrs.put("lang", lang);
-                dbattrs.put("title", attrsTitle.get(lang));
-                dbAccess.sqlDelete("cat_title", dbattrs);
+                dbattrs.put("title", attrsTitle.get(lang));                
+                dbAccess.sqlExecute("delete from cat_title where lang='"
+                                    +lang+"' and catid="+catid);
                 dbAccess.sqlInsert("cat_title", dbattrs);
             }
             						

Index: CategoryServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/CategoryServlet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CategoryServlet.java	27 Jun 2006 10:55:15 -0000	1.17
+++ CategoryServlet.java	22 Sep 2006 17:28:54 -0000	1.18
@@ -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

Index: properties.txt
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/properties.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- properties.txt	13 Sep 2006 12:51:23 -0000	1.2
+++ properties.txt	22 Sep 2006 17:28:54 -0000	1.3
@@ -16,4 +16,4 @@
 org.cobricks.category.comp.presenter.1.class=org.cobricks.category.CategoryPresenter
 org.cobricks.category.comp.listento=
 
-category.cache.maxsize=250
\ No newline at end of file
+category.cache.maxsize=1250
\ No newline at end of file

[Cobricks-cvscommit] cobricks2/src/org/cobricks/item ItemManager.java ItemManagerImpl.java ItemPresenter.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11807/org/cobricks/item

Modified Files:
	ItemManager.java ItemManagerImpl.java ItemPresenter.java 
Log Message:


Index: ItemManager.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ItemManager.java	29 May 2006 09:15:19 -0000	1.31
+++ ItemManager.java	22 Sep 2006 17:28:55 -0000	1.32
@@ -254,10 +254,10 @@
      *
      * @param aname The attribute to search for (creationtime, updatetime,
      *   starttime, endtime, expirationtime)
-     * @param avalue The value to search for
-     * @param lowerthan If true, then aname <= avalue is searched and the
-     *   results are sorted in descending order, if false, aname >= avalue
-     *   is searched and the results are sorted in ascending order
+     * @param avaluelow lower bound (or 0 if ther is no lower bound)
+     * @param avaluehigh upper bound (or 0 if there is no upper bound)
+     * @param sortasc If true, then results are sorted in ascending order,
+     *   otherwise in descending order
      * @param noexpired If true, then do not return expired items
      * @param itemclasses List of possible item classes (String); 
      *   if empty, any item class will match
@@ -267,8 +267,8 @@
      * @return If no errors were encountered during the search, an eventually
      *   empty List of Items is returned. Otherwise null is returned.
      */
-    List searchItemsByTimestamp(String aname, long avalue, 
-                                boolean lowerthan, boolean noexpired, 
+    List searchItemsByTimestamp(String aname, long avaluelow, long avaluehigh,
+                                boolean sortasc, boolean noexpired, 
                                 List itemclasses, List categories,
                                 int maxrows)
         throws CobricksException;

Index: ItemPresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemPresenter.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ItemPresenter.java	18 Sep 2006 14:58:33 -0000	1.49
+++ ItemPresenter.java	22 Sep 2006 17:28:57 -0000	1.50
@@ -1128,7 +1128,8 @@
      * @param toRemove The Set defining which duplicates shall be removed
      * @return The newly created Set
      */
-    public final Set removeDuplicates(final Set set, final Set toRemove) {
+    public final Set removeDuplicates(final Set set, final Set toRemove)
+    {
         Iterator iter = set.iterator();
         Set result = new HashSet();
 
@@ -1151,7 +1152,8 @@
      * shall be removed
      * @return The newly generated Set
      */
-    public final Set removeUnchangedAttributes(Set attributes) {
+    public final Set removeUnchangedAttributes(Set attributes)
+    {
         return removeDuplicates(attributes, unchangedAttributesSet);
     }
 
@@ -1162,7 +1164,8 @@
      * @param set2 The second Set
      * @return The newly generated Set
      */
-    public final Set getCommonElements(final Set set1, final Set set2) {
+    public final Set getCommonElements(final Set set1, final Set set2)
+    {
         Iterator iter = set1.iterator();
         Set result = new HashSet();
 
@@ -1183,7 +1186,8 @@
      * @param string The String to be tested
      * @return True if the given String can be parsed as integer, false otherwise
      */
-    public final boolean isInteger(String string) {
+    public final boolean isInteger(String string)
+    {
         try {
             Integer.parseInt(string.trim());
         } catch (Exception e) {
@@ -1198,7 +1202,8 @@
      * @param itemID The ID of the desired item
      * @return The Item object
      */
-    public final Item getItem(String itemID) { //TBD: Potentially replaced by item
+    public final Item getItem(String itemID)
+    { //TBD: Potentially replaced by item
 
         //manager method getItem(String itemid)
         Item item = null;
@@ -1343,7 +1348,8 @@
      * @param lang The two-character representation of the language
      * @return The whole name of the language
      */
-    public final String getLanguageName(String lang) {
+    public final String getLanguageName(String lang)
+    {
         return (String) languagesMap.get(lang);
     }
 
@@ -1390,62 +1396,139 @@
     }
 
 
-
-    // tbd: add possibility to specify class/categories ...
-    // caching in itemmanager rein
-
-    List cachedResults = null;
-    long cacheTimestamp = 0;
-
-    public List searchItemsByCreationtime(String maxrows) 
-    {        
+    /**
+     * Search for items sorted by a time attribute (creationtime,
+     * updatetime, starttime, endtime, expirationtime)
+     *
+     * @param aname = name of attribute
+     * @param valuelow/high = now, now+X, now-X (X is number of days)
+     * @param itemclasses List of possible item classes (String); 
+     *   if empty, any item class will match
+     * @param categories List of possible categories (Integer); if empty, any
+     *   category will match
+     * @param maxrows Number of rows that should be returned maximally,
+     *   if empty, any items
+     * @return If no errors were encountered during the search, an eventually
+     *   empty List of Items is returned. Otherwise null is returned.
+     */
+    public List searchItemsByTime(String aname, String sort,
+                                  String valuelow, String valuehigh,
+                                  List itemclasses, List categories,
+                                  int maxrows) 
+    {
+        boolean sortasc = true;
+        if (sort.equals("desc"))
+            sortasc = false;
+        
+        boolean noexpired = true;
         long now = (new java.util.Date()).getTime();
-        if (cacheTimestamp>0 && cacheTimestamp>now-100000)
-            return cachedResults;
+        long avaluelow = now;
+        long avaluehigh = now;
+        if (valuelow.length()<1) {
+            avaluelow = 0;
+        } else {
+            if (valuelow.indexOf("+")>-1) {
+                int pos = valuelow.indexOf("+");
+                String tmps = valuelow.substring(pos+1);
+                try {
+                    int tmpi = Integer.parseInt(tmps);
+                    avaluelow += 24*60*60*1000*tmpi;
+                } catch (Exception e) { }
+            }
+            if (valuelow.indexOf("-")>-1) {
+                int pos = valuelow.indexOf("-");
+                String tmps = valuelow.substring(pos+1);
+                try {
+                    int tmpi = Integer.parseInt(tmps);
+                    avaluelow -= 24*60*60*1000*tmpi;
+                } catch (Exception e) { }
+            }
+        }
+        if (valuehigh.length()<1) {
+            avaluehigh = 0;
+        } else {
+            if (valuehigh.indexOf("+")>-1) {
+                int pos = valuehigh.indexOf("+");
+                String tmps = valuehigh.substring(pos+1);
+                try {
+                    int tmpi = Integer.parseInt(tmps);
+                    avaluehigh += 24*60*60*1000*tmpi;
+                } catch (Exception e) { }
+            }
+            if (valuehigh.indexOf("-")>-1) {
+                int pos = valuehigh.indexOf("-");
+                String tmps = valuehigh.substring(pos+1);
+                try {
+                    int tmpi = Integer.parseInt(tmps);
+                    avaluehigh -= 24*60*60*1000*tmpi;
+                } catch (Exception e) { }
+            }
+        }
+
+        List result = null;
         try {
-            int maxrowsint = 5;
-            try {
-                maxrowsint = Integer.parseInt(maxrows);
-            } catch (Exception e) { }
-            cachedResults = 
-                itemManager.searchItemsByTimestamp("creationtime", 0,
-                                                   true, true,
-                                                   null, null, maxrowsint);
-            cacheTimestamp = now;
-            return cachedResults;
+            result = itemManager.
+                searchItemsByTimestamp(aname, avaluelow, avaluehigh,
+                                       sortasc, noexpired,
+                                       itemclasses, categories,
+                                       maxrows);
         } catch (Exception e) {
-            logger.error(LogUtil.ex("Failed loading items", e));
-            return null;
+            logger.error(LogUtil.ex("failed", e));
         }
-    }
-
+        return result;
+    }    
 
+    
     /**
-     * This method returns the Item objects of items whose value of a given 
-     * timestamp attribute in the main table (item) is larger or small than a 
-     * given value. The items are sorted by the choosen attribute and only
-     * the first X items are returned.
+     * Search items with given text in title or content - plus some
+     * other constraints.
      * 
+     * @param qtext Text that has to occure in title or content of item.
      * @param itemclasses List of possible item classes (String); 
      *   if empty, any item class will match
      * @param categories List of possible categories (Integer); if empty, any
      *   category will match
-     * @param days
+     * @param creator Login of item creator
+     * @param aname optional time attribute constraining the items
+     * @param valuelow optional low value for time attribute constraining the items
+     * @param valuehigh optional high value for time attribute constraining the items
+     * @param sortby Name of attribute to sort items by
      * @param maxrows Number of rows that should be returned maximally,
      *   if empty, any items
      * @return If no errors were encountered during the search, an eventually
      *   empty List of Items is returned. Otherwise null is returned.
      */
-    public List searchItemsByValue(String aname,
-                                   List itemclasses, List categories,
-                                   int days, int maxrows)
+    public List searchItems(String qtext,
+                            String s1, String s2,
+                            String creator,
+                            String aname,
+                            String valuelow, String valuehigh,
+                            String sortby,
+                            int maxrows)
+    {
+        List itemclasses = new ArrayList();
+        if (s1!=null && s1.length()>0)
+            itemclasses.add(s1); // TBD
+        List categories = new ArrayList();
+        if (s2!=null && s2.length()>0)
+            categories.add(s2); // TBD
+        return searchItems(qtext, itemclasses, categories,
+                           creator, aname, valuelow, valuehigh,
+                           sortby, maxrows);
+    }
     
+    public List searchItems(String qtext,
+                            List itemclasses, List categories,
+                            String creator,
+                            String aname,
+                            String valuelow, String valuehigh,
+                            String sortby,
+                            int maxrows)
     {
         StringBuffer xpath = new StringBuffer();
-        
-        //for item
+
+        // for item
         if (itemclasses!=null && itemclasses.size()>0) {
-            
             Iterator i = itemclasses.iterator();
             xpath.append("/item[");
             while (i.hasNext()) {
@@ -1456,15 +1539,15 @@
                 if (i.hasNext()) xpath.append(" or ");
             }
             xpath.append("]");
-        }else{
+        } else {
             xpath.append("/item");	
         }
         
-        //for category
+        // for category
         if (categories!=null && categories.size()>0) {
             xpath.append(" and /item/categories/category[");
             Iterator i = categories.iterator();
-            while (i.hasNext()) {
+            while (i.hasNext()) {                
                 xpath.append("@id=");
                 xpath.append(i.next().toString());
                 
@@ -1472,17 +1555,31 @@
             }
             xpath.append("]");
         }
-        //dor date
-        if (days>0) {
-            if (aname == null || aname.length()<1)
-                aname = "creationtime";
-            xpath.append(" and ");	  
-            xpath.append("/item/"+aname+">=TODAY and ");
-            xpath.append("/item/"+aname+"<TODAY+");
-            xpath.append(days);   
+
+        // TBD:
+        // qtext
+        // creator
+        // sortby
+
+        if (aname!=null && aname.length()>0) {
+            if (valuelow!=null && valuelow.length()>0) {
+                valuelow = valuelow.toLowerCase();
+                valuelow = valuelow.replaceAll("now", "TODAY");
+                xpath.append(" and /item/");
+                xpath.append(aname);
+                xpath.append(">=");
+                xpath.append(valuelow);
+            }
+            if (valuehigh!=null && valuehigh.length()>0) {
+                valuehigh = valuehigh.toLowerCase();
+                valuehigh = valuehigh.replaceAll("now", "TODAY");
+                xpath.append(" and /item/");
+                xpath.append(aname);
+                xpath.append("<=");
+                xpath.append(valuehigh);
+            }
         }
         
-        logger.info ("searchItemsByValue: "+xpath.toString());
         List itemids = itemManager.searchItems(xpath.toString());
         //itemids = itemManager.sortItemsByAttribute(itemids,"<itemid>");
         List results = new ArrayList();
@@ -1511,18 +1608,6 @@
 
 
     /**
-     *
-     */
-    public String constructSearchXPath(PortalRequest portalRequest)
-    {
-        String itemclass = portalRequest.getRequestParameter("itemclass");
-        if (itemclass == null) itemclass = "item";
-        String result = "/item[itemclass='"+itemclass+"']";
-        return result;
-    }
-    
-    
-    /**
      * prints out the Channel Attrs and Item directly from the RSS-Link
      */
     public String printRssChannelAttrs(String rssUrl) 
@@ -1633,6 +1718,12 @@
 
     Map categoryListCache = null;
 
+    public String getCategoryOptions(String categoryclassname, 
+                                     String lang)
+    {
+        return getCategoryOptions(categoryclassname, lang, null);
+    }
+    
     /**
      *
      */
@@ -1640,6 +1731,9 @@
                                      String lang,
                                      Set selcat)
     {
+        logger.info("getCategoryOptions");
+        StringBuffer result = new StringBuffer("");
+        try {
         if (categoryListCache==null) categoryListCache = new HashMap();
         String key = lang+";"+categoryclassname;
         List categories = (List)categoryListCache.get(key);
@@ -1666,19 +1760,20 @@
             }
             categoryListCache.put(key, categories);
         }
-        StringBuffer result = new StringBuffer("");
 
         if (selcat != null) {
             Iterator ii = selcat.iterator();
             while (ii.hasNext()) {
                 Integer catid = (Integer)ii.next();
                 Category c = categoryManager.getCategory(catid.intValue());
-                result.append("<option value=\"");
-                result.append(Integer.toString(c.getId()));
-                result.append("\" selected");
-                result.append(">");
-                result.append(c.getTitle(lang));
-                result.append("</option>\n");
+                if (c != null) {
+                    result.append("<option value=\"");
+                    result.append(Integer.toString(c.getId()));
+                    result.append("\" selected");
+                    result.append(">");
+                    result.append(c.getTitle(lang));
+                    result.append("</option>\n");
+                }
             }
         }
         ListIterator i = categories.listIterator();
@@ -1694,7 +1789,9 @@
                 result.append("</option>\n");
             }
         }
-        
+        } catch (Exception e) {
+            logger.error(LogUtil.ex("failed", e));
+        }
         return result.toString();
     }
     

Index: ItemManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemManagerImpl.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- ItemManagerImpl.java	12 Sep 2006 12:42:32 -0000	1.70
+++ ItemManagerImpl.java	22 Sep 2006 17:28:57 -0000	1.71
@@ -438,7 +438,7 @@
         while (i.hasNext()) {
             attrs = (Map)i.next();
             String aname = (String)attrs.get("aname");
-            String avalue = (String)attrs.get("avalue");
+            String avalue = (attrs.get("avalue")).toString();
             // check for non-string attributes (Date, Integer) and convert them
             OntologyClassAttr oca = oc.getAttribute(aname);
             OntologyDataType odt = null;
@@ -1788,6 +1788,8 @@
     public void resetItemCache() 
     {
         itemCache.flush();
+        searchItemsByTimestampCache = new HashMap();
+        searchItemsByTimestampCacheTime = new HashMap();
     }
 
 
@@ -2187,26 +2189,43 @@
     /**
      * @see org.cobricks.item.ItemManager#searchItemsByTimestamp(java.lang.String,long,boolean,boolean,java.util.List,java.util.List)
      */
-    public List searchItemsByTimestamp(String aname, long avalue, 
-                                       boolean lowerthan, boolean noexpired, 
+    public List searchItemsByTimestamp(String aname,
+                                       long avaluelow, long avaluehigh,
+                                       boolean sortasc, boolean noexpired, 
                                        List itemclasses, List categories,
                                        int maxrows)
         throws CobricksException 
     {
+        // result caching for some seconds to boost performance
+        String cachekey = aname+sortasc+itemclasses.toString()
+            +categories.toString()+maxrows;
+        Date tmpd = (Date)searchItemsByTimestampCacheTime.get(cachekey);
+        if (tmpd!=null) {
+            long now = (new Date()).getTime();
+            if (tmpd.getTime()+30000 >= now) { // 30sec
+                return (List)searchItemsByTimestampCache.get(cachekey);
+            }
+        }
+        
         StringBuffer sql = new StringBuffer("select itemid ");
         if (aname != null && !aname.equals(""))
         	sql.append(", " + aname);
         sql.append(" from item where itemid > 0 ");
-        if (lowerthan) {
-            // tbd
+        if (avaluelow > 0) {
             sql.append(" and ");
             sql.append(aname);
-            sql.append(">0 ");
-        } else {
-            // tbd
+            sql.append(" >= '");
+            sql.append(DateUtil.date2String(new Date(avaluelow),
+                                            "yyyy-MM-dd HH:mm:ss"));
+            sql.append("'");
+        } 
+        if (avaluehigh > 0) {
             sql.append(" and ");
             sql.append(aname);
-            sql.append(">0 ");
+            sql.append(" <= '");
+            sql.append(DateUtil.date2String(new Date(avaluehigh),
+                                            "yyyy-MM-dd HH:mm:ss"));
+            sql.append("'");
         }
         if (noexpired) {
             sql.append(" and (expirationtime is null or "
@@ -2228,7 +2247,7 @@
         }
         sql.append(" order by ");
         sql.append(aname);
-        if (lowerthan) sql.append(" desc");
+        if (!sortasc) sql.append(" desc");
         List itemids = dbAccess.sqlQuery(sql.toString(), maxrows);
         
         // now get item objects
@@ -2242,10 +2261,16 @@
             if (item != null) result.add(item);
         }
 
+        searchItemsByTimestampCache.put(cachekey, result);
+        searchItemsByTimestampCacheTime.put(cachekey, new Date());
+        
         return result;
     }
 
+    Map searchItemsByTimestampCache = new HashMap();
+    Map searchItemsByTimestampCacheTime = new HashMap();
 
+    
     /**
      * @see org.cobricks.item.ItemManager#getXMLEncoding()
      */

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalManagerImpl.java PortalServlet.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11807/org/cobricks/portal

Modified Files:
	PortalManagerImpl.java PortalServlet.java 
Log Message:


Index: PortalServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServlet.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- PortalServlet.java	18 Sep 2006 14:57:29 -0000	1.48
+++ PortalServlet.java	22 Sep 2006 17:28:57 -0000	1.49
@@ -75,8 +75,8 @@
         String pagePath = portalRequest.getPagePath();
         String pageName = portalRequest.getPageName();
         String lang = portalRequest.getLang();
-        logger.info("pagePath="+pagePath+", pageName="+pageName
-                    +", lang="+lang);
+        logger.debug("pagePath="+pagePath+", pageName="+pageName
+                     +", lang="+lang);
 
         // process uri redirects
         String redirectUri = portalManager.getRedirect(uri);
@@ -270,7 +270,7 @@
             target = (String) session.getAttribute("logout.target");
         if (target==null) {
             String path = coreManager.getProperty("portal.logout.path");
-            if (path == null) path = "/logout.html";
+            if (path == null) path = "/user/logout.html";
             target = request.getScheme()+"://"+request.getServerName()+":"+
                 request.getServerPort()+path;
         }

Index: PortalManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- PortalManagerImpl.java	18 Sep 2006 14:57:29 -0000	1.87
+++ PortalManagerImpl.java	22 Sep 2006 17:28:57 -0000	1.88
@@ -457,6 +457,20 @@
         String lang = portalRequest.getLang();
         PortalObject page = getObject(pagePath, pageName);
 
+        // check if the expiration date is reached ...
+        Date expirationtime = null;
+        try {
+            expirationtime = (Date)page.getAttribute("expirationtime");
+        } catch (Exception e) {
+        }
+        if (expirationtime != null) {
+            if (expirationtime.before(new Date())) {
+                portalRequest.setPageName("/", "noaccess-expired.html");
+                printPage(portalRequest, page, out);
+                return;
+            }
+        }            
+
         // check if it is a text file or a binary one ...
         String mimetype = page.getMimeType();
         logger.debug("mimetype of request = "+mimetype);
@@ -468,7 +482,7 @@
         }
         // ... otherwise send file content directly
 
-        logger.info("identified non text file ... "+mimetype);
+        logger.debug("identified non text file ... "+mimetype);
 
         Object content = page.getPageContent(lang);
         if (content == null) {

[Cobricks-cvscommit] cobricks2/src/org/cobricks/item ItemPresenter.java ItemSearch.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14103/item

Modified Files:
	ItemPresenter.java ItemSearch.java 
Log Message:


Index: ItemPresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemPresenter.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- ItemPresenter.java	14 Sep 2006 12:21:26 -0000	1.48
+++ ItemPresenter.java	18 Sep 2006 14:58:33 -0000	1.49
@@ -1640,9 +1640,6 @@
                                      String lang,
                                      Set selcat)
     {
-        logger.error("getCategoryOptions: "+selcat);
-        logger.error("getCategoryOptions: "+selcat.getClass().getName());
-        
         if (categoryListCache==null) categoryListCache = new HashMap();
         String key = lang+";"+categoryclassname;
         List categories = (List)categoryListCache.get(key);
@@ -1655,7 +1652,6 @@
             ListIterator i = tmpResult.listIterator();
             while (i.hasNext()) {
                 Category c = (Category)i.next();
-                logger.error("--"+c.getId());
                 String key2 = c.getTitle(lang)+";"+Integer.toString(c.getId());
                 tmpSort.add(key2);
             }
@@ -1672,16 +1668,18 @@
         }
         StringBuffer result = new StringBuffer("");
 
-        Iterator ii = selcat.iterator();
-        while (ii.hasNext()) {
-            Integer catid = (Integer)ii.next();
-            Category c = categoryManager.getCategory(catid.intValue());
-            result.append("<option value=\"");
-            result.append(Integer.toString(c.getId()));
-            result.append("\" selected");
-            result.append(">");
-            result.append(c.getTitle(lang));
-            result.append("</option>\n");
+        if (selcat != null) {
+            Iterator ii = selcat.iterator();
+            while (ii.hasNext()) {
+                Integer catid = (Integer)ii.next();
+                Category c = categoryManager.getCategory(catid.intValue());
+                result.append("<option value=\"");
+                result.append(Integer.toString(c.getId()));
+                result.append("\" selected");
+                result.append(">");
+                result.append(c.getTitle(lang));
+                result.append("</option>\n");
+            }
         }
         ListIterator i = categories.listIterator();
         while (i.hasNext()) {

Index: ItemSearch.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemSearch.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ItemSearch.java	1 Sep 2006 11:32:14 -0000	1.25
+++ ItemSearch.java	18 Sep 2006 14:58:33 -0000	1.26
@@ -2749,9 +2749,9 @@
                             lastPathPart.equals("starttime") ||
                             lastPathPart.equals("endtime")) {
                         intDateType = handleDateTime((Comparison) nodeTest,
-                                "datetime");
+                                                     "datetime");
                     }
-                    //temporary simple type check for type int:
+                    // temporary simple type check for type int:
                     if (lastPathPart.equals("state") ||
                             lastPathPart.equals("itemid")) {
                         intDateType = true;
@@ -3041,7 +3041,7 @@
                                 lastPathPart.equals("starttime") ||
                                 lastPathPart.equals("endtime")) {
                             intDateType = handleDateTime((Comparison) nodeTest,
-                                    "datetime");
+                                                         "datetime");
                         }
 
                         //temporary simple type check for type int:
@@ -3598,7 +3598,8 @@
      *         false otherwise.
      */
     private static boolean handleDateTime(Comparison comparison,
-        String ontologyType) {
+                                          String ontologyType)
+    {
         Value value = null;
         DateTimeBasic dateTime = null;
         
@@ -3627,21 +3628,16 @@
             switch (dateTime.getDateSpanOperator()) {
             case DateSpanOperator.PLUS: 
                 c.add(Calendar.DAY_OF_MONTH, dateTime.getSpan());
-
                 break;
-
             case DateSpanOperator.MINUS: 
                 c.add(Calendar.DAY_OF_MONTH, -dateTime.getSpan());
-
                 break;
-
             default: //just "TODAY", do nothing
             }
  
             if (ontologyType.equals("datetime")) {
-                sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+                sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             }
-
             if (ontologyType.equals("date")) {
                 sdf = new SimpleDateFormat("yyyy-MM-dd");
             }
@@ -3654,7 +3650,7 @@
         //no term computing necessary, just adapting format        
         if (dateTime instanceof DateTime) {
             if (ontologyType.equals("datetime")) {
-                sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+                sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             }
 
             if (ontologyType.equals("date")) {

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalManagerImpl.java PortalServlet.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14082

Modified Files:
	PortalManagerImpl.java PortalServlet.java 
Log Message:


Index: PortalServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServlet.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- PortalServlet.java	29 May 2006 15:57:29 -0000	1.47
+++ PortalServlet.java	18 Sep 2006 14:57:29 -0000	1.48
@@ -145,7 +145,8 @@
             if (userid < 1) {
                 // userid does not exist in platform database
                 // check if there is a user handler for the login
-                UserHandler userHandler = userManager.getUserHandler(userlogin);
+                UserHandler userHandler =
+                    userManager.getUserHandler(userlogin);
                 if (userHandler != null) {
                     user = userHandler.handleUnknownUser(userlogin, userpw);
                 }                
@@ -158,11 +159,26 @@
                 user = userManager.getUser(userid);
             }
             if (!skipAuthentication) {
-                if (!user.checkCredentials(userpw)) {
-                    // password does not match ...
-                    logger.info("Password for userid "+userid+" not correct.");
-                    portalRequest.setReturnCode(2202);
-                    return "error";
+                // first check if the authentication should be
+                // checked via a UserHandler
+                UserHandler userHandler =
+                    userManager.getUserHandler(userlogin);
+                if (userHandler != null) {
+                    if(!userHandler.handleCheckCredentials(user, userpw)) {
+                        // password does not match ...
+                        logger.info("Password for userid "+userid
+                                    +" not correct.");
+                        portalRequest.setReturnCode(2202);
+                        return "error";
+                    }
+                } else {
+                    if (!user.checkCredentials(userpw)) {
+                        // password does not match ...
+                        logger.info("Password for userid "+userid
+                                    +" not correct.");
+                        portalRequest.setReturnCode(2202);
+                        return "error";
+                    }
                 }
             }
             portalRequest.setPortalUser(new PortalUser(user));

Index: PortalManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- PortalManagerImpl.java	14 Sep 2006 12:21:26 -0000	1.86
+++ PortalManagerImpl.java	18 Sep 2006 14:57:29 -0000	1.87
@@ -175,6 +175,8 @@
         portalFolders = new HashMap();
         portalFoldersByPath = new HashMap();
         pageItemIdCache = new HashMap();
+        //
+        initializePortalFolders();
     }
 
     
@@ -1236,7 +1238,7 @@
     {
         super.init(componentId, managerId, properties, coreManager, dbAccess);
 
-        //Set properties
+        // set properties
         Utility.setProperties(properties);
         
         // portal properties
@@ -1345,6 +1347,7 @@
         itemManager = (ItemManager)cd.getManager("itemManager");
         categoryManager = (CategoryManager)cd.getManager("categoryManager");
         userManager = (UserManager) cd.getManager("userManager");
+        
         // load portal folder objects from Category Component
         // initialize filesystem webspace folder categories
         initializePortalFolders();

[Cobricks-cvscommit] cobricks2/src/org/cobricks/user User.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8577

Modified Files:
	User.java 
Log Message:


Index: User.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/User.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- User.java	11 Jul 2006 10:27:03 -0000	1.30
+++ User.java	18 Sep 2006 14:42:29 -0000	1.31
@@ -167,7 +167,7 @@
                 return false;
             }
             if (((String)credentials).length()<2)
-          return false;
+                return false;
             return UnixCrypt.matches(pwEncrypted, (String)credentials);
         } else {
             logger.error("Unsupported credentials class "

[Cobricks-cvscommit] cobricks2/src/org/cobricks/core/util UnixCrypt.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8528

Modified Files:
	UnixCrypt.java 
Log Message:


Index: UnixCrypt.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util/UnixCrypt.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- UnixCrypt.java	12 Feb 2004 06:25:26 -0000	1.2
+++ UnixCrypt.java	18 Sep 2006 14:42:10 -0000	1.3
@@ -612,7 +612,10 @@
      * @return <B>true</B> if the password should be considered correct.
      */
     public final static boolean matches(String encryptedPassword,
-					String enteredPassword) {
+					String enteredPassword)
+    {
+        if (encryptedPassword == null || encryptedPassword.length()<3)
+            return false;
 	String salt = encryptedPassword.substring(0, 2);
 	String newCrypt = crypt(salt, enteredPassword);
 	return newCrypt.equals(encryptedPassword);

[Cobricks-cvscommit] drehscheibe-in/web/user user.html.de

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/web/user
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30270/user

Modified Files:
	user.html.de 
Log Message:


Index: user.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user.html.de,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- user.html.de	13 Sep 2006 13:06:20 -0000	1.10
+++ user.html.de	15 Sep 2006 06:38:29 -0000	1.11
@@ -46,13 +46,6 @@
 
 <p>Loginname: $auserlogin</p>
 
-<form action="/USER" method="post" enctype="multipart/form-data">
-<INPUT TYPE="hidden" NAME="cmd" VALUE="update" />
-<input type="hidden" name="cmd.success" value="/user/user.html" />
-<input type="hidden" name="cmd.error" value="/user/user.html" />
-<input type="hidden" name="path" value="$portalRequest.getPagePath()"/>
-<input type="hidden" name="auserid" value="$auserid" />
-<input type="hidden" name="anames" value="basic.personal.lastname,basic.personal.firstname,basic.personal.title,basic.contact-priv.online.email,basic.contact-priv.online.uri,preference.language,basic.personal.languagesspoken,basic.personal.imageuri,basic.university.status,basic.university.subject,basic.university.graduation" />
 <p>
 #if ($returnCode == 1020)
   <p><div class="error">Fehler beim Aktualisieren des Benutzerprofils.</div></p>
@@ -76,7 +69,7 @@
 </td></tr></table></td>
 <td align="right">
 <table border="0" cellpadding="5pt"><tr><td>
-<form action="change_password.html" method="get">
+<form action="/user/change_password.html" method="get">
 <input type="submit" value="Passwort &auml;ndern" />
 </form>
 <!--<em><a href="change_password.html?auserlogin=$auserlogin">Passwort &auml;ndern</a></em>-->
@@ -84,6 +77,14 @@
 </td></tr>
 <tr><td colspan="2">
 
+<form action="/USER" method="post" enctype="multipart/form-data">
+<INPUT TYPE="hidden" NAME="cmd" VALUE="update" />
+<input type="hidden" name="cmd.success" value="/user/user.html" />
+<input type="hidden" name="cmd.error" value="/user/user.html" />
+<input type="hidden" name="path" value="$portalRequest.getPagePath()"/>
+<input type="hidden" name="auserid" value="$auserid" />
+<input type="hidden" name="anames" value="basic.personal.lastname,basic.personal.firstname,basic.personal.title,basic.contact-priv.online.email,basic.contact-priv.online.uri,preference.language,basic.personal.languagesspoken,basic.personal.imageuri,basic.university.status,basic.university.subject,basic.university.graduation" />
+
 <table border="0" cellpadding="8pt">
 <tr><td>
 
@@ -136,6 +137,8 @@
 <font size="-2">URL (Pfad) zum Bild angeben, z.B. http://www.mein-bild.de/foto.jpg</font></p>
 </td></tr></table><br>
 
+</form>
+
 <p>
 <table border="0" width="100%"><tr><td>
 <input type="submit" value="Benutzerprofil aktualisieren">

[Cobricks-cvscommit] drehscheibe-in/web/item index.html.en item.html.de itemcreate.html.de itemdelete.html.de itemsearch.html.de itemupdate.html.de template-date.html template-msg.html template.html templateedit-date.html templateedit-msg.html

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/drehscheibe-in/web/item
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30270/item

Modified Files:
	index.html.en item.html.de itemcreate.html.de 
	itemdelete.html.de itemsearch.html.de itemupdate.html.de 
	template-date.html template-msg.html template.html 
	templateedit-date.html templateedit-msg.html 
Log Message:


Index: template-date.html
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-date.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- template-date.html	13 Sep 2006 13:09:53 -0000	1.1
+++ template-date.html	15 Sep 2006 06:38:29 -0000	1.2
@@ -1,7 +1,7 @@
 
 #set($format = $portalPresenter.getDateTimeFormatter($language, true))
 
-<table border="1pt" cellpadding="5pt" width="100%">
+<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%">
 <tr><td>
 
 #set($imageurl = $item.getAttributeAsString("imageurl"))
@@ -9,12 +9,12 @@
 <img align="right" valign="top" width="80" src="$imageurl"/>
 #end
 	
-#set($title = $item.getTitle("$!language"))
-#if($title)
+#set($title = $item.getTitle("$!lang"))
+#if("$!title"!="")
 <b>$title</b>
 #else
 <b>$item.getTitle()</b>
-<br><font size="-2">(Kein Titel in der angefragten Sprache $language verfügbar.)</font>
+<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font>
 #end
 <br/>
 
@@ -22,12 +22,12 @@
 #set($creationtime = $item.getAttribute("creationtime"))
 #if($creator)
  (von
-  <a href="$contextPath/user/user.html?auserlogin=$creator.getUserLogin()">$creator.getName()</a>
+  <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a>
  #if("$!creationtime"!="")
  , am/um $format.format($creationtime)
  #end
 )
-#elseif("$!creationtime"!="")
+#elseif($creationtime)
  (am/um $format.format($creationtime))
 #end
 <p>
@@ -38,13 +38,13 @@
 <p>Bis: $format.format($endtime)</p>
 
 <table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td>
-#set($content = $item.getContent("$!language"))
+#set($content = $item.getContent("$!lang"))
 #if("$content"!="")
 <pre>$content
 </pre>
 #else
 $item.getContent()
-<br/>(Kein Inhalt in der angefragten Sprache "$language" verfügbar.)
+<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font>
 #end
 </td></tr></table><br/>
 
@@ -59,7 +59,7 @@
 #end
 	
 #set($uri = $item.getAttributeAsString("url"))
-#if($uri)
+#if("$!uri"!="")
 Link zu zusätzlicher Information:<br/>
 <a href="$uri">$uri</a><br/><br/>
 #end
@@ -68,8 +68,8 @@
 #set($updatetime = $item.getAttribute("updatetime"))
 #if($updater)
  Letzte Aktualisierung durch
- <a href="$contextPath/user/user.html?auserlogin=$updater.getUserLogin()">
- $updater.getName()</a>
+ <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)">
+ $userPresenter.getUserName($updater)</a>
  #if($updatetime)
  , am/um $format.format($updatetime)
  #end
@@ -81,7 +81,7 @@
 <p>Kategorien, denen die Mitteilung zugeordnet ist:
 <ul>
 #foreach ($c in $item.getAttribute("categories"))
- <li>$c.getTitle($language)
+ <li>$categoryPresenter.getCategory($c).getTitle("$lang")
 #end
 #if (!$item.getAttribute("categories"))
  <li>keine Kategorien

Index: itemsearch.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemsearch.html.de,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- itemsearch.html.de	13 Sep 2006 13:28:31 -0000	1.13
+++ itemsearch.html.de	15 Sep 2006 06:38:29 -0000	1.14
@@ -1,76 +1,69 @@
 
 $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest)
 
-<em><a href="index.html">Item Component</a> - 
-<a href="itemsearch.html">Item Search</a>
-</em>
+<h1>Inhaltssuche</h1>
 
-<h1>Cobricks-2 - Item Search</h1>
+#if ("$!xpathquery"!="")
 
-#if ($returnCode == 2004)
-  <p><div class="error">Failed searching for "$!XPathQuery".</div></p>
-#end
+#set ($iresult = $itemManager.searchItems("$!xpathquery"))
 
-#if ($returnCode == 1004)
-#if ($itemlist.isEmpty())
-    <h2>No results found</h2>
-    <b>No items were found that match your query</b> "$xPathQuery" <br/>
-    <b>Please try again.</b>
+#if ($iresult.isEmpty())
+    <h3>Keine Items gefunden.</h3>
+    <b>Es wurden keine Items gefunden, die zu Ihrer Suchanfrage</b>
+   "$xpathquery" <b>passen.</b>
 #else
-    <h2>$itemlist.size() result(s) found</h2>
-    <b>Your query</b> "$xPathQuery" <b>led to the following result(s):</b>
+    <h3>$iresult.size() Items gefunden</h3>
+    <b>Ihre Suchanfrage</b> "$xpathquery" <b>liefert die folgenden
+      Resultate:</b>
     <ul>
-    #foreach ($item in $itemlist)
-        #set ($title = false)
-        #set ($title = $item.getTitle())
-        #if ($title)
-            <li><a href="item.html?itemid=$item.getId()&fromSearch=true">$title</a></li>
-        #else
-            <li><a href="item.html?itemid=$item.getId()&fromSearch=true">No title specified for this item</a>
-        #end
-#set ( $accedit = $userPresenter.checkPermission($userId, "item", "update", $i) )
-#set ( $accdel = $userPresenter.checkPermission($userId, "item", "delete", $i) )
+#foreach ($item in $iresult)
+#set ( $itemclass = $item.getAttribute("itemclass") )
+#set ($title = false)
+#set ($title = $item.getTitle())
+#if ($title)
+<li>
+<img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)">
+<a href="item.html?itemid=$item.getId()&fromSearch=true">$title</a>
+#else
+<li>
+<img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)">
+<a href="item.html?itemid=$item.getId()&fromSearch=true">kein Titel</a>
+#end
+#set ( $accedit = $userPresenter.checkPermission($userId, "item", "update", $item) )
+#set ( $accdel = $userPresenter.checkPermission($userId, "item", "delete", $item) )
 #if ( "$!accedit" == "true" )
 - <a href="itemupdate.html?itemid=$i.getId()">edit</a> 
 #end
 #if ( "$!accdel" == "true" )
 - <a href="/ITEM?cmd=deleteitem&cmd.success=/item/itemlist.html&cmd.error=/item/itemlist.html&itemid=$i.getId()&itemclass=$!itemclass">delete</a>
 #end
-        </li>
-    #end
-    </ul>
+</li>
+#end
+</ul>
 #end
 #end
 
 ## Show a textarea where the user can enter its query
 ## This query is then processed by the ItemServlet
-<form action="$contextPath/ITEM" method="get">
+<form action="$contextPath/item/itemsearch.html" method="get">
     <table>
         <tr>
-        <td><b>Please enter your query here:</b></td>
+        <td><b>Bitte geben Sie ihre Suchanfrage hier an:</b></td>
         </tr>
         <tr>
-        <td><textarea name="xPathQuery" cols="80" rows="5"></textarea></td>
+        <td><textarea name="xpathquery" cols="80" rows="5"></textarea></td>
         </tr>
     </table>
 
-    <input type="hidden" name="cmd" value="xpathsearchitem">
-    <input type="hidden" name="cmd.success" value="$contextPath/item/itemsearch.html">
-    <input type="hidden" name="cmd.error" value="$contextPath/item/itemsearch.html">
-
-    <input type="submit" value="Search"/>
+    <input type="submit" value="Suche durchführen"/>
 </form>
 
-<p>Examples for queries are:</p>
+<p>Beispiele für Suchanfragen sind:</p>
 <pre>
    /item[itemclass='item']
    /item[itemclass='portalpage' and name='index.html']
    /item[itemclass='portalpage'] and /item/folders/category/id=12
 </pre>
 
-<form action="$contextPath/item/index.html" method="get">
-    <input type="submit" value="Back to item overview"/>
-</form>
-
 
 $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

Index: itemdelete.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemdelete.html.de,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- itemdelete.html.de	13 Sep 2006 13:12:22 -0000	1.1
+++ itemdelete.html.de	15 Sep 2006 06:38:29 -0000	1.2
@@ -1,24 +1,13 @@
 
 $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest)
 
-<em><a href="index.html">Item Component</a> -
-<a href="itemdelete.html">Item Delete</a></em>
-
-<h1>Cobricks-2 - Item Delete</h1>
+<h1>Item Löschen</h1>
 
 #if ($returnCode == 1002)
-  <p><div class="success">Item deleted.</div></p>
+  <p><div class="success">Item "$itemid" wurde erfolgreich gelöscht.</div></p>
 #elseif ($returnCode == 2002)
-  <p><div class="error">Failed deleting item.</div></p>
+  <p><div class="error">Fehler beim Löschen des Items "$!itemid".</div></p>
 #end
 
-<form action="$contextPath/ITEM" method="get">
-    <input type="hidden" name="cmd" value="deleteitem"/>
-    <input type="hidden" name="cmd.success" value="$contextPath/item/itemdelete.html"/>
-    <input type="hidden" name="cmd.error" value="$contextPath/item/itemdelete.html"/>
-    Item with itemid=<input name="itemid" type="text" size="5">
-    <input type="submit" value="Delete">
-</form>
-
 
 $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

Index: templateedit-msg.html
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/templateedit-msg.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- templateedit-msg.html	13 Sep 2006 13:09:53 -0000	1.1
+++ templateedit-msg.html	15 Sep 2006 06:38:29 -0000	1.2
@@ -1,8 +1,4 @@
 
-#if($catid)
-#set($selectedCat = $!categoryPresenter.getCategory($catid))
-#end
-
 <table cellspacing="10">
 #foreach($lg in $selectedLangs)
 <tr><td colspan="2">
@@ -14,6 +10,7 @@
   nicht nur "Vortrag" oder "Jobangebot", sondern auch Thema)</font>
 </td></tr>
 #end
+
 #foreach($lg in $selectedLangs)
 <tr><td colspan="2">
 <b>Inhalt</b> (in <b>$itemPresenter.getLanguageName($lg)</b>, in HTML, 
@@ -28,7 +25,7 @@
 <b>Zufgriff:</b>
 </td></tr>
 <tr><td noWrap align=left colSpan=2>
-$itemPresenter.printAttrInput($itemclass, "permission", $lang, null, 1, 30, false)
+$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false)
 </td></tr>
 
 <tr>
@@ -36,22 +33,8 @@
 <tr>
 <td valign="top">
 #set ( $categoryclass = "community" )
-#set ( $parentid = "$!parentid" )
-#set ( $catid = "$!catid")
-#set ( $title = "$!title")
-#set ( $selcatid = $selectedCat.getId() )
 <select name="categories" size="10" multiple>
-#foreach( $i in  $categoryPresenter.getSortedCategories($!categoryclass, $!parentid, $!title, "$!lang") )
-#if("$!selcatid"=="$!i.getId()")
-  <option value="$!i.getId()" selected>
-    $!i.getTitle()
-  </option>
-#else
-  <option value="$!i.getId()">
-    $!i.getTitle()
-  </option>
-#end
-#end
+$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories"))
 </select>
 </td>
 <td vAlign=top>Die Kategorien werden dazu benutzt, das
@@ -61,17 +44,18 @@
   href="/community/read.html.de">Informationen zu den 
   einzelnen Communities</a>. </td>
 </tr>
-<tr><td noWrap align=left colSpan=2>
+
+<tr><td nowrap align=left colSpan=2>
 <b>Verweis zu weiteren Informationen</b> (URL, optional):
 </td></tr>
 <tr>
 <td noWrap align=left colSpan=2>
-$itemPresenter.printAttrInput($itemclass, "url", $lang, null, 1, 80, false)
+$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false)
 </td></tr>
 
 <tr><td colSpan=2><b>Verfallsdatum:</b></td></tr>
 <tr><td colSpan=2>
-$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, null, 1, 20, false)
+$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $velocityContext, 1, 20, false)
 </td></tr>
 </table>
         

Index: templateedit-date.html
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/templateedit-date.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- templateedit-date.html	13 Sep 2006 13:09:53 -0000	1.1
+++ templateedit-date.html	15 Sep 2006 06:38:29 -0000	1.2
@@ -1,8 +1,4 @@
 
-#if($catid)
-#set($selectedCat = $!categoryPresenter.getCategory($catid))
-#end
-
 <table cellspacing="10">
 #foreach($lg in $selectedLangs)
 <tr><td colspan="2">
@@ -17,11 +13,11 @@
 
 <tr><td colSpan=2><b>Anfangstermin:</b></td></tr>
 <tr><td colSpan=2>
-$itemPresenter.printAttrInput($itemclass, "starttime", $lang, null, 1, 20, false)
+$itemPresenter.printAttrInput($itemclass, "starttime", $lang, $velocityContext, 1, 20, false)
 </td></tr>
 <tr><td colSpan=2><b>Endtermin:</b></td></tr>
 <tr><td colSpan=2>
-$itemPresenter.printAttrInput($itemclass, "endtime", $lang, null, 1, 20, false)
+$itemPresenter.printAttrInput($itemclass, "endtime", $lang, $velocityContext, 1, 20, false)
 </td></tr>
 
 #foreach($lg in $selectedLangs)
@@ -38,7 +34,7 @@
 <b>Zufgriff:</b>
 </td></tr>
 <tr><td noWrap align=left colSpan=2>
-$itemPresenter.printAttrInput($itemclass, "permission", $lang, null, 1, 30, false)
+$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false)
 </td></tr>
 
 <tr>
@@ -46,22 +42,8 @@
 <tr>
 <td valign="top">
 #set ( $categoryclass = "community" )
-#set ( $parentid = "$!parentid" )
-#set ( $catid = "$!catid")
-#set ( $title = "$!title")
-#set ( $selcatid = $selectedCat.getId() )
 <select name="categories" size="10" multiple>
-#foreach( $i in  $categoryPresenter.getSortedCategories($!categoryclass, $!parentid, $!title, "$!lang") )
-#if("$!selcatid"=="$!i.getId()")
-  <option value="$!i.getId()" selected>
-    $!i.getTitle()
-  </option>
-#else
-  <option value="$!i.getId()">
-    $!i.getTitle()
-  </option>
-#end
-#end
+$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories"))
 </select>
 </td>
 <td vAlign=top>Die Kategorien werden dazu benutzt, das
@@ -71,12 +53,17 @@
   href="/community/read.html.de">Informationen zu den 
   einzelnen Communities</a>. </td>
 </tr>
+
 <tr><td noWrap align=left colSpan=2>
 <b>Verweis zu weiteren Informationen</b> (URL, optional):
 </td></tr>
 <tr><td noWrap align=left colSpan=2>
-$itemPresenter.printAttrInput($itemclass, "url", $lang, null, 1, 80, false)
+$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false)
 </td></tr>
 
+<tr><td colSpan=2><b>Verfallsdatum:</b></td></tr>
+<tr><td colSpan=2>
+$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $velocityContext, 1, 20, false)
+</td></tr>
 </table>
         

Index: itemcreate.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemcreate.html.de,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- itemcreate.html.de	13 Sep 2006 13:09:53 -0000	1.1
+++ itemcreate.html.de	15 Sep 2006 06:38:29 -0000	1.2
@@ -1,12 +1,19 @@
 
 $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest)
 
-#set ( $auserlogin = "$!auserlogin" )
-#if ( $auserlogin == "" )
+#set ($lang = "de")
+#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages"))
+#if(!$selectedLangs)
+#set ($selectedLangs = [$lang])
+#end
+
 #set ( $auserlogin = $userLogin )
 #end
 #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) )
 #set ( $auser = $userManager.getUser($auserid))
+#if ("$!author"=="")
+#set ($author = $auser.getName())
+#end
 
 #if("$!itemclass"=="")
 #set($itemclass = "item")
@@ -25,12 +32,6 @@
 #end</ul></div><br/>
 #end
 
-#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages"))
-#if(!$selectedLangs)
-#set($selectedLangs = [$lang])
-#end
-
-
 <form action="$contextPath/ITEM" method="post" enctype="multipart/form-data">
 <input type="hidden" name="itemclass" value="${itemclass}"/>
 <input type="hidden" name="cmd" value="createitem"/>
@@ -43,10 +44,6 @@
 #end
 
 #set ($itemtemplate = $itemPresenter.getItemEditTemplate("$!itemclass"))
-#if ($itemtemplate == "")
-#set ( $itemtemplate = "/item/templateedit.html" )
-#end
-
 $portalPresenter.parse("$itemtemplate",$portalRequest,"/item/templateedit.html")
 
 <p>

Index: item.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/item.html.de,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- item.html.de	13 Sep 2006 13:09:53 -0000	1.1
+++ item.html.de	15 Sep 2006 06:38:29 -0000	1.2
@@ -1,21 +1,27 @@
 
 $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest)
 
-#set ( $auserlogin = "$!auserlogin" )
-#if ( $auserlogin == "" )
-#set ( $auserlogin = $userLogin )
+#set ($lang = "de")
+#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages"))
+#if(!$selectedLangs)
+#set ($selectedLangs = [$lang])
 #end
-#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) )
-#set ( $auser = $userManager.getUser($auserid))
 
 #set($item = $itemPresenter.getItem($itemid))
+#if(!$item)
+<h1>Item anzeigen</h1>
+<div class="error">Item mit Identifikator "$!itemid" existiert nicht.</div>
+#else
+
 #set($itemclass = $item.getItemClass())
 #set ( $itemname = $itemManager.getOntology().getClass("$itemclass").getDescription("de") )
 #if ("$!itemname"=="")
 #set ($itemname = "Item")
 #end
 
+#if ( $itemclass!="fww")
 <h3>$itemname</h3>
+#end
 
 #if ($returnCode == 1005)
   <p><div class="success">Anmerkung angefügt.</div></p>
@@ -45,10 +51,14 @@
 #set ($itemtemplate = $itemPresenter.getItemTemplate("details", $item))
 
 <p>
-$portalPresenter.parse("$itemtemplate",$portalRequest,"/item/template.html")
-</p>
+$portalPresenter.parse("$itemtemplate",$portalRequest,"/item/template.html")<br>
+<div align="right"><form action="/item/itemupdate.html" method="get">
+<input type="hidden" name="itemid" value="$itemid">
+<input type="submit" value="Editieren"></form></div>
 
+</p>
 
+#if ("$!itemdisplayattachments"!="false")
 ## Print attachments
 <h3>Attachments:</h3>
 <ul>
@@ -73,7 +83,9 @@
   </form>
 
 <br/>
+#end
 
+#if ("$!itemdisplayannotations"!="false")
 ## Print annotations and a form to insert annotations
 <h3>Anmerkungen:</h3>
 <ul>
@@ -100,8 +112,7 @@
   </form>
 
 <br/>
-
-<a href="/item/itemupdate.html?itemid=$itemid">Item editieren</a>
-
+#end
+#end
 
 $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest)

Index: itemupdate.html.de
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemupdate.html.de,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- itemupdate.html.de	13 Sep 2006 13:09:53 -0000	1.1
+++ itemupdate.html.de	15 Sep 2006 06:38:29 -0000	1.2
@@ -1,171 +1,88 @@
 
 $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest)
 
-<h1>Cobricks-2 - Item Update</h1>
+#set ($lang = "de")
+#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages"))
+#if(!$selectedLangs)
+#set ($selectedLangs = [$lang])
+#end
+
+#set ( $auserlogin = "$!auserlogin" )
+#if ( $auserlogin == "" )
+#set ( $auserlogin = $userLogin )
+#end
+#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) )
+#set ( $auser = $userManager.getUser($auserid))
 
 #if($createdItem)
-	#set($itemid= $!createdItem.getLocalId())
-	#set($item = $itemManager.getItem($itemid))
+#set($itemid= $!createdItem.getLocalId())
+#set($item = $itemManager.getItem($itemid))
+#elseif($itemid)
+#set($item = $itemPresenter.getItem($itemid))
 #end
-#if($itemid)
-	#set($item = $itemPresenter.getItem($itemid))
-	#set($item = $itemManager.getItem($itemid))
+
+#if(!$item)
+<h1>Item editieren</h1>
+<div class="error">Item mit Identifikator "$!itemid" existiert nicht.</div>
+#else
+
+#set ($itemclass = $item.getItemClass())
+#set ($itemname = $itemManager.getOntology().getClass("$itemclass").getDescription("de") )
+#if ("$!itemname"=="")
+#set ($itemname = "Item")
 #end
 
+<h1>$!itemname editieren</h1>
+
 #if($returnCode == 1003)
-<div class="success">Successfully updated item.</div><br/>
+<div class="success">Item erfolgreich aktualisiert.</div><br/>
 #elseif($returnCode == 2003)
-<div class="error">Failed updating item. The following error(s) ocurred:
+<div class="error">Fehler beim Aktualisieren des Items:
 <ul>#foreach($error in $errors)
 <li>$corePresenter.printErrorMessage($error, "$!lang")</li>
 #end</ul></div><br/>
 #end
 
-#set($item = $itemPresenter.getItem($itemid))
-#if(!$itemPresenter.isInteger($itemid))
-<div class="error">Item Id $!itemid is not an integer.</div>
-<form action="$contextPath/item/itemupdate_start.html" method="get">
-            <input type="submit" value="Back"/>
-</form>
-#elseif(!$item)
-<div class="error">Item with item Id $!itemid does not exist.</div>
-<form action="$contextPath/item/itemupdate_start.html" method="get">
-            <input type="submit" value="Back"/>
-</form>
-#else
-
 #set ($acc = $userPresenter.checkPermission("$userId", "item", "update", "itemid=$itemid"))
 #if ($acc == "false")
 
 <div class="error">
-You do not have the appropriate permissions to update this item.
+Sie haben nicht ausreichend Rechte um das gewünschte Item mit dem
+Identifikator "$!itemid" zu editieren.
 </div>
 
 #else
 
-<form action="$contextPath/ITEM" method="get">
-<input type="hidden" name="cmd" value="deleteitem"/>
-<input type="hidden" name="cmd.success" value="$contextPath/item/itemdelete.html"/>
-<input type="hidden" name="cmd.error" value="$contextPath/item/itemdelete.html"/>
-<input type="hidden" name="itemid" value="$itemid"/>
-<p>
-    <table><tr>
-    <td><input type="submit" value="Delete"/></td>
-    <td>(if you want to delete this item)</td>
-    </tr></table>
-</p>
-</form>
-
 #set($itemclass = $item.getItemClass())
-#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages"))
-#if(!$selectedLangs)
-    #set($selectedLangs = [$lang])
-#end
 
 <form action="$contextPath/ITEM" method="get">
 <input type="hidden" name="itemid" value="$!itemid">
-#foreach($lg in $selectedLangs)
-  <input type="hidden" name="_languages" value="${lg}"/>
-#end
-
-<p>
-<b>Item class</b>
-$itemPresenter.printDropDown("itemclass", $itemclass, "itemclass", false)
-<p>
-
-<table cellspacing="10">
-#set($CURRENT_ATTR = "title")
-$portalPresenter.parse("attribute_fields.html", $portalRequest)
-#set($CURRENT_ATTR = "content")
-$portalPresenter.parse("attribute_fields.html", $portalRequest)
-</table>
-
-    <table cellspacing="10"><tr valign="top">
-    <td><b>State</b><br/>$itemPresenter.printDescription($itemclass, "state", $lang)</td>
-    <td>$itemPresenter.printDropDown("state", $itemPresenter.printAttribute($item.getAttribute("state"), $lang), "state", false)</td>
-    <td align="right"><b>Location</b><br/>$itemPresenter.printDescription($itemclass, "location", $lang)</td>
-    <td>$itemPresenter.printAttrInput($itemclass, "location", $lang, $itemPresenter.printAttribute($item.getAttribute("location"), $lang), 1, 50, false)</td>
-    </tr><tr valign="top">
-    <td><b>Expiration<br/>time</b><br/>$itemPresenter.printDescription($itemclass, "expirationtime", $lang)</td>
-    <td>$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $itemPresenter.printAttribute($item.getAttribute("expirationtime"), $lang), 1, 20, false)</td>
-    <td align="right"><b>Origin</b><br/>$itemPresenter.printDescription($itemclass, "origin", $lang)</td>
-    <td>$itemPresenter.printAttrInput($itemclass, "origin", $lang, $itemPresenter.printAttribute($item.getAttribute("origin"), $lang), 1, 50, false)</td>
-    </tr></table>
-</p>
-
-<input type="hidden" name="globalid" value="$itemPresenter.printAttribute($item.getAttribute("globalid"), $lang)"/>
-<input type="hidden" name="updater" value="${userId}"/>
-<input type="hidden" name="updatetime" value="$portalPresenter.getCurrentDateTime($lang)"/>
-<input type="hidden" name="creator" value="$itemPresenter.printAttribute($item.getAttribute("creator"), $lang)"/>
-<input type="hidden" name="creationtime" value="$itemPresenter.printAttribute($item.getAttribute("creationtime"), $lang)"/>
-<!-- TBD --><input type="hidden" name="_lang" value="${lang}"/>
 <input type="hidden" name="cmd" value="updateitem"/>
 <input type="hidden" name="cmd.success" value="$contextPath/item/itemupdate.html"/>
 <input type="hidden" name="cmd.error" value="$contextPath/item/itemupdate.html"/>
-<input type="hidden" name="cmd.changedItemClass" value="$contextPath/item/itemupdate_changedIC.html"/>
 
-#set($allAttrs = $itemPresenter.getAttributeNames($itemclass))
-#set($itemAttrs = $itemPresenter.getAttributeNames("item"))
-#set($attrs = $itemPresenter.removeDuplicates($allAttrs, $itemAttrs))
-	
-#if(!$attrs.isEmpty())	
-    <p>
-    <table cellspacing="10">
-        #foreach($attr in $attrs)
-            #set($CURRENT_ATTR = $attr)
-            $portalPresenter.parse("attribute_fields.html", $portalRequest)
-        #end
-    </table>
-    </p>
+#foreach($lg in $selectedLangs)
+  <input type="hidden" name="_languages" value="${lg}"/>
 #end
 
-<hr/>
+#set ($itemtemplate = $itemPresenter.getItemEditTemplate("$!itemclass"))
+$itemPresenter.setItemAttrInContext($item, $velocityContext)
+$portalPresenter.parse("$itemtemplate",$portalRequest,"/item/templateedit.html")
 
 <p>
-<h2>Change/add custom attributes:</h2>
-#set($temp = $item.getAttributeNames())
-#set($custattrs = $itemPresenter.removeDuplicates($temp, $allAttrs))
-    <table cellspacing="10">
-        #if(!$custattrs.isEmpty())
-        <tr><td colspan="4"><b>Previously defined:</b></td></tr>
-        #foreach($cattr in $custattrs)
-            <tr valign="top">
-            <td><b>$cattr</b></td>
-            <td colspan="3">$itemPresenter.printNewAttrInput($cattr, $itemPresenter.printAttribute($item.getAttribute($cattr), $lang), 80)</td>
-            </tr>
-        #end
-        #end
-        <tr><td colspan="4"><b>Defined by yourself:</b></td></tr>
-        <tr valign="top">
-        <td><b>Attribute name</b></td>
-        <td>$itemPresenter.printNewAttrInput("_customAname_1", null, 10)</td>
-        <td><b>Attribute value</b></td>
-        <td>$itemPresenter.printNewAttrInput("_customAvalue_1", null, 80)</td>
-        </tr>
-        <tr valign="top">
-        <td><b>Attribute name</b></td>
-        <td>$itemPresenter.printNewAttrInput("_customAname_2", null, 10)</td>
-        <td><b>Attribute value</b></td>
-        <td>$itemPresenter.printNewAttrInput("_customAvalue_2", null, 80)</td>
-        </tr>
-        <tr valign="top">
-        <td><b>Attribute name</b></td>
-        <td>$itemPresenter.printNewAttrInput("_customAname_3", null, 10)</td>
-        <td><b>Attribute value</b></td>
-        <td>$itemPresenter.printNewAttrInput("_customAvalue_3", null, 80)</td>
-        </tr>
-    </table>
+<input type="submit" value="$itemname aktualisieren"/>
 </p>
-<hr/>
 
-<p>
-    <table><tr>
-        <td><input type="submit" value="Save changes"/></td>
-        <td><input type="reset" value="Reset all values"/></td>
-    </tr></table>
-</p>
 </form>
 
+<div align="right">
+<form action="$contextPath/ITEM" method="get">
+<input type="hidden" name="cmd" value="deleteitem"/>
+<input type="hidden" name="cmd.success" value="$contextPath/item/itemdelete.html"/>
+<input type="hidden" name="cmd.error" value="$contextPath/item/itemdelete.html"/>
+<input type="hidden" name="itemid" value="$itemid"/>
+<input type="submit" value="Item löschen"/>
+</form></div>
 
 #end
 

Index: template-msg.html
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-msg.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- template-msg.html	13 Sep 2006 13:09:53 -0000	1.1
+++ template-msg.html	15 Sep 2006 06:38:29 -0000	1.2
@@ -1,7 +1,7 @@
 
-#set($format = $portalPresenter.getDateTimeFormatter($language, true))
+#set($format = $portalPresenter.getDateTimeFormatter($lang, true))
 
-<table border="1pt" cellpadding="5pt" width="100%">
+<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%">
 <tr><td>
 
 #set($imageurl = $item.getAttributeAsString("imageurl"))
@@ -9,12 +9,12 @@
 <img align="right" valign="top" width="80" src="$imageurl"/>
 #end
 	
-#set($title = $item.getTitle("$!language"))
-#if($title)
+#set($title = $item.getTitle("$!lang"))
+#if("$!title"!="")
 <b>$title</b>
 #else
 <b>$item.getTitle()</b>
-<br><font size="-2">(Kein Titel in der angefragten Sprache $language verfügbar.)</font>
+<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font>
 #end
 <br/>
 
@@ -22,7 +22,7 @@
 #set($creationtime = $item.getAttribute("creationtime"))
 #if($creator)
  (von
-  <a href="$contextPath/user/user.html?auserlogin=$creator.getUserLogin()">$creator.getName()</a>
+  <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a>
  #if("$!creationtime"!="")
  , am/um $format.format($creationtime)
  #end
@@ -33,13 +33,13 @@
 <p>
 
 <table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td>
-#set($content = $item.getContent("$!language"))
+#set($content = $item.getContent("$!lang"))
 #if("$content"!="")
 <pre>$content
 </pre>
 #else
 $item.getContent()
-<br/>(Kein Inhalt in der angefragten Sprache "$language" verfügbar.)
+<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font>
 #end
 </td></tr></table><br/>
 
@@ -54,7 +54,7 @@
 #end
 	
 #set($uri = $item.getAttributeAsString("url"))
-#if($uri)
+#if("$!uri"!="")
 Link zu zusätzlicher Information:<br/>
 <a href="$uri">$uri</a><br/><br/>
 #end
@@ -63,8 +63,8 @@
 #set($updatetime = $item.getAttribute("updatetime"))
 #if($updater)
  Letzte Aktualisierung durch
- <a href="$contextPath/user/user.html?auserlogin=$updater.getUserLogin()">
- $updater.getName()</a>
+ <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)">
+ $userPresenter.getUserName($updater)</a>
  #if($updatetime)
  , am/um $format.format($updatetime)
  #end
@@ -76,7 +76,7 @@
 <p>Kategorien, denen die Mitteilung zugeordnet ist:
 <ul>
 #foreach ($c in $item.getAttribute("categories"))
- <li>$c.getTitle($language)
+ <li>$categoryPresenter.getCategory($c).getTitle("$lang")
 #end
 #if (!$item.getAttribute("categories"))
  <li>keine Kategorien

Index: index.html.en
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/index.html.en,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.html.en	13 Sep 2006 13:09:53 -0000	1.1
+++ index.html.en	15 Sep 2006 06:38:29 -0000	1.2
@@ -17,6 +17,10 @@
 <li><a href="itemcreate.html?itemclass=tummsg">Mitteilung (tummsg)</a>
 <li><a href="itemcreate.html?itemclass=tumdate">Veranstaltungsankündigung (tumdate)</a>
 <p>
+<li><a href="itemcreate.html?itemclass=fww">Eintrag in Fakultätswegweiser (fww)</a>
+<p>
+&nbsp;
+<p>
 <li><a href="termin.html">Veranstaltungsankündigung - offiziell (odate)</a>
 <li><a href="bookmark.html">Mitteilung (bookmark)</a>
 <p>
@@ -24,16 +28,11 @@
 <li><a href="idp.html">IdP-Angebot (da)</a>
 <li><a href="sypro.html">Systementwicklungsprojektangebot (sypro)</a>
 <p>
-<li><a href="job.html">Jobangebot (da)</a>
-<p>
-<li><a href="sypro.html">Systementwicklungsprojektangebot (fww)</a>
-<li><a href="sypro.html">Systementwicklungsprojektangebot (vwm)</a>
-<li><a href="sypro.html">Systementwicklungsprojektangebot (fipro)</a>
-<li><a href="sypro.html">Systementwicklungsprojektangebot (fipra)</a>
-<li><a href="sypro.html">Systementwicklungsprojektangebot (fidoc)</a>
-<li><a href="sypro.html">Systementwicklungsprojektangebot (conv)</a>
+<li><a href="job.html">Jobangebot (job)</a>
 </ul>
 
+<p>Ausserdem können Sie <a href="itemsearch.html">im Bestand der Items
+suchen</a>.</p>
 
 <table width="100%" border=0>
 <tbody>
@@ -51,16 +50,10 @@
 #foreach ($i in $iresult)
   #set ( $itemclass = $i.getAttribute("itemclass") )
   <tr><td vAlign=top>
-  #if($itemclass=="diplom")
-    <img alt=- src="images/itemtypeicon-da.gif">
-  #elseif($itemclass=="sep")
-    <img alt=- src="images/itemtypeicon-sypro.gif">
-  #else
-    <img alt=- src="images/itemtype.gif">
-  #end
+  <img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)">
   &nbsp;</td>
   <td>
-  <a href="/item/item.html?itemid=$i.getId()">$i.getTitle() xxx</a>
+  <a href="/item/item.html?itemid=$i.getId()">$i.getTitle()</a>
   #if($i.getAttribute("expirationtime")) 
   [$i.getAttribute("expirationtime")]
   #end 
@@ -87,10 +80,10 @@
 #foreach ($i in $iresult)
   #set ( $itemclass = $i.getAttribute("itemclass") )
   <tr><td vAlign=top>
-  <img alt=- src="$itemPresenter.getItemTypeIcon()">
+  <img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)">
   &nbsp;</td>
   <td>
-  <a href="/item/item.html?itemid=$i.getId()">$i.getTitle()</a>
+  <a href="/item/item.html?itemid=$i.getId()">$i.getTitle() xxx</a>
   #if($i.getAttribute("expirationtime")) 
   [$i.getAttribute("expirationtime")]
   #end 

Index: template.html
===================================================================
RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- template.html	13 Sep 2006 13:09:53 -0000	1.1
+++ template.html	15 Sep 2006 06:38:29 -0000	1.2
@@ -1,6 +1,8 @@
 ## default item display (if no special display was defined in the
 ## properties
 
+#set($format = $portalPresenter.getDateTimeFormatter($language, true))
+
 ## Divide the attributes of this item into two categories:
 ## 1. The standard attributes (standardAttrs): Attributes that are
 ##    defined in the ontology
@@ -10,9 +12,8 @@
 #set($map = $itemPresenter.categorizeItemAttributes($item))
 #set($standardAttrs = $map.get("standard"))
 #set($additionalAttrs = $map.get("additional"))
-#set($format = $portalPresenter.getDateTimeFormatter($language, true))
 
-<table border="1pt" cellpadding="5pt" width="100%">
+<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%">
 <tr><td>
 
 #set($imageurl = $standardAttrs.get("imageurl"))
@@ -20,32 +21,31 @@
 <img align="right" valign="top" width="80" src="$imageurl"/>
 #end
 	
-#set($title = $item.getTitle("$!language"))
-<h2>
-#if($title)
-$title
+#set($title = $item.getTitle("$!lang"))
+#if("$!title"!="")
+<b>$title</b>
 #else
-$item.getTitle()
-<br><font size="-2">Kein Titel in der angefragten Sprache $language verfügbar.)</font>
+<b>$item.getTitle()</b>
+<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font>
 #end
-</h2>
+<br/>
 
-#set($creator = $standardAttrs.get("creator"))
-#set($creationtime = $standardAttrs.get("creationtime"))
+#set($creator = $item.getAttribute("creator"))
+#set($creationtime = $item.getAttribute("creationtime"))
 #if($creator)
- (veröffentlicht durch
-  <a href="$contextPath/user/user.html?auserlogin=$creator.getUserLogin()">$creator.getName()</a>
+ (von
+  <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a>
  #if("$!creationtime"!="")
  , am/um $format.format($creationtime)
  #end
-)<br/><br/>
+)
 #elseif($creationtime)
- (veröffentlicht am/um $format.format($creationtime))<br/><br/>
+ (am/um $format.format($creationtime))
 #end
-<br/>
+<p>
 
 #set($location = $standardAttrs.get("location"))
-#if($location)
+#if("$!location"!="")
 <b>Ort:</b> $location<br/><br/>
 #end
 	
@@ -55,27 +55,28 @@
 #end
 	
 <table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td>
-#set($content = $item.getContent("$!language"))
+#set($content = $item.getContent("$!lang"))
 #if("$content"!="")
 <pre>$content
 </pre>
 #else
-Kein Inhalt in der angefragten Sprache $language verfügbar.
+$item.getContent()
+<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font>
 #end
 </td></tr></table><br/>
 
 #set($uri = $standardAttrs.get("url"))
-#if($uri)
+#if("$!uri"!="")
  Link zu zusätzlicher Information:<br/>
  <a href="$uri">$uri</a><br/><br/>
 #end
 
-#set($updater = $standardAttrs.get("updater"))
-#set($updatetime = $standardAttrs.get("updatetime"))
+#set($updater = $item.getAttribute("updater"))
+#set($updatetime = $item.getAttribute("updatetime"))
 #if($updater)
  Letzte Aktualisierung durch
- <a href="$contextPath/user/user.html?auserlogin=$updater.getUserLogin()">
- $updater.getName()</a>
+ <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)">
+ $userPresenter.getUserName($updater)</a>
  #if($updatetime)
  , am/um $format.format($updatetime)
  #end
@@ -87,7 +88,7 @@
 <p>Kategorien, denen das Item zugeordnet ist:
 <ul>
 #foreach ($c in $standardAttrs.get("categories"))
- <li>$c.getTitle($language)
+ <li>$categoryPresenter.getCategory($c).getTitle("$lang")
 #end
 #if (!$standardAttrs.get("categories"))
  <li>keine Kategorien