Some fixes:

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index b98aea3993459c7cbbdeb1fb132acf30d5936ed4..c26a12b991c15b93a9df2ac7756cf8b79b7fca2f 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -273,7 +273,7 @@ ORDER BY
 
                                        // Full file name for checking menu
                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sub_what=' . $content['sub_what']);
-                                       $inc = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']);
+                                       $inc = sprintf('inc/modules/%s/what-%s.php', $mode, $content['sub_what']);
                                        if (isIncludeReadable($inc)) {
                                                // Mark currently selected menu - open
                                                if ((!empty($what)) && (($what == $content['sub_what']))) {
@@ -331,7 +331,7 @@ ORDER BY
                                enableBlockMode();
 
                                // Load menu block
-                               $INC = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
+                               $INC = sprintf('inc/modules/%s/action-%s.php', $mode, $content['action']);
                                if (isFileReadable($INC)) {
                                        // Load include file
                                        if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', TRUE, $mode);
@@ -1387,8 +1387,15 @@ function getAdminMenuMode ($adminId) {
 }
 
 // Generates an option list from various parameters
-function generateOptions ($table, $key, $value, $default = '', $extra = '', $whereStatement = '', $disabled = array(), $callback = '') {
+function generateOptions ($table, $key, $value, $default = '', $extra = '', $whereStatement = '', $disabled = array(), $callback = '', $allowNone = FALSE) {
        $ret = '';
+
+       // Allow none?
+       if ($allowNone === TRUE) {
+               // Add option for none
+               $ret .= '<option value="0">{--SELECT_NONE--}</option>';
+       } // END - if
+
        if ($table == '/ARRAY/') {
                // Selection from array
                if ((is_array($key)) && (is_array($value)) && ((count($key)) == (count($value)) || (!empty($callback)))) {
@@ -1791,11 +1798,6 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
                $addWhere .= " AND `d`.`holiday_active`='N'";
        } // END - if
 
-       // Include only HTML recipients?
-       if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
-               $addWhere .= " AND `d`.`html`='Y'";
-       } // END - if
-
        // Run query
        $result = sqlQueryEscaped("SELECT
        `d`.`userid`
@@ -2021,7 +2023,7 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
 
                                // Call the callback-function
                                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=<pre>'.print_r($args, TRUE).'</pre>');
-                               // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
+                               // @TODO If the EL sub-system can support more than one parameter, this call_user_func_array() can be avoided
                                $row[$columnName] = call_user_func_array($callbackName, $args);
                        } // END - foreach
 
@@ -2510,5 +2512,43 @@ function addKeyValueSql ($key, $value) {
        return $sql;
 }
 
+// "Getter" for an array from given table and columns
+function getArrayFromTable ($tableName, $columns, $orderBy, $ordered = 'ASC', $whereSql = '') {
+       // The table must exist
+       assert(ifSqlTableExists($tableName));
+
+       // Search for it
+       $result = sqlQueryEscaped('SELECT
+       `' . implode('`, `', $columns) . '`
+FROM
+       `{?_MYSQL_PREFIX?}_%s`
+' . $whereSql . '
+ORDER BY
+       `%s` %S',
+               array(
+                       $tableName,
+                       $orderBy,
+                       $ordered
+               ), __FUNCTION__, __LINE__
+       );
+
+       // Init array
+       $rows = array();
+
+       // Are there entries?
+       if (!ifSqlHasZeroNums($result)) {
+               // Load all entries
+               while ($row = sqlFetchArray($result)) {
+                       array_push($rows, $row);
+               } // END - while
+       } // END - if
+
+       // Free result
+       sqlFreeResult($result);
+
+       // Return all found rows
+       return $rows;
+}
+
 // [EOF]
 ?>