diff --git a/README.md b/README.md index 4d395787..a53bd5d5 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/mkoch227/Mods-for-HESK/blob/master/LICENSE) [![Join the chat at https://gitter.im/mkoch227/Mods-for-HESK](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mkoch227/Mods-for-HESK?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -Mods for HESK is a set of modifications for [HESK](http://www.hesk.com) v2.6.x, a free and popular helpdesk solution. +Mods for HESK is a set of modifications for [HESK](https://www.hesk.com) v2.7.x, a free and popular helpdesk solution. ## Features diff --git a/admin/admin_main.php b/admin/admin_main.php index 58775298..b76bf937 100644 --- a/admin/admin_main.php +++ b/admin/admin_main.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php index fbdf5258..81e485f1 100644 --- a/admin/admin_reply_ticket.php +++ b/admin/admin_reply_ticket.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/admin_settings.php b/admin/admin_settings.php index f29d028d..9df73602 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ @@ -333,21 +333,21 @@ $modsForHesk_settings = mfh_getSettings(); // Is this a beta/dev version? if (strpos($hesk_settings['hesk_version'], 'beta') || strpos($hesk_settings['hesk_version'], 'dev') || strpos($hesk_settings['hesk_version'], 'RC')) { echo ' ' . $hesklang['beta'] . ' '; ?> ' . $hesklang['hnw'] . ' '; ?> - - @@ -374,7 +374,7 @@ $modsForHesk_settings = mfh_getSettings(); if ($hesk_settings['check_updates']) { if (strpos($modsForHeskVersion, 'beta') || strpos($modsForHeskVersion, 'dev') || strpos($modsForHeskVersion, 'RC')) { echo ' ' . $hesklang['beta'] . ' '; ?> ' . $hesklang['mfh_up_to_date'] . ''; @@ -3926,7 +3926,7 @@ $modsForHesk_settings = mfh_getSettings(); } /* Check if language file is for current version */ - if (strpos($tmp, '$hesklang[\'refresh_page\']') === false) { + if (strpos($tmp, '$hesklang[\'LANGUAGE_EN\']') === false) { $err .= " |----> WRONG VERSION (not " . $hesk_settings['hesk_version'] . ")\n"; } diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php index be46d35a..9d8a2ee9 100644 --- a/admin/admin_settings_save.php +++ b/admin/admin_settings_save.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ @@ -822,7 +822,7 @@ function hesk_getLanguagesArray($returnArray = 0) $add = 0; } elseif (!preg_match('/\$hesklang\[\'EMAIL_HR\'\]\=\'(.*)\'\;/', $tmp, $hr)) { $add = 0; - } elseif (!preg_match('/\$hesklang\[\'refresh_page\'\]/', $tmp)) { + } elseif (!preg_match('/\$hesklang\[\'LANGUAGE_EN\'\]/', $tmp)) { $add = 0; } } else { diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php index f918dc6e..09592bb4 100644 --- a/admin/admin_submit_ticket.php +++ b/admin/admin_submit_ticket.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index cd295a38..929aeada 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/api_settings.php b/admin/api_settings.php index 2bdc36b7..072bddb1 100644 --- a/admin/api_settings.php +++ b/admin/api_settings.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.5 from 28th August 2015 * Author: Klemen Stirn - * Website: http://www.hesk.com + * Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/admin/assign_owner.php b/admin/assign_owner.php index 0bef7af7..92d2f7c2 100755 --- a/admin/assign_owner.php +++ b/admin/assign_owner.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.1 from 26th February 2015 * Author: Klemen Stirn - * Website: http://www.hesk.com + * Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/admin/banned_emails.php b/admin/banned_emails.php index 6fd9892c..d3aa2adf 100644 --- a/admin/banned_emails.php +++ b/admin/banned_emails.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/banned_ips.php b/admin/banned_ips.php index 23672d43..49d8dd15 100644 --- a/admin/banned_ips.php +++ b/admin/banned_ips.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/calendar.php b/admin/calendar.php index a1182dcf..ef06eb08 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.5 from 28th August 2015 * Author: Klemen Stirn - * Website: http://www.hesk.com + * Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/admin/change_status.php b/admin/change_status.php index 36622e97..9e6a572d 100644 --- a/admin/change_status.php +++ b/admin/change_status.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/custom_fields.php b/admin/custom_fields.php index 09f6d65f..bbd978f2 100755 --- a/admin/custom_fields.php +++ b/admin/custom_fields.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/delete_tickets.php b/admin/delete_tickets.php index e387ea3f..7bc77b44 100644 --- a/admin/delete_tickets.php +++ b/admin/delete_tickets.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/edit_note.php b/admin/edit_note.php index 455275c4..a269e5ab 100644 --- a/admin/edit_note.php +++ b/admin/edit_note.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/edit_post.php b/admin/edit_post.php index 15156456..34ac110c 100644 --- a/admin/edit_post.php +++ b/admin/edit_post.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/export.php b/admin/export.php index 41218a43..5ae26010 100644 --- a/admin/export.php +++ b/admin/export.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ define('IN_SCRIPT', 1); diff --git a/admin/find_tickets.php b/admin/find_tickets.php index dc796346..56b4def1 100644 --- a/admin/find_tickets.php +++ b/admin/find_tickets.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/index.php b/admin/index.php index f3a3031b..627e803c 100644 --- a/admin/index.php +++ b/admin/index.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php index 372c2941..d83f49dd 100644 --- a/admin/knowledgebase_private.php +++ b/admin/knowledgebase_private.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.8 from 10th August 2016 * Author: Klemen Stirn -* Website: http://www.hesk.com +* Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/admin/lock.php b/admin/lock.php index a1afbae5..57bedfd6 100644 --- a/admin/lock.php +++ b/admin/lock.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/mail.php b/admin/mail.php index 93c0e860..d0a8f3f9 100644 --- a/admin/mail.php +++ b/admin/mail.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ @@ -407,7 +407,7 @@ function show_message() hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."mail` SET `read`='1' WHERE `id`='".intval($id)."'"); } - $pm['name'] = isset($admins[$pm[$hesk_settings['mailtmp']['other']]]) ? ''.$admins[$pm[$hesk_settings['mailtmp']['other']]].'' : (($pm['from'] == 9999) ? 'HESK.com' : $hesklang['e_udel']); + $pm['name'] = isset($admins[$pm[$hesk_settings['mailtmp']['other']]]) ? ''.$admins[$pm[$hesk_settings['mailtmp']['other']]].'' : (($pm['from'] == 9999) ? 'HESK.com' : $hesklang['e_udel']); $pm['dt'] = hesk_dateToString($pm['dt'],0,1,0,true); ?> @@ -564,10 +564,8 @@ function mail_list_messages() $i = 0; while ($pm = hesk_dbFetchAssoc($res)) { if ($i) { - $color = "admin_gray"; $i = 0; } else { - $color = "admin_white"; $i = 1; } @@ -575,7 +573,7 @@ function mail_list_messages() if ($hesk_settings['mailtmp']['this'] == 'to' && !$pm['read']) { $pm['subject'] = '' . $pm['subject'] . ''; } - $pm['name'] = isset($admins[$pm[$hesk_settings['mailtmp']['other']]]) ? '' . $admins[$pm[$hesk_settings['mailtmp']['other']]] . '' : (($pm['from'] == 9999) ? 'HESK.com' : $hesklang['e_udel']); + $pm['name'] = isset($admins[$pm[$hesk_settings['mailtmp']['other']]]) ? '' . $admins[$pm[$hesk_settings['mailtmp']['other']]] . '' : (($pm['from'] == 9999) ? 'HESK.com' : $hesklang['e_udel']); $pm['dt'] = hesk_dateToString($pm['dt'], 0, 0, 0, true) ?> diff --git a/admin/manage_canned.php b/admin/manage_canned.php index 726ad8cf..98d87644 100644 --- a/admin/manage_canned.php +++ b/admin/manage_canned.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/manage_categories.php b/admin/manage_categories.php index 417cbf70..d88d3737 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php index aa8f2652..ceeeec48 100644 --- a/admin/manage_knowledgebase.php +++ b/admin/manage_knowledgebase.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.8 from 10th August 2016 * Author: Klemen Stirn -* Website: http://www.hesk.com +* Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php index 571b74d8..2434657b 100644 --- a/admin/manage_permission_templates.php +++ b/admin/manage_permission_templates.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php index b1904f34..666167ac 100644 --- a/admin/manage_ticket_templates.php +++ b/admin/manage_ticket_templates.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/manage_users.php b/admin/manage_users.php index 2b80c794..4c4a1812 100644 --- a/admin/manage_users.php +++ b/admin/manage_users.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/move_category.php b/admin/move_category.php index d78b8ab3..5e15d457 100755 --- a/admin/move_category.php +++ b/admin/move_category.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.1 from 26th February 2015 * Author: Klemen Stirn - * Website: http://www.hesk.com + * Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/admin/new_ticket.php b/admin/new_ticket.php index a0926d18..506bc42f 100644 --- a/admin/new_ticket.php +++ b/admin/new_ticket.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/password.php b/admin/password.php index 8fef7c6e..b6c35830 100644 --- a/admin/password.php +++ b/admin/password.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/profile.php b/admin/profile.php index fc27d6a0..3e607602 100644 --- a/admin/profile.php +++ b/admin/profile.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/reports.php b/admin/reports.php index 5edefd8a..844f264f 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/service_messages.php b/admin/service_messages.php index 019502ba..214c4b11 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/admin/show_tickets.php b/admin/show_tickets.php index 1ba42e2c..52b3a69d 100644 --- a/admin/show_tickets.php +++ b/admin/show_tickets.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/api/core/database.inc.php b/api/core/database.inc.php index c8d98d34..c56381e6 100755 --- a/api/core/database.inc.php +++ b/api/core/database.inc.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.1 from 26th February 2015 * Author: Klemen Stirn -* Website: http://www.hesk.com +* Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/api/core/database_mysqli.inc.php b/api/core/database_mysqli.inc.php index fc13df26..b52122aa 100755 --- a/api/core/database_mysqli.inc.php +++ b/api/core/database_mysqli.inc.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.1 from 26th February 2015 * Author: Klemen Stirn -* Website: http://www.hesk.com +* Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/calendar.php b/calendar.php index 80eec543..0caf2818 100644 --- a/calendar.php +++ b/calendar.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.5 from 28th August 2015 * Author: Klemen Stirn - * Website: http://www.hesk.com + * Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/change_status.php b/change_status.php index f490597b..5fee55e1 100644 --- a/change_status.php +++ b/change_status.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/cron/core/database.inc.php b/cron/core/database.inc.php index 52a81271..885278d6 100755 --- a/cron/core/database.inc.php +++ b/cron/core/database.inc.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.1 from 26th February 2015 * Author: Klemen Stirn -* Website: http://www.hesk.com +* Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/cron/core/database_mysqli.inc.php b/cron/core/database_mysqli.inc.php index 43172543..f1746a2a 100755 --- a/cron/core/database_mysqli.inc.php +++ b/cron/core/database_mysqli.inc.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.1 from 26th February 2015 * Author: Klemen Stirn -* Website: http://www.hesk.com +* Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/download_attachment.php b/download_attachment.php index 356638a6..232ba232 100755 --- a/download_attachment.php +++ b/download_attachment.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/hesk_javascript.js b/hesk_javascript.js index fed60f01..f36d7bdf 100644 --- a/hesk_javascript.js +++ b/hesk_javascript.js @@ -2,7 +2,7 @@ * Title: Help Desk Software HESK * Version: 2.6.8 from 10th August 2016 * Author: Klemen Stirn - * Website: http://www.hesk.com + * Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/inc/admin_functions.inc.php b/inc/admin_functions.inc.php index fe949621..6ba5237a 100644 --- a/inc/admin_functions.inc.php +++ b/inc/admin_functions.inc.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/inc/attachments.inc.php b/inc/attachments.inc.php index 1dfd4fee..37535af7 100644 --- a/inc/attachments.inc.php +++ b/inc/attachments.inc.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/inc/common.inc.php b/inc/common.inc.php index c69478d6..ba3c43ef 100644 --- a/inc/common.inc.php +++ b/inc/common.inc.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ @@ -1137,7 +1137,7 @@ function hesk_getLanguage() define('HESK_DEFAULT_LANGUAGE', $hesk_settings['language']); /* Can users select language? */ - if (empty($hesk_settings['can_sel_lang'])) { + if (defined('NO_HTTP_HEADER') || empty($hesk_settings['can_sel_lang'])) { return hesk_returnLanguage(); } diff --git a/inc/custom_fields.inc.php b/inc/custom_fields.inc.php index b077c502..4d57778f 100755 --- a/inc/custom_fields.inc.php +++ b/inc/custom_fields.inc.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php index df45602f..b1ed8563 100644 --- a/inc/email_functions.inc.php +++ b/inc/email_functions.inc.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/inc/footer.inc.php b/inc/footer.inc.php index 15259146..c6065c9c 100644 --- a/inc/footer.inc.php +++ b/inc/footer.inc.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ @@ -75,13 +75,13 @@ yg4LlpjXSordVI1MTInKSkgIT09IGZhbHNlKQ0Kew0KJHMgPSAwOw0KfQ0KZWxzZQ0Kew0KZWNobyAnP HAgc3R5bGU9InRleHQtYWxpZ246Y2VudGVyO2NvbG9yOnJlZDsiPklOVkFMSUQgTElDRU5TRSAoTk9UI FJFR0lTVEVSRUQgRk9SICcuJGguJykhPC9wPic7DQp9DQp9DQppZiAoJHMpDQp7DQplY2hvICc8cCBzd HlsZT0idGV4dC1hbGlnbjpjZW50ZXIiPjxzcGFuIGNsYXNzPSJzbWFsbGVyIj4mbmJzcDs8YnIgLz5Qb -3dlcmVkIGJ5IDxhIGhyZWY9Imh0dHA6Ly93d3cuaGVzay5jb20iIGNsYXNzPSJzbWFsbGVyIiB0aXRsZ -T0iRnJlZSBQSFAgSGVscCBEZXNrIFNvZnR3YXJlIj5IZWxwIERlc2sgU29mdHdhcmU8L2E+IDxiPkhFU -0s8L2I+LCBicm91Z2h0IHRvIHlvdSBieSA8YSBocmVmPSJodHRwczovL3d3dy5zeXNhaWQuY29tLz91d -G1fc291cmNlPUhlc2smYW1wO3V0bV9tZWRpdW09Y3BjJmFtcDt1dG1fY2FtcGFpZ249SGVza1Byb2R1Y -3RfVG9fSFAiPlN5c0FpZDwvYT48L3NwYW4+PC9wPic7DQp9DQplY2hvICc8L3RkPjwvdHI+PC90YWJsZ -T48L2Rpdj4nOw0KaW5jbHVkZShIRVNLX1BBVEggLiAnZm9vdGVyLnR4dCcpOw0KZWNobyAnPC9ib2R5P -jwvaHRtbD4nOw==',"\112"); +3dlcmVkIGJ5IDxhIGhyZWY9Imh0dHBzOi8vd3d3Lmhlc2suY29tIiBjbGFzcz0ic21hbGxlciIgdGl0b +GU9IkZyZWUgUEhQIEhlbHAgRGVzayBTb2Z0d2FyZSI+SGVscCBEZXNrIFNvZnR3YXJlPC9hPiA8Yj5IR +VNLPC9iPiwgYnJvdWdodCB0byB5b3UgYnkgPGEgaHJlZj0iaHR0cHM6Ly93d3cuc3lzYWlkLmNvbS8/d +XRtX3NvdXJjZT1IZXNrJmFtcDt1dG1fbWVkaXVtPWNwYyZhbXA7dXRtX2NhbXBhaWduPUhlc2tQcm9kd +WN0X1RvX0hQIj5TeXNBaWQ8L2E+PC9zcGFuPjwvcD4nOw0KfQ0KZWNobyAnPC90ZD48L3RyPjwvdGFib +GU+PC9kaXY+JzsNCmluY2x1ZGUoSEVTS19QQVRIIC4gJ2Zvb3Rlci50eHQnKTsNCmVjaG8gJzwvYm9ke +T48L2h0bWw+Jzs=',"\112"); if (defined('ADMIN_PAGE')) { echo ''; diff --git a/inc/header.inc.php b/inc/header.inc.php index 60705433..7d8037a7 100644 --- a/inc/header.inc.php +++ b/inc/header.inc.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ @@ -239,6 +239,9 @@ if (is_dir(HESK_PATH . 'install')) { diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index db6fb92f..ea3a2de4 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.8 from 10th August 2016 * Author: Klemen Stirn - * Website: http://www.hesk.com + * Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2014 Klemen Stirn. All Rights Reserved. @@ -221,7 +221,12 @@ $modsForHesk_settings = mfh_getSettings(); - + Insert rate this script email -hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."mail` (`id`, `from`, `to`, `subject`, `message`, `dt`, `read`, `deletedby`) VALUES (1, 9999, 1, 'Rate this script', '
\r\n\r\n

Enjoy using HESK? Please let others know!

\r\n\r\n

You are invited to rate HESK or even write a short review here:
 
\"\" Rate this script @ Hot Scripts
 
\"\" Rate this script @ The PHP Resource Index

\r\n\r\n

Thank you,
 
Klemen,
\r\nwww.hesk.com\r\n\r\n

 

', NOW(), '0', 9999)"); +hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."mail` (`id`, `from`, `to`, `subject`, `message`, `dt`, `read`, `deletedby`) VALUES (1, 9999, 1, 'Rate this script', '
\r\n\r\n

Enjoy using HESK? Please let others know!

\r\n\r\n

You are invited to rate HESK or even write a short review here:
 
\"\" Rate this script @ Hot Scripts
 
\"\" Rate this script @ The PHP Resource Index

\r\n\r\n

Thank you,
 
Klemen,
\r\nwww.hesk.com\r\n\r\n

 

', NOW(), '0', 9999)"); // ---> Insert welcome email -hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."mail` (`id`, `from`, `to`, `subject`, `message`, `dt`, `read`, `deletedby`) VALUES (2, 9999, 1, 'Welcome to HESK! Here are some quick tips...', '

HESK quick "Getting Started" tips:
 

\r\n\r\n
    \r\n
  1. Click the Profile link to set your name, email, signature and password.
     
    2. \r\n
  2. Click the Settings link in the top menu to get to the Settings page. For additional information about each setting, click the [?] link.
     
    3. \r\n
  3. Add new categories (departments) on the Categories page. The default category cannot be deleted, but it can be renamed.
     
    4. \r\n
  4. Create new staff accounts on the Users page. You can give them unlimited (Administrator) or restricted (Staff) access.
     
    5. \r\n
  5. Use the integrated Knowledgebase. A comprehensive and well-written knowledgebase can drastically reduce the number of support tickets you receive and save a lot of your time in the long run.
     
    6. \r\n
  6. You can create response and new ticket templates on the Canned page.
     
    7. \r\n
  7. Subscribe to the HESK Newsletter to be notified of updates and new versions.
     
    8. \r\n
  8. You should follow HESK on Twitter here.
     
    9. \r\n
  9. To remove the "Powered by Help Desk Software HESK" links from the bottom of your help desk buy a license here.
     
\r\n\r\n

Enjoy using HESK and please feel free to share your constructive feedback and feature suggestions.

\r\n\r\n

Klemen Stirn
\r\nHESK owner and author
\r\nwww.hesk.com', NOW(), '0', 9999)"); +hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."mail` (`id`, `from`, `to`, `subject`, `message`, `dt`, `read`, `deletedby`) VALUES (2, 9999, 1, 'Welcome to HESK! Here are some quick tips...', '

HESK quick "Getting Started" tips:
 

\r\n\r\n
    \r\n
  1. Click the Profile link to set your name, email, signature and password.
     
    2. \r\n
  2. Click the Settings link in the top menu to get to the Settings page. For additional information about each setting, click the [?] link.
     
    3. \r\n
  3. Add new categories (departments) on the Categories page. The default category cannot be deleted, but it can be renamed.
     
    4. \r\n
  4. Create new staff accounts on the Users page. You can give them unlimited (Administrator) or restricted (Staff) access.
     
    5. \r\n
  5. Use the integrated Knowledgebase. A comprehensive and well-written knowledgebase can drastically reduce the number of support tickets you receive and save a lot of your time in the long run.
     
    6. \r\n
  6. You can create response and new ticket templates on the Canned page.
     
    7. \r\n
  7. Subscribe to the HESK Newsletter to be notified of updates and new versions.
     
    8. \r\n
  8. You should follow HESK on Twitter here.
     
    9. \r\n
  9. To remove the "Powered by Help Desk Software HESK" links from the bottom of your help desk buy a license here.
     
\r\n\r\n

Enjoy using HESK and please feel free to share your constructive feedback and feature suggestions.

\r\n\r\n

Klemen Stirn
\r\nHESK owner and author
\r\nwww.hesk.com', NOW(), '0', 9999)"); // -> Notes hesk_dbQuery(" diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php index cd903e53..6e8f9f9a 100644 --- a/install/install_functions.inc.php +++ b/install/install_functions.inc.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.8 from 10th August 2016 * Author: Klemen Stirn -* Website: http://www.hesk.com +* Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. @@ -37,7 +37,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');} // We will be installing this HESK version: define('HESK_NEW_VERSION','2.7.0'); -define('MODS_FOR_HESK_NEW_VERSION','3.0.0 beta 1'); +define('MODS_FOR_HESK_NEW_VERSION','3.0.0'); define('REQUIRE_PHP_VERSION','5.3.0'); define('REQUIRE_MYSQL_VERSION','5.0.7'); @@ -888,7 +888,7 @@ function hesk_iFooter() global $hesk_settings; ?> -

 
Powered by Help Desk Software HESK, brought to you by SysAid

