Skip to content

Commit

Permalink
fixed ~~#296~~
Browse files Browse the repository at this point in the history 
Added sort in users list by extrafields
Added send address in header for login form
  • Loading branch information
@esclkm
esclkm committed Jun 28, 2009
1 parent eae3585 commit 222ab31
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 37 deletions.
78 changes: 41 additions & 37 deletions system/core/users/users.inc.php
View file
Expand Up @@ -52,49 +52,35 @@
{
$sq = $y;
$title .= $cfg['separator']." ". $L['Search']." '".sed_cc($y)."'";
$sql = sed_sql_query("SELECT COUNT(*) FROM $db_users WHERE user_name LIKE '%".sed_sql_prep($y)."%'");
$totalusers = sed_sql_result($sql, 0, "COUNT(*)");
$sql = sed_sql_query("SELECT * FROM $db_users WHERE user_name LIKE '%".sed_sql_prep($y)."%' ORDER BY user_$s $w LIMIT $d,".$cfg['maxusersperpage']);
$sqlmask = "WHERE user_name LIKE '%".sed_sql_prep($y)."%'";
}
elseif ($g>1)
{
$title .= $cfg['separator']." ".$L['Maingroup']." = ".sed_build_group($g);
$sql = sed_sql_query("SELECT COUNT(*) FROM $db_users WHERE user_maingrp='$g'");
$totalusers = sed_sql_result($sql, 0, "COUNT(*)");
$sql = sed_sql_query("SELECT * FROM $db_users WHERE user_maingrp='$g' ORDER BY user_$s $w LIMIT $d,".$cfg['maxusersperpage']);
$sqlmask = "WHERE user_maingrp='$g'";
}

