Index: trunk/admin/templates/classic/config.tpl
===================================================================
--- trunk/admin/templates/classic/config.tpl	(revision 597)
+++ trunk/admin/templates/classic/config.tpl	(revision 597)
@@ -0,0 +1,186 @@
+<!-- BEGIN header -->
+<form method="POST" action="{action_url}">
+<table align="center" width="85%" callspacing="0" style="{ border: 1px solid #000000; }">
+   <tr class="th">
+    <td colspan="2">&nbsp;<b>{title}</b></td>
+   </tr>
+<!-- END header -->
+<!-- BEGIN body -->
+	<tr class="row_on">
+    <td>{lang_Time_for_expire_inatives_accounts(0 for never expires)}:</td>
+    <td><input size="8" name="newsettings[time_to_account_expires]" value="{value_time_to_account_expires}"></td>
+   </tr>
+   <tr class="row_off">
+    <td>{lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}:</td>
+    <td><input size="8" name="newsettings[sessions_timeout]" value="{value_sessions_timeout}"></td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_Timeout_for_application_session_data_in_seconds_(default_86400_=_1_day)}:</td>
+    <td><input size="8" name="newsettings[sessions_app_timeout]" value="{value_sessions_app_timeout}"></td>
+   </tr>
+
+   <tr class="row_off">
+    <td>{lang_Would_you_like_to_show_each_application's_upgrade_status_?}:</td><td>
+     <select name="newsettings[checkappversions]">
+      <option value="">{lang_No}</option>
+      <option value="Admin"{selected_checkappversions_Admin}>{lang_Admins}</option>
+      <option value="All"{selected_checkappversions_All}>{lang_All_Users}</option>
+     </select>
+    </td>
+   </tr>
+   <tr class="row_on">
+    <td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
+    <td>
+     <select name="newsettings[disable_autoload_langfiles]">
+      <option value="">{lang_Yes}</option>
+      <option value="True"{selected_disable_autoload_langfiles_True}>{lang_No}</option>
+     </select>
+    </td>
+   </tr>
+
+    <tr class="row_off">
+    <td>{lang_Should_the_login_page_include_a_language_selectbox_(useful_for_demo-sites)_?}:</td>
+    <td>
+     <select name="newsettings[login_show_language_selection]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_login_show_language_selection_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr class="th">
+    <td colspan="2">&nbsp;<b>{lang_security}</b></td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+    <td>
+     <select name="newsettings[usecookies]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_usecookies_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr class="row_off">
+    <td>{lang_check_ip_address_of_all_sessions}:</td>
+    <td>
+     <select name="newsettings[sessions_checkip]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_sessions_checkip_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries_?}:</td>
+    <td>
+     <select name="newsettings[deny_user_grants_access]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_deny_user_grants_access_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+   <tr class="row_off">
+    <td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
+    <td>
+     <input name="newsettings[max_access_log_age]" value="{value_max_access_log_age}" size="5">
+    </td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_account_should_be_blocked_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_unsuccessful_id]" value="{value_num_unsuccessful_id}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_off">
+    <td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_IP_should_be_blocked_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_unsuccessful_ip]" value="{value_num_unsuccessful_ip}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_on">
+    <td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked_(default_30)_?}:</td>
+    <td>
+     <input name="newsettings[block_time]" value="{value_block_time}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_off">
+    <td>{lang_How_many_letters_the_user_password_must_contain_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_letters_userpass]" value="{value_num_letters_userpass}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_on">
+    <td>{lang_How_many_special_letters_the_user_password_must_contain_(default_0)_?}:</td>
+    <td>
+     <input name="newsettings[num_special_letters_userpass]" value="{value_num_special_letters_userpass}" size="5">
+    </td>
+   </tr>
+      
+   <tr class="row_off">
+    <td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
+    <td>
+     <input name="newsettings[admin_mails]" value="{value_admin_mails}" size="40">
+    </td>
+   </tr>
+
+   <!--tr class="th">
+    <td colspan="2">&nbsp;<b>{lang_VoIP_settings}</b></td>
+   </tr>
+
+   <tr class="row_off">
+    <td>{lang_Enter_your_VoIP_server_address}:</td>
+    <td><input name="newsettings[voip_server]" value="{value_voip_server}"  size="40"></td>
+   </tr>   
+   <tr class="row_on">
+    <td>{lang_Enter_your_VoIP_server_url} (Ex.: /telefoniaip/servicos/voip.php):</td>
+    <td><input name="newsettings[voip_url]" value="{value_voip_url}"  size="40"></td>
+   </tr>   
+   <tr class="row_off">
+    <td>{lang_Enter_your_VoIP_server_port}:</td>
+    <td><input name="newsettings[voip_port]" value="{value_voip_port}"></td>
+   </tr-->   
+    <tr class="row_on">
+    <td >
+		{lang_use_agree_term}:
+     </td>
+	<td>
+     <select name="newsettings[use_agree_term]">
+         <option value="">{lang_No}</option>
+         <option value="True"{selected_use_agree_term_True}>{lang_Yes}</option>
+     </select>					
+	</td>
+   </tr>
+   
+  <tr class="row_off">
+    <td colspan="2">{lang_agree_term}: <br />
+								{agree_term_input} <br />
+	</td>
+   </tr>
+
+   
+<!-- END body -->
+
+<!-- BEGIN footer -->
+  <!--tr class="th">
+    <td colspan="2">
+&nbsp;
+    </td>
+  </tr-->
+  <tr>
+    <td colspan="2" align="center">
+      <input type="submit" name="submit" value="{lang_submit}">
+      <input type="submit" name="cancel" value="{lang_cancel}">
+		  <br>
+    </td>
+  </tr>
+</table>
+</form>
+<!-- END footer -->
Index: trunk/admin/templates/default/config.tpl
===================================================================
--- trunk/admin/templates/default/config.tpl	(revision 1035)
+++ trunk/admin/templates/default/config.tpl	(revision 1155)
@@ -1,5 +1,5 @@
 <!-- BEGIN header -->
 <form method="POST" action="{action_url}">
