[jira] [Commented] (OPENMEETINGS-2472) Old ga.js should be migrated to gtag
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2472?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17207098#comment-17207098 ] ASF subversion and git services commented on OPENMEETINGS-2472: --- Commit 640c50916a7b5c3da9c775597e0309887b3bc42d in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=640c509 ] [OPENMEETINGS-2472] gtag should work > Old ga.js should be migrated to gtag > > > Key: OPENMEETINGS-2472 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2472 > Project: Openmeetings > Issue Type: Improvement > Components: Builds >Affects Versions: 5.0.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.1.0 > > > Old ga.js should be migrated to gtag -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2472] gtag should work
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 640c509 [OPENMEETINGS-2472] gtag should work
640c509 is described below
commit 640c50916a7b5c3da9c775597e0309887b3bc42d
Author: Maxim Solodovnik
AuthorDate: Sun Oct 4 12:57:53 2020 +0700
[OPENMEETINGS-2472] gtag should work
---
.../java/org/apache/openmeetings/web/pages/om-ga.js | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
index 2e3068d..d1bd241 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
@@ -1,12 +1,25 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
function initGA(code, hash) {
window.dataLayer = window.dataLayer || [];
- const gtag = () => dataLayer.push(arguments)
- , newPage = () => gtag('config', code, {'page_path':
location.pathname + location.hash});
+ function gtag() {
+ dataLayer.push(arguments);
+ }
+ function newPage() {
+ const page = location.pathname +
(location.search.indexOf('app=') > -1 ? location.search : location.hash);
+ gtag('config', code, {'page_path': page});
+ }
gtag('js', new Date());
+ gtag('config', code, {
+ anonymize_ip: true
+ , send_page_view: false
+ });
newPage();
if (hash) {
- $(window).off('hashchange').on('hashchange', newPage);
+ $(window).off('hashchange').on('hashchange', () => {
+ if (location.hash.indexOf('/') > -1) {
+ newPage();
+ }
+ });
}
}
[openmeetings] branch master updated: [OPENMEETINGS-2472] js improvements
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 0865e81 [OPENMEETINGS-2472] js improvements
0865e81 is described below
commit 0865e81e1a7bb24e107e883a7885d5b80a25d384
Author: Maxim Solodovnik
AuthorDate: Sun Oct 4 11:30:38 2020 +0700
[OPENMEETINGS-2472] js improvements
---
.../apache/openmeetings/web/pages/BasePage.java| 4 ++--
.../org/apache/openmeetings/web/pages/om-ga.js | 22 --
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index dbb1010..0c993f0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -140,8 +140,8 @@ public abstract class BasePage extends
AsyncUrlFragmentAwarePage {
return
List.of(JavaScriptHeaderItem.forUrl("https://www.googletagmanager.com/gtag/js?id=;
+ getGaCode()).setAsync(true));
}
})));
- StringBuilder script = new StringBuilder("initGA('");
-
script.append(getGaCode()).append("');").append(isMainPage() ? "initHash()" :
"gtagEvent()").append(';');
+ StringBuilder script = new StringBuilder("initGA('")
+ .append(getGaCode()).append("',
").append(isMainPage()).append(");");
response.render(OnDomReadyHeaderItem.forScript(script));
}
response.render(CssHeaderItem.forReference(FontAwesome5CssReference.instance()));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
index b3d6f99..2e3068d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
@@ -1,18 +1,12 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
-window.dataLayer = window.dataLayer || [];
-function gtag() {
- dataLayer.push(arguments);
-}
-function gtagEvent() {
- gtag('event', 'pageview', {page: location.pathname, hash:
location.hash});
-}
-function initGA(code) {
+function initGA(code, hash) {
+ window.dataLayer = window.dataLayer || [];
+ const gtag = () => dataLayer.push(arguments)
+ , newPage = () => gtag('config', code, {'page_path':
location.pathname + location.hash});
gtag('js', new Date());
- gtag('config', code);
-}
-function initHash() {
- gtagEvent();
-
- $(window).off('hashchange').on('hashchange', gtagEvent);
+ newPage();
+ if (hash) {
+ $(window).off('hashchange').on('hashchange', newPage);
+ }
}
[jira] [Commented] (OPENMEETINGS-2472) Old ga.js should be migrated to gtag
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2472?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17207089#comment-17207089 ] ASF subversion and git services commented on OPENMEETINGS-2472: --- Commit 0865e81e1a7bb24e107e883a7885d5b80a25d384 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=0865e81 ] [OPENMEETINGS-2472] js improvements > Old ga.js should be migrated to gtag > > > Key: OPENMEETINGS-2472 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2472 > Project: Openmeetings > Issue Type: Improvement > Components: Builds >Affects Versions: 5.0.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.1.0 > > > Old ga.js should be migrated to gtag -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2472) Old ga.js should be migrated to gtag
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2472?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17207082#comment-17207082 ] ASF subversion and git services commented on OPENMEETINGS-2472: --- Commit 90cad09a90836c525c78dd52fd6f753644906ca5 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=90cad09 ] [OPENMEETINGS-2472] more work on csp, code clean-up > Old ga.js should be migrated to gtag > > > Key: OPENMEETINGS-2472 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2472 > Project: Openmeetings > Issue Type: Improvement > Components: Builds >Affects Versions: 5.0.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.1.0 > > > Old ga.js should be migrated to gtag -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2472] more work on csp, code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 90cad09 [OPENMEETINGS-2472] more work on csp, code clean-up
90cad09 is described below
commit 90cad09a90836c525c78dd52fd6f753644906ca5
Author: Maxim Solodovnik
AuthorDate: Sun Oct 4 10:22:13 2020 +0700
[OPENMEETINGS-2472] more work on csp, code clean-up
---
.../apache/openmeetings/db/dao/basic/ConfigurationDao.java | 1 +
.../java/org/apache/openmeetings/web/pages/BasePage.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/pages/om-ga.js | 12 +---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 16c8537..273ce5f 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -632,6 +632,7 @@ public class ConfigurationDao implements
IDataProviderDao {
if (!Strings.isEmpty(getGaCode())) {
//
https://developers.google.com/tag-manager/web/csp#universal_analytics_google_analytics
addCspRule(cspConfig, CSPDirective.IMG_SRC,
"https://www.google-analytics.com;);
+ addCspRule(cspConfig, CSPDirective.CONNECT_SRC,
"https://www.google-analytics.com;);
addCspRule(cspConfig, CSPDirective.SCRIPT_SRC,
"https://www.googletagmanager.com;);
}
oauthDao.getActive().forEach(oauth -> {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 97f6879..dbb1010 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -141,7 +141,7 @@ public abstract class BasePage extends
AsyncUrlFragmentAwarePage {
}
})));
StringBuilder script = new StringBuilder("initGA('");
-
script.append(getGaCode()).append("');").append(isMainPage() ? "initHash()" :
"init()").append(';');
+
script.append(getGaCode()).append("');").append(isMainPage() ? "initHash()" :
"gtagEvent()").append(';');
response.render(OnDomReadyHeaderItem.forScript(script));
}
response.render(CssHeaderItem.forReference(FontAwesome5CssReference.instance()));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
index 65b4cb3..b3d6f99 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
@@ -3,18 +3,16 @@ window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
+function gtagEvent() {
+ gtag('event', 'pageview', {page: location.pathname, hash:
location.hash});
+}
function initGA(code) {
gtag('js', new Date());
gtag('config', code);
}
-function init() {
- gtag('event', 'pageview');
-}
function initHash() {
- gtag('event', 'pageview', window.location.hash);
+ gtagEvent();
- $(window).bind('hashchange', function() {
- gtag('event', 'pageview', window.location.hash);
- });
+ $(window).off('hashchange').on('hashchange', gtagEvent);
}
[jira] [Commented] (OPENMEETINGS-2472) Old ga.js should be migrated to gtag
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2472?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17206899#comment-17206899 ] ASF subversion and git services commented on OPENMEETINGS-2472: --- Commit 8e40be1ef183b76032437a2142f11126864bfe9a in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=8e40be1 ] [OPENMEETINGS-2472] CSP is updated > Old ga.js should be migrated to gtag > > > Key: OPENMEETINGS-2472 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2472 > Project: Openmeetings > Issue Type: Improvement > Components: Builds >Affects Versions: 5.0.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.1.0 > > > Old ga.js should be migrated to gtag -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2472] CSP is updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 8e40be1 [OPENMEETINGS-2472] CSP is updated
8e40be1 is described below
commit 8e40be1ef183b76032437a2142f11126864bfe9a
Author: Maxim Solodovnik
AuthorDate: Sun Oct 4 07:09:08 2020 +0700
[OPENMEETINGS-2472] CSP is updated
---
.../java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index bc5fc77..16c8537 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -631,7 +631,7 @@ public class ConfigurationDao implements
IDataProviderDao {
addCspRule(cspConfig, CSPDirective.CONNECT_SRC,
app.getWsUrl(), false); // special code for Safari browser
if (!Strings.isEmpty(getGaCode())) {
//
https://developers.google.com/tag-manager/web/csp#universal_analytics_google_analytics
- //addCspRule(cspConfig, CSPDirective.IMG_SRC,
"https://www.google-analytics.com;);
+ addCspRule(cspConfig, CSPDirective.IMG_SRC,
"https://www.google-analytics.com;);
addCspRule(cspConfig, CSPDirective.SCRIPT_SRC,
"https://www.googletagmanager.com;);
}
oauthDao.getActive().forEach(oauth -> {
[jira] [Commented] (OPENMEETINGS-2472) Old ga.js should be migrated to gtag
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2472?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17206820#comment-17206820 ] ASF subversion and git services commented on OPENMEETINGS-2472: --- Commit 6b379b7c8ab5c81c91b1dfbd0a8957d41b9c5893 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=6b379b7 ] [OPENMEETINGS-2472] JS error is fixed > Old ga.js should be migrated to gtag > > > Key: OPENMEETINGS-2472 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2472 > Project: Openmeetings > Issue Type: Improvement > Components: Builds >Affects Versions: 5.0.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.1.0 > > > Old ga.js should be migrated to gtag -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2472] JS error is fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 6b379b7 [OPENMEETINGS-2472] JS error is fixed
6b379b7 is described below
commit 6b379b7c8ab5c81c91b1dfbd0a8957d41b9c5893
Author: Maxim Solodovnik
AuthorDate: Sun Oct 4 00:49:26 2020 +0700
[OPENMEETINGS-2472] JS error is fixed
---
.../src/main/java/org/apache/openmeetings/web/pages/om-ga.js | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
index 0752f69..65b4cb3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
@@ -1,9 +1,9 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
+window.dataLayer = window.dataLayer || [];
+function gtag() {
+ dataLayer.push(arguments);
+}
function initGA(code) {
- window.dataLayer = window.dataLayer || [];
- function gtag() {
- dataLayer.push(arguments);
- }
gtag('js', new Date());
gtag('config', code);
[openmeetings] branch master updated: [OPENMEETINGS-2472] ga.js is partially migrated to gtag
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new fa86d55 [OPENMEETINGS-2472] ga.js is partially migrated to gtag
fa86d55 is described below
commit fa86d553f22dc09f9a48a01d98e7ef1e6f50a5e3
Author: Maxim Solodovnik
AuthorDate: Sun Oct 4 00:22:25 2020 +0700
[OPENMEETINGS-2472] ga.js is partially migrated to gtag
---
.../db/dao/basic/ConfigurationDao.java | 4 ++--
.../apache/openmeetings/web/pages/BasePage.java| 11 ++-
.../org/apache/openmeetings/web/pages/om-ga.js | 22 ++
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index b81a447..bc5fc77 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -631,8 +631,8 @@ public class ConfigurationDao implements
IDataProviderDao {
addCspRule(cspConfig, CSPDirective.CONNECT_SRC,
app.getWsUrl(), false); // special code for Safari browser
if (!Strings.isEmpty(getGaCode())) {
//
https://developers.google.com/tag-manager/web/csp#universal_analytics_google_analytics
- addCspRule(cspConfig, CSPDirective.IMG_SRC,
"https://www.google-analytics.com;);
- addCspRule(cspConfig, CSPDirective.SCRIPT_SRC,
"https://www.google-analytics.com, https://ssl.google-analytics.com;);
+ //addCspRule(cspConfig, CSPDirective.IMG_SRC,
"https://www.google-analytics.com;);
+ addCspRule(cspConfig, CSPDirective.SCRIPT_SRC,
"https://www.googletagmanager.com;);
}
oauthDao.getActive().forEach(oauth -> {
if (!Strings.isEmpty(oauth.getIconUrl())) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index f3d47e1..97f6879 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -25,6 +25,7 @@ import static
org.apache.openmeetings.web.app.Application.isInstalled;
import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.apache.openmeetings.web.app.Application;
@@ -35,6 +36,7 @@ import
org.apache.openmeetings.web.util.OmUrlFragment.AreaKeys;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -130,7 +132,14 @@ public abstract class BasePage extends
AsyncUrlFragmentAwarePage {
response.render(CssHeaderItem.forUrl(String.format("css/theme_om/jquery-ui%s.css",
suffix)));
response.render(CssHeaderItem.forUrl("css/theme.css"));
if (!Strings.isEmpty(getGaCode())) {
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(BasePage.class, "om-ga.js";
+ response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(BasePage.class, "om-ga.js") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List getDependencies() {
+ return
List.of(JavaScriptHeaderItem.forUrl("https://www.googletagmanager.com/gtag/js?id=;
+ getGaCode()).setAsync(true));
+ }
+ })));
StringBuilder script = new StringBuilder("initGA('");
script.append(getGaCode()).append("');").append(isMainPage() ? "initHash()" :
"init()").append(';');
response.render(OnDomReadyHeaderItem.forScript(script));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
index e7e73f4..0752f69 100644
---
[jira] [Commented] (OPENMEETINGS-2472) Old ga.js should be migrated to gtag
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2472?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17206814#comment-17206814 ] ASF subversion and git services commented on OPENMEETINGS-2472: --- Commit fa86d553f22dc09f9a48a01d98e7ef1e6f50a5e3 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=fa86d55 ] [OPENMEETINGS-2472] ga.js is partially migrated to gtag > Old ga.js should be migrated to gtag > > > Key: OPENMEETINGS-2472 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2472 > Project: Openmeetings > Issue Type: Improvement > Components: Builds >Affects Versions: 5.0.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.1.0 > > > Old ga.js should be migrated to gtag -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Created] (OPENMEETINGS-2472) Old ga.js should be migrated to gtag
Maxim Solodovnik created OPENMEETINGS-2472: -- Summary: Old ga.js should be migrated to gtag Key: OPENMEETINGS-2472 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2472 Project: Openmeetings Issue Type: Improvement Components: Builds Affects Versions: 5.0.1 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 5.1.0 Old ga.js should be migrated to gtag -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Created] (OPENMEETINGS-2471) Invitation email format
Uwe Simon created OPENMEETINGS-2471: --- Summary: Invitation email format Key: OPENMEETINGS-2471 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2471 Project: Openmeetings Issue Type: Bug Components: Email, UI Affects Versions: 5.0.1 Reporter: Uwe Simon Assignee: Maxim Solodovnik Attachments: Bildschirmfoto vom 2020-10-03 18-42-12.png, Bildschirmfoto vom 2020-10-03 18-44-06.png The invitation email is shown in email client without any linebreaks. (seems not to depend on email client). In "Message-UI" add a space between Start/End and the time of the Invitation. Schedule of invitation is shown in openmeetings UI, but not included in email. Improvements of "messages UI": * Columns From/to Topic, Start..., End... are quite far on the right, reduce width of 1. column, * Add class "bg-light" or something similar to the 2 in the message display so that header and start/end times are seperated from message content. * In the list it's not "very visible" whether a message is read or not. !Bildschirmfoto vom 2020-10-03 18-42-12.png!!Bildschirmfoto vom 2020-10-03 18-44-06.png! -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2239) (Re-) Implementation SIP
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2239?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17206716#comment-17206716 ] ASF subversion and git services commented on OPENMEETINGS-2239: --- Commit d83df260226cf2c98abefb0ace8878a7199c9a7d in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=d83df26 ] [OPENMEETINGS-2239] initial steps are documented > (Re-) Implementation SIP > > > Key: OPENMEETINGS-2239 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2239 > Project: Openmeetings > Issue Type: Wish > Components: VoIP/SIP >Affects Versions: 5.0.0-M3 >Reporter: Rene Scholz >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 5.1.0 > > > In OM5 the SIP is no longer working - please "reactivate" ist. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2239] initial steps are documented
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/master by this push: new d83df26 [OPENMEETINGS-2239] initial steps are documented d83df26 is described below commit d83df260226cf2c98abefb0ace8878a7199c9a7d Author: Maxim Solodovnik AuthorDate: Sat Oct 3 21:32:43 2020 +0700 [OPENMEETINGS-2239] initial steps are documented --- .../src/site/markdown/AsteriskIntegration.md | 259 + .../src/site/markdown/ExternalVideo.md | 3 +- openmeetings-server/src/site/markdown/HTTPS.md | 3 +- .../src/site/markdown/InstallMediaServer.md| 3 +- .../src/site/markdown/LdapAndADS.md| 3 +- .../src/site/markdown/PortSettings.md | 3 +- .../src/site/markdown/RestrictedAccess.md | 3 +- 7 files changed, 271 insertions(+), 6 deletions(-) diff --git a/openmeetings-server/src/site/markdown/AsteriskIntegration.md b/openmeetings-server/src/site/markdown/AsteriskIntegration.md new file mode 100644 index 000..44107ce --- /dev/null +++ b/openmeetings-server/src/site/markdown/AsteriskIntegration.md @@ -0,0 +1,259 @@ + + +# Not implemented + + + Please NOTE: this functionality is not yet implemented in 5.0.x + + +# VoIP and SIP Integration + +There are multiple ways to integrate with VoIP and or SIP. +OpenMeetings does not provide out of the box a ready to run VoIP +integration / integration to cell phone or usual land lane. +The nature of such integrations is that it depends heavily on the +infrastructure that you are using and where you would like to +integrate OpenMeetings into. + + +It also depends on a number of factors of which OpenMeetings is +impossible to set up for you, for example setting up your VoIP +server or provide you with a range of telephone numbers reserved for +conference calls in your national phone network. +Such an integration +project is likely to become a consulting job for a +telecommunications consultant. + + +To get help on the integration you can contact the +mailing lists +or for example somebody from the list of +commercial support. + +# Asterisk Integration + +You need Apache OpenMeetings version 5.1+ to apply this guide! + +You need Asterisk version 16+ to apply this guide! + +Here is the instruction how-to set up integration between OpenMeetings and Asterisk on Ubuntu 18.04. + +## Prerequisites + +``` +sudo apt update && sudo apt upgrade +``` + +## Building and setting up Asterisk + +``` +sudo apt install build-essential + +sudo mkdir /usr/src/asterisk && cd /usr/src/asterisk +sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.13.0.tar.gz +sudo tar -xvzf asterisk-16.13.0.tar.gz +cd ./asterisk-16.13.0 +sudo make clean +sudo contrib/scripts/install_prereq install +sudo ./configure +sudo make menuconfig +``` + +Make sure you have selected (https://wiki.asterisk.org/wiki/display/AST/Configuring+Asterisk+for+WebRTC+Clients;>Asterisk WebRTC Config) + +* Add-ons -> res_config_mysql +* Codec Translators -> codec_opus +* Resource Modules -> res_crypto +* Resource Modules -> res_http_websocket +* Resource Modules -> res_pjsip_transport_websocket + +Press F12 to save + +``` +sudo make +sudo make install +sudo make samples +sudo make config + +``` + +## Configure Asterisk + +### Enable asterisk MySQL module: + +Modify `[modules]` section of `/etc/asterisk/modules.conf` +**Add/uncomment the following lines** + +``` +preload => res_config_mysql.so +``` + +### Configure MySQL module: + +Set valid data for MySQL in `/etc/asterisk/res_config_mysql.conf`: + +**Example** + +``` +[general] +dbhost = 127.0.0.1 +dbname = openmeetings +dbuser = root +dbpass = +dbport = 3306 +dbsock = /var/lib/mysql/mysql.sock +dbcharset = utf8 +requirements=warn +``` + +### Configure SIP module: + +Modify `/etc/asterisk/sip.conf` + +**Add/uncomment the following lines** + +``` +videosupport=yes +rtcachefriends=yes +``` + +**Increase maxexpiry value to 43200** + +``` +maxexpiry=43200 +``` + +** FIXME TODO Add user for the "SIP Transport"** + +``` +; FIXME TODO commented for now +; [red5sip_user] +; type=friend +; secret=12345 +; disallow=all +; allow=ulaw +; allow=h263 +; host=dynamic +; nat=force_rport,comedia +; context=rooms-red5sip +``` + +### Configure extensions: + +Add next lines into the `/etc/asterisk/extconfig.conf`: + +``` +[settings] +sippeers => mysql,general,sipusers +``` + +Modify `/etc/asterisk/extensions.conf` +**Add the following section:** + +``` +; * +; The below dial plan is used to dial into a Openmeetings Conference room +; The first line DB_EXISTS(openmeetings/room/ does not belong to the openmeetings application +; but is the name of astDB containing the astDB family/key pair and values +; To Check if your astDB has been created do
[jira] [Commented] (OPENMEETINGS-2466) Camera is occupied (on) even after leaving the room
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2466?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17206708#comment-17206708 ] Maxim Solodovnik commented on OPENMEETINGS-2466: Hello [~ali.alhaidary], I just have tested it using Ubuntu 20.04, FF 81 The issue is not reproducible for me > Camera is occupied (on) even after leaving the room > --- > > Key: OPENMEETINGS-2466 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2466 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video >Affects Versions: 5.1.0 >Reporter: Ali Alhaidary >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 5.1.0 > > > Camera keeps occupied (on) even after leaving the room, no other application > can use it. It will turn off after logging out of OM. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2466) Camera is occupied (on) even after leaving the room
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2466?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17206707#comment-17206707 ] ASF subversion and git services commented on OPENMEETINGS-2466: --- Commit fbfb6d2b0b939b15ca311b79998b38d488746b24 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=fbfb6d2 ] [OPENMEETINGS-2466] code clean-up > Camera is occupied (on) even after leaving the room > --- > > Key: OPENMEETINGS-2466 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2466 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video >Affects Versions: 5.1.0 >Reporter: Ali Alhaidary >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 5.1.0 > > > Camera keeps occupied (on) even after leaving the room, no other application > can use it. It will turn off after logging out of OM. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2466] code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new fbfb6d2 [OPENMEETINGS-2466] code clean-up
fbfb6d2 is described below
commit fbfb6d2b0b939b15ca311b79998b38d488746b24
Author: Maxim Solodovnik
AuthorDate: Sat Oct 3 21:10:09 2020 +0700
[OPENMEETINGS-2466] code clean-up
---
.../db/dao/basic/ConfigurationDao.java | 2 +-
.../apache/openmeetings/web/room/raw-settings.js | 27 --
.../org/apache/openmeetings/web/room/raw-video.js | 9
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 3871588..b81a447 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -589,7 +589,7 @@ public class ConfigurationDao implements
IDataProviderDao {
for(String str : val.split(",")) {
if (!Strings.isEmpty(str)) {
try {
- cspConfig.add(key, str.trim());
+ cspConfig.add(key, str.trim());
} catch (Exception e) {
log.error("Enexpected error
while adding CSP rule: key '{}', value '{}', part '{}'", key, val, str, e);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index 72fb92c..3ff9a23 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -372,20 +372,15 @@ var VideoSettings = (function() {
return;
}
navigator.mediaDevices.enumerateDevices()
- .then(function(devices) {
- devices.forEach(function(device) {
+ .then(devices => devices.forEach(device => {
if (DEV_AUDIO === device.kind) {
devCnts.audio = true;
} else if (DEV_VIDEO === device.kind) {
devCnts.video = true;
}
- });
- callback(devCnts);
- })
- .catch(function() {
- OmUtil.error('Unable to get the list of
multimedia devices');
- callback(devCnts);
- });
+ }))
+ .catch(() => OmUtil.error('Unable to get the list of
multimedia devices'))
+ .finally(() => callback(devCnts));
}
function _initDevices() {
if (window.isSecureContext === false) {
@@ -404,23 +399,19 @@ var VideoSettings = (function() {
return;
}
navigator.mediaDevices.getUserMedia(devCnts)
- .then(function(stream) {
+ .then(stream => {
const devices =
navigator.mediaDevices.enumerateDevices()
- .then(function(devices) {
- _clear(stream);
- return devices;
- })
.catch(function(err) {
- _clear(stream);
throw err;
- });
+ })
+ .finally(() => _clear(stream));
return devices;
})
- .then(function(devices) {
+ .then(devices => {
let cCount = 0, mCount = 0;
_load();
_setDisabled([cam, mic]);
-
[jira] [Commented] (OPENMEETINGS-2460) FireFox on iOS
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2460?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17206630#comment-17206630 ] Ali Alhaidary commented on OPENMEETINGS-2460: - This is to confirm that safari, FireFox and google chrome have no audio in iOS and no video almost all of the time (I had video only once in tens of trails) > FireFox on iOS > -- > > Key: OPENMEETINGS-2460 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2460 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video >Affects Versions: 5.0.1, 5.1.0 >Reporter: Ali Alhaidary >Assignee: Maxim Solodovnik >Priority: Major > Attachments: ff-ios.png > > > audio/video is not working. attached is the massage that shows when testing > settings -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Closed] (OPENMEETINGS-2468) Moving keys 282, 283, 286 and 287 from translation table to configuration
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2468?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Ali Alhaidary closed OPENMEETINGS-2468. --- Resolution: Not A Bug > Moving keys 282, 283, 286 and 287 from translation table to configuration > - > > Key: OPENMEETINGS-2468 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2468 > Project: Openmeetings > Issue Type: Improvement > Components: Dashboard >Affects Versions: 5.1.0 >Reporter: Ali Alhaidary >Assignee: Maxim Solodovnik >Priority: Minor > > Keys 282, 283, 286 and 287 in language table have the same site specific > characteristics as some other configuration keys like site name, google > analytics and mail parameters > When upgrading to a new build or version, these keys need to be configured > each and every time, so moving them to the database makes it more practical. -- This message was sent by Atlassian Jira (v8.3.4#803005)
