From 22a34e30a2b24b1b1e47510f8a4659b27d4aa09c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 25 Feb 2013 07:58:05 +0000
Subject: [PATCH] Added line number to debug lines as this will become the
 default

---
 inc/classes/main/console/class_ConsoleTools.php         | 4 ++--
 inc/classes/main/io/class_FrameworkDirectoryPointer.php | 8 ++++----
 inc/classes/main/registry/class_BaseRegistry.php        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php
index d5982605..028009f9 100644
--- a/inc/classes/main/console/class_ConsoleTools.php
+++ b/inc/classes/main/console/class_ConsoleTools.php
@@ -123,7 +123,7 @@ class ConsoleTools extends BaseFrameworkSystem {
 
 		// Add last new-line
 		$proxyTunnel .= self::HTTP_EOL;
-		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONSOLE-TOOLS: proxyTunnel=' . $proxyTunnel);
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONSOLE-TOOLS[' . __LINE__ . ']: proxyTunnel=' . $proxyTunnel);
 
 		// Write request
 		fwrite($socketResource, $proxyTunnel);
@@ -343,7 +343,7 @@ class ConsoleTools extends BaseFrameworkSystem {
 
 
 		// Debug message
-		/* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONSOLE-TOOLS: Resolved external address: ' . $externalAddress);
+		/* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONSOLE-TOOLS[' . __LINE__ . ']: Resolved external address: ' . $externalAddress);
 
 		// Return determined external IP
 		return $externalAddress;
diff --git a/inc/classes/main/io/class_FrameworkDirectoryPointer.php b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
index f48b884b..95932392 100644
--- a/inc/classes/main/io/class_FrameworkDirectoryPointer.php
+++ b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
@@ -140,7 +140,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	public function readDirectoryExcept (array $except = array('.', '..')) {
 		if (count($except) == 0) {
 			// No exception given, so read all data
-			self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY: No exceptions given, please use readRawDirectory() instead!');
+			self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __LINE__ . ']: No exceptions given, please use readRawDirectory() instead!');
 			return $this->readRawDirectory();
 		} // END - if
 
@@ -150,16 +150,16 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 		// Shall we exclude directories?
 		if ((!is_null($rawLine)) && ($rawLine !== false) && (!in_array($rawLine, $except))) {
 			// Return read data
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY: rawLine[' . gettype($rawLine) . ']=' . $rawLine);
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __LINE__ . ']: rawLine[' . gettype($rawLine) . ']=' . $rawLine);
 			return $rawLine;
 		} elseif ((!is_null($rawLine)) && ($rawLine !== false)) {
 			// Exclude this part
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY: rawline[' . gettype($rawLine) . ']=' . $rawLine . ' - Recursive call!');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __LINE__ . ']: rawline[' . gettype($rawLine) . ']=' . $rawLine . ' - Recursive call!');
 			return $this->readDirectoryExcept($except);
 		}
 
 		// End pointer reached
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY: Returning NULL!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __LINE__ . ']: Returning NULL!');
 		return NULL;
 	}
 
diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index e16ded28..4fd9aaf6 100644
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -133,19 +133,19 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 		// "Walk" over all entries
 		foreach ($this->getEntries($arrayKey) as $key => $value) {
 			// Debug message
-			//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
+			//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
 
 			// If $value matches the $lookFor, we need to look for more entries for this!
 			if ($lookFor == $value) {
 				// Look for more entries
 				foreach ($this->getEntries() as $key2 => $value2) {
 					// Debug message
-					//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
+					//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
 
 					// Both keys must match!
 					if (($key == $key2) || (isset($value2[$key]))) {
 						// Debug message
-						//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Adding ' . $value2[$key] . ' ...');
+						//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Adding ' . $value2[$key] . ' ...');
 
 						// Then add it
 						$entry[$key2] = $value2[$key];
-- 
2.30.2