sigue bcast

dojo.conf

@@ -3,12 +3,20 @@
   secrets => ['b8a9e54090ccb580b6203e53a9f9199af38ce538'],
   path => 'public',
  
-  radio => {
+ #Radio =====================================================
-    server_name=>"localhost:3000",
+  radio_server_name=>"localhost:3000",
   radio_server =>"https://radio.vuelodegrulla.com",
-    channel => "/p",
+  radio_channel => "/p",
-    listen_url =>"http://gruya:8000/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",
 
 }
 

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],

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');
 }

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 ==============================================================

templates/home/admin/radio.html.ep

@@ -1,8 +1,10 @@
 <section class="title flex">
   <article class="title"> <p>Radio</p> </article>
   <article class="bcast"> <form action="/admin/radio" method="post">
-      <div><label>Contraseña Video Stream</label></div>
+      <div><label>Contraseña Video</label></div>
-      <div><textarea name="gpass" id="gpass" class="gpass"><%= $gpass %></textarea></div> 
+      <div>
+        <input type="text" name="gpass" id="gpass" class="gpass" value="<%= $gpass %>"</input>
+      </div> 
       <input type="hidden" name="update" value="gpass"> 
       <div><input type="submit" name="pup" value="Cambiar"></div>  
   
@@ -29,5 +31,4 @@
 </section>
   
 <script>
-const radio_server="<%= $radio_server %>";
 </script>

templates/home/bcast.html.ep

@@ -3,11 +3,11 @@
   <script src="//releases.flowplayer.org/7.2.1/flowplayer.min.js"></script>
 
   <section class="vid">
-    <div class="flowplayer fp-outlined" data-rtmp=<%= $rtmp_server %> data-ratio="0.4167">
+    <div class="flowplayer fp-outlined" data-rtmp=<%= $config->{rtmp_server} %> data-ratio="0.4167">
 
  <video controls="controls" autoplay="autoplay" poster="/home/bcast/noise.jpg" data-title="Transmisión en vivo">
-   <source src=<%= $radio_server %>"/live.ogg" type="video/ogg">
+   <source src=<%= $config->{radio_server} %>"/live.ogg" type="video/ogg">
-   <source src=<%= $rtmp_channel %> type="video/flash">
+   <source src=<%= $config->{rtmp_channel} %> type="video/flash">
  </video> </div>
 </section>
 

templates/home/candy.html.ep

@@ -6,8 +6,8 @@
 
 <script>
   const nick="<%= $nick %>";
-  const chat_addr="<%= $chat_addr %>";
+  const chat_addr="<%= $config->{chat_addr} %>";
-  const chat_srv="<%= $chat_srv %>";
+  const chat_srv="<%= $config->{chat_srv} %>";
-  const chat_channel="<%= $chat_channel %>";
+  const chat_channel="<%= $config->{chat_channel} %>";
 </script>
 

templates/home/radio.html.ep

@@ -38,7 +38,7 @@
 </section></article> </section>
 <script> 
  const nick="<%= $nick %>";
- const radio_server="<%= $radio_server %>";
+ const radio_server="<%= $config->{radio_server} %>";
- const listen_url="<%= $listen_url %>";
+ const listen_url="<%= $config->{radio_listen_url} %>";
- const channel="<%= $channel %>";
+ const channel="<%= $config->{radio_channel} %>";
 </script>