index 9572a774762f38c3b0235bc298d9cd1e40794d30..c6072ccfb82a1336810cc6d9e7d6f63432143c82 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
-
-{if $warnings_cnt}
-<b><font style='color:red' >Errors:</font></b>
-{foreach from=$warnings item=val key=key}
- <br>
- <font style='color:red' >{$val}</font>
-{/foreach}
-{/if}
-
-<div class='default' style='margin:12px; '>
- <div style='float:left; '>
- <br>
- <b>{t}GOsa settings{/t}</b>
- </div>
+<div class='default'>
+ <p><b>{t}Look and feel{/t}</b></p>
<div class='step4_container'>
<div class='step4_name'>
<div class='step4_container'>
<div class='step4_name'>
- {t}GOsa theme{/t}
+ {t}Theme{/t}
</div>
<div class='step4_value'>
<select name="theme">
{html_options options=$themes selected=$theme}
</select>
</div>
</div>
<div class='step4_value'>
<select name="theme">
{html_options options=$themes selected=$theme}
</select>
</div>
- <div class='step4_status'>
- </div>
</div>
</div>
+ <p><b>{t}People and group storage{/t}</b></p>
<div class='step4_container'>
<div class='step4_name'>
<div class='step4_container'>
<div class='step4_name'>
- {t}People dn attribute{/t}
+ {t}People DN attribute{/t}
</div>
<div class='step4_value'>
<select size="1" name="peopledn">
{html_options values=$peopledns output=$peopledns selected=$peopledn}
</select>
</div>
</div>
<div class='step4_value'>
<select size="1" name="peopledn">
{html_options values=$peopledns output=$peopledns selected=$peopledn}
</select>
</div>
- <div class='step4_status'>
- </div>
</div>
<div class='step4_container'>
<div class='step4_name'>
</div>
<div class='step4_container'>
<div class='step4_name'>
- {t}People storage ou{/t}
+ {t}People storage subtree{/t}
</div>
<div class='step4_value'>
</div>
<div class='step4_value'>
- <input type='text' name='peopleou' maxlength='40' size='20' value='{$peopleou}'>
- </div>
- <div class='step4_status'>
+ <input type='text' name='peopleou' maxlength='40' size='40' value='{$peopleou}'>
</div>
</div>
</div>
</div>
-
<div class='step4_container'>
<div class='step4_name'>
<div class='step4_container'>
<div class='step4_name'>
- {t}Group storage ou{/t}
+ {t}Group storage subtree{/t}
</div>
<div class='step4_value'>
</div>
<div class='step4_value'>
- <input type='text' name='groupou' maxlength='40' size='20' value='{$groupou}'>
- </div>
- <div class='step4_status'>
+ <input type='text' name='groupou' maxlength='40' size='40' value='{$groupou}'>
</div>
</div>
</div>
</div>
- <div class='step4_container'>
+ <div class='step4_container'>
<div class='step4_name'>
<div class='step4_name'>
- {t}ID base for users/groups{/t}
+ {t}Include personal title in user DN{/t}
</div>
<div class='step4_value'>
</div>
<div class='step4_value'>
- <input type='text' name='uidbase' maxlength='20' size='10' value='{$uidbase}'>
- </div>
- <div class='step4_status'>
+ <select name="include_personal_title" size="1" title="">
+ {html_options options=$bool selected=$include_personal_title}
+ </select>
</div>
</div>
</div>
</div>
+ <div class='step4_container'>
+ <div class='step4_name'>
+ {t}Relaxed naming policies{/t}
+ </div>
+ <div class='step4_value'>
+ <select name="strict" size="1" title="">
+ {html_options options=$bool selected=$strict}
+ </select>
+ </div>
+ </div>
<div class='step4_container'>
<div class='step4_container'>
- <div class='step4_name'>
- {t}Base hook{/t}
+ <div class='step4_name'>
+ {t}Automatic uids{/t}
</div>
<div class='step4_value'>
</div>
<div class='step4_value'>
- {if $base_hook_active == FALSE}
- <input type='checkbox' value='1' name='base_hook_active'
- onClick='changeState("base_hook");'>
- <input style='width:90%' id='base_hook' name='base_hook' type='text' value='{$base_hook}' disabled>
+ {if $id_settings.idgen_active == FALSE}
+ <input type='checkbox' value='1' name='idgen_active'
+ onClick='changeState("idgen");'>
+ <input size='20' id='idgen' name='idgen' type='text' value='{$id_settings.idgen}' disabled>
{else}
{else}
- <input type='checkbox' value='1' name='base_hook_active' checked>
- <input style='width:90%' id='base_hook' name='base_hook' type='text' value='{$base_hook}' >
+ <input type='checkbox' value='1' name='idgen_active' checked>
+ <input size='20' id='idgen' name='idgen' type='text' value='{$id_settings.idgen}' >
{/if}
</div>
{/if}
</div>
- <div class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
</div>
+ <div class='step4_container'>
+ <div class='step4_name'>
+ {t}GID / UID min id{/t}
+ </div>
+ <div class='step4_value'>
+ {if $id_settings.minid_active == FALSE}
+ <input type='checkbox' value='1' name='minid_active'
+ onClick='changeState("minid");'>
+ <input size='10' id='minid' name='minid' type='text' value='{$id_settings.minid}' disabled>
+ {else}
+ <input type='checkbox' value='1' name='minid_active' checked>
+ <input size='10' id='minid' name='minid' type='text' value='{$id_settings.minid}' >
+ {/if}
+ </div>
+ </div>
- <div class='step4_container'>
+ <div class='step4_container' style="margin-bottom:5px;">
<div class='step4_name'>
<div class='step4_name'>
- {t}Display PHP errors{/t}
+ {t}Number base for people/groups{/t}
</div>
<div class='step4_value'>
</div>
<div class='step4_value'>
- <select name="errorlvl" size="1" title="">
- {html_options options=$bool selected=$errorlvl}
- </select>
+ <input type='text' name='uidbase' maxlength='20' size='10' value='{$uidbase}'>
</div>
</div>
- <div class='step4_status'>
+ </div>
+ <div class='step4_container' style="margin-bottom:5px;">
+ <div class='step4_name'>
+ {t}Hook for number base{/t}
+ </div>
+ <div class='step4_value'>
+ {if $base_hook_active == FALSE}
+ <input type='checkbox' value='1' name='base_hook_active'
+ onClick='changeState("base_hook");'>
+ <input id='base_hook' name='base_hook' size=40 type='text' value='{$base_hook}' disabled>
+ {else}
+ <input type='checkbox' value='1' name='base_hook_active' checked>
+ <input id='base_hook' name='base_hook' size=40 type='text' value='{$base_hook}' >
+ {/if}
+ </div>
</div>
</div>
</div>
</div>
- <div style='float:left;'>
- <br>
- <b>{t}Password settings{/t}</b>
- </div>
+
+ <p><b>{t}Password settings{/t}</b></p>
<div class='step4_container'>
<div class='step4_name'>
<div class='step4_container'>
<div class='step4_name'>
{html_options options=$crypt_methods selected=$encryption}
</select>
</div>
{html_options options=$crypt_methods selected=$encryption}
</select>
</div>
- <div class='step4_status'>
- </div>
</div>
<div class='step4_container' style='height:4em;'>
</div>
<div class='step4_container' style='height:4em;'>
{/if}
</div>
{/if}
</div>
- <div class='step4_status' style='height:4em;'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
</div>
- <div class='step4_container'>
+ <div class='step4_container'>
<div class='step4_name'>
<div class='step4_name'>
- {t}External script{/t}
+ {t}Password change hook{/t}
</div>
<div class='step4_value'>
{if $pwd_rules.externalpwdhook_active == FALSE}
<input type='checkbox' value='1' name='externalpwdhook_active'
onClick='changeState("externalpwdhook");'>
</div>
<div class='step4_value'>
{if $pwd_rules.externalpwdhook_active == FALSE}
<input type='checkbox' value='1' name='externalpwdhook_active'
onClick='changeState("externalpwdhook");'>
- <input style='width:90%' id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' disabled>
+ <input size=40 id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' disabled>
{else}
<input type='checkbox' value='1' name='externalpwdhook_active' checked>
{else}
<input type='checkbox' value='1' name='externalpwdhook_active' checked>
- <input style='width:90%' id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' >
+ <input size=40 id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' >
{/if}
</div>
{/if}
</div>
- <div class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
</div>
- <div style='float:left; '>
- <br>
- <b>{t}Mail settings{/t}</b>
- </div>
-
<div class='step4_container'>
<div class='step4_name'>
<div class='step4_container'>
<div class='step4_name'>
- {t}Mail method{/t}
+ {t}Use SASL for kerberos{/t}
</div>
<div class='step4_value'>
</div>
<div class='step4_value'>
- <select name="mail" size="1" title="">
- <option value="disabled">{t}disabled{/t}</option>
- {html_options options=$mail_methods selected=$mail}
+ <select name="krbsasl" size="1" title="">
+ {html_options options=$bool selected=$krbsasl}
</select>
</div>
</select>
</div>
- <div class='step4_status'>
- </div>
</div>
<div class='step4_container'>
<div class='step4_name'>
</div>
<div class='step4_container'>
<div class='step4_name'>
- {t}Vacation templates{/t}
+ {t}Use account expiration{/t}
</div>
<div class='step4_value'>
</div>
<div class='step4_value'>
- {if $mail_settings.vacationdir_active == FALSE}
- <input type='checkbox' value='1' name='vacationdir_active'
- onClick='changeState("vacationdir");'>
- <input style='width:90%' id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}' disabled>
- {else}
- <input type='checkbox' value='1' name='vacationdir_active' checked>
- <input style='width:90%' id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}' >
- {/if}
- </div>
- <div class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
- </div>
-
- <div class='step4_container'>
- <div class='step4_name'>
- {t}Use cyrus account style{/t}
- </div>
- <div class='step4_value'>
- <select name="cyrusunixstyle" size="1" title="">
- {html_options options=$bool selected=$cyrusunixstyle}
+ <select name="account_expiration" size="1" title="">
+ {html_options options=$bool selected=$account_expiration}
</select>
</div>
</select>
</div>
- <div class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
</div>
-</div>
+
<input type='hidden' value='1' name='step5_posted'>
<!--
<input type='hidden' value='1' name='step5_posted'>
<!--