From 9f51350afd7e6e32662fe592085cb22eca9a435c Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Fri, 16 Jun 2017 16:44:37 -0400 Subject: [PATCH] Adding short description character limit field A short description character limit field added to the database, which can be set in management. --- classes/data/dataMemberInfo.php | 6 +++--- classes/data/settings/dataSettingsGeneral.php | 8 ++++++++ index.php | 2 +- ...atabase_V1.1.31.sql => create_database_V1.1.32.sql} | 3 ++- setup/databaseScripts/dbVersions.php | 3 ++- setup/databaseScripts/update_database_V1.1.32.sql | 10 ++++++++++ views/admin/management/index.html | 5 +++-- .../member/memberInfo/editProfileDescription.html | 4 +++- views/admin/member/memberInfo/editStatus.html | 2 +- 9 files changed, 33 insertions(+), 10 deletions(-) rename setup/databaseScripts/{create_database_V1.1.31.sql => create_database_V1.1.32.sql} (99%) create mode 100644 setup/databaseScripts/update_database_V1.1.32.sql diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php index 41a5d30f..d494db5a 100644 --- a/classes/data/dataMemberInfo.php +++ b/classes/data/dataMemberInfo.php @@ -373,7 +373,7 @@ class GlmDataMemberInfo extends GlmDataAbstract 'short_descr' => array ( 'field' => 'short_descr', 'type' => 'text', - 'maxLength' => '124', + 'maxLength' => $this->config['settings']['short_desc_char_limit'], 'use' => 'a' ), @@ -606,12 +606,12 @@ class GlmDataMemberInfo extends GlmDataAbstract $r['short_descr'] = $r['descr']; } $dotdotdot = ''; - if (strlen($r['short_descr']) > 120 ) { + if (strlen($r['short_descr']) > $this->config['settings']['short_desc_char_limit'] ) { $dotdotdot = ' ...'; } $formattedStr = trim(preg_replace('/\s\s+/', ' ', $r['short_descr'])); - $r['short_descr'] = substr($formattedStr, 0, 120).$dotdotdot; + $r['short_descr'] = substr($formattedStr, 0, $this->config['settings']['short_desc_char_limit']).$dotdotdot; } diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php index 005c735a..d42854e0 100644 --- a/classes/data/settings/dataSettingsGeneral.php +++ b/classes/data/settings/dataSettingsGeneral.php @@ -240,6 +240,14 @@ class GlmDataSettingsGeneral extends GlmDataAbstract 'use' => 'a' ), + // How many characters the short description is limited to - also used for importing + 'short_desc_char_limit' => array( + 'field' => 'short_desc_char_limit', + 'type' => 'integer', + 'default' => 120, + 'use' => 'a' + ), + /* * Member Info edit tab selection */ diff --git a/index.php b/index.php index 418e1a5e..f70e7358 100644 --- a/index.php +++ b/index.php @@ -39,7 +39,7 @@ */ define('GLM_MEMBERS_PLUGIN_VERSION', '2.9.19'); -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.31'); +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.32'); // Check if plugin version is not current in WordPress option and if needed updated it if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) { diff --git a/setup/databaseScripts/create_database_V1.1.31.sql b/setup/databaseScripts/create_database_V1.1.32.sql similarity index 99% rename from setup/databaseScripts/create_database_V1.1.31.sql rename to setup/databaseScripts/create_database_V1.1.32.sql index 8317b40f..d7b19d6f 100644 --- a/setup/databaseScripts/create_database_V1.1.31.sql +++ b/setup/databaseScripts/create_database_V1.1.32.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database -- File Created: 12/29/16 12:06:00 --- Database Version: 1.1.27 +-- Database Version: 1.1.32 -- Database Creation Script -- -- To permit each query below to be executed separately, @@ -402,6 +402,7 @@ CREATE TABLE {prefix}settings_general ( detail_map_show_amenities BOOLEAN DEFAULT '0', members_only_support_email TINYTEXT DEFAULT '', members_only_support_phone TINYTEXT DEFAULT '', + short_desc_char_limit INTEGER DEFAULT '120', -- How many characters the short description is limited to - also used for importing PRIMARY KEY (id) ); diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 152063f7..6dc1e568 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -62,7 +62,8 @@ $glmMembersDbVersions = array( '1.1.28' => array('version' => '1.1.28', 'tables' => 19, 'date' => '04/04/17'), '1.1.29' => array('version' => '1.1.29', 'tables' => 19, 'date' => '04/10/17'), '1.1.30' => array('version' => '1.1.30', 'tables' => 19, 'date' => '04/12/17'), - '1.1.31' => array('version' => '1.1.31', 'tables' => 20, 'date' => '04/23/17') + '1.1.31' => array('version' => '1.1.31', 'tables' => 20, 'date' => '04/23/17'), + '1.1.32' => array('version' => '1.1.32', 'tables' => 20, 'date' => '06/14/17') ); diff --git a/setup/databaseScripts/update_database_V1.1.32.sql b/setup/databaseScripts/update_database_V1.1.32.sql new file mode 100644 index 00000000..b24554e5 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.32.sql @@ -0,0 +1,10 @@ +-- Gaslight Media Members Database +-- File Created: 04/12/17 +-- Database Version: 1.1.32 +-- Database Update From Previous Version Script +-- +-- To permit each query below to be executed separately, +-- all queries must be separated by a line with four dashes +-- Sets which character to use to separate phone numbers + +ALTER TABLE {prefix}settings_general ADD COLUMN short_desc_char_limit INTEGER DEFAULT '0'; diff --git a/views/admin/management/index.html b/views/admin/management/index.html index 02f1023d..7db7bd71 100644 --- a/views/admin/management/index.html +++ b/views/admin/management/index.html @@ -245,7 +245,7 @@ Address Options: - + @@ -256,6 +256,7 @@ + @@ -363,7 +364,7 @@ -
Show Street:
Show City, State, ZIP:
Show Region:
Show Description:
Show Short Description:
Character Limit for Short Desc:
Show Phone Number:
Show Toll Free Phone Number:
Address Options: + diff --git a/views/admin/member/memberInfo/editProfileDescription.html b/views/admin/member/memberInfo/editProfileDescription.html index 8c7378f9..8707996c 100644 --- a/views/admin/member/memberInfo/editProfileDescription.html +++ b/views/admin/member/memberInfo/editProfileDescription.html @@ -3,7 +3,9 @@

Short Description:

- +
{if $memberInfo.fieldFail.short_descr}

{$memberInfo.fieldFail.short_descr}

{/if}
diff --git a/views/admin/member/memberInfo/editStatus.html b/views/admin/member/memberInfo/editStatus.html index 264a7339..d87fa1c0 100644 --- a/views/admin/member/memberInfo/editStatus.html +++ b/views/admin/member/memberInfo/editStatus.html @@ -40,7 +40,7 @@
-- 2.17.1
Show Street:
Show City, State, ZIP:
Short Description: - +
{if $memberInfo.fieldFail.short_descr}

{$memberInfo.fieldFail.short_descr}

{/if}