summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2006-10-02 20:35:16 +0000
committerJoshua Colp <jcolp@digium.com>2006-10-02 20:35:16 +0000
commit3e4a081e1cdae046b37c16177f6ea5d57ae8c7fb (patch)
tree36ce0a530e136bda39dd9309722c188079822eb3 /res
parentfadd9e783170e6719ca08e160c3a83874cefaaee (diff)
Make callerid fields in Manager events more consistent. CallerIDNum for number and CallerIDName for name. (issue #7976 reported by suhler)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_features.c b/res/res_features.c
index 3947bb360..9b521453e 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -399,7 +399,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
"Channel: %s\r\n"
"From: %s\r\n"
"Timeout: %ld\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n",
pu->parkingexten, pu->chan->name, peer ? peer->name : "",
(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
@@ -1514,7 +1514,7 @@ static void post_manager_event(const char *s, char *parkingexten, struct ast_cha
manager_event(EVENT_FLAG_CALL, s,
"Exten: %s\r\n"
"Channel: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n\r\n",
parkingexten,
chan->name,
@@ -1768,7 +1768,7 @@ static int park_exec(struct ast_channel *chan, void *data)
"Exten: %s\r\n"
"Channel: %s\r\n"
"From: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n",
pu->parkingexten, pu->chan->name, chan->name,
S_OR(pu->chan->cid.cid_num, "<unknown>"),
@@ -1951,7 +1951,7 @@ static int manager_parking_status( struct mansession *s, struct message *m )
"Channel: %s\r\n"
"From: %s\r\n"
"Timeout: %ld\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"%s"
"\r\n",