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

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

Revision: 2151
          http://astpp.svn.sourceforge.net/astpp/?rev=2151&view=rev
Author:   darrenkw
Date:     2007-11-03 15:03:16 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
Resolved a bug that was trying to incorrectly pass a hash to the ASTPP module.

Modified Paths:
--------------
    trunk/astpp-admin.cgi
    trunk/astpp-callingcards.agi

Modified: trunk/astpp-admin.cgi
===================================================================
--- trunk/astpp-admin.cgi	2007-11-03 21:35:25 UTC (rev 2150)
+++ trunk/astpp-admin.cgi	2007-11-03 22:03:16 UTC (rev 2151)
@@ -423,11 +423,6 @@
         return &build_admin_vendor_report()
           if $params->{mode} eq gettext("Vendor Report");
 
-#        return &build_add_booth() if $params->{mode} eq gettext("Create Booth");
-#        return &build_remove_booth() if $params->{mode} eq gettext("Remove Booth");
-#        return &build_list_booths() if $params->{mode} eq gettext("List Booths");
-#        return &build_view_booth() if $params->{mode} eq gettext("View Booth");
-
         return &build_homepage()
           if $params->{mode} eq gettext("Home Page")
           || $params->{mode} eq gettext("Home")
@@ -552,9 +547,6 @@
     elsif ( $params->{logintype} == 5 ) {    #Call Shop Login
         return &build_pricelists() if $params->{mode} eq gettext("Pricelists");
         return &build_routes()     if $params->{mode} eq gettext("Routes");
-
-#        return &build_add_callshop() if $params->{mode} eq gettext("Create CallShop");
-#        return &build_remove_callshop() if $params->{mode} eq gettext("Remove CallShop");
         return &build_add_booth() if $params->{mode} eq gettext("Create Booth");
         return &build_remove_booth()
           if $params->{mode} eq gettext("Remove Booth");
@@ -9153,12 +9145,12 @@
       HTML::Template->new(
         filename => '/var/lib/astpp/templates/configuration-list.tpl', die_on_bad_params => $config->{template_die_on_bad_params} );
     if ( $params->{logintype} == 2 ) {
-        $tmp = "SELECT * FROM system";
+        $tmp = "SELECT * FROM system ORDER BY reseller,name";
     }
     elsif ( $params->{logintype} == 1 ) {
         $tmp =
           "SELECT * FROM system WHERE reseller = "
-          . $astpp_db->quote( $params->{username} );
+          . $astpp_db->quote( $params->{username} ) . " ORDER BY name";
     }
     print STDERR $tmp if $config->{debug} == 1;
     my $sql = $astpp_db->prepare($tmp);
@@ -9201,7 +9193,6 @@
     push @currency, $config->{currency};
     $ASTPP->set_astpp_db($astpp_db);
     $ASTPP->set_cdr_db($cdr_db);
-#    $ASTPP->set_config(\%config);
 }
 
 ############### Integration with Realtime starts here #######################

Modified: trunk/astpp-callingcards.agi
===================================================================
--- trunk/astpp-callingcards.agi	2007-11-03 21:35:25 UTC (rev 2150)
+++ trunk/astpp-callingcards.agi	2007-11-03 22:03:16 UTC (rev 2151)
@@ -58,7 +58,6 @@
 	}
 	$cdr_db = &cdr_connect_db( $config, @output );
 	$ASTPP->set_cdr_db($cdr_db);
-	$ASTPP->set_config($config);
 	$sound = &define_sounds($astpp_db);
 }
 


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