@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | //namespace EventEspresso\core\libraries\templates; |
| 3 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
| 4 | - exit( 'No direct script access allowed' ); |
|
| 3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 4 | + exit('No direct script access allowed'); |
|
| 5 | 5 | } |
| 6 | 6 | |
| 7 | 7 | |
@@ -70,23 +70,23 @@ discard block |
||
| 70 | 70 | * @param string $template - name or path of template to be used by EEH_Template::locate_template() |
| 71 | 71 | * @param int $priority - order in which template parts should be applied |
| 72 | 72 | */ |
| 73 | - public function add_template_part( $name, $label, $template, $priority ) { |
|
| 73 | + public function add_template_part($name, $label, $template, $priority) { |
|
| 74 | 74 | // SplPriorityQueue doesn't play nice with multiple items having the same priority |
| 75 | 75 | // so if the incoming priority is already occupied, then let's increment it by one, |
| 76 | 76 | // and then pass everything back into this method and try again with the new priority |
| 77 | - if ( isset( $this->priorities[ $priority ] ) ) { |
|
| 77 | + if (isset($this->priorities[$priority])) { |
|
| 78 | 78 | $priority++; |
| 79 | - $this->add_template_part( $name, $label, $template, $priority ); |
|
| 79 | + $this->add_template_part($name, $label, $template, $priority); |
|
| 80 | 80 | return; |
| 81 | 81 | } |
| 82 | 82 | // kk now we can mark this priority as being occupied |
| 83 | - $this->priorities[ $priority ] = true; |
|
| 83 | + $this->priorities[$priority] = true; |
|
| 84 | 84 | // create the template part and add to the queue |
| 85 | 85 | $this->template_parts->insert( |
| 86 | - new EE_Template_Part( $name, $label, $template, $priority ), |
|
| 86 | + new EE_Template_Part($name, $label, $template, $priority), |
|
| 87 | 87 | $priority |
| 88 | 88 | ); |
| 89 | - if ( $name == 'event' ) { |
|
| 89 | + if ($name == 'event') { |
|
| 90 | 90 | $this->event_desc_priority = $priority; |
| 91 | 91 | } |
| 92 | 92 | } |
@@ -103,10 +103,10 @@ discard block |
||
| 103 | 103 | * @param string $content |
| 104 | 104 | * @return string |
| 105 | 105 | */ |
| 106 | - public function apply_template_part_filters( $content = '' ) { |
|
| 106 | + public function apply_template_part_filters($content = '') { |
|
| 107 | 107 | $this->template_parts->rewind(); |
| 108 | 108 | // loop through template parts and position content |
| 109 | - while ( $this->template_parts->valid() ) { |
|
| 109 | + while ($this->template_parts->valid()) { |
|
| 110 | 110 | $this->_position_template_part( |
| 111 | 111 | $content, |
| 112 | 112 | $this->template_parts->current()->template(), |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | $this->template_parts->next(); |
| 116 | 116 | } |
| 117 | 117 | // now simply add our three strings of content together |
| 118 | - return $this->before_event_content . $this->event_content . $this->after_event_content; |
|
| 118 | + return $this->before_event_content.$this->event_content.$this->after_event_content; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | |
@@ -136,16 +136,16 @@ discard block |
||
| 136 | 136 | * @param int $priority |
| 137 | 137 | * @return string |
| 138 | 138 | */ |
| 139 | - protected function _position_template_part( $content, $template, $priority ) { |
|
| 139 | + protected function _position_template_part($content, $template, $priority) { |
|
| 140 | 140 | // Event Description content is the actual incoming content itself |
| 141 | - if ( $priority === $this->event_desc_priority ) { |
|
| 141 | + if ($priority === $this->event_desc_priority) { |
|
| 142 | 142 | $this->event_content = $content; |
| 143 | - } else if ( $priority < $this->event_desc_priority ) { |
|
| 143 | + } else if ($priority < $this->event_desc_priority) { |
|
| 144 | 144 | // everything BEFORE the Event Description |
| 145 | - $this->before_event_content .= EEH_Template::locate_template( $template ); |
|
| 146 | - } else if ( $priority > $this->event_desc_priority ) { |
|
| 145 | + $this->before_event_content .= EEH_Template::locate_template($template); |
|
| 146 | + } else if ($priority > $this->event_desc_priority) { |
|
| 147 | 147 | // everything AFTER the Event Description |
| 148 | - $this->after_event_content .= EEH_Template::locate_template( $template ); |
|
| 148 | + $this->after_event_content .= EEH_Template::locate_template($template); |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
@@ -170,16 +170,16 @@ discard block |
||
| 170 | 170 | $list_item_css_class = '', |
| 171 | 171 | $list_item_css_id_prefix = '' |
| 172 | 172 | ) { |
| 173 | - EE_Registry::instance()->load_helper( 'HTML' ); |
|
| 174 | - $event_archive_display_order = EEH_HTML::ul( $list_css_id, $list_css_class ); |
|
| 173 | + EE_Registry::instance()->load_helper('HTML'); |
|
| 174 | + $event_archive_display_order = EEH_HTML::ul($list_css_id, $list_css_class); |
|
| 175 | 175 | $this->template_parts->rewind(); |
| 176 | 176 | // loop through template parts and add template content |
| 177 | - while ( $this->template_parts->valid() ) { |
|
| 177 | + while ($this->template_parts->valid()) { |
|
| 178 | 178 | $event_archive_display_order .= EEH_HTML::li( |
| 179 | - EEH_HTML::span( '', '', 'dashicons dashicons-arrow-up-alt2' ) . |
|
| 180 | - EEH_HTML::span( '', '', 'dashicons dashicons-arrow-down-alt2' ) . |
|
| 179 | + EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2'). |
|
| 180 | + EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2'). |
|
| 181 | 181 | $this->template_parts->current()->label(), |
| 182 | - $list_item_css_id_prefix . $this->template_parts->current()->name(), |
|
| 182 | + $list_item_css_id_prefix.$this->template_parts->current()->name(), |
|
| 183 | 183 | $list_item_css_class |
| 184 | 184 | ); |
| 185 | 185 | $this->template_parts->next(); |
@@ -199,10 +199,10 @@ discard block |
||
| 199 | 199 | * @return string |
| 200 | 200 | */ |
| 201 | 201 | public function display_template_parts() { |
| 202 | - if ( WP_DEBUG ) { |
|
| 202 | + if (WP_DEBUG) { |
|
| 203 | 203 | $this->template_parts->rewind(); |
| 204 | - while ( $this->template_parts->valid() ) { |
|
| 205 | - EEH_Debug_Tools::printr( $this->template_parts->current(), 'template_part', __FILE__, __LINE__ ); |
|
| 204 | + while ($this->template_parts->valid()) { |
|
| 205 | + EEH_Debug_Tools::printr($this->template_parts->current(), 'template_part', __FILE__, __LINE__); |
|
| 206 | 206 | $this->template_parts->next(); |
| 207 | 207 | } |
| 208 | 208 | } |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | //namespace EventEspresso\core\libraries\templates; |
| 3 | 3 | |
| 4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
| 5 | - exit( 'No direct script access allowed' ); |
|
| 4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 5 | + exit('No direct script access allowed'); |
|
| 6 | 6 | } |
| 7 | 7 | /** |
| 8 | 8 | * Class EE_Template_Part_PriorityQueue |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | * @param int $priority |
| 32 | 32 | * @return bool |
| 33 | 33 | */ |
| 34 | - public function insert( $object, $priority = 100 ) { |
|
| 35 | - if ( $object instanceof EE_Template_Part ) { |
|
| 36 | - parent::insert( $object, $priority ); |
|
| 34 | + public function insert($object, $priority = 100) { |
|
| 35 | + if ($object instanceof EE_Template_Part) { |
|
| 36 | + parent::insert($object, $priority); |
|
| 37 | 37 | return true; |
| 38 | 38 | } else { |
| 39 | 39 | return false; |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | * @param int $priority2 |
| 53 | 53 | * @return bool |
| 54 | 54 | */ |
| 55 | - public function compare( $priority1, $priority2 ) { |
|
| 56 | - if ( $priority1 === $priority2 ) { |
|
| 55 | + public function compare($priority1, $priority2) { |
|
| 56 | + if ($priority1 === $priority2) { |
|
| 57 | 57 | return 0; |
| 58 | 58 | } |
| 59 | 59 | return $priority1 > $priority2 ? -1 : 1; |
@@ -21,11 +21,11 @@ discard block |
||
| 21 | 21 | * @param EE_Response $response |
| 22 | 22 | * @return EE_Response |
| 23 | 23 | */ |
| 24 | - public function handle_request( EE_Request $request, EE_Response $response ) { |
|
| 24 | + public function handle_request(EE_Request $request, EE_Response $response) { |
|
| 25 | 25 | $this->_request = $request; |
| 26 | 26 | $this->_response = $response; |
| 27 | 27 | $this->display_alpha_banner_warning(); |
| 28 | - $this->_response = $this->process_request_stack( $this->_request, $this->_response ); |
|
| 28 | + $this->_response = $this->process_request_stack($this->_request, $this->_response); |
|
| 29 | 29 | return $this->_response; |
| 30 | 30 | } |
| 31 | 31 | |
@@ -41,22 +41,22 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public function display_alpha_banner_warning() { |
| 43 | 43 | // skip AJAX requests |
| 44 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { |
|
| 44 | + if (defined('DOING_AJAX') && DOING_AJAX) { |
|
| 45 | 45 | return; |
| 46 | 46 | } |
| 47 | 47 | // skip stable releases |
| 48 | - if ( strpos( EVENT_ESPRESSO_VERSION, '.alpha' ) === false ) { |
|
| 48 | + if (strpos(EVENT_ESPRESSO_VERSION, '.alpha') === false) { |
|
| 49 | 49 | return; |
| 50 | 50 | } |
| 51 | 51 | // post release candidate warning |
| 52 | - if ( is_admin() ) { |
|
| 53 | - add_action( 'admin_notices', array( $this, 'alpha_banner_admin_notice' ), -999 ); |
|
| 52 | + if (is_admin()) { |
|
| 53 | + add_action('admin_notices', array($this, 'alpha_banner_admin_notice'), -999); |
|
| 54 | 54 | } else { |
| 55 | 55 | // site admin has authorized use of non-stable release candidate for production |
| 56 | - if ( defined( 'ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE' ) && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE ) { |
|
| 56 | + if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) { |
|
| 57 | 57 | return; |
| 58 | 58 | } |
| 59 | - add_action( 'shutdown', array( $this, 'alpha_banner_warning_notice' ), 10 ); |
|
| 59 | + add_action('shutdown', array($this, 'alpha_banner_warning_notice'), 10); |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | public function alpha_banner_admin_notice() { |
| 73 | 73 | EE_Error::add_attention( |
| 74 | 74 | sprintf( |
| 75 | - __( 'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso' ), |
|
| 75 | + __('This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso'), |
|
| 76 | 76 | '<strong>', |
| 77 | 77 | '</strong>' |
| 78 | 78 | ), |
@@ -91,11 +91,11 @@ discard block |
||
| 91 | 91 | */ |
| 92 | 92 | public function alpha_banner_warning_notice() { |
| 93 | 93 | global $pagenow; |
| 94 | - if ( in_array( $pagenow, array( 'wp-login.php', 'wp-register.php' ) ) ) { |
|
| 94 | + if (in_array($pagenow, array('wp-login.php', 'wp-register.php'))) { |
|
| 95 | 95 | return; |
| 96 | 96 | } |
| 97 | 97 | printf( |
| 98 | - __( '%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso' ), |
|
| 98 | + __('%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso'), |
|
| 99 | 99 | '<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>', |
| 100 | 100 | '<strong>', |
| 101 | 101 | '</strong>', |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | * @access public |
| 44 | 44 | * @param \EEI_Request_Decorator $request_stack |
| 45 | 45 | */ |
| 46 | - public function __construct( EEI_Request_Decorator $request_stack ) { |
|
| 46 | + public function __construct(EEI_Request_Decorator $request_stack) { |
|
| 47 | 47 | $this->request_stack = $request_stack; |
| 48 | 48 | } |
| 49 | 49 | |
@@ -57,13 +57,13 @@ discard block |
||
| 57 | 57 | * @param EE_Response $response |
| 58 | 58 | * @return EE_Response |
| 59 | 59 | */ |
| 60 | - protected function process_request_stack( EE_Request $request, EE_Response $response ) { |
|
| 60 | + protected function process_request_stack(EE_Request $request, EE_Response $response) { |
|
| 61 | 61 | $this->_request = $request; |
| 62 | 62 | $this->_response = $response; |
| 63 | - if ( ! $this->_response->request_terminated() ) { |
|
| 64 | - $this->_response = $this->request_stack->handle_request( $this->_request, $this->_response ); |
|
| 63 | + if ( ! $this->_response->request_terminated()) { |
|
| 64 | + $this->_response = $this->request_stack->handle_request($this->_request, $this->_response); |
|
| 65 | 65 | } else { |
| 66 | - espresso_deactivate_plugin( EE_PLUGIN_BASENAME ); |
|
| 66 | + espresso_deactivate_plugin(EE_PLUGIN_BASENAME); |
|
| 67 | 67 | } |
| 68 | 68 | return $this->_response; |
| 69 | 69 | } |
@@ -22,34 +22,34 @@ discard block |
||
| 22 | 22 | * @param EE_Response $response |
| 23 | 23 | * @return EE_Response |
| 24 | 24 | */ |
| 25 | - public function handle_request( EE_Request $request, EE_Response $response ) { |
|
| 25 | + public function handle_request(EE_Request $request, EE_Response $response) { |
|
| 26 | 26 | $this->_request = $request; |
| 27 | 27 | $this->_response = $response; |
| 28 | 28 | //$this->_response->add_output( "\n\t IN >> " . __CLASS__ ); |
| 29 | 29 | //$this->_response->set_notice( 1, 'hey look at this' ); |
| 30 | 30 | // check required WP version |
| 31 | - if ( ! $this->_minimum_wp_version_required() ) { |
|
| 32 | - $this->_request->un_set( 'activate', true ); |
|
| 33 | - add_action( 'admin_notices', array( $this, 'minimum_wp_version_error' ), 1 ); |
|
| 31 | + if ( ! $this->_minimum_wp_version_required()) { |
|
| 32 | + $this->_request->un_set('activate', true); |
|
| 33 | + add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1); |
|
| 34 | 34 | //$this->_response->add_output( "\n<br />" . 'minimum_wp_version_error' ); |
| 35 | 35 | $this->_response->terminate_request(); |
| 36 | 36 | } |
| 37 | 37 | // check required PHP version |
| 38 | - if ( ! $this->_minimum_php_version_required() ) { |
|
| 39 | - $this->_request->un_set( 'activate', true ); |
|
| 40 | - add_action( 'admin_notices', array( $this, 'minimum_php_version_error' ), 1 ); |
|
| 38 | + if ( ! $this->_minimum_php_version_required()) { |
|
| 39 | + $this->_request->un_set('activate', true); |
|
| 40 | + add_action('admin_notices', array($this, 'minimum_php_version_error'), 1); |
|
| 41 | 41 | //$this->_response->add_output( "\n<br />" . 'minimum_php_version_error' ); |
| 42 | 42 | $this->_response->terminate_request(); |
| 43 | 43 | } |
| 44 | 44 | // check recommended WP version |
| 45 | - if ( ! $this->_minimum_wp_version_recommended() ) { |
|
| 45 | + if ( ! $this->_minimum_wp_version_recommended()) { |
|
| 46 | 46 | $this->_display_minimum_recommended_wp_version_notice(); |
| 47 | 47 | } |
| 48 | 48 | // check recommended PHP version |
| 49 | - if ( ! $this->_minimum_php_version_recommended() ) { |
|
| 49 | + if ( ! $this->_minimum_php_version_recommended()) { |
|
| 50 | 50 | $this->_display_minimum_recommended_php_version_notice(); |
| 51 | 51 | } |
| 52 | - $this->_response = $this->process_request_stack( $this->_request, $this->_response ); |
|
| 52 | + $this->_response = $this->process_request_stack($this->_request, $this->_response); |
|
| 53 | 53 | //$this->_response->add_output( "\n\t OUT << " . __CLASS__ ); |
| 54 | 54 | return $this->_response; |
| 55 | 55 | } |
@@ -63,9 +63,9 @@ discard block |
||
| 63 | 63 | * @param string $min_version |
| 64 | 64 | * @return boolean |
| 65 | 65 | */ |
| 66 | - private function _check_wp_version( $min_version = EE_MIN_WP_VER_REQUIRED ) { |
|
| 66 | + private function _check_wp_version($min_version = EE_MIN_WP_VER_REQUIRED) { |
|
| 67 | 67 | global $wp_version; |
| 68 | - return version_compare( $wp_version, $min_version, '>=' ) ? true : false; |
|
| 68 | + return version_compare($wp_version, $min_version, '>=') ? true : false; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * @return boolean |
| 78 | 78 | */ |
| 79 | 79 | private function _minimum_wp_version_required() { |
| 80 | - return $this->_check_wp_version( EE_MIN_WP_VER_REQUIRED ); |
|
| 80 | + return $this->_check_wp_version(EE_MIN_WP_VER_REQUIRED); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | * @return boolean |
| 90 | 90 | */ |
| 91 | 91 | private function _minimum_wp_version_recommended() { |
| 92 | - return $this->_check_wp_version( EE_MIN_WP_VER_RECOMMENDED ); |
|
| 92 | + return $this->_check_wp_version(EE_MIN_WP_VER_RECOMMENDED); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | |
@@ -101,8 +101,8 @@ discard block |
||
| 101 | 101 | * @param string $min_version |
| 102 | 102 | * @return boolean |
| 103 | 103 | */ |
| 104 | - private function _check_php_version( $min_version = EE_MIN_PHP_VER_RECOMMENDED ) { |
|
| 105 | - return version_compare( PHP_VERSION, $min_version, '>=' ) ? true : false; |
|
| 104 | + private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED) { |
|
| 105 | + return version_compare(PHP_VERSION, $min_version, '>=') ? true : false; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * @return boolean |
| 115 | 115 | */ |
| 116 | 116 | private function _minimum_php_version_required() { |
| 117 | - return $this->_check_php_version( EE_MIN_PHP_VER_REQUIRED ); |
|
| 117 | + return $this->_check_php_version(EE_MIN_PHP_VER_REQUIRED); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * @return boolean |
| 127 | 127 | */ |
| 128 | 128 | private function _minimum_php_version_recommended() { |
| 129 | - return $this->_check_php_version( EE_MIN_PHP_VER_RECOMMENDED ); |
|
| 129 | + return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | <p> |
| 144 | 144 | <?php |
| 145 | 145 | printf( |
| 146 | - __( 'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ), |
|
| 146 | + __('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'), |
|
| 147 | 147 | EE_MIN_WP_VER_REQUIRED, |
| 148 | 148 | $wp_version, |
| 149 | 149 | '<br/>', |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | <p> |
| 169 | 169 | <?php |
| 170 | 170 | printf( |
| 171 | - __( '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' ), |
|
| 171 | + __('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'), |
|
| 172 | 172 | EE_MIN_PHP_VER_REQUIRED, |
| 173 | 173 | PHP_VERSION, |
| 174 | 174 | '<br/>', |
@@ -191,9 +191,9 @@ discard block |
||
| 191 | 191 | private function _display_minimum_recommended_wp_version_notice() { |
| 192 | 192 | global $wp_version; |
| 193 | 193 | EE_Error::add_persistent_admin_notice( |
| 194 | - 'wp_version_' . str_replace( '.', '-', EE_MIN_WP_VER_RECOMMENDED ) . '_recommended', |
|
| 194 | + 'wp_version_'.str_replace('.', '-', EE_MIN_WP_VER_RECOMMENDED).'_recommended', |
|
| 195 | 195 | sprintf( |
| 196 | - __( 'Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ), |
|
| 196 | + __('Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'), |
|
| 197 | 197 | EE_MIN_WP_VER_RECOMMENDED, |
| 198 | 198 | $wp_version, |
| 199 | 199 | '<br/>', |
@@ -212,9 +212,9 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | private function _display_minimum_recommended_php_version_notice() { |
| 214 | 214 | EE_Error::add_persistent_admin_notice( |
| 215 | - 'php_version_' . str_replace( '.', '-', EE_MIN_PHP_VER_RECOMMENDED ) . '_recommended', |
|
| 215 | + 'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended', |
|
| 216 | 216 | sprintf( |
| 217 | - __( 'Event Espresso recommends PHP version %1$s or greater for optimal performance. 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' ), |
|
| 217 | + __('Event Espresso recommends PHP version %1$s or greater for optimal performance. 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'), |
|
| 218 | 218 | EE_MIN_PHP_VER_RECOMMENDED, |
| 219 | 219 | PHP_VERSION, |
| 220 | 220 | '<br/>', |
@@ -38,12 +38,12 @@ discard block |
||
| 38 | 38 | * @access public |
| 39 | 39 | * @param array $request |
| 40 | 40 | */ |
| 41 | - public function __construct( $request ) { |
|
| 41 | + public function __construct($request) { |
|
| 42 | 42 | // grab request vars |
| 43 | 43 | $this->_params = $request; |
| 44 | 44 | // AJAX ??? |
| 45 | - $this->ajax = defined( 'DOING_AJAX' ) ? TRUE : FALSE; |
|
| 46 | - $this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? TRUE : FALSE; |
|
| 45 | + $this->ajax = defined('DOING_AJAX') ? TRUE : FALSE; |
|
| 46 | + $this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? TRUE : FALSE; |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | * @param bool $override_ee |
| 68 | 68 | * @return void |
| 69 | 69 | */ |
| 70 | - public function set( $key, $value, $override_ee = FALSE ) { |
|
| 70 | + public function set($key, $value, $override_ee = FALSE) { |
|
| 71 | 71 | // don't allow "ee" to be overwritten unless explicitly instructed to do so |
| 72 | - if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) { |
|
| 73 | - $this->_params[ $key ] = $value; |
|
| 72 | + if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) { |
|
| 73 | + $this->_params[$key] = $value; |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
@@ -84,8 +84,8 @@ discard block |
||
| 84 | 84 | * @param null $default |
| 85 | 85 | * @return mixed |
| 86 | 86 | */ |
| 87 | - public function get( $key, $default = NULL ) { |
|
| 88 | - return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default; |
|
| 87 | + public function get($key, $default = NULL) { |
|
| 88 | + return isset($this->_params[$key]) ? $this->_params[$key] : $default; |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | * @param $key |
| 98 | 98 | * @return boolean |
| 99 | 99 | */ |
| 100 | - public function is_set( $key ) { |
|
| 101 | - return isset( $this->_params[ $key ] ) ? TRUE : FALSE; |
|
| 100 | + public function is_set($key) { |
|
| 101 | + return isset($this->_params[$key]) ? TRUE : FALSE; |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | |
@@ -110,10 +110,10 @@ discard block |
||
| 110 | 110 | * @param $key |
| 111 | 111 | * @param bool $unset_from_global_too |
| 112 | 112 | */ |
| 113 | - public function un_set( $key, $unset_from_global_too = false ) { |
|
| 114 | - unset( $this->_params[ $key ] ); |
|
| 115 | - if ( $unset_from_global_too ) { |
|
| 116 | - unset( $_REQUEST[ $key ] ); |
|
| 113 | + public function un_set($key, $unset_from_global_too = false) { |
|
| 114 | + unset($this->_params[$key]); |
|
| 115 | + if ($unset_from_global_too) { |
|
| 116 | + unset($_REQUEST[$key]); |
|
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | |
@@ -1,4 +1,6 @@ |
||
| 1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | +} |
|
| 2 | 4 | /** |
| 3 | 5 | * class EE_Request |
| 4 | 6 | * |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | * @param EEI_Request_Decorator $application |
| 44 | 44 | * @param array $middlewares |
| 45 | 45 | */ |
| 46 | - public function __construct( EEI_Request_Decorator $application, $middlewares = array() ) { |
|
| 46 | + public function __construct(EEI_Request_Decorator $application, $middlewares = array()) { |
|
| 47 | 47 | $this->_application = $application; |
| 48 | 48 | $this->_middlewares = $middlewares; |
| 49 | 49 | } |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | * @param EE_Response $response |
| 56 | 56 | * @return EE_Response |
| 57 | 57 | */ |
| 58 | - public function handle_request( EE_Request $request, EE_Response $response ) { |
|
| 58 | + public function handle_request(EE_Request $request, EE_Response $response) { |
|
| 59 | 59 | $this->_request = $request; |
| 60 | 60 | $this->_response = $response; |
| 61 | - return $this->_application->handle_request( $request, $response ); |
|
| 61 | + return $this->_application->handle_request($request, $response); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
@@ -70,9 +70,9 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function handle_response() { |
| 72 | 72 | $prev_middleware = null; |
| 73 | - foreach ( $this->_middlewares as $middleware ) { |
|
| 74 | - if ( ! $prev_middleware instanceof EEI_Request_Stack_Core_App && $middleware instanceof EEI_Request_Stack_Core_App ) { |
|
| 75 | - $middleware->handle_response( $this->_request, $this->_response ); |
|
| 73 | + foreach ($this->_middlewares as $middleware) { |
|
| 74 | + if ( ! $prev_middleware instanceof EEI_Request_Stack_Core_App && $middleware instanceof EEI_Request_Stack_Core_App) { |
|
| 75 | + $middleware->handle_response($this->_request, $this->_response); |
|
| 76 | 76 | } |
| 77 | 77 | $prev_middleware = $middleware; |
| 78 | 78 | } |
@@ -44,12 +44,12 @@ discard block |
||
| 44 | 44 | * @return EE_Request_Stack_Builder |
| 45 | 45 | */ |
| 46 | 46 | public function unshift( /*$class_name, $args*/ ) { |
| 47 | - if ( func_num_args() === 0 ) { |
|
| 48 | - throw new InvalidArgumentException( "Missing argument(s) when calling unshift" ); |
|
| 47 | + if (func_num_args() === 0) { |
|
| 48 | + throw new InvalidArgumentException("Missing argument(s) when calling unshift"); |
|
| 49 | 49 | } |
| 50 | 50 | $middleware = func_get_args(); |
| 51 | 51 | //$this->middleware_stack->unshift( $middleware ); |
| 52 | - array_unshift( $this->_middleware_stack, $middleware ); |
|
| 52 | + array_unshift($this->_middleware_stack, $middleware); |
|
| 53 | 53 | return $this; |
| 54 | 54 | } |
| 55 | 55 | |
@@ -66,12 +66,12 @@ discard block |
||
| 66 | 66 | * @return EE_Request_Stack_Builder |
| 67 | 67 | */ |
| 68 | 68 | public function push( /*$class_name, $args...*/ ) { |
| 69 | - if ( func_num_args() === 0 ) { |
|
| 70 | - throw new InvalidArgumentException( "Missing argument(s) when calling push" ); |
|
| 69 | + if (func_num_args() === 0) { |
|
| 70 | + throw new InvalidArgumentException("Missing argument(s) when calling push"); |
|
| 71 | 71 | } |
| 72 | 72 | $middleware = func_get_args(); |
| 73 | 73 | //$this->middleware_stack->push( $middleware ); |
| 74 | - array_push( $this->_middleware_stack, $middleware ); |
|
| 74 | + array_push($this->_middleware_stack, $middleware); |
|
| 75 | 75 | return $this; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -84,20 +84,20 @@ discard block |
||
| 84 | 84 | * @param EEI_Request_Decorator $application |
| 85 | 85 | * @return EE_Request_Stack |
| 86 | 86 | */ |
| 87 | - public function resolve( EEI_Request_Decorator $application ) { |
|
| 88 | - $middlewares = array( $application ); |
|
| 89 | - foreach ( $this->_middleware_stack as $middleware_args ) { |
|
| 90 | - $class_name = array_shift( $middleware_args ); |
|
| 91 | - if ( is_callable( $class_name ) ) { |
|
| 92 | - $application = $class_name( $application ); |
|
| 87 | + public function resolve(EEI_Request_Decorator $application) { |
|
| 88 | + $middlewares = array($application); |
|
| 89 | + foreach ($this->_middleware_stack as $middleware_args) { |
|
| 90 | + $class_name = array_shift($middleware_args); |
|
| 91 | + if (is_callable($class_name)) { |
|
| 92 | + $application = $class_name($application); |
|
| 93 | 93 | } else { |
| 94 | - array_unshift( $middleware_args, $application ); |
|
| 95 | - $reflection = new ReflectionClass( $class_name ); |
|
| 96 | - $application = $reflection->newInstanceArgs( $middleware_args ); |
|
| 94 | + array_unshift($middleware_args, $application); |
|
| 95 | + $reflection = new ReflectionClass($class_name); |
|
| 96 | + $application = $reflection->newInstanceArgs($middleware_args); |
|
| 97 | 97 | } |
| 98 | - array_unshift( $middlewares, $application ); |
|
| 98 | + array_unshift($middlewares, $application); |
|
| 99 | 99 | } |
| 100 | - return new EE_Request_Stack( $application, $middlewares ); |
|
| 100 | + return new EE_Request_Stack($application, $middlewares); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @return \EE_Response |
| 41 | 41 | */ |
| 42 | 42 | public function __construct() { |
| 43 | - $this->terminate_request( false ); |
|
| 43 | + $this->terminate_request(false); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | * @param $value |
| 54 | 54 | * @return void |
| 55 | 55 | */ |
| 56 | - public function set_notice( $key, $value ) { |
|
| 57 | - $this->_notice[ $key ] = $value; |
|
| 56 | + public function set_notice($key, $value) { |
|
| 57 | + $this->_notice[$key] = $value; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | * @param $key |
| 67 | 67 | * @return mixed |
| 68 | 68 | */ |
| 69 | - public function get_notice( $key ) { |
|
| 70 | - return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : NULL; |
|
| 69 | + public function get_notice($key) { |
|
| 70 | + return isset($this->_notice[$key]) ? $this->_notice[$key] : NULL; |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | |
@@ -91,8 +91,8 @@ discard block |
||
| 91 | 91 | * @param $string |
| 92 | 92 | * @param bool $append |
| 93 | 93 | */ |
| 94 | - public function add_output( $string, $append = true ) { |
|
| 95 | - $this->_output = $append ? $this->_output . $string : $string . $this->_output; |
|
| 94 | + public function add_output($string, $append = true) { |
|
| 95 | + $this->_output = $append ? $this->_output.$string : $string.$this->_output; |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | /** |
| 122 | 122 | * @param boolean $request_terminated |
| 123 | 123 | */ |
| 124 | - public function terminate_request( $request_terminated = true ) { |
|
| 125 | - $this->request_terminated = filter_var( $request_terminated, FILTER_VALIDATE_BOOLEAN ); |
|
| 124 | + public function terminate_request($request_terminated = true) { |
|
| 125 | + $this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | |
@@ -1,4 +1,6 @@ |
||
| 1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | +} |
|
| 2 | 4 | /** |
| 3 | 5 | * class EE_Response |
| 4 | 6 | * |