Some improvements:

- Used wrapper convertCommaToDotInPostData() instead of that wrapped code
- Init database charset to UTF-8 by default
- Use a mask for float instead (float) casting

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index d7a7fd3872ea7f8138fb851a8c0be9aace892320..c32c8f2b869e57347fd3d97c5692bdd927a1a5a4 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -223,6 +223,14 @@ function SQL_CONNECT ($host, $login, $password, $F, $L) {
                 * working database link.
                 */
                SQL_SET_LINK(__FUNCTION__, __LINE__, $linkResource);
+
+               // Init charsets (UTF-8 is default now)
+               SQL_QUERY("SET
+       `character_set_results`='utf8',
+       `character_set_client`='utf8',
+       `character_set_connection`='utf8',
+       `character_set_database`='utf8',
+       `character_set_server`='utf8'", __FUNCTION__, __LINE__);
        } // END - if
 
        // Return the resource

diff --git a/inc/functions.php b/inc/functions.php
index faecd19e7d1811d8ed10f2eacb03232503f0e332..74305d4701e40bf233a83baddfb2e9a5c6340288 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1464,12 +1464,12 @@ function convertCommaToDot ($str) {
                        $str = str_replace('.', '', $str);
 
                        // Replace german commata with decimal dot and cast it
-                       $float = (float) str_replace(',', '.', $str);
+                       $float = sprintf('%01.5f', str_replace(',', '.', $str));
                        break;
 
                default: // US and so on
                        // Remove thousand commatas first and cast
-                       $float = (float) str_replace(',', '', $str);
+                       $float = sprintf('%01.5f', str_replace(',', '', $str));
                        break;
        } // END - switch
 

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index e5348112684754dc6077dee443c9ef5f2f44db6b..1ec81ad88917f19e1bbe9894293b42af3b97d163 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -1872,7 +1872,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE) {
        setPostRequestElement('network_type_id', bigintval(getRequestElement('network_type_id')));
 
        // Translate German comma to dot
-       setPostRequestElement('network_min_payment', convertCommaToDot(postRequestElement('network_min_payment')));
+       convertCommaToDotInPostData('network_min_payment');
 
        /*
         * Some parameters are optional, at least one must be given so check a bunch
@@ -1962,6 +1962,9 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE) {
 
 // Only changes network type configuration if not yet present
 function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE) {
+       // Translate German comma to dot
+       convertCommaToDotInPostData('network_min_payment');
+
        /*
         * Some parameters are optional, at least one must be given so check a bunch
         * of parameters.

diff --git a/inc/sql-functions.php b/inc/sql-functions.php
index b08d51ca5c8e0a9013c2049d38f810bac2acf026..84456a0f00d2f2dba9d455aaf790df079a0e8bb4 100644 (file)
--- a/inc/sql-functions.php
+++ b/inc/sql-functions.php
@@ -184,11 +184,11 @@ function getInsertSqlFromArray ($array, $tableName) {
        $SQL = 'INSERT INTO
 `{?_MYSQL_PREFIX?}_' . $tableName . '`
 (
-`' . implode('`, `', array_keys(postRequestArray())) . '`
+`' . implode('`, `', array_keys($array)) . '`
 ) VALUES (';
 
        // Walk through all entries
-       foreach (postRequestArray() as $key => $value) {
+       foreach ($array as $key => $value) {
                // Log debug message
                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',key=' . $key . ',value=' . $value);
 

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 36d0bb2fe9f5fc7cf4e56c7fd328b2272c0b1d66..c5a616a6bd30442534e5c478e99c458322eb2e43 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -3393,5 +3393,11 @@ function loadAllExtensionsByTemplate () {
        return $extensions;
 }
 
+// Wrapper function to allow full float values as supported by current database layout
+function translateFullComma ($dotted) {
+       // Call inner function
+       return translateComma($dotted, TRUE, 5);
+}
+
 // [EOF]
 ?>

diff --git a/templates/de/html/admin/admin_edit_config_network_type_form.tpl b/templates/de/html/admin/admin_edit_config_network_type_form.tpl
index 89b26309894adc8d0710350d7d16644146ceea20..10ff1167fec6cc0f06a4f54460c9e6decd5df99d 100644 (file)
--- a/templates/de/html/admin/admin_edit_config_network_type_form.tpl
+++ b/templates/de/html/admin/admin_edit_config_network_type_form.tpl
@@ -32,7 +32,7 @@
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
                <label for="network_min_payment">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_PAYMENT--}</label>
-               <input type="text" class="form_normal" name="network_min_payment" size="7" maxlength="20" value="$content[network_min_payment]" />
+               <input type="text" class="form_normal" name="network_min_payment" size="7" maxlength="20" value="{%pipe,translateFullComma=$content[network_min_payment]%}" />
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
@@ -42,7 +42,7 @@
 
        <div class="table_footer">
                <input type="hidden" name="network_data_id" value="$content[network_data_id]" />
-               <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_FORM_SUBMIT--}" />
+               <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_FORM_SUBMIT--}" />
        </div>
 </div>
 {%form_close%}