merged sesson-functions for .16, incl. the brute-force stuffe and cacheing the data from other session in the appsession

fixed multidomain logins for register_globals off

admin/setup/phpgw_de.lang

@@ -221,7 +221,7 @@ this application is current	admin	de	Diese Anwendung ist aktuell
 this application requires an upgrade	admin	de	Diese Anwednung benötigt ein Upgrade
 this category is currently being used by applications as a parent category	admin	de	Diese Kategorie wird gegenwärtig als übergeordnete Kategorie benutzt.
 timeout for application session data in seconds (default 86400 = 1 day)	admin	de	Zeit nach der Anwendungsdaten der Sitzung gelöscht werden in Sekunden (Vorgabe 86400 = 1 Tag) 
-timeout for sessions in seconds (default 14400 = 4 hours)<br>(not for php4 sessions!!!)	admin	de	Zeit nach der Sitzungen verfallen (Vorgabe 14400 = 4 Stunden)<br>(nicht für php4 Sitzungen)
+timeout for sessions in seconds (default 14400 = 4 hours)	admin	de	Zeit nach der Sitzungen verfallen (Vorgabe 14400 = 4 Stunden)
 top	admin	de	oben
 total records	admin	de	Anzahl Datensätze insgesamt
 trust level	admin	de	Grad des Vertrauens

admin/setup/phpgw_en.lang

@@ -251,7 +251,7 @@ this application is current	admin	en	This application is current
 this application requires an upgrade	admin	en	This application requires an upgrade
 this category is currently being used by applications as a parent category	admin	en	This category is currently being used by applications as a parent category.
 timeout for application session data in seconds (default 86400 = 1 day)	admin	en	Timeout for application session data in seconds (default 86400 = 1 day)
-timeout for sessions in seconds (default 14400 = 4 hours)<br>(not for php4 sessions!!!)	admin	en	Timeout for sessions in seconds (default 14400 = 4 hours)<br>(not for php4 sessions!!!)
+timeout for sessions in seconds (default 14400 = 4 hours)	admin	en	Timeout for sessions in seconds (default 14400 = 4 hours)
 top	admin	en	top
 total records	admin	en	Total records
 trust level	admin	en	Trust Level

admin/templates/default/config.tpl

@@ -49,14 +49,13 @@
 
    <tr class="row_on">
     <td>
-      {lang_Timeout_for_sessions_(in_seconds)}.
+      {lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}
-      <br>{lang_(not_for_php4_sessions)}
     </td>
     <td><input size="8" name="newsettings[sessions_timeout]" value="{value_sessions_timeout}"></td>
    </tr>
 
    <tr class="row_off">
-    <td>{lang_Timeout_for_application_session_data_(in_seconds)}.</td>
+    <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>
 
@@ -148,6 +147,44 @@
      </td>
     </tr>
 -->
+   <tr class="th">
+    <td colspan="2">&nbsp;<b>{lang_AccessLog_and_BruteForce_defense}</b></td>
+   </tr>
+   
+   <tr class="row_on">
+    <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_off">
+    <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_on">
+    <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_off">
+    <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_on">
+    <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>
 <!-- END body -->
 
 <!-- BEGIN footer -->