Continued a bit:

- added correct test for UUID (will be later moved to 'core')
- moved config entry 'extension_foo_loaded' to core's config.php (DONT TOUCH IT)
- updated 'core'

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/hub/classes/filter/node/class_NodePhpRequirementsFilter.php b/application/hub/classes/filter/node/class_NodePhpRequirementsFilter.php
index 7cba2b5ca371859eaff41ae81f319f4712d60b8e..cb8a15785672bf21ada3e9168028c4e1e393cb02 100644 (file)
--- a/application/hub/classes/filter/node/class_NodePhpRequirementsFilter.php
+++ b/application/hub/classes/filter/node/class_NodePhpRequirementsFilter.php
@@ -76,6 +76,16 @@ class NodePhpRequirementsFilter extends BaseNodeFilter implements Filterable {
                        self::createDebugInstance(__CLASS__)->debugOutput('FILTER[' . __METHOD__ . ':' . __LINE__ . '] ext-scrypt not found or scrypt() function not found. "Hubcoin reward" feature disabled.');
                }
 
+               // If uuid_create() is not found (ext-uuid) then some keys are a bit weaker
+               if ((extension_loaded('uuid')) && (is_callable('uuid_create'))) {
+                       // Mark it as working
+                       self::createDebugInstance(__CLASS__)->debugOutput('FILTER[' . __METHOD__ . ':' . __LINE__ . '] ext-uuid and a callable uuid_create() function found. UUID "entropy" available.');
+                       $this->getConfigInstance()->setConfigEntry('extension_uuid_loaded', TRUE);
+               } else {
+                       // Not working (not all have ext-uuid installed
+                       self::createDebugInstance(__CLASS__)->debugOutput('FILTER[' . __METHOD__ . ':' . __LINE__ . '] ext-uuid not found or uuid_create() function not found. "Hubcoin reward" feature disabled.');
+               }
+
                // Are all tests passed?
                if ($checkPassed === FALSE) {
                        // Throw an exception

diff --git a/application/hub/init.php b/application/hub/init.php
index 1c750dc767578fcc8de7ab8ad209ff0151a469a1..548d5172ed4c5ba112e3357e7699d5736079ddc4 100644 (file)
--- a/application/hub/init.php
+++ b/application/hub/init.php
@@ -37,8 +37,5 @@ require($cfg->getConfigEntry('base_path') . 'inc/database.php');
 // Get own internal address and set it in config
 $cfg->setConfigEntry('internal_address', HubTools::determineOwnInternalAddress());
 
-// By default scrypt is assumed absent and later tested being there
-$cfg->setConfigEntry('extension_scrypt_loaded', FALSE);
-
 // [EOF]
 ?>

diff --git a/contrib/find-bad-php.sh b/contrib/find-bad-php.sh
index 2fdfecf45b9391673b127911bf8eae0335154842..85af1b24555a99968d6d8dee410429de5626508f 100755 (executable)
--- a/contrib/find-bad-php.sh
+++ b/contrib/find-bad-php.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo "$0: Searching for PHP scripts (except 3rd party) ..."
-PHP=`find -type f -name "*.php" | grep -v "third_party"`
+PHP=`find -type f -name "*.php" 2>&1 | grep -v "third_party"`
 
 for SCRIPT in ${PHP};
 do
@@ -19,7 +19,7 @@ do
                echo "$0: Script '${SCRIPT}' has non-typical footer."
        fi
 
-       LINT=`php -l "${SCRIPT}" 2>&1 | grep -v "No syntax errors detected in"`
+       LINT=`php -l "${SCRIPT}" 2>&1 | grep -v "Constant FUSE_EDEADLK already defined in Unknown on line 0" | grep -v "No syntax errors detected in"`
 
        if [ -n "${LINT}" ]
        then

diff --git a/core b/core
index e3c9a9ab3fc3f5d6a11b5af02d89cdba472d7ab8..df42c6e506561f872ee628448945833cad968d28 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit e3c9a9ab3fc3f5d6a11b5af02d89cdba472d7ab8
+Subproject commit df42c6e506561f872ee628448945833cad968d28