mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus

Browse Source 
* github-nickvergessen/ticket/10073: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
This commit is contained in:
Nils Adermann
2014-06-09 17:55:25 +02:00
parent 0c5af536f1 92f43c5371
commit b6232aa9b2
40 changed files with 1745 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
phpBB/phpbb/db/migration/data/v310/contact_admin_acp_module.php Normal file
View File

@@ -0,0 +1,27 @@
<?php
/**
*
* @package migration
* @copyright (c) 2014 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
namespace phpbb\db\migration\data\v310;
class contact_admin_acp_module extends \phpbb\db\migration\migration
{
public function update_data()
{
return array(
array('module.add', array(
'acp',
'ACP_BOARD_CONFIGURATION',
array(
'module_basename' => 'acp_contact',
'modes' => array('contact'),
),
)),
);
}
}

37
phpBB/phpbb/db/migration/data/v310/contact_admin_form.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
/**
*
* @package migration
* @copyright (c) 2014 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
namespace phpbb\db\migration\data\v310;
class contact_admin_form extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return isset($this->config['contact_admin_form_enable']);
}
public function update_data()
{
return array(
array('config.add', array('contact_admin_form_enable', 1)),
array('custom', array(array($this, 'contact_admin_info'))),
);
}
public function contact_admin_info()
{
$text_config = new \phpbb\config\db_text($this->db, $this->table_prefix . 'config_text');
$text_config->set_array(array(
'contact_admin_info' => '',
'contact_admin_info_uid' => '',
'contact_admin_info_bitfield' => '',
'contact_admin_info_flags' => OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS,
));
}
}