Commit ea80c2fa authored by Ben's avatar Ben
Browse files

Updating

parent 692b8561

Core/Channels/Ban.php

+2 −2
Original line number Original line Diff line number Diff line
@@ -81,12 +81,12 @@ class Ban 
     */

     */

    public function ban($banReason = '')

    public function ban($banReason = '')

    {

    {



        error_log("ban called");

        if (!$this->user) {

        if (!$this->user) {

            throw new \Exception('Missing User');

            throw new \Exception('Missing User');

        }

        }

        

        

        $banned = $this->banDelegate->ban($this->user, $banReason);



        if ($banned) {

        if ($banned) {

            $this->logoutDelegate->logout($this->user);

            $this->logoutDelegate->logout($this->user);

            $this->queueClient

            $this->queueClient

Core/Email/Mailer.php

+1 −2
Original line number Original line Diff line number Diff line
@@ -52,9 +52,8 @@ class Mailer 




        $this->mailer->ClearAllRecipients();

        $this->mailer->ClearAllRecipients();

        $this->mailer->ClearAttachments();

        $this->mailer->ClearAttachments();

        error_log(var_export($message->from, true));





        if (isset($message->from)) {

        if (isset($message->from['email'])) {

            $this->mailer->ClearReplyTos();

            $this->mailer->ClearReplyTos();

            $this->mailer->addReplyTo($message->from['email'], $fromName);    

            $this->mailer->addReplyTo($message->from['email'], $fromName);    

        }

        }

Core/Reports/Events.php

+2 −1
Original line number Original line Diff line number Diff line
@@ -27,11 +27,12 @@ class Events 
                ->set('email', $user->getEmail())

                ->set('email', $user->getEmail())

                ->set('reason', $user->ban_reason)

                ->set('reason', $user->ban_reason)

                ->set('user', $user);

                ->set('user', $user);



            $message = new Core\Email\Message();

            $message = new Core\Email\Message();

            $message->setTo($user)

            $message->setTo($user)

                ->setMessageId(implode('-', [$user->guid, sha1($user->getEmail()), sha1('register-' . time())]))

                ->setMessageId(implode('-', [$user->guid, sha1($user->getEmail()), sha1('register-' . time())]))

                ->setSubject("You are banned from Minds.")

                ->setSubject("You are banned from Minds.")

                ->setFrom($config->get('contact_email'))

                ->setFrom($config->get('contact_details')['email'], $config->get('contact_details')['name'])

                ->setHtml($template);

                ->setHtml($template);

            Di::_()->get('Mailer')->queue($message);

            Di::_()->get('Mailer')->queue($message);

settings.example.php

+4 −1
Original line number Original line Diff line number Diff line
@@ -582,7 +582,10 @@ $CONFIG->set('pro', [ 
    'dynamodb_table_name' => 'traefik',

    'dynamodb_table_name' => 'traefik',

]);

]);





$CONFIG->set('contact_email', 'info@minds.com');

$CONFIG->set('contact_details', [

    'name' => 'Minds',

    'email' => 'info@minds.com',

]);





$CONFIG->set('upgrades', [

$CONFIG->set('upgrades', [

    'pro' => [

    'pro' => [