MDL-43189 core: Validate db prefix during installation

moodle · Nov 1, 2019 · 7a902de · 7a902de
1 parent a78ed9e
commit 7a902de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lang/en/install.php b/lang/en/install.php
@@ -144,6 +144,7 @@
 $string['inputwebadress'] = 'Web address :';
 $string['inputwebdirectory'] = 'Moodle directory:';
 $string['installation'] = 'Installation';
+$string['invaliddbprefix'] = 'Invalid prefix. The prefix can only consist of lower case letters and underscore.';
 $string['langdownloaderror'] = 'Unfortunately the language "{$a}" could not be downloaded. The installation process will continue in English.';
 $string['langdownloadok'] = 'The language "{$a}" was installed successfully. The installation process will continue in this language.';
 $string['memorylimit'] = 'Memory limit';

diff --git a/lib/installlib.php b/lib/installlib.php
@@ -179,6 +179,9 @@ function install_helpbutton($url, $title='') {
  * @return string
  */
 function install_db_validate($database, $dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions) {
+    if (!preg_match('/^[a-z_]*$/', $prefix)) {
+        return get_string('invaliddbprefix', 'install');
+    }
     try {
         try {
             $database->connect($dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions);