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

#51 Fixed variable naming clash

Browse Source
This commit is contained in:
Mike Koch 2014-09-25 21:50:13 -04:00
parent e045921e9f
commit f000ebc729
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/index.php
View File

@ -280,7 +280,7 @@ function print_login()
<div> <div>
<form class="form-signin form-horizontal" role="form" action="index.php" method="post" name="form1"> <form class="form-signin form-horizontal" role="form" action="index.php" method="post" name="form1">
<h2 class="form-signin-heading"><span <?php echo $display; ?>><span class="mega-octicon octicon-sign-in"></span>&nbsp;</span><?php echo $hesklang['admin_login']; ?></a></h2><br/> <h2 class="form-signin-heading"><span <?php echo $iconDisplay; ?>><span class="mega-octicon octicon-sign-in"></span>&nbsp;</span><?php echo $hesklang['admin_login']; ?></a></h2><br/>
<?php if (in_array('pass',$_SESSION['a_iserror'])) { echo '<div class="form-group has-error">';} else { echo '<div class="form-group">';}?> <?php if (in_array('pass',$_SESSION['a_iserror'])) { echo '<div class="form-group has-error">';} else { echo '<div class="form-group">';}?>
<label for="user" class="col-sm-3 control-label"><?php echo $hesklang['username']; ?>:</label> <label for="user" class="col-sm-3 control-label"><?php echo $hesklang['username']; ?>:</label>
<div class="col-sm-9"> <div class="col-sm-9">

14
inc/header.inc.php
View File

