diff --git a/language/de/info_acp_portal.php b/language/de/info_acp_portal.php
index 63de2baf..abc31f1e 100644
--- a/language/de/info_acp_portal.php
+++ b/language/de/info_acp_portal.php
@@ -38,4 +38,17 @@ $lang = array_merge($lang, array(
'ACP_PORTAL' => 'Portal',
'ACP_PORTAL_GENERAL_INFO' => 'Allgemeine Einstellungen',
'ACP_PORTAL_UPLOAD' => 'Modul hochladen',
+
+ // Logs
+ 'LOG_PORTAL_LINK_ADDED' => 'Portal-Einstellungen geändert
» Link hinzugefügt: %s ',
+ 'LOG_PORTAL_LINK_UPDATED' => 'Portal-Einstellungen geändert
» Link geändert: %s ',
+ 'LOG_PORTAL_LINK_REMOVED' => 'Portal-Einstellungen geändert
» Link gelöscht: %s ',
+ 'LOG_PORTAL_EVENT_ADDED' => 'Portal-Einstellungen geändert
» Termin eingetragen: %s ',
+ 'LOG_PORTAL_EVENT_UPDATED' => 'Portal-Einstellungen geändert
» Termin geändert: %s ',
+ 'LOG_PORTAL_EVENT_REMOVED' => 'Portal-Einstellungen geändert
» Termin gelöscht: %s ',
+ 'LOG_PORTAL_CONFIG' => 'Portal-Einstellungen geändert
» %s',
+
+ // Adding the permissions
+ 'ACL_A_MANAGE_PORTAL' => 'Kann Portal-Einstellungen ändern',
+ 'ACL_U_VIEW_PORTAL' => 'Kann das Portal sehen',
));
diff --git a/language/de/portal_acp.php b/language/de/portal_acp.php
index aa25139a..6fde2df8 100644
--- a/language/de/portal_acp.php
+++ b/language/de/portal_acp.php
@@ -98,12 +98,6 @@ $lang = array_merge($lang, array(
'LINK_ADDED' => 'Der Link wurde erfolgreich eingetragen',
'LINK_UPDATED' => 'Der Link wurde erfolgreich geändert',
- 'LOG_PORTAL_LINK_ADDED' => 'Portal-Einstellungen geändert
» Link hinzugefügt: %s ',
- 'LOG_PORTAL_LINK_UPDATED' => 'Portal-Einstellungen geändert
» Link geändert: %s ',
- 'LOG_PORTAL_LINK_REMOVED' => 'Portal-Einstellungen geändert
» Link gelöscht: %s ',
- 'LOG_PORTAL_EVENT_ADDED' => 'Portal-Einstellungen geändert
» Termin eingetragen: %s ',
- 'LOG_PORTAL_EVENT_UPDATED' => 'Portal-Einstellungen geändert
» Termin geändert: %s ',
- 'LOG_PORTAL_EVENT_REMOVED' => 'Portal-Einstellungen geändert
» Termin gelöscht: %s ',
// Upload Module
'MODULE_UPLOAD' => 'Lade ein Modul hoch',
@@ -126,9 +120,6 @@ $lang = array_merge($lang, array(
'PORTAL_BASIC_INSTALL' => 'Füge Basismodule hinzu',
'PORTAL_BASIC_UNINSTALL' => 'Entferne Module von Datenbank',
- // Logs
- 'LOG_PORTAL_CONFIG' => 'Portal-Einstellungen geändert
» %s',
-
/**
* A copy of Handyman` s MOD version check, to view it on the gallery overview
*/
@@ -141,9 +132,4 @@ $lang = array_merge($lang, array(
'RELEASE_ANNOUNCEMENT' => 'Ankündigungsthema',
'UP_TO_DATE' => '%s ist aktuell',
'VERSION_CHECK' => 'MOD Version Check',
-
- // Adding the permissions
- 'ACL_A_MANAGE_PORTAL' => 'Kann Portal-Einstellungen ändern',
- 'ACL_U_VIEW_PORTAL' => 'Kann das Portal sehen',
-
));
diff --git a/language/en/info_acp_portal.php b/language/en/info_acp_portal.php
index ce31234c..68680bbd 100644
--- a/language/en/info_acp_portal.php
+++ b/language/en/info_acp_portal.php
@@ -37,4 +37,17 @@ $lang = array_merge($lang, array(
'ACP_PORTAL' => 'Portal',
'ACP_PORTAL_GENERAL_INFO' => 'General settings',
'ACP_PORTAL_UPLOAD' => 'Upload module',
+
+ // Portal logs
+ 'LOG_PORTAL_LINK_ADDED' => 'Altered Portal settings
» Link added: %s ',
+ 'LOG_PORTAL_LINK_UPDATED' => 'Altered Portal settings
» Link updated: %s ',
+ 'LOG_PORTAL_LINK_REMOVED' => 'Altered Portal settings
» Link removed: %s ',
+ 'LOG_PORTAL_EVENT_ADDED' => 'Altered Portal settings
» Event added: %s ',
+ 'LOG_PORTAL_EVENT_UPDATED' => 'Altered Portal settings
» Event updated: %s ',
+ 'LOG_PORTAL_EVENT_REMOVED' => 'Altered Portal settings
» Event removed: %s ',
+ 'LOG_PORTAL_CONFIG' => 'Altered Portal settings
» %s',
+
+ // Adding the permissions
+ 'ACL_A_MANAGE_PORTAL' => 'Can alter Portal settings',
+ 'ACL_U_VIEW_PORTAL' => 'Can view the Portal',
));
diff --git a/language/en/portal_acp.php b/language/en/portal_acp.php
index fac82bcc..d286dba0 100644
--- a/language/en/portal_acp.php
+++ b/language/en/portal_acp.php
@@ -97,12 +97,6 @@ $lang = array_merge($lang, array(
'LINK_ADDED' => 'The link has been successfully added',
'LINK_UPDATED' => 'The link has been successfully updated',
- 'LOG_PORTAL_LINK_ADDED' => 'Altered Portal settings
» Link added: %s ',
- 'LOG_PORTAL_LINK_UPDATED' => 'Altered Portal settings
» Link updated: %s ',
- 'LOG_PORTAL_LINK_REMOVED' => 'Altered Portal settings
» Link removed: %s ',
- 'LOG_PORTAL_EVENT_ADDED' => 'Altered Portal settings
» Event added: %s ',
- 'LOG_PORTAL_EVENT_UPDATED' => 'Altered Portal settings
» Event updated: %s ',
- 'LOG_PORTAL_EVENT_REMOVED' => 'Altered Portal settings
» Event removed: %s ',
// Upload Module
'MODULE_UPLOAD' => 'Upload a module',
@@ -125,9 +119,6 @@ $lang = array_merge($lang, array(
'PORTAL_BASIC_INSTALL' => 'Adding basic set of modules',
'PORTAL_BASIC_UNINSTALL' => 'Removing modules from database',
- // Logs
- 'LOG_PORTAL_CONFIG' => 'Altered Portal settings
» %s',
-
/**
* A copy of Handyman` s MOD version check, to view it on the portal overview
*/
@@ -140,8 +131,4 @@ $lang = array_merge($lang, array(
'RELEASE_ANNOUNCEMENT' => 'Annoucement Topic',
'UP_TO_DATE' => '%s is up to date',
'VERSION_CHECK' => 'MOD Version Check',
-
- // Adding the permissions
- 'ACL_A_MANAGE_PORTAL' => 'Can alter Portal settings',
- 'ACL_U_VIEW_PORTAL' => 'Can view the Portal',
));
diff --git a/tests/functional/portal_acp_test.php b/tests/functional/portal_acp_test.php
index 59ea6794..fd2d197b 100644
--- a/tests/functional/portal_acp_test.php
+++ b/tests/functional/portal_acp_test.php
@@ -75,4 +75,26 @@ class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframewor
$form->setValues(array('module_classname' => $module_name));
self::submit($form);
}
+
+ public function test_portal_logs()
+ {
+ $this->add_lang_ext('board3/portal', 'info_acp_portal');
+ $crawler = self::request('GET', 'adm/index.php?i=-board3-portal-acp-portal_module&mode=config&sid=' . $this->sid);
+ $form = $crawler->selectButton('submit')->form();
+ $crawler = self::submit($form);
+ $this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
+
+ // Take a look at the logs
+ $crawler = self::request('GET', 'adm/index.php?i=acp_logs&mode=admin&sid=' . $this->sid);
+ $this->assertContains(strip_tags(html_entity_decode($this->lang('LOG_PORTAL_CONFIG', $this->lang('ACP_PORTAL_GENERAL_INFO')), ENT_COMPAT, 'UTF-8')), $crawler->text());
+ }
+
+ public function test_portal_permissions()
+ {
+ $this->add_lang_ext('board3/portal', 'info_acp_portal');
+ $crawler = self::request('GET', 'adm/index.php?i=acp_permissions&mode=setting_group_global&sid=' . $this->sid);
+ $form = $crawler->selectButton('submit')->form();
+ $crawler = self::submit($form);
+ $this->assertContainsLang('ACL_U_VIEW_PORTAL', $crawler->text());
+ }
}