eventespresso / event-espresso-core

core/libraries/template_parts/EE_Template_Part_Manager.class.php

Indentation +191 added lines, -191 removed lines

@@ -14,195 +14,195 @@
 class EE_Template_Part_Manager
 {
 
-    /**
-     * @param EE_Template_Part_PriorityQueue $template_parts
-     */
-    protected $template_parts;
-
-    /**
-     * @param array $priorities
-     */
-    protected $priorities = array();
-
-    /**
-     * @param int $event_desc_priority
-     */
-    protected $event_desc_priority;
-
-    /**
-     * @param string $before_event_content
-     */
-    protected $before_event_content;
-
-    /**
-     * @param string $event_content
-     */
-    protected $event_content;
-
-    /**
-     * @param string $after_event_content
-     */
-    protected $after_event_content;
-
-
-    /**
-     *    class constructor
-     */
-    public function __construct()
-    {
-        $this->template_parts = new EE_Template_Part_PriorityQueue();
-    }
-
-
-    /**
-     *    add_template_part
-     *
-     *    used for setting the details about a particular template part
-     *
-     * @param string $name     - just a simple string identifier - do NOT use 'event'
-     * @param string $label    - template part label displayed in admin
-     * @param string $template - name or path of template to be used by EEH_Template::locate_template()
-     * @param int    $priority - order in which template parts should be applied
-     */
-    public function add_template_part($name, $label, $template, $priority)
-    {
-        // SplPriorityQueue doesn't play nice with multiple items having the same priority
-        // so if the incoming priority is already occupied, then let's increment it by one,
-        // and then pass everything back into this method and try again with the new priority
-        if (isset($this->priorities[ $priority ])) {
-            $priority++;
-            $this->add_template_part($name, $label, $template, $priority);
-            return;
-        }
-        // kk now we can mark this priority as being occupied
-        $this->priorities[ $priority ] = true;
-        // create the template part and add to the queue
-        $this->template_parts->insert(
-            new EE_Template_Part($name, $label, $template, $priority),
-            $priority
-        );
-        if ($name === 'event') {
-            $this->event_desc_priority = $priority;
-        }
-    }
-
-
-    /**
-     *    apply_template_part_filters
-     *
-     *    adds template parts to the supplied content
-     *    according to the details set when the template parts were added
-     *
-     * @access public
-     * @param string $content
-     * @return string
-     */
-    public function apply_template_part_filters($content = '')
-    {
-        $this->template_parts->rewind();
-        // loop through template parts and position content
-        while ($this->template_parts->valid()) {
-            $this->_position_template_part(
-                $content,
-                $this->template_parts->current()->template(),
-                $this->template_parts->current()->priority()
-            );
-            $this->template_parts->next();
-        }
-        // now simply add our three strings of content together
-        return $this->before_event_content . $this->event_content . $this->after_event_content;
-    }
-
-
-    /**
-     *    position_template_part
-     *
-     * based on the priority of the incoming template part
-     * relative to the known event description template part priority,
-     * this method will assign template parts to one of the following:
-     *        $this->before_event_content
-     *        $this->event_content
-     *        $this->after_event_content
-     *
-     * @access protected
-     * @param string $content
-     * @param string $template
-     * @param int    $priority
-     * @return void
-     */
-    protected function _position_template_part($content, $template, $priority)
-    {
-        // Event Description content is the actual incoming content itself
-        if ($priority === $this->event_desc_priority) {
-            $this->event_content = $content;
-        } elseif ($priority < $this->event_desc_priority) {
-            // everything BEFORE the Event Description
-            $this->before_event_content .= EEH_Template::locate_template($template);
-        } elseif ($priority > $this->event_desc_priority) {
-            // everything AFTER the Event Description
-            $this->after_event_content .= EEH_Template::locate_template($template);
-        }
-    }
-
-
-    /**
-     *    generate_sortable_list_of_template_parts
-     *
-     *    creates an HTML list (<ul>) with list items (<li>) for each template part,
-     *    in a format that can be used as a sortable list in the admin
-     *
-     * @access public
-     * @param string $list_css_id
-     * @param string $list_css_class
-     * @param string $list_item_css_class
-     * @param string $list_item_css_id_prefix
-     * @return string
-     */
-    public function generate_sortable_list_of_template_parts(
-        $list_css_id = '',
-        $list_css_class = '',
-        $list_item_css_class = '',
-        $list_item_css_id_prefix = ''
-    ) {
-        $event_archive_display_order = EEH_HTML::ul($list_css_id, $list_css_class);
-        $this->template_parts->rewind();
-        // loop through template parts and add template content
-        while ($this->template_parts->valid()) {
-            $event_archive_display_order .= EEH_HTML::li(
-                EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2') .
-                EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2') .
-                $this->template_parts->current()->label(),
-                $list_item_css_id_prefix . $this->template_parts->current()->name(),
-                $list_item_css_class
-            );
-            $this->template_parts->next();
-        }
-        $event_archive_display_order .= EEH_HTML::ulx();
-        return $event_archive_display_order;
-    }
-
-
-    /**
-     *    display_template_parts
-     *
-     * just for debugging purposes
-     *
-     * @access    public
-     * @return void
-     */
-    public function display_template_parts()
-    {
-        if (WP_DEBUG) {
-            $this->template_parts->rewind();
-            while ($this->template_parts->valid()) {
-                EEH_Debug_Tools::printr(
-                    $this->template_parts->current(),
-                    'template_part',
-                    __FILE__,
-                    __LINE__
-                );
-                $this->template_parts->next();
-            }
-        }
-    }
+	/**
+	 * @param EE_Template_Part_PriorityQueue $template_parts
+	 */
+	protected $template_parts;
+
+	/**
+	 * @param array $priorities
+	 */
+	protected $priorities = array();
+
+	/**
+	 * @param int $event_desc_priority
+	 */
+	protected $event_desc_priority;
+
+	/**
+	 * @param string $before_event_content
+	 */
+	protected $before_event_content;
+
+	/**
+	 * @param string $event_content
+	 */
+	protected $event_content;
+
+	/**
+	 * @param string $after_event_content
+	 */
+	protected $after_event_content;
+
+
+	/**
+	 *    class constructor
+	 */
+	public function __construct()
+	{
+		$this->template_parts = new EE_Template_Part_PriorityQueue();
+	}
+
+
+	/**
+	 *    add_template_part
+	 *
+	 *    used for setting the details about a particular template part
+	 *
+	 * @param string $name     - just a simple string identifier - do NOT use 'event'
+	 * @param string $label    - template part label displayed in admin
+	 * @param string $template - name or path of template to be used by EEH_Template::locate_template()
+	 * @param int    $priority - order in which template parts should be applied
+	 */
+	public function add_template_part($name, $label, $template, $priority)
+	{
+		// SplPriorityQueue doesn't play nice with multiple items having the same priority
+		// so if the incoming priority is already occupied, then let's increment it by one,
+		// and then pass everything back into this method and try again with the new priority
+		if (isset($this->priorities[ $priority ])) {
+			$priority++;
+			$this->add_template_part($name, $label, $template, $priority);
+			return;
+		}
+		// kk now we can mark this priority as being occupied
+		$this->priorities[ $priority ] = true;
+		// create the template part and add to the queue
+		$this->template_parts->insert(
+			new EE_Template_Part($name, $label, $template, $priority),
+			$priority
+		);
+		if ($name === 'event') {
+			$this->event_desc_priority = $priority;
+		}
+	}
+
+
+	/**
+	 *    apply_template_part_filters
+	 *
+	 *    adds template parts to the supplied content
+	 *    according to the details set when the template parts were added
+	 *
+	 * @access public
+	 * @param string $content
+	 * @return string
+	 */
+	public function apply_template_part_filters($content = '')
+	{
+		$this->template_parts->rewind();
+		// loop through template parts and position content
+		while ($this->template_parts->valid()) {
+			$this->_position_template_part(
+				$content,
+				$this->template_parts->current()->template(),
+				$this->template_parts->current()->priority()
+			);
+			$this->template_parts->next();
+		}
+		// now simply add our three strings of content together
+		return $this->before_event_content . $this->event_content . $this->after_event_content;
+	}
+
+
+	/**
+	 *    position_template_part
+	 *
+	 * based on the priority of the incoming template part
+	 * relative to the known event description template part priority,
+	 * this method will assign template parts to one of the following:
+	 *        $this->before_event_content
+	 *        $this->event_content
+	 *        $this->after_event_content
+	 *
+	 * @access protected
+	 * @param string $content
+	 * @param string $template
+	 * @param int    $priority
+	 * @return void
+	 */
+	protected function _position_template_part($content, $template, $priority)
+	{
+		// Event Description content is the actual incoming content itself
+		if ($priority === $this->event_desc_priority) {
+			$this->event_content = $content;
+		} elseif ($priority < $this->event_desc_priority) {
+			// everything BEFORE the Event Description
+			$this->before_event_content .= EEH_Template::locate_template($template);
+		} elseif ($priority > $this->event_desc_priority) {
+			// everything AFTER the Event Description
+			$this->after_event_content .= EEH_Template::locate_template($template);
+		}
+	}
+
+
+	/**
+	 *    generate_sortable_list_of_template_parts
+	 *
+	 *    creates an HTML list (<ul>) with list items (<li>) for each template part,
+	 *    in a format that can be used as a sortable list in the admin
+	 *
+	 * @access public
+	 * @param string $list_css_id
+	 * @param string $list_css_class
+	 * @param string $list_item_css_class
+	 * @param string $list_item_css_id_prefix
+	 * @return string
+	 */
+	public function generate_sortable_list_of_template_parts(
+		$list_css_id = '',
+		$list_css_class = '',
+		$list_item_css_class = '',
+		$list_item_css_id_prefix = ''
+	) {
+		$event_archive_display_order = EEH_HTML::ul($list_css_id, $list_css_class);
+		$this->template_parts->rewind();
+		// loop through template parts and add template content
+		while ($this->template_parts->valid()) {
+			$event_archive_display_order .= EEH_HTML::li(
+				EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2') .
+				EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2') .
+				$this->template_parts->current()->label(),
+				$list_item_css_id_prefix . $this->template_parts->current()->name(),
+				$list_item_css_class
+			);
+			$this->template_parts->next();
+		}
+		$event_archive_display_order .= EEH_HTML::ulx();
+		return $event_archive_display_order;
+	}
+
+
+	/**
+	 *    display_template_parts
+	 *
+	 * just for debugging purposes
+	 *
+	 * @access    public
+	 * @return void
+	 */
+	public function display_template_parts()
+	{
+		if (WP_DEBUG) {
+			$this->template_parts->rewind();
+			while ($this->template_parts->valid()) {
+				EEH_Debug_Tools::printr(
+					$this->template_parts->current(),
+					'template_part',
+					__FILE__,
+					__LINE__
+				);
+				$this->template_parts->next();
+			}
+		}
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -69,13 +69,13 @@ 
         // SplPriorityQueue doesn't play nice with multiple items having the same priority
         // so if the incoming priority is already occupied, then let's increment it by one,
         // and then pass everything back into this method and try again with the new priority
-        if (isset($this->priorities[ $priority ])) {
+        if (isset($this->priorities[$priority])) {
             $priority++;
             $this->add_template_part($name, $label, $template, $priority);
             return;
         }
         // kk now we can mark this priority as being occupied
-        $this->priorities[ $priority ] = true;
+        $this->priorities[$priority] = true;
         // create the template part and add to the queue
         $this->template_parts->insert(
             new EE_Template_Part($name, $label, $template, $priority),
@@ -110,7 +110,7 @@ 
             $this->template_parts->next();
         }
         // now simply add our three strings of content together
-        return $this->before_event_content . $this->event_content . $this->after_event_content;
+        return $this->before_event_content.$this->event_content.$this->after_event_content;
     }
 
 
@@ -169,10 +169,10 @@ 
         // loop through template parts and add template content
         while ($this->template_parts->valid()) {
             $event_archive_display_order .= EEH_HTML::li(
-                EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2') .
-                EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2') .
+                EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2').
+                EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2').
                 $this->template_parts->current()->label(),
-                $list_item_css_id_prefix . $this->template_parts->current()->name(),
+                $list_item_css_id_prefix.$this->template_parts->current()->name(),
                 $list_item_css_class
             );
             $this->template_parts->next();

core/libraries/template_parts/EE_Template_Part.class.php

Indentation +108 added lines, -108 removed lines

@@ -16,112 +16,112 @@
 {
 
 
-    /**
-     * @type string $name
-     */
-    protected $name;
-
-    /**
-     * @type string $label
-     */
-    protected $label;
-
-    /**
-     * @type string $template
-     */
-    protected $template;
-
-    /**
-     * @type int $priority
-     */
-    protected $priority;
-
-
-    /**
-     *    class constructor
-     *
-     * @param string $name
-     * @param string $label
-     * @param string $template
-     * @param int    $priority
-     */
-    public function __construct($name, $label, $template, $priority = 100)
-    {
-        $this->set_name($name);
-        $this->set_label($label);
-        $this->set_template($template);
-        $this->set_priority($priority);
-    }
-
-
-    /**
-     * @return mixed
-     */
-    public function name()
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * @param mixed $name
-     */
-    public function set_name($name)
-    {
-        $this->name = $name;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function label()
-    {
-        return $this->label;
-    }
-
-
-    /**
-     * @param string $label
-     */
-    public function set_label($label)
-    {
-        $this->label = $label;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function template()
-    {
-        return $this->template;
-    }
-
-
-    /**
-     * @param string $template
-     */
-    public function set_template($template)
-    {
-        $this->template = $template;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function priority()
-    {
-        return $this->priority;
-    }
-
-
-    /**
-     * @param int $priority
-     */
-    public function set_priority($priority)
-    {
-        $this->priority = intval($priority);
-    }
+	/**
+	 * @type string $name
+	 */
+	protected $name;
+
+	/**
+	 * @type string $label
+	 */
+	protected $label;
+
+	/**
+	 * @type string $template
+	 */
+	protected $template;
+
+	/**
+	 * @type int $priority
+	 */
+	protected $priority;
+
+
+	/**
+	 *    class constructor
+	 *
+	 * @param string $name
+	 * @param string $label
+	 * @param string $template
+	 * @param int    $priority
+	 */
+	public function __construct($name, $label, $template, $priority = 100)
+	{
+		$this->set_name($name);
+		$this->set_label($label);
+		$this->set_template($template);
+		$this->set_priority($priority);
+	}
+
+
+	/**
+	 * @return mixed
+	 */
+	public function name()
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * @param mixed $name
+	 */
+	public function set_name($name)
+	{
+		$this->name = $name;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function label()
+	{
+		return $this->label;
+	}
+
+
+	/**
+	 * @param string $label
+	 */
+	public function set_label($label)
+	{
+		$this->label = $label;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function template()
+	{
+		return $this->template;
+	}
+
+
+	/**
+	 * @param string $template
+	 */
+	public function set_template($template)
+	{
+		$this->template = $template;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function priority()
+	{
+		return $this->priority;
+	}
+
+
+	/**
+	 * @param int $priority
+	 */
+	public function set_priority($priority)
+	{
+		$this->priority = intval($priority);
+	}
 }

core/libraries/template_parts/EE_Template_Part_PriorityQueue.class.php

Indentation +37 added lines, -37 removed lines

@@ -17,43 +17,43 @@
 {
 
 
-    /**
-     * add
-     *
-     * attaches aTemplate_Part to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     *
-     * @access public
-     * @param EE_Template_Part $object
-     * @param int              $priority
-     * @return bool
-     */
-    public function insert($object, $priority = 100)
-    {
-        if ($object instanceof EE_Template_Part) {
-            parent::insert($object, $priority);
-            return true;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * add
+	 *
+	 * attaches aTemplate_Part to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 *
+	 * @access public
+	 * @param EE_Template_Part $object
+	 * @param int              $priority
+	 * @return bool
+	 */
+	public function insert($object, $priority = 100)
+	{
+		if ($object instanceof EE_Template_Part) {
+			parent::insert($object, $priority);
+			return true;
+		} else {
+			return false;
+		}
+	}
 
 
-    /**
-     * compare
-     *
-     * sorts EE_Template_Part in ascending order based on set priority
-     *
-     * @access public
-     * @param int $priority1
-     * @param int $priority2
-     * @return bool
-     */
-    public function compare($priority1, $priority2)
-    {
-        if ($priority1 === $priority2) {
-            return 0;
-        }
-        return $priority1 > $priority2 ? -1 : 1;
-    }
+	/**
+	 * compare
+	 *
+	 * sorts EE_Template_Part in ascending order based on set priority
+	 *
+	 * @access public
+	 * @param int $priority1
+	 * @param int $priority2
+	 * @return bool
+	 */
+	public function compare($priority1, $priority2)
+	{
+		if ($priority1 === $priority2) {
+			return 0;
+		}
+		return $priority1 > $priority2 ? -1 : 1;
+	}
 }

core/business/EE_Processor_Base.class.php

Indentation +60 added lines, -60 removed lines

@@ -14,71 +14,71 @@
 class EE_Processor_Base
 {
 
-    /**
-     * Used to indicate whether current request is for an IPN or not.
-     *
-     * @var bool
-     */
-    protected static $IPN = false;
+	/**
+	 * Used to indicate whether current request is for an IPN or not.
+	 *
+	 * @var bool
+	 */
+	protected static $IPN = false;
 
-    /**
-     * Used to indicate whether SPCO is being revisited by registrant or not.
-     *
-     * @var bool
-     */
-    protected $_revisit = false;
+	/**
+	 * Used to indicate whether SPCO is being revisited by registrant or not.
+	 *
+	 * @var bool
+	 */
+	protected $_revisit = false;
 
 
-    /**
-     * @param boolean $IPN
-     */
-    public static function set_IPN($IPN)
-    {
-        self::$IPN = filter_var($IPN, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * @param boolean $IPN
+	 */
+	public static function set_IPN($IPN)
+	{
+		self::$IPN = filter_var($IPN, FILTER_VALIDATE_BOOLEAN);
+	}
 
 
-    /**
-     * Allows external class (usually checkout) to set whether SPCO is being revisited by registrant or not.
-     *
-     * @param bool $revisit
-     * @return void
-     */
-    public function set_revisit($revisit = false)
-    {
-        $this->_revisit = filter_var($revisit, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * Allows external class (usually checkout) to set whether SPCO is being revisited by registrant or not.
+	 *
+	 * @param bool $revisit
+	 * @return void
+	 */
+	public function set_revisit($revisit = false)
+	{
+		$this->_revisit = filter_var($revisit, FILTER_VALIDATE_BOOLEAN);
+	}
 
 
-    /**
-     * debug
-     *
-     * @param string          $class
-     * @param string          $func
-     * @param string          $line
-     * @param \EE_Transaction $transaction
-     * @param array           $info
-     * @param bool            $display_request
-     */
-    protected function log(
-        $class = '',
-        $func = '',
-        $line = '',
-        EE_Transaction $transaction,
-        $info = array(),
-        $display_request = false
-    ) {
-        if (WP_DEBUG && false) {
-            if ($transaction instanceof EE_Transaction) {
-                // don't serialize objects
-                $info = EEH_Debug_Tools::strip_objects($info);
-                if ($transaction->ID()) {
-                    $info['TXN_status'] = $transaction->status_ID();
-                    $info['TXN_reg_steps'] = $transaction->reg_steps();
-                    $index = 'EE_Transaction: ' . $transaction->ID();
-                    EEH_Debug_Tools::log($class, $func, $line, $info, $display_request, $index);
-                }
-            }
-        }
-    }
+	/**
+	 * debug
+	 *
+	 * @param string          $class
+	 * @param string          $func
+	 * @param string          $line
+	 * @param \EE_Transaction $transaction
+	 * @param array           $info
+	 * @param bool            $display_request
+	 */
+	protected function log(
+		$class = '',
+		$func = '',
+		$line = '',
+		EE_Transaction $transaction,
+		$info = array(),
+		$display_request = false
+	) {
+		if (WP_DEBUG && false) {
+			if ($transaction instanceof EE_Transaction) {
+				// don't serialize objects
+				$info = EEH_Debug_Tools::strip_objects($info);
+				if ($transaction->ID()) {
+					$info['TXN_status'] = $transaction->status_ID();
+					$info['TXN_reg_steps'] = $transaction->reg_steps();
+					$index = 'EE_Transaction: ' . $transaction->ID();
+					EEH_Debug_Tools::log($class, $func, $line, $info, $display_request, $index);
+				}
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
                 if ($transaction->ID()) {
                     $info['TXN_status'] = $transaction->status_ID();
                     $info['TXN_reg_steps'] = $transaction->reg_steps();
-                    $index = 'EE_Transaction: ' . $transaction->ID();
+                    $index = 'EE_Transaction: '.$transaction->ID();
                     EEH_Debug_Tools::log($class, $func, $line, $info, $display_request, $index);
                 }
             }

core/admin/EE_Help_Tour_final_stop.class.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                        'That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!',
                        'event_espresso'
                    ),
-                   '<a href="' . EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php')) . '">',
+                   '<a href="'.EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php')).'">',
                    '</a>'
                )
                . '</p>';

Indentation +43 added lines, -43 removed lines

@@ -15,51 +15,51 @@
 class EE_Help_Tour_final_stop extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = esc_html__('Final Stop Tour', 'event_espresso');
-        $this->_slug = 'final-stop-tour';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = esc_html__('Final Stop Tour', 'event_espresso');
+		$this->_slug = 'final-stop-tour';
+	}
 
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'id'          => 'contextual-help-link',
-                'content'     => $this->_end(),
-                'button_text' => esc_html__('Quit', 'event_espresso'),
-                'options'     => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -20,
-                    'tipAdjustmentX' => 10,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'id'          => 'contextual-help-link',
+				'content'     => $this->_end(),
+				'button_text' => esc_html__('Quit', 'event_espresso'),
+				'options'     => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -20,
+					'tipAdjustmentX' => 10,
+				),
+			),
+		);
+	}
 
 
-    /**
-     * This is the default last stop for all tours that is displayed at the end of a tour OR when a tour is exited for
-     * the first time.
-     *
-     * @return string
-     */
-    protected function _end()
-    {
-        $query_args = array(
-            'action' => 'admin_option_settings',
-            'page'   => 'espresso_general_settings',
-        );
-        return '<p>'
-               . sprintf(
-                   esc_html__(
-                       'That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!',
-                       'event_espresso'
-                   ),
-                   '<a href="' . EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php')) . '">',
-                   '</a>'
-               )
-               . '</p>';
-    }
+	/**
+	 * This is the default last stop for all tours that is displayed at the end of a tour OR when a tour is exited for
+	 * the first time.
+	 *
+	 * @return string
+	 */
+	protected function _end()
+	{
+		$query_args = array(
+			'action' => 'admin_option_settings',
+			'page'   => 'espresso_general_settings',
+		);
+		return '<p>'
+			   . sprintf(
+				   esc_html__(
+					   'That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!',
+					   'event_espresso'
+				   ),
+				   '<a href="' . EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php')) . '">',
+				   '</a>'
+			   )
+			   . '</p>';
+	}
 }

admin_pages/support/Support_Admin_Page_Init.core.php

Spacing +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@
     {
         // define some help/support page related constants
         define('EE_SUPPORT_PG_SLUG', 'espresso_support');
-        define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG));
-        define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
-        define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/');
-        define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/');
+        define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page='.EE_SUPPORT_PG_SLUG));
+        define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES.'support/templates/');
+        define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES.'support/');
+        define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL.'support/assets/');
         parent::__construct();
     }
 

Indentation +30 added lines, -30 removed lines

@@ -16,36 +16,36 @@
 {
 
 
-    public function __construct()
-    {
-        // define some help/support page related constants
-        define('EE_SUPPORT_PG_SLUG', 'espresso_support');
-        define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG));
-        define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
-        define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/');
-        define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/');
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		// define some help/support page related constants
+		define('EE_SUPPORT_PG_SLUG', 'espresso_support');
+		define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG));
+		define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
+		define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/');
+		define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/');
+		parent::__construct();
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Help & Support', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Help & Support', 'event_espresso');
+	}
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'              => 'extras',
-                'menu_order'              => 30,
-                'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
-                'parent_slug'             => 'espresso_events',
-                'menu_slug'               => EE_SUPPORT_PG_SLUG,
-                'menu_label'              => esc_html__('Help & Support', 'event_espresso'),
-                'capability'              => 'ee_read_ee',
-                'maintenance_mode_parent' => 'espresso_maintenance_settings',
-                'admin_init_page'         => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'              => 'extras',
+				'menu_order'              => 30,
+				'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
+				'parent_slug'             => 'espresso_events',
+				'menu_slug'               => EE_SUPPORT_PG_SLUG,
+				'menu_label'              => esc_html__('Help & Support', 'event_espresso'),
+				'capability'              => 'ee_read_ee',
+				'maintenance_mode_parent' => 'espresso_maintenance_settings',
+				'admin_init_page'         => $this,
+			)
+		);
+	}
 }