@ -135,9 +135,9 @@ if ($nuMods_settings['maintenance_mode'] && !defined('ON_MAINTENANCE_PAGE') && !
<?php <?php
include(HESK_PATH . 'header.txt'); include(HESK_PATH . 'header.txt');
$display = 'style="display: none"'; $iconDisplay = 'style="display: none"';
if ($nuMods_settings['show_icons']) { if ($nuMods_settings['show_icons']) {
$display = ''; $iconDisplay = '';
} }
?> ?>
@ -154,17 +154,17 @@ if ($nuMods_settings['show_icons']) {
</div> </div>
<div class="navbar-collapse collapse"> <div class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="<?php echo HESK_PATH; ?>"><i class="fa fa-home" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['main_page']; ?></a></li> <li><a href="<?php echo HESK_PATH; ?>"><i class="fa fa-home" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['main_page']; ?></a></li>
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ticket" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['ticket'] ?><b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ticket" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['ticket'] ?><b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="<?php echo HESK_PATH; ?>index.php?a=add"><i class="fa fa-plus-circle" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['sub_ticket'] ?></a></li> <li><a href="<?php echo HESK_PATH; ?>index.php?a=add"><i class="fa fa-plus-circle" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['sub_ticket'] ?></a></li>
<li><a href="<?php echo HESK_PATH; ?>ticket.php"><i class="fa fa-search" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['view_ticket_nav'] ?></a></li> <li><a href="<?php echo HESK_PATH; ?>ticket.php"><i class="fa fa-search" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['view_ticket_nav'] ?></a></li>
</ul> </ul>
</li> </li>
<?php if ($hesk_settings['kb_enable']) <?php if ($hesk_settings['kb_enable'])
{ ?> { ?>
<li><a href="<?php echo HESK_PATH; ?>knowledgebase.php"><i class="fa fa-book" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['kb_text'] ?></a></li> <?php } ?> <li><a href="<?php echo HESK_PATH; ?>knowledgebase.php"><i class="fa fa-book" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['kb_text'] ?></a></li> <?php } ?>
<?php include ('custom/header-custom.inc.php'); ?> <?php include ('custom/header-custom.inc.php'); ?>
</ul> </ul>
</div><!-- /.navbar-collapse --> </div><!-- /.navbar-collapse -->

4
inc/headerAdmin.inc.php
View File

@ -131,8 +131,8 @@ require(HESK_PATH . 'nuMods_settings.inc.php');
<?php <?php
include(HESK_PATH . 'header.txt'); include(HESK_PATH . 'header.txt');
$display = 'style="display: none"'; $iconDisplay = 'style="display: none"';
if ($nuMods_settings['show_icons']) { if ($nuMods_settings['show_icons']) {
$display = ''; $iconDisplay = '';
} }
?> ?>

28
inc/show_admin_nav.inc.php
View File

@ -51,17 +51,17 @@ $num_mail = hesk_checkNewMail();
</div> </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="admin_main.php"><i class="fa fa-home" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['main_page']; ?></a></li> <li><a href="admin_main.php"><i class="fa fa-home" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['main_page']; ?></a></li>
<?php if (hesk_checkPermission('can_man_users',0)){echo '<li><a href="manage_users.php"><i class="fa fa-users" '.$display.'></i>&nbsp;'.$hesklang['menu_users'].'</a></li>';} <?php if (hesk_checkPermission('can_man_users',0)){echo '<li><a href="manage_users.php"><i class="fa fa-users" '.$iconDisplay.'></i>&nbsp;'.$hesklang['menu_users'].'</a></li>';}
if (hesk_checkPermission('can_man_cat',0)) {echo '<li><a href="manage_categories.php"><i class="fa fa-pie-chart" '.$display.'></i>&nbsp;'.$hesklang['menu_cat'].'</a></li>';} if (hesk_checkPermission('can_man_cat',0)) {echo '<li><a href="manage_categories.php"><i class="fa fa-pie-chart" '.$iconDisplay.'></i>&nbsp;'.$hesklang['menu_cat'].'</a></li>';}
if (hesk_checkPermission('can_man_canned',0)) {echo '<li><a href="manage_canned.php"><i class="fa fa-file-text-o" '.$display.'></i>&nbsp;'.$hesklang['menu_can'].'</a></li>';} if (hesk_checkPermission('can_man_canned',0)) {echo '<li><a href="manage_canned.php"><i class="fa fa-file-text-o" '.$iconDisplay.'></i>&nbsp;'.$hesklang['menu_can'].'</a></li>';}
if (hesk_checkPermission('can_man_kb',0)) {echo '<li><a href="manage_knowledgebase.php"><i class="fa fa-book" '.$display.'></i>&nbsp;'.$hesklang['menu_kb'].'</a></li>';} if (hesk_checkPermission('can_man_kb',0)) {echo '<li><a href="manage_knowledgebase.php"><i class="fa fa-book" '.$iconDisplay.'></i>&nbsp;'.$hesklang['menu_kb'].'</a></li>';}
else {echo '<li><a href="knowledgebase_private.php"><i class="fa fa-book" '.$display.'></i>&nbsp;'.$hesklang['menu_kb'].'</a></li>';} else {echo '<li><a href="knowledgebase_private.php"><i class="fa fa-book" '.$iconDisplay.'></i>&nbsp;'.$hesklang['menu_kb'].'</a></li>';}
if (hesk_checkPermission('can_run_reports',0)) {echo '<li><a href="reports.php"><i class="fa fa-line-chart" '.$display.'></i>&nbsp;'.$hesklang['reports'].'</a></li>';} if (hesk_checkPermission('can_run_reports',0)) {echo '<li><a href="reports.php"><i class="fa fa-line-chart" '.$iconDisplay.'></i>&nbsp;'.$hesklang['reports'].'</a></li>';}
elseif (hesk_checkPermission('can_export',0)) {echo '<li><a href="export.php"><i class="fa fa-line-chart" '.$display.'></i>&nbsp;'.$hesklang['reports'].'</a></li>';} elseif (hesk_checkPermission('can_export',0)) {echo '<li><a href="export.php"><i class="fa fa-line-chart" '.$iconDisplay.'></i>&nbsp;'.$hesklang['reports'].'</a></li>';}
if (hesk_checkPermission('can_man_settings',0)) {echo '<li><a href="admin_settings.php"><i class="fa fa-cog" '.$display.'></i>&nbsp;'.$hesklang['settings'].'</a></li>';} ?> if (hesk_checkPermission('can_man_settings',0)) {echo '<li><a href="admin_settings.php"><i class="fa fa-cog" '.$iconDisplay.'></i>&nbsp;'.$hesklang['settings'].'</a></li>';} ?>
<li><a href="profile.php"><i class="fa fa-user" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['menu_profile']; ?></a></li> <li><a href="profile.php"><i class="fa fa-user" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['menu_profile']; ?></a></li>
<li><a href="mail.php"><i class="fa fa-envelope-o" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['menu_msg']; ?> <li><a href="mail.php"><i class="fa fa-envelope-o" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['menu_msg']; ?>
<?php if ($num_mail != 0) <?php if ($num_mail != 0)
{ {
echo '<span class="badge">'; echo '<span class="badge">';
@ -70,10 +70,10 @@ $num_mail = hesk_checkNewMail();
echo '</span>'; echo '</span>';
} ?> } ?>
</a></li> </a></li>
<?php include('custom/show_admin_nav-custom.inc.php'); <?php include('custom/show_admin_nav-custom.inc.php');
$display = ($display == '') ? 'style="font-size: 14px"' : $display; $iconDisplay = ($iconDisplay == '') ? 'style="font-size: 14px"' : $iconDisplay;
?> ?>
<li><a href="index.php?a=logout&amp;token=<?php echo hesk_token_echo(); ?>"><span class="octicon octicon-sign-out" <?php echo $display; ?>></span>&nbsp;<?php echo $hesklang['logout']; ?></a></li> <li><a href="index.php?a=logout&amp;token=<?php echo hesk_token_echo(); ?>"><span class="octicon octicon-sign-out" <?php echo $iconDisplay; ?>></span>&nbsp;<?php echo $hesklang['logout']; ?></a></li>
</ul> </ul>
</div><!-- /.navbar-collapse --> </div><!-- /.navbar-collapse -->
</nav> </nav>