From 43c787767e99231011b3322e436c7d9b1bbf9746 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 3 Mar 2008 21:22:01 +0000 Subject: [PATCH] core code merged, interfaces OutputStreamer implemented --- .../main/debug/class_DebugConsoleOutput.php | 26 ++++++++++++++++++- .../main/debug/class_DebugErrorLogOutput.php | 26 ++++++++++++++++++- .../main/debug/class_DebugWebOutput.php | 26 ++++++++++++++++++- inc/database/lib-local.php | 2 +- inc/includes.php | 2 +- inc/output.php | 2 +- 6 files changed, 78 insertions(+), 6 deletions(-) diff --git a/inc/classes/main/debug/class_DebugConsoleOutput.php b/inc/classes/main/debug/class_DebugConsoleOutput.php index 46205f48b3..82bcd7f1fe 100644 --- a/inc/classes/main/debug/class_DebugConsoleOutput.php +++ b/inc/classes/main/debug/class_DebugConsoleOutput.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger { +class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, OutputStreamer { /** * Private constructor * @@ -60,6 +60,30 @@ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger { public final function outputStream ($output) { print html_entity_decode(strip_tags($output)); } + + /** + * Assigns a variable for output + * + * @param $var The variable we shall assign + * @param $value The value to store in the variable + * @return void + */ + public final function assignVariable ($var, $value) { + // Empty stub! + trigger_error(__METHOD__.": Stub!"); + } + + /** + * Output the code + * + * @return void + */ + public final function output ($outStream=false) { + // Empty output will be silently ignored + if ($outStream !== false) { + $this->outputStream($outStream); + } + } } // [EOF] diff --git a/inc/classes/main/debug/class_DebugErrorLogOutput.php b/inc/classes/main/debug/class_DebugErrorLogOutput.php index 2897e948f5..c8e62936e5 100644 --- a/inc/classes/main/debug/class_DebugErrorLogOutput.php +++ b/inc/classes/main/debug/class_DebugErrorLogOutput.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class DebugErrorLogOutput extends BaseFrameworkSystem implements Debugger { +class DebugErrorLogOutput extends BaseFrameworkSystem implements Debugger, OutputStreamer { /** * Private constructor * @@ -69,6 +69,30 @@ class DebugErrorLogOutput extends BaseFrameworkSystem implements Debugger { } } } + + /** + * Assigns a variable for output + * + * @param $var The variable we shall assign + * @param $value The value to store in the variable + * @return void + */ + public final function assignVariable ($var, $value) { + // Empty stub! + trigger_error(__METHOD__.": Stub!"); + } + + /** + * Output the code + * + * @return void + */ + public final function output ($outStream=false) { + // Empty output will be silently ignored + if ($outStream !== false) { + $this->outputStream($outStream); + } + } } // [EOF] diff --git a/inc/classes/main/debug/class_DebugWebOutput.php b/inc/classes/main/debug/class_DebugWebOutput.php index f79bec0123..ee3ae81b4c 100644 --- a/inc/classes/main/debug/class_DebugWebOutput.php +++ b/inc/classes/main/debug/class_DebugWebOutput.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class DebugWebOutput extends BaseFrameworkSystem implements Debugger { +class DebugWebOutput extends BaseFrameworkSystem implements Debugger, OutputStreamer { /** * Private constructor * @@ -60,6 +60,30 @@ class DebugWebOutput extends BaseFrameworkSystem implements Debugger { public final function outputStream ($output) { trigger_error($output); } + + /** + * Assigns a variable for output + * + * @param $var The variable we shall assign + * @param $value The value to store in the variable + * @return void + */ + public final function assignVariable ($var, $value) { + // Empty stub! + trigger_error(__METHOD__.": Stub!"); + } + + /** + * Output the code + * + * @return void + */ + public final function output ($outStream=false) { + // Empty output will be silently ignored + if ($outStream !== false) { + $this->outputStream($outStream); + } + } } // [EOF] diff --git a/inc/database/lib-local.php b/inc/database/lib-local.php index 90b1c0733f..a689fed4bc 100644 --- a/inc/database/lib-local.php +++ b/inc/database/lib-local.php @@ -1,6 +1,6 @@ * @version 0.3.0 diff --git a/inc/includes.php b/inc/includes.php index b2533f852a..5cecef8875 100644 --- a/inc/includes.php +++ b/inc/includes.php @@ -1,6 +1,6 @@ * @version 0.3.0 diff --git a/inc/output.php b/inc/output.php index 275f13927e..87e8384329 100644 --- a/inc/output.php +++ b/inc/output.php @@ -1,6 +1,6 @@ * @version 0.3.0 -- 2.39.5