From e200010cb40bd7b796790e322996fd471fdf4b27 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 15 Jan 2016 14:17:25 -0500 Subject: [PATCH] Update for setting name --- controllers/admin.php | 57 ++-------------------- index.php | 6 +-- models/job.php | 107 ++++++++++++++---------------------------- views/page.php | 2 +- views/text.php | 2 +- views/textArea.php | 2 +- 6 files changed, 44 insertions(+), 132 deletions(-) diff --git a/controllers/admin.php b/controllers/admin.php index 14ba853..a226841 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -94,25 +94,11 @@ class glm_employment_admin public function job_settings_init() { - //add_settings_section( - //'glmjobsjobs_setting_section_two', - //'Edit Settings', - //array($this, 'glmjobs_settings_two_section_callback'), - //'glmjobsjobs_settings' - //); - //add_settings_field( - //'thank_you_text', - //'Thank You Message', - //array($this, 'render_textarea_field'), - //'glmjobsjobs_settings', - //'glmjobsjobs_setting_section_two', - //'thank_you_text' - //); add_settings_section( - 'glmjobsjobs_setting_section', + 'glmjobs_setting_section', 'Edit Form Settings', array($this, 'glmjobs_settings_section_callback'), - 'glmjobsjobs_settings' + GLM_EMP_SETTINGS ); $fieldNames = array( array( @@ -120,41 +106,6 @@ class glm_employment_admin 'label' => 'Page for the Form', 'type' => 'page' ) - //array( - //'name' => 'notification_name', - //'label' => 'Online Form Notify: Name', - //'type' => 'text' - //), - //array( - //'name' => 'notification_email', - //'label' => 'Online Form Notify: Email', - //'type' => 'text' - //), - //array( - //'name' => 'from_name', - //'label' => 'From: Name', - //'type' => 'text' - //), - //array( - //'name' => 'from_email', - //'label' => 'From: Email', - //'type' => 'text' - //), - //array( - //'name' => 'replyto_name', - //'label' => 'Reply-To: Name', - //'type' => 'text' - //), - //array( - //'name' => 'replyto_email', - //'label' => 'Reply-To: Email', - //'type' => 'text' - //), - //array( - //'name' => 'notification_message', - //'label' => 'Notification Message', - //'type' => 'textarea' - //), ); foreach ($fieldNames as $field) { @@ -243,8 +194,8 @@ class glm_employment_admin $name, $label, array($this, $callback), - 'glmjobsjobs_settings', - 'glmjobsjobs_setting_section', + GLM_EMP_SETTINGS, + 'glmjobs_setting_section', $name ); } diff --git a/index.php b/index.php index 6036536..7f530ff 100644 --- a/index.php +++ b/index.php @@ -13,9 +13,9 @@ defined('ABSPATH') or die(); * Defines for the plugin */ define('GLM_EMP_PLUGIN_PATH_FILE', __FILE__); -define('GLM_EMP_VERSION', '0.0.1'); -define('GLM_EMP_SETTING_NAME', 'glmjobsjobs_settings'); -define('GLM_EMP_SETTINGS', 'glmjobsjobs_settings'); +define('GLM_EMP_VERSION', '1.3.2'); +define('GLM_EMP_SETTING_NAME', 'glmjobs_settings'); +define('GLM_EMP_SETTINGS', 'glmjobs_settings'); define('GLM_EMP_NEW_CAPABILITY', 'edit_glmjobs_jobs'); define('GLM_EMP_BUILT_IN_CAPABILITY', 'edit_posts'); define('GLM_EMP_VRS_OPTION_NAME', 'glm_jobs_db_version'); diff --git a/models/job.php b/models/job.php index 51932f3..5ab1f67 100644 --- a/models/job.php +++ b/models/job.php @@ -18,34 +18,23 @@ class glm_employment_job */ public function __construct($path) { -// global $typenow; $this->pluginDirName = $path; add_action('init', array($this, 'addPostTypes')); add_action('init', array($this, 'createJobTaxonomy')); - add_filter('post_updated_messages', array($this, 'jobsUpdatedMessages')); - - add_filter('manage_edit-glm_jobs_columns', - array($this, 'jobsEditColumns')); - - add_action('manage_posts_custom_column', - array($this, 'jobsCustomColumns')); + add_filter('manage_edit-glm_jobs_columns', array($this, 'jobsEditColumns')); + add_action('manage_posts_custom_column', array($this, 'jobsCustomColumns')); add_action('admin_init', array($this, 'metaDates')); add_action('save_post', array($this, 'saveEmpMeta')); - add_filter('manage_edit-glm_jobs_sortable_columns', - array($this, 'sortingColumns')); - add_action('restrict_manage_posts', - array($this, 'taxonomy_filter_restrict_manage_posts')); + add_filter('manage_edit-glm_jobs_sortable_columns', array($this, 'sortingColumns')); + add_action('restrict_manage_posts', array($this, 'taxonomy_filter_restrict_manage_posts')); add_filter('parse_query', array($this, 'jobFilter')); -// var_dump($typenow); -// add_filter('user_row_actions', array($this, 'remove_row_actions')); } // Filter the request to just give posts for the given taxonomy, if applicable. function taxonomy_filter_restrict_manage_posts() { global $typenow; -// var_dump($typenow); if ($typenow == GLM_EMP_POST_TYPE) { $filters = get_object_taxonomies(GLM_EMP_POST_TYPE); @@ -71,14 +60,10 @@ class glm_employment_job function taxonomy_filter_post_type_request($query) { global $pagenow, $typenow; -//var_dump($typenow); if ('edit.php' == $pagenow && $typenow == GLM_EMP_POST_TYPE) { $filters = get_object_taxonomies(GLM_EMP_POST_TYPE); -// var_dump($filters); foreach ($filters as $tax_slug) { $var = &$query->query_vars[$tax_slug]; -// var_dump($var); -// var_dump($tax_slug); if (isset($var)) { $term = get_term_by('id', $var, $tax_slug); var_dump($term); @@ -137,7 +122,6 @@ class glm_employment_job if (isset($query->tax_query)) { $tax_query =& $query->tax_query; $queries =& $tax_query->queries; -// echo '
'.print_r($queries, true).'
'; foreach ($queries as $key => &$qs) { if ($qs['taxonomy'] == GLM_EMP_TAX_CATEGORIES) { $qs['terms'][$key] = $term->slug; @@ -150,13 +134,7 @@ class glm_employment_job $term = get_term_by('id', $qv[GLM_EMP_TAX_DEPARTMENTS], GLM_EMP_TAX_DEPARTMENTS); $qv[GLM_EMP_TAX_DEPARTMENTS] = $term->slug; } - if ($qv['post_type'] == GLM_EMP_POST_TYPE) { -// echo '
'.print_r($qv, true).'
'; - } -// echo '
'.print_r($query, true).'
'; } - - return $query; } } @@ -231,27 +209,13 @@ class glm_employment_job $clean_sd = date('D, M d, Y', $meta_sd); $clean_ed = date('D, M d, Y', $meta_ed); - $glm_jobs_status = (isset($glm_jobs_status[0])) - ? $glm_jobs_status[0] - : ''; - $glm_jobs_pay_grade = (isset($glm_jobs_pay_grade[0])) - ? $glm_jobs_pay_grade[0] - : ''; - $glm_jobs_shift = (isset($glm_jobs_shift[0])) - ? $glm_jobs_shift[0] - : ''; - $glm_jobs_contact = (isset($glm_jobs_contact[0])) - ? $glm_jobs_contact[0] - : ''; - $glm_jobs_email = (isset($glm_jobs_email[0])) - ? $glm_jobs_email[0] - : ''; - $glm_jobs_comments = (isset($glm_jobs_comments[0])) - ? $glm_jobs_comments[0] - : ''; - $glm_jobs_code = (isset($glm_jobs_code[0])) - ? $glm_jobs_code[0] - : ''; + $glm_jobs_status = (isset($glm_jobs_status[0])) ? $glm_jobs_status[0] : ''; + $glm_jobs_pay_grade = (isset($glm_jobs_pay_grade[0])) ? $glm_jobs_pay_grade[0] : ''; + $glm_jobs_shift = (isset($glm_jobs_shift[0])) ? $glm_jobs_shift[0] : ''; + $glm_jobs_contact = (isset($glm_jobs_contact[0])) ? $glm_jobs_contact[0] : ''; + $glm_jobs_email = (isset($glm_jobs_email[0])) ? $glm_jobs_email[0] : ''; + $glm_jobs_comments = (isset($glm_jobs_comments[0])) ? $glm_jobs_comments[0] : ''; + $glm_jobs_code = (isset($glm_jobs_code[0])) ? $glm_jobs_code[0] : ''; include $this->pluginDirName . 'views/admin/job_meta.php'; } @@ -293,14 +257,11 @@ class glm_employment_job update_post_meta($post->ID, 'glm_jobs_enddate', $updateendd); update_post_meta($post->ID, 'glm_jobs_status', $_POST['glm_jobs_status']); - update_post_meta($post->ID, 'glm_jobs_pay_grade', - $_POST['glm_jobs_pay_grade']); + update_post_meta($post->ID, 'glm_jobs_pay_grade', $_POST['glm_jobs_pay_grade']); update_post_meta($post->ID, 'glm_jobs_shift', $_POST['glm_jobs_shift']); - update_post_meta($post->ID, 'glm_jobs_contact', - $_POST['glm_jobs_contact']); + update_post_meta($post->ID, 'glm_jobs_contact', $_POST['glm_jobs_contact']); update_post_meta($post->ID, 'glm_jobs_email', $_POST['glm_jobs_email']); - update_post_meta($post->ID, 'glm_jobs_comments', - $_POST['glm_jobs_comments']); + update_post_meta($post->ID, 'glm_jobs_comments', $_POST['glm_jobs_comments']); update_post_meta($post->ID, 'glm_jobs_code', $_POST['glm_jobs_code']); } @@ -404,10 +365,8 @@ class glm_employment_job public function createJobTaxonomy() { $labels = array( - 'name' => _x(GLM_EMP_CATEGORY_PLURAL, - 'taxonomy general name'), - 'singular_name' => _x(GLM_EMP_CATEGORY_SINGLE, - 'taxonomy singular name'), + 'name' => _x(GLM_EMP_CATEGORY_PLURAL, 'taxonomy general name'), + 'singular_name' => _x(GLM_EMP_CATEGORY_SINGLE, 'taxonomy singular name'), 'search_items' => __('Search' . GLM_EMP_CATEGORY_PLURAL), 'popular_items' => __('Popular ' . GLM_EMP_CATEGORY_PLURAL), 'all_items' => __('All ' . GLM_EMP_CATEGORY_PLURAL), @@ -425,15 +384,16 @@ class glm_employment_job register_taxonomy( GLM_EMP_TAX_CATEGORIES, GLM_EMP_POST_TYPE, array( - 'label' => __('Job ' . GLM_EMP_CATEGORY_SINGLE), - 'labels' => $labels, - 'hierarchical' => true, - 'show_ui' => true, - 'query_var' => GLM_EMP_TAX_CATEGORIES, - 'rewrite' => array('slug' => GLM_EMP_TAX_CATEGORIES), - 'show_admin_column' => true, - '_builtin' => true - )); + 'label' => __('Job ' . GLM_EMP_CATEGORY_SINGLE), + 'labels' => $labels, + 'hierarchical' => true, + 'show_ui' => true, + 'query_var' => GLM_EMP_TAX_CATEGORIES, + 'rewrite' => array('slug' => GLM_EMP_TAX_CATEGORIES), + 'show_admin_column' => true, + '_builtin' => true + ) + ); $labels = array( 'name' => _x(GLM_EMP_DEPARTMENT_PLURAL, @@ -457,13 +417,14 @@ class glm_employment_job register_taxonomy( GLM_EMP_TAX_DEPARTMENTS, GLM_EMP_POST_TYPE, array( - 'label' => __('Job ' . GLM_EMP_DEPARTMENT_SINGLE), - 'labels' => $labels, - 'hierarchical' => true, - 'show_ui' => true, - 'query_var' => GLM_EMP_TAX_DEPARTMENTS, - 'rewrite' => array('slug' => GLM_EMP_TAX_DEPARTMENTS), - )); + 'label' => __('Job ' . GLM_EMP_DEPARTMENT_SINGLE), + 'labels' => $labels, + 'hierarchical' => true, + 'show_ui' => true, + 'query_var' => GLM_EMP_TAX_DEPARTMENTS, + 'rewrite' => array('slug' => GLM_EMP_TAX_DEPARTMENTS), + ) + ); } /** diff --git a/views/page.php b/views/page.php index d0ff8be..12d1748 100644 --- a/views/page.php +++ b/views/page.php @@ -5,7 +5,7 @@ wp_dropdown_pages( 'child_of' => 0, 'selected' => $options[$fieldName], 'echo' => 1, - 'name' => 'glmjobsjobs_settings['.$fieldName.']', + 'name' => GLM_EMP_SETTINGS . '['.$fieldName.']', 'id' => 'glm_block_page', 'show_option_none' => 'None', 'post_status' => 'publish', diff --git a/views/text.php b/views/text.php index f0807ed..1a6da27 100644 --- a/views/text.php +++ b/views/text.php @@ -1,2 +1,2 @@ -"> diff --git a/views/textArea.php b/views/textArea.php index ad85e2c..fe7b910 100644 --- a/views/textArea.php +++ b/views/textArea.php @@ -1 +1 @@ - + -- 2.17.1