Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets
Show
Ignore:
Timestamp:
06/04/08 01:37:02 (6 months ago)
Author:
rats
Message:

* Updated net2ftp to version 0.97
* Updated SquirrelMail to version 1.4.15

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gui/tools/filemanager/includes/registerglobals.inc.php

    r910 r1198  
    33//   ------------------------------------------------------------------------------- 
    44//  |                  net2ftp: a web based FTP client                              | 
    5 //  |              Copyright (c) 2003-2007 by David Gartner                         | 
     5//  |              Copyright (c) 2003-2008 by David Gartner                         | 
    66//  |                                                                               | 
    77//  | This program is free software; you can redistribute it and/or                 | 
    …… 
    5555 
    5656// PMA - Cookies are safer 
    57 ini_set("session.use_cookies", true); 
     57@ini_set("session.use_cookies", true); 
    5858 
    5959// PMA - but not all user allow cookies 
    60 ini_set("session.use_only_cookies", false); 
    61 ini_set("session.use_trans_sid", true); 
     60@ini_set("session.use_only_cookies", false); 
     61@ini_set("session.use_trans_sid", true); 
    6262 
    6363// PMA - Delete session/cookies when browser is closed 
    64 ini_set("session.cookie_lifetime", 0); 
     64@ini_set("session.cookie_lifetime", 0); 
    6565 
    6666// PMA - Warn but dont work with bug 
    67 ini_set("session.bug_compat_42", false); 
    68 ini_set("session.bug_compat_warn", true); 
     67@ini_set("session.bug_compat_42", false); 
     68@ini_set("session.bug_compat_warn", true); 
    6969 
    7070// PMA - Use more secure session ids (with PHP 5) 
    7171if (version_compare(PHP_VERSION, "5.0.0", "ge") && substr(PHP_OS, 0, 3) != "WIN") { 
    72         ini_set("session.hash_function", 1); 
    73         ini_set("session.hash_bits_per_character", 6); 
     72        @ini_set("session.hash_function", 1); 
     73        @ini_set("session.hash_bits_per_character", 6); 
    7474} 
    7575 
    7676// PMA - [2006-01-25] Nicola Asuni - www.tecnick.com: maybe the PHP directive 
    7777// session.save_handler is set to another value like "user" 
    78 ini_set("session.save_handler", "files"); 
     78@ini_set("session.save_handler", "files"); 
    7979 
    8080// Start the session 
    …… 
    8989$_SESSION["net2ftp_session_id_new"]  = session_id(); 
    9090$_SESSION["net2ftp_remote_addr_new"] = $_SERVER["REMOTE_ADDR"]; 
    91  
    9291 
    9392// ------------------------------------------------------------------------- 
    …… 
    149148        $net2ftp_globals["password_encrypted"]  = encryptPassword(trim($_POST["password"])); 
    150149        $_SESSION["net2ftp_password_encrypted_" . $net2ftp_globals["ftpserver"] . $net2ftp_globals["username"]] = encryptPassword(trim($_POST["password"])); 
     150        $_SESSION["net2ftp_session_id_old"]  = $_SESSION["net2ftp_session_id_new"]; 
    151151} 
    152152// From the upload page (SWFUpload Flash applet) 
    …… 
    154154        $net2ftp_globals["password_encrypted"]  = trim($_GET["password_encrypted"]); 
    155155        $_SESSION["net2ftp_password_encrypted_" . $net2ftp_globals["ftpserver"] . $net2ftp_globals["username"]] = trim($_GET["password_encrypted"]); 
     156        $_SESSION["net2ftp_session_id_old"]  = $_SESSION["net2ftp_session_id_new"]; 
    156157} 
    157158 
    …… 
    324325// ------------------------------------------------------------------------- 
    325326// 5.2 Redirect to login_small  
    326 //         if session has expired 
     327//         if session has expired        (not for OpenLaszlo skin as it does not make a connection on the Login screen) 
    327328//         if the IP address has changed (disabled as this may cause problems for some people) 
    328329//         if the password is blank 
    329330// ------------------------------------------------------------------------- 
    330 if ($net2ftp_globals["state"] != "login" && $net2ftp_globals["state"] != "login_small" && 
     331if ($net2ftp_globals["state"] != "login" && $net2ftp_globals["state"] != "login_small" &&  
    331332        $_SESSION["net2ftp_session_id_old"] != $_SESSION["net2ftp_session_id_new"]) { 
    332333        $net2ftp_globals["go_to_state"]  = $net2ftp_globals["state"]; 
    …… 
    894895        $statelist[] = "logout"; 
    895896        $statelist[] = "newdir"; 
    896         $statelist[] = "newfile"; 
    897897        $statelist[] = "raw"; 
    898898        $statelist[] = "rename";