-<table align="center" width="85%" callspacing="0" style="{ border: 1px solid #000000; }">
+<table align="center" width="85%" callspacing="0">
    <tr class="th">
     <td colspan="2">&nbsp;<b>{title}</b></td>
@@ -7,14 +7,8 @@
 <!-- END header -->
 <!-- BEGIN body -->
-   <tr class="row_on">
-    <td>{lang_Would_you_like_eGroupWare_to_check_for_a_new_version<br>when_admins_login_?}:</td>
-    <td>
-     <select name="newsettings[checkfornewversion]">
-      <option value="">{lang_No}</option>
-      <option value="True"{selected_checkfornewversion_True}>{lang_Yes}</option>
-     </select>
-    </td>
-   </tr>
-
+	<tr class="row_on">
+    <td>{lang_Time_for_expire_inatives_accounts(0 for never expires)}:</td>
+    <td><input size="8" name="newsettings[time_to_account_expires]" value="{value_time_to_account_expires}"></td>
+   </tr>
    <tr class="row_off">
     <td>{lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}:</td>
@@ -36,20 +30,4 @@
     </td>
    </tr>
-<!--
-   <tr class="row_on">
-    <td>{lang_Would_you_like_eGroupWare_to_cache_the_phpgw_info_array_?}:</td>
-    <td>
-     <select name="newsettings[cache_phpgw_info]">
-      <option value="">{lang_No}</option>
-      <option value="True"{selected_cache_phpgw_info_True}>{lang_Yes}</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr class="row_off">
-    <td>{lang_Maximum_entries_in_click_path_history}:</td>
-    <td><input size="8" name="newsettings[max_history]" value="{value_max_history}"></td>
-   </tr>
--->
    <tr class="row_on">
     <td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
