Changeset 1735 in subversion

Timestamp:

Sep 5, 2008 3:27:23 AM (5 years ago)

Author:

thomasb

Message:

Killed one more global var + log logins to a separate file (not console)

Location:

trunk/roundcubemail

Files:

• index.php (modified) (2 diffs)
• program/include/main.inc (modified) (1 diff)
• program/include/rcube_json_output.php (modified) (1 diff)
• program/include/rcube_template.php (modified) (1 diff)
• program/steps/mail/list.inc (modified) (1 diff)

trunk/roundcubemail/index.php

@@ -30 +30 @@
 // include environment
 require_once 'program/include/iniset.php';
-
-// define global vars
-$OUTPUT_TYPE = 'html';
 
 // init application and start session with requested task
@@ -95 +92 @@
 
     // log successful login
-    if ($RCMAIL->config->get('log_logins') && $RCMAIL->config->get('debug_level') & 1)
-      console(sprintf('Successful login for %s (id %d) from %s',
-                      trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
-                      $_SESSION['user_id'],
-                      $_SERVER['REMOTE_ADDR']));
+    if ($RCMAIL->config->get('log_logins')) {
+      write_log('userlogins', sprintf('Successful login for %s (id %d) from %s',
+        $RCMAIL->user->get_username(),
+        $RCMAIL->user->ID,
+        $_SERVER['REMOTE_ADDR']));
+    }
 
     // send redirect

trunk/roundcubemail/program/include/main.inc

@@ -318 +318 @@
   }
   if (!$enctype)
-    $enctype = $GLOBALS['OUTPUT_TYPE'];
+    $enctype = $OUTPUT->type;
 
   // encode for plaintext

trunk/roundcubemail/program/include/rcube_json_output.php

@@ -35 +35 @@
     private $commands = array();
 
+    public $type = 'js';
     public $ajax_call = true;
     

trunk/roundcubemail/program/include/rcube_template.php

@@ -40 +40 @@
     var $object_handlers = array();
 
+    public $type = 'html';
     public $ajax_call = false;
 

trunk/roundcubemail/program/steps/mail/list.inc

@@ -20 +20 @@
 */
 
-$OUTPUT_TYPE = 'js';
 // is there a sort type for this request?
 if ($sort = get_input_value('_sort', RCUBE_INPUT_GET))