X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=66aba313a9b23f1593dba0a8beeaad2d5ebdd866;hp=c2619e9c5118e1ed2f6d5ef2268c7ce2519fef4e;hb=5ad4c41dc406a15beaa0a7b73d9dada1df74f939;hpb=57c3ea7aa25062d6e77794f5152bd96672badd04

diff --git a/apppbx.cpp b/apppbx.cpp
index c2619e9..66aba31 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -1001,7 +1001,7 @@ void EndpointAppPBX::out_setup(void)
 				goto check_anycall_intern;
 			}
 			/* directory.list */
-			if (e_callerinfo.id[0] && (e_ext.centrex || e_ext.display_name))
+			if (e_callerinfo.id[0] && e_ext.display_name)
 			{
 				dirname = parse_directory(e_callerinfo.id, e_callerinfo.ntype);
 				if (dirname)
@@ -1025,8 +1025,8 @@ void EndpointAppPBX::out_setup(void)
 			SCPY(message->param.setup.callerinfo.display, apply_callerid_display(message->param.setup.callerinfo.id, message->param.setup.callerinfo.itype, message->param.setup.callerinfo.ntype, message->param.setup.callerinfo.present, message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name));
 //printf("\n\ndisplay = %s\n\n\n",message->param.setup.callerinfo.display);
 			/* use cnip, if enabld */
-			if (!e_ext.centrex)
-				message->param.setup.callerinfo.name[0] = '\0';
+	//		if (!e_ext.centrex)
+	//			message->param.setup.callerinfo.name[0] = '\0';
 			/* screen clip if prefix is required */
 			if (message->param.setup.callerinfo.id[0] && e_ext.clip_prefix[0])
 			{
@@ -2986,8 +2986,8 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
 		SCPY(message->param.connectinfo.display, apply_callerid_display(message->param.connectinfo.id, message->param.connectinfo.itype, message->param.connectinfo.ntype, message->param.connectinfo.present, message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name));
 
 		/* use conp, if enabld */
-		if (!e_ext.centrex)
-			message->param.connectinfo.name[0] = '\0';
+//		if (!e_ext.centrex)
+//			message->param.connectinfo.name[0] = '\0';
 
 		/* send connect */
 		message_put(message);