Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Linkify messages, remove dead code

Browse Source
This commit is contained in:
Mike Koch 2016-08-01 12:58:57 -04:00
parent 1e8505ee22
commit f82d8e95d7
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/mail_functions.inc.php
View File

@ -8,7 +8,8 @@ function mfh_get_mail_headers_for_dropdown($user_id, $hesk_settings, $hesklang)
LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS `users` LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS `users`
ON `mail`.`from` = `users`.`id` ON `mail`.`from` = `users`.`id`
WHERE `to` = " . hesk_dbEscape($user_id) . " WHERE `to` = " . hesk_dbEscape($user_id) . "
AND `read` = '0'"; AND `read` = '0'
ORDER BY `mail`.`dt` DESC";
$rs = hesk_dbQuery($sql); $rs = hesk_dbQuery($sql);

33
inc/new_admin_header_and_sidebar.inc.php
View File

@ -34,20 +34,6 @@ if (!defined('IN_SCRIPT')) {
} }
$mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hesklang); $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hesklang);
// Show a notice if we are in maintenance mode
/*if (hesk_check_maintenance(false)) {
echo '<div style="margin-bottom: -20px">';
hesk_show_notice($hesklang['mma2'], $hesklang['mma1'], false);
echo '</div>';
}
// Show a notice if we are in "Knowledgebase only" mode
if (hesk_check_kb_only(false)) {
echo '<div style="margin-bottom: -20px">';
hesk_show_notice($hesklang['kbo2'], $hesklang['kbo1'], false);
echo '</div>';
}*/
?> ?>
<div class="wrapper"> <div class="wrapper">
<header class="main-header"> <header class="main-header">
@ -119,21 +105,6 @@ if (hesk_check_kb_only(false)) {
</ul> </ul>
</li> </li>
<?php endif; ?> <?php endif; ?>
<?php
/*if (hesk_check_maintenance(false)) {
echo '<div style="margin-bottom: -20px">';
hesk_show_notice($hesklang['mma2'], $hesklang['mma1'], false);
echo '</div>';
}
// Show a notice if we are in "Knowledgebase only" mode
if (hesk_check_kb_only(false)) {
echo '<div style="margin-bottom: -20px">';
hesk_show_notice($hesklang['kbo2'], $hesklang['kbo1'], false);
echo '</div>';
}*/
?>
<li class="dropdown messages-menu"> <li class="dropdown messages-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-envelope-o"></i> <i class="fa fa-envelope-o"></i>
@ -153,7 +124,7 @@ if (hesk_check_kb_only(false)) {
<ul class="menu"> <ul class="menu">
<?php foreach ($mails as $mail): ?> <?php foreach ($mails as $mail): ?>
<li><!-- start message --> <li><!-- start message -->
<a href="#"> <a href="mail.php?a=read&id=<?php echo $mail['id']; ?>">
<!-- TODO User avatars --> <!-- TODO User avatars -->
<!--<div class="pull-left"> <!--<div class="pull-left">
<img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image"> <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
@ -169,7 +140,7 @@ if (hesk_check_kb_only(false)) {
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
</li> </li>
<li class="footer"><a href="#">See All Messages</a></li> <li class="footer"><a href="mail.php">See All Messages</a></li>
</ul> </ul>
</li> </li>
<!-- User Account: style can be found in dropdown.less --> <!-- User Account: style can be found in dropdown.less -->