+

 
Powered by Help Desk Software HESK, brought to you by SysAid

diff --git a/internal-api/core/database.inc.php b/internal-api/core/database.inc.php index c8d98d34..c56381e6 100755 --- a/internal-api/core/database.inc.php +++ b/internal-api/core/database.inc.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.1 from 26th February 2015 * Author: Klemen Stirn -* Website: http://www.hesk.com +* Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/internal-api/core/database_mysqli.inc.php b/internal-api/core/database_mysqli.inc.php index b7b5a11e..96cabfc6 100755 --- a/internal-api/core/database_mysqli.inc.php +++ b/internal-api/core/database_mysqli.inc.php @@ -3,7 +3,7 @@ * Title: Help Desk Software HESK * Version: 2.6.1 from 26th February 2015 * Author: Klemen Stirn -* Website: http://www.hesk.com +* Website: https://www.hesk.com ******************************************************************************** * COPYRIGHT AND TRADEMARK NOTICE * Copyright 2005-2015 Klemen Stirn. All Rights Reserved. diff --git a/knowledgebase.php b/knowledgebase.php index d5215365..a5ebb4eb 100644 --- a/knowledgebase.php +++ b/knowledgebase.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/language/en/text.php b/language/en/text.php index 3a086070..fe7d701d 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -1,17 +1,41 @@ CONTRIBUTORS +* +* Klemen Stirn (https://www.hesk.com) +* Mike Koch (https://mods-for-hesk.mkochcs.com) +* +* +* ==> HOW TO TRANSLATE THIS FILE +* +* https://www.hesk.com/knowledgebase/?article=34 +* +* ==> HOW TO CUSTOMIZE TEXT +* +* Do NOT customize text inside here, it will be overwritten by updates! +* +* Follow this guide instead: +* https://www.hesk.com/knowledgebase/?article=88 +* +* ==> IMPORTANT: FILE ENCODING * * !!! This file must be saved in UTF-8 encoding without byte order mark (BOM) !!! * Test chars: àáâãäåæ +* +* https://www.hesk.com/knowledgebase/?article=87 +* */ -// Change "English" to the name of your language +// Native name of language, for example: Deutsch $hesklang['LANGUAGE']='English'; +// English name of language, for example: German +$hesklang['LANGUAGE_EN'] ='English'; + // Language encoding. It MUST be set to UTF-8 for all languages! $hesklang['ENCODING']='UTF-8'; diff --git a/print.php b/print.php index 936fa963..c673a80c 100644 --- a/print.php +++ b/print.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/reply_ticket.php b/reply_ticket.php index 80c0baf6..55150aa7 100644 --- a/reply_ticket.php +++ b/reply_ticket.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/submit_ticket.php b/submit_ticket.php index 46102941..43f542f6 100644 --- a/submit_ticket.php +++ b/submit_ticket.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/suggest_articles.php b/suggest_articles.php index 1ec11ca7..68f3b41f 100644 --- a/suggest_articles.php +++ b/suggest_articles.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/suggest_email.php b/suggest_email.php index c271ffd3..5b19bfb3 100644 --- a/suggest_email.php +++ b/suggest_email.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */ diff --git a/ticket.php b/ticket.php index af6d8732..ec0e67a5 100644 --- a/ticket.php +++ b/ticket.php @@ -4,10 +4,10 @@ * This file is part of HESK - PHP Help Desk Software. * * (c) Copyright Klemen Stirn. All rights reserved. - * http://www.hesk.com + * https://www.hesk.com * * For the full copyright and license agreement information visit - * http://www.hesk.com/eula.php + * https://www.hesk.com/eula.php * */