projects
/
core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
50a2fbc
)
All empty double-quoted strings replaced with single-quotes
author
Roland Häder
<roland@mxchange.org>
Fri, 13 Mar 2009 20:01:36 +0000
(20:01 +0000)
committer
Roland Häder
<roland@mxchange.org>
Fri, 13 Mar 2009 20:01:36 +0000
(20:01 +0000)
57 files changed:
inc/classes.php
patch
|
blob
|
history
inc/classes/exceptions/class_FrameworkException.php
patch
|
blob
|
history
inc/classes/exceptions/main/class_MissingArrayElementsException.php
patch
|
blob
|
history
inc/classes/interfaces/crypto/class_Cryptable.php
patch
|
blob
|
history
inc/classes/main/class_BaseFrameworkSystem.php
patch
|
blob
|
history
inc/classes/main/class_FrameworkArrayObject.php
patch
|
blob
|
history
inc/classes/main/commands/class_BaseCommand.php
patch
|
blob
|
history
inc/classes/main/commands/web/class_WebLoginAreaCommand.php
patch
|
blob
|
history
inc/classes/main/criteria/class_BaseCriteria.php
patch
|
blob
|
history
inc/classes/main/criteria/dataset/class_DataSetCriteria.php
patch
|
blob
|
history
inc/classes/main/criteria/search/class_SearchCriteria.php
patch
|
blob
|
history
inc/classes/main/crypto/class_CryptoHelper.php
patch
|
blob
|
history
inc/classes/main/database/databases/class_LocalFileDatabase.php
patch
|
blob
|
history
inc/classes/main/debug/class_DebugWebOutput.php
patch
|
blob
|
history
inc/classes/main/discovery/class_BaseDiscovery.php
patch
|
blob
|
history
inc/classes/main/filter/auth/class_UserAuthFilter.php
patch
|
blob
|
history
inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
patch
|
blob
|
history
inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php
patch
|
blob
|
history
inc/classes/main/helper/captcha/images/class_ImageHelper.php
patch
|
blob
|
history
inc/classes/main/helper/captcha/web/class_GraphicalCodeCaptcha.php
patch
|
blob
|
history
inc/classes/main/helper/class_BaseHelper.php
patch
|
blob
|
history
inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
patch
|
blob
|
history
inc/classes/main/helper/web/forms/class_WebFormHelper.php
patch
|
blob
|
history
inc/classes/main/helper/web/links/class_WebLinkHelper.php
patch
|
blob
|
history
inc/classes/main/images/class_BaseImage.php
patch
|
blob
|
history
inc/classes/main/io/class_FileIoStream.php
patch
|
blob
|
history
inc/classes/main/io/class_FrameworkDirectoryPointer.php
patch
|
blob
|
history
inc/classes/main/io/class_FrameworkFileInputPointer.php
patch
|
blob
|
history
inc/classes/main/io/class_FrameworkFileOutputPointer.php
patch
|
blob
|
history
inc/classes/main/language/class_LanguageSystem.php
patch
|
blob
|
history
inc/classes/main/mailer/class_BaseMailer.php
patch
|
blob
|
history
inc/classes/main/output/class_ConsoleOutput.php
patch
|
blob
|
history
inc/classes/main/resolver/action/class_BaseActionResolver.php
patch
|
blob
|
history
inc/classes/main/resolver/action/web/class_WebActionResolver.php
patch
|
blob
|
history
inc/classes/main/resolver/class_BaseResolver.php
patch
|
blob
|
history
inc/classes/main/resolver/command/class_BaseCommandResolver.php
patch
|
blob
|
history
inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
patch
|
blob
|
history
inc/classes/main/resolver/command/web/class_WebCommandResolver.php
patch
|
blob
|
history
inc/classes/main/resolver/controller/class_BaseControllerResolver.php
patch
|
blob
|
history
inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
patch
|
blob
|
history
inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
patch
|
blob
|
history
inc/classes/main/response/class_BaseResponse.php
patch
|
blob
|
history
inc/classes/main/response/http/class_HttpResponse.php
patch
|
blob
|
history
inc/classes/main/response/image/class_ImageResponse.php
patch
|
blob
|
history
inc/classes/main/result/class_DatabaseResult.php
patch
|
blob
|
history
inc/classes/main/rng/class_RandomNumberGenerator.php
patch
|
blob
|
history
inc/classes/main/template/class_BaseTemplateEngine.php
patch
|
blob
|
history
inc/classes/main/template/image/class_ImageTemplateEngine.php
patch
|
blob
|
history
inc/classes/main/template/mail/class_MailTemplateEngine.php
patch
|
blob
|
history
inc/classes/main/user/class_BaseUser.php
patch
|
blob
|
history
inc/classes/middleware/database/class_DatabaseConnection.php
patch
|
blob
|
history
inc/config/class_FrameworkConfiguration.php
patch
|
blob
|
history
inc/includes.php
patch
|
blob
|
history
inc/loader/class_ClassLoader.php
patch
|
blob
|
history
inc/output.php
patch
|
blob
|
history
tests/ConfigTest.php
patch
|
blob
|
history
tests/old/contract-test.php
patch
|
blob
|
history
diff --git
a/inc/classes.php
b/inc/classes.php
index b139dcfd1c0c277ad82f5fb29fbdb53a8ea86709..49867957408e9e578f7968efcecc7a33a7ab1355 100644
(file)
--- a/
inc/classes.php
+++ b/
inc/classes.php
@@
-23,10
+23,10
@@
// Lower framework classes
$lowerClasses = array(
// Lower framework classes
$lowerClasses = array(
- 0 =>
"exceptions"
, // Exceptions
- 1 =>
"interfaces"
, // Interfaces
- 2 =>
"main"
, // General main classes
- 3 =>
"middleware"
// The middleware
+ 0 =>
'exceptions'
, // Exceptions
+ 1 =>
'interfaces'
, // Interfaces
+ 2 =>
'main'
, // General main classes
+ 3 =>
'middleware'
// The middleware
);
// Load all classes
);
// Load all classes
diff --git
a/inc/classes/exceptions/class_FrameworkException.php
b/inc/classes/exceptions/class_FrameworkException.php
index a1bd5693158799353339ae8f64e8a9c9dc6e68a6..4c1c73a979feaf12101865619cd9ee5da1b07653 100644
(file)
--- a/
inc/classes/exceptions/class_FrameworkException.php
+++ b/
inc/classes/exceptions/class_FrameworkException.php
@@
-32,7
+32,7
@@
abstract class FrameworkException extends ReflectionException {
/**
* Extra data
*/
/**
* Extra data
*/
- private $extraData =
""
;
+ private $extraData =
''
;
/**
* The super constructor for all exceptions
/**
* The super constructor for all exceptions
@@
-118,7
+118,7
@@
abstract class FrameworkException extends ReflectionException {
// Are there arguments?
if ((isset($dbgInfo['args'])) && (is_array($dbgInfo['args'])) && (isset($dbgInfo['args'][0]))) {
//* DEBUG: */ echo $dbgIndex.": <pre>".htmlentities(print_r($dbgInfo['args'], true))."</pre>";
// Are there arguments?
if ((isset($dbgInfo['args'])) && (is_array($dbgInfo['args'])) && (isset($dbgInfo['args'][0]))) {
//* DEBUG: */ echo $dbgIndex.": <pre>".htmlentities(print_r($dbgInfo['args'], true))."</pre>";
- $info =
""
;
+ $info =
''
;
foreach ($dbgInfo['args'] as $debug) {
// Add only non-array elements
if (!is_array($debug)) {
foreach ($dbgInfo['args'] as $debug) {
// Add only non-array elements
if (!is_array($debug)) {
diff --git
a/inc/classes/exceptions/main/class_MissingArrayElementsException.php
b/inc/classes/exceptions/main/class_MissingArrayElementsException.php
index c7900ca0e02b027ec3c2ac2628c7b0607097f83c..e1f388c2838c5e49191b828ffea08aefe9f5245b 100644
(file)
--- a/
inc/classes/exceptions/main/class_MissingArrayElementsException.php
+++ b/
inc/classes/exceptions/main/class_MissingArrayElementsException.php
@@
-31,7
+31,7
@@
class MissingArrayElementsException extends FrameworkException {
*/
public function __construct (array $classArray, $code) {
// Extract all elements
*/
public function __construct (array $classArray, $code) {
// Extract all elements
- $elements =
""
;
+ $elements =
''
;
if ((isset($classArray[2])) && (is_array($classArray[2]))) {
// Convert into strings
$elements = implode("</u>, <u>", $classArray[2]);
if ((isset($classArray[2])) && (is_array($classArray[2]))) {
// Convert into strings
$elements = implode("</u>, <u>", $classArray[2]);
diff --git
a/inc/classes/interfaces/crypto/class_Cryptable.php
b/inc/classes/interfaces/crypto/class_Cryptable.php
index fec45d924023881921b812c05c010557c3a6ffc2..91d73227c66fcc9e04573f4ce944df797199de7d 100644
(file)
--- a/
inc/classes/interfaces/crypto/class_Cryptable.php
+++ b/
inc/classes/interfaces/crypto/class_Cryptable.php
@@
-32,7
+32,7
@@
interface Cryptable extends FrameworkInterface {
* @param $oldHash A hash from previous hashed string
* @return $hashed The hashed and salted string
*/
* @param $oldHash A hash from previous hashed string
* @return $hashed The hashed and salted string
*/
- function hashString ($str, $oldHash =
""
);
+ function hashString ($str, $oldHash =
''
);
/**
* Encrypt the string with fixed salt
/**
* Encrypt the string with fixed salt
diff --git
a/inc/classes/main/class_BaseFrameworkSystem.php
b/inc/classes/main/class_BaseFrameworkSystem.php
index e635ab55824ad9c18fd818a427e0bc8c99da78f8..38f9f594a624792c2c8246ab5076387f4e195394 100644
(file)
--- a/
inc/classes/main/class_BaseFrameworkSystem.php
+++ b/
inc/classes/main/class_BaseFrameworkSystem.php
@@
-221,7
+221,7
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
public final function __call ($methodName, $args) {
// Implode all given arguments
*/
public final function __call ($methodName, $args) {
// Implode all given arguments
- $argsString =
""
;
+ $argsString =
''
;
if (empty($args)) {
// No arguments
$argsString = "NULL";
if (empty($args)) {
// No arguments
$argsString = "NULL";
@@
-772,12
+772,12
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $message Optional message to show in debug output
* @return void
*/
* @param $message Optional message to show in debug output
* @return void
*/
- public final function debugInstance ($message =
""
) {
+ public final function debugInstance ($message =
''
) {
// Restore the error handler to avoid trouble with missing array elements or undeclared variables
restore_error_handler();
// Init content
// Restore the error handler to avoid trouble with missing array elements or undeclared variables
restore_error_handler();
// Init content
- $content =
""
;
+ $content =
''
;
// Is a message set?
if (!empty($message)) {
// Is a message set?
if (!empty($message)) {
@@
-808,7
+808,7
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $message An optional message to display
* @return void
*/
* @param $message An optional message to display
* @return void
*/
- protected function partialStub ($message =
""
) {
+ protected function partialStub ($message =
''
) {
// Get the backtrace
$backtrace = debug_backtrace();
// Get the backtrace
$backtrace = debug_backtrace();
@@
-887,7
+887,7
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
public function convertToClassName ($str) {
// Init class name
*/
public function convertToClassName ($str) {
// Init class name
- $className =
""
;
+ $className =
''
;
// Convert all dashes in underscores
$str = str_replace("-", "_", $str);
// Convert all dashes in underscores
$str = str_replace("-", "_", $str);
@@
-910,7
+910,7
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
public function markupCode ($phpCode) {
// Init marked code
*/
public function markupCode ($phpCode) {
// Init marked code
- $markedCode =
""
;
+ $markedCode =
''
;
// Get last error
$errorArray = error_get_last();
// Get last error
$errorArray = error_get_last();
diff --git
a/inc/classes/main/class_FrameworkArrayObject.php
b/inc/classes/main/class_FrameworkArrayObject.php
index 199904ff69db65a92a6535b49f8dec588a6edc72..5b54d8cbc6e56e4b96d2fca9f522b569ccd48716 100644
(file)
--- a/
inc/classes/main/class_FrameworkArrayObject.php
+++ b/
inc/classes/main/class_FrameworkArrayObject.php
@@
-27,7
+27,7
@@
class FrameworkArrayObject extends ArrayObject {
/**
* Real class name
*/
/**
* Real class name
*/
- private $realClass =
""
;
+ private $realClass =
''
;
/**
* Public constructor for setting real class name
/**
* Public constructor for setting real class name
diff --git
a/inc/classes/main/commands/class_BaseCommand.php
b/inc/classes/main/commands/class_BaseCommand.php
index 902caacb606d25365a941482bb832cb3fb7f0b88..9b9238885cc7eebbedf348c3bdf2f776b0158040 100644
(file)
--- a/
inc/classes/main/commands/class_BaseCommand.php
+++ b/
inc/classes/main/commands/class_BaseCommand.php
@@
-25,7
+25,7
@@
class BaseCommand extends BaseFrameworkSystem {
/**
* The controller we need for this command
*/
/**
* The controller we need for this command
*/
- private $controllerName =
""
;
+ private $controllerName =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
index e581a6cbe3b3ed7943359f8f9b9c6163bcbdc378..7531fa1f7241183b8e817be8df5bbee8f9a2f50d 100644
(file)
--- a/
inc/classes/main/commands/web/class_WebLoginAreaCommand.php
+++ b/
inc/classes/main/commands/web/class_WebLoginAreaCommand.php
@@
-25,7
+25,7
@@
class WebLoginAreaCommand extends BaseCommand implements Commandable {
/**
* Name of the action
*/
/**
* Name of the action
*/
- private $actionName =
""
;
+ private $actionName =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/criteria/class_BaseCriteria.php
b/inc/classes/main/criteria/class_BaseCriteria.php
index 2e299e8bb457cd17aa8956cbd3b665c43b59296a..7fc785a7fabaa95dd6436e7c14dc203deea71fef 100644
(file)
--- a/
inc/classes/main/criteria/class_BaseCriteria.php
+++ b/
inc/classes/main/criteria/class_BaseCriteria.php
@@
-25,7
+25,7
@@
class BaseCriteria extends BaseFrameworkSystem {
/**
* Wrapper class name stored in config entry
*/
/**
* Wrapper class name stored in config entry
*/
- private $wrapperConfigEntry =
""
;
+ private $wrapperConfigEntry =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
b/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
index 94248cf07ac58c10e4aec02eb54c2137622bb84c..42f3d787d3337e44f2a4f1630b70a39e6bab3be1 100644
(file)
--- a/
inc/classes/main/criteria/dataset/class_DataSetCriteria.php
+++ b/
inc/classes/main/criteria/dataset/class_DataSetCriteria.php
@@
-26,7
+26,7
@@
class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
/**
* Table name
*/
/**
* Table name
*/
- private $tableName =
""
;
+ private $tableName =
''
;
/**
* Table columns (criteria) to store
/**
* Table columns (criteria) to store
@@
-36,12
+36,12
@@
class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
/**
* Unique key
*/
/**
* Unique key
*/
- private $uniqueKey =
""
;
+ private $uniqueKey =
''
;
/**
* Primary key
*/
/**
* Primary key
*/
- private $primaryKey =
""
;
+ private $primaryKey =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/criteria/search/class_SearchCriteria.php
b/inc/classes/main/criteria/search/class_SearchCriteria.php
index 546efe85005006d38a89c4ba890e86fabb06a5b8..31f8cbd60cdf3a5d105e23be69f1b962d362e457 100644
(file)
--- a/
inc/classes/main/criteria/search/class_SearchCriteria.php
+++ b/
inc/classes/main/criteria/search/class_SearchCriteria.php
@@
-133,7
+133,7
@@
class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
*/
public function getCacheKey () {
// Initialize the key
*/
public function getCacheKey () {
// Initialize the key
- $cacheKey =
""
;
+ $cacheKey =
''
;
// Now walk through all criterias
foreach ($this->searchCriteria as $criteriaKey => $criteriaValue) {
// Now walk through all criterias
foreach ($this->searchCriteria as $criteriaKey => $criteriaValue) {
diff --git
a/inc/classes/main/crypto/class_CryptoHelper.php
b/inc/classes/main/crypto/class_CryptoHelper.php
index c99a85d0af4995c32644e2a6673a3491bc99e0e1..bc1c191f8be96b1f189e1c36f2550b50d8bb1b68 100644
(file)
--- a/
inc/classes/main/crypto/class_CryptoHelper.php
+++ b/
inc/classes/main/crypto/class_CryptoHelper.php
@@
-39,7
+39,7
@@
class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
/**
* Salt for hashing operations
*/
/**
* Salt for hashing operations
*/
- private $salt =
""
;
+ private $salt =
''
;
/**
* Protected constructor
/**
* Protected constructor
@@
-126,7
+126,7
@@
class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
* @param $oldHash A hash from previous hashed string
* @return $hashed The hashed and salted string
*/
* @param $oldHash A hash from previous hashed string
* @return $hashed The hashed and salted string
*/
- public function hashString ($str, $oldHash =
""
) {
+ public function hashString ($str, $oldHash =
''
) {
// Cast the string
$str = (string) $str;
// Cast the string
$str = (string) $str;
diff --git
a/inc/classes/main/database/databases/class_LocalFileDatabase.php
b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 8187f96e54bc091305abccaffc93159a068628fb..2e28443090bf01b5ebfff2ebe9a36cb1d3a7b900 100644
(file)
--- a/
inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/
inc/classes/main/database/databases/class_LocalFileDatabase.php
@@
-33,7
+33,7
@@
class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
/**
* Save path for "file database"
*/
/**
* Save path for "file database"
*/
- private $savePath =
""
;
+ private $savePath =
''
;
/**
* The file's extension
/**
* The file's extension
@@
-43,7
+43,7
@@
class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
/**
* The last read file's name
*/
/**
* The last read file's name
*/
- private $lastFile =
""
;
+ private $lastFile =
''
;
/**
* The last read file's content including header information
/**
* The last read file's content including header information
@@
-58,7
+58,7
@@
class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
/**
* Last error message
*/
/**
* Last error message
*/
- private $lastError =
""
;
+ private $lastError =
''
;
/**
* Last exception
/**
* Last exception
@@
-173,7
+173,7
@@
class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
* @return void
*/
private final function resetLastError () {
* @return void
*/
private final function resetLastError () {
- $this->lastError =
""
;
+ $this->lastError =
''
;
$this->lastException = null;
}
$this->lastException = null;
}
diff --git
a/inc/classes/main/debug/class_DebugWebOutput.php
b/inc/classes/main/debug/class_DebugWebOutput.php
index e34be08297a1a39713016278110cd774c59ee033..7406574d42ba7a92c4d8622acc34d018cfab3c1a 100644
(file)
--- a/
inc/classes/main/debug/class_DebugWebOutput.php
+++ b/
inc/classes/main/debug/class_DebugWebOutput.php
@@
-53,7
+53,7
@@
class DebugWebOutput extends BaseFrameworkSystem implements Debugger, OutputStre
*/
public final function outputStream ($output) {
// Strip out <br />
*/
public final function outputStream ($output) {
// Strip out <br />
- $output = str_replace("<br />",
""
, $output);
+ $output = str_replace("<br />",
''
, $output);
print(stripslashes($output)."<br />\n");
}
print(stripslashes($output)."<br />\n");
}
diff --git
a/inc/classes/main/discovery/class_BaseDiscovery.php
b/inc/classes/main/discovery/class_BaseDiscovery.php
index 956d0cf5545655f1fcacaddf3cb9c5fafdb0da31..fdbd1e258d5ac91bf364f17d5a075d93c93596d0 100644
(file)
--- a/
inc/classes/main/discovery/class_BaseDiscovery.php
+++ b/
inc/classes/main/discovery/class_BaseDiscovery.php
@@
-25,7
+25,7
@@
class BaseDiscovery extends BaseFrameworkSystem {
/**
* Action name for payment discovery
*/
/**
* Action name for payment discovery
*/
- private $actionName =
""
;
+ private $actionName =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/filter/auth/class_UserAuthFilter.php
b/inc/classes/main/filter/auth/class_UserAuthFilter.php
index 7f42bf8462b2776a978550c95bc0be71ba8cd671..aedda9573a1e4a376c973262f50b3f2f9cb92f6f 100644
(file)
--- a/
inc/classes/main/filter/auth/class_UserAuthFilter.php
+++ b/
inc/classes/main/filter/auth/class_UserAuthFilter.php
@@
-28,7
+28,7
@@
class UserAuthFilter extends BaseFilter implements Filterable {
/**
* The login method we shall choose
*/
/**
* The login method we shall choose
*/
- private $authMethod =
""
;
+ private $authMethod =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
b/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
index 38891e5eb0b38788ed2a8cfbbd413304dd393115..62b5418b6aec962cd174ca67acf7867c12a1852b 100644
(file)
--- a/
inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/
inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
@@
-27,7
+27,7
@@
class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
/**
* Action name for payment discovery
*/
/**
* Action name for payment discovery
*/
- private $actionName =
""
;
+ private $actionName =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php
b/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php
index 3e38be477996c8428cf6331b3b4aa5e962fd9821..29cb8a1eaf4d539bb20e507f17acced4f43b6069 100644
(file)
--- a/
inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/
inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php
@@
-63,7
+63,7
@@
class UserStatusConfimedUpdateFilter extends BaseFilter implements Filterable {
$userInstance->updateDatabaseField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS, $confirmed);
// Wipe out the confirm hash for extra security
$userInstance->updateDatabaseField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS, $confirmed);
// Wipe out the confirm hash for extra security
- $userInstance->updateDatabaseField(UserDatabaseWrapper::DB_COLUMN_CONFIRM_HASH,
""
);
+ $userInstance->updateDatabaseField(UserDatabaseWrapper::DB_COLUMN_CONFIRM_HASH,
''
);
// Write all updates to the database
$userInstance->flushPendingUpdates();
// Write all updates to the database
$userInstance->flushPendingUpdates();
diff --git
a/inc/classes/main/helper/captcha/images/class_ImageHelper.php
b/inc/classes/main/helper/captcha/images/class_ImageHelper.php
index f67e45471c8be97c678aa28121943fe33f47ae1f..df7625052f19b59f44957503e25959da6c3353b8 100644
(file)
--- a/
inc/classes/main/helper/captcha/images/class_ImageHelper.php
+++ b/
inc/classes/main/helper/captcha/images/class_ImageHelper.php
@@
-30,7
+30,7
@@
class ImageHelper extends BaseCaptcha implements HelpableTemplate {
/**
* The image name
*/
/**
* The image name
*/
- private $imageName =
""
;
+ private $imageName =
''
;
/**
* Width of the image in pixel
/**
* Width of the image in pixel
@@
-68,7
+68,7
@@
class ImageHelper extends BaseCaptcha implements HelpableTemplate {
/**
* Current string name
*/
/**
* Current string name
*/
- private $currString =
""
;
+ private $currString =
''
;
/**
* Protected constructor
/**
* Protected constructor
@@
-257,10
+257,10
@@
class ImageHelper extends BaseCaptcha implements HelpableTemplate {
public function addTextLine ($stringName) {
// Create the image string
$this->imageStrings[$stringName] = array(
public function addTextLine ($stringName) {
// Create the image string
$this->imageStrings[$stringName] = array(
- 'x' =>
""
,
- 'y' =>
""
,
- 'size' =>
""
,
- 'string' =>
""
+ 'x' =>
''
,
+ 'y' =>
''
,
+ 'size' =>
''
,
+ 'string' =>
''
);
// Set current string name
);
// Set current string name
diff --git
a/inc/classes/main/helper/captcha/web/class_GraphicalCodeCaptcha.php
b/inc/classes/main/helper/captcha/web/class_GraphicalCodeCaptcha.php
index e028dcd5aa84942eb2069b23044e78a74dc464f2..edfd2310fe313593c1550802301496c3d05cd84c 100644
(file)
--- a/
inc/classes/main/helper/captcha/web/class_GraphicalCodeCaptcha.php
+++ b/
inc/classes/main/helper/captcha/web/class_GraphicalCodeCaptcha.php
@@
-25,12
+25,12
@@
class GraphicalCodeCaptcha extends BaseCaptcha implements SolveableCaptcha {
/**
* Hash of the CAPTCHA string
*/
/**
* Hash of the CAPTCHA string
*/
- private $hashedString =
""
;
+ private $hashedString =
''
;
/**
* Encrypted string
*/
/**
* Encrypted string
*/
- private $encryptedString =
""
;
+ private $encryptedString =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/helper/class_BaseHelper.php
b/inc/classes/main/helper/class_BaseHelper.php
index 6c7c82d5c1ec2973112e8b5641f051a1aba89bee..c651872cab81bb808b1285061be8d65362879b3d 100644
(file)
--- a/
inc/classes/main/helper/class_BaseHelper.php
+++ b/
inc/classes/main/helper/class_BaseHelper.php
@@
-30,7
+30,7
@@
class BaseHelper extends BaseFrameworkSystem {
/**
* Rendered content created by the helper class
*/
/**
* Rendered content created by the helper class
*/
- private $content =
""
;
+ private $content =
''
;
/**
* Array with groups
/**
* Array with groups
@@
-45,12
+45,12
@@
class BaseHelper extends BaseFrameworkSystem {
/**
* Previously opened group
*/
/**
* Previously opened group
*/
- private $previousGroupId =
""
;
+ private $previousGroupId =
''
;
/**
* Previously opened sub group
*/
/**
* Previously opened sub group
*/
- private $previousSubGroupId =
""
;
+ private $previousSubGroupId =
''
;
/**
* Total counter for groups and sub groups
/**
* Total counter for groups and sub groups
@@
-259,7
+259,7
@@
class BaseHelper extends BaseFrameworkSystem {
* @return void
* @throws HelperNoPreviousOpenedGroupException If no previously opened group was found
*/
* @return void
* @throws HelperNoPreviousOpenedGroupException If no previously opened group was found
*/
- public function closePreviousGroupByContent ($content =
""
) {
+ public function closePreviousGroupByContent ($content =
''
) {
// Check if any sub group was opened before
if ($this->ifSubGroupOpenedPreviously()) {
// Close it automatically
// Check if any sub group was opened before
if ($this->ifSubGroupOpenedPreviously()) {
// Close it automatically
@@
-286,7
+286,7
@@
class BaseHelper extends BaseFrameworkSystem {
$this->groups[$groupId]['opened'] = false;
// Mark previous group as closed
$this->groups[$groupId]['opened'] = false;
// Mark previous group as closed
- $this->setPreviousGroupId(
""
);
+ $this->setPreviousGroupId(
''
);
//* DEBUG: */ echo "CLOSE:groupId={$groupId}<br />\n";
}
//* DEBUG: */ echo "CLOSE:groupId={$groupId}<br />\n";
}
@@
-330,7
+330,7
@@
class BaseHelper extends BaseFrameworkSystem {
* @return void
* @throws HelperNoPreviousOpenedSubGroupException If no previously opened sub group was found
*/
* @return void
* @throws HelperNoPreviousOpenedSubGroupException If no previously opened sub group was found
*/
- public function closePreviousSubGroupByContent ($content =
""
) {
+ public function closePreviousSubGroupByContent ($content =
''
) {
// Check if any sub group was opened before
if ($this->ifSubGroupOpenedPreviously() === false) {
// Then throw an exception
// Check if any sub group was opened before
if ($this->ifSubGroupOpenedPreviously() === false) {
// Then throw an exception
@@
-351,7
+351,7
@@
class BaseHelper extends BaseFrameworkSystem {
$this->subGroups[$subGroupId]['opened'] = false;
// Mark previous sub group as closed
$this->subGroups[$subGroupId]['opened'] = false;
// Mark previous sub group as closed
- $this->setPreviousSubGroupId(
""
);
+ $this->setPreviousSubGroupId(
''
);
//* DEBUG: */ echo "CLOSE:subGroupId={$subGroupId}<br />\n";
}
//* DEBUG: */ echo "CLOSE:subGroupId={$subGroupId}<br />\n";
}
@@
-362,7
+362,7
@@
class BaseHelper extends BaseFrameworkSystem {
*/
public function renderContent () {
// Initialize content
*/
public function renderContent () {
// Initialize content
- $content =
""
;
+ $content =
''
;
// Is header content there?
if (isset($this->groups['header'])) {
// Is header content there?
if (isset($this->groups['header'])) {
diff --git
a/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
b/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
index 85da820a4b500f87b6049b20222c6db0b3cc291b..bcdeb5ffcec976df862fdd3fd5221cef97b2cce3 100644
(file)
--- a/
inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
+++ b/
inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
@@
-25,7
+25,7
@@
class WebBlockHelper extends BaseWebHelper implements HelpableTemplate {
/**
* Name of the block
*/
/**
* Name of the block
*/
- private $blockName =
""
;
+ private $blockName =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/helper/web/forms/class_WebFormHelper.php
b/inc/classes/main/helper/web/forms/class_WebFormHelper.php
index 2fd68cc1b47e562b63884fe53bcecd2cf65129df..b816c337ed2c9f57db4537ca59093fef2196e180 100644
(file)
--- a/
inc/classes/main/helper/web/forms/class_WebFormHelper.php
+++ b/
inc/classes/main/helper/web/forms/class_WebFormHelper.php
@@
-31,7
+31,7
@@
class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
/**
* Name of the form
*/
/**
* Name of the form
*/
- private $formName =
""
;
+ private $formName =
''
;
/**
* Wether form tag is enabled (default: true)
/**
* Wether form tag is enabled (default: true)
@@
-114,7
+114,7
@@
class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
// Check wether we shall open or close the form
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Add HTML code
// Check wether we shall open or close the form
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Add HTML code
- $formContent = sprintf("<form name=\"%s\" class=\"forms\" action=\"%s/%s\" method=\"%s\" target=\"%s\
""
,
+ $formContent = sprintf("<form name=\"%s\" class=\"forms\" action=\"%s/%s\" method=\"%s\" target=\"%s\
''
,
$formName,
$this->getConfigInstance()->readConfig('base_url'),
$this->getConfigInstance()->readConfig('form_action'),
$formName,
$this->getConfigInstance()->readConfig('base_url'),
$this->getConfigInstance()->readConfig('form_action'),
@@
-123,7
+123,7
@@
class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
);
// Add form id as well
);
// Add form id as well
- $formContent .= sprintf(" id=\"%s_form\
""
,
+ $formContent .= sprintf(" id=\"%s_form\
''
,
$formId
);
$formId
);
@@
-162,7
+162,7
@@
class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
* @return void
* @throws FormClosedException If the form is not yet opened
*/
* @return void
* @throws FormClosedException If the form is not yet opened
*/
- public function addInputTextField ($fieldName, $fieldValue =
""
) {
+ public function addInputTextField ($fieldName, $fieldValue =
''
) {
// Is the form opened?
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Throw an exception
// Is the form opened?
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Throw an exception
@@
-204,7
+204,7
@@
class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
* @return void
* @throws FormClosedException If the form is not yet opened
*/
* @return void
* @throws FormClosedException If the form is not yet opened
*/
- public function addInputPasswordField ($fieldName, $fieldValue =
""
) {
+ public function addInputPasswordField ($fieldName, $fieldValue =
''
) {
// Is the form opened?
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Throw an exception
// Is the form opened?
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Throw an exception
@@
-231,7
+231,7
@@
class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
* @return void
* @throws FormClosedException If the form is not yet opened
*/
* @return void
* @throws FormClosedException If the form is not yet opened
*/
- public function addInputHiddenField ($fieldName, $fieldValue =
""
) {
+ public function addInputHiddenField ($fieldName, $fieldValue =
''
) {
// Is the form opened?
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Throw an exception
// Is the form opened?
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Throw an exception
@@
-296,7
+296,7
@@
class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
} // END - if
// Set wether the check box is checked...
} // END - if
// Set wether the check box is checked...
- $checked = " checked=\"checked\
""
;
+ $checked = " checked=\"checked\
''
;
if ($fieldChecked === false) $checked = " ";
// Generate the content
if ($fieldChecked === false) $checked = " ";
// Generate the content
@@
-370,7
+370,7
@@
class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
* @throws FormClosedException If no form has been opened before
* @throws EmptyVariableException If $groupId is not set
*/
* @throws FormClosedException If no form has been opened before
* @throws EmptyVariableException If $groupId is not set
*/
- public function addFormGroup ($groupId =
"", $groupText = ""
) {
+ public function addFormGroup ($groupId =
'', $groupText = ''
) {
// Is a form opened?
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Throw exception here
// Is a form opened?
if (($this->formOpened === false) && ($this->formEnabled === true)) {
// Throw exception here
@@
-445,7
+445,7
@@
class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
* @throws FormFormClosedException If no group has been opened before
* @throws EmptyVariableException If $subGroupId is not set
*/
* @throws FormFormClosedException If no group has been opened before
* @throws EmptyVariableException If $subGroupId is not set
*/
- public function addFormSubGroup ($subGroupId =
"", $subGroupText = ""
) {
+ public function addFormSubGroup ($subGroupId =
'', $subGroupText = ''
) {
// Is a group opened?
if ($this->ifGroupOpenedPreviously() === false) {
// Throw exception here
// Is a group opened?
if ($this->ifGroupOpenedPreviously() === false) {
// Throw exception here
diff --git
a/inc/classes/main/helper/web/links/class_WebLinkHelper.php
b/inc/classes/main/helper/web/links/class_WebLinkHelper.php
index c7981044ea6cd08c226a8c12b09f30a32e4050ce..83b806d89ac8685a9cee7379f90b577eaad95609 100644
(file)
--- a/
inc/classes/main/helper/web/links/class_WebLinkHelper.php
+++ b/
inc/classes/main/helper/web/links/class_WebLinkHelper.php
@@
-25,12
+25,12
@@
class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
/**
* Name of the link
*/
/**
* Name of the link
*/
- private $linkName =
""
;
+ private $linkName =
''
;
/**
* Base of the link
*/
/**
* Base of the link
*/
- private $linkBase =
""
;
+ private $linkBase =
''
;
/**
* Protected constructor
/**
* Protected constructor
@@
-64,7
+64,7
@@
class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
$helperInstance->setLinkBase($linkBase);
// Add default group
$helperInstance->setLinkBase($linkBase);
// Add default group
- $helperInstance->openGroupByIdContent('main',
"", ""
);
+ $helperInstance->openGroupByIdContent('main',
'', ''
);
// Return the prepared instance
return $helperInstance;
// Return the prepared instance
return $helperInstance;
@@
-79,7
+79,7
@@
class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
* @param $extraContent Optional extra HTML content
* @return $linkContent Rendered text link content
*/
* @param $extraContent Optional extra HTML content
* @return $linkContent Rendered text link content
*/
- private function renderLinkContentWithTextExtraContent ($linkText, $linkTitle, $extraContent=
""
) {
+ private function renderLinkContentWithTextExtraContent ($linkText, $linkTitle, $extraContent=
''
) {
// Construct link content
$linkContent = sprintf("<a href=\"%s%s\" title=\"%s\">%s</a>",
$this->getLinkBase(),
// Construct link content
$linkContent = sprintf("<a href=\"%s%s\" title=\"%s\">%s</a>",
$this->getLinkBase(),
@@
-140,7
+140,7
@@
class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
// Is a previous opened group still open?
if ($this->ifGroupOpenedPreviously()) {
// Then close it
// Is a previous opened group still open?
if ($this->ifGroupOpenedPreviously()) {
// Then close it
- $this->closePreviousGroupByContent(
""
);
+ $this->closePreviousGroupByContent(
''
);
} // END - if
// Get the content
} // END - if
// Get the content
@@
-166,7
+166,7
@@
class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
// Is a group with that name open?
if ($this->ifGroupOpenedPreviously()) {
// Then close it here
// Is a group with that name open?
if ($this->ifGroupOpenedPreviously()) {
// Then close it here
- $this->closePreviousGroupByContent(
""
);
+ $this->closePreviousGroupByContent(
''
);
} // END - if
// Generate the group content
} // END - if
// Generate the group content
diff --git
a/inc/classes/main/images/class_BaseImage.php
b/inc/classes/main/images/class_BaseImage.php
index 0e7b00dd78eff27900ab1fa9124cec0eabd276cd..86d7ab94e9c8edfe4a1d52452ab6e729a2d246af 100644
(file)
--- a/
inc/classes/main/images/class_BaseImage.php
+++ b/
inc/classes/main/images/class_BaseImage.php
@@
-25,40
+25,40
@@
class BaseImage extends BaseFrameworkSystem implements Registerable {
/**
* Image type
*/
/**
* Image type
*/
- private $imageType =
""
;
+ private $imageType =
''
;
/**
* Width of the image
*/
/**
* Width of the image
*/
- private $width =
""
;
+ private $width =
''
;
/**
* Height of the image
*/
/**
* Height of the image
*/
- private $height =
""
;
+ private $height =
''
;
/**
* Background color in RGB
*/
private $backgroundColor = array(
/**
* Background color in RGB
*/
private $backgroundColor = array(
- 'red' =>
""
,
- 'green' =>
""
,
- 'blue' =>
""
+ 'red' =>
''
,
+ 'green' =>
''
,
+ 'blue' =>
''
);
/**
* Foreground color in RGB
*/
private $foregroundColor = array(
);
/**
* Foreground color in RGB
*/
private $foregroundColor = array(
- 'red' =>
""
,
- 'green' =>
""
,
- 'blue' =>
""
+ 'red' =>
''
,
+ 'green' =>
''
,
+ 'blue' =>
''
);
/**
* Current choosen color array
*/
);
/**
* Current choosen color array
*/
- private $colorMode =
""
;
+ private $colorMode =
''
;
/**
* Image resource
/**
* Image resource
@@
-68,12
+68,12
@@
class BaseImage extends BaseFrameworkSystem implements Registerable {
/**
* Image name
*/
/**
* Image name
*/
- private $imageName =
""
;
+ private $imageName =
''
;
/**
* String name
*/
/**
* String name
*/
- private $stringName =
""
;
+ private $stringName =
''
;
/**
* Groupable image strings?
/**
* Groupable image strings?
diff --git
a/inc/classes/main/io/class_FileIoStream.php
b/inc/classes/main/io/class_FileIoStream.php
index 0eff6c5a9c3923e17e23f3f235f82a537e46efa6..b4a8548062f007f29c69f14ed07c6cbef0ef7861 100644
(file)
--- a/
inc/classes/main/io/class_FileIoStream.php
+++ b/
inc/classes/main/io/class_FileIoStream.php
@@
-58,7
+58,7
@@
class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
*/
public final function saveFile ($fileName, $dataArray) {
// Try it five times
*/
public final function saveFile ($fileName, $dataArray) {
// Try it five times
- $dirName =
""
; $fileInstance = null;
+ $dirName =
''
; $fileInstance = null;
for ($idx = 0; $idx < 5; $idx++) {
// Get a file output pointer
try {
for ($idx = 0; $idx < 5; $idx++) {
// Get a file output pointer
try {
@@
-114,11
+114,11
@@
class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
*/
public final function loadFileContents ($fqfn) {
// Initialize some variables and arrays
*/
public final function loadFileContents ($fqfn) {
// Initialize some variables and arrays
- $inputBuffer =
""
;
- $lastBuffer =
""
;
+ $inputBuffer =
''
;
+ $lastBuffer =
''
;
$header = array();
$data = array();
$header = array();
$data = array();
- $readData =
""
; // This will contain our read data
+ $readData =
''
; // This will contain our read data
// Get a file input handler
$fileInstance = FrameworkFileInputPointer::createFrameworkFileInputPointer($fqfn);
// Get a file input handler
$fileInstance = FrameworkFileInputPointer::createFrameworkFileInputPointer($fqfn);
diff --git
a/inc/classes/main/io/class_FrameworkDirectoryPointer.php
b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
index 3f076b6a96d519996c1c76654371efed695849a1..e0a0c4e5bfcae51f016229ba1e1d758302787ad7 100644
(file)
--- a/
inc/classes/main/io/class_FrameworkDirectoryPointer.php
+++ b/
inc/classes/main/io/class_FrameworkDirectoryPointer.php
@@
-25,7
+25,7
@@
class FrameworkDirectoryPointer extends BaseFrameworkSystem {
/**
* The current path we are working in
*/
/**
* The current path we are working in
*/
- private $pathName =
""
;
+ private $pathName =
''
;
/**
* The directory pointer
/**
* The directory pointer
@@
-153,7
+153,7
@@
class FrameworkDirectoryPointer extends BaseFrameworkSystem {
* @return string Directory and/or file names read from the current
* directory pointer
*/
* @return string Directory and/or file names read from the current
* directory pointer
*/
- public function readDirectoryExcept ($except =
""
) {
+ public function readDirectoryExcept ($except =
''
) {
if ((empty($except)) || (!is_array($except)) || (count($except) == 0)) {
// No exception given, so read all data
return $this->readRawDirectory();
if ((empty($except)) || (!is_array($except)) || (count($except) == 0)) {
// No exception given, so read all data
return $this->readRawDirectory();
@@
-185,7
+185,7
@@
class FrameworkDirectoryPointer extends BaseFrameworkSystem {
// Close the directory pointer and reset the instance variable
@closedir($this->getPointer());
$this->setPointer(null);
// Close the directory pointer and reset the instance variable
@closedir($this->getPointer());
$this->setPointer(null);
- $this->setPathName(
""
);
+ $this->setPathName(
''
);
}
/**
}
/**
diff --git
a/inc/classes/main/io/class_FrameworkFileInputPointer.php
b/inc/classes/main/io/class_FrameworkFileInputPointer.php
index ad16db1ffd0aa1fa6093e3a81bd3591caf906566..8098d60425e436a6a468e1ad622322a56e00fc28 100644
(file)
--- a/
inc/classes/main/io/class_FrameworkFileInputPointer.php
+++ b/
inc/classes/main/io/class_FrameworkFileInputPointer.php
@@
-25,7
+25,7
@@
class FrameworkFileInputPointer extends BaseFrameworkSystem {
/**
* The current file we are working in
*/
/**
* The current file we are working in
*/
- private $fileName =
""
;
+ private $fileName =
''
;
/**
* The file pointer
/**
* The file pointer
@@
-168,7
+168,7
@@
class FrameworkFileInputPointer extends BaseFrameworkSystem {
// Close the file pointer and reset the instance variable
@fclose($this->getPointer());
$this->setPointer(null);
// Close the file pointer and reset the instance variable
@fclose($this->getPointer());
$this->setPointer(null);
- $this->setFileName(
""
);
+ $this->setFileName(
''
);
}
/**
}
/**
diff --git
a/inc/classes/main/io/class_FrameworkFileOutputPointer.php
b/inc/classes/main/io/class_FrameworkFileOutputPointer.php
index 6c555bdffbc7645701b9208cbfdc2e721de64ec6..0506adde8ae5f6d92d911162073a1f1529fb1752 100644
(file)
--- a/
inc/classes/main/io/class_FrameworkFileOutputPointer.php
+++ b/
inc/classes/main/io/class_FrameworkFileOutputPointer.php
@@
-25,7
+25,7
@@
class FrameworkFileOutputPointer extends BaseFrameworkSystem {
/**
* The current file we are working in
*/
/**
* The current file we are working in
*/
- private $fileName =
""
;
+ private $fileName =
''
;
/**
* The file pointer
/**
* The file pointer
@@
-138,7
+138,7
@@
class FrameworkFileOutputPointer extends BaseFrameworkSystem {
// Close the file pointer and reset the instance variable
@fclose($this->getPointer());
$this->setPointer(null);
// Close the file pointer and reset the instance variable
@fclose($this->getPointer());
$this->setPointer(null);
- $this->setFileName(
""
);
+ $this->setFileName(
''
);
}
/**
}
/**
diff --git
a/inc/classes/main/language/class_LanguageSystem.php
b/inc/classes/main/language/class_LanguageSystem.php
index aec00f206cac2c71c088640d2bed43c4c8c94d69..c1d66e4f3c5b2ebbaf14932f452df4b86b8091b0 100644
(file)
--- a/
inc/classes/main/language/class_LanguageSystem.php
+++ b/
inc/classes/main/language/class_LanguageSystem.php
@@
-26,7
+26,7
@@
class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
/**
* The full-qualified base path for the language include files
*/
/**
* The full-qualified base path for the language include files
*/
- private $basePath =
""
;
+ private $basePath =
''
;
/**
* The 2-char language code
/**
* The 2-char language code
diff --git
a/inc/classes/main/mailer/class_BaseMailer.php
b/inc/classes/main/mailer/class_BaseMailer.php
index 895ae2b5f9d1a4bfb7d1a9b44a9a0b08f76230b3..a22fe55b66d04376f55e351680b45f002ba5e1ce 100644
(file)
--- a/
inc/classes/main/mailer/class_BaseMailer.php
+++ b/
inc/classes/main/mailer/class_BaseMailer.php
@@
-30,7
+30,7
@@
class BaseMailer extends BaseFrameworkSystem {
/**
* Template name
*/
/**
* Template name
*/
- private $templateName =
""
;
+ private $templateName =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/output/class_ConsoleOutput.php
b/inc/classes/main/output/class_ConsoleOutput.php
index 0e78c8a22b68acd359a51fa6b87c7b6f723ec063..b0df4fefb887dbc4f93ab3f78b117417487ee71b 100644
(file)
--- a/
inc/classes/main/output/class_ConsoleOutput.php
+++ b/
inc/classes/main/output/class_ConsoleOutput.php
@@
-91,7
+91,7
@@
class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
if ($outStream === false) {
// Output something here...
foreach ($this->vars as $var => $value) {
if ($outStream === false) {
// Output something here...
foreach ($this->vars as $var => $value) {
- $this->output("var=".$var.", value=".$value.
""
);
+ $this->output("var=".$var.", value=".$value.
''
);
}
} else {
// Output it to the console
}
} else {
// Output it to the console
diff --git
a/inc/classes/main/resolver/action/class_BaseActionResolver.php
b/inc/classes/main/resolver/action/class_BaseActionResolver.php
index 6f4cbd83271cd761c2964ffa1234d5b72ea93a59..5d4738b996d866903054eb01b7c3a5ec02280cda 100644
(file)
--- a/
inc/classes/main/resolver/action/class_BaseActionResolver.php
+++ b/
inc/classes/main/resolver/action/class_BaseActionResolver.php
@@
-25,12
+25,12
@@
class BaseActionResolver extends BaseResolver {
/**
* Prefix for local, remote or other resolver
*/
/**
* Prefix for local, remote or other resolver
*/
- private $actionPrefix =
""
;
+ private $actionPrefix =
''
;
/**
* Validated action name
*/
/**
* Validated action name
*/
- private $actionName =
""
;
+ private $actionName =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/resolver/action/web/class_WebActionResolver.php
b/inc/classes/main/resolver/action/web/class_WebActionResolver.php
index c30644a3faee4d69dfc3fa5dce07c5fc7ae76e80..dc6e4d8152a63fd4cdc89681aac4744d700c1693 100644
(file)
--- a/
inc/classes/main/resolver/action/web/class_WebActionResolver.php
+++ b/
inc/classes/main/resolver/action/web/class_WebActionResolver.php
@@
-25,7
+25,7
@@
class WebActionResolver extends BaseActionResolver implements ActionResolver {
/**
* Last successfull resolved action
*/
/**
* Last successfull resolved action
*/
- private $lastActionInstance =
""
;
+ private $lastActionInstance =
''
;
/**
* Protected constructor
/**
* Protected constructor
@@
-82,7
+82,7
@@
class WebActionResolver extends BaseActionResolver implements ActionResolver {
*/
public function resolveActionByRequest (Requestable $requestInstance) {
// Init variables
*/
public function resolveActionByRequest (Requestable $requestInstance) {
// Init variables
- $actionName =
""
;
+ $actionName =
''
;
$actionInstance = null;
// This goes fine so let's resolv the action
$actionInstance = null;
// This goes fine so let's resolv the action
diff --git
a/inc/classes/main/resolver/class_BaseResolver.php
b/inc/classes/main/resolver/class_BaseResolver.php
index b3c362081976b8cdd874f87d58d81705e997f7f8..cc840d4f3e3ffa757c94421e89456673da5d5c40 100644
(file)
--- a/
inc/classes/main/resolver/class_BaseResolver.php
+++ b/
inc/classes/main/resolver/class_BaseResolver.php
@@
-25,7
+25,7
@@
class BaseResolver extends BaseFrameworkSystem {
/**
* Class name
*/
/**
* Class name
*/
- private $className =
""
;
+ private $className =
''
;
// Exception constants
const EXCEPTION_INVALID_COMMAND = 0x1d0;
// Exception constants
const EXCEPTION_INVALID_COMMAND = 0x1d0;
diff --git
a/inc/classes/main/resolver/command/class_BaseCommandResolver.php
b/inc/classes/main/resolver/command/class_BaseCommandResolver.php
index 8f924ad11acaa521da1375ee15eceae7a7486460..fc662c3aa1cb048a8ac7cc1ed72ba3edcdf10b36 100644
(file)
--- a/
inc/classes/main/resolver/command/class_BaseCommandResolver.php
+++ b/
inc/classes/main/resolver/command/class_BaseCommandResolver.php
@@
-25,12
+25,12
@@
class BaseCommandResolver extends BaseResolver {
/**
* Prefix for local, remote or other resolver
*/
/**
* Prefix for local, remote or other resolver
*/
- private $commandPrefix =
""
;
+ private $commandPrefix =
''
;
/**
* Validated command name
*/
/**
* Validated command name
*/
- private $commandName =
""
;
+ private $commandName =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
index 1924e49adfe877cd452f1b1c260157dc9e98fb0d..d70e25c0799ecc5bd10276c869f52cefb61fe8e3 100644
(file)
--- a/
inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
+++ b/
inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
@@
-82,7
+82,7
@@
class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
*/
public function resolveCommandByRequest (Requestable $requestInstance) {
// Init variables
*/
public function resolveCommandByRequest (Requestable $requestInstance) {
// Init variables
- $commandName =
""
;
+ $commandName =
''
;
$commandInstance = null;
// This goes fine so let's resolv the command
$commandInstance = null;
// This goes fine so let's resolv the command
diff --git
a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
index ffcd702770e7bcce30a98e4bedfcb35a9457d692..f61f0cddd62ed159d1ec604abf32f6e6bb946e74 100644
(file)
--- a/
inc/classes/main/resolver/command/web/class_WebCommandResolver.php
+++ b/
inc/classes/main/resolver/command/web/class_WebCommandResolver.php
@@
-82,7
+82,7
@@
class WebCommandResolver extends BaseCommandResolver implements CommandResolver
*/
public function resolveCommandByRequest (Requestable $requestInstance) {
// Init variables
*/
public function resolveCommandByRequest (Requestable $requestInstance) {
// Init variables
- $commandName =
""
;
+ $commandName =
''
;
$commandInstance = null;
// This goes fine so let's resolv the command
$commandInstance = null;
// This goes fine so let's resolv the command
diff --git
a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
index f324ec6d3a2bf4105f9d10c6af9929c51d51f29c..6295df907fa551aaa40f5f776acc67990f4b6dba 100644
(file)
--- a/
inc/classes/main/resolver/controller/class_BaseControllerResolver.php
+++ b/
inc/classes/main/resolver/controller/class_BaseControllerResolver.php
@@
-25,12
+25,12
@@
class BaseControllerResolver extends BaseResolver {
/**
* Prefix for local, remote or other resolver
*/
/**
* Prefix for local, remote or other resolver
*/
- private $controllerPrefix =
""
;
+ private $controllerPrefix =
''
;
/**
* Validated controller name
*/
/**
* Validated controller name
*/
- private $controllerName =
""
;
+ private $controllerName =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
index e6fdf592fc3662a2fb303f3d55955efd6ada9410..dc664e87cefa98684daee07b1cabb05f8fc8ee67 100644
(file)
--- a/
inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
+++ b/
inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
@@
-25,7
+25,7
@@
class ImageControllerResolver extends BaseControllerResolver implements Controll
/**
* Last successfull resolved controller (name)
*/
/**
* Last successfull resolved controller (name)
*/
- private $lastControllerName =
""
;
+ private $lastControllerName =
''
;
/**
* Last successfull resolved controller (instance)
/**
* Last successfull resolved controller (instance)
@@
-87,7
+87,7
@@
class ImageControllerResolver extends BaseControllerResolver implements Controll
*/
public function resolveController () {
// Init variables
*/
public function resolveController () {
// Init variables
- $controllerName =
""
;
+ $controllerName =
''
;
$controllerInstance = null;
// Get the command name
$controllerInstance = null;
// Get the command name
diff --git
a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index 7c7e58ce9876b5876d4f0c5b3ee0147e829f851d..06ba1118e8a8739c4a3a526aa3592b2eb1937c81 100644
(file)
--- a/
inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
+++ b/
inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
@@
-25,7
+25,7
@@
class WebControllerResolver extends BaseControllerResolver implements Controller
/**
* Last successfull resolved controller (name)
*/
/**
* Last successfull resolved controller (name)
*/
- private $lastControllerName =
""
;
+ private $lastControllerName =
''
;
/**
* Last successfull resolved controller (instance)
/**
* Last successfull resolved controller (instance)
@@
-87,7
+87,7
@@
class WebControllerResolver extends BaseControllerResolver implements Controller
*/
public function resolveController () {
// Init variables
*/
public function resolveController () {
// Init variables
- $controllerName =
""
;
+ $controllerName =
''
;
$controllerInstance = null;
// Get the command name
$controllerInstance = null;
// Get the command name
@@
-152,7
+152,7
@@
class WebControllerResolver extends BaseControllerResolver implements Controller
} // END - if
// Set default resolver config name
} // END - if
// Set default resolver config name
- $resolverConfigEntry =
""
;
+ $resolverConfigEntry =
''
;
// Try to read a config entry for our resolver including controller name... ;-)
try {
// Try to read a config entry for our resolver including controller name... ;-)
try {
diff --git
a/inc/classes/main/response/class_BaseResponse.php
b/inc/classes/main/response/class_BaseResponse.php
index 48aa79f9610b71146376bb31ccdcdfcc1b7312a6..7e40ce779eb20a21c1957fd01ff2121facbc9f51 100644
(file)
--- a/
inc/classes/main/response/class_BaseResponse.php
+++ b/
inc/classes/main/response/class_BaseResponse.php
@@
-43,7
+43,7
@@
class BaseResponse extends BaseFrameworkSystem {
/**
* Body of the response
*/
/**
* Body of the response
*/
- private $responseBody =
""
;
+ private $responseBody =
''
;
/**
* Instance of the template engine
/**
* Instance of the template engine
@@
-202,7
+202,7
@@
class BaseResponse extends BaseFrameworkSystem {
}
// Clear response header and body
}
// Clear response header and body
- $this->setResponseBody(
""
);
+ $this->setResponseBody(
''
);
$this->resetResponseHeaders();
}
}
$this->resetResponseHeaders();
}
}
diff --git
a/inc/classes/main/response/http/class_HttpResponse.php
b/inc/classes/main/response/http/class_HttpResponse.php
index 3cde5516b6f19ae81034e4536bdfde9b020bd2d9..19a453bb52348741e67856402edc84b6dedc2b49 100644
(file)
--- a/
inc/classes/main/response/http/class_HttpResponse.php
+++ b/
inc/classes/main/response/http/class_HttpResponse.php
@@
-156,7
+156,7
@@
class HttpResponse extends BaseResponse implements Responseable {
$this->setResponseStatus("301 Moved Permanently");
// Clear the body
$this->setResponseStatus("301 Moved Permanently");
// Clear the body
- $this->setResponseBody(
""
);
+ $this->setResponseBody(
''
);
// Flush the result
$this->flushBuffer();
// Flush the result
$this->flushBuffer();
@@
-175,7
+175,7
@@
class HttpResponse extends BaseResponse implements Responseable {
// Is the cookie there?
if (isset($_COOKIE[$cookieName])) {
// Then expire it with 20 minutes past
// Is the cookie there?
if (isset($_COOKIE[$cookieName])) {
// Then expire it with 20 minutes past
- $this->addCookie($cookieName,
""
, false, (time() - 1200));
+ $this->addCookie($cookieName,
''
, false, (time() - 1200));
// Remove it from array
unset($_COOKIE[$cookieName]);
// Remove it from array
unset($_COOKIE[$cookieName]);
diff --git
a/inc/classes/main/response/image/class_ImageResponse.php
b/inc/classes/main/response/image/class_ImageResponse.php
index 870ce11f4b1b764848d85f1190d93fdc498d904c..dc6e5ad03e0f2a5debf4c3f7bf319d75983866f2 100644
(file)
--- a/
inc/classes/main/response/image/class_ImageResponse.php
+++ b/
inc/classes/main/response/image/class_ImageResponse.php
@@
-170,7
+170,7
@@
class ImageResponse extends BaseResponse implements Responseable {
$this->setResponseStatus("301 Moved Permanently");
// Clear the body
$this->setResponseStatus("301 Moved Permanently");
// Clear the body
- $this->setResponseBody(
""
);
+ $this->setResponseBody(
''
);
// Flush the result
$this->flushBuffer();
// Flush the result
$this->flushBuffer();
@@
-213,7
+213,7
@@
class ImageResponse extends BaseResponse implements Responseable {
// Is the cookie there?
if (isset($_COOKIE[$cookieName])) {
// Then expire it with 20 minutes past
// Is the cookie there?
if (isset($_COOKIE[$cookieName])) {
// Then expire it with 20 minutes past
- $this->addCookie($cookieName,
""
, false, (time() - 1200));
+ $this->addCookie($cookieName,
''
, false, (time() - 1200));
// Remove it from array
unset($_COOKIE[$cookieName]);
// Remove it from array
unset($_COOKIE[$cookieName]);
diff --git
a/inc/classes/main/result/class_DatabaseResult.php
b/inc/classes/main/result/class_DatabaseResult.php
index b53cad5bb8523ae81031a63951ce00ef70a8ab33..e0d169a5caadaff51f00daff0306291be33d7ed1 100644
(file)
--- a/
inc/classes/main/result/class_DatabaseResult.php
+++ b/
inc/classes/main/result/class_DatabaseResult.php
@@
-54,7
+54,7
@@
class DatabaseResult extends BaseFrameworkSystem implements SearchableResult, Up
/**
* Found value
*/
/**
* Found value
*/
- private $foundValue =
""
;
+ private $foundValue =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/rng/class_RandomNumberGenerator.php
b/inc/classes/main/rng/class_RandomNumberGenerator.php
index 51a0846ecd72a66b84839a02fbc0d9e2e1f35a10..431b9d130bbe092b8133dafc9d7b543dcbfae61b 100644
(file)
--- a/
inc/classes/main/rng/class_RandomNumberGenerator.php
+++ b/
inc/classes/main/rng/class_RandomNumberGenerator.php
@@
-35,12
+35,12
@@
class RandomNumberGenerator extends BaseFrameworkSystem {
/**
* Extra salt for secured hashing
*/
/**
* Extra salt for secured hashing
*/
- private $extraSalt =
""
;
+ private $extraSalt =
''
;
/**
* Fixed salt for secured hashing
*/
/**
* Fixed salt for secured hashing
*/
- private $fixedSalt =
""
;
+ private $fixedSalt =
''
;
/**
* Maximum length for random string
/**
* Maximum length for random string
@@
-133,7
+133,7
@@
class RandomNumberGenerator extends BaseFrameworkSystem {
if ($length < 1) $length = $this->rndStrLen;
// Initialize the string
if ($length < 1) $length = $this->rndStrLen;
// Initialize the string
- $randomString =
""
;
+ $randomString =
''
;
// And generate it
for ($idx = 0; $idx < $length; $idx++) {
// And generate it
for ($idx = 0; $idx < $length; $idx++) {
diff --git
a/inc/classes/main/template/class_BaseTemplateEngine.php
b/inc/classes/main/template/class_BaseTemplateEngine.php
index 8969e4e90deae5e5110e579699af231848f50356..4b121a4febe93ae70082126205ccab4ecd254001 100644
(file)
--- a/
inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/
inc/classes/main/template/class_BaseTemplateEngine.php
@@
-27,7
+27,7
@@
class BaseTemplateEngine extends BaseFrameworkSystem {
* templates are stored. We will internally determine the language plus
* "html" for web templates or "emails" for email templates
*/
* templates are stored. We will internally determine the language plus
* "html" for web templates or "emails" for email templates
*/
- private $basePath =
""
;
+ private $basePath =
''
;
/**
* Template type
/**
* Template type
@@
-52,17
+52,17
@@
class BaseTemplateEngine extends BaseFrameworkSystem {
/**
* The raw (maybe uncompiled) template
*/
/**
* The raw (maybe uncompiled) template
*/
- private $rawTemplateData =
""
;
+ private $rawTemplateData =
''
;
/**
* Template data with compiled-in variables
*/
/**
* Template data with compiled-in variables
*/
- private $compiledData =
""
;
+ private $compiledData =
''
;
/**
* The last loaded template's FQFN for debugging the engine
*/
/**
* The last loaded template's FQFN for debugging the engine
*/
- private $lastTemplate =
""
;
+ private $lastTemplate =
''
;
/**
* The variable stack for the templates
/**
* The variable stack for the templates
@@
-560,7
+560,7
@@
class BaseTemplateEngine extends BaseFrameworkSystem {
// Is it not a config variable?
if ($varName != 'config') {
// Regular template variables
// Is it not a config variable?
if ($varName != 'config') {
// Regular template variables
- $this->assignVariable($var,
""
);
+ $this->assignVariable($var,
''
);
} else {
// Configuration variables
$this->assignConfigVariable($var);
} else {
// Configuration variables
$this->assignConfigVariable($var);
@@
-779,7
+779,7
@@
class BaseTemplateEngine extends BaseFrameworkSystem {
}
// Do we have some quotes left and right side? Then it is free text
}
// Do we have some quotes left and right side? Then it is free text
- if ((substr($varMatches[2][$key], 0, 1) == "\
"") && (substr($varMatches[2][$key], -1, 1) == "\""
)) {
+ if ((substr($varMatches[2][$key], 0, 1) == "\
'') && (substr($varMatches[2][$key], -1, 1) == "\''
)) {
// Free string detected! Which we can assign directly
$this->assignVariable($var, $varMatches[3][$key]);
} elseif (!empty($varMatches[2][$key])) {
// Free string detected! Which we can assign directly
$this->assignVariable($var, $varMatches[3][$key]);
} elseif (!empty($varMatches[2][$key])) {
@@
-998,7
+998,7
@@
class BaseTemplateEngine extends BaseFrameworkSystem {
$eval = str_replace(
"<%php", "\";",
str_replace(
$eval = str_replace(
"<%php", "\";",
str_replace(
- "%>", "\n\$result .= \
""
, $eval
+ "%>", "\n\$result .= \
''
, $eval
)
);
)
);
@@
-1074,7
+1074,7
@@
class BaseTemplateEngine extends BaseFrameworkSystem {
$this->insertRawTemplates();
// Remove the raw template content as well
$this->insertRawTemplates();
// Remove the raw template content as well
- $this->setRawTemplateData(
""
);
+ $this->setRawTemplateData(
''
);
} // END - if
} // END - if
@@
-1162,7
+1162,7
@@
class BaseTemplateEngine extends BaseFrameworkSystem {
$this->assignVariable($variableName, $content);
// Purge raw content
$this->assignVariable($variableName, $content);
// Purge raw content
- $this->setRawTemplateData(
""
);
+ $this->setRawTemplateData(
''
);
}
/**
}
/**
diff --git
a/inc/classes/main/template/image/class_ImageTemplateEngine.php
b/inc/classes/main/template/image/class_ImageTemplateEngine.php
index c77556a4507ea977fd8725260c20f492c3814838..309279a695abccb5812943a39db08cf879d49891 100644
(file)
--- a/
inc/classes/main/template/image/class_ImageTemplateEngine.php
+++ b/
inc/classes/main/template/image/class_ImageTemplateEngine.php
@@
-40,7
+40,7
@@
class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl
/**
* Current main node
*/
/**
* Current main node
*/
- private $currMainNode =
""
;
+ private $currMainNode =
''
;
/**
* Protected constructor
/**
* Protected constructor
diff --git
a/inc/classes/main/template/mail/class_MailTemplateEngine.php
b/inc/classes/main/template/mail/class_MailTemplateEngine.php
index d67651fbf443c82056d0a255fb3355ddf6d2ad8e..241e24fe44fa492a9b7f04a2a9c664a96faaf521 100644
(file)
--- a/
inc/classes/main/template/mail/class_MailTemplateEngine.php
+++ b/
inc/classes/main/template/mail/class_MailTemplateEngine.php
@@
-40,7
+40,7
@@
class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
/**
* Current main node
*/
/**
* Current main node
*/
- private $currMainNode =
""
;
+ private $currMainNode =
''
;
/**
* Protected constructor
/**
* Protected constructor
@@
-316,7
+316,7
@@
class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
*/
public function getMailCacheFqfn () {
// Initialize FQFN
*/
public function getMailCacheFqfn () {
// Initialize FQFN
- $fqfn =
""
;
+ $fqfn =
''
;
$this->debugBackTrace();
// Return it
$this->debugBackTrace();
// Return it
diff --git
a/inc/classes/main/user/class_BaseUser.php
b/inc/classes/main/user/class_BaseUser.php
index c5cdfa9ad886019c36f6c643a51f447828a91fad..f1a63026e0259c0494bb0ba33cd887b698913e16 100644
(file)
--- a/
inc/classes/main/user/class_BaseUser.php
+++ b/
inc/classes/main/user/class_BaseUser.php
@@
-30,7
+30,7
@@
class BaseUser extends BaseFrameworkSystem {
/**
* Username of current user
*/
/**
* Username of current user
*/
- private $userName =
""
;
+ private $userName =
''
;
/**
* User id of current user
/**
* User id of current user
@@
-40,7
+40,7
@@
class BaseUser extends BaseFrameworkSystem {
/**
* Email of current user
*/
/**
* Email of current user
*/
- private $email =
""
;
+ private $email =
''
;
/**
* Protected constructor
/**
* Protected constructor
@@
-199,7
+199,7
@@
class BaseUser extends BaseFrameworkSystem {
$exists = true;
// Is the username set?
$exists = true;
// Is the username set?
- if ($this->getUserName() ==
""
) {
+ if ($this->getUserName() ==
''
) {
// Get current entry
$currEntry = $this->getResultInstance()->current();
// Get current entry
$currEntry = $this->getResultInstance()->current();
diff --git
a/inc/classes/middleware/database/class_DatabaseConnection.php
b/inc/classes/middleware/database/class_DatabaseConnection.php
index 56f07783c3fc2d168ddd3a35d7e67df68970b88e..420421fd4f1ecb461e694153f6d24302206ed195 100644
(file)
--- a/
inc/classes/middleware/database/class_DatabaseConnection.php
+++ b/
inc/classes/middleware/database/class_DatabaseConnection.php
@@
-26,10
+26,10
@@
class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
* Array for connection data
*/
private $connectData = array(
* Array for connection data
*/
private $connectData = array(
- 'login' =>
""
,
- 'pass' =>
""
,
- 'dbase' =>
""
,
- 'host' =>
""
+ 'login' =>
''
,
+ 'pass' =>
''
,
+ 'dbase' =>
''
,
+ 'host' =>
''
);
// The real database layer
);
// The real database layer
diff --git
a/inc/config/class_FrameworkConfiguration.php
b/inc/config/class_FrameworkConfiguration.php
index fafc68fd21c9f3aa07c20f88fc5e4546eece5d28..aa00607c0d3b91a242febd70c55f8a342fb34c56 100644
(file)
--- a/
inc/config/class_FrameworkConfiguration.php
+++ b/
inc/config/class_FrameworkConfiguration.php
@@
-236,7
+236,7
@@
class FrameworkConfiguration implements Registerable {
*/
public function detectScriptPath () {
// Default is empty
*/
public function detectScriptPath () {
// Default is empty
- $scriptPath =
""
;
+ $scriptPath =
''
;
// Is the scriptname set?
if (isset($_SERVER['SCRIPT_NAME'])) {
// Is the scriptname set?
if (isset($_SERVER['SCRIPT_NAME'])) {
diff --git
a/inc/includes.php
b/inc/includes.php
index 246a53253fa8d30b67589d85fece2989023ae28a..367399ad841f1c9d000a766d9bd8bb74f5d1c235 100644
(file)
--- a/
inc/includes.php
+++ b/
inc/includes.php
@@
-56,7
+56,7
@@
if (!empty($_GET['app'])) {
$application = htmlentities(strip_tags($application), ENT_QUOTES);
// Secure it a little more with a reg.exp.
$application = htmlentities(strip_tags($application), ENT_QUOTES);
// Secure it a little more with a reg.exp.
-$application = preg_replace('/([^a-z0-9_-])+/i',
""
, $application);
+$application = preg_replace('/([^a-z0-9_-])+/i',
''
, $application);
// Set the application name for later usage
$cfg->setConfigEntry('app_name', $application);
// Set the application name for later usage
$cfg->setConfigEntry('app_name', $application);
diff --git
a/inc/loader/class_ClassLoader.php
b/inc/loader/class_ClassLoader.php
index ffa07930f1bae1c3677840e426f83bdd18ff90cb..7b551d8747c95ab9f3acea3b2040a8ea150c8155 100644
(file)
--- a/
inc/loader/class_ClassLoader.php
+++ b/
inc/loader/class_ClassLoader.php
@@
-84,12
+84,12
@@
class ClassLoader {
/**
* Filename for the list cache
*/
/**
* Filename for the list cache
*/
- private $listCacheFQFN =
""
;
+ private $listCacheFQFN =
''
;
/**
* Cache for class content
*/
/**
* Cache for class content
*/
- private $classCacheFQFN =
""
;
+ private $classCacheFQFN =
''
;
/**
* Counter for loaded include files
/**
* Counter for loaded include files
@@
-217,7
+217,7
@@
class ClassLoader {
// Skip here if already cached
if ($this->classesCached === false) {
// Generate a full-cache of all classes
// Skip here if already cached
if ($this->classesCached === false) {
// Generate a full-cache of all classes
- $cacheContent =
""
;
+ $cacheContent =
''
;
foreach ($this->loadedClasses as $fqfn) {
// Load the file
$cacheContent .= file_get_contents($fqfn);
foreach ($this->loadedClasses as $fqfn) {
// Load the file
$cacheContent .= file_get_contents($fqfn);
@@
-398,7
+398,7
@@
class ClassLoader {
*/
public function getPrintableIncludeList () {
// Prepare the list
*/
public function getPrintableIncludeList () {
// Prepare the list
- $includeList =
""
;
+ $includeList =
''
;
foreach ($this->loadedClasses as $classFile) {
$includeList .= basename($classFile)."<br />\n";
} // END - foreach
foreach ($this->loadedClasses as $classFile) {
$includeList .= basename($classFile)."<br />\n";
} // END - foreach
diff --git
a/inc/output.php
b/inc/output.php
index c23d0ffdb289eedeb4f1ba79929f44d2433cd985..0f826ad9070c76ad2cb501e6b67be53baa7f1a16 100644
(file)
--- a/
inc/output.php
+++ b/
inc/output.php
@@
-26,7
+26,7
@@
$debug = DebugMiddleware::createDebugMiddleware(FrameworkConfiguration::getInstance()->readConfig('debug_class'));
// Empty string should be ignored and used for testing the middleware
$debug = DebugMiddleware::createDebugMiddleware(FrameworkConfiguration::getInstance()->readConfig('debug_class'));
// Empty string should be ignored and used for testing the middleware
-DebugMiddleware::getInstance()->output(
""
);
+DebugMiddleware::getInstance()->output(
''
);
// [EOF]
?>
// [EOF]
?>
diff --git
a/tests/ConfigTest.php
b/tests/ConfigTest.php
index 6e14186f51b356cdfbcd0d6a17f4a8342b440d72..1014d10adb143571f68e1c6728826307aefb6123 100644
(file)
--- a/
tests/ConfigTest.php
+++ b/
tests/ConfigTest.php
@@
-91,7
+91,7
@@
class ConfigTest extends PHPUnit_Framework_TestCase {
$cfg = FrameworkConfiguration::getInstance();
// Try to read an empty configuration variable
$cfg = FrameworkConfiguration::getInstance();
// Try to read an empty configuration variable
- $dummy = $cfg->readConfig(
""
);
+ $dummy = $cfg->readConfig(
''
);
} catch (ConfigEntryIsEmptyException $expected) {
// This exception was expected, so it is fine
$testPassed = true;
} catch (ConfigEntryIsEmptyException $expected) {
// This exception was expected, so it is fine
$testPassed = true;
@@
-120,7
+120,7
@@
class ConfigTest extends PHPUnit_Framework_TestCase {
$cfg = FrameworkConfiguration::getInstance();
// Try to read an empty configuration variable
$cfg = FrameworkConfiguration::getInstance();
// Try to read an empty configuration variable
- $cfg->setConfigEntry(
""
, 'will_never_be_set');
+ $cfg->setConfigEntry(
''
, 'will_never_be_set');
} catch (ConfigEntryIsEmptyException $expected) {
// This exception was expected, so it is fine
$testPassed = true;
} catch (ConfigEntryIsEmptyException $expected) {
// This exception was expected, so it is fine
$testPassed = true;
diff --git
a/tests/old/contract-test.php
b/tests/old/contract-test.php
index fd44cdf394265209910fc435a38b5761a82ff015..5dfeabf4b90c714e5f66d486d84e184498d50e28 100644
(file)
--- a/
tests/old/contract-test.php
+++ b/
tests/old/contract-test.php
@@
-200,7
+200,7
@@
$einbauten = array(
// Preisliste auffuellen
foreach ($einbauten['parts'] as $key=>$part) {
// Create item array string
// Preisliste auffuellen
foreach ($einbauten['parts'] as $key=>$part) {
// Create item array string
- $item =
""
;
+ $item =
''
;
foreach ($part as $idx=>$itemPart) {
if (is_string($itemPart)) {
// String found
foreach ($part as $idx=>$itemPart) {
if (is_string($itemPart)) {
// String found