X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_cats.php;h=308ed2f32b3deb8ef81b65c493c0a75ac41b8398;hb=e1235e719b767d6693976c3d24489beaa38a3667;hp=4483c96ecc13cb3b11423d85f89c8d56d3ff7da8;hpb=f8da178ba4b2f0ed9bfd303d6d32f62b0919a442;p=mailer.git
diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 4483c96ecc..308ed2f32b 100644
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -1,7 +1,7 @@
".$sname." ".$fname."");
+ // @TODO No longer needed? define('__CATS_BASE' , "".$content['surname']." ".$content['family']."";
// Ok, list categories of this user
- $result_cats = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats` ORDER BY `sort`", __FILE__, __LINE__);
+ $result_cats = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
if (SQL_NUMROWS($result_cats) > 0) {
// List categories
$cnt = 1; $OUT = ''; $SW = 2;
- while ($content = SQL_FETCHARRAY($result_cats)) {
+ while ($content = merge_array($content, SQL_FETCHARRAY($result_cats))) {
// Check user's selection
- $result_user = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
- array(bigintval(REQUEST_GET('uid')), bigintval($content['id'])), __FILE__, __LINE__);
+ $result_user = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s AND `cat_id`=%s LIMIT 1",
+ array(bigintval(getRequestElement('userid')), bigintval($content['id'])), __FILE__, __LINE__);
// Set selection
$selection = "{--NO--}";
@@ -82,30 +78,30 @@ if (REQUEST_ISSET_GET('uid')) {
$content['sel'] = $selection;
// Load row template and switch colors + count up
- $OUT .= LOAD_TEMPLATE("admin_list_cats_row", true, $content);
+ $OUT .= loadTemplate('admin_list_cats_row', true, $content);
$SW = 3 - $SW; $cnt++;
} // END - while
// Free memory
SQL_FREERESULT($result);
- // @TODO Rewrite this constant
- define('__CATS_ROWS', $OUT);
+ // Remember all rows in the array
+ $content['rows'] = $OUT;
// Load main template
- LOAD_TEMPLATE("admin_list_cats");
+ loadTemplate('admin_list_cats', false, $content);
} else {
// No categories selected! :-(
- LOAD_TEMPLATE("admin_list_cats_404");
+ loadTemplate('admin_list_cats_404', false, $content);
}
} else {
// User not found
- LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), constant('__UID')));
+ loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), $content['userid']));
}
} else {
// Output selection form with all confirmed user accounts listed
- ADD_MEMBER_SELECTION_BOX();
+ addMemberSelectionBox();
}
-//
+// [EOF]
?>