mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-20 22:41:42 +02:00
Code Issues Releases Wiki Activity

Fixes #929 - Missing user/member list.

Browse Source
This commit is contained in:
Cameron
2015-03-21 20:18:06 -07:00
parent d9d437bf73
commit d3de7a85d4
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_core/shortcodes/batch/user_shortcodes.php
View File

@@ -715,15 +715,10 @@ class user_shortcodes extends e_shortcode
function sc_user_form_records($parm='') function sc_user_form_records($parm='')
{ {
global $records, $user_frm; global $records;
$ret = $user_frm->form_select_open("records"); $opts = array(5,10,20,30,50);
for($i=10; $i<=30; $i+=10) return e107::getForm()->select('records', $opts, $records,'useValues=1');
{
$sel = ($i == $records ? true: false);
$ret .= $user_frm->form_option($i, $sel, $i);
}
$ret .= $user_frm->form_select_close();
return $ret;
} }
@@ -732,14 +727,14 @@ class user_shortcodes extends e_shortcode
global $order; global $order;
if ($order == "ASC") if ($order == "ASC")
{ {
$ret = "<select name='order' class='tbox'> $ret = "<select name='order' class='form-control tbox'>
<option value='DESC'>".LAN_USER_45."</option> <option value='DESC'>".LAN_USER_45."</option>
<option value='ASC' selected='selected'>".LAN_USER_46."</option> <option value='ASC' selected='selected'>".LAN_USER_46."</option>
</select>"; </select>";
} }
else else
{ {
$ret = "<select name='order' class='tbox'> $ret = "<select name='order' class='form-control tbox'>
<option value='DESC' selected='selected'>".LAN_USER_45."</option> <option value='DESC' selected='selected'>".LAN_USER_45."</option>
<option value='ASC'>".LAN_USER_46."</option> <option value='ASC'>".LAN_USER_46."</option>
</select>"; </select>";

18
user.php
View File

@@ -74,10 +74,16 @@ e107::scStyle($sc_style);
if(empty($USER_TEMPLATE)) // BC Fix for loading old templates. if(empty($USER_TEMPLATE)) // BC Fix for loading old templates.
{ {
echo "DEBUG: Using v1.x user template"; e107::getMessage()->addDebug( "Using v1.x user template");
include_once(e107::coreTemplatePath('user')); //correct way to load a core template. include_once(e107::coreTemplatePath('user')); //correct way to load a core template.
} }
else
{
$USER_FULL_TEMPLATE = $USER_TEMPLATE['view'];
$USER_SHORT_TEMPLATE_START = $USER_TEMPLATE['list']['start'] ;
$USER_SHORT_TEMPLATE = $USER_TEMPLATE['list']['item'] ;
$USER_SHORT_TEMPLATE_END = $USER_TEMPLATE['list']['end'];
}
$TEMPLATE = str_replace('{USER_EMBED_USERPROFILE}','{USER_ADDONS}', $TEMPLATE); // BC Fix $TEMPLATE = str_replace('{USER_EMBED_USERPROFILE}','{USER_ADDONS}', $TEMPLATE); // BC Fix
@@ -221,15 +227,17 @@ else
$ns->tablerender(LAN_USER_52, $text); $ns->tablerender(LAN_USER_52, $text);
$parms = $users_total.",".$records.",".$from.",".e_SELF.'?[FROM].'.$records.".".$order; $parms = $users_total.",".$records.",".$from.",".e_SELF.'?[FROM].'.$records.".".$order;
echo "<div class='nextprev'>&nbsp;".$tp->parseTemplate("{NEXTPREV={$parms}}")."</div>"; echo "<div class='nextprev form-inline'>&nbsp;".$tp->parseTemplate("{NEXTPREV={$parms}}")."</div>";
function renderuser($uid, $mode = "verbose") function renderuser($uid, $mode = "verbose")
{ {
global $sql, $pref, $tp, $sc_style, $user_shortcodes; global $pref, $sc_style, $user_shortcodes;
global $EXTENDED_START, $EXTENDED_TABLE, $EXTENDED_END, $USER_SHORT_TEMPLATE, $USER_FULL_TEMPLATE, $USER_TEMPLATE; global $EXTENDED_START, $EXTENDED_TABLE, $EXTENDED_END, $USER_SHORT_TEMPLATE, $USER_FULL_TEMPLATE, $USER_TEMPLATE;
global $user; global $user;
$tp = e107::getParser();
if(is_array($uid)) if(is_array($uid))
{ {
$user = $uid; $user = $uid;
@@ -246,7 +254,7 @@ function renderuser($uid, $mode = "verbose")
if($mode == 'verbose') if($mode == 'verbose')
{ {
return $tp->parseTemplate($USER_TEMPLATE['view'], TRUE, $user_shortcodes); return $tp->parseTemplate( $USER_FULL_TEMPLATE, TRUE, $user_shortcodes);
} }
else else
{ {