holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed config options that have been moved to forced preferences

Browse Source
This commit is contained in:
jengo 2001-09-03 23:35:38 +00:00
parent 969e39dff0
commit ac6cb8b252
3 changed files with 1 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
preferences/inc/hook_config.inc.php
View File

@ -39,89 +39,4 @@
return $out; return $out;
} }
function force_theme($config)
{
global $phpgw;
$themes = array('user_choice');
$themes += $phpgw->common->list_themes();
while (list ($key, $value) = each ($themes))
{
if ($config['force_theme'] == $value)
{
$selected = ' selected';
}
else
{
$selected = '';
}
if ($value == 'user_choice')
{
$descr = lang('Users Choice');
}
else
{
$descr = $value;
}
$out .= '<option value="' . $value . '"' . $selected .'>'.$descr.'</option>' . "\n";
}
return $out;
}
function template_set($config)
{
global $phpgw;
$templ['user_choice'] = array(
'name' => 'user_choice',
'title' => lang('Users Choice')
);
$templ += $phpgw->common->list_templates();
while (list ($key, $value) = each ($templ))
{
if ($config['template_set'] == $key)
{
$selected = ' selected';
}
else
{
$selected = '';
}
$descr = $templ[$key]['title'];
$out .= '<option value="' . $key . '"' . $selected . '>'.$descr.'</option>' . "\n";
}
return $out;
}
function force_default_app($config)
{
global $phpgw, $phpgw_info;
$out = '<option value="user_choice"';
if ($config['force_default_app'] == 'user_choice')
{
$out .= ' selected';
}
$out .= '>' . lang('Users Choice') . '</option>' . "\n";
reset($phpgw_info['user']['apps']);
while ($permission = each($phpgw_info['user']['apps']))
{
if ($phpgw_info['apps'][$permission[0]]['status'] != 2)
{
$out .= '<option value="' . $permission[0] . '"';
if ($config['force_default_app'] == $permission[0])
{
$out .= ' selected';
}
$out .= '>' . lang($phpgw_info['apps'][$permission[0]]['title']) . '</option>' . "\n";
}
}
return $out;
}
?> ?>

65
preferences/setup/config.inc.php
View File

@ -37,71 +37,6 @@
</tr> </tr>
<?php $selected = array(); ?> <?php $selected = array(); ?>
<?php $selected[$current_config["template_set"]] = " selected"; ?>
<tr bgcolor="e6e6e6">
<td>Interface/Template Selection:<br> <!---(if user choice, and they dont make a selection, then classic will be used)---></td>
<td>
<select name="newsettings[template_set]">
<?php
if ($phpgw_setup)
{
$templates = $phpgw_setup->get_template_list();
}
else
{
$templates = $phpgw->common->list_templates();
}
echo '<option value="user_choice"' . $selected['user_choice'] . '>Users Choice</option>';
while (list ($key, $value) = each ($templates))
{
echo '<option value="'.$key.'" '.$selected[$key].'>'.$templates[$key]["title"].'</option>';
}
?>
</select>
</td>
</tr>
<?php $selected = array(); ?>
<?php $selected[$current_config["force_theme"]] = " selected"; ?>
<tr bgcolor="e6e6e6">
<td>Use theme:<br></td>
<td>
<select name="newsettings[force_theme]">
<?php
if ($phpgw_setup)
{
$themes = $phpgw_setup->list_themes();
}
else
{
$themes = $phpgw->common->list_themes();
}
echo '<option value="user_choice"' . $selected['user_choice'] . '>Users Choice</option>';
while (list ($key, $value) = each ($themes))
{
echo '<option value="'.$value.'" '.$selected[$value].'>'.$value.'</option>';
}
?>
</select>
</td>
</tr>
<?php $selected = array(); ?>
<?php
/* $selected[$current_config["useframes"]] = " selected"; ?>
<tr bgcolor="e6e6e6">
<td>Frame support:</td>
<td>
<select name="newsettings[useframes]">
<option value="allowed"<?php echo $selected["allowed"]; ?>>Allow frames</option>
<option value="always"<?php echo $selected["always"]; ?>>Force frames</option>
<option value="never"<?php echo $selected["never"]; ?>>Disable frames</option>
</select>
</td>
</tr>
<?php $selected = array(); */
?>
<?php $selected = array(); ?> <?php $selected = array(); ?>
<?php $selected[$current_config['htmlcompliant']] = ' selected'; ?> <?php $selected[$current_config['htmlcompliant']] = ' selected'; ?>
<tr bgcolor="e6e6e6"> <tr bgcolor="e6e6e6">

27
preferences/templates/default/config.tpl
View File

@ -48,33 +48,6 @@
</td> </td>
</tr> </tr>
<tr bgcolor="{row_on}">
<td>{lang_Interface}/{lang_Template_Selection}:</td>
<td>
<select name="newsettings[template_set]">
{hook_template_set}
</select>
</td>
</tr>
<tr bgcolor="{row_off}">
<td>{lang_Use_theme}:<br></td>
<td>
<select name="newsettings[force_theme]">
{hook_force_theme}
</select>
</td>
</tr>
<tr bgcolor="{row_off}">
<td>{lang_Force_default_application}:<br></td>
<td>
<select name="newsettings[force_default_app]">
{hook_force_default_app}
</select>
</td>
</tr>
<tr bgcolor="{row_on}"> <tr bgcolor="{row_on}">
<td>{lang_Use_pure_HTML_compliant_code_(not_fully_working_yet)}:</td> <td>{lang_Use_pure_HTML_compliant_code_(not_fully_working_yet)}:</td>
<td> <td>