diff options
| author | Nitish Bezzala <nbezzala@yahoo.com> | 2016-04-26 23:14:24 +0300 |
|---|---|---|
| committer | Thomas Steur <tsteur@users.noreply.github.com> | 2016-04-26 23:14:24 +0300 |
| commit | 1266ba27a82880f252f2e59994dc9d4bf5705b06 (patch) | |
| tree | f1f23b0145e0a23948e83ad5813b40e0f2fceb00 /plugins | |
| parent | 425fcea8b6e0de720dc85622728775e5c8f955c3 (diff) | |
allow + in database names during setup (#10091)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Installation/FormDatabaseSetup.php | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php index 2a54f8722a..bd5e668cf4 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -34,6 +34,7 @@ class FormDatabaseSetup extends QuickForm2 function init() { HTML_QuickForm2_Factory::registerRule('checkValidFilename', 'Piwik\Plugins\Installation\FormDatabaseSetup_Rule_checkValidFilename'); + HTML_QuickForm2_Factory::registerRule('checkValidDbname', 'Piwik\Plugins\Installation\FormDatabaseSetup_Rule_checkValidDbname'); HTML_QuickForm2_Factory::registerRule('checkUserPrivileges', 'Piwik\Plugins\Installation\Rule_checkUserPrivileges'); $availableAdapters = Adapter::getAdapters(); @@ -60,7 +61,7 @@ class FormDatabaseSetup extends QuickForm2 $item = $this->addElement('text', 'dbname') ->setLabel(Piwik::translate('Installation_DatabaseSetupDatabaseName')); $item->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_DatabaseSetupDatabaseName'))); - $item->addRule('checkValidFilename', Piwik::translate('General_NotValid', Piwik::translate('Installation_DatabaseSetupDatabaseName'))); + $item->addRule('checkValidDbname', Piwik::translate('General_NotValid', Piwik::translate('Installation_DatabaseSetupDatabaseName'))); $this->addElement('text', 'tables_prefix') ->setLabel(Piwik::translate('Installation_DatabaseSetupTablePrefix')) @@ -302,7 +303,7 @@ class Rule_checkUserPrivileges extends HTML_QuickForm2_Rule } /** - * Filename check for prefix/DB name + * Filename check for prefix * */ class FormDatabaseSetup_Rule_checkValidFilename extends HTML_QuickForm2_Rule @@ -315,3 +316,17 @@ class FormDatabaseSetup_Rule_checkValidFilename extends HTML_QuickForm2_Rule } } +/** + * Filename check for DB name + * + */ +class FormDatabaseSetup_Rule_checkValidDbname extends HTML_QuickForm2_Rule +{ + function validateOwner() + { + $prefix = $this->owner->getValue(); + return empty($prefix) + || DbHelper::isValidDbname($prefix); + } +} + |