From 3725cfb245bfae3a77baf857ea5403e8064b84b9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 7 May 2013 15:12:22 +0200
Subject: Avoid uninitialized/unused variables

---
 program/include/rcmail.php | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

(limited to 'program/include/rcmail.php')

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 6257f4925..c16257d50 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -596,7 +596,7 @@ class rcmail extends rcube
       $post_host = rcube_utils::get_input_value('_host', rcube_utils::INPUT_POST);
       $post_user = rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST);
 
-      list($user, $domain) = explode('@', $post_user);
+      list(, $domain) = explode('@', $post_user);
 
       // direct match in default_host array
       if ($default_host[$post_host] || in_array($post_host, array_values($default_host))) {
@@ -699,28 +699,6 @@ class rcmail extends rcube
   }
 
 
-  /**
-   * Create unique authorization hash
-   *
-   * @param string Session ID
-   * @param int Timestamp
-   * @return string The generated auth hash
-   */
-  private function get_auth_hash($sess_id, $ts)
-  {
-    $auth_string = sprintf('rcmail*sess%sR%s*Chk:%s;%s',
-      $sess_id,
-      $ts,
-      $this->config->get('ip_check') ? $_SERVER['REMOTE_ADDR'] : '***.***.***.***',
-      $_SERVER['HTTP_USER_AGENT']);
-
-    if (function_exists('sha1'))
-      return sha1($auth_string);
-    else
-      return md5($auth_string);
-  }
-
-
   /**
    * Build a valid URL to this instance of Roundcube
    *
@@ -1532,7 +1510,7 @@ class rcmail extends rcube
         $collapsed = $this->config->get('collapsed_folders');
 
         $out = '';
-        foreach ($arrFolders as $key => $folder) {
+        foreach ($arrFolders as $folder) {
             $title        = null;
             $folder_class = $this->folder_classname($folder['id']);
             $is_collapsed = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
@@ -1618,7 +1596,7 @@ class rcmail extends rcube
     {
         $out = '';
 
-        foreach ($arrFolders as $key => $folder) {
+        foreach ($arrFolders as $folder) {
             // skip exceptions (and its subfolders)
             if (!empty($opts['exceptions']) && in_array($folder['id'], $opts['exceptions'])) {
                 continue;
-- 
cgit v1.2.3