X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=31b89cb81e89c73add8eb227eb6b3d4135d30126;hp=0870dccdc8a1d0dad250a631799bc7ca5f902ef7;hb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 0870dccdc8..31b89cb81e 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
@@ -87,7 +87,7 @@ function outputStandardOverview (&$result_tasks) {
//* DEBUG: */ outputHtml($ext_name."=".$ext_ver."
");
// Update extension if extension is installed and outdated
- //* DEBUG: */ outputHtml("ext={$ext_name},ver={getThisExtensionVersion()}/".getExtensionVersion($ext_name)."
");
+ //* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."
");
if (getThisExtensionVersion() > $ext_ver) {
// Update the extension
updateExtension($ext_name, $ext_ver);
@@ -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 = "
{--ADMIN_MEMBER_UID--}: ".generateUserProfileLink($userid, 'user_data')." (".translateGender($content['gender'])." ".$content['surname']." ".$content['family'].")";
} 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);
@@ -261,10 +260,10 @@ LIMIT 1",
// Prepare array for the template
$content = array(
'sw' => $SW,
- 'subj' => $subj,
+ 'subject' => $subj,
'add' => $add,
'text' => $text,
- 'created' => generateDateTime($created, '1'),
+ 'created' => generateDateTime($created, 1),
'extension' => $ext_name
);
@@ -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 {
@@ -373,6 +372,10 @@ LIMIT 1",
$OUT .= loadTemplate('admin_task_holiday', true, $userid);
break;
+ case 'MEMBER_ORDER': // Member mail orders
+ $OUT .= loadTemplate('admin_task_order', true, $id);
+ break;
+
default: // Unknown task type
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
$OUT .= "".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."
\n";
@@ -393,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
@@ -451,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?