From d3487c4fdf9ab197d773038710bc66a853784808 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 25 Oct 2019 06:15:15 +0000
Subject: [PATCH] Added LDAP parameters to SecurityConfig_parameter.properties

git-svn-id: https://svn.libreccm.org/ccm/trunk@6280 8810af33-2d31-482b-a856-94f89814c4df
---
 .../freemarker/ccm-cms/content-item.ftl       | 25 ++++++++++++++++---
 .../SecurityConfig_parameter.properties       | 15 +++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl b/ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl
index 1efda5606..64f06fd2e 100644
--- a/ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl
+++ b/ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl
@@ -9,19 +9,19 @@
     <#return model["/bebop:page/cms:contentPanel/cms:item"]>
 </#function>
 
-<#--
+<#---
     Includes the template for the type of the provided content item 
     for the provided view and style. The paramters view and style are
     optional. If not provided the default value "detail" is used for 
     the view parameter.
 
-    @param {node} item The data model of the content item itself. There are 
+    @param item The data model of the content item itself. There are 
     several functions for extracting this provided by other modules.
 
-    @param {string} view View type to use. Either `detail` or `list`. Default 
+    @param view View type to use. Either `detail` or `list`. Default 
     value is `detail`.
 
-    @param {string} style Style to use. Styles allow it to use different 
+    @param style Style to use. Styles allow it to use different 
     templates for `detail` or `list` views depending on the context were the 
     content item is displayed.
 -->
@@ -44,6 +44,11 @@
     
 </#macro>
 
+<#---
+    Retrieve the title of a content item.
+
+    @param item The content item.
+#-->
 <#function getItemTitle item>
     <#if (item["./title"]?size > 0)>
         <#return item["./title"]>
@@ -54,6 +59,18 @@
     </#if>
 </#function>
 
+<#---
+    Get the title of the current page. This function tries several possible 
+    sources for the title of the current page and uses to first source found.
+
+    The possible sources are:
+
+    * The title of the primary content item. For items of the types
+      Glossary Item and FAQ Item special titles are used.
+    * If the title `AtoZ` is provided by Bebop the localized text 
+      `layout.page.title.atoz` used.
+    * If the title `Search` is provided by Bebop
+-->
 <#function getPageTitle useCategoryMenu='categoryMenu' useRootIndexItemTitle=false>
 
     <#if (model["/bebop:page//cms:contentPanel"]?size > 0)>
diff --git a/ccm-core/src/com/arsdigita/kernel/security/SecurityConfig_parameter.properties b/ccm-core/src/com/arsdigita/kernel/security/SecurityConfig_parameter.properties
index 91434ea77..2c91f1219 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/SecurityConfig_parameter.properties
+++ b/ccm-core/src/com/arsdigita/kernel/security/SecurityConfig_parameter.properties
@@ -28,6 +28,21 @@ waf.user_question_enable.purpose=Enable question if a user has forgotten its pas
 waf.user_question_enable.example=false
 waf.user_question_enable.format=true|false
 
+waf.ldap.connectionUrl.title=LDAP Connection URL
+waf.ldap.connectionUrl.purpose=URL of the LDAP Server to use
+waf.ldap.connectionUrl.example=ldap://ldap.example.org:389
+waf.ldap.connectionUrl.format=[string]
+
+waf.ldap.userBase.title=LDAP User Base
+waf.ldap.userBase.purpose=The root of user LDAP tree
+waf.ldap.userBase.example=ou=users,dc=example,dc=org
+waf.ldap.userBase.format=[string]
+
+waf.ldap.userSearch.title=LDAP User Search
+waf.ldap.userSearch.purpose=LDAP filter for finding the user. Must contain one placeholder for String.format.
+waf.ldap.userSearch.example=(mail=%s)
+waf.ldap.userSearch.format=[string]
+
 waf.enable_saml.title=Enable SAML
 waf.enable_saml.purpose=Enable authentication via SAML
 waf.enable_saml.example=false