Changeset 1049994

Timestamp:

12/20/2014 04:06:57 AM (11 years ago)

Author:

themeavenue

Message:

Update to 3.0.1

Location:

awesome-support/trunk

Files:

• awesome-support.php (modified) (2 diffs)
• class-awesome-support.php (modified) (2 diffs)
• includes/addons/custom-fields/class-display.php (modified) (4 diffs)
• includes/admin/class-admin.php (modified) (1 diff)
• includes/class-notification.php (modified) (2 diffs)
• includes/functions-general.php (modified) (1 diff)
• includes/functions-post.php (modified) (1 diff)
• includes/functions-user.php (modified) (5 diffs)
• includes/shortcodes/shortcode-submit.php (modified) (1 diff)
• includes/shortcodes/shortcode-tickets.php (modified) (1 diff)

awesome-support/trunk/awesome-support.php

@@ -11 +11 @@
  * Plugin URI:        http://getawesomesupport.com
  * Description:       Awesome Support is a great ticketing system that will help you improve your customer satisfaction by providing a unique customer support experience.
- * Version:           3.0.0
+ * Version:           3.0.1
  * Author:            ThemeAvenue
  * Author URI:        http://themeavenue.net
@@ -29 +29 @@
  *----------------------------------------------------------------------------*/
 
-define( 'WPAS_VERSION',           '3.0.0' );
+define( 'WPAS_VERSION',           '3.0.1' );
 define( 'WPAS_DB_VERSION',        '1' );
 define( 'WPAS_URL',               trailingslashit( plugin_dir_url( __FILE__ ) ) );

awesome-support/trunk/class-awesome-support.php

@@ -30 +30 @@
      */
     private function __construct() {
-
-        /**
-         * Ticket post type slug.
-         *
-         * @since 1.0.0
-         * @var   string
-         */
-        $this->slug = 'ticket';
 
         add_action( 'plugins_loaded',                 array( 'WPAS_Ticket_Post_Type', 'get_instance' ), 11 );
@@ -107 +99 @@
          */
         if ( isset( $_POST['wpas_registration'] ) ) {
-            add_action( 'wp', 'wpas_register_account' );
+            add_action( 'wp', 'wpas_register_account', 10, 0 );
         }
 

awesome-support/trunk/includes/addons/custom-fields/class-display.php

@@ -91 +91 @@
         global $post;
 
-        $field_id = 'wpas_' . $field['name'];
-        $label    = wpas_get_field_title( $field );
-        $current  = get_the_terms( $post->ID, sanitize_text_field( $field['name'] ) );
-        $terms    = get_terms( sanitize_text_field( $field['name'] ), array( 'hide_empty' => 0 ) );
-        $value    = '';
+        $field_id      = 'wpas_' . $field['name'];
+        $label         = wpas_get_field_title( $field );
+        $current       = get_the_terms( $post->ID, sanitize_text_field( $field['name'] ) );
+        $terms         = get_terms( sanitize_text_field( $field['name'] ), array( 'hide_empty' => 0 ) );
+        $value         = '';
+        $ordered_terms = array();
 
         if ( is_array( $current ) ) {
@@ -109 +110 @@
             return;
         }
+
+        /**
+         * Re-order the terms hierarchically.
+         */
+        wpas_sort_terms_hierarchicaly( $terms, $ordered_terms );
         ?>
 
@@ -120 +126 @@
 
                     <?php
-                    foreach( $terms as $term ) { ?>
-                        <option value="<?php echo $term->slug; ?>" <?php if( $term->slug == $value ) { echo 'selected="selected"'; } ?>><?php echo $term->name; ?></option>
-                    <?php } ?>
+                    foreach ( $ordered_terms as $term ) {
+                        wpas_hierarchical_taxonomy_dropdown_options( $term, $value );
+                    } ?>
 
                 </select>
@@ -189 +195 @@
 
 }
