General directory structure added for debug extension

diff --git a/.gitattributes b/.gitattributes
index c0c87f725c8b49a8b682871db1d6b007b7f3310d..67b6872cff934d609087564939f6b500d8ee157b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -93,6 +93,11 @@ inc/databases.php -text
 inc/db/.htaccess -text
 inc/db/lib-mysql3.php -text
 inc/db/lib.php -text
+inc/debug/.htaccess -text
+inc/debug/client/.htaccess -text
+inc/debug/relay/.htaccess -text
+inc/debug/request_ -text
+inc/debug/server/.htaccess -text
 inc/doubler_send.php -text
 inc/extensions.php -text
 inc/extensions/.htaccess -text

diff --git a/debug.php b/debug.php
index dd213e44f9a2ea27a767913ade8eb233b2b36d88..0d6150cadb20880a8c97ca87bfefe41dd1ea3e57 100644 (file)
--- a/debug.php
+++ b/debug.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * MXChange v0.2.1                                    Start: 10/12/2008 *
- * ===============                              Last change: 10/12/2008 *
+ * ===============                              Last change: 23/12/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : debug.php                                        *
@@ -35,18 +35,49 @@
 require_once("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+global $what, $action, $FATAL;
+$GLOBALS['what'] = "";
+$GLOBALS['action'] = "";
+$FATAL = array();
 
-// Set module
+// Set module and fake "CSS mode"
 $GLOBALS['module'] = "debug"; $CSS = -1;
 
 // Load the required file(s)
 require("inc/config.php");
 
 // Redirect only to registration page when this script is installed
-if (isBooleanConstantAndTrue('mxchange_installed')) {
-       // TODO Do something useful here...
+if ((isBooleanConstantAndTrue('mxchange_installed')) && (count($FATAL) == 0)) {
+       // Is the request parameter set?
+       if (isset($_POST['request'])) {
+               // Handle the request
+               if (DEBUG_HANDLE_REQUEST($_POST['request'])) {
+                       // Construct FQFN for the module
+                       $fqfn = sprintf("%sinc/debug/%s/request_%s",
+                               PATH,
+                               getConfig('debug_mode'),
+                               SQL_ESCAPE($_POST['request'])
+                       );
+
+                       // Is the module there? Else we log it!
+                       if (FILE_READABLE($fqfn)) {
+                               // Load the request module
+                               require($fqfn);
+                       } else {
+                               // Missing request file, may happen while development
+                               DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_404", $_POST['request']);
+                       }
+               } else {
+                       // Unhandled request detected
+                       DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_unhandled", $_POST['request']);
+               }
+       } else {
+               // Empty request
+               DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_empty", "");
+       }
+} else {
+       // Not installed or fatal errors
+       DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_fatal", count($FATAL));
 } // END - if
 
 // Really all done here... ;-)

diff --git a/inc/databases.php b/inc/databases.php
index a932b7831974c88da8563d80d75b7e5f194b0aa7..7121547965315dfd1b10f10287464444e9fb6cf8 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -115,7 +115,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "702");
+define('CURR_SVN_REVISION', "703");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/debug/.htaccess b/inc/debug/.htaccess
new file mode 100644 (file)
index 0000000..14249c5
--- /dev/null
+++ b/inc/debug/.htaccess
@@ -0,0 +1 @@
+Deny from all
\ No newline at end of file

diff --git a/inc/debug/client/.htaccess b/inc/debug/client/.htaccess
new file mode 100644 (file)
index 0000000..14249c5
--- /dev/null
+++ b/inc/debug/client/.htaccess
@@ -0,0 +1 @@
+Deny from all
\ No newline at end of file

diff --git a/inc/debug/relay/.htaccess b/inc/debug/relay/.htaccess
new file mode 100644 (file)
index 0000000..14249c5
--- /dev/null
+++ b/inc/debug/relay/.htaccess
@@ -0,0 +1 @@
+Deny from all
\ No newline at end of file

diff --git a/inc/debug/request_ b/inc/debug/request_
new file mode 100644 (file)
index 0000000..9f71990
--- /dev/null
+++ b/inc/debug/request_
@@ -0,0 +1,41 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 12/23/2008 *
+ * ===============                              Last change: 12/23/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : request_                                         *
+ * -------------------------------------------------------------------- *
+ * Short description :                                                  *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  :                                                  *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       require($INC);
+} // END - if
+
+//
+?>

diff --git a/inc/debug/server/.htaccess b/inc/debug/server/.htaccess
new file mode 100644 (file)
index 0000000..14249c5
--- /dev/null
+++ b/inc/debug/server/.htaccess
@@ -0,0 +1 @@
+Deny from all
\ No newline at end of file

diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php
index 193ae3200c26469b59c810a0e2cca6ae20cfce8c..886c13554816aef3bea08341631c74e8ffc2da47 100644 (file)
--- a/inc/extensions/ext-debug.php
+++ b/inc/extensions/ext-debug.php
@@ -130,6 +130,7 @@ PRIMARY KEY (`id`)
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_new_log` ENUM('ACCEPT','FIRST','REG') NOT NULL DEFAULT 'FIRST'";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_new_client` ENUM('ACTIVE','NEW','REG') NOT NULL DEFAULT 'NEW'";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_reject_log` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day') * 30)."";
+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `debug_master_url` VARCHAR(255) NOT NULL DEFAULT '{!SERVER_URL!}'";
        break;
 
 case "remove": // Do stuff when removing extension