X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=action.cpp;h=0bb68cdbd6bfc57edb1e2ccd4519519975092397;hp=9f9db8e1cf52878846178cac980a5bdfad8f4bd8;hb=83477c7faf66a160530f5a01c1bf3016e2127a4d;hpb=78f7f22944e2473d66b7d1828b24ee415f04e4d8

diff --git a/action.cpp b/action.cpp
index 9f9db8e..0bb68cd 100644
--- a/action.cpp
+++ b/action.cpp
@@ -636,44 +636,8 @@ void EndpointAppPBX::action_init_partyline(void)
  */
 void EndpointAppPBX::action_hangup_call(void)
 {
-	int i;
-
 	trace_header("ACTION hangup", DIRECTION_NONE);
 	end_trace();
-	/* check */
-	if (e_ext.number[0] == '\0')
-	{
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last dialed number '%s' because caller is unknown (not internal).\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id);
-		return;
-	}
-	if (!(read_extension(&e_ext, e_ext.number)))
-	{
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last dialed number '%s' because cannot read settings.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id);
-		return;
-	}
-	if (e_dialinginfo.id[0] == '\0')
-	{
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last dialed number because nothing was dialed.\n", ea_endpoint->ep_serial, e_ext.number);
-		return;
-	}
-	if (!strcmp(e_dialinginfo.id, e_ext.last_out[0]))
-	{
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last dialed number '%s' because it is identical with the last one.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id);
-		return;
-	}
-
-	/* insert */
-	PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: storing last number '%s'.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id);
-	i = MAX_REMEMBER-1;
-	while(i)
-	{
-		UCPY(e_ext.last_out[i], e_ext.last_out[i-1]);
-		i--;
-	}
-	SCPY(e_ext.last_out[0], e_dialinginfo.id);
-
-	/* write extension */
-	write_extension(&e_ext, e_ext.number);
 }
 
 
@@ -734,7 +698,7 @@ void EndpointAppPBX::action_dialing_login(void)
 		message->param.connectinfo.present = INFO_PRESENT_RESTRICTED;
 	else	message->param.connectinfo.present = e_ext.callerid_present;
 	/* handle restricted caller ids */
-	apply_callerid_restriction(e_ext.anon_ignore, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name);
+	apply_callerid_restriction(&e_ext, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name);
 	/* display callerid if desired for extension */
 	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));
 	message->param.connectinfo.ntype = e_ext.callerid_type;
@@ -1409,7 +1373,7 @@ void EndpointAppPBX::action_dialing_test(void)
 		message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT);
 		memcpy(&message->param.connectinfo, &e_connectinfo, sizeof(struct connect_info));
 		/* handle restricted caller ids */
-		apply_callerid_restriction(e_ext.anon_ignore, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name);
+		apply_callerid_restriction(&e_ext, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name);
 		/* display callerid if desired for extension */
 		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));
 		message_put(message);
@@ -1861,7 +1825,7 @@ void EndpointAppPBX::_action_goto_menu(int mode)
 	} else
 	{
 		/* remove digits that are required to match the rule */
-		if (!(rparam = routeparam(e_action, PARAM_STRIP)))
+		if ((rparam = routeparam(e_action, PARAM_STRIP)))
 		{
 			if (e_extdialing)
 				SCPY(e_dialinginfo.id, e_extdialing);
@@ -2580,6 +2544,7 @@ void EndpointAppPBX::process_hangup(int cause, int location)
 		write_log(e_ext.number, callertext, dialingtext, e_start, e_stop, 0, cause, location);
 
 		/* store last received call for reply-list */
+		if (e_origin == 1) // outgoing to phone is incomming for user
 		if (e_callerinfo.id[0] || e_callerinfo.extension[0])
 		if (e_ext.anon_ignore || e_callerinfo.present!=INFO_PRESENT_RESTRICTED)
 		{
@@ -2601,8 +2566,26 @@ void EndpointAppPBX::process_hangup(int cause, int location)
 			} else
 				PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last received id '%s' because it is identical with the last one.\n", ea_endpoint->ep_serial, e_ext.number, callertext);
 		}
-	}
 
+		/* store last made call for reply-list */
+		if (e_origin == 0) // incomming from phone is outgoing for user
+		if (e_dialinginfo.id[0])
+		{
+			if (!!strcmp(e_dialinginfo.id, e_ext.last_out[0]))
+			{
+				i = MAX_REMEMBER-1;
+				while(i)
+				{
+					UCPY(e_ext.last_out[i], e_ext.last_out[i-1]);
+					i--;
+				}
+				SCPY(e_ext.last_out[0], e_dialinginfo.id);
+				writeext |= 1; /* store extension later */
+				PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: storing last number '%s'.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id);
+			} else
+				PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last number '%s' because it is identical with the last one.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id);
+		}
+	}
 	/* write extension if needed */
 	if (writeext == 0x11)
 		write_extension(&e_ext, e_ext.number);