core code merged, interfaces OutputStreamer implemented

diff --git a/inc/classes/main/debug/class_DebugConsoleOutput.php b/inc/classes/main/debug/class_DebugConsoleOutput.php
index 46205f48b3982ee8dbe5e32d7759f4da7fd3dfc2..82bcd7f1fe8df8a9810456bc479847ae4af19f18 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-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 2897e948f526d0c761d16f5d1902848e7d17fd0d..c8e62936e528147977d4082e2f75d020a10fbcbe 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-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 f79bec012363d4551102e3e26965b4b431fe5619..ee3ae81b4c8fe373bd9ac46d490e16ef90f30e8a 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-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 90b1c0733f747be928c0697bd10ce1bbacf80485..a689fed4bc556e1c2bb7482568e7e0302231f681 100644 (file)
--- a/inc/database/lib-local.php
+++ b/inc/database/lib-local.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Prepares a local file datbase
+ * Initializes the local file database class
  *
  * @author             Roland Haeder <webmaster@mxchange.org>
  * @version            0.3.0

diff --git a/inc/includes.php b/inc/includes.php
index b2533f852a4dfac81af77baa9ac1e0199badafdd..5cecef88756d542602b14f07b043de476a8fd243 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Load required include files
+ * Loads more include files by using the generic class loader
  *
  * @author             Roland Haeder <webmaster@mxchange.org>
  * @version            0.3.0

diff --git a/inc/output.php b/inc/output.php
index 275f13927e4cee58e17c056ad7ba0da6ac3a5064..87e838432964783d606c1c30bd6a74504be80dc0 100644 (file)
--- a/inc/output.php
+++ b/inc/output.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Prepares the (debug) output system
+ * Initializes the output middleware layer
  *
  * @author             Roland Haeder <webmaster@mxchange.org>
  * @version            0.3.0