Merge branch 'master' of https://www.wagner.pp.ru/git/oss/vjournal

[oss/vjournal.git] / bin / userinfo

diff --git a/bin/userinfo b/bin/userinfo
index 92a45e5fd45b1f0d76e267e622a0d9b80ecc45a7..7499a90db1dbc2af445ec3aaf3b3ecb329573d64 100644 (file)
--- a/bin/userinfo
+++ b/bin/userinfo
@@ -34,17 +34,18 @@ If user is not logged in, returns following structure:
 =cut
 
 use VJournal::Session;
+use VJournal::ProviderList;
 use JSON;
 use CGI;
 
 my $cgi=new CGI;
-my $session = VJourna::Session->new($cgi);
+my $session = VJournal::Session->new($cgi);
 my $out={};
 if (!defined $session) {
 # User is not authenticated. Return list of providers;
        $out->{state}="notlogged";
        $sites=VJournal::ProviderList->new;
-       $out->{providers}=$sites->menu;
+       $out->{providers}=[ $sites->menu ] ;
        $session=$cgi;
 } else {
        if ($session->isowner())  {
@@ -64,6 +65,6 @@ if (!defined $session) {
        }                       
                
 }
-$session->header(-content_type=>"text/json",-charset=>utf-8);
-print $encode_json($out);
+print $session->header(-content_type=>"text/json",-charset=>"utf-8");
+print encode_json($out);