Changeset 2906601

constellation-client-portal/tags/1.5.7/README.txt

-                      r2893094
+                      r2906601
 Requires at least: 5.0.0
 Tested up to: 6.2
 Stable tag: 1.5.6
+Stable tag: 1.5.7
 Requires PHP: 7.4
 License: GPLv3 or later
 …
 * **list_id** this can be useful for development when you have multiple lists on the same page (ex. this could be helpful when creatig paginated lists on the same page). Accepted Values: any whole positive number that is unique on the page. Default: null
 * **categories** Accepted Values: this can be entered as an Invoice Category Slug or ID, or a combination of those. Separate multiple values with a comma (ex. “21, category-a”). Default: null.
 * **link_title** Accepted Values: “no_link”.  Adding this parameter and setting the value to "no_link" will remove the href from post titles in the list and make them unclickable. Default: null.
+* **link_title** Accepted Values: “nolink”.  Adding this parameter and setting the value to "nolink" will remove the href from post titles in the list and make them unclickable. Default: null.
 * **id** Accepted Values: any valid HTML ID attribute name. Default: null.
 * **class** Accepted Values: any valid HTML class attribute name or names (separate multiple class names with a space). Default: null.
 …
 * **show_post_date** this allows for the WordPress post date to be displayed with each item in a list. Accepted Values: “true” or “false”. Default: “false”.
 * **list_id** this can be useful for development when you have multiple lists on the same page (ex. this could be helpful when creatig paginated lists on the same page). Accepted Values: any whole positive number that is unique on the page. Default: null.
 * **link_title** Accepted Values: “no_link”.  Adding this parameter and setting the value to "no_link" will remove the href from post titles in the list and make them unclickable. Default: null.
+* **link_title** Accepted Values: “nolink”.  Adding this parameter and setting the value to "nolink" will remove the href from post titles in the list and make them unclickable. Default: null.
 * **id** Accepted Values: any valid HTML ID attribute name. Default: null.
 * **class** Accepted Values: any valid HTML class attribute name or names (separate multiple class names with a space). Default: null.
 …
 == Changelog ==
+= 1.5.7 (Pro) - 2023-5-1 =
+* Update: Fixed visibility issue with the due date datepicker month navigation elements.
+* Improvement: Updated the manual reminder email functionality to return a message in the AJAX response if the company does not have a primary user assigned.
+* Improvement: Updated the new post email functionality to add a note to the post if the company does not have a primary user assigned to provide better guidance to the user.
+* Fix: Updated the accp_update_automated_email_cron_on_option_change function to not pass any vars, as the function is used for both the add_option and update_option WP hooks. This fixes fatal errors thrown when saving email settings for the first time (where no options exist), which triggered the add_option_ hooks with the incorrect vars.
+* Improvement: Updated pro authorization functionality for better organization, performance, and maintainability.
+* Fix: Fixed issue that intermittently prevented non-admin users from accessing files directly in cases where excluded users and roles were empty for a given post.
+* Update: Deprecated accp-file-list-loop-vars.php and accp-invoice-list-loop-vars.php.
+* Update: Made minor improvements to the settings license tab.
+* Update: Removed target _blank in the license key reminder message in the WP plugin list.
+* Update: Updated the license activation, deactivation, and plugin update functionality to verify that the user is both logged in and has plugin update capabilities.
+= 1.5.7 (Core) - 2023-5-1 =
+* Update: Increased the the max number of characters to 30 in the new user generation password field within company edit pages for improved password strength.
+* Update: Updated the primary user select and new user creation functionality within new company post edit pages to work properly with Gutenberg even if the new post has not yet been saved.
+* Improvement: Updated core authorization functionality for better organization, performance, and maintainability.
+* Improvement: Added functionality to check user capabilities and enable show_in_rest for accp_client_page_categories and accp_client_page_tags taxonomies for admins (to enable Gutenberg support), but disable public access to these taxonomies via the REST API.
+* Improvement: Updated the core authorization checks to evaluate the client_status user meta and allow/deny access based on the value.
+* Improvement: Created new core and pro authorization classes for better organization and maintainability, and integrated the functionality with the file and invoice shortcodes.
+* Update: Updated the shortcodes to explicitly exit if is_admin to ensure that shortcode functionality is only executed on the front-end.
+* Improvement: Updated the accp_align_thumbnail_var function to improve organization and maintainability.
 = 1.5.6 (Pro) - 2023-4-3 =
 * Update: Minor update to a plugin update notice that is returned if plugin data is not returned via api.
 …
 = 1.5.6 (Core) - 2023-4-3 =
 * Fix: Updated the accp_generate_invoice_query_args and accp_generate_files_query_args tax_query field values to "id" instead of "slug" as the $categories var is passed in as an array of category ID's rather than category slugs in each of those functions.
+* Fix: Updated the accp_generate_invoice_query_args and accp_generate_file_query_args tax_query field values to "id" instead of "slug" as the $categories var is passed in as an array of category ID's rather than category slugs in each of those functions.
 * Fix: Updated the accp_categories_var function to properly convert the $atts['categories'] value to an array if it is set in the shortcode.
 * Update: Created a new function to generate the client file upload dir rewrite regex path for better organization and easier use within the main admin file and within the deactivate function.

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-admin.php

-                      r2893094
+                      r2906601
             $request_uri = esc_url_raw($_SERVER['REQUEST_URI']);
+            $base_checks = $this->accp_direct_file_access_base_checks($request_uri);
+            $core_file_checks = new ARS_Constellation_Client_Portal_Core_File_Checks( $this->plugin_name, $this->version );
+            $base_checks = $core_file_checks->accp_direct_file_access_base_checks($request_uri);
             /**
              * If this is the Basic tier, serve the file here if the base checks passed.
              */
             if( $this->plugin_name != 'ars-constellation-client-portal-premium' && $this->plugin_name != 'ars-constellation-client-portal-pro'){
+            if( $this->plugin_name != 'ars-constellation-client-portal-pro' ){
                 if($base_checks == true){
 …
                 $pro_check_class = new ARS_Constellation_Client_Portal_Pro_File_Checks();
                 $pro_checks = $pro_check_class->accp_direct_file_access_pro_checks($request_uri);
+                $pro_checks = $pro_check_class->accp_direct_file_access_pro_checks($request_uri);
                 if($base_checks == true && $pro_checks == true){
 …
+            }
+        }
         return;
+    }
+    /**
+     * Direct file access base checks.
+     */
+    function accp_direct_file_access_base_checks($request_uri){
+        global $current_user;
+        $current_user = wp_get_current_user();
+        $current_user_id = $current_user->ID;
+        $plugin_name = $this->plugin_name;
+        /**
+         * Return false if the user is not logged in.
+         */
+        if ( !is_user_logged_in() || $current_user_id === 0)
+            return false;
+        // Get the company that the current user is assigned to
+        $current_company = get_user_meta($current_user_id, 'client_company', true);
+        if($current_company != NULL){
+            // Get the current user company's upload directory
+            $company_directory = get_post_meta($current_company, 'accp_dir', true);
+        }else{
+            $company_directory = NULL;
+        }
+        // Get the addional companies if any
+        $additional_assigned_companies = get_user_meta($current_user_id, 'client_additional_company', true);
+        // Get the upload directories for additonal companies
+        $additional_company_directories = array();
+        if ( $additional_assigned_companies != null ){
+            foreach ($additional_assigned_companies as $additional_assigned_company) {
+                $additional_company_directories[] = get_post_meta($additional_assigned_company, 'accp_dir', true);
+            }
+        }
+        // Get the dir name from the $request_uri
+        // Break the request_uri into an array
+        $request_dir_parts = explode("/", $request_uri);
+        // Get the third part of the array - contains the dir name
+        // Dev Note: Verify that this works if WP is installed in a sub directory
+        $request_dir = $request_dir_parts[3];
+        // Check if the current user's company dir matches the uri company dir
+        if ( current_user_can('manage_options') || ( $company_directory != NULL && strpos($request_uri, $company_directory ) != false ) || ( $additional_assigned_companies != null && in_array($request_dir, $additional_company_directories) )  ){
+            // Base checks have passed.
+            return true;
+        }
+        return false;
+    }
+    }
 …
      * Serves the requested file after checks have passed.
      */
     private function accp_load_requested_file($request_uri, $checks_passed = false){
+    private function accp_load_requested_file($request_uri, $checks_passed = false){
         if($checks_passed == false) return;
 …
     /**
+     * Restrict access to Client Pages and Client File Posts on front-end
+     * Restrict access to Client Pages Client File and
+     * Client Invoice Posts on front-end.
      */
     function accp_restrict_client_page_access(){
+        if( is_admin() ) return;
+        global $post;
+        $post_id = get_the_id();
+        if( is_admin() ) return;
+        $post_id = get_the_id();
+        if(!$post_id)
+            return;
         $post_type = get_post_type();
+        $current_user = wp_get_current_user();
+        $current_user_id = $current_user->ID;
+        $roles_array = ( array ) $current_user->roles;
+        $roles = array_map('strtolower', $roles_array);
+        if( $post_type == 'accp_client_pages' || $post_type == 'accp_clientfile' || $post_type == 'accp_clientinvoice' ){
+            // Check if the current user is logged in
+            if ($current_user_id === 0){
+                // If the current user id is 0 redirect to the home page
+                wp_redirect('/');
+                exit;
+            }else{
+                $page_company = get_post_meta($post_id, 'accp_user', true);
+                $current_user_company = get_user_meta($current_user_id, 'client_company', true);
+                // Get the addional companies if any
+                if ( is_array(get_user_meta($current_user_id, 'client_additional_company', true)) ){
+                    $additional_assigned_companies = get_user_meta($current_user_id, 'client_additional_company', true);
+                }else{
+                    $additional_assigned_companies = array(get_user_meta($current_user_id, 'client_additional_company', true));
+                }
+                $roles = ( array ) $current_user->roles;
+                /**
+                 * Check if the user is an admin otherwise verify that the current page
+                 * company matches the current user's company (or additional companies,
+                 * and that the current user is not in the excluded user list for the page,
+                 * and that the current user's role is not in the excluded roles list for the page.
+                 * Verify that the current user's ID and role(s) are not in a file categories excluded lists.
+                 */
+                // Include Excluded Users and Excluded Roles checks for Pro and
+                // Premium versions and load the Pro and Premium version criteria.
+                if ($this->plugin_name == 'ars-constellation-client-portal-premium' || $this->plugin_name == 'ars-constellation-client-portal-pro'){
+                    require_once ( dirname(__DIR__)  . '/pro/admin/includes/accp-page-file-access-check.php'  );
+                }else{
+                    // If this is the Basic version, just use the default criteria
+                    if (
+                        !current_user_can('manage_options') &&
+                        $page_company != $current_user_company && // $current_user_company must be checked with $additional_assigned_companies
+                        !in_array($page_company, $additional_assigned_companies)
+                    ){
+                        wp_redirect('/');
+                        exit;
+                    }
+                }
+            }
+        }
+        if(!$post_type)
+            return;
+        /**
+         * Exit if this is not a Client Page, Client File,
+         * or Client Invoice post type.
+         */
+        if( $post_type !== 'accp_client_pages' && $post_type !== 'accp_clientfile' && $post_type !== 'accp_clientinvoice' )
+            return;
+        $user = wp_get_current_user();
+        /**
+         * Redirect to the home page if no user was returned.
+         */
+        if(!$user){
+            wp_redirect('/');
+            exit;
+        }
+        /**
+         * Redirect to the home page if there is no user ID
+         * or the user ID equals 0.
+         */
+        $user_id = $user->ID ? $user->ID : false;
+        if( !$user_id || $user_id === 0){
+            wp_redirect('/');
+            exit;
+        }
+        /**
+         * Check if pro access checks need to be instantiated.
+         */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
+            $authorization = new ARS_Constellation_Client_Portal_Pro_Authorization( $this->plugin_name, $this->version );
+            $check_authorization = $authorization->verify_page_or_post_authorization_pro($post_id, $user_id);
+        }else{
+            /**
+             * Use the default file check if this is the Core version
+             * to determine if access should be granted.
+             */
+            $authorization = new ARS_Constellation_Client_Portal_Core_Authorization( $this->plugin_name, $this->version );
+            $check_authorization = $authorization->verify_page_or_post_authorization($post_id, $user_id);
+        }
+        /**
+         * Redirect to the home page if authorization failed.
+         */
+        if( $check_authorization === false ){
+            wp_redirect('/');
+            exit;
+        }
+    }
 …
+    }
+    /**
+     * Get the company directory name from a URL.
+     *
+     * @param string $request_uri - the URL to parse.
+     * @return string|bool $company_dir|false - the company dir name.
+     */
+    function get_company_dir_name_from_url($request_uri){
+        if(!$request_uri)
+            return false;
+        if ( strpos($request_uri, '/accp-clientfiles/') !== false ) {
+            $file_str = substr( $request_uri, strpos($request_uri, '/accp-clientfiles/') + 1 );
+            $file_path_array = explode('/', $file_str);
+            $company_dir = $file_path_array[1];
+            return $company_dir;
+        }
+        return false;
+    }
+    /**
+     * Get the company ID by the company directory name.
+     *
+     * @param string $company_dir - the company dir name (not path).
+     * @return int $company_id - the company ID associated with the dir.
+     */
+    function get_company_id_by_company_dir_name($company_dir){
+        if(!$company_dir){
+            return false;
+        }
+        $company_dir = str_replace('/', '', $company_dir);
+        $company_dir = str_replace('.', '', $company_dir);
+        $company_id = '';
+        /**
+         * Query for companies that contain a matching
+         * company directory name.
+         */
+        $args = array(
+            'post_type' => array('accp_clientcompany'),
+            'post_status' => 'publish',
+            'meta_query' => array(
+                array(
+                    'key' => 'accp_dir',
+                    'value' => $company_dir
+                )
+            ),
+        );
+        $wp_query = new WP_Query($args);
+        if ( $wp_query->have_posts() ){
+            $company_id = '';
+            while ( $wp_query->have_posts() ){
+                $wp_query->the_post();
+                if(get_the_ID()){
+                    $company_id = get_the_ID();
+                }
+                break;
+            }
+            wp_reset_postdata();
+            /**
+             * Return the company ID if it's set.
+             */
+            if( $company_id && !empty($company_id) )
+                return $company_id;
+        }
+        return false;
+    }

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-client-pages.php

