diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/bookmarks_folder_ins.md open-xchange-0.8.6-0/conf/groupware/METADB/bookmarks_folder_ins.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/bookmarks_folder_ins.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/bookmarks_folder_ins.md 2007-04-03 23:27:43.000000000 +0200 @@ -4,5 +4,5 @@ rs1.prg_bookmarks_folder.group_right, 4, text, 3, 1 rs1.prg_bookmarks_folder.tid, 5, text, 3, 1 rs1.prg_bookmarks_folder.field01, 6, text, 3, 0 -rs1.prg_bookmarks_folder.intfield02, 7, text, 3, 1 -rs1.prg_bookmarks_folder.intfield06, 8, text, 3, 1 \ Kein Zeilenumbruch am Dateiende. +rs1.prg_bookmarks_folder.intfield02, 7, int8, 3, 1 +rs1.prg_bookmarks_folder.intfield06, 8, int8, 3, 1 \ Kein Zeilenumbruch am Dateiende. diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/bookmarks_folder_upd.md open-xchange-0.8.6-0/conf/groupware/METADB/bookmarks_folder_upd.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/bookmarks_folder_upd.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/bookmarks_folder_upd.md 2007-04-03 23:27:43.000000000 +0200 @@ -4,4 +4,4 @@ rs1.prg_bookmarks_folder.group_right, 4, text, 3, 1 rs1.prg_bookmarks_folder.tid, 5, text, 3, 1 rs1.prg_bookmarks_folder.field01, 6, text, 3, 0 -rs1.prg_bookmarks_folder.intfield06, 7, text, 3, 1 \ Kein Zeilenumbruch am Dateiende. +rs1.prg_bookmarks_folder.intfield06, 7, int8, 3, 1 \ Kein Zeilenumbruch am Dateiende. diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/bookmarks_ins.md open-xchange-0.8.6-0/conf/groupware/METADB/bookmarks_ins.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/bookmarks_ins.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/bookmarks_ins.md 2007-04-03 23:27:43.000000000 +0200 @@ -7,5 +7,5 @@ rs1.prg_bookmarks.field02, 7, text, 3, 0 rs1.prg_bookmarks.field03, 8, text, 3, 0 rs1.prg_bookmarks.field04, 9, text, 3, 1 -rs1.prg_bookmarks.intfield02, 10, text, 3, 1 -rs1.prg_bookmarks.intfield06, 11, text, 3, 1 +rs1.prg_bookmarks.intfield02, 10, int8, 3, 1 +rs1.prg_bookmarks.intfield06, 11, int8, 3, 1 diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/bookmarks_upd.md open-xchange-0.8.6-0/conf/groupware/METADB/bookmarks_upd.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/bookmarks_upd.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/bookmarks_upd.md 2007-04-03 23:27:43.000000000 +0200 @@ -7,4 +7,4 @@ rs1.prg_bookmarks.field02, 7, text, 3, 0 rs1.prg_bookmarks.field03, 8, text, 3, 0 rs1.prg_bookmarks.field04, 9, text, 3, 1 -rs1.prg_bookmarks.intfield06, 10, text, 3, 1 \ Kein Zeilenumbruch am Dateiende. +rs1.prg_bookmarks.intfield06, 10, int8, 3, 1 \ Kein Zeilenumbruch am Dateiende. diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/forum_ins.md open-xchange-0.8.6-0/conf/groupware/METADB/forum_ins.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/forum_ins.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/forum_ins.md 2007-04-03 23:27:43.000000000 +0200 @@ -6,4 +6,4 @@ rs1.prg_forums.group_right, 6, text, 3, 1 rs1.prg_forums.field01, 7, text, 3, 0 rs1.prg_forums.archiv, 8, text, 3, 0 -rs1.prg_forums.intfield06, 9, text, 3, 1 +rs1.prg_forums.intfield06, 9, int8, 3, 1 diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/forum_message_ins.md open-xchange-0.8.6-0/conf/groupware/METADB/forum_message_ins.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/forum_message_ins.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/forum_message_ins.md 2007-04-03 23:27:43.000000000 +0200 @@ -3,8 +3,8 @@ rs1.prg_forum_entries.changing_date, 3, text, 3, 1 rs1.prg_forum_entries.changed_from, 4, text, 3, 1 rs1.prg_forum_entries.user_right, 5, text, 3, 1 -rs1.prg_forum_entries.intfield02, 6, text, 3, 0 -rs1.prg_forum_entries.intfield03, 7, text, 3, 1 +rs1.prg_forum_entries.intfield02, 6, int8, 3, 0 +rs1.prg_forum_entries.intfield03, 7, int8, 3, 1 rs1.prg_forum_entries.field01, 8, text, 3, 0 rs1.prg_forum_entries.field02, 9, text, 3, 0 rs1.prg_forum_entries.field03, 10, text, 3, 1 diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/forum_upd.md open-xchange-0.8.6-0/conf/groupware/METADB/forum_upd.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/forum_upd.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/forum_upd.md 2007-04-03 23:27:43.000000000 +0200 @@ -4,4 +4,4 @@ rs1.prg_forums.group_right, 4, text, 3, 1 rs1.prg_forums.field01, 5, text, 3, 0 rs1.prg_forums.archiv, 6, text, 3, 0 -rs1.prg_forums.intfield06, 7, text, 3, 1 \ Kein Zeilenumbruch am Dateiende. +rs1.prg_forums.intfield06, 7, int8, 3, 1 \ Kein Zeilenumbruch am Dateiende. diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/knowledge_folder_ins.md open-xchange-0.8.6-0/conf/groupware/METADB/knowledge_folder_ins.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/knowledge_folder_ins.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/knowledge_folder_ins.md 2007-04-03 23:27:43.000000000 +0200 @@ -4,5 +4,5 @@ rs1.prg_knowledge_folder.group_right, 4, text, 3, 1 rs1.prg_knowledge_folder.tid, 5, text, 3, 1 rs1.prg_knowledge_folder.field01, 6, text, 3, 0 -rs1.prg_knowledge_folder.intfield02, 7, text, 3, 1 -rs1.prg_knowledge_folder.intfield06, 8, text, 3, 1 \ Kein Zeilenumbruch am Dateiende. +rs1.prg_knowledge_folder.intfield02, 7, int8, 3, 1 +rs1.prg_knowledge_folder.intfield06, 8, int8, 3, 1 \ Kein Zeilenumbruch am Dateiende. diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/knowledge_folder_upd.md open-xchange-0.8.6-0/conf/groupware/METADB/knowledge_folder_upd.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/knowledge_folder_upd.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/knowledge_folder_upd.md 2007-04-03 23:27:43.000000000 +0200 @@ -4,4 +4,4 @@ rs1.prg_knowledge_folder.group_right, 4, text, 3, 1 rs1.prg_knowledge_folder.tid, 5, text, 3, 1 rs1.prg_knowledge_folder.field01, 6, text, 3, 0 -rs1.prg_knowledge_folder.intfield06, 7, text, 3, 1 \ Kein Zeilenumbruch am Dateiende. +rs1.prg_knowledge_folder.intfield06, 7, int8, 3, 1 \ Kein Zeilenumbruch am Dateiende. diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/knowledge_ins.md open-xchange-0.8.6-0/conf/groupware/METADB/knowledge_ins.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/knowledge_ins.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/knowledge_ins.md 2007-04-03 23:27:43.000000000 +0200 @@ -6,5 +6,5 @@ rs1.prg_knowledge.field01, 6, text, 3, 0 rs1.prg_knowledge.field03, 7, text, 3, 0 rs1.prg_knowledge.field04, 8, text, 3, 1 -rs1.prg_knowledge.intfield02, 9, text, 3, 1 -rs1.prg_knowledge.intfield06, 10, text, 3, 1 +rs1.prg_knowledge.intfield02, 9, int8, 3, 1 +rs1.prg_knowledge.intfield06, 10, int8, 3, 1 diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/knowledge_upd.md open-xchange-0.8.6-0/conf/groupware/METADB/knowledge_upd.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/knowledge_upd.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/knowledge_upd.md 2007-04-03 23:27:43.000000000 +0200 @@ -6,4 +6,4 @@ rs1.prg_knowledge.field01, 6, text, 3, 0 rs1.prg_knowledge.field03, 7, text, 3, 0 rs1.prg_knowledge.field04, 8, text, 3, 1 -rs1.prg_knowledge.intfield06, 9, text, 3, 1 \ Kein Zeilenumbruch am Dateiende. +rs1.prg_knowledge.intfield06, 9, int8, 3, 1 \ Kein Zeilenumbruch am Dateiende. diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/pin_board_ins.md open-xchange-0.8.6-0/conf/groupware/METADB/pin_board_ins.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/pin_board_ins.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/pin_board_ins.md 2007-04-03 23:27:43.000000000 +0200 @@ -9,4 +9,4 @@ rs1.prg_pin_board.field04, 9, text, 3, 0 rs1.prg_pin_board.timestampfield01, 10, timestamp, 3, 0 rs1.prg_pin_board.timestampfield02, 11, timestamp, 3, 0 -rs1.prg_pin_board.intfield06, 12, text, 3, 0 +rs1.prg_pin_board.intfield06, 12, int8, 3, 0 diff -Naur open-xchange-0.8.6-0.orig/conf/groupware/METADB/pin_board_upd.md open-xchange-0.8.6-0/conf/groupware/METADB/pin_board_upd.md --- open-xchange-0.8.6-0.orig/conf/groupware/METADB/pin_board_upd.md 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/conf/groupware/METADB/pin_board_upd.md 2007-04-03 23:27:43.000000000 +0200 @@ -8,4 +8,4 @@ rs1.prg_pin_board.field03, 10, text, 3, 0 rs1.prg_pin_board.timestampfield01, 11, timestamp, 3, 0 rs1.prg_pin_board.timestampfield02, 12, timestamp, 3, 0 -rs1.prg_pin_board.intfield06, 13, text, 3, 0 \ Kein Zeilenumbruch am Dateiende. +rs1.prg_pin_board.intfield06, 13, int8, 3, 0 \ Kein Zeilenumbruch am Dateiende. diff -Naur open-xchange-0.8.6-0.orig/src/com/openexchange/groupware/CalendarAction.java open-xchange-0.8.6-0/src/com/openexchange/groupware/CalendarAction.java --- open-xchange-0.8.6-0.orig/src/com/openexchange/groupware/CalendarAction.java 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/src/com/openexchange/groupware/CalendarAction.java 2007-04-04 19:11:00.000000000 +0200 @@ -54,6 +54,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Timestamp; import java.io.ByteArrayOutputStream; import java.sql.Connection; import java.util.Calendar; @@ -685,7 +686,7 @@ if (mu) { PreparedStatement cc = writecon.prepareStatement("UPDATE del_dates SET changing_date = ?, changed_from = ? WHERE intfield01 = ?"); - cc.setString(1, GlobalConfig.getParameter("SYSDATE")); + cc.setTimestamp(1, new Timestamp(System.currentTimeMillis())); cc.setString(2, no.getUser()); cc.setInt(3, new Integer(uniqueID).intValue()); cc.addBatch(); @@ -694,7 +695,7 @@ } else if (dmhs.size() > 0) { PreparedStatement cc = writecon.prepareStatement("insert into del_dates (intfield01, creating_date, created_from, user_right, fid) values (?, ?, ?, 'd', -1)"); cc.setInt(1, new Integer(uniqueID).intValue()); - cc.setString(2, GlobalConfig.getParameter("SYSDATE")); + cc.setTimestamp(2, new Timestamp(System.currentTimeMillis())); cc.setString(3, no.getUser()); cc.addBatch(); @@ -920,8 +921,8 @@ no.user.put("rs1.prg_dates.created_from", no.getUser()); CalendarBase icb = new CalendarBase(); icb.setLangCode(no.getLanguage()); - cdo.updateData("rs1.prg_dates.creating_date", GlobalConfig.getParameter("SYSDATE")); + cdo.updateData("rs1.prg_dates.creating_date", (new Timestamp(System.currentTimeMillis())).toString()); } else { no.user.put("rs1.prg_dates.changed_from", no.getUser()); diff -Naur open-xchange-0.8.6-0.orig/src/com/openexchange/groupware/CalendarDelete.java open-xchange-0.8.6-0/src/com/openexchange/groupware/CalendarDelete.java --- open-xchange-0.8.6-0.orig/src/com/openexchange/groupware/CalendarDelete.java 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/src/com/openexchange/groupware/CalendarDelete.java 2007-04-04 00:20:11.000000000 +0200 @@ -52,6 +52,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Connection; +import java.sql.Timestamp; import java.util.*; import java.util.Iterator; import java.util.StringTokenizer; @@ -580,7 +581,7 @@ } no.user.put("rs1.prg_dates.field07", f7); PreparedStatement pst = writecon.prepareStatement("UPDATE prg_dates SET changing_date = ?, field07 = '"+f7+"', changed_from = ? WHERE intfield02 = " + if2 + " AND intfield05 = 0"); - pst.setString(1, GlobalConfig.getParameter("SYSDATE")); + pst.setTimestamp(1, new Timestamp(System.currentTimeMillis())); pst.setString(2, no.getFullName()); if (writecon.getAutoCommit()) { pst.addBatch(); @@ -663,7 +664,7 @@ PreparedStatement de = writecon.prepareStatement("insert into del_dates (intfield01, creating_date, created_from, user_right, fid) values (?, ?, ?, 'd', -1)"); de.setInt(1, new Integer(vkn).intValue()); - de.setString(2, GlobalConfig.getParameter("SYSDATE")); + de.setTimestamp(2, new Timestamp(System.currentTimeMillis())); de.setString(3, no.getUser()); de.addBatch(); diff -Naur open-xchange-0.8.6-0.orig/src/com/openexchange/groupware/DeleteObjects.java open-xchange-0.8.6-0/src/com/openexchange/groupware/DeleteObjects.java --- open-xchange-0.8.6-0.orig/src/com/openexchange/groupware/DeleteObjects.java 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/src/com/openexchange/groupware/DeleteObjects.java 2007-04-04 00:20:38.000000000 +0200 @@ -53,6 +53,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.sql.Timestamp; import java.util.HashSet; import java.util.HashMap; import java.util.Iterator; @@ -1139,7 +1140,7 @@ String updateStr = "UPDATE backup_projects SET changing_date = ?, changed_from = ? WHERE intfield01 = ?"; stmt = writecon.prepareStatement(updateStr); - stmt.setString(1, GlobalConfig.getParameter("SYSDATE")); + stmt.setTimestamp(1, new Timestamp(System.currentTimeMillis())); stmt.setString(2, no.getFullName()); stmt.setInt(3, serial_id); stmt.executeUpdate(); diff -Naur open-xchange-0.8.6-0.orig/src/com/openexchange/groupware/TasksNewEdit.java open-xchange-0.8.6-0/src/com/openexchange/groupware/TasksNewEdit.java --- open-xchange-0.8.6-0.orig/src/com/openexchange/groupware/TasksNewEdit.java 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/src/com/openexchange/groupware/TasksNewEdit.java 2007-04-04 00:21:06.000000000 +0200 @@ -51,6 +51,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.sql.Timestamp; import java.text.ParseException; import java.util.Calendar; import java.util.Date; @@ -1363,7 +1364,7 @@ if (mu) { PreparedStatement cc = writeCon.prepareStatement("UPDATE del_tasks SET changing_date = ?, changed_from = ? WHERE intfield01 = ?"); - cc.setString(1, GlobalConfig.getParameter("SYSDATE")); + cc.setTimestamp(1, new Timestamp(System.currentTimeMillis())); cc.setString(2, no.getUser()); cc.setInt(3, new Integer(uniqueID).intValue()); cc.addBatch(); @@ -1372,7 +1373,7 @@ } else if (dmhs.size() > 0) { PreparedStatement cc = writeCon.prepareStatement("INSERT INTO del_tasks (intfield01, creating_date, created_from, user_right, fid) VALUES (?, ?, ?, 'd', -1)"); cc.setInt(1, new Integer(uniqueID).intValue()); - cc.setString(2, GlobalConfig.getParameter("SYSDATE")); + cc.setTimestamp(2, new Timestamp(System.currentTimeMillis())); cc.setString(3, no.getUser()); cc.addBatch(); diff -Naur open-xchange-0.8.6-0.orig/src/com/openexchange/tools/oxfolder/OXFolderAction.java open-xchange-0.8.6-0/src/com/openexchange/tools/oxfolder/OXFolderAction.java --- open-xchange-0.8.6-0.orig/src/com/openexchange/tools/oxfolder/OXFolderAction.java 2007-04-03 23:24:39.000000000 +0200 +++ open-xchange-0.8.6-0/src/com/openexchange/tools/oxfolder/OXFolderAction.java 2007-04-04 00:21:37.000000000 +0200 @@ -61,6 +61,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.sql.Timestamp; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -369,14 +370,14 @@ if (type.equals("private")) { pst = writeCon.prepareStatement(sql_update_private); pst.setString(1, fname); - pst.setString(2, GlobalConfig.getParameter("SYSDATE")); + pst.setTimestamp(2, new Timestamp(System.currentTimeMillis())); pst.setString(3, fullname); pst.setInt(4, fuid); } else { pst = writeCon.prepareStatement(sql_update_other); pst.setString(1, fname); pst.setString(2, owner); - pst.setString(3, GlobalConfig.getParameter("SYSDATE")); + pst.setTimestamp(3, new Timestamp(System.currentTimeMillis())); pst.setString(4, fullname); pst.setInt(5, fuid); } @@ -531,7 +532,7 @@ pst.setInt(1, new Integer(targetFolderId).intValue()); pst.setString(2, no.getUser()); - pst.setString(3, GlobalConfig.getParameter("SYSDATE")); + pst.setTimestamp(3, new Timestamp(System.currentTimeMillis())); pst.setString(4, no.getFullName()); pst.setInt(5, new Integer(sourceFolderId).intValue());