Broke out applications and args. Beginning work on +/- functionality

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

diff --git a/andrew.webprj b/andrew.webprj
index fdd45f6..c5128ec 100644 (file)
--- a/andrew.webprj
+++ b/andrew.webprj
@@ -1,53 +1,53 @@
 <!DOCTYPE webproject>
 <webproject>
-  <project usePreviewPrefix="0" previewPrefix="" type="Local" usePersistentBookmarks="0" name="Shout" encoding="iso 8859-1" enableEvents="true" >
+  <project usePreviewPrefix="0" type="Local" previewPrefix="" usePersistentBookmarks="0" name="Shout" encoding="iso 8859-1" enableEvents="true" >
     <upload/>
     <defaultDTD>-//w3c//dtd xhtml 1.0 strict//en</defaultDTD>
     <item url="config/" uploadstatus="1" />
     <item modified_time="1120073766" url="config/conf.xml" uploadstatus="1" />
     <item url="dialplan/" uploadstatus="1" />
-    <item modified_time="1130716381" url="dialplan/edit.php" uploadstatus="1" />
+    <item modified_time="1130769960" url="dialplan/edit.php" uploadstatus="1" />
     <item url="lib/" uploadstatus="1" />
     <item url="lib/Driver/" uploadstatus="1" />
-    <item modified_time="1131310877" url="lib/Driver/ldap.php" uploadstatus="1" />
-    <item modified_time="1130704853" url="lib/base.php" uploadstatus="1" />
+    <item modified_time="1131599873" url="lib/Driver/ldap.php" uploadstatus="1" />
+    <item modified_time="1131497449" url="lib/base.php" uploadstatus="1" />
     <item modified_time="1121689003" url="lib/Dialplan.php" uploadstatus="1" />
-    <item modified_time="1130762080" url="lib/Driver.php" uploadstatus="1" />
-    <item modified_time="1131265696" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1130769960" url="lib/Driver.php" uploadstatus="1" />
+    <item modified_time="1131593364" url="lib/Shout.php" uploadstatus="1" />
     <item modified_time="1121689003" url="lib/System.php" uploadstatus="1" />
-    <item modified_time="1130724077" url="lib/User.php" uploadstatus="1" />
+    <item modified_time="1130769961" url="lib/User.php" uploadstatus="1" />
     <item url="main/" uploadstatus="1" />
-    <item modified_time="1131267622" url="main/dialplan.php" uploadstatus="1" />
+    <item modified_time="1131593241" url="main/dialplan.php" uploadstatus="1" />
     <item modified_time="1121401845" url="main/moh.php" uploadstatus="1" />
-    <item modified_time="1130716385" url="main/system.php" uploadstatus="1" />
+    <item modified_time="1130769962" url="main/system.php" uploadstatus="1" />
     <item modified_time="1121689003" url="main/users.php" uploadstatus="1" />
     <item url="templates/" uploadstatus="1" />
     <item url="templates/context/" uploadstatus="1" />
     <item modified_time="1120175005" url="templates/context/contextline.inc" uploadstatus="1" />
     <item url="templates/dialplan/" uploadstatus="1" />
-    <item modified_time="1131256680" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
+    <item modified_time="1131593241" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
     <item modified_time="1121689030" url="templates/dialplan/priority-form-begin.inc" uploadstatus="1" />
     <item modified_time="1121689030" url="templates/dialplan/priority-form-end.inc" uploadstatus="1" />
     <item modified_time="1121689030" url="templates/dialplan/priority-form-line.inc" uploadstatus="1" />
     <item url="templates/users/" uploadstatus="1" />
-    <item modified_time="1131254217" url="templates/users/userlist.inc" uploadstatus="1" />
-    <item modified_time="1131253175" url="templates/common-header.inc" uploadstatus="1" />
+    <item modified_time="1131594877" url="templates/users/userlist.inc" uploadstatus="1" />
+    <item modified_time="1120174958" url="templates/common-header.inc" uploadstatus="1" />
     <item modified_time="1120073766" url="templates/content_page" uploadstatus="1" />
-    <item modified_time="1131408261" url="templates/menu.inc" uploadstatus="1" />
+    <item modified_time="1131593241" url="templates/menu.inc" uploadstatus="1" />
     <item modified_time="1121578596" url="templates/table-limiter-begin.inc" uploadstatus="1" />
     <item modified_time="1121578596" url="templates/table-limiter-end.inc" uploadstatus="1" />
     <item url="themes/" uploadstatus="1" />
     <item url="themes/graphics/" uploadstatus="1" />
     <item modified_time="1121581526" url="themes/graphics/add-extension.gif" uploadstatus="1" />
