Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
19b4f90c
Commit
19b4f90c
authored
10 years ago
by
Josh Eldridge
Committed by
Peter Rotich
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add Email->Emails Help Tips
parent
ca22e2d5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/i18n/en_US/help/tips/emails.addnew_email.yaml
+19
-3
19 additions, 3 deletions
include/i18n/en_US/help/tips/emails.addnew_email.yaml
include/staff/email.inc.php
+88
-58
88 additions, 58 deletions
include/staff/email.inc.php
with
107 additions
and
61 deletions
include/i18n/en_US/help/tips/emails.addnew_email.yaml
+
19
−
3
View file @
19b4f90c
...
...
@@ -25,9 +25,20 @@ email_name:
title
:
Email Name
content
:
>
setting
:
title
:
Setting
new_ticket_help_topic
:
title
:
New Ticket Help Topic
content
:
>
Choose the <span class="doc-desc-title">Help Topic</span> to which incoming mail to this addressed will belong.
new_ticket_priority
:
title
:
New Ticket Priority
content
:
>
Choose the <span class="doc-desc-title">ticket priority</span> for tickets to have that were created from mail sent to this address.
new_ticket_department
:
title
:
New Ticket Department
content
:
>
Choose the <span class="doc-desc-title">Department</span> to which incoming mail to this addressed will be routed.
username
:
title
:
Username
...
...
@@ -61,22 +72,27 @@ host:
port
:
title
:
Port
content
:
>
Enter the proper IMAP/POP port as prescribed by your host. We recommend that you choose IMAP/SSL
protocol
:
title
:
Protocol
content
:
>
IMAP is recommended.
encryption
:
title
:
Encryption
content
:
>
SSL is recommended.
fetch_frequency
:
title
:
Fetch Frequency
content
:
>
Enter the duration of time to be passed between the helpdesk's attempts to check the email address's inbox for new mail.
emails_per_fetch
:
title
:
Emails Per Fetch
content
:
>
Decide the maximum number of emails fetched per fetching cycle.
fetched_emails
:
title
:
Fetched Emails
...
...
@@ -85,7 +101,7 @@ fetched_emails:
smtp_settings
:
title
:
SMTP Settings
content
:
>
When enabled, the <span class="doc-desc-title">email account</span> will use
When enabled, the <span class="doc-desc-title">email account</span> will use
the SMTP server instead of internal PHP mail() function for outgoing emails.
status
:
...
...
This diff is collapsed.
Click to expand it.
include/staff/email.inc.php
+
88
−
58
View file @
19b4f90c
...
...
@@ -68,19 +68,24 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
New Ticket Help Topic
</td>
<td>
<select
name=
"topic_id"
>
<option
value=
"0"
selected=
"selected"
>
—
Empty
—
</option>
<?php
$sql
=
'SELECT topic_id, topic FROM '
.
TOPIC_TABLE
.
' T ORDER by topic'
;
if
((
$res
=
db_query
(
$sql
))
&&
db_num_rows
(
$res
)){
while
(
list
(
$id
,
$name
)
=
db_fetch_row
(
$res
)){
$selected
=
(
$info
[
'topic_id'
]
&&
$id
==
$info
[
'topic_id'
])
?
'selected="selected"'
:
''
;
echo
sprintf
(
'<option value="%d" %s>%s</option>'
,
$id
,
$selected
,
$name
);
}
}
?>
</select>
<span
class=
"error"
>
<?php
echo
$errors
[
'topic_id'
];
?>
</span>
<span>
<select
name=
"topic_id"
>
<option
value=
"0"
selected=
"selected"
>
—
Empty
—
</option>
<?php
$sql
=
'SELECT topic_id, topic FROM '
.
TOPIC_TABLE
.
' T ORDER by topic'
;
if
((
$res
=
db_query
(
$sql
))
&&
db_num_rows
(
$res
)){
while
(
list
(
$id
,
$name
)
=
db_fetch_row
(
$res
)){
$selected
=
(
$info
[
'topic_id'
]
&&
$id
==
$info
[
'topic_id'
])
?
'selected="selected"'
:
''
;
echo
sprintf
(
'<option value="%d" %s>%s</option>'
,
$id
,
$selected
,
$name
);
}
}
?>
</select>
<i
class=
"help-tip icon-question-sign"
href=
"#new_ticket_help_topic"
></i>
</span>
<span
class=
"error"
>
<?php
echo
$errors
[
'topic_id'
];
?>
</span>
</td>
</tr>
<tr>
...
...
@@ -88,19 +93,22 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
New Ticket Priority
</td>
<td>
<select
name=
"priority_id"
>
<option
value=
"0"
selected=
"selected"
>
—
System Default
—
</option>
<?php
$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
[
'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
[
'priority_id'
];
?>
</span>
<span>
<select
name=
"priority_id"
>
<option
value=
"0"
selected=
"selected"
>
—
System Default
—
</option>
<?php
$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
[
'priority_id'
]
&&
$id
==
$info
[
'priority_id'
])
?
'selected="selected"'
:
''
;
echo
sprintf
(
'<option value="%d" %s>%s</option>'
,
$id
,
$selected
,
$name
);
}
}
?>
</select>
<i
class=
"help-tip icon-question-sign"
href=
"#new_ticket_priority"
></i>
</span>
<span
class=
"error"
>
<?php
echo
$errors
[
'priority_id'
];
?>
</span>
</td>
</tr>
<tr>
...
...
@@ -108,19 +116,22 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
New Ticket Dept.
</td>
<td>
<select
name=
"dept_id"
>
<option
value=
"0"
selected=
"selected"
>
—
System Default
—
</option>
<?php
$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
[
'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
[
'dept_id'
];
?>
</span>
<span>
<select
name=
"dept_id"
>
<option
value=
"0"
selected=
"selected"
>
—
System Default
—
</option>
<?php
$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
[
'dept_id'
]
&&
$id
==
$info
[
'dept_id'
])
?
'selected="selected"'
:
''
;
echo
sprintf
(
'<option value="%d" %s>%s</option>'
,
$id
,
$selected
,
$name
);
}
}
?>
</select>
<i
class=
"help-tip icon-question-sign"
href=
"#new_ticket_department"
></i>
</span>
<span
class=
"error"
>
<?php
echo
$errors
[
'dept_id'
];
?>
</span>
</td>
</tr>
<tr>
...
...
@@ -164,7 +175,8 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<em><strong>
Mail Account
</strong>
<i
class=
"help-tip icon-question-sign"
href=
"#mail_account"
></i>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail'
];
?>
</font></em>
</th>
</tr>
<tr><td>
Status
</td>
<tr>
<td>
Status
</td>
<td>
<label><input
type=
"radio"
name=
"mail_active"
value=
"1"
<?php
echo
$info
[
'mail_active'
]
?
'checked="checked"'
:
''
;
?>
/>
Enable
</label>
...
...
@@ -173,45 +185,63 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</td>
</tr>
<tr><td>
Host
</td>
<td><input
type=
"text"
name=
"mail_host"
size=
35
value=
"
<?php
echo
$info
[
'mail_host'
];
?>
"
>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_host'
];
?>
</font>
<td>
<span>
<input
type=
"text"
name=
"mail_host"
size=
35
value=
"
<?php
echo
$info
[
'mail_host'
];
?>
"
>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_host'
];
?>
</font>
</span>
</td>
</tr>
<tr><td>
Port
</td>
<td><input
type=
"text"
name=
"mail_port"
size=
6
value=
"
<?php
echo
$info
[
'mail_port'
]
?
$info
[
'mail_port'
]
:
''
;
?>
"
>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_port'
];
?>
</font>
<span>
<i
class=
"help-tip icon-question-sign"
href=
"#port"
></i>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_port'
];
?>
</font>
</span>
</td>
</tr>
<tr><td>
Protocol
</td>
<td>
<select
name=
"mail_protocol"
>
<option
value=
'POP'
>
—
Select Mail Protocol
—
</option>
<option
value=
'POP'
<?php
echo
(
$info
[
'mail_protocol'
]
==
'POP'
)
?
'selected="selected"'
:
''
;
?>
>
POP
</option>
<option
value=
'IMAP'
<?php
echo
(
$info
[
'mail_protocol'
]
==
'IMAP'
)
?
'selected="selected"'
:
''
;
?>
>
IMAP
</option>
</select>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_protocol'
];
?>
</font>
<span>
<select
name=
"mail_protocol"
>
<option
value=
'POP'
>
—
Select Mail Protocol
—
</option>
<option
value=
'POP'
<?php
echo
(
$info
[
'mail_protocol'
]
==
'POP'
)
?
'selected="selected"'
:
''
;
?>
>
POP
</option>
<option
value=
'IMAP'
<?php
echo
(
$info
[
'mail_protocol'
]
==
'IMAP'
)
?
'selected="selected"'
:
''
;
?>
>
IMAP
</option>
</select>
<i
class=
"help-tip icon-question-sign"
href=
"#protocol"
></i>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_protocol'
];
?>
</font>
</span>
</td>
</tr>
<tr><td>
Encryption
</td>
<td>
<select
name=
"mail_encryption"
>
<option
value=
'NONE'
>
None
</option>
<option
value=
'SSL'
<?php
echo
(
$info
[
'mail_encryption'
]
==
'SSL'
)
?
'selected="selected"'
:
''
;
?>
>
SSL
</option>
</select>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_encryption'
];
?>
</font>
<span>
<select
name=
"mail_encryption"
>
<option
value=
'NONE'
>
None
</option>
<option
value=
'SSL'
<?php
echo
(
$info
[
'mail_encryption'
]
==
'SSL'
)
?
'selected="selected"'
:
''
;
?>
>
SSL
</option>
</select>
<i
class=
"help-tip icon-question-sign"
href=
"#encryption"
></i>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_encryption'
];
?>
</font>
</span>
</td>
</tr>
<tr><td>
Fetch Frequency
</td>
<td>
<input
type=
"text"
name=
"mail_fetchfreq"
size=
4
value=
"
<?php
echo
$info
[
'mail_fetchfreq'
]
?
$info
[
'mail_fetchfreq'
]
:
''
;
?>
"
>
Delay intervals in minutes
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_fetchfreq'
];
?>
</font>
<span>
<input
type=
"text"
name=
"mail_fetchfreq"
size=
4
value=
"
<?php
echo
$info
[
'mail_fetchfreq'
]
?
$info
[
'mail_fetchfreq'
]
:
''
;
?>
"
>
Delay intervals in minutes
<i
class=
"help-tip icon-question-sign"
href=
"#fetch_frequency"
></i>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_fetchfreq'
];
?>
</font>
</span>
</td>
</tr>
<tr><td>
Emails Per Fetch
</td>
<td>
<input
type=
"text"
name=
"mail_fetchmax"
size=
4
value=
"
<?php
echo
$info
[
'mail_fetchmax'
]
?
$info
[
'mail_fetchmax'
]
:
''
;
?>
"
>
Maximum emails to process per fetch.
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_fetchmax'
];
?>
</font>
<span>
<input
type=
"text"
name=
"mail_fetchmax"
size=
4
value=
"
<?php
echo
$info
[
'mail_fetchmax'
]
?
$info
[
'mail_fetchmax'
]
:
''
;
?>
"
>
Maximum emails to process per fetch.
<i
class=
"help-tip icon-question-sign"
href=
"#emails_per_fetch"
></i>
<font
class=
"error"
>
<?php
echo
$errors
[
'mail_fetchmax'
];
?>
</font>
</span>
</td>
</tr>
<tr><td
valign=
"top"
>
Fetched Emails
</td>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment