X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=bf893886ec2bae51420e5a5aa87c71954da378d9;hp=c2619e9c5118e1ed2f6d5ef2268c7ce2519fef4e;hb=d9d954e58d6acf8c3de95402110e691f0bc29688;hpb=14f76f1e81f0a4e7a63e83136d1ac958bf85c8a5

diff --git a/apppbx.cpp b/apppbx.cpp
index c2619e9..bf89388 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])
 			{
@@ -2845,7 +2845,7 @@ void EndpointAppPBX::join_facility(struct port_list *portlist, int message_type,
 {
 	struct message *message;
 
-	if (!e_ext.facility)
+	if (!e_ext.facility && e_ext.number[0])
 	{
 		return;
 	}
@@ -2877,7 +2877,10 @@ void EndpointAppPBX::join_overlap(struct port_list *portlist, int message_type,
 	}
 	if (e_action) if (e_action->index == ACTION_OUTDIAL || e_action->index == ACTION_EXTERNAL)
 	{
-			set_tone(portlist, "dialtone");
+			if (e_dialinginfo.id[0])
+				set_tone(portlist, "dialing");
+			else
+				set_tone(portlist, "dialtone");
 			return;
 	}
 	if (e_ext.number[0])
@@ -2986,8 +2989,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);
@@ -3120,7 +3123,7 @@ void EndpointAppPBX::join_disconnect_release(int message_type, union parameter *
 void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, union parameter *param)
 {
 	struct message *message;
-	struct interface	*interface;
+//	struct interface	*interface;
 
 	/* if we already in setup state, we just update the dialing with new digits */
 	if (e_state == EPOINT_STATE_OUT_SETUP