From db61178ebaf96aa11cc16f18af4fedaaf32fe2de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 1 Jul 2008 13:07:54 +0000 Subject: [PATCH] Minor code improvements: - A lot else statements rewritten - Typos fixed --- .../class_NoShipyardsConstructedException.php | 7 +- .../main/companies/class_ShippingCompany.php | 12 ++-- .../personell/class_SimulatorPersonell.php | 25 +++---- .../company/class_CompanyEmployee.php | 8 +-- .../ship-simu/main/ships/class_BaseShip.php | 10 +-- .../ships/passenger/class_PassengerShip.php | 41 ++---------- .../de/code/action_login_company.ctp | 4 +- .../main/class_BaseFrameworkSystem.php | 21 +++--- .../main/crypto/class_CryptoHelper.php | 10 +-- .../main/filter/auth/class_UserAuthFilter.php | 10 +-- .../io/class_FrameworkFileInputPointer.php | 25 +++---- .../main/mailer/debug/class_DebugMailer.php | 65 ++++++++++--------- .../main/output/class_ConsoleOutput.php | 12 ++-- .../class_BaseControllerResolver.php | 4 +- .../image/class_ImageControllerResolver.php | 7 +- inc/config/class_FrameworkConfiguration.php | 27 ++++---- 16 files changed, 129 insertions(+), 159 deletions(-) diff --git a/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php b/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php index 228e2dd..03245b3 100644 --- a/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php +++ b/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php @@ -23,15 +23,14 @@ */ class NoShipyardsConstructedException extends FrameworkException { public function __construct (FrameworkInterface $class, $code) { + // No class given + $message = sprintf("Please provide a class for %s", __CLASS__); if (is_object($class)) { // Add a message around the missing class $message = sprintf("[%s:] Keine Werften gefunden!", $class->__toString() ); - } else { - // No class given - $message = sprintf("Please provide a class for %s", __CLASS__); - } + } // END - if // Call parent constructor parent::__construct($message, $code); diff --git a/application/ship-simu/main/companies/class_ShippingCompany.php b/application/ship-simu/main/companies/class_ShippingCompany.php index 1eef86b..7549af4 100644 --- a/application/ship-simu/main/companies/class_ShippingCompany.php +++ b/application/ship-simu/main/companies/class_ShippingCompany.php @@ -331,14 +331,14 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner $iterator->seek($pos); // Is the current position valid? - if ($iterator->valid()) { - // Element holen - $employee = $iterator->current(); - } else { + if (!$iterator->valid()) { // Should normally not happen... :( throw new StructuresOutOfBoundsException($idx, self::EXCEPTION_INDEX_OUT_OF_BOUNDS); - } - } + } // END - if + + // Get current element + $employee = $iterator->current(); + } // END - while // A dummy just for the description and real class $dummy = CompanyEmployee::createCompanyEmployee("", "", "M", 1970, 1, 1, $employee->isMarried(), 0); diff --git a/application/ship-simu/main/personell/class_SimulatorPersonell.php b/application/ship-simu/main/personell/class_SimulatorPersonell.php index 1021c56..91916e5 100644 --- a/application/ship-simu/main/personell/class_SimulatorPersonell.php +++ b/application/ship-simu/main/personell/class_SimulatorPersonell.php @@ -129,20 +129,20 @@ class SimulatorPersonell extends BasePersonell { * @throws MissingSimulatorIdException If an ID number was not found */ public final static function createSimulatorPersonellByID ($idNumber) { + // Use the direct ID number + $tempID = $idNumber; + // Add the class name if it was not found if (count(explode("@", $idNumber)) < 2) { // Add class name in front of the incomplete ID number $tempID = sprintf("%s@%s", __CLASS__, $idNumber); - } else { - // Use the direct ID number - $tempID = $idNumber; - } + } // END - if // Validate the ID number if (!preg_match(sprintf("/%s\@([a-f0-9]){32}/i", __CLASS__), $tempID)) { // Invalid format throw new InvalidIDFormatException(new SimulatorPersonell(), self::EXCEPTION_ID_IS_INVALID_FORMAT); - } + } // END - if // Get instance $personellInstance = new SimulatorPersonell(false); @@ -154,7 +154,7 @@ class SimulatorPersonell extends BasePersonell { if (!$dbInstance->isUniqueIdUsed($tempID)) { // Entry not found! throw new MissingSimulatorIdException(array($personellInstance, $idNumber), self::EXCEPTION_SIMULATOR_ID_INVALID); - } + } // END - if // Load the personell list and add it to this object $personellInstance->loadPersonellList($tempID); @@ -176,15 +176,18 @@ class SimulatorPersonell extends BasePersonell { // Create personell list public function createPersonellList () { - if (is_null($this->personellList)) { - $this->personellList = new FrameworkArrayObject("FakedPersonellList"); - } else { + // Is the list already created? + if ($this->personelllList instanceof FrameworkArrayObject) { + // Throw an exception throw new PersonellListAlreadyCreatedException($this, self::EXCEPTION_DIMENSION_ARRAY_INVALID); - } + } // END - if + + // Initialize the array + $this->personellList = new FrameworkArrayObject("FakedPersonellList"); } // Remove the personell list - private function removePersonellList () { + private final function removePersonellList () { unset($this->personellList); } diff --git a/application/ship-simu/main/personell/company/class_CompanyEmployee.php b/application/ship-simu/main/personell/company/class_CompanyEmployee.php index 32d2abe..52a4d24 100644 --- a/application/ship-simu/main/personell/company/class_CompanyEmployee.php +++ b/application/ship-simu/main/personell/company/class_CompanyEmployee.php @@ -56,14 +56,14 @@ class CompanyEmployee extends SimulatorPersonell { } // Ist the given birthday valid? - if ($personellInstance->isDateValid($year, $month, $day)) { - // Set birthday - $personellInstance->setBirthday($year, $month, $day); - } else { + if (!$personellInstance->isDateValid($year, $month, $day)) { // Something is wrong ... throw new BirthdayInvalidException(array($year, $month, $day), self::EXCEPTION_BIRTH_DATE_IS_INVALID); } + // Set birthday + $personellInstance->setBirthday($year, $month, $day); + // Set as employed/marrital status $personellInstance->setEmployed(true); $personellInstance->setMarried($married); diff --git a/application/ship-simu/main/ships/class_BaseShip.php b/application/ship-simu/main/ships/class_BaseShip.php index 51f1559..b72af8a 100644 --- a/application/ship-simu/main/ships/class_BaseShip.php +++ b/application/ship-simu/main/ships/class_BaseShip.php @@ -70,13 +70,13 @@ class BaseShip extends BaseSimulator { )); // Ist die gewuenschte Klasse vorhanden? - if (class_exists($partClass)) { - // Get an instance back from our object factory - $partInstance = ObjectFactory::createObjectByName($partClass); - } else { + if (!class_exists($partClass)) { // Nicht vorhanden, dann Ausnahme werfen! throw new ClassNotFoundException($partClass, self::EXCEPTION_CLASS_NOT_FOUND); - } + } // END - if + + // Get an instance back from our object factory + $partInstance = ObjectFactory::createObjectByName($partClass); // Das Einbauen versuchen... try { diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php index 4e8b130..39f50db 100644 --- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php +++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php @@ -43,15 +43,7 @@ class PassengerShip extends BaseShip implements ConstructableShip { // Get new instance $passInstance = new PassengerShip(); - // Debug message - if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) { - $passInstance->debugOutput(sprintf("[%s:%d] Ein Passagier-Schiff wird erstellt.", - __CLASS__, - __LINE__ - )); - } // END - if - - // Set ship's name + // Set ship name $passInstance->setShipName($shipName); // Instanz zurueckgeben @@ -59,7 +51,7 @@ class PassengerShip extends BaseShip implements ConstructableShip { } // Anzahl Betten ermitteln - final function calcTotalBeds () { + public final function calcTotalBeds () { // Struktur-Array holen $struct = $this->getStructuresArray(); @@ -90,34 +82,11 @@ class PassengerShip extends BaseShip implements ConstructableShip { if (!is_null($cab)) { // Kabinenbeschreibung holen $cabType = $cab->getObjectDescription(); - } - - // Debug-Meldung ausgeben - $this->debugOutput(sprintf("[%s:%d] Es stehen %d Betten vom Kabinen-Typ %s bereit.", - __CLASS__, - __LINE__, - $total, - $cabType - )); - } - } else { - // Keine Kabine! - if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] %s ist keine Kabine.", - __CLASS__, - __LINE__, - $el->getObjectDescription() - )); - } + } // END - if + } // END - if + } // END - if } // END - for - if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] Das %s mit dem Namen %s hat %d Betten.", - __CLASS__, - __LINE__, - $this->getObjectDescription(), - $this->getShipName(), - $numBeds - )); - // Anzahl zurueckliefern return $numBeds; } diff --git a/application/ship-simu/templates/de/code/action_login_company.ctp b/application/ship-simu/templates/de/code/action_login_company.ctp index 2747805..7eacc4b 100644 --- a/application/ship-simu/templates/de/code/action_login_company.ctp +++ b/application/ship-simu/templates/de/code/action_login_company.ctp @@ -8,9 +8,9 @@ $linkInstance->prefetchValueInstance('user'); // Maximum of allowed companies reached? if ($linkInstance->getValueInstance()->ifUserCreatedMaximumAllowedCompanies()) { // No more companies allowed to create -} elseif ($linkInstance->getValueInstance()->ifUserPointsEnougth('found_new_company')) { +} elseif ($linkInstance->getValueInstance()->ifUserPointsEnough('found_new_company')) { // Enough money to found company -} elseif ($linkInstance->getValueInstance()->ifUserPointsEnougth('write_applications')) { +} elseif ($linkInstance->getValueInstance()->ifUserPointsEnough('write_applications')) { // Enough money to write applications to other companies } elseif ($linkInstance->getValueInstance()->ifGovermentPaysStartupHelp()) { // Display link to goverment for startup help diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index 4a6eb89..9633826 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -480,11 +480,16 @@ 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)) { - return Registry::getRegistry()->getInstance('dbInstance'); - } else { - return null; - } + $dbInstance = Registry::getRegistry()->getInstance('dbInstance'); + } // END - if + + // Return instance + return $dbInstance; } /** @@ -721,11 +726,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { * @return $objectDescription The description of this simulation part */ public final function getObjectDescription () { - if (isset($this->objectDescription)) { - return $this->objectDescription; - } else { - return null; - } + return $this->objectDescription; } /** @@ -750,7 +751,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { /** * Compare if both simulation part description and class name matches - * (shall be enougth) + * (shall be enough) * * @param $itemInstance An object instance to an other class * @return boolean The result of comparing class name simulation part description diff --git a/inc/classes/main/crypto/class_CryptoHelper.php b/inc/classes/main/crypto/class_CryptoHelper.php index d1b7e87..4583bd7 100644 --- a/inc/classes/main/crypto/class_CryptoHelper.php +++ b/inc/classes/main/crypto/class_CryptoHelper.php @@ -136,17 +136,17 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable { // Cast the string $str = (string) $str; + // Default is the default salt ;-) + $salt = $this->salt; + // Is the old password set? - if (empty($oldHash)) { - // No, then use the current salt - $salt = $this->salt; - } else { + if (!empty($oldHash)) { // Use the salt from hash, first get length $length = $this->getConfigInstance()->readConfig('salt_length'); // Then extract the X first characters from the hash as our salt $salt = substr($oldHash, 0, $length); - } + } // END - if // Hash the password with salt //* DEBUG: */ echo "salt=".$salt."/plain=".$str."
\n"; diff --git a/inc/classes/main/filter/auth/class_UserAuthFilter.php b/inc/classes/main/filter/auth/class_UserAuthFilter.php index 572d2b0..5c871cd 100644 --- a/inc/classes/main/filter/auth/class_UserAuthFilter.php +++ b/inc/classes/main/filter/auth/class_UserAuthFilter.php @@ -107,16 +107,16 @@ class UserAuthFilter extends BaseFilter implements Filterable { throw new UserAuthorizationException($this, self::EXCEPTION_AUTH_DATA_INVALID); } // END - if + // Regular user account + $className = $this->getConfigInstance()->readConfig('user_class'); + $methodName = 'createMemberByUserName'; + // Now, try to get a user or guest instance if ($authLogin == $this->getConfigInstance()->readConfig('guest_login_user')) { // Set class $className = $this->getConfigInstance()->readConfig('guest_class'); $methodName = 'createGuestByUserName'; - } else { - // Regular user account - $className = $this->getConfigInstance()->readConfig('user_class'); - $methodName = 'createMemberByUserName'; - } + } // END - if // Does the guest class exist? if (!class_exists($className)) { diff --git a/inc/classes/main/io/class_FrameworkFileInputPointer.php b/inc/classes/main/io/class_FrameworkFileInputPointer.php index 0e070be..4cefaaf 100644 --- a/inc/classes/main/io/class_FrameworkFileInputPointer.php +++ b/inc/classes/main/io/class_FrameworkFileInputPointer.php @@ -34,6 +34,8 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { /** * Protected constructor + * + * @return void */ protected function __construct () { // Call parent constructor @@ -51,6 +53,8 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { /** * Destructor for cleaning purposes, etc + * + * @return void */ public final function __destruct() { // Is there a resource pointer? Then we have to close the file here! @@ -67,11 +71,10 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { * Create a file pointer based on the given file. The file will also * be verified here. * - * @param $fileName The file name we shall pass - * to fopen() + * @param $fileName The file name we shall pass to fopen() * @throws FileIsEmptyException If the provided file name is empty. - * @throws FilePointerNotOpenedException If fopen() returns not a - * file resource + * @throws FilePointerNotOpenedException If fopen() returns not a + * file resource * @return void */ public final static function createFrameworkFileInputPointer ($fileName) { @@ -110,7 +113,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { * * @return mixed The result of fread() * @throws NullPointerException If the file pointer instance - * is not set by setPointer() + * is not set by setPointer() * @throws InvalidFileResourceException If there is being set * an invalid file resource */ @@ -132,7 +135,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { * * @return mixed The result of fread() * @throws NullPointerException If the file pointer instance - * is not set by setPointer() + * is not set by setPointer() * @throws InvalidFileResourceException If there is being set * an invalid file resource */ @@ -155,7 +158,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { * * @return void * @throws NullPointerException If the file pointer instance - * is not set by setPointer() + * is not set by setPointer() * @throws InvalidFileResourceException If there is being set */ public function closeFile () { @@ -176,7 +179,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { /** * Setter for the file pointer * - * @param $filePointer File resource + * @param $filePointer File resource * @return void */ public final function setPointer ($filePointer) { @@ -194,7 +197,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { * Getter for the file pointer * * @return $filePointer The file pointer which shall be a valid - * file resource + * file resource */ public final function getPointer () { return $this->filePointer; @@ -203,7 +206,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { /** * Setter for file name * - * @param $fileName The new file name + * @param $fileName The new file name * @return void */ public final function setFileName ($fileName) { @@ -214,7 +217,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { /** * Getter for file name * - * @return $fileName The current file name + * @return $fileName The current file name */ public final function getFileName () { return $this->fileName; diff --git a/inc/classes/main/mailer/debug/class_DebugMailer.php b/inc/classes/main/mailer/debug/class_DebugMailer.php index 9e2aea1..171c565 100644 --- a/inc/classes/main/mailer/debug/class_DebugMailer.php +++ b/inc/classes/main/mailer/debug/class_DebugMailer.php @@ -68,6 +68,7 @@ class DebugMailer extends BaseMailer implements DeliverableMail { * Deliver email to the recipient(s) * * @return void + * @throws InvalidInterfaceException If the recipient instance does not implement ManageableMember */ public function deliverEmail () { // Get template instance @@ -78,46 +79,46 @@ class DebugMailer extends BaseMailer implements DeliverableMail { // Walk through all recipients and "sent", or better print, it out foreach ($recipientList['recipients'] as $recipientInstance) { // The recipient should be a user instance, right? - if ($recipientInstance instanceof ManageableMember) { - // User class found, so entry is valid, first load the template - $this->loadTemplate($templateName); + if (!$recipientInstance instanceof ManageableMember) { + // Invalid entry found! + throw new InvalidInterfaceException(array($this, 'ManageableMember'), self::EXCEPTION_REQUIRED_INTERFACE_MISSING); + } - // Set subject line - $templateInstance->assignVariable('subject', $this->getSubjectLine()); + // User class found, so entry is valid, first load the template + $this->loadTemplate($templateName); - // Walk through all variables, first config to assign them - foreach ($recipientList['config_vars'] as $variable=>$dummy) { - // Load the config value and set it - $templateInstance->assignConfigVariable($variable); - } // END - if + // Set subject line + $templateInstance->assignVariable('subject', $this->getSubjectLine()); + + // Walk through all variables, first config to assign them + foreach ($recipientList['config_vars'] as $variable=>$dummy) { + // Load the config value and set it + $templateInstance->assignConfigVariable($variable); + } // END - if - // Now do the same with the values but ask the "value instance" instead! - foreach ($recipientList['value_vars'] as $variable=>$dummy) { - // Is the value instance there? - if (!isset($recipientList['values'][$variable])) { - // Throw exception - throw new NullPointerException ($this, self::EXCEPTION_IS_NULL_POINTER); - } // END - if + // Now do the same with the values but ask the "value instance" instead! + foreach ($recipientList['value_vars'] as $variable=>$dummy) { + // Is the value instance there? + if (!isset($recipientList['values'][$variable])) { + // Throw exception + throw new NullPointerException ($this, self::EXCEPTION_IS_NULL_POINTER); + } // END - if - // Get the field from the value instance - $fieldValue = $recipientList['values'][$variable]->getField($variable); + // Get the field from the value instance + $fieldValue = $recipientList['values'][$variable]->getField($variable); - // Set it in the template engine - $templateInstance->assignVariable($variable, $fieldValue); - } + // Set it in the template engine + $templateInstance->assignVariable($variable, $fieldValue); + } - // Render the content - $templateInstance->renderXmlContent(); + // Render the content + $templateInstance->renderXmlContent(); - // Get responce instance - $responseInstance = $this->getApplicationInstance()->getResponseInstance(); + // Get responce instance + $responseInstance = $this->getApplicationInstance()->getResponseInstance(); - // Transfer the data to the response - $this->getTemplateInstance()->transferToResponse($responseInstance); - } else { - // Invalid entry found! - $this->partialStub("Handling of invalid recipient entries not yet finished."); - } + // Transfer the data to the response + $this->getTemplateInstance()->transferToResponse($responseInstance); } // END - foreach } // END - foreach } diff --git a/inc/classes/main/output/class_ConsoleOutput.php b/inc/classes/main/output/class_ConsoleOutput.php index 6c9e0fe..ff2ad10 100644 --- a/inc/classes/main/output/class_ConsoleOutput.php +++ b/inc/classes/main/output/class_ConsoleOutput.php @@ -52,8 +52,8 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer { /** * Create a new web output system and set the content type * - * @param $contentType A valid content-type - * @return $debugInstance An instance of this middleware class + * @param $contentType A valid content-type + * @return $debugInstance An instance of this middleware class */ public final static function createConsoleOutput ($contentType) { // Cast the content-type to string @@ -77,7 +77,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer { /** * Getter for an instance of this class * - * @return $consoleInstance An instance of this class + * @return $consoleInstance An instance of this class */ public final static function getInstance() { if (is_null(self::$consoleInstance)) { @@ -90,7 +90,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer { /** * Output the code * - * @param $outStream Something we shall sent to the console + * @param $outStream Something we shall sent to the console * @return void */ public final function output ($outStream=false) { @@ -108,8 +108,8 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer { /** * Assigns a variable for output * - * @param $var The variable we shall assign - * @param $value The value to store in the variable + * @param $var The variable we shall assign + * @param $value The value to store in the variable * @return void */ public function assignVariable ($var, $value) { diff --git a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php index c34d5ca..2548b4f 100644 --- a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php +++ b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php @@ -106,10 +106,10 @@ class BaseControllerResolver extends BaseResolver { // Do we have news? if ($this->getConfigInstance()->readConfig('page_with_news') == $this->getApplicationInstance()->getRequestInstance()->getRequestElement('page')) { // Yes, display news in home then set default controller with news - $this->setClassName($this->controllerPrefix.'DefaultNewsController'); + $this->setClassName($this->controllerPrefix . 'DefaultNewsController'); } else { // No news at home page or non-news page - $this->setClassName($this->controllerPrefix.'DefaultController'); + $this->setClassName($this->controllerPrefix . 'DefaultController'); } } else { // All is tried, give it up here diff --git a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php index 6ec8fc4..c10a4c6 100644 --- a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php +++ b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php @@ -136,7 +136,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll $controllerInstance = null; // Default controller - $this->setClassName('ImageDefaultController'); + $this->setClassName($defaultController); // Generate the class name //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName; @@ -145,10 +145,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll $this->setClassName(sprintf("Image%sController", $this->convertToClassName($controllerName) )); - } else { - // Default controller - $this->setClassName('ImageDefaultController'); - } + } // END - if //* DEBUG: */ echo ", controller=".$this->getClassName()."
\n"; // Is this class loaded? diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php index 74c9416..1178361 100644 --- a/inc/config/class_FrameworkConfiguration.php +++ b/inc/config/class_FrameworkConfiguration.php @@ -133,14 +133,14 @@ class FrameworkConfiguration implements Registerable { // Is the file name really set? if (!empty($inc)) { + // Base path is by default added + $fqfn = $inc; + // Base path added? (Uni* / Windows) if ((substr($inc, 0, 1) != "/") && (substr($inc, 1, 1) != ":")) { // Generate FQFN $fqfn = sprintf("%s/inc/extra/%s", PATH, $inc); - } else { - // Base path is already added - $fqfn = $inc; - } + } // END - if } // END - if // Include them all here @@ -157,18 +157,15 @@ class FrameworkConfiguration implements Registerable { */ public function defineDatabaseType ($type) { // Is it defined or not? - if (!defined('_DB_TYPE')) { - // Cast to string - $type = (string) $type; - - // Set the constant - define('_DB_TYPE', $type); - } else { + if (defined('_DB_TYPE')) { // Already defined! But we cannot throw an exception here... :( ApplicationEntryPoint::app_die(sprintf("[%s:] Please define the database type only once in your application!", __CLASS__ )); } + + // Set the constant + define('_DB_TYPE', (string) $type); } /** @@ -190,15 +187,15 @@ class FrameworkConfiguration implements Registerable { ApplicationEntryPoint::app_die(sprintf("[%s:] Invalid path (not found) specified. Please make sure it is created.", __CLASS__ )); - } elseif (!defined('PATH')) { - // Set the constant - define('PATH', $path); - } else { + } elseif (defined('PATH')) { // Already defined! But we cannot throw an exception here... :( ApplicationEntryPoint::app_die(sprintf("[%s:] Please define the local file path only once in your application.", __CLASS__ )); } + + // Define path here + define('PATH', $path); } /** -- 2.30.2