Wrapper function isBegRallyeEnabled() introduced, rewrites to make usage of isExtensi...

[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 8c36a0770ba9caaad6e76643cf6410f14f8ea04c..43e15afc41f299315c47a5b01121240988ef75f3 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -64,7 +65,7 @@ if (isGetRequestParameterSet('sub')) {
                                }
                        }
                        break;
-       }
+       } // END - switch
 } else {
        // Display overview
        setGetRequestParameter('sub', 'overview');
@@ -74,7 +75,7 @@ if (isFormSent()) {
        initSqls();
        switch (getRequestParameter('sub')) {
                case 'points':
-                       updateConfiguration(array('points_register', 'points_ref'), array(postRequestParameter('points_register'), postRequestParameter('points_ref')));
+                       adminSaveSettingsFromPostData();
                        break;
 
                case 'ref':
@@ -93,10 +94,10 @@ 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 = getMessage('REF_DEPTHS_SAVED');
+                                       $message = '{--REF_DEPTHS_SAVED--}';
                                        break;
 
                                case 'del':
@@ -104,14 +105,15 @@ if (isFormSent()) {
                                                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
                                                array(bigintval($id)), __FILE__, __LINE__);
                                        }
-                                       $message = getMessage('REF_DEPTHS_DELETED');
+                                       $message = '{--REF_DEPTHS_DELETED--}';
                                        break;
                        }
 
                        // Update cache file
-                       if (getExtensionVersion('cache') >= '0.1.2') {
+                       // @TODO Rewrite this to a filter
+                       if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
                                if ($GLOBALS['cache_instance']->loadCacheFile('refdepths')) $GLOBALS['cache_instance']->removeCacheFile();
-                       }
+                       } // END - if
                        break;
 
                case 'settings':
@@ -123,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");
@@ -131,7 +134,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
                                addSql("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `locked_points`=0 WHERE `locked_points` > 0");
                        }
                        break;
-       }
+       } // END - if
 
        if ((isSqlsValid()) && (isSqlsValid())) {
                if (strpos($GLOBALS['sqls'][0], 'INSERT') > -1) {
@@ -145,13 +148,13 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
                        runFilterChain('run_sqls');
 
                        // Entry saved...
-                       $message = getMessage('SETTINGS_SAVED');
+                       $message = '{--SETTINGS_SAVED--}';
 
                        // Destroy config cache file here...
-                       rebuildCacheFile('config', 'config');
+                       rebuildCache('config', 'config');
                } else {
                        // Prepare failed-message
-                       $message = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
+                       $message = '<span class="admin_failed">{--SETTINGS_NOT_SAVED--}</span>';
                }
 
                // Remove SQL queries
@@ -182,71 +185,51 @@ 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 ((isPostRequestParameterSet('del')) && (isPostRequestParameterSet('sel')) && (countPostSelection() > 0)) {
+       if ((isFormSent('del')) && (isPostRequestParameterSet('sel')) && (ifPostContainsSelections())) {
                // Delete entries
-               $OUT = ''; $SW = 2;
+               $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(
-                               'sw'       => $SW,
-                               'id'       => $id,
-                               'level'    => $content['level'],
-                               'percents' => translateComma($content['percents']),
-                       );
-
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_points_del_row', true, $content);
-                       $SW = 3 - $SW;
-               }
+               } // END - foreach
 
                // Load main template
                loadTemplate('admin_points_del', false, $OUT);
-       } elseif ((isPostRequestParameterSet('edit')) && (isPostRequestParameterSet('sel')) && (countPostSelection() > 0)) {
+       } elseif ((isFormSent('edit')) && (isPostRequestParameterSet('sel')) && (ifPostContainsSelections())) {
                // Edit entries
-               $OUT = ''; $SW = 2;
+               $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(
-                               'sw'       => $SW,
-                               'id'       => $id,
-                               'level'    => $content['level'],
-                               'percents' => translateComma($content['percents']),
-                       );
-
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_points_edit_row', true, $content);
-                       $SW = 3 - $SW;
-               }
+               } // END - foreach
 
                // Load main template
                loadTemplate('admin_points_edit', false, $OUT);
        } 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 = ''; $SW = 2;
+                       $OUT = '';
 
                        // List already existing categories for editing
                        while ($content = SQL_FETCHARRAY($result)) {
                                // Prepare data for the row template
-                               $content['sw']       = $SW;
                                $content['percents'] = translateComma($content['percents']);
 
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_points_row', true, $content);
-                               $SW = 3 - $SW;
-                       }
+                       } // END - while
 
                        // Free memory
                        SQL_FREERESULT($result);