+
+/**
+ * Recursively sort an array of taxonomy terms hierarchically. Child categories will be
+ * placed under a 'children' member of their parent term.
+ *
+ * @since  3.0.1
+ * @param Array   $cats     taxonomy term objects to sort
+ * @param Array   $into     result array to put them in
+ * @param integer $parentId the current parent ID to put them in
+ * @link  http://wordpress.stackexchange.com/a/99516/16176
+ */
+function wpas_sort_terms_hierarchicaly( Array &$cats, Array &$into, $parentId = 0 ) {
+
+    foreach ($cats as $i => $cat) {
+        if ($cat->parent == $parentId) {
+            $into[$cat->term_id] = $cat;
+            unset($cats[$i]);
+        }
+    }
+
+    foreach ($into as $topCat) {
+        $topCat->children = array();
+        wpas_sort_terms_hierarchicaly( $cats, $topCat->children, $topCat->term_id );
+    }
+}
+
+/**
+ * Recursively displays hierarchical options into a select dropdown.
+ *
+ * @since  3.0.1
+ * @param  object $term  The term to display
+ * @param  string $value The value to compare against
+ * @return void
+ */
+function wpas_hierarchical_taxonomy_dropdown_options( $term, $value, $level = 1 ) {
+
+    $option = '';
+
+    /* Add a visual indication that this is a child term */
+    if ( 1 !== $level ) {
+        for ( $i = 1; $i < ( $level - 1 ); $i++ ) {
+            $option .= '&nbsp;&nbsp;&nbsp;&nbsp;';
+        }
+        $option .= '&angrt; ';
+    }
+
+    $option .= $term->name;
+    ?>
+
+    <option value="<?php echo $term->slug; ?>" <?php if( $term->slug == $value ) { echo 'selected="selected"'; } ?>><?php echo $option; ?></option>
+
+    <?php if ( isset( $term->children ) && !empty( $term->children ) ) {
+        ++$level;
+        foreach ( $term->children as $child ) {
+            wpas_hierarchical_taxonomy_dropdown_options( $child, $value, $level );
+        }
+    }
+
+}

awesome-support/trunk/includes/admin/class-admin.php

@@ -64 +64 @@
             require_once( WPAS_PATH . 'includes/admin/class-admin-titan.php' );
             require_once( WPAS_PATH . 'includes/admin/class-admin-help.php' );
-            require_once( WPAS_PATH . 'includes/class-remote-notification-client.php' );
+            
+            if ( !class_exists( 'TAV_Remote_Notification_Client' ) ) {
+                require_once( WPAS_PATH . 'includes/class-remote-notification-client.php' );
+            }
 
             /* Load settings files */

awesome-support/trunk/includes/class-notification.php

@@ -117 +117 @@
         if ( is_null( $this->message ) || false === $this->case ) {
             return false;
-        } 
-
-        return $this->template();
+        }
+
+        ob_start();
+        $this->template();
+        $notification = ob_get_clean();
+        
+        return $notification;
 
     }
@@ -239 +243 @@
 
     if( true === $echo ) {
-        echo $notification->notify( $case, $message );
+        echo $notification->notify();
     }
 
     else {
-        return $notification->notify( $case, $message );
+        return $notification->notify();
     }
 

awesome-support/trunk/includes/functions-general.php

@@ -13 +13 @@
 
     /* Return option value if exists */
-    if ( isset( $options[$option] ) ) {
-        return apply_filters( 'wpas_option_' . $option, $options[$option] );
-    }
-
-    /* Otherwise return $default value */
-    else {
-        return $default;
-    }
+    $value = isset( $options[$option] ) ? $options[$option] : $default;
+
+    return apply_filters( 'wpas_option_' . $option, $value );
 
 }

awesome-support/trunk/includes/functions-post.php

@@ -94 +94 @@
 
         /* Redirect to submit page */
-        wp_redirect( add_query_arg( array( 'message' => urlencode( base64_encode( json_encode( $messages ) ) ) ), get_permalink( $submit ) ) );
+        wp_redirect( add_query_arg( array( 'message' => wpas_create_notification( $messages ), get_permalink( $submit ) ) ) );
 
         exit;

awesome-support/trunk/includes/functions-user.php

@@ -6 +6 @@
  * @return void
  */
