Changeset 2900796

Timestamp:

04/18/2023 03:11:48 PM (3 years ago)

Author:

GermanPearls

Message:

ver 3.0.2

Location:

time-tracker/trunk

Files:

• inc/CF7 (added)
• inc/CF7/class-time-tracker-activator-forms-cf7.php (added)
• inc/CF7/class-tt-hook-save-form-data-cf7.php (added)
• inc/CF7/function-tt-custom-cf7-field-categories-from-settings.php (added)
• inc/CF7/function-tt-custom-cf7-field-client-dropdown.php (added)
• inc/CF7/function-tt-custom-cf7-field-datetime.php (added)
• inc/CF7/function-tt-custom-cf7-field-project-dropdown.php (added)
• inc/CF7/function-tt-custom-cf7-field-task-dropdown.php (added)
• inc/CF7/function-tt-recaptcha-cf7.php (added)
• inc/WPF (added)
• inc/WPF/class-time-tracker-activator-forms-wpf.php (added)
• inc/WPF/class-time-tracker-wpf-custom-post-types.php (added)
• inc/WPF/class-time-tracker-wpf-fields-add-properties.php (added)
• inc/WPF/class-time-tracker-wpf-select-fields-dynamic-options.php (added)
• inc/WPF/class-tt-hook-save-form-data-wpf.php (added)
• inc/class-time-tracker-activator-forms.php (modified) (17 diffs)
• inc/class-time-tracker-activator-pages.php (modified) (8 diffs)
• inc/class-time-tracker-activator.php (modified) (2 diffs)
• inc/class-time-tracker-updater.php (modified) (1 diff)
• inc/class-time-tracker.php (modified) (9 diffs)
• inc/class-tt-hook-after-form-data-saved.php (modified) (3 diffs)
• inc/class-tt-save-form-input.php (modified) (13 diffs)
• inc/css/time-tracker.php (modified) (3 diffs)
• inc/function-tt-utilities.php (modified) (4 diffs)
• inc/js/filter_time_log.js (modified) (2 diffs)
• inc/js/get_projects_for_client.js (modified) (2 diffs)
• inc/js/get_tasks_for_client.js (modified) (2 diffs)
• inc/js/set_date_picker_default_value.js (modified) (1 diff)
• inc/js/update_end_timer.js (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• templates/tt-page-template.php (modified) (1 diff)
• templates/tt-sidebar.php (modified) (1 diff)
• time-tracker.php (modified) (2 diffs)

time-tracker/trunk/inc/class-time-tracker-activator-forms.php

@@ -22 +22 @@
         public static $form_details = array();
         public static $form_content = array();
-        public static $mail_meta = array();
-        public static $mail_2_meta = array();
-        public static $msg_meta = array();
-        public static $additional_settings = "";
-        
-        /**
-         * Constructor
-         * 
-         */
-        public function __construct() {
-            //$form_details = self::create_form_details_array();
-            //self::create_forms();
+        public static $post_typ = "";
+        public static $form_class = "";
+        
+
+        /**
+         * Define form details
+         * 
+         */
+        private static function define_forms() {
+            if (self::$post_typ == "") {
+                self::get_post_type();
+            }
+            if (self::$form_class == "") {
+                self::get_form_class_name();
+            }
+            if (self::$form_content == array()) {
+                self::create_form_content_array();
+            }
+            if (self::$form_details == array()) {
+                self::create_form_details_array();
+            }
         }
 
@@ -42 +51 @@
          */
         public static function setup() {
-            self::create_form_details_array();
-            self::create_form_content_array();
-            self::get_mail_meta();
-            self::get_mail_2_meta();
-            self::get_msg_meta();
-            self::get_additional_settings();
+            self::define_forms();
             self::create_forms('false');
         }
@@ -53 +57 @@
 
         /**
-         * Update Version
+         * Update Version - Check for updates
          * 
          */ 
@@ -63 +67 @@
 
         /**
-         * Update Version
+         * Update Version - Force updates
          * 
          */ 
@@ -70 +74 @@
             self::create_forms('true');
         }
+
+        /**
+         * Get expected form content based on definitions herein and post id, if exists
+         * 
+         */
+        private static function get_expected_form_content($form_index, $post_id = 0) {
+            if ($form_index < count(self::$form_content)) {
+                if (TT_PLUGIN_FORM_TYPE == "CF7") {
+                    return self::$form_content[$form_index];
+                } elseif (TT_PLUGIN_FORM_TYPE == "WPF") {
+                    $content = self::$form_class::decode_form_content(self::$form_content[$form_index]);
+                    $content["id"] = $post_id;
+                    return self::$form_class::encode_form_content($content);
+                }
+            }
+        }
         
         
@@ -79 +99 @@
             $installed_form = get_post($form_post_id);
             $installed_form_content = $installed_form->post_content;
-            $updated_content = self::$form_content[$i];
-            //does the content match the current version}              
-            if (($installed_form_content != $updated_content) || ($force_update == true)) {
-                $updated_form = array(
-                    'ID' => $form_post_id,
-                    'post_content' => $updated_content
-                );
-                $result = wp_update_post($updated_form);
-                $result_meta = update_post_meta($form_post_id, '_form', $updated_content);
-            }                
+            self::define_forms();
+            if (count(self::$form_content) > $i) {
+                $updated_content = self::get_expected_form_content($i, $form_post_id);
+                
+                //does the content match the current version}              
+                if ((wp_slash($installed_form_content) != $updated_content) || ($force_update == true)) {
+                    $updated_form = array(
+                        'ID' => $form_post_id,
+                        'post_content' => $updated_content
+                    );
+                    $result = wp_update_post($updated_form);
+                    $result_meta = update_post_meta($form_post_id, '_form', $updated_content);
+                }   
+            }             
             return $form_post_id;
         }
@@ -99 +123 @@
         public static function create_forms($force_update) {
             $i = 0;
-            if (self::$form_details == array() || self::$form_content == array()) {
-                self::setup();
-            }
-            $number_forms = count(self::$form_details);
-            for ($i==0; $i<$number_forms; $i++) {
+            self::define_forms();
+            for ($i == 0; $i < count(self::$form_details); $i++) {
                 $form_arr = self::get_form_details($i);
                 
@@ -109 +130 @@
                 $form_exists = get_posts(array(
                     'title'=> $form_arr['post_title'],
-                    'post_type' => 'wpcf7_contact_form'
+                    'post_type' => $form_arr['post_type']
                 ), ARRAY_A);
+
                 //if form does not exist, create it
-
                 if (empty($form_exists)) {
                     $post_id = wp_insert_post($form_arr);
+
+                    //WPForms has the form id embedded in the post content, now that we have the id, update the content json
+                    if (TT_PLUGIN_FORM_TYPE == "WPF") {
+                        self::$form_class::update_form_id_in_database($form_arr, $post_id);
+                    }
+
+                    //post meta
                     if ($post_id) {
-                        add_post_meta($post_id, '_form', self::$form_content[$i]);
-                        add_post_meta($post_id, '_mail', self::$mail_meta);
-                        add_post_meta($post_id, '_mail_2', self::$mail_2_meta);
-                        add_post_meta($post_id, '_messages', self::$msg_meta);
-                        add_post_meta($post_id, '_additional_settings', self::$additional_settings);                    
-                        add_post_meta($post_id, '_locale', self::get_user_location() );
+                        self::$form_class::add_form_post_meta($post_id, $i);
                     }
                 
@@ -130 +153 @@
             }
         }
-
-
-        /**
-         * post locale information for post meta
-         * 
-         */
-        public static function get_user_location() {
-            $users_location = "";
-            $users_location = get_user_locale();
-            if ($users_location) {
-                return $users_location;
-            } else {
-                return "en_US";
-            }
-        }
-        
-        
-        /**
-         * Define arguments for creating form (CF7 post type)
+        
+        
+        /**
+         * Define arguments for creating form
          * 
          */
         public static function get_form_details($arr_index) {
+            if (self::$post_typ == "") {
+                self::get_post_type();
+            }
             $arr = array(
                 'post_author'           => '',
@@ -160 +171 @@
                 'post_excerpt'          => '',
                 'post_status'           => 'publish',
-                'post_type'             => 'wpcf7_contact_form',
+                'post_type'             => self::$post_typ,
                 'page_template'         => '',
                 'comment_status'        => 'closed',
@@ -184 +195 @@
             $details = array();
             $all_details = array();
-          
+            if (self::$form_class == "") {
+                self::get_form_class_name();
+            }
             //add new client
             $details = array(
                 "Title" => "Add New Client",
                 "Slug" => "form-add-new-client",
-                "Content" => self::get_form_content_new_client() . "\r\n" . implode("\r\n", self::$mail_meta) . "\r\n" . implode("\r\n", self::$msg_meta)
+                "Content" => self::$form_class::get_form_content_new_client()
             );
             array_push($all_details, $details);
@@ -197 +210 @@
                 "Title" => "Add New Project",
                 "Slug" => "form-add-new-project",
-                "Content" => self::get_form_content_new_project() . "\r\n" . implode("\r\n", self::$mail_meta) . "\r\n" . implode("\r\n", self::$msg_meta)
+                "Content" => self::$form_class::get_form_content_new_project()
             );
             array_push($all_details, $details);
@@ -205 +218 @@
                 "Title" => "Add New Recurring Task",
                 "Slug" => "form-add-new-recurring-task",
-                "Content" => self::get_form_content_new_recurring_task() . "\r\n" . implode("\r\n", self::$mail_meta) . "\r\n" . implode("\r\n", self::$msg_meta)
+                "Content" => self::$form_class::get_form_content_new_recurring_task()
             );
             array_push($all_details, $details);
@@ -213 +226 @@
                 "Title" => "Add New Task",
                 "Slug" => "form-add-new-task",
-                "Content" => self::get_form_content_new_task() . "\r\n" . implode("\r\n", self::$mail_meta) . "\r\n" . implode("\r\n", self::$msg_meta)
+                "Content" => self::$form_class::get_form_content_new_task()
             );
             array_push($all_details, $details);
@@ -221 +234 @@
                 "Title" => "Add Time Entry",
                 "Slug" => "form-add-time-entry",
-                "Content" => self::get_form_content_add_time_entry() . "\r\n" . implode("\r\n", self::$mail_meta) . "\r\n" . implode("\r\n", self::$msg_meta)
+                "Content" => self::$form_class::get_form_content_add_time_entry()
             );
             array_push($all_details, $details);
