X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=b1fb3347d8fc18f37a7c3077bd8566dece690311;hb=9197694ce183b69384a385a6c4a5e16988c7fb09;hp=0e9f92f0991ff5cdf95c65b66767ae2f3aa529d1;hpb=903f539b5aac6171fdfee9ad252565531e8dd4e2;p=mailer.git
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 0e9f92f099..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,10 +38,10 @@
// 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 = '';
@@ -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,7 +94,7 @@ 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);
@@ -106,10 +104,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
$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,7 +117,7 @@ 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_delete_admin_menu_row', true, $data);
@@ -134,7 +132,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
} // END - if
} // END - switch
$content['rows'] = $OUT;
- $content['cnt'] = $cnt;
+ $content['cnt'] = $count;
// Load template
loadTemplate('admin_delete_admin_menu', false, $content);
@@ -168,7 +166,7 @@ LIMIT 1",
}
// Load template
- loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+ displayMessage('{--SETTINGS_SAVED--}');
break;
case 'delete': // Delete menu
@@ -178,94 +176,46 @@ LIMIT 1",
} // 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) {
+ 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 == SQL_NUMROWS($result)) {
+ } 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
@@ -285,7 +235,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--}');
}
}