-                      r2893094
+                      r2906601
+    }
     /**
 …
     /**
      * Register the Categories for the Client Page custom post type.
 …
         );
+        /**
+         * Only show the post type in rest if the user has sufficient
+         * capabilities.  We want to enable show_in_rest to allow Gutenberg support,
+         * without allowing public access to the post type via the WP REST API.
+         */
+        $show_in_rest = current_user_can( 'manage_options' ) ? true : false;
         $args = array(
             'labels' => $labels,
             'public' => true,
+            'show_in_rest' => $show_in_rest,
             'show_in_nav_menus' => false,
             'show_ui' => true,
 …
         register_taxonomy( 'accp_client_page_categories', array('accp_client_pages'), $args );
+    }
     /**
 …
         );
+        /**
+         * Only show the post type in rest if the user has sufficient
+         * capabilities.  We want to enable show_in_rest to allow Gutenberg support,
+         * without allowing public access to the post type via the WP REST API.
+         */
+        $show_in_rest = current_user_can( 'manage_options' ) ? true : false;
         $args = array(
             'labels' => $labels,
             'public' => true,
+            'show_in_rest' => $show_in_rest,
             'show_in_nav_menus' => false,
             'show_ui' => true,

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-company.php

-                      r2893094
+                      r2906601
         register_post_type( 'accp_clientcompany', $args );
+    }
 …
+        }
+        return $new_columns;
+    }
+        return $new_columns;
+    }
     /**
 …
             if($user){
                 echo $user->user_login . ' (ID: '.$primary_user_id.')';
+            }
+        }
+    }
 …
             return;
-        // Post (Company) id
         $id = get_the_id();
+        $args  = array(
+            'meta_query' => array(
+                'relation' => 'OR',
+                array(
+                'key' => 'client_company',
+                'value' => $id,
+                'compare' => 'IN'
+                ),
+                array(
+                'key' => 'client_additional_company',
+                'value' => $id,
+                'compare' => 'LIKE'
+                )
+            )
+        );
+        $user_query = new WP_User_Query( $args );
+        $users = (array) $user_query->results;
+        $user_name_list = array();
+        if(!empty($users)){
+            foreach($users as $user){
+                $user_id = $user->ID;
+                $user_url = get_edit_user_link($user->ID);
+                $user_name_list[] = '<a href="' . esc_url($user_url) . '">' . esc_html($user->user_login) . '</a>';
+            }
+            // echo join(', ', $user_name_list); // uncomment this to display a list of hyperlinked usernames
+            echo esc_html(count($user_name_list));
+        }else{
+            echo '0';
+        }
+    }
+    /**
+     * Display the Home Page column content - Client Company WP List Table - Company Home Page.
+     */
+    public function clientcompany_column_display_home_page( $column_name, $post_id ) {
+        if ( 'company_home_page' != $column_name )
+            return;
+        $accp_home_page = get_post_meta($post_id, 'accp_home_page', true);
+        if(!empty($accp_home_page)){
+            $view_page_link = get_the_permalink($accp_home_page);
+            echo '<span class="hov-nav-link">' . esc_url($view_page_link) . '</span>';
+            echo '<ul class="home-page-hov-nav row-actions"><li><a href="post.php?post=' . esc_attr($accp_home_page) . '&action=edit">Edit Page</a></li><li><a href="' . esc_url($view_page_link) . '" target="_blank">View Page</a></li></ul>';
+        }
+    }
+    /**
+     * Display the Home Page column content - Client Company WP List Table - Company Status.
+     */
+    public function clientcompany_column_display_status( $column_name, $post_id ) {
+        if ( 'company_status' != $column_name )
+            return;
+        $company_statuses = get_option('accp_company_status_repeater');
+        $saved_status = get_post_meta($post_id, 'accp_company_status', true);
+        if(!empty($saved_status)){
+            foreach ($company_statuses as $field) {
+                if($field['value'] == $saved_status){
+                    echo esc_html($field['label']);
+                }
+            }
+        }
+    }
+    /**
+     * Create metaboxes for the Client Company post page
+     */
+    public function display_clientcompany_meta_options() {
+        $screens = array( 'accp_clientcompany' );
+        foreach ( $screens as $screen ) {
+            add_meta_box("company-home-page", "Company Home Page", array($this, "display_home_page_meta_options"), $screen, "side");
+            add_meta_box("company-upload-dir", "Company Upload Directory", array($this, "display_company_upload_meta_options"), $screen, "normal", "high");
+            add_meta_box("company-primary-user", "Company Primary User", array($this, "display_company_primary_user_meta_options"), $screen, "normal", "high");
+            add_meta_box("company-users", "Company Users", array($this, "display_company_user_meta_options"), $screen, "normal", "high");
+        }
+    }
+    /**
+     * Client Company Metaboxes Save field data.
+     */
+    function save_clientcompany_meta_options($post_id, $post, $update) {
+        if ( current_user_can( 'edit_posts' ) && is_admin() && function_exists('get_current_screen') ){
+            $current_screen = get_current_screen();
+            if( $current_screen->id === "accp_clientcompany" ) {
+                /**
+                 * Exit if post does not yet exist.
+                 */
+                if( !is_object($post) )
+                    return;
+                /**
+                 * Save Home Page
+                 */
+                if($post && isset($_POST["accp_home_page"]) ){
+                    $home_page_id = $this->accp_utility_functions->accp_sanitize_integers($_POST["accp_home_page"]);
+                    update_post_meta($post_id, "accp_home_page", $home_page_id);
+                }
+                if($post && !isset($_POST["accp_home_page"]) ){
+                    delete_post_meta($post_id, "accp_home_page");
+                }
+                /**
+                 * Save Primary User
+                 */
+                if($post && isset($_POST["accp_company_primary_user"]) ){
+                    $primary_user = $this->accp_utility_functions->accp_sanitize_integers($_POST["accp_company_primary_user"]);
+                    update_post_meta($post_id, "accp_company_primary_user", $primary_user);
+                }
+                if($post && !isset($_POST["accp_company_primary_user"]) ){
+                    delete_post_meta($post_id, "accp_company_primary_user");
+                }
+            }
+        }
+    }
+    /**
+     * Display meta box and custom fields - Company Home Page metabox.
+     */
+    public function display_home_page_meta_options() {
+        global $post;
+        $accp_home_page = get_post_meta($post->ID, 'accp_home_page', true);
+        ?>
+        <p class="accp-field-instructions">Select a company home page.</p>
+        <?php
+        wp_dropdown_pages(array('post_type'=>'accp_client_pages', 'value_field' => 'ID', 'echo' => TRUE, 'show_option_none' => 'Select a page...', 'name' => 'accp_home_page', 'selected' => $accp_home_page ));
+        $create_page_nonce = wp_create_nonce('create_home_page');
+        ?>
+        <div class="accp-create-page-container">
+            <p>Or, create and assign a new blank page.</p>
+            <span class="button button-primary accp-show-new-page-form">Create New Page</span>
+            <div class="accp-generate-page-form">
+                <p class="accp-create-new-page-instructions">
+                This process will create a new blank Client Page and assign it as the home page for the current Company.
+                </p>
+                <label for="accp_new_page_title">Client Page Title</label>
+                <input type="text" class="accp-new-page-title" name="accp_new_page_title">
+                <span class="button button-primary accp-generate-new-page" data-nonce="<?php echo $create_page_nonce; ?>" data-post-id="<?php echo $post->ID; ?>">Generate Page</span>
+                <span class="accp-generate-page-message"></span>
+            </div>
+        </div>
+        <?php
+    }
+    /**
+     * Generate new Client Page AJAX function.
+     */
+    function accp_generate_new_client_page(){
+        if( !is_admin() || !is_user_logged_in() || !current_user_can('manage_options'))
+            return;
+        /**
+         * Verify the nonce.
+         */
+        $nonce = filter_var($_POST['nonce'], FILTER_SANITIZE_STRING);
+        if ( ! wp_verify_nonce( $nonce, 'create_home_page' ) )
+            wp_die();
+        $post_title = filter_var($_POST['post_title'], FILTER_SANITIZE_STRING);
+        $company_post_id = (int)$_POST['company_post_id'];
+        /**
+         * Exit if this is a new post that has not yet been saved.
+         */
+        if(!get_post($company_post_id)){
+            echo 'Please save the post before attempting to assign a home page';
+            wp_die();
+        }
+        $args = array(
+            'post_type'   => 'accp_client_pages',
+            'post_title'  => esc_html($post_title),
+            'post_status' => 'publish'
+        );
+        $post_id = wp_insert_post($args);
+        if($post_id){
+            /**
+             * Assign the Company to the new Client Page.
+             */
+            update_post_meta($post_id, 'accp_user', $company_post_id);
+            /**
+             * Assign the home page to the Company.
+             */
+            update_post_meta($company_post_id, 'accp_home_page', $post_id);
+            echo (int)$post_id;
+        }else{
+            echo 'accp add post error';
+        }
+        wp_die();
+    }
+    /**
+     * Display meta box and custom fields - Company Users metabox.
+     */
+    public function display_company_user_meta_options() {
+        global $post;
+        $id = get_the_ID();
         $args  = array(
             'meta_query' => array(
 …
         );
-        $user_query = new WP_User_Query( $args );
-        $users = (array) $user_query->results;
-        $user_name_list = array();
-        if(!empty($users)){
-            foreach($users as $user){
-                $user_id = $user->ID;
-                $user_url = get_edit_user_link($user->ID);
-                $user_name_list[] = '<a href="' . esc_url($user_url) . '">' . esc_html($user->user_login) . '</a>';
+            }
-            // echo join(', ', $user_name_list); // uncomment this to display a list of hyperlinked usernames
-            echo esc_html(count($user_name_list));
-        }else{
-            echo '0';
+        }
+    }
-    /**
-     * Display the Home Page column content - Client Company WP List Table - Company Home Page.
-     */
-    public function clientcompany_column_display_home_page( $column_name, $post_id ) {
-        if ( 'company_home_page' != $column_name )
-            return;
-        $accp_home_page = get_post_meta($post_id, 'accp_home_page', true);
-        if(!empty($accp_home_page)){
-            $view_page_link = get_the_permalink($accp_home_page);
-            echo '<span class="hov-nav-link">' . esc_url($view_page_link) . '</span>';
-            echo '<ul class="home-page-hov-nav row-actions"><li><a href="post.php?post=' . esc_attr($accp_home_page) . '&action=edit">Edit Page</a></li><li><a href="' . esc_url($view_page_link) . '" target="_blank">View Page</a></li></ul>';
+        }
+    }
-    /**
-     * Display the Home Page column content - Client Company WP List Table - Company Status.
-     */
-    public function clientcompany_column_display_status( $column_name, $post_id ) {
-        if ( 'company_status' != $column_name )
-            return;
-        $company_statuses = get_option('accp_company_status_repeater');
-        $saved_status = get_post_meta($post_id, 'accp_company_status', true);
-        if(!empty($saved_status)){
-            foreach ($company_statuses as $field) {
-                if($field['value'] == $saved_status){
-                    echo esc_html($field['label']);
+                }
+            }
+        }
+    }
-    /**
-     * Create metaboxes for the Client Company post page
-     */
-    public function display_clientcompany_meta_options() {
-        $screens = array( 'accp_clientcompany' );
-        foreach ( $screens as $screen ) {
-            add_meta_box("company-home-page", "Company Home Page", array($this, "display_home_page_meta_options"), $screen, "side");
-            add_meta_box("company-upload-dir", "Company Upload Directory", array($this, "display_company_upload_meta_options"), $screen, "normal", "high");
-            add_meta_box("company-primary-user", "Company Primary User", array($this, "display_company_primary_user_meta_options"), $screen, "normal", "high");
-            add_meta_box("company-users", "Company Users", array($this, "display_company_user_meta_options"), $screen, "normal", "high");
+        }
+    }
-    /**
-     * Client Company Metaboxes
-     * Save field data.
-     */
-    function save_clientcompany_meta_options($post_id, $post, $update) {
-        if ( current_user_can( 'edit_posts' ) && is_admin() && function_exists('get_current_screen') ){
-            $current_screen = get_current_screen();
-            if( $current_screen->id === "accp_clientcompany" ) {
-                // Exit if post does not yet exist.
-                if( !is_object($post) )
-                    return;
-                /**
-                 * Save Home Page
-                 */
-                if($post && isset($_POST["accp_home_page"]) ){
-                    $home_page_id = $this->accp_utility_functions->accp_sanitize_integers($_POST["accp_home_page"]);
-                    update_post_meta($post_id, "accp_home_page", $home_page_id);
+                }
-                if($post && !isset($_POST["accp_home_page"]) ){
-                    delete_post_meta($post_id, "accp_home_page");
+                }
-                /**
-                 * Save Primary User
-                 */
-                if($post && isset($_POST["accp_company_primary_user"]) ){
-                    $primary_user = $this->accp_utility_functions->accp_sanitize_integers($_POST["accp_company_primary_user"]);
-                    update_post_meta($post_id, "accp_company_primary_user", $primary_user);
+                }
-                if($post && !isset($_POST["accp_company_primary_user"]) ){
-                    delete_post_meta($post_id, "accp_company_primary_user");
+                }
+            }
+        }
+    }
-    /**
-     * Display meta box and custom fields - Company Home Page metabox.
-     */
-    public function display_home_page_meta_options() {
-        global $post;
-        $accp_home_page = get_post_meta($post->ID, 'accp_home_page', true);
-        ?>
-        <p class="accp-field-instructions">Select a company home page.</p>
-        <?php
-        wp_dropdown_pages(array('post_type'=>'accp_client_pages', 'value_field' => 'ID', 'echo' => TRUE, 'show_option_none' => 'Select a page...', 'name' => 'accp_home_page', 'selected' => $accp_home_page ));
-        $create_page_nonce = wp_create_nonce('create_home_page');
-        ?>
-        <div class="accp-create-page-container">
-            <p>Or, create and assign a new blank page.</p>
-            <span class="button button-primary accp-show-new-page-form">Create New Page</span>
-            <div class="accp-generate-page-form">
-                <p class="accp-create-new-page-instructions">
-                This process will create a new blank Client Page and assign it as the home page for the current Company.
-                </p>
-                <label for="accp_new_page_title">Client Page Title</label>
-                <input type="text" class="accp-new-page-title" name="accp_new_page_title">
-                <span class="button button-primary accp-generate-new-page" data-nonce="<?php echo $create_page_nonce; ?>" data-post-id="<?php echo $post->ID; ?>">Generate Page</span>
-                <span class="accp-generate-page-message"></span>
-            </div>
-        </div>
-        <?php
+    }
-    /**
-     * Generate new Client Page AJAX function.
-     */
-    function accp_generate_new_client_page(){
-        if( !is_admin() || !is_user_logged_in() || !current_user_can('manage_options'))
-            return;
-        // Verify the nonce
-        $nonce = filter_var($_POST['nonce'], FILTER_SANITIZE_STRING);
-        if ( ! wp_verify_nonce( $nonce, 'create_home_page' ) )
-            wp_die();
-        $post_title = filter_var($_POST['post_title'], FILTER_SANITIZE_STRING);
-        $company_post_id = (int)$_POST['company_post_id'];
-        // Exit if this is a new post that has not yet been saved.
-        if(!get_post($company_post_id)){
-            echo 'Please save the post before attempting to assign a home page';
-            wp_die();
+        }
-        $args = array(
-            'post_type'   => 'accp_client_pages',
-            'post_title'  => esc_html($post_title),
-            'post_status' => 'publish'
-        );
-        $post_id = wp_insert_post($args);
-        if($post_id){
-            // Assign the Company to the new Client Page.
-            update_post_meta($post_id, 'accp_user', $company_post_id);
-            // Assign the home page to the Company.
-            update_post_meta($company_post_id, 'accp_home_page', $post_id);
-            echo (int)$post_id;
-        }else{
-            echo 'accp add post error';
+        }
-        wp_die();
+    }
-    /**
-     * Display meta box and custom fields - Company Users metabox.
-     */
-    public function display_company_user_meta_options() {
-        global $post;
-        // Post (Company) id
-        $id = get_the_ID();
-        $args  = array(
-            'meta_query' => array(
-                'relation' => 'OR',
-                array(
-                'key' => 'client_company',
-                'value' => $id,
-                'compare' => 'IN'
-                ),
-                array(
-                'key' => 'client_additional_company',
-                'value' => $id,
-                'compare' => 'LIKE'
+                )
+            )
-        );
         $user_query = new WP_User_Query( $args );
         $users = (array) $user_query->results;
 …
                 <div id="accp-assign-primary-user-container">
+                <input type="hidden" name="accp_company_primary_user" value="">
                 <span class="accp-assign-primary-user-heading">Assign Existing User</span>
 …
                     <?php
                     /**
+                     * Assign an existing WP user as
+                     * the primary user.
+                     * Assign an existing WP user as the primary user.
                      */
                     ?>
 …
                     <?php
                     /**
+                     * Create a new WP user and
+                     * assign as the primary user.
+                     * Create a new WP user and assign as the primary user.
                      */
 …
         <p class="accp-company-directory-label">Upload Directory:</p>
         <?php
+        // Post (Company) id
         $id = get_the_id();
         $upload_dir = get_post_meta($id, 'accp_dir', true);
 …
         $generate_nonce = wp_create_nonce('accp_generate_nonce');
+        // Only display this section if it is not a new unsaved post.
+        /**
+         * Only display this section if it is not a new unsaved post.
+         */
         if ( $post_status != 'auto-draft' ){
 …
             <?php
+        }
+        }
+    }
 …
         $count = $company_query->found_posts;
