X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=b1fb3347d8fc18f37a7c3077bd8566dece690311;hp=8746b7d4bbd8952d45059840cd3c7099f8ba9728;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=241acfbd7e38ff9916100dac9d88892713f85c7f
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 8746b7d4bb..b1fb3347d8 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,15 +38,15 @@
// 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 = '';
if (isGetRequestParameterSet('sub')) {
- $AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestParameter('sub'));
+ $AND = sprintf("`action`='%s' AND `what` != '' AND `what` IS NOT NULL", getRequestParameter('sub'));
$SUB = getRequestParameter('sub');
} // END - if
@@ -58,10 +56,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
// @TODO Kill all constants in this file
$content['sub'] = $SUB;
$content['chk'] = countPostSelection();
- $cnt = '0';
+ $count = '0'; $OUT = '';
foreach (postRequestParameter('sel') as $sel => $confirm) {
if ($confirm == 1) {
- $cnt++;
+ $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) {
@@ -75,7 +73,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
'sel' => $sel,
'menu' => $data['title'],
'descr' => $data['descr'],
- 'cnt' => $cnt,
+ 'cnt' => $count,
);
// Load row template
@@ -96,20 +94,20 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
} // END - foreach
$content['rows'] = $OUT;
- $content['cnt'] = $cnt;
+ $content['cnt'] = $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['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) {
@@ -119,10 +117,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
// Prepare data for the row template
$data = array(
'menu' => $data['title'],
- 'cnt' => $cnt,
+ 'cnt' => $count,
'sel' => $sel,
);
- $OUT .= loadTemplate('admin_del_admin_menu_row', true, $data);
+ $OUT .= loadTemplate('admin_delete_admin_menu_row', true, $data);
} else {
// Entry not found?
$data = array(
@@ -134,10 +132,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
} // END - if
} // END - switch
$content['rows'] = $OUT;
- $content['cnt'] = $cnt;
+ $content['cnt'] = $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')) {
@@ -147,108 +145,77 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
$sel = bigintval($sel);
// Update entry
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET
-`title`='%s',
-`action`='%s',
-`what`='%s',
-`descr`='%s'
-WHERE ".$AND." AND `id`=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE
+ `{?_MYSQL_PREFIX?}_admin_menu`
+SET
+ `title`='%s',
+ `action`='%s',
+ `what`='%s',
+ `descr`='%s'
+WHERE
+ ".$AND." AND
+ `id`=%s
+LIMIT 1",
array(
- $menu,
- postRequestParameter('sel_action', $sel),
- postRequestParameter('sel_what', $sel),
- postRequestParameter('sel_desc', $sel),
- $sel,
+ $menu,
+ postRequestParameter('sel_action', $sel),
+ postRequestParameter('sel_what', $sel),
+ postRequestParameter('sel_desc', $sel),
+ $sel,
), __FILE__, __LINE__);
}
// 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 `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(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(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(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(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);
- // 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",
- 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__);
- }
+ // Run SQL
+ $result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__);
- $numMenus = SQL_NUMROWS($result);
- if ($numMenus > 0) {
+ // Do we have entries?
+ if (!SQL_HASZERONUMS($result)) {
// Remember sub value
$content['sub'] = $SUB;
// Init variables
- $OUT = ''; $cnt = '0';
+ $OUT = '';
+ $count = '0';
// Process all entries
while ($data = SQL_FETCHARRAY($result)) {
// Count this entry
- $cnt++;
+ $count++;
// Init navigation variable
$data['navi'] = '';
if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
// Is highest position
$data['navi'] = '{--LOWER--}';
- } elseif ($cnt == $numMenus) {
+ } elseif ($count == SQL_NUMROWS($result)) {
// Is lowest position
$data['navi'] = '{--HIGHER--}';
} elseif ($data['sort'] > 0) {
// Anything else between highest and lowest
- $data['navi'] = '{--HIGHER--}/{--LOWER--}';
+ $data['navi'] = '{--HIGHER--}|{--LOWER--}';
}
// Add more data to $data
@@ -268,7 +235,7 @@ WHERE ".$AND." AND `id`=%s 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--}');
}
}