Author: solomax
Date: Thu Nov 29 18:06:27 2012
New Revision: 1415309
URL: http://svn.apache.org/viewvc?rev=1415309&view=rev
Log:
OPENMEETINGS-477 is implemented
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
Thu Nov 29 18:06:27 2012
@@ -6054,4 +6054,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Thu
Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
Thu Nov 29 18:06:27 2012
@@ -4601,4 +4601,7 @@ see http://incubator.apache.org/openmeet
<string id="1525" name="server admin active">
<value>Active</value>
</string>
+ <string id="1526" name="generate_hash">
+ <value>Generate URL</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
Thu Nov 29 18:06:27 2012
@@ -26,13 +26,15 @@
label: send invitation
-->
<class name="inviteMainWindow" extends="labelExplorerBox" labelid="214"
- docking="true" closable="true" width="464" x="200"
y="100" height="440">
+ docking="true" closable="true" width="464" x="200"
y="100" height="465">
<attribute name="roomType" value="conference" type="string" />
<attribute name="baseUrl" value="http://www.denic.de";
type="string" />
+ <attribute name="currentHash" value="" type="string" />
+ <attribute name="display" value="false" type="boolean" />
- <handler name="oninit">
- <![CDATA[
+ <handler name="oninit">
+ <![CDATA[
lz.ModeManager.makeModal(this);
var pressEnter = new LzDelegate(this, "register");
@@ -40,8 +42,20 @@
getTimeZoneOffset(this);
- ]]>
- </handler>
+ var urlObject = lz.Browser.getBaseURL();
+ //If Port is Null or undefinied use port 80
+ var port = urlObject.port;
+ if (port!=null && port!=undefined && port !=
80){
+ this.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path;
+ } else {
+ this.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
+ }
+ if( $debug ) Debug.write("this.baseUrl: ",
this.baseUrl);
+ if (!canvas.isConference){
+ this.roomType = "restricted"; //FIXME
+ }
+ ]]>
+ </handler>
<method name="callback" args="returnValue">
if ($debug) Debug.write("getTimeZoneOffset callback ",returnValue);
@@ -155,6 +169,17 @@
</netRemoteCallHib>
</resetCombobox>
+ <customEdittext name="_url" enabled="false" width="$once{
parent.width - 10 }" x="5" y="405" text=""/>
+
+ <simpleLabelButton name="generate" labelid="1526" x="$once{
parent.width-440 }" width="170" y="$once{ parent.height-26 }">
+ <handler name="onclick">
+ <![CDATA[
+ parent.display = true;
+ parent.sendInvitationHash.doCall();
+ ]]>
+ </handler>
+ </simpleLabelButton>
+
<!-- label: send -->
<simpleLabelButton labelid="218" x="$once{ parent.width-260 }"
width="120" y="$once{ parent.height-26 }">
<handler name="onclick">
@@ -190,37 +215,65 @@
</handler>
</simpleLabelButton>
- <netRemoteCallHib name="sendInvitationHash"
funcname="invitationservice.sendInvitationHash" remotecontext="$once{
canvas.thishib }" >
-
- <netparam name="sid"><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam name="username"><method
name="getValue">return hib.userobject.firstname+'
'+hib.userobject.lastname</method></netparam>
- <netparam name="message"><method name="getValue">return
this.parent.parent._message.getText();</method></netparam>
- <netparam name="baseurl"><method name="getValue">return
parent.parent.baseUrl;</method></netparam>
- <netparam name="email"><method name="getValue">return
this.parent.parent._recipient.getText();</method></netparam>
- <netparam name="subject"><method name="getValue">return
this.parent.parent._subject.getText();</method></netparam>
- <netparam name="roomid"><method name="getValue">return
hib.currentroomid;</method></netparam>
- <netparam name="conferencedomain"><method
name="getValue">return hib.conferencedomain;</method></netparam>
- <netparam name="ispasswordProtected"><method
name="getValue">return
parent.parent._ispasswordProtected.value;</method></netparam>
- <netparam name="password"><method name="getValue">return
parent.parent._password.getText();</method></netparam>
- <netparam name="valid"><method name="getValue">return
parent.parent._valid.value;</method></netparam>
- <netparam name="validFromDate"><method
name="getValue">return parent.parent._valid_from.getDate();</method></netparam>
- <netparam name="validFromTime"><method
name="getValue">return parent.parent._timeFrom.getText();</method></netparam>
- <netparam name="validToDate"><method name="getValue">return
parent.parent._valid_to.getDate();</method></netparam>
- <netparam name="validToTime"><method name="getValue">return
parent.parent._timeTo.getText();</method></netparam>
- <netparam name="language_id"><method name="getValue">return
parent.parent._languages.getValue();</method></netparam>
- <netparam name="jNameTimeZone"><method name="getValue">return
parent.parent._timeZone.getValue();</method></netparam>
-
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("sendInvitationHash :
",value);
- if (value=="success"){
+ <netRemoteCallHib name="sendInvitationByHash"
funcname="invitationservice.sendInvitationByHash" remotecontext="$once{
canvas.thishib }" >
+ <netparam name="SID"><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <netparam name="invitationHash"><method
name="getValue">return this.parent.parent.currentHash;</method></netparam>
+ <netparam name="message"><method name="getValue">return
this.parent.parent._message.getText();</method></netparam>
+ <netparam name="baseurl"><method name="getValue">return
parent.parent.baseUrl;</method></netparam>
+ <netparam name="subject"><method name="getValue">return
this.parent.parent._subject.getText();</method></netparam>
+ <netparam name="language_id"><method
name="getValue">return parent.parent._languages.getValue();</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if (value != null){
parent.close();
} else {
new
lz.errorPopup(canvas.main_content._content.inner,{error:value});
}
- ]]>
+ ]]>
</handler>
</netRemoteCallHib>
+
+ <netRemoteCallHib name="sendInvitationHash"
funcname="invitationservice.sendInvitationHash" remotecontext="$once{
canvas.thishib }" >
+ <netparam name="sid"><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <netparam name="username"><method
name="getValue">return hib.userobject.firstname+'
'+hib.userobject.lastname</method></netparam>
+ <netparam name="message"><method name="getValue">return
this.parent.parent._message.getText();</method></netparam>
+ <netparam name="baseurl"><method name="getValue">return
parent.parent.baseUrl;</method></netparam>
+ <netparam name="email"><method name="getValue">return
this.parent.parent._recipient.getText();</method></netparam>
+ <netparam name="subject"><method name="getValue">return
this.parent.parent._subject.getText();</method></netparam>
+ <netparam name="roomid"><method name="getValue">return
hib.currentroomid;</method></netparam>
+ <netparam name="conferencedomain"><method
name="getValue">return hib.conferencedomain;</method></netparam>
+ <netparam name="ispasswordProtected"><method
name="getValue">return
parent.parent._ispasswordProtected.value;</method></netparam>
+ <netparam name="password"><method
name="getValue">return parent.parent._password.getText();</method></netparam>
+ <netparam name="valid"><method name="getValue">return
parent.parent._valid.value;</method></netparam>
+ <netparam name="validFromDate"><method
name="getValue">return parent.parent._valid_from.getDate();</method></netparam>
+ <netparam name="validFromTime"><method
name="getValue">return parent.parent._timeFrom.getText();</method></netparam>
+ <netparam name="validToDate"><method
name="getValue">return parent.parent._valid_to.getDate();</method></netparam>
+ <netparam name="validToTime"><method
name="getValue">return parent.parent._timeTo.getText();</method></netparam>
+ <netparam name="language_id"><method
name="getValue">return parent.parent._languages.getValue();</method></netparam>
+ <netparam name="jNameTimeZone"><method
name="getValue">return parent.parent._timeZone.getValue();</method></netparam>
+ <netparam name="sendMail"><method
name="getValue">return !parent.parent.display;</method></netparam>
+
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("sendInvitationHash :
",value);
+ if ($debug) Debug.write("sendInvitationHash :
", (typeof value));
+ if (typeof value == "object"){
+ if (parent.display) {
+
parent.send.setAttribute('enabled', true);
+
parent._message.setAttribute('enabled', true);
+
parent._subject.setAttribute('enabled', true);
+
parent._languages.setAttribute('enabled', true);
+ parent.currentHash = value.hash;
+
parent._url.setAttribute('text', parent.baseUrl + "?invitationHash=" +
parent.currentHash + "&language=" + parent._languages.getValue());
+ } else {
+ parent.close();
+ }
+ } else {
+ new
lz.errorPopup(canvas.main_content._content.inner,{error:value});
+ }
+ ]]>
+ </handler>
+ </netRemoteCallHib>
</class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
Thu Nov 29 18:06:27 2012
@@ -592,6 +592,12 @@ public class Invitationmanagement {
}
//
---------------------------------------------------------------------------------------------------------
+ public String sendInvitionLink(Users us, Invitations inv, String
message, String baseurl, String subject, Long language_id) {
+ return sendInvitionLink(us != null ?
us.getAdresses().getEmail() : inv.getInvitedEMail()
+ , inv.getInvitedname()
+ , message, baseurl, inv.getInvitedEMail(),
subject, inv.getHash()
+ , inv.getValidFrom(), inv.getValidTo(),
language_id, us.getFirstname() + " " + us.getLastname());
+ }
/**
* @param username
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java?rev=1415309&r1=1415308&r2=1415309&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
Thu Nov 29 18:06:27 2012
@@ -28,8 +28,10 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.conference.Invitationmanagement;
import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
+import org.apache.openmeetings.persistence.beans.user.Users;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
@@ -45,6 +47,8 @@ public class InvitationService implement
@Autowired
private ConfigurationDao configurationDaoImpl;
@Autowired
+ private UsersDao userDAO;
+ @Autowired
private Usermanagement userManagement;
@Autowired
private OmTimeZoneDao omTimeZoneDaoImpl;
@@ -78,12 +82,12 @@ public class InvitationService implement
* @param jNameTimeZone
* @return
*/
- public String sendInvitationHash(String SID, String username,
+ public Object sendInvitationHash(String SID, String username,
String message, String baseurl, String email, String
subject,
Long room_id, String conferencedomain, Boolean
isPasswordProtected,
String invitationpass, Integer valid, Date
validFromDate,
String validFromTime, Date validToDate, String
validToTime,
- Long language_id, String jNameTimeZone) {
+ Long language_id, String jNameTimeZone, boolean
sendMail) {
try {
log.debug("sendInvitationHash: ");
@@ -140,11 +144,11 @@ public class InvitationService implement
.addInvitationLink(user_level,
username, message, baseurl,
email, subject,
room_id, conferencedomain,
isPasswordProtected,
invitationpass, valid, dFrom,
- dTo, users_id, baseurl,
language_id, true,
+ dTo, users_id, baseurl,
language_id, sendMail,
dFrom, dTo, null,
username, omTimeZone);
if (invitation != null) {
- return "success";
+ return invitation;
} else {
return "Sys - Error";
}
@@ -153,13 +157,14 @@ public class InvitationService implement
}
return null;
-
- // return
- // invitationManagement.sendInvitionLink(user_level,
- // username, message, domain, room, roomtype, baseurl, email,
subject,
- // room_id);
}
+ public String sendInvitationByHash(String SID, String invitationHash,
String message, String baseurl, String subject, Long language_id) {
+ Users us = userDAO.get(sessionManagement.checkSession(SID));
+ Invitations inv =
(Invitations)invitationManagement.getInvitationByHashCode(invitationHash, true);
+ return invitationManagement.sendInvitionLink(us, inv, message,
baseurl, subject, language_id);
+ }
+
public Object getInvitationByHash(String hashCode) {
return invitationManagement.getInvitationByHashCode(
hashCode, true);
