diff --git a/include/staff/group.inc.php b/include/staff/group.inc.php
index 5b590866c6a901f45c5450a78df9d0ae02164d51..258ca652379f8a10ccb7f20a553fd701fcef6409 100644
--- a/include/staff/group.inc.php
+++ b/include/staff/group.inc.php
@@ -65,7 +65,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="radio" name="can_create_tickets" value="1" <?php echo $info['can_create_tickets']?'checked="checked"':''; ?> />Yes
<input type="radio" name="can_create_tickets" value="0" <?php echo !$info['can_create_tickets']?'checked="checked"':''; ?> />No
- <i>Ability to open tickets on behalf of clients.</i>
+ <i>Ability to open tickets on behalf of users.</i>
</td>
</tr>
<tr><td>Can <b>Edit</b> Tickets</td>
diff --git a/include/staff/settings-access.inc.php b/include/staff/settings-access.inc.php
index 1ad55030a9a2f93f4424e76abd3180e5eab1ac05..5ea795a5b8dbac101eb8df7da91c33625a2d2dcd 100644
--- a/include/staff/settings-access.inc.php
+++ b/include/staff/settings-access.inc.php
@@ -81,7 +81,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</tr>
<tr>
<th colspan="2">
- <em><b>Client Authentication Settings</b></em>
+ <em><b>End User Authentication Settings</b></em>
</th>
</tr>
<tr><td>Registration Required:</td>
@@ -95,7 +95,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<?php foreach (array(
'disabled' => 'Disabled — All users are guests',
'public' => 'Public — Anyone can register',
- 'closed' => 'Private — Only staff can register clients',)
+ 'closed' => 'Private — Only staff can register users',)
as $key=>$val) { ?>
<option value="<?php echo $key; ?>" <?php
if ($config['client_registration'] == $key)
@@ -104,7 +104,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
} ?>
</select></td>
</tr>
- <tr><td>Client Excessive Logins:</td>
+ <tr><td>User Excessive Logins:</td>
<td>
<select name="client_max_logins">
<?php
@@ -123,10 +123,10 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</select> minute lock-out is enforced.
</td>
</tr>
- <tr><td>Client Session Timeout:</td>
+ <tr><td>User Session Timeout:</td>
<td>
<input type="text" name="client_session_timeout" size=6 value="<?php echo $config['client_session_timeout']; ?>">
- Maximum idle time in minutes before a client must log in again (enter 0 to disable). <i class="help-tip icon-question-sign" href="#client_session_timeout"></i>
+ Maximum idle time in minutes before a user must log in again (enter 0 to disable). <i class="help-tip icon-question-sign" href="#client_session_timeout"></i>
</td>
</tr>
</tbody>
@@ -178,7 +178,7 @@ $manage_content = function($title, $content) use ($contents) {
<?php $manage_content('Client Sign-In Page', 'banner-client'); ?>
<tr>
<th colspan="2">
- <em><b>Client Account Registration</b></em>
+ <em><b>User Account Registration</b></em>
</th>
</tr>
<?php $manage_content('Please Confirm Email Address Page', 'registration-confirm'); ?>
diff --git a/include/staff/templates/user.tmpl.php b/include/staff/templates/user.tmpl.php
index 2aabe3ba5857d0cbecd5079ff7a46641f164ff28..c9aa89a93f3ee6d79a37dcc0a4ddd33cc0fa0706 100644
--- a/include/staff/templates/user.tmpl.php
+++ b/include/staff/templates/user.tmpl.php
@@ -31,7 +31,7 @@ if ($info['error']) {
<div class="clear"></div>
<ul class="tabs" style="margin-top:5px">
<li><a href="#info-tab" class="active"
- ><i class="icon-info-sign"></i> Client</a></li>
+ ><i class="icon-info-sign"></i> User</a></li>
<?php if ($org) { ?>
<li><a href="#organization-tab"
><i class="icon-fixed-width icon-building"></i> Organization</a></li>
diff --git a/include/staff/ticket-edit.inc.php b/include/staff/ticket-edit.inc.php
index 299835b3734d270cbd9e62a73d7fc73bf872c329..cf057bda5b522c05ceecd205e0adc44f19a8cff3 100644
--- a/include/staff/ticket-edit.inc.php
+++ b/include/staff/ticket-edit.inc.php
@@ -16,14 +16,14 @@ if ($_POST)
<tbody>
<tr>
<th colspan="2">
- <em><strong>Client Information</strong>: Currently selected client</em>
+ <em><strong>User Information</strong>: Currently selected user</em>
</th>
</tr>
<?php
if(!$info['user_id'] || !($user = User::lookup($info['user_id'])))
$user = $ticket->getUser();
?>
- <tr><td>Client:</td><td>
+ <tr><td>User:</td><td>
<div id="client-info">
<a href="#" onclick="javascript:
$.userLookup('ajax.php/users/<?php echo $ticket->getOwnerId(); ?>/edit',
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index c183c7b4e11c9c3d847a2e316e6424806c540ebd..47df3fe47726500f22aa360def7262c960616c83 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -166,7 +166,7 @@ if($ticket->isOverdue())
<td width="50%" style="vertical-align:top">
<table border="0" cellspacing="" cellpadding="4" width="100%">
<tr>
- <th width="100">Client:</th>
+ <th width="100">User:</th>
<td><a href="#tickets/<?php echo $ticket->getId(); ?>/user"
onclick="javascript:
$.userLookup('ajax.php/tickets/<?php echo $ticket->getId(); ?>/user',
@@ -196,7 +196,9 @@ if($ticket->isOverdue())
$user->getId(), $closed);
?>
<li><a href="tickets.php?a=search&uid=<?php echo $ticket->getOwnerId(); ?>"><i class="icon-double-angle-right icon-fixed-width"></i> All Tickets</a></li>
- <li><a href="users.php?id=<?php echo $user->getId(); ?>"><i class="icon-user icon-fixed-width"></i> Manage Client</a></li>
+ <li><a href="users.php?id=<?php echo
+ $user->getId(); ?>"><i class="icon-user
+ icon-fixed-width"></i> Manage User</a></li>
<?php if ($user->getOrgId()) { ?>
<li><a href="orgs.php?id=<?php echo $user->getOrgId(); ?>"><i class="icon-building icon-fixed-width"></i> Manage Organization</a></li>
<?php } ?>