Changeset 1198 for trunk/gui/tools/filemanager/main.inc.php

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:

• trunk/gui/tools/filemanager/main.inc.php (modified) (23 diffs)

trunk/gui/tools/filemanager/main.inc.php

@@ -3 +3 @@
-//   -------------------------------------------------------------------------------
-//  |                  net2ftp: a web based FTP client                              |
-7
+8
-//  |                                                                               |
-//  | This program is free software; you can redistribute it and/or                 |
@@ -53 +53 @@
-        }
-
-
-// -------------------------------------------------------------------------
-// Global variables
@@ -68 +67 @@
-                $net2ftp_output = array();
-                $net2ftp_result["success"]         = true;
-_message"]
+message"] 
-                $net2ftp_result["debug_backtrace"] = "";
-                $net2ftp_result["exit"]            = false;
@@ -83 +82 @@
-// Input checks
-// -------------------------------------------------------------------------
-o
+O
-                $net2ftp_result["success"]         = false;
-_message"]
+message"] 
-                $net2ftp_result["debug_backtrace"] = debug_backtrace();
-                logError();
@@ -116 +115 @@
-        $net2ftp_globals["application_tempdir"]      = $net2ftp_globals["application_rootdir"] . "/temp";
-
-
-// -------------------------------------------------------------------------
-// Set basic settings
@@ -125 +123 @@
-// Run the script to the end, even if the user hits the stop button
-                ignore_user_abort();
-
+
-// Execute function shutdown() if the script reaches the maximum execution time (usually 30 seconds)
-// DON'T REGISTER IT HERE YET, as this causes errors on newer versions of PHP; first include the function libraries
-//              register_shutdown_function("net2ftp_shutdown");
-
+
-// Set the error reporting level
-                if     ($net2ftp_settings["error_reporting"] == "ALL")  { error_reporting(E_ALL); }
-                elseif ($net2ftp_settings["error_reporting"] == "NONE") { error_reporting(0); }
-                else                                                    { error_reporting(E_ERROR | E_WARNING | E_PARSE); }
-
+
-// Timer: start
-                $net2ftp_globals["starttime"] = microtime();
@@ -141 +139 @@
-
-// Set the PHP temporary directory
-
+//
-
-// -------------------------------------------------------------------------
@@ -147 +145 @@
-// 1. Libraries which are always needed
-// 2. Register global variables
-
+ 
-// // --> Do this only once, when $action == "sendHttpHeaders"
-// -------------------------------------------------------------------------
@@ -160 +158 @@
-                require_once($net2ftp_globals["application_includesdir"]  . "/filesystem.inc.php");
-                require_once($net2ftp_globals["application_includesdir"]  . "/html.inc.php");
+                require_once($net2ftp_globals["application_includesdir"]  . "/StonePhpSafeCrypt.php");
-                require_once($net2ftp_globals["application_languagesdir"] . "/languages.inc.php");
-                require_once($net2ftp_globals["application_skinsdir"]     . "/skins.inc.php");
@@ -166 +165 @@
-                if (version_compare(phpversion(), "4.3.0", "<")) {
-                        require_once($net2ftp_globals["application_includesdir"] . "/before430.inc.php");
-
+ 
-
-// 2. Register global variables (POST, GET, GLOBAL, ...)
@@ -179 +178 @@
-                }
-                if ($net2ftp_globals["state"] == "advanced_ftpserver"   || $net2ftp_globals["state"] == "advanced_parsing" ||
-
-
-
+ 
+ 
+ 
-                        $net2ftp_globals["state"] == "findstring"         || $net2ftp_globals["state"] == "followsymlink"    ||
-                        $net2ftp_globals["state"] == "install"            || $net2ftp_globals["state"] == "zip") {
@@ -190 +189 @@
-                }
-
-3
+4
-                require_once($net2ftp_globals["application_pluginsdir"] . "/plugins.inc.php");
-                $net2ftp_globals["activePlugins"] = getActivePlugins();
-                net2ftp_plugin_includePhpFiles();
-
-3
+5
-                includeLanguageFile();
-
@@ -205 +204 @@
-        if ($action == "sendHttpHeaders") {
-                register_shutdown_function("net2ftp_shutdown");
+        }
+
+// -------------------------------------------------------------------------
+// Log access
+// --> Do this only once, when $action == "sendHttpHeaders"
+// -------------------------------------------------------------------------
+        if ($action == "sendHttpHeaders") {
+                logAccess();
+                if ($net2ftp_result["success"] == false) { 
+                        logError();
+                        return false; 
+                }
-        }
-
@@ -211 +222 @@
-// --> Do this only once, when $action == "sendHttpHeaders"
-// -------------------------------------------------------------------------
-
-        if ($action == "sendHttpHeaders" && $net2ftp_settings["check_authorization"] == "yes" && $net2ftp_globals["ftpserver"] != "") {
-
-                checkAuthorization($net2ftp_globals["ftpserver"], $net2ftp_globals["ftpserverport"], $net2ftp_globals["directory"], $net2ftp_globals["username"]);
-
+ 
-                        logError();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                }
-        }
@@ -236 +232 @@
-// -------------------------------------------------------------------------
-// Get the consumption counter values from the database
-
-
+ 
+ 
-// values in global variables. See /includes/consumption.inc.php for the details.
-// --> Do this only once, when $action == "sendHttpHeaders"
@@ -243 +239 @@
-        if ($action == "sendHttpHeaders") {
-                getConsumption();
-
+ 
-                        logError();
-
+ 
-                }
-        }
@@ -256 +252 @@
-// For most modules, everything must be done: send headers, print body, etc
-// ------------------------------------
-
-
-
-
-
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
-          $net2ftp_globals["state"] == "calculatesize" ||
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+  
+  
+ 
+ 
+ 
-          $net2ftp_globals["state"] == "zip") {
-
-                require_once($net2ftp_globals["application_modulesdir"] . "/" . $net2ftp_globals["state"] . "/" . $net2ftp_globals["state"] . ".inc.php");
-
-
-
+ 
+ 
-
-                        // If needed, exit to avoid sending non-header output (by net2ftp or other application)
@@ -294 +290 @@
-
-                }
-
-
-
-
-
+ 
+ 
+ 
+
+ 
-                        net2ftp_module_printCss();
-                        net2ftp_plugin_printCss();
-                }
-onload") {
-onload();
-onload();
+Onload") { 
+Onload(); 
+Onload(); 
-                }
-                elseif ($action == "printBody")       {
-
-                        // Print the status bar to be able to show the progress
-
-
-
+
+
-                        }
+                        require_once($net2ftp_globals["application_skinsdir"] . "/" . $net2ftp_globals["skin"] . "/status/status.inc.php"); 
-
-                        // Do the work and meanwhile update the progress bar
@@ -334 +330 @@
-// For some modules, only headers must be sent
-// ------------------------------------
-
-
+ 
+ 
-              $net2ftp_globals["state"] == "downloadzip"   ||
-              $net2ftp_globals["state"] == "followsymlink" ||
-
+ 
-             ($net2ftp_globals["state"] == "view" && $net2ftp_globals["state2"] != "")) {
-                require_once($net2ftp_globals["application_modulesdir"] . "/" . $net2ftp_globals["state"] . "/" . $net2ftp_globals["state"] . ".inc.php");
-
+ 
-
-                        // Do the work - do not update the progress bar
@@ -358 +354 @@
-                elseif ($action == "printJavascript") { }
-                elseif ($action == "printCss")        { }
-o
+O
-                elseif ($action == "printBody")       { }
-        }
@@ -366 +362 @@
-        }
-        else {
-
+ 
-                setErrorVars(false, $errormessage, debug_backtrace(), __FILE__, __LINE__);
-                logError();
@@ -399 +395 @@
-// If $net2ftp_globals["isStatusbarActive"] is not yet filled, calculate its value
-// and fill it in
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $net2ftp_globals["state"] == "calculatesize" ||
-
-
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
+ 
+ 
-                $net2ftp_globals["state"] == "newfile" ||
-
-
-
-
-
-
+  
+  
+ 
+ 
+ 
+ 
-                $net2ftp_globals["state"] == "zip") {
-                        $net2ftp_globals["isStatusbarActive"] = true;
@@ -466 +463 @@
-
-// Initialization
-
+ 
-                $net2ftp_globals["stopwatch_starttime"] = $now;
-        }
-
+ 
-                $net2ftp_globals["stopwatch_endtime"] = $now;
-        }