Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml (14760 => 14761)
--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml 2009-09-04 01:37:23 UTC (rev 14760)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml 2009-09-04 08:31:45 UTC (rev 14761)
@@ -13,7 +13,7 @@
<xml-odbc-do name="break-to" value="${section}"/>
</template>
- <template name="directory"> -->
+ <template name="directory">
<xml-odbc-do name="check-event-header" if-name="purpose">
<!-- catches purpose gateways and network-list (any more?) -->
<xml-odbc-do name="break-to" value="directory-${purpose}"/>
@@ -48,7 +48,7 @@
</document>
</template>
- <template name="not_found">
+ <template name="not-found">
<document type="freeswitch/xml">
<section name="result">
<result status="not found"/>
Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/directory-user.xml (14760 => 14761)
--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/directory-user.xml 2009-09-04 01:37:23 UTC (rev 14760)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/directory-user.xml 2009-09-04 08:31:45 UTC (rev 14761)
@@ -6,6 +6,7 @@
SELECT
dir_domains.id AS domain_id,
dir_users.id AS user_id,
+ dir_users.username,
dir_users.cidr,
dir_users.mailbox,
dir_users.`number-alias`
@@ -13,7 +14,7 @@
dir_domains,
dir_users
WHERE
- dir_users.${key} = '${user}' AND
+ dir_users.`${key}` = '${user}' AND
dir_domains.name = '${domain}' AND
dir_users.dir_domain_id = dir_domains.id AND
dir_users.enabled = '1';"/>
@@ -44,7 +45,7 @@
<groups>
<group name="default">
<users>
- <user id="${user}" mailbox="${mailbox}" cidr="${cidr}" number-alias="${number-alias}">
+ <user id="${username}" mailbox="${mailbox}" cidr="${cidr}" number-alias="${number-alias}">
<params>
<xml-odbc-do name="query" on-empty-result-break-to="not-found" value="
SELECT
@@ -80,7 +81,7 @@
dir_groups_users.dir_group_id = dir_groups.id AND
dir_user_id = '${user_id}';">
<group name="${group_name}">
- <user id="${user}" type="pointer"/>
+ <user id="${username}" type="pointer"/>
</group>
</xml-odbc-do>
</groups>