[ticket/571] Use proper links for forms in ACP

B3P-571
This commit is contained in:
Marc Alexander
2015-06-06 15:37:03 +02:00
parent 45fb1c859d
commit 31d01f0aa4
7 changed files with 9 additions and 9 deletions

View File

@@ -80,7 +80,7 @@
</form>
<!-- ELSE -->
<form id="acp_portal_calendar" method="post" action="{U_ACTION}">
<form id="acp_portal_calendar" method="post" action="{B3P_U_ACTION}">
<!-- IF SHOW_MODULE_OPTIONS -->
<fieldset>
<legend>{L_MODULE_OPTIONS}</legend>
@@ -156,7 +156,7 @@
<input class="button2" name="add" type="submit" value="{L_ADD_EVENT}" />
</p>
<table cellspacing="1">
<table style="cellspacing: 1;">
<thead>
<tr>
<th>{L_EVENT_TITLE}</th>

View File

@@ -71,7 +71,7 @@
</form>
<!-- ELSE -->
<form id="acp_portal_links" method="post" action="{U_ACTION}">
<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
<!-- IF SHOW_MODULE_OPTIONS -->
<fieldset>
<legend>{L_MODULE_OPTIONS}</legend>
@@ -146,7 +146,7 @@
<input class="button2" name="add" type="submit" value="{L_ACP_PORTAL_MENU_ADD}" />
</p>
<table cellspacing="1">
<table style="cellspacing: 1;">
<thead>
<tr>
<th>{L_ACP_PORTAL_MENU_TITLE}</th>

View File

@@ -426,7 +426,7 @@ class calendar extends module_base
$events = (strlen($portal_config['board3_calendar_events_' . $module_id]) >= 1) ? $this->utf_unserialize($portal_config['board3_calendar_events_' . $module_id]) : array();
// append_sid() adds adm/ already, no need to add it here
$u_action = append_sid('index.' . $this->php_ext, 'i=\board3\portal\acp\portal_module&amp;mode=config&amp;module_id=' . $module_id);
$u_action = append_sid('index.' . $this->php_ext, 'i=-board3-portal-acp-portal_module&amp;mode=config&amp;module_id=' . $module_id);
switch ($action)
{

View File

@@ -187,7 +187,7 @@ class custom extends module_base
$portal_config = obtain_portal_config();
$u_action = append_sid('index.' . $this->php_ext, 'i=\board3\portal\acp\portal_module&amp;mode=config&amp;module_id=' . $module_id);
$u_action = append_sid('index.' . $this->php_ext, 'i=-board3-portal-acp-portal_module&amp;mode=config&amp;module_id=' . $module_id);
switch ($action)
{

View File

@@ -304,7 +304,7 @@ class main_menu extends module_base
$links = $this->utf_unserialize($portal_config['board3_menu_array_' . $module_id]);
$u_action = append_sid('index.' . $this->php_ext, 'i=%5Cboard3%5Cportal%5Cacp%5Cportal_module&amp;mode=config&amp;module_id=' . $module_id);
$u_action = append_sid('index.' . $this->php_ext, 'i=-board3-portal-acp-portal_module&amp;mode=config&amp;module_id=' . $module_id);
switch ($action)
{

View File

@@ -171,7 +171,7 @@ class welcome extends module_base
$portal_config = obtain_portal_config();
$u_action = append_sid('index.' . $this->php_ext, 'i=\board3\portal\acp\portal_module&amp;mode=config&amp;module_id=' . $module_id);
$u_action = append_sid('index.' . $this->php_ext, 'i=-board3-portal-acp-portal_module&amp;mode=config&amp;module_id=' . $module_id);
switch($action)
{

View File

@@ -128,7 +128,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
public function test_get_module_link()
{
$this->modules_manager->set_acp_class('foo\bar')->set_u_action('index.php?i=25&amp;mode=barfoo');
$this->assertEquals('index.php?i=%5Cfoo%5Cbar&amp;mode=test&amp;module_id=5', $this->modules_manager->get_module_link('test', 5));
$this->assertEquals('index.php?i=-foo-bar&amp;mode=test&amp;module_id=5', $this->modules_manager->get_module_link('test', 5));
}
public function test_handle_ajax_request()