Repository: openmeetings Updated Branches: refs/heads/master 5fca25f36 -> e76158747
[OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e7615874 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e7615874 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e7615874 Branch: refs/heads/master Commit: e761587471f012ca0728561af9ff22ae53b09556 Parents: 5fca25f Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 9 16:47:32 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 9 16:47:32 2017 +0700 ---------------------------------------------------------------------- .../core/converter/BaseConverter.java | 8 +++---- .../core/converter/InterviewConverter.java | 8 +++---- .../core/converter/RecordingConverter.java | 4 ++-- .../listener/async/StreamAudioWriter.java | 6 +++--- .../openmeetings/core/ldap/LdapOptions.java | 22 ++++++++++---------- .../openmeetings/core/remote/MobileService.java | 8 +++---- .../core/remote/ScopeApplicationAdapter.java | 2 +- .../db/dao/server/SessiondataDao.java | 18 ++++++++-------- .../openmeetings/db/dao/user/IUserManager.java | 4 ++-- .../java/org/apache/openmeetings/cli/Admin.java | 8 +++---- .../apache/openmeetings/screenshare/Core.java | 4 ++-- .../web/pages/auth/ForgetPasswordDialog.java | 4 ++-- .../web/room/poll/PollResultsDialog.java | 4 ++-- .../web/room/sidebar/RoomSidebar.java | 2 +- .../openmeetings/web/user/MessageDialog.java | 14 ++++++------- 15 files changed, 58 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java index 11a7e01..01539c5 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java @@ -305,18 +305,18 @@ public abstract class BaseConverter { metaDelta.setWaveOutPutName(hashFileGapsFullName); - String[] argv_sox = null; + String[] soxArgs = null; if (metaDelta.getDeltaTime() != null) { double gapSeconds = diffSeconds(metaDelta.getDeltaTime()); if (metaDelta.isStartPadding()) { - argv_sox = addSoxPad(returnLog, "fillGap", gapSeconds, 0, inputFile, outputGapFullWav); + soxArgs = addSoxPad(returnLog, "fillGap", gapSeconds, 0, inputFile, outputGapFullWav); } else if (metaDelta.isEndPadding()) { - argv_sox = addSoxPad(returnLog, "fillGap", 0, gapSeconds, inputFile, outputGapFullWav); + soxArgs = addSoxPad(returnLog, "fillGap", 0, gapSeconds, inputFile, outputGapFullWav); } } - if (argv_sox != null) { + if (soxArgs != null) { log.debug("START fillGap ################# Delta-ID :: " + metaDelta.getId()); metaDeltaDao.update(metaDelta); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java index c2f974c..5761869 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java @@ -134,14 +134,14 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve } else if (waveFiles.size() == 1) { wav = waveFiles.get(0); } else { - String[] argv_full_sox; + String[] soxArgs; if (reconversion) { - argv_full_sox = mergeAudioToWaves(waveFiles, wav, metaDataList, rcv); + soxArgs = mergeAudioToWaves(waveFiles, wav, metaDataList, rcv); } else { - argv_full_sox = mergeAudioToWaves(waveFiles, wav); + soxArgs = mergeAudioToWaves(waveFiles, wav); } - logs.add(ProcessHelper.executeScript("mergeAudioToWaves", argv_full_sox)); + logs.add(ProcessHelper.executeScript("mergeAudioToWaves", soxArgs)); } // Default Image for empty interview video pods final File defaultInterviewImageFile = new File(streamFolderGeneral, "default_interview_image.png"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java index 82ae5f1..4ecca4e 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java @@ -101,9 +101,9 @@ public class RecordingConverter extends BaseConverter implements IRecordingConve } else if (waveFiles.size() == 1) { wav = waveFiles.get(0); } else { - String[] argv_full_sox = mergeAudioToWaves(waveFiles, wav); + String[] soxArgs = mergeAudioToWaves(waveFiles, wav); - logs.add(ProcessHelper.executeScript("mergeAudioToWaves", argv_full_sox)); + logs.add(ProcessHelper.executeScript("mergeAudioToWaves", soxArgs)); } screenMetaData.setFullWavAudioData(wav.getName()); metaDataDao.update(screenMetaData); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java index 8b1a178..d72a518 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java @@ -153,8 +153,8 @@ public class StreamAudioWriter extends BaseStreamWriter { metaDelta.setStartTime(startedSessionTimeDate); metaDelta.setPacketTimeStamp(streampacket.getTimestamp()); - Date current_date = new Date(); - Long deltaTimeStamp = current_date.getTime() - startedSessionTimeDate.getTime(); + Date curDate = new Date(); + Long deltaTimeStamp = curDate.getTime() - startedSessionTimeDate.getTime(); duration = Math.max(duration, timeStamp + writer.getOffset()); metaDelta.setDuration(duration); @@ -163,7 +163,7 @@ public class StreamAudioWriter extends BaseStreamWriter { metaDelta.setMissingTime(missingTime); - metaDelta.setCurrentTime(current_date); + metaDelta.setCurrentTime(curDate); metaDelta.setDeltaTimeStamp(deltaTimeStamp); metaDelta.setStartTimeStamp(startTimeStamp); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java index d72ad1a..f289950 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java @@ -76,28 +76,28 @@ public class LdapOptions { String importQuery = null; public LdapOptions(Properties config) { - String ldap_use_lower_case = config.getProperty(CONFIGKEY_LDAP_USE_LOWER_CASE, "false"); - useLowerCase = "true".equals(ldap_use_lower_case); + String useLowerCaseProp = config.getProperty(CONFIGKEY_LDAP_USE_LOWER_CASE, "false"); + useLowerCase = "true".equals(useLowerCaseProp); - String ldap_auth_type = config.getProperty(CONFIGKEY_LDAP_AUTH_TYPE, ""); + String authType = config.getProperty(CONFIGKEY_LDAP_AUTH_TYPE, ""); try { - type = AuthType.valueOf(ldap_auth_type); + type = AuthType.valueOf(authType); } catch (Exception e) { - log.error("ConfigKey in Ldap Config contains invalid auth type : '{}' -> Defaulting to {}", ldap_auth_type, type); + log.error("ConfigKey in Ldap Config contains invalid auth type : '{}' -> Defaulting to {}", authType, type); } - String ldap_prov_type = config.getProperty(CONFIGKEY_LDAP_PROV_TYPE, ""); + String provType = config.getProperty(CONFIGKEY_LDAP_PROV_TYPE, ""); try { - prov = Provisionning.valueOf(ldap_prov_type); + prov = Provisionning.valueOf(provType); } catch (Exception e) { - log.error("ConfigKey in Ldap Config contains invalid provisionning type : '{}' -> Defaulting to {}", ldap_prov_type, prov); + log.error("ConfigKey in Ldap Config contains invalid provisionning type : '{}' -> Defaulting to {}", provType, prov); } - String ldap_deref_mode = config.getProperty(CONFIGKEY_LDAP_DEREF_MODE, ""); + String derefModeProp = config.getProperty(CONFIGKEY_LDAP_DEREF_MODE, ""); try { - derefMode = AliasDerefMode.getDerefMode(ldap_deref_mode); + derefMode = AliasDerefMode.getDerefMode(derefModeProp); } catch (Exception e) { - log.error("ConfigKey in Ldap Config contains invalid deref mode : '{}' -> Defaulting to {}", ldap_deref_mode, derefMode); + log.error("ConfigKey in Ldap Config contains invalid deref mode : '{}' -> Defaulting to {}", derefModeProp, derefMode); } if (AuthType.NONE == type && Provisionning.NONE == prov) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java index b9c5557..b81a6e1 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java @@ -345,10 +345,10 @@ public class MobileService { /** * designed to do nothing remain for compatibility * - * @param SID - sid + * @param sid - sid * @param userId - redundant userId */ - public Map<String, Object> roomConnect(String SID, Long userId) { + public Map<String, Object> roomConnect(String sid, Long userId) { // publicSid is changed on mobile room connect IConnection current = Red5.getConnectionLocal(); StreamClient c = sessionManager.get(IClientUtil.getId(current.getClient())); @@ -478,8 +478,8 @@ public class MobileService { //for creating via reflection } - public Language(long language_id, String code, String name) { - this.language_id = language_id; + public Language(long langId, String code, String name) { + this.language_id = langId; this.code = code; this.name = name; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java index 5a259b5..90cf892 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java @@ -742,7 +742,7 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp }.start(); } - public static abstract class MessageSender extends Thread { + public abstract static class MessageSender extends Thread { final IScope scope; final IConnection current; final String method; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java index 35e60d7..88ae986 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java @@ -117,11 +117,11 @@ public class SessiondataDao { /** * - * @param SID + * @param sid * @return */ - public Sessiondata check(String SID) { - Sessiondata sd = find(SID); + public Sessiondata check(String sid) { + Sessiondata sd = find(sid); // Checks if wether the Session or the User Object of that Session is set yet if (sd == null) { return newInstance(); @@ -172,14 +172,14 @@ public class SessiondataDao { String aux = rcl.getSwfurl(); //FIXME TODO this need to be refactored ! - int init_pos = aux.indexOf("sid=") + 4; - int end_pos = init_pos + 32; - if (end_pos > aux.length()) { - end_pos = aux.length(); + int start = aux.indexOf("sid=") + 4; + int end = start + 32; + if (end > aux.length()) { + end = aux.length(); } - String SID = aux.substring(init_pos, end_pos); + String sid = aux.substring(start, end); - Sessiondata sData = check(SID); + Sessiondata sData = check(sid); if (sData != null) { em.remove(sData); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java index f71c885..0ddc944 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java @@ -34,7 +34,7 @@ import org.apache.openmeetings.util.OmException; //FIXME HACK to bypass cross project compilation public interface IUserManager { - Object registerUser(String login, String Userpass, String lastname, + Object registerUser(String login, String userpass, String lastname, String firstname, String email, Date age, String street, String additionalname, String fax, String zip, String country, String town, long languageId, String phone, boolean sendSMS, @@ -53,5 +53,5 @@ public interface IUserManager { User loginOAuth(Map<String, String> params, long serverId) throws IOException, NoSuchAlgorithmException; boolean kickById(String uid); - boolean kickUsersByRoomId(Long room_id); + boolean kickUsersByRoomId(Long roomId); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index 9d2cdb0..09d98e3 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -312,13 +312,13 @@ public class Admin { f = new File(file); } boolean includeFiles = !cmdl.hasOption("exclude-files"); - File backup_dir = new File(OmFileHelper.getUploadBackupDir(), String.valueOf(System.currentTimeMillis())); - backup_dir.mkdirs(); + File backupDir = new File(OmFileHelper.getUploadBackupDir(), String.valueOf(System.currentTimeMillis())); + backupDir.mkdirs(); BackupExport export = getApplicationContext().getBean(BackupExport.class); export.performExport(f, includeFiles, new ProgressHolder()); - FileUtils.deleteDirectory(backup_dir); - backup_dir.delete(); + FileUtils.deleteDirectory(backupDir); + backupDir.delete(); } break; case restore: http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java index 3a4b846..88c6ba8 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java @@ -380,11 +380,11 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { } } - synchronized public boolean isReadyToRecord() { + public synchronized boolean isReadyToRecord() { return readyToRecord; } - synchronized private void setReadyToRecord(boolean readyToRecord) { + private synchronized void setReadyToRecord(boolean readyToRecord) { this.readyToRecord = readyToRecord; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/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 1557d85..08c0d33 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 @@ -259,11 +259,11 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> { us.setResethash(UUID.randomUUID().toString()); us.setResetDate(new Date()); userDao.update(us, null); - String reset_link = appLink + "?hash=" + us.getResethash(); + String resetLink = appLink + "?hash=" + us.getResethash(); String email = us.getAddress().getEmail(); - String template = ResetPasswordTemplate.getEmail(reset_link); + String template = ResetPasswordTemplate.getEmail(resetLink); getBean(MailHandler.class).send(email, getString("517"), template); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java index a181685..f8fab51 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java @@ -170,8 +170,8 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> { } } - private static String removeMinified(String name_) { - String name = name_; + private static String removeMinified(String _name) { + String name = _name; int idxOfExtension = name.lastIndexOf('.'); if (idxOfExtension > -1) { String extension = name.substring(idxOfExtension); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java index 94da0dd..8dddd6a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java @@ -463,7 +463,7 @@ public class RoomSidebar extends Panel { tabs.reload(handler); } - private static abstract class OmTab implements ITab { + private abstract static class OmTab implements ITab { private static final long serialVersionUID = 1L; public abstract String getCssClass(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java index 425b33e..aef4e92 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java @@ -238,21 +238,21 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> { if (to.getAddress() != null) { String aLinkHTML = (isPrivate && to.getType() == Type.user) ? "<br/><br/>" + "<a href='" + getContactsLink() + "'>" + Application.getString("1302", to.getLanguageId()) + "</a><br/>" : ""; - String invitation_link = ""; + String invitationLink = ""; if (p.isBookedRoom()) { Invitation i = getBean(IInvitationManager.class).getInvitation(to, p.getRoom(), false, null, Valid.Period, owner, to.getLanguageId() , CalendarHelper.getDate(start.getModelObject(), to.getTimeZoneId()) , CalendarHelper.getDate(end.getModelObject(), to.getTimeZoneId()), null); - invitation_link = getInvitationLink(i, WebSession.get().getExtendedProperties().getBaseUrl()); + invitationLink = getInvitationLink(i, WebSession.get().getExtendedProperties().getBaseUrl()); - if (invitation_link == null) { - invitation_link = ""; + if (invitationLink == null) { + invitationLink = ""; } else { - invitation_link = "<br/>" // + invitationLink = "<br/>" // + Application.getString("503", to.getLanguageId()) - + "<br/><a href='" + invitation_link + + "<br/><a href='" + invitationLink + "'>" + Application.getString("504", to.getLanguageId()) + "</a><br/>"; } @@ -261,7 +261,7 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> { String subj = p.getSubject() == null ? "" : p.getSubject(); getBean(MailHandler.class).send(to.getAddress().getEmail(), Application.getString("1301", to.getLanguageId()) + subj, - (p.getMessage() == null ? "" : p.getMessage().replaceAll("\\<.*?>", "")) + aLinkHTML + invitation_link); + (p.getMessage() == null ? "" : p.getMessage().replaceAll("\\<.*?>", "")) + aLinkHTML + invitationLink); } } }