@@ -71,47 +49,10 @@
     </td>
    </tr>
-
-  <tr class="th">
+    <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_appearance}</b></td>
    </tr>
-
-   <tr class="row_on">
-    <td>{lang_Enter_the_title_for_your_site}:</td>
-    <td><input name="newsettings[site_title]" value="{value_site_title}"></td>
-   </tr>
-<!-- This is not used / working at the moment, RalfBecker 21.03.2004
-   <tr class="row_off">
-    <td>{lang_Enter_the_background_color_for_the_site_title}:</td>
-    <td>#<input name="newsettings[login_bg_color_title]" value="{value_login_bg_color_title}"></td>
-   </tr>
-
-   <tr class="row_on">
-    <td>{lang_Enter_the_background_color_for_the_login_page}:</td>
-    <td>#<input name="newsettings[login_bg_color]" value="{value_login_bg_color}"></td>
-   </tr>
--->
-   <tr class="row_off">
-    <td>{lang_Enter_the_URL_or_filename_(in_phpgwapi/templates/default/images)_of_your_logo}:</td>
+ <tr class="row_off">
+    <td>{lang_HTML_code_of_the_organization_login}</td>
     <td><input name="newsettings[login_logo_file]" value="{value_login_logo_file}"></td>
-   </tr>
-
-   <tr class="row_on">
-    <td>{lang_Enter_the_url_where_your_logo_should_link_to}:</td>
-    <td><input name="newsettings[login_logo_url]" value="{value_login_logo_url}"></td>
-   </tr>
-
-   <tr class="row_off">
-    <td>{lang_Enter_the_title_of_your_logo}:</td>
-    <td><input name="newsettings[login_logo_title]" value="{value_login_logo_title}"></td>
-   </tr>
-
-   <tr class="row_on">
-    <td>{lang_Show_'powered_by'_logo_on}:</td>
-    <td>
-     <select name="newsettings[showpoweredbyon]">
-      <option value="bottom" {selected_showpoweredbyon_bottom}>{lang_bottom}</option>
-      <option value="top" {selected_showpoweredbyon_top}>{lang_top}</option>
-     </select>
-    </td>
    </tr>
 
@@ -121,15 +62,15 @@
 
    <tr class="row_off">
-   <td valign="top"><pre>
-Nome, um ponto-e-virgula como separador, e o caminho completo para os drivers dos tokens
+    <td valign="top"><pre>
+Nome, um ponto-e-virgula como separador, e o caminho completo para os drivers dos tokens 
 que ser&atilde;o suportados (At&eacute; 10):<br/>
 
    Ex:  ePass2000Lx;/usr/lib/libepsng_p11.so
-	ePass2000Win;c:/windows/system32/ngp11v211.dll
-
+	ePass2000Win;c:/windows/system32/ngp11v211.dll 
+       
         Estes s&atilde;o os drivers para o token ePass2000, utilizado no Serpro,
         nos ambientes Linux e Windows respectivamente.
 
-        <b>Aten&ccedil;&atilde;o</b>: O caminho no ambiente Windows n&atilde;o deve usar contra barra.
+        <b>Aten&ccedil;&atilde;o</b>: O caminho no ambiente Windows n&atilde;o deve usar contra barra. 
          </pre>	</td>
     <td>
@@ -176,136 +117,96 @@
     </td>
    </tr>
