X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=d418ba4fc90185ba815c51260e87a1e4e7a4a988;hb=ad16f516e254e67b221dd72d518821e9a0853610;hp=874fa092f56376d3aa4da2598166701c2597d25c;hpb=c9510cf2a41f21f369e49f93ce9268d8bf1ace6b;p=mailer.git
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 874fa092f5..d418ba4fc9 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -14,11 +14,9 @@
* $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 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -40,54 +38,54 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!isAdmin())) {
die();
-}
+} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
// Do we edit/delete/change main menus or sub menus?
-$AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
+$AND = "(`what` = '' OR `what` IS NULL)"; $subMenu = '';
if (isGetRequestParameterSet('sub')) {
$AND = sprintf("`action`='%s' AND `what` != '' AND `what` IS NOT NULL", getRequestParameter('sub'));
- $SUB = getRequestParameter('sub');
+ $subMenu = getRequestParameter('sub');
} // END - if
// List all menu points and make them editable
if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
// Edit menu entries
// @TODO Kill all constants in this file
- $content['sub'] = $SUB;
+ $content['sub'] = $subMenu;
$content['chk'] = countPostSelection();
- $cnt = '0';
+ $count = '0'; $OUT = '';
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",
+ $count++;
+ $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...
- $data = SQL_FETCHARRAY($result);
+ $content = SQL_FETCHARRAY($result);
// Prepare data for the row template
- $data = array(
- 'action' => adminAddMenuSelectionBox('admin', 'action', 'sel_action[' . $sel . ']', $data['action']),
- 'what' => adminAddMenuSelectionBox('admin', 'what' , 'sel_what[' . $sel . ']', $data['what']),
+ $content = array(
+ 'action' => adminAddMenuSelectionBox('admin', 'action', 'sel_action[' . $sel . ']', $content['action']),
+ 'what' => adminAddMenuSelectionBox('admin', 'what' , 'sel_what[' . $sel . ']', $content['what']),
'sel' => $sel,
- 'menu' => $data['title'],
- 'descr' => $data['descr'],
- 'cnt' => $cnt,
+ 'menu' => $content['title'],
+ 'descr' => $content['descr'],
+ 'count' => $count,
);
// Load row template
- $OUT .= loadTemplate('admin_edit_admin_menu_row', true, $data);
+ $OUT .= loadTemplate('admin_edit_admin_menu_row', true, $content);
} else {
// Entry not found?
- $data = array(
+ $content = array(
'sel' => $sel
);
// Load row template
- $OUT .= loadTemplate('admin_menu_404_row', true, $data);
+ $OUT .= loadTemplate('admin_menu_404_row', true, $content);
}
// Free result and switch color
@@ -95,49 +93,54 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
} // END - if
} // END - foreach
- $content['rows'] = $OUT;
- $content['cnt'] = $cnt;
+ $content['rows'] = $OUT;
+ $content['sub'] = $subMenu;
+ $content['chk'] = countPostSelection();
+ $content['count'] = $count;
// Load template
loadTemplate('admin_edit_admin_menu_form', false, $content);
-} elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
// Prepare misc content
- $content['sub'] = $SUB;
+ $content['sub'] = $subMenu;
$content['chk'] = countPostSelection();
// Del menu entries with or without confirmation
- $cnt = '0'; $OUT = '';
+ $count = '0'; $OUT = '';
foreach (postRequestParameter('sel') as $sel => $confirm) {
if ($confirm == 1) {
- $cnt++;
+ $count++;
$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...
- $data = SQL_FETCHARRAY($result);
+ $content = SQL_FETCHARRAY($result);
// Prepare data for the row template
- $data = array(
- 'menu' => $data['title'],
- 'cnt' => $cnt,
- 'sel' => $sel,
+ $content = array(
+ 'menu' => $content['title'],
+ 'count' => $count,
+ 'sel' => $sel,
);
- $OUT .= loadTemplate('admin_del_admin_menu_row', true, $data);
+ $OUT .= loadTemplate('admin_delete_admin_menu_row', true, $content);
} else {
// Entry not found?
- $data = array(
+ $content = array(
'sel' => $sel
);
- $OUT .= loadTemplate('admin_menu_404_row', true, $data);
+ $OUT .= loadTemplate('admin_menu_404_row', true, $content);
}
SQL_FREERESULT($result);
} // END - if
} // END - switch
- $content['rows'] = $OUT;
- $content['cnt'] = $cnt;
+
+ $content['rows'] = $OUT;
+ $content['sub'] = $subMenu;
+ $content['chk'] = countPostSelection();
+ $content['count'] = $count;
// Load template
- loadTemplate('admin_del_admin_menu', false, $content);
+ loadTemplate('admin_delete_admin_menu', false, $content);
} elseif ((isFormSent()) && (!isDemoModeActive())) {
// An action is done...
switch (postRequestParameter('ok')) {
@@ -168,115 +171,68 @@ LIMIT 1",
}
// Load template
- loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+ displayMessage('{--SETTINGS_SAVED--}');
break;
- case 'del': // Delete menu
+ case 'delete': // Delete menu
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
- loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+ displayMessage('{--SETTINGS_SAVED--}');
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')));
+ displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
break;
- }
+ } // END - switch
} else {
- 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 ".$AND." AND `what` != '%s' AND `sort`=%s LIMIT 1",
- array(
- getRequestParameter('w'),
- 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 ".$AND." AND `what`='%s' AND `sort`=%s LIMIT 1",
- array(
- getRequestParameter('w'),
- 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 `action` != %s AND ".$AND." AND `sort`=%s LIMIT 1",
- array(
- getRequestParameter('act'),
- 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 `action`=%s AND ".$AND." AND `sort`=%s LIMIT 1",
- array(
- getRequestParameter('act'),
- bigintval(getRequestParameter('fid'))
- ), __FILE__, __LINE__);
- list($fid) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
- }
-
- // Do we have entries found?
- 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(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__);
- } // END - if
- } // END - if
+ // Handle weightning
+ doAdminProcessMenuWeightning('admin', $AND);
// Run SQL
- $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__);
+ $result = SQL_QUERY("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__);
// Do we have entries?
- if (SQL_NUMROWS($result) > 0) {
- // Remember sub value
- $content['sub'] = $SUB;
-
+ if (!SQL_HASZERONUMS($result)) {
// Init variables
- $OUT = ''; $cnt = '0';
+ $OUT = '';
+ $count = '0';
// Process all entries
- while ($data = SQL_FETCHARRAY($result)) {
+ while ($content = SQL_FETCHARRAY($result)) {
+ // Remember sub value
+ $content['sub'] = $subMenu;
+
// Count this entry
- $cnt++;
+ $count++;
// Init navigation variable
- $data['navi'] = '';
- if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
+ $content['navi'] = '';
+ if (($content['sort'] == '0') || (($content['sort'] == 1) && (!empty($subMenu)))) {
// Is highest position
- $data['navi'] = '{--LOWER--}';
- } elseif ($cnt == SQL_NUMROWS($result)) {
+ $content['navi'] = '{--LOWER--}';
+ } elseif ($count == SQL_NUMROWS($result)) {
// Is lowest position
- $data['navi'] = '{--HIGHER--}';
- } elseif ($data['sort'] > 0) {
+ $content['navi'] = '{--HIGHER--}';
+ } elseif ($content['sort'] > 0) {
// Anything else between highest and lowest
- $data['navi'] = '{--HIGHER--}/{--LOWER--}';
+ $content['navi'] = '{--HIGHER--}|{--LOWER--}';
}
- // Add more data to $data
- $data['mode'] = 'admin';
+ // Add more data to $content
+ $content['mode'] = 'admin';
// Load row template and switch colors
- $OUT .= loadTemplate('admin_menu_overview_row', true, $data);
+ $OUT .= loadTemplate('admin_menu_overview_row', true, $content);
} // END - switch
// Remember all rows
$content['rows'] = $OUT;
+ $content['sub'] = $subMenu;
// Free memory
SQL_FREERESULT($result);
@@ -285,7 +241,7 @@ LIMIT 1",
loadTemplate('admin_edit_admin_menu', false, $content);
} else {
// Menu entries are missing... (???)
- loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
+ displayMessage('{--ADMIN_NO_MENUS_FOUND--}');
}
}