X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_cats.php;h=121d37ace5e214a49e4b17da8058bb59228e64cd;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=4b5430a248dfcb60e70927393b5a03022fec4901;hpb=34db702d004b245e5528b0ba20c6de441f61820a;p=mailer.git
diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 4b5430a248..121d37ace5 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -15,8 +15,6 @@
* $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 *
@@ -44,7 +42,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
// Init variable to avoid a notice
$CATS = '';
@@ -64,7 +62,7 @@ if (isFormSent('add')) {
$content = '{--CATEGORY_ADDED--}';
} else {
// Category does already exists
- $content = '{--CATEGORY_ALREADY_EXISTS--}';
+ $content = '{--CATEGORY_ALREADY_EXISTS--}';
}
// Free memory
@@ -86,14 +84,14 @@ if (isFormSent('add')) {
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET `cat`='%s', `visible`='%s', `sort`=%s WHERE `id`=%s LIMIT 1",
array(
$cat,
- postRequestParameter('vis', $id),
+ postRequestParameter('visible', $id),
postRequestParameter('sort', $id),
$id
), __FILE__, __LINE__);
$TEXT = '{--ADMIN_CATEGORIES_SAVED--}';
break;
- case 'del': // Delete categories
+ case 'delete': // Delete categories
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
array($id), __FILE__, __LINE__);
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s",
@@ -111,47 +109,30 @@ if (isFormSent('add')) {
// Display message
loadTemplate('admin_settings_saved', false, $TEXT);
} // END - if
-} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
// Delete categories
$OUT = '';
foreach (postRequestParameter('sel') as $id => $value) {
- // Load data of category
- $result = SQL_QUERY_ESC("SELECT `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
- array(bigintval($id)), __FILE__, __LINE__);
- list($cat) = SQL_FETCHROW($result);
-
- // Free result
- SQL_FREERESULT($result);
-
- // Prepare data for the row template
- $content = array(
- 'id' => $id,
- 'cat' => $cat,
- );
-
// Load row template and switch colors
- $OUT .= loadTemplate('admin_del_cats_row', true, $content);
+ $OUT .= loadTemplate('admin_delete_cats_row', true, $id);
} // END - foreach
// Load main template
- loadTemplate('admin_del_cats', false, $OUT);
+ loadTemplate('admin_delete_cats', false, $OUT);
} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
// Edit categories
$OUT = '';
foreach (postRequestParameter('sel') as $id => $value) {
// Load data from the category
- $result = SQL_QUERY_ESC("SELECT cat, visible, sort FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
- array(bigintval($id)), __FILE__, __LINE__);
- list($cat, $vis, $sort) = SQL_FETCHROW($result);
+ $result = SQL_QUERY_ESC("SELECT `id`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
+ array(bigintval($id)), __FILE__, __LINE__);
+ $content = SQL_FETCHARRAY($result);
+
+ // Free result
SQL_FREERESULT($result);
// Prepare data for the row template
- $content = array(
- 'id' => $id,
- 'cat' => $cat,
- 'vis' => addSelectionBox('yn', $vis, 'vis', $id),
- 'sort' => $sort,
- );
+ $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']);
// Load row template and switch colors
$OUT .= loadTemplate('admin_edit_cats_row', true, $content);
@@ -171,9 +152,6 @@ if (isFormSent('add')) {
// List already existing categories for editing
while ($content = SQL_FETCHARRAY($result)) {
- // Prepare data for the row template
- $content['vis'] = translateYesNo($content['visible']);
-
// Put cat descriptions into variable for the selection box
$cat = $content['cat'];
if (strlen($cat) > 40) $cat = substr($cat, 0, 37) . '...';