maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- correct links on client-settings page

Browse Source 
- added new server_id parameter to buildFormEx, so getFormGroupOutput will use the correct template (with correct links)
This commit is contained in:
Michael Kaufmann (d00p)
2010-10-20 07:40:34 +00:00
parent d3fd4ee2f4
commit 836b7fb056
7 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_clients.php
View File

@@ -214,7 +214,7 @@ if((int)$settings['multiserver']['enabled'] == 1)
* @TODO this has to get the client-id so the * @TODO this has to get the client-id so the
* links "configuration" have the ID * links "configuration" have the ID
*/ */
$fields = buildFormEx($settings_data, $_part); $fields = buildFormEx($settings_data, $_part, $id);
$settings_page = ''; $settings_page = '';
if($_part == '') if($_part == '')

4
lib/functions/formfields/function.buildFormEx.php
View File

@@ -15,7 +15,7 @@
* @version $Id $ * @version $Id $
*/ */
function buildFormEx($form, $part = '') function buildFormEx($form, $part = '', $server_id = 0)
{ {
$fields = ''; $fields = '';
@@ -28,7 +28,7 @@ function buildFormEx($form, $part = '')
{ {
if(isset($groupdetails['title']) && $groupdetails['title'] != '') if(isset($groupdetails['title']) && $groupdetails['title'] != '')
{ {
$fields .= getFormOverviewGroupOutput($groupname, $groupdetails); $fields .= getFormOverviewGroupOutput($groupname, $groupdetails, $server_id);
} }
} }
// only show one section // only show one section

12
lib/functions/formfields/function.getFormGroupOutput.php
View File

@@ -24,7 +24,7 @@ function getFormGroupOutput($groupname, $groupdetails)
return $group; return $group;
} }
function getFormOverviewGroupOutput($groupname, $groupdetails) function getFormOverviewGroupOutput($groupname, $groupdetails, $server_id = 0)
{ {
global $lng, $settings, $filename, $s; global $lng, $settings, $filename, $s;
@@ -81,6 +81,16 @@ function getFormOverviewGroupOutput($groupname, $groupdetails)
} }
} }
// if the server_id is > 0 then
// this is a client-settings page
// and we need another template
if($server_id > 0)
{
eval("\$group = \"" . getTemplate("froxlorclients/froxlorclient_settingsoverviewgroup") . "\";");
}
else
{
eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";"); eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";");
}
return $group; return $group;
} }

3
lib/functions/froxlor/function.loadConfigArrayDir.php
View File

@@ -82,10 +82,11 @@ function loadConfigArrayDir()
&& is_array($selection) && is_array($selection)
&& isset($selection[0]) && isset($selection[0])
) { ) {
$_data['groups'] = array();
foreach($data['groups'] as $group => $data) foreach($data['groups'] as $group => $data)
{ {
if(in_array($group, $selection)) { if(in_array($group, $selection)) {
$_data[$group] = $data; $_data['groups'][$group] = $data;
} }
} }
$data = $_data; $data = $_data;

2
templates/admin/froxlorclients/froxlorclient_settings.tpl
View File

@@ -1,7 +1,7 @@
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable"> <table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
<tr> <tr>
<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclient_settings']}&nbsp;"{$client->Get('name')}</b> <td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclient_settings']}&nbsp;"{$client->Get('name')}</b>
[<a href="$filename?page=settings&amp;part=&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['compactoverview']}</a>]</td> [<a href="$filename?page=clients&amp;action=settings&amp;part=&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['compactoverview']}</a>]</td>
</tr> </tr>
$fields $fields
<tr> <tr>

2
templates/admin/froxlorclients/froxlorclient_settingsoverview.tpl
View File

@@ -2,7 +2,7 @@
<tr> <tr>
<td class="maintitle" align="center" colspan="3"> <td class="maintitle" align="center" colspan="3">
<b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> <b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b>
[<a href="$filename?page=settings&amp;part=all&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['overview']}</a>] [<a href="$filename?page=clients&amp;action=settings&amp;part=all&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['overview']}</a>]
</td> </td>
</tr> </tr>
$fields $fields

12
templates/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl Normal file
View File

@@ -0,0 +1,12 @@
<tr>
<td class="maintitle_apply_left">
<b><img src="images/title.gif" alt="" />&nbsp;{$title}</b>
</td>
<td class="main_field_display_small" nowrap="nowrap">{$option}</td>
<td class="main_field_display_small" nowrap="nowrap">
<if $activated == 1>
<a href="$filename?page=clients&amp;action=settings&amp;part=$part&amp;s=$s&amp;id={$server_id}">{$lng['admin']['configfiles']['serverconfiguration']}</a>
</if>
</td>
</tr>