un poco turbio

lib/Dojo.pm

@@ -3,7 +3,6 @@ use Mojo::Base 'Mojolicious';
 use Dojo::Conf;
 use Dojo::Model::Vuelo;
 use Dojo::Model::Users;
-use Dojo::Model::Data;
 
 # This method will run once at server start
   sub startup {
@@ -14,11 +13,11 @@ use Dojo::Model::Data;
 
     $self->helper(dbv => sub { state $dbv = Dojo::Model::Vuelo->new });
     $self->helper(dbg => sub { state $dbg = Dojo::Model::Users->new });
-    $self->helper(ddtt => sub { state $ddtt = Dojo::Model::Data->new });
     $self->defaults({%Dojo::Conf::def});
     my $r = $self->routes; #router
 
 # user ========================================================================
+    $r->any('/')->to('home#home_');
     $r->any('/home')->to('home#home');
     $r->any('/cal')->to('home#cal');
     $r->any('/event/:id'=> [id => qr/\d+/])->to('home#event');
@@ -40,22 +39,20 @@ use Dojo::Model::Data;
     $r->any('/candy')->to('home#candy');
 # =============================================================================
  
-# admin =======================================================================
-    #    $r->any('/admin/home')->to('home#admin_home');
-    #$r->any('/admin/radio')->to('home#admin_radio');
-    #$r->any('/admin/eventos')->to('home#admin_eventos');
-    #$r->any('/admin/eventos/:type'=> [type=>['e','p','c']])->to('home#admin_eventos');
-    #$r->any('/admin/mensajes')->to('home#admin_mensajes');
-    #$r->any('/admin/json/:dreq/:id')->to('home#admin_json');
-# =============================================================================
-
-# login =======================================================================
+# login guest =================================================================
     $r->any('/login')->to('users#login');
     $r->any('/logout')->to('users#logout');
 
     my $logged_in = $r->under('/')->to('users#is_logged');
     $logged_in->get('/radio')->to('home#radio');
+# =============================================================================
     
+# login user grulla ===========================================================
+    my $guestp = $r->under('/')->to('users#is_grulla');
+    $guestp->any('/bcast')->to('home#bcast');
+# =============================================================================
+
+# admin =======================================================================
     my $admin = $r->under('/admin')->to('users#is_admin');
     $admin->any('')->to('home#admin');
     $admin->any('home')->to('home#admin_home');

lib/Dojo/Controller/Data.pm

@@ -51,25 +51,25 @@ sub candy{
 
  sub isOn{return grep(/\s$server_name/,sendT("host:list()"))? 1:0; }  
 
-  sub sendT{ 
+sub sendT{ 
     commandT(shift);  
     my @r = $t->getlines(All=>0);
     return @r
-  } 
-  sub connectT{ 
+} 
+sub connectT{ 
     $t = new Net::Telnet (  Port=>5582, Timeout=>1, Errmode=>'return' );
     #  $t = new Net::Telnet (  Port=>5582, Timeout=>1, Errmode=>'die' );
     return 1 if $t->open();
     return 0;
-  } 
-  sub commandT{ 
+} 
+sub commandT{ 
     $t->getlines(All=>0);#empty buffer  
     $t->print(shift); #run istruction
-  } 
-  sub disconnectT{ $t->close();}  
+} 
+sub disconnectT{ $t->close();}  
 
 #=========================================================
-1 
+1; 
 __END__ 
 
 

lib/Dojo/Controller/Home.pm

@@ -3,7 +3,6 @@ use Mojo::Base 'Mojolicious::Controller';
 use Mojo::Template;
 use Dojo::Support qw{ log dmph merge_hash load_module get_names};
 use Dojo::Conf;
-
 sub tst{
   my $c=shift;
   #  $c->stash( merge_hash( 
@@ -11,16 +10,22 @@ sub tst{
   #  (load_module("home/contact"))[0]
   #));
   # $c->stash(apend => ["home/contact"]);
-   $c->stash( (load_module("home/tst"))[0] );
-  $c->stash(layout=> "defaultContact");
-  my $x =  [get_names("public/home/cal/img/")];
-  log("@$x");
-  $c->stash( ilist => $x);
-  $c->dbv->tst;
+  #$c->stash( (load_module("home/tst"))[0] );
+  #$c->stash(layout=> "defaultContact");
+  #my $x =  [get_names("public/home/cal/img/")];
+  #log("@$x");
+  #$c->stash( ilist => $x);
+  #$c->dbv->tst;
+  $c->render(text=> $c->config->{radio}{'channel'});
 
 }
 
 # User ========================================================================
+  sub home_ {
+    my $c = shift;
+    $c->redirect_to("/home") ;
+  }
+
   sub home {
     my $c = shift;
     $c->stash((load_module("home/home"))[0]);
@@ -92,6 +97,13 @@ sub tst{
     $c->stash( t=>$c->dbv->podcast_txt, pod=>$c->dbv->podcast_infoHash);
   }
 
+  sub bcast{
+    my $c = shift;
+    $c->stash((load_module("home/bcast"))[0]);
+    $c->stash( $c->dbv->conf_bcast);
+    
+  }
+
   sub radio{
     my $c=shift;
     $c->stash((load_module("home/radio"))[0]);

lib/Dojo/Controller/Users.pm

@@ -6,11 +6,16 @@ use Dojo::Support qw{ merge_hash load_module };
 sub login {
   my $self = shift;
   #falta si el usuario ya está registrado y llama a login.
-  if ($self->session('ureq')//1 == 4){
+  if (($self->session('ureq')//0) == 4){
     $self->stash( css=>["users/login/cssaForm.css"]);
     $self->stash(template=>'users/logina') ;
     $self->stash(layout=>"default");
   }
+  elsif (($self->session('ureq')//0) == 2){
+    $self->stash( css=>["users/login/cssuForm.css"]);
+    $self->stash(template=>'users/loginu') ;
+    $self->stash(layout=>"defaultContact");
+  }
   else{
     $self->stash( css=>["users/login/cssForm.css"]);
     $self->stash(layout=>"defaultContact");
@@ -19,21 +24,27 @@ sub login {
   my $pass = $self->param('pass') //'';
   return $self->render unless my $pmid = $self->dbg->check($user, $pass);
   $self->session(user => $user, pmid=>$pmid, nick=> $self->param('nick'));
-  $self->redirect_to($self->session('prev'));
+  $self->redirect_to($self->session('prev')) ;
 }
 
 sub is_logged {
   my $self = shift;
   return 1 if $self->session('user');
-  $self->session(prev=>$self->url_for);
+  $self->session(ureq=>1,prev=>$self->url_for);
   $self->redirect_to('login');
 }
 sub is_admin {
   my $self = shift;
-    return 1 if ($self->session('pmid')==4);
+    return 1 if ( ($self->session('pmid') //0) == 4);
   $self->session(ureq=>4,prev=>$self->url_for);
   $self->redirect_to('login');
 }
+sub is_grulla {
+  my $self = shift;
+    return 1 if (($self->session('pmid')//0)==2);
+    $self->session(ureq=>2,prev=>$self->url_for);
+    $self->redirect_to('login');
+}
 
 sub logout {
   my $self = shift;

lib/Dojo/Model/Data.pm

@@ -1,15 +0,0 @@
-package Dojo::Model::Data;
-use Dojo::Support qw{ dmph merge_hash load_module };
-use Dojo::Conf;
-
-sub new { bless {}, shift };
-
-
-sub tst{
-  
-  return {tst=>"this is my rifle"};
-}
-
-1;
-
-

lib/Dojo/Model/Vuelo.pm

@@ -58,6 +58,9 @@ sub new { bless {}, shift };
   sub conf_chat{
     return $Dojo::Conf::chat;
   }
+  sub conf_bcast{
+    return $Dojo::Conf::rtmp;
+  }
 #==============================================================================
 
 # Read vdg admin ==============================================================