X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=d41753b54a28f9dd80acb36d904f4ea646f98267;hp=6db7d6964761b7e2f9fedfb265cbd6d430b54091;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hpb=2ec9007220186d54f84846871ed1f7638c29baf7
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 6db7d69647..d41753b54a 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -1,7 +1,7 @@
0) && (!IS_DEMO())) {
+if ((isFormSent('edit')l) && (countPostSelection() > 0) && (!isDemoModeActive())) {
// Edit menu entries
// @TODO Kill all constants in this file
- define('__SUB_VALUE', $SUB);
- define('__CHK_VALUE', $chk);
- $cnt = 0; $SW = 2;
- foreach (REQUEST_POST('sel') as $sel => $confirm) {
+ $content['sub'] = $SUB;
+ $content['chk'] = countPostSelection();
+ $cnt = '0'; $SW = 2;
+ foreach (postRequestParameter('sel') as $sel => $confirm) {
if ($confirm == 1) {
$cnt++;
- $result = SQL_QUERY_ESC("SELECT title, action, what, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
- array(bigintval($sel)), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `title`, `action`, `what`, `descr` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+ array(bigintval($sel)), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Entry found so we load the stuff...
- list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
+ $data = SQL_FETCHARRAY($result);
// Prepare data for the row template
- $content = array(
- 'action' => ADMIN_MAKE_MENU_SELECTION('admin', 'action', 'sel_action[' . $sel . ']', $act),
- 'what' => ADMIN_MAKE_MENU_SELECTION('admin', 'what', 'sel_what[' . $sel . ']', $wht),
+ $data = array(
+ 'action' => adminAddMenuSelectionBox('admin', 'action', 'sel_action[' . $sel . ']', $data['action']),
+ 'what' => adminAddMenuSelectionBox('admin', 'what' , 'sel_what[' . $sel . ']', $data['what']),
'sw' => $SW,
'sel' => $sel,
- 'menu' => $menu,
- 'descr' => $descr,
+ 'menu' => $data['title'],
+ 'descr' => $data['descr'],
'cnt' => $cnt,
);
- $OUT .= LOAD_TEMPLATE('admin_amenu_edit_row', true, $content);
+
+ // Load row template
+ $OUT .= loadTemplate('admin_amenu_edit_row', true, $data);
} else {
// Entry not found?
- $content = array(
+ $data = array(
'sw' => $SW,
'sel' => $sel
);
- $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
+
+ // Load row template
+ $OUT .= loadTemplate('admin_menu_404_row', true, $data);
}
+
+ // Free result and switch color
+ SQL_FREERESULT($result);
$SW = 3 - $SW;
} // END - if
} // END - foreach
- define('__MENU_ROWS', $OUT);
- define('__CNT_VALUE', $cnt);
+ $content['rows'] = $OUT;
+ $content['cnt'] = $cnt;
// Load template
- LOAD_TEMPLATE('admin_amenu_edit_form');
-} elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO())) {
- define('__SUB_VALUE', $SUB);
- define('__CHK_VALUE', $chk);
+ loadTemplate('admin_amenu_edit_form', false, $content);
+} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+ // Prepare misc content
+ $content['sub'] = $SUB;
+ $content['chk'] = countPostSelection();
+
// Del menu entries with or without confirmation
- $SW = 2; $cnt = 0; $OUT = '';
- foreach (REQUEST_POST('sel') as $sel => $confirm) {
+ $SW = 2; $cnt = '0'; $OUT = '';
+ foreach (postRequestParameter('sel') as $sel => $confirm) {
if ($confirm == 1) {
$cnt++;
- $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
- array(bigintval($sel)), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+ array(bigintval($sel)), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Entry found so we load the stuff...
- list($menu) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
+ $data = SQL_FETCHARRAY($result);
// Prepare data for the row template
- $content = array(
- 'menu' => $menu,
+ $data = array(
+ 'menu' => $data['title'],
'cnt' => $cnt,
'sel' => $sel,
'sw' => $SW
);
- $OUT .= LOAD_TEMPLATE('admin_amenu_delete_row', true, $content);
+ $OUT .= loadTemplate('admin_amenu_delete_row', true, $data);
} else {
// Entry not found?
- $content = array(
+ $data = array(
'sw' => $SW,
'sel' => $sel
);
- $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
+ $OUT .= loadTemplate('admin_menu_404_row', true, $data);
}
+ SQL_FREERESULT($result);
$SW = 3 - $SW;
}
}
- define('__MENU_ROWS', $OUT);
- define('__CNT_VALUE', $cnt);
+ $content['rows'] = $OUT;
+ $content['cnt'] = $cnt;
// Load template
- LOAD_TEMPLATE('admin_amenu_delete');
-} elseif ((isFormSent()) && (!IS_DEMO())) {
+ loadTemplate('admin_amenu_delete', false, $content);
+} elseif ((isFormSent()) && (!isDemoModeActive())) {
// An action is done...
- switch (REQUEST_POST('ok')) {
+ switch (postRequestParameter('ok')) {
case 'edit': // Edit menu
- foreach (REQUEST_POST('sel') as $sel => $menu) {
- // Secure ID
+ foreach (postRequestParameter('sel') as $sel => $menu) {
+ // Secure id
$sel = bigintval($sel);
// Update entry
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET
-title='%s',
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET
+`title`='%s',
`action`='%s',
`what`='%s',
-descr='%s'
-WHERE ".$AND." AND id=%s LIMIT 1",
+`descr`='%s'
+WHERE ".$AND." AND `id`=%s LIMIT 1",
array(
$menu,
- REQUEST_POST('sel_action', $sel),
- REQUEST_POST('sel_what', $sel),
- REQUEST_POST('sel_desc', $sel),
+ postRequestParameter('sel_action', $sel),
+ postRequestParameter('sel_what', $sel),
+ postRequestParameter('sel_desc', $sel),
$sel,
), __FILE__, __LINE__);
}
- // Purge admin menu cache
- cachePurgeAdminMenu(0, REQUEST_POST('sel_action', $sel), REQUEST_POST('sel_what', $sel));
-
// Load template
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+ loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
break;
case 'del': // Delete menu
- foreach (REQUEST_POST('sel') as $sel => $menu) {
- SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
- array(bigintval($sel)), __FILE__, __LINE__);
- cachePurgeAdminMenu(0, '', '', $AND);
+ foreach (postRequestParameter('sel') as $sel => $menu) {
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+ array(bigintval($sel)), __FILE__, __LINE__);
} // END - foreach
// Load template
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+ loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
break;
default: // Unexpected action
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", REQUEST_POST('ok')));
- define('__OK_VALUE', REQUEST_POST('ok'));
- LOAD_TEMPLATE("admin_menu_unknown_okay");
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
break;
}
} else {
- if ((REQUEST_ISSET_GET(('act'))) && (REQUEST_ISSET_GET(('tid'))) && (REQUEST_ISSET_GET(('fid')))) {
- // Get IDs
- if (REQUEST_ISSET_GET(('w'))) {
+ if ((isGetRequestParameterSet(('act'))) && (isGetRequestParameterSet(('tid'))) && (isGetRequestParameterSet(('fid')))) {
+ // Get ids
+ if (isGetRequestParameterSet(('w'))) {
// Sub menus selected
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
- array(REQUEST_GET('act'), bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+ array(getRequestParameter('act'), bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
list($tid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
- $result = SQL_QUERY("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
- array(REQUEST_GET('act'), bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
+ $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+ array(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!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
- array(bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+ array(bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
list($tid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
- array(bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+ array(bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
list($fid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
}
if ((!empty($tid)) && (!empty($fid))) {
// Sort menu
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
- array(bigintval(REQUEST_GET('tid')), bigintval($fid)), __FILE__, __LINE__);
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
- array(bigintval(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
- cachePurgeAdminMenu(0, '', '', $AND);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_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?}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+ array(bigintval(getRequestParameter('fid')), bigintval($tid)), __FILE__, __LINE__);
}
}
// By default list menus
if (!empty($SUB)) {
// Sub menus of a main menu
- $result = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
+ $result = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
array($SUB), __FILE__, __LINE__);
} else {
// Main menus
- $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
+ $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
}
$max = SQL_NUMROWS($result);
if ($max > 0) {
- // @TODO Rewrite this constant
- define('__SUB_VALUE', $SUB);
+ // Remember sub value
+ $content['sub'] = $SUB;
// Init variables
- $OUT = ''; $SW = 2; $cnt = 0;
+ $OUT = ''; $SW = 2; $cnt = '0';
// Process all entries
- while ($content = SQL_FETCHARRAY($result)) {
+ while ($data = SQL_FETCHARRAY($result)) {
// Count this entry
$cnt++;
// Init navigation variable
- $content['navi'] = '';
- if (($content['sort'] == 0) || (($content['sort'] == 1) && (!empty($SUB)))) {
+ $data['navi'] = '';
+ if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
// Is highest position
- $content['navi'] = "{--LOWER--}";
+ $data['navi'] = '{--LOWER--}';
} elseif ($cnt == $max) {
// Is lowest position
- $content['navi'] = "{--HIGHER--}";
- } elseif ($content['sort'] > 0) {
+ $data['navi'] = '{--HIGHER--}';
+ } elseif ($data['sort'] > 0) {
// Anything else between highest and lowest
- $content['navi'] = "{--HIGHER--}/{--LOWER--}";
+ $data['navi'] = '{--HIGHER--}/{--LOWER--}';
}
// Fix empty elements for constant (fixes display bugs in Firefox)
- if (empty($content['action'])) $content['action'] = " ";
- if (empty($content['what'])) $content['what'] = " ";
- if (empty($content['title'])) $content['title'] = " ";
+ if (empty($data['action'])) $data['action'] = ' ';
+ if (empty($data['what'])) $data['what'] = ' ';
+ if (empty($data['title'])) $data['title'] = ' ';
- // Add more data to $content
- $content['sw'] = $SW;
- $content['mode'] = 'admin';
+ // Add more data to $data
+ $data['sw'] = $SW;
+ $data['mode'] = 'admin';
// Load row template and switch colors
- $OUT .= LOAD_TEMPLATE("admin_menu_overview_row", true, $content);
+ $OUT .= loadTemplate('admin_menu_overview_row', true, $data);
$SW = 3 - $SW;
} // END - switch
+ // Remember all rows
+ $content['rows'] = $OUT;
+
// Free memory
SQL_FREERESULT($result);
- // Rewrite this constant
- define('__MENU_ROWS', $OUT);
-
// Load template
- LOAD_TEMPLATE("admin_amenu_edit");
+ loadTemplate('admin_amenu_edit', false, $content);
} else {
// Menu entries are missing... (???)
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
}
}