From 155b6c5926a9e262b12bff11813b6f2634e0982f Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 28 Feb 2018 21:21:47 -0500
Subject: [PATCH] Update a bunch of files for HESK 2.7.6

---
 admin/admin_settings.php      | 22 ++++++++++++----------
 admin/admin_settings_save.php |  2 +-
 admin/edit_post.php           |  6 ++----
 admin/export.php              |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index db11e3e2..8fd9fd77 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -93,19 +93,20 @@ if ($hesk_settings['attachments']['use'] && !defined('HESK_DEMO')) {
     $tmp = @ini_get('upload_max_filesize');
     if ($tmp) {
         $last = strtoupper(substr($tmp, -1));
+        $number = substr($tmp, 0, -1);
 
         switch ($last) {
             case 'K':
-                $tmp = $tmp * 1024;
+                $tmp = $number * 1024;
                 break;
             case 'M':
-                $tmp = $tmp * 1048576;
+                $tmp = $number * 1048576;
                 break;
             case 'G':
-                $tmp = $tmp * 1073741824;
+                $tmp = $number * 1073741824;
                 break;
             default:
-                $tmp = $tmp;
+                $tmp = $number;
         }
 
         if ($tmp < $hesk_settings['attachments']['max_size']) {
@@ -117,19 +118,20 @@ if ($hesk_settings['attachments']['use'] && !defined('HESK_DEMO')) {
     $tmp = @ini_get('post_max_size');
     if ($tmp) {
         $last = strtoupper(substr($tmp, -1));
+        $number = substr($tmp, 0, -1);
 
         switch ($last) {
             case 'K':
-                $tmp = $tmp * 1024;
+                $tmp = $number * 1024;
                 break;
             case 'M':
-                $tmp = $tmp * 1048576;
+                $tmp = $number * 1048576;
                 break;
             case 'G':
-                $tmp = $tmp * 1073741824;
+                $tmp = $number * 1073741824;
                 break;
             default:
-                $tmp = $tmp;
+                $tmp = $number;
         }
 
         if ($tmp < ($hesk_settings['attachments']['max_size'] * $hesk_settings['attachments']['max_number'] + 524288)) {
@@ -3508,13 +3510,13 @@ $modsForHesk_settings = mfh_getSettings();
 
                 <h4 class="bold"><?php echo $hesklang['other']; ?></h4>
                 <div class="form-group">
-                    <label for="s_ip_whois" class="col-sm-4 control-label"><?php echo $hesklang['ip_whois']; ?> <a
+                    <label for="s_ip_whois_url" class="col-sm-4 control-label"><?php echo $hesklang['ip_whois']; ?> <a
                             href="Javascript:void(0)"
                             onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#61','400','500')"><i
                                 class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
                     <div class="col-sm-8">
-                        <input type="text" class="form-control" name="s_ip_whois" size="40" maxlength="255"
+                        <input type="text" class="form-control" name="s_ip_whois_url" size="40" maxlength="255"
                                value="<?php echo $hesk_settings['ip_whois']; ?>"/>
                     </div>
                 </div>
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 27855154..cd6c96cf 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -425,7 +425,7 @@ $set['daylight'] = empty($_POST['s_daylight']) ? 0 : 1;
 $set['timeformat'] = hesk_input(hesk_POST('s_timeformat')) or $set['timeformat'] = 'Y-m-d H:i:s';
 
 /* --> Other */
-$set['ip_whois'] = hesk_input(hesk_POST('s_ip_whois', 'http://whois.domaintools.com/{IP}'));
+$set['ip_whois'] = hesk_input(hesk_POST('s_ip_whois_url', 'http://whois.domaintools.com/{IP}'));
 
 // If no {IP} tag append it to the end
 if (strlen($set['ip_whois']) == 0) {
diff --git a/admin/edit_post.php b/admin/edit_post.php
index 9cd56341..1b96d9b1 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -577,9 +577,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                     case 'hidden':
                                     case 'readonly':
                                     default:
-                                        if (strlen($k_value) != 0) {
-                                            $v['value']['default_value'] = $k_value;
-                                        }
+                                        $k_value = hesk_msgToPlain($k_value,0,0);
 
                                         $cls = in_array($k, $_SESSION['iserror']) ? ' isError' : '';
 
@@ -587,7 +585,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <div class="form-group' . $cls . '">
                             <label for="' . $k . '" class="col-sm-3 control-label">' . $v['name'] . ' ' . $v['req'] . '</label>
                             <div class="col-sm-9">
-                                <input type="text" class="form-control" name="' . $k . '" size="40" maxlength="' . intval($v['value']['max_length']) . '" value="' . $v['value']['default_value'] . '" ' . $required_attribute . '>';
+                                <input type="text" class="form-control" name="' . $k . '" size="40" maxlength="' . intval($v['value']['max_length']) . '" value="' . $k_value . '" ' . $required_attribute . '>';
                                     if (!empty($v['mfh_description'])) {
                                         echo '<div class="help-block">' . $v['mfh_description'] . '</div>';
                                     }
diff --git a/admin/export.php b/admin/export.php
index c0a366e6..af02e349 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -291,7 +291,7 @@ $orderBy = $modsForHesk_settings['category_order_column'];
 $res2 = hesk_dbQuery("SELECT `id`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE " . hesk_myCategories('id') . " ORDER BY `" . $orderBy . "` ASC");
 while ($row = hesk_dbFetchAssoc($res2)) {
     $my_cat[$row['id']] = hesk_msgToPlain($row['name'], 1);
-    $row['name'] = (strlen($row['name']) > 50) ? substr($row['name'], 0, 50) . '...' : $row['name'];
+    $row['name'] = (hesk_mb_strlen($row['name']) > 50) ? hesk_mb_substr($row['name'],0,50) . '...' : $row['name'];
     $cat_selected = ($row['id'] == $category) ? 'selected="selected"' : '';
     $category_options .= '<option value="' . $row['id'] . '" ' . $cat_selected . '>' . $row['name'] . '</option>';
 }