oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-22 17:18:37 +00:00
Code Wiki Activity

remove craueconfig domain name setting and add a proper one in parameters

Browse source
This commit is contained in:
Thomas Citharel 2017-06-01 10:42:19 +02:00
parent 6ed2627bb3
commit be9d693e74
18 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -151,7 +151,7 @@ class ConfigController extends Controller
'token' => $config->getRssToken(),
],
'twofactor_auth' => $this->getParameter('twofactor_auth'),
'wallabag_url' => $this->get('craue_config')->get('wallabag_url'),
'wallabag_url' => $this->getParameter('domain_name'),
'enabled_users' => $this->getDoctrine()
->getRepository('WallabagUserBundle:User')
->getSumEnabledUsers(),

1
src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
View file

@ -62,6 +62,7 @@ class Configuration implements ConfigurationInterface
->end()
->end()
->end()
->scalarNode('domain_name')
->end()
->end()
;

1
src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
View file

@ -29,6 +29,7 @@ class WallabagCoreExtension extends Extension
$container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']);
$container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']);
$container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']);
$container->setParameter('wallabag_core.domain_name', $config['domain_name']);
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yml');

2
src/Wallabag/CoreBundle/Resources/config/services.yml
View file

@ -122,7 +122,7 @@ services:
wallabag_core.helper.entries_export:
class: Wallabag\CoreBundle\Helper\EntriesExport
arguments:
- '@=service(''craue_config'').get(''wallabag_url'')'
- '%domain_name%'
- src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
wallabag.operator.array.matches:

2
src/Wallabag/UserBundle/Resources/config/services.yml
View file

@ -7,7 +7,7 @@ services:
- "%scheb_two_factor.email.sender_email%"
- "%scheb_two_factor.email.sender_name%"
- '@=service(''craue_config'').get(''wallabag_support_url'')'
- '@=service(''craue_config'').get(''wallabag_url'')'
- '%domain_name%'
wallabag_user.password_resetting:
class: Wallabag\UserBundle\EventListener\PasswordResettingListener