Changeset 2015

Timestamp:

06/03/06 18:17:53 (2 years ago)

Author:

qldrob

Message:

Merge 1.0.4 from 2.1

Files:

• modules/branches/2.2 (modified) (1 prop)
• modules/branches/2.2/manager/functions.inc.php (modified) (2 diffs)
• modules/branches/2.2/manager/module.xml (modified) (2 diffs)
• modules/branches/2.2/manager/page.manager.php (modified) (1 diff)

modules/branches/2.2/manager/functions.inc.php

@@ -34 +34 @@
-function manager_list() {
-        global $db;
-
+, secret
-        $res = $db->getAll($sql, DB_FETCHMODE_ASSOC);
-        if(DB::IsError($res)) {
@@ -122 +122 @@
-        $results = sql("INSERT INTO manager set name='$p_name' , secret='$p_secret' , deny='$p_deny' , permit='$p_permit' , `read`='$p_read' , `write`='$p_write'");
-}
+
+
+// Asterisk API Module hooking
+// Input:
+//   $p_manager = default selected user
+//   $dummy = unused
+// $viewing_itemid, $target_menuid
+function manager_hook_phpagiconf($viewing_itemid, $target_menuid) {
+        global $db;
+
+        switch($target_menuid) {
+                case 'phpagiconf':
+                        $sql = "SELECT asman_user FROM phpagiconf";
+                        $res = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+                        if(DB::IsError($res)) {
+                                return null;
+                        }
+                        $selectedmanager = $res['asman_user'];
+                break;
+        }
+        $output = "<tr><td><a href=\"#\" class=\"info\">"._("Choose Manager:")."<span>"._("Choose the user that PHPAGI will use to connect the Asterisk API.")."</span></a></td><td><select name=\"asmanager\">";
+        $selected = "";
+        $managers = manager_list();
+        foreach ($managers as $manager) {
+                ($manager['name'] === $selectedmanager) ? $selected="selected=\"selected\"" : $selected="";
+                $output .= "<option value=\"".$manager['name']."/".$manager['secret']."\" $selected>".$manager['name'];
+        }
+        $output .="</select></td></tr>";
+        return $output;
+}
+
-?>

modules/branches/2.2/manager/module.xml

@@ -2 +2 @@
-        <rawname>manager</rawname>
-        <name>Asterisk API</name>
-2
+4
-        <type>tool</type>
-        <category>Basic</category>
@@ -8 +8 @@
-                <manager>Asterisk API</manager>
-        </menuitems>
-2
+4
-        <info>http://aussievoip.com.au/wiki/freePBX-ManagerAPI</info>
-329adfc7595494f5340914969512369
+f5945ce1c27377c6b6c1e175c077528
-</module>

modules/branches/2.2/manager/page.manager.php

@@ -96 +96 @@
-        <tr>
-                <td><a href="#" class="info"><?php echo _("deny:")?><span><?php echo _("If you want to deny many hosts or networks, use & char as separator.<br/><br/>Example: 192.168.1.0/255.255.255.0&10.0.0.0/255.0.0.0")?></span></a></td>
-3
+5
-        </tr>
-        <tr>
-                <td><a href="#" class="info"><?php echo _("permit:")?><span><?php echo _("If you want to permit many hosts or networks, use & char as separator. Look at deny example.")?></span></a></td>
-3
+5
-        </tr>
-        <tr>