Author: solomax
Date: Wed Apr 25 02:49:33 2012
New Revision: 1330084
URL: http://svn.apache.org/viewvc?rev=1330084&view=rev
Log:
OPENMEETINGS-205 The option is available when running the installation of
OpenMeetings; code cleanup
Modified:
incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/CachedEvent.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1330084&r1=1330083&r2=1330084&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm Wed Apr
25 02:49:33 2012
@@ -240,6 +240,13 @@ function checkEmail()
<option value="1">Yes</option>
<option value="0" selected>No</option>
</select><br />
+ </li><li>
+ <label for="replyToOrganizer">Set inviter's email address as ReplyTo
in email invitations (inviter.email.as.replyto)</label>
+ <select name="replyToOrganizer" id="replyToOrganizer" size="1"
+ >
+ <option value="1" selected>Yes</option>
+ <option value="0">No</option>
+ </select><br />
</li><li>
<label for="configdefaultLang">Default Language</label>
<select name="configdefaultLang" id="configdefaultLang"
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/CachedEvent.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/CachedEvent.java?rev=1330084&r1=1330083&r2=1330084&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/CachedEvent.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/CachedEvent.java
Wed Apr 25 02:49:33 2012
@@ -37,12 +37,10 @@ public class CachedEvent implements IStr
}
public int getTimestamp() {
- // TODO Auto-generated method stub
return timestamp;
}
public IoBuffer getData() {
- // TODO Auto-generated method stub
return data;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1330084&r1=1330083&r2=1330084&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
Wed Apr 25 02:49:33 2012
@@ -550,7 +550,7 @@ public class ImportInitvalues {
cfgManagement.addConfByKey(
3,
"inviter.email.as.replyto",
- "1",
+ cfg.replyToOrganizer,
null,
"Set inviter's email address as
ReplyTo in email invitations (1 == set, 0 == NOT set)");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java?rev=1330084&r1=1330083&r2=1330084&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java
Wed Apr 25 02:49:33 2012
@@ -51,8 +51,9 @@ public class InstallationConfig {
public String red5SipEnable = "no";
public String red5SipRoomPrefix = "400";
public String red5SipExtenContext = "rooms";
-
- @Override
+ public String replyToOrganizer = "1";
+
+ @Override
public String toString() {
return "InstallationConfig [allowFrontendRegister="
+ allowFrontendRegister + ",
createDefaultRooms="
@@ -83,6 +84,7 @@ public class InstallationConfig {
+ ", sipPhoneRangeStart=" + sipPhoneRangeStart
+ ", sipPhoneRange=" + sipPhoneRange + ",
red5SipEnable="
+ red5SipEnable + ", red5SipRoomPrefix=" +
red5SipRoomPrefix
- + ", red5SipExtenContext=" +
red5SipExtenContext + "]";
+ + ", red5SipExtenContext=" + red5SipExtenContext
+ + ", replyToOrganizer=" + replyToOrganizer +
"]";
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java?rev=1330084&r1=1330083&r2=1330084&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Install.java
Wed Apr 25 02:49:33 2012
@@ -253,6 +253,7 @@ public class Install extends VelocityVie
cfg.mailAuthName =
encodeUTF8(httpServletRequest,"configmailuser");
cfg.mailAuthPass =
encodeUTF8(httpServletRequest,"configmailpass");
cfg.mailUseTls =
encodeUTF8(httpServletRequest,"mailusetls");
+ cfg.replyToOrganizer =
httpServletRequest.getParameter("replyToOrganizer");
cfg.defaultLangId =
encodeUTF8(httpServletRequest,"configdefaultLang");
cfg.swfPath =
encodeUTF8(httpServletRequest,"swftools_path");