elseif ($gm>1)
{
$title .= $cfg['separator']." ".$L['Group']." = ".sed_build_group($gm);
$sql = sed_sql_query("SELECT COUNT(*) FROM $db_users as u
LEFT JOIN $db_groups_users as g ON g.gru_userid=u.user_id
WHERE g.gru_groupid='$gm'");
$totalusers = sed_sql_result($sql, 0, "COUNT(*)");
$sql = sed_sql_query("SELECT u.* FROM $db_users as u
LEFT JOIN $db_groups_users as g ON g.gru_userid=u.user_id
WHERE g.gru_groupid='$gm'
ORDER BY user_$s $w
LIMIT $d,".$cfg['maxusersperpage']);
$sqlmask = "as u
LEFT JOIN ".$db_groups_users." as g ON g.gru_userid=u.user_id
WHERE g.gru_groupid='$gm'";
}

elseif (mb_strlen($f)==1)
{
if ($f=="_")
{
$title .= $cfg['separator']." ".$L['use_byfirstletter']." '%'";
$sql = sed_sql_query("SELECT COUNT(*) FROM $db_users WHERE user_name NOT REGEXP(\"^[a-zA-Z]\")");
$totalusers = sed_sql_result($sql, 0, "COUNT(*)");
$sql = sed_sql_query("SELECT * FROM $db_users WHERE user_name NOT REGEXP(\"^[a-zA-Z]\") ORDER BY user_$s $w LIMIT $d,".$cfg['maxusersperpage']);
$sqlmask = "WHERE user_name NOT REGEXP(\"^[a-zA-Z]\")";
}
else
{
$f = mb_strtoupper($f);
$title .= $cfg['separator']." ".$L['use_byfirstletter']." '".$f."'";
$i = $f."%";
$sql = sed_sql_query("SELECT COUNT(*) FROM $db_users WHERE user_name LIKE '$i'");
$totalusers = sed_sql_result($sql, 0, "COUNT(*)");
$sql = sed_sql_query("SELECT * FROM $db_users WHERE user_name LIKE '$i' ORDER BY user_$s $w LIMIT $d,".$cfg['maxusersperpage']);
$sqlmask = "WHERE user_name LIKE '$i'";
}
}

Expand All @@ -103,24 +89,30 @@
$cn = mb_strtolower(mb_substr($f, 8, 2));
$title .= $cfg['separator']." ".$L['Country']." '";
$title .= ($cn=='00') ? $L['None']."'": $sed_countries[$cn]."'";
$sql = sed_sql_query("SELECT COUNT(*) FROM $db_users WHERE user_country='$cn'");
$totalusers = sed_sql_result($sql, 0, "COUNT(*)");
$sql = sed_sql_query("SELECT * FROM $db_users WHERE user_country='$cn' ORDER BY user_$s $w LIMIT $d,".$cfg['maxusersperpage']);
$sqlmask = "WHERE user_country='$cn'";
}

elseif ($f=='all')
{
$sql = sed_sql_query("SELECT COUNT(*) FROM $db_users WHERE 1");
$totalusers = sed_sql_result($sql, 0, "COUNT(*)");
if ($s=='maingrp')
{ $sql = sed_sql_query("SELECT u.* FROM $db_users as u LEFT JOIN $db_groups as g ON g.grp_id=u.user_maingrp ORDER BY grp_level $w LIMIT $d,".$cfg['maxusersperpage']); }
else
{ $sql = sed_sql_query("SELECT * FROM $db_users WHERE 1 ORDER BY user_$s $w LIMIT $d,".$cfg['maxusersperpage']); }
$sqlmask = "WHERE 1";
}

$sql = sed_sql_query("SELECT COUNT(*) FROM $db_users ".$sqlmask);
$totalusers = sed_sql_result($sql, 0, "COUNT(*)");
$sql = sed_sql_query("SELECT * FROM $db_users ".$sqlmask." ORDER BY user_$s $w LIMIT $d,".$cfg['maxusersperpage']);

$totalpage = ceil($totalusers / $cfg['maxusersperpage']);
$currentpage= ceil ($d / $cfg['maxusersperpage'])+1;

//Extra fields for users
$fieldsres = sed_sql_query("SELECT * FROM $db_extra_fields WHERE field_location='users'");
$user_extrafields = "";
while($row = sed_sql_fetchassoc($fieldsres))
{
$extrafields[] = $row; $number_of_extrafields++;
}


$perpage= $cfg['maxusersperpage'];

$pagnav = sed_pagination(sed_url('users', "f=$f&g=$g&gm=$gm&s=$s&w=$w&sq=$sq&"), $d, $totalusers, $perpage);
Expand Down Expand Up @@ -235,9 +227,20 @@
"USERS_TOP_OCCUPATION" => "<a href=\"".sed_url('users', "f=$f&amp;s=occupation&amp;w=asc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_down</a> <a href=\"".sed_url('users', "f=$f&amp;s=occupation&amp;w=desc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_up</a> ".$L['Occupation'],
"USERS_TOP_BIRTHDATE" => "<a href=\"".sed_url('users', "f=$f&amp;s=birthdate&amp;w=asc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_down</a> <a href=\"".sed_url('users', "f=$f&amp;s=birthdate&amp;w=desc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_up</a> ".$L['Birthdate'],
"USERS_TOP_GENDER" => "<a href=\"".sed_url('users', "f=$f&amp;s=gender&amp;w=asc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_down</a> <a href=\"".sed_url('users', "f=$f&amp;s=gender&amp;w=desc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_up</a> ".$L['Gender'],
"USERS_TOP_TIMEZONE" => "<a href=\"".sed_url('users', "f=$f&amp;s=timezone&amp;w=asc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_down</a> <a href=\"".sed_url('users', "f=$f&amp;s=timezone&amp;w=desc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_up</a> ".$L['Timezone']
"USERS_TOP_TIMEZONE" => "<a href=\"".sed_url('users', "f=$f&amp;s=timezone&amp;w=asc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_down</a> <a href=\"".sed_url('users', "f=$f&amp;s=timezone&amp;w=desc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_up</a> ".$L['Timezone'],
"USERS_TOP_POSTCOUNT" => "<a href=\"".sed_url('users', "f=$f&amp;s=postcount&amp;w=asc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_down</a> <a href=\"".sed_url('users', "f=$f&amp;s=postcount&amp;w=desc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_up</a> ".$L['Posts'],
));

// Extra fields for users
if(count($extrafields)>0)
foreach($extrafields as $i=>$extrafield)
{
$uname = strtoupper($extrafield['field_name']);
$fieldtext = isset($L['user_'.$extrafield['field_name'].'_title']) ? $L['user_'.$extrafield['field_name'].'_title'] : $extrafield['field_description'];
$fieldtext = "<a href=\"".sed_url('users', "f=$f&amp;s=".$extrafield['field_name']."&amp;w=asc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_down</a> <a href=\"".sed_url('users', "f=$f&amp;s=".$extrafield['field_name']."&amp;w=desc&amp;g=$g&amp;gm=$gm&amp;sq=$sq")."\">$sed_img_up</a> ".$fieldtext;
$t->assign('USERS_ROW_'.$uname, $fieldtext);
}

$jj=0;

/* === Hook - Part1 : Set === */
Expand Down Expand Up @@ -286,16 +289,17 @@
"USERS_ROW" => $urr
));

// Extra fields
$fieldsres = sed_sql_query("SELECT * FROM $db_extra_fields WHERE field_location='users'");
while($row = sed_sql_fetchassoc($fieldsres))
// Extra fields for users
if(count($extrafields)>0)
foreach($extrafields as $i=>$extrafield)
{
$uname = strtoupper($row['field_name']);
$t->assign('USERS_ROW_'.$uname, $urr['user_'.$row['field_name']]);
isset($L['user_'.$row['field_name'].'_title']) ? $t->assign('USERS_ROW_'.$uname.'_TITLE', $L['user_'.$row['field_name'].'_title']) : $t->assign('USERS_ROW_'.$uname.'_TITLE', $row['field_description']);
$uname = strtoupper($extrafield['field_name']);
$t->assign('USERS_ROW_'.$uname, sed_cc($urr['user_'.$extrafield['field_name']]));
isset($L['user_'.$extrafield['field_name'].'_title']) ? $t->assign('USERS_ROW_'.$uname.'_TITLE', $L['user_'.$extrafield['field_name'].'_title']) : $t->assign('USERS_ROW_'.$uname.'_TITLE', $extrafield['field_description']);
}



/* === Hook - Part2 : Include === */
if (is_array($extp))
{ foreach($extp as $k => $pl) { include($cfg['plugins_dir'].'/'.$pl['pl_code'].'/'.$pl['pl_file'].'.php'); } }
Expand Down
1 change: 1 addition & 0 deletions system/header.php
View file
Expand Up @@ -143,6 +143,7 @@
$out['guest_cookiettl'] = '<input type="checkbox" name="rremember" />';

$t->assign(array (
"HEADER_GUEST_SEND" => sed_url('users', 'm=auth&a=check&redirect='.$sys['url']),
"HEADER_GUEST_USERNAME" => $out['guest_username'],
"HEADER_GUEST_PASSWORD" => $out['guest_password'],
"HEADER_GUEST_REGISTER" => $out['guest_register'],
Expand Down

0 comments on commit 222ab31

Please sign in to comment.