X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=278c2b0e7a24c9778631e117388c2920363aab5e;hb=501a861954273a54a21b714587fc33b57322d8e4;hp=eb26099948c75b6619d067187dd2c16e51762418;hpb=8193d561bd74568fb3da36ec84ee90e0316ed32f;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index eb26099948..278c2b0e7a 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -48,7 +48,7 @@ function outputStandardOverview (&$result_tasks) {
array(getCurrentAdminId()), __FILE__, __LINE__);
// We currently don't want to install an extension so let's find out if we need...
- setExtensionMode('register');
+ setExtensionMode('test');
$jobsDone = true;
// Open the extension directory
@@ -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,14 +167,10 @@ 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 = "
{--ADMIN_MEMBER_UID--}: ".generateUserProfileLink($userid, 'user_data')." (".translateGender($content['gender'])." ".$content['surname']." ".$content['family'].")";
} else {
@@ -182,9 +178,6 @@ LIMIT 1",
logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $userid . ' -> not found!');
$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);
@@ -264,7 +263,7 @@ LIMIT 1",
'subject' => $subj,
'add' => $add,
'text' => $text,
- 'created' => generateDateTime($created, '1'),
+ 'created' => generateDateTime($created, 1),
'extension' => $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 .= "{--PAYOUT_OBTAIN_ID_FAILED--}
\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 .= "{--WERNIS_OBTAIN_ID_FAILED--}
\n";
}
} else {
@@ -397,7 +396,7 @@ LIMIT 1",
// Load final template
loadTemplate('admin_overview_list', false, $OUT);
} else {
- if ((isset($postData['task'])) && ((count($postData['task']) > 0) || ($postData['task'][0] == '1'))) {
+ if ((isset($postData['task'])) && ((count($postData['task']) > 0) || ($postData['task'][0] == 1))) {
// Only unassign / delete tasks when there are selected tasks posted
if (!empty($postData['unassign'])) {
// Unassign from tasks
@@ -455,7 +454,7 @@ LIMIT 1",
'assigned_admin' => $content['assigned_admin'],
'userid' => $content['userid'],
'task_type_msg' => $content['task_type_msg'],
- 'created' => generateDateTime($content['task_created'], '2')
+ 'created' => generateDateTime($content['task_created'], 2)
));
// Do we have extension task?