Return-Path: X-Original-To: apmail-incubator-openmeetings-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-openmeetings-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75D32E24E for ; Fri, 18 Jan 2013 06:03:44 +0000 (UTC) Received: (qmail 30707 invoked by uid 500); 18 Jan 2013 06:03:44 -0000 Delivered-To: apmail-incubator-openmeetings-commits-archive@incubator.apache.org Received: (qmail 30592 invoked by uid 500); 18 Jan 2013 06:03:42 -0000 Mailing-List: contact openmeetings-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: openmeetings-dev@incubator.apache.org Delivered-To: mailing list openmeetings-commits@incubator.apache.org Received: (qmail 30531 invoked by uid 99); 18 Jan 2013 06:03:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jan 2013 06:03:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jan 2013 06:03:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 79BB72388C22; Fri, 18 Jan 2013 06:03:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1435033 - /incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java Date: Fri, 18 Jan 2013 06:03:10 -0000 To: openmeetings-commits@incubator.apache.org From: solomax@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130118060310.79BB72388C22@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: solomax Date: Fri Jan 18 06:03:10 2013 New Revision: 1435033 URL: http://svn.apache.org/viewvc?rev=1435033&view=rev Log: [OPENMEETINGS-506] profile picture is saved with unified name to avoid any filename issues Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1435033&r1=1435032&r2=1435033&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java Fri Jan 18 06:03:10 2013 @@ -179,19 +179,8 @@ public class UploadController extends Ab private void sendMessage(UploadInfo info, UploadCompleteMessage uploadCompleteMessage) { - -// UploadCompleteMessage uploadCompleteMessage = new UploadCompleteMessage( -// usersDao.get(info.userId), -// "library", //message -// "import", //action -// "", //error -// info.filename); - scopeApplicationAdapter.sendUploadCompletMessageByPublicSID( uploadCompleteMessage, info.publicSID); - -// scopeApplicationAdapter.sendMessageWithClientByPublicSID(hs, -// info.publicSID); } private void uploadFile(HttpServletRequest request, boolean userProfile, Long userId, String roomName, @@ -226,7 +215,7 @@ public class UploadController extends Ab if (userProfile) { // User Profile Update this.deleteUserProfileFilesStoreTemp(userId); - + newFileName = "profile"; //set unified file name to avoid any problems with national characters workingDir = OmFileHelper.getUploadProfilesUserDir(userId); } // if it is a presenation it will be copied to another