From a3988132b1e6c8f25801c24426a0a17dba099c74 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Thu, 20 Jul 2017 13:55:19 -0400 Subject: [PATCH] Short desc char limit import set to option Short desc character limits for import were set to 120, but now are set only to 120 if the setting short_desc_char_limit is unset. This is done for both csv import and the member import. --- models/admin/import/index.php | 12 ++++++++++-- models/admin/management/import/members.php | 11 +++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/models/admin/import/index.php b/models/admin/import/index.php index 1e3f10bb..beb1941b 100644 --- a/models/admin/import/index.php +++ b/models/admin/import/index.php @@ -1114,10 +1114,18 @@ class GlmMembersAdmin_import_index '', preg_replace( '/\t+/', '', preg_replace( "/&#?[a-z0-9]{2,8};/i", "", strip_tags( $data['descr'] ) ) ) ); - $short_descr = substr(implode(' ', array_slice(explode(' ', $stripped), 0, 30)), 0, 116); + + if ( isset( $this->config['settings']['short_desc_char_limit'] ) ) { + $short_desc_char_limit = $this->config['settings']['short_desc_char_limit']; + } else { + $short_desc_char_limit = 120; + } + $ellipsis = ' ...'; + + $short_descr = substr(implode(' ', array_slice(explode(' ', $stripped), 0, 30)), 0, $short_desc_char_limit - strlen($ellipsis)); if (strlen($short_descr) < strlen($stripped)) { - $short_descr .= ' ...'; + $short_descr .= $ellipsis; } // Setup the Member Profile Status diff --git a/models/admin/management/import/members.php b/models/admin/management/import/members.php index 0d27fe72..a98c0e28 100644 --- a/models/admin/management/import/members.php +++ b/models/admin/management/import/members.php @@ -796,12 +796,19 @@ if (!$failure) { // Add this member to the names inserted so we can check for duplicates $namesInserted[$membName] = true; + if ( isset( $this->config['settings']['short_desc_char_limit'] ) ) { + $short_desc_char_limit = $this->config['settings']['short_desc_char_limit']; + } else { + $short_desc_char_limit = 120; + } + $ellipsis = ' ...'; + // Create truncated short_descr from descriptions - Less tags, html encoded characters, newlines, tabs, etc. $stripped = str_replace(PHP_EOL, '', preg_replace('/\t+/', '', preg_replace("/&#?[a-z0-9]{2,8};/i", "", strip_tags($val['description'])))); - $short_descr = substr(implode(' ', array_slice(explode(' ', $stripped), 0, 30)), 0, 116); + $short_descr = substr(implode(' ', array_slice(explode(' ', $stripped), 0, 30)), 0, $short_desc_char_limit - strlen($ellipsis)); if (strlen($short_descr) < strlen($stripped)) { - $short_descr .= ' ...'; + $short_descr .= $ellipsis; } // Build Credit Card bitmap -- 2.17.1