-    <item modified_time="1131068895" url="themes/graphics/add-user.gif" uploadstatus="1" />
-    <item modified_time="1131430274" url="themes/screen.css" uploadstatus="1" />
+    <item modified_time="1130861777" url="themes/graphics/add-user.gif" uploadstatus="1" />
+    <item modified_time="1131593241" url="themes/screen.css" uploadstatus="1" />
     <item url="users/" uploadstatus="1" />
     <item modified_time="1122704539" url="users/add.php" uploadstatus="1" />
     <item modified_time="1122704539" url="users/delete.php" uploadstatus="1" />
-    <item modified_time="1130716394" url="users/edit.php" uploadstatus="1" />
-    <item modified_time="1130724223" url="users/save.php" uploadstatus="1" />
-    <item modified_time="1131068894" url="dialplan.php" uploadstatus="1" />
-    <item modified_time="1131254692" url="index.php" uploadstatus="1" />
+    <item modified_time="1130769962" url="users/edit.php" uploadstatus="1" />
+    <item modified_time="1130769962" url="users/save.php" uploadstatus="1" />
+    <item modified_time="1131044239" url="dialplan.php" uploadstatus="1" />
+    <item modified_time="1131593241" url="index.php" uploadstatus="1" />
     <item modified_time="1122704475" url="users.php" uploadstatus="1" />
     <item url="" uploadstatus="1" />
     <uploadprofiles showtreeviews="true" defaultProfile="Shout" >
@@ -55,60 +55,60 @@
       <profile remote_host="picasso.v-office.biz" remote_port="22" remote_path="/srv/vhost/users/alkaloid/sites/intranet.v-office.biz/shout" remote_protocol="sftp" user="alkaloid" name="Shout" >
         <uploadeditem upload_time="0" url="config/" />
         <uploadeditem upload_time="1120073766" url="config/conf.xml" />
-        <uploadeditem upload_time="1131068894" url="dialplan.php" />
+        <uploadeditem upload_time="1131044239" url="dialplan.php" />
         <uploadeditem upload_time="0" url="dialplan/" />
-        <uploadeditem upload_time="1130716381" url="dialplan/edit.php" />
-        <uploadeditem upload_time="1131254692" url="index.php" />
+        <uploadeditem upload_time="1130769960" url="dialplan/edit.php" />
+        <uploadeditem upload_time="1131593241" url="index.php" />
         <uploadeditem upload_time="0" url="lib/" />
         <uploadeditem upload_time="1121689003" url="lib/Dialplan.php" />
-        <uploadeditem upload_time="1130762080" url="lib/Driver.php" />
+        <uploadeditem upload_time="1130769960" url="lib/Driver.php" />
         <uploadeditem upload_time="0" url="lib/Driver/" />
-        <uploadeditem upload_time="1131310877" url="lib/Driver/ldap.php" />
-        <uploadeditem upload_time="1131265696" url="lib/Shout.php" />
+        <uploadeditem upload_time="1131599873" url="lib/Driver/ldap.php" />
+        <uploadeditem upload_time="1131593364" url="lib/Shout.php" />
         <uploadeditem upload_time="1121689003" url="lib/System.php" />
-        <uploadeditem upload_time="1130724077" url="lib/User.php" />
-        <uploadeditem upload_time="1131068895" url="lib/api.php" />
-        <uploadeditem upload_time="1130704853" url="lib/base.php" />
-        <uploadeditem upload_time="1131068895" url="lib/defines.php" />
+        <uploadeditem upload_time="1130769961" url="lib/User.php" />
+        <uploadeditem upload_time="1131600576" url="lib/api.php" />
+        <uploadeditem upload_time="1131497449" url="lib/base.php" />
+        <uploadeditem upload_time="1131045729" url="lib/defines.php" />
         <uploadeditem upload_time="0" url="main/" />
-        <uploadeditem upload_time="1131267622" url="main/dialplan.php" />
+        <uploadeditem upload_time="1131593241" url="main/dialplan.php" />
         <uploadeditem upload_time="1121401845" url="main/moh.php" />
-        <uploadeditem upload_time="1130716385" url="main/system.php" />
+        <uploadeditem upload_time="1130769962" url="main/system.php" />
         <uploadeditem upload_time="1121689003" url="main/users.php" />
+        <uploadeditem upload_time="1131497712" url="security.php" />
         <uploadeditem upload_time="0" url="templates/" />