-
-
-<!--
-   <tr class="row_off">
-     <td>{lang_Default_file_system_space_per_user}/{lang_group_?}:</td>
-     <td>
-      <input type="text" name="newsettings[vfs_default_account_size_number]" size="7" value="{value_vfs_default_account_size_number}">&nbsp;&nbsp;
-      <select name="newsettings[vfs_default_account_size_type]">
-       <option value="gb"{selected_vfs_default_account_size_type_gb}>GB</option>
-       <option value="mb"{selected_vfs_default_account_size_type_mb}>MB</option>
-       <option value="kb"{selected_vfs_default_account_size_type_kb}>KB</option>
-       <option value="b"{selected_vfs_default_account_size_type_b}>B</option>
-      </select>
+   <tr class="row_off">
+    <td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
+    <td>
+     <input name="newsettings[max_access_log_age]" value="{value_max_access_log_age}" size="5">
+    </td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_account_should_be_blocked_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_unsuccessful_id]" value="{value_num_unsuccessful_id}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_off">
+    <td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_IP_should_be_blocked_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_unsuccessful_ip]" value="{value_num_unsuccessful_ip}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_on">
+    <td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked_(default_30)_?}:</td>
+    <td>
+     <input name="newsettings[block_time]" value="{value_block_time}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_off">
+    <td>{lang_How_many_letters_the_user_password_must_contain_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_letters_userpass]" value="{value_num_letters_userpass}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_on">
+    <td>{lang_How_many_special_letters_the_user_password_must_contain_(default_0)_?}:</td>
+    <td>
+     <input name="newsettings[num_special_letters_userpass]" value="{value_num_special_letters_userpass}" size="5">
+    </td>
+   </tr>
+      
+   <tr class="row_off">
+    <td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
+    <td>
+     <input name="newsettings[admin_mails]" value="{value_admin_mails}" size="40">
+    </td>
+   </tr>
+
+   <!--tr class="th">
+    <td colspan="2">&nbsp;<b>{lang_VoIP_settings}</b></td>
+   </tr>
+
+   <tr class="row_off">
+    <td>{lang_Enter_your_VoIP_server_address}:</td>
+    <td><input name="newsettings[voip_server]" value="{value_voip_server}"  size="40"></td>
+   </tr>   
+   <tr class="row_on">
+    <td>{lang_Enter_your_VoIP_server_url} (Ex.: /telefoniaip/servicos/voip.php):</td>
+    <td><input name="newsettings[voip_url]" value="{value_voip_url}"  size="40"></td>
+   </tr>   
+   <tr class="row_off">
+    <td>{lang_Enter_your_VoIP_server_port}:</td>
+    <td><input name="newsettings[voip_port]" value="{value_voip_port}"></td>
+   </tr-->   
+    <tr class="row_on">
+    <td >
+		{lang_use_agree_term}:
      </td>
-    </tr>
--->
-
-   <tr class="row_off">
-    <td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
-    <td>
-     <input name="newsettings[max_access_log_age]" value="{value_max_access_log_age}" size="5">
-    </td>
-   </tr>
-
-   <tr class="row_on">
-    <td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_account_should_be_blocked_(default_3)_?}:</td>
-    <td>
-     <input name="newsettings[num_unsuccessful_id]" value="{value_num_unsuccessful_id}" size="5">
-    </td>
-   </tr>
-   
-   <tr class="row_off">
-    <td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_IP_should_be_blocked_(default_3)_?}:</td>
-    <td>
-     <input name="newsettings[num_unsuccessful_ip]" value="{value_num_unsuccessful_ip}" size="5">
-    </td>
-   </tr>
-   
-   <tr class="row_on">
-    <td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked_(default_30)_?}:</td>
-    <td>
-     <input name="newsettings[block_time]" value="{value_block_time}" size="5">
-    </td>
-   </tr>
-   
-   <tr class="row_off">
-    <td>{lang_How_many_letters_the_user_password_must_contain_(default_3)_?}:</td>
-    <td>
-     <input name="newsettings[num_letters_userpass]" value="{value_num_letters_userpass}" size="5">
-    </td>
-   </tr>
-   
-   <tr class="row_on">
-    <td>{lang_How_many_special_letters_the_user_password_must_contain_(default_0)_?}:</td>
-    <td>
-     <input name="newsettings[num_special_letters_userpass]" value="{value_num_special_letters_userpass}" size="5">
-    </td>
-   </tr>
-      
-   <tr class="row_off">
-    <td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
-    <td>
-     <input name="newsettings[admin_mails]" value="{value_admin_mails}" size="40">
-    </td>
-   </tr>
-
-   <tr class="row_on">
-    <td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
-    <td>
-      <select name="newsettings[autocomplete_login]">
+	<td>
+     <select name="newsettings[use_agree_term]">
          <option value="">{lang_No}</option>
