eventespresso / event-espresso-core

core/EE_Cart.core.php

Spacing +4 added lines, -4 removed lines

@@ -65,14 +65,14 @@ 
             self::$_instance = new self($grand_total, $session);
         }
         // or maybe retrieve an existing one ?
-        if (! self::$_instance instanceof EE_Cart) {
+        if ( ! self::$_instance instanceof EE_Cart) {
             // try getting the cart out of the session
             $saved_cart = $session instanceof EE_Session ? $session->cart() : null;
             self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self($grand_total, $session);
             unset($saved_cart);
         }
         // verify that cart is ok and grand total line item exists
-        if (! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item) {
+        if ( ! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item) {
             self::$_instance = new self($grand_total, $session);
         }
         self::$_instance->get_grand_total();
@@ -124,7 +124,7 @@ 
      */
     public function session()
     {
-        if (! $this->_session instanceof EE_Session) {
+        if ( ! $this->_session instanceof EE_Session) {
             $this->set_session();
         }
         return $this->_session;
@@ -392,7 +392,7 @@ 
 
     public function __wakeup()
     {
-        if (! $this->_grand_total instanceof EE_Line_Item && absint($this->_grand_total) !== 0) {
+        if ( ! $this->_grand_total instanceof EE_Line_Item && absint($this->_grand_total) !== 0) {
             // $this->_grand_total is actually just an ID, so use it to get the object from the db
             $this->_grand_total = EEM_Line_Item::instance()->get_one_by_ID($this->_grand_total);
         }

Indentation +393 added lines, -393 removed lines

@@ -16,397 +16,397 @@
  */
 class EE_Cart implements ResettableInterface
 {
-    /**
-     * instance of the EE_Cart object
-     *
-     * @access    private
-     * @var EE_Cart $_instance
-     */
-    private static $_instance;
-
-    /**
-     * instance of the EE_Session object
-     *
-     * @access    protected
-     * @var EE_Session $_session
-     */
-    protected $_session;
-
-    /**
-     * The total Line item which comprises all the children line-item subtotals,
-     * which in turn each have their line items.
-     * Typically, the line item structure will look like:
-     * grand total
-     * -tickets-sub-total
-     * --ticket1
-     * --ticket2
-     * --...
-     * -taxes-sub-total
-     * --tax1
-     * --tax2
-     *
-     * @var EE_Line_Item
-     */
-    private $_grand_total;
-
-
-    /**
-     * @singleton method used to instantiate class object
-     * @access    public
-     * @param EE_Line_Item $grand_total
-     * @param EE_Session   $session
-     * @return \EE_Cart
-     * @throws \EE_Error
-     */
-    public static function instance(EE_Line_Item $grand_total = null, EE_Session $session = null)
-    {
-        if ($grand_total instanceof EE_Line_Item && $grand_total->is_total()) {
-            self::$_instance = new self($grand_total, $session);
-        }
-        // or maybe retrieve an existing one ?
-        if (! self::$_instance instanceof EE_Cart) {
-            // try getting the cart out of the session
-            $saved_cart = $session instanceof EE_Session ? $session->cart() : null;
-            self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self($grand_total, $session);
-            unset($saved_cart);
-        }
-        // verify that cart is ok and grand total line item exists
-        if (! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item) {
-            self::$_instance = new self($grand_total, $session);
-        }
-        self::$_instance->get_grand_total();
-        // once everything is all said and done, save the cart to the EE_Session
-        add_action('shutdown', array(self::$_instance, 'save_cart'), 90);
-        return self::$_instance;
-    }
-
-
-    /**
-     * private constructor to prevent direct creation
-     *
-     * @Constructor
-     * @access private
-     * @param EE_Line_Item $grand_total
-     * @param EE_Session   $session
-     */
-    private function __construct(EE_Line_Item $grand_total = null, EE_Session $session = null)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $this->set_session($session);
-        if ($grand_total instanceof EE_Line_Item && $grand_total->is_total()) {
-            $this->set_grand_total_line_item($grand_total);
-        }
-    }
-
-
-    /**
-     * Resets the cart completely (whereas empty_cart
-     *
-     * @param EE_Line_Item $grand_total
-     * @param EE_Session   $session
-     * @return EE_Cart
-     * @throws \EE_Error
-     */
-    public static function reset(EE_Line_Item $grand_total = null, EE_Session $session = null)
-    {
-        remove_action('shutdown', array(self::$_instance, 'save_cart'), 90);
-        if ($session instanceof EE_Session) {
-            $session->reset_cart();
-        }
-        self::$_instance = null;
-        return self::instance($grand_total, $session);
-    }
-
-
-    /**
-     * @return \EE_Session
-     */
-    public function session()
-    {
-        if (! $this->_session instanceof EE_Session) {
-            $this->set_session();
-        }
-        return $this->_session;
-    }
-
-
-    /**
-     * @param EE_Session $session
-     */
-    public function set_session(EE_Session $session = null)
-    {
-        $this->_session = $session instanceof EE_Session ? $session : EE_Registry::instance()->load_core('Session');
-    }
-
-
-    /**
-     * Sets the cart to match the line item. Especially handy for loading an old cart where you
-     *  know the grand total line item on it
-     *
-     * @param EE_Line_Item $line_item
-     */
-    public function set_grand_total_line_item(EE_Line_Item $line_item)
-    {
-        $this->_grand_total = $line_item;
-    }
-
-
-    /**
-     * get_cart_from_reg_url_link
-     *
-     * @access public
-     * @param EE_Transaction $transaction
-     * @param EE_Session     $session
-     * @return \EE_Cart
-     * @throws \EE_Error
-     */
-    public static function get_cart_from_txn(EE_Transaction $transaction, EE_Session $session = null)
-    {
-        $grand_total = $transaction->total_line_item();
-        $grand_total->get_items();
-        $grand_total->tax_descendants();
-        return EE_Cart::instance($grand_total, $session);
-    }
-
-
-    /**
-     * Creates the total line item, and ensures it has its 'tickets' and 'taxes' sub-items
-     *
-     * @return EE_Line_Item
-     * @throws \EE_Error
-     */
-    private function _create_grand_total()
-    {
-        $this->_grand_total = EEH_Line_Item::create_total_line_item();
-        return $this->_grand_total;
-    }
-
-
-    /**
-     * Gets all the line items of object type Ticket
-     *
-     * @access public
-     * @return \EE_Line_Item[]
-     */
-    public function get_tickets()
-    {
-        if ($this->_grand_total === null) {
-            return array();
-        }
-        return EEH_Line_Item::get_ticket_line_items($this->_grand_total);
-    }
-
-
-    /**
-     * returns the total quantity of tickets in the cart
-     *
-     * @access public
-     * @return int
-     * @throws \EE_Error
-     */
-    public function all_ticket_quantity_count()
-    {
-        $tickets = $this->get_tickets();
-        if (empty($tickets)) {
-            return 0;
-        }
-        $count = 0;
-        foreach ($tickets as $ticket) {
-            $count += $ticket->get('LIN_quantity');
-        }
-        return $count;
-    }
-
-
-    /**
-     * Gets all the tax line items
-     *
-     * @return \EE_Line_Item[]
-     * @throws \EE_Error
-     */
-    public function get_taxes()
-    {
-        return EEH_Line_Item::get_taxes_subtotal($this->_grand_total)->children();
-    }
-
-
-    /**
-     * Gets the total line item (which is a parent of all other line items) on this cart
-     *
-     * @return EE_Line_Item
-     * @throws \EE_Error
-     */
-    public function get_grand_total()
-    {
-        return $this->_grand_total instanceof EE_Line_Item ? $this->_grand_total : $this->_create_grand_total();
-    }
-
-
-    /**
-     * @process items for adding to cart
-     * @access  public
-     * @param EE_Ticket $ticket
-     * @param int       $qty
-     * @return TRUE on success, FALSE on fail
-     * @throws \EE_Error
-     */
-    public function add_ticket_to_cart(EE_Ticket $ticket, $qty = 1)
-    {
-        EEH_Line_Item::add_ticket_purchase($this->get_grand_total(), $ticket, $qty);
-        return $this->save_cart() ? true : false;
-    }
-
-
-    /**
-     * get_cart_total_before_tax
-     *
-     * @access public
-     * @return float
-     * @throws \EE_Error
-     */
-    public function get_cart_total_before_tax()
-    {
-        return $this->get_grand_total()->recalculate_pre_tax_total();
-    }
-
-
-    /**
-     * gets the total amount of tax paid for items in this cart
-     *
-     * @access public
-     * @return float
-     * @throws \EE_Error
-     */
-    public function get_applied_taxes()
-    {
-        return EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
-    }
-
-
-    /**
-     * Gets the total amount to be paid for the items in the cart, including taxes and other modifiers
-     *
-     * @access public
-     * @return float
-     * @throws \EE_Error
-     */
-    public function get_cart_grand_total()
-    {
-        EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
-        return $this->get_grand_total()->total();
-    }
-
-
-    /**
-     * Gets the total amount to be paid for the items in the cart, including taxes and other modifiers
-     *
-     * @access public
-     * @return float
-     * @throws \EE_Error
-     */
-    public function recalculate_all_cart_totals()
-    {
-        $pre_tax_total = $this->get_cart_total_before_tax();
-        $taxes_total = EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
-        $this->_grand_total->set_total($pre_tax_total + $taxes_total);
-        $this->_grand_total->save_this_and_descendants_to_txn();
-        return $this->get_grand_total()->total();
-    }
-
-
-    /**
-     * deletes an item from the cart
-     *
-     * @access public
-     * @param array|bool|string $line_item_codes
-     * @return int on success, FALSE on fail
-     * @throws \EE_Error
-     */
-    public function delete_items($line_item_codes = false)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes);
-    }
-
-
-    /**
-     * @remove ALL items from cart and zero ALL totals
-     * @access public
-     * @return bool
-     * @throws \EE_Error
-     */
-    public function empty_cart()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $this->_grand_total = $this->_create_grand_total();
-        return $this->save_cart(true);
-    }
-
-
-    /**
-     * @remove ALL items from cart and delete total as well
-     * @access public
-     * @return bool
-     * @throws \EE_Error
-     */
-    public function delete_cart()
-    {
-        if ($this->_grand_total instanceof EE_Line_Item) {
-            $deleted = EEH_Line_Item::delete_all_child_items($this->_grand_total);
-            if ($deleted) {
-                $deleted += $this->_grand_total->delete();
-                $this->_grand_total = null;
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @save   cart to session
-     * @access public
-     * @param bool $apply_taxes
-     * @return TRUE on success, FALSE on fail
-     * @throws \EE_Error
-     */
-    public function save_cart($apply_taxes = true)
-    {
-        if ($apply_taxes && $this->_grand_total instanceof EE_Line_Item) {
-            EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
-            // make sure we don't cache the transaction because it can get stale
-            if (
-                $this->_grand_total->get_one_from_cache('Transaction') instanceof EE_Transaction
-                && $this->_grand_total->get_one_from_cache('Transaction')->ID()
-            ) {
-                $this->_grand_total->clear_cache('Transaction', null, true);
-            }
-        }
-        if ($this->session() instanceof EE_Session) {
-            return $this->session()->set_cart($this);
-        } else {
-            return false;
-        }
-    }
-
-
-    public function __wakeup()
-    {
-        if (! $this->_grand_total instanceof EE_Line_Item && absint($this->_grand_total) !== 0) {
-            // $this->_grand_total is actually just an ID, so use it to get the object from the db
-            $this->_grand_total = EEM_Line_Item::instance()->get_one_by_ID($this->_grand_total);
-        }
-    }
-
-
-    /**
-     * @return array
-     */
-    public function __sleep()
-    {
-        if ($this->_grand_total instanceof EE_Line_Item && $this->_grand_total->ID()) {
-            $this->_grand_total = $this->_grand_total->ID();
-        }
-        return array('_grand_total');
-    }
+	/**
+	 * instance of the EE_Cart object
+	 *
+	 * @access    private
+	 * @var EE_Cart $_instance
+	 */
+	private static $_instance;
+
+	/**
+	 * instance of the EE_Session object
+	 *
+	 * @access    protected
+	 * @var EE_Session $_session
+	 */
+	protected $_session;
+
+	/**
+	 * The total Line item which comprises all the children line-item subtotals,
+	 * which in turn each have their line items.
+	 * Typically, the line item structure will look like:
+	 * grand total
+	 * -tickets-sub-total
+	 * --ticket1
+	 * --ticket2
+	 * --...
+	 * -taxes-sub-total
+	 * --tax1
+	 * --tax2
+	 *
+	 * @var EE_Line_Item
+	 */
+	private $_grand_total;
+
+
+	/**
+	 * @singleton method used to instantiate class object
+	 * @access    public
+	 * @param EE_Line_Item $grand_total
+	 * @param EE_Session   $session
+	 * @return \EE_Cart
+	 * @throws \EE_Error
+	 */
+	public static function instance(EE_Line_Item $grand_total = null, EE_Session $session = null)
+	{
+		if ($grand_total instanceof EE_Line_Item && $grand_total->is_total()) {
+			self::$_instance = new self($grand_total, $session);
+		}
+		// or maybe retrieve an existing one ?
+		if (! self::$_instance instanceof EE_Cart) {
+			// try getting the cart out of the session
+			$saved_cart = $session instanceof EE_Session ? $session->cart() : null;
+			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self($grand_total, $session);
+			unset($saved_cart);
+		}
+		// verify that cart is ok and grand total line item exists
+		if (! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item) {
+			self::$_instance = new self($grand_total, $session);
+		}
+		self::$_instance->get_grand_total();
+		// once everything is all said and done, save the cart to the EE_Session
+		add_action('shutdown', array(self::$_instance, 'save_cart'), 90);
+		return self::$_instance;
+	}
+
+
+	/**
+	 * private constructor to prevent direct creation
+	 *
+	 * @Constructor
+	 * @access private
+	 * @param EE_Line_Item $grand_total
+	 * @param EE_Session   $session
+	 */
+	private function __construct(EE_Line_Item $grand_total = null, EE_Session $session = null)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->set_session($session);
+		if ($grand_total instanceof EE_Line_Item && $grand_total->is_total()) {
+			$this->set_grand_total_line_item($grand_total);
+		}
+	}
+
+
+	/**
+	 * Resets the cart completely (whereas empty_cart
+	 *
+	 * @param EE_Line_Item $grand_total
+	 * @param EE_Session   $session
+	 * @return EE_Cart
+	 * @throws \EE_Error
+	 */
+	public static function reset(EE_Line_Item $grand_total = null, EE_Session $session = null)
+	{
+		remove_action('shutdown', array(self::$_instance, 'save_cart'), 90);
+		if ($session instanceof EE_Session) {
+			$session->reset_cart();
+		}
+		self::$_instance = null;
+		return self::instance($grand_total, $session);
+	}
+
+
+	/**
+	 * @return \EE_Session
+	 */
+	public function session()
+	{
+		if (! $this->_session instanceof EE_Session) {
+			$this->set_session();
+		}
+		return $this->_session;
+	}
+
+
+	/**
+	 * @param EE_Session $session
+	 */
+	public function set_session(EE_Session $session = null)
+	{
+		$this->_session = $session instanceof EE_Session ? $session : EE_Registry::instance()->load_core('Session');
+	}
+
+
+	/**
+	 * Sets the cart to match the line item. Especially handy for loading an old cart where you
+	 *  know the grand total line item on it
+	 *
+	 * @param EE_Line_Item $line_item
+	 */
+	public function set_grand_total_line_item(EE_Line_Item $line_item)
+	{
+		$this->_grand_total = $line_item;
+	}
+
+
+	/**
+	 * get_cart_from_reg_url_link
+	 *
+	 * @access public
+	 * @param EE_Transaction $transaction
+	 * @param EE_Session     $session
+	 * @return \EE_Cart
+	 * @throws \EE_Error
+	 */
+	public static function get_cart_from_txn(EE_Transaction $transaction, EE_Session $session = null)
+	{
+		$grand_total = $transaction->total_line_item();
+		$grand_total->get_items();
+		$grand_total->tax_descendants();
+		return EE_Cart::instance($grand_total, $session);
+	}
+
+
+	/**
+	 * Creates the total line item, and ensures it has its 'tickets' and 'taxes' sub-items
+	 *
+	 * @return EE_Line_Item
+	 * @throws \EE_Error
+	 */
+	private function _create_grand_total()
+	{
+		$this->_grand_total = EEH_Line_Item::create_total_line_item();
+		return $this->_grand_total;
+	}
+
+
+	/**
+	 * Gets all the line items of object type Ticket
+	 *
+	 * @access public
+	 * @return \EE_Line_Item[]
+	 */
+	public function get_tickets()
+	{
+		if ($this->_grand_total === null) {
+			return array();
+		}
+		return EEH_Line_Item::get_ticket_line_items($this->_grand_total);
+	}
+
+
+	/**
+	 * returns the total quantity of tickets in the cart
+	 *
+	 * @access public
+	 * @return int
+	 * @throws \EE_Error
+	 */
+	public function all_ticket_quantity_count()
+	{
+		$tickets = $this->get_tickets();
+		if (empty($tickets)) {
+			return 0;
+		}
+		$count = 0;
+		foreach ($tickets as $ticket) {
+			$count += $ticket->get('LIN_quantity');
+		}
+		return $count;
+	}
+
+
+	/**
+	 * Gets all the tax line items
+	 *
+	 * @return \EE_Line_Item[]
+	 * @throws \EE_Error
+	 */
+	public function get_taxes()
+	{
+		return EEH_Line_Item::get_taxes_subtotal($this->_grand_total)->children();
+	}
+
+
+	/**
+	 * Gets the total line item (which is a parent of all other line items) on this cart
+	 *
+	 * @return EE_Line_Item
+	 * @throws \EE_Error
+	 */
+	public function get_grand_total()
+	{
+		return $this->_grand_total instanceof EE_Line_Item ? $this->_grand_total : $this->_create_grand_total();
+	}
+
+
+	/**
+	 * @process items for adding to cart
+	 * @access  public
+	 * @param EE_Ticket $ticket
+	 * @param int       $qty
+	 * @return TRUE on success, FALSE on fail
+	 * @throws \EE_Error
+	 */
+	public function add_ticket_to_cart(EE_Ticket $ticket, $qty = 1)
+	{
+		EEH_Line_Item::add_ticket_purchase($this->get_grand_total(), $ticket, $qty);
+		return $this->save_cart() ? true : false;
+	}
+
+
+	/**
+	 * get_cart_total_before_tax
+	 *
+	 * @access public
+	 * @return float
+	 * @throws \EE_Error
+	 */
+	public function get_cart_total_before_tax()
+	{
+		return $this->get_grand_total()->recalculate_pre_tax_total();
+	}
+
+
+	/**
+	 * gets the total amount of tax paid for items in this cart
+	 *
+	 * @access public
+	 * @return float
+	 * @throws \EE_Error
+	 */
+	public function get_applied_taxes()
+	{
+		return EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
+	}
+
+
+	/**
+	 * Gets the total amount to be paid for the items in the cart, including taxes and other modifiers
+	 *
+	 * @access public
+	 * @return float
+	 * @throws \EE_Error
+	 */
+	public function get_cart_grand_total()
+	{
+		EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
+		return $this->get_grand_total()->total();
+	}
+
+
+	/**
+	 * Gets the total amount to be paid for the items in the cart, including taxes and other modifiers
+	 *
+	 * @access public
+	 * @return float
+	 * @throws \EE_Error
+	 */
+	public function recalculate_all_cart_totals()
+	{
+		$pre_tax_total = $this->get_cart_total_before_tax();
+		$taxes_total = EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
+		$this->_grand_total->set_total($pre_tax_total + $taxes_total);
+		$this->_grand_total->save_this_and_descendants_to_txn();
+		return $this->get_grand_total()->total();
+	}
+
+
+	/**
+	 * deletes an item from the cart
+	 *
+	 * @access public
+	 * @param array|bool|string $line_item_codes
+	 * @return int on success, FALSE on fail
+	 * @throws \EE_Error
+	 */
+	public function delete_items($line_item_codes = false)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes);
+	}
+
+
+	/**
+	 * @remove ALL items from cart and zero ALL totals
+	 * @access public
+	 * @return bool
+	 * @throws \EE_Error
+	 */
+	public function empty_cart()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_grand_total = $this->_create_grand_total();
+		return $this->save_cart(true);
+	}
+
+
+	/**
+	 * @remove ALL items from cart and delete total as well
+	 * @access public
+	 * @return bool
+	 * @throws \EE_Error
+	 */
+	public function delete_cart()
+	{
+		if ($this->_grand_total instanceof EE_Line_Item) {
+			$deleted = EEH_Line_Item::delete_all_child_items($this->_grand_total);
+			if ($deleted) {
+				$deleted += $this->_grand_total->delete();
+				$this->_grand_total = null;
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @save   cart to session
+	 * @access public
+	 * @param bool $apply_taxes
+	 * @return TRUE on success, FALSE on fail
+	 * @throws \EE_Error
+	 */
+	public function save_cart($apply_taxes = true)
+	{
+		if ($apply_taxes && $this->_grand_total instanceof EE_Line_Item) {
+			EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
+			// make sure we don't cache the transaction because it can get stale
+			if (
+				$this->_grand_total->get_one_from_cache('Transaction') instanceof EE_Transaction
+				&& $this->_grand_total->get_one_from_cache('Transaction')->ID()
+			) {
+				$this->_grand_total->clear_cache('Transaction', null, true);
+			}
+		}
+		if ($this->session() instanceof EE_Session) {
+			return $this->session()->set_cart($this);
+		} else {
+			return false;
+		}
+	}
+
+
+	public function __wakeup()
+	{
+		if (! $this->_grand_total instanceof EE_Line_Item && absint($this->_grand_total) !== 0) {
+			// $this->_grand_total is actually just an ID, so use it to get the object from the db
+			$this->_grand_total = EEM_Line_Item::instance()->get_one_by_ID($this->_grand_total);
+		}
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		if ($this->_grand_total instanceof EE_Line_Item && $this->_grand_total->ID()) {
+			$this->_grand_total = $this->_grand_total->ID();
+		}
+		return array('_grand_total');
+	}
 }

core/helpers/EEH_Formatter.helper.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
             return htmlspecialchars($string);
         } else {
             if ($translate === false) {
-                return self::ee_tep_parse_input_field_data($string, array( '"' => '"' ));
+                return self::ee_tep_parse_input_field_data($string, array('"' => '"'));
             } else {
                 return self::ee_tep_parse_input_field_data($string, $translate);
             }
@@ -84,7 +84,7 @@ 
                 return false;
             }
         } else {
-            if (( $value !== '' ) && ( strtolower($value) !== 'null' ) && ( strlen(trim($value)) > 0 )) {
+            if (($value !== '') && (strtolower($value) !== 'null') && (strlen(trim($value)) > 0)) {
                 return true;
             } else {
                 return false;

Indentation +92 added lines, -92 removed lines

@@ -10,108 +10,108 @@
  */
 class EEH_Formatter
 {
-    /**
-     * _admin_format_content
-     * Text formatting function for wp_editor.
-     * This should fix all of the formatting issues of text output from the database.
-     *
-     * @static
-     * @access public
-     * @param  string $content content to format
-     * @return string          formatted content
-     */
-    public static function admin_format_content($content = '')
-    {
-        return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
-    }
+	/**
+	 * _admin_format_content
+	 * Text formatting function for wp_editor.
+	 * This should fix all of the formatting issues of text output from the database.
+	 *
+	 * @static
+	 * @access public
+	 * @param  string $content content to format
+	 * @return string          formatted content
+	 */
+	public static function admin_format_content($content = '')
+	{
+		return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
+	}
 
 
 
-    /**
-     * ee_tep_output_string
-     * todo: we need a description for this.
-     *
-     * @static
-     * @access public
-     * @param  string  $string    string to handle
-     * @param  boolean $translate //todo what is this for?
-     * @param  boolean $protected true then we run htmlspecialchars and return
-     * @return string
-     */
-    public static function ee_tep_output_string($string, $translate = false, $protected = false)
-    {
-        if ($protected === true) {
-            return htmlspecialchars($string);
-        } else {
-            if ($translate === false) {
-                return self::ee_tep_parse_input_field_data($string, array( '"' => '"' ));
-            } else {
-                return self::ee_tep_parse_input_field_data($string, $translate);
-            }
-        }
-    }
+	/**
+	 * ee_tep_output_string
+	 * todo: we need a description for this.
+	 *
+	 * @static
+	 * @access public
+	 * @param  string  $string    string to handle
+	 * @param  boolean $translate //todo what is this for?
+	 * @param  boolean $protected true then we run htmlspecialchars and return
+	 * @return string
+	 */
+	public static function ee_tep_output_string($string, $translate = false, $protected = false)
+	{
+		if ($protected === true) {
+			return htmlspecialchars($string);
+		} else {
+			if ($translate === false) {
+				return self::ee_tep_parse_input_field_data($string, array( '"' => '"' ));
+			} else {
+				return self::ee_tep_parse_input_field_data($string, $translate);
+			}
+		}
+	}
 
 
 
-    /**
-     * ee_tep_parse_input_field_data
-     *
-     * @param  string $data string to be "translated"
-     * @param         array ] $parse array in the form array( 'from' => 'to', ... )
-     * @return string
-     */
-    public static function ee_tep_parse_input_field_data($data, $parse)
-    {
-        return strtr(trim($data), $parse);
-    }
+	/**
+	 * ee_tep_parse_input_field_data
+	 *
+	 * @param  string $data string to be "translated"
+	 * @param         array ] $parse array in the form array( 'from' => 'to', ... )
+	 * @return string
+	 */
+	public static function ee_tep_parse_input_field_data($data, $parse)
+	{
+		return strtr(trim($data), $parse);
+	}
 
 
 
-    /**
-     * [ee_tep_not_null description]
-     *
-     * @param  string | array $value [description]
-     * @return bool       [description]
-     */
-    public static function ee_tep_not_null($value)
-    {
-        if (is_array($value)) {
-            if (count($value) > 0) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            if (( $value !== '' ) && ( strtolower($value) !== 'null' ) && ( strlen(trim($value)) > 0 )) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
+	/**
+	 * [ee_tep_not_null description]
+	 *
+	 * @param  string | array $value [description]
+	 * @return bool       [description]
+	 */
+	public static function ee_tep_not_null($value)
+	{
+		if (is_array($value)) {
+			if (count($value) > 0) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			if (( $value !== '' ) && ( strtolower($value) !== 'null' ) && ( strlen(trim($value)) > 0 )) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
 
 
 
-    /**
-     * Formats a date
-     *
-     * @param string $date
-     * @param string $format - format for the date
-     * @deprecated 4.6.12  Note, a search revealed this was not used anywhere in core or in our
-     *                       addons at time of writing this.  So just deprecated in case of third party use.
-     * @return string
-     * @deprecated v4.6.21
-     */
-    public static function event_date_display($date, $format = '')
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            esc_html__(
-                'This method is deprecated as of EE 4.6.12.  Currently it does not reformat as with prior behaviour but just returns the incoming string.  Please use the EE_Datetime helpers for Datetime on the event to display as desired.',
-                'event_espresso'
-            ),
-            '4.6.21'
-        );
-        return $date;
-    }
+	/**
+	 * Formats a date
+	 *
+	 * @param string $date
+	 * @param string $format - format for the date
+	 * @deprecated 4.6.12  Note, a search revealed this was not used anywhere in core or in our
+	 *                       addons at time of writing this.  So just deprecated in case of third party use.
+	 * @return string
+	 * @deprecated v4.6.21
+	 */
+	public static function event_date_display($date, $format = '')
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			esc_html__(
+				'This method is deprecated as of EE 4.6.12.  Currently it does not reformat as with prior behaviour but just returns the incoming string.  Please use the EE_Datetime helpers for Datetime on the event to display as desired.',
+				'event_espresso'
+			),
+			'4.6.21'
+		);
+		return $date;
+	}
 }

core/CPTs/EE_CPT_Default_Strategy.core.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public function pre_get_posts(WP_Query $WP_Query)
     {
-        if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
+        if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
             return $WP_Query;
         }
         return $WP_Query;

Indentation +58 added lines, -58 removed lines

@@ -11,70 +11,70 @@
  */
 class EE_CPT_Default_Strategy
 {
-    /**
-     * $CPT - the current page, if it utilizes CPTs
-     *
-     * @var    object
-     * @access    protected
-     */
-    protected $CPT = null;
+	/**
+	 * $CPT - the current page, if it utilizes CPTs
+	 *
+	 * @var    object
+	 * @access    protected
+	 */
+	protected $CPT = null;
 
 
-    /**
-     *    class constructor
-     *
-     * @access    private
-     * @param    array $arguments
-     * @return    \EE_CPT_Default_Strategy
-     */
-    public function __construct($arguments = array())
-    {
-        $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
-    }
+	/**
+	 *    class constructor
+	 *
+	 * @access    private
+	 * @param    array $arguments
+	 * @return    \EE_CPT_Default_Strategy
+	 */
+	public function __construct($arguments = array())
+	{
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
+	}
 
 
-    /**
-     *    pre_get_posts
-     *
-     * @access    public
-     * @param    \WP_Query $WP_Query
-     * @return    \WP_Query
-     */
-    public function pre_get_posts(WP_Query $WP_Query)
-    {
-        if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
-            return $WP_Query;
-        }
-        return $WP_Query;
-    }
+	/**
+	 *    pre_get_posts
+	 *
+	 * @access    public
+	 * @param    \WP_Query $WP_Query
+	 * @return    \WP_Query
+	 */
+	public function pre_get_posts(WP_Query $WP_Query)
+	{
+		if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
+			return $WP_Query;
+		}
+		return $WP_Query;
+	}
 
 
-    /**
-     *    wp
-     *
-     * @access    public
-     * @param    \WP_Post[] $posts
-     * @param    \WP_Query  $WP_Query
-     * @return    \WP_Post[]
-     */
-    public function the_posts($posts, WP_Query $WP_Query)
-    {
-        return $posts;
-    }
+	/**
+	 *    wp
+	 *
+	 * @access    public
+	 * @param    \WP_Post[] $posts
+	 * @param    \WP_Query  $WP_Query
+	 * @return    \WP_Post[]
+	 */
+	public function the_posts($posts, WP_Query $WP_Query)
+	{
+		return $posts;
+	}
 
 
-    /**
-     *    get_EE_post_type_metadata
-     *
-     * @access    public
-     * @param mixed     $meta_value
-     * @param    int    $post_id
-     * @param    string $meta_key
-     * @param    string $single
-     * @return    mixed
-     */
-    public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single)
-    {
-        return $meta_value;
-    }
+	/**
+	 *    get_EE_post_type_metadata
+	 *
+	 * @access    public
+	 * @param mixed     $meta_value
+	 * @param    int    $post_id
+	 * @param    string $meta_key
+	 * @param    string $single
+	 * @return    mixed
+	 */
+	public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single)
+	{
+		return $meta_value;
+	}
 }

modules/invalid_checkout_access/EED_Invalid_Checkout_Access.module.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      */
     public static function getInvalidCheckoutAccess()
     {
-        if (! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
+        if ( ! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
             self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
         }
         return self::$invalid_checkout_access_form;

Indentation +69 added lines, -69 removed lines

@@ -13,84 +13,84 @@
  */
 class EED_Invalid_Checkout_Access extends EED_Module
 {
-    /**
-     * @var InvalidCheckoutAccess $invalid_checkout_access_form
-     */
-    private static $invalid_checkout_access_form;
+	/**
+	 * @var InvalidCheckoutAccess $invalid_checkout_access_form
+	 */
+	private static $invalid_checkout_access_form;
 
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     */
-    public static function set_hooks()
-    {
-    }
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 */
+	public static function set_hooks()
+	{
+	}
 
 
-    /**
-     * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     */
-    public static function set_hooks_admin()
-    {
-        add_action(
-            'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-            array('EED_Invalid_Checkout_Access', 'display_invalid_checkout_access_form'),
-            15
-        );
-        add_filter(
-            'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-            array('EED_Invalid_Checkout_Access', 'process_invalid_checkout_access_form')
-        );
-    }
+	/**
+	 * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 */
+	public static function set_hooks_admin()
+	{
+		add_action(
+			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
+			array('EED_Invalid_Checkout_Access', 'display_invalid_checkout_access_form'),
+			15
+		);
+		add_filter(
+			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
+			array('EED_Invalid_Checkout_Access', 'process_invalid_checkout_access_form')
+		);
+	}
 
 
-    /**
-     * run - initial module setup
-     * this method is primarily used for activating resources in the EE_Front_Controller thru the use of filters
-     *
-     * @var WP $WP
-     */
-    public function run($WP)
-    {
-        // TODO: Implement run() method.
-    }
+	/**
+	 * run - initial module setup
+	 * this method is primarily used for activating resources in the EE_Front_Controller thru the use of filters
+	 *
+	 * @var WP $WP
+	 */
+	public function run($WP)
+	{
+		// TODO: Implement run() method.
+	}
 
 
-    /**
-     * @return InvalidCheckoutAccess
-     */
-    public static function getInvalidCheckoutAccess()
-    {
-        if (! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
-            self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
-        }
-        return self::$invalid_checkout_access_form;
-    }
+	/**
+	 * @return InvalidCheckoutAccess
+	 */
+	public static function getInvalidCheckoutAccess()
+	{
+		if (! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
+			self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
+		}
+		return self::$invalid_checkout_access_form;
+	}
 
 
-    /**
-     * email_validation_settings_form
-     *
-     * @return    void
-     * @throws EE_Error
-     */
-    public static function display_invalid_checkout_access_form()
-    {
-        $invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
-        echo wp_kses($invalid_checkout_access_form->getForm()->get_html(), AllowedTags::getWithFormTags());
-    }
+	/**
+	 * email_validation_settings_form
+	 *
+	 * @return    void
+	 * @throws EE_Error
+	 */
+	public static function display_invalid_checkout_access_form()
+	{
+		$invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
+		echo wp_kses($invalid_checkout_access_form->getForm()->get_html(), AllowedTags::getWithFormTags());
+	}
 
 
-    /**
-     * email_validation_settings_form
-     *
-     * @param EE_Registration_Config $EE_Registration_Config
-     * @return EE_Registration_Config
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function process_invalid_checkout_access_form(EE_Registration_Config $EE_Registration_Config)
-    {
-        $invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
-        return $invalid_checkout_access_form->processForm($EE_Registration_Config);
-    }
+	/**
+	 * email_validation_settings_form
+	 *
+	 * @param EE_Registration_Config $EE_Registration_Config
+	 * @return EE_Registration_Config
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function process_invalid_checkout_access_form(EE_Registration_Config $EE_Registration_Config)
+	{
+		$invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
+		return $invalid_checkout_access_form->processForm($EE_Registration_Config);
+	}
 }

payment_methods/Paypal_Standard/templates/paypal_standard_intro.template.php

Indentation +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@
 // if this is decaf, which is put on WordPress.org, we need to inform users that
 // we just put an affiliate link there. See https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/ section 12
 if (apply_filters('FHEE__ee_show_affiliate_links', true)) {
-    $closing_tag .= esc_html__(' (affiliate link)', 'event_espresso');
+	$closing_tag .= esc_html__(' (affiliate link)', 'event_espresso');
 }
 printf(
-    esc_html__(
-        'PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
-        'event_espresso'
-    ),
-    '<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">',
-    $closing_tag
+	esc_html__(
+		'PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
+		'event_espresso'
+	),
+	'<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">',
+	$closing_tag
 );

caffeinated/admin/new/tickets/Tickets_Admin_Page.core.php

Spacing +9 added lines, -9 removed lines

@@ -216,7 +216,7 @@ 
         $limit = array($offset, $per_page);
 
         if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
+            $sstr = '%'.$this->_req_data['s'].'%';
             $_where['OR'] = array(
                 'TKT_name'        => array('LIKE', $sstr),
                 'TKT_description' => array('LIKE', $sstr),
@@ -245,18 +245,18 @@ 
         $TKT = EEM_Ticket::instance();
 
         // checkboxes?
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+        if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
             // if array has more than one element then success message should be plural
             $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
             // cycle thru the boxes
             while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
                 if ($trash) {
-                    if (! $TKT->delete_by_ID($TKT_ID)) {
+                    if ( ! $TKT->delete_by_ID($TKT_ID)) {
                         $success = 0;
                     }
                 } else {
-                    if (! $TKT->restore_by_ID($TKT_ID)) {
+                    if ( ! $TKT->restore_by_ID($TKT_ID)) {
                         $success = 0;
                     }
                 }
@@ -266,11 +266,11 @@ 
             $TKT_ID = absint($this->_req_data['TKT_ID']);
 
             if ($trash) {
-                if (! $TKT->delete_by_ID($TKT_ID)) {
+                if ( ! $TKT->delete_by_ID($TKT_ID)) {
                     $success = 0;
                 }
             } else {
-                if (! $TKT->restore_by_ID($TKT_ID)) {
+                if ( ! $TKT->restore_by_ID($TKT_ID)) {
                     $success = 0;
                 }
             }
@@ -288,21 +288,21 @@ 
         $TKT = EEM_Ticket::instance();
 
         // checkboxes?
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+        if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
             // if array has more than one element then success message should be plural
             $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
             // cycle thru the boxes
             while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
                 // delete
-                if (! $this->_delete_the_ticket($TKT_ID)) {
+                if ( ! $this->_delete_the_ticket($TKT_ID)) {
                     $success = 0;
                 }
             }
         } else {
             // grab single id and trash
             $TKT_ID = absint($this->_req_data['TKT_ID']);
-            if (! $this->_delete_the_ticket($TKT_ID)) {
+            if ( ! $this->_delete_the_ticket($TKT_ID)) {
                 $success = 0;
             }
         }

Indentation +308 added lines, -308 removed lines

@@ -11,312 +11,312 @@
  */
 class Tickets_Admin_Page extends EE_Admin_Page
 {
-    protected function _init_page_props()
-    {
-        $this->page_slug = TICKETS_PG_SLUG;
-        $this->page_label = TICKETS_LABEL;
-        $this->_admin_base_url = TICKETS_ADMIN_URL;
-        $this->_admin_base_path = TICKETS_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = TICKETS_LABEL;
-        $this->_labels = array(
-            'buttons' => array(
-                'add'    => esc_html__('Add New Default Ticket', 'event_espresso'),
-                'edit'   => esc_html__('Edit Default Ticket', 'event_espresso'),
-                'delete' => esc_html__('Delete Default Ticket', 'event_espresso'),
-            ),
-        );
-    }
-
-
-    protected function _set_page_routes()
-    {
-
-        $tkt_id = ! empty($this->_req_data['TKT_ID']) && ! is_array($this->_req_data['TKT_ID'])
-            ? $this->_req_data['TKT_ID'] : 0;
-
-        $this->_page_routes = array(
-            'default'         => array(
-                'func'       => '_tickets_overview_list_table',
-                'capability' => 'ee_read_default_tickets',
-            ),
-            'trash_ticket'    => array(
-                'func'       => '_trash_or_restore_ticket',
-                'noheader'   => true,
-                'args'       => array('trash' => true),
-                'capability' => 'ee_delete_default_ticket',
-                'obj_id'     => $tkt_id,
-            ),
-            'trash_tickets'   => array(
-                'func'       => '_trash_or_restore_ticket',
-                'noheader'   => true,
-                'args'       => array('trash' => true),
-                'capability' => 'ee_delete_default_tickets',
-            ),
-            'restore_ticket'  => array(
-                'func'       => '_trash_or_restore_ticket',
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_ticket',
-                'obj_id'     => $tkt_id,
-            ),
-            'restore_tickets' => array(
-                'func'       => '_trash_or_restore_ticket',
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_tickets',
-            ),
-            'delete_ticket'   => array(
-                'func'       => '_delete_ticket',
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_ticket',
-                'obj_id'     => $tkt_id,
-            ),
-            'delete_tickets'  => array(
-                'func'       => '_delete_ticket',
-                'noheader'   => true,
-                'capability' => 'ee_delete_default_tickets',
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            'default' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Default Tickets', 'event_espresso'),
-                    'order' => 10,
-                ),
-                'list_table'    => 'Tickets_List_Table',
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    protected function _add_screen_options()
-    {
-    }
-
-    protected function _add_screen_options_default()
-    {
-        $this->_per_page_screen_option();
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-    public function load_scripts_styles()
-    {
-    }
-
-    public function load_scripts_styles_default()
-    {
-    }
-
-    public function admin_footer_scripts()
-    {
-    }
-
-    public function admin_init()
-    {
-    }
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function _set_list_table_views_default()
-    {
-        $this->_views = array(
-            'all'     => array(
-                'slug'        => 'all',
-                'label'       => esc_html__('All', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'trash_tickets' => esc_html__('Move to Trash', 'event_espresso'),
-                ),
-            ),
-            'trashed' => array(
-                'slug'        => 'trashed',
-                'label'       => esc_html__('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'restore_tickets' => esc_html__('Restore from Trash', 'event_espresso'),
-                    'delete_tickets'  => esc_html__('Delete Permanently', 'event_espresso'),
-                ),
-            ),
-        );
-    }
-
-
-    public function _tickets_overview_list_table()
-    {
-        $this->_search_btn_label = esc_html__('Tickets', 'event_espresso');
-        $this->display_admin_list_table_page_with_no_sidebar();
-    }
-
-
-    public function get_default_tickets($per_page = 10, $count = false, $trashed = false)
-    {
-
-        $orderby = empty($this->_req_data['orderby']) ? 'TKT_name' : $this->_req_data['orderby'];
-        $order = empty($this->_req_data['order']) ? 'ASC' : $order;
-
-        switch ($orderby) {
-            case 'TKT_name':
-                $orderby = array('TKT_name' => $order);
-                break;
-
-            case 'TKT_price':
-                $orderby = array('TKT_price' => $order);
-                break;
-
-            case 'TKT_uses':
-                $orderby = array('TKT_uses' => $order);
-                break;
-
-            case 'TKT_min':
-                $orderby = array('TKT_min' => $order);
-                break;
-
-            case 'TKT_max':
-                $orderby = array('TKT_max' => $order);
-                break;
-
-            case 'TKT_qty':
-                $orderby = array('TKT_qty' => $order);
-                break;
-        }
-
-        $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
-            ? $this->_req_data['paged'] : 1;
-        $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
-            ? $this->_req_data['perpage'] : $per_page;
-
-        $_where = array(
-            'TKT_is_default' => 1,
-            'TKT_deleted'    => $trashed,
-        );
-
-        $offset = ($current_page - 1) * $per_page;
-        $limit = array($offset, $per_page);
-
-        if (isset($this->_req_data['s'])) {
-            $sstr = '%' . $this->_req_data['s'] . '%';
-            $_where['OR'] = array(
-                'TKT_name'        => array('LIKE', $sstr),
-                'TKT_description' => array('LIKE', $sstr),
-            );
-        }
-
-        $query_params = array(
-            $_where,
-            'order_by' => $orderby,
-            'limit'    => $limit,
-            'group_by' => 'TKT_ID',
-        );
-
-        if ($count) {
-            return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-        } else {
-            return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
-        }
-    }
-
-
-    protected function _trash_or_restore_ticket($trash = false)
-    {
-        $success = 1;
-
-        $TKT = EEM_Ticket::instance();
-
-        // checkboxes?
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
-            // if array has more than one element then success message should be plural
-            $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
-
-            // cycle thru the boxes
-            while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
-                if ($trash) {
-                    if (! $TKT->delete_by_ID($TKT_ID)) {
-                        $success = 0;
-                    }
-                } else {
-                    if (! $TKT->restore_by_ID($TKT_ID)) {
-                        $success = 0;
-                    }
-                }
-            }
-        } else {
-            // grab single id and trash
-            $TKT_ID = absint($this->_req_data['TKT_ID']);
-
-            if ($trash) {
-                if (! $TKT->delete_by_ID($TKT_ID)) {
-                    $success = 0;
-                }
-            } else {
-                if (! $TKT->restore_by_ID($TKT_ID)) {
-                    $success = 0;
-                }
-            }
-        }
-
-        $action_desc = $trash ? 'moved to the trash' : 'restored';
-        $this->_redirect_after_action($success, 'Tickets', $action_desc, array());
-    }
-
-
-    protected function _delete_ticket()
-    {
-        $success = 1;
-
-        $TKT = EEM_Ticket::instance();
-
-        // checkboxes?
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
-            // if array has more than one element then success message should be plural
-            $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
-
-            // cycle thru the boxes
-            while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
-                // delete
-                if (! $this->_delete_the_ticket($TKT_ID)) {
-                    $success = 0;
-                }
-            }
-        } else {
-            // grab single id and trash
-            $TKT_ID = absint($this->_req_data['TKT_ID']);
-            if (! $this->_delete_the_ticket($TKT_ID)) {
-                $success = 0;
-            }
-        }
-
-        $action_desc = 'deleted';
-        $this->_redirect_after_action($success, 'Tickets', $action_desc, array());
-    }
-
-
-    protected function _delete_the_ticket($TKT_ID)
-    {
-        $tkt = EEM_Ticket::instance()->get_one_by_ID($TKT_ID);
-
-        // delete all related prices first
-        $tkt->delete_related_permanently('Price');
-        return $tkt->delete_permanently();
-    }
+	protected function _init_page_props()
+	{
+		$this->page_slug = TICKETS_PG_SLUG;
+		$this->page_label = TICKETS_LABEL;
+		$this->_admin_base_url = TICKETS_ADMIN_URL;
+		$this->_admin_base_path = TICKETS_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = TICKETS_LABEL;
+		$this->_labels = array(
+			'buttons' => array(
+				'add'    => esc_html__('Add New Default Ticket', 'event_espresso'),
+				'edit'   => esc_html__('Edit Default Ticket', 'event_espresso'),
+				'delete' => esc_html__('Delete Default Ticket', 'event_espresso'),
+			),
+		);
+	}
+
+
+	protected function _set_page_routes()
+	{
+
+		$tkt_id = ! empty($this->_req_data['TKT_ID']) && ! is_array($this->_req_data['TKT_ID'])
+			? $this->_req_data['TKT_ID'] : 0;
+
+		$this->_page_routes = array(
+			'default'         => array(
+				'func'       => '_tickets_overview_list_table',
+				'capability' => 'ee_read_default_tickets',
+			),
+			'trash_ticket'    => array(
+				'func'       => '_trash_or_restore_ticket',
+				'noheader'   => true,
+				'args'       => array('trash' => true),
+				'capability' => 'ee_delete_default_ticket',
+				'obj_id'     => $tkt_id,
+			),
+			'trash_tickets'   => array(
+				'func'       => '_trash_or_restore_ticket',
+				'noheader'   => true,
+				'args'       => array('trash' => true),
+				'capability' => 'ee_delete_default_tickets',
+			),
+			'restore_ticket'  => array(
+				'func'       => '_trash_or_restore_ticket',
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_ticket',
+				'obj_id'     => $tkt_id,
+			),
+			'restore_tickets' => array(
+				'func'       => '_trash_or_restore_ticket',
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_tickets',
+			),
+			'delete_ticket'   => array(
+				'func'       => '_delete_ticket',
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_ticket',
+				'obj_id'     => $tkt_id,
+			),
+			'delete_tickets'  => array(
+				'func'       => '_delete_ticket',
+				'noheader'   => true,
+				'capability' => 'ee_delete_default_tickets',
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			'default' => array(
+				'nav'           => array(
+					'label' => esc_html__('Default Tickets', 'event_espresso'),
+					'order' => 10,
+				),
+				'list_table'    => 'Tickets_List_Table',
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	protected function _add_screen_options()
+	{
+	}
+
+	protected function _add_screen_options_default()
+	{
+		$this->_per_page_screen_option();
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+	public function load_scripts_styles()
+	{
+	}
+
+	public function load_scripts_styles_default()
+	{
+	}
+
+	public function admin_footer_scripts()
+	{
+	}
+
+	public function admin_init()
+	{
+	}
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function _set_list_table_views_default()
+	{
+		$this->_views = array(
+			'all'     => array(
+				'slug'        => 'all',
+				'label'       => esc_html__('All', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'trash_tickets' => esc_html__('Move to Trash', 'event_espresso'),
+				),
+			),
+			'trashed' => array(
+				'slug'        => 'trashed',
+				'label'       => esc_html__('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'restore_tickets' => esc_html__('Restore from Trash', 'event_espresso'),
+					'delete_tickets'  => esc_html__('Delete Permanently', 'event_espresso'),
+				),
+			),
+		);
+	}
+
+
+	public function _tickets_overview_list_table()
+	{
+		$this->_search_btn_label = esc_html__('Tickets', 'event_espresso');
+		$this->display_admin_list_table_page_with_no_sidebar();
+	}
+
+
+	public function get_default_tickets($per_page = 10, $count = false, $trashed = false)
+	{
+
+		$orderby = empty($this->_req_data['orderby']) ? 'TKT_name' : $this->_req_data['orderby'];
+		$order = empty($this->_req_data['order']) ? 'ASC' : $order;
+
+		switch ($orderby) {
+			case 'TKT_name':
+				$orderby = array('TKT_name' => $order);
+				break;
+
+			case 'TKT_price':
+				$orderby = array('TKT_price' => $order);
+				break;
+
+			case 'TKT_uses':
+				$orderby = array('TKT_uses' => $order);
+				break;
+
+			case 'TKT_min':
+				$orderby = array('TKT_min' => $order);
+				break;
+
+			case 'TKT_max':
+				$orderby = array('TKT_max' => $order);
+				break;
+
+			case 'TKT_qty':
+				$orderby = array('TKT_qty' => $order);
+				break;
+		}
+
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
+			? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
+			? $this->_req_data['perpage'] : $per_page;
+
+		$_where = array(
+			'TKT_is_default' => 1,
+			'TKT_deleted'    => $trashed,
+		);
+
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
+
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%' . $this->_req_data['s'] . '%';
+			$_where['OR'] = array(
+				'TKT_name'        => array('LIKE', $sstr),
+				'TKT_description' => array('LIKE', $sstr),
+			);
+		}
+
+		$query_params = array(
+			$_where,
+			'order_by' => $orderby,
+			'limit'    => $limit,
+			'group_by' => 'TKT_ID',
+		);
+
+		if ($count) {
+			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
+		} else {
+			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
+		}
+	}
+
+
+	protected function _trash_or_restore_ticket($trash = false)
+	{
+		$success = 1;
+
+		$TKT = EEM_Ticket::instance();
+
+		// checkboxes?
+		if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			// if array has more than one element then success message should be plural
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+
+			// cycle thru the boxes
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ($trash) {
+					if (! $TKT->delete_by_ID($TKT_ID)) {
+						$success = 0;
+					}
+				} else {
+					if (! $TKT->restore_by_ID($TKT_ID)) {
+						$success = 0;
+					}
+				}
+			}
+		} else {
+			// grab single id and trash
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+
+			if ($trash) {
+				if (! $TKT->delete_by_ID($TKT_ID)) {
+					$success = 0;
+				}
+			} else {
+				if (! $TKT->restore_by_ID($TKT_ID)) {
+					$success = 0;
+				}
+			}
+		}
+
+		$action_desc = $trash ? 'moved to the trash' : 'restored';
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, array());
+	}
+
+
+	protected function _delete_ticket()
+	{
+		$success = 1;
+
+		$TKT = EEM_Ticket::instance();
+
+		// checkboxes?
+		if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			// if array has more than one element then success message should be plural
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+
+			// cycle thru the boxes
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
+				// delete
+				if (! $this->_delete_the_ticket($TKT_ID)) {
+					$success = 0;
+				}
+			}
+		} else {
+			// grab single id and trash
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if (! $this->_delete_the_ticket($TKT_ID)) {
+				$success = 0;
+			}
+		}
+
+		$action_desc = 'deleted';
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, array());
+	}
+
+
+	protected function _delete_the_ticket($TKT_ID)
+	{
+		$tkt = EEM_Ticket::instance()->get_one_by_ID($TKT_ID);
+
+		// delete all related prices first
+		$tkt->delete_related_permanently('Price');
+		return $tkt->delete_permanently();
+	}
 }

caffeinated/admin/extend/support/templates/support_admin_details_faq.template.php

Indentation +10 added lines, -10 removed lines

@@ -4,14 +4,14 @@
     <h4><?php esc_html_e('New to Event Espresso?', 'event_espresso'); ?></h4>
 
     <p><?php
-        printf(
-            esc_html__(
-                'Check out the %1$squick start guide for Event Espresso 4%2$s. It has recommendations, tips, and tutorials so you can get your project started %3$squicker%4$s.',
-                'event_espresso'
-            ),
-            '<a href="https://eventespresso.com/wiki/welcome-to-event-espresso/#event-espresso-4" target="_blank">',
-            '</a>',
-            '<em>',
-            '</em>'
-        ); ?></p>
+		printf(
+			esc_html__(
+				'Check out the %1$squick start guide for Event Espresso 4%2$s. It has recommendations, tips, and tutorials so you can get your project started %3$squicker%4$s.',
+				'event_espresso'
+			),
+			'<a href="https://eventespresso.com/wiki/welcome-to-event-espresso/#event-espresso-4" target="_blank">',
+			'</a>',
+			'<em>',
+			'</em>'
+		); ?></p>
 </div>
\ No newline at end of file

caffeinated/admin/extend/messages/Extend_Messages_Admin_Page.core.php

Spacing +10 added lines, -10 removed lines

@@ -21,17 +21,17 @@ 
     public function __construct($routing = true)
     {
         parent::__construct($routing);
-        if (! defined('EE_MSG_CAF_ASSETS_PATH')) {
-            define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/assets/');
-            define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/');
-            define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/');
-            define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/templates/');
+        if ( ! defined('EE_MSG_CAF_ASSETS_PATH')) {
+            define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND.'messages/assets/');
+            define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/assets/');
+            define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'messages/templates/');
+            define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/templates/');
         }
     }
 
     protected function _extend_page_config()
     {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages';
+        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'messages';
         $this->_page_routes['custom_mtps'] = array(
             'func'       => '_ee_custom_messages_overview_list_table',
             'capability' => 'ee_read_messages',
@@ -76,13 +76,13 @@ 
     {
         global $admin_page_hooks;
 
-        if (! empty($admin_page_hooks['espresso_events'])) {
+        if ( ! empty($admin_page_hooks['espresso_events'])) {
             // we're on a EE specific page... good stuff!
             $hook_prefix = $admin_page_hooks['espresso_events'];
-            $filter_ref = $hook_prefix . '_page_' . $this->page_slug;
-            add_filter('FHEE_manage_' . $filter_ref . '_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
+            $filter_ref = $hook_prefix.'_page_'.$this->page_slug;
+            add_filter('FHEE_manage_'.$filter_ref.'_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
             add_action(
-                'AHEE__EE_Admin_List_Table__column_actions__' . $filter_ref,
+                'AHEE__EE_Admin_List_Table__column_actions__'.$filter_ref,
                 array($this, 'custom_mtp_create_button_column'),
                 10,
                 2

Indentation +187 added lines, -187 removed lines

@@ -16,191 +16,191 @@
  */
 class Extend_Messages_Admin_Page extends Messages_Admin_Page
 {
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-        if (! defined('EE_MSG_CAF_ASSETS_PATH')) {
-            define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/assets/');
-            define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/');
-            define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/');
-            define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/templates/');
-        }
-    }
-
-    protected function _extend_page_config()
-    {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages';
-        $this->_page_routes['custom_mtps'] = array(
-            'func'       => '_ee_custom_messages_overview_list_table',
-            'capability' => 'ee_read_messages',
-        );
-        $this->_page_config['custom_mtps'] = array(
-            'nav'           => array(
-                'label' => esc_html__('Custom Message Templates', 'event_espresso'),
-                'icon' => 'dashicons-art',
-                'order' => 30,
-            ),
-            'list_table'    => 'Custom_Messages_Template_List_Table',
-            'help_tabs'     => array(
-                'message_overview_message_types_help_tab' => array(
-                    'title'    => esc_html__('Message Types', 'event_espresso'),
-                    'filename' => 'messages_overview_types',
-                ),
-                'messages_overview_messengers_help_tab'   => array(
-                    'title'    => esc_html__('Messengers', 'event_espresso'),
-                    'filename' => 'messages_overview_messengers',
-                ),
-                'messages_overview_other_help_tab'        => array(
-                    'title'    => esc_html__('Messages Other', 'event_espresso'),
-                    'filename' => 'messages_overview_other',
-                ),
-            ),
-            'require_nonce' => false,
-        );
-
-        add_action('current_screen', array($this, 'dynamic_screen_hooks'), 10);
-    }
-
-
-    /**
-     * Callback for current_screen action
-     * This is used for any filters and/or actions that require the dynamic screen hook_prefix to be correct.
-     *
-     * @since 4.5.0
-     *
-     * @return void
-     */
-    public function dynamic_screen_hooks()
-    {
-        global $admin_page_hooks;
-
-        if (! empty($admin_page_hooks['espresso_events'])) {
-            // we're on a EE specific page... good stuff!
-            $hook_prefix = $admin_page_hooks['espresso_events'];
-            $filter_ref = $hook_prefix . '_page_' . $this->page_slug;
-            add_filter('FHEE_manage_' . $filter_ref . '_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
-            add_action(
-                'AHEE__EE_Admin_List_Table__column_actions__' . $filter_ref,
-                array($this, 'custom_mtp_create_button_column'),
-                10,
-                2
-            );
-        }
-    }
-
-
-    /**
-     * This is the callback for the FHEE__manage_event-espresso_page_espresso_messages_columns to register the
-     * caffeinated columns for the global message templates list table.
-     *
-     * @since 4.3.2
-     *
-     * @param array  $columns   Original defined list of columns
-     * @param string $screen_id The unique screen id for the page.
-     */
-    public function add_custom_mtps_columns($columns, $screen_id)
-    {
-        if ($screen_id !== 'espresso_messages_global_mtps') {
-            return $columns;
-        }
-
-        $columns['actions'] = '';
-        return $columns;
-    }
-
-
-    /**
-     * Callback for FHEE__EE_Admin_List_Table__column_actions__event-espresso_page_espresso_messages action that allows
-     * for adding the content for the registered "action" column.
-     *
-     * @since 4.3.2
-     *
-     * @param EE_Base_Class
-     * @param string $screen_id Unique screen id for the page
-     *
-     * @return string html content for the page.
-     */
-    public function custom_mtp_create_button_column($item, $screen_id)
-    {
-        if (
-            $screen_id !== 'espresso_messages_global_mtps' || ! EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_messages',
-                'espresso_messages_add_new_message_template'
-            )
-        ) {
-            return '';
-        }
-
-        // first we consider whether this template has override set.  If it does then that means no custom templates can be created from this template as a base.  So let's just skip the button creation.
-        if ($item->get('MTP_is_override')) {
-            return '';
-        }
-
-
-        $create_args = array(
-            'GRP_ID'       => $item->ID(),
-            'messenger'    => $item->messenger(),
-            'message_type' => $item->message_type(),
-            'action'       => 'add_new_message_template',
-        );
-        $create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
-        echo sprintf(
-            '<a href="%s" class="button button--secondary button--small">%s</a>',
-            $create_link,
-            esc_html__('Create Custom', 'event_espresso')
-        );
-    }
-
-
-    protected function _add_screen_options_custom_mtps()
-    {
-        $page_title = $this->_admin_page_title;
-        $this->_admin_page_title = esc_html__('Custom Message Templates', 'event_espresso');
-        $this->_per_page_screen_option();
-        $this->_admin_page_title = $page_title;
-    }
-
-
-    /**
-     * set views array for Custom Templates list table
-     *
-     * @access public
-     * @return void
-     */
-    public function _set_list_table_views_custom_mtps()
-    {
-        $this->_views = array(
-            'in_use' => array(
-                'slug'        => 'in_use',
-                'label'       => esc_html__('In Use', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'trash_message_template' => esc_html__('Move to Trash', 'event_espresso'),
-                ),
-            ),
-        );
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_messages',
-                'espresso_messages_trash_message_template'
-            )
-        ) {
-            $this->_views['trashed'] = array(
-                'slug'        => 'trashed',
-                'label'       => esc_html__('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'restore_message_template' => esc_html__('Restore From Trash', 'event_espresso'),
-                    'delete_message_template'  => esc_html__('Delete Permanently', 'event_espresso'),
-                ),
-            );
-        }
-    }
-
-
-    protected function _ee_custom_messages_overview_list_table()
-    {
-        $this->_admin_page_title = esc_html__('Custom Message Templates', 'event_espresso');
-        $this->display_admin_list_table_page_with_no_sidebar();
-    }
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+		if (! defined('EE_MSG_CAF_ASSETS_PATH')) {
+			define('EE_MSG_CAF_ASSETS_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/assets/');
+			define('EE_MSG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/');
+			define('EE_MSG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/');
+			define('EE_MSG_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/templates/');
+		}
+	}
+
+	protected function _extend_page_config()
+	{
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages';
+		$this->_page_routes['custom_mtps'] = array(
+			'func'       => '_ee_custom_messages_overview_list_table',
+			'capability' => 'ee_read_messages',
+		);
+		$this->_page_config['custom_mtps'] = array(
+			'nav'           => array(
+				'label' => esc_html__('Custom Message Templates', 'event_espresso'),
+				'icon' => 'dashicons-art',
+				'order' => 30,
+			),
+			'list_table'    => 'Custom_Messages_Template_List_Table',
+			'help_tabs'     => array(
+				'message_overview_message_types_help_tab' => array(
+					'title'    => esc_html__('Message Types', 'event_espresso'),
+					'filename' => 'messages_overview_types',
+				),
+				'messages_overview_messengers_help_tab'   => array(
+					'title'    => esc_html__('Messengers', 'event_espresso'),
+					'filename' => 'messages_overview_messengers',
+				),
+				'messages_overview_other_help_tab'        => array(
+					'title'    => esc_html__('Messages Other', 'event_espresso'),
+					'filename' => 'messages_overview_other',
+				),
+			),
+			'require_nonce' => false,
+		);
+
+		add_action('current_screen', array($this, 'dynamic_screen_hooks'), 10);
+	}
+
+
+	/**
+	 * Callback for current_screen action
+	 * This is used for any filters and/or actions that require the dynamic screen hook_prefix to be correct.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @return void
+	 */
+	public function dynamic_screen_hooks()
+	{
+		global $admin_page_hooks;
+
+		if (! empty($admin_page_hooks['espresso_events'])) {
+			// we're on a EE specific page... good stuff!
+			$hook_prefix = $admin_page_hooks['espresso_events'];
+			$filter_ref = $hook_prefix . '_page_' . $this->page_slug;
+			add_filter('FHEE_manage_' . $filter_ref . '_columns', array($this, 'add_custom_mtps_columns'), 10, 2);
+			add_action(
+				'AHEE__EE_Admin_List_Table__column_actions__' . $filter_ref,
+				array($this, 'custom_mtp_create_button_column'),
+				10,
+				2
+			);
+		}
+	}
+
+
+	/**
+	 * This is the callback for the FHEE__manage_event-espresso_page_espresso_messages_columns to register the
+	 * caffeinated columns for the global message templates list table.
+	 *
+	 * @since 4.3.2
+	 *
+	 * @param array  $columns   Original defined list of columns
+	 * @param string $screen_id The unique screen id for the page.
+	 */
+	public function add_custom_mtps_columns($columns, $screen_id)
+	{
+		if ($screen_id !== 'espresso_messages_global_mtps') {
+			return $columns;
+		}
+
+		$columns['actions'] = '';
+		return $columns;
+	}
+
+
+	/**
+	 * Callback for FHEE__EE_Admin_List_Table__column_actions__event-espresso_page_espresso_messages action that allows
+	 * for adding the content for the registered "action" column.
+	 *
+	 * @since 4.3.2
+	 *
+	 * @param EE_Base_Class
+	 * @param string $screen_id Unique screen id for the page
+	 *
+	 * @return string html content for the page.
+	 */
+	public function custom_mtp_create_button_column($item, $screen_id)
+	{
+		if (
+			$screen_id !== 'espresso_messages_global_mtps' || ! EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_messages',
+				'espresso_messages_add_new_message_template'
+			)
+		) {
+			return '';
+		}
+
+		// first we consider whether this template has override set.  If it does then that means no custom templates can be created from this template as a base.  So let's just skip the button creation.
+		if ($item->get('MTP_is_override')) {
+			return '';
+		}
+
+
+		$create_args = array(
+			'GRP_ID'       => $item->ID(),
+			'messenger'    => $item->messenger(),
+			'message_type' => $item->message_type(),
+			'action'       => 'add_new_message_template',
+		);
+		$create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
+		echo sprintf(
+			'<a href="%s" class="button button--secondary button--small">%s</a>',
+			$create_link,
+			esc_html__('Create Custom', 'event_espresso')
+		);
+	}
+
+
+	protected function _add_screen_options_custom_mtps()
+	{
+		$page_title = $this->_admin_page_title;
+		$this->_admin_page_title = esc_html__('Custom Message Templates', 'event_espresso');
+		$this->_per_page_screen_option();
+		$this->_admin_page_title = $page_title;
+	}
+
+
+	/**
+	 * set views array for Custom Templates list table
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function _set_list_table_views_custom_mtps()
+	{
+		$this->_views = array(
+			'in_use' => array(
+				'slug'        => 'in_use',
+				'label'       => esc_html__('In Use', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'trash_message_template' => esc_html__('Move to Trash', 'event_espresso'),
+				),
+			),
+		);
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_messages',
+				'espresso_messages_trash_message_template'
+			)
+		) {
+			$this->_views['trashed'] = array(
+				'slug'        => 'trashed',
+				'label'       => esc_html__('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'restore_message_template' => esc_html__('Restore From Trash', 'event_espresso'),
+					'delete_message_template'  => esc_html__('Delete Permanently', 'event_espresso'),
+				),
+			);
+		}
+	}
+
+
+	protected function _ee_custom_messages_overview_list_table()
+	{
+		$this->_admin_page_title = esc_html__('Custom Message Templates', 'event_espresso');
+		$this->display_admin_list_table_page_with_no_sidebar();
+	}
 }

caffeinated/admin/extend/events/qtips/EE_Event_Editor_Tips.lib.php

Spacing +8 added lines, -8 removed lines

@@ -71,7 +71,7 @@ 
             ),
             7  => array(
                 'content_id' => 'tkt-status-archived',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::archived,
+                'target'     => '.ticket-row .tkt-status-'.EE_Ticket::archived,
                 'content'    => $this->_ticket_status_legend(EE_Ticket::archived),
                 'options'    => array(
                     'position' => array(
@@ -84,7 +84,7 @@ 
             ),
             8  => array(
                 'content_id' => 'tkt-status-expired',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::expired,
+                'target'     => '.ticket-row .tkt-status-'.EE_Ticket::expired,
                 'content'    => $this->_ticket_status_legend(EE_Ticket::expired),
                 'options'    => array(
                     'position' => array(
@@ -97,7 +97,7 @@ 
             ),
             9  => array(
                 'content_id' => 'tkt-status-sold_out',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::sold_out,
+                'target'     => '.ticket-row .tkt-status-'.EE_Ticket::sold_out,
                 'content'    => $this->_ticket_status_legend(EE_Ticket::sold_out),
                 'options'    => array(
                     'position' => array(
@@ -110,7 +110,7 @@ 
             ),
             10 => array(
                 'content_id' => 'tkt-status-pending',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::pending,
+                'target'     => '.ticket-row .tkt-status-'.EE_Ticket::pending,
                 'content'    => $this->_ticket_status_legend(EE_Ticket::pending),
                 'options'    => array(
                     'position' => array(
@@ -123,7 +123,7 @@ 
             ),
             11 => array(
                 'content_id' => 'tkt-status-onsale',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::onsale,
+                'target'     => '.ticket-row .tkt-status-'.EE_Ticket::onsale,
                 'content'    => $this->_ticket_status_legend(EE_Ticket::onsale),
                 'options'    => array(
                     'position' => array(
@@ -173,12 +173,12 @@ 
                        'Clicking the taxable ticket toggle checkbox has enabled taxes for this ticket. What this means is that when a person purchases this ticket, the tax will be applied to all prices on this ticket. You can edit the existing tax price modifier that was setup in Event Espresso by going to  %sDefault Pricing Admin Page%s (labelled "Pricing" in the Event Espresso Menu)',
                        'event_espresso'
                    ),
-                   '<a href="' . $price_admin_link . '" title="' . esc_attr__(
+                   '<a href="'.$price_admin_link.'" title="'.esc_attr__(
                        'Pricing Admin Page',
                        'event_espresso'
-                   ) . '">',
+                   ).'">',
                    '</a>'
-               ) . '</p>';
+               ).'</p>';
     }
 
     /**

Indentation +180 added lines, -180 removed lines

@@ -13,189 +13,189 @@
  */
 class EE_Event_Editor_Tips extends EE_Qtip_Config
 {
-    protected function _set_tips_array()
-    {
-        $this->_qtipsa = array(
-            0  => array(
-                'content_id' => 'about-taxable-toggle',
-                'target'     => '.TKT-taxable-checkbox',
-                'content'    => $this->_get_taxable_info_content(),
-                'options'    => array(
-                    'show_only_once' => true,
-                    'content'        => array(
-                        'title' => esc_html__('Taxable Ticket Toggle', 'event_espresso'),
-                        'button' => true,
-                    ),
-                    'show'           => array(
-                        'event' => 'click',
-                    ),
-                    'hide'           => array(
-                        'event' => false,
-                    ),
-                    'style'          => array(
-                        'classes' => '',
-                    ),
-                )// defaults
-            ),
-            1  => array(
-                'content_id' => 'ticket-icon-help',
-                'target'     => '.ticket-icon',
-                'content'    => esc_html__('Assigned Tickets', 'event_espresso'),
-            ),
-            2  => array(
-                'content_id' => 'clone-icon-help',
-                'target'     => '.clone-icon',
-                'content'    => esc_html__('Duplicate this Item', 'event_espresso'),
-            ),
-            3  => array(
-                'content_id' => 'trash-datetime-help',
-                'target'     => '.datetime-edit-table .trash-icon',
-                'content'    => esc_html__('Trash Datetime', 'event_espresso'),
-            ),
-            4  => array(
-                'content_id' => 'trash-ticket-help',
-                'target'     => '.ticket-row .trash-icon',
-                'content'    => esc_html__('Trash Ticket', 'event_espresso'),
-            ),
-            5  => array(
-                'content_id' => 'trash-price-modifier-help',
-                'target'     => '.ticket-price-rows .trash-icon',
-                'content'    => esc_html__('Trash Price Modifier', 'event_espresso'),
-            ),
-            6  => array(
-                'content_id' => 'gear-icon-help',
-                'target'     => '.gear-icon',
-                'content'    => esc_html__('Advanced Settings', 'event_espresso'),
-            ),
-            7  => array(
-                'content_id' => 'tkt-status-archived',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::archived,
-                'content'    => $this->_ticket_status_legend(EE_Ticket::archived),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                        'adjust' => array(
-                            'mouse' => false,
-                        ),
-                    ),
-                ),
-            ),
-            8  => array(
-                'content_id' => 'tkt-status-expired',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::expired,
-                'content'    => $this->_ticket_status_legend(EE_Ticket::expired),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                        'adjust' => array(
-                            'mouse' => false,
-                        ),
-                    ),
-                ),
-            ),
-            9  => array(
-                'content_id' => 'tkt-status-sold_out',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::sold_out,
-                'content'    => $this->_ticket_status_legend(EE_Ticket::sold_out),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                        'adjust' => array(
-                            'mouse' => false,
-                        ),
-                    ),
-                ),
-            ),
-            10 => array(
-                'content_id' => 'tkt-status-pending',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::pending,
-                'content'    => $this->_ticket_status_legend(EE_Ticket::pending),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                        'adjust' => array(
-                            'mouse' => false,
-                        ),
-                    ),
-                ),
-            ),
-            11 => array(
-                'content_id' => 'tkt-status-onsale',
-                'target'     => '.ticket-row .tkt-status-' . EE_Ticket::onsale,
-                'content'    => $this->_ticket_status_legend(EE_Ticket::onsale),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                        'adjust' => array(
-                            'mouse' => false,
-                        ),
-                    ),
-                ),
-            ),
-            12 => array(
-                'content_id' => 'sortable-tkt-drag-handle-tip',
-                'target'     => '.ee-ticket-sortable .sortable-drag-handle',
-                'content'    => esc_html__('Click and drag-n-drop to reorder tickets.', 'event_espresso'),
-                'options'    => array(
-                    'position' => array(
-                        'adjust' => array(
-                            'mouse' => false,
-                            'y'     => 5,
-                        ),
-                    ),
-                ),
-            ),
-            13 => array(
-                'content_id' => 'sortable-dtt-drag-handle-tip',
-                'target'     => '.ee-dtt-sortable .sortable-drag-handle',
-                'content'    => esc_html__('Click and drag-n-drop to reorder datetimes.', 'event_espresso'),
-                'options'    => array(
-                    'position' => array(
-                        'adjust' => array(
-                            'mouse' => false,
-                            'y'     => 5,
-                        ),
-                    ),
-                ),
-            ),
-        );
-    }
+	protected function _set_tips_array()
+	{
+		$this->_qtipsa = array(
+			0  => array(
+				'content_id' => 'about-taxable-toggle',
+				'target'     => '.TKT-taxable-checkbox',
+				'content'    => $this->_get_taxable_info_content(),
+				'options'    => array(
+					'show_only_once' => true,
+					'content'        => array(
+						'title' => esc_html__('Taxable Ticket Toggle', 'event_espresso'),
+						'button' => true,
+					),
+					'show'           => array(
+						'event' => 'click',
+					),
+					'hide'           => array(
+						'event' => false,
+					),
+					'style'          => array(
+						'classes' => '',
+					),
+				)// defaults
+			),
+			1  => array(
+				'content_id' => 'ticket-icon-help',
+				'target'     => '.ticket-icon',
+				'content'    => esc_html__('Assigned Tickets', 'event_espresso'),
+			),
+			2  => array(
+				'content_id' => 'clone-icon-help',
+				'target'     => '.clone-icon',
+				'content'    => esc_html__('Duplicate this Item', 'event_espresso'),
+			),
+			3  => array(
+				'content_id' => 'trash-datetime-help',
+				'target'     => '.datetime-edit-table .trash-icon',
+				'content'    => esc_html__('Trash Datetime', 'event_espresso'),
+			),
+			4  => array(
+				'content_id' => 'trash-ticket-help',
+				'target'     => '.ticket-row .trash-icon',
+				'content'    => esc_html__('Trash Ticket', 'event_espresso'),
+			),
+			5  => array(
+				'content_id' => 'trash-price-modifier-help',
+				'target'     => '.ticket-price-rows .trash-icon',
+				'content'    => esc_html__('Trash Price Modifier', 'event_espresso'),
+			),
+			6  => array(
+				'content_id' => 'gear-icon-help',
+				'target'     => '.gear-icon',
+				'content'    => esc_html__('Advanced Settings', 'event_espresso'),
+			),
+			7  => array(
+				'content_id' => 'tkt-status-archived',
+				'target'     => '.ticket-row .tkt-status-' . EE_Ticket::archived,
+				'content'    => $this->_ticket_status_legend(EE_Ticket::archived),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+						'adjust' => array(
+							'mouse' => false,
+						),
+					),
+				),
+			),
+			8  => array(
+				'content_id' => 'tkt-status-expired',
+				'target'     => '.ticket-row .tkt-status-' . EE_Ticket::expired,
+				'content'    => $this->_ticket_status_legend(EE_Ticket::expired),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+						'adjust' => array(
+							'mouse' => false,
+						),
+					),
+				),
+			),
+			9  => array(
+				'content_id' => 'tkt-status-sold_out',
+				'target'     => '.ticket-row .tkt-status-' . EE_Ticket::sold_out,
+				'content'    => $this->_ticket_status_legend(EE_Ticket::sold_out),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+						'adjust' => array(
+							'mouse' => false,
+						),
+					),
+				),
+			),
+			10 => array(
+				'content_id' => 'tkt-status-pending',
+				'target'     => '.ticket-row .tkt-status-' . EE_Ticket::pending,
+				'content'    => $this->_ticket_status_legend(EE_Ticket::pending),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+						'adjust' => array(
+							'mouse' => false,
+						),
+					),
+				),
+			),
+			11 => array(
+				'content_id' => 'tkt-status-onsale',
+				'target'     => '.ticket-row .tkt-status-' . EE_Ticket::onsale,
+				'content'    => $this->_ticket_status_legend(EE_Ticket::onsale),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+						'adjust' => array(
+							'mouse' => false,
+						),
+					),
+				),
+			),
+			12 => array(
+				'content_id' => 'sortable-tkt-drag-handle-tip',
+				'target'     => '.ee-ticket-sortable .sortable-drag-handle',
+				'content'    => esc_html__('Click and drag-n-drop to reorder tickets.', 'event_espresso'),
+				'options'    => array(
+					'position' => array(
+						'adjust' => array(
+							'mouse' => false,
+							'y'     => 5,
+						),
+					),
+				),
+			),
+			13 => array(
+				'content_id' => 'sortable-dtt-drag-handle-tip',
+				'target'     => '.ee-dtt-sortable .sortable-drag-handle',
+				'content'    => esc_html__('Click and drag-n-drop to reorder datetimes.', 'event_espresso'),
+				'options'    => array(
+					'position' => array(
+						'adjust' => array(
+							'mouse' => false,
+							'y'     => 5,
+						),
+					),
+				),
+			),
+		);
+	}
 
 
-    private function _get_taxable_info_content()
-    {
-        $price_admin_link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), PRICING_ADMIN_URL);
-        return '<p>'
-               . sprintf(
-                   esc_html__(
-                       'Clicking the taxable ticket toggle checkbox has enabled taxes for this ticket. What this means is that when a person purchases this ticket, the tax will be applied to all prices on this ticket. You can edit the existing tax price modifier that was setup in Event Espresso by going to  %sDefault Pricing Admin Page%s (labelled "Pricing" in the Event Espresso Menu)',
-                       'event_espresso'
-                   ),
-                   '<a href="' . $price_admin_link . '" title="' . esc_attr__(
-                       'Pricing Admin Page',
-                       'event_espresso'
-                   ) . '">',
-                   '</a>'
-               ) . '</p>';
-    }
+	private function _get_taxable_info_content()
+	{
+		$price_admin_link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), PRICING_ADMIN_URL);
+		return '<p>'
+			   . sprintf(
+				   esc_html__(
+					   'Clicking the taxable ticket toggle checkbox has enabled taxes for this ticket. What this means is that when a person purchases this ticket, the tax will be applied to all prices on this ticket. You can edit the existing tax price modifier that was setup in Event Espresso by going to  %sDefault Pricing Admin Page%s (labelled "Pricing" in the Event Espresso Menu)',
+					   'event_espresso'
+				   ),
+				   '<a href="' . $price_admin_link . '" title="' . esc_attr__(
+					   'Pricing Admin Page',
+					   'event_espresso'
+				   ) . '">',
+				   '</a>'
+			   ) . '</p>';
+	}
 
