Extension ext-network continued, "translation" function introduced:

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index a836da97b41a42ca7edd20f597e140d45faf0807..ebb1aeb4362d4d86cdc568df5b88d6e792d0edc7 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -368,8 +368,8 @@ ORDER BY
 
                // Prepare data
                $content = array(
-                       'rows' => $GLOBALS['rows'],
-                       'mode' => $mode
+                       'rows'      => $GLOBALS['rows'],
+                       'menu_mode' => $mode
                );
 
                // Load main template
@@ -678,7 +678,7 @@ function isEmailTaken ($email) {
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       REGEX '%s' `email` AND
+       '%s' REGEXP `email` AND
        `userid` %s
 LIMIT 1",
                array(
@@ -697,7 +697,7 @@ LIMIT 1",
 }
 
 // Validate the given menu action
-function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
+function isMenuActionValid ($mode, $action, $what, $updateEntry = false) {
        // Is the cache entry there and we shall not update?
        if ((isset($GLOBALS['action_valid'][$mode][$action][$what])) && ($updateEntry === false)) {
                // Count cache hit
@@ -1724,8 +1724,8 @@ function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId =
        // Insert the task data into the database
        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`,`userid`,`status`,`task_type`,`subject`,`text`,`task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
                array(
-                       makeZeroToNull($adminId),
-                       makeZeroToNull($userid),
+                       convertZeroToNull($adminId),
+                       convertZeroToNull($userid),
                        $taskType,
                        $subject,
                        $notes