From: Chuck Scott Date: Sat, 7 Mar 2015 22:12:59 +0000 (-0500) Subject: adjusting .gitignore X-Git-Tag: v1.0.0~66 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5ce12c577c6315ed6dda75c161ecfada7f89265a;p=WP-Plugins%2Fglm-member-db.git adjusting .gitignore --- diff --git a/.gitignore b/.gitignore index 1ef30ec2..0fd77687 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Don't save smarty cache directories or files -misc/smarty/* \ No newline at end of file +misc/smarty/** +media/images/** diff --git a/js/geolocation-edit/Copy of jquery.geolocation.edit.0.0.11.js b/js/geolocation-edit/Copy of jquery.geolocation.edit.0.0.11.js deleted file mode 100644 index e2ddf3b9..00000000 --- a/js/geolocation-edit/Copy of jquery.geolocation.edit.0.0.11.js +++ /dev/null @@ -1,245 +0,0 @@ -/** - * jQuery geolocation.edit plugin - * Copyright (c) 2012 Milos Popovic - * - * Freely distributable under the MIT license. - * - * @version 0.0.11 (2014-06-01) - * @see http://github.com/miloss/jquery-geolocation-edit - */ - -(function ($) { - var inits - , methods - , loadScript; - - // Queued initializations - inits = []; - // Methods container object - methods = {}; - - - // Plugin methods - // -------------- - - /** - * Main execution method - * @param {Object} options Passed plugin options - */ - methods.main = function (options) { - var selector = this - , opts - , llat, llng, llocation - , i, addrlen; - - // Check for required fields - if (typeof options.lat === "undefined" || - typeof options.lng === "undefined") { - $.error("Please provide 'lat' and 'lng' options for jQuery.geolocate"); - return; - } - - // If GoogleMaps not loaded - push init to queue and go on - if (typeof google === "undefined" || - typeof google.maps === "undefined") { - inits.push(function () { - $(selector).geolocate(options); - }); - loadScript(); - return; - } - - // Extend default options - opts = $.extend(true, { - address: [], - changeOnEdit: false, - mapOptions: { - zoom: 14, - mapTypeId: google.maps.MapTypeId.ROADMAP, - mapTypeControl: false, - streetViewControl: false - }, - markerOptions: { - draggable:true, - animation: google.maps.Animation.DROP - }, - geoCallback: function(){} - }, options); - - $(this).data('opts', opts); - - // Init map and marker - per coordinates - llat = parseFloat( $( opts.lat ).val() ); - llng = parseFloat( $( opts.lng ).val() ); - if (isNaN(llat)) { - llat = 0; - } - if (isNaN(llng)) { - llng = 0; - } - - llocation = new google.maps.LatLng(llat, llng); - $(this).geolocate({}, 'initMap', llocation); - - // Bind actions - coordinates fields (future?) - if ( opts.changeOnEdit ) { - $( opts.lat ).change(function () { /* ... */ }); - $( opts.lng ).change(function () { /* ... */ }); - } - - // Bind actions - address field - addrlen = opts.address.length; - if (addrlen > 0) { - for (i=0; i -decodeProperties(array ( - 'file_dependency' => - array ( - '26d04a65ccdb3ac3d40bac671736867cbab8e7c6' => - array ( - 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/configure/headder.html', - 1 => 1421135431, - 2 => 'file', - ), - ), - 'nocache_hash' => '141576573654b4ccf8ca7ed1-82007383', - 'function' => - array ( - ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b4ccf8ca85a2_88524224', - 'variables' => - array ( - 'thisURL' => 0, - 'thisPage' => 0, - 'thisAction' => 0, - ), - 'has_nocache_code' => false, -),false); /*/%%SmartyHeaderCode%%*/?> -
- -

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

-
- diff --git a/misc/smarty/templates_c/5b0b8a17c49dbe822cc61d6a64ab3f597b245655.file.edit.html.php b/misc/smarty/templates_c/5b0b8a17c49dbe822cc61d6a64ab3f597b245655.file.edit.html.php deleted file mode 100644 index f036da09..00000000 --- a/misc/smarty/templates_c/5b0b8a17c49dbe822cc61d6a64ab3f597b245655.file.edit.html.php +++ /dev/null @@ -1,89 +0,0 @@ - -decodeProperties(array ( - 'file_dependency' => - array ( - '5b0b8a17c49dbe822cc61d6a64ab3f597b245655' => - array ( - 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/edit.html', - 1 => 1421134609, - 2 => 'file', - ), - ), - 'nocache_hash' => '3795584254b48503304f75-85353117', - 'function' => - array ( - ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b48503344494_95719747', - 'variables' => - array ( - 'newMember' => 0, - 'thisURL' => 0, - 'thisPage' => 0, - 'member' => 0, - ), - 'has_nocache_code' => false, -),false); /*/%%SmartyHeaderCode%%*/?> -getSubTemplate ('admin/members/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> - - - - tpl_vars['newMember']->value) {?> -

Add New Member

- -

Edit 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/8106057c3d809e21acc4c071993e263e2ce152e7.file.footer.html.php b/misc/smarty/templates_c/8106057c3d809e21acc4c071993e263e2ce152e7.file.footer.html.php deleted file mode 100644 index e5671a09..00000000 --- a/misc/smarty/templates_c/8106057c3d809e21acc4c071993e263e2ce152e7.file.footer.html.php +++ /dev/null @@ -1,50 +0,0 @@ - -decodeProperties(array ( - 'file_dependency' => - array ( - '8106057c3d809e21acc4c071993e263e2ce152e7' => - array ( - 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/footer.html', - 1 => 1421125086, - 2 => 'file', - ), - ), - 'nocache_hash' => '100255695754b47059dfdb34-00395845', - 'function' => - array ( - ), - 'version' => 'Smarty-3.1.21-dev', - 'unifunc' => 'content_54b47059e38473_84747847', - 'variables' => - array ( - 'glmPluginName' => 0, - 'thisYear' => 0, - 'adminDebug' => 0, - 'thisURL' => 0, - 'thisPage' => 0, - ), - 'has_nocache_code' => false, -),false); /*/%%SmartyHeaderCode%%*/?> - -
-
- tpl_vars['glmPluginName']->value;?> -
- Copyright © 2014-tpl_vars['thisYear']->value;?> - Gaslight Media - All Rights Reserved
- http://www.gaslightmedia.com -
- - tpl_vars['adminDebug']->value) {?> - -> - window.open('tpl_vars['thisURL']->value;?> -?page=tpl_vars['thisPage']->value;?> -&glmDebugWindow=true','GLM_Plugin_Debug','width=800, height=900, left=50, top=50'); - -> - - -
diff --git a/models/admin/member/member.php b/models/admin/member/member.php deleted file mode 100644 index eee981f3..00000000 --- a/models/admin/member/member.php +++ /dev/null @@ -1,256 +0,0 @@ - - * @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 ($redirectData = false) - { - - $success = true; - $haveMember = false; - $memberData = false; - $memberID = 0; - $error = false; - - // Check if a member ID is supplied - if (isset($_REQUEST['member_id'])) { - // Make sure it's a number - $memberID = $_REQUEST['member_id']-0; - } - - // Check for action option - $option = false; - if (isset($_REQUEST['option']) && trim($_REQUEST['option']) != '') { - $option = $_REQUEST['option']; - } - - // Perform requested option - switch ($option) { - - case 'addNew': - - // Insert the new member into the database - $memberData = $this->insertEntry(); - - if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { - glmMembersAdmin::addNotice($memberData, 'DataBlock', 'New Member Data'); - } - - if ($memberData['status']) { - return array( - 'status' => $success, - 'menuItemRedirect' => 'member', - 'modelRedirect' => 'index', - 'view' => 'admin/member/index.html', - 'data' => array( - 'memberID' => $memberData['fieldData']['id'] - ) - ); - } - - break; - - case 'submit': - - // If we have a member ID - if ($memberID > 0) { - - $haveMember = true; - - // Update the member data - $memberData = $this->updateEntry($memberID); - - // If the update went well, then redirect to the member status page - if ($memberData['status']) { - return array( - 'status' => $success, - 'menuItemRedirect' => 'member', - 'modelRedirect' => 'index', - 'view' => 'admin/member/index.html', - 'data' => array( - 'memberID' => $memberID - ) - ); - } else { - - - } - - // Else if there's no member ID, then we have a problem - } else { - $error = true; - } - - break; - - default: - - if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { - glmMembersAdmin::addNotice("  Member ID specified: $memberID", 'Process'); - } - - // If we have a member ID, try to get the member data - if ($memberID > 0) { - - // Edit the existing member - $memberData = $this->editEntry($memberID); - - // If we have member data, say so - if (is_array($memberData) && $memberData['status']) { - $haveMember = true; - - } else { - - if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { - glmMembersAdmin::addNotice("  Specified Member ID is invalid: $memberID", 'Process'); - } - - $error = true; - - } - - // Else if there's no member ID, assume entering a new member - } else { - - // Ask for new member data - $memberData = $this->newEntry(); - - } - - break; - - - - } - - // 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($memberData, 'DataBlock', '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/views/admin/member/member.html b/views/admin/member/member.html deleted file mode 100644 index 06704f89..00000000 --- a/views/admin/member/member.html +++ /dev/null @@ -1,69 +0,0 @@ -{include file='admin/member/header.html'} - - {if $haveMember} -

Edit Member

- {else} -

Add New Member

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

{$member.fieldFail.name}

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

{$member.fieldFail.status}

{/if} -
Member Type: - - {if $member.fieldFail.member_type}

{$member.fieldFail.member_type}

{/if} -
Description: - - {if $member.fieldFail.descr}

{$member.fieldFail.descr}

{/if} -
Short Description: - - {if $member.fieldFail.short_descr}

{$member.fieldFail.short_descr}

{/if} -
-

* Required

- -
- -{include file='admin/footer.html'}