@@ -229 +242 @@
                 "Title" => "Filter Time",
                 "Slug" => "form-filter-time",
-                "Content" => self::get_form_content_filter_time() . "\r\n" . implode("\r\n", self::$mail_meta) . "\r\n" . implode("\r\n", self::$msg_meta)
+                "Content" => self::$form_class::get_form_content_filter_time()
             );
             array_push($all_details, $details);
@@ -243 +256 @@
          */
         public static function create_form_content_array() {
-            $content = array();
-            array_push($content, self::get_form_content_new_client());
-            array_push($content, self::get_form_content_new_project());
-            array_push($content, self::get_form_content_new_recurring_task());
-            array_push($content, self::get_form_content_new_task());
-            array_push($content, self::get_form_content_add_time_entry());
-            array_push($content, self::get_form_content_filter_time());
-            self::$form_content = $content;
-        }           
-
-
-
-        /**
-         * Create form content - New Client Form
-         * 
-         */
-        public static function get_form_content_new_client() {
-            $html = "";
-            $html .= self::create_33_33_33_row(
-                "<label> Company (required)</label>[text* company maxlength:100]",
-                "<label> Bill To (required)</label>[bill_to_name bill-to id:bill-to-name-dropdown]",
-                "<label> Billing Rate</label>[number billing-rate min:0 max:99999999999 \"" . tt_get_default_billing_rate() . "\"]"
-            );
-            $html .= self::create_50_50_row(
-                "<label> Source (required)</label>[client_category client-source id:client-source-dropdown]",
-                "<label> Source Details</label>[client_sub_category client-source-details id:client-source-details-dropdown]"
-            );
-            $html .= self::create_33_33_33_row(
-                "<label> Contact Name</label>[text contact-name maxlength:100]",
-                "<label> Contact Email </label>[email contact-email maxlength:100]",
-                "<label> Telephone #</label>[text contact-telephone]"
-            );
-            $html .= "<label> Comments</label>[textarea comments maxlength:1000 x3]";
-            $html .= "[submit id:add-client-submit \"Submit\"]";
-            return $html;
-        }
-
-
-        /**
-         * Create form content - New Project
-         * 
-         */
-        public static function get_form_content_new_project() {
-            $html = "";
-            $html .= "<label> Project Name (required)</label>[text* project-name maxlength:100]";
-            $html .= self::create_50_50_row(
-                "<label> Client (required)</label>[client_name client-name]",
-                "<label> Category</label>[work_category project-category id:project-category-dropdown]"
-            );
-            $html .= self::create_50_50_row(
-                "<label>Time Estimate (hrs)</label>[number time-estimate]",
-                "<label>Due Date (required)</label>[date* due-date]"
-            );
-            $html .= "<label> Details</label>[textarea project-details maxlength:500 x3]";
-            $html .= "[submit id:add-project-submit \"Submit\"]";
-            return $html;
-        }
-
-
-        /**
-         * Create form content - New Recurring Task
-         * 
-         */
-        public static function get_form_content_new_recurring_task() {
-            $html = "";
-            $html .= self::create_66_33_row(
-                "<label> Task Name (required)</label>[textarea* task-name 20x1 maxlength:1500]",
-                "Recurring Frequency (required)[select* recur-freq use_label_element \"Monthly\" \"Weekly\"]"
-            );
-            $html .= self::create_50_50_row(
-                "<label> Client (required)</label>[client_name client-name]",
-                "<label> Project</label>[project_name project-name id:project-dropdown]"
-            );
-            $html .= self::create_33_33_33_row(
-                "<label> Category</label>[work_category task-category id:task-category-dropdown]",
-                "<label> Time Estimate in Hours (required)</label>[text* time-estimate]",
-                "<label> End Repeat</label>[date end-repeat]"
-            );  
-            $html .= "<label> Task Notes</label>[textarea task-desc x3]";
-            $html .= "[submit id:add-task-submit \"Send\"]";
-            return $html;
-        }
-
-
-        /**
-         * Create form content - New Task
-         * 
-         */
-        public static function get_form_content_new_task() {
-            $html = "";
-            $html .= self::create_66_33_row(
-                "<label> Task Description (required)</label>[textarea* task-description 20x1 maxlength:500]",
-                "<label> Due Date</label>[date due-date \"today\"]"
-            );
-            $html .= self::create_50_50_row(
-                "<label> Client (required)</label>[client_name client-name]",
-                "<label> Project</label>[project_name project-name id:project-dropdown]"
-            );
-            $html .= self::create_50_50_row(
-                "<label> Category</label>[work_category task-category id:task-category-dropdown]",
-                "<label> Time Estimate (hrs)</label>[text time-estimate]"
-            );
-            $html .= "<label> Notes </label>[textarea notes x3]";
-            $html .= "[hidden what-next default:\"SaveTask\"]<input type=\"submit\" name=\"submit-save\" class=\"tt-button tt-form-button tt-inline-button\" value=\"SaveTask\"><input type=\"submit\" name=\"submit-start\" class=\"tt-button tt-form-button tt-inline-button\" value=\"StartWorking\" onclick=\"save_new_task_and_start_timer()\">";
-            return $html;
-        }
-
-
-        /**
-         * Create form content - New Time Entry
-         * 
-         */
-        public static function get_form_content_add_time_entry() {
-            $html = "";
-            $html .= self::create_50_50_row(
-                "<label> Client (required)</label>[client_name client-name default:get]",
-                "<label> Ticket (required)</label>[task_name task-name default:get id:task-dropdown]"
-            );
-            $html .= self::create_33_33_33_row(
-                "<label> Start Time (required)</label>[datetime start-time id:start-time]",
-                "<label> End Time (required)</label>[datetime end-time id:end-time]",
-                "<label> New Task Status</label>[select new-task-status id:new-task-status include_blank \"In Process\" \"Not Started\" \"Ongoing\" \"Waiting Client\" \"Complete\" \"Canceled\"]"
-            );
-            $html .= "<label> Notes (required)</label>[textarea* time-notes maxlength:1999 x7]";
-            $html .= self::create_33_33_33_row(
-                "<label> Invoiced?</label> [text invoiced id:invoiced]",
-                "<label> Invoice #</label> [text invoice-number id:invoice-number]",
-                "<label> Invoiced Time</label> [text invoiced-time id:invoiced-time]"
-            );
-            $html .= self::create_50_50_row(
-                "<label> Invoice Notes</label> [text invoice-notes id:invoice-notes]",
-                "<label> Follow Up (Create New Task)</label>[text follow-up maxlength:500]"
-            );
-            $html .= "[submit id:add-time-submit \"Send\"]";
-            return $html;
-        }
-
-
-        /**
-         * Create form content - Time Entry Filter
-         * 
-         */
-        public static function get_form_content_filter_time() {
-            $html = "";
-            $html .= self::create_33_66_row(
-                "<label> First Date</label>[date first-date id:first-date default:get]",
-                "<label> Client</label>[client_name client-name id:client-name default:get]"
-            );
-            $html .= self::create_33_66_row(
-                "<label> Last Date</label>[date last-date id:last-date default:get]",
-                "<label> Project</label>[project_name project-name id:project-name default:get]"
-            );
-            $html .= self::create_33_66_row(
-                "<label> Ticket</label>[task_name task-name id:task-name default:get]",
-                "<label> Notes </label>[text notes id:time-notes default:get]"
-            );
-            $html .= self::create_100_row (
-                "[hidden form-type default:\"filter\"][submit id:filter-time-submit \"Filter Time Entries\"]"
-            );
-            return $html;
-        }
-
-
-        /**
-         * Layout Classes and Divs
-         * 
-         */
-        private static function create_33_33_33_row($first, $second, $third) {
-            $out = self::start_form_row();
-            $out .= self::start_col_one_third("left") . $first . self::end_form_column();
-            $out .= self::start_col_one_third("middle") . $second . self::end_form_column();
-            $out .= self::start_col_one_third("right") . $third . self::end_form_column();
-            $out .= self::end_form_row();
-            return $out;
-        }
-
-        
-        /**
-         * Layout Classes and Divs
-         * 
-         */
-        private static function create_100_row($first) {
-            $out = self::start_form_row() . $first . self::end_form_row();
-            return $out;
-        }
-
-
-        /**
-         * Layout Classes and Divs
-         * 
-         */
-        private static function create_33_66_row($first, $second) {
-            $out = self::start_form_row();
-            $out .= self::start_col_one_third("left") . $first . self::end_form_column();
-            $out .= self::start_col_two_thirds("right") . $second . self::end_form_column();
-            $out .= self::end_form_row();
-            return $out;
-        }
-        
-
-        /**
-         * Layout Classes and Divs
-         * 
-         */
-        private static function create_66_33_row($first, $second) {
-            $out = self::start_form_row();
-            $out .= self::start_col_two_thirds("left") . $first . self::end_form_column();
-            $out .= self::start_col_one_third("right") . $second . self::end_form_column();
-            $out .= self::end_form_row();
-            return $out;
-        }
-
-
-        /**
-         * Layout Classes and Divs
-         * 
-         */
-        private static function create_50_50_row($first, $second) {
-            $out = self::start_form_row();
-            $out .= self::start_col_half("left") . $first . self::end_form_column();
-            $out .= self::start_col_half("right") . $second . self::end_form_column();
-            $out .= self::end_form_row();
-            return $out;
-        }
-        
-        
-        
-        /**
-         * Layout Classes and Divs
-         * 
-         */
-        private static function start_form_row() {
-            return "<div class=\"tt-form-row\">";
-        }
-
-
-        /**
-         * Layout Classes and Divs
-         * 
-         */
-        private static function end_form_row() {
-            return "</div>";
-        }
-
-
-        /**
-         * Layout Classes and Divs
-         * 
-         */
-        private static function end_form_column() {
-            return "</div>";
-        }
-
-
-        /**
-         * Start Half width column
-         * 
-         */
-        private static function start_col_half($side) {
-            return "<div class=\"tt-form-element tt-one-half tt-col-" . $side . "\">";
-        }
-        
-
-        /**
-         * Start one third width column
-         * 
-         */
-        private static function start_col_one_third($side) {
-            return "<div class=\"tt-form-element tt-one-third tt-col-" . $side . "\">";
-        }
-
-
-        /**
-         * Start two thirds width column
-         * 
-         */
-        private static function start_col_two_thirds($side) {
-            return "<div class=\"tt-form-element tt-two-thirds tt-col-" . $side . "\">";
-        }
-        
-        /**
-         * Get Additional Settings
-         * 
-         */
-        public static function get_additional_settings() {
-            $settings = "skip_mail: on";  
-            self::$additional_settings = $settings;
-        }
-        
-        
-        /**
-         * Get Mail Meta
-         * 
-         */
-        public static function get_mail_meta() {
-            $body = "";
-            $body = "From: [your-name] <[your-email]>\r\n";
-            $body .= "Subject: [your-subject]\r\n";
-            $body .= "\r\n";
-            $body .= "Message Body:\r\n";
-            $body .= "[your-message]\r\n";
-            $body .= "\r\n";
-            $body .= "-- \r\n";
-            $body .= "This e-mail was sent from a contact form on " . tt_get_site_name() . " (" . tt_get_site_url() . ")";            
-            
-            $mail = array();
-            $mail["active"] = true;
-            $mail["subject"] = tt_get_site_name() . " \"[your-subject]\"";
-            $mail["sender"] = tt_get_site_name() . " <" . tt_get_wordpress_email() . ">";
-            $mail["recipient"] = tt_get_site_admin_email();
-            $mail["body"] = $body;
-            $mail["additional headers"] = "Reply-To: " . tt_get_site_admin_email() . "\r\n";
-            $mail["attachments"] = "\r\n";
-            $mail["use_html"] = false;
-            $mail["exclude_blank"] = false;
-            self::$mail_meta = $mail;
-        }
-
-
-        /**
-         * Get Mail 2 Meta
-         * 
-         */
-        public static function get_mail_2_meta() {
-            $mail2 = array();
-            $mail2 = self::$mail_meta;
-            $mail2["active"] = false;
-            self::$mail_2_meta = $mail2;
-        }
-
-
-        /**
-         * Get Message Meta
-         * 
-         */
-        public static function get_msg_meta() {
-            $msg = array();
-            $msg["mail_sent_ok"] = "Form submitted successfully.";
-            $msg["mail_sent_ng"] = "There was an error submitting this form. Please try again later.";
-            $msg["validation_error"] = "One or more fields have an error. Please check and try again.";
-            $msg["spam"] = "There was an error trying to send your message. Please try again later.";
-            $msg["accept_terms"] = "You must accept the terms and conditions before sending your message.";
-            $msg["invalid_required"] = "Please verify all required fields have been filled in.";
-            $msg["invalid_too_long"] = "The field is too long.";
-            $msg["invalid_too_short"] = "The field is too short.";
-            $msg["invalid_date"] = "The date format is incorrect.";
-            $msg["date_too_early"] = "The date is before the earliest one allowed.";
-            $msg["date_too_late"] = "The date is after the latest one allowed.";
-            $msg["upload_failed"] = "There was an unknown error uploading the file.";
-            $msg["upload_file_type_invalid"] = "You are not allowed to upload files of this type.";
-            $msg["upload_file_too_large"] = "The file is too big.";
-            $msg["upload_failed_php_error"] = "There was an error uploading the file.";
-            $msg["invalid_number"] = "The number format is invalid.";
-            $msg["number_too_small"] = "The number is smaller than the minimum allowed.";
-            $msg["number_too_large"] = "The number is larger than the maximum allowed.";
-            $msg["quiz_answer_not_correct"] = "The answer to the quiz is incorrect.";
-            $msg["invalid_email"] = "The e-mail address entered is invalid.";
-            $msg["invalid_url"] = "The URL is invalid.";
-            $msg["invalid_tel"] = "The telephone number is invalid.";   
-            self::$msg_meta = $msg;
+            if (self::$form_class == "") {
+                self::get_form_class_name();
+            }
+            self::$form_class::create_form_content_array();
+            self::$form_content = self::$form_class::$form_content;
+        }
+        
+
+        /**
+         * Get Post Type for WP-Posts Database Setting
+         * 
+         */
+        public static function get_post_type() {
+            if (TT_PLUGIN_FORM_TYPE == "CF7") {
+                self::$post_typ = "wpcf7_contact_form";
+            }
+            elseif (TT_PLUGIN_FORM_TYPE == "WPF") {
+                self::$post_typ = "wpforms";
+            }
+            return self::$post_typ;
+        }
+
+
+        /**
+         * Get Form Class Namespace and Class Name Based on Form Plugin Being Used
+         * 
+         */
+        private static function get_form_class_name() {
+            self::$form_class = __NAMESPACE__ . "\\" . TT_PLUGIN_FORM_TYPE . "\\" . "Time_Tracker_Activator_Forms_" . TT_PLUGIN_FORM_TYPE;
         }
 