-        <uploadeditem upload_time="1131253200" url="templates/common-footer.inc" />
-        <uploadeditem upload_time="1131253175" url="templates/common-header.inc" />
+        <uploadeditem upload_time="1120174958" url="templates/common-header.inc" />
         <uploadeditem upload_time="1120073766" url="templates/content_page" />
         <uploadeditem upload_time="0" url="templates/context/" />
         <uploadeditem upload_time="1120175005" url="templates/context/contextline.inc" />
         <uploadeditem upload_time="0" url="templates/dialplan/" />
-        <uploadeditem upload_time="1131429808" url="templates/dialplan/contexttree.inc" />
-        <uploadeditem upload_time="1131256680" url="templates/dialplan/dialplanlist.inc" />
-        <uploadeditem upload_time="1131430269" url="templates/dialplan/extensiondetail.inc" />
+        <uploadeditem upload_time="1131600075" url="templates/dialplan/contexttree.inc" />
+        <uploadeditem upload_time="1131593241" url="templates/dialplan/dialplanlist.inc" />
+        <uploadeditem upload_time="1131598909" url="templates/dialplan/extensiondetail.inc" />
         <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-begin.inc" />
         <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-end.inc" />
         <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-line.inc" />
-        <uploadeditem upload_time="1131408261" url="templates/menu.inc" />
+        <uploadeditem upload_time="1131593241" url="templates/menu.inc" />
         <uploadeditem upload_time="1121578596" url="templates/table-limiter-begin.inc" />
         <uploadeditem upload_time="1121578596" url="templates/table-limiter-end.inc" />
         <uploadeditem upload_time="0" url="templates/users/" />
-        <uploadeditem upload_time="1131254217" url="templates/users/userlist.inc" />
+        <uploadeditem upload_time="1131594877" url="templates/users/userlist.inc" />
         <uploadeditem upload_time="0" url="themes/" />
         <uploadeditem upload_time="0" url="themes/graphics/" />
         <uploadeditem upload_time="1121581526" url="themes/graphics/add-extension.gif" />
-        <uploadeditem upload_time="1131068895" url="themes/graphics/add-user.gif" />
-        <uploadeditem upload_time="1131430274" url="themes/screen.css" />
+        <uploadeditem upload_time="1130861777" url="themes/graphics/add-user.gif" />
+        <uploadeditem upload_time="1131593241" url="themes/screen.css" />
         <uploadeditem upload_time="1122704475" url="users.php" />
         <uploadeditem upload_time="0" url="users/" />
         <uploadeditem upload_time="1122704539" url="users/add.php" />
         <uploadeditem upload_time="1122704539" url="users/delete.php" />
-        <uploadeditem upload_time="1130716394" url="users/edit.php" />
-        <uploadeditem upload_time="1130724223" url="users/save.php" />
+        <uploadeditem upload_time="1130769962" url="users/edit.php" />
+        <uploadeditem upload_time="1130769962" url="users/save.php" />
       </profile>
     </uploadprofiles>
     <templates>templates/</templates>
     <toolbars>toolbars/</toolbars>
-    <item modified_time="1131068895" url="lib/api.php" uploadstatus="1" />
+    <item modified_time="1131600576" url="lib/api.php" uploadstatus="1" />
     <author>Ben Klang</author>
     <email>ben@alkaloid.net</email>
     <debuggerclient>No Debugger</debuggerclient>
@@ -119,10 +119,10 @@
       <mailinglist address="" />
     </teamdata>
     <events/>
-    <item modified_time="1131068895" url="lib/defines.php" uploadstatus="1" />
-    <item modified_time="1131429808" url="templates/dialplan/contexttree.inc" uploadstatus="1" />
-    <item modified_time="1131430269" url="templates/dialplan/extensiondetail.inc" uploadstatus="1" />
-    <item modified_time="1131253200" url="templates/common-footer.inc" uploadstatus="1" />
+    <item modified_time="1131045729" url="lib/defines.php" uploadstatus="1" />
+    <item modified_time="1131600075" url="templates/dialplan/contexttree.inc" uploadstatus="1" />
+    <item modified_time="1131598909" url="templates/dialplan/extensiondetail.inc" uploadstatus="1" />
+    <item modified_time="1131497712" url="security.php" uploadstatus="1" />
     <treestatus>
       <openfolder url="config" />
       <openfolder url="dialplan" />

diff --git a/lib/Driver/ldap.php b/lib/Driver/ldap.php
index b2c9168..0b73804 100644 (file)
--- a/lib/Driver/ldap.php
+++ b/lib/Driver/ldap.php
@@ -373,13 +373,24 @@ for $context"));
                     $token2++;
 
                     # Get Application and args
-                    $application = substr($line, $token2);
+                    $application = substr($line, $token2, $token3 - $token2);
 
-                    #$args = strpos($)
+                    if ($token3) {
+                        $application = substr($line, $token2, $token3 - $token2);
+                        $args = substr($line, $token3);
+                        $args = preg_replace('/^\(/', '', $args);
+                        $args = preg_replace('/\)$/', '', $args);
+                    } else {
+                        # This application must not have any args
+                        $application = substr($line, $token2);
+                        $args = '';
+                    }
 
                     # Merge all that data into the returning array
-                    $dialplans[$context]['extensions'][$extension][$priority] =
+                    $dialplans[$context]['extensions'][$extension][$priority]['application'] =
                         $application;
+                    $dialplans[$context]['extensions'][$extension][$priority]['args'] =
+                        $args;
                     $j++;
                 }
 

diff --git a/lib/api.php b/lib/api.php
index 484ab7a..2437a08 100644 (file)
--- a/lib/api.php
+++ b/lib/api.php
@@ -30,7 +30,7 @@ function _shout_perms()
     $perms['tree']['shout']['superadmin'] = false;
     $perms['title']['shout:superadmin'] = _("Super Administrator");
 
-    $contexts= $shout->getContexts();
+//     $contexts = $shout->getContexts();
 
     $perms['tree']['shout']['contexts'] = false;
     $perms['title']['shout:contexts'] = _("Contexts");

diff --git a/templates/dialplan/contexttree.inc b/templates/dialplan/contexttree.inc
index 6b40cc4..b957c40 100644 (file)
--- a/templates/dialplan/contexttree.inc
+++ b/templates/dialplan/contexttree.inc
@@ -34,13 +34,25 @@ function activatePriority(exten, prio)
 
 function deactivatePriority()
 {
-    if (curPrio) {
+    if (curPrio && document.getElementById('pButtons-'+curExten+'-'+curPrio)) {
         document.getElementById('pButtons-'+curExten+'-'+curPrio).className = 'pButtons';
         document.getElementById('pNumber-'+curExten+'-'+curPrio).className = 'pElement';
         document.getElementById('pApp-'+curExten+'-'+curPrio).className = 'pElement';
         document.getElementById('pArgs-'+curExten+'-'+curPrio).className = 'pElement';
     }
 }
+
+function addRow() {
+    if (!curExten || !curPrio) {
+        alert('No extension or priority selected.');
+    }
+
+    tmpPrio = curPrio + 1;
+    while(o = document.getElementById('pNumber-'+tmpexten+'-'+tmpPrio)) {
+
+        tmpPrio++;
+    }
+}
 -->
 </script>
 

diff --git a/templates/dialplan/extensiondetail.inc b/templates/dialplan/extensiondetail.inc
index 426273a..994c109 100644 (file)
--- a/templates/dialplan/extensiondetail.inc
+++ b/templates/dialplan/extensiondetail.inc
@@ -32,7 +32,7 @@ if(!isset($dialplan['extensions'])) {
                     id="<?php echo "pList-$extension"; ?>">
                     <?php
                     $p = 0;
-                    foreach($priorities as $priority => $application) {
+                    foreach($priorities as $priority => $data) {
                         ?>
                         <tr class="priority">
                             <td class="pButtons"
@@ -58,7 +58,8 @@ if(!isset($dialplan['extensions'])) {
                                     <select
                                         name="app[<?php echo $extension; ?>][<?php echo $priority; ?>]"
                                         id="app[<?php echo $extension; ?>][<?php echo $priority; ?>]">
-                                        <option value="APPID"><?php echo "APPLICATION"; ?></option>
+                                        <option value="<?php echo $data['application']; ?>">
+                                            <?php echo $data['application']; ?></option>
                                     </select>
                                 </span>
                             </td>
@@ -66,7 +67,7 @@ if(!isset($dialplan['extensions'])) {
                                 id="<?php echo "pArgs-$extension-$priority"; ?>"
                                 name="<?php echo "pArgs-$extension-$priority"; ?>">
                                 <span class="argBox">
-                                    <?php echo $application; ?>
+                                    <?php echo $data['args']; ?>
                                 </span>
                             </td>
                         </tr>

diff --git a/templates/users/userlist.inc b/templates/users/userlist.inc
index f5f6e7e..f81680c 100644 (file)
--- a/templates/users/userlist.inc
+++ b/templates/users/userlist.inc
@@ -1,9 +1,9 @@
-<div class="header">
-    <span class="contextHeader">Context: <?php echo $context; ?></span>
+<div class="header" style="text-align: right">
+    <span class="contextHeader" style="padding-right: 20px">Context: <?php echo $context; ?></span>
 </div>
 
 <div id="userlist">
-    <table cellspacing="0">
+    <table width="100%" cellspacing="0">
         <tr class="header">
             <td>Extension</td>
             <td>Name</td>