diff --git a/include/class.config.php b/include/class.config.php
index 9a02dd480ea92ea3143f693314d48be92cd9136a..5cfaed44f2bc7d806ff4838278c467662fafccf2 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -936,8 +936,8 @@ class OsticketConfig extends Config {
'autolock_minutes'=>$vars['autolock_minutes'],
'enable_captcha'=>isset($vars['enable_captcha'])?1:0,
'auto_claim_tickets'=>isset($vars['auto_claim_tickets'])?1:0,
- 'show_assigned_tickets'=>isset($vars['show_assigned_tickets'])?1:0,
- 'show_answered_tickets'=>isset($vars['show_answered_tickets'])?1:0,
+ 'show_assigned_tickets'=>isset($vars['show_assigned_tickets'])?0:1,
+ 'show_answered_tickets'=>isset($vars['show_answered_tickets'])?0:1,
'show_related_tickets'=>isset($vars['show_related_tickets'])?1:0,
'hide_staff_name'=>isset($vars['hide_staff_name'])?1:0,
'enable_html_thread'=>isset($vars['enable_html_thread'])?1:0,
diff --git a/include/i18n/en_US/config.yaml b/include/i18n/en_US/config.yaml
index 9ec6537a20eaf27afa0a7568a7c7048a1237ccd0..9d1e385c3bd979cf2bd12dcfeb6f6f9aa874085b 100644
--- a/include/i18n/en_US/config.yaml
+++ b/include/i18n/en_US/config.yaml
@@ -12,7 +12,7 @@ core:
default_priority_id: 2
enable_daylight_saving: 0
- reply_separator: '-- do not edit --'
+ reply_separator: '-- reply above this line --'
# Do not translate below here
allowed_filetypes: '.doc, .pdf, .jpg, .jpeg, .gif, .png, .xls, .docx, .xlsx, .txt'
diff --git a/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml b/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml
deleted file mode 100644
index fe1b51df48d47b959ffca83014257d5a974dc5b3..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Add New Help Topic
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-# title - Link title
-# href - href of link (links starting with / are translated to the
-# helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-help_topic_information:
- title: Help Topic Information
- content: >
- Your Help Topics help guide what information is gathered from a Client and
- how that Client is handled by your Company. The Help Topics are specific to
- a Department and can include Custom Forms.
-
-topic:
- title: Topic
- content: >
- Choose a Topic Label by which you want this Help Topic to be recognized.
-
-status:
- title: Status
- content: >
- If disabled, this Help Topic will not be able to be selected by Clients in
- the Client Interface.
-
-type:
- title: Type
- content: >
- If a Topic is labelled as Private, it will only be available for Agents to
- choose when an Agent opens a new Ticket under the Staff Panel.
-
-parent_topic:
- title: Parent Topic
- content: >
- Do you want the New Topic to be treated as a subtopic? If so, then choose a
- Parent Topic under which your New Topic will belong.
-
-new_ticket_options:
- title: New Ticket Options
- content: >
-
-custom_form:
- title: Custom Form
- content: >
- Custom Forms will help you acquire more specific information from Client’s
- that are relevant to specific Departments and/or Help Topics.
- links:
- - title: Create a Custom Form
- href: /scp/forms.php
-
-priority:
- title: Priority
- content: >
- New Tickets created related to the New Topic will be labeled as having what
- priority level?
-
-department:
- title: Department
- content: >
- If a Client chooses this New Topic as relevant to their situation, to what
- Department do you want their Ticket to be routed?
-
-sla_plan:
- title: SLA Plan
- content: >
- Each Department has a default SLA plan for their Tickets. However, if your
- New Topic is a special case requiring different time constraints, you can
- override the Departments default SLA Plan by choosing an SLA Plan here.
- links:
- - title: Create or Edit SLA Plans
- href: /scp/slas.php
-
-thank_you_page:
- title: Thank-You Page
- content: >
- Choose the Thank-You Page to which a Client is directed after opening a
- Ticket.
- links:
- - title: Manage your Thank-You Page
- href: /scp/pages.php
-
-auto_assign_to:
- title: Auto-assign to…
- content: >
- You may optionally choose to what Agent or Team the Tickets characterized
- by this New Topic will be sent.
- links:
- - title: Manage Teams
- href: /scp/teams.php
-
-ticket_auto_response:
- title: Ticket Auto-response
- content: >
- If enabled, this will prevent any alert sent out to notify any Agent of the
- new ticket. Therefore, this overrides any setting of the
- <span class="doc-desc-title">Department</span> to which the ticket belongs.
-
-admin_notes:
- title: Admin Notes
- content: >
- These notes are only visible to those whose account type is <span
- class='doc-desc-opt'>Admin</span>.
-
-add_topic:
- title: Add Topic
- content: >
diff --git a/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml b/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml
deleted file mode 100644
index 255a4e24d806492805c55395022f9c7457019149..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Add New SLA Plan
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-# title - Link title
-# href - href of link (links starting with / are translated to the
-# helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-name:
- title: Name
- content: >
- Choose a name for this <span class="doc-desc-title">SLA Plan</span>
- that will reflect its purpose or specificity (e.g., exclusivity to
- a <span class="doc-desc-title">Department</span> or <span
- class="doc-desc-title">Help Topic</span>).
-
-grace_period:
- title: Grace Period
- content: >
- This is the how many hours pass by before the status of tickets
- with this <span class="doc-desc-title">SLA Plan</span> are rendered
- as <span class="doc-desc-opt">Overdue</span>.
-
-status:
- title: Status
- content: >
-
-priority_escalation:
- title: Priority Escalation
- content: >
- If enabled, the <span class="doc-desc-title">Priority</span> level
- of tickets will increase as the duration of a ticket’s status as
- <span class="doc-desc-opt">Overdue</span> increases. It is
- recommended to enable to help your Agents prioritize their tickets
- properly.
-
-transient:
- title: Transient
- content: >
- Enable this if you want to allow restrictions of a <span
- class="doc-desc-title">SLA Plan</span> to be overridden
- when a ticket is transferred or its <span
- class="doc-desc-title">Help Topic</span> is changed.
-
-ticket_overdue_alerts:
- title: Ticket Overdue Alerts
- content: >
diff --git a/include/i18n/en_US/help/tips/manage.addnew_filter.yaml b/include/i18n/en_US/help/tips/manage.filter.yaml
similarity index 53%
rename from include/i18n/en_US/help/tips/manage.addnew_filter.yaml
rename to include/i18n/en_US/help/tips/manage.filter.yaml
index 7e1f60edd19e66be458b63a6ae5f1392f7c27459..3b1da4336e7eb2ac5b46ffcf0b69a9da842d182e 100644
--- a/include/i18n/en_US/help/tips/manage.addnew_filter.yaml
+++ b/include/i18n/en_US/help/tips/manage.filter.yaml
@@ -1,5 +1,5 @@
#
-# This is popup help messages for the Admin Panel -> Manage -> Add New Filter
+# This is popup help messages for the Admin Panel -> Manage -> Filter
#
# Fields:
# title - Shown in bold at the top of the popover window
@@ -13,39 +13,29 @@
# must match the HTML #ids put into the page template.
#
---
-filter_name:
- title: Filter Name
- content: >
execution_order:
title: Execution Order
content: >
- Choose a number that controls the priority of the filter being created. The
+ Enter a number that controls the priority of the filter. The
lower the number, the higher the priority this filter will have in being
- executed over against another filter that might have an identical match.
- A match is found according to the filter rules set below. If you want this
- filter to be the last filter applied to a match, enable <span
+ executed over against another filter that might have higher order of execution.
+ <br><br>
+ If you want this filter to be the last filter applied on a match, enable <span
class="doc-desc-title">Stop Processing Further On Match</span>.
-filter_status:
- title: Filter Status
- content: >
-
-target:
- title: Target
+target_channel:
+ title: Channel
content: >
- Choose the <span class="doc-desc-title">Target</span> for your <span
+ Choose the target <span class="doc-desc-title">Channel</span> for your <span
class="doc-desc-title">ticket Filter</span>. The <span
- class="doc-desc-title">Target</span> is the source that created the ticket.
- So, for example, if you choose <span class="doc-desc-opt">Web Forms</span>,
+ class="doc-desc-title">Channel</span> is the source through which the ticket arrived into the system.
+ <br><br>
+ For example, if you choose <span class="doc-desc-opt">Web Forms</span>,
you are saying that you want to apply the <span
class="doc-desc-title">ticket Filter</span> to those tickets that
originated from the Client Portal's webform.
-filter_rules:
- title: Filter Rules
- content: >
-
rules_matching_criteria:
title: Rules Matching Criteria
content: >
@@ -58,55 +48,42 @@ rules_matching_criteria:
Filter</span> to be matched, choose <span class="doc-desc-opt">Match
All</span>.
-basic_fields_criterion:
- title: Basic Fields Criterion
- content: >
- The selectable options below this header are those elements which can be
- found in any standard ticket. Note: the Email option here indicates from
- whom the Email was sent.
-
-criterion_operator:
- title: Criterion Operator
- content: >
- Choose an operator to control what kind of test is performed against the
- chosen field on the left with the value entered in the text field on the
- right.
-
-filter_actions:
- title: Filter Actions
- content: >
-
reject_ticket:
title: Reject Ticket
content: >
- If this is enabled, all other choices of action below will be ignored.
+ If this is enabled, further processing is stopped and all other choices of action below will be ignored on match.
reply_to_email:
title: Reply-To Email
content: >
- Enable this if you want your Help Desk to honor a Client's email
- application's <span class="doc-desc-title">Reply To</span> data. This field
- is only relevant if the <span class="doc-desc-title">Target</span> above is
- an <span class="doc-desc-opt">Email Address</span>.
+ Enable this if you want your Help Desk to honor a User's email
+ application's <span class="doc-desc-title">Reply To</span> header.
+ This field is only relevant if the <span
+ class="doc-desc-title">Channel</span> above includes <span
+ class="doc-desc-opt">Email</span>.
ticket_auto_response:
- title: ticket Auto-Response
+ title: Disable Ticket Auto-Response
content: >
<em>Note: This will override any <span
- class="doc-desc-title">Department</span> settings.</em>
+ class="doc-desc-title">Department</span> or <span class="doc-desc-title">Autoresponder settings</span>.</em>
canned_response:
- title: Canned Response
- content: >
- Choose the <span class="doc-desc-title">Canned Response</span> you want included in the email to go out from the Default Email Address of the <span class="doc-desc-title">Help Desk</span> or <span class="doc-desc-title">Department</span> (if enabled). The <span class="doc-desc-title">New ticket Auto-Reply</span> template in an <span class="doc-desc-title">Email Template Set</span> will control how the <span class="doc-desc-title">Canned Response</span> is included in that email. What <span class="doc-desc-title">Email Template Set</span> is used depends on what template set is assigned as default, or to a matching ticket's <span class="doc-desc-title">Department</span>.
+ title: Canned Auto-Reply
+ content: >
+ Choose a <span class="doc-desc-title">Canned Response</span> you
+ want to be emailed to the user on <span
+ class="doc-desc-title">Ticket Filter</span> match. The <span
+ class="doc-desc-title">New Ticket Auto-Reply</span> template used
+ depends on what <span class="doc-desc-title">template set</span> is
+ assigned as default, or to a matching ticket's <span
+ class="doc-desc-title">Department</span>.
links:
- title: Manage Canned Responses
href: /scp/canned.php
- - title: Manage Departments
- href: /scp/departments.php
- title: Manage Template Sets
href: /scp/templates.php
- - title: Edit the Default New Ticket Auto-Reply Template
+ - title: New Ticket Auto-Reply Template
href: /scp/templates.php?id=2&a=manage
department:
@@ -115,6 +92,9 @@ department:
Choose what <span class="doc-desc-title">Department</span> you want the
matches of the <span class="doc-desc-title">Ticket Filter</span> to be
assigned.
+ links:
+ - title: Manage Departments
+ href: /scp/canned.php
priority:
title: Priority
@@ -123,8 +103,8 @@ priority:
be applied to the matches of the <span class="doc-desc-title">Ticket
Filter</span>.<br />
<br />
- <em>Note: This will override any <span
- class="doc-desc-title">Department</span> settings.</em>
+ <em>Note: This will override <span
+ class="doc-desc-title">Department</span> or <span class="doc-desc-title"> Help Topic</span> settings.</em>
sla_plan:
title: SLA Plan
@@ -132,12 +112,20 @@ sla_plan:
Choose the <span class="doc-desc-title">SLA Plan</span> you want to
be applied to the matches of the <span class="doc-desc-title">Ticket
Filter</span>.
+ links:
+ - title: Manage SLA Plans
+ href: /scp/slaplan.php
-auto_assign_to:
- title: Auto-Assign to…
+auto_assign:
+ title: Auto-Assign
content: >
- Choose the Agent to whom you want the matches of the <span
+ Choose an Agent or a Team to whom you want the matches of the <span
class="doc-desc-title">Ticket Filter</span> to be assigned.
+ links:
+ - title: Manage Agents
+ href: /scp/staff.php
+ - title: Manage Teams
+ href: /scp/teams.php
help_topic:
title: Help Topic
@@ -145,6 +133,9 @@ help_topic:
Choose the <span class="doc-desc-title">Help Topic</span> you want to
be applied to the matches of the <span class="doc-desc-title">Ticket
Filter</span>.
+ links:
+ - title: Manage Help Topics
+ href: /scp/helptopics.php
admin_notes:
title: Admin Notes
diff --git a/include/i18n/en_US/help/tips/manage.help_topics.yaml b/include/i18n/en_US/help/tips/manage.help_topics.yaml
deleted file mode 100644
index 519a870091d62d1c4ad09038682a5de1ad4b0850..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.help_topics.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Help Topics
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-# title - Link title
-# href - href of link (links starting with / are translated to the
-# helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-help_topics:
- title: Help Topics
- content: >
- Your Help Topics help guide what information is gathered from a Client and
- how that Client is handled by your Company. The Help Topics are specific to
- a Department and can include Custom Forms.
diff --git a/include/i18n/en_US/help/tips/manage.helptopic.yaml b/include/i18n/en_US/help/tips/manage.helptopic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..57869f5960ca71935666b528154db21c3b3c5e9c
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.helptopic.yaml
@@ -0,0 +1,112 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Help Topic
+#
+# Fields:
+# title - Shown in bold at the top of the popover window
+# content - The body of the help popover
+# links - List of links shows below the content
+# title - Link title
+# href - href of link (links starting with / are translated to the
+# helpdesk installation path)
+#
+# The key names such as 'helpdesk_name' should not be translated as they
+# must match the HTML #ids put into the page template.
+#
+---
+help_topic_information:
+ title: Help Topic Information
+ content: >
+ Your Help Topics help guide what information is gathered from Users and
+ how tickets are routed or assigned.
+topic:
+ title: Topic Name
+ content: >
+ Uniqueue Help Topic name.
+
+status:
+ title: Status
+ content: >
+ If disabled, this Help Topic will not be available in the Client Interface.
+
+type:
+ title: Type
+ content: >
+ If a Topic is labelled as Private, it will only be available for Agents to
+ choose when an Agent opens a new Ticket under the Staff Panel.
+
+parent_topic:
+ title: Parent Topic
+ content: >
+ Do you want this Help Topic to be treated as a subtopic? If so, then choose a
+ Parent Topic under which this Help Topic will belong.
+
+custom_form:
+ title: Custom Form
+ content: >
+ Custom Forms will help you acquire more specific information from Users
+ that are relevant to this Help Topics.
+ links:
+ - title: Manage Custom Forms
+ href: /scp/forms.php
+
+priority:
+ title: Priority
+ content: >
+ Priority assigned to new ticket related to this Help Topic.
+ <br><br>
+ Ticket Filters can override new ticket Priority.
+
+department:
+ title: Department
+ content: >
+ Choose Department to which new tickets under this Help Topic will be routed.
+ links:
+ - title: Manage Departments
+ href: /scp/departments.php
+sla_plan:
+ title: SLA Plan
+ content: >
+ Choose SLA plan associated with this Help Topic.
+ <br><br>
+ Department default SLA plan will be overriden by choosing an SLA plan.
+ links:
+ - title: Manage SLA Plans
+ href: /scp/slas.php
+
+thank_you_page:
+ title: Thank-You Page
+ content: >
+ Choose the Thank-You Page to which a User is directed after opening a
+ Ticket.
+ links:
+ - title: Manage Thank-You Pages
+ href: /scp/pages.php
+
+auto_assign_to:
+ title: Auto-assign New Tickets
+ content: >
+ You may optionally choose to what Agent or Team the new Tickets characterized
+ by this New Topic will be sent.
+ <br><br>
+ Ticket Filters can override assignment.
+ links:
+ - title: Manage Staff
+ href: /scp/staff.php
+ - title: Manage Teams
+ href: /scp/teams.php
+ - title: Manage Filters
+ href: /scp/filters.php
+
+ticket_auto_response:
+ title: Ticket Auto-response
+ content: >
+ If checked, the setting will disable new ticket auto-response for this Help Topic.
+ <br><br>
+ This overrides <span class="doc-desc-title">Department</span> as
+ well as global <span class="doc-desc-title">Autoresponder
+ settings</span>.
+admin_notes:
+ title: Admin Notes
+ content: >
+ These notes are only visible to those whose account type is <span
+ class='doc-desc-opt'>Admin</span>.
diff --git a/include/i18n/en_US/help/tips/manage.sla.yaml b/include/i18n/en_US/help/tips/manage.sla.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..eeb45a8d03892e769496d6d36cb8ae9ebb0faa81
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.sla.yaml
@@ -0,0 +1,38 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> SLA Plan
+#
+# Fields:
+# title - Shown in bold at the top of the popover window
+# content - The body of the help popover
+# links - List of links shows below the content
+# title - Link title
+# href - href of link (links starting with / are translated to the
+# helpdesk installation path)
+#
+# The key names such as 'helpdesk_name' should not be translated as they
+# must match the HTML #ids put into the page template.
+#
+---
+name:
+ title: Name
+ content: >
+ Choose a discriptive name for this <span class="doc-desc-title">SLA Plan</span>
+ that will reflect its purpose or specificity.
+
+grace_period:
+ title: Grace Period
+ content: >
+ This is the how many hours pass by before the <span class="doc-desc-title">Open Tickets</span>
+ with this <span class="doc-desc-title">SLA Plan</span> are marked
+ as <span class="doc-desc-opt">Overdue</span>.
+ <br><br>
+ <em>Hours are counted from ticket create time.</em>
+
+transient:
+ title: Transient
+ content: >
+ Enable this if you want the <span class="doc-desc-title">SLA
+ Plan</span> to be considered temporary and overridable by
+ none-transient SLA on <span class="doc-desc-opt">Department</span>
+ transfer or when its <span class="doc-desc-title">Help Topic</span>
+ is changed.
diff --git a/include/i18n/en_US/help/tips/manage.ticket_filters.yaml b/include/i18n/en_US/help/tips/manage.ticket_filters.yaml
deleted file mode 100644
index 92bf291040388a744695bb2b35efd06fa033c28d..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/manage.ticket_filters.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Manage -> Ticket Filters
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-# title - Link title
-# href - href of link (links starting with / are translated to the
-# helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-ticket_filters:
- title: Ticket Filters
- content: >
-
-name:
- title: Name
- content: >
-
-status:
- title: Status
- content: >
-
-order:
- title: Order
- content: >
-
-rules:
- title: Rules
- content: >
-
-target:
- title: Target
- content: >
diff --git a/include/i18n/en_US/help/tips/settings.access.yaml b/include/i18n/en_US/help/tips/settings.access.yaml
index 53c6be38bf73ab28370bc1f1a6220caa18ebd1e7..17a86118687abd1f9aa2b2b67b88103a5680aff3 100644
--- a/include/i18n/en_US/help/tips/settings.access.yaml
+++ b/include/i18n/en_US/help/tips/settings.access.yaml
@@ -31,41 +31,44 @@ password_expiration_policy:
allow_password_resets:
title: Allow Password Resets
content: >
- Enable this feature if you would like to display the
+ Enable this feature if you would like to display the
<span class="doc-desc-title">Forgot My Password</span> link on the
<span class="doc-desc-title">Staff Log In Panel</span>
- after 2 failed log in attempts.
+ after a failed log in attempt.
reset_token_expiration:
title: Password Reset Window
content: >
Choose the duration (in minutes) for which the <span class="doc-desc-title">
- Password Reset Token</span> will be valid. When an Agent requests a <span
+ Password Reset Tokens</span> will be valid. When an Agent requests a <span
class="doc-desc-title">Password Reset</span>, they are emailed a token that
- will permit the reset to take place. This token however must have an
- expiration.
+ will permit the reset to take place.
staff_session_timeout:
title: Staff Session Timeout
content: >
Choose the maximum idle time (in minutes) before an Agent is required to
- log in again. If you would like to disable <span
- class="doc-desc-title">Staff Session Timeouts</span>,
- enter 0 to <span class="doc-desc-opt">disable</span>.
+ log in again.
+ <br><br>
+ If you would like to disable <span class="doc-desc-title">Staff
+ Session Timeouts</span>, enter 0.
client_session_timeout:
- title: Client Session Timeout
+ title: User Session Timeout
content: >
- Choose the maximum idle time (in minutes) before a Client is required to
- log in again. If you would like to disable <span
- class="doc-desc-title">Client</span> <span class="doc-desc-title">Session
- Timeouts,</span> enter 0 to <span class="doc-desc-opt">disable</span>.
+ Choose the maximum idle time (in minutes) before a User is required to
+ log in again.
+ <br><br>
+ If you would like to disable <span
+ class="doc-desc-title">User Session Timeouts,</span> enter 0.
bind_staff_session_to_ip:
title: Bind Staff Session to IP
content: >
- Enable this if you want the Agent to be remembered by their current IP
- at the time of Log In.
+ Enable this if you want Agent to be remembered by their current IP
+ upon Log In.
+ <br><br>
+ This setting is not recommened for users assigned IP addreses dynamically.
registration_method:
title: Registration Options
@@ -89,7 +92,7 @@ registration_method:
<td>Anyone can create a ticket, but only agents
can register accounts</td></tr>
<tr><td>Yes</td><td>Private</td>
- <td>Client access is by invitation only</td></tr>
+ <td>User access is by invitation only</td></tr>
<tr><td>No</td><td>Disabled</td>
<td>No one can register for an account, but anyone can
create a ticket. <em>This was how osTicket functioned
diff --git a/include/i18n/en_US/help/tips/settings.alerts.yaml b/include/i18n/en_US/help/tips/settings.alerts.yaml
index d13a702e51d84ad887c7ff2a99fb38b1eb777729..5a37ac2275de5013e432926db53b73ce6762f984 100644
--- a/include/i18n/en_US/help/tips/settings.alerts.yaml
+++ b/include/i18n/en_US/help/tips/settings.alerts.yaml
@@ -22,188 +22,73 @@ page_title:
for those which are enabled, which staff members should be included
on the automated notifications.
-new_ticket_alert:
+ticket_alert:
title: New Ticket Alert
content: >
<p>
- Pertains to alerts that are sent out when new tickets are created.
+ Alert sent out to Agents when a new ticket is created.
</p><p class="info-banner">
<i class="icon-info-sign"></i>
- Staff members (department members) are not
- notified with this alert if the ticket is automatically assigned.
+ New ticket alert is not sent out if the ticket is automatically assigned.
</p>
links:
- title: Default New Ticket Alert Template
href: /scp/templates.php?default_for=ticket.alert
-status:
- title: Status
- content: >
- You may choose to disable whether any notice of New Tickets are sent out at
- all.
-
-new_message_alert:
+message_alert:
title: New Message Alert
content: >
- Alert sent out when a New Message from the Client is appended to an
+ Alert sent out when a New Message from the User is appended to an
existing ticket.
links:
- title: Default New Message Alert Template
href: /scp/templates.php?default_for=message.alert
-status_2:
- title: Status
- content: >
- You may disable this Alert.
-
-last_respondent:
- title: Last Respondent
- content: >
- Choose whether you would like the last Agent to have communicated with the
- Client to be Alerted of the Client’s reply.
-
-assigned_staff:
- title: Assigned Staff
- content: >
- Choose whether you would like the Assigned Agent to receive an Alert of a
- Client’s reply.
-
-department_manager:
- title: Department Manager
- content: >
- If enabled, the Department Manager’s Inbox could be flooded unnecessarily
- with Email Alerts.
-
-new_internal_note_alert:
+internal_note_alert:
title: New Internal Note Alert
content: >
- Pertains to alerts that are sent out when a new <span
- class="doc-desc-title">Internal Note</span> is recorded.
+ Alert sent out when a new <span class="doc-desc-title">Internal
+ Note</span> is appended to a ticket.
links:
- title: Default Ticket Activity Template
href: /scp/templates.php?default_for=note.alert
-last_respondent_2:
- title: Last Respondent
- content: >
- If enabled, the last Agent to have communicated with the Client will
- receive an Alert that an Agent has recorded a new Internal Note on a Ticket
- with which they have been involved.
-
-assigned_staff_2:
- title: Assigned Staff
- content: >
- If enabled, the last Agent assigned to the Ticket will receive an Alert
- that an Agent has recorded a new Internal Note.
-
-department_manager_2:
- title: Department Manager
- content: >
- If enabled, the Department Manager’s Inbox could be flooded unnecessarily
- with Email Alerts.
-
-ticket_assignment_alert:
+assignment_alert:
title: Ticket Assignment Alert
content: >
- Pertains to alerts that are sent out to Agents when a ticket is assigned.
+ Alert sent out to Staff on ticket assignment.
links:
- title: Default Ticket Assignment Alert Template
href: /scp/templates.php?default_for=assigned.alert
-assigned_staff_3:
- title: Assigned Staff
- content: >
- If enabled, the Agent being assigned to a Ticket will receive an Alert
- notifying them of such.
-
-team_lead:
- title: Team Lead
- content: >
- If enabled, if a Ticket is assigned to a Team, the Team Lead will be
- alerted of the new Assigned Ticket. (To manage your Teams, see Admin Panel
- -> Agent (Staff) Members -> Teams).
-
-team_members:
- title: Team Members
- content: >
- If enabled, if a Ticket is assigned to a Team, the entire Team will be
- alerted of the new Assigned Ticket. This may cause an unnecessary amount of
- Email traffic and should be used with caution. (To manage your Teams, see
- Admin Panel -> Agent (Staff) Members -> Teams).
-
-ticket_transfer_alert:
+transfer_alert:
title: Ticket Transfer Alert
content: >
- Pertains to alerts that are sent out to the target <span
- class="doc-desc-title">department</span> when a ticket is transferred.
+ Alert sent out on ticket transfer.
links:
- title: Default Ticket Transfer Alert Template
href: /scp/templates.php?default_for=transfer.alert
-assigned_staff_team:
- title: Assigned Staff/Team
- content: >
- If enabled, the new Agent/Team of the targeted Department will be alerted
- of such.
-
-department_manager_3:
- title: Department Manager
- content: >
- If enabled, when a Ticket is transferred to a new Department, the Manager
- of the targeted Department will be alerted of such.
-
-department_members:
- title: Department Members
- content: >
- If enabled, the every member of the Targeted Department will receive an
- Alert of the Ticket Transfer. This may cause an unnecessary amount of Email
- traffic and should be used with caution.
-
-overdue_ticket_alert:
+overdue_alert:
title: Overdue Ticket Alert
content: >
- Pertains to alerts that are sent out when a ticket becomes overdue. The
- <span class="doc-desc-title">Administrator</span> receives an alert by
- default.
+ Alerts sent out when a ticket becomes overdue based on SLA or Overdue Date.
links:
- title: Default Stale Ticket Alert Template
href: /scp/templates.php?default_for=ticket.overdue
-assigned_staff_team_2:
- title: Assigned Staff/Team
- content: >
- The Agent or Team that is assigned to the Ticket entering an Overdue status
- will be alerted of such.
-
-department_manager_4:
- title: Department Manager
- content: >
- The Manager of the Department whose Ticket enters an Overdue status will be
- alerted.
-
-department_members_2:
- title: Department Members
- content: >
- If enabled, every member of the <span class="doc-desc-title">Department</span> will receive an Alert of the
- Overdue status of the ticket. This may cause an unnecessary amount of Email
- traffic and should be used with caution.
+ - title: Manage SLAs
+ href: /scp/slas.php
system_alerts:
title: System Alerts
content: >
- Pertains to alerts that are sent out when a <span
- class="doc-desc-title">System Error</span> occurs. This is enabled by
- default. Errors are sent to the system <span
- class="doc-desc-title">Administrator</span> (%{config.admin_email}).
-
-system_errors:
- title: System Errors
- content: >
- This is enabled by default. Alerts of System Errors are sent to the System
- Administrator’s Email.
+ Alerts that are sent out when system error occurs. All <span class="doc-desc-title">System Errors</span> are logged in <span class="doc-desc-title">System Logs</span>
+ <br><br>
+ System errors, by default, are sent to the administrator's email (%{config.admin_email}).
+ links:
+ - title: View System Logs
+ href: /scp/logs.php
-excessive_login_attempts:
- title: Excessive Login Attempts
- content: >
- If enabled, the System Administrator will be alerted when a Client or Agent
- undergoes excessive failed login attempts.
+ - title: Change Admin Email
+ href: /scp/settings.php?t=emails
diff --git a/include/i18n/en_US/help/tips/settings.autoresponder.yaml b/include/i18n/en_US/help/tips/settings.autoresponder.yaml
index e67db2f5e1e3f48d3e1ddad28e0863577c8f24d0..35faf7ae2f1558dd8b193c207fd56c41b2bf5a8f 100644
--- a/include/i18n/en_US/help/tips/settings.autoresponder.yaml
+++ b/include/i18n/en_US/help/tips/settings.autoresponder.yaml
@@ -16,47 +16,45 @@
new_ticket:
title: New Ticket
content: >
- Enable this if you want a confirmation message sent to the Client
- that the Help Desk has received their new ticket. The message sent to
- the Client is customizable.
+ Enable this if you want an autoresponse to be sent to the User on new ticket.
links:
- - title: Default New Ticket Autoresponse Template
+ - title: New Ticket Autoresponse Template
href: /scp/templates.php?default_for=ticket.autoresp
new_ticket_by_staff:
title: New Ticket by Staff
content: >
- Notice sent when staff creates a ticket on behalf of the user. <em>Staff
+ Notice sent when an Agent creates a ticket on behalf of the User. <em>Agent
can override this when creating new tickets.</em>
links:
- - title: Default New Ticket by Staff Autoresponse Template
+ - title: New Ticket Notice Template
href: /scp/templates.php?default_for=ticket.notice
new_message_for_submitter:
- title: New Message for Submitter
+ title: New Message Confirmation
content: >
Confirmation notice sent when a new message is appended to an existing
ticket.
links:
- - title: Default New Message Confirmation Template
+ - title: New Message Confirmation Template
href: /scp/templates.php?default_for=message.autoresp
new_message_for_participants:
- title: New Message for Participants
+ title: New Message Notice
content: >
Broadcast messages received from message submitter to all other
participants on the ticket.
links:
- - title: Default New Activity Template
+ - title: New Activity Notice Template
href: /scp/templates.php?default_for=ticket.activity.notice
overlimit_notice:
title: Overlimit Notice
content: >
- Send ticket denied notice sent to user on limit violation. Admin gets
- alerts on <em>all</em> denials by default.
+ Ticket denied notice sent to User on <span
+ class="doc-desc-title">Maximum Open Tickets</span> violation.
links:
- - title: Default Overlimit Notice Template
+ - title: Overlimit Notice Template
href: /scp/templates.php?default_for=ticket.overlimit
- title: Set <em>Maximum Open Tickets</em>
diff --git a/include/i18n/en_US/help/tips/settings.email.yaml b/include/i18n/en_US/help/tips/settings.email.yaml
index de1a41d4acf0ba110b875a67f1db1ba25ad35247..28f90442e401b368754734b5abd9e42f946bab24 100644
--- a/include/i18n/en_US/help/tips/settings.email.yaml
+++ b/include/i18n/en_US/help/tips/settings.email.yaml
@@ -14,109 +14,112 @@
#
---
default_email_templates:
- title: Default Email Templates
+ title: Default Email Template Set
content: >
- <span class="doc-desc-title">Templates</span> are used as <span
- class="doc-desc-title">Auto-Responses</span> for various actions that can
- take place during a Ticket’s lifetime. <span
- class="doc-desc-title">Alerts</span> are sent to Agents as assigned by
- <span class="doc-desc-title">Department</span>, <span
- class="doc-desc-title">Team</span>, <span class="doc-desc-title">Help
- Topic</span> or <span class="doc-desc-title">Group</span>. Responses or
- Replies are intended for the Client who created the Ticket.
+ Select <span class="doc-desc-title">Email Template Set</span> used to send <span
+ class="doc-desc-title">Auto-Responses</span> and <span class="doc-desc-title">Alerts</span> for various actions that can
+ take place during a Ticket’s lifetime.
+ <br><br>
+ Departments can be assigned specific set of Email Template.
+ links:
+ - title: Manage Email Template Sets
+ href: /scp/templates.php
default_system_email:
- title: Default System Email
+ title: Default Outgoing Email
content: >
- Choose an Email Address from which <span
- class="doc-desc-title">Auto-Responses</span> are sent to Clients. Note,
- however, that if the Department to which a Ticket is assigned sets its own
- Default Email Address, that Department Address will override what is set
- here.
+ Choose an email address from which outgoing emails are sent.
+ <br><br>
+ <span class="doc-desc-title">Department</span> can set its own <span
+ class="doc-desc-title">email address</span> which will override what is set here.
+ links:
+ - title: Manage Email Addresses
+ href: /scp/emails.php
default_alert_email:
title: Default Alert Email
content: >
- Choose an Email Address from which Agents are sent <span class="doc-desc-title">Alerts &
- Notices</span>. Note, however, that if the <span
- class="doc-desc-title">Department</span> or <span
- class="doc-desc-title">Help Topic</span> sets its own <span
- class="doc-desc-title">Default Email Address</span>, that <span
- class="doc-desc-title">Department</span> or <span
- class="doc-desc-title">Help Topic</span> setting will override what is set
- here.
+ Choose an email address from which <span class="doc-desc-title">Alerts &
+ Notices</span> are sent to Agents.
+ links:
+ - title: Manage Email Addresses
+ href: /scp/emails.php
admins_email_address:
title: Admin’s Email Address
content: >
- Choose an Email Address from which notices of the <span
- class="doc-desc-title">System Error Log</span> and <span
- class="doc-desc-title">New Ticket Alerts</span> (if enabled) are sent to
- the Helpdesk Administrator.
+ Enter an adminstrator's email address to which <span
+ class="doc-desc-title">System Errors</span> and <span
+ class="doc-desc-title">New Ticket Alerts</span> (if enabled) are sent.
+ links:
+ - title: Manage Alerts & Notices
+ href: /scp/settings.php?t=alerts
-incoming_emails:
- title: Incoming Emails
+email_fetching:
+ title: Email Fetching
content: >
- Allow IMAP/POP polling once you have set up the information in emails
- section of Admin Panel. You can also edit the reply separator text.
-
+ Allow IMAP/POP polling for configured and enabled <span class="doc-desc-title">Mail Boxes</span>.
+ links:
+ - title: Manage Mail Boxes
+ href: /scp/emails.php
-email_polling:
- title: Email Polling
+enable_autocron_fetch:
+ title: Fetch Emails using Auto-cron
content: >
- Allow IMAP/POP polling once you have set up the information in emails
- section of Admin Panel. You can also edit the reply separator text.
+ Enables periodic email fetching using an internal task manager
+ triggered by Agents' activity. <br><br> Please note that emails will not be
+ fetched if no one is logged in to Staff Control Panel. External task scheduler
+ is highly recommended for predictable fetch intervals.
+ links:
+ - title: Using External Task Scheduler
+ href: http://osticket.com/wiki/POP3/IMAP_Setting_Guide#Schedule_Polling
strip_quoted_reply:
title: Strip Quoted Reply
content: >
- If enabled, this will remove any preceding correspondences duplicated
- between response communication. Thereby, the Agent & Client, when viewing
- the Ticket, will not see any one preceding message duplicated. <br /><br />
- <strong>Note:</strong> this will not actually delete preceding communication; it will only hide it from
- the Agent & Client. Furthermore, this feature is relationally dependent
- on the <span class="doc-desc-title">Reply Separator Tag</span> below.
+ If enabled, this will remove preceding correspondence between email communications.
+ <br><br>
+ This feature is relationally dependent on the <span
+ class="doc-desc-title">Reply Separator Tag</span> below.
reply_separator_tag:
title: Reply Separator Tag
content: >
- This is the string that will tell the engine that anything below this line
- is old correspondence. This way the engine knows to remove it from the
- Client or Agent’s sight. <br /><br />
+ This is a token indicating to the User to reply above the line.
+ <br><br>
<strong>Note:</strong> this is only relevant if <span
class="doc-desc-title">Strip Quoted Reply</span> is enabled above.
emailed_tickets_priority:
title: Emailed Tickets Priority
content: >
- Choose whether you would like the priority option of the email service
- (e.g., Yahoo, Gmail, etc.) to dictate the new ticket’s priority status. This
- setting can be overridden by a <span class="doc-desc-title">Ticket
- Filter</span>.
+ Choose whether you would like the priority/importance option of the
+ User's email (e.g. OutLook) to dictate the new ticket’s priority.
+ <br><br>
+ This setting can be overridden by a <span
+ class="doc-desc-title">Ticket Filter</span>.
links:
- title: Create & Manage Ticket Filters
href: /scp/filters.php
+accept_all_emails:
+ title: Accept All Emails
+ content: >
+ Accept emails from unknown Users.
+ <br><br>
+ Unchecking this setting will result in tickets getting rejected.
+
accept_email_collaborators:
title: Accept Email Collaborators
content: >
- Add participants included in the <code><strong>To</strong></code>
- and <code><strong>CC</strong></code> fields of email as ticket
- collaborators.<br /><br />
- <em>Collaborators can always be added manually by staff members when
+ Add email participants included in the <code><strong>To</strong></code>
+ and <code><strong>CC</strong></code> fields as ticket collaborators.
+ <br /><br />
+ <em>Collaborators can always be added manually by Agents when
viewing a ticket.</em>
-default_outgoing_email:
- title: Default Outgoing Email
- content: >
- <span class="doc-desc-title">Default Outgoing Email</span> only applies to
- outgoing emails without SMTP setting.
-
-enable_autocron_poll:
- title: Poll Email using Auto-cron
+default_mta:
+ title: Default MTA
content: >
- <em><b>Not Recommended</b></em><br/><br/>
- Enables fetching email periodically using the automatic cron system.
- As admin and staff members interact with the system, the system will
- periodically run cleanup routines called the auto-cron. This setting
- enables fetching email during this cleanup.
+ <span class="doc-desc-title">Default MTA</span> takes care of
+ email delivery process for outgoing emails without SMTP setting.
diff --git a/include/i18n/en_US/help/tips/settings.kb.yaml b/include/i18n/en_US/help/tips/settings.kb.yaml
index fd0c3a91a51216cea73a2f90710f6de51bc90d2a..ea3cb117e1cfeba21b81b6a88df49b034138ff83 100644
--- a/include/i18n/en_US/help/tips/settings.kb.yaml
+++ b/include/i18n/en_US/help/tips/settings.kb.yaml
@@ -20,18 +20,20 @@ knowledge_base_settings:
knowledge_base_status:
title: Knowledge Base Status
content: >
- Enable this setting to allow your clients self-service access to
+ Enable this setting to allow your users self-service access to
your public knowledge base articles.
+ <br><br>
+ Knowledge base categories and FAQs can be made internal (viewable only by Agents.)
links:
- - title: View and edit the content of your Knowledge Base
+ - title: Manage Knowledge Base
href: /scp/kb.php
canned_responses:
title: Canned Responses
content: >
- Enable this setting to allow agents to configure and use <span
+ Enable this setting to allow Agents to use <span
class="doc-desc-title">Canned Responses</span> when replying to
tickets.
links:
- - title: Manage Canned Responses for Agents
+ - title: Manage Canned Responses
href: /scp/canned.php
diff --git a/include/i18n/en_US/help/tips/settings.ticket.yaml b/include/i18n/en_US/help/tips/settings.ticket.yaml
index b9d3fee67210926a3949a8102b334bc4626b3b7a..50693c2a370d1c4b061c96f58e4bab9d271eebe7 100644
--- a/include/i18n/en_US/help/tips/settings.ticket.yaml
+++ b/include/i18n/en_US/help/tips/settings.ticket.yaml
@@ -34,20 +34,18 @@ default_priority:
maximum_open_tickets:
title: Maximum Open Tickets
content: >
- Enter the maximum <em>number</em> of <span class="doc-desc-title">Open
- Tickets</span> a Client is permitted to have simultaneously. This will help protect
- against spam and enable email flood control. Enter <span class="doc-desc-opt">0
- </span> if you prefer to disable this limitation.
+ Enter the maximum <em>number</em> of tickets a User is permitted to
+ have <strong>open</strong> in your help desk.
+ <br><br>
+ Enter <span class="doc-desc-opt">0 </span> if you prefer to disable this limitation.
agent_collision_avoidance:
title: Agent Collision Avoidance
content: >
- Enter the length of time after an Agent stops ticket-response activity that a
- lockout period takes affect. This lockout prevents other Agents from sending
- a ticket response to the Client. It does not however prevent others from
- composing a draft. If the locking Agent sends their response, then any other
- Agent’s draft will be deleted. Enter <span class="doc-desc-opt">0</span>
- to disable the lockout feature.
+ Enter the maximum length of time an Agent is allowed to hold a lock
+ on a ticket without any activity.
+ <br><br>
+ Enter <span class="doc-desc-opt">0</span> to disable the lockout feature.
email_ticket_priority:
title: Email Ticket Priority
@@ -65,26 +63,29 @@ human_verification:
content: >
Enable CAPTCHA on the Client Portal to verify an incoming ticket is the
result of human activity.
+ <br><br>
+ Requires GDLib library
claim_tickets:
- title: Claim Tickets
+ title: Claim Tickets on Response
content: >
- Enable this to auto-assign unassigned tickets to the initially responding Agent.
- Also, reopened tickets are always assigned to the last respondent.
+ Enable this to auto-assign unassigned tickets to the responding Agent.
+ <br><br>
+ Reopened tickets are always assigned to the last respondent.
assigned_tickets:
title: Assigned Tickets
content: >
- Enable this feature to make visible (in the <span class="doc-desc-title">Open
- Queue</span>) Ticket Assignments that do not belong to the current user.
+ Enable this feature to exclude assigned tickets from the <span class="doc-desc-title">Open
+ Tickets Queue</span>.
answered_tickets:
title: Answered Tickets
content: >
- Show tickets that have been answered by an Agent in the
- <span class="doc-desc-title">Open Queue</span>. If this is not enabled,
- answered tickets will be display in the <span class="doc-desc-title">Answered
- Tickets Queue</span>.
+ Enable this feature to show answered tickets in the <span
+ class="doc-desc-title">Answered Tickets Queue</span>. Otherwise, it
+ will be included in the <span class="doc-desc-title">Open Tickets
+ Queue</span>.
staff_identity_masking:
title: Staff Identity Masking
@@ -96,7 +97,7 @@ enable_html_ticket_thread:
title: Enable HTML Ticket Thread
content: >
If enabled, this will permit the use of rich text formatting between
- Clients and Agents and Auto-Response emails.
+ Clients and Agents.
attachments:
title: Attachments
@@ -129,8 +130,8 @@ maximum_file_size:
ticket_response_files:
title: Ticket Response Files
content: >
- If enabled, any attachments an Agent may attach to a Ticket response will
- be also included in the Client’s email.
+ If enabled, any attachments an Agent may attach to a ticket response will
+ be also included in the email to the User.
accepted_file_types:
title: Accepted File Types
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index dce774dca55109b58de4616b7f83abc28ca24a2d..f2339c537e5ca048f894589a67d869899050f806 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -65,18 +65,19 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
Filter Status:
</td>
<td>
- <input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong>Active</strong>
- <input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>>Disabled
+ <input type="radio" name="isactive" value="1" <?php echo
+ $info['isactive']?'checked="checked"':''; ?>> Active
+ <input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>> Disabled
<span class="error">* </span>
</td>
</tr>
<tr>
<td width="180" class="required">
- Target:
+ Target Channel:
</td>
<td>
<select name="target">
- <option value="">— Select a Target ‐</option>
+ <option value="">— Select a Channel ‐</option>
<?php
foreach(Filter::getTargets() as $k => $v) {
echo sprintf('<option value="%s" %s>%s</option>',
@@ -96,12 +97,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
?>
</select>
- <span class="error">* <?php echo $errors['target']; ?></span> <i class="help-tip icon-question-sign" href="#target"></i>
+ <span class="error">* <?php echo $errors['target']; ?></span>
+ <i class="help-tip icon-question-sign" href="#target_channel"></i>
</td>
</tr>
<tr>
<th colspan="2">
- <em><strong>Filter Rules</strong>: Rules are applied based on the criteria. <span class="error">* <?php echo $errors['rules']; ?></span> <i class="help-tip icon-question-sign" href="#basic_fields_criterion"></i></em>
+ <em><strong>Filter Rules</strong>: Rules are applied based on the criteria. <span class="error">* <?php echo
+ $errors['rules']; ?></span></em>
</th>
</tr>
<tr>
@@ -142,7 +145,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
echo sprintf('<option value="%s" %s>%s</option>',$k,$sel,$v);
}
?>
- </select> <i class="help-tip icon-question-sign" href="#criterion_operator"></i>
+ </select>
<input type="text" size="60" name="rule_v<?php echo $i; ?>" value="<?php echo $info["rule_v$i"]; ?>">
<span class="error"> <?php echo $errors["rule_$i"]; ?></span>
<?php
@@ -313,7 +316,8 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select>
- <span class="error"> <?php echo $errors['assign']; ?></span><i class="help-tip icon-question-sign" href="#auto_assign_to"></i>
+ <span class="error"> <?php echo
+ $errors['assign']; ?></span><i class="help-tip icon-question-sign" href="#auto_assign"></i>
</td>
</tr>
<tr>
@@ -338,7 +342,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<th colspan="2">
- <em><strong>Admin Notes</strong>: Internal notes. <i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
+ <em><strong>Admin Notes</strong>: Internal notes.</em>
</th>
</tr>
<tr>
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index 44de81e20e739a1a8ee868d6e7b4a811d12b7c5e..85b64534cbc64bcac52d683ee99b90a60de8bd27 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -89,7 +89,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr><th colspan="2"><em>New ticket options</em></th></tr>
- <tr>
+ <tr>
<td><strong>Custom Form</strong>:</td>
<td><select name="form_id">
<option value="0">— No Extra Fields —</option>
@@ -101,48 +101,50 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</option>
<?php } ?>
</select>
- <em>Extra information for tickets associated with this help topic</em>
- <span class="error"> <?php echo $errors['form_id']; ?></span> <i class="help-tip icon-question-sign" href="#custom_form"></i>
+ <span class="error"> <?php echo $errors['form_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#custom_form"></i>
</td>
- </tr>
+ </tr>
<tr>
- <td width="180">
- Priority:
+ <td width="180" class="required">
+ Department:
</td>
<td>
- <select name="priority_id">
- <option value="">— System Default —</option>
+ <select name="dept_id">
+ <option value="0">— System Default —</option>
<?php
- $sql='SELECT priority_id,priority_desc FROM '.PRIORITY_TABLE.' pri ORDER by priority_urgency DESC';
+ $sql='SELECT dept_id,dept_name FROM '.DEPT_TABLE.' dept ORDER by dept_name';
if(($res=db_query($sql)) && db_num_rows($res)){
while(list($id,$name)=db_fetch_row($res)){
- $selected=($info['priority_id'] && $id==$info['priority_id'])?'selected="selected"':'';
+ $selected=($info['dept_id'] && $id==$info['dept_id'])?'selected="selected"':'';
echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
}
}
?>
</select>
- <span class="error"> <?php echo $errors['priority_id']; ?></span><i class="help-tip icon-question-sign" href="#priority"></i>
+ <span class="error"> <?php echo $errors['dept_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#department"></i>
</td>
</tr>
<tr>
- <td width="180" class="required">
- Department:
+ <td width="180">
+ Priority:
</td>
<td>
- <select name="dept_id">
- <option value="">— Select Department —</option>
+ <select name="priority_id">
+ <option value="">— System Default —</option>
<?php
- $sql='SELECT dept_id,dept_name FROM '.DEPT_TABLE.' dept ORDER by dept_name';
+ $sql='SELECT priority_id,priority_desc FROM '.PRIORITY_TABLE.' pri ORDER by priority_urgency DESC';
if(($res=db_query($sql)) && db_num_rows($res)){
while(list($id,$name)=db_fetch_row($res)){
- $selected=($info['dept_id'] && $id==$info['dept_id'])?'selected="selected"':'';
+ $selected=($info['priority_id'] && $id==$info['priority_id'])?'selected="selected"':'';
echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
}
}
?>
</select>
- <span class="error">* <?php echo $errors['dept_id']; ?></span> <i class="help-tip icon-question-sign" href="#department"></i>
+ <span class="error"> <?php echo $errors['priority_id']; ?></span>
+ <i class="help-tip icon-question-sign" href="#priority"></i>
</td>
</tr>
<tr>
@@ -162,7 +164,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
?>
</select>
<span class="error"> <?php echo $errors['sla_id']; ?></span>
- <em>(Overrides department's SLA)</em> <i class="help-tip icon-question-sign" href="#sla_plan"></i>
+ <i class="help-tip icon-question-sign" href="#sla_plan"></i>
</td>
</tr>
<tr>
@@ -182,7 +184,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select> <font class="error"><?php echo $errors['page_id']; ?></font>
- <em>(Overrides global setting. Applies to web tickets only.)</em> <i class="help-tip icon-question-sign" href="#thank_you_page"></i>
+ <i class="help-tip icon-question-sign" href="#thank_you_page"></i>
</td>
</tr>
<tr>
@@ -223,17 +225,18 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select>
- <span class="error"> <?php echo $errors['assign']; ?></span> <i class="help-tip icon-question-sign" href="#auto_assign_to"></i>
+ <span class="error"> <?php echo $errors['assign']; ?></span>
+ <i class="help-tip icon-question-sign" href="#auto_assign_to"></i>
</td>
</tr>
<tr>
<td width="180">
- Ticket auto-response:
+ Auto-response:
</td>
<td>
<input type="checkbox" name="noautoresp" value="1" <?php echo $info['noautoresp']?'checked="checked"':''; ?> >
- <strong>Disable</strong> new ticket auto-response for
- this topic (Overrides Dept. settings). <i class="help-tip icon-question-sign" href="#ticket_auto_response"></i>
+ <strong>Disable</strong> new ticket auto-response
+ <i class="help-tip icon-question-sign" href="#ticket_auto_response"></i>
</td>
</tr>
<tr>
diff --git a/include/staff/settings-access.inc.php b/include/staff/settings-access.inc.php
index b6e8ad9faa2f6b28cb9840b43d549f87c8871ee0..29e2fc212e7abdd7e5240752e2044006acc00a46 100644
--- a/include/staff/settings-access.inc.php
+++ b/include/staff/settings-access.inc.php
@@ -129,7 +129,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<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 user must log in again (enter 0 to disable). <i class="help-tip icon-question-sign" href="#client_session_timeout"></i>
+ <i class="help-tip icon-question-sign" href="#client_session_timeout"></i>
</td>
</tr>
</tbody>
diff --git a/include/staff/settings-alerts.inc.php b/include/staff/settings-alerts.inc.php
index 4613a0bf2837e4f379f3966846cb283ec374cb5f..9a479334bcefe9e53d91ce9cc1ebff400edb56fc 100644
--- a/include/staff/settings-alerts.inc.php
+++ b/include/staff/settings-alerts.inc.php
@@ -12,13 +12,15 @@
</thead>
<tbody>
<tr><th><em><b>New Ticket Alert</b>:
- <i class="help-tip icon-question-sign" href="#new_ticket_alert"></i>
+ <i class="help-tip icon-question-sign" href="#ticket_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status:</b></em>
- <input type="radio" name="ticket_alert_active" value="1" <?php echo $config['ticket_alert_active']?'checked':''; ?> />Enable
- <input type="radio" name="ticket_alert_active" value="0" <?php echo !$config['ticket_alert_active']?'checked':''; ?> />Disable
- <font class="error"> <?php echo $errors['ticket_alert_active']; ?></font></em> <i class="help-tip icon-question-sign" href="#status"></i>
+ <input type="radio" name="ticket_alert_active" value="1"
+ <?php echo $config['ticket_alert_active']?'checked':''; ?>
+ /> Enable
+ <input type="radio" name="ticket_alert_active" value="0" <?php echo !$config['ticket_alert_active']?'checked':''; ?> /> Disable
+ <font class="error"> <?php echo $errors['ticket_alert_active']; ?></font></em>
</td>
</tr>
<tr>
@@ -26,14 +28,14 @@
<input type="checkbox" name="ticket_alert_admin" <?php echo $config['ticket_alert_admin']?'checked':''; ?>> Admin Email <em>(<?php echo $cfg->getAdminEmail(); ?>)</em>
</td>
</tr>
- <tr>
+ <tr>
<td>
<input type="checkbox" name="ticket_alert_dept_manager" <?php echo $config['ticket_alert_dept_manager']?'checked':''; ?>> Department Manager
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="ticket_alert_dept_members" <?php echo $config['ticket_alert_dept_members']?'checked':''; ?>> Department Members <em>(spammy)</em>
+ <input type="checkbox" name="ticket_alert_dept_members" <?php echo $config['ticket_alert_dept_members']?'checked':''; ?>> Department Members
</td>
</tr>
<tr>
@@ -42,28 +44,34 @@
</td>
</tr>
<tr><th><em><b>New Message Alert</b>:
- <i class="help-tip icon-question-sign" href="#new_message_alert"></i>
+ <i class="help-tip icon-question-sign" href="#message_alert"></i>
</em></th></tr>
<tr>
- <td><em><b>Status:</b></em>
- <input type="radio" name="message_alert_active" value="1" <?php echo $config['message_alert_active']?'checked':''; ?> />Enable
+ <td><em><b>Status:</b></em>
+ <input type="radio" name="message_alert_active" value="1"
+ <?php echo $config['message_alert_active']?'checked':''; ?>
+ /> Enable
- <input type="radio" name="message_alert_active" value="0" <?php echo !$config['message_alert_active']?'checked':''; ?> />Disable
+ <input type="radio" name="message_alert_active" value="0" <?php echo !$config['message_alert_active']?'checked':''; ?> /> Disable
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="message_alert_laststaff" <?php echo $config['message_alert_laststaff']?'checked':''; ?>> Last Respondent <i class="help-tip icon-question-sign" href="#last_respondent"></i>
+ <input type="checkbox" name="message_alert_laststaff" <?php echo $config['message_alert_laststaff']?'checked':''; ?>> Last Respondent
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="message_alert_assigned" <?php echo $config['message_alert_assigned']?'checked':''; ?>> Assigned Staff <i class="help-tip icon-question-sign" href="#assigned_staff"></i>
+ <input type="checkbox" name="message_alert_assigned" <?php
+ echo $config['message_alert_assigned']?'checked':''; ?>>
+ Assigned Staff
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="message_alert_dept_manager" <?php echo $config['message_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_manager"></i>
+ <input type="checkbox" name="message_alert_dept_manager" <?php
+ echo $config['message_alert_dept_manager']?'checked':''; ?>>
+ Department Manager
</td>
</tr>
<tr>
@@ -72,127 +80,135 @@
</td>
</tr>
<tr><th><em><b>New Internal Note Alert</b>:
- <i class="help-tip icon-question-sign" href="#new_internal_note_alert"></i>
+ <i class="help-tip icon-question-sign" href="#internal_note_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status:</b></em>
- <input type="radio" name="note_alert_active" value="1" <?php echo $config['note_alert_active']?'checked':''; ?> />Enable
+ <input type="radio" name="note_alert_active" value="1" <?php echo $config['note_alert_active']?'checked':''; ?> /> Enable
- <input type="radio" name="note_alert_active" value="0" <?php echo !$config['note_alert_active']?'checked':''; ?> />Disable
+ <input type="radio" name="note_alert_active" value="0" <?php echo !$config['note_alert_active']?'checked':''; ?> /> Disable
<font class="error"> <?php echo $errors['note_alert_active']; ?></font>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="note_alert_laststaff" <?php echo $config['note_alert_laststaff']?'checked':''; ?>> Last Respondent <i class="help-tip icon-question-sign" href="#last_respondent_2"></i>
+ <input type="checkbox" name="note_alert_laststaff" <?php echo
+ $config['note_alert_laststaff']?'checked':''; ?>> Last Respondent
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="note_alert_assigned" <?php echo $config['note_alert_assigned']?'checked':''; ?>> Assigned Staff / Team Members<i class="help-tip icon-question-sign" href="#assigned_staff_2"></i>
+ <input type="checkbox" name="note_alert_assigned" <?php echo $config['note_alert_assigned']?'checked':''; ?>> Assigned Staff / Team
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="note_alert_dept_manager" <?php echo $config['note_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_manager_2"></i>
+ <input type="checkbox" name="note_alert_dept_manager" <?php echo $config['note_alert_dept_manager']?'checked':''; ?>> Department Manager
</td>
</tr>
<tr><th><em><b>Ticket Assignment Alert</b>:
- <i class="help-tip icon-question-sign" href="#ticket_assignment_alert"></i>
+ <i class="help-tip icon-question-sign" href="#assignment_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status: </b></em>
<input name="assigned_alert_active" value="1" type="radio"
- <?php echo $config['assigned_alert_active']?'checked="checked"':''; ?>>Enable
+ <?php echo $config['assigned_alert_active']?'checked="checked"':''; ?>> Enable
<input name="assigned_alert_active" value="0" type="radio"
- <?php echo !$config['assigned_alert_active']?'checked="checked"':''; ?>>Disable
+ <?php echo !$config['assigned_alert_active']?'checked="checked"':''; ?>> Disable
<font class="error"> <?php echo $errors['assigned_alert_active']; ?></font>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="assigned_alert_staff" <?php echo $config['assigned_alert_staff']?'checked':''; ?>> Assigned Staff <i class="help-tip icon-question-sign" href="#assigned_staff_3"></i>
+ <input type="checkbox" name="assigned_alert_staff" <?php echo
+ $config['assigned_alert_staff']?'checked':''; ?>> Assigned Staff
</td>
</tr>
<tr>
<td>
- <input type="checkbox"name="assigned_alert_team_lead" <?php echo $config['assigned_alert_team_lead']?'checked':''; ?>>Team Lead <em>(On team assignment)</em> <i class="help-tip icon-question-sign" href="#team_lead"></i>
+ <input type="checkbox"name="assigned_alert_team_lead" <?php
+ echo $config['assigned_alert_team_lead']?'checked':''; ?>> Team Lead
</td>
</tr>
<tr>
<td>
<input type="checkbox"name="assigned_alert_team_members" <?php echo $config['assigned_alert_team_members']?'checked':''; ?>>
- Team Members <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#team_members"></i>
+ Team Members
</td>
</tr>
<tr><th><em><b>Ticket Transfer Alert</b>:
- <i class="help-tip icon-question-sign" href="#ticket_transfer_alert"></i>
+ <i class="help-tip icon-question-sign" href="#transfer_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status:</b></em>
- <input type="radio" name="transfer_alert_active" value="1" <?php echo $config['transfer_alert_active']?'checked':''; ?> />Enable
- <input type="radio" name="transfer_alert_active" value="0" <?php echo !$config['transfer_alert_active']?'checked':''; ?> />Disable
+ <input type="radio" name="transfer_alert_active" value="1" <?php echo $config['transfer_alert_active']?'checked':''; ?> /> Enable
+ <input type="radio" name="transfer_alert_active" value="0" <?php echo !$config['transfer_alert_active']?'checked':''; ?> /> Disable
<font class="error"> <?php echo $errors['alert_alert_active']; ?></font>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="transfer_alert_assigned" <?php echo $config['transfer_alert_assigned']?'checked':''; ?>> Assigned Staff/Team <i class="help-tip icon-question-sign" href="#assigned_staff_team"></i>
+ <input type="checkbox" name="transfer_alert_assigned" <?php echo $config['transfer_alert_assigned']?'checked':''; ?>> Assigned Staff / Team
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="transfer_alert_dept_manager" <?php echo $config['transfer_alert_dept_manager']?'checked':''; ?>> Department Manager <i class="help-tip icon-question-sign" href="#department_manager_3"></i>
+ <input type="checkbox" name="transfer_alert_dept_manager" <?php echo $config['transfer_alert_dept_manager']?'checked':''; ?>> Department Manager
</td>
</tr>
<tr>
<td>
<input type="checkbox" name="transfer_alert_dept_members" <?php echo $config['transfer_alert_dept_members']?'checked':''; ?>>
- Department Members <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_members"></i>
+ Department Members
</td>
</tr>
<tr><th><em><b>Overdue Ticket Alert</b>:
- <i class="help-tip icon-question-sign" href="#overdue_ticket_alert"></i>
+ <i class="help-tip icon-question-sign" href="#overdue_alert"></i>
</em></th></tr>
<tr>
<td><em><b>Status:</b></em>
- <input type="radio" name="overdue_alert_active" value="1" <?php echo $config['overdue_alert_active']?'checked':''; ?> />Enable
- <input type="radio" name="overdue_alert_active" value="0" <?php echo !$config['overdue_alert_active']?'checked':''; ?> />Disable
- <font class="error"> <?php echo $errors['overdue_alert_active']; ?></font>
+ <input type="radio" name="overdue_alert_active" value="1"
+ <?php echo $config['overdue_alert_active']?'checked':''; ?> /> Enable
+ <input type="radio" name="overdue_alert_active" value="0"
+ <?php echo !$config['overdue_alert_active']?'checked':''; ?> /> Disable
+ <font class="error"> <?php echo $errors['overdue_alert_active']; ?></font>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="overdue_alert_assigned" <?php echo $config['overdue_alert_assigned']?'checked':''; ?>> Assigned Staff/Team <i class="help-tip icon-question-sign" href="#assigned_staff_team_2"></i>
+ <input type="checkbox" name="overdue_alert_assigned" <?php
+ echo $config['overdue_alert_assigned']?'checked':''; ?>> Assigned Staff / Team
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="overdue_alert_dept_manager" <?php echo $config['overdue_alert_dept_manager']?'checked':''; ?>> Department Manager <i class="help-tip icon-question-sign" href="#department_manager_4"></i>
+ <input type="checkbox" name="overdue_alert_dept_manager" <?php
+ echo $config['overdue_alert_dept_manager']?'checked':''; ?>> Department Manager
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="overdue_alert_dept_members" <?php echo $config['overdue_alert_dept_members']?'checked':''; ?>> Department Members <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_members_2"></i>
+ <input type="checkbox" name="overdue_alert_dept_members" <?php
+ echo $config['overdue_alert_dept_members']?'checked':''; ?>> Department Members
</td>
</tr>
- <tr><th><em><b>System Alerts</b>:
- <i class="help-tip icon-question-sign" href="#system_alerts"></i>
- </em></th></tr>
+ <tr><th>
+ <em><b>System Alerts</b>: <i class="help-tip icon-question-sign" href="#system_alerts"></i></em></th></tr>
<tr>
<td>
- <input type="checkbox" name="send_sys_errors" checked="checked" disabled="disabled">System Errors <i class="help-tip icon-question-sign" href="#system_errors"></i>
+ <input type="checkbox" name="send_sys_errors" checked="checked" disabled="disabled"> System Errors
+ <em>(enabled by default)</em>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="send_sql_errors" <?php echo $config['send_sql_errors']?'checked':''; ?>>SQL errors
+ <input type="checkbox" name="send_sql_errors" <?php echo $config['send_sql_errors']?'checked':''; ?>> SQL errors
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="send_login_errors" <?php echo $config['send_login_errors']?'checked':''; ?>>Excessive Login attempts <i class="help-tip icon-question-sign" href="#excessive_login_attempts"></i>
+ <input type="checkbox" name="send_login_errors" <?php echo $config['send_login_errors']?'checked':''; ?>> Excessive failed login attempts
</td>
</tr>
</tbody>
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index a904af89caf0558201c1dcb5571802bafd056687..61535604a7ce198eb1d722ff83c98fc39ebb2535 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -16,12 +16,13 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</thead>
<tbody>
<tr>
- <td width="180" class="required">Default Email Templates:</td>
+ <td width="180" class="required">Default Template Set:</td>
<td>
<select name="default_template_id">
- <option value="">— Select Default Template —</option>
+ <option value="">— Select Default Email Template Set —</option>
<?php
- $sql='SELECT tpl_id,name FROM '.EMAIL_TEMPLATE_GRP_TABLE.' WHERE isactive=1 ORDER BY name';
+ $sql='SELECT tpl_id, name FROM '.EMAIL_TEMPLATE_GRP_TABLE
+ .' WHERE isactive =1 ORDER BY name';
if(($res=db_query($sql)) && db_num_rows($res)){
while (list($id, $name) = db_fetch_row($res)){
$selected = ($config['default_template_id']==$id)?'selected="selected"':''; ?>
@@ -82,24 +83,22 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</td>
</tr>
<tr><th colspan=2><em><strong>Incoming Emails:</strong>
- <i class="help-tip icon-question-sign" href="#incoming_emails"></i>
</em></th>
<tr>
- <td width="180">Email Polling:</td>
- <td><input type="checkbox" name="enable_mail_polling" value=1 <?php echo $config['enable_mail_polling']? 'checked="checked"': ''; ?> > Enable POP/IMAP polling
-
- <i class="help-tip icon-question-sign" href="#email_polling"></i>
+ <td width="180">Email Fetching:</td>
+ <td><input type="checkbox" name="enable_mail_polling" value=1 <?php echo $config['enable_mail_polling']? 'checked="checked"': ''; ?> > Enable
+ <i class="help-tip icon-question-sign" href="#email_fetching"></i>
<input type="checkbox" name="enable_auto_cron" <?php echo $config['enable_auto_cron']?'checked="checked"':''; ?>>
- Poll on auto-cron
- <i class="help-tip icon-question-sign" href="#enable_autocron_poll"></i>
+ Fetch on auto-cron
+ <i class="help-tip icon-question-sign" href="#enable_autocron_fetch"></i>
</td>
</tr>
<tr>
<td width="180">Strip Quoted Reply:</td>
<td>
<input type="checkbox" name="strip_quoted_reply" <?php echo $config['strip_quoted_reply'] ? 'checked="checked"':''; ?>>
- Enable <i class="help-tip icon-question-sign" href="#strip_quoted_reply"></i>
+ Enable <i class="help-tip icon-question-sign" href="#strip_quoted_reply"></i>
<font class="error"> <?php echo $errors['strip_quoted_reply']; ?></font>
</td>
</tr>
@@ -119,8 +118,10 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<tr>
<td width="180">Accept All Emails:</td>
<td><input type="checkbox" name="accept_unregistered_email" <?php
- echo $config['accept_unregistered_email'] ? 'checked="checked"' : ''; ?>/>
- Accept email from unknown Clients
+ echo $config['accept_unregistered_email'] ? 'checked="checked"' : ''; ?>/>
+ Accept email from unknown Users
+ <i class="help-tip icon-question-sign" href="#accept_all_emails"></i>
+ </td>
</tr>
<tr>
<td width="180">Accept Email Collaborators:</td>
@@ -130,22 +131,23 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<i class="help-tip icon-question-sign" href="#accept_email_collaborators"></i>
</tr>
<tr><th colspan=2><em><strong>Outgoing Emails</strong>: Default email only applies to outgoing emails without SMTP setting.</em></th></tr>
- <tr><td width="180">Default Outgoing Email:</td>
+ <tr><td width="180">Default MTA:</td>
<td>
<select name="default_smtp_id">
<option value=0 selected="selected">None: Use PHP mail function</option>
<?php
- $sql='SELECT email_id,email,name,smtp_host FROM '.EMAIL_TABLE.' WHERE smtp_active=1';
-
+ $sql=' SELECT email_id, email, name, smtp_host '
+ .' FROM '.EMAIL_TABLE.' WHERE smtp_active = 1';
if(($res=db_query($sql)) && db_num_rows($res)) {
- while (list($id,$email,$name,$host) = db_fetch_row($res)){
+ while (list($id, $email, $name, $host) = db_fetch_row($res)){
$email=$name?"$name <$email>":$email;
?>
<option value="<?php echo $id; ?>"<?php echo ($config['default_smtp_id']==$id)?'selected="selected"':''; ?>><?php echo $email; ?></option>
<?php
}
} ?>
- </select> <font class="error"> <?php echo $errors['default_smtp_id']; ?></font>
+ </select> <font class="error"> <?php echo $errors['default_smtp_id']; ?></font>
+ <i class="help-tip icon-question-sign" href="#default_mta"></i>
</td>
</tr>
</tbody>
diff --git a/include/staff/settings-kb.inc.php b/include/staff/settings-kb.inc.php
index ed1a3b8d5ed473244104a9df1d06547fd863342b..9f120a814aa493978b90709b4357c54451c124ba 100644
--- a/include/staff/settings-kb.inc.php
+++ b/include/staff/settings-kb.inc.php
@@ -16,10 +16,10 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</thead>
<tbody>
<tr>
- <td width="180">Knowledge base status:</td>
+ <td width="180">Knowledge Base Status:</td>
<td>
<input type="checkbox" name="enable_kb" value="1" <?php echo $config['enable_kb']?'checked="checked"':''; ?>>
- Enable Knowledge base <em>(Client interface)</em>
+ Enable Knowledge Base
<font class="error"> <?php echo $errors['enable_kb']; ?></font> <i class="help-tip icon-question-sign" href="#knowledge_base_status"></i>
</td>
</tr>
@@ -27,7 +27,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<td width="180">Canned Responses:</td>
<td>
<input type="checkbox" name="enable_premade" value="1" <?php echo $config['enable_premade']?'checked="checked"':''; ?> >
- Enable canned responses <em>(Available on ticket reply)</em>
+ Enable Canned Responses
<font class="error"> <?php echo $errors['enable_premade']; ?></font> <i class="help-tip icon-question-sign" href="#canned_responses"></i>
</td>
</tr>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index 84ae8d8b6697ed233da3aefb585798f13354d5ca..37bc2af8561a8e12252dca25e9ef10f1167e3c7e 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -81,11 +81,11 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<td>Human Verification:</td>
<td>
<input type="checkbox" name="enable_captcha" <?php echo $config['enable_captcha']?'checked="checked"':''; ?>>
- Enable CAPTCHA on new web tickets.<em>(requires GDLib)</em> <font class="error"> <?php echo $errors['enable_captcha']; ?></font> <i class="help-tip icon-question-sign" href="#human_verification"></i>
+ Enable CAPTCHA on new web tickets. <font class="error"> <?php echo $errors['enable_captcha']; ?></font> <i class="help-tip icon-question-sign" href="#human_verification"></i>
</td>
</tr>
<tr>
- <td>Claim Tickets:</td>
+ <td>Claim on Response:</td>
<td>
<input type="checkbox" name="auto_claim_tickets" <?php echo $config['auto_claim_tickets']?'checked="checked"':''; ?>>
Enable <i class="help-tip icon-question-sign" href="#claim_tickets"></i>
@@ -94,15 +94,17 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<tr>
<td>Assigned Tickets:</td>
<td>
- <input type="checkbox" name="show_assigned_tickets" <?php echo $config['show_assigned_tickets']?'checked="checked"':''; ?>>
- Show assigned tickets on open queue. <i class="help-tip icon-question-sign" href="#assigned_tickets"></i>
+ <input type="checkbox" name="show_assigned_tickets" <?php
+ echo !$config['show_assigned_tickets']?'checked="checked"':''; ?>>
+ Exclude assigned tickets from open queue. <i class="help-tip icon-question-sign" href="#assigned_tickets"></i>
</td>
</tr>
<tr>
<td>Answered Tickets:</td>
<td>
- <input type="checkbox" name="show_answered_tickets" <?php echo $config['show_answered_tickets']?'checked="checked"':''; ?>>
- Show answered tickets on open queue. <i class="help-tip icon-question-sign" href="#answered_tickets"></i>
+ <input type="checkbox" name="show_answered_tickets" <?php
+ echo !$config['show_answered_tickets']?'checked="checked"':''; ?>>
+ Exclude answered tickets from open queue. <i class="help-tip icon-question-sign" href="#answered_tickets"></i>
</td>
</tr>
<tr>
@@ -136,7 +138,8 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<tr>
<td width="180">Allow Attachments:</td>
<td>
- <input type="checkbox" name="allow_attachments" <?php echo $config['allow_attachments']?'checked="checked"':''; ?>><b>Allow Attachments</b>
+ <input type="checkbox" name="allow_attachments" <?php echo
+ $config['allow_attachments']?'checked="checked"':''; ?>> <b>Allow Attachments</b>
<em>(Global Setting)</em>
<font class="error"> <?php echo $errors['allow_attachments']; ?></font>
</td>
@@ -230,7 +233,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<tr>
<td width="180">Ticket Response Files:</td>
<td>
- <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?> >Email attachments to the user <i class="help-tip icon-question-sign" href="#ticket_response_files"></i>
+ <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?> > Email attachments to the user <i class="help-tip icon-question-sign" href="#ticket_response_files"></i>
</td>
</tr>
<?php if (($bks = FileStorageBackend::allRegistered())
diff --git a/scp/filters.php b/scp/filters.php
index 8a5209016505c7e0dde9da23f2dc357f5fd09ca9..99d1f13e71d68d358890f52af3b6081fd284d7cb 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -99,10 +99,9 @@ if($_POST){
}
$page='filters.inc.php';
-$tip_namespace = 'manage.ticket_filters';
+$tip_namespace = 'manage.filter';
if($filter || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='filter.inc.php';
- $tip_namespace = 'manage.addnew_filter';
}
$nav->setTabActive('manage');
diff --git a/scp/helptopics.php b/scp/helptopics.php
index 228ddff21f88f1d3ec79e6e394a6607c4d903341..0847257cfc0d3da5c7d95a79773f0d34062c0b33 100644
--- a/scp/helptopics.php
+++ b/scp/helptopics.php
@@ -102,10 +102,9 @@ if($_POST){
}
$page='helptopics.inc.php';
-$tip_namespace = 'manage.help_topics';
+$tip_namespace = 'manage.helptopic';
if($topic || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='helptopic.inc.php';
- $tip_namespace = 'manage.addnew_help_topic';
}
$nav->setTabActive('manage');