time-tracker/trunk/inc/class-time-tracker-activator-pages.php

@@ -100 +100 @@
 
                 $updated_content = self::get_page_details($i)['post_content'];
-
                 //does the content match the current version
                 if ($installed_page_content != $updated_content) {
@@ -183 +182 @@
             self::$page_details = $details_all;
         }
+
+
+        /**
+         * Get shortcode for form
+         * 
+         */
+        private static function get_form_shortcode($nm) {
+            if (TT_PLUGIN_FORM_TYPE == "CF7") {
+                return "[contact-form-7 id=\"" . tt_get_form_id($nm) . "\" title=\"" . $nm . "\" html_class=\"tt-form\"]";
+            }
+            elseif (TT_PLUGIN_FORM_TYPE == "WPF") {
+                return "[wpforms id=\"" . tt_get_form_id($nm) . "\"]";
+            }
+            else {
+                return "Error: Either Contact Form 7 or WPForms must be activated to use the Time Tracker plugin.";
+            }
+        }
             
             
@@ -210 +226 @@
                 "Parent" => $parent,
                 "Slug" => "new-client",
-                "Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add New Client") . "\" title=\"Add New Client\" html_class=\"tt-form\"]",
+                //"Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add New Client") . "\" title=\"Add New Client\" html_class=\"tt-form\"]",
+                "Content" => self::get_form_shortcode("Add New Client"),
                 "Paginate" => array(
                     "Flag" => false
@@ -222 +239 @@
                 "Parent" => $parent,
                 "Slug" => "new-project",
-                "Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add New Project") . "\" title=\"Add New Project\" html_class=\"tt-form\"]",
+                //"Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add New Project") . "\" title=\"Add New Project\" html_class=\"tt-form\"]",
+                "Content" => self::get_form_shortcode("Add New Project"),
                 "Paginate" => array(
                     "Flag" => false
@@ -234 +252 @@
                 "Parent" => $parent,
                 "Slug" => "new-recurring-task",
-                "Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add New Recurring Task") . "\" title=\"Add New Recurring Task\" html_class=\"tt-form\"]",
+                //"Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add New Recurring Task") . "\" title=\"Add New Recurring Task\" html_class=\"tt-form\"]",
+                "Content" => self::get_form_shortcode("Add New Recurring Task"),
                 "Paginate" => array(
                     "Flag" => false
@@ -246 +265 @@
                 "Parent" => $parent,
                 "Slug" => "new-task",
-                "Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add New Task") . "\" title=\"Add New Task\" html_class=\"tt-form\"]",
+                //"Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add New Task") . "\" title=\"Add New Task\" html_class=\"tt-form\"]",
+                "Content" => self::get_form_shortcode("Add New Task"),
                 "Paginate" => array(
                     "Flag" => false
@@ -258 +278 @@
                 "Parent" => $parent,
                 "Slug" => "new-time-entry",
-                "Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add Time Entry") . "\" title=\"Add Time Entry\" html_class=\"tt-form\"]",
+                //"Content" => "[contact-form-7 id=\"" . tt_get_form_id("Add Time Entry") . "\" title=\"Add Time Entry\" html_class=\"tt-form\"]",
+                "Content" => self::get_form_shortcode("Add Time Entry"),
                 "Paginate" => array(
                     "Flag" => false
@@ -346 +367 @@
                 "Parent" => $parent,
                 "Slug" => "time-log",
-                "Content" => "<div class=\"tt-accordion\">Search</div><div class=\"tt-accordion-panel\">[contact-form-7 id=\"" . tt_get_form_id("Filter Time") . "\" title=\"Filter Time\" html_class=\"filter-time-form\" html_class=\"tt-form\"]</div>[tt_time_log_table type=\'summary\']<br/>[tt_year_summary]<h3>Time Details</h3>[tt_time_log_table type=\'detail\']",
-                "Paginate" => array(
+                //"Content" => "<div class=\"tt-accordion\">Search</div><div class=\"tt-accordion-panel\">[contact-form-7 id=\"" . tt_get_form_id("Filter Time") . "\" title=\"Filter Time\" html_class=\"filter-time-form\" html_class=\"tt-form\"]</div>[tt_time_log_table type=\'summary\']<br/>[tt_year_summary]<h3>Time Details</h3>[tt_time_log_table type=\'detail\']",
+                "Content" => "<div class=\"tt-accordion\">Search</div><div class=\"tt-accordion-panel\">" . self::get_form_shortcode("Filter Time") . "</div>[tt_time_log_table type=\'summary\']<br/>[tt_year_summary]<h3>Time Details</h3>[tt_time_log_table type=\'detail\']",
+                "Paginate" => array(
                     "Flag" => true,
                     "RecordsPerPage" => 100,

time-tracker/trunk/inc/class-time-tracker-activator.php

@@ -25 +25 @@
     class Time_Tracker_Activator {
 
-        private static $cf7_active = false;
         private static $default_client = null;
         private static $default_task = null;
 
-
         public static function activate() {
             self::define_plugin_variables();
-            self::cf7_plugin_activated();
-            if (self::$cf7_active) {
-                include_once(TT_PLUGIN_DIR_INC . 'function-tt-cron-recurring-tasks.php');
-                require_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-activator-tables.php');
-                require_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-activator-forms.php');
-                require_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-activator-pages.php');
-                Time_Tracker_Activator_Tables::setup();
-                Time_Tracker_Activator_Forms::setup();
-                Time_Tracker_Activator_Pages::setup();
-                self::add_default_client();
-                self::add_default_task();
-                self::set_initial_database_options();
+            if (TT_PLUGIN_FORM_TYPE == "CF7") {
+                self::setup();
+            } elseif (TT_PLUGIN_FORM_TYPE == "WPF") {
+                /**?>
+                <script type="text/javascript">
+                window.alert('Time Tracker is not yet compatible with WPForms. Please install the Contact Form 7 plugin before activating Time Tracker.');
+                </script>
+                <?php
+                **/
+                self::setup();
             } else {
                 ?>
@@ -64 +60 @@
 
 
-        private static function cf7_plugin_activated() {
-            if (class_exists('WPCF7')) {
-                self::$cf7_active = true;
-            }
+        private static function setup() {
+            include_once(TT_PLUGIN_DIR_INC . 'function-tt-cron-recurring-tasks.php');
+            require_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-activator-tables.php');
+            require_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-activator-forms.php');
+            require_once(TT_PLUGIN_DIR_INC . TT_PLUGIN_FORM_TYPE . '/class-time-tracker-activator-forms-' . strtolower(TT_PLUGIN_FORM_TYPE) . '.php');
+            require_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-activator-pages.php');
+            Time_Tracker_Activator_Tables::setup();
+            Time_Tracker_Activator_Forms::setup();
+            Time_Tracker_Activator_Pages::setup();
+            self::add_default_client();
+            self::add_default_task();
+            self::set_initial_database_options();
         }
         

time-tracker/trunk/inc/class-time-tracker-updater.php

@@ -155 +155 @@
         private function tt_update_forms($force_update = false) {
             require_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-activator-forms.php');
+            require_once(TT_PLUGIN_DIR_INC . TT_PLUGIN_FORM_TYPE . '/class-time-tracker-activator-forms-' . strtolower(TT_PLUGIN_FORM_TYPE) . '.php');
             if ($force_update) {
                 $tt_forms = Time_Tracker_Activator_Forms::force_form_updates();

time-tracker/trunk/inc/class-time-tracker.php

@@ -36 +36 @@
         self::$instance->setup_constants();
         self::$instance->load_dependencies();
+        self::$instance->load_form_dependencies();
         self::$instance->add_scripts();
         self::$instance->add_styles();
@@ -53 +54 @@
   
       
-   /**
-   * Log Install Time
-   *
-   **/
+    /**
+    * Log Install Time
+    *
+    **/
     private function log_plugin_installation() {
       if (! get_option('time_tracker_install_time')) {
@@ -64 +65 @@
      
       
-     /**
+    /**
      * Check Plugin Version
      * 
-     */  
+    **/  
     private function check_plugin_version() {
       $installed_version = get_option('time_tracker_version');
-      if ($installed_version != TIME_TRACKER_VERSION) {
-        include_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-updater.php');
-        $updater = New Time_Tracker_Updater;
-        $new_version = $updater->tt_update_from($installed_version);
+      if ($installed_version) {
+        //updates
+        if ($installed_version != TIME_TRACKER_VERSION) {
+          include_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-updater.php');
+          $updater = New Time_Tracker_Updater;
+          $new_version = $updater->tt_update_from($installed_version);
+        }
+      } else {
+        //new installations
+        add_option('time_tracker_version', TIME_TRACKER_VERSION);
       }
     }
@@ -94 +101 @@
       define('TT_PLUGIN_WEB_DIR_ADMIN', plugin_dir_url(__FILE__) . '../admin/');
       define('TT_PLUGIN_WEB_DIR_INC', plugin_dir_url(__FILE__));
+    }
+
+
+    /**
+     * Form Plugin Dependent Items Init
+     * 
+     */
+    private function load_form_dependencies() {      
+      //load time tracker functions based on form plugin being used
+      if (TT_PLUGIN_FORM_TYPE == "CF7") {
+        self::$instance->load_dependencies_cf7();
+      }
+      elseif (TT_PLUGIN_FORM_TYPE == "WPF") {
+        self::$instance->load_dependencies_wpf();
+      }
     }
   
@@ -106 +128 @@
       include_once(TT_PLUGIN_DIR_INC . 'function-tt-utilities.php');
       include_once(TT_PLUGIN_DIR_INC . 'function-tt-get-IDs-from-common-names.php');
-      include_once(TT_PLUGIN_DIR_INC . 'function-tt-custom-cf7-field-datetime.php');
-      include_once(TT_PLUGIN_DIR_INC . 'function-tt-custom-cf7-field-task-dropdown.php');
-      include_once(TT_PLUGIN_DIR_INC . 'function-tt-custom-cf7-field-project-dropdown.php');
-      include_once(TT_PLUGIN_DIR_INC . 'function-tt-custom-cf7-field-client-dropdown.php');
-      include_once(TT_PLUGIN_DIR_INC . 'function-tt-custom-cf7-field-categories-from-settings.php');
       include_once(TT_PLUGIN_DIR_INC . 'function-tt-clear-sql-error.php');
       include_once(TT_PLUGIN_DIR_INC . 'function-tt-cron-recurring-tasks.php');
@@ -119 +136 @@
       include_once(TT_PLUGIN_DIR_INC . 'function-tt-load-dynamic-stylesheets.php');
         include_once(TT_PLUGIN_DIR_INC . 'function-tt-get-new-task-details.php');
-      include_once(TT_PLUGIN_DIR_INC . 'function-tt-recaptcha.php');
      
       //CLASSES  
@@ -148 +164 @@
       //CONTACT FORM 7 HOOKS
       include_once(TT_PLUGIN_DIR_INC . 'class-tt-hook-after-form-data-saved.php');  
-      include_once(TT_PLUGIN_DIR_INC . 'class-tt-hook-save-form-data.php');
 
       //SHORTCODES
@@ -163 +178 @@
       require_once(TT_PLUGIN_DIR_INC . 'class-tt-shortcode-delete-confirmation-content.php');
       require_once(TT_PLUGIN_DIR_ADMIN . 'class-tt-shortcode-error-alert.php');  
-
     } 
 
+    /**
+     * Load Dependencies - CF7
+     * 
+     */
+    public function load_dependencies_cf7() {
+      include_once(TT_PLUGIN_DIR_INC . 'CF7/function-tt-custom-cf7-field-datetime.php');
+      include_once(TT_PLUGIN_DIR_INC . 'CF7/function-tt-custom-cf7-field-task-dropdown.php');
+      include_once(TT_PLUGIN_DIR_INC . 'CF7/function-tt-custom-cf7-field-project-dropdown.php');
+      include_once(TT_PLUGIN_DIR_INC . 'CF7/function-tt-custom-cf7-field-client-dropdown.php');
+      include_once(TT_PLUGIN_DIR_INC . 'CF7/function-tt-custom-cf7-field-categories-from-settings.php');
+      include_once(TT_PLUGIN_DIR_INC . 'CF7/function-tt-recaptcha-cf7.php');
+
+      //CONTACT FORM 7 HOOKS
+      include_once(TT_PLUGIN_DIR_INC . 'CF7/class-tt-hook-save-form-data-cf7.php');
+    }
+
+
+    /**
+     * Load Dependencies - WPForms
+     * 
+     */
+    public function load_dependencies_wpf() {
+      include_once(TT_PLUGIN_DIR_INC . 'WPF/class-time-tracker-activator-forms-wpf.php');
+      include_once(TT_PLUGIN_DIR_INC . 'WPF/class-time-tracker-wpf-select-fields-dynamic-options.php');
+      include_once(TT_PLUGIN_DIR_INC . 'WPF/class-time-tracker-wpf-fields-add-properties.php');
+
+      //WPFORMS HOOKS
+      include_once(TT_PLUGIN_DIR_INC . 'WPF/class-tt-hook-save-form-data-wpf.php');
+    }
 
     /**
@@ -186 +229 @@
       wp_enqueue_script( 'tt_accordion', TT_PLUGIN_WEB_DIR_INC . 'js/tt_accordion.js', array(), null, true );
 
-      //wp_enqueue_script( 'tt_watch_for_client_change_project', TT_PLUGIN_WEB_DIR_INC . 'js/watch_for_client_change_to_update_project.js', array(), null, true);
       wp_enqueue_script( 'tt_update_project_dropdown', TT_PLUGIN_WEB_DIR_INC . 'js/get_projects_for_client.js', array('jquery'), null, true);
-      
-      //wp_enqueue_script( 'tt_watch_for_client_change_task', TT_PLUGIN_WEB_DIR_INC . 'js/watch_for_client_change_to_update_task.js', array(), null, true);
       wp_enqueue_script( 'tt_update_task_dropdown', TT_PLUGIN_WEB_DIR_INC . 'js/get_tasks_for_client.js', array('jquery'), null, true);
       

time-tracker/trunk/inc/class-tt-hook-after-form-data-saved.php

@@ -4 +4 @@
  *
  * Action to happen after form data saved to database (if necessary)
- * Either go back to TT homepage or stay on same page and filter data if it's a filter form
+ * Either:
+ *  - go back to TT homepage
+ *  - stay on same page and filter data (if it's a filter form)
+ *  - go to time entry form to start tracking time (if 'start working' selected) 
  * 
  * @since 1.0
@@ -33 +36 @@
         */
         public function _construct() {
-
         }
 
@@ -42 +44 @@
         */
         public function after_save() {
-            //wp_enqueue_script( 'start_timer_for_task', TT_PLUGIN_WEB_DIR_INC . 'js/start_timer_for_task.js', array(), null, true);
-            //add_action('wp_enqueue_scripts', array($this,'time_tracker_scripts'));
-            ?>
-            <script type='text/javascript'>
-    
-                document.addEventListener('DOMContentLoaded', function () {  //make sure doc is done loading before looking for element
+            if (TT_PLUGIN_FORM_TYPE == "WPF") {
+                ?>
+                <script type='text/javascript'>
+                    document.addEventListener('DOMContentLoaded', function () {  
+                        jQuery(document).find("form[id^='wpforms-form']").each(function(i, form) {
+                            if (window.location.pathname.includes('time-tracker')) {
+
+                                var redirect = function() { location = <?php $home = "'" . TT_HOME . "'"; echo $home; ?>; };
+                                var submitandwork = function() { tt_start_timer_for_new_task(); };
+                                var filtertime = function(e) { tt_filter_time_log(e); };
+
+                                jQuery(form).on('wpformsAjaxSubmitSuccess', redirect);
+                                jQuery(form).find('button').each(function(i, btn) {
+                                    if (btn.name == 'wpforms[submit]' && btn.innerHTML == 'Search') {
+                                        jQuery(form).off('wpformsAjaxSubmitSuccess', redirect);
+                                        jQuery(form).on('wpformsAjaxSubmitSuccess', filtertime);
+                                    } else {
+                                        if (btn.name == 'wpforms[submit]' && btn.innerHTML == 'Start Working') {
+                                            jQuery(btn).on('click', function() {
+                                                jQuery(form).off('wpformsAjaxSubmitSuccess', redirect);
+                                                jQuery(form).on('wpformsAjaxSubmitSuccess', submitandwork);
+                                            })
+                                        }
+                                    }
+                                });
+                                
+                            };
+                        });
+                    }, false);
                 
-                    document.addEventListener( 'wpcf7mailsent', function (event) {
+                </script>
+                <?php
+
+            } elseif (TT_PLUGIN_FORM_TYPE == "CF7") {
+                ?>
+                <script type='text/javascript'>
+        
+                    document.addEventListener('DOMContentLoaded', function () {  
                     
-                        //console.log(event);
-                        var str = window.location.pathname;
-                        //var tthome = document.location.origin + '/time-tracker/';
-                        var formtype = "";
-                        var startworking = false;
-                        var client = "";
-                        var taskdesc = "";
+                        if (window.location.pathname.includes('time-tracker')) {
 
-                        for (var i=0; i < event.detail.inputs.length; i++) {
-                            if (event.detail.inputs[i].name == 'form-type') {
-                                formtype = event.detail.inputs[i].value;
-                            } else {
-                                if ( (event.detail.inputs[i].name == 'what-next') && (event.detail.inputs[i].value == 'StartWorking') ) {
-                                    startworking = true;
-                                } else {
-                                    if (event.detail.inputs[i].name == 'client-name') {
-                                        client = event.detail.inputs[i].value;
+                            document.addEventListener( 'wpcf7mailsent', function (event) {
+
+                                var formtype = "";
+                                var startworking = false;
+                                //var client = "";
+                                //var taskdesc = "";
+
+                                for (var i=0; i < event.detail.inputs.length; i++) {
+                                    if (event.detail.inputs[i].name == 'form-type') {
+                                        formtype = event.detail.inputs[i].value;
                                     } else {
-                                        if (event.detail.inputs[i].name == 'task-description') {
-                                            taskdesc = event.detail.inputs[i].value;
+                                        if ( (event.detail.inputs[i].name == 'what-next') && (event.detail.inputs[i].value == 'StartWorking') ) {
+                                            startworking = true;
+                                        //} else {
+                                            //if (event.detail.inputs[i].name == 'client-name') {
+                                            //    client = event.detail.inputs[i].value;
+                                            //} else {
+                                            //    if (event.detail.inputs[i].name == 'task-description') {
+                                            //        taskdesc = event.detail.inputs[i].value;
+                                            //    }
+                                            //}
                                         }
                                     }
                                 }
-                            }
-                        }
 
-                        //if we're filtering data
-                        if (formtype == 'filter') {
-                            tt_filter_time_log(event);
+                                if (formtype == 'filter') {
+                                    tt_filter_time_log(event);
+                                
+                                } else {
+                                    if (startworking) {
+                                        tt_start_timer_for_new_task();
+                                    } else {
+                                        location = <?php $home = "'" . TT_HOME . "'"; echo $home; ?>;
+                                    }
+                                }
                         
-                        //we added a new task and want to start working
-                        } else {
-                            if (startworking) {
-                                tt_start_timer_for_new_task();
-                            } else {
-                                //if it's a time tracker form submission, go back to tt homepage after submit
-                                if (str.includes('time-tracker')) {
-                                    location = <?php $home = "'" . TT_HOME . "'"; echo $home; ?>;
-                                }
-                            }
-                        }
+                            }, false );  //end wpcf7submit event listener
+                        
+                        }; //if on tt page
                     
-                    }, false );  //end wpcf7submit event listener
-                
-                }, false );  //end domcontentloaded event listener
-            </script>
-            <?php
-        }   //after save function
-
+                    }, false );  //end domcontentloaded event listener
+                </script>
+                <?php
+                }   //if wpcf7
+            }   //after save function
     }  //close class
 }   //if class does not exist
 
 $aftersave = new Time_Tracker_After_Form_Data_Saved();
-
 add_action( 'wp_footer', array($aftersave, 'after_save') );

time-tracker/trunk/inc/class-tt-save-form-input.php

@@ -32 +32 @@
          * 
          */ 
-        private $data;
+        //private $data;
         private $form_post_id;
+        private $original_submission;
         private $result;
         private $client_id;
@@ -44 +45 @@
          * 
          */ 
-        public function __construct($raw_data, $id) {
+        public function __construct($cleaned_data, $id) {
             //removed $form added insertid
             $this->form_post_id = $id;
-            $data = $this->clean_data($raw_data);
+            //$data = $this->clean_data($raw_data);
+            $data = $cleaned_data;
+
             $this->original_submission = $this->serialize_data($data);
             $this->client_id = $this->get_client_id($data);
@@ -55 +58 @@
             /*** Add new task ***/
             if ( $this->form_post_id == tt_get_form_id('Add New Task') ) {
-                $this->save_new_task($data,$this->client_id,$this->project_id,$this->task_id,$this->original_submission);
-            }
+                $this->save_new_task($data, $this->client_id, $this->project_id, $this->task_id, $this->original_submission);
             
             /*** Add new project ***/
-            if ( $this->form_post_id == tt_get_form_id('Add New Project') ) {
-                $this->save_new_project($data,$this->client_id,$this->original_submission);           
-            }
+            } elseif ( $this->form_post_id == tt_get_form_id('Add New Project') ) {
+                $this->save_new_project($data, $this->client_id, $this->original_submission);           
 
             /*** Add new client ***/
-            if ( $this->form_post_id == tt_get_form_id('Add New Client') ) {
-                $this->save_new_client($data,$this->original_submission);
-            }
+            } elseif ( $this->form_post_id == tt_get_form_id('Add New Client') ) {
+                $this->save_new_client($data, $this->original_submission);
 
             /*** Add new recurring task ***/
-            if ( $this->form_post_id == tt_get_form_id('Add New Recurring Task') ) {
-                $this->save_new_recurring_task($data,$this->client_id,$this->project_id,$this->original_submission);
-            }
+            } elseif ( $this->form_post_id == tt_get_form_id('Add New Recurring Task') ) {
+                $this->save_new_recurring_task($data, $this->client_id, $this->project_id, $this->original_submission);
 
             /*** Add new time entry ***/
-            if ( $this->form_post_id == tt_get_form_id('Add Time Entry') ) {
+            } elseif ( $this->form_post_id == tt_get_form_id('Add Time Entry') ) {
                 $this->save_new_time_entry($data);
                 
@@ -88 +87 @@
             } 
         }
-     
-        
-        /**
-         * Sanitize data
-         * 
-         */
-        private function clean_data($raw_data) {
-            $clean_data = array();
-            foreach ($raw_data as $key => $data) {
-                if (is_array($data)) {
-                    //$clean_data[$key] = filter_var(htmlspecialchars_decode($data[0], ENT_NOQUOTES), FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES);
-                    //$raw = $data[0];
-                    //$clean_data[$key] = htmlspecialchars_decode(filter_var($raw, FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES), ENT_NO_QUOTES);
-                    $clean_data[$key] = filter_var($data[0], FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES);
-                } else {
-                    //$clean_data[$key] = filter_var(htmlspecialchars_decode($data, ENT_NOQUOTES), FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES);
-                    //$clean_data[$key] = htmlspecialchars_decode(filter_var($data, FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES), ENT_NOQUOTES);
-                    $clean_data[$key] = filter_var($data, FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES);
-                }
-            }
-            return $clean_data;
-        }
         
         
@@ -132 +109 @@
             //Add New Record to Database
             //wpdb class prepares this so it doesn't need to be SQL escaped
-            if ( ($data['time-estimate'] == null) or ($data['time-estimate'] == "") ) {
-                $time_est = 0;
-            } else {
-                $time_est = tt_convert_fraction_to_time($data['time-estimate']);
-            }
+            foreach ($data as $key => $val) {
+                //supports task-category and category
+                if (strpos(strtolower($key), "category") !== false) {
+                    $cat = $val;
+                }
+            }
+
             $wpdb->insert( $table_name, array(
                 'TDescription' => $data['task-description'],
                 'ClientID'   => $this->client_id,
                 'ProjectID'    => $this->project_id,
-                'TCategory' => $data['task-category'],
+                'TCategory' => $cat,
                 'TStatus' => "New",
-                'TTimeEstimate' => $time_est,
-                'TDueDate' => $data['due-date'],
+                'TTimeEstimate' => $this->get_time_estimate($data),
                 'TDateAdded' => date('Y-m-d H:i:s'),
+                'TDueDate' => $this->reformat_date($data, "due-date"),
                 'TNotes' => $data['notes'],
                 'TSubmission' => $this->original_submission
@@ -163 +142 @@
             //Add New Record to Database
             //wpdb class prepares this so it doesn't need to be SQL escaped
-            if ( ($data['time-estimate'] == null) or ($data['time-estimate'] == "") ) {
-                $time_est = 0;
-            } else {
-                $time_est = tt_convert_fraction_to_time($data['time-estimate']);
-            }
+
+            //CF7 vs WPF
+            $freq = "Monthly";
+            if ( array_key_exists("recur-freq", $data) ) {
+                $freq = $data["recur-freq"];
+            } elseif ( array_key_exists("frequency", $data)) {
+                $freq = $data["frequency"];
+            }
+
+            $desc = "";
+            if ( array_key_exists("task-desc", $data) ) {
+                $desc = $data["task-desc"];
+            } elseif ( array_key_exists("task-notes", $data)) {
+                $desc = $data["task-notes"];
+            }            
+
             $wpdb->insert( $table_name, array(
                 'RTName' => $data['task-name'],
                 'ClientID'   => $this->client_id,
                 'ProjectID'    => $this->project_id,
-                'RTTimeEstimate' => $time_est,
-                'RTDescription' => $data['task-desc'],
-                'Frequency' => $data['recur-freq'],
-                'EndRepeat' => $data['end-repeat'],
+                'RTTimeEstimate' => $this->get_time_estimate($data),
+                'RTDescription' => $desc,
+                'RTCategory' => $data['category'],
+                'Frequency' => $freq,
+                'EndRepeat' => $this->reformat_date($data, "end-repeat"),
                 'RTSubmission' => $this->original_submission
             ) );
@@ -191 +182 @@
 
             //Add New Record to Database
-            if ( ($data['time-estimate'] == null) or ($data['time-estimate'] == "") ) {
-                $time_est = 0;
-            } else {
-                $time_est = tt_convert_fraction_to_time($data['time-estimate']);
-            }
             $wpdb->insert( $table_name, array(
                 'PName' => $data['project-name'],
@@ -201 +187 @@
                 'PCategory'    => $data['project-category'],
                 'PStatus' => "New",
-                'PTimeEstimate' => $time_est,
-                'PDueDate' => $data['due-date'],
+                'PTimeEstimate' => $this->get_time_estimate($data),
                 'PDateStarted' => date('Y-m-d H:i:s'),
+                'PDueDate' => $this->reformat_date($data, "due-date"),
                 'PDetails' => $data['project-details'],
                 'PSubmission' => $this->original_submission
@@ -248 +234 @@
             $end = \DateTime::createFromFormat('n/j/y g:i A', $data['end-time'])->format('Y-m-d H:i:ss');
 
+            //find follow up field
+            $follow_up = "";
+            foreach ($data as $key => $val) {
+                if (strpos(strtolower($key), "follow-up") !== false) {
+                    if ($val != null && $val != "") {
+                        $follow_up = $val;
+                    }
+                }
+            }
+
             //Add New Record to Database
             $wpdb->insert( $table_name, array(
@@ -259 +255 @@
                 'InvoicedTime' => $data['invoiced-time'] == "" ? Null : $data['invoiced-time'],
                 'InvoiceComments' => $data['invoice-notes'],
-                'FollowUp' => $data['follow-up'],
+                'FollowUp' => $follow_up,
                 'NewTaskStatus' => $data['new-task-status'],
                 'TimeSubmission' => $this->original_submission
@@ -312 +308 @@
          */
         private function get_client_id($data) {
-            //no client information passed
-            if ( !array_key_exists('client-name', $data) or $data['client-name'] == '' or $data['client-name'] == null) {
+            if (array_key_exists("client-name", $data) && $data["client-name"] !="" && $data["client-name"] != null ) {
+                return get_client_id_from_name($data['client-name']);
+            } elseif (array_key_exists("client", $data) && $data["client"] !="" && $data["client"] != null ) {
+                return get_client_id_from_name($data['client']);
+            } else {
                 //use default client if one exists, if not just enter null
                 return array_key_exists('default_client', get_option('time_tracker_categories')) ? get_option('time_tracker_categories')['default_client'] : null;
-            } else {
-                return get_client_id_from_name($data['client-name']);
             }
         }
@@ -328 +325 @@
         private function get_project_id($data) {
             //Project field in table requires a valid Project ID or null value, won't except empty string
-            if (!array_key_exists('project-name', $data) or $data['project-name'] == '' or $data['project-name'] == null) {
-                return null;
-            } else {
-                $project = $data['project-name'];
-                return get_project_id_from_name($project);
-            }
+            if (array_key_exists('project-name', $data) && $data['project-name'] != '' && $data['project-name'] != null) {
+                return get_project_id_from_name(($data["project-name"]));
+            } elseif (array_key_exists('project', $data) && $data['project'] != '' && $data['project'] != null) {
+                return get_project_id_from_name(($data["project"]));
+            }
+            return null;
         }
 
@@ -343 +340 @@
         private function get_task_id($data) {
             //Task field in table requires a valid Task ID or null value, won't except empty string
-            if (!array_key_exists('task-name', $data) or $data['task-name'] == '' or $data['task-name'] == null) {
-                return array_key_exists('default_task', get_option('time_tracker_categories')) ? get_option('time_tracker_categories')['default_task'] : null;
-            } else {
+            if (array_key_exists('task-name', $data) and $data['task-name'] != '' and $data['task-name'] != null) {
                 $task = $data['task-name'];
-                $task_number_from_string = substr($task,0,strpos($task,'-'));
+                $task_number_from_string = substr($task, 0, strpos($task,'-'));
                 return $task_number_from_string;
+            } elseif (array_key_exists('ticket', $data) and $data['ticket'] != '' and $data['ticket'] != null) {
+                $task = $data['ticket'];
+                $task_number_from_string = substr($task, 0, strpos($task,'-'));
+                return $task_number_from_string;
+            }
+            return array_key_exists('default_task', get_option('time_tracker_categories')) ? get_option('time_tracker_categories')['default_task'] : null;
+        }
+
+
+        /**
+         * Get time estimate
+         * 
+         */
+        private function get_time_estimate($data) {
+            $time_est = 0;
+            foreach ($data as $key => $val) {
+                if (strpos(strtolower($key), "time-estimate") !== false) {
+                    if ($val != null && $val != "") {
+                        $time_est = tt_convert_fraction_to_time($val);
+                    }
+                }
+            }
+            return $time_est;
+        }
+
+
+        /**
+         * Get date from field and reformat for db
+         * 
+         */
+        private function reformat_date($data, $key) {
+            if (array_key_exists($key, $data)) {
+                //return \DateTime::createFromFormat('m/d/Y', $data[$key])->format('Y-m-d');
+                //if it is already in correct format pass it back
+                if (\DateTime::createFromFormat('Y-m-d', $data[$key])) {
+                    return $data[$key];
+                }
+                $obj = \DateTime::createFromFormat('m/d/Y', $data[$key]);
+                if ($obj) {
+                    return $obj->format('Y-m-d');
+                }
+                return $data[$key];
             }
         }

time-tracker/trunk/inc/css/time-tracker.php

@@ -111 +111 @@
   font-size: 1.3em;
   display: block;
-  padding: 5px 0;
+  padding: 0;
 }
 
@@ -166 +166 @@
         width: 100%;
     }
+
+    div#tt-primary {
+        width: 100%;
+        max-width: 100%;
+    }
 
     .content-area .site {
@@ -564 +569 @@
 .tt-form label, 
 .tt-form select, 
-.tt-form span {
+.tt-form span,
+.tt-form p:has(input[type="datetime"]) {
     display: inline-block;
     width: 90%;

time-tracker/trunk/inc/function-tt-utilities.php

@@ -224 +224 @@
 function tt_get_form_id($form_name) {
     //$forms = WPCF7_ContactForm::find(array("title" => $form_name));
+    require_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-activator-forms.php');
     $forms = get_posts(array(
         'title'=> $form_name,
-        'post_type' => 'wpcf7_contact_form'
+        'post_type' => Time_Tracker_Activator_Forms::get_post_type()
     ), ARRAY_A);
     if ($forms) {
@@ -259 +260 @@
     }
     require_once(TT_PLUGIN_DIR_INC . 'class-time-tracker-activator-forms.php');
-    $tt_forms = new Time_Tracker_Activator_Forms();
-    $tt_forms_arr = $tt_forms->create_form_details_array();
+    require_once(TT_PLUGIN_DIR_INC . '/' . TT_PLUGIN_FORM_TYPE . '/class-time-tracker-activator-forms-' . strtolower(TT_PLUGIN_FORM_TYPE) . '.php');
+    //$tt_forms = new Time_Tracker_Activator_Forms();
+    $tt_forms_arr = Time_Tracker_Activator_Forms::create_form_details_array();
     foreach ($tt_forms_arr as $tt_form) {
         if ($form_name == $tt_form['Title']) {
@@ -266 +268 @@
         }
     }
+    return false;
 }
 
@@ -611 +614 @@
     }
 }
+
+
+/**
+ * Query db
+ * 
+ */
+function tt_query_db($sql_string, $return_type="object") {
+    global $wpdb;
+    if ($return_type == "array") {
+        $sql_result = $wpdb->get_results(esc_sql($sql_string), ARRAY_A );
+    } else {
+        //default return type for get_results is object
+        $sql_result = $wpdb->get_results(esc_sql($sql_string));
+    }
+    \Logically_Tech\Time_Tracker\Inc\catch_sql_errors(__FILE__, __FUNCTION__, $wpdb->last_query, $wpdb->last_error);
+    return $sql_result;
+}
+
+
+/**
+ * Get user options
+ * 
+ */
+function tt_get_user_options($option_name, $sub_option_name) {
+    $optns = get_option($option_name);
+    if (array_key_exists($sub_option_name, $optns)) {
+        //var_dump(nl2br($optns[$sub_option_name]));
+        //var_dump(sanitize_text_field(nl2br($optns[$sub_option_name])));
+        return $optns[$sub_option_name];
+    }
+    return "";
+}
+
+
+/**
+ * Get clients
+ * 
+ */
+function tt_get_clients() {
+    return tt_query_db("SELECT ClientID, Company FROM tt_client ORDER BY Company ASC");
+}
+
+
+/**
+ * Get tasks
+ * 
+ */
+function tt_get_tasks() {
+    return tt_query_db("SELECT TaskID, TDescription FROM tt_task ORDER BY TaskID ASC");
+}
+
+
+/**
+ * Get projects
+ * 
+ */
+function tt_get_projects() {
+    return tt_query_db("SELECT ProjectID, PName FROM tt_project ORDER BY ProjectID ASC");
+}

time-tracker/trunk/inc/js/filter_time_log.js

@@ -1 +1 @@
 //Initiates when filter button pressed on page showing all time entries
 function tt_filter_time_log(event) {
-    var inputs = event.detail.inputs;
+
     var first_date = "";
     var last_date = "";
@@ -10 +10 @@
     var task = "";
     var project = "";
-    
-    for (var i = 0; i < inputs.length; i++) {
-        var input = inputs[i];
-        if (input.name == 'first-date') {
-            first_date = input.value;
-        } else if (input.name == 'last-date') {
-            last_date = input.value;
-        } else if (input.name == 'client-name' && input.value != "null") {
-            client = input.value;
-        } else if (input.name == 'notes' && input.value != "null") {
-            notes = input.value;
-        } else if (input.name == 'project-name' && input.value != "null") {
-            project = input.value;
-        } else if (input.name == 'task-name' && input.value != "null") {
-            //pull out task number, to the left of the hyphen  
-            task = input.value;
-            if (input.value.includes("-")) {
-                ticket = task.split("-", 1);
-                ticketname = task.split("-", 2);
+
+    if (event.detail !== undefined && event.detail !== null && event.detail !== false) {
+        //cf7
+        var inputs = event.detail.inputs;    
+        for (var i = 0; i < inputs.length; i++) {
+            var input = inputs[i];
+            if (input.name == 'first-date') {
+                first_date = input.value;
+            } else if (input.name == 'last-date') {
+                last_date = input.value;
+            } else if (input.name == 'client-name' && input.value != "null") {
+                client = input.value;
+            } else if (input.name == 'notes' && input.value != "null") {
+                notes = input.value;
+            } else if (input.name == 'project-name' && input.value != "null") {
+                project = input.value;
+            } else if (input.name == 'task-name' && input.value != "null") {
+                //pull out task number, to the left of the hyphen  
+                task = input.value;
+                if (input.value.includes("-")) {
+                    ticket = task.split("-", 1);
+                    ticketname = task.split("-", 2);
+                }
+                //ticket = inputs[i].value;
+            } //end if
+        }  //end for loop
+    } else {
+        if (event.target !== undefined && event.target !== null && event.target !== false) {
+            //wpf
+            var targets = event.target;
+            for (var i = 0; i < targets.length; i++) {
+                var ttfieldname = jQuery(event.target[i]).attr('data-tt-field');
+                if (ttfieldname !== undefined && ttfieldname !== false && event.target[i].value !== "" && event.target[i].value !== null) {
+                    if (ttfieldname == 'client') {
+                        client = event.target[i].value;
+                    } else if (ttfieldname == 'project') {
+                        project = event.target[i].value;
+                    } else if (ttfieldname == 'task') {
+                        task = event.target[i].value;
+                        if (task.includes("-")) {
+                            ticket = task.split("-", 1);
+                            ticketname = task.split("-", 2);
+                        }
+                    } else if (ttfieldname == 'notes') {
+                        notes = event.target[i].value;
+                    } else if (ttfieldname == "first-date") {
+                        first_date = event.target[i].value;
+                    } else if (ttfieldname == "last-date") {
+                        last_date = event.target[i].value;
+                    }
+                }
             }
-            //ticket = inputs[i].value;
-        } //end if
-    }  //end for loop
+        }
+    }
 
     client = encodeURIComponent(client);

time-tracker/trunk/inc/js/get_projects_for_client.js

@@ -1 +1 @@
 //Update Project List When Client Name is Updated
 function tt_update_project_dropdown() {
-  var clientField = document.getElementsByName('client-name');
-  var projectField = document.getElementsByName('project-name');
-  if (clientField.length > 0 && projectField.length > 0) {
-    var clientName =  encodeURIComponent(clientField[0].value);
+  var clientField = jQuery(".tt-form").find("#client-name")[0];
+  if (!clientField) {
+    clientField = document.getElementById(jQuery(".tt-form").find("label:contains(Client)").prop("for"));
+  }   
+
+  var projectField = jQuery(".tt-form").find("#project-name")[0];
+  if (!projectField) {
+    projectField = document.getElementById(jQuery(".tt-form").find("label:contains(Project)").prop("for"));
+  }   
+
+  if (clientField && projectField) {
+    var clientName =  encodeURIComponent(clientField.value);
     var send = {
         'security': wp_ajax_object_tt_update_project_list.security,
@@ -18 +26 @@
         if (response.success) {
           //success
-          //console.log(response.data.details);
-          projectField[0].innerHTML = response.data.details;
+          projectField.innerHTML = response.data.details;
         } else {
           //failed

time-tracker/trunk/inc/js/get_tasks_for_client.js

@@ -1 +1 @@
 function tt_update_task_dropdown() {
-  var taskField = document.getElementsByName('task-name');
-  var clientField = document.getElementsByName('client-name');
-  if (clientField.length > 0 && taskField.length > 0) {
-    var clientName =  encodeURIComponent(clientField[0].value);
+  var taskField = jQuery(".tt-form").find("[name='task-name']")[0];
+  if (!taskField) {
+    taskField = document.getElementById(jQuery(".tt-form").find("label:contains(Task)").prop("for"));
+  }
+
+  var clientField = jQuery(".tt-form").find("[name='client-name']")[0];
+  if (!clientField) {
+    clientField = document.getElementById(jQuery(".tt-form").find("label:contains(Client)").prop("for"));
+  }   
+
+  if (clientField && taskField) {
+    var clientName =  encodeURIComponent(clientField.value);
     var send = {
         'security': wp_ajax_object_tt_update_task_list.security,
@@ -17 +25 @@
         if (response.success) {
           //success
-          //console.log(response.data.details);
-          taskField[0].innerHTML = response.data.details;
+          taskField.innerHTML = response.data.details;
         } else {
           //failed

time-tracker/trunk/inc/js/set_date_picker_default_value.js

@@ -1 @@
-//Set default values for date pickers, if they exist in get value
+//Set default values for date pickers, if they exist in get value, filter time form
 document.addEventListener('DOMContentLoaded', function () {  //make sure doc is done loading before looking for element  
   var startDateField = document.getElementById('first-date');
+  if (!startDateField) {
+    var id = jQuery("label:contains(First Date)").prop("for");
+    if (id) {
+      startDateField = document.getElementById(id);
+    }
+  }
+
   var endDateField = document.getElementById('last-date');  
+  if (!endDateField) {
+    var id = jQuery("label:contains(End Date)").prop("for");
+    if (id) {
+      endDateField = document.getElementById(id);
+    }
+  } 
 
   if (startDateField || endDateField ) {

time-tracker/trunk/inc/js/update_end_timer.js

@@ -1 +1 @@
 //Update the "End" Timer for a Time Entry to the Current Time
-
-function update_end_timer() {
+function tt_update_timer(timer) {
     var d = new Date();
     
@@ -24 +23 @@
     var dstring = month + "/" + day + "/" + year + " " + hour + ":" + minutes + " " + ampm;
 
-    document.getElementById('end-time').value = dstring;
+    //document.getElementById('end-time').value = dstring;
+    timer.value = dstring;
 }
 
-jQuery(window).on("load", function() {
-    var endtimer = document.getElementById('end-time');
-    if (endtimer) {
-        var autoupdate = setInterval(function() {
-            update_end_timer();
-        }, 60000);
+jQuery(window).on('load', function() {
+    //look for cf7 end timer
+    var endtimer = jQuery('.tt-form').find('#end-time')[0];
+    //if not found look for wpf end timer
+    if (!endtimer) {
+        endtimer = document.getElementById(jQuery('.tt-form').find('label:contains(End Time)').prop('for'));
+    }    
+    if (endtimer) {
+        //update every 600 milliseconds
+        var autoupdate = setInterval(function() {
+            tt_update_timer(endtimer);
+        }, 600);
 
-        jQuery(endtimer).on("input", function() {
+        //if user enters data stop updating
+        jQuery(endtimer).on('input', function() {
             clearInterval(autoupdate);
         });
-    }
+    }
+
+    //wpf only
+    var starttimer = document.getElementById(jQuery('.tt-form').find('label:contains(Start Time)').prop('for'));
+    if (starttimer) {
+        if (starttimer.value == '' || starttimer.value == null) {
+            tt_update_timer(starttimer);
+        }
+    }
 });

time-tracker/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.1
 Requires PHP: 7.0
-Stable tag: 2.4.7
+Stable tag: 3.0.2
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -98 +98 @@
  
 == Changelog ==
+
+= 3.0.2 =
+* Improvement: Extended plugin requirement to EITHER Contact Forms 7 OR WP Forms as per their preference
+* Improvement: Moved 'Time Tracker Home' button to top of Time Tracker menu to clean up layout
+* Improvement: Mobile layout and usability tweaks
 
 = 2.4.7 =

time-tracker/trunk/templates/tt-page-template.php

@@ -78 +78 @@
 
                 ?>
-                <a href="<?php echo TT_HOME ?>" class="tt-header-button">Home</a>
                 </header>
             <!----------end page header----------->

time-tracker/trunk/templates/tt-sidebar.php

@@ -12 +12 @@
  ?>
 <div id="tt-favorite-functions">
+<a href=<?php echo TT_HOME ?> class="tt-sidebar-button">Time Tracker Home</a>
 <div class="tt-sidebar-header">Favorites</div>
 <a href=<?php echo TT_HOME . "open-task-list" ?> class="tt-sidebar-button">Open Tasks</a>

time-tracker/trunk/time-tracker.php

@@ -12 +12 @@
  * Plugin URI:        https://www.logicallytech.com/services/wordpress-plugins/time-tracker/
  * Description:       A task and time tracking program. Perfect for freelancers or indivdiuals keeping track of to do lists and time worked and billed to clients.
- * Version:           2.4.7
+ * Version:           3.0.2
  * Requires at least: 5.3
  * Requires PHP:      7.0
@@ -40 +40 @@
  * Use SemVer - https://semver.org
  */
-define('TIME_TRACKER_VERSION', '2.4.7');
+define('TIME_TRACKER_VERSION', '3.0.2');
 define('TIME_TRACKER_PLUGIN_BASENAME', plugin_basename(__FILE__));