From 946ebfdaee5cc5ba64456e3ea6c922a3fd0d67c3 Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Thu, 5 May 2016 12:59:50 -0400
Subject: [PATCH] Small JS and calendar fix

---
 inc/header.inc.php                    | 2 ++
 install/mods-for-hesk/modsForHesk.php | 2 +-
 internal-api/admin/calendar/index.php | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/inc/header.inc.php b/inc/header.inc.php
index 050adc32..851a859c 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -104,6 +104,7 @@ if (is_dir(HESK_PATH . 'install')) {
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/fullcalendar.min.css">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.jgrowl.min.css">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css">
     <script src="<?php echo HESK_PATH; ?>js/jquery-1.10.2.min.js"></script>
     <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>hesk_javascript.js"></script>
     <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
@@ -121,6 +122,7 @@ if (is_dir(HESK_PATH . 'install')) {
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-validator.min.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core.php"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js"></script>
     <style>
         .navbar-default {
             background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>;
diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index 538e291a..a0bb61c7 100644
--- a/install/mods-for-hesk/modsForHesk.php
+++ b/install/mods-for-hesk/modsForHesk.php
@@ -152,7 +152,7 @@ hesk_dbConnect();
                                 }
                                 ?>
                                 <a id="254" class="btn <?php echo $v254btn; ?> btn-block disablable"
-                                   href="installModsForHesk.php?v=25">2.5.4</a>
+                                   href="installModsForHesk.php?v=25">2.5.5</a>
                             </div>
                             <div class="col-md-3 col-sm-12">
                                 <?php
diff --git a/internal-api/admin/calendar/index.php b/internal-api/admin/calendar/index.php
index 512d6ac3..095a4b0a 100644
--- a/internal-api/admin/calendar/index.php
+++ b/internal-api/admin/calendar/index.php
@@ -6,6 +6,7 @@ require_once(HESK_PATH . 'hesk_settings.inc.php');
 require_once(HESK_PATH . 'inc/common.inc.php');
 require_once(HESK_PATH . 'inc/attachments.inc.php');
 require_once(HESK_PATH . 'inc/posting_functions.inc.php');
+require_once(HESK_PATH . 'inc/admin_functions.inc.php');
 require_once(INTERNAL_API_PATH . 'core/output.php');
 require_once(INTERNAL_API_PATH . 'dao/calendar_dao.php');
 
@@ -24,12 +25,12 @@ if ($request_method === 'GET') {
 
     return output($events);
 } elseif ($request_method === 'POST') {
-    if ($request_method !== 'update-ticket' && !hesk_checkPermission('can_man_calendar', 0)) {
+    $action = hesk_POST('action');
+    if ($action !== 'update-ticket' && !hesk_checkPermission('can_man_calendar', 0)) {
         print_error('Access Denied', 'Access Denied!');
         return http_response_code(401);
     }
 
-    $action = hesk_POST('action');
 
     if ($action === 'create') {
         $event['title'] = hesk_POST('title');