X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=6949d19c984204b01818f63016a322ff110fed98;hp=88db098f49578b9b0fe627dc913e1a5388c1ae5b;hb=3f51c40f4fede87228216f9285b745a339e3891d;hpb=7f104f6fe558bb56b4205241435a2357c2feece1
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 88db098f49..6949d19c98 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Das Admin-Menue editieren *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -33,89 +38,80 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
}
// Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR('admin', __FILE__);
// Do we edit/delete/change main menus or sub menus?
-$AND = "(what = '' OR what IS NULL)"; $SUB = "";
-if (!empty($_GET['sub']))
-{
- $AND = sprintf("action='%s'", SQL_ESCAPE($_GET['sub']));
- $SUB = SQL_ESCAPE($_GET['sub']);
-}
+$AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
+if (REQUEST_ISSET_GET('sub')) {
+ $AND = sprintf("`action`='%s' AND `what` IS NOT NULL", REQUEST_GET('sub'));
+ $SUB = REQUEST_GET('sub');
+} // END - if
// Get count of (maybe) selected menu points
$chk = 0;
-if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
+if (REQUEST_ISSET_POST('sel')) $chk = countPostSelection();
// List all menu points and make them editable
-if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
+if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
// Edit menu entries
+ // @TODO Kill all constants in this file
define('__SUB_VALUE', $SUB);
define('__CHK_VALUE', $chk);
$cnt = 0; $SW = 2;
- foreach ($_POST['sel'] as $sel => $confirm)
- {
- if ($confirm == 1)
- {
+ foreach (REQUEST_POST('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__);
- if (SQL_NUMROWS($result) == 1)
- {
+ $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);
// 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),
+ 'action' => ADMIN_MAKE_MENU_SELECTION('admin', 'action', 'sel_action[' . $sel . ']', $act),
+ 'what' => ADMIN_MAKE_MENU_SELECTION('admin', 'what', 'sel_what[' . $sel . ']', $wht),
'sw' => $SW,
'sel' => $sel,
'menu' => $menu,
'descr' => $descr,
'cnt' => $cnt,
);
- $OUT .= LOAD_TEMPLATE("admin_amenu_edit_row", true, $content);
- }
- else
- {
+ $OUT .= LOAD_TEMPLATE('admin_amenu_edit_row', true, $content);
+ } else {
// Entry not found?
$content = array(
'sw' => $SW,
'sel' => $sel
);
- $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+ $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
}
$SW = 3 - $SW;
- }
- }
+ } // END - if
+ } // END - foreach
+
define('__MENU_ROWS', $OUT);
define('__CNT_VALUE', $cnt);
// Load template
- LOAD_TEMPLATE("admin_amenu_edit_form");
-}
- elseif ((isset($_POST['del'])) && (!IS_DEMO()))
-{
+ LOAD_TEMPLATE('admin_amenu_edit_form');
+} elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO())) {
define('__SUB_VALUE', $SUB);
define('__CHK_VALUE', $chk);
// Del menu entries with or without confirmation
- $SW = 2; $cnt = 0; $OUT = "";
- foreach ($_POST['sel'] as $sel => $confirm)
- {
- if ($confirm == 1)
- {
+ $SW = 2; $cnt = 0; $OUT = '';
+ foreach (REQUEST_POST('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__);
- if (SQL_NUMROWS($result) == 1)
- {
+ $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);
@@ -127,16 +123,14 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
'sel' => $sel,
'sw' => $SW
);
- $OUT .= LOAD_TEMPLATE("admin_amenu_delete_row", true, $content);
- }
- else
- {
+ $OUT .= LOAD_TEMPLATE('admin_amenu_delete_row', true, $content);
+ } else {
// Entry not found?
$content = array(
'sw' => $SW,
'sel' => $sel
);
- $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+ $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
}
$SW = 3 - $SW;
}
@@ -145,159 +139,151 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
define('__CNT_VALUE', $cnt);
// Load template
- LOAD_TEMPLATE("admin_amenu_delete");
-}
- elseif ((isset($_POST['ok'])) && (!IS_DEMO()))
-{
+ LOAD_TEMPLATE('admin_amenu_delete');
+} elseif ((isFormSent()) && (!IS_DEMO())) {
// An action is done...
- switch ($_POST['ok'])
- {
- case "edit": // Edit menu
- foreach ($_POST['sel'] as $sel => $menu)
- {
- // Secure ID
- $sel = bigintval($sel);
+ switch (REQUEST_POST('ok')) {
+ case 'edit': // Edit menu
+ foreach (REQUEST_POST('sel') as $sel => $menu) {
+ // Secure ID
+ $sel = bigintval($sel);
- // Update entry
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET
+ // Update entry
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET
title='%s',
-action='%s',
-what='%s',
+`action`='%s',
+`what`='%s',
descr='%s'
WHERE ".$AND." AND id=%s LIMIT 1",
- array(
- $menu,
- $_POST['sel_action'][$sel],
- $_POST['sel_what'][$sel],
- addslashes($_POST['sel_desc'][$sel]),
- $sel,
-), __FILE__, __LINE__);
- }
- CACHE_PURGE_ADMIN_MENU(0, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel]);
- LOAD_TEMPLATE("admin_data_saved");
- break;
+ array(
+ $menu,
+ REQUEST_POST('sel_action', $sel),
+ REQUEST_POST('sel_what', $sel),
+ REQUEST_POST('sel_desc', $sel),
+ $sel,
+ ), __FILE__, __LINE__);
+ }
- case "del": // Delete menu
- foreach ($_POST['sel'] as $sel => $menu)
- {
- $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE ".$AND." AND id=%s LIMIT 1",
- array(bigintval($sel)), __FILE__, __LINE__);
- CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
- }
- LOAD_TEMPLATE("admin_data_saved");
- break;
+ // 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'));
+ 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);
+ } // END - foreach
- default: // Unexpected action
- define('__OK_VALUE', $_POST['ok']);
- LOAD_TEMPLATE("admin_menu_unknown_okay");
- break;
+ // Load template
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('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");
+ break;
}
-}
- else
-{
- if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid'])))
- {
+} else {
+ if ((REQUEST_ISSET_GET(('act'))) && (REQUEST_ISSET_GET(('tid'))) && (REQUEST_ISSET_GET(('fid')))) {
// Get IDs
- if (!empty($_GET['w']))
- {
+ if (REQUEST_ISSET_GET(('w'))) {
// Sub menus selected
- $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu WHERE action='%s' AND sort='%s' LIMIT 1",
- array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__);
+ $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__);
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($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__);
+ $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__);
list($fid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
- }
- else
- {
+ } 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($_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(REQUEST_GET('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($_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(REQUEST_GET('fid'))), __FILE__, __LINE__);
list($fid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
}
- if ((!empty($tid)) && (!empty($fid)))
- {
+ if ((!empty($tid)) && (!empty($fid))) {
// Sort menu
- $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
- array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);
- $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
- array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
- CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
+ 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);
}
}
// By default list menus
- if (!empty($SUB))
- {
+ 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",
- array($SUB), __FILE__, __LINE__);
- }
- else
- {
+ $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)
- {
+ if ($max > 0) {
+ // @TODO Rewrite this constant
define('__SUB_VALUE', $SUB);
- $SW = 2; $cnt = 0; $OUT = "";
- while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($result))
- {
+
+ // Init variables
+ $OUT = ''; $SW = 2; $cnt = 0;
+
+ // Process all entries
+ while ($content = SQL_FETCHARRAY($result)) {
+ // Count this entry
$cnt++;
- if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
- {
+
+ // Init navigation variable
+ $content['navi'] = '';
+ if (($content['sort'] == 0) || (($content['sort'] == 1) && (!empty($SUB)))) {
// Is highest position
- $NAVI = "".LOWER."";
- }
- elseif ($cnt == $max)
- {
+ $content['navi'] = "{--LOWER--}";
+ } elseif ($cnt == $max) {
// Is lowest position
- $NAVI = "".HIGHER."";
- }
- elseif ($sort > 0)
- {
+ $content['navi'] = "{--HIGHER--}";
+ } elseif ($content['sort'] > 0) {
// Anything else between highest and lowest
- $NAVI = "".HIGHER."/".LOWER."";
+ $content['navi'] = "{--HIGHER--}/{--LOWER--}";
}
- if (empty($act)) $act = " ";
- if (empty($wht)) $wht = " ";
- if (empty($title)) $title = " ";
+ // 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'] = ' ';
+
+ // Add more data to $content
+ $content['sw'] = $SW;
+ $content['mode'] = 'admin';
- $content = array(
- 'sw' => $SW,
- 'id' => $id,
- 'action' => $act,
- 'what' => $wht,
- 'title' => $title,
- 'navi' => $NAVI,
- 'mode' => "admin",
- );
- $OUT .= LOAD_TEMPLATE("admin_menu_overview_row", true, $content);
+ // Load row template and switch colors
+ $OUT .= LOAD_TEMPLATE('admin_menu_overview_row', true, $content);
$SW = 3 - $SW;
- }
+ } // END - switch
// Free memory
SQL_FREERESULT($result);
+
+ // Rewrite this constant
define('__MENU_ROWS', $OUT);
// Load template
- LOAD_TEMPLATE("admin_amenu_edit");
- }
- else
- {
+ LOAD_TEMPLATE('admin_amenu_edit');
+ } else {
// Menu entries are missing... (???)
- LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
}
}