Changeset 3633 in subversion

Timestamp:

May 19, 2010 2:58:42 AM (3 years ago)

Author:

alec

Message:

• Fix in timezone setting (#1486183)

File:

• trunk/roundcubemail/program/include/rcmail.php (modified) (41 diffs)

trunk/roundcubemail/program/include/rcmail.php

@@ -62 +62 @@
     return self::$instance;
   }
-  
-  
+
+
   /**
    * Private constructor
@@ -71 +71 @@
     // load configuration
     $this->config = new rcube_config();
-    
+
     register_shutdown_function(array($this, 'shutdown'));
   }
-  
-  
+
+
   /**
    * Initial startup function
@@ -127 +127 @@
     $this->plugins->init();
   }
-  
-  
+
+
   /**
    * Setter for application task
@@ -145 +145 @@
     $this->task = $task;
     $this->comm_path = $this->url(array('task' => $this->task));
-    
+
     if ($this->output)
       $this->output->set_env('task', $this->task);
   }
-  
-  
+
+
   /**
    * Setter for system user object
@@ -161 +161 @@
       $this->user = $user;
       $GLOBALS['USER'] = $this->user;
-      
+
       // overwrite config with user preferences
       $this->config->set_user_prefs((array)$this->user->get_prefs());
     }
-    
+
     $_SESSION['language'] = $this->user->language = $this->language_prop($this->config->get('language', $_SESSION['language']));
 
@@ -171 +171 @@
     setlocale(LC_ALL, $_SESSION['language'] . '.utf8', 'en_US.utf8');
 
-    // workaround for http://bugs.php.net/bug.php?id=18556 
-    if (in_array($_SESSION['language'], array('tr_TR', 'ku', 'az_AZ'))) 
-      setlocale(LC_CTYPE, 'en_US' . '.utf8'); 
-  }
-  
-  
+    // workaround for http://bugs.php.net/bug.php?id=18556
+    if (in_array($_SESSION['language'], array('tr_TR', 'ku', 'az_AZ')))
+      setlocale(LC_CTYPE, 'en_US' . '.utf8');
+  }
+
+
   /**
    * Check the given string and return a valid language code
@@ -186 +186 @@
   {
     static $rcube_languages, $rcube_language_aliases;
-    
+
     // user HTTP_ACCEPT_LANGUAGE if no language is specified
     if (empty($lang) || $lang == 'auto') {
@@ -192 +192 @@
        $lang = str_replace('-', '_', $accept_langs[0]);
      }
-     
+
     if (empty($rcube_languages)) {
       @include(INSTALL_PATH . 'program/localization/index.inc');
     }
-    
+
     // check if we have an alias for that language
     if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) {
@@ -204 +204 @@
     else if (!isset($rcube_languages[$lang])) {
       $short = substr($lang, 0, 2);
-     
+
       // check if we have an alias for the short language code
       if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) {
@@ -221 +221 @@
     return $lang;
   }
-  
-  
+
+
   /**
    * Get the current database connection
@@ -241 +241 @@
     return $this->db;
   }
-  
-  
+
+
   /**
    * Return instance of the internal address book class
@@ -257 +257 @@
 
     $plugin = $this->plugins->exec_hook('get_address_book', array('id' => $id, 'writeable' => $writeable));
-    
+
     // plugin returned instance of a rcube_addressbook
     if ($plugin['instance'] instanceof rcube_addressbook) {
@@ -280 +280 @@
       $contacts = new rcube_contacts($this->db, $this->user->ID);
     }
-    
+
     return $contacts;
   }
@@ -335 +335 @@
     return $list;
   }
-  
-  
+
+
   /**
    * Init output object for GUI and add common scripts.
@@ -368 +368 @@
     // add some basic label to client
     $this->output->add_label('loading', 'servererror');
-    
+
     return $this->output;
   }
-  
-  
+
+
   /**
    * Create an output object for JSON responses
@@ -382 +382 @@
     if (!($this->output instanceof rcube_json_output))
       $this->output = new rcube_json_output($this->task);
-    
+
     return $this->output;
   }
@@ -395 +395 @@
   {
     $this->smtp = new rcube_smtp();
-  
+
     if ($connect)
       $this->smtp->connect();
   }
-  
-  
+
+
   /**
    * Create global IMAP object and connect to server
@@ -412 +412 @@
     if (is_object($this->imap))
       return;
-      
+
     $this->imap = new rcube_imap($this->db);
     $this->imap->debug_level = $this->config->get('debug_level');
@@ -424 +424 @@
     // set pagesize from config
     $this->imap->set_pagesize($this->config->get('pagesize', 50));
-    
+
     // Setting root and delimiter before establishing the connection
-    // can save time detecting them using NAMESPACE and LIST 
+    // can save time detecting them using NAMESPACE and LIST
     $options = array(
       'auth_method' => $this->config->get('imap_auth_type', 'check'),
@@ -436 +436 @@
 
     $this->imap->set_options($options);
-  
+
     // set global object for backward compatibility
     $GLOBALS['IMAP'] = $this->imap;
@@ -443 +443 @@
     if ($hook['fetch_headers'])
       $this->imap->fetch_add_headers = $hook['fetch_headers'];
-    
+
     // support this parameter for backward compatibility but log warning
     if ($connect) {
@@ -462 +462 @@
     if (!$this->imap)
       $this->imap_init();
-    
+
     if ($_SESSION['imap_host'] && !$this->imap->conn->connected()) {
       if (!$this->imap->connect($_SESSION['imap_host'], $_SESSION['username'], $this->decrypt($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl'])) {
@@ -501 +501 @@
     ini_set('session.name', 'roundcube_sessid');
     ini_set('session.use_cookies', 1);
-    ini_set('session.use_only_cookies', 1);  
+    ini_set('session.use_only_cookies', 1);
     ini_set('session.serialize_handler', 'php');
 
@@ -588 +588 @@
         $imap_port = 993;
     }
-    
+
     $imap_port = $imap_port ? $imap_port : $config['default_port'];
 
-    /* Modify username with domain if required  
+    /* Modify username with domain if required
        Inspired by Marco <P0L0_notspam_binware.org>
     */
