More HTML swapped and admin contact link rewritten. Resolves #91

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

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 45ad9068406ab4a4b41e92b8b5a5b90f11f5467b..3305017e372963fb8468f7a29077bdce6a4e2a6e 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -46,26 +46,24 @@ if (isset($_POST['edit']))
        $SEL = SELECTION_COUNT($_POST['sel']);
        if ($SEL > 0)
        {
-               // Add option for userlog
+               // Add option for events
                $cacheArray['admins'] = ADD_OPTION_LINES("admins", "id", "login", "", "email");
                $SW = 2; $rowNameS = "";
-               foreach ($_POST['sel'] as $template => $sel)
-               {
+               foreach ($_POST['sel'] as $template => $sel) {
                        // First of all load data from DB
                        $result = SQL_QUERY_ESC("SELECT admin_id, id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY `id`",
                         array($template), __FILE__, __LINE__);
                        $OUT = ""; $aid = 0; $aid2 = 0;
-                       while (list($aid, $id) = SQL_FETCHROW($result))
-                       {
+                       while (list($aid, $id) = SQL_FETCHROW($result)) {
+                               // @TODO Can this be rewritten???
                                $OUT .= "<select name=\"admin_id[".$id."]\" size=\"1\" class=\"admin_select\">
 <option value=\"0\"";
-                               if ($aid == "0") $OUT .= " selected default";
-                               $OUT .=">".ADMINS_ALL_ADMINS."</option>\n";
-                               if (EXT_IS_ACTIVE("userlog"))
-                               {
+                               if ($aid == "0") $OUT .= " selected=\"selected\"";
+                               $OUT .=">{--ADMINS_ALL_ADMINS--}</option>\n";
+                               if (EXT_IS_ACTIVE("events")) {
                                        $OUT .= "<option value=\"-1\"";
-                                       if ($aid == "-1") $OUT .= " selected default";
-                                       $OUT .= ">".ADMINS_TO_USERLOG."</option>\n";
+                                       if ($aid == "-1") $OUT .= " selected=\"selected\"";
+                                       $OUT .= ">{--ADMINS_TO_USERLOG--}</option>\n";
                                }
                                $OUT .= ADD_OPTION_LINES("admins", "id", "login", $aid, "email");
                                $OUT .= "</select><br />\n";
@@ -152,28 +150,13 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
 
                // List found entries
                $SW = 2; $OUT = "";
-               while (list($id, $aid, $admin, $templ) = SQL_FETCHROW($result))
-               {
-                       if ($aid > 0)
-                       {
-                               // Admin assigned
-                               $admin_link = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$aid."\">".$admin."</a>";
-                       }
-                        elseif ($aid == 0)
-                       {
-                               // All admins
-                               $admin_link = "<em>".ADMINS_ALL_ADMINS."</em>";
-                       }
-                        elseif (($aid == -1) && (EXT_IS_ACTIVE("usrlog")))
-                       {
-                               // To userlog
-                               $admin_link = "<em>".ADMINS_TO_USERLOG."</em>";
-                       }
+               while ($data = SQL_FETCHARRAY($result)) {
+                       // Prepare content
                        $content = array(
                                'sw'   => $SW,
-                               'id'   => $id,
-                               'tpl'  => $templ,
-                               'alnk' => $admin_link
+                               'id'   => $data['id'],
+                               'tpl'  => $data['mail_template'],
+                               'alnk' => GENERATE_AID_LINK($data['admin_id'])
                        );
 
                        // Load row template
@@ -187,12 +170,11 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
 
                // Load template
                LOAD_TEMPLATE("admin_admins_mails_list");
-       }
-        else
-       {
+       } else {
                // No entries found
                LOAD_TEMPLATE("admin_settings_saved", false, ADMINS_MAILS_NO_ENTRIES);
        }
 }
+
 //
 ?>