diff --git a/dojo.conf b/dojo.conf index e97f1dd..5c88a56 100644 --- a/dojo.conf +++ b/dojo.conf @@ -2,13 +2,21 @@ perldoc => 1, secrets => ['b8a9e54090ccb580b6203e53a9f9199af38ce538'], path => 'public', - - radio => { - server_name=>"localhost:3000", - radio_server =>"https://radio.vuelodegrulla.com", - channel => "/p", - listen_url =>"http://gruya:8000/p", - } + + #Radio ===================================================== + radio_server_name=>"localhost:3000", + radio_server =>"https://radio.vuelodegrulla.com", + radio_channel => "/p", + radio_listen_url =>"http://gruya:8000/p", + + #Chat ======================================================= + chat_addr => "https://chat.vuelodegrulla.com", + chat_srv => "chat.vuelodegrulla.com", + chat_channel => 'Grullas@radio.chat.vuelodegrulla.com', + + #RTPM ======================================================= + rtmp_server =>"rtmp://vuelodegrulla.com/steam", + rtmp_channel =>"cell", } diff --git a/lib/Dojo/Controller/Home.pm b/lib/Dojo/Controller/Home.pm index b85ce28..18cb1a5 100644 --- a/lib/Dojo/Controller/Home.pm +++ b/lib/Dojo/Controller/Home.pm @@ -100,7 +100,6 @@ sub tst{ sub bcast{ my $c = shift; $c->stash((load_module("home/bcast"))[0]); - $c->stash( $c->dbv->conf_bcast); } @@ -109,7 +108,6 @@ sub tst{ $c->stash((load_module("home/radio"))[0]); $c->stash(layout=> "defaultContact"); $c->stash($c->dbv->mod); - $c->stash($c->dbv->conf_radio); $c->stash(nick=>$c->session("nick")); } @@ -119,7 +117,6 @@ sub tst{ $c->stash( js=>["/home/candy/loader.js","/ext/candy/libs.min.js","/ext/candy/candy.min.js"]); $c->stash(layout=> "clean"); - $c->stash($c->dbv->conf_chat); $c->stash(nick=>$c->session("nick")); } @@ -148,7 +145,6 @@ sub tst{ $c->dbg->ugrulla_pass($c->param('gpass')) if (($c->param("pup") // " " )=~/Cambiar/); $c->stash($c->dbv->mod); - $c->stash($c->dbv->conf_radio); $c->stash($c->dbg->grulla_pass); $c->stash( merge_hash( (load_module("home/admin/radio"))[0], diff --git a/lib/Dojo/Controller/Users.pm b/lib/Dojo/Controller/Users.pm index a7ab037..bc8a87e 100644 --- a/lib/Dojo/Controller/Users.pm +++ b/lib/Dojo/Controller/Users.pm @@ -41,7 +41,7 @@ sub is_admin { } sub is_grulla { my $self = shift; - return 1 if (($self->session('pmid')//0)==2); + return 1 if (($self->session('pmid')//0)>=2); $self->session(ureq=>2,prev=>$self->url_for); $self->redirect_to('login'); } diff --git a/lib/Dojo/Model/Vuelo.pm b/lib/Dojo/Model/Vuelo.pm index 5ee693f..7082cd8 100644 --- a/lib/Dojo/Model/Vuelo.pm +++ b/lib/Dojo/Model/Vuelo.pm @@ -52,15 +52,7 @@ sub new { bless {}, shift }; sub podcast_infoHash{ return decode_json path("public/home/podcast/jsonPod.json")->slurp; } - sub conf_radio{ - return $Dojo::Conf::radio; - } - sub conf_chat{ - return $Dojo::Conf::chat; - } - sub conf_bcast{ - return $Dojo::Conf::rtmp; - } + #============================================================================== # Read vdg admin ============================================================== diff --git a/templates/home/admin/radio.html.ep b/templates/home/admin/radio.html.ep index 70ededd..a11670b 100755 --- a/templates/home/admin/radio.html.ep +++ b/templates/home/admin/radio.html.ep @@ -1,8 +1,10 @@

Radio

-
-
+
+
+ +
@@ -29,5 +31,4 @@
diff --git a/templates/home/bcast.html.ep b/templates/home/bcast.html.ep index 5333ecb..950b7e1 100755 --- a/templates/home/bcast.html.ep +++ b/templates/home/bcast.html.ep @@ -3,11 +3,11 @@
-
data-ratio="0.4167"> +
{rtmp_server} %> data-ratio="0.4167">
diff --git a/templates/home/candy.html.ep b/templates/home/candy.html.ep index 6bc7d8f..22c8bd6 100755 --- a/templates/home/candy.html.ep +++ b/templates/home/candy.html.ep @@ -6,8 +6,8 @@ diff --git a/templates/home/radio.html.ep b/templates/home/radio.html.ep index 71654b7..87c30b1 100755 --- a/templates/home/radio.html.ep +++ b/templates/home/radio.html.ep @@ -38,7 +38,7 @@