Changeset 5866

Timestamp:

07/01/08 21:38:02 (2 months ago)

Author:

p_lindheimer

Message:

Added support for DND and Intercom hints in static and dynamic hints mode

Files:

• modules/branches/2.5/core/agi-bin/user_login_out.agi (modified) (2 diffs)
• modules/branches/2.5/core/functions.inc.php (modified) (2 diffs)
• modules/branches/2.5/core/module.xml (modified) (1 diff)
• modules/branches/2.5/core/sounds (added)
• modules/branches/2.5/core/sounds/featurecode.sln (added)

modules/branches/2.5/core/agi-bin/user_login_out.agi

@@ -30 +30 @@
-        $ampmgrpass   = get_var( "AMPMGRPASS" );
-        $astspooldir  = get_var( "ASTSPOOLDIR" );
+        $ast_version  = get_var("ASTVERSION");
+        $dnd_devstate = get_var( "DNDDEVSTATE" ) == "TRUE" ? true : false;
+        $intercom_code = get_var( "INTERCOMCODE" );
+
+        $ast_version14 = version_compare($ast_vversion, "1.4", "ge");
+
-        /*
-        $ampmgruser  = 'admin';
@@ -179 +185 @@
-                global $astman;
-                global $agi;
+                global $dnd_devstate;
+                global $intercom_code;
+                global $ast_version14;
+
+                // If Asterisk version >= 1.4, syntax change is 'dialplan add extension ...' vs. 'add extension ...'
+                $dp_pre = ($ast_version14) ? 'dialplan ' : '';
-
-                if ($devices) {
-                        $dial_string = get_dial_string($devices);
+                        if ($dnd_devstate) {
+                                $dial_string .= "&Custom:DND$user";
+                        }
-                        debug("Setting user $user hint to $dial_string",5);
-
+
+
+
+
-                } else {
-                        debug("Removing hint for user $user",5);
-
+
+
+
+
-                }
-        }

modules/branches/2.5/core/functions.inc.php

@@ -936 +936 @@
-                        // which require "execincludes=yes" to be set in the [options] section of asterisk.conf
-                        //
+
+                        $fcc = new featurecode('paging', 'intercom-prefix');
+                        $intercom_code = $fcc->getCodeActive();
+                        unset($fcc);
+
+                        $intercom_code = ($intercom_code == '') ? 'nointercom' : $intercom_code;
+
+                        // Pass the code so agi scripts like user_login_logout know to generate hints
+                        //
+                        $ext->addGlobal('INTERCOMCODE',$intercom_code);
+
-                        if ($amp_conf['DYNAMICHINTS']) {
-
+
+
+
+
+
+
-                        }
-                        $userlist = core_users_list();
@@ -966 +982 @@
-                                        if (!$amp_conf['DYNAMICHINTS']) {
-                                                $hint = core_hint_get($exten['extension']);
+                                                $dnd_string = ($amp_conf['USEDEVSTATE'] && function_exists('donotdisturb_get_config')) ? "&Custom:DND".$exten['extension'] : '';
-                                                if (!empty($hint)) {
-
+
+
+
+
+
+
+
+
+
-                                                }
-                                        }

modules/branches/2.5/core/module.xml

@@ -8 +8 @@
-        <canuninstall>no</canuninstall>
-        <changelog>
+                *2.5.0.0* Added support for DND and Intercom hints in static and dynamic hints mode
-                *2.4.0.4* #2857, #2848, #2791, #2449
-                *2.4.0.3* #2851 forwarded/followme/ringgroup calls originating from outside fail