You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/11/06 07:18:49 UTC
svn commit: r1712911 [7/16] - in /openmeetings/branches/3.1.x:
openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/
openmeetings-core/src/main/java/org/apa...
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java Fri Nov 6 06:18:44 2015
@@ -20,7 +20,6 @@ package org.apache.openmeetings.db.entit
import static org.apache.openmeetings.db.util.UserHelper.invalidPassword;
-import java.io.Serializable;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Date;
@@ -81,9 +80,9 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE u.user_id = :id"),
@NamedQuery(name = "getUsersByIds", query = "select c from User c where c.user_id IN :ids"),
@NamedQuery(name = "getUserByLogin", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.login = :login AND ((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"),
- @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.adresses.email = :email AND ((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"),
+ @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.address.email = :email AND ((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"),
@NamedQuery(name = "getUserByHash", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.resethash = :resethash"),
- @NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.adresses.email = :email AND u.type = :type AND u.ownerId = :ownerId"),
+ @NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.address.email = :email AND u.type = :type AND u.ownerId = :ownerId"),
@NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select count(c.user_id) from User c "
+ "where c.deleted = false " + "AND ("
+ "lower(c.login) LIKE :search "
@@ -99,12 +98,17 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "countNondeletedUsers", query = "SELECT COUNT(u) FROM User u WHERE u.deleted = false"),
@NamedQuery(name = "getUsersByOrganisationId", query = "SELECT u FROM User u WHERE u.deleted = false AND u.organisation_users.organisation.organisation_id = :organisation_id"),
@NamedQuery(name = "getExternalUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.externalUserId LIKE :externalId AND u.externalUserType LIKE :externalType"),
- @NamedQuery(name = "getUserByLoginOrEmail", query = "SELECT u from User u WHERE u.deleted = false AND u.type = :type AND (u.login = :userOrEmail OR u.adresses.email = :userOrEmail)")
+ @NamedQuery(name = "getUserByLoginOrEmail", query = "SELECT u from User u WHERE u.deleted = false AND u.type = :type AND (u.login = :userOrEmail OR u.address.email = :userOrEmail)")
})
@Table(name = "om_user")
@Root(name = "user")
-public class User implements Serializable, IDataProviderEntity {
+public class User implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
+ public static final int SALUTATION_MR_ID = 1;
+ public static final int SALUTATION_MS_ID = 2;
+ public static final int SALUTATION_MRS_ID = 3;
+ public static final int SALUTATION_DR_ID = 4;
+ public static final int SALUTATION_PROF_ID = 5;
@XmlType(namespace="org.apache.openmeetings.user.user.right")
public enum Right {
@@ -123,6 +127,52 @@ public class User implements Serializabl
, external
, contact
}
+ public enum Salutation {
+ mr(SALUTATION_MR_ID)
+ , ms(SALUTATION_MS_ID)
+ , mrs(SALUTATION_MRS_ID)
+ , dr(SALUTATION_DR_ID)
+ , prof(SALUTATION_PROF_ID);
+ private int id;
+
+ Salutation() {} //default;
+ Salutation(int id) {
+ this.id = id;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public static Salutation get(Long type) {
+ return get(type == null ? 1 : type.intValue());
+ }
+
+ public static Salutation get(Integer type) {
+ return get(type == null ? 1 : type.intValue());
+ }
+
+ public static Salutation get(int type) {
+ Salutation rt = Salutation.mr;
+ switch (type) {
+ case SALUTATION_MS_ID:
+ rt = Salutation.ms;
+ break;
+ case SALUTATION_MRS_ID:
+ rt = Salutation.mrs;
+ break;
+ case SALUTATION_DR_ID:
+ rt = Salutation.dr;
+ break;
+ case SALUTATION_PROF_ID:
+ rt = Salutation.prof;
+ break;
+ default:
+ //no-op
+ }
+ return rt;
+ }
+ }
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -194,10 +244,10 @@ public class User implements Serializabl
private String activatehash;
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
- @JoinColumn(name = "adresses_id", insertable = true, updatable = true)
+ @JoinColumn(name = "address_id", insertable = true, updatable = true)
@ForeignKey(enabled = true)
@Element(name = "address", required = false)
- private Address adresses;
+ private Address address;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumn(name = "user_id", insertable = true, updatable = true)
@@ -273,20 +323,20 @@ public class User implements Serializabl
@Element(data = true, required = false)
private Long domainId; // LDAP config id for LDAP, OAuth server id for OAuth
- public Long getUser_id() {
+ public Long getId() {
return user_id;
}
- public void setUser_id(Long user_id) {
- this.user_id = user_id;
+ public void setId(Long id) {
+ this.user_id = id;
}
- public Address getAdresses() {
- return adresses;
+ public Address getAddress() {
+ return address;
}
- public void setAdresses(Address adresses) {
- this.adresses = adresses;
+ public void setAddress(Address address) {
+ this.address = address;
}
public Date getAge() {
@@ -422,12 +472,12 @@ public class User implements Serializabl
this.pictureuri = pictureuri;
}
- public Long getLanguage_id() {
+ public Long getLanguageId() {
return language_id;
}
- public void setLanguage_id(Long language_id) {
- this.language_id = language_id;
+ public void setLanguageId(Long languageId) {
+ this.language_id = languageId;
}
public List<Organisation_Users> getOrganisation_users() {
@@ -459,20 +509,20 @@ public class User implements Serializabl
this.activatehash = activatehash;
}
- public String getExternalUserId() {
+ public String getExternalId() {
return externalUserId;
}
- public void setExternalUserId(String externalUserId) {
- this.externalUserId = externalUserId;
+ public void setExternalId(String externalId) {
+ this.externalUserId = externalId;
}
- public String getExternalUserType() {
+ public String getExternalType() {
return externalUserType;
}
- public void setExternalUserType(String externalUserType) {
- this.externalUserType = externalUserType;
+ public void setExternalType(String externalType) {
+ this.externalUserType = externalType;
}
public Sessiondata getSessionData() {
@@ -547,7 +597,7 @@ public class User implements Serializabl
}
public String getPhoneForSMS() {
- return getSendSMS() ? getAdresses().getPhone() : "";
+ return getSendSMS() ? getAddress().getPhone() : "";
}
public Type getType() {
@@ -587,7 +637,7 @@ public class User implements Serializabl
return "User [id=" + user_id + ", firstname=" + firstname
+ ", lastname=" + lastname + ", login=" + login
+ ", pictureuri=" + pictureuri + ", deleted=" + deleted
- + ", language_id=" + language_id + ", adresses=" + adresses
+ + ", language_id=" + language_id + ", address=" + address
+ ", externalId=" + externalUserId + ", externalType=" + externalUserType
+ ", type=" + type + "]";
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java Fri Nov 6 06:18:44 2015
@@ -45,7 +45,7 @@ public class AuthLevelUtil {
boolean result = hasAdminLevel(u.getRights());
if (!result && orgId != null) {
for (Organisation_Users ou : u.getOrganisation_users()) {
- if (orgId.equals(ou.getOrganisation().getOrganisation_id())) {
+ if (orgId.equals(ou.getOrganisation().getId())) {
if (Boolean.TRUE.equals(ou.getIsModerator())) {
result = true;
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java Fri Nov 6 06:18:44 2015
@@ -68,7 +68,7 @@ public class FormatHelper {
public static String formatUser(User u, boolean isHTMLEscape) {
String user = "";
if (u != null) {
- String email = u.getAdresses() == null ? "" : u.getAdresses().getEmail();
+ String email = u.getAddress() == null ? "" : u.getAddress().getEmail();
if (u.getFirstname() == null && u.getLastname() == null) {
user = email;
} else {
Propchange: openmeetings/branches/3.1.x/openmeetings-flash/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Nov 6 06:18:44 2015
@@ -1,4 +1,5 @@
target
+openlaszlo
.project
.classpath
.settings
Modified: openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml Fri Nov 6 06:18:44 2015
@@ -24,20 +24,20 @@
xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:artifact="antlib:org.apache.maven.artifact.ant"
>
- <property name="laszlo46.home" value="${basedir}/openlaszlo46" />
+ <property name="laszlo46.home" value="${openlaszlo}/openlaszlo46" />
<!-- LPS Properties -->
<property name="out.dir.swf" value="${dist.webapps.dir}/public" />
- <property name="flex.src.dir" value="${webcontent.base.dir}/flex" />
+ <property name="laszlo.as2.src.dir" value="${webcontent.base.dir}/swf" />
<property name="laszlo.as3.src.dir" value="${webcontent.base.dir}/swf10" />
<path id="laszlo46.lib">
<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
</path>
-
- <target name="client.only" depends="compile.flex, compile.laszlo.networktesting" unless="client-already-built">
+
+ <target name="client.only" depends="compile.laszlo.networktesting" unless="client-already-built">
<property name="client-already-built" value="true"/>
</target>
- <target name="client.debug.only" depends="compile.flex.debug,compile.laszlo.networktesting.debug" />
+ <target name="client.debug.only" depends="compile.laszlo.main.debug,compile.laszlo.networktesting.debug" />
<target name="-compile.flash" description="compile flash application">
<!-- commented for now
@@ -73,6 +73,59 @@
</antcall>
</target>
+ <target name="compile.laszlo.main.as3" depends="compile.laszlo.main.debug.as3">
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <param name="flash.classpath.ref" value="laszlo46.lib" />
+ <param name="flash.src.dir" value="${laszlo.as3.src.dir}" />
+ <param name="flash.lps.home" value="${laszlo46.home}" />
+ <param name="flash.runtime" value="swf11" />
+ <param name="flash.main.file" value="main.as3.lzx" />
+ <param name="flash.out.file" value="main.as3.swf11.swf" />
+ <param name="flash.debug" value="" />
+ </antcall>
+ </target>
+
+ <target name="compile.laszlo.main" depends="compile.laszlo.main.debug">
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <param name="flash.classpath.ref" value="laszlo.lib" />
+ <param name="flash.src.dir" value="${laszlo.src.dir}" />
+ <param name="flash.lps.home" value="${laszlo.home}" />
+ <param name="flash.runtime" value="swf8" />
+ <param name="flash.main.file" value="main.lzx" />
+ <param name="flash.out.file" value="main.swf8.swf" />
+ <param name="flash.debug" value="" />
+ </antcall>
+ </target>
+
+ <!--target name="compile.laszlo.main.debug" depends="-retrieve-openlaszlo"-->
+ <target name="compile.laszlo.main.debug" depends="-retrieve-openlaszlo46">
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <!--param name="flash.classpath.ref" value="laszlo.lib" /-->
+ <param name="flash.classpath.ref" value="laszlo46.lib" />
+ <!--param name="flash.src.dir" value="${laszlo.src.dir}" /-->
+ <param name="flash.src.dir" value="${laszlo.as2.src.dir}" />
+ <!--param name="flash.lps.home" value="${laszlo.home}" /-->
+ <param name="flash.lps.home" value="${laszlo46.home}" />
+ <!--param name="flash.runtime" value="swf8" /-->
+ <param name="flash.runtime" value="swf11" />
+ <param name="flash.main.file" value="main.lzx" />
+ <param name="flash.out.file" value="maindebug.swf8.swf" />
+ <param name="flash.debug" value="--debug" />
+ </antcall>
+ </target>
+
+ <target name="compile.laszlo.main.debug.as3" depends="-retrieve-openlaszlo46">
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <param name="flash.classpath.ref" value="laszlo46.lib" />
+ <param name="flash.src.dir" value="${laszlo.as3.src.dir}" />
+ <param name="flash.lps.home" value="${laszlo46.home}" />
+ <param name="flash.runtime" value="swf11" />
+ <param name="flash.main.file" value="main.as3.lzx" />
+ <param name="flash.out.file" value="maindebug.as3.swf11.swf" />
+ <param name="flash.debug" value="--debug" />
+ </antcall>
+ </target>
+
<target name="compile.laszlo.networktesting.debug" depends="-retrieve-openlaszlo46">
<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
<param name="flash.classpath.ref" value="laszlo46.lib" />
@@ -85,38 +138,6 @@
</antcall>
</target>
- <condition property="isWindows">
- <os family="windows" />
- </condition>
-
- <condition property="isUnix">
- <os family="unix" />
- </condition>
-
- <target name="if_windows" if="isWindows">
- <property name="mxmlc_bin" value="mxmlc.exe" />
- </target>
-
- <target name="if_unix" if="isUnix">
- <property name="mxmlc_bin" value="mxmlc" />
- </target>
-
- <target name="-compile.flex" description="compile flash application" depends="if_windows, if_unix">
- <exec dir="${flex.src.dir}" executable="${laszlo46.home}/WEB-INF/flexsdk/4.6.0/bin/${mxmlc_bin}">
- <arg value="main.mxml"/>
- <arg line="-output ${out.dir.swf}/main.swf"/>
- <env key="PLAYERGLOBAL_HOME" value="${laszlo46.home}/WEB-INF/flexsdk/4.6.0/frameworks/libs/player"/>
- </exec>
- </target>
-
- <target name="compile.flex" depends="compile.flex.debug">
- <antcall target="-compile.flex" inheritAll="true" inheritRefs="true"/>
- </target>
-
- <target name="compile.flex.debug" depends="-retrieve-openlaszlo46">
- <!--antcall target="-compile.flex" inheritAll="true" inheritRefs="true"/-->
- </target>
-
<target name="-availability-check" description="Check which libraries need to be retrieved">
<available file="${laszlo46.home}/WEB-INF/lib" type="dir" property="laszlo46.installed" />
</target>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/pom.xml?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/pom.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/pom.xml Fri Nov 6 06:18:44 2015
@@ -31,7 +31,6 @@
<description>TODO</description>
<properties>
<openlaszlo>${project.basedir}/openlaszlo</openlaszlo>
- <laszlo46.home>${openlaszlo}/openlaszlo46</laszlo46.home>
<out.dir.swf>${project.build.directory}</out.dir.swf>
<webcontent.base.dir>${project.basedir}/src/main</webcontent.base.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
@@ -81,6 +80,7 @@
<exportAntProperties>true</exportAntProperties>
<target>
<ant antfile="${basedir}/openlaszlo.xml" target="client.only"/>
+ <!-- ant antfile="${basedir}/openlaszlo.xml" target="client.debug.only"/-->
</target>
<skip>${om.quick.build}</skip>
</configuration>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx Fri Nov 6 06:18:44 2015
@@ -33,7 +33,6 @@
<include href="scrollbars/" />
<include href="text/" />
- <include href="omcharts/" />
<include href="button/" />
<include href="explorer/" />
<include href="panel/" />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/panelBoundBox.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/panelBoundBox.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/panelBoundBox.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/panelBoundBox.lzx Fri Nov 6 06:18:44 2015
@@ -63,17 +63,19 @@
targetObj.fill();
]]>
- </method>
+ </method>
+
+ <method name="linearTween" args="t, b, c, d">
+ return c*t/d + b;
+ </method>
<method name="drawDottedLine" args="targetObj,startx,starty,endx,endy,stroke,lineWidth">
<![CDATA[
//var drawObj = new lz.drawview(targetObj,{width:this.width,height:this.height});
//if ($debug) Debug.write("drawDottedLine: ",targetObj,startx,starty,endx,endy,stroke,lineWidth);
- Math.linearTween = function (t, b, c, d) {
- return c*t/d + b;
- };
//if($debug) Debug.write("drawDashLine: ",tObject);
+ var csx, csy;
var tx = endx;
var ty = endy;
var sx = startx;
@@ -84,8 +86,8 @@
var gap = false;
//if($debug) Debug.write("gap1: ",gap);
for (var i = 1; i<=steps; ++i) {
- var ctx = Math.linearTween(i, sx, tx-sx,steps); //equations by R.Penner!
- var cty = Math.linearTween(i, sy, ty-sy,steps);
+ var ctx = linearTween(i, sx, tx-sx,steps); //equations by R.Penner!
+ var cty = linearTween(i, sy, ty-sy,steps);
//if($debug) Debug.write("gap2: ",gap);
gap = !gap; //abwechselnd luecke/nichtluecke
if(!gap) {
@@ -97,7 +99,7 @@
targetObj.lineTo(ctx,cty);
targetObj.stroke();
}
- csx =ctx;
+ csx = ctx;
csy = cty;
}
]]>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/fileUpload.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/fileUpload.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/fileUpload.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/fileUpload.lzx Fri Nov 6 06:18:44 2015
@@ -21,6 +21,13 @@
<library>
<class name="fileUpload">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.net.FileReference;
+ </passthrough>
+ </when>
+ </switch>
<!-- Show all Documents in FileBrowser -->
<attribute name="isOnlyImage" value="false" type="boolean" />
@@ -43,22 +50,18 @@
<![CDATA[
this.fr = new flash.net.FileReference();
this.fr.onHTTPError = function(fr, httpError){
- var t = _root;
- if ($debug) t.Debug.write('onHTTPError function: ' + httpError);
+ if ($debug) Debug.write('onHTTPError function: ' + httpError);
new lz.errorPopup(canvas,{error:'Err2: '+httpError});
}
this.fr.onIOError = function(fr){
- var t = _root;
- if ($debug) t.Debug.write.write('onIOError function');
+ if ($debug) Debug.write.write('onIOError function');
new lz.errorPopup(canvas,{error:'onIOError invoked '});
}
function callbackFunction ( e ) {
- var t = _root;
- if ($debug) t.Debug.write( e.data );
+ if ($debug) Debug.write( e.data );
}
this.fr.onSecurityError = function(fr, errorString){
- var t = _root;
- if ($debug) t.Debug.write('onSecurityError function: ' + errorString);
+ if ($debug) Debug.write('onSecurityError function: ' + errorString);
new lz.errorPopup(canvas,{error:'Err2: '+errorString});
}
this.fr.addListener(invoker, callbackFunction);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Fri Nov 6 06:18:44 2015
@@ -538,10 +538,10 @@
var lName = value.lastname == null ? "" : value.lastname;
canvas.setAttribute('firstName', fName);
canvas.setAttribute('lastName', lName);
- canvas.setAttribute('mail', value.adresses.email);
+ canvas.setAttribute('mail', value.address.email);
if (canvas.isRemoteUser() && fName == '' && lName == '') {
- if ($debug) Debug.write("!!!!!!!!!!! Nickname HIB ", value.adresses.email);
+ if ($debug) Debug.write("!!!!!!!!!!! Nickname HIB ", value.address.email);
new lz.chooseNickName(canvas);
}
hib.userobject.firstname = fName;
@@ -596,10 +596,10 @@
canvas.directRoomObj = value;
canvas.thishib.loaderVar.close();
} else {
- canvas.setRoomValues(value.roomtype.roomtypes_id,value.rooms_id,value);
+ canvas.setRoomValues(value.type,value.rooms_id,value);
var r = value;
r.currentusers = ''; //this might be huge list
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name,"setRoomValues",[value.roomtype.roomtypes_id,value.rooms_id,r]);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name,"setRoomValues",[value.type,value.rooms_id,r]);
}
} else {
new lz.labelerrorPopup(canvas,{errorlabelid:1286});
@@ -728,30 +728,6 @@
} else {
if ($debug) Debug.warn("xmlcrm.getGeneralOptions empty!");
}
- parent.getUserSalutations.doCall();
- ]]>
- </handler>
- </netRemoteCallHib>
-
- <netRemoteCallHib name="setCurrentUserOrganization" funcname="xmlcrm.setCurrentUserOrganization">
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return hib.currentdomainObj.organisation_id;</method></netparam>
- <handler name="ondata" args="value">
- //Sessionmanagement.getInstance()
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("setCurrentUserOrganization: ",value);
- </handler>
- </netRemoteCallHib>
-
-
- <netRemoteCallHib name="getUserSalutations" funcname="userservice.getUserSalutations" >
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return parent.parent.userlang; </method></netparam>
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- //Debug.write("getUserSalutations ",value);
- canvas.salutationsInitValues = value;
- //check for password reset
if (canvas.wicketsid != null) {
parent.loginWicket.doCall();
} else {
@@ -771,8 +747,20 @@
}
}
}
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
+ <netRemoteCallHib name="setCurrentUserOrganization" funcname="xmlcrm.setCurrentUserOrganization">
+ <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return hib.currentdomainObj.organisation_id;</method></netparam>
+ <handler name="ondata" args="value">
+ //Sessionmanagement.getInstance()
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("setCurrentUserOrganization: ",value);
</handler>
- </netRemoteCallHib>
+ </netRemoteCallHib>
+
<netRemoteCallHib name="loginWicket" funcname="xmlcrm.loginWicket" >
<netparam><method name="getValue">return canvas.sessionId;</method></netparam>
@@ -828,6 +816,7 @@
</handler>
</netRemoteCallHib>
+ <!-- //TODO FIXME roomtype -->
<netRemoteCallHib name="getRoomTypes" funcname="conferenceservice.getRoomTypes" >
<netparam><method name="getValue">return canvas.sessionId;</method></netparam>
<handler name="ondata" args="value">
@@ -910,7 +899,7 @@
canvas._drawarea.onopenWhiteBoard.sendEvent();
if ($debug) Debug.write("room ",canvas.currentRoomObject);
- if ($debug) Debug.write("roomType_id ",canvas.currentRoomObject.roomtype.roomtypes_id);
+ if ($debug) Debug.write("roomType_id ",canvas.currentRoomObject.type);
if (canvas.currentRoomObject.roomtype.roomtypes_id != 3) {
//We do not show this warning when the roomtype is 3 (restricted)
@@ -1724,7 +1713,7 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="checkLzRecording" funcname="flvrecorderservice.checkLzRecording" >
+ <netRemoteCallHib name="checkLzRecording" funcname="recorderservice.checkLzRecording" >
<handler name="ondata" args="value">
if ($debug) Debug.write("checkLzRecording: ",value);
if (value != null) {
@@ -1830,20 +1819,6 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="closeRoom" funcname="xmlcrm.closeRoom">
- <attribute name="room_id" value="0" type="number" />
- <attribute name="isClosed" value="true" type="boolean" />
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return parent.room_id;</method></netparam>
- <netparam><method name="getValue">return parent.isClosed;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("closeRoom: ",value);
- ]]>
- </handler>
- </netRemoteCallHib>
-
<netRemoteCallHib name="clearChatContent" funcname="clearChatContent">
<handler name="ondata" args="value">
<![CDATA[
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/netRemoteCallHib.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/netRemoteCallHib.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/netRemoteCallHib.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/netRemoteCallHib.lzx Fri Nov 6 06:18:44 2015
@@ -29,13 +29,13 @@
<attribute name="registerObject" value="false" type="boolean" />
<!--- show Error Messages with normal Box -->
- <attribute name="activeErrorHandler" value="false" type="boolean" />
+ <attribute name="activeErrorHandler" value="false" type="boolean" />
<!--- show Error Messages with normal Box -->
- <attribute name="showLoading" value="true" type="boolean" />
+ <attribute name="showLoading" value="true" type="boolean" />
<!--- show Error Messages with Callback Box -->
- <attribute name="isCallBackHandler" value="false" type="boolean" />
+ <attribute name="isCallBackHandler" value="false" type="boolean" />
<handler name="oninit">
if (this.registerObject) this.parent.addViewToObserver(this);
@@ -43,7 +43,7 @@
<method name="doCall">
if (this.showLoading) canvas._loadingAll.showLoading();
//if($debug) Debug.write("netRemoteCallHib/doCall: [ " , this.funcname , " ]",this.parent);
- this.callRPC();
+ this.callRPC(null);
</method>
<event name="sendCallBack" />
@@ -69,8 +69,8 @@
if (this.activeErrorHandler) {
if (Number(value)<0){
- Debug.warn("Received Error ID: ",value);
- if (this.isCallBackHandler)
+ Debug.warn("Received Error ID: ",value);
+ if (this.isCallBackHandler)
{
var dlg = new lz.callbackRpcErrorDialog(canvas,{callBackObject:this,errorid:Number(value)});
lz.Focus.setFocus(dlg);
@@ -79,9 +79,9 @@
lz.Focus.setFocus(dlg);
}
}
- }
+ }
]]>
- </handler>
+ </handler>
</class>
</library>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx Fri Nov 6 06:18:44 2015
@@ -241,8 +241,6 @@ the LAST RoomClient Object that has been
<attribute name="isConference" value="false" type="boolean" />
-<attribute name="statesInitValues" value="null" />
-<attribute name="salutationsInitValues" value="null" />
<attribute name="roomTypesInitValues" value="null" />
<attribute name="stdTimeOffset" value="0" type="number" />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Fri Nov 6 06:18:44 2015
@@ -831,27 +831,6 @@
</method>
- <!-- country validation -->
- <method name="validateCountry" args="str">
- ////Debug.write("validateCountry: ",str);
- str = str.toLowerCase();
- <![CDATA[
- if (str.length!=0){
- var a = new Array();
- for (var i=0;i<canvas.statesInitValues.length;i++){
- var st = canvas.statesInitValues[i].name.toLowerCase();
- if (st.startsWith(str))a.push(canvas.statesInitValues[i]);
- //this.addItem(canvas.statesInitValues[i].name,canvas.statesInitValues[i].state_id);
- }
- return a;
- }
- ]]>
- </method>
-
- <method name="getCountryRecord" args="id">
- return canvas.statesInitValues[id];
- </method>
-
<handler name="onmousewheeldelta" reference="lz.Keys" args="d">
var obj = getCurrentMouseWheelObject();
////Debug.write("onmousewheeldelta 12: ",d,obj);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx Fri Nov 6 06:18:44 2015
@@ -300,14 +300,14 @@
if (this.dataobject!=null) {
if ( this.dataobject instanceof LzDataset ) {
- //Debug.write("onResult: ",this,value,dataobject);
+ //if ($debug) Debug.write("onResult: ",this,value,dataobject);
var element = LzDataElement.valueToElement(value);
this.dataobject.setData(element.childNodes);
} else if ( this.dataobject instanceof LzDataElement ) {
var element = LzDataElement.valueToElement(value);
this.dataobject.appendChild( element );
} else {
- Debug.warn("dataobject is not LzDataset or LzDataElement: ",this,this.dataobject,delegate);
+ //if ($debug) Debug.warn("dataobject is not LzDataset or LzDataElement: ",this,this.dataobject,delegate);
}
}
this.ondata.sendEvent(value);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx Fri Nov 6 06:18:44 2015
@@ -182,16 +182,21 @@
</view>
<!-- View for Navigation-bar and App-name -->
-<view name="_mainbgcontentNavi" x="0" y="0" clip="true"
- width="100%" height="${ canvas.naviHeight }" visibility="hidden">
+<view name="_mainbgcontentNavi" x="0" y="0" clip="true" width="100%" height="${ canvas.naviHeight }" visibility="hidden">
<image id="mainApplogo" visible="false" />
- <text id="mainBaseText" visible="false"
- fgcolor="${ canvas.fontColorHeader }" fontsize="20" fontstyle="bold">
+ <text id="mainBaseText" visible="false" fgcolor="${ canvas.fontColorHeader }" fontsize="20" fontstyle="bold">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.filters.DropShadowFilter;
+ </passthrough>
+ </when>
+ </switch>
<method name="setShadow" >
<![CDATA[
if (this.isinited && false){
this.normalMC = this.getDisplayObject();
- this.displacementMap = new flash.filters.DropShadowFilter();
+ this.displacementMap = new DropShadowFilter();
this.normalMC.filters = [this.displacementMap];
}
]]>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatMiniButton.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatMiniButton.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatMiniButton.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatMiniButton.lzx Fri Nov 6 06:18:44 2015
@@ -123,7 +123,7 @@
</method>
<method name="activateSynced">
- this.parent.sendActiveWindowSynced(this,win);
+ this.parent.sendActiveWindowSynced(this);
</method>
<view name="_minimizebtn_mo" width="${ parent.width-2 }" height="16"
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx Fri Nov 6 06:18:44 2015
@@ -68,25 +68,11 @@
} else {
parent.setProgress();
canvas.thishib.getTimeZones.doCall();
- parent.getUserSalutations.doCall();
}
]]>
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="getUserSalutations" funcname="userservice.getUserSalutations"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <netparam><method name="getValue"> return hib.userlang; </method></netparam>
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("getUserSalutations ",value);
- canvas.salutationsInitValues = value;
- parent.setProgress();
- parent.getRoomTypes.doCall();
- </handler>
- </netRemoteCallHib>
-
<netRemoteCallHib name="getRoomTypes" funcname="conferenceservice.getRoomTypes"
remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return canvas.sessionId;</method></netparam>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx Fri Nov 6 06:18:44 2015
@@ -117,7 +117,7 @@
parent.userlang = Number(this.userlang);
var invitee = canvas.thishib.currentInvitation.invitee;
- var email = invitee.adresses.email;
+ var email = invitee.address.email;
var fName = invitee.firstname == null ? "" : invitee.firstname;
var lName = invitee.lastname == null || invitee.lastname == "" ? email : invitee.lastname;
//if ($debug) Debug.write("!!!!!!!!!!! invitee :: ", invitee);
@@ -146,7 +146,6 @@
this.close();
//if (canvas.language == canvas.thishib.userlang && canvas.thishib.initlanguageLoaded) { TODO canvas.language seems to be dropped
if (canvas.language_id == canvas.thishib.userlang && canvas.thishib.initlanguageLoaded) {
- canvas.thishib.loaderVar.getUserSalutations.doCall();
} else {
canvas.thishib.loaderVar.getLanguageByIdAndMax.doCall();
}
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/library.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/library.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/library.lzx Fri Nov 6 06:18:44 2015
@@ -65,7 +65,6 @@
src="resources/arrow_undo.png" />
<include href="privatemessages/" />
- <include href="usercontacts/" />
<include href="viewUserProfile.lzx" />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/privatemessages/newPrivateMessage.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/privatemessages/newPrivateMessage.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/privatemessages/newPrivateMessage.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/privatemessages/newPrivateMessage.lzx Fri Nov 6 06:18:44 2015
@@ -41,7 +41,7 @@
if (this.userObject != null) {
var tString = this.userObject.firstname + ' ' + this.userObject.lastname + ' '
- + '<' + this.userObject.adresses.email + '>';
+ + '<' + this.userObject.address.email + '>';
this._to.sendUpdateText = false;
this._to.setAttribute("text",tString);
@@ -60,7 +60,7 @@
if($debug) Debug.write("[admin]userValueForm/getUserById: ",value.lastname);
parent.userObject = value;
var tString = value.firstname + ' ' + value.lastname + ' '
- + '<' + value.adresses.email + '>';
+ + '<' + value.address.email + '>';
parent._to.sendUpdateText = false;
parent._to.setAttribute("text",tString);
@@ -283,7 +283,7 @@
if (canvas.userContacts[i].contact.firstname.startsWith(tString)
|| canvas.userContacts[i].contact.lastname.startsWith(tString)
- || canvas.userContacts[i].contact.adresses.email.startsWith(tString) ) {
+ || canvas.userContacts[i].contact.address.email.startsWith(tString) ) {
tResultA.push(canvas.userContacts[i]);
@@ -296,7 +296,7 @@
for (var k=0;k<tResultA.length;k++) {
- this._list.addItem(tResultA[k].contact.firstname +' '+ tResultA[k].contact.lastname + ' <' + tResultA[k].contact.adresses.email + '>', tResultA[k].contact.firstname +' '+ tResultA[k].contact.lastname + ' <' + tResultA[k].contact.adresses.email + '>');
+ this._list.addItem(tResultA[k].contact.firstname +' '+ tResultA[k].contact.lastname + ' <' + tResultA[k].contact.address.email + '>', tResultA[k].contact.firstname +' '+ tResultA[k].contact.lastname + ' <' + tResultA[k].contact.address.email + '>');
}
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/viewUserProfile.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/viewUserProfile.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/viewUserProfile.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/viewUserProfile.lzx Fri Nov 6 06:18:44 2015
@@ -200,12 +200,12 @@
<method name="showUserContactData">
<![CDATA[
- var tString = canvas.getNotNullString(this.userObject.adresses.street) + " " + canvas.getNotNullString(this.userObject.adresses.additionalname) + "<br/>";
- tString += canvas.getNotNullString(this.userObject.adresses.zip) + " " + canvas.getNotNullString(this.userObject.adresses.town) + "<br/>";
- tString += canvas.getNotNullString(this.userObject.adresses.states.name) + "<br/><br/>";
- tString += canvas.getNotNullString(this.userObject.adresses.email) + "<br/>";
- tString += canvas.getNotNullString(this.userObject.adresses.phone) + "<br/><br/>";
- tString += canvas.getNotNullString(this.userObject.adresses.comment) + "<br/>";
+ var tString = canvas.getNotNullString(this.userObject.address.street) + " " + canvas.getNotNullString(this.userObject.address.additionalname) + "<br/>";
+ tString += canvas.getNotNullString(this.userObject.address.zip) + " " + canvas.getNotNullString(this.userObject.address.town) + "<br/>";
+ tString += canvas.getNotNullString(this.userObject.address.state.name) + "<br/><br/>";
+ tString += canvas.getNotNullString(this.userObject.address.email) + "<br/>";
+ tString += canvas.getNotNullString(this.userObject.address.phone) + "<br/><br/>";
+ tString += canvas.getNotNullString(this.userObject.address.comment) + "<br/>";
this.userContactData.setAttribute("text",tString);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidBox.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidBox.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidBox.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidBox.lzx Fri Nov 6 06:18:44 2015
@@ -32,47 +32,16 @@ String.prototype.startsWith = function(p
]]>
</script>
-<attribute name="statesInitValues" value="null" />
-
<handler name="oninit">
<![CDATA[
var tChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
var tCharsSmall = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz";
- this.statesInitValues = new Array();
- var m = 0;
- while (m<20){
- for (var i = 0;i<26;i++){
- for (var r=0;r<3;r++){
- var t = new Array();
- t["state_id"] = i*r;
- t["name"] = tChars.charAt(i)+tCharsSmall.charAt(( Math.random()*100))+tCharsSmall.charAt(( Math.random()*100))+tCharsSmall.charAt(( Math.random()*100))+tCharsSmall.charAt(( Math.random()*100))+tCharsSmall.charAt(( Math.random()*100));
- this.statesInitValues.push(t);
- }
- }
- m++;
- }
- //Debug.write(this.statesInitValues);
-
this._validbox.addItem("Da","1");
this._validbox.selectItem("1",true);
]]>
</handler>
-<method name="validateCountry" args="str">
- //Debug.write("validateCountry: ",str);
- <![CDATA[
- if (str.length!=0){
- var a = new Array();
- for (var i=0;i<canvas.statesInitValues.length;i++){
- if (canvas.statesInitValues[i].name.startsWith(str))a.push(canvas.statesInitValues[i]);
- //this.addItem(canvas.statesInitValues[i].name,canvas.statesInitValues[i].state_id);
- }
- return a;
- }
- ]]>
-</method>
-
<include href="base/baseformitem.lzx" />
<include href="lz/list.lzx" />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidText.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidText.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidText.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidText.lzx Fri Nov 6 06:18:44 2015
@@ -34,47 +34,15 @@ String.prototype.startsWith = function(p
]]>
</script>
-<attribute name="statesInitValues" value="null" />
-
<handler name="oninit">
<![CDATA[
var tChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
var tCharsSmall = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz";
- this.statesInitValues = new Array();
- var m = 0;
- while (m<20){
- for (var i = 0;i<26;i++){
- for (var r=0;r<3;r++){
- var t = new Array();
- t["state_id"] = i*r;
- t["name"] = tChars.charAt(i)+tCharsSmall.charAt(( Math.random()*100))+tCharsSmall.charAt(( Math.random()*100))+tCharsSmall.charAt(( Math.random()*100))+tCharsSmall.charAt(( Math.random()*100))+tCharsSmall.charAt(( Math.random()*100));
- this.statesInitValues.push(t);
- }
- }
- m++;
- }
- //Debug.write(this.statesInitValues);
-
this._validbox.addAndSelectItem("Da","1");
]]>
</handler>
-<method name="validateCountry" args="str">
- //Debug.write("validateCountry: ",str);
- <![CDATA[
- if (str.length!=0){
- var a = new Array();
- for (var i=0;i<canvas.statesInitValues.length;i++){
- if (canvas.statesInitValues[i].name.startsWith(str))a.push(canvas.statesInitValues[i]);
- //this.addItem(canvas.statesInitValues[i].name,canvas.statesInitValues[i].state_id);
- }
- return a;
- }
- ]]>
-</method>
-
-
<class name="validText" extends="edittext">
<!--- The method to be called for validating -->
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/hibernate/netRemoteCallHib.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/hibernate/netRemoteCallHib.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/hibernate/netRemoteCallHib.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/hibernate/netRemoteCallHib.lzx Fri Nov 6 06:18:44 2015
@@ -29,17 +29,17 @@
<attribute name="registerObject" value="false" type="boolean" />
<!-- show Error Messages with normal Box -->
- <attribute name="activeErrorHandler" value="false" type="boolean" />
+ <attribute name="activeErrorHandler" value="false" type="boolean" />
<!-- show Error Messages with normal Box -->
- <attribute name="showLoading" value="true" type="boolean" />
+ <attribute name="showLoading" value="true" type="boolean" />
<!-- show Error Messages with Callback Box -->
- <attribute name="isCallBackHandler" value="false" type="boolean" />
+ <attribute name="isCallBackHandler" value="false" type="boolean" />
<handler name="oninit">
if (this.registerObject) this.parent.addViewToObserver(this);
- </handler>
+ </handler>
<method name="doCall">
//if (this.showLoading) canvas._loadingAll.setAttribute('visible',true);
//if($debug) Debug.write("netRemoteCallHib/doCall: [ " , this.funcname , " ]",this.parent);
@@ -69,8 +69,8 @@
if (this.activeErrorHandler) {
if (Number(value)<0){
- if ($debug) Debug.warn("Received Error ID: ",value);
- if (this.isCallBackHandler)
+ if ($debug) Debug.warn("Received Error ID: ",value);
+ if (this.isCallBackHandler)
{
//TODO: Fix error messages
@@ -78,9 +78,9 @@
//TODO: Fix error messages
}
}
- }
+ }
]]>
- </handler>
+ </handler>
</class>
</library>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/hibAdapter.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/hibAdapter.lzx?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/hibAdapter.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/hibAdapter.lzx Fri Nov 6 06:18:44 2015
@@ -39,7 +39,6 @@
client.hibAdapter_setLabelObjectByHundred = this.hibAdapter_setLabelObjectByHundred;
client.setRoomValues = this.setRoomValues;
- client.getRoomTypes = this.getRoomTypes;
client.disconnect = this.disconnect;
client.reconnectSuccess = this.reconnectSuccess;
//Test application to record 5 seconds
@@ -81,15 +80,11 @@
setLabelObjectByHundred(start,value);
</method>
- <method name="setRoomValues" args="roomtypes_id,rooms_id,value">
- if($debug) Debug.write("setRoomValues",roomtypes_id,rooms_id,value);
+ <method name="setRoomValues" args="roomtype,rooms_id,value">
+ if($debug) Debug.write("setRoomValues",roomtype,rooms_id,value);
canvas.currentRoomObject = value;
</method>
- <method name="getRoomTypes" args="value">
- canvas.roomTypesInitValues = value;
- </method>
-
<!--
Synces some of the variables from the SWF8 to the SWF10.
This also includes values for httphostlocal
Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java Fri Nov 6 06:18:44 2015
@@ -39,10 +39,10 @@ public class AppointmentConverter extend
}
public Appointment read(InputNode node) throws Exception {
- long oldId = getlongValue(node);
+ long oldId = getLong(node);
long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId;
- Appointment a = appointmentDao.getAppointmentByIdBackup(newId);
+ Appointment a = appointmentDao.getAny(newId);
return a == null ? new Appointment() : a;
}
Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java Fri Nov 6 06:18:44 2015
@@ -18,28 +18,20 @@
*/
package org.apache.openmeetings.backup;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
-public class AppointmentReminderTypeConverter extends OmConverter<AppointmentReminderTyps> {
- private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
-
+public class AppointmentReminderTypeConverter extends OmConverter<Reminder> {
public AppointmentReminderTypeConverter() {
- //default constructor is for export
- }
-
- public AppointmentReminderTypeConverter(AppointmentReminderTypDao appointmentReminderTypDaoImpl) {
- this.appointmentReminderTypDaoImpl = appointmentReminderTypDaoImpl;
}
- public AppointmentReminderTyps read(InputNode node) throws Exception {
- return appointmentReminderTypDaoImpl.get(getlongValue(node));
+ public Reminder read(InputNode node) throws Exception {
+ return Reminder.get(getInt(node));
}
- public void write(OutputNode node, AppointmentReminderTyps value) throws Exception {
+ public void write(OutputNode node, Reminder value) throws Exception {
node.setData(true);
- node.setValue(value == null ? "0" : "" + value.getTypId());
+ node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java Fri Nov 6 06:18:44 2015
@@ -43,7 +43,7 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
-import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
+import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.RoomOrganisationDao;
@@ -53,26 +53,24 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
-import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
-import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
+import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.ChatMessage;
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.room.PollType;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomPoll;
-import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.db.entity.user.State;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
+import org.apache.openmeetings.db.entity.user.User.Salutation;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
@@ -109,19 +107,19 @@ public class BackupExport {
@Autowired
private FileExplorerItemDao fileExplorerItemDao;
@Autowired
- private FlvRecordingDao flvRecordingDao;
+ private RecordingDao recordingDao;
@Autowired
- private UserDao usersDao;
+ private UserDao userDao;
@Autowired
private MeetingMemberDao meetingMemberDao;
@Autowired
private LdapConfigDao ldapConfigDao;
@Autowired
- private PrivateMessagesDao privateMessagesDao;
+ private PrivateMessageDao privateMessageDao;
@Autowired
private PrivateMessageFolderDao privateMessageFolderDao;
@Autowired
- private UserContactsDao userContactsDao;
+ private UserContactDao userContactDao;
@Autowired
private PollDao pollManager;
@Autowired
@@ -155,7 +153,7 @@ public class BackupExport {
/*
* ##################### Backup Users
*/
- exportUsers(backup_dir, usersDao.getAllBackupUsers());
+ exportUsers(backup_dir, userDao.getAllBackupUsers());
progressHolder.setProgress(10);
/*
@@ -167,7 +165,7 @@ public class BackupExport {
Serializer serializer = new Persister(strategy);
registry.bind(User.class, UserConverter.class);
- registry.bind(RoomType.class, RoomTypeConverter.class);
+ registry.bind(Room.Type.class, RoomTypeConverter.class);
writeList(serializer, backup_dir, "rooms.xml", "rooms", roomDao.get());
progressHolder.setProgress(15);
@@ -184,8 +182,7 @@ public class BackupExport {
registry.bind(Organisation.class, OrganisationConverter.class);
registry.bind(Room.class, RoomConverter.class);
- writeList(serializer, backup_dir, "rooms_organisation.xml",
- "room_organisations", roomOrganisationDao.get());
+ writeList(serializer, backup_dir, "rooms_organisation.xml", "room_organisations", roomOrganisationDao.get());
progressHolder.setProgress(20);
}
@@ -193,14 +190,13 @@ public class BackupExport {
* ##################### Backup Appointments
*/
{
- List<Appointment> list = appointmentDao.getAppointments();
+ List<Appointment> list = appointmentDao.get();
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
- registry.bind(AppointmentCategory.class, AppointmentCategoryConverter.class);
registry.bind(User.class, UserConverter.class);
- registry.bind(AppointmentReminderTyps.class, AppointmentReminderTypeConverter.class);
+ registry.bind(Appointment.Reminder.class, AppointmentReminderTypeConverter.class);
registry.bind(Room.class, RoomConverter.class);
if (list != null && list.size() > 0) {
registry.bind(list.get(0).getStart().getClass(), DateConverter.class);
@@ -252,7 +248,7 @@ public class BackupExport {
* ##################### Private Messages
*/
{
- List<PrivateMessage> list = privateMessagesDao.get(0, Integer.MAX_VALUE);
+ List<PrivateMessage> list = privateMessageDao.get(0, Integer.MAX_VALUE);
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
@@ -286,7 +282,7 @@ public class BackupExport {
registry.bind(User.class, UserConverter.class);
writeList(serializer, backup_dir, "userContacts.xml",
- "usercontacts", userContactsDao.get());
+ "usercontacts", userContactDao.get());
progressHolder.setProgress(60);
}
@@ -312,7 +308,7 @@ public class BackupExport {
* ##################### Recordings
*/
{
- List<FlvRecording> list = flvRecordingDao.getAllFlvRecordings();
+ List<Recording> list = recordingDao.get();
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
@@ -462,6 +458,7 @@ public class BackupExport {
registry.bind(Organisation.class, OrganisationConverter.class);
registry.bind(State.class, StateConverter.class);
+ registry.bind(Salutation.class, SalutationConverter.class);
if (list != null && list.size() > 0) {
Class<?> dateClass = list.get(0).getRegdate() != null ? list.get(0).getRegdate().getClass() : list.get(0).getStarttime().getClass();
registry.bind(dateClass, DateConverter.class);
@@ -483,11 +480,11 @@ public class BackupExport {
}
log.debug("sid: " + sid);
- Long users_id = sessiondataDao.checkSession(sid);
- Set<Right> rights = usersDao.get(users_id).getRights();
+ Long userId = sessiondataDao.checkSession(sid);
+ Set<Right> rights = userDao.get(userId).getRights();
- log.debug("users_id: " + users_id);
- log.debug("user_level: " + rights);
+ log.debug("userId: " + userId);
+ log.debug("user level: " + rights);
if (AuthLevelUtil.hasAdminLevel(rights)) {
// if (true) {