Some code cosmetics and fixes

[mailer.git] / inc / modules / admin / what-config_points.php

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 5a3bb6996db215acf631f9854e916581399a10c5..43e15afc41f299315c47a5b01121240988ef75f3 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -94,8 +94,8 @@ if (isFormSent()) {
                                                setPostRequestParameter('percents', array($id => convertCommaToDot(postRequestParameter('percents', $id))));
 
                                                // Update entry
-                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`='%s', `percents`='%s' WHERE `id`=%s LIMIT 1",
-                                               array(bigintval($value), postRequestParameter('percents', $id), $id), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`=%s, `percents`=%s WHERE `id`=%s LIMIT 1",
+                                                       array(bigintval($value), convertCommaToDot(postRequestParameter('percents', $id)), $id), __FILE__, __LINE__);
                                        }
                                        $message = '{--REF_DEPTHS_SAVED--}';
                                        break;
@@ -125,7 +125,8 @@ if (isFormSent()) {
                        if ((getConfig('ref_payout') == '0') && (postRequestParameter('ref_payout') > 0)) {
                                // Update account's ref_payout for "must-confirm"
                                addSql(sprintf("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_payout`=(%s - `mails_confirmed`)
-WHERE `mails_confirmed` < %s", $REF, $REF));
+WHERE
+       `mails_confirmed` < %s", $REF, $REF));
                        } elseif ((getConfig('ref_payout') > 0) && (postRequestParameter('ref_payout') == '0')) {
                                // Update account's ref_payout for "not-must-confirm"
                                addSql("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_payout`=0 WHERE `ref_payout` > 0");
@@ -184,44 +185,30 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
        loadTemplate('admin_config_point_settings', false, $content);
 } elseif (getRequestParameter('sub') == 'ref') {
        // 12                  3     32    2                  3     32    2               3            4     43    21
-       if ((isFormSent('del')) && (isPostRequestParameterSet('sel')) && (countPostSelection() > 0)) {
+       if ((isFormSent('del')) && (isPostRequestParameterSet('sel')) && (ifPostContainsSelections())) {
                // Delete entries
                $OUT = '';
                foreach (postRequestParameter('sel') as $id => $value) {
-                       $result = SQL_QUERY_ESC("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
                        $content = SQL_FETCHARRAY($result);
                        SQL_FREERESULT($result);
 
-                       // Prepare data for the row template
-                       $content = array(
-                               'id'       => $id,
-                               'level'    => $content['level'],
-                               'percents' => translateComma($content['percents']),
-                       );
-
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_points_del_row', true, $content);
                } // END - foreach
 
                // Load main template
                loadTemplate('admin_points_del', false, $OUT);
-       } elseif ((isFormSent('edit')) && (isPostRequestParameterSet('sel')) && (countPostSelection() > 0)) {
+       } elseif ((isFormSent('edit')) && (isPostRequestParameterSet('sel')) && (ifPostContainsSelections())) {
                // Edit entries
                $OUT = '';
                foreach (postRequestParameter('sel') as $id => $value) {
-                       $result = SQL_QUERY_ESC("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
                        $content = SQL_FETCHARRAY($result);
                        SQL_FREERESULT($result);
 
-                       // Prepare data for the row template
-                       $content = array(
-                               'id'       => $id,
-                               'level'    => $content['level'],
-                               'percents' => translateComma($content['percents']),
-                       );
-
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_points_edit_row', true, $content);
                } // END - foreach
@@ -231,7 +218,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
        } else {
                // Referal levels
                $result = SQL_QUERY("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__);
-               if (SQL_NUMROWS($result) > 0) {
+               if (!SQL_HASZERONUMS($result)) {
                        // Make referal levels editable and deletable
                        $OUT = '';