Update version

Signed-off-by: Valentin Popov <info@valentineus.link>

README.md

@@ -7,9 +7,8 @@
 Authorization plugin for Moodle.
 Adds the ability to authorize a user by a direct link.
 
-<a name="installation">
-    <h2>Installation</h2>
-</a>
+## Installation
+
 Get the installation package in any of the available methods:
 
 * [GitHub Releases](https://github.com/valentineus/auth-link/releases).
@@ -17,9 +16,8 @@ Get the installation package in any of the available methods:
 
 In Moodle in the administration panel go to the "Plugins" section and make a standard installation of the plug-in.
 
-<a name="using">
-    <h2>Using</h2>
-</a>
+## Using
+
 Pass the variables `username` and `password` in any standard way.
 Variables are read from a file `$ _REQUEST`, which guarantees GET and POST requests performance, as well as support for the cookie.
 
@@ -28,9 +26,8 @@ Example of a link that authorizes a user on the course:
 https://yourwebserver.org/course/view.php?id=2&username=guest&password=qwerty
 ```
 
-<a name="build">
-    <h2>Build</h2>
-</a>
+## Build
+
 Self-assembly package is as follows:
 
 * Clone the repository:
@@ -44,9 +41,7 @@ cd ./auth-link
 /bin/sh build.sh
 ```
 
-<a name="license">
-    <h2>License</h2>
-</a>
+## License
 
 <img height="256px" alt="GNU Banner" src="https://www.gnu.org/graphics/runfreegnu.png" />
 

auth.php

@@ -134,9 +134,9 @@ class auth_plugin_link extends auth_plugin_base {
                 $username = htmlspecialchars($_REQUEST['username']);
                 $password = htmlspecialchars($_REQUEST['password']);
 
-                // User existence check
-                if ($user = $DB->get_record('user', array( 'username' => $username) )) {
-                    // Verification of authorization data
+                // User existence check.
+                if ($user = $DB->get_record('user', array('username' => $username) )) {
+                    // Verification of authorization data.
                     if (validate_internal_user_password($user, $password)) {
                         complete_user_login($user);
                         $this->redirect_user();
@@ -152,14 +152,14 @@ class auth_plugin_link extends auth_plugin_base {
     public function redirect_user() {
         global $CFG, $SESSION;
 
+        $redirect = new moodle_url($CFG->wwwroot, $_GET);
+
         if (isset($SESSION->wantsurl)) {
-            $redirect = $SESSION->wantsurl;
+            $redirect = new moodle_url($SESSION->wantsurl, $_GET);
         } else if (isset($_GET['wantsurl'])) {
             $redirect = htmlspecialchars($_GET['wantsurl']);
-        } else {
-            $redirect = $CFG->wwwroot;
         }
 
         redirect($redirect);
     }
-}
+}

build.sh

@@ -11,10 +11,11 @@ export PATH="$PATH:/usr/local/scripts"
 
 # Build the package
 cd ..
+mv "./moodle_auth-link" "./auth-link"
 zip -9 -r "auth-link.zip" "auth-link"  \
         -x "auth-link/.git*"       \
         -x "auth-link/.travis.yml" \
         -x "auth-link/build.sh"
 
 # End of work
-exit 0
+exit 0

version.php

@@ -23,8 +23,8 @@
  */
 
 defined('MOODLE_INTERNAL') || die();
-$plugin->release   = '0.0.1 (Build: 2017101700)';
-$plugin->version   = 2017101700;
+$plugin->release   = '1.1.0 (Build: 2018061000)';
+$plugin->version   = 2018061000;
 $plugin->requires  = 2016112900;
 $plugin->component = 'auth_link';
-$plugin->maturity  = MATURITY_RC;
+$plugin->maturity  = MATURITY_STABLE;