From: Chuck Scott Date: Wed, 14 Jan 2015 23:28:53 +0000 (-0500) Subject: Continuing development. Now have preliminary organization of menu items and tabs. X-Git-Tag: v1.0.0~85 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2454e0c42faf46a8971b18610f3fd87487bca2a5;p=WP-Plugins%2Fglm-member-db.git Continuing development. Now have preliminary organization of menu items and tabs. --- diff --git a/classes/glmPluginSupport.php b/classes/glmPluginSupport.php index bd35635e..b7f4dd6e 100644 --- a/classes/glmPluginSupport.php +++ b/classes/glmPluginSupport.php @@ -28,7 +28,7 @@ class GlmPluginSupport * @return void * @access public */ - public function addNotice ($message, $title = false) + public static function addNotice ($message, $title = false) { $notices = get_option('glmMembersAdminNotices'); diff --git a/controllers/admin.php b/controllers/admin.php index d1628f64..5f3f4f01 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -27,12 +27,19 @@ $GLOBALS['glmMembersAdminValidActions'] = array( 'members' => array( - 'index', - 'display', - 'edit', - 'add', - 'delete' + 'index', // member list + 'reports', + 'other' ), + 'member' => array( + 'index', // Member Dashboard + 'member', + 'locations', + 'facilities', + 'activities', + 'accommodations' + ) + , 'configure' => array( 'index', 'cities', @@ -41,6 +48,7 @@ $GLOBALS['glmMembersAdminValidActions'] = array( 'regions' ), 'error' => array( + 'index', 'badAction' ) ); @@ -176,10 +184,11 @@ class glmMembersAdmin extends GlmPluginSupport } // Add hooks to WordPress - add_action('admin_menu', array( - $this, - 'configureMenus' - )); + add_action('admin_menu', + array( + $this, + 'configureMenus' + )); // Add admin scripts and css add_action('admin_enqueue_scripts', @@ -203,7 +212,8 @@ class glmMembersAdmin extends GlmPluginSupport { wp_enqueue_media(); wp_register_script('glm-members-admin-js', - GLM_MEMBERS_PLUGIN_URL . 'js/admin.js', array( + GLM_MEMBERS_PLUGIN_URL . 'js/admin.js', + array( 'jquery' )); wp_enqueue_script('glm-members-admin-js'); @@ -242,6 +252,13 @@ class glmMembersAdmin extends GlmPluginSupport 'glmMembersAdminMenuMembers' )); + add_submenu_page('glm-members-admin-menu-members', 'Member Information', + 'Member', 'glm_members_member', 'glm-members-admin-menu-member', + array( + $this, + 'glmMembersAdminMenuMember' + )); + add_submenu_page('glm-members-admin-menu-members', 'Configure Members Database', 'Configure', 'glm_members_configure', 'glm-members-admin-menu-configure', @@ -271,6 +288,11 @@ class glmMembersAdmin extends GlmPluginSupport } // Add Sub Menu Items + public function glmMembersAdminMenuMember () + { + $this->controller('member'); + } + public function glmMembersAdminMenuConfigure () { $this->controller('configure'); @@ -328,6 +350,7 @@ class glmMembersAdmin extends GlmPluginSupport */ public function controller ($menuItem) { + $errorMsg = ''; /* * Determine model to execute @@ -345,12 +368,30 @@ class glmMembersAdmin extends GlmPluginSupport } } - // Loop as long as there's a model redirect. + // Loop till we have a final action + $loopCheck = 0; do { + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + $this->addNotice("Requested Action: Menu item = $menuItem, Action = $action"); + } + + $modelRedirect = false; + + // Verify that we have the requested menu item in the valid actions + if (!isset($GLOBALS['glmMembersAdminValidActions'][$menuItem])) { + + $modelRedirect = true; + $menuItem = 'error'; + $action = 'index'; + $errorMsg .= "Model doesn't exist: ".$modelName; + + } + // Verify Menu item and action using array at top of this file - if (! in_array($action, - $GLOBALS['glmMembersAdminValidActions'][$menuItem])) { + if (! isset($GLOBALS['glmMembersAdminValidActions'][$menuItem]) || + ! in_array($action, + $GLOBALS['glmMembersAdminValidActions'][$menuItem])) { $menuItem = 'error'; $action = 'badAction'; } @@ -359,29 +400,77 @@ class glmMembersAdmin extends GlmPluginSupport * Execute the selected model */ - // Build model and path and class names and load the model + // Build model and path and class names $modelName = GLM_MEMBERS_PLUGIN_DIR . '/models/admin/' . $menuItem . '/' . $action . '.php'; $className = 'GlmMembersAdmin_' . $menuItem . '_' . $action; - require_once ($modelName); - // Instantiate the model and ask it to perform the work - $model = new $className($this->wpdb, $this->config); - $results = $model->modelAction(); + // If model file doesn't exist - we have an error + if (!file_exists($modelName)) { - // Check if there's been a model redirect request - $modelRedirect = false; - if ($results['modelRedirect']) { + $modelRedirect = true; + $menuItem = 'error'; + $action = 'index'; + $errorMsg .= "Model doesn't exist: ".$modelName; - // Set the new model action - $action = $results['modelRedirect']; + // Otherwise, load and run the model + } else { - // Check if there's also a menu item change - if ($results['menuItemRedirect']) { - $menuItem = $results['menuItemRedirect']; - } + // Load the model file + require_once ($modelName); - $modelRedirect = true; + // check for an invalid model class name + if (!class_exists($className)) { + + $modelRedirect = true; + $menuItem = 'error'; + $action = 'index'; + $errorMsg .= "Model class doesn't exist: ".$className; + + } else { + + // Instantiate the model and ask it to perform the work + $model = new $className($this->wpdb, $this->config); + $results = $model->modelAction(); + + // Check if there's been a model redirect request + if ($results['modelRedirect']) { + + // Set the new model action + $action = $results['modelRedirect']; + + // Check if there's also a menu item change + if ($results['menuItemRedirect']) { + $menuItem = $results['menuItemRedirect']; + } + + $modelRedirect = true; + } + + // Get the specified view file + $view = false; + if (isset($results['view'])) { + $view = $results['view']; + } + + // Check for invalid or missing view file + if (!$view || !is_file(GLM_MEMBERS_PLUGIN_DIR . '/views/'.$view)) { + $modelRedirect = true; + $menuItem = 'error'; + $action = 'index'; + $errorMsg .= "Bad or missing view file: ".$view; + } + + } // model class exists + } + + // This is just a sanity check on this loop to keep it from getting out of control + if (++$loopCheck > 10) { + die('

Serious failure looping on model load in "controllers/admin.php".

'); + } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG && $modelRedirect) { + $this->addNotice('Redirecting...'); } // Loop again if there's a model redirect @@ -414,9 +503,19 @@ class glmMembersAdmin extends GlmPluginSupport } } + $smarty->templateAssign ( 'thisAction', $action); + + + // If there's an error message, add that also + if ($errorMsg != '') { + $smarty->templateAssign('errorMsg', $errorMsg); + } + // If view debug has been requested if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice("Template Data
$view"); + $x = $smarty->template->getTemplateVars(); $templateVars = '
' . print_r($x, 1) . '
'; glmMembersAdmin::addNotice($templateVars, 'Template Parameters'); diff --git a/css/admin.css b/css/admin.css index 28766467..2175f67c 100644 --- a/css/admin.css +++ b/css/admin.css @@ -24,6 +24,26 @@ background-color: #fff; } +/* Admin Tabs */ +.nav-tab { + font-size: 15px !important; + font-weight: bold; +} +.nav-tab-active { + font-size: 15px !important; + font-weight: bold; + text-decoration: none; + border: 2px #ccc solid; + border-bottom: 0px; + padding: 6px 10px 8px 10px; + background-color: #f8f8f8; +} +.disabled { + pointer-events: none; + cursor: default; + color: #ccc; +} + /* Admin Forms */ .glm-form-bad-input { background: #FFaBa9; diff --git a/index.php b/index.php index 6eddbac7..3d6ded53 100644 --- a/index.php +++ b/index.php @@ -48,6 +48,7 @@ // Debug Options define('GLM_MEMBERS_PLUGIN_ADMIN_DEBUG', true); +define('GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE', false); // Plugin Versions define('GLM_MEMBERS_PLUGIN_VERSION', 0.1); @@ -325,7 +326,7 @@ function glmMembersAdminNotices($windowed = false) } // Check if there's admin notices for output $notices = get_option('glmMembersAdminNotices'); -if (is_admin() && $notices) { +if (is_admin() && $notices && !GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { // Add action to output the notices add_action('admin_notices','glmMembersAdminNotices'); } diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php index c975706c..9412e288 100755 --- a/lib/GlmDataAbstract/DataAbstract.php +++ b/lib/GlmDataAbstract/DataAbstract.php @@ -2378,6 +2378,11 @@ abstract class GlmDataAbstract public function processOutputData($data, $op = 'l', $forEdit = false, $id = false, $idfield = 'id') { + if ($forEdit) { + $fieldRequired = array(); + $fieldFail = array(); + } + // For each possible field reset($this->fields); while (list($k, $v) = each($this->fields )) { @@ -2414,9 +2419,21 @@ abstract class GlmDataAbstract $out = $this->{$type.'Output'}($v, $d, $forEdit, $id, $idfield, $op); $data[$as] = $out; + + if($forEdit) { + $fieldRequired[$as] = (isset($v['required']) && $v['required']); + $fieldFail[$as] = false; + } } } + if ($forEdit) { + return array( + 'fieldData' => $data, + 'fieldRequired' => $fieldRequired, + 'fieldFail' => $fieldFail + ); + } return $data; } @@ -2523,6 +2540,10 @@ abstract class GlmDataAbstract FROM $this->table WHERE $where;"; + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($sql,1)."
", "DataAbstract - getStats() query"); + } + $stats = $this->wpdb->get_results($sql, ARRAY_A); return $stats['count']; @@ -2557,7 +2578,11 @@ abstract class GlmDataAbstract "; } -//echo "
$sql
"; + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($sql,1)."
", "DataAbstract - getList() query"); + } + + //echo "
$sql
"; $list = $this->wpdb->get_results($sql, ARRAY_A); if (count($list) == 0) @@ -2593,7 +2618,11 @@ abstract class GlmDataAbstract $where ;"; - $detail = $this->wpdb->get_results($sql, ARRAY_A); + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($sql,1)."
", "DataAbstract - getEntry() query"); + } + + $detail = $this->wpdb->get_row($sql, ARRAY_A); // If nothing was found, simply return false if ($detail == false) { @@ -2684,6 +2713,10 @@ abstract class GlmDataAbstract $detail = $this->wpdb->get_row($sql, ARRAY_A); $r['insertedID'] = $detail['currval']; + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($sql,1)."
", "DataAbstract - insertEntry() query"); + } + // Get the data again for output $r['fieldData'] = $this->getEntry($r['insertedID']); @@ -2709,7 +2742,11 @@ abstract class GlmDataAbstract WHERE $idfield = $id ;"; - $detail = $this->wpdb->get_results($sql, ARRAY_A); + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($sql,1)."
", "DataAbstract - editEntry() query"); + } + + $detail = $this->wpdb->get_row($sql, ARRAY_A); // Process individual fields $detail = $this->processOutputData($detail, 'e', true, $id, $idfield); @@ -2776,6 +2813,10 @@ abstract class GlmDataAbstract WHERE $idField = $id; "; + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($sql,1)."
", "DataAbstract - updateEntry() query"); + } + // Now store the field data $this->wpdb->query($sql, ARRAY_A); @@ -2829,6 +2870,10 @@ abstract class GlmDataAbstract WHERE $idField = $id; "; + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($sql,1)."
", "DataAbstract - deleteEntry() query"); + } + // Assume things will go fine try { $this->wpdb->query($sql, ARRAY_A); diff --git a/lib/smartyTemplateSupport.php b/lib/smartyTemplateSupport.php index 36e6abda..a5dd0f51 100644 --- a/lib/smartyTemplateSupport.php +++ b/lib/smartyTemplateSupport.php @@ -71,7 +71,6 @@ class smartyTemplateSupport { $this->templateAssign ( 'adminDebug', GLM_MEMBERS_PLUGIN_ADMIN_DEBUG); $this->templateAssign ( 'thisURL', $scriptURL ); $this->templateAssign ( 'thisPage', $_REQUEST['page']); - $this->templateAssign ( 'thisAction', $action); $this->templateAssign ( 'glmPluginName', GLM_MEMBERS_PLUGIN_NAME ); $this->templateAssign ( 'thisYear', date ( 'Y' ) ); diff --git a/misc/smarty/templates_c/06926788f51c1a5a54be2a368556f9c37e2780da.file.badAction.html.php b/misc/smarty/templates_c/06926788f51c1a5a54be2a368556f9c37e2780da.file.badAction.html.php index d0c996f6..186d759b 100644 --- a/misc/smarty/templates_c/06926788f51c1a5a54be2a368556f9c37e2780da.file.badAction.html.php +++ b/misc/smarty/templates_c/06926788f51c1a5a54be2a368556f9c37e2780da.file.badAction.html.php @@ -1,4 +1,4 @@ - decodeProperties(array ( @@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( '06926788f51c1a5a54be2a368556f9c37e2780da' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/error/badAction.html', - 1 => 1421094485, + 1 => 1421264558, 2 => 'file', ), ), @@ -17,6 +17,10 @@ $_valid = $_smarty_tpl->decodeProperties(array ( ), 'version' => 'Smarty-3.1.21-dev', 'unifunc' => 'content_54b42dd4c09430_68496846', + 'variables' => + array ( + 'errorMsg' => 0, + ), 'has_nocache_code' => false, ),false); /*/%%SmartyHeaderCode%%*/?>
@@ -24,6 +28,9 @@ $_valid = $_smarty_tpl->decodeProperties(array (

Sorry, we've had an error.

Error: : An invalid action has been specified.

+ + tpl_vars['errorMsg']->value) {?>

tpl_vars['errorMsg']->value;?> +

Please try again. If you still get the same error, contact Gaslight Media at 231-487-0692 for assistance.

diff --git a/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php b/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php index 0d4bc63a..23b62f9d 100644 --- a/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php +++ b/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php @@ -1,4 +1,4 @@ - decodeProperties(array ( @@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( '081a36d97cdf30d438a1e104c26a275acc180da0' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/index.html', - 1 => 1421135080, + 1 => 1421259050, 2 => 'file', ), ), @@ -22,6 +22,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'haveMembers' => 0, 'members' => 0, 'i' => 0, + 'thisURL' => 0, 'm' => 0, ), 'has_nocache_code' => false, @@ -57,8 +58,12 @@ $_smarty_tpl->tpl_vars['m']->_loop = true; - tpl_vars['m']->value['name'];?> - + + tpl_vars['m']->value['name'];?> + + (nothing here yet) diff --git a/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php b/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php index f2b50b45..a4c3b877 100644 --- a/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php +++ b/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php @@ -1,4 +1,4 @@ - decodeProperties(array ( @@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( '15f83071407dddb0b3c23ae1a70b66cefbd681db' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/header.html', - 1 => 1421132420, + 1 => 1421271213, 2 => 'file', ), ), @@ -26,17 +26,17 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'has_nocache_code' => false, ),false); /*/%%SmartyHeaderCode%%*/?>
- +

Your Members

List Members +&glm_action=index" class="nav-tabtpl_vars['thisAction']->value=='index') {?>-active">List of Members Add New Member +&glm_action=reports" class="nav-tabtpl_vars['thisAction']->value=='add') {?>-active">Reports Edit Member +&glm_action=other" class="nav-tabtpl_vars['thisAction']->value=='edit') {?>-active disabled">Or Something - perahps mailing stuff?

diff --git a/misc/smarty/templates_c/1be35689c5d30d774f40ebc45e387f5f95c45e90.file.index.html.php b/misc/smarty/templates_c/1be35689c5d30d774f40ebc45e387f5f95c45e90.file.index.html.php new file mode 100644 index 00000000..6986fb30 --- /dev/null +++ b/misc/smarty/templates_c/1be35689c5d30d774f40ebc45e387f5f95c45e90.file.index.html.php @@ -0,0 +1,39 @@ + +decodeProperties(array ( + 'file_dependency' => + array ( + '1be35689c5d30d774f40ebc45e387f5f95c45e90' => + array ( + 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/member/index.html', + 1 => 1421269603, + 2 => 'file', + ), + ), + 'nocache_hash' => '163797333154b6ac77c986e8-14104892', + 'function' => + array ( + ), + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54b6ac77cbe666_15018258', + 'variables' => + array ( + 'member' => 0, + ), + 'has_nocache_code' => false, +),false); /*/%%SmartyHeaderCode%%*/?> +getSubTemplate ('admin/member/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> + + +

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

+ + + +
Member Name:tpl_vars['member']->value['name'];?> +
+ +getSubTemplate ('admin/footer.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> + + diff --git a/misc/smarty/templates_c/25c8610e0e0bacafec3046a296066e9f8eceedae.file.member.html.php b/misc/smarty/templates_c/25c8610e0e0bacafec3046a296066e9f8eceedae.file.member.html.php new file mode 100644 index 00000000..cff656f0 --- /dev/null +++ b/misc/smarty/templates_c/25c8610e0e0bacafec3046a296066e9f8eceedae.file.member.html.php @@ -0,0 +1,85 @@ + +decodeProperties(array ( + 'file_dependency' => + array ( + '25c8610e0e0bacafec3046a296066e9f8eceedae' => + array ( + 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/member/member.html', + 1 => 1421272105, + 2 => 'file', + ), + ), + 'nocache_hash' => '172471491954b6e51b1368b6-20693769', + 'function' => + array ( + ), + 'variables' => + array ( + 'haveMember' => 0, + 'thisURL' => 0, + 'thisPage' => 0, + 'member' => 0, + ), + 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54b6e51b158d19_68572085', +),false); /*/%%SmartyHeaderCode%%*/?> +getSubTemplate ('admin/member/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> + + + tpl_vars['haveMember']->value) {?> +

Edit Member

+ +

Add New Member

+ + +
+ + + + + + + + + + + + + + + + + + + + + +
tpl_vars['member']->value['fieldRequired']['name']) {?>class="glm-required">Member Name:tpl_vars['member']->value['fieldFail']['name']) {?>class="glm-form-bad-input"> + + tpl_vars['member']->value['fieldFail']['name']) {?>

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

+
Active: + tpl_vars['member']->value['fieldData']['active']['value']) {?>checked="checked""> + tpl_vars['member']->value['fieldFail']['name']) {?>

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

+
Member Type: + Need to add "enum" type to data abstract. +
tpl_vars['member']->value['fieldRequired']['descr']) {?>class="glm-required">Description:tpl_vars['member']->value['fieldFail']['descr']) {?>class="glm-form-bad-input"> + + tpl_vars['member']->value['fieldFail']['descr']) {?>

tpl_vars['member']->value['fieldFail']['descr'];?> +

+
+

* Required

+ +
+ +getSubTemplate ('admin/footer.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> + + diff --git a/misc/smarty/templates_c/3ec5bcbe581d6335e06bc6c9474f73121a83d59b.file.header.html.php b/misc/smarty/templates_c/3ec5bcbe581d6335e06bc6c9474f73121a83d59b.file.header.html.php index 5fa85893..9f3f0f1a 100644 --- a/misc/smarty/templates_c/3ec5bcbe581d6335e06bc6c9474f73121a83d59b.file.header.html.php +++ b/misc/smarty/templates_c/3ec5bcbe581d6335e06bc6c9474f73121a83d59b.file.header.html.php @@ -1,4 +1,4 @@ - decodeProperties(array ( @@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( '3ec5bcbe581d6335e06bc6c9474f73121a83d59b' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/configure/header.html', - 1 => 1421134183, + 1 => 1421271318, 2 => 'file', ), ), @@ -15,8 +15,38 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'function' => array ( ), - 'has_nocache_code' => false, 'version' => 'Smarty-3.1.21-dev', 'unifunc' => 'content_54b4cb22446989_15253660', + 'variables' => + array ( + 'glmPluginName' => 0, + 'thisURL' => 0, + 'thisPage' => 0, + 'thisAction' => 0, + ), + 'has_nocache_code' => false, ),false); /*/%%SmartyHeaderCode%%*/?> - +
+ +

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

+ +

+ General Options + Cities List + States List + Countries List + Regions List +

+
+ diff --git a/misc/smarty/templates_c/47fb9b803e7138d215645f3c977b0b1dc2a9e718.file.index.html.php b/misc/smarty/templates_c/47fb9b803e7138d215645f3c977b0b1dc2a9e718.file.index.html.php index 67982dde..1770b38a 100644 --- a/misc/smarty/templates_c/47fb9b803e7138d215645f3c977b0b1dc2a9e718.file.index.html.php +++ b/misc/smarty/templates_c/47fb9b803e7138d215645f3c977b0b1dc2a9e718.file.index.html.php @@ -1,4 +1,4 @@ - decodeProperties(array ( @@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( '47fb9b803e7138d215645f3c977b0b1dc2a9e718' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/configure/index.html', - 1 => 1421135161, + 1 => 1421255040, 2 => 'file', ), ), @@ -19,7 +19,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'unifunc' => 'content_54b4ca1e9c5b88_76832702', 'has_nocache_code' => false, ),false); /*/%%SmartyHeaderCode%%*/?> -getSubTemplate ('admin/configure/headder.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/50e78f1400d6db96c588c737669426ab57397d1d.file.footer.html.php b/misc/smarty/templates_c/50e78f1400d6db96c588c737669426ab57397d1d.file.footer.html.php index db81be3d..542893a0 100644 --- a/misc/smarty/templates_c/50e78f1400d6db96c588c737669426ab57397d1d.file.footer.html.php +++ b/misc/smarty/templates_c/50e78f1400d6db96c588c737669426ab57397d1d.file.footer.html.php @@ -1,4 +1,4 @@ - decodeProperties(array ( @@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( '50e78f1400d6db96c588c737669426ab57397d1d' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/footer.html', - 1 => 1421125086, + 1 => 1421268442, 2 => 'file', ), ), @@ -15,6 +15,8 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'function' => array ( ), + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54b4cb2244e1c6_97382029', 'variables' => array ( 'glmPluginName' => 0, @@ -24,12 +26,10 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'thisPage' => 0, ), 'has_nocache_code' => false, - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b4cb2244e1c6_97382029', ),false); /*/%%SmartyHeaderCode%%*/?>
-
+
tpl_vars['glmPluginName']->value;?>
Copyright © 2014-tpl_vars['thisYear']->value;?> @@ -42,7 +42,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( > window.open('tpl_vars['thisURL']->value;?> ?page=tpl_vars['thisPage']->value;?> -&glmDebugWindow=true','GLM_Plugin_Debug','width=800, height=900, left=50, top=50'); +&glmDebugWindow=true','GLM_Plugin_Debug','width=800,height=800,left=50,top=50,resizable=yes,scrollbars=yes'); > diff --git a/misc/smarty/templates_c/60cbe99d19bbec013cbca4d9344f2fd4a4152f52.file.index.html.php b/misc/smarty/templates_c/60cbe99d19bbec013cbca4d9344f2fd4a4152f52.file.index.html.php index 05f3572f..cf9e3a2a 100644 --- a/misc/smarty/templates_c/60cbe99d19bbec013cbca4d9344f2fd4a4152f52.file.index.html.php +++ b/misc/smarty/templates_c/60cbe99d19bbec013cbca4d9344f2fd4a4152f52.file.index.html.php @@ -1,4 +1,4 @@ - decodeProperties(array ( @@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( '60cbe99d19bbec013cbca4d9344f2fd4a4152f52' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/error/index.html', - 1 => 1421094555, + 1 => 1421264555, 2 => 'file', ), ), @@ -15,15 +15,24 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'function' => array ( ), - 'has_nocache_code' => false, 'version' => 'Smarty-3.1.21-dev', 'unifunc' => 'content_54b42e9eafe502_03625329', + 'variables' => + array ( + 'errorMsg' => 0, + ), + 'has_nocache_code' => false, ),false); /*/%%SmartyHeaderCode%%*/?>

Sorry, we've had an error.

-

Error: : Unknown error.

+ tpl_vars['errorMsg']->value) {?> +

tpl_vars['errorMsg']->value;?> +

+ +

Error: : Unknown error.

+

Please try again. If you still get the same error, contact Gaslight Media at 231-487-0692 for assistance.

diff --git a/misc/smarty/templates_c/c74bd17240f8892f8955e8bedbedd434341aeca9.file.header.html.php b/misc/smarty/templates_c/c74bd17240f8892f8955e8bedbedd434341aeca9.file.header.html.php new file mode 100644 index 00000000..f0a72449 --- /dev/null +++ b/misc/smarty/templates_c/c74bd17240f8892f8955e8bedbedd434341aeca9.file.header.html.php @@ -0,0 +1,62 @@ + +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, + 2 => 'file', + ), + ), + 'nocache_hash' => '8257956454b6ac77cc21f2-25755845', + 'function' => + array ( + ), + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54b6ac77cd9375_10535024', + 'variables' => + array ( + 'thisURL' => 0, + 'thisPage' => 0, + 'memberID' => 0, + 'thisAction' => 0, + 'haveMember' => 0, + ), + 'has_nocache_code' => false, +),false); /*/%%SmartyHeaderCode%%*/?> +
+ +

Member Information

+ +

+ Dashboard + Member + Locations + Facilities + Attractions + Contacts +

+
+ + diff --git a/models/admin/error/index.php b/models/admin/error/index.php index d0339c68..eff0d570 100644 --- a/models/admin/error/index.php +++ b/models/admin/error/index.php @@ -18,7 +18,7 @@ * This model is called if there is a generic/unknown error * */ -class glmMembersAdminError +class GlmMembersAdmin_error_index { /** @@ -58,12 +58,18 @@ class glmMembersAdminError { // No work to perform here so just return status + } + + public function modelAction() { + // Return status, any suggested view, and any data to controller return array( 'status' => true, - 'view' => false, + 'modelRedirect' => false, + 'view' => 'admin/error/index.html', 'data' => false ); + } } diff --git a/models/admin/member/index.php b/models/admin/member/index.php new file mode 100644 index 00000000..76c4f222 --- /dev/null +++ b/models/admin/member/index.php @@ -0,0 +1,168 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @version 0.1 + */ + +// Load Members data abstract +require_once(GLM_MEMBERS_PLUGIN_CLASS_DIR.'/data/dataMembers.php'); + +/* + * This class performs the work for the default action of the "Members" menu + * option, which is to display the members dashboard. + * + */ +class GlmMembersAdmin_member_index extends GlmDataMembers +{ + + /** + * 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 () + { + + $success = true; + $haveMember = false; + $memberData = false; + $memberID = 0; + + // Check if a member ID is supplied + if (isset($_REQUEST['member_id'])) { + // Make sure it's a number + $memberID = $_REQUEST['member_id']-0; + } + + // If we don't have a member ID, assume this is to add a member and go do that + if ($memberID <= 0) { + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice('  No member ID supplied.'); + } + + return array( + 'status' => $success, + 'menuItemRedirect' => false, + 'modelRedirect' => 'member', + 'view' => 'admin/member/member.html', + 'data' => array( + 'haveMember' => false, + ) + ); + } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice("  Member ID specified: $memberID"); + } + + // Try to get existing member data + $memberData = $this->getEntry($memberID); + + // Check that we have data for the specified member ID + if ($memberData !== false) { + $haveMember = true; + } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($memberData,1)."
", 'Member Data'); + } + + // Compile template data + $templateData = array( + 'haveMember' => $haveMember, + 'memberID' => $memberID, + 'member' => $memberData, + ); + + // Return status, suggested view, and data to controller + return array( + 'status' => $success, + 'menuItemRedirect' => false, + 'modelRedirect' => false, + 'view' => 'admin/member/index.html', + 'data' => $templateData + ); + + } + + +} + +?> \ No newline at end of file diff --git a/models/admin/member/member.php b/models/admin/member/member.php new file mode 100644 index 00000000..04f33bc7 --- /dev/null +++ b/models/admin/member/member.php @@ -0,0 +1,157 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @version 0.1 + */ + +// Load Members data abstract +require_once(GLM_MEMBERS_PLUGIN_CLASS_DIR.'/data/dataMembers.php'); + +/* + * This class performs the work for the default action of the "Members" menu + * option, which is to display the members dashboard. + * + */ +class GlmMembersAdmin_member_member extends GlmDataMembers +{ + + /** + * 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 () + { + + $success = true; + $haveMember = false; + $memberData = false; + $memberID = 0; + + // Check if a member ID is supplied + if (isset($_REQUEST['member_id'])) { + // Make sure it's a number + $memberID = $_REQUEST['member_id']-0; + } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + glmMembersAdmin::addNotice("  Member ID specified: $memberID"); + } + + // If we have a member ID, try to get the member data + if ($memberID > 0) { + $memberData = $this->editEntry($memberID); + } + + // If we have member data, say so + if ($memberData !== false) { + $haveMember = true; + + // Otherwise, we're going setup to enter a new one + } else { + + $memberData = $this->newEntry(); + } + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($memberData,1)."
", 'Member Data'); + } + + // Compile template data + $templateData = array( + 'haveMember' => $haveMember, + 'memberID' => $memberID, + 'member' => $memberData + ); + + // Return status, suggested view, and data to controller + return array( + 'status' => $success, + 'menuItemRedirect' => false, + 'modelRedirect' => false, + 'view' => 'admin/member/member.html', + 'data' => $templateData + ); + + } + + +} + +?> \ No newline at end of file diff --git a/models/admin/members/add.php b/models/admin/members/add.php deleted file mode 100644 index 34b8a5ef..00000000 --- a/models/admin/members/add.php +++ /dev/null @@ -1,143 +0,0 @@ - - * @license http://www.gaslightmedia.com Gaslightmedia - * @release admin.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ - * @link http://dev.gaslightmedia.com/ - */ - -// Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_DIR.'/data/dataMembers.php'); - -/* - * This class performs the work neede to add a new member - * option, which is to display the members dashboard. - * - */ -class GlmMembersAdmin_members_add extends GlmDataMembers -{ - - /** - * 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 () - { - - // Assume we're just going to display an input form - $view = 'edit.html'; - - // Check if this is a submission - if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'submit') { - $member = $this->insertEntry(); - - // If the submission was successful - display the result - if ($member && $member['status']) { - $view = 'display.html'; - } - - } else { - // Get the setup data from the data abstract to edit a new member - $member = $this->newEntry(); - } - - // Get result status - $success = ($member && $member['status']); - - // Determine if current user can add, edit, delete prototypes - $canEdit = current_user_can('glm_proto_edit'); - - // Return status, suggested view, and data to controller - return array( - 'status' => $success, - 'menuItemRedirect' => false, - 'modelRedirect' => false, - 'view' => 'admin/members/'.$view, - 'data' => array( - 'newMember' => true, - 'member' => $member, - 'canEdit' => $canEdit - ) - ); - - } - -} - -?> \ No newline at end of file diff --git a/models/admin/members/delete.php b/models/admin/members/delete.php deleted file mode 100644 index 8a8414c6..00000000 --- a/models/admin/members/delete.php +++ /dev/null @@ -1,127 +0,0 @@ - - * @license http://www.gaslightmedia.com Gaslightmedia - * @release admin.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ - * @link http://dev.gaslightmedia.com/ - */ - -// Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_DIR.'/data/dataMembers.php'); - -/* - * This class performs the work needed to delete a member. - */ -class GlmMembersAdmin_members_delete extends GlmDataMembers -{ - - /** - * 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 () - { - - // Check if we recieved a prototype ID - $id = $_REQUEST['proto_id'] - 0; - if ($id > 0) { - - // Delete the prototype data - $res = $this->wpdb->get_row( - " - DELETE - FROM ".$this->wpdb->posts." - WHERE post_type = 'glm_proto' - AND id = $id - ", ARRAY_A); - } - - // Return status - in this case we always redirect to the prototypes - // index model (list) - return array( - 'status' => true, - 'menuItemRedirect' => 'prototypes', - 'modelRedirect' => 'index', - 'view' => false, - 'data' => false - ); - } -} - -?> \ No newline at end of file diff --git a/models/admin/members/display.php b/models/admin/members/display.php deleted file mode 100644 index 22477c8c..00000000 --- a/models/admin/members/display.php +++ /dev/null @@ -1,144 +0,0 @@ - - * @license http://www.gaslightmedia.com Gaslightmedia - * @release admin.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ - * @link http://dev.gaslightmedia.com/ - */ - -// Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_DIR.'/data/dataMembers.php'); - -/* - * This class performs the work needed to display member data - */ -class GlmMembersAdmin_members_display extends GlmDataMembers -{ - - /** - * 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 () - { - - // Check if we recieved a prototype ID - $id = $_REQUEST['proto_id'] - 0; - if ($id > 0) { - - // Get the prototype data - $res = $this->wpdb->get_row( - " - SELECT id, - DATE_FORMAT(post_date, '%Y-%m-%d') p_date, - post_title, - post_content - FROM ".$this->wpdb->posts." - WHERE post_type = 'glm_proto' - AND id = $id - ", ARRAY_A); - - // If we have results - $success = false; - if ($res['post_content']) { - - $success = true; - - // Break out the prototype file data - $d = unserialize($res['post_content']); - $res['content'] = $d; - } - } - - // Return status, any suggested view, and any data to controller - // If 'viewText' exists, it's parsed as smarty template source for output rather than the 'view' file. - return array( - 'status' => $success, - 'menuItemRedirect' => false, - 'modelRedirect' => false, - 'view' => 'admin/prototypes/display.html', - 'viewText' => stripslashes($d['html']), - 'data' => array( - 'content' => $res['content'] - ) - ); - } -} - -?> \ No newline at end of file diff --git a/models/admin/members/edit.php b/models/admin/members/edit.php deleted file mode 100644 index f48e9354..00000000 --- a/models/admin/members/edit.php +++ /dev/null @@ -1,349 +0,0 @@ - - * @license http://www.gaslightmedia.com Gaslightmedia - * @release admin.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ - * @link http://dev.gaslightmedia.com/ - */ - -// Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_DIR.'/data/dataMembers.php'); - -/* - * This class performs the work needed to add a new prototype. - */ -class GlmMembersAdmin_members_edit extends GlmDataMembers -{ - - /** - * 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 () - { - - // Check that we have a prototype ID - $id = 0; - if (isset($_REQUEST['proto_id'])) { - // Make sure it's an integer - $id = $_REQUEST['proto_id'] - 0; - } - if (! $id) { - echo "FAILURE"; - exit(); - } - - // Get the current data for the selected prototype - // Get the prototype data - $res = $this->wpdb->get_row( - " - SELECT id, - DATE_FORMAT(post_date, '%Y-%m-%d') p_date, - post_title, - post_content - FROM ".$this->wpdb->posts." - WHERE post_type = 'glm_proto' - AND id = $id - ", ARRAY_A); - - // If we have results - $success = false; - if ($res['post_content']) { - - $success = true; - - // Break out the prototype file data - $content = unserialize($res['post_content']); - } - - // Setup input data array - $content = array( - 'glm_proto_title' => $content['title'], - 'glm_proto_title_error' => '', - 'glm_proto_width' => $content['width'], - 'glm_proto_width_error' => '', - 'glm_proto_height' => $content['height'], - 'glm_proto_height_error' => '', - 'glm_proto_html' => stripslashes($content['html']), - 'glm_proto_html_error' => '', - 'glm_proto_background' => $content['background'], - 'glm_proto_background_error' => '', - 'glm_proto_prototype' => $content['prototype'], - 'glm_proto_prototype_error' => '', - 'glm_proto_image3' => $content['image3'], - 'glm_proto_image3_error' => '', - 'glm_proto_image4' => $content['image4'], - 'glm_proto_image4_error' => '', - 'glm_proto_image5' => $content['image5'], - 'glm_proto_image5_error' => '' - ); - - /* - * If a protototype update is being submitted - */ - $submitError = false; - $submitted = false; - if (isset($_REQUEST['glm_proto_title'])) { - - // Clean up all input - $content['glm_proto_title'] = sanitize_text_field( - $_REQUEST['glm_proto_title']); - $content['glm_proto_width'] = sanitize_text_field( - $_REQUEST['glm_proto_width']); - $content['glm_proto_height'] = sanitize_text_field( - $_REQUEST['glm_proto_height']); - $content['glm_proto_html'] = stripslashes($_REQUEST['glm_proto_html']); - $content['glm_proto_background'] = sanitize_text_field( - $_REQUEST['glm_proto_background']); - $content['glm_proto_prototype'] = sanitize_text_field( - $_REQUEST['glm_proto_prototype']); - $content['glm_proto_image3'] = sanitize_text_field( - $_REQUEST['glm_proto_image3']); - $content['glm_proto_image4'] = sanitize_text_field( - $_REQUEST['glm_proto_image4']); - $content['glm_proto_image5'] = sanitize_text_field( - $_REQUEST['glm_proto_image5']); - - // Check title field - if ($content['glm_proto_title'] == '') { - $content['glm_proto_title_error'] = 'Required title not supplied'; - $submitError = true; - } - - // Check width field - if ($content['glm_proto_width'] == '') { - $content['glm_proto_width_error'] = 'Required width not supplied'; - $submitError = true; - } - - // Check height field - if ($content['glm_proto_height'] == '') { - $content['glm_proto_height_error'] = 'Required height not supplied'; - $submitError = true; - } - - // Check background image - Not required but must exist if provided - if ($content['glm_proto_background'] != '' && ! $this->glmProtoIsUploaded( - $content['glm_proto_background'])) { - $content['glm_proto_background_error'] = 'Supplied background image does not exists'; - $submitError = true; - } - - // Check prototype image - if ($content['glm_proto_prototype'] == '') { - $content['glm_proto_prototype_error'] = 'Required prototype image not supplied '; - $submitError = true; - } else { - $exists = $this->glmProtoIsUploaded( - $content['glm_proto_prototype']); - if (! $exists) { - $content['glm_proto_prototype_error'] .= 'Supplied prototype image does not exists'; - $submitError = true; - } - } - - // Check image #3 - Not required but must exist if provided - if ($content['glm_proto_image3'] != '' && ! $this->glmProtoIsUploaded( - $content['glm_proto_image3'])) { - $content['glm_proto_image3_error'] = 'Supplied image #3 does not exists'; - $submitError = true; - } - - // Check image #4 - Not required but must exist if provided - if ($content['glm_proto_image4'] != '' && ! $this->glmProtoIsUploaded( - $content['glm_proto_image4'])) { - $content['glm_proto_image4_error'] = 'Supplied image #4 does not exists'; - $submitError = true; - } - - // Check image #5 - Not required but must exist if provided - if ($content['glm_proto_image5'] != '' && ! $this->glmProtoIsUploaded( - $content['glm_proto_image5'])) { - $content['glm_proto_image3_error'] = 'Supplied image #5 does not exists'; - $submitError = true; - } - - - if (! $submitError) { - - // Prepair data for storage - $date = date('Y-m-d', time()); - $timezoneBackup = date_default_timezone_get(); - date_default_timezone_set("GMT"); - $gmtDate = date('Y-m-d', time()); - date_default_timezone_set($timezoneBackup); - - $contentSerialized = serialize( - array( - 'title' => $content['glm_proto_title'], - 'width' => $content['glm_proto_width'], - 'height' => $content['glm_proto_height'], - 'html' => $content['glm_proto_html'], - 'background' => $content['glm_proto_background'], - 'prototype' => $content['glm_proto_prototype'], - 'image3' => $content['glm_proto_image3'], - 'image4' => $content['glm_proto_image4'], - 'image5' => $content['glm_proto_image5'] - )); - - // Store into wp_posts table - $result = $this->wpdb->update($this->wpdb->posts, - array( - 'post_date' => $date, - 'post_date_gmt' => $gmtDate, - 'post_content' => $contentSerialized, - 'post_title' => $content['glm_proto_title'], - 'post_type' => 'glm_proto' - ), - array( - 'id' => $id - )); - - // If there was a problem storing the prototype, pass that to - // the template - if (! $result) { - $content['glm_proto_title_error'] = 'There was an unknown problem updating this prototype.'; - } - - $prototypeSubmitted = true; - } - } - - // If submitted OK then display success page - $menuItemRedirect = false; - $modelRedirect = false; - if ($prototypeSubmitted) { - - $view = 'admin/prototypes/updated.html'; - - // Prototype was not successfully submitted so redisplay the form. - } else { - - // Select view - $view = 'admin/prototypes/edit.html'; - } - - // Return status, suggested view, and data to controller - return array( - 'status' => true, - 'menuItemRedirect' => false, - 'modelRedirect' => false, - 'view' => $view, - 'data' => array( - 'content' => $content - ) - ); - } - - /* - * Check if a file supposedly uploaded to WordPress exists - * - * This method accepts a URL to a WordPress file or image, strips the - * WordPress base file URL to get the remaining path and file name for - * the file, then adds the base path for WordPress files and checks to - * see if the file exists. - * - * @param string URL of uploaded WordPress file or image - * - * @return bool True if it exists, false if not - */ - private function glmProtoIsUploaded ($url) - { - - // Get current WordPress upload directory/url information - $paths = wp_upload_dir(); - $base = $paths['baseurl']; - $path = $paths['basedir']; - - // Strip base directory from supplied URL - $file = substr($url, strlen($base)); - - // If there's now no file name - if (trim($file) == '') { - return false; - } - - // Check if file exists - $exists = file_exists($path . $file); - - return $exists; - } -} - -?> \ No newline at end of file diff --git a/models/admin/members/index.php b/models/admin/members/index.php index e1859d74..c7718f96 100644 --- a/models/admin/members/index.php +++ b/models/admin/members/index.php @@ -102,6 +102,10 @@ class GlmMembersAdmin_members_index extends GlmDataMembers // Get a current list of members $list = $this->getList(); + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($list,1)."
", 'Member Data'); + } + // If we have list entries - even if it's an empty list $success = true; $haveMembers = false; diff --git a/readme.txt b/readme.txt index b7b6bd3c..59c7268e 100644 --- a/readme.txt +++ b/readme.txt @@ -26,13 +26,43 @@ e.g. == Frequently Asked Questions == -= A question that someone might have = += Code for this plugin looks completely different from others. = +OK, so I just couldn't understand why certain things were done a certain way in WordPress. One of those is +the way Templates are built. It seems to me that including PHP programing in a template is counter-productive. +The whole idea of a template is to completely separate programming (the data side) and interface (the template +side). I've also found many plugins mix code and html all over the place. How people can deal with that is a +mystery to me. I used to program Web applications like that and believe me it cost me plenty in support. -An answer to that question. +Because of all that I've decided to use Smarty Templates for this project. I've been so happy with Smarty +Templates, and my last large project used them to completely separate data and design. (I know, Smarty is +kind of like programming and underneath uses PHP, but logically it's all output design.) -= What about foo bar? = +This project also has a revised MVC approach that fits with how I see that working in WordPress. It's a +first pass at really using this particular MVC adaptation, so cut me some slack on this one. + +Lastly, I just didn't like the very limited database, form-data processing, and input sanitizing/filtering I +found in WordPress. To avoid confusing and sloppy code, I decided to migrate my abstract data class from +my previous project to handle all of this. This makes the "models" here much simpler and makes maintenance +and extention of this plugin much simpler. You'll see that under lib/GlmDataAbstract. (Note that that class +is proprietary and requires licensing. You did purchase this plugin, right?) For info on what that class does, +look at the "documentation.txt" file in that directory. I'm not taking time to even summarize it here since +I could not do it justice in a paragraph or two. + += How the heck does this plugin work? = +For the admin side the typical flow is (highly summarized) ... + +/index.php -> /controllers/admin.php -> /models/admin/{menu}/{action}.php -> /views/admin/{menu}/{action}.html + +Note that the models also bring in data descriptions in the /classes/data directory that are appropriately +named for the data of interest. The data structure arrays in those files are what the abstract data class +uses to process input and output and interact with the database tables. + +So, if you want to find out how some particular action works, look in that models directory. If you want +to see the template for a particular output, look in the that views directory. If you want to see what data +is stored and managed and how it input and structured for output, look at the /classes/data directory. + +Beyond all that, good luck. This is my view of the WordPress world. I'm afraid you'll have to live with that. -Answer to foo bar dilemma. == Screenshots == diff --git a/views/admin/configure/headder.html b/views/admin/configure/headder.html deleted file mode 100644 index bffc06b9..00000000 --- a/views/admin/configure/headder.html +++ /dev/null @@ -1,10 +0,0 @@ -
- -

- Cities List - States List - Countries List - Regions List -

-
- \ No newline at end of file diff --git a/views/admin/configure/header.html b/views/admin/configure/header.html new file mode 100644 index 00000000..6d9eff32 --- /dev/null +++ b/views/admin/configure/header.html @@ -0,0 +1,13 @@ +
+ +

{$glmPluginName} Configuration

+ +

+ General Options + Cities List + States List + Countries List + Regions List +

+
+ \ No newline at end of file diff --git a/views/admin/configure/index.html b/views/admin/configure/index.html index 91886540..6ac1fe55 100644 --- a/views/admin/configure/index.html +++ b/views/admin/configure/index.html @@ -1,4 +1,4 @@ -{include file='admin/configure/headder.html'} +{include file='admin/configure/header.html'}

General Configuration

diff --git a/views/admin/error/badAction.html b/views/admin/error/badAction.html index 8640ade5..4c84eedf 100644 --- a/views/admin/error/badAction.html +++ b/views/admin/error/badAction.html @@ -3,6 +3,8 @@

Sorry, we've had an error.

Error: : An invalid action has been specified.

+ + {if $errorMsg}

{$errorMsg}

{/if}

Please try again. If you still get the same error, contact Gaslight Media at 231-487-0692 for assistance.

diff --git a/views/admin/error/index.html b/views/admin/error/index.html index 5e267347..c8ede523 100644 --- a/views/admin/error/index.html +++ b/views/admin/error/index.html @@ -2,7 +2,11 @@

Sorry, we've had an error.

-

Error: : Unknown error.

+ {if $errorMsg} +

{$errorMsg}

+ {else} +

Error: : Unknown error.

+ {/if}

Please try again. If you still get the same error, contact Gaslight Media at 231-487-0692 for assistance.

diff --git a/views/admin/footer.html b/views/admin/footer.html index bc845a2b..1fc38bbe 100644 --- a/views/admin/footer.html +++ b/views/admin/footer.html @@ -1,6 +1,6 @@
-
+
{$glmPluginName}
Copyright © 2014-{$thisYear} Gaslight Media - All Rights Reserved
http://www.gaslightmedia.com @@ -8,7 +8,7 @@ {if $adminDebug} {/if} diff --git a/views/admin/member/header.html b/views/admin/member/header.html new file mode 100644 index 00000000..73f17d9f --- /dev/null +++ b/views/admin/member/header.html @@ -0,0 +1,15 @@ +
+ +

Member Information

+ +

+ Dashboard + Member + Locations + Facilities + Attractions + Contacts +

+
+ + \ No newline at end of file diff --git a/views/admin/member/index.html b/views/admin/member/index.html new file mode 100644 index 00000000..f3031181 --- /dev/null +++ b/views/admin/member/index.html @@ -0,0 +1,9 @@ +{include file='admin/member/header.html'} + +

{$member.name}

+ + + +
Member Name:{$member.name}
+ +{include file='admin/footer.html'} diff --git a/views/admin/member/member.html b/views/admin/member/member.html new file mode 100644 index 00000000..06fa920e --- /dev/null +++ b/views/admin/member/member.html @@ -0,0 +1,47 @@ +{include file='admin/member/header.html'} + + {if $haveMember} +

Edit Member

+ {else} +

Add New Member

+ {/if} + +
+ + + + + + + + + + + + + + + + + + + + + +
Member Name: + + {if $member.fieldFail.name}

{$member.fieldFail.name}

{/if} +
Active: + + {if $member.fieldFail.name}

{$member.fieldFail.name}

{/if} +
Member Type: + Need to add "enum" type to data abstract. +
Description: + + {if $member.fieldFail.descr}

{$member.fieldFail.descr}

{/if} +
+

* Required

+ +
+ +{include file='admin/footer.html'} diff --git a/views/admin/members/edit.html b/views/admin/members/edit.html deleted file mode 100644 index 17d4bf73..00000000 --- a/views/admin/members/edit.html +++ /dev/null @@ -1,51 +0,0 @@ -{include file='admin/members/header.html'} - - - {if $newMember} -

Add New Member

- {else} -

Edit Member

- {/if} - -
- - - - - - - - - - - - - - - - - - - - - -
Member Name: - - {if $member.fieldFail.name}

{$member.fieldFail.name}

{/if} -
Active: - - {if $member.fieldFail.name}

{$member.fieldFail.name}

{/if} -
Member Type: - Need to add "enum" type to data abstract. -
Description: - - {if $member.fieldFail.descr}

{$member.fieldFail.descr}

{/if} -
-

* Required

- -
- -{include file='admin/footer.html'} - - - diff --git a/views/admin/members/headder.html b/views/admin/members/headder.html deleted file mode 100644 index eef30669..00000000 --- a/views/admin/members/headder.html +++ /dev/null @@ -1,9 +0,0 @@ -
- -

- List Members - Add New Member - Edit Member -

-
- \ No newline at end of file diff --git a/views/admin/members/header.html b/views/admin/members/header.html new file mode 100644 index 00000000..eaaccdfa --- /dev/null +++ b/views/admin/members/header.html @@ -0,0 +1,9 @@ +
+

Your Members

+

+ List of Members + Reports + Or Something - perahps mailing stuff? +

+
+ \ No newline at end of file diff --git a/views/admin/members/index.html b/views/admin/members/index.html index c380103b..941e6f0f 100644 --- a/views/admin/members/index.html +++ b/views/admin/members/index.html @@ -24,7 +24,9 @@ {else} {/if} - {$m.name} + + {$m.name} + (nothing here yet)