-         <option value="True"{selected_autocomplete_login_True}>{lang_Yes}</option>
-       </select>
-    </td>
-   </tr>
-
-   <tr class="row_off">
-    <td>{lang_Enable_the_xmlrpc_service} {lang_(default_No,_leave_it_off_if_you_dont_use_it)}:</td>
-    <td>
-      <select name="newsettings[xmlrpc_enabled]">
-         <option value="">{lang_No}</option>
-         <option value="True"{selected_xmlrpc_enabled_True}>{lang_Yes}</option>
-       </select>
-    </td>
-   </tr>
-
-   <tr class="row_on">
-    <td>{lang_Enable_the_soap_service} {lang_(default_No,_leave_it_off_if_you_dont_use_it)}:</td>
-    <td>
-      <select name="newsettings[soap_enabled]">
-         <option value="">{lang_No}</option>
-         <option value="True"{selected_soap_enabled_True}>{lang_Yes}</option>
-       </select>
-    </td>
-   </tr>
-
-   <tr class="th">
-    <td colspan="2">&nbsp;<b>{lang_Mail_settings}</b></td>
-   </tr>
-
-   <tr class="row_on">
-    <td>{lang_Enter_your_default_mail_domain_(_From:_user@domain_)}:</td>
-    <td><input name="newsettings[mail_suffix]" value="{value_mail_suffix}"></td>
-   </tr>
-
-   <tr class="row_off">
-    <td>{lang_Enter_your_SMTP_server_hostname_or_IP_address}:</td>
-    <td><input name="newsettings[smtp_server]" value="{value_smtp_server}"></td>
-   </tr>
-
-   <tr class="row_on">
-    <td>{lang_Enter_your_SMTP_server_port}:</td>
-    <td><input name="newsettings[smtp_port]" value="{value_smtp_port}"></td>
-   </tr>
-
-   <tr class="row_off">
-    <td>{lang_User_for_SMTP-authentication_(leave_it_empty_if_no_auth_required)}:</td>
-    <td><input name="newsettings[smtp_auth_user]" value="{value_smtp_auth_user}"></td>
-   </tr>
-
-   <tr class="row_on">
-    <td>{lang_Password_for_SMTP-authentication}:</td>
-    <td><input name="newsettings[smtp_auth_passwd]" value="{value_smtp_auth_passwd}"></td>
-   </tr>
+         <option value="True"{selected_use_agree_term_True}>{lang_Yes}</option>
+     </select>					
+	</td>
+   </tr>
+   
+  <tr class="row_off">
+    <td colspan="2">{lang_agree_term}: <br />
+								{agree_term_input} <br />
+	</td>
+   </tr>
+
+   
 <!-- END body -->
 
 <!-- BEGIN footer -->
-  <tr class="th">
+  <!--tr class="th">
     <td colspan="2">
 &nbsp;
     </td>
-  </tr>
+  </tr-->
   <tr>
     <td colspan="2" align="center">
Index: trunk/admin/templates/default/index.tpl
===================================================================
--- trunk/admin/templates/default/index.tpl	(revision 2)
+++ trunk/admin/templates/default/index.tpl	(revision 1155)
@@ -1,5 +1,5 @@
 <!-- BEGIN list -->
 
-<table width="75%" border="0" cellspacing="0" cellpadding="0">
+<table width="75%" border="0" cellspacing="0" cellpadding="0"  class="prefTable">
  {rows}
 </table>
