Repository: openmeetings Updated Branches: refs/heads/master d706041e3 -> d37dede74
no jira: Captcha is added to registration and forget password dialogs Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d37dede7 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d37dede7 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d37dede7 Branch: refs/heads/master Commit: d37dede746da245c1dc997fa6b51d957ae22dd66 Parents: d706041 Author: Maxim Solodovnik <[email protected]> Authored: Sun May 21 10:53:09 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun May 21 11:01:45 2017 +0700 ---------------------------------------------------------------------- .../web/app/Application.properties.xml | 2 + .../web/app/Application_ar.properties.xml | 2 + .../web/app/Application_bg.properties.xml | 2 + .../web/app/Application_ca.properties.xml | 2 + .../web/app/Application_cs.properties.xml | 2 + .../web/app/Application_da.properties.xml | 2 + .../web/app/Application_de.properties.xml | 2 + .../web/app/Application_el.properties.xml | 2 + .../web/app/Application_es.properties.xml | 2 + .../web/app/Application_fa.properties.xml | 2 + .../web/app/Application_fi.properties.xml | 2 + .../web/app/Application_fr.properties.xml | 2 + .../web/app/Application_gl.properties.xml | 2 + .../web/app/Application_hu.properties.xml | 2 + .../web/app/Application_id.properties.xml | 2 + .../web/app/Application_it.properties.xml | 2 + .../web/app/Application_ja.properties.xml | 2 + .../web/app/Application_ko.properties.xml | 2 + .../web/app/Application_nl.properties.xml | 2 + .../web/app/Application_pl.properties.xml | 2 + .../web/app/Application_pt.properties.xml | 2 + .../web/app/Application_pt_BR.properties.xml | 2 + .../web/app/Application_ru.properties.xml | 2 + .../web/app/Application_sk.properties.xml | 2 + .../web/app/Application_sv.properties.xml | 2 + .../web/app/Application_th.properties.xml | 2 + .../web/app/Application_tr.properties.xml | 2 + .../web/app/Application_uk.properties.xml | 2 + .../web/app/Application_zh_CN.properties.xml | 2 + .../web/app/Application_zh_TW.properties.xml | 2 + .../apache/openmeetings/web/common/Captcha.html | 27 +++++ .../apache/openmeetings/web/common/Captcha.java | 106 +++++++++++++++++++ .../web/pages/auth/ForgetPasswordDialog.html | 5 + .../web/pages/auth/ForgetPasswordDialog.java | 2 + .../web/pages/auth/RegisterDialog.html | 13 +-- .../web/pages/auth/RegisterDialog.java | 21 +--- .../web/pages/auth/SignInDialog.java | 4 +- 37 files changed, 209 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index 190aca5..b9b950d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml index bab7863..275adfd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml index 6440812..045ab0e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml index 7637a98..fea2ddb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml index 31bd424..ab4ff0a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml index 2319b76..c2bd1cc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml index 06a5f98..b27e359 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml @@ -1917,4 +1917,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml index 2e2e2a2..c4c354f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml index b83aa46..ed46e85 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml index 0486ab0..85d175d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml index 7ec4ef6..df7779f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml index 41aedb2..a052e86 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml @@ -1904,4 +1904,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml index a8f47ba..c527e8c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml index bef99fe..57ed57d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml @@ -1900,4 +1900,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml index 5d8f5d7..175d2fd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml index 50ad361..b5f9e9e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml @@ -1914,4 +1914,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml index 57f6464..3158a91 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml index b82d760..617f1f4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml @@ -1914,4 +1914,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml index 989a73a..b7ffbf9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml index 89e75f7..07da9c4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml index d078736..d270f87 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml index a51482f..6569531 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml index 1dfc9dc..283292e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml @@ -1913,4 +1913,6 @@ <entry key="right.presenter.remove">ÐÑнÑÑÑ Ð¿Ñаво бÑÑÑ ÐокладÑиком в комнаÑе</entry> <entry key="right.presenter.request">Ñ Ð¾Ñел Ð±Ñ Ð±ÑÑÑ ÐокладÑиком в ÑÑой комнаÑе</entry> <entry key="right.presenter.request.self">Я Ñ Ð¾Ñел Ð±Ñ Ð±ÑÑÑ ÐокладÑиком в ÑÑой комнаÑе</entry> + <entry key="captcha.text">ТекÑÑ ÐºÐ°Ð¿Ñи</entry> + <entry key="bad.captcha.text">ÐÑ Ð²Ð²ÐµÐ»Ð¸ невеÑнÑй ÑекÑÑ ÐºÐ°Ð¿Ñи</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml index 8f17053..f17a9cc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml index 38b93e1..919bc4b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml index 08b5642..c9f2e98 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml index b835462..616b1c2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml index 13dc5ec..95e2220 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml @@ -1914,4 +1914,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml index adfd44d..88b104a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml @@ -1902,4 +1902,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml index 04dbc65..0284170 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml @@ -1912,4 +1912,6 @@ <entry key="right.presenter.remove">Remove right to be presenter in this room</entry> <entry key="right.presenter.request">would like to have right to be presenter in this room</entry> <entry key="right.presenter.request.self">I would like to have right to be presenter in this room</entry> + <entry key="captcha.text">Captcha text</entry> + <entry key="bad.captcha.text">You have entered incorrect captcha text</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html new file mode 100644 index 0000000..c24f3ff --- /dev/null +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<html xmlns:wicket="http://wicket.apache.org";> +<wicket:panel> + <input type="text" wicket:id="captchaText" wicket:message="placeholder:captcha.text,title:captcha.text" style="margin-bottom: 5px;"/><br/> + <img wicket:id="captcha" style="vertical-align: bottom;"/> + <span wicket:id="refresh" wicket:message="alt:402,title:402"><wicket:message key="402"/></span> +</wicket:panel> +</html> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java new file mode 100644 index 0000000..4283f68 --- /dev/null +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java @@ -0,0 +1,106 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License") + you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openmeetings.web.common; + +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource; +import org.apache.wicket.markup.html.form.RequiredTextField; +import org.apache.wicket.markup.html.image.Image; +import org.apache.wicket.markup.html.panel.Panel; +import org.apache.wicket.model.Model; +import org.apache.wicket.validation.IValidatable; +import org.apache.wicket.validation.IValidator; +import org.apache.wicket.validation.ValidationError; + +import com.googlecode.wicket.jquery.core.JQueryBehavior; +import com.googlecode.wicket.jquery.core.Options; +import com.googlecode.wicket.jquery.ui.JQueryIcon; +import com.googlecode.wicket.jquery.ui.markup.html.link.AjaxLink; + +public class Captcha extends Panel { + private static final long serialVersionUID = 1L; + private String randomText; + private final CaptchaImageResource captchaImageResource = new CaptchaImageResource() { + private static final long serialVersionUID = 1L; + + @Override + protected byte[] render() { + randomText = randomString(6, 8); + getChallengeIdModel().setObject(randomText); + return super.render(); + } + }; + private final Image captcha = new Image("captcha", captchaImageResource); + private final RequiredTextField<String> captchaText = new RequiredTextField<>("captchaText", Model.of("")); + + public Captcha(String id) { + super(id); + setOutputMarkupId(true); + add(captcha.setOutputMarkupId(true)); + add(captchaText.setLabel(Model.of(getString("captcha.text"))).add(new IValidator<String>() { + private static final long serialVersionUID = 1L; + + @Override + public void validate(IValidatable<String> validatable) { + if (!randomText.equals(validatable.getValue())) { + validatable.error(new ValidationError(getString("bad.captcha.text"))); + } + } + })); + } + + @Override + protected void onInitialize() { + super.onInitialize(); + add(new AjaxLink<String>("refresh") { + private static final long serialVersionUID = 1L; + + @Override + public void onClick(AjaxRequestTarget target) { + captchaImageResource.invalidate(); + target.add(captcha); + } + + @Override + public void onConfigure(JQueryBehavior behavior) { + behavior.setOption("icon", Options.asString(JQueryIcon.REFRESH)); + behavior.setOption("showLabel", false); + } + }); + } + + private static int randomInt(int min, int max) { + return (int)(Math.random() * (max - min) + min); + } + + private static String randomString(int min, int max) { + int num = randomInt(min, max); + byte b[] = new byte[num]; + for (int i = 0; i < num; ++i) { + b[i] = (byte)randomInt('a', 'z'); + } + return new String(b); + } + + public Image refresh() { + captchaImageResource.invalidate(); + captchaText.setModelObject(""); + return captcha; + } +} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html index 6dc458b..e10aae7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html @@ -36,6 +36,11 @@ <td><span wicket:id="label"></span></td> <td><input wicket:id="name" type="text" /></td> </tr> + <tr> + <td colspan="2"> + <div wicket:id="captcha" style="text-align: center;"></div> + </td> + </tr> </table> <span wicket:id="feedback"></span> <input type="submit" wicket:id="submit" class="invisible-form-component"/> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java index 6adb603..402853b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java @@ -33,6 +33,7 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.util.UserHelper; import org.apache.openmeetings.service.mail.template.ResetPasswordTemplate; import org.apache.openmeetings.web.app.Application; +import org.apache.openmeetings.web.common.Captcha; import org.apache.openmeetings.web.pages.ResetPage; import org.apache.openmeetings.web.util.NonClosableMessageDialog; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -92,6 +93,7 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> { add(label.setOutputMarkupId(true)); add(nameField = new RequiredTextField<>("name", new PropertyModel<String>(ForgetPasswordDialog.this, "name"))); nameField.setLabel(Model.of(Application.getString(type == Type.email ? 315 : 316))); + add(new Captcha("captcha")); RadioGroup<Type> rg = new RadioGroup<>("type", new PropertyModel<Type>(ForgetPasswordDialog.this, "type")); add(rg.add(new Radio<>("email", Model.of(Type.email)).setOutputMarkupId(true)) .add(new Radio<>("login", Model.of(Type.login)).setOutputMarkupId(true)) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html index b526eb8..6a9a65f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html @@ -39,16 +39,9 @@ <td><input wicket:id="confirmPassword" type="password" wicket:message="placeholder:116" value="" /></td> </tr> <tr> - <td class="desc"><wicket:message key="1143" /></td> - <td><select wicket:id="tz"></select></td> - </tr> - <tr> - <td class="desc"><wicket:message key="120" /></td> - <td><select wicket:id="country"></select></td> - </tr> - <tr> - <td class="desc"><wicket:message key="111" /></td> - <td><select wicket:id="lang"></select></td> + <td colspan="2"> + <div wicket:id="captcha" style="text-align: center;"></div> + </td> </tr> </table> <span wicket:id="feedback"></span> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java index 2095511..80b2d60 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java @@ -23,12 +23,10 @@ import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.web.app.Application.getBean; -import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONES; import static org.apache.wicket.validation.validator.StringValidator.minimumLength; import java.util.Arrays; import java.util.List; -import java.util.Random; import java.util.TimeZone; import java.util.UUID; @@ -38,15 +36,13 @@ import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.app.WebSession; -import org.apache.openmeetings.web.common.LanguageDropDown; -import org.apache.openmeetings.web.util.CountryDropDown; +import org.apache.openmeetings.web.common.Captcha; import org.apache.openmeetings.web.util.NonClosableDialog; import org.apache.openmeetings.web.util.NonClosableMessageDialog; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator; -import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.form.RequiredTextField; @@ -77,10 +73,9 @@ public class RegisterDialog extends NonClosableDialog<String> { }; private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); private final IModel<String> tzModel = Model.of(WebSession.get().getClientTZCode()); - private final DropDownChoice<String> tzDropDown = new DropDownChoice<>("tz", tzModel, AVAILABLE_TIMEZONES); - private final Random rnd = new Random(); private RegisterForm form; private SignInDialog s; + private Captcha captcha; private String firstName; private String lastName; private String login; @@ -97,7 +92,6 @@ public class RegisterDialog extends NonClosableDialog<String> { super(id, Application.getString(113)); add(form = new RegisterForm("form")); form.setOutputMarkupId(true); - tzDropDown.setOutputMarkupId(true); confirmRegistration = new NonClosableMessageDialog("confirmRegistration", Application.getString(235), Application.getString(674)) { private static final long serialVersionUID = 1L; @@ -138,6 +132,7 @@ public class RegisterDialog extends NonClosableDialog<String> { email = null; lang = WebSession.get().getLanguageByBrowserLocale(); country = WebSession.get().getBrowserLocale().getCountry(); + captcha.refresh(); } @Override @@ -215,8 +210,6 @@ public class RegisterDialog extends NonClosableDialog<String> { private RequiredTextField<String> loginField; private RequiredTextField<String> firstNameField; private RequiredTextField<String> lastNameField; - private LanguageDropDown langField; - private CountryDropDown countryField; public RegisterForm(String id) { super(id); @@ -227,7 +220,7 @@ public class RegisterDialog extends NonClosableDialog<String> { add(passwordField = new PasswordTextField("password", new PropertyModel<String>(RegisterDialog.this, "password"))); add(confirmPassword = new PasswordTextField("confirmPassword", new Model<String>()).setResetPassword(true)); add(emailField = new RequiredTextField<>("email", new PropertyModel<String>(RegisterDialog.this, "email"))); - add(langField = new LanguageDropDown("lang", new PropertyModel<Long>(RegisterDialog.this, "lang"))); + add(captcha = new Captcha("captcha")); } @Override @@ -240,10 +233,6 @@ public class RegisterDialog extends NonClosableDialog<String> { passwordField.setResetPassword(true).add(minimumLength(getMinPasswdLength(cfgDao))).setLabel(Model.of(getString("115"))); confirmPassword.setLabel(Model.of(getString("116"))); emailField.add(RfcCompliantEmailAddressValidator.getInstance()).setLabel(Model.of(getString("119"))); - langField.setRequired(true).setLabel(Model.of(getString("111"))); - add(tzDropDown.setRequired(true).setLabel(Model.of(getString("1143")))); - add(countryField = new CountryDropDown("country", new PropertyModel<String>(RegisterDialog.this, "country"))); - countryField.setRequired(true).setLabel(Model.of(getString("120"))); add(new AjaxButton("submit") { // FAKE button so "submit-on-enter" works as expected private static final long serialVersionUID = 1L; @@ -274,7 +263,7 @@ public class RegisterDialog extends NonClosableDialog<String> { if (hasErrorMessage()) { // add random timeout try { - Thread.sleep(rnd.nextInt(10) * 1000); + Thread.sleep((long)(10 * Math.random() * 1000)); } catch (InterruptedException e) { log.error("Unexpected exception while sleeting", e); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d37dede7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java index 28a3953..f9ede65 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java @@ -29,7 +29,6 @@ import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK; import java.util.ArrayList; import java.util.List; -import java.util.Random; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.basic.ErrorDao; @@ -100,7 +99,6 @@ public class SignInDialog extends NonClosableDialog<String> { private ForgetPasswordDialog f; private LdapConfig domain; private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); - private final Random rnd = new Random(); public SignInDialog(String id) { super(id, Application.getString(108)); @@ -206,7 +204,7 @@ public class SignInDialog extends NonClosableDialog<String> { } // add random timeout try { - Thread.sleep((6 + rnd.nextInt(10)) * 1000); + Thread.sleep(6 + (long)(10 * Math.random() * 1000)); } catch (InterruptedException e) { log.error("Unexpected exception while sleeting", e); }
