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

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

Revision: 2306
          http://astpp.svn.sourceforge.net/astpp/?rev=2306&view=rev
Author:   darrenkw
Date:     2010-02-20 07:01:16 +0000 (Sat, 20 Feb 2010)

Log Message:
-----------
Cleaned up in the makefile.  Fixed a bug that caused astpp-admin.cgi to fail when trying to list sip devices from freeswitch.

Modified Paths:
--------------
    trunk/Makefile
    trunk/web_interface/astpp-admin.cgi

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-02-18 05:02:42 UTC (rev 2305)
+++ trunk/Makefile	2010-02-20 07:01:16 UTC (rev 2306)
@@ -1,3 +1,4 @@
+#Makefile for ASTPP (www.astpp.org)
 SHELL=/bin/sh
 ASTERISKDIR=/etc/asterisk
 IAX=/etc/asterisk/iax.conf

Modified: trunk/web_interface/astpp-admin.cgi
===================================================================
--- trunk/web_interface/astpp-admin.cgi	2010-02-18 05:02:42 UTC (rev 2305)
+++ trunk/web_interface/astpp-admin.cgi	2010-02-20 07:01:16 UTC (rev 2306)
@@ -2104,13 +2104,12 @@
             }
         }
         if ($fs_db) {
-            my (@sip_devices);
-            @sip_devices = $ASTPP->fs_list_sip_usernames(
+            my ($count,@sip_devices) = $ASTPP->fs_list_sip_usernames(
                 cc          => $accountinfo->{cc},
                 accountcode => $accountinfo->{number}
             );
             foreach my $record (@sip_devices) {
-                print STDERR $record->{username};
+#                print STDERR $record->{username};
                 my $deviceinfo = $ASTPP->fs_retrieve_sip_user(
 			directory_id	=> $record->{id}
 			);
@@ -9908,7 +9907,7 @@
 
 sub build_freeswitch_sip_devices() {
     return gettext("Database is NOT configured!") . "\n" unless $astpp_db;
-    my ( @device_list, @sip_devices );
+    my ( @device_list, $count, @sip_devices );
     my $template = HTML::Template->new(
         filename          => '/var/lib/astpp/templates/freeswitch-sip-list.tpl',
         die_on_bad_params => $config->{template_die_on_bad_params}
@@ -9962,7 +9961,7 @@
     	$template->param( fs_username	=> $deviceinfo->{username} );
     }
 
-    @sip_devices = $ASTPP->fs_list_sip_usernames();
+    ($count,@sip_devices) = $ASTPP->fs_list_sip_usernames();
     foreach my $record (@sip_devices) {
         my $deviceinfo = $ASTPP->fs_retrieve_sip_user(
 		directory_id	=> $record->{id}


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