From: Ben Klang <ben@alkaloid.net>
Date: Sun, 20 Dec 2009 22:47:51 +0000 (+0000)
Subject: Clean up formatting, fix bugs in nested tags.  Add ability to specify a different... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4f0812d8e6e654b33245ccc52ec3706bd7c18cad;p=horde.git

Clean up formatting, fix bugs in nested tags.  Add ability to specify a different driver for Devices vs. Extensions.


git-svn-id: https://svn.alkaloid.net/gpl/shout/trunk@495 06cd67b6-e706-0410-b29e-9de616bca6e9
---

diff --git a/config/conf.xml b/config/conf.xml
index 4ba17f0ce..ed5dbebb8 100644
--- a/config/conf.xml
+++ b/config/conf.xml
@@ -1,16 +1,39 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <configuration>
-  <configtab name="devices" desc="VoIP Devices">
-    <configsection name="storage">
-      <configheader>Device Storage</configheader>
-      <configswitch name="driver" desc="What backend should we use for
-        storing Asterisk phone user configuration?">ldap
-        <case name="ldap" desc="LDAP">
-          <configldap name="params" />
-        </case>
-      </configswitch>
-    </configsection>
-  </configtab>
+ <configtab name="extensions" desc="Extensions">
+  <configsection name="extensions">
+   <configheader>Extension Storage</configheader>
+   <configswitch name="driver" desc="What backend should we use for storing Asterisk phone user configuration?">ldap
+    <case name="ldap" desc="LDAP">
+     <configsection name="params">
+      <configldap switchname="extensionsdriver" />
+     </configsection>
+    </case>
+    <case name="sql" desc="SQL">
+     <configsection name="params">
+      <configsql switchname="extensionsdriver" />
+     </configsection>
+    </case>
+   </configswitch>
+  </configsection>
+ </configtab>
+ <configtab name="devices" desc="VoIP Devices">
+  <configsection name="storage">
+   <configheader>Device Storage</configheader>
+   <configswitch name="driver" desc="What backend should we use for storing Asterisk phone user configuration?">ldap
+    <case name="ldap" desc="LDAP">
+     <configsection name="params">
+      <configldap switchname="devicesdriver" />
+     </configsection>
+    </case>
+    <case name="sql" desc="SQL">
+     <configsection name="params">
+      <configsql switchname="devicesdriver" />
+     </configsection>
+    </case>
+   </configswitch>
+  </configsection>
+ </configtab>
 </configuration>