Moved 'devel' directory (need to update all repos)

diff --git a/.gitattributes b/.gitattributes
index 991ebdc43beef94144451429da2238c1ddcf182a..1bb2819567a0f1ead3653615612df9d8497ede26 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,4 @@
 * text=auto !eol
-devel/.htaccess -text
-devel/class_Debug.php -text
 docs/COPYING -text
 docs/COPYING.documents -text
 docs/COPYING.software -text
@@ -531,6 +529,8 @@ inc/config/config-hubmaster.php -text
 inc/database.php -text
 inc/database/.htaccess -text
 inc/database/lib-local.php -text
+inc/devel/.htaccess -text
+inc/devel/class_Debug.php -text
 inc/file_io.php -text
 inc/hooks.php -text
 inc/includes.php -text

diff --git a/devel/.htaccess b/devel/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/devel/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/devel/class_Debug.php b/devel/class_Debug.php
deleted file mode 100644 (file)
index ad19e8a..0000000
--- a/devel/class_Debug.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * A dummy class for debugging
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- *
- * 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 3 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, see <http://www.gnu.org/licenses/>.
- */
-class Debug {
-       // Constructor
-       public function __construct () {
-               // eval()-Befehle debuggen
-               //define('DEBUG_EVAL', true);
-               // SimulatorBase debuggen (VORSICHT! SEHR VIELE DEBUG-MELDUNGEN!!!)
-               //define('DEBUG_CORE', true);
-               //////// Objekte debuggen (ausgeben) ////////
-               // Datenbank-Objekt debuggen
-               //define('DEBUG_DATABASE_OBJ', true);
-               //////// Alles unteren debuggen ////////
-               //define('DEBUG_ALL', true);
-               // Kompressor debuggen
-               //define('DEBUG_COMPRESSOR', true);
-               // Datenbankschichten debuggen
-               //define('DEBUG_DATABASE', true);
-               // Template-System debuggen
-               //define('DEBUG_TEMPLATE', true);
-               // Konfiguration debuggen
-               //define('DEBUG_CONFIG', true);
-       }
-}
-
-/**
- * Initialize the dummy debug class
- */
-$dummy = new Debug();
-unset($dummy);
-
-//
-?>

diff --git a/inc/devel/.htaccess b/inc/devel/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/inc/devel/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/inc/devel/class_Debug.php b/inc/devel/class_Debug.php
new file mode 100644 (file)
index 0000000..ad19e8a
--- /dev/null
+++ b/inc/devel/class_Debug.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * A dummy class for debugging
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+class Debug {
+       // Constructor
+       public function __construct () {
+               // eval()-Befehle debuggen
+               //define('DEBUG_EVAL', true);
+               // SimulatorBase debuggen (VORSICHT! SEHR VIELE DEBUG-MELDUNGEN!!!)
+               //define('DEBUG_CORE', true);
+               //////// Objekte debuggen (ausgeben) ////////
+               // Datenbank-Objekt debuggen
+               //define('DEBUG_DATABASE_OBJ', true);
+               //////// Alles unteren debuggen ////////
+               //define('DEBUG_ALL', true);
+               // Kompressor debuggen
+               //define('DEBUG_COMPRESSOR', true);
+               // Datenbankschichten debuggen
+               //define('DEBUG_DATABASE', true);
+               // Template-System debuggen
+               //define('DEBUG_TEMPLATE', true);
+               // Konfiguration debuggen
+               //define('DEBUG_CONFIG', true);
+       }
+}
+
+/**
+ * Initialize the dummy debug class
+ */
+$dummy = new Debug();
+unset($dummy);
+
+//
+?>

diff --git a/inc/includes.php b/inc/includes.php
index baa8a6362b6fd3a422a3dcd5d61d2387192cb819..979f16e50a0876e42936632be153e9f752a78419 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -63,9 +63,9 @@ $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 
 // Is the devel package included?
-if (is_dir(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'devel')) {
+if (is_dir(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/devel')) {
        // Load all development includes
-       ClassLoader::getInstance()->scanClassPath('devel');
+       ClassLoader::getInstance()->scanClassPath('inc/devel');
 } // END - if
 
 // [EOF]