+        // Return an empty array if 1 or fewer posts are returned.
+        /**
+         * Return an empty array if 1 or fewer posts are returned.
+         */
         if($count <= 1)
             return $company_id_list;
 …
     function accp_assign_existing_primary_user(){
+        // Verify the nonce
+        /**
+         * Verify the nonce.
+         */
         $nonce = filter_var($_POST['nonce'], FILTER_SANITIZE_STRING);
 …
         $company_id = (int)$_POST['company_id'];
         $user_id = (int)$_POST['user_id'];
         /**
 …
         $user = get_user_by('ID', $user_id);
+        echo $user->user_login;
+        $response = array(
+            'status' => 'success',
+            'user_id' => $user_id,
+            'username' => $user->user_login,
+        );
+        echo json_encode($response);
         wp_die();
 …
     function accp_create_and_assign_primary_user(){
+        // Verify the nonce
+        /**
+         * Verify the nonce.
+         */
         $nonce = filter_var($_POST['nonce'], FILTER_SANITIZE_STRING);
 …
          * Enforce password complexity.
          */
         if( !preg_match('/(?=^.{8,15}$)((?=.*\d)|(?=.*\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/', $_POST['password']) ){
             echo 'Please enter a password between 8-15 characters long, that contains at least 1 uppercase letter, 1 lowercase letter, 1 number, and 1 special character.';
+        if( !preg_match('/(?=^.{8,30}$)((?=.*\d)|(?=.*\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/', $_POST['password']) ){
+            echo 'Please enter a password between 8-30 characters long, that contains at least 1 uppercase letter, 1 lowercase letter, 1 number, and 1 special character.';
             wp_die();
 …
         $post = get_post($company_id);
         if($post->post_type != 'accp_clientcompany')
             die();
 …
          * for this company.
          */
         update_post_meta($company_id, 'accp_company_primary_user' , (int)$new_user_id);
+        update_post_meta($company_id, 'accp_company_primary_user', (int)$new_user_id);
 …
         $response = array(
             'status' => 'success',
+            'username' => $user->user_login
+            'user_id' => $new_user_id,
+            'username' => $user->user_login,
         );
 …
         $pw_reset_url = $login_url . '?action=rp&key=' . $reset_key . '&login=' . $username;
+        /**
+         * Email subject.
+         */
         $subject = '[' . $site_name . '] New Account Details';
+        /**
+         * Email message.
+         */
         $message = "Hello, \r\n";
         $message .= "Your new " . esc_html($site_name) . " account has been configured, and is ready for use. \r\n\r\n";
 …
         $message .= $site_name;
+        /**
+         * Email headers.
+         */
         $headers = array();
         $headers[] ='From: "'.htmlspecialchars_decode(esc_html(get_bloginfo('name')), ENT_QUOTES).'" <'.filter_var(get_option('admin_email'), FILTER_SANITIZE_EMAIL).'>';
         $headers[] = 'Content-Type: text/plain; charset=UTF-8';
+        wp_mail( filter_var($email, FILTER_SANITIZE_EMAIL), esc_html($subject), wp_kses_post($message), $headers);
+        /**
+         * Send the email.
+         */
+        wp_mail( filter_var($email, FILTER_SANITIZE_EMAIL), esc_html($subject), wp_kses_post($message), $headers );
+    }

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-file.php

-                      r2893094
+                      r2906601
+    }
     /**
 …
+    }
     /**
      * Register the Tags for the Client File custom post type.
 …
+    }
     /**
      * Display the Company column content in the Client File WP List Table.
      */
+    function clientfile_column_display_company_name( $column_name, $post_id ) {
+        //Client Company
+    function clientfile_column_display_company_name( $column_name, $post_id ) {
         if ( 'company' != $column_name )
             return;
 …
             if($company != null){
+                // Display the company name
+                /**
+                 * Display the company name.
+                 */
                 echo esc_html($company);
+                // If a file exists, output the file path data that is used
+                // when deleting posts.
+                /**
+                 * If a file exists, output the file path data that
+                 * is used when deleting posts.
+                 */
                 $accp_file = get_post_meta($post_id, 'accp_file', true);
 …
+    }
     /**
      * Display the Status column content in the Client File WP List Table.
 …
+    }
     /**
 …
+    }
     /**
      * Display the Category column content in the Client File WP List Table.
      */
+    function clientfile_column_display_category( $column_name, $post_id ) {
+        // Client File Category
+    function clientfile_column_display_category( $column_name, $post_id ) {
         if ( 'file_category' != $column_name )
             return;
 …
+    }
     /**
      * Register the column as sortable - Client File WP List Table.
 …
+    }
     /**
      * Sort orderby.
 …
     function clientfile_column_orderby( $vars ) {
+        // Sort the Title column.
+        /**
+         * Sort the Title column.
+         */
         if ( isset( $vars['orderby'] ) && 'user' == $vars['orderby'] ) {
 …
+        }
+        // Sort the Company column - sorts by the accp_user id.
+        /**
+         * Sort the Company column - sorts by the accp_user id.
+         */
         if ( isset( $vars['orderby'] ) && 'company' == $vars['orderby'] ) {
 …
             ) );
+        }
+        // Sort the Document ID column.
+        }
+        /**
+         * Sort the Document ID column.
+         */
         if ( isset( $vars['orderby'] ) && 'doc_id' == $vars['orderby'] ) {
 …
         return $vars;
+    }
+    /**
+     * Add WP List Table Filter Fields
+    }
+    /**
+     * Add WP List Table Filter Fields.
      */
     function accp_add_core_file_list_filter_fields($post_type, $which){
 …
         if($post_type != 'accp_clientfile') return;
+        // Company Filter
+        /**
+         * Company Filter
+         */
         $args = array(
             'post_type' => 'accp_clientcompany',
 …
         if(!is_admin()) return;
+        // Company Filter
+        /**
+         * Company Filter
+         */
         if ( $pagenow=='edit.php' && isset($_GET['accp_file_company_filter']) && $_GET['accp_file_company_filter'] != '' && $query->is_main_query() ) {
 …
+    }
     /**
 …
+    }
     /**
      * Create metaboxes for the Client File post page
 …
+    }
     /**
      * Client File Status Metabox Display
 …
         $saved_status = get_post_meta($post->ID, 'file_status', true);
+        // If there is no saved status, set the invoice status
+        // to the default - 'unpaid.'
+        /**
+         * If there is no saved status, set the invoice
+         * status to the default - 'unpaid.'
+         */
         if(is_object($post) && !$saved_status){
             update_post_meta($post->ID, 'invoice_status', 'unpaid');
 …
+    }
     /**
      * Add File fields to the WP Admin Quick Edit form.
 …
+    }
     /**
      * Add File fields to the WP Admin Bulk Edit form.
 …
+    }
     /**
      * Save File quick edit fields.
 …
         wp_die();
+    }

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-invoice.php

-                      r2893094
+                      r2906601
+    }
     /**
 …
         register_post_type( 'accp_clientinvoice', $args );
+    }
 …
      * Display the Company column content in the Client Invoice WP List Table.
      */
+    function accp_clientinvoice_column_display_company_name( $column_name, $post_id ) {
+        //Client Company
+    function accp_clientinvoice_column_display_company_name( $column_name, $post_id ) {
         if ( 'company' != $column_name )
             return;
 …
             if($company != null){
+                // Display the company name
+                /**
+                 * Display the company name.
+                 */
                 echo esc_html($company);
+                // If a file exists, output the file path data that is used
+                // when deleting posts.
+                /**
+                 * If a file exists, output the file path data that
+                 * is used when deleting posts.
+                 */
                 $accp_file = get_post_meta($post_id, 'accp_file', true);
 …
      * Display the Category column content in the Client Ivnoice WP List Table.
      */
+    function accp_clientinvoice_column_display_categories( $column_name, $post_id ) {
+        // Client File Category
+    function accp_clientinvoice_column_display_categories( $column_name, $post_id ) {
         if ( 'file_category' != $column_name )
             return;
 …
     function accp_clientinvoice_column_orderby( $vars ) {
+        // Sort the Title column.
+        /**
+         * Sort the Title column.
+         */
         if ( isset( $vars['orderby'] ) && 'user' == $vars['orderby'] ) {
 …
+        }
+        // Sort the Company column - sorts by the accp_user id.
+        /**
+         * Sort the Company column - sorts by the accp_user id.
+         */
         if ( isset( $vars['orderby'] ) && 'company' == $vars['orderby'] ) {
 …
+        }
+        // Sort the Document ID column.
+        /**
+         * Sort the Document ID column.
+         */
         if ( isset( $vars['orderby'] ) && 'doc_id' == $vars['orderby'] ) {
 …
         $saved_status = get_post_meta($post->ID, 'invoice_status', true);
+        // If there is no saved status, set the invoice status
+        // to the default - 'unpaid.'
+        /**
+         * If there is no saved status, set the invoice
+         * status to the default - 'unpaid.'
+         */
         if(is_object($post) && !$saved_status){
             update_post_meta($post->ID, 'invoice_status', 'unpaid');
 …
             ?>
+                <option id="<?php echo esc_attr($value); ?>" value="<?php echo esc_attr($value); ?>" <?php echo !$saved_status || $saved_status === $value ? 'selected="selected"' : ''; ?> ><?php echo esc_html($label); ?></option>
+                <option id="<?php echo esc_attr($value); ?>" value="<?php echo esc_attr($value); ?>" <?php echo !$saved_status || $saved_status === $value ? 'selected="selected"' : ''; ?> >
+                    <?php echo esc_html($label); ?>
+                </option>
             <?php
 …
+    }
     /**
 …
                 ?>
+                <option value="<?php echo esc_attr($value); ?>" <?php echo $value == $current_value ? ' selected="selected"' : ''; ?> ><?php echo esc_html($label); ?></option>
+                <option value="<?php echo esc_attr($value); ?>" <?php echo $value == $current_value ? ' selected="selected"' : ''; ?> >
+                    <?php echo esc_html($label); ?>
+                </option>
                 <?php
 …
                                 ?>
+                                    <option id="<?php echo esc_attr($value); ?>" value="<?php echo esc_attr($value); ?>" ><?php echo esc_html($label); ?></option>
+                                    <option id="<?php echo esc_attr($value); ?>" value="<?php echo esc_attr($value); ?>" >
+                                        <?php echo esc_html($label); ?>
+                                    </option>
                                 <?php
 …
                                 ?>
+                                    <option value="<?php echo esc_attr($value); ?>" ><?php echo esc_html($label); ?></option>
+                                    <option value="<?php echo esc_attr($value); ?>" >
+                                        <?php echo esc_html($label); ?>
+                                    </option>
                                 <?php

constellation-client-portal/tags/1.5.7/admin/js/ars-constellation-client-portal-admin.js

-                      r2893094
+                      r2906601
                     success: function(data){
+                        $('.accp-primary-user-section-message').html('Primary User: ' + data);
+                        var response_obj = JSON.parse(data);
+                        $('.accp-primary-user-section-message').html('Primary User: ' + response_obj.username);
+                        $('input[name="accp_company_primary_user"').val(response_obj.user_id);
                         $('#accp-assign-primary-user-container').hide();
                         $('.accp-no-users-assigned-message').remove();
 …
                     },
                     error: function(jqXHR, textStatus, errorThrown){
                         console.log(textStatus, errorThrown);
                         console.log(jqXHR);
 …
         });
         $('#accp-generate-new-user-btn').click(function (e) {
+        $('#accp-generate-new-user-btn').click(function (e) {
             e.preventDefault();
 …
                                 $('.accp-primary-user-section-message').html('Primary User: ' + response_obj.username);
+                                $('input[name="accp_company_primary_user"').val(response_obj.user_id);
                                 $('.accp-create-user-text-field').val('');
                                 $('#accp-send-user-notification').prop('checked', false);
 …
                     },
                     error: function(jqXHR, textStatus, errorThrown){
                         console.log(textStatus, errorThrown);
                         console.log(jqXHR);
 …
+            }
+        });
+        });
         $('.accp-reassign-directory-button.button').click(function(){

constellation-client-portal/tags/1.5.7/ars-constellation-client-portal.php

-                      r2893094
+                      r2906601
  * Plugin URI:        https://adrianrodriguezstudios.com/constellation-client-portal/
  * Description:       Create private pages for each of your clients, post private files, and protect your client files from unauthorized users and search engines.  <strong>Important:</strong> All Site-level File Protection features will cease to function if the plugin is disabled or uninstalled.
  * Version:           1.5.6
+ * Version:           1.5.7
  * Author:            ARS
  * Author URI:        https://adrianrodriguezstudios.com
 …
      */
     define('ACCP_PLUGIN_NAME', 'ARS_CONSTELLATION_CLIENT_PORTAL');
     define('ACCP_PLUGIN_VERSION', '1.5.6'); // Change the version in the header as well.
+    define('ACCP_PLUGIN_VERSION', '1.5.7'); // Change the version in the header as well.
     define( ACCP_PLUGIN_NAME, ACCP_PLUGIN_VERSION );
     define('ACCP_PLUGIN_FILE_NAME', __FILE__);

constellation-client-portal/tags/1.5.7/includes/class-ars-constellation-client-portal.php

-                      r2893094
+                      r2906601
         require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-ars-constellation-client-portal-file.php';
         require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-ars-constellation-client-portal-invoice.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-ars-constellation-client-portal-core-authorization.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-ars-constellation-client-portal-core-file-checks.php';
         require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ars-constellation-client-portal-utility-functions.php';
+        /**
+         * Premium Tier Admin functions
+         */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+            // Include the Pro functions
+            require_once ( dirname(__DIR__)  . '/pro/admin/ars-constellation-client-portal-pro-admin-functions.php'  );
+            // Pro Email Class
+            require_once ( dirname(__DIR__)  . '/pro/admin/ars-constellation-client-portal-pro-emails.php'  );
+            // Include the Premium functions
+            require_once ( dirname(__DIR__)  . '/premium/admin/ars-constellation-client-portal-prem-admin-functions.php'  );
+        }
         /**
 …
             // Pro Email Class
+            require_once ( dirname(__DIR__)  . '/pro/admin/class-ars-constellation-client-portal-pro-emails.php'  );
+        }
+        /**
+         * Premium Tier Public functions
+         */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+            // Include the Pro functions
+            require_once ( dirname(__DIR__)  . '/pro/public/class-ars-constellation-client-portal-pro-public.php'  );
+            // Include the Premium functions
+        }
+            require_once ( dirname(__DIR__)  . '/pro/admin/class-ars-constellation-client-portal-pro-emails.php'  );
+            // Pro Authorization Class
+            require_once ( dirname(__DIR__)  . '/pro/admin/class-ars-constellation-client-portal-pro-authorization.php' );
+        }
         /**
 …
         $plugin_client_file = new ARS_Constellation_Client_Portal_Client_File( $this->get_plugin_name(), $this->get_version() );
         $plugin_client_invoice = new ARS_Constellation_Client_Portal_Client_Invoice( $this->get_plugin_name(), $this->get_version() );
+        $plugin_authorization = new ARS_Constellation_Client_Portal_Core_Authorization( $this->get_plugin_name(), $this->get_version() );
         /* Core (Basic tier) hooks */

constellation-client-portal/tags/1.5.7/public/class-ars-constellation-client-portal-public.php

-                      r2893094
+                      r2906601
         wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/ars-constellation-client-portal-public.js', array( 'jquery' ), $this->version, false );
+        // Localize script for AJAX functionality
+        /**
+         * Localize script for AJAX functionality.
+         */
         wp_localize_script( $this->plugin_name, 'accpfrontajax', array( 'ajaxurl' => admin_url( 'admin-ajax.php' )));
+    }
+    }
     /**
 …
+     *
      * Shortcode: [accp_clientfiles]
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $html - the shortcode result.
      */
     function accp_client_files( $atts, $content = null ) {
+        if (!is_user_logged_in()) return;
+        /**
+         * Exit if the user is not logged in
+         * or if this is WP Admin.
+         */
+        if ( !is_user_logged_in() || is_admin() )
+            return;
         global $post;
 …
          * Conditionally add Pro Tier shortcode attributes.
          */
         if ( $this->plugin_name == 'ars-constellation-client-portal-pro' || $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+        if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
             include dirname(__DIR__) . '/pro/public/accp-file-list-shortcode-atts.php';
+        }
 …
         // Thumbnail alignment
         $align_thumbnail = $this->accp_align_thumbnail_var($atts);
+        $align_thumbnail = $this->accp_align_thumbnail_var($atts) ? $this->accp_align_thumbnail_var($atts) : '';
         // Link title
 …
                     $file_post_company_id = get_post_meta($file_post_id, 'accp_user', true );
+                    // Pro Loop Vars and Access Check
+                    if ( $this->plugin_name == 'ars-constellation-client-portal-pro' || $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+                    /**
+                     * Check if pro access checks need to be instantiated.
+                     */
+                    if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
+                        include dirname(__DIR__) . '/pro/public/accp-file-list-shortcode-includes/accp-file-list-loop-vars.php';
+                    }else{
+                        // Use the default file check if this is the Basic version to determine
+                        // if access should be granted.
+                        if (
+                            (is_user_logged_in() && current_user_can('manage_options')) ||
+                            (is_user_logged_in() && $file_post_company_id === $authorized_company_id)
+                        ){
+                            $access_granted = true;
+                        }else{
+                            $access_granted = false;
+                        }
+                        $authorization = new ARS_Constellation_Client_Portal_Pro_Authorization( $this->plugin_name, $this->version );
+                        $check_authorization = $authorization->verify_page_or_post_authorization_pro($file_post_id, $user_id);
+                    }else{
+                        /**
+                         * Use the default file check if this is the Core version
+                         * to determine if access should be granted.
+                         */
+                        $authorization = new ARS_Constellation_Client_Portal_Core_Authorization( $this->plugin_name, $this->version );
+                        $check_authorization = $authorization->verify_page_or_post_authorization($file_post_id, $user_id);
+                    }
                     if( $access_granted == true ){
+                    if( $check_authorization === true ){
                         /**
 …
                             <? // Thumbnail ?>
                             <div class="file-loop-thumbnail file-thumb-align<?php echo $align_thumbnail != null ? esc_attr($align_thumbnail) : ''; ?>">
+                            <div class="file-loop-thumbnail file-thumb-align<?php echo esc_attr($align_thumbnail); ?>">
                             <?php
 …
      * Generate file query args.
+     *
+     * @return array $args - array of file query args.
+     * @param array $categories - array of category ID's.
+     * @param int $number_of_posts - number of posts to show in the shortcode loop.
+     * @param int $paged - the query args paged value.
+     * @param string $order_by - the query args order_by value.
+     * @param string $order - the query args order value.
+     * @param int $authorized_company_id - post ID for the authorized company.
+     * @param string $file_status - file status value.
+     * @return array $args - array of args for the file query.
      */
     function accp_generate_file_query_args($categories, $number_of_posts, $paged, $order_by, $order, $authorized_company_id, $file_status){
 …
     /**
      * Set up the core atts for the clientfile shortcode.
+     *
+     * @return array $atts_list_array - array of defined shortcode atts.
      */
     function accp_clientfile_core_shortcode_atts(){
 …
     /**
+     * Set up Client Invoice List shortcode - [accp_clientinvoices]
+     * Set up Client Invoice List shortcode.
+     *
+     * Shortcode: [accp_clientinvoices]
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $html - the shortcode result.
      */
     function accp_client_invoices( $atts, $content = null ) {
+        if (!is_user_logged_in()) return;
+        /**
+         * Exit if the user is not logged in
+         * or if this is WP Admin.
+         */
+        if ( !is_user_logged_in() || is_admin() )
+            return;
         global $post;
 …
         // Thumbnail alignment
         $align_thumbnail = $this->accp_align_thumbnail_var($atts);
+        $align_thumbnail = $this->accp_align_thumbnail_var($atts) ? $this->accp_align_thumbnail_var($atts) : '';
         // Link title
 …
                     // Get the Company ID associated with the file
+                    $file_post_company_id = get_post_meta($file_post_id, 'accp_user', true );
+                    // Pro Loop Vars and Access Check
+                    if ( $this->plugin_name == 'ars-constellation-client-portal-pro' || $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+                    $file_post_company_id = get_post_meta($file_post_id, 'accp_user', true );
+                    /**
+                     * Check if pro access checks need to be instantiated.
+                     */
+                    if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
+                        include dirname(__DIR__) . '/pro/public/accp-invoice-list-shortcode-includes/accp-invoice-list-loop-vars.php';
+                    }else{
+                        // Use the default file check if this is the Basic version to determine
+                        // if access should be granted.
+                        if (
+                            is_user_logged_in() && current_user_can('manage_options') ||
+                            is_user_logged_in() && $file_post_company_id === $authorized_company_id
+                        ){
+                            $access_granted = true;
+                        }else{
+                            $access_granted = false;
+                        }
+                    }
+                    if( $access_granted == true ){
+                        $authorization = new ARS_Constellation_Client_Portal_Pro_Authorization( $this->plugin_name, $this->version );
+                        $check_authorization = $authorization->verify_page_or_post_authorization_pro($file_post_id, $user_id);
+                    }else{
+                        /**
+                         * Use the default file check if this is the Core version
+                         * to determine if access should be granted.
+                         */
+                        $authorization = new ARS_Constellation_Client_Portal_Core_Authorization( $this->plugin_name, $this->version );
+                        $check_authorization = $authorization->verify_page_or_post_authorization($file_post_id, $user_id);
+                    }
+                    if( $check_authorization === true ){
                         /**
 …
                             <? // Thumbnail ?>
                             <div class="file-loop-thumbnail file-thumb-align<?php echo $align_thumbnail != null ? esc_attr($align_thumbnail) : ''; ?>">
+                            <div class="file-loop-thumbnail file-thumb-align<?php echo esc_attr($align_thumbnail); ?>">
                             <?php
 …
      * Generate invoice query args.
+     *
+     * @return array - array of args for the invoice query.
+     * @param array $categories - array of category ID's.
+     * @param int $number_of_posts - number of posts to show in the shortcode loop.
+     * @param int $paged - the query args paged value.
+     * @param string $order_by - the query args order_by value.
+     * @param string $order - the query args order value.
+     * @param int $authorized_company_id - post ID for the authorized company.
+     * @param string $invoice_status - invoice status value.
+     * @return array $args - array of args for the invoice query.
      */
     function accp_generate_invoice_query_args($categories, $number_of_posts, $paged, $order_by, $order, $authorized_company_id, $invoice_status){
 …
     /**
      * Set up the core atts for the clientinvoice shortcode.
+     *
+     * @return array $atts_list_array - array of defined shortcode atts.
      */
     function accp_clientinvoice_core_shortcode_atts(){
 …
     /**
+     * Set up Client Home Page Link shortcode - [accp_my_company_page]
+     */
+    function accp_client_home_link( $atts, $content = null ) {
+     * Set up Client Home Page Link shortcode.
+     *
+     * Shortcode: [accp_my_company_page]
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $html - shortcode result.
+     */
+    function accp_client_home_link( $atts, $content = null ) {
+        /**
+         * Exit if this is WP Admin.
+         */
+        if ( is_admin() )
+            return;
         global $post;
 …
         return $html;
+    }
 …
     /**
      * Generate excerpt html for File and Invoice shortcodes.
+     *
+     * @param int $file_post_id - the post ID of the file in the loop.
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @param int $excerpt_length - value to use to constrain the exerpt length.
+     * @return string $html - the html for the excerpt element.
      */
     function accp_file_and_invoice_excerpt_html($file_post_id, $atts, $excerpt_length = null){
 …
     /**
      * Set up the $list_id var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return int $list_id - integer.
      */
     function accp_list_id_var($atts){
 …
      * Set up the $categories var.
+     *
      * $categories = list of category ID's.
+     *
      * $taxonomy = either 'accp_file_categories' or 'accp_invoice_categories'.
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @param string $taxonomy - either 'accp_file_categories' or 'accp_invoice_categories'.
+     * @return array $categories - array of category ID's.
      */
     function accp_categories_var($atts, $taxonomy){
 …
     /**
      * Set up $number_of_posts shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return int $number_of_posts - integer.
      */
     function accp_number_of_posts_var($atts){
 …
     /**
      * Set up $order_by shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $order_by - order_by value (ex. "date").
      */
     function accp_order_by_var($atts){
 …
     /**
      * Set up $order shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $order - the order value (ASC or DESC).
      */
     function accp_order_var($atts){
 …
     /**
      * Set up $excerpt_length shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return int $excerpt_length - integer.
      */
     function accp_excerpt_length_var($atts){
 …
         }else{
+            $excerpt_length = null;
+            $excerpt_length = null;
+        }
 …
     /**
      * Set up $thumbnail_size shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $thumbnail_size - the thumbnail slug.
      */
     function accp_thumbnail_size_var($atts){
 …
     /**
      * Set up $align_thumbnail shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string|false $align_thumbnail - the thumbnail CSS class suffix.
      */
     function accp_align_thumbnail_var($atts){
+        $att_input = trim( strtolower($atts['align_thumbnail']) );
+        $align_thumbnail = null;
+        if( $att_input == 'left' ){
+            $align_thumbnail = '-left';
+        }else if($att_input == 'right'){
+            $align_thumbnail = '-right';
+        }else if($att_input == 'center'){
+            $align_thumbnail = '-cetner';
+        }else if($att_input == 'float-left'){
+            $align_thumbnail = '-float-left';
+        }else if($att_input == 'float-right'){
+            $align_thumbnail = '-float-right';
+        }else if($att_input == null){
+            $align_thumbnail = null;
+        }
+        if( !array_key_exists('align_thumbnail', $atts) )
+            return false;
+        $att_input = trim( strtolower($atts['align_thumbnail']) );
+        switch($att_input){
+            case 'left':
+                $align_thumbnail = '-left';
+                break;
+            case 'right':
+                $align_thumbnail = '-right';
+                break;
+            case 'center':
+                $align_thumbnail = '-cetner';
+                break;
+            case 'float-left':
+                $align_thumbnail = '-float-left';
+                break;
+            case 'float-right':
+                $align_thumbnail = '-float-right';
+                break;
+            default:
+                $align_thumbnail = false;
+        }
         return $align_thumbnail;
 …
          * so let's set $_POST['accp_list_count'] to "1".
          */
         if( !isset($_POST['accp_list_count'])){
+        if( !isset($_POST['accp_list_count']) ){
             $_POST['accp_list_count'] = 1;
 …
+        }
         $list_instance_id = filter_var($_POST['accp_list_count'], FILTER_SANITIZE_NUMBER_INT);
+        $list_instance_id = filter_var( $_POST['accp_list_count'], FILTER_SANITIZE_NUMBER_INT );
         return $list_instance_id;

constellation-client-portal/trunk/README.txt

-                      r2893071
+                      r2906601
 Requires at least: 5.0.0
 Tested up to: 6.2
 Stable tag: 1.5.6
+Stable tag: 1.5.7
 Requires PHP: 7.4
 License: GPLv3 or later
 …
 * **list_id** this can be useful for development when you have multiple lists on the same page (ex. this could be helpful when creatig paginated lists on the same page). Accepted Values: any whole positive number that is unique on the page. Default: null
 * **categories** Accepted Values: this can be entered as an Invoice Category Slug or ID, or a combination of those. Separate multiple values with a comma (ex. “21, category-a”). Default: null.
 * **link_title** Accepted Values: “no_link”.  Adding this parameter and setting the value to "no_link" will remove the href from post titles in the list and make them unclickable. Default: null.
+* **link_title** Accepted Values: “nolink”.  Adding this parameter and setting the value to "nolink" will remove the href from post titles in the list and make them unclickable. Default: null.
 * **id** Accepted Values: any valid HTML ID attribute name. Default: null.
 * **class** Accepted Values: any valid HTML class attribute name or names (separate multiple class names with a space). Default: null.
 …
 * **show_post_date** this allows for the WordPress post date to be displayed with each item in a list. Accepted Values: “true” or “false”. Default: “false”.
 * **list_id** this can be useful for development when you have multiple lists on the same page (ex. this could be helpful when creatig paginated lists on the same page). Accepted Values: any whole positive number that is unique on the page. Default: null.
 * **link_title** Accepted Values: “no_link”.  Adding this parameter and setting the value to "no_link" will remove the href from post titles in the list and make them unclickable. Default: null.
+* **link_title** Accepted Values: “nolink”.  Adding this parameter and setting the value to "nolink" will remove the href from post titles in the list and make them unclickable. Default: null.
 * **id** Accepted Values: any valid HTML ID attribute name. Default: null.
 * **class** Accepted Values: any valid HTML class attribute name or names (separate multiple class names with a space). Default: null.
 …
 == Changelog ==
+= 1.5.7 (Pro) - 2023-5-1 =
+* Update: Fixed visibility issue with the due date datepicker month navigation elements.
+* Improvement: Updated the manual reminder email functionality to return a message in the AJAX response if the company does not have a primary user assigned.
+* Improvement: Updated the new post email functionality to add a note to the post if the company does not have a primary user assigned to provide better guidance to the user.
+* Fix: Updated the accp_update_automated_email_cron_on_option_change function to not pass any vars, as the function is used for both the add_option and update_option WP hooks. This fixes fatal errors thrown when saving email settings for the first time (where no options exist), which triggered the add_option_ hooks with the incorrect vars.
+* Improvement: Updated pro authorization functionality for better organization, performance, and maintainability.
+* Fix: Fixed issue that intermittently prevented non-admin users from accessing files directly in cases where excluded users and roles were empty for a given post.
+* Update: Deprecated accp-file-list-loop-vars.php and accp-invoice-list-loop-vars.php.
+* Update: Made minor improvements to the settings license tab.
+* Update: Removed target _blank in the license key reminder message in the WP plugin list.
+* Update: Updated the license activation, deactivation, and plugin update functionality to verify that the user is both logged in and has plugin update capabilities.
+= 1.5.7 (Core) - 2023-5-1 =
+* Update: Increased the the max number of characters to 30 in the new user generation password field within company edit pages for improved password strength.
+* Update: Updated the primary user select and new user creation functionality within new company post edit pages to work properly with Gutenberg even if the new post has not yet been saved.
+* Improvement: Updated core authorization functionality for better organization, performance, and maintainability.
+* Improvement: Added functionality to check user capabilities and enable show_in_rest for accp_client_page_categories and accp_client_page_tags taxonomies for admins (to enable Gutenberg support), but disable public access to these taxonomies via the REST API.
+* Improvement: Updated the core authorization checks to evaluate the client_status user meta and allow/deny access based on the value.
+* Improvement: Created new core and pro authorization classes for better organization and maintainability, and integrated the functionality with the file and invoice shortcodes.
+* Update: Updated the shortcodes to explicitly exit if is_admin to ensure that shortcode functionality is only executed on the front-end.
+* Improvement: Updated the accp_align_thumbnail_var function to improve organization and maintainability.
 = 1.5.6 (Pro) - 2023-4-3 =
 * Update: Minor update to a plugin update notice that is returned if plugin data is not returned via api.
 …
 = 1.5.6 (Core) - 2023-4-3 =
 * Fix: Updated the accp_generate_invoice_query_args and accp_generate_files_query_args tax_query field values to "id" instead of "slug" as the $categories var is passed in as an array of category ID's rather than category slugs in each of those functions.
+* Fix: Updated the accp_generate_invoice_query_args and accp_generate_file_query_args tax_query field values to "id" instead of "slug" as the $categories var is passed in as an array of category ID's rather than category slugs in each of those functions.
 * Fix: Updated the accp_categories_var function to properly convert the $atts['categories'] value to an array if it is set in the shortcode.
 * Update: Created a new function to generate the client file upload dir rewrite regex path for better organization and easier use within the main admin file and within the deactivate function.

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-admin.php

-                      r2893071
+                      r2906601
             $request_uri = esc_url_raw($_SERVER['REQUEST_URI']);
+            $base_checks = $this->accp_direct_file_access_base_checks($request_uri);
+            $core_file_checks = new ARS_Constellation_Client_Portal_Core_File_Checks( $this->plugin_name, $this->version );
+            $base_checks = $core_file_checks->accp_direct_file_access_base_checks($request_uri);
             /**
              * If this is the Basic tier, serve the file here if the base checks passed.
              */
             if( $this->plugin_name != 'ars-constellation-client-portal-premium' && $this->plugin_name != 'ars-constellation-client-portal-pro'){
+            if( $this->plugin_name != 'ars-constellation-client-portal-pro' ){
                 if($base_checks == true){
 …
                 $pro_check_class = new ARS_Constellation_Client_Portal_Pro_File_Checks();
                 $pro_checks = $pro_check_class->accp_direct_file_access_pro_checks($request_uri);
+                $pro_checks = $pro_check_class->accp_direct_file_access_pro_checks($request_uri);
                 if($base_checks == true && $pro_checks == true){
 …
+            }
+        }
         return;
+    }
+    /**
+     * Direct file access base checks.
+     */
+    function accp_direct_file_access_base_checks($request_uri){
+        global $current_user;
+        $current_user = wp_get_current_user();
+        $current_user_id = $current_user->ID;
+        $plugin_name = $this->plugin_name;
+        /**
+         * Return false if the user is not logged in.
+         */
+        if ( !is_user_logged_in() || $current_user_id === 0)
+            return false;
+        // Get the company that the current user is assigned to
+        $current_company = get_user_meta($current_user_id, 'client_company', true);
+        if($current_company != NULL){
+            // Get the current user company's upload directory
+            $company_directory = get_post_meta($current_company, 'accp_dir', true);
+        }else{
+            $company_directory = NULL;
+        }
+        // Get the addional companies if any
+        $additional_assigned_companies = get_user_meta($current_user_id, 'client_additional_company', true);
+        // Get the upload directories for additonal companies
+        $additional_company_directories = array();
+        if ( $additional_assigned_companies != null ){
+            foreach ($additional_assigned_companies as $additional_assigned_company) {
+                $additional_company_directories[] = get_post_meta($additional_assigned_company, 'accp_dir', true);
+            }
+        }
+        // Get the dir name from the $request_uri
+        // Break the request_uri into an array
+        $request_dir_parts = explode("/", $request_uri);
+        // Get the third part of the array - contains the dir name
+        // Dev Note: Verify that this works if WP is installed in a sub directory
+        $request_dir = $request_dir_parts[3];
+        // Check if the current user's company dir matches the uri company dir
+        if ( current_user_can('manage_options') || ( $company_directory != NULL && strpos($request_uri, $company_directory ) != false ) || ( $additional_assigned_companies != null && in_array($request_dir, $additional_company_directories) )  ){
+            // Base checks have passed.
+            return true;
+        }
+        return false;
+    }
+    }
 …
      * Serves the requested file after checks have passed.
      */
     private function accp_load_requested_file($request_uri, $checks_passed = false){
+    private function accp_load_requested_file($request_uri, $checks_passed = false){
         if($checks_passed == false) return;
 …
     /**
+     * Restrict access to Client Pages and Client File Posts on front-end
+     * Restrict access to Client Pages Client File and
+     * Client Invoice Posts on front-end.
      */
     function accp_restrict_client_page_access(){
+        if( is_admin() ) return;
+        global $post;
+        $post_id = get_the_id();
+        if( is_admin() ) return;
+        $post_id = get_the_id();
+        if(!$post_id)
+            return;
         $post_type = get_post_type();
+        $current_user = wp_get_current_user();
+        $current_user_id = $current_user->ID;
+        $roles_array = ( array ) $current_user->roles;
+        $roles = array_map('strtolower', $roles_array);
+        if( $post_type == 'accp_client_pages' || $post_type == 'accp_clientfile' || $post_type == 'accp_clientinvoice' ){
+            // Check if the current user is logged in
+            if ($current_user_id === 0){
+                // If the current user id is 0 redirect to the home page
+                wp_redirect('/');
+                exit;
+            }else{
+                $page_company = get_post_meta($post_id, 'accp_user', true);
+                $current_user_company = get_user_meta($current_user_id, 'client_company', true);
+                // Get the addional companies if any
+                if ( is_array(get_user_meta($current_user_id, 'client_additional_company', true)) ){
+                    $additional_assigned_companies = get_user_meta($current_user_id, 'client_additional_company', true);
+                }else{
+                    $additional_assigned_companies = array(get_user_meta($current_user_id, 'client_additional_company', true));
+                }
+                $roles = ( array ) $current_user->roles;
+                /**
+                 * Check if the user is an admin otherwise verify that the current page
+                 * company matches the current user's company (or additional companies,
+                 * and that the current user is not in the excluded user list for the page,
+                 * and that the current user's role is not in the excluded roles list for the page.
+                 * Verify that the current user's ID and role(s) are not in a file categories excluded lists.
+                 */
+                // Include Excluded Users and Excluded Roles checks for Pro and
+                // Premium versions and load the Pro and Premium version criteria.
+                if ($this->plugin_name == 'ars-constellation-client-portal-premium' || $this->plugin_name == 'ars-constellation-client-portal-pro'){
+                    require_once ( dirname(__DIR__)  . '/pro/admin/includes/accp-page-file-access-check.php'  );
+                }else{
+                    // If this is the Basic version, just use the default criteria
+                    if (
+                        !current_user_can('manage_options') &&
+                        $page_company != $current_user_company && // $current_user_company must be checked with $additional_assigned_companies
+                        !in_array($page_company, $additional_assigned_companies)
+                    ){
+                        wp_redirect('/');
+                        exit;
+                    }
+                }
+            }
+        }
+        if(!$post_type)
+            return;
+        /**
+         * Exit if this is not a Client Page, Client File,
+         * or Client Invoice post type.
+         */
+        if( $post_type !== 'accp_client_pages' && $post_type !== 'accp_clientfile' && $post_type !== 'accp_clientinvoice' )
+            return;
+        $user = wp_get_current_user();
+        /**
+         * Redirect to the home page if no user was returned.
+         */
+        if(!$user){
+            wp_redirect('/');
+            exit;
+        }
+        /**
+         * Redirect to the home page if there is no user ID
+         * or the user ID equals 0.
+         */
+        $user_id = $user->ID ? $user->ID : false;
+        if( !$user_id || $user_id === 0){
+            wp_redirect('/');
+            exit;
+        }
+        /**
+         * Check if pro access checks need to be instantiated.
+         */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
+            $authorization = new ARS_Constellation_Client_Portal_Pro_Authorization( $this->plugin_name, $this->version );
+            $check_authorization = $authorization->verify_page_or_post_authorization_pro($post_id, $user_id);
+        }else{
+            /**
+             * Use the default file check if this is the Core version
+             * to determine if access should be granted.
+             */
+            $authorization = new ARS_Constellation_Client_Portal_Core_Authorization( $this->plugin_name, $this->version );
+            $check_authorization = $authorization->verify_page_or_post_authorization($post_id, $user_id);
+        }
+        /**
+         * Redirect to the home page if authorization failed.
+         */
+        if( $check_authorization === false ){
+            wp_redirect('/');
+            exit;
+        }
+    }
 …
+    }
+    /**
+     * Get the company directory name from a URL.
+     *
+     * @param string $request_uri - the URL to parse.
+     * @return string|bool $company_dir|false - the company dir name.
+     */
+    function get_company_dir_name_from_url($request_uri){
+        if(!$request_uri)
+            return false;
+        if ( strpos($request_uri, '/accp-clientfiles/') !== false ) {
+            $file_str = substr( $request_uri, strpos($request_uri, '/accp-clientfiles/') + 1 );
+            $file_path_array = explode('/', $file_str);
+            $company_dir = $file_path_array[1];
+            return $company_dir;
+        }
+        return false;
+    }
+    /**
+     * Get the company ID by the company directory name.
+     *
+     * @param string $company_dir - the company dir name (not path).
+     * @return int $company_id - the company ID associated with the dir.
+     */
+    function get_company_id_by_company_dir_name($company_dir){
+        if(!$company_dir){
+            return false;
+        }
+        $company_dir = str_replace('/', '', $company_dir);
+        $company_dir = str_replace('.', '', $company_dir);
+        $company_id = '';
+        /**
+         * Query for companies that contain a matching
+         * company directory name.
+         */
+        $args = array(
+            'post_type' => array('accp_clientcompany'),
+            'post_status' => 'publish',
+            'meta_query' => array(
+                array(
+                    'key' => 'accp_dir',
+                    'value' => $company_dir
+                )
+            ),
+        );
+        $wp_query = new WP_Query($args);
+        if ( $wp_query->have_posts() ){
+            $company_id = '';
+            while ( $wp_query->have_posts() ){
+                $wp_query->the_post();
+                if(get_the_ID()){
+                    $company_id = get_the_ID();
+                }
+                break;
+            }
+            wp_reset_postdata();
+            /**
+             * Return the company ID if it's set.
+             */
+            if( $company_id && !empty($company_id) )
+                return $company_id;
+        }
+        return false;
+    }

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-client-pages.php

-                      r2873186
+                      r2906601
+    }
     /**
 …
     /**
      * Register the Categories for the Client Page custom post type.
 …
         );
+        /**
+         * Only show the post type in rest if the user has sufficient
+         * capabilities.  We want to enable show_in_rest to allow Gutenberg support,
+         * without allowing public access to the post type via the WP REST API.
+         */
+        $show_in_rest = current_user_can( 'manage_options' ) ? true : false;
         $args = array(
             'labels' => $labels,
             'public' => true,
+            'show_in_rest' => $show_in_rest,
             'show_in_nav_menus' => false,
             'show_ui' => true,
 …
         register_taxonomy( 'accp_client_page_categories', array('accp_client_pages'), $args );
+    }
     /**
 …
         );
+        /**
+         * Only show the post type in rest if the user has sufficient
+         * capabilities.  We want to enable show_in_rest to allow Gutenberg support,
+         * without allowing public access to the post type via the WP REST API.
+         */
+        $show_in_rest = current_user_can( 'manage_options' ) ? true : false;
         $args = array(
             'labels' => $labels,
             'public' => true,
+            'show_in_rest' => $show_in_rest,
             'show_in_nav_menus' => false,
             'show_ui' => true,

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-company.php

-                      r2873186
+                      r2906601
         register_post_type( 'accp_clientcompany', $args );
+    }
 …
+        }
+        return $new_columns;
+    }
+        return $new_columns;
+    }
     /**
 …
             if($user){
                 echo $user->user_login . ' (ID: '.$primary_user_id.')';
+            }
+        }
+    }
 …
             return;
-        // Post (Company) id
         $id = get_the_id();
+        $args  = array(
+            'meta_query' => array(
+                'relation' => 'OR',
+                array(
+                'key' => 'client_company',
+                'value' => $id,
+                'compare' => 'IN'
+                ),
+                array(
+                'key' => 'client_additional_company',
+                'value' => $id,
+                'compare' => 'LIKE'
+                )
+            )
+        );
+        $user_query = new WP_User_Query( $args );
+        $users = (array) $user_query->results;
+        $user_name_list = array();
+        if(!empty($users)){
+            foreach($users as $user){
+                $user_id = $user->ID;
+                $user_url = get_edit_user_link($user->ID);
+                $user_name_list[] = '<a href="' . esc_url($user_url) . '">' . esc_html($user->user_login) . '</a>';
+            }
+            // echo join(', ', $user_name_list); // uncomment this to display a list of hyperlinked usernames
+            echo esc_html(count($user_name_list));
+        }else{
+            echo '0';
+        }
+    }
+    /**
+     * Display the Home Page column content - Client Company WP List Table - Company Home Page.
+     */
+    public function clientcompany_column_display_home_page( $column_name, $post_id ) {
+        if ( 'company_home_page' != $column_name )
+            return;
+        $accp_home_page = get_post_meta($post_id, 'accp_home_page', true);
+        if(!empty($accp_home_page)){
+            $view_page_link = get_the_permalink($accp_home_page);
+            echo '<span class="hov-nav-link">' . esc_url($view_page_link) . '</span>';
+            echo '<ul class="home-page-hov-nav row-actions"><li><a href="post.php?post=' . esc_attr($accp_home_page) . '&action=edit">Edit Page</a></li><li><a href="' . esc_url($view_page_link) . '" target="_blank">View Page</a></li></ul>';
+        }
+    }
+    /**
+     * Display the Home Page column content - Client Company WP List Table - Company Status.
+     */
+    public function clientcompany_column_display_status( $column_name, $post_id ) {
+        if ( 'company_status' != $column_name )
+            return;
+        $company_statuses = get_option('accp_company_status_repeater');
+        $saved_status = get_post_meta($post_id, 'accp_company_status', true);
+        if(!empty($saved_status)){
+            foreach ($company_statuses as $field) {
+                if($field['value'] == $saved_status){
+                    echo esc_html($field['label']);
+                }
+            }
+        }
+    }
+    /**
+     * Create metaboxes for the Client Company post page
+     */
+    public function display_clientcompany_meta_options() {
+        $screens = array( 'accp_clientcompany' );
+        foreach ( $screens as $screen ) {
+            add_meta_box("company-home-page", "Company Home Page", array($this, "display_home_page_meta_options"), $screen, "side");
+            add_meta_box("company-upload-dir", "Company Upload Directory", array($this, "display_company_upload_meta_options"), $screen, "normal", "high");
+            add_meta_box("company-primary-user", "Company Primary User", array($this, "display_company_primary_user_meta_options"), $screen, "normal", "high");
+            add_meta_box("company-users", "Company Users", array($this, "display_company_user_meta_options"), $screen, "normal", "high");
+        }
+    }
+    /**
+     * Client Company Metaboxes Save field data.
+     */
+    function save_clientcompany_meta_options($post_id, $post, $update) {
+        if ( current_user_can( 'edit_posts' ) && is_admin() && function_exists('get_current_screen') ){
+            $current_screen = get_current_screen();
+            if( $current_screen->id === "accp_clientcompany" ) {
+                /**
+                 * Exit if post does not yet exist.
+                 */
+                if( !is_object($post) )
+                    return;
+                /**
+                 * Save Home Page
+                 */
+                if($post && isset($_POST["accp_home_page"]) ){
+                    $home_page_id = $this->accp_utility_functions->accp_sanitize_integers($_POST["accp_home_page"]);
+                    update_post_meta($post_id, "accp_home_page", $home_page_id);
+                }
+                if($post && !isset($_POST["accp_home_page"]) ){
+                    delete_post_meta($post_id, "accp_home_page");
+                }
+                /**
+                 * Save Primary User
+                 */
+                if($post && isset($_POST["accp_company_primary_user"]) ){
+                    $primary_user = $this->accp_utility_functions->accp_sanitize_integers($_POST["accp_company_primary_user"]);
+                    update_post_meta($post_id, "accp_company_primary_user", $primary_user);
+                }
+                if($post && !isset($_POST["accp_company_primary_user"]) ){
+                    delete_post_meta($post_id, "accp_company_primary_user");
+                }
+            }
+        }
+    }
+    /**
+     * Display meta box and custom fields - Company Home Page metabox.
+     */
+    public function display_home_page_meta_options() {
+        global $post;
+        $accp_home_page = get_post_meta($post->ID, 'accp_home_page', true);
+        ?>
+        <p class="accp-field-instructions">Select a company home page.</p>
+        <?php
+        wp_dropdown_pages(array('post_type'=>'accp_client_pages', 'value_field' => 'ID', 'echo' => TRUE, 'show_option_none' => 'Select a page...', 'name' => 'accp_home_page', 'selected' => $accp_home_page ));
+        $create_page_nonce = wp_create_nonce('create_home_page');
+        ?>
+        <div class="accp-create-page-container">
+            <p>Or, create and assign a new blank page.</p>
+            <span class="button button-primary accp-show-new-page-form">Create New Page</span>
+            <div class="accp-generate-page-form">
+                <p class="accp-create-new-page-instructions">
+                This process will create a new blank Client Page and assign it as the home page for the current Company.
+                </p>
+                <label for="accp_new_page_title">Client Page Title</label>
+                <input type="text" class="accp-new-page-title" name="accp_new_page_title">
+                <span class="button button-primary accp-generate-new-page" data-nonce="<?php echo $create_page_nonce; ?>" data-post-id="<?php echo $post->ID; ?>">Generate Page</span>
+                <span class="accp-generate-page-message"></span>
+            </div>
+        </div>
+        <?php
+    }
+    /**
+     * Generate new Client Page AJAX function.
+     */
+    function accp_generate_new_client_page(){
+        if( !is_admin() || !is_user_logged_in() || !current_user_can('manage_options'))
+            return;
+        /**
+         * Verify the nonce.
+         */
+        $nonce = filter_var($_POST['nonce'], FILTER_SANITIZE_STRING);
+        if ( ! wp_verify_nonce( $nonce, 'create_home_page' ) )
+            wp_die();
+        $post_title = filter_var($_POST['post_title'], FILTER_SANITIZE_STRING);
+        $company_post_id = (int)$_POST['company_post_id'];
+        /**
+         * Exit if this is a new post that has not yet been saved.
+         */
+        if(!get_post($company_post_id)){
+            echo 'Please save the post before attempting to assign a home page';
+            wp_die();
+        }
+        $args = array(
+            'post_type'   => 'accp_client_pages',
+            'post_title'  => esc_html($post_title),
+            'post_status' => 'publish'
+        );
+        $post_id = wp_insert_post($args);
+        if($post_id){
+            /**
+             * Assign the Company to the new Client Page.
+             */
+            update_post_meta($post_id, 'accp_user', $company_post_id);
+            /**
+             * Assign the home page to the Company.
+             */
+            update_post_meta($company_post_id, 'accp_home_page', $post_id);
+            echo (int)$post_id;
+        }else{
+            echo 'accp add post error';
+        }
+        wp_die();
+    }
+    /**
+     * Display meta box and custom fields - Company Users metabox.
+     */
+    public function display_company_user_meta_options() {
+        global $post;
+        $id = get_the_ID();
         $args  = array(
             'meta_query' => array(
 …
         );
-        $user_query = new WP_User_Query( $args );
-        $users = (array) $user_query->results;
-        $user_name_list = array();
-        if(!empty($users)){
-            foreach($users as $user){
-                $user_id = $user->ID;
-                $user_url = get_edit_user_link($user->ID);
-                $user_name_list[] = '<a href="' . esc_url($user_url) . '">' . esc_html($user->user_login) . '</a>';
+            }
-            // echo join(', ', $user_name_list); // uncomment this to display a list of hyperlinked usernames
-            echo esc_html(count($user_name_list));
-        }else{
-            echo '0';
+        }
+    }
-    /**
-     * Display the Home Page column content - Client Company WP List Table - Company Home Page.
-     */
-    public function clientcompany_column_display_home_page( $column_name, $post_id ) {
-        if ( 'company_home_page' != $column_name )
-            return;
-        $accp_home_page = get_post_meta($post_id, 'accp_home_page', true);
-        if(!empty($accp_home_page)){
-            $view_page_link = get_the_permalink($accp_home_page);
-            echo '<span class="hov-nav-link">' . esc_url($view_page_link) . '</span>';
-            echo '<ul class="home-page-hov-nav row-actions"><li><a href="post.php?post=' . esc_attr($accp_home_page) . '&action=edit">Edit Page</a></li><li><a href="' . esc_url($view_page_link) . '" target="_blank">View Page</a></li></ul>';
+        }
+    }
-    /**
-     * Display the Home Page column content - Client Company WP List Table - Company Status.
-     */
-    public function clientcompany_column_display_status( $column_name, $post_id ) {
-        if ( 'company_status' != $column_name )
-            return;
-        $company_statuses = get_option('accp_company_status_repeater');
-        $saved_status = get_post_meta($post_id, 'accp_company_status', true);
-        if(!empty($saved_status)){
-            foreach ($company_statuses as $field) {
-                if($field['value'] == $saved_status){
-                    echo esc_html($field['label']);
+                }
+            }
+        }
+    }
-    /**
-     * Create metaboxes for the Client Company post page
-     */
-    public function display_clientcompany_meta_options() {
-        $screens = array( 'accp_clientcompany' );
-        foreach ( $screens as $screen ) {
-            add_meta_box("company-home-page", "Company Home Page", array($this, "display_home_page_meta_options"), $screen, "side");
-            add_meta_box("company-upload-dir", "Company Upload Directory", array($this, "display_company_upload_meta_options"), $screen, "normal", "high");
-            add_meta_box("company-primary-user", "Company Primary User", array($this, "display_company_primary_user_meta_options"), $screen, "normal", "high");
-            add_meta_box("company-users", "Company Users", array($this, "display_company_user_meta_options"), $screen, "normal", "high");
+        }
+    }
-    /**
-     * Client Company Metaboxes
-     * Save field data.
-     */
-    function save_clientcompany_meta_options($post_id, $post, $update) {
-        if ( current_user_can( 'edit_posts' ) && is_admin() && function_exists('get_current_screen') ){
-            $current_screen = get_current_screen();
-            if( $current_screen->id === "accp_clientcompany" ) {
-                // Exit if post does not yet exist.
-                if( !is_object($post) )
-                    return;
-                /**
-                 * Save Home Page
-                 */
-                if($post && isset($_POST["accp_home_page"]) ){
-                    $home_page_id = $this->accp_utility_functions->accp_sanitize_integers($_POST["accp_home_page"]);
-                    update_post_meta($post_id, "accp_home_page", $home_page_id);
+                }
-                if($post && !isset($_POST["accp_home_page"]) ){
-                    delete_post_meta($post_id, "accp_home_page");
+                }
-                /**
-                 * Save Primary User
-                 */
-                if($post && isset($_POST["accp_company_primary_user"]) ){
-                    $primary_user = $this->accp_utility_functions->accp_sanitize_integers($_POST["accp_company_primary_user"]);
-                    update_post_meta($post_id, "accp_company_primary_user", $primary_user);
+                }
-                if($post && !isset($_POST["accp_company_primary_user"]) ){
-                    delete_post_meta($post_id, "accp_company_primary_user");
+                }
+            }
+        }
+    }
-    /**
-     * Display meta box and custom fields - Company Home Page metabox.
-     */
-    public function display_home_page_meta_options() {
-        global $post;
-        $accp_home_page = get_post_meta($post->ID, 'accp_home_page', true);
-        ?>
-        <p class="accp-field-instructions">Select a company home page.</p>
-        <?php
-        wp_dropdown_pages(array('post_type'=>'accp_client_pages', 'value_field' => 'ID', 'echo' => TRUE, 'show_option_none' => 'Select a page...', 'name' => 'accp_home_page', 'selected' => $accp_home_page ));
-        $create_page_nonce = wp_create_nonce('create_home_page');
-        ?>
-        <div class="accp-create-page-container">
-            <p>Or, create and assign a new blank page.</p>
-            <span class="button button-primary accp-show-new-page-form">Create New Page</span>
-            <div class="accp-generate-page-form">
-                <p class="accp-create-new-page-instructions">
-                This process will create a new blank Client Page and assign it as the home page for the current Company.
-                </p>
-                <label for="accp_new_page_title">Client Page Title</label>
-                <input type="text" class="accp-new-page-title" name="accp_new_page_title">
-                <span class="button button-primary accp-generate-new-page" data-nonce="<?php echo $create_page_nonce; ?>" data-post-id="<?php echo $post->ID; ?>">Generate Page</span>
-                <span class="accp-generate-page-message"></span>
-            </div>
-        </div>
-        <?php
+    }
-    /**
-     * Generate new Client Page AJAX function.
-     */
-    function accp_generate_new_client_page(){
-        if( !is_admin() || !is_user_logged_in() || !current_user_can('manage_options'))
-            return;
-        // Verify the nonce
-        $nonce = filter_var($_POST['nonce'], FILTER_SANITIZE_STRING);
-        if ( ! wp_verify_nonce( $nonce, 'create_home_page' ) )
-            wp_die();
-        $post_title = filter_var($_POST['post_title'], FILTER_SANITIZE_STRING);
-        $company_post_id = (int)$_POST['company_post_id'];
-        // Exit if this is a new post that has not yet been saved.
-        if(!get_post($company_post_id)){
-            echo 'Please save the post before attempting to assign a home page';
-            wp_die();
+        }
-        $args = array(
-            'post_type'   => 'accp_client_pages',
-            'post_title'  => esc_html($post_title),
-            'post_status' => 'publish'
-        );
-        $post_id = wp_insert_post($args);
-        if($post_id){
-            // Assign the Company to the new Client Page.
-            update_post_meta($post_id, 'accp_user', $company_post_id);
-            // Assign the home page to the Company.
-            update_post_meta($company_post_id, 'accp_home_page', $post_id);
-            echo (int)$post_id;
-        }else{
-            echo 'accp add post error';
+        }
-        wp_die();
+    }
-    /**
-     * Display meta box and custom fields - Company Users metabox.
-     */
-    public function display_company_user_meta_options() {
-        global $post;
-        // Post (Company) id
-        $id = get_the_ID();
-        $args  = array(
-            'meta_query' => array(
-                'relation' => 'OR',
-                array(
-                'key' => 'client_company',
-                'value' => $id,
-                'compare' => 'IN'
-                ),
-                array(
-                'key' => 'client_additional_company',
-                'value' => $id,
-                'compare' => 'LIKE'
+                )
+            )
-        );
         $user_query = new WP_User_Query( $args );
         $users = (array) $user_query->results;
 …
                 <div id="accp-assign-primary-user-container">
+                <input type="hidden" name="accp_company_primary_user" value="">
                 <span class="accp-assign-primary-user-heading">Assign Existing User</span>
 …
                     <?php
                     /**
+                     * Assign an existing WP user as
+                     * the primary user.
+                     * Assign an existing WP user as the primary user.
                      */
                     ?>
 …
                     <?php
                     /**
+                     * Create a new WP user and
+                     * assign as the primary user.
+                     * Create a new WP user and assign as the primary user.
                      */
 …
         <p class="accp-company-directory-label">Upload Directory:</p>
         <?php
+        // Post (Company) id
         $id = get_the_id();
         $upload_dir = get_post_meta($id, 'accp_dir', true);
 …
         $generate_nonce = wp_create_nonce('accp_generate_nonce');
+        // Only display this section if it is not a new unsaved post.
+        /**
+         * Only display this section if it is not a new unsaved post.
+         */
         if ( $post_status != 'auto-draft' ){
 …
             <?php
+        }
+        }
+    }
 …
         $count = $company_query->found_posts;
+        // Return an empty array if 1 or fewer posts are returned.
+        /**
+         * Return an empty array if 1 or fewer posts are returned.
+         */
         if($count <= 1)
             return $company_id_list;
 …
     function accp_assign_existing_primary_user(){
+        // Verify the nonce
+        /**
+         * Verify the nonce.
+         */
         $nonce = filter_var($_POST['nonce'], FILTER_SANITIZE_STRING);
 …
         $company_id = (int)$_POST['company_id'];
         $user_id = (int)$_POST['user_id'];
         /**
 …
         $user = get_user_by('ID', $user_id);
+        echo $user->user_login;
+        $response = array(
+            'status' => 'success',
+            'user_id' => $user_id,
+            'username' => $user->user_login,
+        );
+        echo json_encode($response);
         wp_die();
 …
     function accp_create_and_assign_primary_user(){
+        // Verify the nonce
+        /**
+         * Verify the nonce.
+         */
         $nonce = filter_var($_POST['nonce'], FILTER_SANITIZE_STRING);
 …
          * Enforce password complexity.
          */
         if( !preg_match('/(?=^.{8,15}$)((?=.*\d)|(?=.*\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/', $_POST['password']) ){
             echo 'Please enter a password between 8-15 characters long, that contains at least 1 uppercase letter, 1 lowercase letter, 1 number, and 1 special character.';
+        if( !preg_match('/(?=^.{8,30}$)((?=.*\d)|(?=.*\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/', $_POST['password']) ){
+            echo 'Please enter a password between 8-30 characters long, that contains at least 1 uppercase letter, 1 lowercase letter, 1 number, and 1 special character.';
             wp_die();
 …
         $post = get_post($company_id);
         if($post->post_type != 'accp_clientcompany')
             die();
 …
          * for this company.
          */
         update_post_meta($company_id, 'accp_company_primary_user' , (int)$new_user_id);
+        update_post_meta($company_id, 'accp_company_primary_user', (int)$new_user_id);
 …
         $response = array(
             'status' => 'success',
+            'username' => $user->user_login
+            'user_id' => $new_user_id,
+            'username' => $user->user_login,
         );
 …
         $pw_reset_url = $login_url . '?action=rp&key=' . $reset_key . '&login=' . $username;
+        /**
+         * Email subject.
+         */
         $subject = '[' . $site_name . '] New Account Details';
+        /**
+         * Email message.
+         */
         $message = "Hello, \r\n";
         $message .= "Your new " . esc_html($site_name) . " account has been configured, and is ready for use. \r\n\r\n";
 …
         $message .= $site_name;
+        /**
+         * Email headers.
+         */
         $headers = array();
         $headers[] ='From: "'.htmlspecialchars_decode(esc_html(get_bloginfo('name')), ENT_QUOTES).'" <'.filter_var(get_option('admin_email'), FILTER_SANITIZE_EMAIL).'>';
         $headers[] = 'Content-Type: text/plain; charset=UTF-8';
+        wp_mail( filter_var($email, FILTER_SANITIZE_EMAIL), esc_html($subject), wp_kses_post($message), $headers);
+        /**
+         * Send the email.
+         */
+        wp_mail( filter_var($email, FILTER_SANITIZE_EMAIL), esc_html($subject), wp_kses_post($message), $headers );
+    }

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-file.php

-                      r2845715
+                      r2906601
+    }
     /**
 …
+    }
     /**
      * Register the Tags for the Client File custom post type.
 …
+    }
     /**
      * Display the Company column content in the Client File WP List Table.
      */
+    function clientfile_column_display_company_name( $column_name, $post_id ) {
+        //Client Company
+    function clientfile_column_display_company_name( $column_name, $post_id ) {
         if ( 'company' != $column_name )
             return;
 …
             if($company != null){
+                // Display the company name
+                /**
+                 * Display the company name.
+                 */
                 echo esc_html($company);
+                // If a file exists, output the file path data that is used
+                // when deleting posts.
+                /**
+                 * If a file exists, output the file path data that
+                 * is used when deleting posts.
+                 */
                 $accp_file = get_post_meta($post_id, 'accp_file', true);
 …
+    }
     /**
      * Display the Status column content in the Client File WP List Table.
 …
+    }
     /**
 …
+    }
     /**
      * Display the Category column content in the Client File WP List Table.
      */
+    function clientfile_column_display_category( $column_name, $post_id ) {
+        // Client File Category
+    function clientfile_column_display_category( $column_name, $post_id ) {
         if ( 'file_category' != $column_name )
             return;
 …
+    }
     /**
      * Register the column as sortable - Client File WP List Table.
 …
+    }
     /**
      * Sort orderby.
 …
     function clientfile_column_orderby( $vars ) {
+        // Sort the Title column.
+        /**
+         * Sort the Title column.
+         */
         if ( isset( $vars['orderby'] ) && 'user' == $vars['orderby'] ) {
 …
+        }
+        // Sort the Company column - sorts by the accp_user id.
+        /**
+         * Sort the Company column - sorts by the accp_user id.
+         */
         if ( isset( $vars['orderby'] ) && 'company' == $vars['orderby'] ) {
 …
             ) );
+        }
+        // Sort the Document ID column.
+        }
+        /**
+         * Sort the Document ID column.
+         */
         if ( isset( $vars['orderby'] ) && 'doc_id' == $vars['orderby'] ) {
 …
         return $vars;
+    }
+    /**
+     * Add WP List Table Filter Fields
+    }
+    /**
+     * Add WP List Table Filter Fields.
      */
     function accp_add_core_file_list_filter_fields($post_type, $which){
 …
         if($post_type != 'accp_clientfile') return;
+        // Company Filter
+        /**
+         * Company Filter
+         */
         $args = array(
             'post_type' => 'accp_clientcompany',
 …
         if(!is_admin()) return;
+        // Company Filter
+        /**
+         * Company Filter
+         */
         if ( $pagenow=='edit.php' && isset($_GET['accp_file_company_filter']) && $_GET['accp_file_company_filter'] != '' && $query->is_main_query() ) {
 …
+    }
     /**
 …
+    }
     /**
      * Create metaboxes for the Client File post page
 …
+    }
     /**
      * Client File Status Metabox Display
 …
         $saved_status = get_post_meta($post->ID, 'file_status', true);
+        // If there is no saved status, set the invoice status
+        // to the default - 'unpaid.'
+        /**
+         * If there is no saved status, set the invoice
+         * status to the default - 'unpaid.'
+         */
         if(is_object($post) && !$saved_status){
             update_post_meta($post->ID, 'invoice_status', 'unpaid');
 …
+    }
     /**
      * Add File fields to the WP Admin Quick Edit form.
 …
+    }
     /**
      * Add File fields to the WP Admin Bulk Edit form.
 …
+    }
     /**
      * Save File quick edit fields.
 …
         wp_die();
+    }

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-invoice.php

-                      r2773559
+                      r2906601
+    }
     /**
 …
         register_post_type( 'accp_clientinvoice', $args );
+    }
 …
      * Display the Company column content in the Client Invoice WP List Table.
      */
+    function accp_clientinvoice_column_display_company_name( $column_name, $post_id ) {
+        //Client Company
+    function accp_clientinvoice_column_display_company_name( $column_name, $post_id ) {
         if ( 'company' != $column_name )
             return;
 …
             if($company != null){
+                // Display the company name
+                /**
+                 * Display the company name.
+                 */
                 echo esc_html($company);
+                // If a file exists, output the file path data that is used
+                // when deleting posts.
+                /**
+                 * If a file exists, output the file path data that
+                 * is used when deleting posts.
+                 */
                 $accp_file = get_post_meta($post_id, 'accp_file', true);
 …
      * Display the Category column content in the Client Ivnoice WP List Table.
      */
+    function accp_clientinvoice_column_display_categories( $column_name, $post_id ) {
+        // Client File Category
+    function accp_clientinvoice_column_display_categories( $column_name, $post_id ) {
         if ( 'file_category' != $column_name )
             return;
 …
     function accp_clientinvoice_column_orderby( $vars ) {
+        // Sort the Title column.
+        /**
+         * Sort the Title column.
+         */
         if ( isset( $vars['orderby'] ) && 'user' == $vars['orderby'] ) {
 …
+        }
+        // Sort the Company column - sorts by the accp_user id.
+        /**
+         * Sort the Company column - sorts by the accp_user id.
+         */
         if ( isset( $vars['orderby'] ) && 'company' == $vars['orderby'] ) {
 …
+        }
+        // Sort the Document ID column.
+        /**
+         * Sort the Document ID column.
+         */
         if ( isset( $vars['orderby'] ) && 'doc_id' == $vars['orderby'] ) {
 …
         $saved_status = get_post_meta($post->ID, 'invoice_status', true);
+        // If there is no saved status, set the invoice status
+        // to the default - 'unpaid.'
+        /**
+         * If there is no saved status, set the invoice
+         * status to the default - 'unpaid.'
+         */
         if(is_object($post) && !$saved_status){
             update_post_meta($post->ID, 'invoice_status', 'unpaid');
 …
             ?>
+                <option id="<?php echo esc_attr($value); ?>" value="<?php echo esc_attr($value); ?>" <?php echo !$saved_status || $saved_status === $value ? 'selected="selected"' : ''; ?> ><?php echo esc_html($label); ?></option>
+                <option id="<?php echo esc_attr($value); ?>" value="<?php echo esc_attr($value); ?>" <?php echo !$saved_status || $saved_status === $value ? 'selected="selected"' : ''; ?> >
+                    <?php echo esc_html($label); ?>
+                </option>
             <?php
 …
+    }
     /**
 …
                 ?>
+                <option value="<?php echo esc_attr($value); ?>" <?php echo $value == $current_value ? ' selected="selected"' : ''; ?> ><?php echo esc_html($label); ?></option>
+                <option value="<?php echo esc_attr($value); ?>" <?php echo $value == $current_value ? ' selected="selected"' : ''; ?> >
+                    <?php echo esc_html($label); ?>
+                </option>
                 <?php
 …
                                 ?>
+                                    <option id="<?php echo esc_attr($value); ?>" value="<?php echo esc_attr($value); ?>" ><?php echo esc_html($label); ?></option>
+                                    <option id="<?php echo esc_attr($value); ?>" value="<?php echo esc_attr($value); ?>" >
+                                        <?php echo esc_html($label); ?>
+                                    </option>
                                 <?php
 …
                                 ?>
+                                    <option value="<?php echo esc_attr($value); ?>" ><?php echo esc_html($label); ?></option>
+                                    <option value="<?php echo esc_attr($value); ?>" >
+                                        <?php echo esc_html($label); ?>
+                                    </option>
                                 <?php

constellation-client-portal/trunk/admin/js/ars-constellation-client-portal-admin.js

-                      r2845715
+                      r2906601
                     success: function(data){
+                        $('.accp-primary-user-section-message').html('Primary User: ' + data);
+                        var response_obj = JSON.parse(data);
+                        $('.accp-primary-user-section-message').html('Primary User: ' + response_obj.username);
+                        $('input[name="accp_company_primary_user"').val(response_obj.user_id);
                         $('#accp-assign-primary-user-container').hide();
                         $('.accp-no-users-assigned-message').remove();
 …
                     },
                     error: function(jqXHR, textStatus, errorThrown){
                         console.log(textStatus, errorThrown);
                         console.log(jqXHR);
 …
         });
         $('#accp-generate-new-user-btn').click(function (e) {
+        $('#accp-generate-new-user-btn').click(function (e) {
             e.preventDefault();
 …
                                 $('.accp-primary-user-section-message').html('Primary User: ' + response_obj.username);
+                                $('input[name="accp_company_primary_user"').val(response_obj.user_id);
                                 $('.accp-create-user-text-field').val('');
                                 $('#accp-send-user-notification').prop('checked', false);
 …
                     },
                     error: function(jqXHR, textStatus, errorThrown){
                         console.log(textStatus, errorThrown);
                         console.log(jqXHR);
 …
+            }
+        });
+        });
         $('.accp-reassign-directory-button.button').click(function(){

constellation-client-portal/trunk/ars-constellation-client-portal.php

-                      r2893071
+                      r2906601
  * Plugin URI:        https://adrianrodriguezstudios.com/constellation-client-portal/
  * Description:       Create private pages for each of your clients, post private files, and protect your client files from unauthorized users and search engines.  <strong>Important:</strong> All Site-level File Protection features will cease to function if the plugin is disabled or uninstalled.
  * Version:           1.5.6
+ * Version:           1.5.7
  * Author:            ARS
  * Author URI:        https://adrianrodriguezstudios.com
 …
      */
     define('ACCP_PLUGIN_NAME', 'ARS_CONSTELLATION_CLIENT_PORTAL');
     define('ACCP_PLUGIN_VERSION', '1.5.6'); // Change the version in the header as well.
+    define('ACCP_PLUGIN_VERSION', '1.5.7'); // Change the version in the header as well.
     define( ACCP_PLUGIN_NAME, ACCP_PLUGIN_VERSION );
     define('ACCP_PLUGIN_FILE_NAME', __FILE__);

constellation-client-portal/trunk/includes/class-ars-constellation-client-portal.php

-                      r2893071
+                      r2906601
         require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-ars-constellation-client-portal-file.php';
         require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-ars-constellation-client-portal-invoice.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-ars-constellation-client-portal-core-authorization.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-ars-constellation-client-portal-core-file-checks.php';
         require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ars-constellation-client-portal-utility-functions.php';
+        /**
+         * Premium Tier Admin functions
+         */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+            // Include the Pro functions
+            require_once ( dirname(__DIR__)  . '/pro/admin/ars-constellation-client-portal-pro-admin-functions.php'  );
+            // Pro Email Class
+            require_once ( dirname(__DIR__)  . '/pro/admin/ars-constellation-client-portal-pro-emails.php'  );
+            // Include the Premium functions
+            require_once ( dirname(__DIR__)  . '/premium/admin/ars-constellation-client-portal-prem-admin-functions.php'  );
+        }
         /**
 …
             // Pro Email Class
+            require_once ( dirname(__DIR__)  . '/pro/admin/class-ars-constellation-client-portal-pro-emails.php'  );
+        }
+        /**
+         * Premium Tier Public functions
+         */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+            // Include the Pro functions
+            require_once ( dirname(__DIR__)  . '/pro/public/class-ars-constellation-client-portal-pro-public.php'  );
+            // Include the Premium functions
+        }
+            require_once ( dirname(__DIR__)  . '/pro/admin/class-ars-constellation-client-portal-pro-emails.php'  );
+            // Pro Authorization Class
+            require_once ( dirname(__DIR__)  . '/pro/admin/class-ars-constellation-client-portal-pro-authorization.php' );
+        }
         /**
 …
         $plugin_client_file = new ARS_Constellation_Client_Portal_Client_File( $this->get_plugin_name(), $this->get_version() );
         $plugin_client_invoice = new ARS_Constellation_Client_Portal_Client_Invoice( $this->get_plugin_name(), $this->get_version() );
+        $plugin_authorization = new ARS_Constellation_Client_Portal_Core_Authorization( $this->get_plugin_name(), $this->get_version() );
         /* Core (Basic tier) hooks */

constellation-client-portal/trunk/public/class-ars-constellation-client-portal-public.php

-                      r2893071
+                      r2906601
         wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/ars-constellation-client-portal-public.js', array( 'jquery' ), $this->version, false );
+        // Localize script for AJAX functionality
+        /**
+         * Localize script for AJAX functionality.
+         */
         wp_localize_script( $this->plugin_name, 'accpfrontajax', array( 'ajaxurl' => admin_url( 'admin-ajax.php' )));
+    }
+    }
     /**
 …
+     *
      * Shortcode: [accp_clientfiles]
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $html - the shortcode result.
      */
     function accp_client_files( $atts, $content = null ) {
+        if (!is_user_logged_in()) return;
+        /**
+         * Exit if the user is not logged in
+         * or if this is WP Admin.
+         */
+        if ( !is_user_logged_in() || is_admin() )
+            return;
         global $post;
 …
          * Conditionally add Pro Tier shortcode attributes.
          */
         if ( $this->plugin_name == 'ars-constellation-client-portal-pro' || $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+        if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
             include dirname(__DIR__) . '/pro/public/accp-file-list-shortcode-atts.php';
+        }
 …
         // Thumbnail alignment
         $align_thumbnail = $this->accp_align_thumbnail_var($atts);
+        $align_thumbnail = $this->accp_align_thumbnail_var($atts) ? $this->accp_align_thumbnail_var($atts) : '';
         // Link title
 …
                     $file_post_company_id = get_post_meta($file_post_id, 'accp_user', true );
+                    // Pro Loop Vars and Access Check
+                    if ( $this->plugin_name == 'ars-constellation-client-portal-pro' || $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+                    /**
+                     * Check if pro access checks need to be instantiated.
+                     */
+                    if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
+                        include dirname(__DIR__) . '/pro/public/accp-file-list-shortcode-includes/accp-file-list-loop-vars.php';
+                    }else{
+                        // Use the default file check if this is the Basic version to determine
+                        // if access should be granted.
+                        if (
+                            (is_user_logged_in() && current_user_can('manage_options')) ||
+                            (is_user_logged_in() && $file_post_company_id === $authorized_company_id)
+                        ){
+                            $access_granted = true;
+                        }else{
+                            $access_granted = false;
+                        }
+                        $authorization = new ARS_Constellation_Client_Portal_Pro_Authorization( $this->plugin_name, $this->version );
+                        $check_authorization = $authorization->verify_page_or_post_authorization_pro($file_post_id, $user_id);
+                    }else{
+                        /**
+                         * Use the default file check if this is the Core version
+                         * to determine if access should be granted.
+                         */
+                        $authorization = new ARS_Constellation_Client_Portal_Core_Authorization( $this->plugin_name, $this->version );
+                        $check_authorization = $authorization->verify_page_or_post_authorization($file_post_id, $user_id);
+                    }
                     if( $access_granted == true ){
+                    if( $check_authorization === true ){
                         /**
 …
                             <? // Thumbnail ?>
                             <div class="file-loop-thumbnail file-thumb-align<?php echo $align_thumbnail != null ? esc_attr($align_thumbnail) : ''; ?>">
+                            <div class="file-loop-thumbnail file-thumb-align<?php echo esc_attr($align_thumbnail); ?>">
                             <?php
 …
      * Generate file query args.
+     *
+     * @return array $args - array of file query args.
+     * @param array $categories - array of category ID's.
+     * @param int $number_of_posts - number of posts to show in the shortcode loop.
+     * @param int $paged - the query args paged value.
+     * @param string $order_by - the query args order_by value.
+     * @param string $order - the query args order value.
+     * @param int $authorized_company_id - post ID for the authorized company.
+     * @param string $file_status - file status value.
+     * @return array $args - array of args for the file query.
      */
     function accp_generate_file_query_args($categories, $number_of_posts, $paged, $order_by, $order, $authorized_company_id, $file_status){
 …
     /**
      * Set up the core atts for the clientfile shortcode.
+     *
+     * @return array $atts_list_array - array of defined shortcode atts.
      */
     function accp_clientfile_core_shortcode_atts(){
 …
     /**
+     * Set up Client Invoice List shortcode - [accp_clientinvoices]
+     * Set up Client Invoice List shortcode.
+     *
+     * Shortcode: [accp_clientinvoices]
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $html - the shortcode result.
      */
     function accp_client_invoices( $atts, $content = null ) {
+        if (!is_user_logged_in()) return;
+        /**
+         * Exit if the user is not logged in
+         * or if this is WP Admin.
+         */
+        if ( !is_user_logged_in() || is_admin() )
+            return;
         global $post;
 …
         // Thumbnail alignment
         $align_thumbnail = $this->accp_align_thumbnail_var($atts);
+        $align_thumbnail = $this->accp_align_thumbnail_var($atts) ? $this->accp_align_thumbnail_var($atts) : '';
         // Link title
 …
                     // Get the Company ID associated with the file
+                    $file_post_company_id = get_post_meta($file_post_id, 'accp_user', true );
+                    // Pro Loop Vars and Access Check
+                    if ( $this->plugin_name == 'ars-constellation-client-portal-pro' || $this->plugin_name == 'ars-constellation-client-portal-premium' ){
+                    $file_post_company_id = get_post_meta($file_post_id, 'accp_user', true );
+                    /**
+                     * Check if pro access checks need to be instantiated.
+                     */
+                    if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
+                        include dirname(__DIR__) . '/pro/public/accp-invoice-list-shortcode-includes/accp-invoice-list-loop-vars.php';
+                    }else{
+                        // Use the default file check if this is the Basic version to determine
+                        // if access should be granted.
+                        if (
+                            is_user_logged_in() && current_user_can('manage_options') ||
+                            is_user_logged_in() && $file_post_company_id === $authorized_company_id
+                        ){
+                            $access_granted = true;
+                        }else{
+                            $access_granted = false;
+                        }
+                    }
+                    if( $access_granted == true ){
+                        $authorization = new ARS_Constellation_Client_Portal_Pro_Authorization( $this->plugin_name, $this->version );
+                        $check_authorization = $authorization->verify_page_or_post_authorization_pro($file_post_id, $user_id);
+                    }else{
+                        /**
+                         * Use the default file check if this is the Core version
+                         * to determine if access should be granted.
+                         */
+                        $authorization = new ARS_Constellation_Client_Portal_Core_Authorization( $this->plugin_name, $this->version );
+                        $check_authorization = $authorization->verify_page_or_post_authorization($file_post_id, $user_id);
+                    }
+                    if( $check_authorization === true ){
                         /**
 …
                             <? // Thumbnail ?>
                             <div class="file-loop-thumbnail file-thumb-align<?php echo $align_thumbnail != null ? esc_attr($align_thumbnail) : ''; ?>">
+                            <div class="file-loop-thumbnail file-thumb-align<?php echo esc_attr($align_thumbnail); ?>">
                             <?php
 …
      * Generate invoice query args.
+     *
+     * @return array - array of args for the invoice query.
+     * @param array $categories - array of category ID's.
+     * @param int $number_of_posts - number of posts to show in the shortcode loop.
+     * @param int $paged - the query args paged value.
+     * @param string $order_by - the query args order_by value.
+     * @param string $order - the query args order value.
+     * @param int $authorized_company_id - post ID for the authorized company.
+     * @param string $invoice_status - invoice status value.
+     * @return array $args - array of args for the invoice query.
      */
     function accp_generate_invoice_query_args($categories, $number_of_posts, $paged, $order_by, $order, $authorized_company_id, $invoice_status){
 …
     /**
      * Set up the core atts for the clientinvoice shortcode.
+     *
+     * @return array $atts_list_array - array of defined shortcode atts.
      */
     function accp_clientinvoice_core_shortcode_atts(){
 …
     /**
+     * Set up Client Home Page Link shortcode - [accp_my_company_page]
+     */
+    function accp_client_home_link( $atts, $content = null ) {
+     * Set up Client Home Page Link shortcode.
+     *
+     * Shortcode: [accp_my_company_page]
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $html - shortcode result.
+     */
+    function accp_client_home_link( $atts, $content = null ) {
+        /**
+         * Exit if this is WP Admin.
+         */
+        if ( is_admin() )
+            return;
         global $post;
 …
         return $html;
+    }
 …
     /**
      * Generate excerpt html for File and Invoice shortcodes.
+     *
+     * @param int $file_post_id - the post ID of the file in the loop.
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @param int $excerpt_length - value to use to constrain the exerpt length.
+     * @return string $html - the html for the excerpt element.
      */
     function accp_file_and_invoice_excerpt_html($file_post_id, $atts, $excerpt_length = null){
 …
     /**
      * Set up the $list_id var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return int $list_id - integer.
      */
     function accp_list_id_var($atts){
 …
      * Set up the $categories var.
+     *
      * $categories = list of category ID's.
+     *
      * $taxonomy = either 'accp_file_categories' or 'accp_invoice_categories'.
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @param string $taxonomy - either 'accp_file_categories' or 'accp_invoice_categories'.
+     * @return array $categories - array of category ID's.
      */
     function accp_categories_var($atts, $taxonomy){
 …
     /**
      * Set up $number_of_posts shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return int $number_of_posts - integer.
      */
     function accp_number_of_posts_var($atts){
 …
     /**
      * Set up $order_by shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $order_by - order_by value (ex. "date").
      */
     function accp_order_by_var($atts){
 …
     /**
      * Set up $order shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $order - the order value (ASC or DESC).
      */
     function accp_order_var($atts){
 …
     /**
      * Set up $excerpt_length shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return int $excerpt_length - integer.
      */
     function accp_excerpt_length_var($atts){
 …
         }else{
+            $excerpt_length = null;
+            $excerpt_length = null;
+        }
 …
     /**
      * Set up $thumbnail_size shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string $thumbnail_size - the thumbnail slug.
      */
     function accp_thumbnail_size_var($atts){
 …
     /**
      * Set up $align_thumbnail shortcode var.
+     *
+     * @param array $atts - array of atts passed in via the shortcode.
+     * @return string|false $align_thumbnail - the thumbnail CSS class suffix.
      */
     function accp_align_thumbnail_var($atts){
+        $att_input = trim( strtolower($atts['align_thumbnail']) );
+        $align_thumbnail = null;
+        if( $att_input == 'left' ){
+            $align_thumbnail = '-left';
+        }else if($att_input == 'right'){
+            $align_thumbnail = '-right';
+        }else if($att_input == 'center'){
+            $align_thumbnail = '-cetner';
+        }else if($att_input == 'float-left'){
+            $align_thumbnail = '-float-left';
+        }else if($att_input == 'float-right'){
+            $align_thumbnail = '-float-right';
+        }else if($att_input == null){
+            $align_thumbnail = null;
+        }
+        if( !array_key_exists('align_thumbnail', $atts) )
+            return false;
+        $att_input = trim( strtolower($atts['align_thumbnail']) );
+        switch($att_input){
+            case 'left':
+                $align_thumbnail = '-left';
+                break;
+            case 'right':
+                $align_thumbnail = '-right';
+                break;
+            case 'center':
+                $align_thumbnail = '-cetner';
+                break;
+            case 'float-left':
+                $align_thumbnail = '-float-left';
+                break;
+            case 'float-right':
+                $align_thumbnail = '-float-right';
+                break;
+            default:
+                $align_thumbnail = false;
+        }
         return $align_thumbnail;
 …
          * so let's set $_POST['accp_list_count'] to "1".
          */
         if( !isset($_POST['accp_list_count'])){
+        if( !isset($_POST['accp_list_count']) ){
             $_POST['accp_list_count'] = 1;
 …
+        }
         $list_instance_id = filter_var($_POST['accp_list_count'], FILTER_SANITIZE_NUMBER_INT);
+        $list_instance_id = filter_var( $_POST['accp_list_count'], FILTER_SANITIZE_NUMBER_INT );
         return $list_instance_id;

Plugin Directory

Context Navigation

Legend:

constellation-client-portal/tags/1.5.7/README.txt

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-admin.php

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-client-pages.php

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-company.php

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-file.php

constellation-client-portal/tags/1.5.7/admin/class-ars-constellation-client-portal-invoice.php

constellation-client-portal/tags/1.5.7/admin/js/ars-constellation-client-portal-admin.js

constellation-client-portal/tags/1.5.7/ars-constellation-client-portal.php

constellation-client-portal/tags/1.5.7/includes/class-ars-constellation-client-portal.php

constellation-client-portal/tags/1.5.7/public/class-ars-constellation-client-portal-public.php

constellation-client-portal/trunk/README.txt

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-admin.php

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-client-pages.php

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-company.php

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-file.php

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-invoice.php

constellation-client-portal/trunk/admin/js/ars-constellation-client-portal-admin.js

constellation-client-portal/trunk/ars-constellation-client-portal.php

constellation-client-portal/trunk/includes/class-ars-constellation-client-portal.php

constellation-client-portal/trunk/public/class-ars-constellation-client-portal-public.php

Download in other formats: