cobricks-cvscommit — Information about commits to the CVS repository

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

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

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

Modified Files:
	CourseManagerImpl.java CourseModule.java CoursePresenter.java 
	CourseServlet.java 
Log Message:


Index: CourseManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseManagerImpl.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- CourseManagerImpl.java	30 May 2006 14:32:00 -0000	1.55
+++ CourseManagerImpl.java	11 Jul 2006 10:27:03 -0000	1.56
@@ -759,6 +759,7 @@
         copyAttr("cmhours_sem", attrs, sqlAttrs);
         copyAttr("cmhours_lab", attrs, sqlAttrs);
         copyAttr("cmcapacity", attrs, sqlAttrs);
+        copyAttr("cmlang", attrs, sqlAttrs);
         copyAttr("cmresponsible", attrs, sqlAttrs);
         copyAttr("cmcomment", attrs, sqlAttrs);
         // add new attributes
@@ -787,6 +788,8 @@
                     if (o != null) sqlAttrs2.put("cpendsem", o);
                     o = attrs.get("type"+i);
                     if (o != null) sqlAttrs2.put("cptype", o);
+                    o = attrs.get("cpcomment"+i);
+                    if (o != null) sqlAttrs2.put("cpcomment", o);  
                     dbAccess.sqlInsert("course_progrel", sqlAttrs2);
                 } 
             } 
@@ -829,6 +832,7 @@
         copyAttr("cmcycle", attrs, sqlAttrs);
         copyAttr("cmhidden", attrs, sqlAttrs);     
         copyAttr("cmcapacity", attrs, sqlAttrs);  
+        copyAttr("cmlang", attrs, sqlAttrs);  
         copyAttr("cmresponsible", attrs, sqlAttrs);  
         copyAttr("cmcomment", attrs, sqlAttrs);
         copyAttr("cmhours_lec", attrs, sqlAttrs);
@@ -859,7 +863,8 @@
                     if (o != null) sqlAttrs2.put("cpendsem", o);
                     o = attrs.get("type"+i);
                     if (o != null) sqlAttrs2.put("cptype", o);
-//                    logger.debug("Progrel : "+sqlAttrs2.toString()+" "+i);
+                    o = attrs.get("cpcomment"+i);
+                    if (o != null) sqlAttrs2.put("cpcomment", o);
                     dbAccess.sqlInsert("course_progrel", sqlAttrs2);
                 } 
             }       

Index: CoursePresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CoursePresenter.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- CoursePresenter.java	30 May 2006 14:32:00 -0000	1.21
+++ CoursePresenter.java	11 Jul 2006 10:27:03 -0000	1.22
@@ -216,6 +216,7 @@
             try {
                 Map attrs = new HashMap();
                 attrs.put("cmname", cmname);
+                attrs.put("cmhidden", "0");
                 result = courseManager.searchCourseModules(attrs,"cmname");
             } catch (Exception e) { 
                 logger.error(LogUtil.ex("Failed getting course modules.", e));

Index: CourseServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseServlet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- CourseServlet.java	30 May 2006 14:32:00 -0000	1.20
+++ CourseServlet.java	11 Jul 2006 10:27:03 -0000	1.21
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.StringTokenizer;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 
@@ -442,6 +443,8 @@
                 attrs.put("cmectscredits", new BigDecimal(tmps));
             } catch (Exception e) { }
         }
+        attrs.put("cmcapacity", prequest.getRequestParameter("cmcapacity"));
+        attrs.put("cmlang", prequest.getRequestParameter("cmlang"));
         attrs.put("cmcontent", 
                   prequest.getRequestParameter("cmcontent"));
         attrs.put("cmcontent_en", 
@@ -547,6 +550,10 @@
                     attrs.put("endsem"+i, new Integer(tmpi));
                 } catch (Exception e) { }
             }             
+            tmps = prequest.getRequestParameter("cpcomment"+i);
+            if (tmps != null) {
+                attrs.put("cpcomment"+i, tmps);
+            }
         }
         return attrs;
     }
@@ -566,16 +573,42 @@
 
        PortalUser portalUser = prequest.getPortalUser();
 
-       /** TODO check access rights
        if (!userManager.getAccessControl().
            checkPermission(portalUser.getUserId(), 
                            "coursemodule", "create", null)) {
            prequest.setReturnCode(2000);
            return "noaccess";
-       } */
-       
+       }
+
        Map attrs = getCourseModuleRequestParameters(prequest);
-       String tmps = (String)attrs.remove("cmresponsiblename");
+
+       // 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)

Index: CourseModule.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CourseModule.java	30 May 2006 14:32:00 -0000	1.2
+++ CourseModule.java	11 Jul 2006 10:27:03 -0000	1.3
@@ -188,6 +188,11 @@
         return (String)attrs.get("cmcomment");
     }
 
+    public String getLang()
+    {
+        return (String)attrs.get("cmlang");
+    }
+    
     public int getCapacity()
     {
         return ((Integer)attrs.get("cmcapacity")).intValue();

[Cobricks-cvscommit] cobricks2/src/org/cobricks/util/migration FromDBAccess.java

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

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

Modified Files:
	FromDBAccess.java 
Log Message:


Index: FromDBAccess.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/util/migration/FromDBAccess.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FromDBAccess.java	8 May 2006 07:48:00 -0000	1.2
+++ FromDBAccess.java	11 Jul 2006 10:27:04 -0000	1.3
@@ -366,6 +366,67 @@
         return result;
     }
 
+    /**
+     * Same as sqlInsert - but for tables without table descriptor ...
+     */
+    public int sqlInsert(String tablename, String primarykeyAttr,
+                         List attrnames, Map attrs) 
+    {
+        int result = -1;
+        String primarykeyValue = "";
+        if (primarykeyAttr != null) {
+            primarykeyValue = getNewPrimaryKey(tablename, primarykeyAttr);
+            result = Integer.parseInt(primarykeyValue);
+        }
+        StringBuffer sb = new StringBuffer("insert into ");
+        sb.append(tablename);
+        sb.append(" (");    
+        if (primarykeyAttr != null) {
+            sb.append(primarykeyAttr);
+            sb.append(", ");
+        }
+      
+        ListIterator i = attrnames.listIterator();
+        while (i.hasNext()) {
+            sb.append((String)i.next());
+            if (i.hasNext()) sb.append(", ");
+        }
+        sb.append(") values (");
+        
+        if (primarykeyAttr != null) {
+            sb.append(primarykeyValue);
+            sb.append(", ");
+        }
+
+        i = attrnames.listIterator();
+        // Instead of values inside of values SQL clause we insert placeholders
+        // here. The concrete values will be set by corresponding JDBC calls.
+        while (i.hasNext()) {
+            sb.append("?");
+            i.next();
+            if (i.hasNext()) sb.append(", ");
+        }
+        sb.append(")");
+
+        Connection conn = null;
+        PreparedStatement pstmt = null;
+        try {
+            conn = dataSource.getConnection();
+            pstmt = conn.prepareStatement(sb.toString());
+            setPreparedObjects(pstmt, attrnames, attrs, null);
+            pstmt.execute();
+            pstmt.close();
+        } catch(Exception e) {
+            logger.error(LogUtil.exception("Failed executing sql statement: "
+                                           +sb.toString(), e));
+            result = -1;
+        } finally {
+            try { pstmt.close(); } catch (Exception e) { }
+            try { conn.close(); } catch (Exception e) { }
+        }
+        return result;
+    }
+
     
     protected void setPreparedObjects(PreparedStatement pstmt,
                                       List attrnames, Map attrs,
@@ -376,7 +437,10 @@
         int count = 1;
         while (i.hasNext()) {
             String aname = (String)i.next();
-            String type = td.getColumnType(aname);
+            String type = "";
+            if (td != null) {
+                type = td.getColumnType(aname);
+            }
             Object o = attrs.get(aname);
             if (o == null)
                 logger.debug("setPrepared "+aname+": NULL");
@@ -467,6 +531,15 @@
         else if (o instanceof java.sql.Time) {
             pstmt.setTime(position, (java.sql.Time)o);
         }
+        else if (o instanceof java.lang.Integer) {
+            pstmt.setInt(position, ((java.lang.Integer)o).intValue());
+        }
+        else if (o instanceof java.lang.Float) {
+            pstmt.setFloat(position, ((java.lang.Float)o).floatValue());
+        }
+        else if (o instanceof java.lang.Long) {
+            pstmt.setLong(position, ((java.lang.Long)o).longValue());
+        }
         else if (o instanceof byte[]) {
             pstmt.setBytes(position, (byte[])o);
         }

[Cobricks-cvscommit] cobricks2 build.xml changelog.txt

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

Update of /cvsroot/cobricks/cobricks2
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16693

Modified Files:
	build.xml changelog.txt 
Log Message:


Index: changelog.txt
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/changelog.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- changelog.txt	31 May 2006 06:04:18 -0000	1.10
+++ changelog.txt	11 Jul 2006 10:27:02 -0000	1.11
@@ -1,5 +1,9 @@
 Cobricks2 v0.37
 
+- forgot password dialog fixed
+
+- added correct handling for mimetype text/x-vcard - .vcf
+
 - Module course reworked completely (to fit needs of course
   management at TUM)
 

Index: build.xml
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/build.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- build.xml	30 May 2006 14:20:49 -0000	1.55
+++ build.xml	11 Jul 2006 10:27:02 -0000	1.56
@@ -795,5 +795,12 @@
   </copy>
 </target>  
   
+<target name="html" depends="compile">
+  <java fork="yes" classname="org.cobricks.core.util.HTMLUtil" 
+        classpathref="exec.classpath">
+      <arg line="test.html"/>
+  </java>
+</target>
+  
 
 </project>

[Cobricks-cvscommit] cobricks2/src/org/cobricks/cwall/meeting properties.txt

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

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

Modified Files:
	properties.txt 
Log Message:


Index: properties.txt
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/cwall/meeting/properties.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- properties.txt	1 Nov 2005 22:45:56 -0000	1.19
+++ properties.txt	11 Jul 2006 10:27:03 -0000	1.20
@@ -125,7 +125,7 @@
 #cwall.view.mm.rfid.automatching.searchstring.attr=mm.interests
 #cwall.view.mm.rfid.automatching.searchstring.mv=true
 
-cwall.view.mm.rfid.reader.stub.class=
+#cwall.view.mm.rfid.reader.stub.class=
 #cwall.view.mm.rfid.reader.stub.class=org.cobricks.cwall.meeting.rfid.TagReaderImpl
 cwall.view.mm.rfid.reader.sleeptime=3000
 cwall.view.mm.rfid.reader.tablesize=256

[Cobricks-cvscommit] cobricks2/src/org/cobricks/cwall CWall.java

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

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

Modified Files:
	CWall.java 
Log Message:


Index: CWall.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/cwall/CWall.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CWall.java	31 Aug 2005 13:24:04 -0000	1.17
+++ CWall.java	11 Jul 2006 10:27:03 -0000	1.18
@@ -277,8 +277,8 @@
                             Class testClass = Class.forName(avalue);
                         } catch (ClassNotFoundException e) {
                             this.exitProgram("The class '" + avalue +  
-                                             "' given in the config-file does " +
-                                             "not exist.");
+                                             "' used in the config-file " +
+                                             "could not be loaded.");
                         }
                     }
                 }

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

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

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

Modified Files:
	UserManagerWS.java 
Log Message:


Index: UserManagerWS.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerWS.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- UserManagerWS.java	4 Jul 2005 12:56:00 -0000	1.11
+++ UserManagerWS.java	11 Jul 2006 08:36:25 -0000	1.12
@@ -65,9 +65,6 @@
         try {
             int requid = userManager.getUserIdForUserLogin(login);
 
-            /* int userid = userManager.getUserIdForUserLogin(userlogin);
-            if (userid < 1) return null; */
-            //erstelle eine Kopie vom Orginal User
             User userold = userManager.getUser(userid);
             User user = (User) userold.cloneUser();
 
@@ -75,14 +72,13 @@
             List anames = new ArrayList(map.keySet());
             
             Map mymap = new HashMap();
-
             for(int i=0;i<anames.size();i++) {
                String key = (String) anames.get(i);
                Object value =
-                   userManager.getUserAttr(userid,key, requid,destination);
-                if(value != null) {
+                   userManager.getUserAttr(userid, key, requid, destination);
+               if (value != null) {
                    mymap.put(key,value);
-                }
+               }
             }
             user.setAttributesLocally(mymap);
             return user;

[Cobricks-cvscommit] cobricks2/src/org/cobricks/core/ws AxisHTTPAuthenticationHandler.java

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

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

Modified Files:
	AxisHTTPAuthenticationHandler.java 
Log Message:


Index: AxisHTTPAuthenticationHandler.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/ws/AxisHTTPAuthenticationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AxisHTTPAuthenticationHandler.java	12 Feb 2004 06:25:26 -0000	1.2
+++ AxisHTTPAuthenticationHandler.java	11 Jul 2006 08:36:25 -0000	1.3
@@ -77,8 +77,7 @@
 	    }
 	}
 
-	logger.info("check log information: userlogin="+userlogin
-		    +", pw="+userpw);
+	logger.info("check log information: userlogin="+userlogin);
 
 	/* check password against Cobricks user data */
 	if (userlogin == null || userlogin.equals("")) {
@@ -105,6 +104,8 @@
                                     "Could not authenticate user "+userlogin
                                     +": wrong userid",
                                     null, null);
+
+            logger.info("password check currently disabled");
             /*
             if (!user.checkCredential(userpw))
                 throw new AxisFault("Server.Unauthenticated",
@@ -116,7 +117,7 @@
             msgContext.setProperty("cobricks.user", user);
         }
 
-	logger.info("succeeded checking log information");
+	logger.debug("succeeded checking authentication information");
 
     }
 

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

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

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

Modified Files:
	CategoryServlet.java 
Log Message:


Index: CategoryServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/CategoryServlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CategoryServlet.java	27 Jun 2006 10:13:12 -0000	1.16
+++ CategoryServlet.java	27 Jun 2006 10:55:15 -0000	1.17
@@ -105,8 +105,8 @@
         if (!userManager.getAccessControl().
             checkPermission(portalUser.getUserId(),
                             "category", "create", null)) {
-            // prequest.setReturnCode(2000);
-            // return "noaccess";
+            prequest.setReturnCode(2000);
+            return "noaccess";
         }
 
         Map attrs = new HashMap();
@@ -215,8 +215,8 @@
         if (!userManager.getAccessControl().
             checkPermission(portalUser.getUserId(),
                             "category", "update", null)) {
-            // prequest.setReturnCode(2000);
-            // return "noaccess";
+            prequest.setReturnCode(2000);
+            return "noaccess";
         }
  
         Map attrs = new HashMap();

[Cobricks-cvscommit] cobricks2/src/org/cobricks/category Category.java CategoryManagerImpl.java CategoryPresenter.java CategoryServlet.java

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

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

Modified Files:
	Category.java CategoryManagerImpl.java CategoryPresenter.java 
	CategoryServlet.java 
Log Message:


Index: CategoryPresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/CategoryPresenter.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- CategoryPresenter.java	27 Jun 2006 09:27:38 -0000	1.18
+++ CategoryPresenter.java	27 Jun 2006 10:13:12 -0000	1.19
@@ -420,7 +420,8 @@
      * @return The html form input field as String
      */
     public final String printAttrInput(String categoryClass, String aname,
-                                       String lang, String requestVal, int rows, int cols, 
+                                       String lang, String requestVal,
+                                       int rows, int cols, 
                                        boolean readonly) 
     {
         String result = "";
@@ -444,15 +445,12 @@
             }
             
             typeName = odat.getTypeName();
-            logger.debug("attributeName: "+attr);
-            logger.debug("typeName: "+typeName);
             if (odat.hasMaxLength()) {
                 maxLength = odat.getMaxLength();
             }
         }
         
         if (rows == -1) {
-            logger.debug("rows == -1");
             for (int i = 0; i < LONG_DATATYPES.length; i++) {
                 if (typeName.equals(LONG_DATATYPES[i])) {
                     rows = ROWS_FOR_LONG_INPUT;
@@ -468,11 +466,9 @@
             if (attr.equalsIgnoreCase("title")) {
                 rows = 1;
             }
-            logger.debug("rows = "+rows);
         }
         
         if ((oca != null) && !oca.getValues().isEmpty()) {
-            logger.debug("in dropDown if");
             //There are possible values
             if (requestVal != null) {
                 result += printDropDown(categoryClass, aname, requestVal, lang,
@@ -481,7 +477,6 @@
                 result += printDropDown(categoryClass, aname, defaultVal, lang,
 					"attribute", false, readonly);
             }
-            
         } else if(typeName.equals("category")){
             logger.debug("in category if");
             Map attrs = new HashMap();
@@ -492,14 +487,19 @@
             // show the categories as options
             for(int i=0; i<ret.size();i++){
                 result += "<option value=\""+((Category)(ret.get(i))).getId();
-                
+                Object o = ret.get(i);
+                String tmps = "";
+                if (o instanceof Category) {
+                    tmps = Integer.toString(((Category)o).getId());
+                } else {
+                    tmps = o.toString();
+                }
                 if(requestVal != null && 
-                   requestVal.trim().equals( (new Integer(((Category)(ret.get(i))).
-                                                          getId())).toString().trim()))
+                   requestVal.trim().equals(tmps)) {
                     result += "\" selected>"+((Category)(ret.get(i))).getTitle();
-                else
+                } else {
                     result += "\">"+((Category)(ret.get(i))).getTitle();
-                
+                }
                 result += "</option>\n";
             }
             result += "</select>";
@@ -599,59 +599,28 @@
             result += "</table>\n";
             
         } else if (typeName.equals("boolean")) {
-            logger.debug("in boolean if");
-            
-//            result += "<input type=\"checkbox\" name=\""+aname+"\" value=\"true\"";
-//            if(requestVal != null && requestVal.equals("true"))
-//                result += " checked ";
-            //					result += ">";
-            
             result = "<input type=\"radio\" name=\"" + aname + "\"";
-
-                result += " value=\"true\"";
-
-                if ((requestVal != null) && requestVal.equals("true")) {
-                    result += " checked=\"checked\"";
-                }
-
-                if (readonly) {
-                    result += " readonly=\"readonly\"";
-                }
-
-                result += "> true </input><input type=\"radio\"";
-                result += (" name=\"" + aname + "\" value=\"false\"");
-
-                if ((requestVal != null) && requestVal.equals("false")) {
-                    result += " checked=\"checked\"";
-                }
-
-                if (readonly) {
-                    result += " readonly=\"readonly\"";
-                }
-
-                result += "> false </input>";
-//                result += "<input type=\"radio\"";
-//                result += (" name=\"" + aname + "\" value=\"\"");
-//
-//                if ((defaultVal != null) && defaultVal.equals("")) {
-//                    result += " checked=\"checked\"";
-//                }
-//
-//                if (readonly) {
-//                    result += " readonly=\"readonly\"";
-//                }
-//
-//                result += "> no value </input>";
-            
-            
+            result += " value=\"true\"";
+            if ((requestVal != null) && requestVal.equals("true")) {
+                result += " checked=\"checked\"";
+            }
+            if (readonly) {
+                result += " readonly=\"readonly\"";
+            }
+            result += "> true </input><input type=\"radio\"";
+            result += (" name=\"" + aname + "\" value=\"false\"");
+            if ((requestVal != null) && requestVal.equals("false")) {
+                result += " checked=\"checked\"";
+            }
+            if (readonly) {
+                result += " readonly=\"readonly\"";
+            }
+            result += "> false </input>";            
         } else if ((rows <= 1)) {
-            logger.debug("rows <= 1");
             result += ("<input name=\"" + aname + "\" type=\"text\"");
-            
             if (maxLength > -1) {
                 if (maxLength > MAX_NUMBER_COLS) {
                     rows = (maxLength / MAX_NUMBER_COLS) + 1;
-                    
                     return printAttrInput(categoryClass, aname, lang, requestVal,
                                           rows, MAX_NUMBER_COLS, readonly);
                 } else {
@@ -686,7 +655,6 @@
                            .toLocalizedPattern() + ")");
             }
         } else {
-            logger.debug("in the else branch");
             result += ("<textarea name=\"" + aname + "\"");
             result += (" cols=\"" + cols + "\" rows=\"" + rows + "\"");
             
@@ -704,8 +672,6 @@
             
             result += "</textarea>";
         }
-        logger.debug("result: "+result);
-        
         return result;
     }
 
@@ -942,7 +908,6 @@
                                       boolean multiple,
                                       boolean readonly) 
     {
-        logger.debug("in printDropDown");
         String result = "<select name=\"" + submitName + "\"";
         
         if (type.equals("language")) {

Index: CategoryServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/CategoryServlet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CategoryServlet.java	2 May 2006 11:55:41 -0000	1.15
+++ CategoryServlet.java	27 Jun 2006 10:13:12 -0000	1.16
@@ -263,8 +263,8 @@
         // now update the category
         try {
             categoryManager.
-                updateCategory(catid, attrs, prequest.getPortalUser().getUser());
-                                    
+                updateCategory(catid, attrs,
+                               prequest.getPortalUser().getUser());
             prequest.setReturnCode(1013);
             return "success";
             

Index: Category.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/Category.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Category.java	27 Jun 2006 09:27:37 -0000	1.15
+++ Category.java	27 Jun 2006 10:13:12 -0000	1.16
@@ -238,7 +238,10 @@
             setOntologyClassName(avalue.toString());
         } else if (aname.equals("parent")) {            
             if (avalue instanceof Integer) 
-                parentid = ((Integer)avalue).intValue();            
+                parentid = ((Integer)avalue).intValue();
+            else {
+                parentid = Integer.parseInt(avalue.toString());
+            }
         } else {
             super.setAttribute(aname, avalue);
         }

Index: CategoryManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/CategoryManagerImpl.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- CategoryManagerImpl.java	30 May 2006 14:32:00 -0000	1.28
+++ CategoryManagerImpl.java	27 Jun 2006 10:13:12 -0000	1.29
@@ -798,7 +798,6 @@
             }
 
             // reload object in cache
-            // TBD
             categoryCache.removeFromCache(catid);
             
             // and send an event ...
@@ -816,7 +815,6 @@
             logger.error(LogUtil.ex("Failed updating category", e));
         }
         
-        //return result;
     }
            
    

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

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

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

Modified Files:
	DataObjectCache.java 
Log Message:


Index: DataObjectCache.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/DataObjectCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DataObjectCache.java	10 Aug 2005 13:31:33 -0000	1.1
+++ DataObjectCache.java	27 Jun 2006 10:13:01 -0000	1.2
@@ -212,8 +212,8 @@
         DataObject o = getObject(globalid);
         if (o != null) {
             logger.info("removing from cache: " + globalid);
-            this.objectsGlobal.remove(o);
-            this.objectsLocal.remove(o);
+            this.objectsGlobal.remove(o.getGlobalId());
+            this.objectsLocal.remove(new Integer(o.getId()));
         } else {
             logger.info("removing from cache Problem - DataObject not found: "
                         + globalid);
@@ -229,9 +229,9 @@
         DataObject o = getObject(localid);
         if (o != null) {
             logger.info("removing from cache: "
-                + new Integer(localid).toString());
-            this.objectsGlobal.remove(o);
-            this.objectsLocal.remove(o);
+                        + new Integer(localid).toString());
+            this.objectsGlobal.remove(o.getGlobalId());
+            this.objectsLocal.remove(new Integer(o.getId()));
         } else {
             logger.warn("removing from cache problem - DataObject not found: "
                         + localid);

[Cobricks-cvscommit] cobricks2/web/category update_start.html

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

Update of /cvsroot/cobricks/cobricks2/web/category
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13068

Modified Files:
	update_start.html 
Log Message:


Index: update_start.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/category/update_start.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- update_start.html	27 Jun 2006 09:27:57 -0000	1.7
+++ update_start.html	27 Jun 2006 10:12:44 -0000	1.8
@@ -176,7 +176,7 @@
 <tr valign="top">
 	<td><b>$attr</b>
 	<br/>$categoryPresenter.printDescription($categoryclass, $attr, $lang)</td>
-	<td>$categoryPresenter.printAttrInput($categoryclass, $attr, $lang, $field_value)</td>
+	<td>$categoryPresenter.printAttrInput($categoryclass, $attr, $lang, $field_value) - "$!attr","$!field_value"</td>
 </tr>
 	#end
     #end

[Cobricks-cvscommit] cobricks2/web/category create.html update.html update_start.html

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

Update of /cvsroot/cobricks/cobricks2/web/category
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20203

Modified Files:
	create.html update.html update_start.html 
Log Message:


Index: update_start.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/category/update_start.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- update_start.html	19 Jan 2005 15:29:58 -0000	1.6
+++ update_start.html	27 Jun 2006 09:27:57 -0000	1.7
@@ -1,4 +1,6 @@
-#parse ("pageheader.html")
+
+$portalPresenter.parse("$contextPath/pageheader.html.en",$portalRequest)
+
 <script>
 
     function writeValues2FormField(fieldname){
@@ -87,21 +89,32 @@
 #set($categoryclass = $category.getCategoryClass())
 
 #set($selectedLangs = $portalRequest.getRequestParameterValues("_languages"))
-
-#if(!$selectedLangs)
+#if("$!selectedLangs"=="")
   #set($selectedLangs = $category.getUsedLanguages())
 #end
+#if("$!selectedLangs" == "en")
+  #set($selectedLangs = [ "en" ])
+#end
+#if("$!selectedLangs" == "de")
+  #set($selectedLangs = [ "de" ])
+#end
+#if("$!selectedLangs" == "")
+  #set($selectedLangs = [ "en" ])
+#end
 
 #set ($langs = "")
 Update for languages: 
 #foreach($lg in $selectedLangs)
-  $lg,
-	#if($langs == "")
+	#if("$langs" == "")
+$lg
 		#set ($langs = "${lg}")
 	#else
+, $lg
 		#set ($langs = "${langs},${lg}")
 	#end
 #end
+<br>(for these languages the multilingual attributes are displayed)
+<p>
 
 <form action="$contextPath/category/update_start.html" method="get">
 <input type="hidden" name="categoryclass" value="$!categoryclass"/>
@@ -121,7 +134,7 @@
 	</tr>
 
 	</table>
-	<br/>
+
 	<input type="submit" value="Reload"/>
 </form>
 
@@ -145,18 +158,13 @@
 
   #if(!$attrs.isEmpty())
 <p>
-<h3>Further Attributes:</h3>
 <table cellspacing="10">
 
     #foreach($attr in $attrs)
         #set ($field_value = "")
 	#if($categoryPresenter.isMultiLang($categoryclass, $attr))
 		#foreach($lg in $selectedLangs)
-                    #if ($attr == "title")
-			#set ($field_value = $category.getTitle($lg))
-		    #else
-			#set ($field_value = $category.getAttribute($attr) )
-		    #end
+		#set ($field_value = $category.getAttribute($attr,$lg) )
 <tr valign="top">
 	<td><b>$attr</b> (in language <b>$categoryPresenter.getLanguageName($lg)</b>)
 	<br/>$categoryPresenter.printDescription($categoryclass, $attr, $lg)</td>
@@ -201,4 +209,4 @@
 
 </form>
 
-#parse ("pagefooter.html")
+$portalPresenter.parse("$contextPath/pagefooter.html.en",$portalRequest)

Index: update.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/category/update.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- update.html	1 Oct 2004 13:42:49 -0000	1.3
+++ update.html	27 Jun 2006 09:27:57 -0000	1.4
@@ -45,8 +45,8 @@
 	</tr>
 	<!--tr valign="top">
 		<td><b>Item ID</b></td>
-		<td>$itemPresenter.printAttrInput($itemclass, "itemid", $lang, $itemid, 1, 15, true)</td>
-		<td>$itemPresenter.printDescription($itemclass, "itemid", $lang)</td>
+		<td>$itemPresenter.printAttrInput("$!itemclass", "itemid", "$!lang", $itemid, 1, 15, true)</td>
+		<td>$itemPresenter.printDescription("$!itemclass", "itemid", "$!lang")</td>
 	</tr>
 	</table>
 
@@ -61,11 +61,11 @@
 
 </p>
 
-<input type="hidden" name="globalid" value="$categoryPresenter.printAttribute($category.getAttribute("globalid"), $lang)"/>
+<input type="hidden" name="globalid" value="$categoryPresenter.printAttribute($category.getAttribute("globalid"), '$!lang')"/>
 <input type="hidden" name="updater" value="${userId}"/>
-<input type="hidden" name="updatetime" value="$categoryPresenter.getCurrentDateTime($lang)"/>
-<input type="hidden" name="creator" value="$categoryPresenter.printAttribute($category.getAttribute("creator"), $lang)"/>
-<input type="hidden" name="creationtime" value="$categoryPresenter.printAttribute($category.getAttribute("creationtime"), $lang)"/>
+<input type="hidden" name="updatetime" value="$categoryPresenter.getCurrentDateTime('$!lang')"/>
+<input type="hidden" name="creator" value="$categoryPresenter.printAttribute($category.getAttribute("creator"), '$!lang')"/>
+<input type="hidden" name="creationtime" value="$categoryPresenter.printAttribute($category.getAttribute("creationtime"), '$!lang')"/>
 <!-- TBD --><input type="hidden" name="_lang" value="${lang}"/>
 
 
@@ -85,14 +85,14 @@
 			<tr valign="top">
 			<td><b>$attr</b> (in language <b>$categoryPresenter.getLanguageName($lg)</b>)
 				<br/>$categoryPresenter.printDescription($categoryclass, $attr, $lg)</td>
-			<td>$categoryPresenter.printAttrInput($categoryclass, "${attr}_${lg}", $lang, null)</td>
+			<td>$categoryPresenter.printAttrInput("$!categoryclass", "${attr}_${lg}", "$!lang")</td>
 			</tr>
 			#end
 		#else
 			<tr valign="top">
 			<td><b>$attr</b>
-				<br/>$categoryPresenter.printDescription($categoryclass, $attr, $lang)</td>
-			<td>$categoryPresenter.printAttrInput($categoryclass, $attr, $lang, null)</td>
+				<br/>$categoryPresenter.printDescription("$!categoryclass", "$!attr", "$!lang")</td>
+			<td>$categoryPresenter.printAttrInput("$!categoryclass", "$!attr", "$!lang")</td>
 			</tr>
 		#end
 	#end

Index: create.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/category/create.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- create.html	3 Dec 2004 23:14:38 -0000	1.7
+++ create.html	27 Jun 2006 09:27:57 -0000	1.8
@@ -140,10 +140,10 @@
 	<tr valign="top">
 	<td><table>
 		<tr><td><b>Title</b></td>
-		<td>(in language <b>$categoryPresenter.getLanguageName($lg)</b>)</td></tr>
-		<tr><td colspan="2">$categoryPresenter.printDescription($categoryclass, "title", $lg)</td></tr>
+		<td>(in language <b>$categoryPresenter.getLanguageName("$!lg")</b>)</td></tr>
+		<tr><td colspan="2">$categoryPresenter.printDescription("$!categoryclass", "title", "$!lg")</td></tr>
 	</table></td>
-	<td>$categoryPresenter.printAttrInput($categoryclass, "title_${lg}", $lang, null, 1, 50, false)</td>
+	<td>$categoryPresenter.printAttrInput("$categoryclass", "title_${lg}", "$!lang", null, 1, 50, false)</td>
 	</tr>
 	#end-->
 
@@ -157,24 +157,21 @@
 	#if(!$attrs.isEmpty())
 	<hr/>
 	<p>
-	<h3>Further Attributes:</h3>
 	<table cellspacing="10">
 	#foreach($attr in $attrs)
 		#if($categoryPresenter.isMultiLang($categoryclass, $attr))
 			#foreach($lg in $selectedLangs)
 			<tr valign="top">
-			<td><b>$attr</b> (in language <b>$categoryPresenter.getLanguageName($lg)</b>)
+			<td><b>$attr</b> (in language <b>$categoryPresenter.getLanguageName("$!lg")</b>)
 				<br/>$categoryPresenter.printDescription($categoryclass, $attr, $lg)</td>
-			<td>$categoryPresenter.printAttrInput($categoryclass, "${attr}_${lg}", $lang, null)</td>
-			<td>categoryPresenter.printAttrInput($categoryclass, "${attr}_${lg}", $lang, null)</td>
+			<td>$categoryPresenter.printAttrInput("$!categoryclass", "${attr}_${lg}", "$!lang")</td>
 			</tr>
 			#end
 		#else
 			<tr valign="top">
 			<td><b>$attr</b>
-				<br/>$categoryPresenter.printDescription($categoryclass, $attr, $lang)</td>
-			<td>$categoryPresenter.printAttrInput($categoryclass, $attr, $lang, null)</td>
-			<td>categoryPresenter.printAttrInput($categoryclass, $attr, $lang, null)</td>
+				<br/>$categoryPresenter.printDescription("$!categoryclass", "$!attr", "$!lang")</td>
+			<td>$categoryPresenter.printAttrInput("$!categoryclass", "$!attr", "$!lang")</td>
 			</tr>
 		#end
 	#end

[Cobricks-cvscommit] cobricks2/src/org/cobricks/category Category.java CategoryPresenter.java

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

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

Modified Files:
	Category.java CategoryPresenter.java 
Log Message:


Index: CategoryPresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/CategoryPresenter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CategoryPresenter.java	2 May 2006 11:55:41 -0000	1.17
+++ CategoryPresenter.java	27 Jun 2006 09:27:38 -0000	1.18
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 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
@@ -15,10 +15,9 @@
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-
 import java.util.*;
 
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 
 import org.cobricks.core.ComponentDirectory;
 import org.cobricks.core.ComponentEvent;
@@ -32,7 +31,6 @@
 import org.cobricks.user.UserManager;
 import org.cobricks.user.UserManagerImpl;
 
-
 /**
  * Presenter class for the Category Component
  *
@@ -394,6 +392,11 @@
         return "";
     }
     
+    public final String printAttrInput(String categoryClass, String aname,
+                                       String lang) 
+    {
+        return printAttrInput(categoryClass, aname, lang, null);
+    }
 
     private List userList = null;
     
@@ -1049,6 +1052,7 @@
             String attrKey = keys.next().toString();
             if (!(classAttrs.contains(attrKey) 
                   || attrKey.startsWith("title_")
+                  || attrKey.startsWith("description_")
                   || attrKey.equals("updaterid")
                   || attrKey.equals("creatorid"))) {
                 result.add(attrKey);

Index: Category.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/Category.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Category.java	2 May 2006 11:55:41 -0000	1.14
+++ Category.java	27 Jun 2006 09:27:37 -0000	1.15
@@ -98,7 +98,7 @@
         if (o!=null) return o.toString();
         
         // try german
-         o = getAttribute("title_de");
+        o = getAttribute("title_de");
         if (o!=null) return o.toString();
         
         // try french
@@ -217,6 +217,13 @@
         return super.getAttribute(aname);
     }
 
+    public Object getAttribute(String aname, String lang) 
+    {
+        if (aname == null) return null;
+        return super.getAttribute(aname+"_"+lang);
+    }
+
+    
     /**
      *
      */

[Cobricks-cvscommit] cobricks2/web/discussion topic.html posting_form.html tree.html

[Philipp H. <p-...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/discussion
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24522/web/discussion

Modified Files:
	topic.html posting_form.html tree.html 
Log Message:


Index: topic.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/discussion/topic.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- topic.html	3 Jun 2006 09:59:48 -0000	1.3
+++ topic.html	6 Jun 2006 22:20:28 -0000	1.4
@@ -34,22 +34,70 @@
 #parse ( "pageheader.html" )
 <em><a href="index.html">$coreManager.getProperty("org.cobricks.discussion.settings.forum_headline")</a> - 
 <a href="category.html?catId=$cat.getLocalId()">$cat.getTitle()</a> - 
+#if ( $forum_type != "Weblog" && $forum_type != "Guestbook")
 <a href="forum.html?forumId=$forum.getLocalId()">$forum.getTitle()</a> - 
+#end
 $topic.getTitle()</em>
 #if($returnCode == 1010)
 <div class="success">New view is set.</div><br/>
 #elseif($returnCode == 2010)
 <div class="error">Failed setting new view.</div>
 #end
-#if ( $forum_type == "Forum" && $view != "list")
-	<iframe src="tree.html?topicId=$topicId&postingId=$postingId" width="100%" height="150">
+
+#if ( $forum_type == "Forum" && $view != "list") ## evtl. auch fuer list einstellbar
+	<iframe src="tree.html?topicId=$topicId&postingId=$postingId&view=$view" width="100%" height="150">
 	</iframe>
 #end
+#if ($forum_type == "Weblog" || $forum_type == "Guestbook")
+	#if ($coreManager.getProperty("org.cobricks.discussion.settings.topic_with_form") == "true")
+	<!-- FCKeditor -->
+	<script type="text/javascript" src="fckeditor.js"></script>
+	<script type="text/javascript">
+    <!--
+    
+    window.onload = function()
+    {
+    	
+    	var oFCKeditor = new FCKeditor( 'content_$lang' ) ;
+    	oFCKeditor.BasePath	= "" ;
+    	oFCKeditor.Height	= 270 ;
+    	oFCKeditor.Width	= 630 ;
+    	
+    	oFCKeditor.ToolbarSet = 'Cobricks' ;
+    	
+    	oFCKeditor.ReplaceTextarea() ;
+    }
+    
+    //-->
+    	</script>
+    <!-- /FCKeditor -->
+	<form action="/DISCUSSION" method="post">
+    <input type="hidden" name="cmd" value="createPosting"/>
+    <input type="hidden" name="cmd.success" value="$contextPath/discussion/topic.html"/>
+    <input type="hidden" name="cmd.error" value="$contextPath/discussion/topic.html"/>
+    <input type="hidden" name="topicId" value="$topic.getLocalId()"/>
 
+		#if ($userId == "0")
+    	Name: <br/><input name="name" type="text" size="80" maxlength="100"><br/>
+    	E-Mail: <br/><input name="email" type="text" size="80" maxlength="100"><br/>
+		#end
+	<input type="hidden" name="lang" value="$lang" />
+    Title: <br/><input name="title_$lang" type="text" size="80" maxlength="100"><br/>
+	Content: <br/>
+    <textarea name="content_$lang">This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</textarea><br/>
+	<input type="submit" value=" Absenden ">
+    <input type="reset" value=" Abbrechen">
+	</form>
+	#else
+	<form action="posting_form.html" method="post" >
+        	<input type="hidden" name="topicId" value="$topicId" />
+            <input type="submit" value=" Add Posting ">
+    </form>
+	#end
+#end
 <h1>$topic.getTitle()</h1>
     #foreach ( $posting in $posting_list)
 	#set ( $creator = $userManager.getUser($posting.getAttribute("creator")))
-<!-- $posting.getIndent() -->
 #if ( $posting.getIndent() )
 	#set ($indent = $posting.getIndent()*20)
 #else
@@ -65,7 +113,7 @@
     </tr>
     <tr>
 	  <td style="width: 613px;">
-		$posting.getContent()
+		$posting.getContent($lang)
 	  <div style="text-align:right;">
 		($posting.getAttribute("creationtime"))
 #if ($posting.getAttribute("ip"))
@@ -83,7 +131,8 @@
 	  <td style="width: 613px;">
 	  <div style="text-align:right;">
 		## reply nur fuer Forum, FAQ fuer Frage ohne Antwort, Weblog und Guestbook nicht an Eintrag
-        <form action="posting_form.html" method="post" >
+	#if ($forum_type == "Forum" || $discussionPresenter.needAnswer($topic))
+		<form action="posting_form.html" method="post" >
         	<input type="hidden" name="topicId" value="$topicId" />
 			<!-- [debug] posting.getAttribute("itemclass")=$posting.getAttribute("itemclass")  -->
 			#if ($posting.getAttribute("itemclass") == "discussion_posting")
@@ -91,7 +140,7 @@
 			#end
             <input type="submit" value=" Reply ">
         </form>
-		
+	#end
 		#*
         <form action="posting_form.html" method="post" >
         	<input type="hidden" name="topicId" value="$topicId" />

Index: posting_form.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/discussion/posting_form.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- posting_form.html	3 Jun 2006 09:59:48 -0000	1.2
+++ posting_form.html	6 Jun 2006 22:20:28 -0000	1.3
@@ -10,6 +10,9 @@
 	  Redirekt to Main Diskussion Page because topicId is missing.
 </body>
 #end
+#if ($discussionPresenter.allowed($userId, "discussion", "view"))
+	[debug] user is allowed
+#end
 #set ( $topic = $itemPresenter.getItem($topicId))
 #set ( $forumId = $topic.getAttribute("parent_cat"))
 #set ( $forum = $categoryPresenter.getCategory($forumId))
@@ -45,8 +48,7 @@
 #if($forum_type == "FAQ")
 Create answer</em>
 <h1>Create answer</h1>
-#end
-#if($forum_type == "Forum")
+#else
 Create new posting</em>
 <h1>Create new posting</h1>
 #end

Index: tree.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/discussion/tree.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tree.html	2 Jun 2006 12:43:33 -0000	1.3
+++ tree.html	6 Jun 2006 22:20:28 -0000	1.4
@@ -26,8 +26,11 @@
 #set ( $posting_list = $discussionPresenter.getPostings("$topicId", "Forum", "$view", "$postingId", "-1","-1", false))
 #foreach ( $posting in $posting_list)
 	#set ( $creator = $userManager.getUser($posting.getAttribute("creator")))
-<!-- $posting.getIndent() -->
-#set ($indent = $posting.getIndent()*20)
+#if ( $posting.getIndent() )
+	#set ($indent = $posting.getIndent()*20)
+#else
+	#set ($indent = 0)
+#end
 <table style="text-align: left; width: 627px; margin-left: ${indent}px;" border="0"
  cellpadding="2" cellspacing="2">
   <tbody>

[Cobricks-cvscommit] cobricks2/src/org/cobricks/discussion DiscussionAccessHandler.java properties.txt OrderComparator.java DiscussionPresenter.java DiscussionManagerImpl.java

[Philipp H. <p-...@us...>]

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

Modified Files:
	DiscussionAccessHandler.java properties.txt 
	OrderComparator.java DiscussionPresenter.java 
	DiscussionManagerImpl.java 
Log Message:


Index: DiscussionManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/discussion/DiscussionManagerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DiscussionManagerImpl.java	2 Jun 2006 12:04:44 -0000	1.4
+++ DiscussionManagerImpl.java	6 Jun 2006 22:20:28 -0000	1.5
@@ -12,6 +12,7 @@
 
 import org.apache.log4j.Logger;
 import org.cobricks.category.Category;
+import org.cobricks.category.CategoryAccessHandler;
 import org.cobricks.category.CategoryManager;
 import org.cobricks.core.CobricksException;
 import org.cobricks.core.ComponentEvent;
@@ -24,6 +25,7 @@
 import org.cobricks.item.ItemManager;
 import org.cobricks.user.AccessControl;
 import org.cobricks.user.AccessHandler;
[...980 lines suppressed...]
+            attrs
+                    .put(
+                            "content_de",
+                            "Lorem ipsum mei modus summo voluptua in, ne sit affert consul, no sea nostrud eruditi graecis. An pri hinc dicunt salutandi. Ea congue noluisse duo, ad pri aperiri eruditi percipit, ad aeque persecuti moderatius sea. An mazim quaeque meliore sit, vel quodsi perfecto omittantur ea, stet menandri antiopam est ea. Quis probo torquatos nec cu, eu nec dicta iusto denique.");
+            attrs
+                    .put(
+                            "content_en",
+                            "Lorem ipsum mei modus summo voluptua in, ne sit affert consul, no sea nostrud eruditi graecis. An pri hinc dicunt salutandi. Ea congue noluisse duo, ad pri aperiri eruditi percipit, ad aeque persecuti moderatius sea. An mazim quaeque meliore sit, vel quodsi perfecto omittantur ea, stet menandri antiopam est ea. Quis probo torquatos nec cu, eu nec dicta iusto denique.");
             attrs.put("state", new Integer(1));
 
             attrs.put("creationtime", cal.getTime());
@@ -838,7 +971,7 @@
             cal.add(Calendar.MINUTE, 1);
 
             attrs.put("topicId", new Integer(guestbook_topic.getLocalId()));
-//            attrs.put("parent", new Integer(question2.getLocalId()));
+            // attrs.put("parent", new Integer(question2.getLocalId()));
             attrs.put("ip", "127.0.0.1");
             attrs.put("name", "Hans Mustermann");
             attrs.put("email", "name_(at)_host.de");

Index: DiscussionAccessHandler.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/discussion/DiscussionAccessHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DiscussionAccessHandler.java	5 May 2006 09:37:44 -0000	1.3
+++ DiscussionAccessHandler.java	6 Jun 2006 22:20:28 -0000	1.4
@@ -38,15 +38,41 @@
 
     static final String domain = "discussion";
 
-    static final String[] domainactions = { "*", "view", "read", "createCat","create", "delete" };
+    static final String[] domainactions = { "*", "view", "read", "create", 
+        "reply", "edit_own", "edit", "delete_own", "delete", "important", 
+        "announce", "split", "merge", "move", "admin"};
 
     static final String[][] domainactionattrs = {
+         // *
+         { "" },
+         // view
+         { "" },
+         // read
+         { "" },
          // create
-         { "votingclass" },
+         { "" },
+         // reply
+         { "" },
+         // edit_own
+         { "" },
+         // edit
+         { "" },
+         // delete_own
+         { "" },
          // delete
-         { "votingId", "votingclass" },
-         // vote
-         { "votingId", "votingclass" } };
+         { "" },
+         // important
+         { "" },
+         // announce
+         { "" },
+         // split
+         { "" },
+         // merge
+         { "" },
+         // move
+         { "" },
+         // admin
+         { "" } };
 
     List actions;
 
@@ -129,6 +155,8 @@
             AccessPermission perm = (AccessPermission)i.next();
             // check if this is the requested permission
             if (perm.contains(user, domain, action, attrs)) return true;
+            
+            logger.debug("die Attribute der permission:"+perm.getAttrsAsString());
         }
 
     return false;

Index: DiscussionPresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/discussion/DiscussionPresenter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DiscussionPresenter.java	3 Jun 2006 09:59:48 -0000	1.5
+++ DiscussionPresenter.java	6 Jun 2006 22:20:28 -0000	1.6
@@ -2,7 +2,9 @@
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -192,7 +194,8 @@
     }
 
     /**
-     * For Forums with type "Weblog" or "Guestbook".
+     * For Forums with type "Weblog" or "Guestbook". If the topic doesn't exist
+     * it will be created with the same title as the forum.
      * 
      * @param parentId
      * @return the single Item in this Forum, if there are more than one topic
@@ -200,10 +203,82 @@
      */
     public Item getSingleTopic(String parentId)
     {
+        logger.debug("getSingleTopic(" + parentId + ")");
         List items = itemManager.searchItems("/item/parent_cat[category="
                 + parentId + "]");
+        // create topic if there is none and forum is "Weblog" or "Guestbook"
+        if (items == null || items.size() == 0)
+        {
+            int pId = 0;
+            try
+            {
+                pId = Integer.parseInt(parentId);
+
+            } catch (NumberFormatException e)
+            {
+                logger.warn("parentId is no integer", e);
+                return null;
+            }
+            Category cat = categoryManager.getCategory(pId);
+            if (cat == null)
+            {
+                logger.warn("failed in creating topic for empty forum, "
+                        + "because parentId is no valid categorie");
+                return null;
+            }
+            Object cat_obj = cat.getAttribute("forumtype");
+            String type = null;
+            if (cat_obj instanceof String)
+            {
+                type = (String) cat_obj;
+            } else
+            {
+                logger.warn("getAttribute should return String object");
+                return null;
+            }
+            if (type.equalsIgnoreCase("Weblog")
+                    || type.equalsIgnoreCase("Guestbook"))
+            {
+                Map attrs = new HashMap();
+                attrs.put("itemclass", "discussion_topic");
+                // copy the titles and content from the forum
+                String[] lang = { "de", "en", "fr" };
+                for (int i = 0; i < lang.length; i++)
+                {
+                    String title = (String) cat
+                            .getAttribute("title_" + lang[i]);
+                    if (title != null)
+                    {
+                        attrs.put("title_" + lang[i], title);
+                    }
+                    String descr = (String) cat.getAttribute("description_"
+                            + lang[i]);
+                    if (descr != null)
+                    {
+                        attrs.put("content_" + lang[i], descr);
+                    }
+                }
+                attrs.put("state", new Integer(1));
+
+                attrs.put("creationtime", new Date());
+                attrs.put("updatetime", new Date());
+
+                attrs.put("parent_cat", new Integer(pId));
+
+                try
+                {
+                    Item topic = itemManager.createItem(attrs, null);
+                    return topic;
+                } catch (CobricksException e)
+                {
+                    logger.warn("fail to create default topic for forum", e);
+                }
+            }
+
+        }
         if (items.size() != 1)
         {
+            // todo if size > 1 return first or oldest topic
             return null;
         } else
         {
@@ -270,7 +345,8 @@
                 && view.equalsIgnoreCase("tree"))
         {
             logger
-                    .debug("cut_tree und 'forum' only List with Item from postingId or topicId");
+                    .debug("cut_tree und 'forum' only List with Item from " +
+                            "postingId or topicId");
             if (startId > 0)
             {
                 return itemManager.searchItems("/item/itemid=" + postingId);
@@ -282,7 +358,8 @@
 
         List postings = itemManager.searchItems("/item/topicId/itemid="
                 + topicId);
-        if(postings == null){
+        if (postings == null)
+        {
             logger.debug("postings == null");
             postings = new ArrayList();
         }
@@ -294,7 +371,8 @@
             if (postings.size() > 1)
             {
                 logger
-                        .warn("something wrong, cause FAQ should have only one posting");
+                        .warn("something wrong, cause FAQ should have only " +
+                                "one posting");
             } else
             {
                 logger.debug("faq with one posting");
@@ -313,7 +391,8 @@
                 || type.equalsIgnoreCase("Guestbook"))
         {
             logger
-                    .debug("getPostings for Weblog or Guestbook in reverse chronological order");
+                    .debug("getPostings for Weblog or Guestbook in reverse " +
+                            "chronological order");
             Collections
                     .sort(postings, new ChronologicalPostingComparator(true));
         } else
@@ -321,9 +400,12 @@
             if (view.equalsIgnoreCase("list"))
             {
                 logger
-                        .debug("getPostings for Forum (view='list')in chronological order");
+                        .debug("getPostings for Forum (view='list')in " +
+                                "chronological order");
                 Collections
-                        .sort(postings, new ChronologicalPostingComparator());// insert topic
+                        .sort(postings, new ChronologicalPostingComparator());
+                // insert
+                // topic
                 Item topic;
                 try
                 {
@@ -337,9 +419,11 @@
                     || view.equalsIgnoreCase("hybrid"))
             {
                 logger
-                        .debug("getPostings for Forum (view='tree' or 'hybrid')in tree order");
+                        .debug("getPostings for Forum (view='tree' or " +
+                                "'hybrid')in tree order");
                 String sorting = coreManager
-                        .getProperty("org.cobricks.discussion.settings.tree_sorting");
+                        .getProperty("org.cobricks.discussion.settings." +
+                                "tree_sorting");
                 try
                 {
                     postings = createPostingsList(postings);
@@ -361,7 +445,8 @@
                 {
                     topic = itemManager.getItem(topicId);
                     Posting p = new Posting(topic, 0);
-                    if (startId == -1){
+                    if (startId == -1)
+                    {
                         p.setMarked(true);
                     }
                     postings.add(0, p);
@@ -381,7 +466,9 @@
                 for (Iterator iter = postings.iterator(); iter.hasNext();)
                 {
                     Posting posting = (Posting) iter.next();
-                    if (indent > -1 || (startId == -1 && view.equalsIgnoreCase("hybrid")))
+                    if (indent > -1
+                            || (startId == -1 && view
+                                    .equalsIgnoreCase("hybrid")))
                     {
                         if (posting.getIndent() > indent)
                         {
@@ -406,7 +493,7 @@
                             cuted_list.add(posting);
                         }
                         if (view.equalsIgnoreCase("tree"))
-                        { 
+                        {
                             // only mark the start posting
                             break;
                         }
@@ -416,24 +503,26 @@
                 {
                     postings = cuted_list;
                 }
-                //normalize indent
+                // normalize indent
                 Object first = postings.get(0);
                 if (first instanceof Posting)
                 {
                     int first_indent = ((Posting) first).getIndent();
-                    if(first_indent > 0){
+                    if (first_indent > 0)
+                    {
                         for (Iterator iter = postings.iterator(); iter
                                 .hasNext();)
                         {
                             Posting posting = (Posting) iter.next();
-                            posting.setIndent(posting.getIndent()-first_indent);
+                            posting.setIndent(posting.getIndent()
+                                    - first_indent);
                         }
                     }
                 }
             }
             logger.debug("after type specific code, postings.size()="
                     + postings.size());
-            
+
         }
 
         return postings;
@@ -552,6 +641,12 @@
 
     public String getViewFromRequest(PortalRequest pRequest)
     {
+        if (pRequest.getRequestParameter("view") != null)
+        {
+            logger.debug("view from request parameter, value="
+                    + pRequest.getRequestParameter("view"));
+            return pRequest.getRequestParameter("view");
+        }
         Cookie[] cookies = pRequest.getHttpServletRequest().getCookies();
         if (cookies != null)
         {
@@ -565,18 +660,41 @@
                 }
             }
         }
-        if (pRequest.getRequestParameter("view") != null)
-        {
-            logger.debug("view from request parameter, value="
-                    + pRequest.getRequestParameter("view"));
-            return pRequest.getRequestParameter("view");
-        }
         logger
                 .debug("view from settings, value="
                         + coreManager
-                                .getProperty("org.cobricks.discussion.settings.forum_view"));
+                                .getProperty("org.cobricks.discussion.settings." +
+                                        "forum_view"));
 
         return coreManager
                 .getProperty("org.cobricks.discussion.settings.forum_view");
     }
+
+    /**
+     * Test if topic is of type "FAQ" and if 'topic' has one child.
+     * 
+     * @param topic
+     *            the topic to test.
+     * @return boolean if the topic has no child (true), with child (false)
+     */
+    public boolean needAnswer(Item topic)
+    {
+        Category parent = categoryManager.getCategory(topic.getLocalId());
+        if (!parent.getAttributeAsString("forumtype").equalsIgnoreCase("FAQ"))
+        {
+            return false;
+        }
+        List postings = itemManager.searchItems("/item/topicId/itemid="
+                + topic.getLocalId());
+        if (postings == null || postings.size() == 0)
+        {
+            return true;
+        }
+        return false;
+    }
+    public boolean allowed(String userid,
+                           String domain,
+                           String action){
+        return userManager.getAccessControl().checkPermission(0, domain, action, null);
+    }
 }

Index: OrderComparator.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/discussion/OrderComparator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- OrderComparator.java	2 Jun 2006 12:04:44 -0000	1.2
+++ OrderComparator.java	6 Jun 2006 22:20:28 -0000	1.3
@@ -82,11 +82,9 @@
 
         if (order1 instanceof String)
         {
-            logger.debug("order is returned as String");
             i1 = Integer.parseInt((String) order1);
         } else if (order1 instanceof Integer)
         {
-            logger.debug("order is returned as Integer");
             i1 = ((Integer) order1).intValue();
         }
         if (order2 instanceof String)

Index: properties.txt
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/discussion/properties.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- properties.txt	2 Jun 2006 12:04:44 -0000	1.4
+++ properties.txt	6 Jun 2006 22:20:28 -0000	1.5
@@ -46,10 +46,10 @@
 org.cobricks.discussion.settings.display_count=15
 org.cobricks.discussion.settings.display_count.descr=how much forums and topics on one page
 
-org.cobricks.discussion.settings.guestbook_with_form=true
-org.cobricks.discussion.settings.guestbook_with_form.descr=if entry form ist displayed in the guestbook view or on new page
-org.cobricks.discussion.settings.guestbook_with_form.choice1=true
-org.cobricks.discussion.settings.guestbook_with_forme.choice2=false
+org.cobricks.discussion.settings.topic_with_form=true
+org.cobricks.discussion.settings.topic_with_form.descr=if entry form ist displayed in the guestbook and weblog view or on new page
+org.cobricks.discussion.settings.topic_with_form.choice1=true
+org.cobricks.discussion.settings.topic_with_forme.choice2=false
 
 org.cobricks.discussion.settings.weblog_with_form=true
 org.cobricks.discussion.settings.weblog_with_form.descr=if entry form ist displayed in the weblog view or on new page<br/>only for users who can create entry

[Cobricks-cvscommit] cobricks2/web/discussion forum.html topic.html posting_form.html topic_form.html

[Philipp H. <p-...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/discussion
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30688/web/discussion

Modified Files:
	forum.html topic.html posting_form.html topic_form.html 
Log Message:
Added creation of topics and postings

Index: topic_form.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/discussion/topic_form.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- topic_form.html	2 Jun 2006 12:04:44 -0000	1.1
+++ topic_form.html	3 Jun 2006 09:59:48 -0000	1.2
@@ -1,3 +1,42 @@
+## redirect if forumId is missing
+#if(!$forumId)
+<head>
+<meta http-equiv="refresh" content="0; URL=$contextPath/discussion/index.html">
+<link rel="stylesheet" type="text/css" href="$contextPath/style.css">
+<link rel="shortcut icon" href="http://www.cobricks.de/c2.png" type="image/png">
+</head>
+
+<body bgcolor="#ffffff" topmargin="1" leftmargin="3" 
+      marginwidth="3" marginheight="1">
+	  Redirekt to Main Diskussion Page because forumId is missing.
+</body>
+#end
+#set ( $forum = $categoryPresenter.getCategory("$forumId"))
+#set ( $forum_type = $forum.getAttribute("forumtype"))
+
+## redirect if forumtype equals Weblog or Guestbook
+#if($forum_type == "Weblog" || $forum_type == "Guestbook")
+#set ($topic = $discussionPresenter.getSingleTopic("$forum.getLocalId()"))
+#if($topic)
+<head>
+<meta http-equiv="refresh" content="0; URL=$contextPath/discussion/topic.html?topicId=$topic.getLocalId()">
+<link rel="stylesheet" type="text/css" href="$contextPath/style.css">
+<link rel="shortcut icon" href="http://www.cobricks.de/c2.png" type="image/png">
+</head>
+
+<body bgcolor="#ffffff" topmargin="1" leftmargin="3" 
+      marginwidth="3" marginheight="1">
+	  Redirekt to Topic Page because Type is Weblog or Guestbook.
+</body>
+#end
+#end
+
+#if (!$topicId)
+
+#end
+
+#set ( $cat = $categoryPresenter.getCategory("$forum.getParentId()"))
+
 #parse ( "pageheader.html" )
 <!-- FCKeditor -->
 	<script type="text/javascript" src="fckeditor.js"></script>
@@ -7,7 +46,7 @@
 window.onload = function()
 {
 	
-	var oFCKeditor = new FCKeditor( 'content' ) ;
+	var oFCKeditor = new FCKeditor( 'content_$lang' ) ;
 	oFCKeditor.BasePath	= "" ;
 	oFCKeditor.Height	= 270 ;
 	oFCKeditor.Width	= 630 ;
@@ -20,23 +59,33 @@
 //-->
 	</script>
 <!-- /FCKeditor -->
+<em><a href="index.html">$coreManager.getProperty("org.cobricks.discussion.settings.forum_headline")</a> - 
+<a href="category.html?catId=$cat.getLocalId()">$cat.getTitle()</a> - 
+<a href="forum.html?forumId=$forum.getLocalId()">$forum.getTitle()</a> - 
+#if($forum_type == "FAQ")
+Create new question</em>
+<h1>Create new question</h1>
+#end
+#if($forum_type == "Forum")
+Create new topic</em>
+<h1>Create new topic</h1>
+#end
 
 <form action="/DISCUSSION" method="post">
-    <input type="hidden" name="cmd" value="saveTopic"/>
-    <input type="hidden" name="cmd.success" value="$contextPath/discussion/topic.html"/>
-    <input type="hidden" name="cmd.error" value="$contextPath/discussion/topic.html"/>
-    <input type="hidden" name="topicId" value="$topic.getLocalId()"/>
-	<input type="hidden" name="parent_cat" value="" />
-    <input name="title" type="text" size="70" maxlength="100"><br/>
-	<!--
-	<textarea name="title" cols="80" rows="2"></textarea>
-	-->
-    <textarea name="content">This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</textarea><br/>
-	Normal<input type="radio" name="priority" value="normal" />
-	Wichtig<input type="radio" name="priority" value="important" />
-	Ank&uuml;ndiung<input type="radio" name="priority" value="announcement" /><br/>
-    <input type="submit" value=" Absenden ">
-    <input type="reset" value=" Abbrechen">
+    <input type="hidden" name="cmd" value="createTopic"/>
+    <input type="hidden" name="cmd.success" value="$contextPath/discussion/forum.html"/>
+    <input type="hidden" name="cmd.error" value="$contextPath/discussion/forum.html"/>
+	<input type="hidden" name="forumId" value="$forum.getLocalId()" />
+	<input type="hidden" name="parent_cat" value="$forum.getLocalId()" />
+	<input type="hidden" name="lang" value="$lang" />
+    Title: <br/><input name="title_$lang" type="text" size="80" maxlength="100"><br/>
+	Content: <br/>
+    <textarea name="content_$lang">This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</textarea><br/>
+	Create topic as: Normal<input type="radio" name="priority" value="normal" checked="checked"/>
+	Important<input type="radio" name="priority" value="important" />
+	Announcement<input type="radio" name="priority" value="announcement" /><br/>
+    <input type="submit" value=" Submit ">
+    <input type="reset" value=" Cancel ">
 </form>
 
 #parse ( "pagefooter.html" )

Index: topic.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/discussion/topic.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- topic.html	2 Jun 2006 12:04:43 -0000	1.2
+++ topic.html	3 Jun 2006 09:59:48 -0000	1.3
@@ -36,7 +36,6 @@
 <a href="category.html?catId=$cat.getLocalId()">$cat.getTitle()</a> - 
 <a href="forum.html?forumId=$forum.getLocalId()">$forum.getTitle()</a> - 
 $topic.getTitle()</em>
-<!-- [debug] forumtype=$forum.getAttribute("forumtype") -->
 #if($returnCode == 1010)
 <div class="success">New view is set.</div><br/>
 #elseif($returnCode == 2010)
@@ -51,7 +50,11 @@
     #foreach ( $posting in $posting_list)
 	#set ( $creator = $userManager.getUser($posting.getAttribute("creator")))
 <!-- $posting.getIndent() -->
-#set ($indent = $posting.getIndent()*20)
+#if ( $posting.getIndent() )
+	#set ($indent = $posting.getIndent()*20)
+#else
+	#set ($indent = 0)
+#end
 <table style="text-align: left; width: 627px; margin-left: ${indent}px;" border="0"
  cellpadding="2" cellspacing="2">
   <tbody>
@@ -76,6 +79,39 @@
 	  </div>
 	  </td>
     </tr>
+    <tr>
+	  <td style="width: 613px;">
+	  <div style="text-align:right;">
+		## reply nur fuer Forum, FAQ fuer Frage ohne Antwort, Weblog und Guestbook nicht an Eintrag
+        <form action="posting_form.html" method="post" >
+        	<input type="hidden" name="topicId" value="$topicId" />
+			<!-- [debug] posting.getAttribute("itemclass")=$posting.getAttribute("itemclass")  -->
+			#if ($posting.getAttribute("itemclass") == "discussion_posting")
+				<input type="hidden" name="postingId" value="$posting.getLocalId()" />
+			#end
+            <input type="submit" value=" Reply ">
+        </form>
+		
+		#*
+        <form action="posting_form.html" method="post" >
+        	<input type="hidden" name="topicId" value="$topicId" />
+			<input type="hidden" name="postingId" value="$posting.getLocalId()" />
+            <input type="submit" value=" Update ">
+        </form>
+			#if ($posting.getAttribute("itemclass") == "discussion_posting")
+        <form action="/DISCUSSION" method="post" >
+            <input type="hidden" name="cmd" value="deletePosting"/>
+            <input type="hidden" name="cmd.success" value="$contextPath/discussion/forum.html"/>
+            <input type="hidden" name="cmd.error" value="$contextPath/discussion/forum.html"/>
+        	<input type="hidden" name="topicId" value="$topicId" />
+			<input type="hidden" name="postingId" value="$posting.getLocalId()" />
+            <input type="submit" value=" Delete ">
+        </form>
+			#end
+		*#
+	  </div>
+	  </td>
+    </tr>
   </tbody>
 </table>
 	#end

Index: forum.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/discussion/forum.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- forum.html	30 May 2006 14:48:06 -0000	1.1
+++ forum.html	3 Jun 2006 09:59:48 -0000	1.2
@@ -33,8 +33,14 @@
 <em><a href="index.html">$coreManager.getProperty("org.cobricks.discussion.settings.forum_headline")</a> - 
 <a href="category.html?catId=$cat.getLocalId()">$cat.getTitle()</a> - 
 $forum.getTitle()</em>
-<!-- [debug] forumtype=$forum.getAttribute("forumtype") -->
+
 <h1>$forum.getTitle()</h1>
+#if ($userId != "0")
+<form action="topic_form.html" method="post" >
+	<input type="hidden" name="forumId" value="$forumId" />
+    <input type="submit" value=" Create Topic ">
+</form>
+#end
 <table style="text-align: left; width: 627px;" border="0"
  cellpadding="2" cellspacing="2">
   <tbody>

Index: posting_form.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/discussion/posting_form.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- posting_form.html	2 Jun 2006 12:04:43 -0000	1.1
+++ posting_form.html	3 Jun 2006 09:59:48 -0000	1.2
@@ -1,6 +1,76 @@
+## redirect if catId or forumId is missing
+#if(!$topicId)
+<head>
+<meta http-equiv="refresh" content="0; URL=$contextPath/discussion/index.html">
+<link rel="stylesheet" type="text/css" href="$contextPath/style.css">
+<link rel="shortcut icon" href="http://www.cobricks.de/c2.png" type="image/png">
+</head>
+<body bgcolor="#ffffff" topmargin="1" leftmargin="3" 
+      marginwidth="3" marginheight="1">
+	  Redirekt to Main Diskussion Page because topicId is missing.
+</body>
+#end
+#set ( $topic = $itemPresenter.getItem($topicId))
+#set ( $forumId = $topic.getAttribute("parent_cat"))
+#set ( $forum = $categoryPresenter.getCategory($forumId))
+#set ( $cat = $categoryPresenter.getCategory("$forum.getParentId()"))
+#set ( $forum_type = $forum.getAttribute("forumtype"))
+
 #parse ( "pageheader.html" )
+<!-- FCKeditor -->
+	<script type="text/javascript" src="fckeditor.js"></script>
+	<script type="text/javascript">
+<!--
+
+window.onload = function()
+{
+	
+	var oFCKeditor = new FCKeditor( 'content_$lang' ) ;
+	oFCKeditor.BasePath	= "" ;
+	oFCKeditor.Height	= 270 ;
+	oFCKeditor.Width	= 630 ;
+	
+	oFCKeditor.ToolbarSet = 'Cobricks' ;
+	
+	oFCKeditor.ReplaceTextarea() ;
+}
+
+//-->
+	</script>
+<!-- /FCKeditor -->
+<em><a href="index.html">$coreManager.getProperty("org.cobricks.discussion.settings.forum_headline")</a> - 
+<a href="category.html?catId=$cat.getLocalId()">$cat.getTitle()</a> - 
+<a href="forum.html?forumId=$forum.getLocalId()">$forum.getTitle()</a> - 
+<a href="topic.html?topicId=$topic.getLocalId()">$topic.getTitle()</a> - 
+#if($forum_type == "FAQ")
+Create answer</em>
+<h1>Create answer</h1>
+#end
+#if($forum_type == "Forum")
+Create new posting</em>
+<h1>Create new posting</h1>
+#end
 
 
+<form action="/DISCUSSION" method="post">
+    <input type="hidden" name="cmd" value="createPosting"/>
+    <input type="hidden" name="cmd.success" value="$contextPath/discussion/topic.html"/>
+    <input type="hidden" name="cmd.error" value="$contextPath/discussion/topic.html"/>
+    <input type="hidden" name="topicId" value="$topic.getLocalId()"/>
+#if ($postingId)
+	<input type="hidden" name="parent" value="$postingId" />
+#end
+#if ($userId == "0")
+	Name: <br/><input name="name" type="text" size="80" maxlength="100"><br/>
+	E-Mail: <br/><input name="email" type="text" size="80" maxlength="100"><br/>
+#end
+	<input type="hidden" name="lang" value="$lang" />
+    Title: <br/><input name="title_$lang" type="text" size="80" maxlength="100"><br/>
+	Content: <br/>
+    <textarea name="content_$lang">This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</textarea><br/>
+	<input type="submit" value=" Absenden ">
+    <input type="reset" value=" Abbrechen">
+</form>
 
+#parse ( "pagefooter.html" )
 
-#parse ( "pagefooter.html" )
\ No newline at end of file

[Cobricks-cvscommit] cobricks2/src/org/cobricks/discussion DiscussionServlet.java DiscussionPresenter.java

[Philipp H. <p-...@us...>]

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

Modified Files:
	DiscussionServlet.java DiscussionPresenter.java 
Log Message:
Added creation of topics and postings

Index: DiscussionServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/discussion/DiscussionServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DiscussionServlet.java	30 May 2006 14:48:06 -0000	1.3
+++ DiscussionServlet.java	3 Jun 2006 09:59:48 -0000	1.4
@@ -2,23 +2,18 @@
 
 import java.io.PrintWriter;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 
 import org.apache.log4j.Logger;
-import org.cobricks.category.Category;
 import org.cobricks.category.CategoryManager;
+import org.cobricks.core.CobricksException;
 import org.cobricks.core.ComponentDirectory;
 import org.cobricks.core.Ontology;
-import org.cobricks.core.OntologyClass;
-import org.cobricks.core.OntologyClassAttr;
-import org.cobricks.core.util.LogUtil;
+import org.cobricks.item.Item;
 import org.cobricks.item.ItemManager;
 import org.cobricks.portal.PortalRequest;
 import org.cobricks.portal.PortalServletAdaptor;
@@ -42,12 +37,9 @@
     {
         super.init(config);
 
-        // this.addTarget("createCat", "performCreateCat", "", true);
-
-        this.addTarget("saveProperties", "performSaveProps", "", true);
         this.addTarget("saveView", "performSaveView", "", false);
-        // this.addTarget("add_interessted_user",
-        // "performAddInterestedUser", "", true);
+        this.addTarget("createTopic", "performCreateTopic", "", true);
+        this.addTarget("createPosting", "performCreatePosting", "", false);
         // this.addTarget("add_community_user",
         // "performAddCommunityUser", "", true);
         // this.addTarget("add_community_user_password",
@@ -74,90 +66,6 @@
         }
     }
 
-    public String performSaveProps(PortalRequest prequest, PrintWriter out)
-    {
-        logger.info("performSaveProps");
-
-        // check access rights
-        PortalUser portalUser = prequest.getPortalUser();
-        if (!userManager.getAccessControl().checkPermission(
-                portalUser.getUserId(), "discussion", "admin", null))
-        {
-            // prequest.setReturnCode(2000);
-            return "noaccess";
-        }
-        // Map for the attributes
-        Map attrs = new HashMap();
-
-//        coreManager.getProperties();
-//            if (prop_name
-//                    .matches("^org\\.cobricks\\.discussion\\.settings\\.\\w*$"))
-//            {
-//                
-//            }
-
-        return "success"; // "error" if fail
-        //        
-        // //get ontology classname request parameter
-        // String classname = prequest.getRequestParameter("categoryclass");
-        // //get language request parameter
-        // String lang = prequest.getRequestParameter("lang");
-        // //add classname to attrs Map
-        // attrs.put("categoryclass", classname);
-        //                 
-        // OntologyClass oc = categoryOntology.getClass(classname);
-        // //get set of ontology attribute names
-        // Set attr_list = oc.getAttributeNames();
-        // //iterate over all attribute names
-        // Iterator it = attr_list.iterator();
-        // while(it.hasNext()){
-        // String aname = (String)it.next(); //get next attribute name
-        // OntologyClassAttr oca = oc.getAttribute(aname);
-        // if (oca.isMultiLanguage()){ //check if multilingual
-        // String[] usedLangs = lang.split(",");
-        // logger.info("lang = "+lang);
-        // for (int j =0;j<usedLangs.length;j++){
-        // String avalue =
-        // prequest.getRequestParameter(aname+"_"+usedLangs[j]);
-        // attrs.put(aname+"_"+usedLangs[j],avalue);
-        // }
-        // }
-        // else {
-        // String avalue = prequest.getRequestParameter(aname.toString());
-        // //todo
-        // toString() ??? wieso ist doch schon einer
-        // attrs.put(aname,avalue);
-        // }
-        // }
-        //
-        // int count = 1;
-        // while (true) {
-        // String aname =
-        // prequest.getRequestParameter("aname"+Integer.toString(count));
-        // if (aname != null && aname.trim().length()>0) {
-        // String avalue =
-        // prequest.
-        // getRequestParameter("avalue"+Integer.toString(count));
-        // attrs.put(aname, avalue);
-        // }
-        // if (aname == null)
-        // break;
-        // count++;
-        // }
-        //        
-        // try {
-        // // Category catid =
-        // categoryManager.
-        // createCategory(attrs, prequest.getPortalUser().getUser());
-        // prequest.setReturnCode(1011);
-        // return "success";
-        // } catch (Exception e) {
-        // logger.error(LogUtil.ex("failed creating category", e));
-        // }
-        // prequest.setReturnCode(2011);
-        // return "error";
-    }
-
     public String performSaveView(PortalRequest prequest, PrintWriter out)
     {
         Cookie view = new Cookie("discussion_view", prequest.getRequestParameter("view"));
@@ -170,4 +78,137 @@
         prequest.setReturnCode(1010);
         return "success";
     }
+    
+
+    public String performCreateTopic(PortalRequest prequest, PrintWriter out)
+    {
+        logger.debug("performCreateTopic()");
+        
+        // check access rights
+        PortalUser portalUser = prequest.getPortalUser();
+        // todo check
+        
+        Map attrs = new HashMap();
+        String parent_cat = prequest.getRequestParameter("parent_cat");
+        logger.debug("parent_cat="+parent_cat);
+        try
+        {
+            Integer catId = Integer.valueOf(parent_cat);
+            attrs.put("parent_cat", catId);
+        } catch (NumberFormatException e)
+        {
+            logger.warn("parent_cat not valid", e);
+            return "error";
+        }
+        
+        attrs.put("itemclass", "discussion_topic");
+        String lang = prequest.getRequestParameter("lang");
+        logger.debug("lang="+lang);
+        String title = prequest.getRequestParameter("title_"+lang).trim();
+        String content = prequest.getRequestParameter("content_"+lang).trim();
+        if (title.equals("")){
+            // empty title
+            logger.warn("title is empty");
+            return "error";
+        }
+        attrs.put("title_"+lang, title);
+        attrs.put("content_"+lang, content);
+        attrs.put("priority", prequest.getRequestParameter("priority"));
+        
+        logger.debug("title_"+lang+"="+ prequest.getRequestParameter("title_"+lang).trim());
+        logger.debug("content_"+lang+"="+ prequest.getRequestParameter("content_"+lang).trim());
+        logger.debug("priority="+ prequest.getRequestParameter("priority"));
+        
+        Item item = null;
+        try
+        { 
+            item = itemManager.createItem(attrs, portalUser.getUser());
+            prequest.setContextObject("topicId", new Integer(item.getLocalId()));
+            prequest.setReturnCode(1001);
+            return("success");
+        } catch (CobricksException e)
+        {
+            logger.warn("Failed creating item.", e);
+        }
+        
+        return "error";
+    }
+    public String performCreatePosting(PortalRequest prequest, PrintWriter out)
+    {
+        logger.debug("performCreatePosting()");
+        
+        // check access rights
+        PortalUser portalUser = prequest.getPortalUser();
+        // todo check
+        
+        Map attrs = new HashMap();
+        String topicId = prequest.getRequestParameter("topicId");
+        logger.debug("topicId="+topicId);
+        try
+        {
+            Integer tId = Integer.valueOf(topicId);
+            attrs.put("topicId", tId);
+        } catch (NumberFormatException e)
+        {
+            logger.warn("topicId not valid", e);
+            return "error";
+        }
+
+        String parent = prequest.getRequestParameter("parent");
+        logger.debug("parent="+parent);
+        try
+        {
+            Integer pId = Integer.valueOf(parent);
+            attrs.put("parent", pId);
+        } catch (NumberFormatException e)
+        {
+            logger.warn("parent not valid", e);
+        }
+        
+        attrs.put("itemclass", "discussion_posting");
+        String lang = prequest.getRequestParameter("lang");
+        logger.debug("lang="+lang);
+        String title = prequest.getRequestParameter("title_"+lang).trim();
+        String content = prequest.getRequestParameter("content_"+lang).trim();
+        if (title.equals("")){
+            // empty title
+            logger.warn("title is empty");
+            return "error";
+        }
+        attrs.put("title_"+lang, title);
+        attrs.put("content_"+lang, content);
+
+        logger.debug("title_"+lang+"="+ prequest.getRequestParameter("title_"+lang).trim());
+        logger.debug("content_"+lang+"="+ prequest.getRequestParameter("content_"+lang).trim());
+        
+        // if user is anonymous then save the ip address
+        if (portalUser.getUserId() == 0)
+        {
+            attrs.put("ip", prequest.getHttpServletRequest().getRemoteHost());
+            String name = prequest.getRequestParameter("name");
+            if (name != null || !name.trim().equals("")) 
+            {
+                attrs.put("name", name);
+            }
+            String email = prequest.getRequestParameter("email");
+            if (email != null || !email.trim().equals(""))
+            {
+                attrs.put("email", email);
+            }
+        }
+
+        Item item = null;
+        try
+        { 
+            item = itemManager.createItem(attrs, portalUser.getUser());
+            prequest.setContextObject("topicId", Integer.toString(item.getLocalId()));
+            prequest.setReturnCode(1001);
+            return("success");
+        } catch (CobricksException e)
+        {
+            logger.warn("Failed creating item.", e);
+        }
+        
+        return "error";
+    }
 }

Index: DiscussionPresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/discussion/DiscussionPresenter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DiscussionPresenter.java	2 Jun 2006 12:04:44 -0000	1.4
+++ DiscussionPresenter.java	3 Jun 2006 09:59:48 -0000	1.5
@@ -282,6 +282,10 @@
 
         List postings = itemManager.searchItems("/item/topicId/itemid="
                 + topicId);
+        if(postings == null){
+            logger.debug("postings == null");
+            postings = new ArrayList();
+        }
 
         logger.debug("number of postings in search>" + postings.size());
 
@@ -377,7 +381,7 @@
                 for (Iterator iter = postings.iterator(); iter.hasNext();)
                 {
                     Posting posting = (Posting) iter.next();
-                    if (indent > -1 || startId == -1)
+                    if (indent > -1 || (startId == -1 && view.equalsIgnoreCase("hybrid")))
                     {
                         if (posting.getIndent() > indent)
                         {

[Cobricks-cvscommit] cobricks2/web/discussion tree.html

[Philipp H. <p-...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/discussion
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14538/web/discussion

Modified Files:
	tree.html 
Log Message:
bugfix in tree sorting

Index: tree.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/discussion/tree.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tree.html	2 Jun 2006 12:04:43 -0000	1.2
+++ tree.html	2 Jun 2006 12:43:33 -0000	1.3
@@ -32,10 +32,6 @@
  cellpadding="2" cellspacing="2">
   <tbody>
 	<tr>
-<!-- posting.isMarked()=$posting.isMarked() -->
-#if ($posting.isMarked())
-	<!-- comment only if posting is marked -->
-#end
       <td#if ($posting.isMarked()) style="font-weight:bold"#end>
 		<a href="topic.html?topicId=$topicId&postingId=$posting.getLocalId()" target="_top">$posting.getTitle(), $creator.getUserLogin() ($posting.getAttribute("creationtime"))</a>
 	  </td>

[Cobricks-cvscommit] cobricks2/src/org/cobricks/discussion TreePostingComparator.java

[Philipp H. <p-...@us...>]

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

Modified Files:
	TreePostingComparator.java 
Log Message:
bugfix in tree sorting

Index: TreePostingComparator.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/discussion/TreePostingComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TreePostingComparator.java	30 May 2006 14:48:06 -0000	1.1
+++ TreePostingComparator.java	2 Jun 2006 12:43:33 -0000	1.2
@@ -41,7 +41,7 @@
                     }
                     result = time_arr1[i].compareTo(time_arr2[i]);
                     if(result != 0){
-                        return result;
+                        return result * -1;
                     }
                 }
                 return -1; // second Array is longer
@@ -56,7 +56,7 @@
                     }
                     result = time_arr1[i].compareTo(time_arr2[i]);
                     if(result != 0){
-                        return result * -1;
+                        return result;
                     }
                 }
                 return -1; // second Array is longer

[Cobricks-cvscommit] cobricks2/web/discussion/editor fckeditor.html fckeditor.original.html fckblank.html fckdialog.html fckdebug.html

[Philipp H. <p-...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/discussion/editor
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30569/web/discussion/editor

Added Files:
	fckeditor.html fckeditor.original.html fckblank.html 
	fckdialog.html fckdebug.html 
Log Message:
Bugfixes in Topic Display and WYSIWYG Editor for Disucssion Forms (FCKeditor)

--- NEW FILE: fckblank.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head><title></title></head>
<body></body>
</html>
--- NEW FILE: fckdialog.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for internet
 * Copyright (C) 2003-2006 Frederico Caldeira Knabben
 * 
 * Licensed under the terms of the GNU Lesser General Public License:
 * 		http://www.opensource.org/licenses/lgpl-license.php
 * 
 * For further information visit:
 * 		http://www.fckeditor.net/
 * 
 * "Support Open Source software. What about a donation today?"
 * 
 * File Name: fckdialog.html
 * 	This page is used by all dialog box as the container.
 * 
 * File Authors:
 * 		Frederico Caldeira Knabben (fr...@fc...)
-->
<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
		<meta name="robots" content="noindex, nofollow" />
		<script type="text/javascript">

// On some Gecko browsers (probably over slow connections) the
// "dialogArguments" are not set so we must get it from the opener window.
if ( !window.dialogArguments )
	window.dialogArguments = window.opener.FCKLastDialogInfo ;

// Sets the Skin CSS
document.write( '<link href="' + window.dialogArguments.Editor.FCKConfig.SkinPath + 'fck_dialog.css" type="text/css" rel="stylesheet">' ) ;

// Sets the language direction.
window.document.dir = window.dialogArguments.Editor.FCKLang.Dir ;

var sTitle = window.dialogArguments.Title ;
document.write( '<title>' + sTitle + '<\/title>' ) ;

function LoadInnerDialog()
{
	if ( window.onresize )
		window.onresize() ;

	// First of all, translate the dialog box contents.
	window.dialogArguments.Editor.FCKLanguageManager.TranslatePage( document ) ;

	window.frames["frmMain"].document.location.href = window.dialogArguments.Page ;
}

function InnerDialogLoaded()
{
	var oInnerDoc = document.getElementById('frmMain').contentWindow.document ;

	// Set the language direction.
	oInnerDoc.dir = window.dialogArguments.Editor.FCKLang.Dir ;

	// Sets the Skin CSS.
	oInnerDoc.write( '<link href="' + window.dialogArguments.Editor.FCKConfig.SkinPath + 'fck_dialog.css" type="text/css" rel="stylesheet">' ) ;

	SetOnKeyDown( oInnerDoc ) ;
	DisableContextMenu( oInnerDoc ) ;

	return window.dialogArguments.Editor ;
}

function SetOkButton( showIt )
{
	document.getElementById('btnOk').style.visibility = ( showIt ? '' : 'hidden' ) ;
}

var bAutoSize = false ;

function SetAutoSize( autoSize )
{
	bAutoSize = autoSize ;
	RefreshSize() ;
}

function RefreshSize()
{
	if ( bAutoSize )
	{
		var oInnerDoc = document.getElementById('frmMain').contentWindow.document ;

		var iFrameHeight ;
		if ( document.all )
			iFrameHeight = oInnerDoc.body.offsetHeight ;
		else
			iFrameHeight = document.getElementById('frmMain').contentWindow.innerHeight ;

		var iInnerHeight = oInnerDoc.body.scrollHeight ;

		var iDiff = iInnerHeight - iFrameHeight ;

		if ( iDiff > 0 )
		{
			if ( document.all )
				window.dialogHeight = ( parseInt( window.dialogHeight ) + iDiff ) + 'px' ;
			else
				window.resizeBy( 0, iDiff ) ;
		}
	}
}

function Ok()
{
	if ( window.frames["frmMain"].Ok && window.frames["frmMain"].Ok() )
		Cancel() ;
}

function Cancel()
{
	// All dialog windows will fire the "OnSelectionChange" event, not matter
	// the Ok or Cancel button have being pressed.
	window.dialogArguments.Editor.FCK.Events.FireEvent( 'OnSelectionChange' ) ;
	window.close() ;
}

// Object that holds all available tabs.
var oTabs = new Object() ;

function TabDiv_OnClick()
{
	SetSelectedTab( this.TabCode ) ;
}

function AddTab( tabCode, tabText, startHidden )
{
	if ( typeof( oTabs[ tabCode ] ) != 'undefined' )
		return ;

	var eTabsRow = document.getElementById( 'Tabs' ) ;

	var oCell = eTabsRow.insertCell(  eTabsRow.cells.length - 1 ) ;
	oCell.noWrap = true ;

	var oDiv = document.createElement( 'DIV' ) ;
	oDiv.className = 'PopupTab' ;
	oDiv.innerHTML = tabText ;
	oDiv.TabCode = tabCode ;
	oDiv.onclick = TabDiv_OnClick ;

	if ( startHidden )
		oDiv.style.display = 'none' ;

	eTabsRow = document.getElementById( 'TabsRow' ) ;

	oCell.appendChild( oDiv ) ;

	if ( eTabsRow.style.display == 'none' )
	{
		var eTitleArea = document.getElementById( 'TitleArea' ) ;
		eTitleArea.className = 'PopupTitle' ;

		oDiv.className = 'PopupTabSelected' ;
		eTabsRow.style.display = '' ;

		if ( ! window.dialogArguments.Editor.FCKBrowserInfo.IsIE )
			window.onresize() ;
	}

	oTabs[ tabCode ] = oDiv ;
	oTabs[ tabCode ].Index = oTabs.length - 1 ;
}

function SetSelectedTab( tabCode )
{
	for ( var sCode in oTabs )
	{
		if ( sCode == tabCode )
			oTabs[sCode].className = 'PopupTabSelected' ;
		else
			oTabs[sCode].className = 'PopupTab' ;
	}

	if ( typeof( window.frames["frmMain"].OnDialogTabChange ) == 'function' )
		window.frames["frmMain"].OnDialogTabChange( tabCode ) ;
}

function SetTabVisibility( tabCode, isVisible )
{
	var oTab = oTabs[ tabCode ] ;
	oTab.style.display = isVisible ? '' : 'none' ;

	if ( ! isVisible && oTab.className == 'PopupTabSelected' )
	{
		for ( var sCode in oTabs )
		{
			if ( oTabs[sCode].style.display != 'none' )
			{
				SetSelectedTab( sCode ) ;
				break ;
			}
		}
	}
}

function SetOnKeyDown( targetDocument )
{
	targetDocument.onkeydown = function ( e )
	{
		e = e || event || this.parentWindow.event ;
		switch ( e.keyCode )
		{
			case 13 :		// ENTER
				var oTarget = e.srcElement || e.target ;
				if ( oTarget.tagName == 'TEXTAREA' ) return ;
				Ok() ;
				return false ;
			case 27 :		// ESC
				Cancel() ;
				return false ;
				break ;
		}
		return true ;
	}
}
SetOnKeyDown( document ) ;

function DisableContextMenu( targetDocument )
{
	if ( window.dialogArguments.Editor.FCKBrowserInfo.IsIE ) return ;

	// Disable Right-Click
	var oOnContextMenu = function( e )
	{
		var sTagName = e.target.tagName ;
		if ( ! ( ( sTagName == "INPUT" && e.target.type == "text" ) || sTagName == "TEXTAREA" ) )
			e.preventDefault() ;
	}
	targetDocument.addEventListener( 'contextmenu', oOnContextMenu, true ) ;
}
DisableContextMenu( document ) ;

if ( ! window.dialogArguments.Editor.FCKBrowserInfo.IsIE )
{
	window.onresize = function()
	{
		var oFrame = document.getElementById("frmMain") ;

		if ( ! oFrame )
		return ;

		oFrame.height = 0 ;

		var oCell = document.getElementById("FrameCell") ;
		var iHeight = oCell.offsetHeight ;

		oFrame.height = iHeight - 2 ;
	}
}

if ( window.dialogArguments.Editor.FCKBrowserInfo.IsIE )
{
	function Window_OnBeforeUnload()
	{
		for ( var t in oTabs )
			oTabs[t] = null ;

		window.dialogArguments.Editor = null ;
	}
	window.attachEvent( "onbeforeunload", Window_OnBeforeUnload ) ;
}

function Window_OnClose()
{
	window.dialogArguments.Editor.FCKFocusManager.Unlock() ;
}

if ( window.addEventListener )
	window.addEventListener( 'unload', Window_OnClose, false ) ;

		</script>
	</head>
	<body onload="LoadInnerDialog();" class="PopupBody">
		<table height="100%" cellspacing="0" cellpadding="0" width="100%" border="0">
			<tr>
				<td id="TitleArea" class="PopupTitle PopupTitleBorder">
					<script type="text/javascript">
document.write( sTitle ) ;
					</script>
				</td>
			</tr>
			<tr id="TabsRow" style="DISPLAY: none">
				<td class="PopupTabArea">
					<table border="0" cellpadding="0" cellspacing="0" width="100%">
						<tr id="Tabs" onselectstart="return false;">
							<td class="PopupTabEmptyArea">&nbsp;</td>
							<td class="PopupTabEmptyArea" width="100%">&nbsp;</td>
						</tr>
					</table>
				</td>
			</tr>
			<tr>
				<td id="FrameCell" height="100%" valign="top">
					<iframe id="frmMain" src="fckblank.html" name="frmMain" frameborder="0" height="100%" width="100%" scrolling="auto">
					</iframe>
				</td>
			</tr>
			<tr>
				<td class="PopupButtons">
					<table border="0" cellpadding="0" cellspacing="0">
						<tr>
							<td width="100%">&nbsp;</td>
							<td nowrap="nowrap">
								<input id="btnOk" style="VISIBILITY: hidden; WIDTH: 100px" type="button" value="Ok" class="Button"
									onclick="Ok();" fckLang="DlgBtnOK" />&nbsp; <input type="button" value="Cancel" class="Button" onclick="Cancel();" fckLang="DlgBtnCancel" />
							</td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>
--- NEW FILE: fckeditor.original.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for internet
 * Copyright (C) 2003-2006 Frederico Caldeira Knabben
 * 
 * Licensed under the terms of the GNU Lesser General Public License:
 * 		http://www.opensource.org/licenses/lgpl-license.php
 * 
 * For further information visit:
 * 		http://www.fckeditor.net/
 * 
 * "Support Open Source software. What about a donation today?"
 * 
 * File Name: fckeditor.original.html
 * 	Main page that holds the editor.
 * 
 * File Authors:
 * 		Frederico Caldeira Knabben (fr...@fc...)
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor</title>
	<meta name="robots" content="noindex, nofollow" />
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<!-- @Packager.RemoveLine
	<meta http-equiv="Cache-Control" content="public" />
	@Packager.RemoveLine -->
	<script type="text/javascript">

// Instead of loading scripts and CSSs using inline tags, all scripts are
// loaded by code. In this way we can guarantee the correct processing order,
// otherwise external scripts and inline scripts could be executed in a
// unwanted order (IE).

function LoadScript( url )
{
	document.write( '<script type="text/javascript" src="' + url + '" onerror="alert(\'Error loading \' + this.src);"><\/script>' ) ;
}

function LoadCss( url )
{
	document.write( '<link href="' + url + '" type="text/css" rel="stylesheet" onerror="alert(\'Error loading \' + this.src);" />' ) ;
}

// Main editor scripts.
var sSuffix = /msie/.test( navigator.userAgent.toLowerCase() ) ? 'ie' : 'gecko' ;

/* @Packager.RemoveLine
LoadScript( 'js/fckeditorcode_' + sSuffix + '.js' ) ;
@Packager.RemoveLine */
// @Packager.Remove.Start

LoadScript( '_source/fckconstants.js' ) ;
LoadScript( '_source/fckjscoreextensions.js' ) ;

if ( sSuffix == 'ie' )
	LoadScript( '_source/classes/fckiecleanup.js' ) ;

LoadScript( '_source/internals/fckbrowserinfo.js' ) ;
LoadScript( '_source/internals/fckurlparams.js' ) ;
LoadScript( '_source/internals/fck.js' ) ;
LoadScript( '_source/internals/fckconfig.js' ) ;
LoadScript( '_source/fckeditorapi.js' ) ;

LoadScript( '_source/internals/fckdebug.js' ) ;
LoadScript( '_source/internals/fcktools.js' ) ;
LoadScript( '_source/internals/fcktools_' + sSuffix + '.js' ) ;
LoadScript( '_source/internals/fckregexlib.js' ) ;
LoadScript( '_source/internals/fcklanguagemanager.js' ) ;
LoadScript( '_source/classes/fckevents.js' ) ;
LoadScript( '_source/internals/fckxhtmlentities.js' ) ;
LoadScript( '_source/internals/fckxhtml.js' ) ;
LoadScript( '_source/internals/fckxhtml_' + sSuffix + '.js' ) ;
LoadScript( '_source/internals/fckcodeformatter.js' ) ;
LoadScript( '_source/internals/fckundo_' + sSuffix + '.js' ) ;
LoadScript( '_source/classes/fckeditingarea.js' ) ;
LoadScript( '_source/internals/fckdocumentprocessor.js' ) ;
LoadScript( '_source/internals/fck_1.js' ) ;
LoadScript( '_source/internals/fck_1_' + sSuffix + '.js' ) ;
LoadScript( '_source/internals/fck_2.js' ) ;
LoadScript( '_source/internals/fck_2_' + sSuffix + '.js' ) ;
LoadScript( '_source/internals/fckselection.js' ) ;
LoadScript( '_source/internals/fckselection_' + sSuffix + '.js' ) ;

LoadScript( '_source/internals/fcktablehandler.js' ) ;
LoadScript( '_source/internals/fcktablehandler_' + sSuffix + '.js' ) ;
LoadScript( '_source/classes/fckxml_' + sSuffix + '.js' ) ;
LoadScript( '_source/classes/fckstyledef.js' ) ;
LoadScript( '_source/classes/fckstyledef_' + sSuffix + '.js' ) ;
LoadScript( '_source/classes/fckstylesloader.js' ) ;

LoadScript( '_source/commandclasses/fcknamedcommand.js' ) ;
LoadScript( '_source/commandclasses/fck_othercommands.js' ) ;
LoadScript( '_source/commandclasses/fckspellcheckcommand_' + sSuffix + '.js' ) ;
LoadScript( '_source/commandclasses/fcktextcolorcommand.js' ) ;
LoadScript( '_source/commandclasses/fckpasteplaintextcommand.js' ) ;
LoadScript( '_source/commandclasses/fckpastewordcommand.js' ) ;
LoadScript( '_source/commandclasses/fcktablecommand.js' ) ;
LoadScript( '_source/commandclasses/fckstylecommand.js' ) ;
LoadScript( '_source/commandclasses/fckfitwindow.js' ) ;
LoadScript( '_source/internals/fckcommands.js' ) ;

LoadScript( '_source/classes/fckpanel.js' ) ;
LoadScript( '_source/classes/fckicon.js' ) ;
LoadScript( '_source/classes/fcktoolbarbuttonui.js' ) ;
LoadScript( '_source/classes/fcktoolbarbutton.js' ) ;
LoadScript( '_source/classes/fckspecialcombo.js' ) ;
LoadScript( '_source/classes/fcktoolbarspecialcombo.js' ) ;
LoadScript( '_source/classes/fcktoolbarfontscombo.js' ) ;
LoadScript( '_source/classes/fcktoolbarfontsizecombo.js' ) ;
LoadScript( '_source/classes/fcktoolbarfontformatcombo.js' ) ;
LoadScript( '_source/classes/fcktoolbarstylecombo.js' ) ;
LoadScript( '_source/classes/fcktoolbarpanelbutton.js' ) ;
LoadScript( '_source/internals/fcktoolbaritems.js' ) ;
LoadScript( '_source/classes/fcktoolbar.js' ) ;
LoadScript( '_source/classes/fcktoolbarbreak_' + sSuffix + '.js' ) ;
LoadScript( '_source/internals/fcktoolbarset.js' ) ;
LoadScript( '_source/internals/fckdialog.js' ) ;
LoadScript( '_source/internals/fckdialog_' + sSuffix + '.js' ) ;
LoadScript( '_source/classes/fckmenuitem.js' ) ;
LoadScript( '_source/classes/fckmenublock.js' ) ;
LoadScript( '_source/classes/fckcontextmenu.js' ) ;
LoadScript( '_source/internals/fck_contextmenu.js' ) ;
LoadScript( '_source/classes/fckplugin.js' ) ;
LoadScript( '_source/internals/fckplugins.js' ) ;

// @Packager.Remove.End

// Base configuration file.
LoadScript( '../fckconfig.js' ) ;

	</script>
	<script type="text/javascript">

// Create the default cleanup object used by the editor.
if ( FCKBrowserInfo.IsIE )
{
	FCK.IECleanup = new FCKIECleanup( window ) ;
	FCK.IECleanup.AddItem( FCKTempBin, FCKTempBin.Reset ) ;
}

// The config hidden field is processed immediately, because
// CustomConfigurationsPath may be set in the page.
FCKConfig.ProcessHiddenField() ;

// Load the custom configurations file (if defined).
if ( FCKConfig.CustomConfigurationsPath.length > 0 )
	LoadScript( FCKConfig.CustomConfigurationsPath ) ;

	</script>
	<script type="text/javascript">

// Load configurations defined at page level.
FCKConfig_LoadPageConfig() ;

FCKConfig_PreProcess() ;

// Load the active skin CSS.
LoadCss( FCKConfig.SkinPath + 'fck_editor.css' ) ;

// Load the language file.
FCKLanguageManager.Initialize() ;
LoadScript( 'lang/' + FCKLanguageManager.ActiveLanguage.Code + '.js' ) ;

	</script>
	<script type="text/javascript">

// Initialize the editing area context menu.
FCK_ContextMenu_Init() ;

FCKPlugins.Load() ;

	</script>
	<script type="text/javascript">
	
// Set the editor interface direction.
window.document.dir = FCKLang.Dir ;

// Activate pasting operations.
if ( FCKConfig.ForcePasteAsPlainText || FCKConfig.AutoDetectPasteFromWord )
	FCK.Events.AttachEvent( "OnPaste", FCK.Paste ) ;

	</script>
	<script type="text/javascript">

window.onload = function()
{
	InitializeAPI() ;

	if ( FCKBrowserInfo.IsIE )
		FCK_PreloadImages() ;
	else
		LoadToolbarSetup() ;
}

function LoadToolbarSetup()
{
	FCKeditorAPI._FunctionQueue.Add( LoadToolbar ) ;
}

function LoadToolbar()
{
	var oToolbarSet = FCK.ToolbarSet = FCKToolbarSet_Create() ;
	
	if ( oToolbarSet.IsLoaded )
		StartEditor() ;
	else
	{
		oToolbarSet.OnLoad = StartEditor ;
		oToolbarSet.Load( FCKURLParams['Toolbar'] || 'Default' ) ;
	}
}

function StartEditor()
{
	// Remove the onload listener.
	FCK.ToolbarSet.OnLoad = null ;

	FCKeditorAPI._FunctionQueue.Remove( LoadToolbar ) ;

	FCK.Events.AttachEvent( 'OnStatusChange', WaitForActive ) ;

	// Start the editor.
	FCK.StartEditor() ;
}

function WaitForActive( editorInstance, newStatus )
{
	if ( newStatus == FCK_STATUS_ACTIVE )
	{
		if ( FCKBrowserInfo.IsGecko )
			FCKTools.RunFunction( window.onresize ) ;

		FCK.SetStatus( FCK_STATUS_COMPLETE ) ;

		// Call the special "FCKeditor_OnComplete" function that should be present in 
		// the HTML page where the editor is located.
		if ( typeof( window.parent.FCKeditor_OnComplete ) == 'function' )
			window.parent.FCKeditor_OnComplete( FCK ) ;	
	}
}

// Gecko browsers doens't calculate well that IFRAME size so we must
// recalculate it every time the window size changes.
if ( FCKBrowserInfo.IsGecko )
{
	function Window_OnResize()
	{
		var oCell = document.getElementById( 'xEditingArea' ) ;

		var eInnerElement ;
		if ( eInnerElement = oCell.firstChild )
		{
			eInnerElement.style.height = 0 ;
			eInnerElement.style.height = oCell.scrollHeight - 2 ;
		}
	}
	window.onresize = Window_OnResize ;
}

	</script>
</head>
<body>
	<table width="100%" cellpadding="0" cellspacing="0" style="height: 100%; table-layout: fixed">
		<tr id="xToolbarRow" style="display: none">
			<td id="xToolbarSpace" style="overflow: hidden">
				<table width="100%" cellpadding="0" cellspacing="0">
					<tr id="xCollapsed" style="display: none">
						<td id="xExpandHandle" class="TB_Expand" colspan="3">
							<img class="TB_ExpandImg" alt="" src="images/spacer.gif" width="8" height="4" /></td>
					</tr>
					<tr id="xExpanded" style="display: none">
						<td id="xTBLeftBorder" class="TB_SideBorder" style="width: 1px; display: none;"></td>
						<td id="xCollapseHandle" style="display: none" class="TB_Collapse" valign="bottom">
							<img class="TB_CollapseImg" alt="" src="images/spacer.gif" width="8" height="4" /></td>
						<td id="xToolbar" class="TB_ToolbarSet"></td>
						<td class="TB_SideBorder" style="width: 1px"></td>
					</tr>
				</table>
			</td>
		</tr>
		<tr style="height: 100%">
			<td id="xEditingArea" valign="top"></td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fckeditor.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for internet
 * Copyright (C) 2003-2006 Frederico Caldeira Knabben
 * 
 * Licensed under the terms of the GNU Lesser General Public License:
 * 		http://www.opensource.org/licenses/lgpl-license.php
 * 
 * For further information visit:
 * 		http://www.fckeditor.net/
 * 
 * "Support Open Source software. What about a donation today?"
 * 
 * File Name: fckeditor.html
 * 	Main page that holds the editor.
 * 
 * File Authors:
 * 		Frederico Caldeira Knabben (fr...@fc...)
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor</title>
	<meta name="robots" content="noindex, nofollow" />
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta http-equiv="Cache-Control" content="public" />
	<script type="text/javascript">

// Instead of loading scripts and CSSs using inline tags, all scripts are
// loaded by code. In this way we can guarantee the correct processing order,
// otherwise external scripts and inline scripts could be executed in a
// unwanted order (IE).

function LoadScript( url )
{
	document.write( '<script type="text/javascript" src="' + url + '" onerror="alert(\'Error loading \' + this.src);"><\/script>' ) ;
}

function LoadCss( url )
{
	document.write( '<link href="' + url + '" type="text/css" rel="stylesheet" onerror="alert(\'Error loading \' + this.src);" />' ) ;
}

// Main editor scripts.
var sSuffix = /msie/.test( navigator.userAgent.toLowerCase() ) ? 'ie' : 'gecko' ;

LoadScript( 'js/fckeditorcode_' + sSuffix + '.js' ) ;

// Base configuration file.
LoadScript( '../fckconfig.js' ) ;

	</script>
	<script type="text/javascript">

// Create the default cleanup object used by the editor.
if ( FCKBrowserInfo.IsIE )
{
	FCK.IECleanup = new FCKIECleanup( window ) ;
	FCK.IECleanup.AddItem( FCKTempBin, FCKTempBin.Reset ) ;
}

// The config hidden field is processed immediately, because
// CustomConfigurationsPath may be set in the page.
FCKConfig.ProcessHiddenField() ;

// Load the custom configurations file (if defined).
if ( FCKConfig.CustomConfigurationsPath.length > 0 )
	LoadScript( FCKConfig.CustomConfigurationsPath ) ;

	</script>
	<script type="text/javascript">

// Load configurations defined at page level.
FCKConfig_LoadPageConfig() ;

FCKConfig_PreProcess() ;

// Load the active skin CSS.
LoadCss( FCKConfig.SkinPath + 'fck_editor.css' ) ;

// Load the language file.
FCKLanguageManager.Initialize() ;
LoadScript( 'lang/' + FCKLanguageManager.ActiveLanguage.Code + '.js' ) ;

	</script>
	<script type="text/javascript">

// Initialize the editing area context menu.
FCK_ContextMenu_Init() ;

FCKPlugins.Load() ;

	</script>
	<script type="text/javascript">
	
// Set the editor interface direction.
window.document.dir = FCKLang.Dir ;

// Activate pasting operations.
if ( FCKConfig.ForcePasteAsPlainText || FCKConfig.AutoDetectPasteFromWord )
	FCK.Events.AttachEvent( "OnPaste", FCK.Paste ) ;

	</script>
	<script type="text/javascript">

window.onload = function()
{
	InitializeAPI() ;

	if ( FCKBrowserInfo.IsIE )
		FCK_PreloadImages() ;
	else
		LoadToolbarSetup() ;
}

function LoadToolbarSetup()
{
	FCKeditorAPI._FunctionQueue.Add( LoadToolbar ) ;
}

function LoadToolbar()
{
	var oToolbarSet = FCK.ToolbarSet = FCKToolbarSet_Create() ;
	
	if ( oToolbarSet.IsLoaded )
		StartEditor() ;
	else
	{
		oToolbarSet.OnLoad = StartEditor ;
		oToolbarSet.Load( FCKURLParams['Toolbar'] || 'Default' ) ;
	}
}

function StartEditor()
{
	// Remove the onload listener.
	FCK.ToolbarSet.OnLoad = null ;

	FCKeditorAPI._FunctionQueue.Remove( LoadToolbar ) ;

	FCK.Events.AttachEvent( 'OnStatusChange', WaitForActive ) ;

	// Start the editor.
	FCK.StartEditor() ;
}

function WaitForActive( editorInstance, newStatus )
{
	if ( newStatus == FCK_STATUS_ACTIVE )
	{
		if ( FCKBrowserInfo.IsGecko )
			FCKTools.RunFunction( window.onresize ) ;

		FCK.SetStatus( FCK_STATUS_COMPLETE ) ;

		// Call the special "FCKeditor_OnComplete" function that should be present in 
		// the HTML page where the editor is located.
		if ( typeof( window.parent.FCKeditor_OnComplete ) == 'function' )
			window.parent.FCKeditor_OnComplete( FCK ) ;	
	}
}

// Gecko browsers doens't calculate well that IFRAME size so we must
// recalculate it every time the window size changes.
if ( FCKBrowserInfo.IsGecko )
{
	function Window_OnResize()
	{
		var oCell = document.getElementById( 'xEditingArea' ) ;

		var eInnerElement ;
		if ( eInnerElement = oCell.firstChild )
		{
			eInnerElement.style.height = 0 ;
			eInnerElement.style.height = oCell.scrollHeight - 2 ;
		}
	}
	window.onresize = Window_OnResize ;
}

	</script>
</head>
<body>
	<table width="100%" cellpadding="0" cellspacing="0" style="height: 100%; table-layout: fixed">
		<tr id="xToolbarRow" style="display: none">
			<td id="xToolbarSpace" style="overflow: hidden">
				<table width="100%" cellpadding="0" cellspacing="0">
					<tr id="xCollapsed" style="display: none">
						<td id="xExpandHandle" class="TB_Expand" colspan="3">
							<img class="TB_ExpandImg" alt="" src="images/spacer.gif" width="8" height="4" /></td>
					</tr>
					<tr id="xExpanded" style="display: none">
						<td id="xTBLeftBorder" class="TB_SideBorder" style="width: 1px; display: none;"></td>
						<td id="xCollapseHandle" style="display: none" class="TB_Collapse" valign="bottom">
							<img class="TB_CollapseImg" alt="" src="images/spacer.gif" width="8" height="4" /></td>
						<td id="xToolbar" class="TB_ToolbarSet"></td>
						<td class="TB_SideBorder" style="width: 1px"></td>
					</tr>
				</table>
			</td>
		</tr>
		<tr style="height: 100%">
			<td id="xEditingArea" valign="top"></td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fckdebug.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for internet
 * Copyright (C) 2003-2006 Frederico Caldeira Knabben
 * 
 * Licensed under the terms of the GNU Lesser General Public License:
 * 		http://www.opensource.org/licenses/lgpl-license.php
 * 
 * For further information visit:
 * 		http://www.fckeditor.net/
 * 
 * "Support Open Source software. What about a donation today?"
 * 
 * File Name: fckdebug.html
 * 	This is the Debug window.
 * 	It automatically popups if the Debug = true in the configuration file.
 * 
 * File Authors:
 * 		Frederico Caldeira Knabben (fr...@fc...)
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor Debug Window</title>
	<meta name="robots" content="noindex, nofollow" />
	<script type="text/javascript">

var oWindow ;
var oDiv ;

if ( !window.FCKMessages )
	window.FCKMessages = new Array() ;

window.onload = function()
{
	oWindow = document.getElementById('xOutput').contentWindow ;
	oWindow.document.open() ;
	oWindow.document.write( '<div id="divMsg"><\/div>' ) ;
	oWindow.document.close() ;
	oDiv	= oWindow.document.getElementById('divMsg') ;
}

function Output( message, color )
{
	if ( color )
		message = '<font color="' + color + '">' + message + '<\/font>' ;
		
	window.FCKMessages[ window.FCKMessages.length ] = message ;
	StartTimer() ;
}

function StartTimer()
{
	window.setTimeout( 'CheckMessages()', 100 ) ;
}

function CheckMessages()
{
	if ( window.FCKMessages.length > 0 )
	{
		// Get the first item in the queue
		var sMessage = window.FCKMessages[0] ;
		
		// Removes the first item from the queue
		var oTempArray = new Array() ;
		for ( i = 1 ; i < window.FCKMessages.length ; i++ )
			oTempArray[ i - 1 ] = window.FCKMessages[ i ] ;
		window.FCKMessages = oTempArray ;
		
		var d = new Date() ;
		var sTime = 
			( d.getHours() + 100 + '' ).substr( 1,2 ) + ':' + 
			( d.getMinutes() + 100 + '' ).substr( 1,2 ) + ':' + 
			( d.getSeconds() + 100 + '' ).substr( 1,2 ) + ':' + 
			( d.getMilliseconds() + 1000 + '' ).substr( 1,3 ) ;

		var oMsgDiv = oWindow.document.createElement( 'div' ) ;
		oMsgDiv.innerHTML = sTime + ': <b>' + sMessage + '<\/b>' ;
		oDiv.appendChild( oMsgDiv ) ;
		oMsgDiv.scrollIntoView() ;
	}
}

function Clear()
{
	oDiv.innerHTML = '' ;
}
	</script>
</head>
<body style="margin: 10px">
	<table style="height: 100%" cellspacing="5" cellpadding="0" width="100%" border="0">
		<tr>
			<td>
				<table cellspacing="0" cellpadding="0" width="100%" border="0">
					<tr>
						<td style="font-weight: bold; font-size: 1.2em;">
							FCKeditor Debug Window</td>
						<td align="right">
							<input type="button" value="Clear" onclick="Clear();" /></td>
					</tr>
				</table>
			</td>
		</tr>
		<tr style="height: 100%">
			<td style="border: #696969 1px solid">
				<iframe id="xOutput" width="100%" height="100%" scrolling="auto" src="fckblank.html"
					frameborder="0"></iframe>
			</td>
		</tr>
	</table>
</body>
</html>

[Cobricks-cvscommit] cobricks2/web/discussion/editor/dialog/common/images reset.gif locked.gif unlocked.gif

[Philipp H. <p-...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/discussion/editor/dialog/common/images
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30569/web/discussion/editor/dialog/common/images

Added Files:
	reset.gif locked.gif unlocked.gif 
Log Message:
Bugfixes in Topic Display and WYSIWYG Editor for Disucssion Forms (FCKeditor)

--- NEW FILE: reset.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: locked.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: unlocked.gif ---
(This appears to be a binary file; contents omitted.)

[Cobricks-cvscommit] cobricks2/web/ADMIN/org.cobricks.discussion index.html

[Philipp H. <p-...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.discussion
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30569/web/ADMIN/org.cobricks.discussion

Modified Files:
	index.html 
Log Message:
Bugfixes in Topic Display and WYSIWYG Editor for Disucssion Forms (FCKeditor)

Index: index.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.discussion/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.html	30 May 2006 14:48:06 -0000	1.2
+++ index.html	2 Jun 2006 12:04:46 -0000	1.3
@@ -1,4 +1,5 @@
-#parse ( "adminpageheader.html" )
+
+$portalPresenter.parse("$!contextPath/ADMIN/pageheader.html.en",$portalRequest)
 
 #if ($returnCode == 1005)
   <p><div class="success">Item annotation added.</div></p>
@@ -30,5 +31,5 @@
 </table>
 </form>
 
-#parse ( "adminpagefooter.html" )
+$portalPresenter.parse("$!contextPath/ADMIN/pagefooter.html.en",$portalRequest)
 

[Cobricks-cvscommit] cobricks2/web/discussion/editor/dialog/fck_link fck_link.js

[Philipp H. <p-...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/discussion/editor/dialog/fck_link
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30569/web/discussion/editor/dialog/fck_link

Added Files:
	fck_link.js 
Log Message:
Bugfixes in Topic Display and WYSIWYG Editor for Disucssion Forms (FCKeditor)

--- NEW FILE: fck_link.js ---
(This appears to be a binary file; contents omitted.)

[Cobricks-cvscommit] cobricks2/web/discussion/editor/dialog/common fck_dialog_common.js fcknumericfield.htc fck_dialog_common.css moz-bindings.xml

[Philipp H. <p-...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/discussion/editor/dialog/common
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30569/web/discussion/editor/dialog/common

Added Files:
	fck_dialog_common.js fcknumericfield.htc fck_dialog_common.css 
	moz-bindings.xml 
Log Message:
Bugfixes in Topic Display and WYSIWYG Editor for Disucssion Forms (FCKeditor)

--- NEW FILE: moz-bindings.xml ---
<?xml version="1.0" encoding="utf-8" ?>
<bindings xmlns="http://www.mozilla.org/xbl">
	<binding id="numericfield">
		<implementation>
			<constructor>
				this.keypress = CheckIsDigit ;
			</constructor>
			<method name="CheckIsDigit">
				<body>
					<![CDATA[
					var iCode = keyCode ;

					var bAccepted =
						(
							( iCode >= 48 && iCode <= 57 )		// Numbers
							|| (iCode >= 37 && iCode <= 40)		// Arrows
							|| iCode == 8											// Backspace
							|| iCode == 46										// Delete
						) ;

					return bAccepted ;
					]]>
				</body>
			</method>
		</implementation>
		<events>
			<event type="keypress" value="CheckIsDigit()" />
		</events>
	</binding>
</bindings>
--- NEW FILE: fck_dialog_common.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_dialog_common.css ---
/*
 * FCKeditor - The text editor for internet
 * Copyright (C) 2003-2006 Frederico Caldeira Knabben
 * 
 * Licensed under the terms of the GNU Lesser General Public License:
 * 		http://www.opensource.org/licenses/lgpl-license.php
 * 
 * For further information visit:
 * 		http://www.fckeditor.net/
 * 
 * "Support Open Source software. What about a donation today?"
 * 
 * File Name: fck_dialog_common.css
 * 	This is the CSS file used for interface details in some dialog
 * 	windows.
 * 
 * File Authors:
 * 		Frederico Caldeira Knabben (fr...@fc...)
 */

.ImagePreviewArea
{
	border: #000000 1px solid;
	overflow: auto;
	width: 100%;
	height: 170px;
	background-color: #ffffff;
}

.FlashPreviewArea
{
	border: #000000 1px solid;
	padding: 5px;
	overflow: auto;
	width: 100%;
	height: 170px;
	background-color: #ffffff;
}

.BtnReset
{
	float: left;
	background-position: center center;
	background-image: url(images/reset.gif);
	width: 16px;
	height: 16px;
	background-repeat: no-repeat;
	border: 1px none;
	font-size: 1px ;
}

.BtnLocked, .BtnUnlocked
{
	float: left;
	background-position: center center;
	background-image: url(images/locked.gif);
	width: 16px;
	height: 16px;
	background-repeat: no-repeat;
	border: 1px none;
	font-size: 1px ;
}

.BtnUnlocked
{
	background-image: url(images/unlocked.gif);
}

.BtnOver
{
	border: 1px outset;
	cursor: pointer;
	cursor: hand;
}

.FCK__FieldNumeric
{
	behavior: url(common/fcknumericfield.htc) ;
}
--- NEW FILE: fcknumericfield.htc ---
<public:component lightweight="true">

<script language="javascript">

function CheckIsDigit()
{
	var iCode = event.keyCode ;

	event.returnValue =
		(
			( iCode >= 48 && iCode <= 57 )		// Numbers
			|| (iCode >= 37 && iCode <= 40)		// Arrows
			|| iCode == 8						// Backspace
			|| iCode == 46						// Delete
		) ;

	return event.returnValue ;
}

this.onkeypress = CheckIsDigit ;

</script>

</public:component>

[Cobricks-cvscommit] cobricks2/web/discussion/editor/css fck_showtableborders_gecko.css fck_editorarea.css fck_internal.css

[Philipp H. <p-...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/discussion/editor/css
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30569/web/discussion/editor/css

Added Files:
	fck_showtableborders_gecko.css fck_editorarea.css 
	fck_internal.css 
Log Message:
Bugfixes in Topic Display and WYSIWYG Editor for Disucssion Forms (FCKeditor)

--- NEW FILE: fck_showtableborders_gecko.css ---
/*
 * FCKeditor - The text editor for internet
 * Copyright (C) 2003-2006 Frederico Caldeira Knabben
 * 
 * Licensed under the terms of the GNU Lesser General Public License:
 * 		http://www.opensource.org/licenses/lgpl-license.php
 * 
 * For further information visit:
 * 		http://www.fckeditor.net/
 * 
 * "Support Open Source software. What about a donation today?"
 * 
 * File Name: fck_showtableborders_gecko.css
 * 	This CSS Style Sheet defines the rules to show table borders on Gecko.
 * 
 * File Authors:
 * 		Frederico Caldeira Knabben (fr...@fc...)
 */

/* For tables with the "border" attribute set to "0" */
table[border="0"], 
table[border="0"] > tr > td, table[border="0"] > tr > th, 
table[border="0"] > tbody > tr > td, table[border="0"] > tbody > tr > th, 
table[border="0"] > thead > tr > td, table[border="0"] > thead > tr > th, 
table[border="0"] > tfoot > tr > td, table[border="0"] > tfoot > tr > th
{
	border: #d3d3d3 1px dotted ;
}

/* For tables with no "border" attribute set */
table:not([border]), 
table:not([border]) > tr > td, table:not([border]) > tr > th,
table:not([border]) > tbody > tr > td, table:not([border]) > tbody > tr > th,
table:not([border]) > thead > tr > td, table:not([border]) > thead > tr > th,
table:not([border]) > tfoot > tr > td, table:not([border]) > tfoot > tr > th
{
	border: #d3d3d3 1px dotted ;
}

--- NEW FILE: fck_editorarea.css ---
/*
 * FCKeditor - The text editor for internet
 * Copyright (C) 2003-2006 Frederico Caldeira Knabben
 * 
 * Licensed under the terms of the GNU Lesser General Public License:
 * 		http://www.opensource.org/licenses/lgpl-license.php
 * 
 * For further information visit:
 * 		http://www.fckeditor.net/
 * 
 * "Support Open Source software. What about a donation today?"
 * 
 * File Name: fck_editorarea.css
 * 	This is the default CSS file used by the editor area. It defines the
 * 	initial font of the editor and background color.
 * 
 * 	A user can configure the editor to use another CSS file. Just change
 * 	the value of the FCKConfig.EditorAreaCSS key in the configuration
 * 	file.
 * 
 * File Authors:
 * 		Frederico Caldeira Knabben (fr...@fc...)
 */

/*
    The "body" styles should match your editor web site, mainly regarding
    background color and font family and size.
*/

body
{
	background-color: #ffffff;
	padding: 5px 5px 5px 5px;
	margin: 0px;
}

body, td
{
	font-family: Arial, Verdana, Sans-Serif;
	font-size: 12px;
}

a
{
	color: #0000FF !important;	/* For Firefox... mark as important, otherwise it becomes black */
}

/* 
	Just uncomment the following block if you want to avoid spaces between 
	paragraphs. Remember to apply the same style in your output front end page.
*/

/*
P, UL, LI
{
	margin-top: 0px;
	margin-bottom: 0px;
}
*/

/*
    The following are some sample styles used in the "Styles" toolbar command.
    You should instead remove them, and include the styles used by the site
    you are using the editor in.
*/

.Bold
{
	font-weight: bold;
}

.Title
{
	font-weight: bold;
	font-size: 18px;
	color: #cc3300;
}

.Code
{
	border: #8b4513 1px solid;
	padding-right: 5px;
	padding-left: 5px;
	color: #000066;
	font-family: 'Courier New' , Monospace;
	background-color: #ff9933;
}
--- NEW FILE: fck_internal.css ---
/*
 * FCKeditor - The text editor for internet
 * Copyright (C) 2003-2006 Frederico Caldeira Knabben
 * 
 * Licensed under the terms of the GNU Lesser General Public License:
 * 		http://www.opensource.org/licenses/lgpl-license.php
 * 
 * For further information visit:
 * 		http://www.fckeditor.net/
 * 
 * "Support Open Source software. What about a donation today?"
 * 
 * File Name: fck_internal.css
 * 	This CSS Style Sheet defines rules used by the editor for its internal use.
 * 
 * File Authors:
 * 		Frederico Caldeira Knabben (fr...@fc...)
 */

table.FCK__ShowTableBorders, table.FCK__ShowTableBorders td, table.FCK__ShowTableBorders th
{
	border: #d3d3d3 1px solid;
}

form
{
	border: 1px dotted #FF0000;
	padding: 2px;
}

.FCK__Flash
{
	border: darkgray 1px solid;
	background-position: center center;
	background-image: url(images/fck_flashlogo.gif);
	background-repeat: no-repeat;
	width: 80px;
	height: 80px;
}

.FCK__Anchor
{
	background-position: center center;
	background-image: url(images/fck_anchor.gif);
	background-repeat: no-repeat;
	width: 16px;
	height: 15px;
}

.FCK__PageBreak
{
	background-position: center center;
	background-image: url(images/fck_pagebreak.gif);
	background-repeat: no-repeat;
	clear: both;
	display: block;
	float: none;
	width: 100%;
	border-top: #999999 1px dotted;
	border-bottom: #999999 1px dotted;
	border-right: 0px;
	border-left: 0px;
	height: 5px;
}

input[type="hidden"]
{
	display: inline;
	width:20px;
	height:20px;
	border:1px dotted #FF0000 ;
	background-image: url(behaviors/hiddenfield.gif);
	background-repeat: no-repeat;
}

input[type="hidden"]:after
{
	padding-left: 20px;
	content: "" ;
}