-    /**
-     * output the relevant ee-status-legend with the designated status highlighted.
-     *
-     * @param  EE_Ticket constant $status What status is set (by class)
-     * @return string         The status legend with the related status highlighted
-     */
-    private function _ticket_status_legend($status)
-    {
+	/**
+	 * output the relevant ee-status-legend with the designated status highlighted.
+	 *
+	 * @param  EE_Ticket constant $status What status is set (by class)
+	 * @return string         The status legend with the related status highlighted
+	 */
+	private function _ticket_status_legend($status)
+	{
 
-        $status_array = array(
-            'archived' => EE_Ticket::archived,
-            'expired'  => EE_Ticket::expired,
-            'sold_out' => EE_Ticket::sold_out,
-            'pending'  => EE_Ticket::pending,
-            'onsale'   => EE_Ticket::onsale,
-        );
+		$status_array = array(
+			'archived' => EE_Ticket::archived,
+			'expired'  => EE_Ticket::expired,
+			'sold_out' => EE_Ticket::sold_out,
+			'pending'  => EE_Ticket::pending,
+			'onsale'   => EE_Ticket::onsale,
+		);
 
-        return EEH_Template::status_legend($status_array, $status);
-    }
+		return EEH_Template::status_legend($status_array, $status);
+	}
 }