Simplified code + removed debug log

3 files changed, 6 insertions, 12 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1c1810b83..3b1969d91 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
-2007/08/09 (thomasb)
+2007/08/10 (thomasb)
 ----------
 - Identify mailboxes case-sensitive
 - Sort mailbox list case-insensitive (closes #1484338)
@@ -10,7 +10,7 @@ CHANGELOG RoundCube Webmail
 - Make autocomplete for loginform configurable by the skin template
 
 
-2007/07/09 (richs)
+2007/08/09 (richs)
 ----------
 - Fixed bug with buttons not dimming/enabling properly after switching folders
 - Fixed compose window becoming unresponsive after saving a draft (#1484487)
diff --git a/program/include/main.inc b/program/include/main.inc
index 4b8aa68d5..19d421441 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -234,10 +234,7 @@ function rcmail_authenticate_session()
   // check session filetime
   if (!empty($CONFIG['session_lifetime']) && isset($SESS_CHANGED) && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < time())
     $valid = false;
-    
-  if (!$valid)
-    write_log('timeouts', $_SESSION + array('SESS_CLIENT_IP' => $SESS_CLIENT_IP, 'SESS_CHANGED' => $SESS_CHANGED, 'COOKIE' => $_COOKIE));
-
+  
   return $valid;
   }
 
diff --git a/program/js/app.js b/program/js/app.js
index 6cf9d4850..78e2b1afa 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1683,13 +1683,10 @@ function rcube_webmail()
       }
 
     // check for empty body
-    if ((input_message.value=='')&&(tinyMCE == null ? true : (tinyMCE.getContent()=='' || tinyMCE.getContent() == null)))
+    if ((input_message.value == '' || (window.tinyMCE && tinyMCE.getContent() == '')) && !confirm(this.get_label('nobodywarning')))
       {
-      if (!confirm(this.get_label('nobodywarning')))
-        {
-        input_message.focus();
-        return false;
-        }
+      input_message.focus();
+      return false;
       }
 
     return true;