Fixed: Listener sample for overriding of default config.inc.php configuration file.

Fixed: Location regexp in Nginx configuration file.
Fixed: Useless import of the `iMSCP::Rights` package (package handler).
CS fixes

Author: nuxwin

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.0.3 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Listener sample for overriding of default `config.inc.php` configuration file.
+- Location regexp in Nginx configuration file.
+- Useless import of the `iMSCP::Rights` package (package handler).
+- CS fixes
+
 ## 1.0.2 - 20190401
 
 ### Added
@@ -22,9 +47,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- DBI instance must be Lazy loaded
-- Nginx configuration file not removed on uninstallation
-- Uncaught exception in `Package::SqlAdminTools::PhpMyAdmin::Handler::_setupDatabase()`
+- DBI instance must be Lazy loaded.
+- Nginx configuration file not removed on uninstallation.
+- Uncaught exception in `_setupDatabase` routine (package handler).
 
 ## 1.0.1 - 20190331
 

src/Handler.pm

@@ -35,7 +35,6 @@ use iMSCP::Debug qw/ debug error /;
 use iMSCP::EventManager;
 use iMSCP::Execute 'execute';
 use iMSCP::File;
-use iMSCP::Rights 'setRights';
 use iMSCP::TemplateParser qw/ getBloc replaceBloc process /;
 use Scalar::Defer 'lazy';
 use Servers::sqld;
@@ -111,7 +110,7 @@ sub postinstall
         "$CWD/public/tools/phpmyadmin"
     ) ) {
         error( sprintf(
-            "Couldn't create symlink for PhpMyAdmin SQL administration tool"
+            "Couldn't create symlink for the PhpMyAdmin SQL administration tool"
         ));
         return 1;
     }
@@ -285,6 +284,7 @@ sub _buildConfigFiles
             $config{'PMA_CONTROL_USER'}, $config{'PMA_CONTROL_USER_PASSWD'}
         );
 
+        # Save generated values in database (encrypted)
         $self->{'dbh'}->do(
             '
                 INSERT INTO `config` (`name`,`value`)
@@ -340,10 +340,6 @@ sub _buildConfigFiles
         );
         $file->set( $cfgTpl );
         $rs = $file->save();
-        $rs ||= $file->owner(
-            $::imscpConfig{'SYSTEM_USER_PREFIX'} . $::imscpConfig{'SYSTEM_USER_MIN_UID'},
-            $::imscpConfig{'SYSTEM_USER_PREFIX'} . $::imscpConfig{'SYSTEM_USER_MIN_UID'}
-        );
         return $rs if $rs;
 
         # Vendor configuration file
@@ -364,7 +360,7 @@ sub _buildConfigFiles
     };
     if ( $@ ) {
         error( $@ );
-        return 1;
+        $rs = 1;
     }
 
     $rs;

src/config.inc.php

@@ -8,6 +8,10 @@
  *
  * Perl code:
  *
+ * Package Listener::PhpMyAdmin::CustomConfigIncFile;
+ *
+ * use strict;
+ * use warnings;
  * use iMSCP::EventManager;
  * use iMSCP::File;
  * 
@@ -20,9 +24,9 @@
  *
  *   # Load custom PhpMyAdmin configuration file into the $cfgTplContent
  *   # variable.
- *   return 1 unless defined ${ $cfgTplContent } = iMSCP::File->new(
+ *   return 1 unless defined( ${ $cfgTplContent } = iMSCP::File->new(
  *     filename => 'path/to/your/phpmyadmin/conf/file'
- *   )->get();
+ *   )->get() );
  *
  *   0;
  * });

src/nginx.conf

@@ -5,7 +5,7 @@ location = /phpmyadmin {
 location ^~ /phpmyadmin/ {
     root {GUI_ROOT_DIR}/public/tools;
 
-    location ~ /(setup|sql)/ {
+    location ~ ^/phpmyadmin/(setup|sql)/ {
         deny all;
     }