-function wpas_register_account() {
+function wpas_register_account( $data = false ) {
 
     global $post;
@@ -18 +18 @@
     }
 
-    $email      = isset( $_POST['email'] ) && !empty( $_POST['email'] ) ? sanitize_email( $_POST['email'] ) : false;
-    $first_name = isset( $_POST['first_name'] ) && !empty( $_POST['first_name'] ) ? sanitize_text_field( $_POST['first_name'] ) : false;
-    $last_name  = isset( $_POST['last_name'] ) && !empty( $_POST['last_name'] ) ? sanitize_text_field( $_POST['last_name'] ) : false;
-    $pwd        = isset( $_POST['pwd'] ) && !empty( $_POST['pwd'] ) ? $_POST['pwd'] : false;
-    $pwd2       = isset( $_POST['pwd-validate'] ) && !empty( $_POST['pwd-validate'] ) ? $_POST['pwd-validate'] : false;
+    if ( false === $data ) {
+        $data = $_POST;
+    }
+
+    $email      = isset( $data['email'] ) && !empty( $data['email'] ) ? sanitize_email( $data['email'] ) : false;
+    $first_name = isset( $data['first_name'] ) && !empty( $data['first_name'] ) ? sanitize_text_field( $data['first_name'] ) : false;
+    $last_name  = isset( $data['last_name'] ) && !empty( $data['last_name'] ) ? sanitize_text_field( $data['last_name'] ) : false;
+    $pwd        = isset( $data['pwd'] ) && !empty( $data['pwd'] ) ? $data['pwd'] : false;
+    $pwd2       = isset( $data['pwd-validate'] ) && !empty( $data['pwd-validate'] ) ? $data['pwd-validate'] : false;
 
     /* Save the user information in session to pre populate the form in case of error. */
@@ -31 +35 @@
     );
 
-    if ( wpas_get_option( 'terms_conditions', false ) && !isset( $_POST['terms'] ) ) {
+    /**
+     * wpas_pre_register_account hook
+     *
+     * This hook is triggered all the time
+     * even if the checks don't pass.
+     *
+     * @since  3.0.1
+     */
+    do_action( 'wpas_pre_register_account', $data );
+
+    if ( wpas_get_option( 'terms_conditions', false ) && !isset( $data['terms'] ) ) {
         wp_redirect( add_query_arg( array( 'message' => wpas_create_notification( __( 'You did not accept the terms and conditions.', 'wpas' ) ), get_permalink( $post->ID ) ) ) );
         exit;
@@ -72 +86 @@
     );
 
+    /**
+     * wpas_register_account_before hook
+     *
+     * Fired right before the user is added to the database.
+     */
+    do_action( 'wpas_register_account_before', $args );
+
     $user_id = wp_insert_user( apply_filters( 'wpas_user_registration_data', $args ) );
 
     if ( is_wp_error( $user_id ) ) {
+
+        /**
+         * wpas_register_account_before hook
+         *
+         * Fired right after a failed attempt to register a user.
+         *
+         * @since  3.0.1
+         */
+        do_action( 'wpas_register_account_failed', $user_id, $args );
 
         $error = $user_id->get_error_message();
@@ -81 +111 @@
 
     } else {
+
+        /**
+         * wpas_register_account_before hook
+         *
+         * Fired right after the user is successfully added to the database.
+         *
+         * @since  3.0.1
+         */
+        do_action( 'wpas_register_account_after', $user_id, $args );
 
         /* Delete the user information data from session. */

awesome-support/trunk/includes/shortcodes/shortcode-submit.php

@@ -24 +24 @@
          */
         do_action( 'wpas_frontend_plugin_page_top', $post->ID, $post );
-
-        if ( isset( $_GET['message'] ) ) {
-            wpas_notification( 'decode', $_GET['message'] );
-        }
 
         /* If user is not logged in we display the register form */

awesome-support/trunk/includes/shortcodes/shortcode-tickets.php

@@ -6 +6 @@
 function wpas_sc_client_account() {
 
-    global $wpas_tickets, $current_user;
+    global $wpas_tickets, $current_user, $post;
 
     /**