X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-memedit.php;h=658f45675cc87a83e3965e671218a315cb4d3d50;hb=ec572865e457cf5e06e61d8664ca987b1d5196aa;hp=0370abeeb87714a402585aebfbda431e07ce4a88;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git
diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index 0370abeeb8..658f45675c 100644
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -18,6 +18,7 @@
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -53,11 +54,11 @@ if (isGetRequestParameterSet('sub')) {
} // END - if
// List all menu points and make them editable
-if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
// Edit menu entries
$content['sub'] = $SUB;
$content['chk'] = countPostSelection();
- $SW = 2; $cnt = '0'; $OUT = '';
+ $cnt = '0'; $OUT = '';
foreach (postRequestParameter('sel') as $sel => $confirm) {
if ($confirm == 1) {
$cnt++;
@@ -70,17 +71,15 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
'cnt' => $cnt,
'sel' => $sel,
'menu' => $data['title'],
- 'sw' => $SW,
'act' => adminAddMenuSelectionBox('member', 'act' , 'sel_act[' . $sel . ']', $data['action']),
'what' => adminAddMenuSelectionBox('member', 'what', 'sel_what[' . $sel . ']', $data['what']),
);
// Load template
- $OUT .= loadTemplate('admin_mmenu_edit_row', true, $data);
+ $OUT .= loadTemplate('admin_edit_member_menu_row', true, $data);
} else {
// Entry not found?
$data = array(
- 'sw' => $SW,
'sel' => $sel
);
@@ -88,19 +87,20 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
$OUT .= loadTemplate('admin_menu_404_row', true, $data);
}
SQL_FREERESULT($result);
- $SW = 3 - $SW;
- }
- }
+ } // END - if
+ } // END - foreach
+
+ // Add row content and current counter
$content['rows'] = $OUT;
$content['cnt'] = $cnt;
// Load template
- loadTemplate('admin_mmenu_edit', false, $content);
-} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+ loadTemplate('admin_edit_member_menu', false, $content);
+} elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
// Del menu entries with or without confirmation
$content['sub'] = $SUB;
$content['chk'] = countPostSelection();
- $SW = 2; $cnt = '0'; $OUT = '';
+ $cnt = '0'; $OUT = '';
foreach (postRequestParameter('sel') as $sel => $confirm) {
if ($confirm == 1) {
$cnt++;
@@ -116,11 +116,10 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
);
// Load template
- $OUT .= loadTemplate('admin_mmenu_delete_row', true, $content);
+ $OUT .= loadTemplate('admin_del_member_menu_row', true, $content);
} else {
// Entry not found?
$content = array(
- 'sw' => $SW,
'sel' => $sel
);
@@ -134,12 +133,12 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
$content['cnt'] = $cnt;
// Load template
- loadTemplate('admin_mmenu_delete', false, $content);
-} elseif ((isPostRequestParameterSet('status')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+ loadTemplate('admin_del_member_menu', false, $content);
+} elseif ((isPostRequestParameterSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
// Change status (visible / locked)
$content['sub'] = $SUB;
$content['chk'] = countPostSelection();
- $SW = 2; $cnt = '0'; $OUT = '';
+ $cnt = '0'; $OUT = '';
foreach (postRequestParameter('sel') as $sel => $confirm) {
if ($confirm == 1) {
$cnt++;
@@ -152,7 +151,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
'cnt' => $cnt,
'menu' => $data['title'],
'sel' => $sel,
- 'sw' => $SW,
'visible' => addSelectionBox('yn', $data['visible'], 'visible', $sel),
'locked' => addSelectionBox('yn', $data['locked'] , 'locked' , $sel),
);
@@ -162,7 +160,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
} else {
// Entry not found?
$data = array(
- 'sw' => $SW,
'sel' => $sel
);
@@ -170,20 +167,22 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
$OUT .= loadTemplate('admin_menu_404_row', true, $data);
}
SQL_FREERESULT($result);
- $SW = 3 - $SW;
} // END - if
} // END - foreach
$content['rows'] = $OUT;
$content['cnt'] = $cnt;
// Load template
- loadTemplate('admin_mmenu_status', false, $content);
+ loadTemplate('admin_member_menu_status', false, $content);
} elseif ((isFormSent()) && (!isDemoModeActive())) {
// An act is done...
foreach (postRequestParameter('sel') as $sel => $menu) {
$AND = "(`what` = '' OR `what` IS NULL)";
+
$sel = bigintval($sel);
- if (!empty($SUB)) $AND = "`action`='".$SUB."'";
+
+ if (!empty($SUB)) $AND = "`action`='" . $SUB . "'";
+
switch (postRequestParameter('ok')) {
case 'edit': // Edit menu
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
@@ -199,12 +198,16 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
array(postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__);
break;
+
+ default: // Unexpected action
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+ break;
} // END - switch
- break;
} // END - foreach
// Load template
- loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+ loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
} else {
if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
// Init
@@ -213,29 +216,29 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
// Get ids
if (isGetRequestParameterSet('w')) {
// Sub menus selected
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
array(bigintval(getRequestParameter('act')), bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
list($tid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
array(bigintval(getRequestParameter('act')), bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
list($fid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
} else {
// Main menu selected
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
array(bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
list($tid) = SQL_FETCHROW($result);
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
array(bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
list($fid) = SQL_FETCHROW($result);
}
if ((!empty($tid)) && (!empty($fid))) {
// Sort menu
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
array(bigintval(getRequestParameter('tid')), bigintval($fid)), __FILE__, __LINE__);
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
array(bigintval(getRequestParameter('fid')), bigintval($tid)), __FILE__, __LINE__);
} // END - -fi
} // END - if
@@ -248,15 +251,12 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
$result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
}
- // Get total menu entries
- $max = SQL_NUMROWS($result);
-
// Some are there?
- if ($max > 0) {
+ if (SQL_NUMROWS($result) > 0) {
// Set sub value
$content['sub'] = $SUB;
- $SW = 2; $cnt = '0'; $OUT = '';
+ $cnt = '0'; $OUT = '';
while ($data = SQL_FETCHARRAY($result)) {
// Init navigation
$data['navi'] = '';
@@ -264,7 +264,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
// Is highest position
$data['navi'] = '{--LOWER--}';
- } elseif ($cnt == $max) {
+ } elseif ($cnt == SQL_NUMROWS($result)) {
// Is lowest position
$data['navi'] = '{--HIGHER--}';
} elseif ($data['sort'] > 0) {
@@ -278,12 +278,10 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
if (empty($data['title'])) $data['title'] = ' ';
// Add more entries
- $data['sw'] = $SW;
$data['mode'] = 'mem';
// Load row template and switch color
$OUT .= loadTemplate('admin_menu_overview_row', true, $data);
- $SW = 3 - $SW;
} // END - while
// Free memory
@@ -293,10 +291,10 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
$content['rows'] = $OUT;
// Load main template
- loadTemplate('admin_mmenu_overview', false, $content);
+ loadTemplate('admin_member_menu_overview', false, $content);
} else {
// Menu entries are missing... (???)
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
}
}