Revision: 3924
Author: seba.wagner
Date: Fri Jul 1 05:58:20 2011
Log: Fix: Show confirmation on delete at current slide + remove
references to old LDAP Config param
http://code.google.com/p/openmeetings/source/detail?r=3924
Modified:
/trunk/singlewebapp/WebContent/languages/arabic.xml
/trunk/singlewebapp/WebContent/languages/bulgarian.xml
/trunk/singlewebapp/WebContent/languages/catalan.xml
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
/trunk/singlewebapp/WebContent/languages/czech.xml
/trunk/singlewebapp/WebContent/languages/danish.xml
/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/languages/dutch.xml
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/WebContent/languages/finnish.xml
/trunk/singlewebapp/WebContent/languages/french.xml
/trunk/singlewebapp/WebContent/languages/galician.xml
/trunk/singlewebapp/WebContent/languages/greek.xml
/trunk/singlewebapp/WebContent/languages/hebrew.xml
/trunk/singlewebapp/WebContent/languages/hungarian.xml
/trunk/singlewebapp/WebContent/languages/indonesian.xml
/trunk/singlewebapp/WebContent/languages/italian.xml
/trunk/singlewebapp/WebContent/languages/japanese.xml
/trunk/singlewebapp/WebContent/languages/korean.xml
/trunk/singlewebapp/WebContent/languages/persian.xml
/trunk/singlewebapp/WebContent/languages/polish.xml
/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
/trunk/singlewebapp/WebContent/languages/portugues.xml
/trunk/singlewebapp/WebContent/languages/russian.xml
/trunk/singlewebapp/WebContent/languages/slovak.xml
/trunk/singlewebapp/WebContent/languages/spanish.xml
/trunk/singlewebapp/WebContent/languages/swedish.xml
/trunk/singlewebapp/WebContent/languages/thai.xml
/trunk/singlewebapp/WebContent/languages/turkish.xml
/trunk/singlewebapp/WebContent/languages/ukrainian.xml
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
/trunk/singlewebapp/src/templates/install_step1_EN.vm
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Fri Jul 1 05:58:20
2011
@@ -4081,4 +4081,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Fri Jul 1
05:58:20 2011
@@ -4079,4 +4079,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Thu Jun
30 11:57:15 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Fri
Jul 1 05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>播放视频</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Fri
Jun 24 08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Fri
Jul 1 05:58:20 2011
@@ -4086,4 +4086,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Fri Jul 1 05:58:20
2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/danish.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/danish.xml Fri Jul 1 05:58:20
2011
@@ -4079,4 +4079,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Fri Jun
24 08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Fri Jul
1 05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Fri Jul 1 05:58:20
2011
@@ -4079,4 +4079,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Sun Jun 26
09:30:36 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Fri Jul 1
05:58:20 2011
@@ -4079,4 +4079,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/french.xml Fri Jul 1 05:58:20
2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Fri Jul 1 05:58:20
2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Sun Jun 26 09:30:36
2011
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Fri Jul 1 05:58:20
2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Fri Jul 1 05:58:20
2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Fri Jul 1 05:58:20
2011
@@ -4154,4 +4154,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Fri Jun
24 08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Fri Jul
1 05:58:20 2011
@@ -4086,4 +4086,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Fri Jul 1
05:58:20 2011
@@ -4086,4 +4086,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/slovak.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/slovak.xml Fri Jul 1 05:58:20
2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Fri Jul 1
05:58:20 2011
@@ -4088,4 +4088,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Fri Jun 24 08:51:46
2011
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Fri Jul 1 05:58:20
2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Fri Jul 1
05:58:20 2011
@@ -4079,4 +4079,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Fri Jun 24
08:51:46 2011
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Fri Jul 1
05:58:20 2011
@@ -4080,4 +4080,7 @@
<string id="1358" name="fileExplorer">
<value>Play video</value>
</string>
+ <string id="1359" name="submenu">
+ <value>Do you really want to delete the content on the current
slide?</value>
+ </string>
</language>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
Mon Jun 13 07:52:13 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
Fri Jul 1 05:58:20 2011
@@ -86,6 +86,8 @@
<attribute name="hasprevious" value="false" type="boolean" />
<attribute name="hasenext" value="false" type="boolean" />
+ <attribute name="doClearAll" value="false" type="boolean" />
+ <attribute name="doClearSlide" value="false" type="boolean" />
<!-- For the dragging resizeing there is a bounding box -->
<attribute name="boundingIsActive" value="false" type="boolean" />
@@ -337,11 +339,18 @@
}
if (modi=='plainSlide'){
- this.clearSlideOnly();
+ this.doClearSlide = true;
+ this.doClearAll = false;
+ new
lz.confirmationSingle(canvas.main_content._content.inner,{
+ labelid:1339,labeliderror:1359,
+
refObj:this,showCheckBox:false});
+
this.setAttribute('drawmodus',previousModus);
} else if (modi=='plainConfirm'){
+ this.doClearSlide = false;
+ this.doClearAll = true;
new
lz.confirmationSingle(canvas.main_content._content.inner,{
- labelid:1326,labeliderror:1340,
+ labelid:1339,labeliderror:1340,
refObj:this,showCheckBox:false});
//this.clearAll();
//if ($debug) Debug.write("clearAll and RESET Modus
to",previousModus);
@@ -363,7 +372,11 @@
</method>
<method name="sendConfirmation" args="yesno" >
- this.clearAll();
+ if (this.doClearSlide) {
+ this.clearSlideOnly();
+ } else if (this.doClearAll) {
+ this.clearAll();
+ }
</method>
<method name="sendNoConfirmation" args="ref">
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sun Jun 19 01:09:07 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Fri Jul 1 05:58:20 2011
@@ -210,7 +210,7 @@
String default_lang_id, String swf_path, String im_path,
String url_feed, String url_feed2,
String sendEmailAtRegister, String
sendEmailWithVerficationCode,
- String default_export_font, String ldap_auth_path,
String screen_viewer,
+ String default_export_font, String screen_viewer,
String ffmpeg_path, String sox_path, String sip_enable, String
sip_realm,
String sip_port,
String sip_proxyname,
@@ -237,10 +237,6 @@
crypt_ClassName,
null,
"This Class is used for Authentification-Crypting. Be carefull what
you do here! If you change it while running previous Pass of users will not
be workign anymore! for more Information see
http://code.google.com/p/openmeetings/wiki/CustomCryptMechanism";);
- //"1"
- //Not needed anymore, see the LDAP Configuration in the Administration
section
-// Configurationmanagement.getInstance().addConfByKey(3,
-// "ldap_config_path", ldap_auth_path, null, "Absolute Path to a Ldap
Configration File(see example config)");
Configurationmanagement.getInstance().addConfByKey(3,
"screen_viewer", screen_viewer, null, "ScreenViewer Type(0==standard,
1== jrdesktop)");
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Mon Sep 27 11:10:38 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Fri Jul 1 05:58:20 2011
@@ -154,32 +154,6 @@
return true;
}
}
-
- /**
- * Ldap Login configured?
- */
-
//----------------------------------------------------------------------------------------
- public boolean isLdapConfigured(){
- log.debug("LdapLoginmanagement.isLdapConfigured");
-
- Configuration configVal =
Configurationmanagement.getInstance().getConfKey(3, "ldap_config_path");
-
- if(configVal == null){
- log.error("Error retrieving ConfigKey
ldap_config_path!");
- return false;
- }
-
- File tester = new File(configVal.getConf_value());
-
- if(!tester.isFile()){
- log.error("ConfigVal ldap_config_path not describes a valid File : " +
configVal);
- return false;
- }
-
- return true;
-
- }
-
//----------------------------------------------------------------------------------------
/**
* Retrieving LdapData from Config
@@ -188,14 +162,7 @@
public HashMap<String, String> getLdapConfigData(String
ldapConfigfileName) throws Exception{
log.debug("LdapLoginmanagement.getLdapConfigData");
- // Retrieving Path to Config
- //Configuration configVal =
Configurationmanagement.getInstance().getConfKey(3, "ldap_config_path");
-//
-// if(configVal == null){
-// log.error("Error retrieving ConfigKey
ldap_config_path!");
-// return null;
-// }
-//
+
// String path = configVal.getConf_value().trim();
String path = ScopeApplicationAdapter.webAppPath
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Tue Apr 26 02:03:59 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Fri Jul 1 05:58:20 2011
@@ -282,13 +282,8 @@
*/
public Object loginUser(String SID, String usernameOrEmail, String
Userpass, Boolean storePermanent, Long language_id, Long ldapConfigId){
- // Check, whether LDAP - Login is required(Configuration has key
ldap_config_path
boolean withLdap = false;
-// if(LdapLoginManagement.getInstance().isLdapConfigured()){
-// withLdap = true;
-// }
-
if (ldapConfigId > 0) {
withLdap = true;
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
Fri Oct 15 01:36:00 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
Fri Jul 1 05:58:20 2011
@@ -183,7 +183,6 @@
String sox_path =
httpServletRequest.getParameter("sox_path");
- String ldap_auth_path =
httpServletRequest.getParameter("ldap_config_path");
String screen_viewer =
httpServletRequest.getParameter("screen_viewer");
@@ -216,7 +215,7 @@
log.error("step 0+ start init with values. "+username+"
***** "+useremail+" "+orgname+" "+configdefault+" "+configreferer+" "+
configsmtp+" "+configmailuser+" "+configmailpass+" "+configdefaultLang
+ " " +
- swf_path+" "+im_path + " " +
ldap_auth_path + " " + screen_viewer);
+ swf_path+" "+im_path + " " +
screen_viewer);
String filePath =
getServletContext().getRealPath("/")+ImportInitvalues.languageFolderName;
@@ -231,7 +230,7 @@
ImportInitvalues.getInstance().loadConfiguration(crypt_ClassName,
configdefault, configsmtp, configsmtpport,
configreferer, configmailuser, configmailpass, mailusetls,
configdefaultLang,
swf_path, im_path, url_feed, url_feed2,
- sendEmailAtRegister, sendEmailWithVerficationCode,
default_export_font, ldap_auth_path, screen_viewer,
+ sendEmailAtRegister, sendEmailWithVerficationCode,
default_export_font, screen_viewer,
ffmpeg_path, sox_path,
sip_enable, sip_realm,
sip_port,
=======================================
--- /trunk/singlewebapp/src/templates/install_step1_EN.vm Tue Sep 21
11:11:24 2010
+++ /trunk/singlewebapp/src/templates/install_step1_EN.vm Fri Jul 1
05:58:20 2011
@@ -284,24 +284,6 @@
You can edit this value later BUT previous created Users and Sessions
might be not usable anymore<BR/>
</i></p>
- </fieldset>
-
- <fieldset id="LdapConf">
-
- <legend>Authentication Type</legend>
- <li>
- <label for="ldap_config_path">LDAP Config</label>
- <input name="ldap_config_path" id="ldap_config_path" size="27"
- type="text"
- title="Enter the absolute path to a valid ldap config (see
om_ldap.cfg within installation directory)"
- value="" />
- </li>
- <p><i>
- Entering a path pointing to a valid LDAP Configuration File
activates LDAP Authentification.<BR/>
- Keep empty, if you want to keep the standard auth method.<BR/>
- Admin users are always authenticated against local database, other
user have to enter a valid LDAP password.
- </i></p>
-
</fieldset>
<fieldset id="ScreenViewer">
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
