makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15289] Dont use short names

Browse source 
PHPBB3-15289
This commit is contained in:
Rubén Calvo 2017-09-07 16:31:24 +02:00
parent 5420d660ba
commit 500404a921
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
phpBB/includes/acp/acp_storage.php
View file

@ -111,9 +111,9 @@ class acp_storage
// Check if options have been modified // Check if options have been modified
if (!$modified) if (!$modified)
{ {
foreach (array_keys($options) as $def) foreach (array_keys($options) as $definition)
{ {
if ($this->get_new_def($storage_name, $def) != $this->get_current_def($storage_name, $def)) if ($this->get_new_definition($storage_name, $definition) != $this->get_current_definition($storage_name, $definition))
{ {
$modified = true; $modified = true;
break; break;
@ -171,14 +171,14 @@ class acp_storage
return $this->provider_collection->get_by_class($provider)->get_options(); return $this->provider_collection->get_by_class($provider)->get_options();
} }
protected function get_current_def($storage_name, $def) protected function get_current_definition($storage_name, $definition)
{ {
return $this->config['storage\\' . $storage_name . '\\config\\' . $def]; return $this->config['storage\\' . $storage_name . '\\config\\' . $definition];
} }
protected function get_new_def($storage_name, $def) protected function get_new_definition($storage_name, $definition)
{ {
return $this->request->variable([$storage_name, $def], ''); return $this->request->variable([$storage_name, $definition], '');
} }
protected function validate_data($storage_name, &$messages) protected function validate_data($storage_name, &$messages)
@ -206,33 +206,33 @@ class acp_storage
// Check options // Check options
$new_options = $this->get_provider_options($this->get_new_provider($storage_name)); $new_options = $this->get_provider_options($this->get_new_provider($storage_name));
foreach ($new_options as $def_k => $def_v) foreach ($new_options as $definition_key => $definition_value)
{ {
$provider = $this->provider_collection->get_by_class($this->get_new_provider($storage_name)); $provider = $this->provider_collection->get_by_class($this->get_new_provider($storage_name));
$def_title = $this->lang->lang('STORAGE_ADAPTER_' . strtoupper($provider->get_name()) . '_OPTION_' . strtoupper($def_k)); $definition_title = $this->lang->lang('STORAGE_ADAPTER_' . strtoupper($provider->get_name()) . '_OPTION_' . strtoupper($definition_key));
$value = $this->get_new_def($storage_name, $def_k); $value = $this->get_new_definition($storage_name, $definition_key);
switch ($def_v['type']) switch ($definition_value['type'])
{ {
case 'email': case 'email':
if (!filter_var($value, FILTER_VALIDATE_EMAIL)) if (!filter_var($value, FILTER_VALIDATE_EMAIL))
{ {
$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $def_title, $storage_title); $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title);
} }
case 'text': case 'text':
case 'password': case 'password':
$maxlength = isset($def_v['maxlength']) ? $def_v['maxlength'] : 255; $maxlength = isset($definition_value['maxlength']) ? $definition_value['maxlength'] : 255;
if (strlen($value) > $maxlength) if (strlen($value) > $maxlength)
{ {
$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $def_title, $storage_title); $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title);
} }
break; break;
case 'radio': case 'radio':
case 'select': case 'select':
if (!in_array($value, array_values($def_v['options']))) if (!in_array($value, array_values($definition_value['options'])))
{ {
$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $def_title, $storage_title); $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title);
} }
break; break;
} }
@ -244,9 +244,9 @@ class acp_storage
$current_options = $this->get_provider_options($this->get_current_provider($storage_name)); $current_options = $this->get_provider_options($this->get_current_provider($storage_name));
// Remove old storage config // Remove old storage config
foreach (array_keys($current_options) as $def) foreach (array_keys($current_options) as $definition)
{ {
$this->config->delete('storage\\' . $storage_name . '\\config\\' . $def); $this->config->delete('storage\\' . $storage_name . '\\config\\' . $definition);
} }
// Update provider // Update provider
@ -255,9 +255,9 @@ class acp_storage
// Set new storage config // Set new storage config
$new_options = $this->get_provider_options($this->get_new_provider($storage_name)); $new_options = $this->get_provider_options($this->get_new_provider($storage_name));
foreach (array_keys($new_options) as $def) foreach (array_keys($new_options) as $definition)
{ {
$this->config->set('storage\\' . $storage_name . '\\config\\' . $def, $this->get_new_def($storage_name, $def)); $this->config->set('storage\\' . $storage_name . '\\config\\' . $definition, $this->get_new_definition($storage_name, $definition));
} }
} }
} }