[Asterisk-cvs] asterisk/apps app_setcidname.c, 1.6, 1.7 app_setcidnum.c, 1.7, 1.8 app_setrdnis.c, 1.2, 1.3

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv17164/apps

Modified Files:
	app_setcidname.c app_setcidnum.c app_setrdnis.c 
Log Message:
add dialplan functions for Caller ID, language and timeouts (bug #4219, with mods)


Index: app_setcidname.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_setcidname.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- app_setcidname.c	21 Apr 2005 06:02:43 -0000	1.6
+++ app_setcidname.c	15 May 2005 17:45:30 -0000	1.7
@@ -34,7 +34,9 @@
 "  SetCIDName(cname[|a]): Set Caller*ID Name on a call to a new\n"
 "value, while preserving the original Caller*ID number.  This is\n"
 "useful for providing additional information to the called\n"
-"party. Always returns 0\n";
+"party. Always returns 0\n"
+"SetCIDName has been deprecated in favor of the function\n"
+"CALLERID(name)\n";
 
 STANDARD_LOCAL_USER;
 
@@ -46,6 +48,13 @@
 	char tmp[256] = "";
 	struct localuser *u;
 	char *opt;
+	static int deprecation_warning = 0;
+
+	if (!deprecation_warning) {
+		ast_log(LOG_WARNING, "SetCIDName is deprecated, please use SetVar(CALLERID(name)=value) instead.\n");
+		deprecation_warning = 1;
+	}
+
 	if (data)
 		strncpy(tmp, (char *)data, sizeof(tmp) - 1);
 	opt = strchr(tmp, '|');

Index: app_setcidnum.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_setcidnum.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_setcidnum.c	21 Apr 2005 06:02:43 -0000	1.7
+++ app_setcidnum.c	15 May 2005 17:45:30 -0000	1.8
@@ -35,7 +35,9 @@
 "  SetCIDNum(cnum[|a]): Set Caller*ID Number on a call to a new\n"
 "value, while preserving the original Caller*ID name.  This is\n"
 "useful for providing additional information to the called\n"
-"party. Sets ANI as well if a flag is used.  Always returns 0\n";
+"party. Sets ANI as well if a flag is used.  Always returns 0\n"
+"SetCIDNum has been deprecated in favor of the function\n"
+"CALLERID(number)\n";
 
 STANDARD_LOCAL_USER;
 
@@ -48,6 +50,13 @@
 	char *opt;
 	int anitoo = 0;
 	char tmp[256];
+	static int deprecation_warning = 0;
+
+	if (!deprecation_warning) {
+		ast_log(LOG_WARNING, "SetCIDNum is deprecated, please use SetVar(CALLERID(number)=value) instead.\n");
+		deprecation_warning = 1;
+	}
+
 	if (data)
 		strncpy(tmp, (char *)data, sizeof(tmp) - 1);
 	opt = strchr(tmp, '|');

Index: app_setrdnis.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_setrdnis.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- app_setrdnis.c	21 Apr 2005 06:02:43 -0000	1.2
+++ app_setrdnis.c	15 May 2005 17:45:30 -0000	1.3
@@ -33,7 +33,9 @@
 
 static char *descrip = 
 "  SetRDNIS(cnum): Set RDNIS Number on a call to a new\n"
-"value.  Always returns 0\n";
+"value.  Always returns 0\n"
+"SetRDNIS has been deprecated in favor of the function\n"
+"CALLERID(rdnis)\n";
 
 STANDARD_LOCAL_USER;
 
@@ -44,6 +46,13 @@
 	struct localuser *u;
 	char *opt, *n, *l;
 	char tmp[256];
+	static int deprecation_warning = 0;
+
+	if (!deprecation_warning) {
+		ast_log(LOG_WARNING, "SetRDNIS is deprecated, please use SetVar(CALLERID(rdnis)=value) instead.\n");
+		deprecation_warning = 1;
+	}
+
 	if (data)
 		strncpy(tmp, (char *)data, sizeof(tmp) - 1);
 	else