admin_pages/about/About_Admin_Page.core.php

Spacing +12 added lines, -12 removed lines

@@ -169,8 +169,8 @@ 
         $this->_template_args['admin_page_subtitle'] = esc_html__(
             'Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.',
             'event_espresso'
-        ) . $settings_message;
-        $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
+        ).$settings_message;
+        $template = EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
             $template,
             $this->_template_args,
@@ -182,7 +182,7 @@ 
 
     protected function _get_started_steps()
     {
-        $steps = '<h2>' . esc_html__('Getting Started', 'event_espresso') . '</h2>';
+        $steps = '<h2>'.esc_html__('Getting Started', 'event_espresso').'</h2>';
         $step_one = '<p>'
                     . sprintf(
                         esc_html__(
@@ -193,7 +193,7 @@ 
                         '</strong>',
                         '<a href="admin.php?page=espresso_general_settings">',
                         '</a>'
-                    ) . '</strong></p>';
+                    ).'</strong></p>';
         $step_two = '<p>'
                     . sprintf(
                         esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'),
@@ -201,7 +201,7 @@ 
                         '</strong>',
                         '<a href="admin.php?page=espresso_payment_settings">',
                         '</a>'
-                    ) . '</strong></p>';
+                    ).'</strong></p>';
         $step_three = '<p>'
                       . sprintf(
                           esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'),
@@ -209,7 +209,7 @@ 
                           '</strong>',
                           '<a href="admin.php?page=espresso_events&action=create_new">',
                           '</a>'
-                      ) . '</strong></p>';
+                      ).'</strong></p>';
 
         // done?
         $done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? false : true;