@@ -667 +667 @@
       $_SESSION['password']  = $this->encrypt($pass);
       $_SESSION['login_time'] = mktime();
-      
-      if ($_REQUEST['_timezone'] != '_default_')
+
+      if (isset($_REQUEST['_timezone']) && $_REQUEST['_timezone'] != '_default_')
         $_SESSION['timezone'] = floatval($_REQUEST['_timezone']);
 
@@ -698 +698 @@
       $this->imap->set_page($_SESSION['page']);
     }
-    
+
     // cache IMAP root and delimiter in session for performance reasons
     $_SESSION['imap_root'] = $this->imap->root_dir;
@@ -714 +714 @@
     $default_host = $this->config->get('default_host');
     $host = null;
-    
+
     if (is_array($default_host)) {
       $post_host = get_input_value('_host', RCUBE_INPUT_POST);
-      
+
       // direct match in default_host array
       if ($default_host[$post_host] || in_array($post_host, array_values($default_host))) {
         $host = $post_host;
       }
-      
+
       // try to select host by mail domain
       list($user, $domain) = explode('@', get_input_value('_user', RCUBE_INPUT_POST));
@@ -760 +760 @@
     if (empty($this->texts))
       $this->load_language();
-    
+
     // extract attributes
     if (is_string($attrib))
@@ -776 +776 @@
     }
 
-    // make text item array 
+    // make text item array
     $a_text_item = is_array($text_item) ? $text_item : array('single' => $text_item);
 
@@ -826 +826 @@
   {
     $lang = $this->language_prop(($lang ? $lang : $_SESSION['language']));
-    
+
     // load localized texts
     if (empty($this->texts) || $lang != $_SESSION['language']) {
@@ -850 +850 @@
           $this->texts = array_merge($this->texts, $messages);
       }
-      
+
       $_SESSION['language'] = $lang;
     }
@@ -929 +929 @@
   {
     $this->plugins->exec_hook('kill_session');
-    
+
     $this->session->remove();
     $_SESSION = array('language' => $this->user->language, 'auth_time' => time(), 'temp' => true);
@@ -943 +943 @@
   {
     $config = $this->config->all();
-    
-    // on logout action we're not connected to imap server  
+
+    // on logout action we're not connected to imap server
     if (($config['logout_purge'] && !empty($config['trash_mbox'])) || $config['logout_expunge']) {
       if (!$this->authenticate_session())
@@ -995 +995 @@
     }
   }
-  
-  
+
+
   /**
    * Generate a unique token to be used in a form request
@@ -1005 +1005 @@
   {
     $key = $this->task;
-    
+
     if (!$_SESSION['request_tokens'][$key])
       $_SESSION['request_tokens'][$key] = md5(uniqid($key . mt_rand(), true));
-    
+
     return $_SESSION['request_tokens'][$key];
   }
-  
-  
+
+
   /**
    * Check if the current request contains a valid token
@@ -1024 +1024 @@
     return !empty($token) && $_SESSION['request_tokens'][$this->task] == $token;
   }
-  
-  
+
+
   /**
    * Create unique authorization hash
@@ -1067 +1067 @@
      */
     $clear = pack("a*H2", $clear, "80");
-  
+
     if (function_exists('mcrypt_module_open') &&
         ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, "")))
@@ -1112 +1112 @@
     if (!$cipher)
       return '';
-  
+
     $cipher = $base64 ? base64_decode($cipher) : $cipher;
 
@@ -1127 +1127 @@
     else {
       @include_once('lib/des.inc');
-    
+
       if (function_exists('des')) {
         $des_iv_size = 8;
@@ -1148 +1148 @@
      */
     $clear = substr(rtrim($clear, "\0"), 0, -1);
-  
+
     return $clear;
   }
@@ -1162 +1162 @@
     if (!is_array($p))
       $p = array('_action' => @func_get_arg(0));
-    
+
     $task = $p['_task'] ? $p['_task'] : ($p['task'] ? $p['task'] : $this->task);
     $p['_task'] = $task;