Tried to fix a warning

[core.git] / inc / classes / main / class_BaseFrameworkSystem.php

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 9e7f247b4bf131264ce6c8e6a7dc0d0ae20a9b55..d574f4129ed3e0e4e347f25eec0d962503ba7045 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -101,7 +101,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        /***********************
         * Exception codes.... *
         ***********************/
-
+       // @todo Try to clean these constants up
        const EXCEPTION_IS_NULL_POINTER              = 0x001;
        const EXCEPTION_IS_NO_OBJECT                 = 0x002;
        const EXCEPTION_IS_NO_ARRAY                  = 0x003;
@@ -128,7 +128,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        const EXCEPTION_WRITE_PROTECED_PATH          = 0x018;
        const EXCEPTION_DIR_POINTER_INVALID          = 0x019;
        const EXCEPTION_FILE_POINTER_INVALID         = 0x01a;
-       const EXCEPTION_INVALID_DIRECTORY_POINTER    = 0x01b;
+       const EXCEPTION_INVALID_RESOURCE             = 0x01b;
        const EXCEPTION_UNEXPECTED_OBJECT            = 0x01c;
        const EXCEPTION_LIMIT_ELEMENT_IS_UNSUPPORTED = 0x01d;
        const EXCEPTION_GETTER_IS_MISSING            = 0x01e;
@@ -171,10 +171,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                // Set real class
                $this->setRealClass($className);
 
-               // Initialize the class if class Registry is there
-               if ((class_exists('Registry')) && (Registry::isInitialized() === false)) {
-                       // Initialize the registry automatically
-                       $this->initInstance();
+               // Set configuration instance if no registry
+               if (!$this instanceof Register) {
+                       // Because registries doesn't need to be configured
+                       $this->setConfigInstance(FrameworkConfiguration::getInstance());
                } // END - if
        }
 
@@ -245,16 +245,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                return null;
        }
 
-       /**
-        * Private initializer for this class
-        *
-        * @return      void
-        */
-       private final function initInstance () {
-               // Set configuration instance
-               $this->setConfigInstance(FrameworkConfiguration::getInstance());
-       }
-
        /**
         * Setter for database result instance
         *
@@ -388,7 +378,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @return      $debugInstance  Instance to class DebugConsoleOutput or DebugWebOutput
         */
        public final function getDebugInstance () {
+               // Get debug instance
                $debugInstance = Registry::getRegistry()->getInstance('debug');
+
+               // Return it
                return $debugInstance;
        }
 
@@ -429,13 +422,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @return      $dbInstance     The database layer instance
         */
        public final function getDatabaseInstance () {
-               // Default is invalid db instance
-               $dbInstance = null;
-
-               // Is the registry there and initialized?
-               if ((class_exists('Registry')) && (Registry::isInitialized() === true)) {
-                       $dbInstance = Registry::getRegistry()->getInstance('db_instance');
-               } // END - if
+               // Get instance
+               $dbInstance = Registry::getRegistry()->getInstance('db_instance');
 
                // Return instance
                return $dbInstance;
@@ -1130,6 +1118,46 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        public final function getIteratorInstance () {
                return $this->iteratorInstance;
        }
+
+       /**
+        * "Getter" as a time() replacement but with milliseconds. You should use this
+        * method instead of the encapsulated getimeofday() function.
+        *
+        * @return      $milliTime      Timestamp with milliseconds
+        */
+       public function getMilliTime () {
+               // Get the time of day as float
+               $milliTime = gettimeofday(true);
+
+               // Return it
+               return $milliTime;
+       }
+
+       /**
+        * Idles (sleeps) for given milliseconds
+        *
+        * @return      $hasSlept       Wether it goes fine
+        */
+       public function idle ($milliSeconds) {
+               // Sleep is fine by default
+               $hasSlept = true;
+
+               // Idle so long with found function
+               if (function_exists('time_sleep_until')) {
+                       // Get current time and add idle time
+                       $sleepUntil = $this->getMilliTime() + abs($milliSeconds) / 1000;
+
+                       // New PHP 5.1.0 function found
+                       $hasSlept = time_sleep_until($sleepUntil);
+               } else {
+                       // My Sun Station doesn't have that function even with latest PHP
+                       // package. :(
+                       usleep($milliSeconds * 1000);
+               }
+
+               // Return result
+               return $hasSlept;
+       }
 }
 
 // [EOF]