Changeset 3062211

constellation-client-portal/trunk/README.txt

-                      r3043713
+                      r3062211
 Requires at least: 5.0.0
 Tested up to: 6.4
 Stable tag: 1.8.0
+Stable tag: 1.8.1
 Requires PHP: 7.4
 License: GPLv3 or later
 …
 == Changelog ==
+= 1.8.1 (Pro) - 2024-4-1 =
+* Update: Made the bulk create and export sections responsive.
+* Feature: Created new post quick create feature that allows invoice, file, and global file posts to be batch created via a Quick Create UI.
+* Improvement: Added better date format validation to the due date fields, along with user feedback for invalid date formats.
+* Update: Added new parameters to the accp_company_menu shortcode to extend the functionality.
+* Update: Corrected typo in client page company menu setting section.
+* Update: Fixed broken link in the bulk create section description.
+* Update: Reorganized the functionality that adds the Bulk Create section to WP list tables for better maintainability.
+* Fix: Updated the csv export product total function to account for the new product quantity value to produce accurate product totals for quantities greater than one.
+* Update: Created new csv export class and relocated related functions into the new class for better organization and maintainability.
+* Update: Updated the functionality that adds pro WP list table columns for better organization and maintainability.
+* Update: Fixed typo in reminder email button class, and in corresponding JS.
+* Update: Deleted legacy, deprecated file access php file.
+* Update: Added the accp_after_global_file_list_pagination action hook.
+* Improvement: Improved sanitization and validation of the accp_update_allowed_post_types_for_global_files filter.
+= 1.8.1 (Core) - 2024-4-1 =
+* Update: Reworked the file upload functionality to work with new features.
+* Update: Created new plugin dir path constant.
+* Update: Updated the user profile field functionality for better organization and maintainability.
+* Update: Updated the functionality that adds core WP list table columns for better organization and maintainability.
+* Update: Code formatting updates.
+* Update: Deprecated legacy settings function.
 = 1.8.0 (Pro) - 2024-3-1 =
 * Update: Updated the CSV import functionality to add warnings to import logs if company id or file attachment data is missing or malformed.

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

-                      r3043713
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
+    exit; // Exit if accessed directly
+    exit;
+}
 …
+    }
     /**
      * Register the JavaScript for the admin area.
 …
      * File Check Redirects
+     *
      * Prevent direct access to clientfiles
+     * Prevent direct access to clientfiles.
      */
     function accp_file_redirect_init() {
 …
     /**
      * Add ACCP query_vars
+     * Add ACCP query_vars.
      */
     function accp_query_vars( $query_vars ){
 …
                  */
+                // Exit if the pro check class does not exist.
+                /**
+                 * Exit if the pro check class does not exist.
+                 */
                 if( !class_exists('ARS_Constellation_Client_Portal_Pro_File_Checks') ){
 …
+                }
+            }
 …
+    }
     /**
      * Load requested file.
 …
         if($checks_passed == false) return;
+        // Set up the actual file path for readfile to work properly.
+        /**
+         * Set up the actual file path for readfile to work properly.
+         */
         $file_path = parse_url( esc_url_raw($request_uri), PHP_URL_PATH);
+        // Account for wp-content being renamed in installer's environment.
+        /**
+         * Account for wp-content being renamed in installer's environment.
+         */
         $home_path = $this->accp_get_wp_home_path();
         $wp_content_dir_name = $this->accp_utility_functions->accp_get_wp_content_dir_name();
