Cambio para independizar de servidor

bootstrap/app.php

@@ -3,6 +3,9 @@ use DI\Bridge\Slim\Bridge;
 
 include_once 'composer.php';
 
+$dotenv = Dotenv\Dotenv::createImmutable(dirname(__DIR__));
+$dotenv->load();
+
 $container_builder = new DI\ContainerBuilder();
 
 $folders = [
@@ -42,7 +45,4 @@ foreach ($folders as $folder) {
   }
 }
 
-$dotenv = Dotenv\Dotenv::createImmutable($container->get('folders.base'));
-$dotenv->load();
-
 include_once implode(DIRECTORY_SEPARATOR, [$app->getContainer()->get('folders.routes'), 'router.php']);

bootstrap/common/config.php

@@ -9,5 +9,6 @@ return [
     '{folders.resources}',
     'routes'
   ])),
-  'urls.base' => '/provm/raby'
+  'base_url' => getenv('BASE_URL'),
+  'urls.base' => getenv('URLS_BASE')
 ];

bootstrap/web/config.php

@@ -77,10 +77,9 @@ return [
   'email.recepcion' => 'recepcion@notariaraby.cl',
   'email.administrativo' => 'vwielandt@notariaraby.cl',
   'email' => [
-    'host' => 'smtp.notariaraby.cl',
+    'host' => 'mail.notariaraby.cl',
-    'username' => '',
+    'username' => 'contacto@notariaraby.cl',
-    'password' => '',
+    'password' => 'ntrco2020'
-    'secure' => 'ssl'
   ],
   'scripts' => [
     'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js',

bootstrap/web/setup.php

@@ -11,7 +11,7 @@ return [
       null,
       [
         'urls' => (object) [
-          'base' => $container->get('urls.base'),
+          'base' => $container->get('base_url'),
           'assets' => (object) [
             'images' => $container->get('urls.images'),
             'styles' => $container->get('urls.styles'),
@@ -60,5 +60,11 @@ return [
   Nette\Mail\SmtpMailer::class => function(Container $c) {
     return new Nette\Mail\SmtpMailer($c->get('email'));
   },
+  Nette\Mail\FallbackMailer::class => function(Container $c) {
+    return new Nette\Mail\FallbackMailer([
+      $c->get(Nette\Mail\SmtpMailer::class),
+      $c->get(Nette\Mail\SendmailMailer::class)
+    ]);
+  },
   Nette\Mail\Message::class => DI\create()
 ];

common/Controller/Web/Admin/Clave.php

@@ -35,10 +35,7 @@ class Clave {
     ]);
     file_put_contents($filename, implode(PHP_EOL, $vars));
     return $response
-      ->withHeader('Location', implode('/', [
+      ->withHeader('Location', $container->get('urls.admin'))
-        $container->get('urls.base'),
-        'admin'
-      ]))
       ->withStatus(301);
   }
 }

common/Controller/Web/Admin/Login.php

@@ -14,10 +14,7 @@ class Login {
   public function do_login(Request $request, Response $response, Service $login, Container $container): Response {
     $login->login($request);
     return $response
-      ->withHeader('Location', implode('/', [
+      ->withHeader('Location', $container->get('urls.admin'))
-        $container->get('urls.base'),
-        'admin'
-      ]))
       ->withStatus(302);
   }
   public function logout(Request $request, Response $response, Service $login, Container $container): Response {

common/Controller/Web/Contacto.php

@@ -5,7 +5,7 @@ use Psr\Container\ContainerInterface as Container;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
 use Slim\Views\Blade as View;
-use Nette\Mail\SendmailMailer as Mailer;
+use Nette\Mail\FallbackMailer as Mailer;
 use Nette\Mail\Message;
 
 class Contacto {
@@ -24,17 +24,24 @@ class Contacto {
     $subject = 'Contacto Web - ' . $post['nombre'];
 
     $message = $container->make(Message::class)
-      ->setFrom($post['email'], $post['nombre'])
+      ->setFrom($container->get('email')['username'])
       ->addTo($container->get('email.recepcion'))
       ->addCc($container->get('email.administrativo'))
       ->setSubject($subject)
       ->setBody($body)
       ->setHTMLBody(nl2br($body));
-    //$mailer->send($message);
+    $mailer->send($message);
+    $message = $container->make(Message::class)
+      ->setFrom($container->get('email')['username'])
+      ->addTo($post['email'], $post['nombre'])
+      ->setSubject($subject)
+      ->setBody('Su correo a Notaría Patricio Raby ha sido recibido.');
+    $mailer->send($message);
 
     $output = [
       'informacion' => $post,
       'mail' => [
+        'from' => $post['email'],
         'to' => $container->get('email.recepcion'),
         'cc' => $container->get('email.administrativo'),
         'asunto' => $subject,

resources/views/admin/layout/footer.blade.php

@@ -4,8 +4,8 @@
   </div>
   <div class="grey">
     <nav class="ui container attached text stackable menu">
-      <a class="item" href="{{$urls->base}}/admin/clave">Cambiar Clave</a>
+      <a class="item" href="{{$urls->admin}}/clave">Cambiar Clave</a>
-      <a class="item" href="{{$urls->base}}/admin/logout">Salir</a>
+      <a class="item" href="{{$urls->admin}}/logout">Salir</a>
     </nav>
   </div>
 </footer>

resources/views/admin/layout/menu.blade.php

@@ -1,7 +1,7 @@
 <nav class="ui inverted attached massive text stackable menu" id="page_menu">
-  <a class="left aligned item brand" href="{{$urls->base}}/admin">
+  <a class="left aligned item brand" href="{{$urls->admin}}">
     NOTAR&Iacute;A PATRICIO RABY BENAVENTE
   </a>
-  <a class="item" href="{{$urls->base}}/admin/clave">Cambiar Clave</a>
+  <a class="item" href="{{$urls->admin}}/clave">Cambiar Clave</a>
-  <a class="item" href="{{$urls->base}}/admin/logout">Salir</a>
+  <a class="item" href="{{$urls->admin}}/logout">Salir</a>
 </nav>