PMCORE-2948-A Update the branch develop with the release/3.5.11

gulliver/system/class.g.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Request;
+use PHPMailer\PHPMailer\PHPMailer;
 use ProcessMaker\Core\System;
 use ProcessMaker\Log\AuditLog;
 use ProcessMaker\Plugins\PluginRegistry;

gulliver/system/class.mailer.php

@@ -1,50 +1,6 @@
 <?php
-/**
- * class.mailer.php
- *
- * @package gulliver.system
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
 
-/* Send emails using the class "PHPMailer"
- *  Email server configuration constants:
- *    MAIL_MAILER     mail/smtp
- *    MAIL_HOST       email.server.address
- *    MAIL_SMTPAUTH   true/false
- *    MAIL_USERNAME   Email Username (smtp)
- *    MAIL_PASSWORD   Email Password (smtp)
- *    MAIL_TIMEOUT    Email Timeout  (smtp)
- *    MAIL_CHARSET    Email Charset  "utf-8"
- *    MAIL_ENCODING   Email Encoding "base64"
- *  Other required configuration constants:
- *    PATH_HTMLMAIL   Email templates path
- * @author David Callizaya <davidsantos@colosa.com>
- */
-
-/**
- *
- * @package gulliver.system
- *
- */
+use PHPMailer\PHPMailer\PHPMailer;
 
 class mailer
 {

gulliver/system/class.rbac.php

@@ -145,11 +145,15 @@ class RBAC
                 'DEL' => ['PM_SETUP'],
                 'LST' => ['PM_SETUP'],
                 'TEST' => ['PM_SETUP'],
-                'createAuthUrl' => ['PM_SETUP']
+                'createAuthUrl' => ['PM_SETUP'],
+                'createAuthUrlOffice365' => ['PM_SETUP']
             ],
             'emailServerGmailOAuth.php' => [
                 'code' => ['PM_SETUP']
             ],
+            'emailServerOffice365OAuth.php' => [
+                'code' => ['PM_SETUP']
+            ],
             'processes_GetFile.php' => [
                 'mailTemplates' => ['PM_FACTORY'],
                 'public' => ['PM_FACTORY']