@@ -238,10 +238,10 @@ 
         }
 
         // now let's put it together
-        $steps .= sprintf('%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
-        $steps .= sprintf('%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
+        $steps .= sprintf('%s'.$step_one.'%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
+        $steps .= sprintf('%s'.$step_two.'%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
         $steps .= sprintf(
-            '%s' . $step_three . '%s',
+            '%s'.$step_three.'%s',
             $done_step_three ? '<strike>' : '',
             $done_step_three ? '</strike>' : ''
         );
@@ -260,7 +260,7 @@ 
             'Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.',
             'event_espresso'
         );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
+        $template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
             $template,
             $this->_template_args,
@@ -286,7 +286,7 @@ 
             '<strong>',
             '</strong>'
         );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
+        $template = EE_ABOUT_TEMPLATE_PATH.'decafvpro.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
             $template,
             $this->_template_args,
@@ -302,7 +302,7 @@ 
             'At Event Espresso, customer satisfaction is our ultimate goal.',
             'event_espresso'
         );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
+        $template = EE_ABOUT_TEMPLATE_PATH.'reviews.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
             $template,
             $this->_template_args,

Indentation +274 added lines, -274 removed lines

@@ -17,128 +17,128 @@ 
 {
 
 
-    protected function _init_page_props()
-    {
-        $this->page_slug = EE_ABOUT_PG_SLUG;
-        $this->page_label = esc_html__('About Event Espresso', 'event_espresso');
-        $this->_admin_base_url = EE_ABOUT_ADMIN_URL;
-        $this->_admin_base_path = EE_ABOUT_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        // todo: all hooks for ajax goes here.
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_labels = array();
-        $this->_admin_page_title = $this->page_label;
-    }
-
-
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = array(
-            'default' => array(
-                'func'       => '_overview',
-                'capability' => 'manage_options',
-            ),
-            // 'overview' => '_overview',
-            // 'func' => '_overview',
-            // 'capability' => 'ee_read_ee'
-            // ),
-            'credits' => array(
-                'func'       => '_credits',
-                'capability' => 'manage_options',
-            ),
-
-            'decafvpro' => array(
-                'func'       => '_decafvpro',
-                'capability' => 'manage_options',
-            ),
-            'reviews'   => array(
-                'func'       => '_reviews',
-                'capability' => 'manage_options',
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            /*'default' => array(
+	protected function _init_page_props()
+	{
+		$this->page_slug = EE_ABOUT_PG_SLUG;
+		$this->page_label = esc_html__('About Event Espresso', 'event_espresso');
+		$this->_admin_base_url = EE_ABOUT_ADMIN_URL;
+		$this->_admin_base_path = EE_ABOUT_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		// todo: all hooks for ajax goes here.
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_labels = array();
+		$this->_admin_page_title = $this->page_label;
+	}
+
+
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = array(
+			'default' => array(
+				'func'       => '_overview',
+				'capability' => 'manage_options',
+			),
+			// 'overview' => '_overview',
+			// 'func' => '_overview',
+			// 'capability' => 'ee_read_ee'
+			// ),
+			'credits' => array(
+				'func'       => '_credits',
+				'capability' => 'manage_options',
+			),
+
+			'decafvpro' => array(
+				'func'       => '_decafvpro',
+				'capability' => 'manage_options',
+			),
+			'reviews'   => array(
+				'func'       => '_reviews',
+				'capability' => 'manage_options',
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			/*'default' => array(
                 'nav' => array(
                     'label' => esc_html__('What\'s New', 'event_espresso'),
                     'order' => 10),
                 'require_nonce' => FALSE
                 ),*/
-            // 'overview' => array(
-            'default' => array(
-                'nav'           => array(
-                    'label' => esc_html__('About', 'event_espresso'),
-                    'order' => 20,
-                ),
-                'require_nonce' => false,
-            ),
-            'credits' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Credits', 'event_espresso'),
-                    'order' => 30,
-                ),
-                'require_nonce' => false,
-            ),
-
-            'decafvpro' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Decaf vs Regular', 'event_espresso'),
-                    'order' => 40,
-                ),
-                'require_nonce' => false,
-            ),
-            'reviews'   => array(
-                'nav'           => array(
-                    'label' => esc_html__('Reviews', 'event_espresso'),
-                    'order' => 50,
-                ),
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    // none of the below group are currently used for Support pages
-    protected function _add_screen_options()
-    {
-    }
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-    public function admin_init()
-    {
-    }
-
-    public function admin_notices()
-    {
-    }
-
-    public function admin_footer_scripts()
-    {
-    }
-
-    public function load_scripts_styles()
-    {
-    }
-
-
-    protected function _whats_new()
-    {
-        /*$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
+			// 'overview' => array(
+			'default' => array(
+				'nav'           => array(
+					'label' => esc_html__('About', 'event_espresso'),
+					'order' => 20,
+				),
+				'require_nonce' => false,
+			),
+			'credits' => array(
+				'nav'           => array(
+					'label' => esc_html__('Credits', 'event_espresso'),
+					'order' => 30,
+				),
+				'require_nonce' => false,
+			),
+
+			'decafvpro' => array(
+				'nav'           => array(
+					'label' => esc_html__('Decaf vs Regular', 'event_espresso'),
+					'order' => 40,
+				),
+				'require_nonce' => false,
+			),
+			'reviews'   => array(
+				'nav'           => array(
+					'label' => esc_html__('Reviews', 'event_espresso'),
+					'order' => 50,
+				),
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	// none of the below group are currently used for Support pages
+	protected function _add_screen_options()
+	{
+	}
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+	public function admin_init()
+	{
+	}
+
+	public function admin_notices()
+	{
+	}
+
+	public function admin_footer_scripts()
+	{
+	}
+
+	public function load_scripts_styles()
+	{
+	}
+
+
+	protected function _whats_new()
+	{
+		/*$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
         $steps = $steps !== FALSE ? $steps : '';
         $this->_admin_page_title = sprintf( esc_html__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
         $settings_message = $steps;
@@ -146,168 +146,168 @@ 
         $template = EE_ABOUT_TEMPLATE_PATH . 'whats_new.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
         $this->display_about_admin_page();*/
-    }
+	}
 
 
-    protected function _overview()
-    {
-        /*$this->_template_args['admin_page_title'] = esc_html__('About Event Espresso', 'event_espresso');
+	protected function _overview()
+	{
+		/*$this->_template_args['admin_page_title'] = esc_html__('About Event Espresso', 'event_espresso');
         $this->_template_args['admin_page_subtitle'] = esc_html__('Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso');
         $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
         $this->display_about_admin_page();*/
 
-        // Copied from _whats_new()
-        $steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance
-            ? $this->_get_started_steps() : false;
-        $steps = $steps !== false ? $steps : '';
-        $this->_admin_page_title = sprintf(
-            esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION
-        );
-        $settings_message = $steps;
-        $this->_template_args['admin_page_subtitle'] = esc_html__(
-            'Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.',
-            'event_espresso'
-        ) . $settings_message;
-        $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
-
-
-    protected function _get_started_steps()
-    {
-        $steps = '<h2>' . esc_html__('Getting Started', 'event_espresso') . '</h2>';
-        $step_one = '<p>'
-                    . sprintf(
-                        esc_html__(
-                            '%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.',
-                            'event_espresso'
-                        ),
-                        '<strong>',
-                        '</strong>',
-                        '<a href="admin.php?page=espresso_general_settings">',
-                        '</a>'
-                    ) . '</strong></p>';
-        $step_two = '<p>'
-                    . sprintf(
-                        esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'),
-                        '<strong>',
-                        '</strong>',
-                        '<a href="admin.php?page=espresso_payment_settings">',
-                        '</a>'
-                    ) . '</strong></p>';
-        $step_three = '<p>'
-                      . sprintf(
-                          esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'),
-                          '<strong>',
-                          '</strong>',
-                          '<a href="admin.php?page=espresso_events&action=create_new">',
-                          '</a>'
-                      ) . '</strong></p>';
-
-        // done?
-        $done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? false : true;
-        $active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(
-            EEM_Payment_Method::scope_cart,
-            array(array('PMD_type' => 'Invoice'))
-        );
-        $active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
-        // done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
-        // if only the invoice is active but it's clearly been updated
-        $done_step_two = $active_pms_count > 1 ||
-                         ($active_pms_count === 1 && ! $active_invoice_pm) ||
-                         ($active_invoice_pm instanceof EE_Payment_Method && (
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_name', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_email', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_address', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('page_extra_info', true, '')
-                             )
-                         );
-        $done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? true : false;
-
-        // if ALL steps are done, let's just return FALSE so we don't display anything
-        if ($done_step_one && $done_step_two && $done_step_three) {
-            return false;
-        }
-
-        // now let's put it together
-        $steps .= sprintf('%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
-        $steps .= sprintf('%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
-        $steps .= sprintf(
-            '%s' . $step_three . '%s',
-            $done_step_three ? '<strike>' : '',
-            $done_step_three ? '</strike>' : ''
-        );
-
-        return $steps;
-    }
-
-
-    protected function _credits()
-    {
-        $this->_template_args['admin_page_title'] = sprintf(
-            esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION
-        );
-        $this->_template_args['admin_page_subtitle'] = esc_html__(
-            'Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.',
-            'event_espresso'
-        );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
-
-
-    protected function _decafvpro()
-    {
-        $this->_template_args['admin_page_title'] = sprintf(
-            esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION
-        );
-        $this->_template_args['admin_page_subtitle'] = sprintf(
-            esc_html__(
-                'Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s',
-                'event_espresso'
-            ),
-            '<em>',
-            '</em>',
-            '<strong>',
-            '</strong>'
-        );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
-
-    protected function _reviews()
-    {
-        $this->_template_args['admin_page_title'] = esc_html__('Rave Reviews About Event Espresso 4', 'event_espresso');
-        $this->_template_args['admin_page_subtitle'] = esc_html__(
-            'At Event Espresso, customer satisfaction is our ultimate goal.',
-            'event_espresso'
-        );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
+		// Copied from _whats_new()
+		$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance
+			? $this->_get_started_steps() : false;
+		$steps = $steps !== false ? $steps : '';
+		$this->_admin_page_title = sprintf(
+			esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION
+		);
+		$settings_message = $steps;
+		$this->_template_args['admin_page_subtitle'] = esc_html__(
+			'Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.',
+			'event_espresso'
+		) . $settings_message;
+		$template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
+
+
+	protected function _get_started_steps()
+	{
+		$steps = '<h2>' . esc_html__('Getting Started', 'event_espresso') . '</h2>';
+		$step_one = '<p>'
+					. sprintf(
+						esc_html__(
+							'%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.',
+							'event_espresso'
+						),
+						'<strong>',
+						'</strong>',
+						'<a href="admin.php?page=espresso_general_settings">',
+						'</a>'
+					) . '</strong></p>';
+		$step_two = '<p>'
+					. sprintf(
+						esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'),
+						'<strong>',
+						'</strong>',
+						'<a href="admin.php?page=espresso_payment_settings">',
+						'</a>'
+					) . '</strong></p>';
+		$step_three = '<p>'
+					  . sprintf(
+						  esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'),
+						  '<strong>',
+						  '</strong>',
+						  '<a href="admin.php?page=espresso_events&action=create_new">',
+						  '</a>'
+					  ) . '</strong></p>';
+
+		// done?
+		$done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? false : true;
+		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(
+			EEM_Payment_Method::scope_cart,
+			array(array('PMD_type' => 'Invoice'))
+		);
+		$active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
+		// done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
+		// if only the invoice is active but it's clearly been updated
+		$done_step_two = $active_pms_count > 1 ||
+						 ($active_pms_count === 1 && ! $active_invoice_pm) ||
+						 ($active_invoice_pm instanceof EE_Payment_Method && (
+								 $active_invoice_pm->get_extra_meta('pdf_payee_name', true, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_email', true, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', true, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_address', true, '') ||
+								 $active_invoice_pm->get_extra_meta('page_extra_info', true, '')
+							 )
+						 );
+		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? true : false;
+
+		// if ALL steps are done, let's just return FALSE so we don't display anything
+		if ($done_step_one && $done_step_two && $done_step_three) {
+			return false;
+		}
+
+		// now let's put it together
+		$steps .= sprintf('%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
+		$steps .= sprintf('%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
+		$steps .= sprintf(
+			'%s' . $step_three . '%s',
+			$done_step_three ? '<strike>' : '',
+			$done_step_three ? '</strike>' : ''
+		);
+
+		return $steps;
+	}
+
+
+	protected function _credits()
+	{
+		$this->_template_args['admin_page_title'] = sprintf(
+			esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION
+		);
+		$this->_template_args['admin_page_subtitle'] = esc_html__(
+			'Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.',
+			'event_espresso'
+		);
+		$template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
+
+
+	protected function _decafvpro()
+	{
+		$this->_template_args['admin_page_title'] = sprintf(
+			esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION
+		);
+		$this->_template_args['admin_page_subtitle'] = sprintf(
+			esc_html__(
+				'Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s',
+				'event_espresso'
+			),
+			'<em>',
+			'</em>',
+			'<strong>',
+			'</strong>'
+		);
+		$template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
+
+	protected function _reviews()
+	{
+		$this->_template_args['admin_page_title'] = esc_html__('Rave Reviews About Event Espresso 4', 'event_espresso');
+		$this->_template_args['admin_page_subtitle'] = esc_html__(
+			'At Event Espresso, customer satisfaction is our ultimate goal.',
+			'event_espresso'
+		);
+		$template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
 }

admin_pages/messages/qtips/EE_Message_List_Table_Tips.lib.php

Indentation +96 added lines, -96 removed lines

@@ -15,105 +15,105 @@
 {
 
 
-    protected function _set_tips_array()
-    {
-        $this->_qtipsa = array(
-            0 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_sent,
-                'target'     => '.msg-status-' . EEM_Message::status_sent,
-                'content'    => $this->_message_status_legend(EEM_Message::status_sent),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                    ),
-                ),
-            ),
-            1 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_idle,
-                'target'     => '.msg-status-' . EEM_Message::status_idle,
-                'content'    => $this->_message_status_legend(EEM_Message::status_idle),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                    ),
-                ),
-            ),
-            2 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_failed,
-                'target'     => '.msg-status-' . EEM_Message::status_failed,
-                'content'    => $this->_message_status_legend(EEM_Message::status_failed),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                    ),
-                ),
-            ),
-            3 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_resend,
-                'target'     => '.msg-status-' . EEM_Message::status_resend,
-                'content'    => $this->_message_status_legend(EEM_Message::status_resend),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                    ),
-                ),
-            ),
-            4 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_incomplete,
-                'target'     => '.msg-status-' . EEM_Message::status_incomplete,
-                'content'    => $this->_message_status_legend(EEM_Message::status_incomplete),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                    ),
-                ),
-            ),
-            5 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_retry,
-                'target'     => '.msg-status-' . EEM_Message::status_retry,
-                'content'    => $this->_message_status_legend(EEM_Message::status_retry),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                    ),
-                ),
-            ),
-            6 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_debug_only,
-                'target'     => '.msg-status-' . EEM_Message::status_debug_only,
-                'content'    => $this->_message_status_legend(EEM_Message::status_debug_only),
-                'options'    => array(
-                    'position' => array(
-                        'target' => 'mouse',
-                    ),
-                ),
-            ),
-        );
-    }
+	protected function _set_tips_array()
+	{
+		$this->_qtipsa = array(
+			0 => array(
+				'content_id' => 'message_status-' . EEM_Message::status_sent,
+				'target'     => '.msg-status-' . EEM_Message::status_sent,
+				'content'    => $this->_message_status_legend(EEM_Message::status_sent),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+					),
+				),
+			),
+			1 => array(
+				'content_id' => 'message_status-' . EEM_Message::status_idle,
+				'target'     => '.msg-status-' . EEM_Message::status_idle,
+				'content'    => $this->_message_status_legend(EEM_Message::status_idle),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+					),
+				),
+			),
+			2 => array(
+				'content_id' => 'message_status-' . EEM_Message::status_failed,
+				'target'     => '.msg-status-' . EEM_Message::status_failed,
+				'content'    => $this->_message_status_legend(EEM_Message::status_failed),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+					),
+				),
+			),
+			3 => array(
+				'content_id' => 'message_status-' . EEM_Message::status_resend,
+				'target'     => '.msg-status-' . EEM_Message::status_resend,
+				'content'    => $this->_message_status_legend(EEM_Message::status_resend),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+					),
+				),
+			),
+			4 => array(
+				'content_id' => 'message_status-' . EEM_Message::status_incomplete,
+				'target'     => '.msg-status-' . EEM_Message::status_incomplete,
+				'content'    => $this->_message_status_legend(EEM_Message::status_incomplete),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+					),
+				),
+			),
+			5 => array(
+				'content_id' => 'message_status-' . EEM_Message::status_retry,
+				'target'     => '.msg-status-' . EEM_Message::status_retry,
+				'content'    => $this->_message_status_legend(EEM_Message::status_retry),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+					),
+				),
+			),
+			6 => array(
+				'content_id' => 'message_status-' . EEM_Message::status_debug_only,
+				'target'     => '.msg-status-' . EEM_Message::status_debug_only,
+				'content'    => $this->_message_status_legend(EEM_Message::status_debug_only),
+				'options'    => array(
+					'position' => array(
+						'target' => 'mouse',
+					),
+				),
+			),
+		);
+	}
 
 
-    /**
-     * output the relevant ee-status-legend with the designated status highlighted.
-     *
-     * @param  EEM_Message constant $status What status is set (by class)
-     * @return string         The status legend with the related status highlighted
-     */
-    private function _message_status_legend($status)
-    {
+	/**
+	 * output the relevant ee-status-legend with the designated status highlighted.
+	 *
+	 * @param  EEM_Message constant $status What status is set (by class)
+	 * @return string         The status legend with the related status highlighted
+	 */
+	private function _message_status_legend($status)
+	{
 
-        $status_array = array(
-            'sent_status'       => EEM_Message::status_sent,
-            'idle_status'       => EEM_Message::status_idle,
-            'failed_status'     => EEM_Message::status_failed,
-            'resend_status'     => EEM_Message::status_resend,
-            'incomplete_status' => EEM_Message::status_incomplete,
-            'retry_status'      => EEM_Message::status_retry,
-        );
+		$status_array = array(
+			'sent_status'       => EEM_Message::status_sent,
+			'idle_status'       => EEM_Message::status_idle,
+			'failed_status'     => EEM_Message::status_failed,
+			'resend_status'     => EEM_Message::status_resend,
+			'incomplete_status' => EEM_Message::status_incomplete,
+			'retry_status'      => EEM_Message::status_retry,
+		);
 
-        if (defined('WP_DEBUG') && WP_DEBUG) {
-            $status_array['debug_only_status'] = EEM_Message::status_debug_only;
-        }
+		if (defined('WP_DEBUG') && WP_DEBUG) {
+			$status_array['debug_only_status'] = EEM_Message::status_debug_only;
+		}
 
-        return EEH_Template::status_legend($status_array, $status);
-    }
+		return EEH_Template::status_legend($status_array, $status);
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -19,8 +19,8 @@ 
     {
         $this->_qtipsa = array(
             0 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_sent,
-                'target'     => '.msg-status-' . EEM_Message::status_sent,
+                'content_id' => 'message_status-'.EEM_Message::status_sent,
+                'target'     => '.msg-status-'.EEM_Message::status_sent,
                 'content'    => $this->_message_status_legend(EEM_Message::status_sent),
                 'options'    => array(
                     'position' => array(
@@ -29,8 +29,8 @@ 
                 ),
             ),
             1 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_idle,
-                'target'     => '.msg-status-' . EEM_Message::status_idle,
+                'content_id' => 'message_status-'.EEM_Message::status_idle,
+                'target'     => '.msg-status-'.EEM_Message::status_idle,
                 'content'    => $this->_message_status_legend(EEM_Message::status_idle),
                 'options'    => array(
                     'position' => array(
@@ -39,8 +39,8 @@ 
                 ),
             ),
             2 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_failed,
-                'target'     => '.msg-status-' . EEM_Message::status_failed,
+                'content_id' => 'message_status-'.EEM_Message::status_failed,
+                'target'     => '.msg-status-'.EEM_Message::status_failed,
                 'content'    => $this->_message_status_legend(EEM_Message::status_failed),
                 'options'    => array(
                     'position' => array(
@@ -49,8 +49,8 @@ 
                 ),
             ),
             3 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_resend,
-                'target'     => '.msg-status-' . EEM_Message::status_resend,
+                'content_id' => 'message_status-'.EEM_Message::status_resend,
+                'target'     => '.msg-status-'.EEM_Message::status_resend,
                 'content'    => $this->_message_status_legend(EEM_Message::status_resend),
                 'options'    => array(
                     'position' => array(
@@ -59,8 +59,8 @@ 
                 ),
             ),
             4 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_incomplete,
-                'target'     => '.msg-status-' . EEM_Message::status_incomplete,
+                'content_id' => 'message_status-'.EEM_Message::status_incomplete,
+                'target'     => '.msg-status-'.EEM_Message::status_incomplete,
                 'content'    => $this->_message_status_legend(EEM_Message::status_incomplete),
                 'options'    => array(
                     'position' => array(
@@ -69,8 +69,8 @@ 
                 ),
             ),
             5 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_retry,
-                'target'     => '.msg-status-' . EEM_Message::status_retry,
+                'content_id' => 'message_status-'.EEM_Message::status_retry,
+                'target'     => '.msg-status-'.EEM_Message::status_retry,
                 'content'    => $this->_message_status_legend(EEM_Message::status_retry),
                 'options'    => array(
                     'position' => array(
@@ -79,8 +79,8 @@ 
                 ),
             ),
             6 => array(
-                'content_id' => 'message_status-' . EEM_Message::status_debug_only,
-                'target'     => '.msg-status-' . EEM_Message::status_debug_only,
+                'content_id' => 'message_status-'.EEM_Message::status_debug_only,
+                'target'     => '.msg-status-'.EEM_Message::status_debug_only,
                 'content'    => $this->_message_status_legend(EEM_Message::status_debug_only),
                 'options'    => array(
                     'position' => array(

admin_pages/maintenance/templates/ee_upgrade_addons_before_migrating.template.php

Indentation +10 added lines, -10 removed lines

@@ -4,15 +4,15 @@
 <h1><?php esc_html_e("You must upgrade your Event Espresso Add-ons before Migrating", "event_espresso"); ?></h1>
 <p>
     <?php printf(
-        esc_html__(
-            "Please %s visit the plugins page%s and update all Event Espresso addon plugins before updating your database.",
-            "event_espresso"
-        ),
-        "<a href='" . admin_url('/plugins.php') . "'>",
-        "</a>"
-    ); ?></p>
+		esc_html__(
+			"Please %s visit the plugins page%s and update all Event Espresso addon plugins before updating your database.",
+			"event_espresso"
+		),
+		"<a href='" . admin_url('/plugins.php') . "'>",
+		"</a>"
+	); ?></p>
 <p>
     <?php esc_html_e(
-        "You can also deactivate the addons, but all of their data will be lost when your database is migrated",
-        "event_espresso"
-    ); ?></p>
\ No newline at end of file
+		"You can also deactivate the addons, but all of their data will be lost when your database is migrated",
+		"event_espresso"
+	); ?></p>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
             "Please %s visit the plugins page%s and update all Event Espresso addon plugins before updating your database.",
             "event_espresso"
         ),
-        "<a href='" . admin_url('/plugins.php') . "'>",
+        "<a href='".admin_url('/plugins.php')."'>",
         "</a>"
     ); ?></p>
 <p>