Merge pull request 'fix/checklist-issues' from fix/checklist-issues i…

…nto develop

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/moodle-mod_onlyofficedocspace/pulls/12

api/inviteusers.php

@@ -22,11 +22,11 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/config.php');
+use mod_onlyofficedocspace\local\errors\docspace_error;
+use mod_onlyofficedocspace\local\errors\validation_error;
+use mod_onlyofficedocspace\local\http\requests\invite_users_request;
 
-use mod_onlyofficedocspace\errors\docspace_error;
-use mod_onlyofficedocspace\errors\validation_error;
-use mod_onlyofficedocspace\http\requests\invite_users_request;
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/config.php');
 
 defined('AJAX_SCRIPT') || define('AJAX_SCRIPT', true);
 

api/updateadminsettings.php

@@ -14,7 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-use mod_onlyofficedocspace\common\flash_message;
+use mod_onlyofficedocspace\local\common\flash_message;
+use mod_onlyofficedocspace\local\errors\docspace_error;
+use mod_onlyofficedocspace\local\errors\validation_error;
+use mod_onlyofficedocspace\local\http\requests\update_admin_settings_request;
+
 /**
  * Return json-encoded response.
  *
@@ -25,10 +29,6 @@
 
 require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/config.php');
 
-use mod_onlyofficedocspace\errors\docspace_error;
-use mod_onlyofficedocspace\errors\validation_error;
-use mod_onlyofficedocspace\http\requests\update_admin_settings_request;
-
 defined('AJAX_SCRIPT') || define('AJAX_SCRIPT', true);
 
 require_admin();

api/updateuserpassword.php

@@ -22,11 +22,11 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/config.php');
+use mod_onlyofficedocspace\local\errors\docspace_error;
+use mod_onlyofficedocspace\local\errors\validation_error;
+use mod_onlyofficedocspace\local\http\requests\update_password_request;
 
-use mod_onlyofficedocspace\errors\docspace_error;
-use mod_onlyofficedocspace\errors\validation_error;
-use mod_onlyofficedocspace\http\requests\update_password_request;
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/config.php');
 
 defined('AJAX_SCRIPT') || define('AJAX_SCRIPT', true);
 

classes/common/flash_message.php → classes/local/common/flash_message.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\common;
+namespace mod_onlyofficedocspace\local\common;
 
 /**
  * flash_message

classes/common/http_request.php → classes/local/common/http_request.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\common;
+namespace mod_onlyofficedocspace\local\common;
 
 /**
  * http request class

classes/common/http_response.php → classes/local/common/http_response.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\common;
+namespace mod_onlyofficedocspace\local\common;
 
 /**
  * http response class

classes/docspace/docspace_auth_manager.php → classes/local/docspace/docspace_auth_manager.php

@@ -22,11 +22,11 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\docspace;
+namespace mod_onlyofficedocspace\local\docspace;
 
-use mod_onlyofficedocspace\common\http_request;
-use mod_onlyofficedocspace\errors\docspace_error;
-use mod_onlyofficedocspace\errors\invalid_credentials_error;
+use mod_onlyofficedocspace\local\common\http_request;
+use mod_onlyofficedocspace\local\errors\docspace_error;
+use mod_onlyofficedocspace\local\errors\invalid_credentials_error;
 
 /**
  * Docspace auth manager

classes/docspace/docspace_file_manager.php → classes/local/docspace/docspace_file_manager.php

@@ -22,10 +22,10 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\docspace;
+namespace mod_onlyofficedocspace\local\docspace;
 
-use mod_onlyofficedocspace\common\http_request;
-use mod_onlyofficedocspace\errors\docspace_error;
+use mod_onlyofficedocspace\local\common\http_request;
+use mod_onlyofficedocspace\local\errors\docspace_error;
 
 /**
  * DocSpace file manager

classes/docspace/docspace_settings.php → classes/local/docspace/docspace_settings.php

@@ -22,10 +22,10 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\docspace;
+namespace mod_onlyofficedocspace\local\docspace;
 
-use mod_onlyofficedocspace\common\http_request;
-use mod_onlyofficedocspace\errors\docspace_error;
+use mod_onlyofficedocspace\local\common\http_request;
+use mod_onlyofficedocspace\local\errors\docspace_error;
 
 /**
  * Docspace settings class

classes/docspace/docspace_user_manager.php → classes/local/docspace/docspace_user_manager.php

@@ -22,11 +22,11 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\docspace;
+namespace mod_onlyofficedocspace\local\docspace;
 
-use mod_onlyofficedocspace\common\http_request;
-use mod_onlyofficedocspace\docspace\enums\docspace_user_type;
-use mod_onlyofficedocspace\errors\docspace_error;
+use mod_onlyofficedocspace\local\common\http_request;
+use mod_onlyofficedocspace\local\docspace\enums\docspace_user_type;
+use mod_onlyofficedocspace\local\errors\docspace_error;
 
 /**
  * Docspace user manager class

classes/docspace/docspace_users_collection.php → classes/local/docspace/docspace_users_collection.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\docspace;
+namespace mod_onlyofficedocspace\local\docspace;
 
 /**
  * DocSpace users collection

classes/docspace/enums/docspace_user_status.php → classes/local/docspace/enums/docspace_user_status.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\docspace\enums;
+namespace mod_onlyofficedocspace\local\docspace\enums;
 // phpcs:disable
 enum docspace_user_status: int {
 

classes/docspace/enums/docspace_user_type.php → classes/local/docspace/enums/docspace_user_type.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\docspace\enums;
+namespace mod_onlyofficedocspace\local\docspace\enums;
 // phpcs:disable
 enum docspace_user_type: int {
 

classes/errors/docspace_error.php → classes/local/errors/docspace_error.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\errors;
+namespace mod_onlyofficedocspace\local\errors;
 use Exception;
 
 /**

classes/errors/invalid_credentials_error.php → classes/local/errors/invalid_credentials_error.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\errors;
+namespace mod_onlyofficedocspace\local\errors;
 
 /**
  * invalid_credentials_error

classes/errors/validation_error.php → classes/local/errors/validation_error.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\errors;
+namespace mod_onlyofficedocspace\local\errors;
 use Exception;
 
 /**

classes/http/requests/get_users_request.php → classes/local/http/requests/get_users_request.php

@@ -22,14 +22,14 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\http\requests;
+namespace mod_onlyofficedocspace\local\http\requests;
 
-use mod_onlyofficedocspace\docspace\enums\docspace_user_status;
-use mod_onlyofficedocspace\moodle\moodle_docspace_user_manager;
-use mod_onlyofficedocspace\moodle\moodle_user_manager;
-use mod_onlyofficedocspace\docspace\docspace_settings;
-use mod_onlyofficedocspace\docspace\docspace_user_manager;
-use mod_onlyofficedocspace\docspace\enums\docspace_user_type;
+use mod_onlyofficedocspace\local\docspace\docspace_settings;
+use mod_onlyofficedocspace\local\docspace\docspace_user_manager;
+use mod_onlyofficedocspace\local\docspace\enums\docspace_user_status;
+use mod_onlyofficedocspace\local\docspace\enums\docspace_user_type;
+use mod_onlyofficedocspace\local\moodle\moodle_docspace_user_manager;
+use mod_onlyofficedocspace\local\moodle\moodle_user_manager;
 
 /**
  * get_users_request

classes/http/requests/invite_users_request.php → classes/local/http/requests/invite_users_request.php

@@ -22,16 +22,16 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\http\requests;
-
-use mod_onlyofficedocspace\common\flash_message;
-use mod_onlyofficedocspace\moodle\moodle_docspace_user_manager;
-use mod_onlyofficedocspace\moodle\moodle_user_manager;
-use mod_onlyofficedocspace\docspace\docspace_settings;
-use mod_onlyofficedocspace\docspace\docspace_user_manager;
-use mod_onlyofficedocspace\docspace\enums\docspace_user_type;
-use mod_onlyofficedocspace\errors\docspace_error;
-use mod_onlyofficedocspace\errors\validation_error;
+namespace mod_onlyofficedocspace\local\http\requests;
+
+use mod_onlyofficedocspace\local\common\flash_message;
+use mod_onlyofficedocspace\local\docspace\docspace_settings;
+use mod_onlyofficedocspace\local\docspace\docspace_user_manager;
+use mod_onlyofficedocspace\local\docspace\enums\docspace_user_type;
+use mod_onlyofficedocspace\local\errors\docspace_error;
+use mod_onlyofficedocspace\local\errors\validation_error;
+use mod_onlyofficedocspace\local\moodle\moodle_docspace_user_manager;
+use mod_onlyofficedocspace\local\moodle\moodle_user_manager;
 
 /**
  * invite_users_request

classes/http/requests/update_admin_settings_request.php → classes/local/http/requests/update_admin_settings_request.php

@@ -22,17 +22,17 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\http\requests;
-
-use Exception;
-use mod_onlyofficedocspace\common\flash_message;
-use mod_onlyofficedocspace\docspace\docspace_settings;
-use mod_onlyofficedocspace\docspace\docspace_user_manager;
-use mod_onlyofficedocspace\docspace\enums\docspace_user_type;
-use mod_onlyofficedocspace\errors\docspace_error;
-use mod_onlyofficedocspace\errors\invalid_credentials_error;
-use mod_onlyofficedocspace\errors\validation_error;
-use mod_onlyofficedocspace\moodle\moodle_docspace_user_manager;
+namespace mod_onlyofficedocspace\local\http\requests;
+
+use mod_onlyofficedocspace\local\common\flash_message;
+use mod_onlyofficedocspace\local\docspace\docspace_settings;
+use mod_onlyofficedocspace\local\docspace\docspace_user_manager;
+use mod_onlyofficedocspace\local\docspace\enums\docspace_user_type;
+use mod_onlyofficedocspace\local\errors\docspace_error;
+use mod_onlyofficedocspace\local\errors\invalid_credentials_error;
+use mod_onlyofficedocspace\local\errors\validation_error;
+use mod_onlyofficedocspace\local\moodle\moodle_docspace_user_manager;
+use moodle_exception;
 
 /**
  * update_admin_settings_request
@@ -62,20 +62,15 @@ class update_admin_settings_request {
      * @return void
      */
     public function __construct() {
-        if (
-            ! (isset($_POST['url']) && !empty($_POST['url'])
-                && isset($_POST['email']) && !empty($_POST['email'])
-                && isset($_POST['password']) && !empty($_POST['password'])
-                && isset($_POST['randomPassword']) && !empty($_POST['randomPassword']))
-        ) {
+        try {
+            $this->docspaceurl = required_param('url', PARAM_URL);
+            $this->docspaceemail = required_param('email', PARAM_EMAIL);
+            $this->docspacepassword = required_param('password', PARAM_RAW);
+            $this->randompassword = required_param('randomPassword', PARAM_RAW);
+        } catch (moodle_exception) {
             throw new validation_error(get_string('paramsmissingvalidationerror', 'onlyofficedocspace'));
         }
 
-        $this->docspaceurl = $_POST['url'];
-        $this->docspaceemail = $_POST['email'];
-        $this->docspacepassword = $_POST['password'];
-        $this->randompassword = $_POST['randomPassword'];
-
         $this->sanitize();
     }
 

classes/http/requests/update_password_request.php → classes/local/http/requests/update_password_request.php

@@ -22,12 +22,13 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\http\requests;
+namespace mod_onlyofficedocspace\local\http\requests;
 
-use mod_onlyofficedocspace\docspace\docspace_settings;
-use mod_onlyofficedocspace\docspace\docspace_auth_manager;
-use mod_onlyofficedocspace\errors\validation_error;
-use mod_onlyofficedocspace\moodle\moodle_docspace_user_manager;
+use mod_onlyofficedocspace\local\docspace\docspace_auth_manager;
+use mod_onlyofficedocspace\local\docspace\docspace_settings;
+use mod_onlyofficedocspace\local\errors\validation_error;
+use mod_onlyofficedocspace\local\moodle\moodle_docspace_user_manager;
+use moodle_exception;
 
 /**
  * update_password_request
@@ -55,19 +56,19 @@ class update_password_request {
     public function __construct() {
         global $USER;
 
-        if (
-            ! (isset($_POST['email']) && !empty($_POST['email'])
-                && isset($_POST['password']) && !empty($_POST['password']))
-        ) {
+        try {
+            $email = required_param('email', PARAM_EMAIL);
+            $password = required_param('password', PARAM_RAW);
+        } catch (moodle_exception) {
             throw new validation_error(get_string('paramsmissingvalidationerror', 'onlyofficedocspace'));
         }
 
-        if ($USER->email !== $_POST['email']) {
+        if ($USER->email !== $email) {
             throw new validation_error(get_string('invalidparamsvalidationerror', 'onlyofficedocspace'));
         }
 
-        $this->docspaceemail = $_POST['email'];
-        $this->docspacepassword = $_POST['password'];
+        $this->docspaceemail = $email;
+        $this->docspacepassword = $password;
     }
 
     /**

classes/moodle/moodle_docspace_user_manager.php → classes/local/moodle/moodle_docspace_user_manager.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\moodle;
+namespace mod_onlyofficedocspace\local\moodle;
 
 /**
  * Class for managing moodle docspace users
@@ -35,7 +35,7 @@ class moodle_docspace_user_manager {
     /**
      * @var $table table name
      */
-    private $table = 'onlyofficedocspace_docspaceuser';
+    private $table = 'onlyofficedocspace_dsuser';
 
     /**
      * Moodle docspace user manager constructor.
@@ -83,6 +83,18 @@ public function create_or_update(string $email, ?string $password = null): void
         }
     }
 
+    /**
+     * Delete multiple users from database table.
+     * @param array $emails user emails.
+     */
+    public function delete(array $emails): void {
+        $this->persistence->delete_records_select(
+            $this->table,
+            "email IN ('" . implode("','", $emails) . "')",
+            []
+        );
+    }
+
     /**
      * Delete all users from database table.
      */

classes/moodle/moodle_user_manager.php → classes/local/moodle/moodle_user_manager.php

@@ -22,7 +22,7 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_onlyofficedocspace\moodle;
+namespace mod_onlyofficedocspace\local\moodle;
 
 use context_system;