X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=32d08b012bf61baebccd427feaaa48cd50158ff9;hb=0f3a135204757cc8750262871c8e62c42300acb4;hp=45d42bc01e42c0355d6bbcf9d21252f3f17cfa22;hpb=682edce003a1a91f66fb8e2212d7fdb591379843;p=mailer.git diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index 45d42bc01e..32d08b012b 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -16,7 +16,7 @@ * $Author:: $ * * -------------------------------------------------------------------- * * 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 * @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // 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 = ''; @@ -60,32 +60,32 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() foreach (postRequestParameter('sel') as $sel => $confirm) { if ($confirm == 1) { $count++; - $result = SQL_QUERY_ESC("SELECT `title`, `action`, `what`, `descr` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 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... - $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' => $count, + '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 @@ -94,7 +94,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() } // END - foreach $content['rows'] = $OUT; - $content['cnt'] = $count; + $content['count'] = $count; // Load template loadTemplate('admin_edit_admin_menu_form', false, $content); @@ -112,27 +112,27 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() 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' => $count, - 'sel' => $sel, + $content = array( + 'menu' => $content['title'], + 'count' => $count, + 'sel' => $sel, ); - $OUT .= loadTemplate('admin_delete_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'] = $count; + $content['count'] = $count; // Load template loadTemplate('admin_delete_admin_menu', false, $content); @@ -166,7 +166,7 @@ LIMIT 1", } // Load template - loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); + displayMessage('{--SETTINGS_SAVED--}'); break; case 'delete': // Delete menu @@ -176,52 +176,53 @@ 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 { // Handle weightning - doAdminProcessMenuWeightning('guest'); + 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 = ''; $count = '0'; + $OUT = ''; + $count = '0'; // Process all entries - while ($data = SQL_FETCHARRAY($result)) { + while ($content = SQL_FETCHARRAY($result)) { // Count this entry $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($SUB)))) { // Is highest position - $data['navi'] = '{--LOWER--}'; + $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 @@ -234,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--}'); } }