+        $file = $home_path . strstr($file_path, $wp_content_dir_name);
+        // Set up the mime info - important
+        $file = $home_path . strstr($file_path, $wp_content_dir_name);
+        /**
+         * Set up the mime info.
+         */
         $mime = wp_check_filetype($file);
 …
         /**
          * Actually serve the file.
+         * Serve the file.
          */
         readfile( $file );
 …
         if( $options['action'] == 'update' && $options['type'] == 'plugin' && isset( $options['plugins'] ) ) {
          foreach( $options['plugins'] as $plugin ) {
             if( $plugin == $accp_plugin_basename ) {
                 flush_rewrite_rules();
+            }
+         }
+            foreach( $options['plugins'] as $plugin ) {
+                if( $plugin == $accp_plugin_basename ) {
+                    flush_rewrite_rules();
+                }
+            }
+        }
 …
     /**
      * Add items to the plugin row meta.
+     *
+     * @param array $links - Array of plugin links.
+     * @param string $file - Plugin file path.
+     *
+     * @return array $links - Array of plugin links.
+     *
+     * @hooked plugin_row_meta.
      */
     function accp_add_plugin_row_meta( $links, $file ) {
         if ( strpos( $file, plugin_basename( dirname(__DIR__) ) ) !== false ) {
             $new_links = array(
                 '<a href="https://adrianrodriguezstudios.com/documentation-constellation-client-portal/" target="_blank">Documentation</a>'
                 );
+            );
             $links = array_merge( $links, $new_links );
+        }
 …
     /**
      * Add additional menu items to the plugin action menu.
+     *
+     * @param array $actions - Array of plugin action links.
+     * @param string $plugin_file - Plugin file path.
+     * @param array $plugin_data - Array of plugin data.
+     * @param string $context - The plugin context.
+     *
+     * @return array $actions - Array of plugin action links.
+     *
+     * @hooked plugin_action_links_{$plugin_file}.
      */
     function accp_add_links_to_plugin_row_actions_menu( $actions, $plugin_file, $plugin_data, $context ){
 …
+    }
+    /**
+     * Add Upgrade menu item to the
+     * plugin action menu - base plugin only.
+    /**
+     * Add an Upgrade menu item to the plugin action menu - core plugin only.
+     *
+     * @param array $actions - Array of plugin action links.
+     * @param string $plugin_file - Plugin file path.
+     * @param array $plugin_data - Array of plugin data.
+     * @param string $context - The plugin context.
+     *
+     * @return array $actions - Array of plugin action links.
+     *
+     * @hooked plugin_action_links_{$plugin_file}.
      */
     function accp_add_upgrade_link_to_plugin_row_actions_menu( $actions, $plugin_file, $plugin_data, $context ){
 …
+     *
      * If there is no file associated with the post the default
      * WP functionality will handle the post deletion
+     * WP functionality will handle the post deletion.
      */
     function accp_delete_file_on_post_delete(){
 …
                 $note_id = get_the_ID();
+                // Delete the note post.
+                /**
+                 * Delete the note post.
+                 */
                 wp_delete_post($note_id, true);
 …
             die ();
         $file_ids = json_decode(stripslashes($_POST['del_file_post_id_json'])); // Sanitize in loop.
+        $file_ids = json_decode( stripslashes($_POST['del_file_post_id_json']) ); // Sanitize in loop.
         $included_post_types = array( 'accp_clientinvoice', 'accp_clientfile', 'accp_global_file' );
 …
         $nonce = filter_var($_POST['empty_trash_nonce'], FILTER_SANITIZE_STRING);
         if ( ! wp_verify_nonce( $nonce, 'clientfile_admin_nonce' ) )
+        if ( !wp_verify_nonce( $nonce, 'clientfile_admin_nonce' ) )
             die ();
 …
                 if($post_type !== 'accp_clientcompany'){
+                    // Check if the post has file.
+                    /**
+                     * Check if the post has a file.
+                     */
                     if (!empty($accp_file)  ) {
 …
     /**
      * Restrict access to Client Pages, Client File and
      * Client Invoice, and Global File posts on front-end.
+     * Restrict access to Client Pages, Client File, Client Invoice,
+     * and Global File posts on the front-end.
      */
     function accp_restrict_client_page_access(){
 …
         $current_user_id = $current_user->ID;
+        // Get a list of users that are assigned to the
+        // current Company
+        /**
+         * Get a list of users that are assigned
+         * to the current Company.
+         */
         $args  = array(
           'meta_query' => array(
 …
         foreach ($users as $user) {
             $user_id_array[] = $user->ID;
+        }
+        }
         if( $post_type == 'accp_clientcompany' ){
 …
+            }
+        }
+        }
+    }
 …
     /**
      * Get the Company upload directory name.
+     *
+     * @param int|string $company_id - The post ID of the company.
+     *
+     * @return string $dir - The directory name.
      */
     function accp_get_company_dir($company_id) {
+        if( !isset($company_id) ) return false;
+        if( !isset($company_id) )
+            return false;
         $dir = get_post_meta($company_id, 'accp_dir', true);
 …
     /**
+     * Update the Client File Post Edit Form Tag
+     * Update the the post edit form tag for
+     * client file, client invoice, and global
+     * file post types.
+     *
      * Add 'enctype="multipart/form-data"' to allow
      * for file upload support.
+     *
+     * @hooked post_edit_form_tag.
      */
     function accp_update_post_edit_form_tag() {
 …
+    }
+    /**
+     * Add Client File Metabox to Client File Post Type.
+    /**
+     * Add meta fields to client file, client invoice,
+     * and global file post types.
+     *
+     * @hooked admin_menu.
      */
     public function accp_client_file_meta_box() {
+        $screens = array( 'accp_clientfile', 'accp_clientinvoice' );
+        $screens = array( 'accp_clientfile', 'accp_clientinvoice' );
         $is_pro = $this->accp_utility_functions->is_pro_plugin($this->plugin_name);
 …
     /**
      * Client file meta boxes.
+     * Client file attachment meta box content.
+     *
      * Adds the file upload and current file UI.
 …
              * Verify that the actual file (not post) still exists.
              */
             clearstatcache();
+            clearstatcache();
             if ( file_exists($accp_file_full_path) ):
 …
     /**
      * Reassign file to another company
+     * Reassign file to another company - AJAX function.
      */
     function accp_reassign_file_1(){
 …
     /**
      * Generate a Company Directory - AJAX
+     * Generate a company directory - AJAX.
      */
     function accp_generate_company_dir(){
 …
         $new_company_dir = get_post_meta($company_id, 'accp_dir', true);
         $accp_clientfiles_full_dir_path = $this->accp_utility_functions->accp_get_clientfiles_path();
 …
             mkdir($new_company_path);
             /**
              * Add the new directory name post meta.
 …
             add_post_meta( $company_id, 'accp_dir', $new_company_dir );
             /**
              * Add a note indicating that the new dir was created - Pro feature.
 …
             $new_dir_name = $new_company_dir;
             /**
 …
     /**
      * Maybe insert note - Pro feature.
+     *
+     * @param int|string $company_id - The post ID of the company.
+     * @param string $note_content - The note content.
      */
     function accp_add_directory_update_note($company_id, $note_content){
 …
             return;
         if(class_exists('ARS_Constellation_Client_Portal_Pro_Notes')){
+        if( class_exists('ARS_Constellation_Client_Portal_Pro_Notes') ){
             $accp_notes = new ARS_Constellation_Client_Portal_Pro_Notes($this->version, $this->plugin_name);
 …
+    }
+    /**
+     * Move files from one company upload
+     * directory to another company upload directory.
+    /**
+     * Move files from one company upload directory
+     * to another company upload directory.
+     *
+     * @param string $old_dir_name - The old directory name (moving away from).
+     * @param string $new_dir_name - The new directory name (moving to).
      */
     function accp_move_files_to_another_directory($old_dir_name, $new_dir_name){
         if(!is_admin() || !current_user_can('manage_options'))
+        if( !is_admin() || !current_user_can('manage_options') )
             die();
 …
         $new_dir_name = filter_var(preg_replace("/[^-\w,]/", "", $new_dir_name), FILTER_SANITIZE_STRING);
         if(!$old_dir_name || !$new_dir_name)
+        if( !$old_dir_name || !$new_dir_name )
             return false;
         if($old_dir_name == $new_dir_name)
+        if( $old_dir_name == $new_dir_name )
             return false;
 …
     /**
      * Specify a Company Directory - AJAX
+     * Specify a company directory - AJAX.
      */
     function accp_specify_company_dir(){
 …
+    /**
+     * Function to delete actual files
+     */
+    /*function accp_delete_file_or_dir(){
+        // Verify the nonce
+        $nonce = filter_var($_POST['file_del_nonce'], FILTER_SANITIZE_STRING);
+        if ( ! wp_verify_nonce( $nonce, 'file_del_nonce' ) )
+            die ();
+        $file_full_path = filter_var($_POST['accp_del_path'], FILTER_SANITIZE_URL);
+        if( file_exists($file_full_path) ){
+            unlink( $file_full_path );
+            echo 'The file was successfully deleted.';
+        }else{
+            echo 'That file does not exist.';
+        }
+        die();
+    }*/
+    /**
+     * Function to delete directories
+     *
+     * Call the functions with "$this->accp_delete_dir();"
+     */
+    /*function accp_delete_dir(){
+        // Verify the nonce
+        $nonce = filter_var($_POST['dir_del_nonce'], FILTER_SANITIZE_STRING);
+        if ( ! wp_verify_nonce( $nonce, 'dir_del_nonce' ) )
+            die ();
+        $file_full_path = filter_var($_POST['accp_del_dir_path'], FILTER_SANITIZE_URL);
+        if( file_exists($file_full_path) ){
+            rmdir( $file_full_path );
+            echo 'The directory was successfully deleted.';
+        }else{
+            echo 'That directory does not exist.';
+        }
+        die();
+    }*/
+    /**
+     * Save File to Company Directory
+     *
+     * Client Files and Client Invoices.
+    /**
+     * Save file to company directory.
+     *
+     * @param int $post_id - The post ID.
+     * @param object|null - The post object.
+     *
+     * @hooked save_post.
      */
     function accp_save_post($post_id, $post = null){
+        $post = get_post($post_id);
+        $current_user = wp_get_current_user();
+        $post_type = $post->post_type;
+        if(isset($_POST['wp_accp_nonce'])){
+            $nonce = filter_var($_POST['wp_accp_nonce'], FILTER_SANITIZE_STRING);
+            if(!wp_verify_nonce($nonce, 'accp_file_save_nonce'))
+                return $post_id;
+        }else{
+            return $post_id;
+        }
+        if( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE )
+            return $post_id;
+        if( $post_type !== 'accp_clientfile' && $post_type !== 'accp_clientinvoice' && $post_type !== 'accp_global_file')
+            return $post_id;
+        if( !is_user_logged_in() )
+        if( !is_user_logged_in() || !is_admin() )
             return wp_die('Invalid command.');
 …
             return $post_id;
+        if( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE )
+            return $post_id;
+        if( isset($_POST['wp_accp_nonce']) ){
+            $nonce = filter_var( $_POST['wp_accp_nonce'], FILTER_SANITIZE_STRING );
+            if( !wp_verify_nonce($nonce, 'accp_file_save_nonce') )
+                return $post_id;
+        }else{
+            return $post_id;
+        }
+        $post = get_post($post_id);
+        $post_type = $post->post_type;
+        if( $post_type !== 'accp_clientfile' && $post_type !== 'accp_clientinvoice' && $post_type !== 'accp_global_file')
+            return $post_id;
         /**
 …
             update_post_meta($post_id, 'accp_user', $company_id);
+        }
+        }
+        /**
+         * Upload the file attachment.
+         */
+        $files = $_FILES['accp_file'];
+        $this->accp_upload_file($files, $post_id);
+    }
+    /**
+     * Upload client file attachment.
+     *
+     * @param array $files - The $_FILES['accp_file'] array.
+     * @param int $post_id - The post ID that the file is associated with.
+     */
+    function accp_upload_file($files, $post_id){
+        if( !is_admin() || !is_user_logged_in() || !current_user_can('manage_options') )
+            return;
         /**
          *  Verify that the file field is not empty.
 …
          * are used to verify and handle the upload.
          */
+        if( !empty($_FILES['accp_file']['name']) ) {
+            // Get list of enabled mime types
+        if( !empty($files['name']) ) {
+            /**
+             * Get list of enabled mime types.
+             */
             $enabled_option_list = $this->accp_get_enabled_mime_type_option_values();
+            // Set up the Supported Mime Type var
+            /**
+             * Set up the Supported Mime Type var.
+             */
             if(!empty($enabled_option_list)){
 …
+            }
             /**
+             * Verify mime type.
+             * Get the file type of the upload.
+             */
+            $file_type_array = wp_check_filetype(basename($files['name']));
+            $uploaded_file_type = $file_type_array['type'];
+            /**
+             * Verify that the mime type is supported.
              */
+            // Get the file type of the upload
+            $file_type_array = wp_check_filetype(basename($_FILES['accp_file']['name']));
+            $uploaded_file_type = $file_type_array['type'];
+            // Verify that the mime type is supported
+            if( in_array($uploaded_file_type, $supported_types) ) {
+                $accp_file = get_post_meta($post_id, 'accp_file', true);
+                if ($accp_file) {
+                    $accp_file_path = $this->accp_utility_functions->accp_get_clientfiles_path() . '/' . $accp_file['file'];
+                    //NOTE: if the file already exists, a number will be appended to the new file name.
+                }
+            if( in_array($uploaded_file_type, $supported_types) ) {
                 /**
                  * Prep upload.
+                 * Upload the file.
                  */
                 if( !empty($file_type_array['type']) ){
+                    $upload = wp_handle_upload( $_FILES['accp_file'], array( 'test_form' => false ) );
+                    $upload = wp_handle_upload( $files, array( 'test_form' => false ) );
+                }
                 if(isset($upload['error']) && $upload['error'] != 0) {
+                if( isset($upload['error']) && $upload['error'] != 0 ){
                     wp_die( 'There was an error uploading your file. ' . $upload['error'] );
 …
                     /**
                      * Update save uploaded file info to post meta.
+                     * Save uploaded file info to post meta.
                      */
                     update_post_meta($post_id, 'accp_file', $upload);
 …
                      * company directory if it doesn't already exist.
                      */
+                    $accp_clientfiles_full_dir_path = $this->accp_utility_functions->accp_get_clientfiles_path();
+                    $company_dir_name = $this->accp_get_company_dir($company_id);
+                    $accp_file = get_post_meta($post_id, 'accp_file', true); //redefine $accp_file
+                    $source_file = plugin_dir_path( __DIR__  ) . 'public/assets/index.php';
+                    $accp_file_path_dir = parse_url($accp_file['url'], PHP_URL_PATH);
+                    // The upload dir is changed within this function, so
+                    // wp_get_upload_dir()['basedir'] returns 'fullpath/uploads/accp-clientfiles.
+                    $company_dir = wp_get_upload_dir()['basedir'] . '/' . $company_dir_name . '/' . 'index.php';
+                    $main_file_dir = wp_get_upload_dir()['basedir'] . '/index.php';
+                    $this->copy_index_file_to_company_dir($post_id);
 …
                     //do_action('accp_after_file_upload', $post_id, $company_id);
-                    if ( !file_exists( $company_dir )){
-                        copy($source_file, $company_dir);
+                    }
                     /**
+                     * Add index.php (silence is golden) to the main
+                     * accp-clientfiles upload dir if it doesn't exist
+                     * NOTE: Consider adding this to plugin activation -
+                     * Need to create the /accp-clientfiles dir on activation if so.
+                     * Copy the detault index.php file to the main
+                     * client portal uploads dir if needed.
                      */
+                    if ( !file_exists( $main_file_dir )){
+                        copy($source_file, $main_file_dir);
+                    }
+                    $this->copy_index_file_to_uploads_dir($post_id);
+                }
 …
+            }
+        }
+    }
+    /**
+     * Copy index.php file to client portal
+     * uploads dir.
+     *
+     * @param int $post_id - The post ID of the post initiating the action.
+     */
+    function copy_index_file_to_uploads_dir($post_id){
+        if( !is_admin() || !is_user_logged_in() || !current_user_can('manage_options') )
+            return;
+        if(!$post_id)
+            return;
+        $post_type = get_post_type($post_id);
+        if( 'accp_clientinvoice' !== $post_type &&
+            'accp_clientfile' !== $post_type &&
+            'accp_global_file' !== $post_type
+        ){
+            return;
+        }
+        $source_file = plugin_dir_path( __DIR__  ) . 'public/assets/index.php';
+        $main_file_dir = wp_get_upload_dir()['basedir'] . '/index.php';
+        /**
+         * Add index.php (silence is golden) to the main
+         * accp-clientfiles upload dir if it doesn't exist
+         * NOTE: Consider adding this to plugin activation -
+         * Need to create the /accp-clientfiles dir on activation if so.
+         */
+        if ( !file_exists( $main_file_dir )){
+            copy($source_file, $main_file_dir);
+        }
+    }
+    /**
+     * Copy index.php file to company and/or
+     * global-files upload dir.
+     *
+     * @param int $post_id - The post ID of the post initiating the action.
+     */
+    function copy_index_file_to_company_dir($post_id){
+        if( !is_admin() || !is_user_logged_in() || !current_user_can('manage_options') )
+            return;
+        if(!$post_id)
+            return;
+        $post_type = get_post_type($post_id);
+        if( 'accp_clientinvoice' !== $post_type &&
+            'accp_clientfile' !== $post_type &&
+            'accp_global_file' !== $post_type
+        ){
+            return;
+        }
+        $source_file = plugin_dir_path( __DIR__  ) . 'public/assets/index.php';
+        $dir_name = '';
+        if( 'accp_global_file' !== $post_type ){
+            $company_id = get_post_meta($post_id, 'accp_user', true) ? (int)get_post_meta($post_id, 'accp_user', true) : '';
+            if(!$company_id)
+                return;
+            $company_dir_name = $this->accp_get_company_dir($company_id);
+            $dir_name = $company_dir_name;
+        }else{
+            $dir_name = 'global-files';
+        }
+        if( !$dir_name || empty($dir_name) )
+            return;
+        /**
+         * The upload dir is updated for client portal post types, so
+         * wp_get_upload_dir()['basedir'] returns 'fullpath/uploads/accp-clientfiles.
+         */
+        $directory = wp_get_upload_dir()['basedir'] . '/' . $dir_name . '/' . 'index.php';
+        if ( !file_exists( $directory )){
+            copy($source_file, $directory);
+        }
 …
             return $default_dir;
+        $company_id = $this->accp_utility_functions->accp_sanitize_integers($_POST['accp_user']);
+        $company_id = $this->accp_utility_functions->accp_sanitize_integers($_POST['accp_user']);
+        $custom_dir = $this->get_custom_upload_dir($company_id);
+        if(!$custom_dir)
+            return $default_dir;
+        return $custom_dir;
+    }
+    /**
+     * Get custom upload directory for
+     * accp_clientfile and accp_clientinvoice
+     * post types.
+     *
+     * @param int $company_id - The post ID of the company.
+     *
+     * @return array $custom_dir - The upload directory array.
+     */
+    function get_custom_upload_dir($company_id){
+        if(!$company_id)
+            return;
         $base_dir = $this->wp_uploads_base_dir_const . '/accp-clientfiles';
         $base_url = $this->wp_uploads_base_url_const . '/accp-clientfiles';
 …
     /**
      * File and Invoice Dowload Function
+     * File attachment front-end download functionality.
      */
     public function accp_get_download(){
 …
         if( !isset($_GET['accp-dl-id'])  ) return;
+        if( !is_user_logged_in() ) {
+        if( !is_user_logged_in() ){
             wp_redirect( wp_login_url($_SERVER['REQUEST_URI']) );
             exit;
+        }
         $file_id = $this->accp_utility_functions->accp_sanitize_integers($_GET['accp-dl-id']);
+        // Exit if the file was not assigned to the current user
+        if( !get_post_meta($file_id, 'accp_user', true) ) return;
+        if( !$current_user->ID || $current_user->ID == 0 ) return;
+        if( !get_post_meta($file_id, 'accp_user', true) )
+            return;
+        if( !$current_user->ID || $current_user->ID == 0 )
+            return;
         $file_company_id = get_post_meta($file_id, 'accp_user', true);
 …
         $company_dir_name = get_post_meta($file_company_id, 'accp_dir', true);
+        $accp_file = get_post_meta($file_id, 'accp_file', true);
+        //$accp_dir_and_filename = substr($accp_file['file'], stripos($accp_file['file'], '/') +1); // DEPRECATED
+        $accp_file = get_post_meta($file_id, 'accp_file', true);
         $accp_dir_and_filename = $company_dir_name . '/' . basename($accp_file['file']);
         $accp_file_path = $this->wp_uploads_base_dir_const . '/accp-clientfiles/' . $accp_dir_and_filename;
 …
     /**
+     * Client File Output Function
+     * File attachment output functionality.
+     *
+     * @param string $file - The file path.
+     * @param string $mime_type - The mime type.
+     * @param string $action - The action. Defaults to "download."
      */
     private function accp_output_file($file, $name, $mime_type = '', $action = 'download') {
 …
          */
         $defined_mime_types = $this->accp_defined_file_mime_types();
         $file_extension = strtolower(substr(strrchr($file,"."), 1));
+        $file_extension = strtolower( substr( strrchr($file,"."), 1 ) );
         /**
 …
          */
         if($file_extension == 'jpeg'){
             $file_extension = 'jpg';
+        }
 …
                 if( strtolower($file_extension) == strtolower($value['file_extension']) ){
                     $mime_type = $value['file_extension'];
                     break;
+                }
 …
         if( $mime_type == '' || $mime_type == NULL || $mime_type == 'undefined'){
             $mime_type = 'application/force-download';
+        }
 …
         $bytes_send = 0;
         if ($file = fopen($file, 'r')){
             if(isset($_SERVER['HTTP_RANGE']))
+        if ( $file = fopen($file, 'r') ){
+            if( isset($_SERVER['HTTP_RANGE']) )
                 fseek($file, $range);
             while(!feof($file) && (!connection_aborted()) && ($bytes_send < $updated_length)){
+            while( !feof($file) && (!connection_aborted()) && ($bytes_send < $updated_length) ){
                 $buffer = fread($file, $chunk_size);
 …
     /**
      * Set base file headers.
+     *
+     * @param string $file - The file path.
+     * @param string $action - The action. Defaults to "download."
+     * @param string $name - The file name for the file to output.
      */
     private function set_base_file_headers($mime_type, $action, $name){
 …
         if(ini_get('zlib.output_compression')){
             ini_set('zlib.output_compression', 'Off');
+        }
 …
         $screen = 'accp_client_pages';
         add_meta_box("client-meta-2", "Assign Company*", array($this, "display_meta_company_select_options"), $screen, "normal", "high");
+        add_meta_box('client-meta-2', 'Assign Company*', array($this, 'display_meta_company_select_options'), $screen, 'normal', 'high');
+    }
 …
             $current_screen = get_current_screen();
             if( $current_screen->id === "accp_client_pages" ) {
+            if( 'accp_client_pages' === $current_screen->id ) {
                 global $post;
 …
+        }
+    }
+    /**
+     * Add user profile fields.
+     */
+    function extra_user_profile_fields($user){
+        if( !$user || !is_object($user) )
+            return;
+        $user_id = $user->ID;
+        if(!$user_id)
+            return;
+        $wp_post_statuses = get_post_statuses() ? array_keys( (array)get_post_statuses() ) : array();
+        ?>
+        <h2>Constellation Client Information</h2>
+        <table class="form-table">
+            <?php
+            /**
+             * Primary Company section.
+             */
+            ?>
+            <tr>
+                <th><label for="client_company">Company</label></th>
+                <td>
+                    <?php
+                    $saved_company = is_object($user) ? get_user_meta($user_id, 'client_company', true) : '';
+                    if ( current_user_can('manage_options') ){
+                        $args = array(
+                            'post_type' => 'accp_clientcompany',
+                        );
+                        /**
+                         * Include all defined WP post statuses,
+                         * not just "publish."
+                         */
+                        if(!empty($wp_post_statuses)){
+                            $args['post_status'] = $wp_post_statuses;
+                        }
+                        $company_list = get_pages($args);
+                        ?>
+                        <select name="client_company" id="client_company">
+                            <option value="">Select a company...</option>
+                        <?php
+                            foreach( $company_list as $key => $company ){
+                                $company_id = $company->ID;
+                                $company_name = $company->post_title;
+                                $selected = $saved_company && (int)$saved_company === (int)$company_id ? "selected" : "";
+                                $post_status_class = '';
+                                if( $company->post_status != 'publish' ){
+                                    $company_name = $company_name . ' (' . $company->post_status . ')';
+                                    $post_status_class = "accp-non-published-post-option";
+                                }
+                                ?>
+                                <option class="level-0 <?php echo esc_attr($post_status_class); ?>" value="<?php echo esc_attr($company_id); ?>" <?php echo esc_attr($selected); ?> ><?php echo esc_html($company_name); ?></option>
+                                <?php
+                            }
+                        ?>
+                        </select>
+                        <?php
+                    }else{
+                        if( !empty($saved_company) ){
+                            echo esc_html(get_the_title($saved_company));
+                        }
+                    }
+                    ?>
+                    <br />
+                </td>
+            </tr>
+            <?php
+            /**
+             * Client Status section.
+             */
+            ?>
+            <tr>
+                <th>
+                    <label for="client_status">
+                        <?php _e("Client Status"); ?>
+                        <?php if( is_user_logged_in() && current_user_can('manage_options') ): ?>
+                            <span class="accp-admin-tooltip-icon">i</span>
+                            <span class="accp-wp-admin-tooltip accp-wp-admin-tooltip-dark accp-wp-admin-has-tooltip-center accp-user-status-tooltip">A status of <strong>Inactive</strong> or <strong>Pending</strong> will prevent the user from accessing client pages, invoices, and files.</span>
+                        <?php endif; ?>
+                    </label>
+                </th>
+                <td>
+                    <?php $saved_status = is_object($user) ? get_user_meta($user->ID, 'client_status', true) : '';
+                    if ( current_user_can('manage_options') ){
+                    ?>
+                        <select name="client_status" id="client-status" value="<?php echo esc_attr( get_the_author_meta( 'client_status', $user_id ) ); ?>">
+                            <option value="active" <?php echo $saved_status == 'active' ? esc_attr("selected") : ""; ?>>Active</option>
+                            <option value="inactive" <?php echo $saved_status == 'inactive' ? esc_attr("selected") : ""; ?>>Inactive</option>
+                            <option value="pending" <?php echo $saved_status == 'pending' ? esc_attr("selected") : ""; ?>>Pending</option>
+                        </select>
+                    <?php
+                    }else{
+                        if(!empty($saved_status)){
+                            echo esc_html($saved_status);
+                        }
+                    }
+                    ?>
+                </td>
+            </tr>
+            <?php
+            /**
+             * Additional Assigned Companies section.
+             */
+            ?>
+            <tr>
+                <th>
+                    <label for="client_company"><?php echo (current_user_can('manage_options') ? 'Assign Additional Companies' : 'Additional Companies' ); ?></label>
+                </th>
+                <td>
+                    <?php
+                    $saved_companies = array();
+                    if(is_object($user)){
+                        if ( get_user_meta($user_id, 'client_additional_company', true) && !empty(get_user_meta($user_id, 'client_additional_company', true)) ){
+                            $saved_companies = (array)get_user_meta( $user_id, 'client_additional_company', true );
+                        }
+                    }
+                    if ( current_user_can('manage_options') ){
+                        ?>
+                        <select class="client-add-company-select" name="client_additional_company[]"  value="" multiple="multiple" >
+                        <?php
+                            foreach( $company_list as $company ){
+                                $company_id = $company->ID;
+                                $company_name = $company->post_title;
+                                $selected = in_array( $company_id , $saved_companies ) ? "selected" : "";
+                                $post_status_class = '';
+                                if( $company->post_status != 'publish' ){
+                                    $company_name = $company_name . ' (' . $company->post_status . ')';
+                                    $post_status_class = "accp-non-published-post-option";
+                                }
+                                ?>
+                                <option class="level-0 <?php echo esc_attr($post_status_class); ?>" value="<?php echo esc_attr($company_id); ?>" <?php echo esc_attr($selected); ?> ><?php echo esc_html($company_name); ?></option>
+                                <?php
+                            }
+                        ?>
+                        </select>
+                        <?php
+                    }else{
+                        if(!empty($saved_companies)){
+                            ?>
+                            <ul>
+                            <?php
+                            foreach( $saved_companies as $saved_company ){
+                                echo '<li>' . esc_html(get_the_title($saved_company)) . '</li>';
+                            }
+                            ?>
+                            </ul>
+                            <?php
+                        }
+                    }
+                    ?>
+                </td>
+            </tr>
+            <?php
+            if( is_admin() && is_user_logged_in() && current_user_can('manage_options') ){
+                do_action('accp_after_user_profile_settings', $user_id);
+            }
+            ?>
+        </table>
+    <?php
+    }
+    /**
+     * Check user global page suitability.  If a user
+     * is assigned to only 1 company, they are suitable
+     * for global pages, otherwise they are not.
+     *
+     * @param int $user_id - The ID of the user to check.
+     *
+     * @return bool $is_eligible - true|false.
+     */
+    function check_if_user_is_eligible_for_global_pages($user_id){
+        $primary_company_id = get_user_meta($user_id, 'client_company', true);
+        $additional_company_ids = get_user_meta($user_id, 'client_additional_company', true);
+        /**
+         * Return true if a primary company is assigned and no
+         * additional companies are assigned.
+         */
+        if( $primary_company_id && ( !$additional_company_ids || empty($additional_company_ids) ) )
+            return true;
+        /**
+         * Return true if a primary company is not assigned and only
+         * one additional company is assigned.
+         */
+        if( !$primary_company_id && $additional_company_ids && is_array($additional_company_ids) ){
+            if( count($additional_company_ids) === 1)
+                return true;
+        }
+        /**
+         * Return true if a primary company is not assigned and
+         * no additional companies are assigned.
+         */
+        if( !$primary_company_id && ( !$additional_company_ids || empty($additional_company_ids) ) ){
+                return true;
+        }
+        return false;
+    }
+    /**
+     * Save user profile fields.
+     */
+    function save_extra_user_profile_fields( $user_id ) {
+        if ( !current_user_can( 'edit_user', $user_id ) ) {
+            return false;
+        }
+        /**
+         * Assigned Company
+         */
+        if(isset($_POST['client_company'])){
+            $company_id = $this->accp_utility_functions->accp_sanitize_integers($_POST['client_company']);
+            update_user_meta( $user_id, 'client_company', $company_id );
+        }
+        /**
+         * User Client Status
+         */
+        if(isset($_POST['client_status'])){
+            $client_status = filter_var($_POST['client_status'], FILTER_SANITIZE_STRING);
+            update_user_meta( $user_id, 'client_status', $client_status );
+        }
+        /**
+         * Additional Companies
+         */
+        if (!empty($_POST['client_additional_company'])){
+            $sanitized_company_array = array();
+            foreach( $_POST['client_additional_company'] as $additional_company_id ){
+                $sanitized_company_array[] = $this->accp_utility_functions->accp_sanitize_integers($additional_company_id);
+            }
+            update_user_meta( $user_id, 'client_additional_company', $sanitized_company_array );
+        }else{
+            delete_user_meta( $user_id, 'client_additional_company');
+        }
+    }
+    /**
+     *  Add content above the clienfile list table.
+    }
+    /**
+     * Add content above the clienfile list table.
      */
     function accp_add_content_before_file_list_table(){
 …
      * Define MIME Types.
+     *
      * @return array Returns list of defined mime types (enabled and disabled).
+     * @return array $mime_types - Array of defined mime types (enabled and disabled).
      */
     function accp_defined_file_mime_types(){
 …
      * Get Enabled ACCP Mime Type Options
+     *
+     * @return array  Returns list of enabled (only) mime type options.
+     * @return array $enabled_mime_types - Array of enabled (only) mime type options.
+     *
      * Option value = $enabled_mime_types['value'].
      */
 …
             if( get_option($value['option_name']) ){
                 $enabled_mime_types[] = $value;
+            }
 …
     /**
      * Get Enabled TCP Mime Type Option Values
      * @return array Returns list of enabled (only) mime type option values.
+     * @return array $enabled_mime_type_vals - Array of enabled (only) mime type option values.
      */
     function accp_get_enabled_mime_type_option_values(){
 …
         foreach ($enabled_mime_types as $key => $value) {
             $enabled_mime_type_vals[] = $value['value'];
+        }
 …
+    }
+    /**
+     * Add Settings Page Content
+     */
+    public function accp_settings_page(){
+        include_once( dirname( __FILE__ ) . '/includes/accp-settings-page.php');
+    }
     /**
      * Add Client Portal sub menu items
 …
         /**
          * Company menu page.
+         */
+        //add_submenu_page('admin.php?page=accp-settings.php', 'Companies', 'Companies', 'manage_options', 'edit.php?post_type=accp_clientcompany' );
+         */
         add_submenu_page('accp-settings', 'Companies', 'Companies', 'manage_options', 'edit.php?post_type=accp_clientcompany' );
 …
     /**
      * Add columns to the WP user list table.
+     *
+     * @param array $columns - Array of column names.
+     *
+     * @return array $columns - Array of column names.
+     *
+     * @hooked manage_users_columns.
      */
     function add_wp_user_list_columns($columns){
 …
     /**
      * Add WP user list table column content.
+     *
+     * @param string $output - The column content.
+     * @param string $column_name - The column name.
+     * @param string $user_id - The ID of the currently listed user.
+     *
+     * @return string $output - The column content.
+     *
+     * @hooked manage_users_custom_column.
      */
     function add_wp_user_list_column_content($output, $column_name, $user_id){
 …
     /**
+     * Generate admin settings message and
+     * error markup.
+     *
+     * @param string $message - The message to be displayed,
+     * which can also contain markup.
+     * Generate admin settings message and error markup.
+     *
+     * @param string $message - The message to be displayed, which can also contain markup.
      * @param string $type - The type of message type from the
      * list of available WP admin notice type classes (notice-error,
 …
     /**
      * Flush rewrite fules if the 'accp_rewrite_flush_needed_after_settings_change'
+     * Flush rewrite rules if the 'accp_rewrite_flush_needed_after_settings_change'
      * option is present and set to 'rewrite-flush-needed.'
+     *
      * @hooked to init.
+     * @hooked init.
      */
     function accp_maybe_flush_rewrite_rules(){
 …
+    }
+    /**
+     * Add core WP list table columns.
+     *
+     * @param array $columns - Array of column heading data.
+     *
+     * @hooked manage_edit-accp_clientfile_columns.
+     * @hooked manage_edit-accp_clientinvoice_columns.
+     * @hooked manage_edit-accp_global_file_columns.
+     */
+    function add_core_wp_list_table_columns($columns){
+        if( !is_admin() || !is_user_logged_in() || !current_user_can('manage_options') )
+            return;
+        global $current_screen;
+        $post_type = $current_screen->post_type;
+        $position_column = 'title';
+        $new_columns = array();
+        foreach ( $columns as $column_slug => $column_name ) {
+            $new_columns[ $column_slug ] = $column_name;
+            if ( $position_column === $column_slug ) {
+                /**
+                 * Company
+                 */
+                if( $post_type !== 'accp_global_file' ){
+                    $new_columns['company'] = __( 'Company', 'constellation-client-portal' );
+                }
+                /**
+                 * Category
+                 */
+                $new_columns['file_category'] = __( 'Category', 'constellation-client-portal' );
+                /**
+                 * Status
+                 */
+                $new_columns['status'] = __( 'Status', 'constellation-client-portal' );
+                /**
+                 * Document ID
+                 */
+                $new_columns['doc_id'] = __( 'Document ID', 'constellation-client-portal' );
+                /**
+                 * Due Date
+                 */
+                $new_columns['due_date'] = __( 'Due Date', 'constellation-client-portal' );
+            }
+        }
+        return $new_columns;
+    }
 } //End ARS_Constellation_Client_Portal_Admin Class

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

-                      r3043713
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}
 …
         $labels = array(
             'name' => _x( 'Client Pages', 'accp-client-page' ),
             'singular_name' => _x( 'Client Page', 'accp-client-page' ),
             'add_new' => _x( 'Add New', 'accp-client-page' ),
             'add_new_item' => _x( 'Add New Client Page', 'accp-client-page' ),
             'edit_item' => _x( 'Edit Client Page', 'accp-client-page' ),
             'new_item' => _x( 'New Client Page', 'accp-client-page' ),
             'view_item' => _x( 'View Client Page', 'accp-client-page' ),
             'search_items' => _x( 'Search Client Pages', 'accp-client-page' ),
             'not_found' => _x( 'No client pages found', 'accp-client-page' ),
             'not_found_in_trash' => _x( 'No client pages found in Trash', 'accp-client-page' ),
             'parent_item_colon' => _x( 'Parent Client Page:', 'accp-client-page' ),
             'menu_name' => _x( 'Client Pages', 'accp-client-page' ),
+            'name' => _x( 'Client Pages', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client Page', 'constellation-client-portal' ),
+            'add_new' => _x( 'Add New', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Client Page', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Client Page', 'constellation-client-portal' ),
+            'new_item' => _x( 'New Client Page', 'constellation-client-portal' ),
+            'view_item' => _x( 'View Client Page', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Client Pages', 'constellation-client-portal' ),
+            'not_found' => _x( 'No client pages found', 'constellation-client-portal' ),
+            'not_found_in_trash' => _x( 'No client pages found in Trash', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Client Page:', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Client Pages', 'constellation-client-portal' ),
         );
 …
         $labels = array(
             'name' => _x( 'Client Page Categories', 'accp_client_page_categories' ),
             'singular_name' => _x( 'Client Page Category', 'accp_client_page_categories' ),
             'search_items' => _x( 'Search Categories', 'accp_client_page_categories' ),
             'popular_items' => _x( 'Popular Categories', 'accp_client_page_categories' ),
             'all_items' => _x( 'All Categories', 'accp_client_page_categories' ),
             'parent_item' => _x( 'Parent Category', 'accp_client_page_categories' ),
             'parent_item_colon' => _x( 'Parent Category:', 'accp_client_page_categories' ),
             'edit_item' => _x( 'Edit Category', 'accp_client_page_categories' ),
             'update_item' => _x( 'Update Category', 'accp_client_page_categories' ),
             'add_new_item' => _x( 'Add New Category', 'accp_client_page_categories' ),
             'new_item_name' => _x( 'New Category', 'accp_client_page_categories' ),
             'separate_items_with_commas' => _x( 'Separate categories with commas', 'accp_client_page_categories' ),
             'add_or_remove_items' => _x( 'Add or remove categories', 'accp_client_page_categories' ),
             'choose_from_most_used' => _x( 'Choose from the most used categories', 'accp_client_page_categories' ),
             'menu_name' => _x( 'Client Page Categories', 'accp_client_page_categories' ),
+            'name' => _x( 'Client Page Categories', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client Page Category', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Categories', 'constellation-client-portal' ),
+            'popular_items' => _x( 'Popular Categories', 'constellation-client-portal' ),
+            'all_items' => _x( 'All Categories', 'constellation-client-portal' ),
+            'parent_item' => _x( 'Parent Category', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Category:', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Category', 'constellation-client-portal' ),
+            'update_item' => _x( 'Update Category', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Category', 'constellation-client-portal' ),
+            'new_item_name' => _x( 'New Category', 'constellation-client-portal' ),
+            'separate_items_with_commas' => _x( 'Separate categories with commas', 'constellation-client-portal' ),
+            'add_or_remove_items' => _x( 'Add or remove categories', 'constellation-client-portal' ),
+            'choose_from_most_used' => _x( 'Choose from the most used categories', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Client Page Categories', 'constellation-client-portal' ),
         );
 …
         $labels = array(
             'name' => _x( 'Client Page Tags', 'accp_client_page_tags' ),
             'singular_name' => _x( 'Client Page Tag', 'accp_client_page_tags' ),
             'search_items' => _x( 'Search Tags', 'accp_client_page_tags' ),
             'popular_items' => _x( 'Popular Tags', 'accp_client_page_tags' ),
             'all_items' => _x( 'All Tags', 'accp_client_page_tags' ),
             'parent_item' => _x( 'Parent Tag', 'accp_client_page_tags' ),
             'parent_item_colon' => _x( 'Parent Tag:', 'accp_client_page_tags' ),
             'edit_item' => _x( 'Edit Tag', 'accp_client_page_tags' ),
             'update_item' => _x( 'Update Tag', 'accp_client_page_tags' ),
             'add_new_item' => _x( 'Add New Tag', 'accp_client_page_tags' ),
             'new_item_name' => _x( 'New Tag', 'accp_client_page_tags' ),
             'separate_items_with_commas' => _x( 'Separate tags with commas', 'accp_client_page_tags' ),
             'add_or_remove_items' => _x( 'Add or remove tags', 'accp_client_page_tags' ),
             'choose_from_most_used' => _x( 'Choose from the most used tags', 'accp_client_page_tags' ),
             'menu_name' => _x( 'Client Page Tags', 'accp_client_page_tags' ),
+            'name' => _x( 'Client Page Tags', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client Page Tag', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Tags', 'constellation-client-portal' ),
+            'popular_items' => _x( 'Popular Tags', 'constellation-client-portal' ),
+            'all_items' => _x( 'All Tags', 'constellation-client-portal' ),
+            'parent_item' => _x( 'Parent Tag', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Tag:', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Tag', 'constellation-client-portal' ),
+            'update_item' => _x( 'Update Tag', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Tag', 'constellation-client-portal' ),
+            'new_item_name' => _x( 'New Tag', 'constellation-client-portal' ),
+            'separate_items_with_commas' => _x( 'Separate tags with commas', 'constellation-client-portal' ),
+            'add_or_remove_items' => _x( 'Add or remove tags', 'constellation-client-portal' ),
+            'choose_from_most_used' => _x( 'Choose from the most used tags', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Client Page Tags', 'constellation-client-portal' ),
         );

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

-                      r3043713
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}
 …
     /**
-     * Initialize the class and set its properties.
+     *
      * @since    1.0.0
      * @param      string    $plugin_name       The name of this plugin.
 …
         $labels = array(
             'name' => _x( 'Client Company', 'accp_clientcompany' ),
             'singular_name' => _x( 'Client Company', 'accp_clientcompany' ),
             'add_new' => _x( 'Add New', 'accp_clientcompany' ),
             'add_new_item' => _x( 'Add New Client Company', 'accp_clientcompany' ),
             'edit_item' => _x( 'Edit Client Company', 'accp_clientcompany' ),
             'new_item' => _x( 'New Client Company', 'accp_clientcompany' ),
             'view_item' => _x( 'View Client Company', 'accp_clientcompany' ),
             'search_items' => _x( 'Search Client Companies', 'accp_clientcompany' ),
             'not_found' => _x( 'No client Companies found', 'accp_clientcompany' ),
             'not_found_in_trash' => _x( 'No client companiess found in Trash', 'accp_clientcompany' ),
             'parent_item_colon' => _x( 'Parent Client Company:', 'accp_clientcompany' ),
             'menu_name' => _x( 'Client Companies', 'accp_clientcompany' ),
+            'name' => _x( 'Client Company', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client Company', 'constellation-client-portal' ),
+            'add_new' => _x( 'Add New', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Client Company', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Client Company', 'constellation-client-portal' ),
+            'new_item' => _x( 'New Client Company', 'constellation-client-portal' ),
+            'view_item' => _x( 'View Client Company', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Client Companies', 'constellation-client-portal' ),
+            'not_found' => _x( 'No client Companies found', 'constellation-client-portal' ),
+            'not_found_in_trash' => _x( 'No client companiess found in Trash', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Client Company:', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Client Companies', 'constellation-client-portal' ),
         );
 …
             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");

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

-                      r3043713
+                      r3062211
     /**
-     * Initialize the class and set its properties.
+     *
      * @since    1.0.0
      * @param      string    $plugin_name       The name of this plugin.
 …
+     *
      * @param int $post_id - the post ID of the page or post to verify.
+     * @param int $user_id - the user ID of the current user.
      * @return bool $authorized true|false - true if authorized, and false if not authorized.
      */
 …
+     *
      * @param int $company_id - the post ID of the company to verify.
+     * @param int $user_id - the user ID of the current user.
      * @return bool $authorized true|false - true if authorized, and false if not authorized.
      */
 …
      * Get the additional assigned companies for a user.
+     *
      * @param int $user_id - the ID of the user to check.
      * @return array $additional_companies - array of comapny ID's that
+     * @param int $user_id - The ID of the user to check.
+     * @return array $additional_companies - Array of comapny ID's that
      * the user is assigned to, if any.
      */

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

-                      r2906601
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}
 …
     /**
-     * Initialize the class
+     *
      * @since    1.0.0
      * @param      string    $plugin_name The name of this plugin.
 …
     /**
      * Direct file access base checks.
+     *
+     * @param string $request_uri - The file URL.
      */
     function accp_direct_file_access_base_checks($request_uri){

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

-                      r3043713
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}
 …
         $labels = array(
             'name' => _x( 'Client Files', 'accp_clientfile' ),
             'singular_name' => _x( 'Client File', 'accp_clientfile' ),
             'add_new' => _x( 'Add New', 'accp_clientfile' ),
             'add_new_item' => _x( 'Add New Client File', 'accp_clientfile' ),
             'edit_item' => _x( 'Edit Client File', 'accp_clientfile' ),
             'new_item' => _x( 'New Client File', 'accp_clientfile' ),
             'view_item' => _x( 'View Client File', 'accp_clientfile' ),
             'search_items' => _x( 'Search Client Files', 'accp_clientfile' ),
             'not_found' => _x( 'No client files found', 'accp_clientfile' ),
             'not_found_in_trash' => _x( 'No client files found in Trash', 'accp_clientfile' ),
             'parent_item_colon' => _x( 'Parent Client File:', 'accp_clientfile' ),
             'menu_name' => _x( 'Client Files', 'accp_clientfile' ),
+            'name' => _x( 'Client Files', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client File', 'constellation-client-portal' ),
+            'add_new' => _x( 'Add New', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Client File', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Client File', 'constellation-client-portal' ),
+            'new_item' => _x( 'New Client File', 'constellation-client-portal' ),
+            'view_item' => _x( 'View Client File', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Client Files', 'constellation-client-portal' ),
+            'not_found' => _x( 'No client files found', 'constellation-client-portal' ),
+            'not_found_in_trash' => _x( 'No client files found in Trash', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Client File:', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Client Files', 'constellation-client-portal' ),
         );
 …
         $labels = array(
             'name' => _x( 'Client File Categories', 'accp_file_categories' ),
             'singular_name' => _x( 'Client File Category', 'accp_file_categories' ),
             'search_items' => _x( 'Search Categories', 'accp_file_categories' ),
             'popular_items' => _x( 'Popular Categories', 'accp_file_categories' ),
             'all_items' => _x( 'All Categories', 'accp_file_categories' ),
             'parent_item' => _x( 'Parent Category', 'accp_file_categories' ),
             'parent_item_colon' => _x( 'Parent Category:', 'accp_file_categories' ),
             'edit_item' => _x( 'Edit Category', 'accp_file_categories' ),
             'update_item' => _x( 'Update Category', 'accp_file_categories' ),
             'add_new_item' => _x( 'Add New Category', 'accp_file_categories' ),
             'new_item_name' => _x( 'New Category', 'accp_file_categories' ),
             'separate_items_with_commas' => _x( 'Separate categories with commas', 'accp_file_categories' ),
             'add_or_remove_items' => _x( 'Add or remove categories', 'accp_file_categories' ),
             'choose_from_most_used' => _x( 'Choose from the most used categories', 'accp_file_categories' ),
             'menu_name' => _x( 'Client File Categories', 'accp_file_categories' ),
+            'name' => _x( 'Client File Categories', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client File Category', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Categories', 'constellation-client-portal' ),
+            'popular_items' => _x( 'Popular Categories', 'constellation-client-portal' ),
+            'all_items' => _x( 'All Categories', 'constellation-client-portal' ),
+            'parent_item' => _x( 'Parent Category', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Category:', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Category', 'constellation-client-portal' ),
+            'update_item' => _x( 'Update Category', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Category', 'constellation-client-portal' ),
+            'new_item_name' => _x( 'New Category', 'constellation-client-portal' ),
+            'separate_items_with_commas' => _x( 'Separate categories with commas', 'constellation-client-portal' ),
+            'add_or_remove_items' => _x( 'Add or remove categories', 'constellation-client-portal' ),
+            'choose_from_most_used' => _x( 'Choose from the most used categories', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Client File Categories', 'constellation-client-portal' ),
         );
 …
         $labels = array(
             'name' => _x( 'Client File Tags', 'accp_file_tags' ),
             'singular_name' => _x( 'Client File Tags', 'accp_file_tags' ),
             'search_items' => _x( 'Search Tags', 'accp_file_tags' ),
             'popular_items' => _x( 'Popular Tags', 'accp_file_tags' ),
             'all_items' => _x( 'All Categories', 'accp_file_tags' ),
             'parent_item' => _x( 'Parent Category', 'accp_file_tags' ),
             'parent_item_colon' => _x( 'Parent Tag:', 'accp_file_tags' ),
             'edit_item' => _x( 'Edit Tag', 'accp_file_tags' ),
             'update_item' => _x( 'Update Tag', 'accp_file_tags' ),
             'add_new_item' => _x( 'Add New Tag', 'accp_file_tags' ),
             'new_item_name' => _x( 'New Tag', 'accp_file_tags' ),
             'separate_items_with_commas' => _x( 'Separate tags with commas', 'accp_file_tags' ),
             'add_or_remove_items' => _x( 'Add or remove tags', 'accp_file_tags' ),
             'choose_from_most_used' => _x( 'Choose from the most used tags', 'accp_file_tags' ),
             'menu_name' => _x( 'Client File Tags', 'accp_file_tags' ),
+            'name' => _x( 'Client File Tags', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client File Tags', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Tags', 'constellation-client-portal' ),
+            'popular_items' => _x( 'Popular Tags', 'constellation-client-portal' ),
+            'all_items' => _x( 'All Categories', 'constellation-client-portal' ),
+            'parent_item' => _x( 'Parent Category', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Tag:', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Tag', 'constellation-client-portal' ),
+            'update_item' => _x( 'Update Tag', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Tag', 'constellation-client-portal' ),
+            'new_item_name' => _x( 'New Tag', 'constellation-client-portal' ),
+            'separate_items_with_commas' => _x( 'Separate tags with commas', 'constellation-client-portal' ),
+            'add_or_remove_items' => _x( 'Add or remove tags', 'constellation-client-portal' ),
+            'choose_from_most_used' => _x( 'Choose from the most used tags', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Client File Tags', 'constellation-client-portal' ),
         );
 …
         register_taxonomy( 'accp_file_tags', array('accp_clientfile'), $args );
+    }
+    /**
+     *  Client File Post Type fields and list table.
+     *
+     * Register the columns - Company, Categories, and Doc ID.
+     */
+    function clientfile_column_register( $columns ) {
+        $new_columns = array();
+        foreach ( $columns as $column_name => $column_info ) {
+            $new_columns[ $column_name ] = $column_info;
+            if ( 'title' === $column_name ) {
+                $new_columns['company'] = __( 'Company', 'accp' );
+                $new_columns['status'] = __( 'Status', 'accp' );
+                $new_columns['doc_id'] = __( 'Document ID', 'accp' );
+                $new_columns['file_category'] = __( 'Category', 'accp' );
+                $new_columns['due_date'] = __( 'Due Date', 'accp' );
+            }
+        }
+        return $new_columns;
+    }
+    }
 …
     function accp_add_core_file_list_filter_fields($post_type, $which){
+        if($post_type != 'accp_clientfile') return;
+        if( $post_type != 'accp_clientfile' )
+            return;
         /**

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

-                      r3043713
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}
 …
     /**
-     * Initialize the class and set its properties.
+     *
      * @since    1.0.0
      * @param      string    $plugin_name       The name of this plugin.
 …
         $labels = array(
             'name' => _x( 'Client Invoices', 'clientinvoice' ),
             'singular_name' => _x( 'Client Invoice', 'clientinvoice' ),
             'add_new' => _x( 'Add New', 'clientinvoice' ),
             'add_new_item' => _x( 'Add New Client Invoice', 'clientinvoice' ),
             'edit_item' => _x( 'Edit Client Invoice', 'clientinvoice' ),
             'new_item' => _x( 'New Client Invoice', 'clientinvoice' ),
             'view_item' => _x( 'View Client Invoice', 'clientinvoice' ),
             'search_items' => _x( 'Search Client Invoices', 'clientinvoice' ),
             'not_found' => _x( 'No client invoices found', 'clientinvoice' ),
             'not_found_in_trash' => _x( 'No client invoices found in Trash', 'clientinvoice' ),
             'parent_item_colon' => _x( 'Parent Client Invoice:', 'clientinvoice' ),
             'menu_name' => _x( 'Client Invoices', 'clientinvoice' ),
+            'name' => _x( 'Client Invoices', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client Invoice', 'constellation-client-portal' ),
+            'add_new' => _x( 'Add New', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Client Invoice', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Client Invoice', 'constellation-client-portal' ),
+            'new_item' => _x( 'New Client Invoice', 'constellation-client-portal' ),
+            'view_item' => _x( 'View Client Invoice', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Client Invoices', 'constellation-client-portal' ),
+            'not_found' => _x( 'No client invoices found', 'constellation-client-portal' ),
+            'not_found_in_trash' => _x( 'No client invoices found in Trash', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Client Invoice:', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Client Invoices', 'constellation-client-portal' ),
         );
 …
         $labels = array(
             'name' => _x( 'Client Invoice Categories', 'invoice_categories' ),
             'singular_name' => _x( 'Client Invoice Category', 'invoice_categories' ),
             'search_items' => _x( 'Search Categories', 'invoice_categories' ),
             'popular_items' => _x( 'Popular Categories', 'invoice_categories' ),
             'all_items' => _x( 'All Categories', 'invoice_categories' ),
             'parent_item' => _x( 'Parent Category', 'invoice_categories' ),
             'parent_item_colon' => _x( 'Parent Category:', 'invoice_categories' ),
             'edit_item' => _x( 'Edit Category', 'invoice_categories' ),
             'update_item' => _x( 'Update Category', 'invoice_categories' ),
             'add_new_item' => _x( 'Add New Category', 'invoice_categories' ),
             'new_item_name' => _x( 'New Category', 'invoice_categories' ),
             'separate_items_with_commas' => _x( 'Separate categories with commas', 'invoice_categories' ),
             'add_or_remove_items' => _x( 'Add or remove categories', 'invoice_categories' ),
             'choose_from_most_used' => _x( 'Choose from the most used categories', 'file_categories' ),
             'menu_name' => _x( 'Invoice Categories', 'invoice_categories' ),
+            'name' => _x( 'Client Invoice Categories', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client Invoice Category', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Categories', 'constellation-client-portal' ),
+            'popular_items' => _x( 'Popular Categories', 'constellation-client-portal' ),
+            'all_items' => _x( 'All Categories', 'constellation-client-portal' ),
+            'parent_item' => _x( 'Parent Category', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Category:', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Category', 'constellation-client-portal' ),
+            'update_item' => _x( 'Update Category', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Category', 'constellation-client-portal' ),
+            'new_item_name' => _x( 'New Category', 'constellation-client-portal' ),
+            'separate_items_with_commas' => _x( 'Separate categories with commas', 'constellation-client-portal' ),
+            'add_or_remove_items' => _x( 'Add or remove categories', 'constellation-client-portal' ),
+            'choose_from_most_used' => _x( 'Choose from the most used categories', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Invoice Categories', 'constellation-client-portal' ),
         );
 …
         $labels = array(
             'name' => _x( 'Client Invoice Tags', 'invoice_tags' ),
             'singular_name' => _x( 'Client Invoice Tags', 'invoice_tags' ),
             'search_items' => _x( 'Search Tags', 'invoice_tags' ),
             'popular_items' => _x( 'Popular Tags', 'invoice_tags' ),
             'all_items' => _x( 'All Categories', 'invoice_tags' ),
             'parent_item' => _x( 'Parent Category', 'invoice_tags' ),
             'parent_item_colon' => _x( 'Parent Tag:', 'invoice_tags' ),
             'edit_item' => _x( 'Edit Tag', 'invoice_tags' ),
             'update_item' => _x( 'Update Tag', 'invoice_tags' ),
             'add_new_item' => _x( 'Add New Tag', 'invoice_tags' ),
             'new_item_name' => _x( 'New Tag', 'invoice_tags' ),
             'separate_items_with_commas' => _x( 'Separate tags with commas', 'invoice_tags' ),
             'add_or_remove_items' => _x( 'Add or remove tags', 'invoice_tags' ),
             'choose_from_most_used' => _x( 'Choose from the most used tags', 'invoice_tags' ),
             'menu_name' => _x( 'Invoice Tags', 'invoice_tags' ),
+            'name' => _x( 'Client Invoice Tags', 'constellation-client-portal' ),
+            'singular_name' => _x( 'Client Invoice Tags', 'constellation-client-portal' ),
+            'search_items' => _x( 'Search Tags', 'constellation-client-portal' ),
+            'popular_items' => _x( 'Popular Tags', 'constellation-client-portal' ),
+            'all_items' => _x( 'All Categories', 'constellation-client-portal' ),
+            'parent_item' => _x( 'Parent Category', 'constellation-client-portal' ),
+            'parent_item_colon' => _x( 'Parent Tag:', 'constellation-client-portal' ),
+            'edit_item' => _x( 'Edit Tag', 'constellation-client-portal' ),
+            'update_item' => _x( 'Update Tag', 'constellation-client-portal' ),
+            'add_new_item' => _x( 'Add New Tag', 'constellation-client-portal' ),
+            'new_item_name' => _x( 'New Tag', 'constellation-client-portal' ),
+            'separate_items_with_commas' => _x( 'Separate tags with commas', 'constellation-client-portal' ),
+            'add_or_remove_items' => _x( 'Add or remove tags', 'constellation-client-portal' ),
+            'choose_from_most_used' => _x( 'Choose from the most used tags', 'constellation-client-portal' ),
+            'menu_name' => _x( 'Invoice Tags', 'constellation-client-portal' ),
         );
 …
+    }
+    /**
+     *  Client Invoice Post Type fields and list table.
+     *
+     * Register the columns - Company, Status, Categories, and Doc ID.
+     */
+    function accp_clientinvoice_column_register( $columns ) {
+        $new_columns = array();
+        foreach ( $columns as $column_name => $column_info ) {
+            $new_columns[ $column_name ] = $column_info;
+            if ( 'title' === $column_name ) {
+                $new_columns['company'] = __( 'Company', 'accp' );
+                $new_columns['status'] = __( 'Status', 'accp' );
+                $new_columns['doc_id'] = __( 'Document ID', 'accp' );
+                $new_columns['file_category'] = __( 'Category', 'accp' );
+                $new_columns['due_date'] = __( 'Due Date', 'accp' );
+            }
+        }
+        return $new_columns;
+    }
     /**

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

-                      r3043713
+                      r3062211
  * Core settings related functionality.
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}
 …
         add_submenu_page(
             'accp-settings',
             __( 'General Settings', 'accp' ),
             __( 'Settings', 'accp' ),
+            __( 'General Settings', 'constellation-client-portal' ),
+            __( 'Settings', 'constellation-client-portal' ),
             'manage_options',
             'accp-settings',
 …
             'step'        => array(),
             'maxlength'   => array(),
+            'data-post-type' => array(),
+            'data-post-type' => array(),
+            'media'       => array(),
         );

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

-                      r2920206
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
+    exit; // Exit if accessed directly
+    exit;
+}
 …
     /**
-     * Initialize the class and set its properties.
+     *
      * @since    1.0.0
      * @param      string    $plugin_name       The name of this plugin.
 …
         $this->accp_utility_functions = new ACCP_Utility_Functions();
+    }
+    /**
+     * Add user profile fields.
+     *
+     * @param object $user - The user object.
+     *
+     * @hooked show_user_profile.
+     * @hooked edit_user_profile.
+     * @hooked user_new_form.
+     */
+    function add_core_user_profile_fields($user){
+        if( !is_admin() || !is_user_logged_in() || !current_user_can('manage_options') )
+            return;
+        if( !$user || !is_object($user) )
+            return;
+        $user_id = $user->ID;
+        if(!$user_id)
+            return;
+        /**
+         * Define the allowed html for wp_kses.
+         */
+        $accp_settings = new ARS_Constellation_Client_Portal_Settings();
+        $allowed_html = $accp_settings->get_customized_allowed_html_for_wp_kses();
+        echo wp_kses( $this->get_core_user_fields_html($user, $user_id), $allowed_html );
+    }
+    /**
+     * Get the core user profile fields html.
+     *
+     * @param object $user - The user object.
+     * @param int $user_id - The user ID.
+     */
+    function get_core_user_fields_html($user, $user_id){
+        if( !is_admin() || !is_user_logged_in() )
+            return;
+        if( !$user || !$user_id )
+            return;
+        $wp_post_statuses = get_post_statuses() ? array_keys( (array)get_post_statuses() ) : array();
+        $html = '';
+        $html .= '<h2>Constellation Client Information</h2>';
+        $html .= '<table class="form-table">';
+        /**
+         * Primary Company section.
+         */
+        $html .=    $this->get_user_primary_company_html($user, $user_id);
+        /**
+         * Client Status section.
+         */
+        $html .=    $this->get_user_client_status_html($user, $user_id);
+        /**
+         * Additional Assigned Companies section.
+         */
+        $html .=    $this->get_user_additional_companies_html($user, $user_id);
+        /**
+         * Allow content to be added after the core
+         * user content.
+         *
+         * Buffer the output of the hook so that it
+         * appears in the expected position.
+         *
+         * Hook - accp_after_user_profile_settings.
+         */
+        if( is_admin() && is_user_logged_in() && current_user_can('manage_options') ){
+            ob_start();
+            do_action('accp_after_user_profile_settings', $user_id);
+            $html .= ob_get_contents();
+            ob_end_clean();
+        }
+        $html .= '</table>';
+        return $html;
+    }
+    /**
+     * Get the user profile primary company section html.
+     *
+     * @param object $user - The user object.
+     * @param int $user_id - The user ID.
+     *
+     * @return string $html - The section html.
+     */
+    function get_user_primary_company_html($user, $user_id){
+        if( !is_admin() || !is_user_logged_in() )
+            return;
+        if( !$user || !$user_id )
+            return;
+        $saved_company = is_object($user) ? get_user_meta($user_id, 'client_company', true) : '';
+        $html = '';
+        $html .= '<tr>';
+        $html .=    '<th><label for="client_company">Company</label></th>';
+        $html .=    '<td>';
+        if ( current_user_can('manage_options') ){
+            $args = array(
+                'post_type' => 'accp_clientcompany',
+            );
+            /**
+             * Include all defined WP post statuses,
+             * not just "publish."
+             */
+            if(!empty($wp_post_statuses)){
+                $args['post_status'] = $wp_post_statuses;
+            }
+            $company_list = get_pages($args);
+            $html .= '<select name="client_company" id="client_company">';
+            $html .=    '<option value="">Select a company...</option>';
+                foreach( $company_list as $key => $company ){
+                    $company_id = $company->ID;
+                    $company_name = $company->post_title;
+                    $selected = $saved_company && (int)$saved_company === (int)$company_id ? "selected" : "";
+                    $post_status_class = '';
+                    if( $company->post_status != 'publish' ){
+                        $company_name = $company_name . ' (' . $company->post_status . ')';
+                        $post_status_class = "accp-non-published-post-option";
+                    }
+                    $html .= '<option class="level-0  '. esc_attr($post_status_class) .'" value="'. esc_attr($company_id) .'" '. esc_attr($selected) .' >'. esc_html($company_name) .'</option>';
+                }
+            $html .= '</select>';
+        }else{
+            if( !empty($saved_company) ){
+                $html .= esc_html(get_the_title($saved_company));
+            }
+        }
+        $html .=        '<br />';
+        $html .=    '</td>';
+        $html .= '</tr>';
+        return $html;
+    }
+    /**
+     * Get the user profile client status section html.
+     *
+     * @param object $user - The user object.
+     * @param int $user_id - The user ID.
+     *
+     * @return string $html - The section html.
+     */
+    function get_user_client_status_html($user, $user_id){
+        if( !is_admin() || !is_user_logged_in() )
+            return;
+        if( !$user || !$user_id )
+            return;
+        $saved_status = is_object($user) ? get_user_meta($user->ID, 'client_status', true) : '';
+        $html = '';
+        $html .= '<tr>';
+        $html .=    '<th>';
+        $html .=        '<label for="client_status">';
+        $html .=            'Client Status';
+        if( is_user_logged_in() && current_user_can('manage_options') ){
+            $html .=    '<span class="accp-admin-tooltip-icon">i</span>';
+            $html .=     '<span class="accp-wp-admin-tooltip accp-wp-admin-tooltip-dark accp-wp-admin-has-tooltip-center accp-user-status-tooltip">A status of <strong>Inactive</strong> or <strong>Pending</strong> will prevent the user from accessing client pages, invoices, and files.</span>';
+        }
+        $html .=        '</label>';
+        $html .=    '</th>';
+        $html .=    '<td>';
+        if ( current_user_can('manage_options') ){
+            $html .=    '<select name="client_status" id="client-status" value="'.esc_attr($saved_status).'">';
+            $html .=        '<option value="active" '. ($saved_status == "active" ? esc_attr("selected") : "") .'>Active</option>';
+            $html .=        '<option value="inactive" '. ($saved_status == "inactive" ? esc_attr("selected") : "") .'>Inactive</option>';
+            $html .=        '<option value="pending" '. ($saved_status == "pending" ? esc_attr("selected") : "") .'>Pending</option>';
+            $html .=    '</select>';
+        }else{
+            if(!empty($saved_status)){
+                $html .= esc_html($saved_status);
+            }
+        }
+        $html .=    '</td>';
+        $html .= '</tr>';
+        return $html;
+    }
+     /**
+     * Get the user profile additional companies section html.
+     *
+     * @param object $user - The user object.
+     * @param int $user_id - The user ID.
+     *
+     * @return string $html - The section html.
+     */
+    function get_user_additional_companies_html($user, $user_id){
+        if( !is_admin() || !is_user_logged_in() )
+            return;
+        if( !$user || !$user_id )
+            return;
+        $label = current_user_can('manage_options') ? 'Assign Additional Companies' : 'Additional Companies';
+        $saved_companies = array();
+        if(is_object($user)){
+            if ( get_user_meta($user_id, 'client_additional_company', true) && !empty(get_user_meta($user_id, 'client_additional_company', true)) ){
+                $saved_companies = (array)get_user_meta( $user_id, 'client_additional_company', true );
+            }
+        }
+        $html = '';
+        $html .= '<tr>';
+        $html .=    '<th>';
+        $html .=        '<label for="client_company">'. esc_html($label) .'</label>';
+        $html .=    '</th>';
+        $html .=    '<td>';
+        if ( current_user_can('manage_options') ){
+            $args = array(
+                'post_type' => 'accp_clientcompany',
+            );
+            /**
+             * Include all defined WP post statuses,
+             * not just "publish."
+             */
+            if(!empty($wp_post_statuses)){
+                $args['post_status'] = $wp_post_statuses;
+            }
+            $company_list = get_pages($args);
+            $html .= '<select class="client-add-company-select" name="client_additional_company[]"  value="" multiple="multiple" >';
+                foreach( $company_list as $company ){
+                    $company_id = $company->ID;
+                    $company_name = $company->post_title;
+                    $selected = in_array( $company_id , $saved_companies ) ? "selected" : "";
+                    $post_status_class = '';
+                    if( $company->post_status != 'publish' ){
+                        $company_name = $company_name . ' (' . $company->post_status . ')';
+                        $post_status_class = "accp-non-published-post-option";
+                    }
+                    $html .= '<option class="level-0 '. esc_attr($post_status_class) .'" value="'. esc_attr($company_id) .'" '. esc_attr($selected) .' >'. esc_html($company_name) .'</option>';
+                }
+                $html .= '</select>';
+        }else{
+            if( !empty($saved_companies) ){
+                $html .= '<ul>';
+                foreach( $saved_companies as $saved_company ){
+                    $html .=    '<li>' . esc_html(get_the_title($saved_company)) . '</li>';
+                }
+                $html .= '</ul>';
+            }
+        }
+        $html .=    '</td>';
+        $html .= '</tr>';
+        return $html;
+    }
+    /**
+     * Check user global page suitability.  If a user
+     * is assigned to only 1 company, they are suitable
+     * for global pages, otherwise they are not.
+     *
+     * @param int $user_id - The ID of the user to check.
+     *
+     * @return bool $is_eligible - true|false.
+     */
+    function check_if_user_is_eligible_for_global_pages($user_id){
+        $primary_company_id = get_user_meta($user_id, 'client_company', true);
+        $additional_company_ids = get_user_meta($user_id, 'client_additional_company', true);
+        /**
+         * Return true if a primary company is assigned and no
+         * additional companies are assigned.
+         */
+        if( $primary_company_id && ( !$additional_company_ids || empty($additional_company_ids) ) )
+            return true;
+        /**
+         * Return true if a primary company is not assigned and only
+         * one additional company is assigned.
+         */
+        if( !$primary_company_id && $additional_company_ids && is_array($additional_company_ids) ){
+            if( count($additional_company_ids) === 1)
+                return true;
+        }
+        /**
+         * Return true if a primary company is not assigned and
+         * no additional companies are assigned.
+         */
+        if( !$primary_company_id && ( !$additional_company_ids || empty($additional_company_ids) ) ){
+                return true;
+        }
+        return false;
+    }
+    /**
+     * Save user profile fields.
+     *
+     * @param int $user_id - The user ID.
+     *
+     * @hooked personal_options_update.
+     * @hooked edit_user_profile_update.
+     * @hooked user_register.
+     */
+    function save_extra_user_profile_fields($user_id) {
+        if ( !current_user_can( 'edit_user', $user_id ) ) {
+            return false;
+        }
+        /**
+         * Assigned Company
+         */
+        if(isset($_POST['client_company'])){
+            $company_id = $this->accp_utility_functions->accp_sanitize_integers($_POST['client_company']);
+            update_user_meta( $user_id, 'client_company', $company_id );
+        }
+        /**
+         * User Client Status
+         */
+        if(isset($_POST['client_status'])){
+            $client_status = filter_var($_POST['client_status'], FILTER_SANITIZE_STRING);
+            update_user_meta( $user_id, 'client_status', $client_status );
+        }
+        /**
+         * Additional Companies
+         */
+        if (!empty($_POST['client_additional_company'])){
+            $sanitized_company_array = array();
+            foreach( $_POST['client_additional_company'] as $additional_company_id ){
+                $sanitized_company_array[] = $this->accp_utility_functions->accp_sanitize_integers($additional_company_id);
+            }
+            update_user_meta( $user_id, 'client_additional_company', $sanitized_company_array );
+        }else{
+            delete_user_meta( $user_id, 'client_additional_company');
+        }
+    }
 …
+    }
 } // END ARS_Constellation_Client_Portal_Users

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

-                      r3043713
+                      r3062211
 /**
+ * Admin-specific CSS
+ */
+ * Core Admin CSS.
+ */
 #client-meta .select2{
     width: 100% !important;
 …
+}
 .home-page-hov-nav li {
+.home-page-hov-nav li{
     display: inline;
     font-size: 13px;
 …
+}
 .accp-number-column {
+.accp-number-column{
     width: 40px;
     text-align: center;
 …
+}
 .fa.fa-folder.dir-explorer-icon, .fa.fa-folder-open.dir-explorer-icon {
+.fa.fa-folder.dir-explorer-icon, .fa.fa-folder-open.dir-explorer-icon{
     font-size: 19px;
+}
 …
     display: none;
+}
-/* .alternate, .striped > tbody > :nth-child(3n + 1) {
-    background-color: #f9f9f9;
-} */
 .main-dir-row.even-row, .file-detail-row.even-row{
 …
+}
 .unassigned-text {
+.unassigned-text{
     color: #B1B1B1;
+}
 .file-controls {
+.file-controls{
     display: block;
     width: 100%;
 …
+}
 .file-del-confirm-div, .dir-del-confirm-div {
+.file-del-confirm-div, .dir-del-confirm-div{
     margin-bottom: 30px;
     padding-bottom: 30px;
 …
+}
 .del-btn-container, .del-dir-btn-container {
+.del-btn-container, .del-dir-btn-container{
     display: block;
     margin-top: 8px;
+}
 .inactive-text {
+.inactive-text{
     color: #B1B1B1;
+}
 .small-note {
+.small-note{
     font-size: 11px;
     font-style: italic;
+}
 .tax-role-exclude {
+.tax-role-exclude{
     margin-top: 15px;
     margin-bottom: 40px;
 …
 .tax-role-exclude .select2,
 .tax-company-exclude .select2,
 .tax-custom-select .select2 {
+.tax-custom-select .select2{
     width: 95% !important;
+}
 .accp-settings-messages-and-errors-item.notice {
+.accp-settings-messages-and-errors-item.notice{
     padding-top: 20px;
     padding-bottom: 20px;
+}
 .accp-settings-note.small-note {
+.accp-settings-note.small-note{
     display: block;
     margin-top: 7px;
+}
 #accp-admin-main-content {
+#accp-admin-main-content{
     max-width: 100%;
     background-color: #fff;
 …
+}
 .company-assign-container .select2-selection__arrow {
+.company-assign-container .select2-selection__arrow{
     top: 10px !important;
     right: 3px !important;
+}
 .accp-upgrade-tab-banner {
+.accp-upgrade-tab-banner{
     background-color: #005be0;
     color: #FFF;
 …
+}
 .accp-upgrade-tab-banner h2 {
+.accp-upgrade-tab-banner h2{
     color: #fff;
     font-size: 40px;
 …
+}
 .accp-upgrade-tab-banner p {
+.accp-upgrade-tab-banner p{
     font-size: 18px;
     font-style: italic;
 …
+}
 .accp-upgrade-tab-banner a {
+.accp-upgrade-tab-banner a{
     color: #fff;
     text-decoration: none;
 …
+}
 .accp-upgrade-tab-banner a::after {
+.accp-upgrade-tab-banner a::after{
     content: '>';
     font-weight: bold;
 …
+}
 .accp-upgrade-button {
+.accp-upgrade-button{
     background-color: orange;
     display: block;
 …
+}
 .accp-settings-page-container .accp-upgrade-button {
+.accp-settings-page-container .accp-upgrade-button{
     border-radius: 8px;
+}
 …
+}
 .accp-setting-logo-container {
+.accp-setting-logo-container{
     background-color: #fff;
+}
 .accp-setting-logo-container img {
+.accp-setting-logo-container img{
     width: 80%;
     max-width: 300px;
 …
+}
 .delete-screen-notice {
+.delete-screen-notice{
     display: inline-block;
     margin-top: 6px;
 …
+}
 .accp-filemgmt-button.button {
+.accp-filemgmt-button.button{
     margin-right: 5px !important;
+}
 .accp-filemgmt-button.button:last-child {
+.accp-filemgmt-button.button:last-child{
     margin-right: 0px !important;
+}
 …
+}
 li.accp-filemgmt-button.button {
+li.accp-filemgmt-button.button{
     padding: 0 !important;
     overflow: hidden;
 …
+}
 .shortcode-markup {
+.shortcode-markup{
     border: 1px solid #ccc;
     background-color: #efefef;
 …
+}
 #curr_file_container {
+#curr_file_container{
     border-bottom: 1px solid #eee;
     padding-bottom: 25px;
 …
+}
 .wp-admin input[type="file"].accp-upload-btn {
+.wp-admin input[type="file"].accp-upload-btn{
     padding-left: 7px;
     padding-right: 7px;
 …
+}
 .accp-settings-section {
+.accp-settings-section{
     background-color: #fff;
     padding-top: 10px;
 …
+}
 .accp-settings-section h3 {
+.accp-settings-section h3{
     color: #3A3A3A;
+}
 .accp-settings-section h2 {
+.accp-settings-section h2{
     color: #005be0;
     font-weight: normal;
 …
+}
 ul.theme-thumb-list {
+ul.theme-thumb-list{
     list-style: none;
+}
 ul.theme-thumb-list li {
+ul.theme-thumb-list li{
     border: 1px solid #ccc;
     background: #efefef;
 …
 /* Odd */
 ul.theme-thumb-list li:nth-child(2n+1) {
+ul.theme-thumb-list li:nth-child(2n+1){
     float: left;
+}
 /* Even */
 ul.theme-thumb-list li:nth-child(2n) {
+ul.theme-thumb-list li:nth-child(2n){
     float: right;
+}
 …
+}
 select[name="accp_login_redirect_select"] {
+select[name="accp_login_redirect_select"]{
     margin-top: 7px;
+}
 ul.accp-settings-tabs {
+ul.accp-settings-tabs{
     border-bottom: 1px solid #ddd;
     margin-bottom: 25px;
+}
 .accp-settings-tabs li {
+.accp-settings-tabs li{
     display: inline-block;
     background-color: #e0e0e0;
 …
+}
 .accp-shortcode-col-heading {
+.accp-shortcode-col-heading{
     font-weight: bold;
     color: #777;
 …
+}
 input.accp-copy-text-enabled {
+input.accp-copy-text-enabled{
     cursor: pointer;
     background-color: #eee;
 …
+}
 .accp-shortcode-input-container:hover::after {
     display: block;
+}
 .accp-shortcode-input-container::after {
+.accp-shortcode-input-container:hover::after{
+    display: block;
+}
+.accp-shortcode-input-container::after{
     content: "\f0c5";
     font-family: "Font Awesome 5 Free";
 …
+}
 .accp-shortcode-input-container.accp-element-copied::after {
+.accp-shortcode-input-container.accp-element-copied::after{
     content: "\f00c";
     font-family: "Font Awesome 5 Free";
 …
+}
 .accp-settings-tabs li:hover {
+.accp-settings-tabs li:hover{
     background-color: #fff;
+}
 …
+}
 .accp-settings-tabs a {
+.accp-settings-tabs a{
     text-decoration: none;
     font-size: 11px;
 …
+}
 .accp-settings-tabs a:focus {
+.accp-settings-tabs a:focus{
     outline: none;
     -webkit-box-shadow: none;
 …
+}
 .accp-create-page-container {
+.accp-create-page-container{
     margin-top: 15px;
+}
 .accp-new-page-title {
+.accp-new-page-title{
     margin-bottom: 10px;
+}
 .accp-generate-page-form .accp-create-new-page-instructions {
+.accp-generate-page-form .accp-create-new-page-instructions{
     margin-top: 25px;
     display: block;
 …
+}
 .tablenav .select2-selection.select2-selection--single {
+.tablenav .select2-selection.select2-selection--single{
     height: 100%;
     border-radius: 3px;
 …
+}
 label .title.accp-quickedit-invoice-status-label {
+label .title.accp-quickedit-invoice-status-label{
     width: auto !important;
     margin-right: 5px !important;
+}
 .accp-admin-invoice-data-quickedit {
+.accp-admin-invoice-data-quickedit{
     margin-bottom: 0;
+}
 .accp-duplicate-dir-assignment-notice {
+.accp-duplicate-dir-assignment-notice{
     padding: 15px;
     border: 2px solid #ff5e5e;
 …
+}
 .accp-reassign-directory-button.button {
+.accp-reassign-directory-button.button{
     margin-top: 15px;
     margin-bottom: 15px;
+}
 .accp-dir-reassign-option {
+.accp-dir-reassign-option{
     background-color: #f6f7f7;
     padding-top: 10px;
 …
+}
 .accp-field-note {
+.accp-field-note{
     font-style: italic;
     color: #808080;
 …
+}
 .accp-boxed-container {
+.accp-boxed-container{
     background-color: #f6f7f7;
     border: 1px solid #eeefef;
 …
+}
 .accp-boxed-container.current-assigned-company-container {
+.accp-boxed-container.current-assigned-company-container{
     margin-bottom: 20px;
+}
 .accp-boxed-container label {
+.accp-boxed-container label{
     font-weight: 600;
     padding-top: 15px;
+}
 .accp-or-sparator {
+.accp-or-sparator{
     font-weight: 600;
+}
 …
+}
 .accp-wp-admin-tooltip {
+.accp-wp-admin-tooltip{
     position: absolute;
     z-index: 1;
 …
+}
 .accp-wp-admin-tooltip-dark {
+.accp-wp-admin-tooltip-dark{
     position: absolute;
     z-index: 1;
 …
+}
 .accp-wp-admin-tooltip.accp-user-status-tooltip {
+.accp-wp-admin-tooltip.accp-user-status-tooltip{
     left: 0;
+}
 .accp-wp-admin-tooltip::after {
+.accp-wp-admin-tooltip::after{
     content:'';
     position: absolute;
 …
+}
 .accp-wp-admin-tooltip-dark::after {
+.accp-wp-admin-tooltip-dark::after{
     border-top: solid 10px #3c434a;
+}
 .accp-wp-admin-has-tooltip-center {
+.accp-wp-admin-has-tooltip-center{
     left: 12%;
     margin-top: -115px;
+}
 .accp-company-global-page-tooltip {
+.accp-company-global-page-tooltip{
     margin-top: -143px;
+}
 .accp-generate-page-form p.accp-create-new-page-instructions {
+.accp-generate-page-form p.accp-create-new-page-instructions{
     margin-top: 20px;
+}
 .accp-generate-new-page-field-container {
+.accp-generate-new-page-field-container{
     display: block;
     margin-bottom: 10px;
+}
 .button.button-primary.accp-generate-new-page {
+.button.button-primary.accp-generate-new-page{
     margin-top: 15px;
+}
 .accp-unpublished-company-item {
+.accp-unpublished-company-item{
     padding: 10px;
     background-color: #fff;
 …
+}
 .accp-delete-unpublished-company-item {
+.accp-delete-unpublished-company-item{
     display: inline-block;
     background-color: #C3C3C3;
 …
+}
 option.accp-non-published-post-option {
+option.accp-non-published-post-option{
     color: #717171;
+}
 .accp-boxed-container label[for="accp_make_page_global"] {
+.accp-boxed-container label[for="accp_make_page_global"]{
     display: block;
     padding-bottom: 15px;
+}
 .accp-boxed-container.accp-specify-company-field-container .select2-container {
+.accp-boxed-container.accp-specify-company-field-container .select2-container{
     padding-bottom: 15px;
+}
 .accp-boxed-container.current-assigned-company-container p {
+.accp-boxed-container.current-assigned-company-container p{
     padding-top: 15px;
     padding-bottom: 15px;
 …
+}
 .accp-dir-update-notice {
+.accp-dir-update-notice{
     border: 2px solid #c9d1de;
     background-color: #e0e8f5;
 …
+}
 .accp-dir-update-check-label {
+.accp-dir-update-check-label{
     display: block;
     margin-bottom: 10px;
+}
 #accp-create-user-container {
+#accp-create-user-container{
     margin-top: 25px;
+}
 .accp-new-user-field {
+.accp-new-user-field{
     display: block;
     margin-bottom: 20px;
+}
 .accp-set-width-label-85 {
+.accp-set-width-label-85{
     width: 85px;
     display: inline-block;
+}
 #accp-autogenerate-password {
+#accp-autogenerate-password{
     margin-left: 10px;
+}
 …
+}
 #accp-assign-primary-user-container {
+#accp-assign-primary-user-container{
     border: 1px solid #eeefef;
     margin-top: 25px;
 …
+}
 .accp-assign-primary-user-heading {
+.accp-assign-primary-user-heading{
     display: block;
     margin-top: 20px;
 …
+}
 .accp-upgrade-pro-feature-item-container:hover {
+.accp-upgrade-pro-feature-item-container:hover{
     background-color: #005be0;
+}
 …
+}
 .accp-upgrade-pro-feature-item-container:hover > a .accp-upgrade-pro-feature-item-title {
+.accp-upgrade-pro-feature-item-container:hover > a .accp-upgrade-pro-feature-item-title{
     color: #fff;
+}
 …
+}
 .accp-upgrade-pro-feature-item-title {
+.accp-upgrade-pro-feature-item-title{
     font-size: 21px;
     line-height: 27px;
 …
+}
 .accp-upgrade-pro-feature-item-container p {
+.accp-upgrade-pro-feature-item-container p{
     color: #777;
     font-size: 14px;
+}
 .accp-upgrade-pro-feature-item-container a {
+.accp-upgrade-pro-feature-item-container a{
     text-decoration: none;
     width: 100%;
 …
+}
 .accp-settings-section-inner {
+.accp-settings-section-inner{
     border-bottom: 1px solid #eee;
     padding-bottom: 15px;
 …
+}
 .company_status_row {
+.company_status_row{
     margin-bottom: 15px;
+}
 …
 .company_status_row label,
 .company_status_row input,
 .company_status_row select {
+.company_status_row select{
     margin-right: 5px;
+}
 .company_status_row .accp-row-add {
+.company_status_row .accp-row-add{
     margin-left: 5px;
     margin-right: 10px;
+}
 .company_status_row i {
+.company_status_row i{
     font-size: 15px;
     position: relative;
 …
+}
 .accp-add-status-row.button {
+.accp-add-status-row.button{
     cursor: pointer;
+}
 …
+}
 #accp-settings-sidebar-container {
+#accp-settings-sidebar-container{
     padding-left: 20px;
     padding-top: 20px;
 …
+}
 .accp-settings-page-container.wrap {
+.accp-settings-page-container.wrap{
     background-color: #fff;
     min-height: 800px;
+}
 .accp-admin-main-content-header {
+.accp-admin-main-content-header{
     margin-bottom: 15px;
+}
 …
+}
 @media screen and (min-width: 980px) {
     .accp-upgrade-pro-feature-short-list {
+@media screen and (min-width: 980px){
+    .accp-upgrade-pro-feature-short-list{
         display: grid;
         grid-template-columns: auto auto auto;
 …
+    }
     #accp-admin-main-content {
+    #accp-admin-main-content{
         margin-left: 200px;
+    }

constellation-client-portal/trunk/admin/css/jquery-ui/1.11.1/themes/cupertino/jquery-ui.css

-                      r2663884
+                      r3062211
 .ui-widget-content {
     border: 1px solid #dddddd;
     background: #f2f5f7 url("images/ui-bg_highlight-hard_100_f2f5f7_1x100.png") 50% top repeat-x;
+    background: #f2f5f7 /* url("images/ui-bg_highlight-hard_100_f2f5f7_1x100.png") 50% top repeat-x */;
     color: #362b36;
+}
 …
 .ui-widget-header {
     border: 1px solid #aed0ea;
     background: #deedf7 url("images/ui-bg_highlight-soft_100_deedf7_1x100.png") 50% 50% repeat-x;
+    background: #deedf7 /* url("images/ui-bg_highlight-soft_100_deedf7_1x100.png") 50% 50% repeat-x */;
     color: #222222;
     font-weight: bold;
 …
 .ui-widget-header .ui-state-default {
     border: 1px solid #aed0ea;
     background: #d7ebf9 url("images/ui-bg_glass_80_d7ebf9_1x400.png") 50% 50% repeat-x;
+    background: #d7ebf9 /* url("images/ui-bg_glass_80_d7ebf9_1x400.png") 50% 50% repeat-x */;
     font-weight: bold;
     color: #2779aa;
 …
 .ui-widget-header .ui-state-focus {
     border: 1px solid #74b2e2;
     background: #e4f1fb url("images/ui-bg_glass_100_e4f1fb_1x400.png") 50% 50% repeat-x;
+    background: #e4f1fb /* url("images/ui-bg_glass_100_e4f1fb_1x400.png") 50% 50% repeat-x */;
     font-weight: bold;
     color: #0070a3;
 …
 .ui-widget-header .ui-state-active {
     border: 1px solid #2694e8;
     background: #3baae3 url("images/ui-bg_glass_50_3baae3_1x400.png") 50% 50% repeat-x;
+    background: #3baae3 /* url("images/ui-bg_glass_50_3baae3_1x400.png") 50% 50% repeat-x */;
     font-weight: bold;
     color: #ffffff;
 …
 .ui-widget-header .ui-state-highlight {
     border: 1px solid #f9dd34;
     background: #ffef8f url("images/ui-bg_highlight-soft_25_ffef8f_1x100.png") 50% top repeat-x;
+    background: #ffef8f /* url("images/ui-bg_highlight-soft_25_ffef8f_1x100.png") 50% top repeat-x */;
     color: #363636;
+}
 …
 .ui-widget-header .ui-state-error {
     border: 1px solid #cd0a0a;
     background: #cd0a0a url("images/ui-bg_flat_15_cd0a0a_40x100.png") 50% 50% repeat-x;
+    background: #cd0a0a /* url("images/ui-bg_flat_15_cd0a0a_40x100.png") 50% 50% repeat-x */;
     color: #ffffff;
+}
 …
     height: 16px;
+}
 .ui-icon,
+/* .ui-icon,
 .ui-widget-content .ui-icon {
     background-image: url("images/ui-icons_72a7cf_256x240.png");
 …
 .ui-state-error-text .ui-icon {
     background-image: url("images/ui-icons_ffffff_256x240.png");
+}
+} */
 /* positioning */
 …
 /* Overlays */
 .ui-widget-overlay {
     background: #eeeeee url("images/ui-bg_diagonals-thick_90_eeeeee_40x40.png") 50% 50% repeat;
+    background: #eeeeee /* url("images/ui-bg_diagonals-thick_90_eeeeee_40x40.png") 50% 50% repeat */;
     opacity: .8;
     filter: Alpha(Opacity=80); /* support: IE8 */
 …
     margin: -7px 0 0 -7px;
     padding: 7px;
     background: #000000 url("images/ui-bg_highlight-hard_70_000000_1x100.png") 50% top repeat-x;
+    background: #000000 /* url("images/ui-bg_highlight-hard_70_000000_1x100.png") 50% top repeat-x */;
     opacity: .3;
     filter: Alpha(Opacity=30); /* support: IE8 */

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

-                      r3043713
+                      r3062211
         accp_admin_make_company_select_field_required();
+        accp_initiate_core_select2_fields();
+        // Delete file associated with accp_clientfile post
+        // when 'permanently delete' is clicked
+        accp_initiate_core_select2_fields();
+        accp_delete_file_attachment_on_post_permanent_delete();
+        accp_delete_file_attachment_on_bulk_post_permanent_delete();
+        accp_delete_file_attachment_on_post_empty_trash();
+        accp_admin_toggle_file_reassign_form();
+        accp_admin_toggle_file_replace_form();
+        accp_reassign_post_company_on_click();
+        accp_create_company_directory_on_click();
+        accp_assign_company_directory_on_click();
+        accp_generate_password_on_click();
+        accp_toggle_create_new_primary_user_section();
+        accp_assign_existing_primary_user_on_click();
+        accp_create_and_assign_new_primary_user_on_click();
+        accp_reassign_company_directory_on_click();
+        accp_toggle_create_new_company_home_page_form();
+        accp_generate_new_company_home_page_on_click();
+        accp_dismiss_duplicate_dir_assignment_message_on_click();
+        accp_save_bulk_edit_post_data();
+    }); // End document ready.
+    function accp_save_invoice_bulk_edit(e){
+        if( $('#invoice-status-bulk-edit-select').length ){
+            /**
+             * Disable pointer events instead of setting
+             * a "disabled" property to allow native WP
+             * post data to be saved normally.
+             */
+            accp_disable_pointer_events_by_event_target(e);
+            accp_add_and_show_status_spinner_after_bulk_add_buttons(e);
+            var post_ids = new Array();
+            var invoice_status = $('#invoice-status-bulk-edit-select').val();
+            var nonce = $('#accp-invoice-bulk-edit-section').attr('data-nonce');
+            $( 'tr#bulk-edit ul#bulk-titles-list li button' ).each( function() {
+                post_ids.push( $( this ).attr( 'id' ).replace( /^(_)/i, '' ) );
+            });
+            if(invoice_status != "-1"){
+                $.ajax({
+                    url: ajaxurl,
+                    type: 'POST',
+                    async: false,
+                    data: {
+                        action: 'accp_save_invoice_bulk_edit',
+                        post_ids: post_ids,
+                        invoice_status: invoice_status,
+                        nonce: nonce
+                    },
+                    success: function(data){
+                    },
+                    error: function(jqXHR, textStatus, errorThrown){
+                        accp_reset_pointer_events_by_selector('#bulk-edit');
+                        $('.accp-spinner-after-bulk-edit').remove();
+                        console.log(textStatus, errorThrown);
+                        console.log(jqXHR);
+                    },
+                });
+            }
+        }
+    }
+    function accp_save_file_bulk_edit(e){
+        if( $('#file-status-bulk-edit-select').length ){
+            /**
+             * Disable pointer events instead of setting
+             * a "disabled" property to allow native WP
+             * post data to be saved normally.
+             */
+            accp_disable_pointer_events_by_event_target(e);
+            accp_add_and_show_status_spinner_after_bulk_add_buttons(e);
+            var post_ids = new Array();
+            var file_status = $('#file-status-bulk-edit-select').val();
+            var nonce = $('#accp-file-bulk-edit-section').attr('data-nonce');
+            $( 'tr#bulk-edit ul#bulk-titles-list li button' ).each( function() {
+                post_ids.push( $( this ).attr( 'id' ).replace( /^(_)/i, '' ) );
+            });
+            if(file_status != "-1"){
+                $.ajax({
+                    url: ajaxurl,
+                    type: 'POST',
+                    async: false,
+                    data: {
+                        action: 'accp_save_file_bulk_edit',
+                        post_ids: post_ids,
+                        file_status: file_status,
+                        nonce: nonce
+                    },
+                    success: function(data){
+                    },
+                    error: function(jqXHR, textStatus, errorThrown){
+                        accp_reset_pointer_events_by_selector('#bulk-edit');
+                        $('.accp-spinner-after-bulk-edit').remove();
+                        console.log(textStatus, errorThrown);
+                        console.log(jqXHR);
+                    },
+                });
+            }
+        }
+    }
+    function accp_save_global_file_bulk_edit(e){
+        if( $('#global-file-status-bulk-edit-select').length ){
+            /**
+             * Disable pointer events instead of setting
+             * a "disabled" property to allow native WP
+             * post data to be saved normally.
+             */
+            accp_disable_pointer_events_by_event_target(e);
+            accp_add_and_show_status_spinner_after_bulk_add_buttons(e);
+            var post_ids = new Array();
+            var file_status = $('#global-file-status-bulk-edit-select').val();
+            var nonce = $('#accp-file-bulk-edit-section').attr('data-nonce');
+            $( 'tr#bulk-edit ul#bulk-titles-list li button' ).each( function() {
+                post_ids.push( $( this ).attr( 'id' ).replace( /^(_)/i, '' ) );
+            });
+            if(file_status != "-1"){
+                $.ajax({
+                    url: ajaxurl,
+                    type: 'POST',
+                    async: false,
+                    data: {
+                        action: 'accp_save_global_file_bulk_edit',
+                        post_ids: post_ids,
+                        file_status: file_status,
+                        nonce: nonce
+                    },
+                    success: function(data){
+                    },
+                    error: function(jqXHR, textStatus, errorThrown){
+                        accp_reset_pointer_events_by_selector('#bulk-edit');
+                        $('.accp-spinner-after-bulk-edit').remove();
+                        console.log(textStatus, errorThrown);
+                        console.log(jqXHR);
+                    },
+                });
+            }
+        }
+    }
+    function accp_admin_make_company_select_field_required(){
+        if( $('.company-assign-container select#company-select').length > -1 ){
+            $('select#company-select').attr('required', true);
+        }
+    }
+    function accp_admin_toggle_file_reassign_form(){
+        $('#reassign-toggle').click(function () {
+            if ($('#reassign-form-container').is(":hidden")){
+                $('#reassign-form-container').show('slow');
+                $('.accp-hide-assigment').show();
+                $('#reassign-toggle').text('Cancel');
+            }else{
+                $('#reassign-form-container').hide();
+                $('.accp-hide-assigment').hide();
+                $('#reassign-toggle').text('Reassign');
+            }
+        });
+    }
+    function accp_admin_toggle_file_replace_form(){
+        $('#replace-file-toggle').click(function () {
+            if ($('.accp-file-replace-hide').is(":hidden")){
+                $('.accp-file-replace-hide').show('slow');
+                $('#replace-file-toggle').text('Cancel');
+            }else{
+                $('.accp-file-replace-hide').hide();
+                $('#replace-file-toggle').text('Replace File');
+            }
+        });
+    }
+    function accp_add_and_show_status_spinner(e){
+        var target_elem = e.target;
+        var unique_class = 'accp-' + Math.random().toString(36).slice(2) + '-spinner';
+        var spinner_elem = '<span class="'+unique_class+' accp-spinner spinner" style="float: none;"></span>';
+        var new_spinner_class = '.' + unique_class + '.accp-spinner.spinner';
+        $(spinner_elem).insertAfter(target_elem);
+        $(new_spinner_class).css('visibility', 'visible');
+        return new_spinner_class;
+    }
+    function accp_add_and_show_status_spinner_after_bulk_add_buttons(e){
+        var target_elem = e.target.closest('.submit.inline-edit-save');
+        var unique_class = 'accp-' + Math.random().toString(36).slice(2) + '-spinner';
+        var spinner_elem = '<span class="'+unique_class+' accp-spinner spinner accp-spinner-after-bulk-edit" style="float: none;"></span>';
+        var new_spinner_class = '.' + unique_class + '.accp-spinner.spinner';
+        $(spinner_elem).appendTo(target_elem);
+        $(new_spinner_class).css('visibility', 'visible');
+        return new_spinner_class;
+    }
+    function accp_disable_element_by_event_target(e){
+        var target_elem = e.target;
+        $(target_elem).prop('disabled', true);
+    }
+    function accp_disable_pointer_events_by_event_target(e){
+        var target_elem = e.target;
+        $(target_elem).attr('style', 'pointer-events: none;');
+    }
+    function accp_reset_pointer_events_by_selector(selector){
+        $(selector).attr('style', 'pointer-events: all;');
+    }
+    function accp_remove_disabled_prop_from_element(selector){
+        $(selector).prop('disabled', false);
+    }
+    function accp_initiate_core_select2_fields(){
+        $('.client-add-company-select').select2({
+            placeholder: 'Select a company...',
+            multiple: true,
+            allowClear: true,
+            tags: true,
+            tokenSeparators: [',', ' ']
+        });
+        $('#company-select').select2({
+            placeholder: 'Select a company...',
+            multiple: false,
+            allowClear: true,
+            tags: true,
+            tokenSeparators: [',', ' ']
+        });
+        if($('select.accp_admin_list_filter').length){
+            $('select.accp_admin_list_filter').select2({
+                multiple: false
+            });
+        }
+    }
+    function accp_delete_file_attachment_on_post_permanent_delete(){
         $('table a.submitdelete').click(function (e) {
 …
                     },
+                });
+            }
+        });
+        /**
+         * Bulk delete clienfiles function - delete posts and files
+         * when posts are checked and the bulk permanently delete
+         * option is selected.
+         */
+        $('#doaction').click(function (e) {
+            // Only do this on accp_clientfile or accp_clientinvoice delete pages
+                });
+            }
+        });
+    }
+    function accp_delete_file_attachment_on_bulk_post_permanent_delete(){
+        $('#doaction').click(function (e) {
             if (
+                (
 …
                 var bulk_delete_nonce = $('#clientfile-admin-nonce').attr('data-nonce');
+                    $.ajax({
+                        type: 'POST',
+                        url: ajaxurl,
+                        cache: false,
+                        headers: {
+                            'cache-control': 'no-cache',
+                        },
+                        data: {
+                            action:'accp_bulk_delete_file_on_post_delete',
+                            bulk_delete_nonce: bulk_delete_nonce,
+                            del_file_post_id_json: del_file_post_id_json,
+                        },
+                        success: function(data){
+                            window.location.reload(true);
+                        },
+                        error: function(jqXHR, textStatus, errorThrown){
+                            console.log(textStatus, errorThrown);
+                            console.log(jqXHR);
+                        },
+                    });
+            }
+        });
+        /**
+         *  Bulk delete clienfiles function - accp_clientfile empty trash button
+         */
+                $.ajax({
+                    type: 'POST',
+                    url: ajaxurl,
+                    cache: false,
+                    headers: {
+                        'cache-control': 'no-cache',
+                    },
+                    data: {
+                        action:'accp_bulk_delete_file_on_post_delete',
+                        bulk_delete_nonce: bulk_delete_nonce,
+                        del_file_post_id_json: del_file_post_id_json,
+                    },
+                    success: function(data){
+                        window.location.reload(true);
+                    },
+                    error: function(jqXHR, textStatus, errorThrown){
+                        console.log(textStatus, errorThrown);
+                        console.log(jqXHR);
+                    },
+                });
+            }
+        });
+    }
+    function accp_delete_file_attachment_on_post_empty_trash(){
          $('#delete_all').click(function (e) {
 …
                 $.ajax({
+                        type: 'POST',
+                        url: ajaxurl,
+                        cache: false,
+                        headers: {
+                            'cache-control': 'no-cache',
+                        },
+                        data: {
+                            action:'accp_bulk_delete_file_on_empty_trash',
+                            empty_trash_nonce: empty_trash_nonce,
+                            post_type: post_type
+                        },
+                        success: function(data){
+                            window.location.reload(true);
+                        },
+                        error: function(jqXHR, textStatus, errorThrown){
+                            console.log(textStatus, errorThrown);
+                            console.log(jqXHR);
+                        },
+                    });
+            }
+        });
+        accp_admin_toggle_file_reassign_form();
+        accp_admin_toggle_file_replace_form();
+                    type: 'POST',
+                    url: ajaxurl,
+                    cache: false,
+                    headers: {
+                        'cache-control': 'no-cache',
+                    },
+                    data: {
+                        action:'accp_bulk_delete_file_on_empty_trash',
+                        empty_trash_nonce: empty_trash_nonce,
+                        post_type: post_type
+                    },
+                    success: function(data){
+                        window.location.reload(true);
+                    },
+                    error: function(jqXHR, textStatus, errorThrown){
+                        console.log(textStatus, errorThrown);
+                        console.log(jqXHR);
+                    },
+                });
+            }
+        });
+    }
+    function accp_reassign_post_company_on_click(){
         $('#accp_reassign_btn').click(function (e) {
             e.preventDefault();
 …
         });
+    }
+    function accp_create_company_directory_on_click(){
         $('#accp-generate-dir-btn').click(function (e) {
 …
         });
+    }
+    function accp_assign_company_directory_on_click(){
         $('#accp-assign-dir-btn').click(function (e) {
 …
         });
+    }
+    function accp_generate_password_on_click(){
         $('#accp-autogenerate-password').click(function (e) {
 …
         });
+    }
+    function accp_toggle_create_new_primary_user_section(){
         $('.accp-create-new-primary-user-btn').click(function (e) {
 …
         });
+    }
+    function accp_assign_existing_primary_user_on_click(){
         $('#accp-assign-existing-primary-user-btn').click(function (e) {
 …
         });
+    }
+    function accp_create_and_assign_new_primary_user_on_click(){
         $('#accp-generate-new-user-btn').click(function (e) {
 …
+            }
+        });
+        });
+    }
+    function accp_reassign_company_directory_on_click(){
         $('.accp-reassign-directory-button.button').click(function(){
 …
         });
+    }
+    function accp_toggle_create_new_company_home_page_form(){
         $('.accp-show-new-page-form').click(function () {
 …
         });
+    }
+    function accp_generate_new_company_home_page_on_click(){
         $('.accp-generate-new-page').click(function (e) {
 …
         });
+    }
+    function accp_dismiss_duplicate_dir_assignment_message_on_click(){
         $('.accp-dismiss-dir-assigment-msg.button').click(function (e) {
 …
         });
+    }
+    function accp_save_bulk_edit_post_data(){
         $('#bulk_edit').on( 'click', function(e) {
 …
         });
-    }); // End document ready
-    function accp_save_invoice_bulk_edit(e){
-        if( $('#invoice-status-bulk-edit-select').length ){
-            /**
-             * Disable pointer events instead of setting
-             * a "disabled" property to allow native WP
-             * post data to be saved normally.
-             */
-            accp_disable_pointer_events_by_event_target(e);
-            accp_add_and_show_status_spinner_after_bulk_add_buttons(e);
-            var post_ids = new Array();
-            var invoice_status = $('#invoice-status-bulk-edit-select').val();
-            var nonce = $('#accp-invoice-bulk-edit-section').attr('data-nonce');
-            $( 'tr#bulk-edit ul#bulk-titles-list li button' ).each( function() {
-                post_ids.push( $( this ).attr( 'id' ).replace( /^(_)/i, '' ) );
-            });
-            if(invoice_status != "-1"){
-                $.ajax({
-                    url: ajaxurl,
-                    type: 'POST',
-                    async: false,
-                    data: {
-                        action: 'accp_save_invoice_bulk_edit',
-                        post_ids: post_ids,
-                        invoice_status: invoice_status,
-                        nonce: nonce
-                    },
-                    success: function(data){
-                    },
-                    error: function(jqXHR, textStatus, errorThrown){
-                        accp_reset_pointer_events_by_selector('#bulk-edit');
-                        $('.accp-spinner-after-bulk-edit').remove();
-                        console.log(textStatus, errorThrown);
-                        console.log(jqXHR);
-                    },
-                });
+            }
+        }
+    }
-    function accp_save_file_bulk_edit(e){
-        if( $('#file-status-bulk-edit-select').length ){
-            /**
-             * Disable pointer events instead of setting
-             * a "disabled" property to allow native WP
-             * post data to be saved normally.
-             */
-            accp_disable_pointer_events_by_event_target(e);
-            accp_add_and_show_status_spinner_after_bulk_add_buttons(e);
-            var post_ids = new Array();
-            var file_status = $('#file-status-bulk-edit-select').val();
-            var nonce = $('#accp-file-bulk-edit-section').attr('data-nonce');
-            $( 'tr#bulk-edit ul#bulk-titles-list li button' ).each( function() {
-                post_ids.push( $( this ).attr( 'id' ).replace( /^(_)/i, '' ) );
-            });
-            if(file_status != "-1"){
-                $.ajax({
-                    url: ajaxurl,
-                    type: 'POST',
-                    async: false,
-                    data: {
-                        action: 'accp_save_file_bulk_edit',
-                        post_ids: post_ids,
-                        file_status: file_status,
-                        nonce: nonce
-                    },
-                    success: function(data){
-                    },
-                    error: function(jqXHR, textStatus, errorThrown){
-                        accp_reset_pointer_events_by_selector('#bulk-edit');
-                        $('.accp-spinner-after-bulk-edit').remove();
-                        console.log(textStatus, errorThrown);
-                        console.log(jqXHR);
-                    },
-                });
+            }
+        }
+    }
-    function accp_save_global_file_bulk_edit(e){
-        if( $('#global-file-status-bulk-edit-select').length ){
-            /**
-             * Disable pointer events instead of setting
-             * a "disabled" property to allow native WP
-             * post data to be saved normally.
-             */
-            accp_disable_pointer_events_by_event_target(e);
-            accp_add_and_show_status_spinner_after_bulk_add_buttons(e);
-            var post_ids = new Array();
-            var file_status = $('#global-file-status-bulk-edit-select').val();
-            var nonce = $('#accp-file-bulk-edit-section').attr('data-nonce');
-            $( 'tr#bulk-edit ul#bulk-titles-list li button' ).each( function() {
-                post_ids.push( $( this ).attr( 'id' ).replace( /^(_)/i, '' ) );
-            });
-            if(file_status != "-1"){
-                $.ajax({
-                    url: ajaxurl,
-                    type: 'POST',
-                    async: false,
-                    data: {
-                        action: 'accp_save_global_file_bulk_edit',
-                        post_ids: post_ids,
-                        file_status: file_status,
-                        nonce: nonce
-                    },
-                    success: function(data){
-                    },
-                    error: function(jqXHR, textStatus, errorThrown){
-                        accp_reset_pointer_events_by_selector('#bulk-edit');
-                        $('.accp-spinner-after-bulk-edit').remove();
-                        console.log(textStatus, errorThrown);
-                        console.log(jqXHR);
-                    },
-                });
+            }
+        }
+    }
-    function accp_admin_make_company_select_field_required(){
-        if($('.company-assign-container select#company-select').length > -1){
-            $('select#company-select').attr('required', true);
+        }
+    }
-    function accp_admin_toggle_file_reassign_form(){
-        $('#reassign-toggle').click(function () {
-            if ($('#reassign-form-container').is(":hidden")){
-                $('#reassign-form-container').show('slow');
-                $('.accp-hide-assigment').show();
-                $('#reassign-toggle').text('Cancel');
-            }else{
-                $('#reassign-form-container').hide();
-                $('.accp-hide-assigment').hide();
-                $('#reassign-toggle').text('Reassign');
+            }
-        });
+    }
-    function accp_admin_toggle_file_replace_form(){
-        $('#replace-file-toggle').click(function () {
-            if ($('.accp-file-replace-hide').is(":hidden")){
-                $('.accp-file-replace-hide').show('slow');
-                $('#replace-file-toggle').text('Cancel');
-            }else{
-                $('.accp-file-replace-hide').hide();
-                $('#replace-file-toggle').text('Replace File');
+            }
-        });
+    }
-    function accp_add_and_show_status_spinner(e){
-        var target_elem = e.target;
-        var unique_class = 'accp-' + Math.random().toString(36).slice(2) + '-spinner';
-        var spinner_elem = '<span class="'+unique_class+' accp-spinner spinner" style="float: none;"></span>';
-        var new_spinner_class = '.' + unique_class + '.accp-spinner.spinner';
-        $(spinner_elem).insertAfter(target_elem);
-        $(new_spinner_class).css('visibility', 'visible');
-        return new_spinner_class;
+    }
-    function accp_add_and_show_status_spinner_after_bulk_add_buttons(e){
-        var target_elem = e.target.closest('.submit.inline-edit-save');
-        var unique_class = 'accp-' + Math.random().toString(36).slice(2) + '-spinner';
-        var spinner_elem = '<span class="'+unique_class+' accp-spinner spinner accp-spinner-after-bulk-edit" style="float: none;"></span>';
-        var new_spinner_class = '.' + unique_class + '.accp-spinner.spinner';
-        $(spinner_elem).appendTo(target_elem);
-        $(new_spinner_class).css('visibility', 'visible');
-        return new_spinner_class;
+    }
-    function accp_disable_element_by_event_target(e){
-        var target_elem = e.target;
-        $(target_elem).prop('disabled', true);
+    }
-    function accp_disable_pointer_events_by_event_target(e){
-        var target_elem = e.target;
-        $(target_elem).attr('style', 'pointer-events: none;');
+    }
-    function accp_reset_pointer_events_by_selector(selector){
-        $(selector).attr('style', 'pointer-events: all;');
+    }
-    function accp_remove_disabled_prop_from_element(selector){
-        $(selector).prop('disabled', false);
+    }
-    function accp_initiate_core_select2_fields(){
-        $('.client-add-company-select').select2({
-            placeholder: 'Select a company...',
-            multiple: true,
-            allowClear: true,
-            tags: true,
-            tokenSeparators: [',', ' ']
-        });
-        $('#company-select').select2({
-            placeholder: 'Select a company...',
-            multiple: false,
-            allowClear: true,
-            tags: true,
-            tokenSeparators: [',', ' ']
-        });
-        if($('select.accp_admin_list_filter').length){
-            $('select.accp_admin_list_filter').select2({
-                multiple: false
-            });
+        }
+    }

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

-                      r3043713
+                      r3062211
  * 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.8.0
+ * Version:           1.8.1
  * Author:            ARS
  * Author URI:        https://adrianrodriguezstudios.com
 …
      */
     define('ACCP_PLUGIN_NAME', 'ARS_CONSTELLATION_CLIENT_PORTAL');
     define('ACCP_PLUGIN_VERSION', '1.8.0'); // Change the version in the header as well.
+    define('ACCP_PLUGIN_VERSION', '1.8.1'); // Change the version in the header as well.
     define( ACCP_PLUGIN_NAME, ACCP_PLUGIN_VERSION );
     define('ACCP_PLUGIN_FILE_NAME', __FILE__);
     define('ACCP_PLUGIN_DIR_URL', plugin_dir_url( __FILE__ ) );
+    define('ACCP_PLUGIN_DIR_PATH', plugin_dir_path( __FILE__ ) );

constellation-client-portal/trunk/includes/ars-constellation-client-portal-install-uninstall.php

-                      r2987566
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}
 …
 /**
+ * Add default Company Status options
+ * on plugin activation - leave the options/statuses
+ * in place on plugin deactivation in case the plugin is
+ * reactivated.
+ * Add default Company Status options on plugin activation -
+ * leave the options/statuses in place on plugin deactivation
+ * in case the plugin is reactivated.
  */
 function add_default_company_statuses(){
 …
         $new[] = array( 'label' => sanitize_text_field('Active'), 'value' => sanitize_text_field('active'), 'status_action' => sanitize_text_field('vis_no_action') );
         $new[] = array( 'label' => sanitize_text_field('Pending'), 'value' => sanitize_text_field('pending'), 'status_action' => sanitize_text_field('vis_no_action') );
         $new[] = array( 'label' => sanitize_text_field('Inactive'), 'value' => sanitize_text_field('inactive'), 'status_action' => sanitize_text_field('vis_no_action') );
 …
                 $missing_statuses[] = 'pending';
+            }
+            }
+        }

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

-                      r2946134
+                      r3062211
     /**
+     * Check if post type slug is a valid post type.
+     *
+     * @param string $slug - The slug to check.
+     *
+     * @return bool $is_valid_post_type - True if the slug is a valid post type or false if not.
+     */
+    function check_if_post_type_slug_is_valid_post_type($slug){
+        if(!$slug)
+            return false;
+        /**
+         * Get all post types.
+         */
+        $post_types = get_post_types( array(), 'objects');
+        foreach($post_types as $post_type){
+            /**
+             * Check the post type name.
+             */
+            $name = $post_type->name;
+            /**
+             * Return false if the post type name
+             * matches the slug being checked.
+             */
+            if( $name === sanitize_text_field( strtolower($slug) ) ){
+                $is_valid_post_type = true;
+                return $is_valid_post_type;
+            }
+        }
+        return false;
+    }
+    /**
      * Check slug for uniqueness, and
      * verify that it is not already in use

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

-                      r2973972
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}
 …
      * @since    1.0.0
      */
+    public function __construct() {
+        // Check for Premium version
+        if ( defined( 'ARS_CONSTELLATION_CLIENT_PORTAL_PREMIUM' ) ) {
+            $this->version = ARS_CONSTELLATION_CLIENT_PORTAL_PREMIUM;
+            $this->plugin_name = 'ars-constellation-client-portal-premium';
+        // Check for Pro version
+        } elseif ( defined( 'ARS_CONSTELLATION_CLIENT_PORTAL_PRO' ) ) {
+    public function __construct() {
+        if ( defined( 'ARS_CONSTELLATION_CLIENT_PORTAL_PRO' ) ) {
             $this->version = ARS_CONSTELLATION_CLIENT_PORTAL_PRO;
             $this->plugin_name = 'ars-constellation-client-portal-pro';
+        // Check for Basic version
+        } elseif ( defined( 'ARS_CONSTELLATION_CLIENT_PORTAL_PRO' ) ) {
+        } elseif ( defined( 'ARS_CONSTELLATION_CLIENT_PORTAL' ) ) {
             $this->version = ARS_CONSTELLATION_CLIENT_PORTAL;
             $this->plugin_name = 'ars-constellation-client-portal';
+        // Fall back to defaults if nothing is defined
+        } else {
+        }else{
             $this->version = '1.0.0';
 …
+        }
-        //$this->plugin_name = 'ars-constellation-client-portal-premium';
         $this->load_dependencies();
 …
         require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-ars-constellation-client-portal-settings.php';
         require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ars-constellation-client-portal-utility-functions.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/shortcodes/class-ars-constellation-client-portal-list-shortcodes.php';
+        /**
+         * Pro tier Admin functions
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/shortcodes/class-ars-constellation-client-portal-list-shortcodes.php';
+        /**
+         * Pro tier Admin functions.
          */
         if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
 …
         /**
          * Pro tier Public functions
+         * Pro tier Public functions.
          */
         if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
 …
     /**
      * Register admin hooks
+     * Register admin hooks.
+     *
      * @since    1.0.0
 …
         $core_settings = new ARS_Constellation_Client_Portal_Settings();
+        /* Core (Basic tier) hooks */
+        /**
+         * Enqueue core styles and scripts.
+         */
         $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
         $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
 …
         /**
+         *
          * Direct file access redirects.
+         */
+        // Prevent direct access to accp-clientfiles.
+        $this->loader->add_action( 'init', $plugin_admin, 'accp_file_redirect_init');
+        // Add accp query_vars.
+         *
+         */
+        /**
+         * Prevent direct access to accp-clientfiles.
+         */
+        $this->loader->add_action( 'init', $plugin_admin, 'accp_file_redirect_init');
+        /**
+         * Add accp query_vars.
+         */
         $this->loader->add_filter( 'query_vars', $plugin_admin, 'accp_query_vars' );
+        // Parse accp query_vars.
+        $this->loader->add_action( 'parse_request', $plugin_admin, 'accp_parse_request' );
+        // Plugin upgrade complete actions.
+        /**
+         * Parse accp query_vars.
+         */
+        $this->loader->add_action( 'parse_request', $plugin_admin, 'accp_parse_request' );
+        /**
+         * Plugin upgrade complete actions.
+         */
         $this->loader->add_action( 'upgrader_process_complete', $plugin_admin, 'accp_upgrade_completed', 10, 2 );
+        // Run plugin initialization functions.
+        /**
+         * Run plugin initialization functions.
+         */
         $this->loader->add_action( 'admin_init', $plugin_admin, 'accp_plugin_initialize');
+        // Maybe flush rewrite rules.
+        /**
+         * Maybe flush rewrite rules.
+         */
         $this->loader->add_action( 'init', $plugin_admin, 'accp_maybe_flush_rewrite_rules');
 …
          */
+        // Client File - Register the 'accp_clientfile' post type
+        /**
+         * Client File - Register the 'accp_clientfile' post type.
+         */
         $this->loader->add_action( 'init', $plugin_client_file, 'accp_register_accp_clientfile' );
+        // Client File - Register taxonomies for the 'accp_clientfile' post type
+        /**
+         * Client File - Register taxonomies for the 'accp_clientfile' post type.
+         */
         $this->loader->add_action( 'init', $plugin_client_file, 'accp_register_taxonomy_file_categories' );
         $this->loader->add_action( 'init', $plugin_client_file, 'accp_register_taxonomy_file_tags' );
+        // Client File - WP list table columns
+        $this->loader->add_filter( 'manage_edit-accp_clientfile_columns', $plugin_client_file, 'clientfile_column_register' );
+        /**
+         * Client File - WP list table columns.
+         */
+        $this->loader->add_filter( 'manage_edit-accp_clientfile_columns', $plugin_admin, 'add_core_wp_list_table_columns' );
         $this->loader->add_action( 'manage_accp_clientfile_posts_custom_column', $plugin_client_file, 'clientfile_column_display_company_name', 10, 2 );
         $this->loader->add_action( 'manage_accp_clientfile_posts_custom_column', $plugin_client_file, 'accp_clientfile_column_display_file_status', 10, 2 );
 …
         $this->loader->add_action( 'request', $plugin_client_file, 'clientfile_column_orderby' );
+        // Client File - Add filter fields
+        /**
+         * Client File - Add filter fields.
+         */
         $this->loader->add_action( 'restrict_manage_posts', $plugin_client_file, 'accp_add_core_file_list_filter_fields', 10, 2 );
         $this->loader->add_filter( 'parse_query', $plugin_client_file, 'accp_core_file_additional_filters', 10, 1 );
+        // Client File - Add metaboxes to client files
+        /**
+         * Client File - Add metaboxes to client files.
+         */
         $this->loader->add_action( 'admin_init', $plugin_client_file, 'rerender_file_status_meta_options' );
         $this->loader->add_action( 'save_post', $plugin_client_file, 'save_file_status_meta_options', 10, 1 );
+        // Client File - Add Quick Edit fields.
+        /**
+         * Client File - Add Quick Edit fields.
+         */
         $this->loader->add_action( 'quick_edit_custom_box', $plugin_client_file, 'accp_add_file_quick_edit_fields', 10, 2 );
+        // Client File - Add Bulk Edit fields.
+        /**
+         * Client File - Add Bulk Edit fields.
+         */
         $this->loader->add_action( 'bulk_edit_custom_box', $plugin_client_file, 'accp_add_file_bulk_edit_fields', 10, 2 );
+        // Cliet File - Save File Quick Edit fields.
+        /**
+         * Cliet File - Save File Quick Edit fields.
+         */
         $this->loader->add_action('save_post_accp_clientfile', $plugin_client_file, 'accp_save_file_quick_edit_fields', 10, 1);
+        // Client File - save bulk edit fields ajax function.
+        /**
+         * Client File - save bulk edit fields ajax function.
+         */
         $this->loader->add_action( 'wp_ajax_accp_save_file_bulk_edit', $plugin_client_file, 'accp_save_file_bulk_edit');
+        // Client File - Add filter fields
+        /**
+         * Client File - Add filter fields.
+         */
         $this->loader->add_action( 'restrict_manage_posts', $plugin_client_file, 'accp_add_core_file_list_filter_fields', 10, 2 );
         $this->loader->add_filter( 'parse_query', $plugin_client_file, 'accp_core_file_additional_filters', 10, 1 );
 …
          */
+        // Client Invoice - Register the 'clientinvoice' post type
+        /**
+         * Client Invoice - Register the 'clientinvoice' post type.
+         */
         $this->loader->add_action( 'init', $plugin_client_invoice, 'accp_register_accp_clientinvoice' );
+        // Client Invoice - Register taxonomies for the 'clientinvoice' post type
+        /**
+         * Client Invoice - Register taxonomies for the 'clientinvoice' post type.
+         */
         $this->loader->add_action( 'init', $plugin_client_invoice, 'accp_register_taxonomy_invoice_categories' );
         $this->loader->add_action( 'init', $plugin_client_invoice, 'accp_register_taxonomy_invoice_tags' );
+        // Client Invoice - WP list table columns
+        $this->loader->add_filter( 'manage_edit-accp_clientinvoice_columns', $plugin_client_invoice, 'accp_clientinvoice_column_register' );
+        /**
+         * Client Invoice - WP list table columns.
+         */
+        $this->loader->add_filter( 'manage_edit-accp_clientinvoice_columns', $plugin_admin, 'add_core_wp_list_table_columns' );
         $this->loader->add_action( 'manage_accp_clientinvoice_posts_custom_column', $plugin_client_invoice, 'accp_clientinvoice_column_display_company_name', 10, 2 );
         $this->loader->add_action( 'manage_accp_clientinvoice_posts_custom_column', $plugin_client_invoice, 'accp_clientinvoice_column_display_invoice_status', 10, 2 );
 …
         $this->loader->add_action( 'request', $plugin_client_invoice, 'accp_clientinvoice_column_orderby' );
+        // Client Invoice - Add Metaboxes to Client Invoices
+        /**
+         * Client Invoice - Add Metaboxes to Client Invoices.
+         */
         $this->loader->add_action( 'admin_init', $plugin_client_invoice, 'rerender_invoice_status_meta_options' );
         $this->loader->add_action( 'save_post', $plugin_client_invoice, 'save_invoice_status_meta_options', 10, 1 );
+        // Client Invoice - Add Quick Edit fields.
+        $this->loader->add_action( 'quick_edit_custom_box', $plugin_client_invoice, 'accp_add_invoice_quick_edit_fields', 10, 2 );
+        // Client Invoice - Add Bulk Edit fields.
+        $this->loader->add_action( 'bulk_edit_custom_box', $plugin_client_invoice, 'accp_add_invoice_bulk_edit_fields', 10, 2 );
+        // Cliet Invoice - Save Invoice Quick Edit fields.
+        $this->loader->add_action('save_post_accp_clientinvoice', $plugin_client_invoice, 'accp_save_invoice_quick_edit_fields', 10, 1);
+        // Client Invoice - save bulk edit fields ajax function.
+        /**
+         * Client Invoice - Quick Edit fields.
+         */
+        $this->loader->add_action( 'quick_edit_custom_box', $plugin_client_invoice, 'accp_add_invoice_quick_edit_fields', 10, 2 );
+        $this->loader->add_action( 'bulk_edit_custom_box', $plugin_client_invoice, 'accp_add_invoice_bulk_edit_fields', 10, 2 );
+        $this->loader->add_action('save_post_accp_clientinvoice', $plugin_client_invoice, 'accp_save_invoice_quick_edit_fields', 10, 1);
         $this->loader->add_action( 'wp_ajax_accp_save_invoice_bulk_edit', $plugin_client_invoice, 'accp_save_invoice_bulk_edit');
+        // Client Invoice - Add filter fields
+        /**
+         * Client Invoice - Add filter fields.
+         */
         $this->loader->add_action( 'restrict_manage_posts', $plugin_client_invoice, 'accp_add_core_invoice_list_filter_fields', 10, 2 );
+        $this->loader->add_filter( 'parse_query', $plugin_client_invoice, 'accp_core_invoice_additional_filters', 10, 1 );
+        // Delete file ajax function - when accp_clientfile or accp_clientinvoice post is permanently deleted
+        $this->loader->add_action( 'wp_ajax_accp_delete_file_on_post_delete', $plugin_admin, 'accp_delete_file_on_post_delete');
+        // Bulk delete files ajax function - when accp_clientfile or accp_clientinvoice delete permanently button is clicked
+        $this->loader->add_action( 'wp_ajax_accp_bulk_delete_file_on_post_delete', $plugin_admin, 'accp_bulk_delete_file_on_post_delete');
+        // Bulk delete files ajax function - when accp_clientfile or accp_clientinvoice empty trash button is clicked
+        $this->loader->add_action( 'wp_ajax_accp_bulk_delete_file_on_empty_trash', $plugin_admin, 'accp_bulk_delete_file_on_empty_trash');
+        // Change the main submenu title to "Settings."
+        $this->loader->add_action( 'admin_menu', $core_settings, 'add_menu_accp_main_sub_title' );
+        // Add Companies admin menu item/page
+        $this->loader->add_filter( 'parse_query', $plugin_client_invoice, 'accp_core_invoice_additional_filters', 10, 1 );
+        /**
+         * Delete file attachments.
+         */
+        $this->loader->add_action( 'wp_ajax_accp_delete_file_on_post_delete', $plugin_admin, 'accp_delete_file_on_post_delete');
+        $this->loader->add_action( 'wp_ajax_accp_bulk_delete_file_on_post_delete', $plugin_admin, 'accp_bulk_delete_file_on_post_delete');
+        $this->loader->add_action( 'wp_ajax_accp_bulk_delete_file_on_empty_trash', $plugin_admin, 'accp_bulk_delete_file_on_empty_trash');
+        /**
+         * Change the main submenu title to "Settings."
+         */
+        $this->loader->add_action( 'admin_menu', $core_settings, 'add_menu_accp_main_sub_title' );
+        /**
+         * Add Companies admin menu item/page.
+         */
         $this->loader->add_action( 'admin_menu', $plugin_admin, 'add_menu_accp_add_sub_menu_items_to_main_menu_item' );
+        // Add core settings pages
+        $this->loader->add_action( 'admin_menu', $core_settings, 'add_accp_settings_pages_to_wp_admin' );
+        // Add the main admin settings menu item
+        $this->loader->add_action( 'admin_menu', $core_settings, 'register_main_settings_menu_item' );
+        // Add Settings admin menu item/page
+        //$this->loader->add_action( 'admin_menu', $plugin_admin, 'add_menu_accp_settings_page' ); // DEPRECATED
+        /**
+         * Add core settings pages.
+         */
+        $this->loader->add_action( 'admin_menu', $core_settings, 'add_accp_settings_pages_to_wp_admin' );
+        $this->loader->add_action( 'admin_menu', $core_settings, 'register_main_settings_menu_item' );
         $this->loader->add_action( 'admin_init', $core_settings, 'register_client_portal_settings' );
+        //Add company select field to Client Pages
+        /**
+         * Add company select field to Client Pages.
+         */
         $this->loader->add_action( 'admin_init', $plugin_admin, 'rerender_company_select_meta_options' );
+        $this->loader->add_action( 'save_post', $plugin_admin, 'save_client_company_meta_options' );
+        //Add user profile fields
+        $this->loader->add_action( 'show_user_profile', $plugin_admin, 'extra_user_profile_fields' );
+        $this->loader->add_action( 'edit_user_profile', $plugin_admin, 'extra_user_profile_fields' );
+        $this->loader->add_action( 'user_new_form', $plugin_admin, 'extra_user_profile_fields' );
+        $this->loader->add_action( 'personal_options_update', $plugin_admin, 'save_extra_user_profile_fields' );
+        $this->loader->add_action( 'edit_user_profile_update', $plugin_admin, 'save_extra_user_profile_fields' );
+        $this->loader->add_action( 'user_register', $plugin_admin, 'save_extra_user_profile_fields' );
+        // Client Page and Client File Page - restrict access
+        $this->loader->add_action( 'wp', $plugin_admin, 'accp_restrict_client_page_access' );
+        // Client Company Page - restrict access
+        $this->loader->add_action( 'wp', $plugin_admin, 'accp_restrict_company_page_access' );
+        // Client File upload
+        $this->loader->add_action( 'save_post', $plugin_admin, 'save_client_company_meta_options' );
+        /**
+         * Add user profile fields.
+         */
+        $this->loader->add_action( 'show_user_profile', $plugin_users, 'add_core_user_profile_fields' );
+        $this->loader->add_action( 'edit_user_profile', $plugin_users, 'add_core_user_profile_fields' );
+        $this->loader->add_action( 'user_new_form', $plugin_users, 'add_core_user_profile_fields' );
+        $this->loader->add_action( 'personal_options_update', $plugin_users, 'save_extra_user_profile_fields' );
+        $this->loader->add_action( 'edit_user_profile_update', $plugin_users, 'save_extra_user_profile_fields' );
+        $this->loader->add_action( 'user_register', $plugin_users, 'save_extra_user_profile_fields' );
+        /**
+         * Restrict page access.
+         */
+        $this->loader->add_action( 'wp', $plugin_admin, 'accp_restrict_client_page_access' );
+        $this->loader->add_action( 'wp', $plugin_admin, 'accp_restrict_company_page_access' );
+        /**
+         * Client File upload.
+         */
         $this->loader->add_action('post_edit_form_tag' , $plugin_admin, 'accp_update_post_edit_form_tag');
         $this->loader->add_action('admin_menu', $plugin_admin, 'accp_client_file_meta_box');
 …
          */
+        // Client Company - Register the 'accp_clientcompany' post type
+        /**
+         * Client Company - Register the 'accp_clientcompany' post type
+         */
         $this->loader->add_action( 'init', $plugin_company, 'accp_register_clientcompany' );
+        // Client Company - WP list table columns
+        /**
+         * Client Company - WP list table columns.
+         */
         $this->loader->add_filter( 'manage_edit-accp_clientcompany_columns', $plugin_company, 'clientcompany_column_register' );
         $this->loader->add_action( 'manage_accp_clientcompany_posts_custom_column', $plugin_company, 'clientcompany_column_display_assigned_user_count', 10, 2 );
 …
         $this->loader->add_action( 'manage_accp_clientcompany_posts_custom_column', $plugin_company, 'clientcompany_column_display_company_id', 10, 2 );
+        // Client Company - Add custom fields
+        /**
+         * Client Company - Add custom fields.
+         */
         $this->loader->add_action( 'admin_init', $plugin_company, 'display_clientcompany_meta_options' );
         $this->loader->add_action( 'save_post', $plugin_company, 'save_clientcompany_meta_options', 10, 3 );
+        // Client Company - Generate new Client Page on the Company page.  AJAX function.
+        /**
+         * Client Company - Generate new Client Page on the Company page.  AJAX function.
+         */
         $this->loader->add_action( 'wp_ajax_accp_generate_new_client_page', $plugin_company, 'accp_generate_new_client_page');
+        // Client Company - Check for directory names assigned to more than one company.
+        /**
+         * Client Company - Check for directory names assigned to more than one company.
+         */
         $this->loader->add_action( 'wp_ajax_accp_dismiss_duplicate_dir_assignment_notice', $plugin_company, 'accp_dismiss_duplicate_dir_assignment_notice');
+        // Create and assign new primary user ajax function
+        /**
+         * Create and assign new primary user ajax function.
+         */
         $this->loader->add_action( 'wp_ajax_accp_create_and_assign_primary_user', $plugin_company, 'accp_create_and_assign_primary_user');
+        // Assign existing primary user ajax function
+        /**
+         * Assign existing primary user ajax function.
+         */
         $this->loader->add_action( 'wp_ajax_accp_assign_existing_primary_user', $plugin_company, 'accp_assign_existing_primary_user');
 …
          */
+        // Client Pages - Register the 'accp_client_pages' post type
+        /**
+         * Client Pages - Register the 'accp_client_pages' post type.
+         */
         $this->loader->add_action( 'init', $plugin_client_pages, 'accp_register_client_pages_post_type' );
+        // Client Pages - Register taxonomies for the 'accp_client_pages' post type
+        /**
+         * Client Pages - Register taxonomies for the 'accp_client_pages' post type.
+         */
         $this->loader->add_action( 'init', $plugin_client_pages, 'accp_register_taxonomy_client_page_categories' );
         $this->loader->add_action( 'init', $plugin_client_pages, 'accp_register_taxonomy_client_page_tags' );
+        // Client Pages - WP list table columns
+        /**
+         * Client Pages - WP list table columns.
+         */
         $this->loader->add_filter( 'manage_accp_client_pages_posts_columns', $plugin_client_pages, 'accp_client_pages_column_register');
         $this->loader->add_action( 'manage_accp_client_pages_posts_custom_column', $plugin_client_pages, 'accp_client_pages_column_display_company_name', 10, 2 );
+        // Reassign accp_clientfile ajax function
+        /**
+         * Reassign accp_clientfile ajax function.
+         */
         $this->loader->add_action( 'wp_ajax_accp_reassign_file_1', $plugin_admin, 'accp_reassign_file_1');
+        // Generate company directory ajax function
+        /**
+         * Generate company directory ajax function.
+         */
         $this->loader->add_action( 'wp_ajax_accp_generate_company_dir', $plugin_admin, 'accp_generate_company_dir');
+        // Specify company directory ajax function
+        /**
+         * Specify company directory ajax function.
+         */
         $this->loader->add_action( 'wp_ajax_accp_specify_company_dir', $plugin_admin, 'accp_specify_company_dir');
+        // Clear Mime Type option ajax function
+        /**
+         * Clear Mime Type option ajax function.
+         */
         $this->loader->add_action( 'wp_ajax_accp_clear_mime_type_option', $plugin_admin, 'accp_clear_mime_type_option');
+        // Generate User Password ajax function
+        $this->loader->add_action( 'wp_ajax_accp_generate_user_password', $plugin_admin, 'accp_generate_user_password');
+        //Add content above the clienfile list table
+        /**
+         * Generate User Password ajax function.
+         */
+        $this->loader->add_action( 'wp_ajax_accp_generate_user_password', $plugin_admin, 'accp_generate_user_password');
+        /**
+         * Add content above the clienfile list table.
+         */
         $this->loader->add_action( 'all_admin_notices', $plugin_admin, 'accp_add_content_before_file_list_table', 10, 3);
+        // DEPRECATED - ACCP Hook - After File Upload
         //$this->loader->add_action( 'accp_after_file_upload', $plugin_admin, $call_back = NULL, 10, 2 );
         // File and Invoice Download AJAX function
+        /**
+         * File and Invoice Download AJAX function.
+         */
         $this->loader->add_action('init', $plugin_admin, 'accp_get_download');
+        // Add items to the plugin row actions menu in the plugin list
+        /**
+         * Add items to the plugin row actions menu in the plugin list.
+         */
         $this->loader->add_filter( 'plugin_action_links_' . plugin_basename(dirname(__DIR__) ) .'/ars-constellation-client-portal.php', $plugin_admin,  'accp_add_links_to_plugin_row_actions_menu', 10, 4 );
+        // Add an upgrade link to the plugin menu in the WP plugin list - base plugin only.
+        if ( $this->plugin_name !== 'ars-constellation-client-portal-pro'  && $this->plugin_name !== 'ars-constellation-client-portal-premium' ){
+        /**
+         * Add an upgrade link to the plugin menu in the WP plugin list - base plugin only.
+         */
+        if ( $this->plugin_name !== 'ars-constellation-client-portal-pro' ){
             $this->loader->add_filter( 'plugin_action_links_' . plugin_basename(dirname(__DIR__) ) .'/ars-constellation-client-portal.php', $plugin_admin,  'accp_add_upgrade_link_to_plugin_row_actions_menu', 10, 4 );
+        }
+        // Add items to the plugin row meta.
+        $this->loader->add_filter( 'plugin_row_meta', $plugin_admin,  'accp_add_plugin_row_meta', 10, 4 );
+        /* END Core (Basic tier) hooks */
+        /* Pro tier hooks */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
+            // Include the Pro hooks
+        /**
+         * Add items to the plugin row meta.
+         */
+        $this->loader->add_filter( 'plugin_row_meta', $plugin_admin,  'accp_add_plugin_row_meta', 10, 4 );
+        /**
+         * Pro tier hooks
+         */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
             $plugin_pro_admin = new ARS_Constellation_Client_Portal_Pro_Admin( $this->get_plugin_name(), $this->get_version() );
             $plugin_pro_email = new ARS_Constellation_Client_Portal_Pro_Email( $this->get_plugin_name(), $this->get_version() );
 …
+    }
     /**
      * Register public hooks
 …
         $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+        // Client File List shortcode - [accp_clientfiles]
+        /**
+         * Client File List shortcode - [accp_clientfiles].
+         */
         $this->loader->add_shortcode( 'accp_clientfiles', $list_shortcodes, 'get_client_files_shortcode' );
+        // Client Invoice List shortcode - [accp_clientinvoices]
+        /**
+         * Client Invoice List shortcode - [accp_clientinvoices].
+         */
         $this->loader->add_shortcode( 'accp_clientinvoices', $list_shortcodes, 'get_client_invoices_shortcode' );
+        // Client Home Page Link shortcode - [accp_my_company_page]
+        /**
+         * Client Home Page Link shortcode - [accp_my_company_page].
+         */
         $this->loader->add_shortcode( 'accp_my_company_page', $plugin_public, 'accp_client_home_link' );
+        /* Pro tier hooks */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
+            // Include the Pro hooks
+        /**
+         * Pro tier hooks
+         */
+        if ( $this->plugin_name == 'ars-constellation-client-portal-pro' ){
             $plugin_pro_public = new ARS_Constellation_Client_Portal_Pro_Public( $this->get_plugin_name(), $this->get_version() );
             require_once ( dirname(__DIR__)  . '/pro/public/ars-constellation-client-portal-pro-public-hooks.php'  );
+        }
+    }

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

-                      r2973972
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}

constellation-client-portal/trunk/public/css/ars-constellation-client-portal-list-shortcode-styles.css

r3018869	r3062211
2	2	* List shortcode CSS.
3	3	*/
4
5	4	.file-thumb-align-float-left{
6	5	float: left;
7	6	}
	7
8	8	.file-thumb-align-float-right{
9	9	float: right;
10	10	}
	11
11	12	.file-thumb-align-left{
12	13	text-align: left;
13	14	width: 100%;
14	15	}
	16
15	17	.file-thumb-align-right{
16	18	text-align: right;
17	19	width: 100%;
18	20	}
	21
19	22	.file-thumb-align-center{
20	23	text-align: center;
21	24	width: 100%;
22	25	}
	26
23	27	.accp-past-due-notice{
24	28	font-weight:bold;
…	…
31	35	vertical-align: middle;
32	36	}
	37
33	38	.accp-due-date{
34	39	font-size: 12px;
35	40	}
	41
36	42	.accp-post-status{
37	43	font-size: 12px;
38	44	}
	45
39	46	.accp-list-item-meta .accp-post-meta-item:not(:last-child):after{
40	47	content:'\|';
…	…
42	49	margin-right: 5px;
43	50	}
	51
44	52	.accp-list-item-meta .accp-due-date.accp-post-meta-item::after{
45	53	content: none;
46	54	}
	55
47	56	.accp_documents_filelist .accp-file-list-item-title a{
48	57	text-decoration-color: none;
49	58	}
	59
50	60	.accp-file-list-item-title{
51	61	margin-top: 12px;
52	62	display: block;
53	63	}
	64
54	65	.accp-file-post-date{
55	66	margin-top: 3px;
56	67	font-size: 14px;
57	68	}
	69
58	70	.accp-item-container{
59	71	background: #f9f9f9 none repeat scroll 0 0;
…	…
66	78	padding-top: 15px;
67	79	}
	80
68	81	.accp_documents_filelist .accp-list-item-meta{
69	82	margin-bottom: 10px;
70	83	}
	84
71	85	.accp-page-nav-container{
72	86	border: 1px solid #f9f9f9;
73	87	padding: 10px;
74	88	}
	89
75	90	.accp-pay-btn{
76	91	-moz-user-select: none;
…	…
90	105	transition: all 0.2s ease-out 0s;
91	106	}
	107
92	108	.accp-pay-btn a{
93	109	color: #fff;
…	…
98	114	display: block;
99	115	}
	116
100	117	a.accp-pay-link{
101	118	color: #fff;
102	119	}
	120
103	121	.accp-view-dl-link-container a{
104	122	font-size: 11px;
105	123	text-decoration: none;
106	124	}
	125
107	126	.accp-pay-btn:hover{
108	127	background-color: #3cacf6;

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

-                      r3043713
+                      r3062211
  */
+/**
+ * Exit if accessed directly.
+ */
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
+    exit;
+}
 …
                 do_action('accp_after_invoice_list_pagination', $post_id, $shortcode_id, $list_instance);
+            }else{
+            }
+            if( 'accp_clientfile' === $list_type ){
                 do_action('accp_after_file_list_pagination', $post_id, $shortcode_id, $list_instance);
+            }
+            if( 'accp_global_file' === $list_type ){
+                do_action('accp_after_global_file_list_pagination', $post_id, $shortcode_id, $list_instance);
+            }
 …
+    }
+}

constellation-client-portal/trunk/uninstall.php

-                      r2862820
+                      r3062211
  */
+// Exit if not called from WordPress.
+/**
+ * Exit if not called from WordPress.
+ */
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
     exit;

Plugin Directory

Context Navigation

Legend:

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-core-authorization.php

constellation-client-portal/trunk/admin/class-ars-constellation-client-portal-core-file-checks.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/class-ars-constellation-client-portal-settings.php

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

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

constellation-client-portal/trunk/admin/css/jquery-ui/1.11.1/themes/cupertino/jquery-ui.css

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/ars-constellation-client-portal-install-uninstall.php

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

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

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

constellation-client-portal/trunk/public/css/ars-constellation-client-portal-list-shortcode-styles.css

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

constellation-client-portal/trunk/uninstall.php

Download in other formats: