Way more usage of EL code:

[mailer.git] / inc / modules / admin / what-config_cats.php

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index feffa1cfb374d03037e8ce0f7677cbf2c6ae69ac..770725dd1e8ad09c8259fa452adea8c5ef45ebd3 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -15,11 +15,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 *
@@ -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,14 +62,14 @@ if (isFormSent('add')) {
                $content = '{--CATEGORY_ADDED--}';
        } else {
                // Category does already exists
-               $content = '<span class="admin_failed">{--CATEGORY_ALREADY_EXISTS--}</span>';
+               $content = '<span class="notice">{--CATEGORY_ALREADY_EXISTS--}</span>';
        }
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Display message
-       loadTemplate('admin_settings_saved', false, $content);
+       displayMessage($content);
 } elseif ((isFormSent()) && (isPostRequestParameterSet('id')) && (is_array(postRequestParameter('id')))) {
        // Change or delete categories...
        $TEXT = '';
@@ -93,7 +91,7 @@ if (isFormSent('add')) {
                                        $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",
@@ -103,24 +101,24 @@ if (isFormSent('add')) {
                        } // END - switch
                } else {
                        // Entry not saved
-                       $TEXT .= getMaskedMessage('ADMIN_CATEGORY_NOT_SAVED', $id);
+                       $TEXT .= '{%message,ADMIN_CATEGORY_NOT_SAVED=' . $id . '%}';
                }
        } // END - foreach
 
        if (isset($TEXT)) {
                // Display message
-               loadTemplate('admin_settings_saved', false, $TEXT);
+               displayMessage($TEXT);
        } // END - if
-} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
        // Delete categories
        $OUT = '';
        foreach (postRequestParameter('sel') as $id => $value) {
                // Load row template and switch colors
-               $OUT .= loadTemplate('admin_del_cats_row', true, $id);
+               $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 = '';
@@ -134,7 +132,7 @@ if (isFormSent('add')) {
                SQL_FREERESULT($result);
 
                // Prepare data for the row template
-               $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id'])
+               $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']);
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_edit_cats_row', true, $content);
@@ -160,14 +158,14 @@ if (isFormSent('add')) {
                        $CATS .= '<option value="' . $content['sort'] . '">' . $cat . '</option>';
 
                        // Load row template and switch color
-                       $OUT .= loadTemplate('admin_config_cats_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_cats_row', true, $content);
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
-               loadTemplate('admin_config_cats', false, $OUT);
+               loadTemplate('admin_list_cats', false, $OUT);
        } // END - if
 
        // Remember in array