eventespresso / event-espresso-core

modules/ticket_selector/ProcessTicketSelectorPostData.php

Indentation +221 added lines, -221 removed lines

@@ -16,225 +16,225 @@
 class ProcessTicketSelectorPostData
 {
 
-    const DATA_KEY_EVENT_ID      = 'id';
-
-    const DATA_KEY_MAX_ATNDZ     = 'max_atndz';
-
-    const DATA_KEY_QUANTITY      = 'ticket-selections';
-
-    const DATA_KEY_RETURN_URL    = 'return_url';
-
-    const DATA_KEY_ROWS          = 'rows';
-
-    const DATA_KEY_TICKET_ID     = 'ticket_id';
-
-    const DATA_KEY_TOTAL_TICKETS = 'total_tickets';
-
-    const INPUT_KEY_EVENT_ID     = 'tkt-slctr-event-id';
-
-    const INPUT_KEY_MAX_ATNDZ    = 'tkt-slctr-max-atndz-';
-
-    const INPUT_KEY_ROWS         = 'tkt-slctr-rows-';
-
-    const INPUT_KEY_QTY          = 'tkt-slctr-qty-';
-
-    const INPUT_KEY_TICKET_ID    = 'tkt-slctr-ticket-id-';
-
-    const INPUT_KEY_RETURN_URL   = 'tkt-slctr-return-url-';
-
-
-    /**
-     * @var int
-     */
-    protected $event_id;
-
-    /**
-     * @var array
-     */
-    protected $inputs_to_clean = [];
-
-    /**
-     * @var array
-     */
-    protected $valid_data = [];
-
-    /**
-     * @var RequestInterface
-     */
-    protected $request;
-
-
-    /**
-     * @param RequestInterface $request
-     */
-    public function __construct(RequestInterface $request)
-    {
-        $this->request         = $request;
-        $this->inputs_to_clean = [
-            self::DATA_KEY_MAX_ATNDZ     => self::INPUT_KEY_MAX_ATNDZ,
-            self::DATA_KEY_RETURN_URL    => self::INPUT_KEY_RETURN_URL,
-            self::DATA_KEY_ROWS          => self::INPUT_KEY_ROWS,
-            self::DATA_KEY_TOTAL_TICKETS => self::INPUT_KEY_TICKET_ID,
-            self::DATA_KEY_QUANTITY      => self::INPUT_KEY_QTY,
-        ];
-    }
-
-
-    /**
-     * @return int
-     * @throws DomainException
-     */
-    public function getEventId()
-    {
-        // do we have an event id?
-        if ($this->event_id === null) {
-            $this->event_id = $this->request->getRequestParam(self::INPUT_KEY_EVENT_ID, 0, 'int');
-            if (! $this->event_id) {
-                // $_POST['tkt-slctr-event-id'] was not set ?!?!?!?
-                throw new DomainException(
-                    sprintf(
-                        esc_html__(
-                            'An event id was not provided or was not received.%sPlease click the back button on your browser and try again.',
-                            'event_espresso'
-                        ),
-                        '<br/>'
-                    )
-                );
-            }
-        }
-        // event id is valid
-        return $this->event_id;
-    }
-
-
-    /**
-     * @return array
-     * @throws DomainException
-     */
-    public function validatePostData()
-    {
-        // grab valid id
-        $this->valid_data[ self::DATA_KEY_EVENT_ID ] = $this->getEventId();
-        // let's track the total number of tickets ordered.'
-        $this->valid_data[ self:: DATA_KEY_TOTAL_TICKETS ] = 0;
-        // cycle through $inputs_to_clean array
-        foreach ($this->inputs_to_clean as $what => $input_to_clean) {
-            $input_key = "{$input_to_clean}{$this->event_id}";
-            // check for POST data
-            if ($this->request->requestParamIsSet($input_key)) {
-                switch ($what) {
-                    // integers
-                    case self::DATA_KEY_ROWS:
-                    case self::DATA_KEY_MAX_ATNDZ:
-                        $this->processInteger($what, $input_key);
-                        break;
-                    // arrays of integers
-                    case self::DATA_KEY_QUANTITY:
-                        $this->processQuantity($input_key);
-                        break;
-                    // array of integers
-                    case self::DATA_KEY_TOTAL_TICKETS:
-                        $this->processTicketIDs($input_key);
-                        break;
-                    case self::DATA_KEY_RETURN_URL:
-                        $this->processReturnURL($input_key);
-                        break;
-                }
-            }
-        }
-        return $this->valid_data;
-    }
-
-
-    /**
-     * @param string $what
-     * @param string $input_key
-     */
-    protected function processInteger($what, $input_key)
-    {
-        $this->valid_data[ $what ] = $this->request->getRequestParam($input_key, 0, 'int');
-    }
-
-
-    /**
-     * @param string $input_key
-     * @throws DomainException
-     */
-    protected function processQuantity($input_key)
-    {
-        /** @var array $row_qty */
-        $row_qty = $this->request->getRequestParam($input_key, [], 'int', true);
-        if (empty($row_qty) || ! is_array($row_qty)) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'An error occurred while trying to retrieve the ticket selections for the event.%sPlease click the back button on your browser and try again.',
-                        'event_espresso'
-                    ),
-                    '<br/>'
-                )
-            );
-        }
-        $max_atndz = $this->valid_data[ self::DATA_KEY_MAX_ATNDZ ];
-        // if max attendees is 1 then the incoming row qty array
-        // will only have one element and the value will be the ticket ID
-        // ex: row qty = [ 0 => TKT_ID ]
-        if ($max_atndz === 1 && count($row_qty) === 1) {
-            // so we'll grab that ticket ID, use it as the key, and set the value to 1
-            // ex: row qty = [ TKT_ID => 1 ]
-            $ticket_id = array_pop($row_qty);
-            $row_qty = [ $ticket_id => 1 ];
-        }
-        foreach ($this->valid_data[ self::DATA_KEY_TICKET_ID ] as $ticket_id) {
-            $qty = isset($row_qty[ $ticket_id ]) ? $row_qty[ $ticket_id ] : 0;
-            $this->valid_data[ self::DATA_KEY_QUANTITY ][ $ticket_id ]     = $qty;
-            $this->valid_data[ self:: DATA_KEY_TOTAL_TICKETS ] += $qty;
-        }
-    }
-
-
-    /**
-     * @param string $input_key
-     */
-    protected function processReturnURL($input_key)
-    {
-        // grab and sanitize return-url
-        $input_value = $this->request->getRequestParam($input_key, '', 'url');
-        // was the request coming from an iframe ? if so, then:
-        if (strpos($input_value, 'event_list=iframe')) {
-            // get anchor fragment
-            $input_value = explode('#', $input_value);
-            $input_value = end($input_value);
-            // use event list url instead, but append anchor
-            $input_value = EEH_Event_View::event_archive_url() . '#' . $input_value;
-        }
-        $this->valid_data[ self::DATA_KEY_RETURN_URL ] = $input_value;
-    }
-
-
-    /**
-     * @param string $input_key
-     * @throws DomainException
-     */
-    protected function processTicketIDs($input_key)
-    {
-        $ticket_ids          = (array) $this->request->getRequestParam($input_key, [], 'int', true);
-        $filtered_ticket_ids = array_filter($ticket_ids);
-        if (empty($filtered_ticket_ids)) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'An error occurred while trying to retrieve the ticket IDs for the event.%sPlease click the back button on your browser and try again.',
-                        'event_espresso'
-                    ),
-                    '<br/>'
-                )
-            );
-        }
-        // cycle thru values
-        foreach ($ticket_ids as $key => $value) {
-            // allow only integers
-            $this->valid_data[ self::DATA_KEY_TICKET_ID ][ $key ] = absint($value);
-        }
-    }
+	const DATA_KEY_EVENT_ID      = 'id';
+
+	const DATA_KEY_MAX_ATNDZ     = 'max_atndz';
+
+	const DATA_KEY_QUANTITY      = 'ticket-selections';
+
+	const DATA_KEY_RETURN_URL    = 'return_url';
+
+	const DATA_KEY_ROWS          = 'rows';
+
+	const DATA_KEY_TICKET_ID     = 'ticket_id';
+
+	const DATA_KEY_TOTAL_TICKETS = 'total_tickets';
+
+	const INPUT_KEY_EVENT_ID     = 'tkt-slctr-event-id';
+
+	const INPUT_KEY_MAX_ATNDZ    = 'tkt-slctr-max-atndz-';
+
+	const INPUT_KEY_ROWS         = 'tkt-slctr-rows-';
+
+	const INPUT_KEY_QTY          = 'tkt-slctr-qty-';
+
+	const INPUT_KEY_TICKET_ID    = 'tkt-slctr-ticket-id-';
+
+	const INPUT_KEY_RETURN_URL   = 'tkt-slctr-return-url-';
+
+
+	/**
+	 * @var int
+	 */
+	protected $event_id;
+
+	/**
+	 * @var array
+	 */
+	protected $inputs_to_clean = [];
+
+	/**
+	 * @var array
+	 */
+	protected $valid_data = [];
+
+	/**
+	 * @var RequestInterface
+	 */
+	protected $request;
+
+
+	/**
+	 * @param RequestInterface $request
+	 */
+	public function __construct(RequestInterface $request)
+	{
+		$this->request         = $request;
+		$this->inputs_to_clean = [
+			self::DATA_KEY_MAX_ATNDZ     => self::INPUT_KEY_MAX_ATNDZ,
+			self::DATA_KEY_RETURN_URL    => self::INPUT_KEY_RETURN_URL,
+			self::DATA_KEY_ROWS          => self::INPUT_KEY_ROWS,
+			self::DATA_KEY_TOTAL_TICKETS => self::INPUT_KEY_TICKET_ID,
+			self::DATA_KEY_QUANTITY      => self::INPUT_KEY_QTY,
+		];
+	}
+
+
+	/**
+	 * @return int
+	 * @throws DomainException
+	 */
+	public function getEventId()
+	{
+		// do we have an event id?
+		if ($this->event_id === null) {
+			$this->event_id = $this->request->getRequestParam(self::INPUT_KEY_EVENT_ID, 0, 'int');
+			if (! $this->event_id) {
+				// $_POST['tkt-slctr-event-id'] was not set ?!?!?!?
+				throw new DomainException(
+					sprintf(
+						esc_html__(
+							'An event id was not provided or was not received.%sPlease click the back button on your browser and try again.',
+							'event_espresso'
+						),
+						'<br/>'
+					)
+				);
+			}
+		}
+		// event id is valid
+		return $this->event_id;
+	}
+
+
+	/**
+	 * @return array
+	 * @throws DomainException
+	 */
+	public function validatePostData()
+	{
+		// grab valid id
+		$this->valid_data[ self::DATA_KEY_EVENT_ID ] = $this->getEventId();
+		// let's track the total number of tickets ordered.'
+		$this->valid_data[ self:: DATA_KEY_TOTAL_TICKETS ] = 0;
+		// cycle through $inputs_to_clean array
+		foreach ($this->inputs_to_clean as $what => $input_to_clean) {
+			$input_key = "{$input_to_clean}{$this->event_id}";
+			// check for POST data
+			if ($this->request->requestParamIsSet($input_key)) {
+				switch ($what) {
+					// integers
+					case self::DATA_KEY_ROWS:
+					case self::DATA_KEY_MAX_ATNDZ:
+						$this->processInteger($what, $input_key);
+						break;
+					// arrays of integers
+					case self::DATA_KEY_QUANTITY:
+						$this->processQuantity($input_key);
+						break;
+					// array of integers
+					case self::DATA_KEY_TOTAL_TICKETS:
+						$this->processTicketIDs($input_key);
+						break;
+					case self::DATA_KEY_RETURN_URL:
+						$this->processReturnURL($input_key);
+						break;
+				}
+			}
+		}
+		return $this->valid_data;
+	}
+
+
+	/**
+	 * @param string $what
+	 * @param string $input_key
+	 */
+	protected function processInteger($what, $input_key)
+	{
+		$this->valid_data[ $what ] = $this->request->getRequestParam($input_key, 0, 'int');
+	}
+
+
+	/**
+	 * @param string $input_key
+	 * @throws DomainException
+	 */
+	protected function processQuantity($input_key)
+	{
+		/** @var array $row_qty */
+		$row_qty = $this->request->getRequestParam($input_key, [], 'int', true);
+		if (empty($row_qty) || ! is_array($row_qty)) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'An error occurred while trying to retrieve the ticket selections for the event.%sPlease click the back button on your browser and try again.',
+						'event_espresso'
+					),
+					'<br/>'
+				)
+			);
+		}
+		$max_atndz = $this->valid_data[ self::DATA_KEY_MAX_ATNDZ ];
+		// if max attendees is 1 then the incoming row qty array
+		// will only have one element and the value will be the ticket ID
+		// ex: row qty = [ 0 => TKT_ID ]
+		if ($max_atndz === 1 && count($row_qty) === 1) {
+			// so we'll grab that ticket ID, use it as the key, and set the value to 1
+			// ex: row qty = [ TKT_ID => 1 ]
+			$ticket_id = array_pop($row_qty);
+			$row_qty = [ $ticket_id => 1 ];
+		}
+		foreach ($this->valid_data[ self::DATA_KEY_TICKET_ID ] as $ticket_id) {
+			$qty = isset($row_qty[ $ticket_id ]) ? $row_qty[ $ticket_id ] : 0;
+			$this->valid_data[ self::DATA_KEY_QUANTITY ][ $ticket_id ]     = $qty;
+			$this->valid_data[ self:: DATA_KEY_TOTAL_TICKETS ] += $qty;
+		}
+	}
+
+
+	/**
+	 * @param string $input_key
+	 */
+	protected function processReturnURL($input_key)
+	{
+		// grab and sanitize return-url
+		$input_value = $this->request->getRequestParam($input_key, '', 'url');
+		// was the request coming from an iframe ? if so, then:
+		if (strpos($input_value, 'event_list=iframe')) {
+			// get anchor fragment
+			$input_value = explode('#', $input_value);
+			$input_value = end($input_value);
+			// use event list url instead, but append anchor
+			$input_value = EEH_Event_View::event_archive_url() . '#' . $input_value;
+		}
+		$this->valid_data[ self::DATA_KEY_RETURN_URL ] = $input_value;
+	}
+
+
+	/**
+	 * @param string $input_key
+	 * @throws DomainException
+	 */
+	protected function processTicketIDs($input_key)
+	{
+		$ticket_ids          = (array) $this->request->getRequestParam($input_key, [], 'int', true);
+		$filtered_ticket_ids = array_filter($ticket_ids);
+		if (empty($filtered_ticket_ids)) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'An error occurred while trying to retrieve the ticket IDs for the event.%sPlease click the back button on your browser and try again.',
+						'event_espresso'
+					),
+					'<br/>'
+				)
+			);
+		}
+		// cycle thru values
+		foreach ($ticket_ids as $key => $value) {
+			// allow only integers
+			$this->valid_data[ self::DATA_KEY_TICKET_ID ][ $key ] = absint($value);
+		}
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -89,7 +89,7 @@ 
         // do we have an event id?
         if ($this->event_id === null) {
             $this->event_id = $this->request->getRequestParam(self::INPUT_KEY_EVENT_ID, 0, 'int');
-            if (! $this->event_id) {
+            if ( ! $this->event_id) {
                 // $_POST['tkt-slctr-event-id'] was not set ?!?!?!?
                 throw new DomainException(
                     sprintf(
@@ -114,9 +114,9 @@ 
     public function validatePostData()
     {
         // grab valid id
-        $this->valid_data[ self::DATA_KEY_EVENT_ID ] = $this->getEventId();
+        $this->valid_data[self::DATA_KEY_EVENT_ID] = $this->getEventId();
         // let's track the total number of tickets ordered.'
-        $this->valid_data[ self:: DATA_KEY_TOTAL_TICKETS ] = 0;
+        $this->valid_data[self:: DATA_KEY_TOTAL_TICKETS] = 0;
         // cycle through $inputs_to_clean array
         foreach ($this->inputs_to_clean as $what => $input_to_clean) {
             $input_key = "{$input_to_clean}{$this->event_id}";
@@ -152,7 +152,7 @@ 
      */
     protected function processInteger($what, $input_key)
     {
-        $this->valid_data[ $what ] = $this->request->getRequestParam($input_key, 0, 'int');
+        $this->valid_data[$what] = $this->request->getRequestParam($input_key, 0, 'int');
     }
 
 
@@ -175,7 +175,7 @@ 
                 )
             );
         }
-        $max_atndz = $this->valid_data[ self::DATA_KEY_MAX_ATNDZ ];
+        $max_atndz = $this->valid_data[self::DATA_KEY_MAX_ATNDZ];
         // if max attendees is 1 then the incoming row qty array
         // will only have one element and the value will be the ticket ID
         // ex: row qty = [ 0 => TKT_ID ]
@@ -183,12 +183,12 @@ 
             // so we'll grab that ticket ID, use it as the key, and set the value to 1
             // ex: row qty = [ TKT_ID => 1 ]
             $ticket_id = array_pop($row_qty);
-            $row_qty = [ $ticket_id => 1 ];
+            $row_qty = [$ticket_id => 1];
         }
-        foreach ($this->valid_data[ self::DATA_KEY_TICKET_ID ] as $ticket_id) {
-            $qty = isset($row_qty[ $ticket_id ]) ? $row_qty[ $ticket_id ] : 0;
-            $this->valid_data[ self::DATA_KEY_QUANTITY ][ $ticket_id ]     = $qty;
-            $this->valid_data[ self:: DATA_KEY_TOTAL_TICKETS ] += $qty;
+        foreach ($this->valid_data[self::DATA_KEY_TICKET_ID] as $ticket_id) {
+            $qty = isset($row_qty[$ticket_id]) ? $row_qty[$ticket_id] : 0;
+            $this->valid_data[self::DATA_KEY_QUANTITY][$ticket_id] = $qty;
+            $this->valid_data[self:: DATA_KEY_TOTAL_TICKETS] += $qty;
         }
     }
 
@@ -206,9 +206,9 @@ 
             $input_value = explode('#', $input_value);
             $input_value = end($input_value);
             // use event list url instead, but append anchor
-            $input_value = EEH_Event_View::event_archive_url() . '#' . $input_value;
+            $input_value = EEH_Event_View::event_archive_url().'#'.$input_value;
         }
-        $this->valid_data[ self::DATA_KEY_RETURN_URL ] = $input_value;
+        $this->valid_data[self::DATA_KEY_RETURN_URL] = $input_value;
     }
 
 
@@ -234,7 +234,7 @@ 
         // cycle thru values
         foreach ($ticket_ids as $key => $value) {
             // allow only integers
-            $this->valid_data[ self::DATA_KEY_TICKET_ID ][ $key ] = absint($value);
+            $this->valid_data[self::DATA_KEY_TICKET_ID][$key] = absint($value);
         }
     }
 }

