Changeset 4040

Timestamp:

06/09/07 10:58:16 (1 year ago)

Author:

p_lindheimer

Message:

make sure is always set to a valid value since feature codes depend on it being set to the real user, and not the masqueraded user

Files:

• freepbx/trunk/amp_conf/astetc/extensions.conf (modified) (1 diff)

freepbx/trunk/amp_conf/astetc/extensions.conf

@@ -917 +917 @@
-
-;sets the callerid of the device to that of the logged in user
+;
+; ${AMPUSER} is set upon return to the real user despite any aliasing that may
+; have been set as a result of the AMPUSER/<nnn>/cidnum field. This is used by
+; features like DND, CF, etc. to set the proper structure on aliased instructions
+;
-[macro-user-callerid]
-exten => s,1,Noop(user-callerid: ${CALLERID(name)} ${CALLERID(number)})
+
+; make sure AMPUSER is set if it doesn't get set below
+;
+exten => s,n,Set(AMPUSER=${IF($["foo${AMPUSER}" = "foo"]?${CALLERID(number)}:${AMPUSER})})
-exten => s,n,GotoIf($["${CHANNEL:0:5}" = "Local"]?report) 
-exten => s,n,GotoIf($["${REALCALLERIDNUM:1:2}" != ""]?start)