git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master' into dilatometer
[matches/MCTX3420.git]
/
testing
/
MCTXWeb
/
public_html
/
users
/
admin_user.php
diff --git
a/testing/MCTXWeb/public_html/users/admin_user.php
b/testing/MCTXWeb/public_html/users/admin_user.php
index
2d0e656
..
169a22f
100644
(file)
--- a/
testing/MCTXWeb/public_html/users/admin_user.php
+++ b/
testing/MCTXWeb/public_html/users/admin_user.php
@@
-141,28
+141,16
@@
$userPermission = fetchUserPermissions($userId);
$permissionData = fetchAllPermissions();
\r
\r
require_once("models/header.php");
\r
$permissionData = fetchAllPermissions();
\r
\r
require_once("models/header.php");
\r
+startPage();
\r
\r
\r
-echo "
\r
-<body>
\r
-<div id='wrapper'>
\r
-<div id='top'><div id='logo'></div></div>
\r
-<div id='content'>
\r
-<h1>UserCake</h1>
\r
-<h2>Admin User</h2>
\r
-<div id='left-nav'>";
\r
-
\r
-include("left-nav.php");
\r
+echo notificationBlock($errors,$successes);
\r
\r
echo "
\r
\r
echo "
\r
-</div>
\r
-<div id='main'>";
\r
-
\r
-echo resultBlock($errors,$successes);
\r
+<div class='widget'><div class='title centre'>User administration</div>";
\r
\r
echo "
\r
<form name='adminUser' action='".$_SERVER['PHP_SELF']."?id=".$userId."' method='post'>
\r
<table class='admin'><tr><td>
\r
\r
echo "
\r
<form name='adminUser' action='".$_SERVER['PHP_SELF']."?id=".$userId."' method='post'>
\r
<table class='admin'><tr><td>
\r
-<h3>User Information</h3>
\r
<div id='regbox'>
\r
<p>
\r
<label>ID:</label>
\r
<div id='regbox'>
\r
<p>
\r
<label>ID:</label>
\r
@@
-181,7
+169,7
@@
echo "
<input type='text' name='email' value='".$userdetails['email']."' />
\r
</p>
\r
<p>
\r
<input type='text' name='email' value='".$userdetails['email']."' />
\r
</p>
\r
<p>
\r
-<label>Active:</label>";
\r
+<label>Active:
</label>";
\r
\r
//Display activation link, if account inactive
\r
if ($userdetails['active'] == '1'){
\r
\r
//Display activation link, if account inactive
\r
if ($userdetails['active'] == '1'){
\r
@@
-207,7
+195,7
@@
echo "
".date("j M, Y", $userdetails['sign_up_stamp'])."
\r
</p>
\r
<p>
\r
".date("j M, Y", $userdetails['sign_up_stamp'])."
\r
</p>
\r
<p>
\r
-<label>Last Sign In:</label>";
\r
+<label>Last Sign In:
</label>";
\r
\r
//Last sign in, interpretation
\r
if ($userdetails['last_sign_in_stamp'] == '0'){
\r
\r
//Last sign in, interpretation
\r
if ($userdetails['last_sign_in_stamp'] == '0'){
\r
@@
-257,9
+245,8
@@
echo"
</table>
\r
</form>
\r
</div>
\r
</table>
\r
</form>
\r
</div>
\r
-<div id='bottom'></div>
\r
-</div>
\r
-</body>
\r
-</html>";
\r
+";
\r
+
\r
+finishPage();
\r
\r
?>
\r
\r
?>
\r
UCC
git Repository :: git.ucc.asn.au