Author: ktlili
Date: Mon Sep 3 15:33:47 2007
New Revision: 52
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D52&repname=3D=
jforum_portlet
Log:
- sanitas fixes (jforum + oracle)
Modified:
trunk/WEB-INF/config/database/oracle/oracle.sql
trunk/src/net/jforum/view/forum/common/AttachmentCommon.java
trunk/src/net/jforum/view/forum/common/UserCommon.java
trunk/src/org/jahia/portlet/jforum/JForumPortletBridge.java
Modified: trunk/WEB-INF/config/database/oracle/oracle.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/WEB-INF/config/=
database/oracle/oracle.sql&rev=3D52&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/WEB-INF/config/database/oracle/oracle.sql (original)
+++ trunk/WEB-INF/config/database/oracle/oracle.sql Mon Sep 3 15:33:47 2007
@@ -276,3 +276,7 @@
=
AttachmentModel.addAttachmentInfo =3D INSERT INTO jforum_attach_desc (atta=
ch_desc_id, attach_id, physical_filename, real_filename, description, \
mimetype, filesize, upload_time, thumb, extension_id ) VALUES
(jforum_att=
ach_desc_seq.nextval, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+
+# fork jahia #
+AttachmentModel.deleteGroupQuota =3D DELETE FROM jforum_attach_quota
+AttachmentModel.setGroupQuota =3D INSERT INTO jforum_attach_quota (attach_=
quota_id, group_id, quota_limit_id) VALUES (jforum_attach_quota_seq.nextval=
,?, ?)
Modified: trunk/src/net/jforum/view/forum/common/AttachmentCommon.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
view/forum/common/AttachmentCommon.java&rev=3D52&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/view/forum/common/AttachmentCommon.java (original)
+++ trunk/src/net/jforum/view/forum/common/AttachmentCommon.java Mon Sep 3=
15:33:47 2007
@@ -252,10 +252,10 @@
=
private boolean shouldCreateThumb(Attachment a) {
String extension =3D a.getInfo().getExtension().getExtension();
-
+ // jahia fork
return SystemGlobals.getBoolValue(ConfigKeys.ATTACHMENTS_IMAGES_CR=
EATE_THUMB)
- && ("jpg".equals(extension) || "jpeg".equals(extension)
- || "gif".equals(extension) || "png".equals(extension));
+ && ("jpg".equalsIgnoreCase(extension) || "jpeg".equalsIgno=
reCase(extension)
+ || "gif".equalsIgnoreCase(extension) || "png".equalsIgnore=
Case(extension));
}
=
private void createSaveThumb(String path) {
Modified: trunk/src/net/jforum/view/forum/common/UserCommon.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
view/forum/common/UserCommon.java&rev=3D52&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/view/forum/common/UserCommon.java (original)
+++ trunk/src/net/jforum/view/forum/common/UserCommon.java Mon Sep 3 15:33=
:47 2007
@@ -177,10 +177,10 @@
String extension =3D uploadUtils.getExtension().toLowerCase();
int type =3D ImageUtils.IMAGE_UNKNOWN;
=
- if (extension.equals("jpg") || extension.equals("jpeg")) {
+ if (extension.equalsIgnoreCase("jpg") ||
extension.equalsIgnoreCase("jpe=
g")) {
type =3D ImageUtils.IMAGE_JPEG;
}
- else if (extension.equals("gif") || extension.equals("png")) {
+ else if (extension.equalsIgnoreCase("gif") ||
extension.equalsIgnoreCase=
("png")) {
type =3D ImageUtils.IMAGE_PNG;
}
=
Modified: trunk/src/org/jahia/portlet/jforum/JForumPortletBridge.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/org/jahia/p=
ortlet/jforum/JForumPortletBridge.java&rev=3D52&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/org/jahia/portlet/jforum/JForumPortletBridge.java (original)
+++ trunk/src/org/jahia/portlet/jforum/JForumPortletBridge.java Mon Sep 3 =
15:33:47 2007
@@ -293,9 +293,15 @@
// check if it's multipart file
logger.debug("Get content type: " + actionRequest.getContentType()=
);
String tmpDir =3D SystemGlobals.getApplicationPath() + "/" + Syste=
mGlobals.getValue(ConfigKeys.TMP_DIR);
+
ServletFileUpload upload =3D new ServletFileUpload(new DiskFileIte=
mFactory(100 * 1024, new File(tmpDir)));
upload.setHeaderEncoding(encoding);
try {
+ File tmpDirFile =3D new File(tmpDir);
+ if (!tmpDirFile.exists()) {
+ boolean result =3D tmpDirFile.createNewFile();
+ logger.debug("Create "+tmpDirFile+": "+result);
+ }
RequestContext context =3D new PortletRequestContext(actionReq=
uest);
List items =3D upload.parseRequest(context);
for (Iterator iter =3D items.iterator(); iter.hasNext();) {
@@ -318,7 +324,7 @@
//new ForumException(e);
logger.error("File upload error due to: ", e);
}
- catch (UnsupportedEncodingException e) {
+ catch (Exception e) {
//new ForumException(e);
logger.error("File upload error due to: ", e);
}
@@ -497,11 +503,11 @@
logger.debug("Print result from session");
response.getPortletOutputStream().write(result.getBytes(SystemGlob=
als.getValue(ConfigKeys.ENCODING)));
=
- /* UserSession us =3D SessionFacade.getUserSession();
- int anonymousUser =3D SystemGlobals.getIntValue(ConfigKeys.ANONYMO=
US_USER_ID);
- if (us.getUserId() !=3D anonymousUser) {
- logger.info("Connected user has same id than anonymous");
- } */
+ /* UserSession us =3D SessionFacade.getUserSession();
+ int anonymousUser =3D SystemGlobals.getIntValue(ConfigKeys.ANONYMOU=
S_USER_ID);
+ if (us.getUserId() !=3D anonymousUser) {
+ logger.info("Connected user has same id than anonymous");
+ } */
=
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
