Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use $ismoo instend of calling jinput #14047

Merged
merged 4 commits into from
Feb 13, 2017
Merged

Use $ismoo instend of calling jinput #14047

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abccdaf
Update modal.php
zero-24 Feb 13, 2017
96e431b
Thanks @joomdonation
zero-24 Feb 13, 2017
b57b0b7
oops :smile:
zero-24 Feb 13, 2017
29dab64
Merge branch 'staging' into zero-24-patch-3
zero-24 Feb 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 28 additions & 30 deletions administrator/components/com_users/views/users/tmpl/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));

$app = JFactory::getApplication();
$input = $app->input;
$input = JFactory::getApplication()->input;
$field = $input->getCmd('field');
$listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction'));
Expand All @@ -36,7 +35,7 @@
*
* This should be removed when mootools won't be shipped by Joomla.
*/
$isMoo = $input->getInt('ismoo', 1);
$isMoo = $input->getInt('ismoo', 1);

if ($isMoo)
{
Expand Down Expand Up @@ -89,32 +88,31 @@
</tr>
</tfoot>
<tbody>
<?php
$i = 0;
foreach ($this->items as $item) : ?>
<tr class="row<?php echo $i % 2; ?>">
<td>
<a class="pointer button-select" href="#" data-user-value="<?php echo $item->id; ?>" data-user-name="<?php echo $this->escape($item->name); ?>"
data-user-field="<?php echo $this->escape($field); ?>" <?php if ($isMoo) : ?>onclick="<?php echo $onClick; ?>"<?php endif; ?>>
<?php echo $this->escape($item->name); ?>
</a>
</td>
<td>
<?php echo $this->escape($item->username); ?>
</td>
<td class="center">
<span class="<?php echo $enabledStates[(int) $this->escape($item->block)]; ?>"></span>
</td>
<td class="center">
<span class="<?php echo $activatedStates[(int) $this->escape($item->activation)]; ?>"></span>
</td>
<td>
<?php echo nl2br($item->group_names); ?>
</td>
<td>
<?php echo (int) $item->id; ?>
</td>
</tr>
<?php $i = 0; ?>
<?php foreach ($this->items as $item) : ?>
<tr class="row<?php echo $i % 2; ?>">
<td>
<a class="pointer button-select" href="#" data-user-value="<?php echo $item->id; ?>" data-user-name="<?php echo $this->escape($item->name); ?>"
data-user-field="<?php echo $this->escape($field); ?>" <?php if ($isMoo) : ?>onclick="<?php echo $onClick; ?>"<?php endif; ?>>
<?php echo $this->escape($item->name); ?>
</a>
</td>
<td>
<?php echo $this->escape($item->username); ?>
</td>
<td class="center">
<span class="<?php echo $enabledStates[(int) $this->escape($item->block)]; ?>"></span>
</td>
<td class="center">
<span class="<?php echo $activatedStates[(int) $this->escape($item->activation)]; ?>"></span>
</td>
<td>
<?php echo nl2br($item->group_names); ?>
</td>
<td>
<?php echo (int) $item->id; ?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
Expand All @@ -123,7 +121,7 @@
<input type="hidden" name="field" value="<?php echo $this->escape($field); ?>" />
<input type="hidden" name="boxchecked" value="0" />
<input type="hidden" name="required" value="<?php echo $userRequired; ?>" />
<input type="hidden" name="ismoo" value="<?php echo $input->get('ismoo', 1, 'int'); ?>" />
<input type="hidden" name="ismoo" value="<?php echo $isMoo; ?>" />
<?php echo JHtml::_('form.token'); ?>
</form>
</div>