From: Chuck Scott Date: Mon, 26 Jan 2015 14:05:56 +0000 (-0500) Subject: More user elements working, more corrections to database abstract, and database updates. X-Git-Tag: v1.0.0~72 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0768e9698ed983c792119404f209f84ddbb16b1b;p=WP-Plugins%2Fglm-member-db.git More user elements working, more corrections to database abstract, and database updates. --- diff --git a/activate.php b/activate.php index ef29d27d..e16009a7 100644 --- a/activate.php +++ b/activate.php @@ -42,7 +42,7 @@ class glmMembersPluginActivate extends glmPluginSupport * @access private */ private $dbVersions = array( - '0.1' => array('version' => '0.1', 'tables' => 22) + '0.1' => array('version' => '0.1', 'tables' => 24) ); /** diff --git a/classes/data/dataAccommodationTypes.php b/classes/data/dataAccommodationTypes.php new file mode 100644 index 00000000..76b76330 --- /dev/null +++ b/classes/data/dataAccommodationTypes.php @@ -0,0 +1,157 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @release SVN: $Id: dataMemberType.php,v 1.0 2011/01/25 19:31:47 cscott Exp $ + */ + +/** + * EventManagementDataAccommodationTypes class + * + * PHP version 5 + * + * @category Data + * @package EventManagement + * @author Chuck Scott + * @license http://www.gaslightmedia.com Gaslightmedia + * @release SVN: $Id: dataMembers.php,v 1.0 2011/01/25 19:31:47 cscott + * Exp $ + * @link http://www.visitgreatlakesbay.org/ + */ +abstract class GlmDataAccommodationTypes extends GlmDataAbstract +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + /** + * Field definitions + * + * @var $ini + * @access public + */ + public $table; + + /** + * Field definitions + * + * 'type' is type of field as defined by the application + * text Regular text field + * pointer Pointer to an entry in another table + * 'filters' is the filter name for a particular filter ID in PHP filter + * functions + * See PHP filter_id() + * + * 'use' is when to use the field + * l = List + * g = Get + * n = New + * i = Insert + * e = Edit + * u = Update + * d = Delete + * a = All + * + * @var $ini + * @access public + */ + public $fields = false; + + /** + * Constructor + * + * @param object $d + * database connection + * + * @return void + * @access public + */ + function __construct ($wpdb, $config) + { + parent::__construct($wpdb, $config); + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + /* + * Table Name + */ + $this->table = GLM_MEMBERS_PLUGIN_DB_PREFIX . 'accommodation_types'; + + /* + * Table Data Fields + */ + $this->fields = array( + + 'id' => array( + 'field' => 'id', + 'type' => 'integer', + 'view_only' => true, + 'use' => 'a' + ), + + // Facility Type + 'facility_type' => array ( + 'field' => 'facility_type', + 'type' => 'list', + 'list' => $this->config['facility_type'], + 'required' => true, + 'use' => 'a' + ), + + // Name + 'name' => array( + 'field' => 'name', + 'type' => 'text', + 'required' => true, + 'unique' => true, + 'use' => 'a' + ), + + // Description + 'descr' => array( + 'field' => 'descr', + 'type' => 'text', + 'use' => 'a' + ), + + // Short Description + 'short_descr' => array( + 'field' => 'short_descr', + 'type' => 'text', + 'use' => 'a' + ) + + + ); + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice($this->fields, 'DataBlock', 'Table Fields: '.$this->table); + } + + } +} + +?> \ No newline at end of file diff --git a/classes/data/dataCategories.php b/classes/data/dataCategories.php new file mode 100644 index 00000000..66c8ee5d --- /dev/null +++ b/classes/data/dataCategories.php @@ -0,0 +1,161 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @release SVN: $Id: dataMemberType.php,v 1.0 2011/01/25 19:31:47 cscott Exp $ + */ + +/** + * EventManagementDataCategories class + * + * PHP version 5 + * + * @category Data + * @package EventManagement + * @author Chuck Scott + * @license http://www.gaslightmedia.com Gaslightmedia + * @release SVN: $Id: dataMembers.php,v 1.0 2011/01/25 19:31:47 cscott + * Exp $ + * @link http://www.visitgreatlakesbay.org/ + */ +abstract class GlmDataCategories extends GlmDataAbstract +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + /** + * Field definitions + * + * @var $ini + * @access public + */ + public $table; + + /** + * Field definitions + * + * 'type' is type of field as defined by the application + * text Regular text field + * pointer Pointer to an entry in another table + * 'filters' is the filter name for a particular filter ID in PHP filter + * functions + * See PHP filter_id() + * + * 'use' is when to use the field + * l = List + * g = Get + * n = New + * i = Insert + * e = Edit + * u = Update + * d = Delete + * a = All + * + * @var $ini + * @access public + */ + public $fields = false; + + /** + * Constructor + * + * @param object $d + * database connection + * + * @return void + * @access public + */ + function __construct ($wpdb, $config) + { + parent::__construct($wpdb, $config); + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + /* + * Table Name + */ + $this->table = GLM_MEMBERS_PLUGIN_DB_PREFIX . 'categories'; + + /* + * Table Data Fields + */ + $this->fields = array( + + 'id' => array( + 'field' => 'id', + 'type' => 'integer', + 'view_only' => true, + 'use' => 'a' + ), + + // Name + 'name' => array( + 'field' => 'name', + 'type' => 'text', + 'required' => true, + 'unique' => true, + 'use' => 'a' + ), + + // Parent + 'parent' => array( + 'field' => 'parent', + 'type' => 'pointer', + 'p_table' => GLM_MEMBERS_PLUGIN_DB_PREFIX . 'categories', + 'p_field' => 'name', + 'p_orderby' => 'name', + 'p_blank' => true, + + 'required' => false, + 'use' => 'a' + ), + + // Description + 'descr' => array( + 'field' => 'descr', + 'type' => 'text', + 'use' => 'a' + ), + + // Short Description + 'short_descr' => array( + 'field' => 'short_descr', + 'type' => 'text', + 'use' => 'a' + ) + + + ); + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice($this->fields, 'DataBlock', 'Table Fields: '.$this->table); + } + + } +} + +?> \ No newline at end of file diff --git a/controllers/admin.php b/controllers/admin.php index 67b05eb9..5347f073 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -44,8 +44,10 @@ $GLOBALS['glmMembersAdminValidActions'] = array( 'configure' => array( 'index', 'memberTypes', + 'categories', 'cities', - 'regions' + 'regions', + 'accommodationTypes' ), 'error' => array( 'index', diff --git a/css/admin.css b/css/admin.css index dcaf0523..420ff1fd 100644 --- a/css/admin.css +++ b/css/admin.css @@ -65,6 +65,14 @@ } /* Admin table additions */ +.glm-admin-table { + border: 3px #ddd solid !important; +} +.glm-admin-table thead th{ + border-bottom: 3px #ddd solid !important; + font-size: 15px; + font-weight: bold; +} .glm-table-fieldname { text-align: left; vertical-align: top; @@ -73,6 +81,9 @@ } /* Overlay dialog box */ +.glm-dialog-box { + display: none; +} .ui-dialog { background: #fff; border: 1px black solid; diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php index f16ec2c2..ac6c02ac 100755 --- a/lib/GlmDataAbstract/DataAbstract.php +++ b/lib/GlmDataAbstract/DataAbstract.php @@ -570,12 +570,22 @@ abstract class GlmDataAbstract $field_val = 'COALESCE(sum('.$field_val.'), 0) '; } - $field = "( - SELECT ".$field_val." - FROM ".$f['p_table']." - $from - WHERE $where - ) "; + // Check for "as" option + $as = $f['field']; + if (isset($f['as']) && $f['as'] != '') { + $as = $f['as']; + } + + $field = " + COALESCE( + ( + SELECT ".$field_val." + FROM ".$f['p_table']." + $from + WHERE $where + ), null + ) AS $as + "; return $field; } @@ -604,7 +614,7 @@ abstract class GlmDataAbstract { // If the operation is Edit then we need to also get the options for select (unless it's p_static) - if ($forEdit && !($f['p_static'] === true)) { + if ($forEdit && !(isset($f['p_static']) && $f['p_static'] === true)) { // Get current value of pointer if ($id) { @@ -613,8 +623,8 @@ abstract class GlmDataAbstract FROM ".$this->table." WHERE $idfield = $id "; - $d = $this->wpdb->get_results($sql, ARRAY_A); - $p_value = $d['id']; + $p_data = $this->wpdb->get_row($sql, ARRAY_A); + $p_value = $p_data['id']; } // Get pointer options from specified table @@ -625,7 +635,7 @@ abstract class GlmDataAbstract // Get picklist options from other table $where = ''; - if ($f['p_where']) { + if (isset($f['p_where']) && $f['p_where']) { $where = 'WHERE '.$f['p_where']; } @@ -657,7 +667,7 @@ abstract class GlmDataAbstract $pick_list[0] = array( 'value' => '', 'name' => $blankText, - 'default' => ($p['p_id'] == '') + 'default' => (!$p_value) ); } @@ -785,10 +795,9 @@ abstract class GlmDataAbstract // Build pick select table $pick_select = false; $selected_name = ''; + $pick_list = array(); if (count($p_list) > 0) { - $pick_list = array(); - // Deal with optional blank entry $blankText = ''; if (isset($f['p_blank_text']) && $f['p_blank_text'] != '') { diff --git a/misc/databaseScripts/create_database_V0.1.sql b/misc/databaseScripts/create_database_V0.1.sql index 91a93fe0..fe331695 100644 --- a/misc/databaseScripts/create_database_V0.1.sql +++ b/misc/databaseScripts/create_database_V0.1.sql @@ -6,6 +6,18 @@ -- To permit each query below to be executed separately, -- all queries must be separated by a line with ---- +CREATE TABLE {prefix}members ( + id INT NOT NULL AUTO_INCREMENT, + active BOOLEAN NULL, + date_created TIMESTAMP NULL, + name TINYTEXT NULL, + data_records INT NULL, + PRIMARY KEY (id), + INDEX(name(20)) +); + +---- + CREATE TABLE {prefix}member_type ( id INT NOT NULL AUTO_INCREMENT, name TINYTEXT NULL, @@ -34,11 +46,11 @@ CREATE TABLE {prefix}regions ( ---- -CREATE TABLE {prefix}members ( +CREATE TABLE {prefix}member_data ( id INT NOT NULL AUTO_INCREMENT, + member INT NULL, status INT NULL, member_type INT NULL, - name TINYTEXT NULL, descr TEXT NULL, short_descr TINYTEXT NULL, addr1 TINYTEXT NULL, @@ -56,17 +68,23 @@ CREATE TABLE {prefix}members ( logo TINYTEXT NULL, cc_type INT NULL, join_date DATE NULL, - notex TEXT NULL, + notes TEXT NULL, create_time TIMESTAMP NULL, modify_time TIMESTAMP NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(status), + INDEX(city), + INDEX(zip(10)), + INDEX(lat), + INDEX(lon), + INDEX(region) ); ---- CREATE TABLE {prefix}locations ( id INT NOT NULL AUTO_INCREMENT, - status INT NULL, + active BOOLEAN NULL, location_type INT NULL, member INT NULL, name TINYTEXT NULL, @@ -88,14 +106,20 @@ CREATE TABLE {prefix}locations ( notes TEXT NULL, create_time TIMESTAMP NULL, modify_time TIMESTAMP NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(name(20)), + INDEX(city), + INDEX(zip(10)), + INDEX(lat), + INDEX(lon), + INDEX(region) ); ---- CREATE TABLE {prefix}facilities ( id INT NOT NULL AUTO_INCREMENT, - status INT NULL, + active BOOLEAN NULL, facility_type INT NULL, location INT NULL, name TINYTEXT NULL, @@ -116,15 +140,20 @@ CREATE TABLE {prefix}facilities ( notes TEXT NULL, create_time TIMESTAMP NULL, modify_time TIMESTAMP NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(name(20)), + INDEX(city), + INDEX(zip(10)), + INDEX(lat), + INDEX(lon) ); ---- CREATE TABLE {prefix}activties ( id INT NOT NULL AUTO_INCREMENT, - status INT NULL, - activity_type TINYTEXT NULL, + active BOOLEAN NULL, + activity_type INT NULL, facility INT NULL, name TINYTEXT NULL, descr TEXT NULL, @@ -136,15 +165,33 @@ CREATE TABLE {prefix}activties ( modify_time TIMESTAMP NULL, ref_type INT NULL, ref_dest INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(activity_type), + INDEX(name(20)), + INDEX(ref_type), + INDEX(ref_dest) +); + +---- + +CREATE TABLE {prefix}accommodation_types ( + id INT NOT NULL AUTO_INCREMENT, + facility_type INT NULL, + name TINYTEXT NULL, + descr TEXT NULL, + short_descr TINYTEXT NULL, + PRIMARY KEY (id), + INDEX(facility_type), + INDEX(name(20)) ); ---- CREATE TABLE {prefix}accommodations ( id INT NOT NULL AUTO_INCREMENT, - status INT NULL, + active BOOLEAN NULL, name TINYTEXT NULL, + accommodation_type INT NULL, descr TEXT NULL, short_descr TINYTEXT NULL, quant INT NULL, @@ -153,14 +200,18 @@ CREATE TABLE {prefix}accommodations ( year_round TINYINT(1) NULL, ref_type INT NULL, ref_dest INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(accommodation_type), + INDEX(name(20)), + INDEX(ref_type), + INDEX(ref_dest) ); ---- CREATE TABLE {prefix}golf ( id INT NOT NULL AUTO_INCREMENT, - status INT NULL, + active BOOLEAN NULL, name TINYTEXT NULL, descr TEXT NULL, short_descr TINYTEXT NULL, @@ -173,15 +224,31 @@ CREATE TABLE {prefix}golf ( reservation_url TINYTEXT NULL, ref_type INT NULL, ref_dest INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(name(20)), + INDEX(ref_type), + INDEX(ref_dest) +); + +---- + +CREATE TABLE {prefix}restaurant_types ( + id INT NOT NULL AUTO_INCREMENT, + active TINYINT(1) NULL, + name TINYTEXT NULL, + descr TEXT NULL, + short_descr TINYTEXT NULL, + PRIMARY KEY (id), + INDEX(name(20)) ); ---- CREATE TABLE {prefix}restaurants ( id INT NOT NULL AUTO_INCREMENT, - status INT NULL, + active BOOLEAN NULL, name TINYTEXT NULL, + restaurant_type INT NULL, descr TEXT NULL, short_descr TINYTEXT NULL, menu TEXT NULL, @@ -195,14 +262,18 @@ CREATE TABLE {prefix}restaurants ( notes TEXT NULL, ref_type INT NULL, ref_dest INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(restaurant_type), + INDEX(name(20)), + INDEX(ref_type), + INDEX(ref_dest) ); ---- CREATE TABLE {prefix}meals ( id INT NOT NULL AUTO_INCREMENT, - status INT NULL, + active BOOLEAN NULL, name TINYTEXT NULL, descr TEXT NULL, short_descr TINYTEXT NULL, @@ -248,16 +319,17 @@ CREATE TABLE {prefix}meals ( sat_end_time TIME NULL, sat_res_req TINYINT(1) NULL, restaurant INT NULL, - PRIMARY KEY (id) + ref_type INT NULL, + ref_dest INT NULL, + PRIMARY KEY (id), + INDEX(name(20)) ); ---- CREATE TABLE {prefix}contacts ( id INT NOT NULL AUTO_INCREMENT, - status INT NULL, - ref_type INT NULL, - ref_dest INT NULL, + active BOOLEAN NULL, fname TINYTEXT NULL, lname TINYTEXT NULL, contact_type INT NULL, @@ -283,7 +355,16 @@ CREATE TABLE {prefix}contacts ( notes TEXT NULL, create_time TIMESTAMP NULL, modify_time TIMESTAMP NULL, - PRIMARY KEY (id) + ref_type INT NULL, + ref_dest INT NULL, + PRIMARY KEY (id), + INDEX(fname(20)), + INDEX(lname(20)), + INDEX(city), + INDEX(zip(10)), + INDEX(lat), + INDEX(lon), + INDEX(email(20)) ); ---- @@ -295,7 +376,8 @@ CREATE TABLE {prefix}amenities ( descr TEXT NULL, short_descr TINYTEXT NULL, facility_type INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(name(20)) ); ---- @@ -310,23 +392,28 @@ CREATE TABLE {prefix}social_media ( ---- -CREATE TABLE {prefix}social_media_member ( +CREATE TABLE {prefix}social_media_ref ( id INT NOT NULL AUTO_INCREMENT, ref_type INT NULL, ref_dest INT NULL, social_media INT NULL, url TINYTEXT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(ref_type), + INDEX(ref_dest), + INDEX(social_media) ); ---- -CREATE TABLE {prefix}amenity_member ( +CREATE TABLE {prefix}amenity_ref ( id INT NOT NULL AUTO_INCREMENT, amenity INT NULL, ref_type INT NULL, ref_dest INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(ref_type), + INDEX(ref_dest) ); ---- @@ -336,7 +423,8 @@ CREATE TABLE {prefix}accounts ( member INT NULL, payment_type INT NULL, invoice_delivery INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(member) ); ---- @@ -354,11 +442,14 @@ CREATE TABLE {prefix}categories ( CREATE TABLE {prefix}category_member ( id INT NOT NULL AUTO_INCREMENT, - cateogory INT NULL, - main_category TINYINT(1) NULL, + category INT NULL, + main_category INT NULL, ref_type INT NULL, ref_dest INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(category), + INDEX(ref_type), + INDEX(ref_dest) ); ---- @@ -374,7 +465,11 @@ CREATE TABLE {prefix}files ( create_date DATE NULL, ref_type INT NULL, ref_dest INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(name(20)), + INDEX(file_name(20)), + INDEX(ref_type), + INDEX(ref_dest) ); ---- @@ -389,5 +484,9 @@ CREATE TABLE {prefix}images ( position INT NULL, ref_type INT NULL, ref_dest INT NULL, - PRIMARY KEY (id) + PRIMARY KEY (id), + INDEX(name(20)), + INDEX(file_name(20)), + INDEX(ref_type), + INDEX(ref_dest) ); diff --git a/misc/smarty/templates_c/06926788f51c1a5a54be2a368556f9c37e2780da.file.badAction.html.php b/misc/smarty/templates_c/06926788f51c1a5a54be2a368556f9c37e2780da.file.badAction.html.php index 88044165..6e45c643 100644 --- a/misc/smarty/templates_c/06926788f51c1a5a54be2a368556f9c37e2780da.file.badAction.html.php +++ b/misc/smarty/templates_c/06926788f51c1a5a54be2a368556f9c37e2780da.file.badAction.html.php @@ -1,29 +1,29 @@ - -decodeProperties(array ( 'file_dependency' => array ( '06926788f51c1a5a54be2a368556f9c37e2780da' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/error/badAction.html', - 1 => 1421285081, + 1 => 1421691086, 2 => 'file', ), ), - 'nocache_hash' => '210264866954b42dd4bbc715-16113482', + 'nocache_hash' => '105358588254c05121d677a6-75784395', 'function' => array ( ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b42dd4c09430_68496846', 'variables' => array ( 'errorMsg' => 0, ), 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c05121d71ab3_37928404', ),false); /*/%%SmartyHeaderCode%%*/?> -getSubTemplate ('admin/error/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> +getSubTemplate ('admin/error/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?>

Sorry, we've had an error.

diff --git a/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php b/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php index 6f74ae14..71330b67 100644 --- a/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php +++ b/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php @@ -1,30 +1,30 @@ - -decodeProperties(array ( 'file_dependency' => array ( '081a36d97cdf30d438a1e104c26a275acc180da0' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/index.html', - 1 => 1421288544, + 1 => 1421691086, 2 => 'file', ), ), - 'nocache_hash' => '206413157254b42f2535e168-27938613', + 'nocache_hash' => '43313958054c05ab60b0587-71987387', 'function' => array ( ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b42f25390269_82355360', 'variables' => array ( 'numbMembers' => 0, 'thisURL' => 0, ), 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c05ab60bb1c1_03470573', ),false); /*/%%SmartyHeaderCode%%*/?> -getSubTemplate ('admin/members/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> +getSubTemplate ('admin/members/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?>

Members Dashboard

diff --git a/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php b/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php index 76a16384..a080e005 100644 --- a/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php +++ b/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php @@ -1,22 +1,20 @@ - -decodeProperties(array ( 'file_dependency' => array ( '15f83071407dddb0b3c23ae1a70b66cefbd681db' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/header.html', - 1 => 1421281076, + 1 => 1421691086, 2 => 'file', ), ), - 'nocache_hash' => '81165772654b46f32298020-09293550', + 'nocache_hash' => '41614071154c05ab60be091-67045844', 'function' => array ( ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b46f322c0910_93147809', 'variables' => array ( 'thisURL' => 0, @@ -24,8 +22,10 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'thisAction' => 0, ), 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c05ab60d1510_45219092', ),false); /*/%%SmartyHeaderCode%%*/?> -
+

Your Members

-decodeProperties(array ( 'file_dependency' => array ( '1be35689c5d30d774f40ebc45e387f5f95c45e90' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/member/index.html', - 1 => 1421302521, + 1 => 1421905148, 2 => 'file', ), ), - 'nocache_hash' => '163797333154b6ac77c986e8-14104892', + 'nocache_hash' => '94073808254c05abfc4adf1-45287000', 'function' => array ( ), 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b6ac77cbe666_15018258', + 'unifunc' => 'content_54c05abfc64731_62067320', 'variables' => array ( 'deleted' => 0, @@ -27,12 +27,12 @@ $_valid = $_smarty_tpl->decodeProperties(array ( ), 'has_nocache_code' => false, ),false); /*/%%SmartyHeaderCode%%*/?> -getSubTemplate ('admin/member/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> +getSubTemplate ('admin/member/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> tpl_vars['deleted']->value) {?>
Delete this Member
-
+

Are you sure you want to delete this member?

Yes, delete this member

@@ -44,18 +44,19 @@ $_valid = $_smarty_tpl->decodeProperties(array (

tpl_vars['member']->value['name'];?>

- tpl_vars['deleted']->value) {?> -

Member Has Been Deleted!

- - tpl_vars['member']->value['active']['value']) {?> -

This member is active.

- -

Member Not Active

- - +

+ + + tpl_vars['member']->value['status']['name']=='Pending Review') {?> class="glm-notice"tpl_vars['member']->value['status']['name']=='Active') {?> class="glm-active"> + tpl_vars['member']->value['status']['name'];?> + + + + @@ -68,6 +69,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( jQuery(document).ready(function($) { $("#deleteMemberDialog").dialog({ autoOpen: false, + minWidth: 400, dialogClass: "glm-dialog-no-close" }); $('#deleteMemberButton').click( function() { diff --git a/misc/smarty/templates_c/25c8610e0e0bacafec3046a296066e9f8eceedae.file.member.html.php b/misc/smarty/templates_c/25c8610e0e0bacafec3046a296066e9f8eceedae.file.member.html.php index 256b564a..2adf0055 100644 --- a/misc/smarty/templates_c/25c8610e0e0bacafec3046a296066e9f8eceedae.file.member.html.php +++ b/misc/smarty/templates_c/25c8610e0e0bacafec3046a296066e9f8eceedae.file.member.html.php @@ -1,32 +1,33 @@ - -decodeProperties(array ( 'file_dependency' => array ( '25c8610e0e0bacafec3046a296066e9f8eceedae' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/member/member.html', - 1 => 1421287476, + 1 => 1421872896, 2 => 'file', ), ), - 'nocache_hash' => '172471491954b6e51b1368b6-20693769', + 'nocache_hash' => '101324643954c05ab3f0e228-27454872', 'function' => array ( ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b6e51b158d19_68572085', 'variables' => array ( 'haveMember' => 0, 'thisURL' => 0, 'thisPage' => 0, 'member' => 0, + 'v' => 0, ), 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c05ab4009233_84144294', ),false); /*/%%SmartyHeaderCode%%*/?> -getSubTemplate ('admin/member/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> +getSubTemplate ('admin/member/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> tpl_vars['haveMember']->value) {?> @@ -60,15 +61,37 @@ $_valid = $_smarty_tpl->decodeProperties(array ( diff --git a/misc/smarty/templates_c/3ec5bcbe581d6335e06bc6c9474f73121a83d59b.file.header.html.php b/misc/smarty/templates_c/3ec5bcbe581d6335e06bc6c9474f73121a83d59b.file.header.html.php index 9f3f0f1a..9ea95c5e 100644 --- a/misc/smarty/templates_c/3ec5bcbe581d6335e06bc6c9474f73121a83d59b.file.header.html.php +++ b/misc/smarty/templates_c/3ec5bcbe581d6335e06bc6c9474f73121a83d59b.file.header.html.php @@ -1,22 +1,22 @@ - -decodeProperties(array ( 'file_dependency' => array ( '3ec5bcbe581d6335e06bc6c9474f73121a83d59b' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/configure/header.html', - 1 => 1421271318, + 1 => 1421921594, 2 => 'file', ), ), - 'nocache_hash' => '148991197854b4cb224461f5-92408371', + 'nocache_hash' => '124095827254c0496da79607-59867625', 'function' => array ( ), 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b4cb22446989_15253660', + 'unifunc' => 'content_54c0496da89482_99477612', 'variables' => array ( 'glmPluginName' => 0, @@ -26,7 +26,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( ), 'has_nocache_code' => false, ),false); /*/%%SmartyHeaderCode%%*/?> -
+

tpl_vars['glmPluginName']->value;?> Configuration

@@ -37,16 +37,19 @@ $_valid = $_smarty_tpl->decodeProperties(array ( &glm_action=index" class="nav-tabtpl_vars['thisAction']->value=='index') {?>-active">General Options Cities List +&glm_action=memberTypes" class="nav-tabtpl_vars['thisAction']->value=='memberTypes') {?>-active">Member Types States List +&glm_action=categories" class="nav-tabtpl_vars['thisAction']->value=='categories') {?>-active">Member Categories Countries List +&glm_action=cities" class="nav-tabtpl_vars['thisAction']->value=='cities') {?>-active">Cities Regions List +&glm_action=regions" class="nav-tabtpl_vars['thisAction']->value=='regions') {?>-active">Regions + Accommodation Types
diff --git a/misc/smarty/templates_c/47fb9b803e7138d215645f3c977b0b1dc2a9e718.file.index.html.php b/misc/smarty/templates_c/47fb9b803e7138d215645f3c977b0b1dc2a9e718.file.index.html.php index 1770b38a..04744489 100644 --- a/misc/smarty/templates_c/47fb9b803e7138d215645f3c977b0b1dc2a9e718.file.index.html.php +++ b/misc/smarty/templates_c/47fb9b803e7138d215645f3c977b0b1dc2a9e718.file.index.html.php @@ -1,25 +1,25 @@ - -decodeProperties(array ( 'file_dependency' => array ( '47fb9b803e7138d215645f3c977b0b1dc2a9e718' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/configure/index.html', - 1 => 1421255040, + 1 => 1421691086, 2 => 'file', ), ), - 'nocache_hash' => '113537149654b4ca1e9b41e6-15887083', + 'nocache_hash' => '135960089454c0496da6c5c6-30692976', 'function' => array ( ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b4ca1e9c5b88_76832702', 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c0496da75c57_83289225', ),false); /*/%%SmartyHeaderCode%%*/?> -getSubTemplate ('admin/configure/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> +getSubTemplate ('admin/configure/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?>

General Configuration

diff --git a/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php b/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php index 3ac806c0..d9e0024a 100644 --- a/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php +++ b/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php @@ -1,20 +1,22 @@ - -decodeProperties(array ( 'file_dependency' => array ( '4c287ca0e4946b3d644e61950c851e98e8906d49' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/list.html', - 1 => 1421259050, + 1 => 1421904927, 2 => 'file', ), ), - 'nocache_hash' => '46596749754b706fe3a62d3-72547374', + 'nocache_hash' => '33593880254c05ab8e362a8-88978550', 'function' => array ( ), + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c05ab8e47dd3_05464531', 'variables' => array ( 'haveMembers' => 0, @@ -24,27 +26,20 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'm' => 0, ), 'has_nocache_code' => false, - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b706fe3c2516_38940524', ),false); /*/%%SmartyHeaderCode%%*/?> -getSubTemplate ('admin/members/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> +getSubTemplate ('admin/members/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?>

List of Members

-
Status
Member Name:tpl_vars['member']->value['name'];?> +
Type:tpl_vars['member']->value['member_type'];?>
Description:tpl_vars['member']->value['descr'];?>
Active: - tpl_vars['member']->value['fieldData']['active']['value']) {?>checked="checked""> - tpl_vars['member']->value['fieldFail']['name']) {?>

tpl_vars['member']->value['fieldFail']['name'];?> + + tpl_vars['member']->value['fieldFail']['status']) {?>

tpl_vars['member']->value['fieldFail']['status'];?>

Member Type: - Need to add "enum" type to data abstract. + + tpl_vars['member']->value['fieldFail']['member_type']) {?>

tpl_vars['member']->value['fieldFail']['member_type'];?> +
+
+ - - - - - - tpl_vars['haveMembers']->value) {?> tpl_vars["i"] = new Smarty_variable("0", null, 0);?> @@ -65,7 +60,13 @@ $_smarty_tpl->tpl_vars['m']->_loop = true; + diff --git a/misc/smarty/templates_c/50e78f1400d6db96c588c737669426ab57397d1d.file.footer.html.php b/misc/smarty/templates_c/50e78f1400d6db96c588c737669426ab57397d1d.file.footer.html.php index c82ad608..6f4882a8 100644 --- a/misc/smarty/templates_c/50e78f1400d6db96c588c737669426ab57397d1d.file.footer.html.php +++ b/misc/smarty/templates_c/50e78f1400d6db96c588c737669426ab57397d1d.file.footer.html.php @@ -1,22 +1,20 @@ - -decodeProperties(array ( 'file_dependency' => array ( '50e78f1400d6db96c588c737669426ab57397d1d' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/footer.html', - 1 => 1421621593, + 1 => 1421691086, 2 => 'file', ), ), - 'nocache_hash' => '146319615854b4cb224487c6-63517443', + 'nocache_hash' => '186248802254c0496da8b546-87847278', 'function' => array ( ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b4cb2244e1c6_97382029', 'variables' => array ( 'glmPluginName' => 0, @@ -26,8 +24,10 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'thisPage' => 0, ), 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c0496da905b3_89352768', ),false); /*/%%SmartyHeaderCode%%*/?> - +
tpl_vars['glmPluginName']->value;?> diff --git a/misc/smarty/templates_c/60cbe99d19bbec013cbca4d9344f2fd4a4152f52.file.index.html.php b/misc/smarty/templates_c/60cbe99d19bbec013cbca4d9344f2fd4a4152f52.file.index.html.php index cc82045a..b511d05f 100644 --- a/misc/smarty/templates_c/60cbe99d19bbec013cbca4d9344f2fd4a4152f52.file.index.html.php +++ b/misc/smarty/templates_c/60cbe99d19bbec013cbca4d9344f2fd4a4152f52.file.index.html.php @@ -1,25 +1,25 @@ - -decodeProperties(array ( 'file_dependency' => array ( '60cbe99d19bbec013cbca4d9344f2fd4a4152f52' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/error/index.html', - 1 => 1421285131, + 1 => 1421691086, 2 => 'file', ), ), - 'nocache_hash' => '204984570454b42e9eaf47c6-75708563', + 'nocache_hash' => '74342921254c086b3b0af86-22635380', 'function' => array ( ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b42e9eafe502_03625329', 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c086b3b1dd65_92948708', ),false); /*/%%SmartyHeaderCode%%*/?> -getSubTemplate ('admin/error/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> +getSubTemplate ('admin/error/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?>
diff --git a/misc/smarty/templates_c/6b21e44674b437b1c7d4844f49a7ab41316a5694.file.header.html.php b/misc/smarty/templates_c/6b21e44674b437b1c7d4844f49a7ab41316a5694.file.header.html.php index 7c7cc483..33679114 100644 --- a/misc/smarty/templates_c/6b21e44674b437b1c7d4844f49a7ab41316a5694.file.header.html.php +++ b/misc/smarty/templates_c/6b21e44674b437b1c7d4844f49a7ab41316a5694.file.header.html.php @@ -1,29 +1,29 @@ - -decodeProperties(array ( 'file_dependency' => array ( '6b21e44674b437b1c7d4844f49a7ab41316a5694' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/error/header.html', - 1 => 1421285180, + 1 => 1421691086, 2 => 'file', ), ), - 'nocache_hash' => '112530116454b716e1691b91-32861276', + 'nocache_hash' => '66908105654c05121d74c63-58046810', 'function' => array ( ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b716e1693c97_05571152', 'variables' => array ( 'glmPluginName' => 0, ), 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c05121d76603_49097204', ),false); /*/%%SmartyHeaderCode%%*/?> -
+

tpl_vars['glmPluginName']->value;?>

diff --git a/misc/smarty/templates_c/c74bd17240f8892f8955e8bedbedd434341aeca9.file.header.html.php b/misc/smarty/templates_c/c74bd17240f8892f8955e8bedbedd434341aeca9.file.header.html.php index f0a72449..a008c478 100644 --- a/misc/smarty/templates_c/c74bd17240f8892f8955e8bedbedd434341aeca9.file.header.html.php +++ b/misc/smarty/templates_c/c74bd17240f8892f8955e8bedbedd434341aeca9.file.header.html.php @@ -1,22 +1,20 @@ - -decodeProperties(array ( 'file_dependency' => array ( 'c74bd17240f8892f8955e8bedbedd434341aeca9' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/member/header.html', - 1 => 1421274467, + 1 => 1421691086, 2 => 'file', ), ), - 'nocache_hash' => '8257956454b6ac77cc21f2-25755845', + 'nocache_hash' => '145413007654c05ab400d0a2-83797817', 'function' => array ( ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b6ac77cd9375_10535024', 'variables' => array ( 'thisURL' => 0, @@ -26,8 +24,10 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'haveMember' => 0, ), 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54c05ab4030650_34922061', ),false); /*/%%SmartyHeaderCode%%*/?> -
+

Member Information

diff --git a/models/admin/configure/accommodationTypes.php b/models/admin/configure/accommodationTypes.php new file mode 100644 index 00000000..044382b7 --- /dev/null +++ b/models/admin/configure/accommodationTypes.php @@ -0,0 +1,198 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @version 0.1 + */ + +// Load Member Types data abstract +require_once(GLM_MEMBERS_PLUGIN_CLASS_DIR.'/data/dataAccommodationTypes.php'); + +/* + * This class performs the work for the default action of the "Members" menu + * option, which is to display the members dashboard. + * + */ +class GlmMembersAdmin_configure_accommodationTypes extends GlmDataAccommodationTypes +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + + /* + * Constructor + * + * This contructor sets up this model. At this time that only includes + * storing away the WordPress data object. + * + * @return object Class object + * + */ + public function __construct ($wpdb, $config) + { + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + // Run constructor for members data class + parent::__construct($this->wpdb, $this->config); + + } + + /* + * Perform Model Action + * + * This method does the work for this model and returns any resulting data + * + * @return array Status and data array + * + * 'status' + * + * True if successfull and false if there was a fatal failure. + * + * 'menuItemRedirect' + * + * If not false, provides a menu item the controller should + * execute after this one. Normally if this is used, there would also be a + * modelRedirect value supplied as well. + * + * 'modelRedirect' + * + * If not false, provides an action the controller should execute after + * this one. + * + * 'view' + * + * A suggested view name that the contoller should use instead of the + * default view for this model or false to indicate that the default view + * should be used. + * + * 'data' + * + * Data that the model is returning for use in merging with the view to + * produce output. + * + */ + public function modelAction ($redirectData = false) + { + + $success = true; + $haveAccommodationTypes = false; + $accommodationTypes = false; + $error = false; + + if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'addNew') { + + $accommodationTypes = $this->insertEntry(); + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice('  New Entry Added ', 'Process'); + } + } + + if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'delete' && isset($_REQUEST['accommodationTypeID'])) { + + $id = $_REQUEST['accommodationTypeID']-0; + if ($id > 0) { + $this->deleteEntry($id, true); + } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice('  Entry Deleted: id = '.$id, 'Process'); + } + + } + + // Check if a accommodation type ID is supplied + if (isset($_REQUEST['accommodationType_id'])) { + // Make sure it's a number + $accommodationTypeID = $_REQUEST['accommodationType_id']-0; + } + + // Check for action option + $option = false; + if (isset($_REQUEST['option']) && trim($_REQUEST['option']) != '') { + $option = $_REQUEST['option']; + } + +// Check for options + + // Get a current list of accommodation types + $accommodationTypes = $this->getList(); + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice($accommodationTypes, 'DataBlock', 'Accommodation Type Data'); + } + + // If we have list entries - even if it's an empty list + $success = true; + $haveAccommodationTypes = false; + if ($accommodationTypes !== false) { + + $success = true; + + // If we have any entries + if (count($accommodationTypes) > 0) { + $haveAccommodationTypes = true; + } + } + + // If we had a fatal error, redirect to the error page + if ($error) { + return array( + 'status' => $success, + 'menuItemRedirect' => 'error', + 'modelRedirect' => 'index', + 'view' => 'admin/error/index.html', + 'data' => false + ); + } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice($accommodationTypes, 'DataBlock', 'Accommodation Types Data'); + } + + // Compile template data + $templateData = array( + 'haveRegions' => $haveAccommodationTypes, + 'accommodationTypes' => $accommodationTypes + ); + + // Return status, suggested view, and data to controller + return array( + 'status' => $success, + 'menuItemRedirect' => false, + 'modelRedirect' => false, + 'view' => 'admin/configure/accommodationTypes.html', + 'data' => $templateData + ); + + } + + +} + +?> \ No newline at end of file diff --git a/models/admin/configure/categories.php b/models/admin/configure/categories.php new file mode 100644 index 00000000..a7558762 --- /dev/null +++ b/models/admin/configure/categories.php @@ -0,0 +1,199 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @version 0.1 + */ + +// Load Member Types data abstract +require_once(GLM_MEMBERS_PLUGIN_CLASS_DIR.'/data/dataCategories.php'); + +/* + * This class performs the work for the default action of the "Members" menu + * option, which is to display the members dashboard. + * + */ +class GlmMembersAdmin_configure_categories extends GlmDataCategories +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + + /* + * Constructor + * + * This contructor sets up this model. At this time that only includes + * storing away the WordPress data object. + * + * @return object Class object + * + */ + public function __construct ($wpdb, $config) + { + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + // Run constructor for members data class + parent::__construct($this->wpdb, $this->config); + + } + + /* + * Perform Model Action + * + * This method does the work for this model and returns any resulting data + * + * @return array Status and data array + * + * 'status' + * + * True if successfull and false if there was a fatal failure. + * + * 'menuItemRedirect' + * + * If not false, provides a menu item the controller should + * execute after this one. Normally if this is used, there would also be a + * modelRedirect value supplied as well. + * + * 'modelRedirect' + * + * If not false, provides an action the controller should execute after + * this one. + * + * 'view' + * + * A suggested view name that the contoller should use instead of the + * default view for this model or false to indicate that the default view + * should be used. + * + * 'data' + * + * Data that the model is returning for use in merging with the view to + * produce output. + * + */ + public function modelAction ($redirectData = false) + { + + $success = true; + $haveCategories = false; + $categories = false; + $error = false; + + if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'addNew') { + + $categories = $this->insertEntry(); + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice('  New Entry Added ', 'Process'); + glmMembersAdmin::addNotice($categories, 'DataBlock', 'New Member Category Data'); + } + } + + if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'delete' && isset($_REQUEST['categoryID'])) { + + $id = $_REQUEST['categoryID']-0; + if ($id > 0) { + $this->deleteEntry($id, true); + } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice('  Entry Deleted: id = '.$id, 'Process'); + } + + } + + // Check if a category ID is supplied + if (isset($_REQUEST['category_id'])) { + // Make sure it's a number + $categoryID = $_REQUEST['category_id']-0; + } + + // Check for action option + $option = false; + if (isset($_REQUEST['option']) && trim($_REQUEST['option']) != '') { + $option = $_REQUEST['option']; + } + +// Check for options + + // Get a current list of members + $categories = $this->getList(); + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice($categories, 'DataBlock', 'Category Data'); + } + + // If we have list entries - even if it's an empty list + $success = true; + $haveCategories = false; + if ($categories !== false) { + + $success = true; + + // If we have any entries + if (count($categories) > 0) { + $haveCategories = true; + } + } + + // If we had a fatal error, redirect to the error page + if ($error) { + return array( + 'status' => $success, + 'menuItemRedirect' => 'error', + 'modelRedirect' => 'index', + 'view' => 'admin/error/index.html', + 'data' => false + ); + } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice($categories, 'DataBlock', 'Categories Data'); + } + + // Compile template data + $templateData = array( + 'haveCategories' => $haveCategories, + 'categories' => $categories + ); + + // Return status, suggested view, and data to controller + return array( + 'status' => $success, + 'menuItemRedirect' => false, + 'modelRedirect' => false, + 'view' => 'admin/configure/categories.html', + 'data' => $templateData + ); + + } + + +} + +?> \ No newline at end of file diff --git a/models/admin/configure/cities.php b/models/admin/configure/cities.php index d9e92524..2f78a428 100644 --- a/models/admin/configure/cities.php +++ b/models/admin/configure/cities.php @@ -101,18 +101,27 @@ class GlmMembersAdmin_configure_cities extends GlmDataCities $success = true; $haveCities = false; - $citiew = false; + $cities = false; $error = false; if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'addNew') { $cities = $this->insertEntry(); + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice('  New Entry Added ', 'Process'); + } } if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'delete' && isset($_REQUEST['cityID'])) { + $id = $_REQUEST['cityID']-0; if ($id > 0) { $this->deleteEntry($id, true); } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice('  Entry Deleted: id = '.$id, 'Process'); + } + } // Check if a city ID is supplied @@ -169,7 +178,7 @@ class GlmMembersAdmin_configure_cities extends GlmDataCities 'haveCities' => $haveCities, 'cities' => $cities ); -echo "!@#!@##"; + // Return status, suggested view, and data to controller return array( 'status' => $success, diff --git a/models/admin/configure/regions.php b/models/admin/configure/regions.php index 45b7fd63..0ed12574 100644 --- a/models/admin/configure/regions.php +++ b/models/admin/configure/regions.php @@ -101,24 +101,35 @@ class GlmMembersAdmin_configure_regions extends GlmDataRegions $success = true; $haveRegions = false; - $citiew = false; + $regions = false; $error = false; if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'addNew') { + $regions = $this->insertEntry(); + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice('  New Entry Added ', 'Process'); + } } - if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'delete' && isset($_REQUEST['cityID'])) { - $id = $_REQUEST['cityID']-0; + if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'delete' && isset($_REQUEST['regionID'])) { + + $id = $_REQUEST['regionID']-0; if ($id > 0) { $this->deleteEntry($id, true); } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice('  Entry Deleted: id = '.$id, 'Process'); + } + } - // Check if a city ID is supplied - if (isset($_REQUEST['city_id'])) { + // Check if a region ID is supplied + if (isset($_REQUEST['region_id'])) { // Make sure it's a number - $cityID = $_REQUEST['city_id']-0; + $regionID = $_REQUEST['region_id']-0; } // Check for action option @@ -133,7 +144,7 @@ class GlmMembersAdmin_configure_regions extends GlmDataRegions $regions = $this->getList(); if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { - glmMembersAdmin::addNotice($regions, 'DataBlock', 'City Data'); + glmMembersAdmin::addNotice($regions, 'DataBlock', 'Region Data'); } // If we have list entries - even if it's an empty list diff --git a/views/admin/configure/accommodationTypes.html b/views/admin/configure/accommodationTypes.html new file mode 100644 index 00000000..da2150a9 --- /dev/null +++ b/views/admin/configure/accommodationTypes.html @@ -0,0 +1,123 @@ +{include file='admin/configure/header.html'} + +
Add a Accommodation Type
+
+
+ + + +
Member NameType  
Member Name 
- (nothing here yet) + tpl_vars['m']->value['member_type'];?> + + + Manage
+ + + + + + + + + + + + + + +
Accommodation Type Name: + +
Description: + +
Description: + +
+

* Required

+ Cancel + + + +
+
+
+

Are you sure you want to delete this accommodation type?

+

Yes, delete this accommodation type

+

No, I don't want to delete this accommodation

+
+
+ + +

Accommodation Types

+ + + + + + + + + + + +{if $haveAccommodationTypes} + {assign var="i" value="0"} + {foreach $accommodationTypes as $t} + {if $i++ is odd by 1} + + {else} + + {/if} + + + + + + {/foreach} +{else} + +{/if} + +
Accommodation TypeDescriptionShort Description 
+ {$t.name} + + {$t.descr} + + {$t.short_descr} + +
Delete
+
(no accommodationTypes listed)
+ + + +{include file='admin/footer.html'} diff --git a/views/admin/configure/categories.html b/views/admin/configure/categories.html new file mode 100644 index 00000000..27337b81 --- /dev/null +++ b/views/admin/configure/categories.html @@ -0,0 +1,141 @@ +{include file='admin/configure/header.html'} + +
Add a Category
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
Category Name: + +
Parent Category: + + +
Description: + +
Description: + +
+

* Required

+ Cancel + + +
+
+
+
+

Are you sure you want to delete this category?

+

Yes, delete this category

+

No, I don't want to delete this category

+
+
+ + +

Categories

+ + + + + + + + + + + + +{if $haveCategories} + {assign var="i" value="0"} + {foreach $categories as $t} + {if $i++ is odd by 1} + + {else} + + {/if} + + + + + + + {/foreach} +{else} + +{/if} + +
CategoryParentDescriptionShort Description 
+ {$t.name} + + {$t.parent} + + {$t.descr} + + {$t.short_descr} + +
Delete
+
(no categories listed)
+ + + +{include file='admin/footer.html'} diff --git a/views/admin/configure/cities.html b/views/admin/configure/cities.html index 46a5af88..047ca067 100644 --- a/views/admin/configure/cities.html +++ b/views/admin/configure/cities.html @@ -39,19 +39,13 @@

Cities

- +
- - - - - - {if $haveCities} {assign var="i" value="0"} @@ -92,10 +86,6 @@ $('#newCityButton').click( function() { $("#newCityDialog").dialog("open"); }); - $('#newCityConfirm').click( function() { - $("#newCityDialog").dialog("close"); - window.location.href = "{$thisURL}?page={$thisPage}&glm_action=cities&option=addNew"; - }); $('#newCityCancel').click( function() { $("#newCityDialog").dialog("close"); }); diff --git a/views/admin/configure/header.html b/views/admin/configure/header.html index a44cbb43..7b073cf6 100644 --- a/views/admin/configure/header.html +++ b/views/admin/configure/header.html @@ -5,8 +5,10 @@

General Options Member Types + Member Categories Cities Regions + Accommodation Types

\ No newline at end of file diff --git a/views/admin/configure/memberTypes.html b/views/admin/configure/memberTypes.html index a702086d..80a6b943 100644 --- a/views/admin/configure/memberTypes.html +++ b/views/admin/configure/memberTypes.html @@ -39,7 +39,7 @@

Member Types

-
City  
City 
+
@@ -47,13 +47,6 @@ - - - - - - - {if $haveMemberTypes} {assign var="i" value="0"} @@ -97,10 +90,6 @@ $('#newMemberTypeButton').click( function() { $("#newMemberTypeDialog").dialog("open"); }); - $('#newMemberTypeConfirm').click( function() { - $("#newMemberTypeDialog").dialog("close"); - window.location.href = "{$thisURL}?page={$thisPage}&glm_action=memberTypes&option=addNew"; - }); $('#newMemberTypeCancel').click( function() { $("#newMemberTypeDialog").dialog("close"); }); diff --git a/views/admin/configure/regions.html b/views/admin/configure/regions.html index aa82f21f..3721af4e 100644 --- a/views/admin/configure/regions.html +++ b/views/admin/configure/regions.html @@ -19,6 +19,12 @@ + + + +
Member Type 
Member TypeDescription 
Description: + +
@@ -37,9 +43,9 @@
-

Cities

+

Regions

- +
@@ -48,16 +54,8 @@ - - - - - - - - -{if $haveCities} +{if $haveRegions} {assign var="i" value="0"} {foreach $regions as $t} {if $i++ is odd by 1} @@ -102,10 +100,6 @@ $('#newRegionButton').click( function() { $("#newRegionDialog").dialog("open"); }); - $('#newRegionConfirm').click( function() { - $("#newRegionDialog").dialog("close"); - window.location.href = "{$thisURL}?page={$thisPage}&glm_action=regions&option=addNew"; - }); $('#newRegionCancel').click( function() { $("#newRegionDialog").dialog("close"); }); diff --git a/views/admin/member/index.html b/views/admin/member/index.html index a2dc6e5e..39602edd 100644 --- a/views/admin/member/index.html +++ b/views/admin/member/index.html @@ -23,6 +23,7 @@ +
Region 
RegionDescriptionShort Description 
Member Name:{$member.name}
Type:{$member.member_type}
Description:{$member.descr}
Short Description:{$member.short_descr}
diff --git a/views/admin/members/list.html b/views/admin/members/list.html index 941e6f0f..a4114c70 100644 --- a/views/admin/members/list.html +++ b/views/admin/members/list.html @@ -2,19 +2,14 @@

List of Members

- +
+ - - - - - - {if $haveMembers} {assign var="i" value="0"} @@ -28,7 +23,10 @@ {$m.name} + {/foreach}
Member NameType  
Member Name 
- (nothing here yet) + {$m.member_type} + + Manage