Continued:

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index fad3d46bc2860332d0d8358e6f363daa47edd8af..ace74be26f4831d058a6e2687d219abe20fc0e0c 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -2116,14 +2116,14 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                // "Walk" through all entries
                foreach (postRequestArray() as $key => $entries) {
                        // Skip raw userid which is always invalid
-                       if (($key == $rawUserId[0]) || ($key == 'do_edit')) {
+                       if (($key == $rawUserId[0]) || ($key == ($rawUserId[0] . '_raw')) || ($key == 'do_edit')) {
                                // Continue with next field
                                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',rawUserId=' . $rawUserId[0]);
                                continue;
                        } // END - if
 
                        // Debug message
-                       /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,TRUE).'</pre>');
+                       //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,TRUE).'</pre>');
 
                        // Is entries an array?
                        if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
@@ -2147,7 +2147,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                                //* BUG: */ die($key.'/<pre>'.print_r($search, TRUE).'</pre>=<pre>'.print_r($columns, TRUE).'</pre>');
 
                                // Debug message
-                               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - BEFORE!');
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - BEFORE!');
 
                                // Add normal entries as well
                                $content[$key] = $entries;
@@ -2156,7 +2156,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                                $entries = doHandleExtraValues($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search);
 
                                // Debug message
-                               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - AFTER!');
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - AFTER!');
 
                                // Add key/value pair to SQL string
                                $sql .= addKeyValueSql($key, $entries);
@@ -2164,8 +2164,8 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                } // END - foreach
 
                // Finish SQL command
-               $sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . bigintval($id);
-               if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) {
+               $sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . $id;
+               if ((isset($rawUserId[0])) && (isset($userIdColumn[0])) && (isPostRequestElementSet($rawUserId[0])) && (!is_array(postRequestElement($rawUserId[0])))) {
                        // Add user id as well
                        $sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0]));
                } // END - if
@@ -2239,7 +2239,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 
        // Is a user id provided?
        //* BUG: */ die('<pre>'.print_r($rawUserId,TRUE).'</pre><pre>'.print_r($userIdColumn,TRUE).'</pre>');
-       if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) {
+       if ((isset($rawUserId[0])) && (isset($userIdColumn[0])) && (isPostRequestElementSet($rawUserId[0])) && (!is_array(postRequestElement($rawUserId[0])))) {
                // Add user id as well
                $sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0]));
        } // END - if
@@ -2331,7 +2331,16 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                        // Filter all data
                        foreach ($row as $key => $value) {
                                // Search index
-                               $idx = searchXmlArray($key, $columns, 'column');
+                               $idx  = searchXmlArray($key, $columns, 'column');
+
+                               // Default name is NULL
+                               $name = NULL;
+
+                               // Is the name there?
+                               if (isset($columns[$idx]['name'])) {
+                                       // Then use it
+                                       $name = $columns[$idx]['name'];
+                               } // END - if
 
                                // Skip any missing entries
                                if ($idx === FALSE) {
@@ -2362,7 +2371,8 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
 
                                // Try to handle call-back functions and/or extra values
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'idx=' . $idx . ',row[' . $key . ']=' . $row[$key]);
-                               $row[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $row[$key], $userIdColumn, $key);
+                               //if ($key == 'forced_campaign_created') die($idx.'=<pre>'.print_r($columns,true).'</pre><pre>'.print_r($extraValues,true).'</pre>');
+                               $row[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $row[$key], $userIdColumn, ((!is_null($name)) ? $name : $key), $id);
                        } // END - foreach
 
                        // Then list it