ADMIN_MEMBER_SELECTION_BOX() does now return a select-tag with the member list

diff --git a/inc/databases.php b/inc/databases.php
index 8e5da059455ae1db93051fbbd8266a4a15a9d2cd..55c7c0db90bda244cf4792a211c527a39321a456 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level

-define('CURR_SVN_REVISION', "300");
+define('CURR_SVN_REVISION', "301");

 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/functions.php b/inc/functions.php
index ba28010254563699fcadff80f480e09c48aaf8e0..c73058b0a52d1d88e0751a55f50c02ad3f6f4d81 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2410,7 +2410,7 @@ function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {
                        // If we have an array simply use it and pre-extend it with our value
                        if (is_array($extraValue)) {
                                // Make the new args array
                        // If we have an array simply use it and pre-extend it with our value
                        if (is_array($extraValue)) {
                                // Make the new args array

-                               $args = array_merge(array($vaue), $extraValue);
+                               $args = array_merge(array($value), $extraValue);

                        } // END - if
 
                        // Call the multi-parameter call-back
                        } // END - if
 
                        // Call the multi-parameter call-back

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index b68a1e7a9f3b0cfc09a1d5b1ed90bd58cdf8b473..0c32844379b89018a2b34a4dc563cbaeacb4a81e 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -489,7 +489,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
        }
 }
 //
        }
 }
 //

-function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = false, $def = "0")
+function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false)

 {
        // Output selection form with all confirmed user accounts listed
        $result = SQL_QUERY("SELECT userid, surname, family FROM "._MYSQL_PREFIX."_user_data ORDER BY userid", __FILE__, __LINE__);
 {
        // Output selection form with all confirmed user accounts listed
        $result = SQL_QUERY("SELECT userid, surname, family FROM "._MYSQL_PREFIX."_user_data ORDER BY userid", __FILE__, __LINE__);


@@ -517,6 +517,9 @@ function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = fal
 
                // Load template
                LOAD_TEMPLATE("admin_member_selection_box", false, $GLOBALS['what']);
 
                // Load template
                LOAD_TEMPLATE("admin_member_selection_box", false, $GLOBALS['what']);

+       } else {
+               // Return content
+               return "<select name=\"userid\" size=\"1\">\n".$OUT."</select>\n";

        }
 }
 //
        }
 }
 //

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 4351ebc13bc077bd3426d8e00bc9acd1d2a389d2..37f436680983cc522cd6fa95e8d9956053ca9c4f 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -50,8 +50,8 @@ if (isset($_POST['edit'])) {
                $_POST['id'],
                "surfbar_urls",
                array("id", "userid", "url", "reward", "costs"),
                $_POST['id'],
                "surfbar_urls",
                array("id", "userid", "url", "reward", "costs"),

-               array("bigintval", "", "", "TRANSLATE_COMMA", "TRANSLATE_COMMA"),
-               array("", "", "", "")
+               array("bigintval", "ADD_MEMBER_SELECTION_BOX", "FRAMETESTER", "TRANSLATE_COMMA", "TRANSLATE_COMMA"),
+               array("", array(false, true), "", "", "")

        );
        $show = false;
 } elseif (isset($_POST['do_edit'])) {
        );
        $show = false;
 } elseif (isset($_POST['do_edit'])) {


@@ -59,7 +59,7 @@ if (isset($_POST['edit'])) {
        ADMIN_EDIT_ENTRIES_CONFIRM($_POST['id'], "surfbar_urls", array(), array(), array(), true);
 } elseif (isset($_POST['delete'])) {
        // Delete entries (with confirmation)
        ADMIN_EDIT_ENTRIES_CONFIRM($_POST['id'], "surfbar_urls", array(), array(), array(), true);
 } elseif (isset($_POST['delete'])) {
        // Delete entries (with confirmation)

-       ADMIN_DELETE_ENTRIES_CONFIRM($_POST['id'], "surfbar_urls", array("id", "userid", "url", "registered"), array("bigintval", "ADMIN_USER_PROFILE_LINK", "", "MAKE_DATETIME"), array("", "", "", "2"));
+       ADMIN_DELETE_ENTRIES_CONFIRM($_POST['id'], "surfbar_urls", array("id", "userid", "url", "registered"), array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", "MAKE_DATETIME"), array("", "", "", "2"));

        $show = false;
 } elseif (isset($_POST['remove'])) {
        // Delete entries (with confirmation)
        $show = false;
 } elseif (isset($_POST['remove'])) {
        // Delete entries (with confirmation)