harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #920 from dawnbreak/master

Browse Source 
Add alert to admin page about old PHP version. Fixing (un)blocking accounts in admin.
This commit is contained in:
habeascodice 2015-03-08 16:51:42 -07:00
commit f7d1fb9c5a
4 changed files with 377 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/sql_conventions.bb
View File

@ -56,7 +56,11 @@ $r = q("SELECT * FROM mail WHERE uid=%d AND $sql_extra ORDER BY created DESC LIM
[b]NULL dates[/b] [b]NULL dates[/b]
[li]To be written [li]To be written
[code]Example[/code][/li] [code]// Example
$r = q("DELETE FROM mail WHERE expires != '%s' AND expires < %s ",
dbesc(NULL_DATE),
db_utcnow()
);[/code][/li]
[b]Storing binary data[/b] [b]Storing binary data[/b]
[li]To be written [li]To be written

659
mod/admin.php
View File

File diff suppressed because it is too large Load Diff

24
view/tpl/admin_summary.tpl
View File

@ -1,36 +1,32 @@
<div class="generic-content-wrapper-styled" id='adminpage'> <div class="generic-content-wrapper-styled" id='adminpage'>
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
{{if $adminalertmsg}}
<p class="alert alert-warning" role="alert">{{$adminalertmsg}}</p>
{{/if}}
<dl> <dl>
<dt>{{$queues.label}}</dt> <dt>{{$queues.label}}</dt>
<dd>{{$queues.queue}}</dd> <dd>{{$queues.queue}}</dd>
</dl> </dl>
<dl>
<dt>{{$accounts.0}}</dt>
<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
</dl>
<dl> <dl>
<dt>{{$pending.0}}</dt> <dt>{{$pending.0}}</dt>
<dd>{{$pending.1}}</dt> <dd>{{$pending.1}}</dt>
</dl> </dl>
<dl> <dl>
<dt>{{$users.0}}</dt> <dt>{{$channels.0}}</dt>
<dd>{{$users.1}}</dd> <dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
</dl> </dl>
<!-- $accounts is empty
{{foreach $accounts as $p}}
<dl>
<dt>{{$p.0}}</dt>
<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
</dl>
{{/foreach}} -->
<dl> <dl>
<dt>{{$plugins.0}}</dt> <dt>{{$plugins.0}}</dt>
<dd> <dd>
{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}} {{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
&nbsp;
</dd> </dd>
</dl> </dl>
<dl> <dl>
<dt>{{$version.0}}</dt> <dt>{{$version.0}}</dt>
<dd>{{$version.1}} - {{$build}}</dd> <dd>{{$version.1}} - {{$build}}</dd>
</dl> </dl>
</div>
</div>

54
view/tpl/admin_users.tpl
View File

@ -10,15 +10,15 @@
return false; return false;
} }
</script> </script>
<div class = "generic-content-wrapper-styled" id='adminpage'> <div class="generic-content-wrapper-styled" id="adminpage">
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/users" method="post"> <form action="{{$baseurl}}/admin/users" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<h3>{{$h_pending}}</h3> <h3>{{$h_pending}}</h3>
{{if $pending}} {{if $pending}}
<table id='pending'> <table id="pending">
<thead> <thead>
<tr> <tr>
{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}} {{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
@ -31,27 +31,25 @@
<tr> <tr>
<td class="created">{{$u.account_created}}</td> <td class="created">{{$u.account_created}}</td>
<td class="email">{{$u.account_email}}</td> <td class="email">{{$u.account_email}}</td>
<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td> <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
<td class="tools"> <td class="tools">
<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><i class='icon-thumbs-up-alt admin-icons'></i></a> <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title="{{$approve}}"><i class="icon-thumbs-up-alt admin-icons"></i></a>
<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><i class='icon-thumbs-down-alt admin-icons'></i></a> <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title="{{$deny}}"><i class="icon-thumbs-down-alt admin-icons"></i></a>
</td> </td>
</tr> </tr>
{{/foreach}} {{/foreach}}
</tbody> </tbody>
</table> </table>
<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div> <div class="selectall"><a href="#" onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div> <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div>
{{else}} {{else}}
<p>{{$no_pending}}</p> <p>{{$no_pending}}</p>
{{/if}} {{/if}}
<h3>{{$h_users}}</h3> <h3>{{$h_users}}</h3>
{{if $users}} {{if $users}}
<table id='users'> <table id="users">
<thead> <thead>
<tr> <tr>
{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}} {{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
@ -62,30 +60,30 @@
<tbody> <tbody>
{{foreach $users as $u}} {{foreach $users as $u}}
<tr> <tr>
<td class='account_id'>{{$u.account_id}}</td> <td class="account_id">{{$u.account_id}}</td>
<td class='email'>{{if $u.blocked}} <td class="email">{{if $u.blocked}}
<i>{{$u.account_email}}</i> <i>{{$u.account_email}}</i>
{{else}} {{else}}
<strong>{{$u.account_email}}</strong> <strong>{{$u.account_email}}</strong>
{{/if}}</td> {{/if}}</td>
<td class='channels'>{{$u.channels}}</td> <td class="channels">{{$u.channels}}</td>
<td class='register_date'>{{$u.account_created}}</td> <td class="register_date">{{$u.account_created}}</td>
<td class='login_date'>{{$u.account_lastlog}}</td> <td class="login_date">{{$u.account_lastlog}}</td>
<td class='account_expires'>{{$u.account_expires}}</td> <td class="account_expires">{{$u.account_expires}}</td>
<td class='service_class'>{{$u.account_service_class}}</td> <td class="service_class">{{$u.account_service_class}}</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"/></td> <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
<td class="tools"> <td class="tools">
<a href="{{$baseurl}}/admin/users/block/{{$u.account_id}}?t={{$form_security_token}}" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($u.blocked)}}dim{{/if}}'></i></a> <a href="{{$baseurl}}/admin/users/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="icon-ban-circle admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a>
<a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-trash admin-icons'></i></a> <a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="icon-trash admin-icons"></i></a>
</td> </td>
</tr> </tr>
{{/foreach}} {{/foreach}}
</tbody> </tbody>
</table> </table>
<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div> <div class="selectall"><a href="#" onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div> <div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
{{else}} {{else}}
NO USERS?!? NO USERS?!?
{{/if}} {{/if}}
</form> </form>
</div> </div>