[Astpp-commit] SF.net SVN: astpp:[2337] trunk

[<dar...@us...>]

Revision: 2337
          http://astpp.svn.sourceforge.net/astpp/?rev=2337&view=rev
Author:   darrenkw
Date:     2011-05-07 03:09:36 +0000 (Sat, 07 May 2011)

Log Message:
-----------
Fixed FreeSWITCH gateway issues.  Tested to be working.

Modified Paths:
--------------
    trunk/modules/ASTPP/lib/ASTPP.pm
    trunk/web_interface/astpp-admin.cgi

Modified: trunk/modules/ASTPP/lib/ASTPP.pm
===================================================================
--- trunk/modules/ASTPP/lib/ASTPP.pm	2011-04-30 16:51:30 UTC (rev 2336)
+++ trunk/modules/ASTPP/lib/ASTPP.pm	2011-05-07 03:09:36 UTC (rev 2337)
@@ -421,16 +421,8 @@
 		return ($dialstring,$data);
 	}
     elsif ( $trunkdata->{tech} eq "SIP" ) {
-	my ($profile,$dest) = split(m/","/m, $trunkdata->{path});
-	$profile =~ s/"//g;                               #Strip off quotation marks
-	$dest =~ s/"//g;                               #Strip off quotation marks
-	if ($profile eq "gateway") {
-		$data = "sofia/gateway/" . $dest . "/" . $arg{route_prepend} . $arg{destination_number};
-		$dialstring .= $data . "|";
-	} else {
-		$data = "sofia/" . $profile . "/" . $arg{route_prepend} . $arg{destination_number} . "\@" . $dest;
-		$dialstring .= $data . "|";
-	}
+	$data = "sofia/gateway/" . $trunkdata->{path} . "/" . $arg{route_prepend} . $arg{destination_number};
+	$dialstring .= $data . "|";
 	return ($dialstring,$data);
     }
     else {

Modified: trunk/web_interface/astpp-admin.cgi
===================================================================
--- trunk/web_interface/astpp-admin.cgi	2011-04-30 16:51:30 UTC (rev 2336)
+++ trunk/web_interface/astpp-admin.cgi	2011-05-07 03:09:36 UTC (rev 2337)
@@ -8445,13 +8445,7 @@
           . "</td><td>"
           . gettext("Protocol")
           . "</td><td>"
-          . "<a href=\"\#\">"
           . gettext("Peer Name")
-          . "<span class=\"popups\">"
-          . gettext(
-"If using freeswitch then use the following formats: \"gateway\",\"gatewayname\" or \"profilename\",\"destinationhost\""
-          )
-          . "</span>" . "</a>"
           . "</td><td>"
           . gettext("Provider")
           . "</td><td>"
@@ -8651,15 +8645,7 @@
           . "</td><td>"
           . gettext("Protocol")
           . "</td><td>"
-          . "<div id=\"popups\">"
-          . "<a href=\"\#\">"
           . gettext("Peer Name")
-          . "<span class=\"popups\">"
-          . gettext(
-"If using freeswitch then use the following formats: \"gateway\",\"gatewayname\" or \"profilename\",\"destinationhost\""
-          )
-          . "</span>" . "</a>"
-          . "</div>"
           . "</td><td>"
           . gettext("Provider")
           . "</td><td>"
@@ -8754,14 +8740,7 @@
           . "</td><td>"
           . gettext("Protocol")
           . "</td><td>"
-          . "<div id=\"popups\">"
-          . "<a href=\"\#\">"
           . gettext("Peer Name")
-          . "<span class=\"popups\">"
-          . gettext(
-"If using freeswitch then use the following formats: \"gateway\",\"gatewayname\" or \"profilename\",\"destinationhost\""
-          )
-          . "</span>" . "</a>"
           . "</div>"
           . "</td><td>"
           . gettext("Provider")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.