Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git into tunable...

diff --combined include/functions.php
index 0d9c154d625037254060d99924a3d16b3139d2b4,5fe5c5a6584a08068fb9575bc085bc8a1f353e7d..e2a2282d51801dcfa31c79fc9a49106a91ac9122
--- 1/include/functions.php
--- 2/include/functions.php
+++ b/include/functions.php
@@@ -60,7 -60,7 +60,7 @@@
                                        "nb_NO" => "Norwegian bokmål",
                                        "nl_NL" => "Dutch",
                                        "pl_PL" => "Polski",
- //                                    "ru_RU" => "Русский",
+                                       "ru_RU" => "Русский",
                                        "pt_BR" => "Portuguese/Brazil",
                                        "zh_CN" => "Simplified Chinese",
                                        "fi_FI" => "Suomi");
@@@ -307,8 -307,8 +307,8 @@@
                                        array("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $timestamp)));
                        }
  
 -                      curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : 15);
 -                      curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : 45);
 +                      curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
 +                      curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
                        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode"));
                        curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
                        curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
@@@ -621,6 -621,7 +621,7 @@@
                                        $_SESSION["uid"]);
  
                                $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
+                               $_SESSION["user_agent"] = sha1($_SERVER['HTTP_USER_AGENT']);
                                $_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
  
                                $_SESSION["last_version_check"] = time();