SQL fixed, generateRandomCode() improved (is now generating better numbers)

diff --git a/inc/extensions/ext-funcoins.php b/inc/extensions/ext-funcoins.php
index 638a5b161e35b7652ffeda67d084cbbfefe1da6b..e60faae3a8d4e691a9c2eb929d8354559897bd21 100644 (file)
--- a/inc/extensions/ext-funcoins.php
+++ b/inc/extensions/ext-funcoins.php
@@ -64,7 +64,7 @@ switch (getExtensionMode()) {
 `funcoins_amount` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000 COMMENT 'Transfered amount',
 `funcoins_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Booking timestamp',
 `funcoins_type` ENUM('WITHDRAW','PAYOUT','FAILED') NOT NULL DEFAULT 'FAILED' COMMENT 'Transaction type',
-`fucoins_tan` VARCHAR(255) NULL DEFAULT NULL COMMENT 'TAN from API',
+`funcoins_tan` VARCHAR(255) NULL DEFAULT NULL COMMENT 'TAN from API',
 `funcoins_api_response` TINYTEXT COMMENT 'Clear text API response (only for debugging)',
 `funcoins_api_status` INT(4) NULL DEFAULT NULL COMMENT 'Status code from API',
 PRIMARY KEY (`id`),
@@ -95,7 +95,7 @@ INDEX (`userid`)",
                // Admin menu
                addAdminMenuSql('funcoins', NULL, 'FunCoins-Management', 'Konfiguration zur FuCo-Ex² einstellen, Auszahlungen auflisten usw..', 15);
                addAdminMenuSql('funcoins', 'config_funcoins', 'FuCo-Ex²-Einstellungen', 'Konfiguration zur FuCo-Ex² einstellen.', 1);
-               addAdminMenuSql('funcoins', 'list_funcoins', 'Anfragen auflisten', 'Listet alle FunCoinsein- und -auszahlungsanfragen Ihrer Mitglieder und Sponsoren auf.', 2);
+               addAdminMenuSql('funcoins', 'list_funcoins', 'Anfragen auflisten', 'Listet alle FunCoins-Ein- und -Auszahlungsanfragen Ihrer Mitglieder und Sponsoren auf.', 2);
 
                // Member menu
                addMemberMenuSql('main', 'funcoins', 'FunCoins-Ein-/Auszahlungen', 11);

diff --git a/inc/filters.php b/inc/filters.php
index 57ebf505ba3d46276105a947fc2cc74a586d9191..881eb57395f1b1bd2d476de9c437f4b423dec756 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -828,7 +828,7 @@ function FILTER_INIT_RANDOM_NUMBER () {
        // Is the extension ext-sql_patches installed and at least 0.3.6?
        if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) {
                // Generate random number
-               setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), ''));
+               setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 99999), getMemberId(), ''));
        } else {
                // Generate *WEAK* code
                setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));

diff --git a/inc/functions.php b/inc/functions.php
index 8ebb9136698b4824fcb3334260f20ab491c4452c..610067aa8bdca0e6e91db3f1f13ae24dd360ebca 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -676,7 +676,7 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') {
        }
 
        // Create number from hash
-       $rcode = hexdec(substr($saltedHash, 8, 9)) / abs(getRandNo() - $a + sqrt(getConfig('_ADD'))) / pi();
+       $rcode = hexdec(substr($saltedHash, getSaltLength(), 9)) / abs(getRandNo() - $a + sqrt(getConfig('_ADD'))) / pi();
 
        // At least 10 numbers shall be secure enought!
        if (isExtensionActive('other')) {
@@ -689,8 +689,8 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') {
                $len = 10;
        } // END - if
 
-       // Cut off requested counts of number
-       $return = substr(str_replace('.', '', $rcode), 0, $len);
+       // Cut off requested counts of number, but skip first digit (which is mostly a zero)
+       $return = substr($rcode, (strpos($rcode, '.') + 1), $len);
 
        // Done building code
        return $return;

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index b1451b999f5fa11c56540321c997b67afece807c..aed64ba5b1637628bb74d969077d41e59898bdfe 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -290,7 +290,7 @@ ORDER BY
                $WHATs[]  = 'list_payouts';
                $DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL--}';
                $TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL_TITLE--}';
-       }
+       } // END - if
 
        if (isExtensionActive('wernis')) {
                // List new wernis requests
@@ -298,7 +298,7 @@ ORDER BY
                $WHATs[]  = 'list_wernis';
                $DESCRs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL--}';
                $TITLEs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL_TITLE--}';
-       }
+       } // END - if
 
        if (isExtensionActive('primera')) {
                // List new primera requests
@@ -306,7 +306,7 @@ ORDER BY
                $WHATs[]  = 'list_primera';
                $DESCRs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL--}';
                $TITLEs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL_TITLE--}';
-       }
+       } // END - if
 
        if (isExtensionActive('holiday')) {
                // List holiday requests
@@ -314,7 +314,7 @@ ORDER BY
                $WHATs[]  = 'list_holiday';
                $DESCRs[] = '{--ADMIN_TASK_LIST_HOLIDAYS--}';
                $TITLEs[] = '{--ADMIN_TASK_LIST_HOLIDAYS_TITLE--}';
-       }
+       } // END - if
 
        if (isExtensionInstalledAndNewer('bonus', '0.8.7')) {
                // List all notifications

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index b28bc9ee2d8efdb18c77445b69e2e2b3dae5830a..e427eb5f21678524c675b07532ea6cb90e4d85fd 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -349,10 +349,10 @@ function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = '',
 // Take fees and factor
 function WERNIS_TAKE_FEE ($points, $mode) {
        // Payout or withdraw are allowed modes!
-       //* DEBUG: */ debugOutput('mode='.$mode.',points='.$points);
+       //* DEBUG: */ debugOutput('mode=' . $mode . ',points=' . $points);
        if (!in_array($mode, array('payout', 'withdraw'))) {
                // Log error and abort
-               logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getMemberId() . ',mode=' . $mode . ',points=' . $points);
+               logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getMemberId() . ',mode=' . $mode . ',points=' . $points . ' - unknown mode detected.');
                return false;
        } // END - if
 

diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php
index 5d2d33ecd7f8a222cfdb985c913c487b307cec79..b6b43a7d7cc374d1bcec3309bfd39a56adfc8b71 100644 (file)
--- a/inc/modules/admin/what-list_wernis.php
+++ b/inc/modules/admin/what-list_wernis.php
@@ -45,7 +45,14 @@ addYouAreHereLink('admin', __FILE__);
 
 // Check for entries
 $result = SQL_QUERY('SELECT
-       `id`, `userid`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type`, `wernis_api_message`, `wernis_api_status`
+       `id`,
+       `userid`,
+       `wernis_account`,
+       `wernis_amount`,
+       `wernis_timestamp`,
+       `wernis_type`,
+       `wernis_api_message`,
+       `wernis_api_status`
 FROM
        `{?_MYSQL_PREFIX?}_user_wernis`
 ORDER BY

diff --git a/mailid.php b/mailid.php
index f93838a1bae4ddec241f994bad9fd01b09d195a4..162ff01041154bfd18584aef3c1d5abec68ae42f 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -57,9 +57,9 @@ setHttpStatus('404 NOT FOUND');
 redirectOnUninstalledExtension('mailid');
 
 // Init
-$userId = '0';
-$bonusId    = '0';
-$mailId    = '0';
+$userId  = '0';
+$bonusId = '0';
+$mailId  = '0';
 
 // Secure all data
 if (isGetRequestParameterSet('userid'))  $userId  = bigintval(getRequestParameter('userid'));