modules/ticket_selector/TicketSelectorRowStandard.php

Indentation +360 added lines, -360 removed lines

@@ -20,364 +20,364 @@
 class TicketSelectorRowStandard extends TicketSelectorRow
 {
 
-    /**
-     * @var TicketDetails
-     */
-    protected $ticket_details;
-
-    /**
-     * @var EE_Ticket_Selector_Config
-     */
-    protected $template_settings;
-
-    /**
-     * @var EE_Tax_Config
-     */
-    protected $tax_settings;
-
-    /**
-     * @var boolean
-     */
-    protected $prices_displayed_including_taxes;
-
-    /**
-     * @var int
-     */
-    protected $row;
-
-    /**
-     * @var int
-     */
-    protected $cols;
-
-    /**
-     * @var boolean
-     */
-    protected $hidden_input_qty = false;
-
-    /**
-     * @var string
-     */
-    protected $ticket_datetime_classes;
-
-
-    /**
-     * TicketDetails constructor.
-     *
-     * @param TicketDetails $ticket_details
-     * @param EE_Tax_Config $tax_settings
-     * @param int           $total_tickets
-     * @param int           $max_attendees
-     * @param int           $row
-     * @param int           $cols
-     * @param boolean       $required_ticket_sold_out
-     * @param string        $event_status
-     * @param string        $ticket_datetime_classes
-     * @throws EE_Error
-     * @throws UnexpectedEntityException
-     */
-    public function __construct(
-        TicketDetails $ticket_details,
-        EE_Tax_Config $tax_settings,
-        $total_tickets,
-        $max_attendees,
-        $row,
-        $cols,
-        $required_ticket_sold_out,
-        $event_status,
-        $ticket_datetime_classes
-    ) {
-        $this->ticket_details = $ticket_details;
-        $this->template_settings = $ticket_details->getTemplateSettings();
-        $this->tax_settings = $tax_settings;
-        $this->row = $row;
-        $this->cols = $cols;
-        $this->ticket_datetime_classes = $ticket_datetime_classes;
-        parent::__construct(
-            $ticket_details->getTicket(),
-            $max_attendees,
-            $ticket_details->getDateFormat(),
-            $event_status,
-            $required_ticket_sold_out,
-            $total_tickets
-        );
-    }
-
-
-    /**
-     * other ticket rows will need to know if a required ticket is sold out,
-     * so that they are not offered for sale
-     *
-     * @return boolean
-     */
-    public function getRequiredTicketSoldOut()
-    {
-        return $this->required_ticket_sold_out;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function getCols()
-    {
-        return $this->cols;
-    }
-
-
-    /**
-     * getHtml
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getHtml()
-    {
-        $this->min = 0;
-        $this->max = $this->ticket->max();
-        $remaining = $this->ticket->remaining();
-        $this->setTicketMinAndMax($remaining);
-        // set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
-        $this->required_ticket_sold_out = $this->ticket->required() && ! $remaining
-            ? $this->ticket->start_date()
-            : $this->required_ticket_sold_out;
-        $this->setTicketPriceDetails();
-        $this->setTicketStatusClasses($remaining);
-        $filtered_row_html = $this->getFilteredRowHtml();
-        if ($filtered_row_html !== false) {
-            return $filtered_row_html;
-        }
-        $ticket_selector_row_html = EEH_HTML::tr(
-            '',
-            '',
-            "tckt-slctr-tbl-tr {$this->status_class}{$this->ticket_datetime_classes} "
-            . espresso_get_object_css_class($this->ticket)
-        );
-        $filtered_row_content = $this->getFilteredRowContents();
-        if ($filtered_row_content !== false) {
-            if ($this->max_attendees === 1) {
-                return $ticket_selector_row_html
-                       . $filtered_row_content
-                       . $this->ticketQtyAndIdHiddenInputs()
-                       . EEH_HTML::trx();
-            }
-            return $ticket_selector_row_html
-                   . $filtered_row_content
-                   . EEH_HTML::trx();
-        }
-        $this->hidden_input_qty = $this->max_attendees > 1;
-
-        $ticket_selector_row_html .= $this->ticketNameTableCell();
-        $ticket_selector_row_html .= $this->ticketPriceTableCell();
-        $ticket_selector_row_html .= EEH_HTML::td(
-            '',
-            '',
-            'tckt-slctr-tbl-td-qty cntr',
-            '',
-            'headers="quantity-' . $this->EVT_ID . '"'
-        );
-        $this->setTicketStatusDisplay($remaining);
-        if (empty($this->ticket_status_display)) {
-            if ($this->max_attendees === 1) {
-                // only ONE attendee is allowed to register at a time
-                $ticket_selector_row_html .= $this->onlyOneAttendeeCanRegister();
-            } elseif ($this->max > 0) {
-                $ticket_selector_row_html .= $this->ticketQuantitySelector();
-            }
-        }
-        $ticket_selector_row_html .= $this->ticket_status_display;
-        $ticket_selector_row_html .= $this->ticketQtyAndIdHiddenInputs();
-        $ticket_selector_row_html .= $this->ticket_details->display(
-            $this->ticket_price,
-            $remaining,
-            $this->cols
-        );
-        $ticket_selector_row_html .= EEH_HTML::tdx();
-        $ticket_selector_row_html .= EEH_HTML::trx();
-
-
-        $this->row++;
-        return $ticket_selector_row_html;
-    }
-
-
-    /**
-     * getTicketPriceDetails
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    protected function setTicketPriceDetails()
-    {
-        $this->ticket_price = $this->tax_settings->prices_displayed_including_taxes
-            ? $this->ticket->get_ticket_total_with_taxes()
-            : $this->ticket->get_ticket_subtotal();
-        $this->ticket_bundle = false;
-        $ticket_min = $this->ticket->min();
-        // for ticket bundles, set min and max qty the same
-        if ($ticket_min !== 0 && $ticket_min === $this->ticket->max()) {
-            $this->ticket_price *= $ticket_min;
-            $this->ticket_bundle = true;
-        }
-        $this->ticket_price = apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_price',
-            $this->ticket_price,
-            $this->ticket
-        );
-    }
-
-
-    /**
-     * ticketNameTableCell
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function ticketNameTableCell()
-    {
-        $html = EEH_HTML::td(
-            '',
-            '',
-            'tckt-slctr-tbl-td-name',
-            '',
-            'headers="details-' . $this->EVT_ID . '"'
-        );
-        $html .= EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
-        $html .= $this->ticket_details->getShowHideLinks();
-        if ($this->ticket->required()) {
-            $html .= EEH_HTML::p(
-                apply_filters(
-                    'FHEE__ticket_selector_chart_template__ticket_required_message',
-                    esc_html__('This ticket is required and must be purchased.', 'event_espresso')
-                ),
-                '',
-                'ticket-required-pg'
-            );
-        }
-        $html .= EEH_HTML::tdx();
-        return $html;
-    }
-
-
-    /**
-     * ticketPriceTableCell
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    protected function ticketPriceTableCell()
-    {
-        $html = '';
-        if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
-            $html .= EEH_HTML::td(
-                '',
-                '',
-                'tckt-slctr-tbl-td-price jst-rght',
-                '',
-                'headers="price-' . $this->EVT_ID . '"'
-            );
-            $html .= EEH_Template::format_currency($this->ticket_price);
-            $html .= $this->ticket->taxable()
-                ? EEH_HTML::span('*', '', 'taxable-tickets-asterisk grey-text')
-                : '';
-            $html .= ' ';
-            // phpcs:disable WordPress.WP.I18n.NoEmptyStrings
-            $html .= EEH_HTML::span(
-                $this->ticket_bundle
-                    ? apply_filters(
-                        'FHEE__ticket_selector_chart_template__per_ticket_bundle_text',
-                        esc_html__(' / bundle', 'event_espresso')
-                    )
-                    : apply_filters(
-                        'FHEE__ticket_selector_chart_template__per_ticket_text',
-                        esc_html__('', 'event_espresso')
-                    ),
-                '',
-                'smaller-text no-bold'
-            );
-            $html .= ' ';
-            $html .= EEH_HTML::tdx();
-            $this->cols++;
-        }
-        return $html;
-    }
-
-
-    /**
-     * onlyOneAttendeeCanRegister
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    protected function onlyOneAttendeeCanRegister()
-    {
-        $this->hidden_input_qty = false;
-        // display submit button since we have tickets available
-        add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-
-        $TKT   = $this->ticket->ID();
-        $label = esc_html__('Select this ticket', 'event_espresso');
-        $name  = "tkt-slctr-qty-{$this->EVT_ID}[]";
-        $class = "ticket-selector-tbl-qty-slct";
-        $id    = "{$class}-{$this->EVT_ID}-{$this->row}";
-        $checked = $this->total_tickets === 1 ? ' checked="checked"' : '';
-
-        $html = "<label class='ee-a11y-screen-reader-text' for='{$id}' >{$label}</label>";
-        $html .= "<input type='radio'{$checked} name='{$name}' id='{$id}' class='{$class}' value='{$TKT}' title='' />";
-        return $html;
-    }
-
-
-    /**
-     * ticketQuantitySelector
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    protected function ticketQuantitySelector()
-    {
-        $this->hidden_input_qty = false;
-        // display submit button since we have tickets available
-        add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-
-        $TKT = $this->ticket->ID();
-        $label = esc_html__('Quantity', 'event_espresso');
-        $class = 'ticket-selector-tbl-qty-slct';
-        $id = "{$class}-{$this->EVT_ID}-{$this->row}";
-
-        $html = "<label class='ee-a11y-screen-reader-text' for='{$id}' >{$label}</label>";
-        $html .= "<select name='tkt-slctr-qty-{$this->EVT_ID}[{$TKT}]' id='{$id}' class='{$class}'>";
-        // this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
-        if ($this->min !== 0 && ! $this->ticket->required()) {
-            $html .= "<option value='0'>&nbsp;0&nbsp;</option>";
-        }
-        // offer ticket quantities from the min to the max
-        for ($i = $this->min; $i <= $this->max; $i++) {
-            $html .= "<option value='{$i}'>&nbsp;{$i}&nbsp;</option>";
-        }
-        $html .= "</select>";
-        return $html;
-    }
-
-
-    /**
-     * getHiddenInputs
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    protected function ticketQtyAndIdHiddenInputs()
-    {
-        $html = '';
-        $EVT = $this->EVT_ID;
-        $TKT = $this->ticket->ID();
-        // depending on group reg we need to change the format for qty
-        if ($this->hidden_input_qty) {
-            $html .= "<input type='hidden' name='tkt-slctr-qty-{$EVT}[]' value='0' />";
-        }
-        $html .= "<input type='hidden' name='tkt-slctr-ticket-id-{$EVT}[]' value='{$TKT}' />";
-        return $html;
-    }
+	/**
+	 * @var TicketDetails
+	 */
+	protected $ticket_details;
+
+	/**
+	 * @var EE_Ticket_Selector_Config
+	 */
+	protected $template_settings;
+
+	/**
+	 * @var EE_Tax_Config
+	 */
+	protected $tax_settings;
+
+	/**
+	 * @var boolean
+	 */
+	protected $prices_displayed_including_taxes;
+
+	/**
+	 * @var int
+	 */
+	protected $row;
+
+	/**
+	 * @var int
+	 */
+	protected $cols;
+
+	/**
+	 * @var boolean
+	 */
+	protected $hidden_input_qty = false;
+
+	/**
+	 * @var string
+	 */
+	protected $ticket_datetime_classes;
+
+
+	/**
+	 * TicketDetails constructor.
+	 *
+	 * @param TicketDetails $ticket_details
+	 * @param EE_Tax_Config $tax_settings
+	 * @param int           $total_tickets
+	 * @param int           $max_attendees
+	 * @param int           $row
+	 * @param int           $cols
+	 * @param boolean       $required_ticket_sold_out
+	 * @param string        $event_status
+	 * @param string        $ticket_datetime_classes
+	 * @throws EE_Error
+	 * @throws UnexpectedEntityException
+	 */
+	public function __construct(
+		TicketDetails $ticket_details,
+		EE_Tax_Config $tax_settings,
+		$total_tickets,
+		$max_attendees,
+		$row,
+		$cols,
+		$required_ticket_sold_out,
+		$event_status,
+		$ticket_datetime_classes
+	) {
+		$this->ticket_details = $ticket_details;
+		$this->template_settings = $ticket_details->getTemplateSettings();
+		$this->tax_settings = $tax_settings;
+		$this->row = $row;
+		$this->cols = $cols;
+		$this->ticket_datetime_classes = $ticket_datetime_classes;
+		parent::__construct(
+			$ticket_details->getTicket(),
+			$max_attendees,
+			$ticket_details->getDateFormat(),
+			$event_status,
+			$required_ticket_sold_out,
+			$total_tickets
+		);
+	}
+
+
+	/**
+	 * other ticket rows will need to know if a required ticket is sold out,
+	 * so that they are not offered for sale
+	 *
+	 * @return boolean
+	 */
+	public function getRequiredTicketSoldOut()
+	{
+		return $this->required_ticket_sold_out;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function getCols()
+	{
+		return $this->cols;
+	}
+
+
+	/**
+	 * getHtml
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getHtml()
+	{
+		$this->min = 0;
+		$this->max = $this->ticket->max();
+		$remaining = $this->ticket->remaining();
+		$this->setTicketMinAndMax($remaining);
+		// set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
+		$this->required_ticket_sold_out = $this->ticket->required() && ! $remaining
+			? $this->ticket->start_date()
+			: $this->required_ticket_sold_out;
+		$this->setTicketPriceDetails();
+		$this->setTicketStatusClasses($remaining);
+		$filtered_row_html = $this->getFilteredRowHtml();
+		if ($filtered_row_html !== false) {
+			return $filtered_row_html;
+		}
+		$ticket_selector_row_html = EEH_HTML::tr(
+			'',
+			'',
+			"tckt-slctr-tbl-tr {$this->status_class}{$this->ticket_datetime_classes} "
+			. espresso_get_object_css_class($this->ticket)
+		);
+		$filtered_row_content = $this->getFilteredRowContents();
+		if ($filtered_row_content !== false) {
+			if ($this->max_attendees === 1) {
+				return $ticket_selector_row_html
+					   . $filtered_row_content
+					   . $this->ticketQtyAndIdHiddenInputs()
+					   . EEH_HTML::trx();
+			}
+			return $ticket_selector_row_html
+				   . $filtered_row_content
+				   . EEH_HTML::trx();
+		}
+		$this->hidden_input_qty = $this->max_attendees > 1;
+
+		$ticket_selector_row_html .= $this->ticketNameTableCell();
+		$ticket_selector_row_html .= $this->ticketPriceTableCell();
+		$ticket_selector_row_html .= EEH_HTML::td(
+			'',
+			'',
+			'tckt-slctr-tbl-td-qty cntr',
+			'',
+			'headers="quantity-' . $this->EVT_ID . '"'
+		);
+		$this->setTicketStatusDisplay($remaining);
+		if (empty($this->ticket_status_display)) {
+			if ($this->max_attendees === 1) {
+				// only ONE attendee is allowed to register at a time
+				$ticket_selector_row_html .= $this->onlyOneAttendeeCanRegister();
+			} elseif ($this->max > 0) {
+				$ticket_selector_row_html .= $this->ticketQuantitySelector();
+			}
+		}
+		$ticket_selector_row_html .= $this->ticket_status_display;
+		$ticket_selector_row_html .= $this->ticketQtyAndIdHiddenInputs();
+		$ticket_selector_row_html .= $this->ticket_details->display(
+			$this->ticket_price,
+			$remaining,
+			$this->cols
+		);
+		$ticket_selector_row_html .= EEH_HTML::tdx();
+		$ticket_selector_row_html .= EEH_HTML::trx();
+
+
+		$this->row++;
+		return $ticket_selector_row_html;
+	}
+
+
+	/**
+	 * getTicketPriceDetails
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	protected function setTicketPriceDetails()
+	{
+		$this->ticket_price = $this->tax_settings->prices_displayed_including_taxes
+			? $this->ticket->get_ticket_total_with_taxes()
+			: $this->ticket->get_ticket_subtotal();
+		$this->ticket_bundle = false;
+		$ticket_min = $this->ticket->min();
+		// for ticket bundles, set min and max qty the same
+		if ($ticket_min !== 0 && $ticket_min === $this->ticket->max()) {
+			$this->ticket_price *= $ticket_min;
+			$this->ticket_bundle = true;
+		}
+		$this->ticket_price = apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_price',
+			$this->ticket_price,
+			$this->ticket
+		);
+	}
+
+
+	/**
+	 * ticketNameTableCell
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function ticketNameTableCell()
+	{
+		$html = EEH_HTML::td(
+			'',
+			'',
+			'tckt-slctr-tbl-td-name',
+			'',
+			'headers="details-' . $this->EVT_ID . '"'
+		);
+		$html .= EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
+		$html .= $this->ticket_details->getShowHideLinks();
+		if ($this->ticket->required()) {
+			$html .= EEH_HTML::p(
+				apply_filters(
+					'FHEE__ticket_selector_chart_template__ticket_required_message',
+					esc_html__('This ticket is required and must be purchased.', 'event_espresso')
+				),
+				'',
+				'ticket-required-pg'
+			);
+		}
+		$html .= EEH_HTML::tdx();
+		return $html;
+	}
+
+
+	/**
+	 * ticketPriceTableCell
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function ticketPriceTableCell()
+	{
+		$html = '';
+		if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
+			$html .= EEH_HTML::td(
+				'',
+				'',
+				'tckt-slctr-tbl-td-price jst-rght',
+				'',
+				'headers="price-' . $this->EVT_ID . '"'
+			);
+			$html .= EEH_Template::format_currency($this->ticket_price);
+			$html .= $this->ticket->taxable()
+				? EEH_HTML::span('*', '', 'taxable-tickets-asterisk grey-text')
+				: '';
+			$html .= '&nbsp;';
+			// phpcs:disable WordPress.WP.I18n.NoEmptyStrings
+			$html .= EEH_HTML::span(
+				$this->ticket_bundle
+					? apply_filters(
+						'FHEE__ticket_selector_chart_template__per_ticket_bundle_text',
+						esc_html__(' / bundle', 'event_espresso')
+					)
+					: apply_filters(
+						'FHEE__ticket_selector_chart_template__per_ticket_text',
+						esc_html__('', 'event_espresso')
+					),
+				'',
+				'smaller-text no-bold'
+			);
+			$html .= '&nbsp;';
+			$html .= EEH_HTML::tdx();
+			$this->cols++;
+		}
+		return $html;
+	}
+
+
+	/**
+	 * onlyOneAttendeeCanRegister
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function onlyOneAttendeeCanRegister()
+	{
+		$this->hidden_input_qty = false;
+		// display submit button since we have tickets available
+		add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+
+		$TKT   = $this->ticket->ID();
+		$label = esc_html__('Select this ticket', 'event_espresso');
+		$name  = "tkt-slctr-qty-{$this->EVT_ID}[]";
+		$class = "ticket-selector-tbl-qty-slct";
+		$id    = "{$class}-{$this->EVT_ID}-{$this->row}";
+		$checked = $this->total_tickets === 1 ? ' checked="checked"' : '';
+
+		$html = "<label class='ee-a11y-screen-reader-text' for='{$id}' >{$label}</label>";
+		$html .= "<input type='radio'{$checked} name='{$name}' id='{$id}' class='{$class}' value='{$TKT}' title='' />";
+		return $html;
+	}
+
+
+	/**
+	 * ticketQuantitySelector
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function ticketQuantitySelector()
+	{
+		$this->hidden_input_qty = false;
+		// display submit button since we have tickets available
+		add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+
+		$TKT = $this->ticket->ID();
+		$label = esc_html__('Quantity', 'event_espresso');
+		$class = 'ticket-selector-tbl-qty-slct';
+		$id = "{$class}-{$this->EVT_ID}-{$this->row}";
+
+		$html = "<label class='ee-a11y-screen-reader-text' for='{$id}' >{$label}</label>";
+		$html .= "<select name='tkt-slctr-qty-{$this->EVT_ID}[{$TKT}]' id='{$id}' class='{$class}'>";
+		// this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
+		if ($this->min !== 0 && ! $this->ticket->required()) {
+			$html .= "<option value='0'>&nbsp;0&nbsp;</option>";
+		}
+		// offer ticket quantities from the min to the max
+		for ($i = $this->min; $i <= $this->max; $i++) {
+			$html .= "<option value='{$i}'>&nbsp;{$i}&nbsp;</option>";
+		}
+		$html .= "</select>";
+		return $html;
+	}
+
+
+	/**
+	 * getHiddenInputs
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function ticketQtyAndIdHiddenInputs()
+	{
+		$html = '';
+		$EVT = $this->EVT_ID;
+		$TKT = $this->ticket->ID();
+		// depending on group reg we need to change the format for qty
+		if ($this->hidden_input_qty) {
+			$html .= "<input type='hidden' name='tkt-slctr-qty-{$EVT}[]' value='0' />";
+		}
+		$html .= "<input type='hidden' name='tkt-slctr-ticket-id-{$EVT}[]' value='{$TKT}' />";
+		return $html;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -175,7 +175,7 @@ 
             '',
             'tckt-slctr-tbl-td-qty cntr',
             '',
-            'headers="quantity-' . $this->EVT_ID . '"'
+            'headers="quantity-'.$this->EVT_ID.'"'
         );
         $this->setTicketStatusDisplay($remaining);
         if (empty($this->ticket_status_display)) {
@@ -242,7 +242,7 @@ 
             '',
             'tckt-slctr-tbl-td-name',
             '',
-            'headers="details-' . $this->EVT_ID . '"'
+            'headers="details-'.$this->EVT_ID.'"'
         );
         $html .= EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
         $html .= $this->ticket_details->getShowHideLinks();
@@ -276,7 +276,7 @@ 
                 '',
                 'tckt-slctr-tbl-td-price jst-rght',
                 '',
-                'headers="price-' . $this->EVT_ID . '"'
+                'headers="price-'.$this->EVT_ID.'"'
             );
             $html .= EEH_Template::format_currency($this->ticket_price);
             $html .= $this->ticket->taxable()

espresso.php

Indentation +80 added lines, -80 removed lines

@@ -38,103 +38,103 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.10.24.rc.004');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.10.24.rc.004');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }