Huge rewrite of default parameters, ext-network continued:

[mailer.git] / inc / modules / admin / overview-inc.php

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index ebd9c8377bbe5a37d8a274aa9d89f35d99b5ab09..31b89cb81e89c73add8eb227eb6b3d4135d30126 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -150,7 +150,7 @@ LIMIT 1",
                                // Task is valid...
                                list($tid, $userid, $type, $subj, $text, $created, $status, $adminId) = SQL_FETCHROW($result_task);
 
-                               if ($adminId == 0) {
+                               if ($adminId == '0') {
                                        // Assgin current admin to unassgigned task
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s LIMIT 1",
                                        array(getCurrentAdminId(), bigintval($tid)), __FILE__, __LINE__);
@@ -167,24 +167,17 @@ LIMIT 1",
                                // Is a userid assign?
                                if ($userid > 0) {
                                        // Then load his data!
-                                       // @TODO Can this SQL be encapsulated in a function, so all similar queries can be rewritten?
-                                       $result_user = SQL_QUERY_ESC("SELECT `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-                                               array(bigintval($userid)), __FILE__, __LINE__);
-
-                                       // Entry found?
-                                       if (SQL_NUMROWS($result_user) == 1) {
+                                       if (fetchUserData($userid)) {
                                                // Fetch row
-                                               $content = SQL_FETCHARRAY($result_user);
+                                               $content = getUserDataArray();
+
                                                // Generate HTML list entry
                                                $add = "<li>{--ADMIN_MEMBER_UID--}: <strong>".generateUserProfileLink($userid, 'user_data')." (<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>)</strong></li>";
                                        } else {
                                                // Invalid userid, so log and zero it
                                                logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $userid . ' -> not found!');
-                                               $userid = 0;
+                                               $userid = '0';
                                        }
-
-                                       // Free result
-                                       SQL_FREERESULT($result_user);
                                } // END - if
 
                                // Decode entities of the text
@@ -204,9 +197,15 @@ LIMIT 1",
 
                                        // Update task or extension task?
                                        if (($type == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
-                                               // Load SQL commands for registering
+                                               // Load SQL commands for registering in dry-run
                                                registerExtension($ext_name, $id, true);
 
+                                               // Is this non-productive?
+                                               if (isExtensionProductive() === false) {
+                                                       // Issue warning
+                                                       $text .= loadTemplate('admin_settings_saved', true, sprintf(getMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE'), $ext_name));
+                                               } // END - if
+
                                                // Set current extension name
                                                setCurrentExtensionName($ext_name);
 
@@ -280,7 +279,7 @@ LIMIT 1",
                                                        array($ext_name), __FILE__, __LINE__);
                                                $lines = SQL_NUMROWS($result_lines);
                                                SQL_FREERESULT($result_lines);
-                                               if ($lines == 0) {
+                                               if ($lines == '0') {
                                                        // New extension found
                                                        $OUT .= loadTemplate('admin_ext_reg_form', true, array(
                                                                'id'       => bigintval($id),
@@ -328,14 +327,14 @@ LIMIT 1",
                                                        SQL_FREERESULT($result_pay);
 
                                                        if ((!empty($pid)) && ($pid > 0)) {
-                                                               // Payout ID can be obtained
+                                                               // Payout id can be obtained
                                                                $content = array(
                                                                        'pid' => $pid,
                                                                        'tid' => $tid,
                                                                );
                                                                $OUT .= loadTemplate('admin_payout_overview_form', true, $content);
                                                        } else {
-                                                               // Problem obtaining payout ID
+                                                               // Problem obtaining payout id
                                                                $OUT .= "<div class=\"admin_failed medium\">{--PAYOUT_OBTAIN_ID_FAILED--}</div>\n";
                                                        }
                                                } else {
@@ -353,14 +352,14 @@ LIMIT 1",
                                                        SQL_FREERESULT($result_pay);
 
                                                        if ((!empty($pid)) && ($pid > 0)) {
-                                                               // Payout ID can be obtained
+                                                               // Payout id can be obtained
                                                                $content = array(
                                                                        'pid' => $pid,
                                                                        'tid' => $tid,
                                                                );
                                                                $OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
                                                        } else {
-                                                               // Problem obtaining wernis ID
+                                                               // Problem obtaining wernis id
                                                                $OUT .= "<div class=\"admin_failed medium\">{--WERNIS_OBTAIN_ID_FAILED--}</div>\n";
                                                        }
                                                } else {