@@ -184,7 +184,7 @@ |
||
| 184 | 184 | * returns TRUE if M-Mode is engaged and the current request is not for the admin |
| 185 | 185 | * |
| 186 | 186 | * @access public |
| 187 | - * @return string |
|
| 187 | + * @return boolean |
|
| 188 | 188 | */ |
| 189 | 189 | public static function disable_frontend_for_maintenance() { |
| 190 | 190 | return ! is_admin() && EE_Maintenance_Mode::instance()->level() ? TRUE : FALSE; |
@@ -48,10 +48,10 @@ |
||
| 48 | 48 | */ |
| 49 | 49 | const option_name_maintenance_mode = 'ee_maintenance_mode'; |
| 50 | 50 | /** |
| 51 | - * EE_Maintenance_Mode Object |
|
| 52 | - * @var EE_Maintenance_Mode $_instance |
|
| 53 | - * @access private |
|
| 54 | - */ |
|
| 51 | + * EE_Maintenance_Mode Object |
|
| 52 | + * @var EE_Maintenance_Mode $_instance |
|
| 53 | + * @access private |
|
| 54 | + */ |
|
| 55 | 55 | private static $_instance = NULL; |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | current_user_can('administrator') && //when the user is an admin |
| 142 | 142 | $real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance){//and we're in level 1 |
| 143 | 143 | $maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance; |
| 144 | - }else{ |
|
| 144 | + } else{ |
|
| 145 | 145 | $maintenance_mode_level = $real_maintenance_mode_level; |
| 146 | 146 | } |
| 147 | 147 | return $maintenance_mode_level; |
@@ -156,12 +156,12 @@ discard block |
||
| 156 | 156 | if( EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){ |
| 157 | 157 | update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance); |
| 158 | 158 | return true; |
| 159 | - }elseif( $this->level() == self::level_2_complete_maintenance ){ |
|
| 159 | + } elseif( $this->level() == self::level_2_complete_maintenance ){ |
|
| 160 | 160 | //we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run |
| 161 | 161 | //then we shouldn't be in mm2. (Maybe an addon got deactivated?) |
| 162 | 162 | update_option( self::option_name_maintenance_mode, self::level_0_not_in_maintenance ); |
| 163 | 163 | return false; |
| 164 | - }else{ |
|
| 164 | + } else{ |
|
| 165 | 165 | return false; |
| 166 | 166 | } |
| 167 | 167 | } |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public static function instance() { |
| 75 | 75 | // check if class object is instantiated |
| 76 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Maintenance_Mode )) { |
|
| 76 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Maintenance_Mode)) { |
|
| 77 | 77 | self::$_instance = new self(); |
| 78 | 78 | } |
| 79 | 79 | return self::$_instance; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * Resets maintenance mode (mostly just re-checks whether or not we should be in maintenance mode) |
| 84 | 84 | * @return EE_Maintenance_Mode |
| 85 | 85 | */ |
| 86 | - public static function reset(){ |
|
| 86 | + public static function reset() { |
|
| 87 | 87 | self::instance()->set_maintenance_mode_if_db_old(); |
| 88 | 88 | return self::instance(); |
| 89 | 89 | } |
@@ -98,11 +98,11 @@ discard block |
||
| 98 | 98 | */ |
| 99 | 99 | private function __construct() { |
| 100 | 100 | // if M-Mode level 2 is engaged, we still need basic assets loaded |
| 101 | - add_action( 'wp_enqueue_scripts', array( $this, 'load_assets_required_for_m_mode' )); |
|
| 101 | + add_action('wp_enqueue_scripts', array($this, 'load_assets_required_for_m_mode')); |
|
| 102 | 102 | // shut 'er down down for maintenance ? |
| 103 | - add_filter( 'the_content', array( $this, 'the_content' ), 2 ); |
|
| 103 | + add_filter('the_content', array($this, 'the_content'), 2); |
|
| 104 | 104 | // add powered by EE msg |
| 105 | - add_action( 'shutdown', array( $this, 'display_maintenance_mode_notice' ), 10 ); |
|
| 105 | + add_action('shutdown', array($this, 'display_maintenance_mode_notice'), 10); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | * retrieves the maintenance mode option value from the db |
| 113 | 113 | * @return int |
| 114 | 114 | */ |
| 115 | - public function real_level(){ |
|
| 116 | - return get_option( self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance ); |
|
| 115 | + public function real_level() { |
|
| 116 | + return get_option(self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /** |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | * thinks their tables are present and up-to-date). |
| 122 | 122 | * @return boolean |
| 123 | 123 | */ |
| 124 | - public function models_can_query(){ |
|
| 124 | + public function models_can_query() { |
|
| 125 | 125 | return $this->real_level() != EE_Maintenance_Mode::level_2_complete_maintenance; |
| 126 | 126 | } |
| 127 | 127 | |
@@ -134,14 +134,14 @@ discard block |
||
| 134 | 134 | * EE_Maintenance_Mode::level_2_complete_maintenance => frontend and backend maintenance mode |
| 135 | 135 | * @return int |
| 136 | 136 | */ |
| 137 | - public function level(){ |
|
| 137 | + public function level() { |
|
| 138 | 138 | $real_maintenance_mode_level = $this->real_level(); |
| 139 | 139 | //if this is an admin request, we'll be honest... except if it's ajax, because that might be from the frontend |
| 140 | - if( ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) && //only on frontend or ajax requests |
|
| 140 | + if (( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) && //only on frontend or ajax requests |
|
| 141 | 141 | current_user_can('administrator') && //when the user is an admin |
| 142 | - $real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance){//and we're in level 1 |
|
| 142 | + $real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance) {//and we're in level 1 |
|
| 143 | 143 | $maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance; |
| 144 | - }else{ |
|
| 144 | + } else { |
|
| 145 | 145 | $maintenance_mode_level = $real_maintenance_mode_level; |
| 146 | 146 | } |
| 147 | 147 | return $maintenance_mode_level; |
@@ -151,17 +151,17 @@ discard block |
||
| 151 | 151 | * Determines if we need to put EE in maintenance mode because the database needs updating |
| 152 | 152 | * @return boolean true if DB is old and maintenance mode was triggered; false otherwise |
| 153 | 153 | */ |
| 154 | - public function set_maintenance_mode_if_db_old(){ |
|
| 155 | - EE_Registry::instance()->load_core( 'Data_Migration_Manager' ); |
|
| 156 | - if( EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){ |
|
| 154 | + public function set_maintenance_mode_if_db_old() { |
|
| 155 | + EE_Registry::instance()->load_core('Data_Migration_Manager'); |
|
| 156 | + if (EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) { |
|
| 157 | 157 | update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance); |
| 158 | 158 | return true; |
| 159 | - }elseif( $this->level() == self::level_2_complete_maintenance ){ |
|
| 159 | + }elseif ($this->level() == self::level_2_complete_maintenance) { |
|
| 160 | 160 | //we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run |
| 161 | 161 | //then we shouldn't be in mm2. (Maybe an addon got deactivated?) |
| 162 | - update_option( self::option_name_maintenance_mode, self::level_0_not_in_maintenance ); |
|
| 162 | + update_option(self::option_name_maintenance_mode, self::level_0_not_in_maintenance); |
|
| 163 | 163 | return false; |
| 164 | - }else{ |
|
| 164 | + } else { |
|
| 165 | 165 | return false; |
| 166 | 166 | } |
| 167 | 167 | } |
@@ -171,8 +171,8 @@ discard block |
||
| 171 | 171 | * @param int $level |
| 172 | 172 | * @return void |
| 173 | 173 | */ |
| 174 | - public function set_maintenance_level($level){ |
|
| 175 | - do_action( 'AHEE__EE_Maintenance_Mode__set_maintenance_level', $level ); |
|
| 174 | + public function set_maintenance_level($level) { |
|
| 175 | + do_action('AHEE__EE_Maintenance_Mode__set_maintenance_level', $level); |
|
| 176 | 176 | update_option(self::option_name_maintenance_mode, intval($level)); |
| 177 | 177 | } |
| 178 | 178 | |
@@ -199,11 +199,11 @@ discard block |
||
| 199 | 199 | * @return string |
| 200 | 200 | */ |
| 201 | 201 | public function load_assets_required_for_m_mode() { |
| 202 | - if ( $this->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance && ! wp_script_is( 'espresso_core', 'enqueued' )) { |
|
| 203 | - wp_register_style( 'espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION ); |
|
| 202 | + if ($this->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance && ! wp_script_is('espresso_core', 'enqueued')) { |
|
| 203 | + wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION); |
|
| 204 | 204 | wp_enqueue_style('espresso_default'); |
| 205 | - wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
| 206 | - wp_enqueue_script( 'espresso_core' ); |
|
| 205 | + wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
| 206 | + wp_enqueue_script('espresso_core'); |
|
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | 209 | |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | */ |
| 222 | 222 | public static function template_include() { |
| 223 | 223 | // shut 'er down down for maintenance ? then don't use any of our templates for our endpoints |
| 224 | - return get_template_directory() . '/index.php'; |
|
| 224 | + return get_template_directory().'/index.php'; |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | |
@@ -235,12 +235,12 @@ discard block |
||
| 235 | 235 | * @param string $the_content |
| 236 | 236 | * @return string |
| 237 | 237 | */ |
| 238 | - public function the_content( $the_content ) { |
|
| 238 | + public function the_content($the_content) { |
|
| 239 | 239 | // check if M-mode is engaged and for EE shortcode |
| 240 | - if ( $this->level() && strpos( $the_content, '[ESPRESSO_' ) !== false ) { |
|
| 240 | + if ($this->level() && strpos($the_content, '[ESPRESSO_') !== false) { |
|
| 241 | 241 | // this can eventually be moved to a template, or edited via admin. But for now... |
| 242 | 242 | $the_content = sprintf( |
| 243 | - __( '%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s', 'event_espresso' ), |
|
| 243 | + __('%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s', 'event_espresso'), |
|
| 244 | 244 | '<h3>', |
| 245 | 245 | '</h3><p>', |
| 246 | 246 | '</p>' |
@@ -264,16 +264,16 @@ discard block |
||
| 264 | 264 | // check if M-mode is engaged and for EE shortcode |
| 265 | 265 | if ( |
| 266 | 266 | $this->real_level() && |
| 267 | - current_user_can( 'administrator' ) && |
|
| 267 | + current_user_can('administrator') && |
|
| 268 | 268 | ! is_admin() && |
| 269 | - ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) |
|
| 269 | + ! (defined('DOING_AJAX') && DOING_AJAX) |
|
| 270 | 270 | && EE_Registry::instance()->REQ->is_espresso_page() |
| 271 | 271 | ) { |
| 272 | 272 | printf( |
| 273 | - __( '%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s', 'event_espresso' ), |
|
| 273 | + __('%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s', 'event_espresso'), |
|
| 274 | 274 | '<div id="ee-m-mode-admin-notice-dv" class="ee-really-important-notice-dv"><a class="close-espresso-notice" title="', |
| 275 | 275 | '"><span class="dashicons dashicons-no"></span></a><p>', |
| 276 | - ' » <a href="' . add_query_arg( array( 'page' => 'espresso_maintenance_settings' ), admin_url( 'admin.php' )) . '">', |
|
| 276 | + ' » <a href="'.add_query_arg(array('page' => 'espresso_maintenance_settings'), admin_url('admin.php')).'">', |
|
| 277 | 277 | '</a></p></div>' |
| 278 | 278 | ); |
| 279 | 279 | } |
@@ -291,9 +291,9 @@ discard block |
||
| 291 | 291 | * @ return void |
| 292 | 292 | */ |
| 293 | 293 | final function __destruct() {} |
| 294 | - final function __call($a,$b) {} |
|
| 294 | + final function __call($a, $b) {} |
|
| 295 | 295 | final function __get($a) {} |
| 296 | - final function __set($a,$b) {} |
|
| 296 | + final function __set($a, $b) {} |
|
| 297 | 297 | final function __isset($a) {} |
| 298 | 298 | final function __unset($a) {} |
| 299 | 299 | final function __sleep() { |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | final function __invoke() {} |
| 305 | 305 | final static function __set_state() {} |
| 306 | 306 | final function __clone() {} |
| 307 | - final static function __callStatic($a,$b) {} |
|
| 307 | + final static function __callStatic($a, $b) {} |
|
| 308 | 308 | |
| 309 | 309 | } |
| 310 | 310 | // End of file EE_Maintenance_Mode.core.php |
@@ -109,7 +109,7 @@ |
||
| 109 | 109 | * - registers and enqueues the qtip scripts and styles. |
| 110 | 110 | * |
| 111 | 111 | * @access public |
| 112 | - * @param array $paths Array of paths to check for the EE_Qtip class. If present we check these path(s) first. If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded. |
|
| 112 | + * @param string[] $paths Array of paths to check for the EE_Qtip class. If present we check these path(s) first. If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded. |
|
| 113 | 113 | * @param string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips] |
| 114 | 114 | * @return void |
| 115 | 115 | */ |
@@ -81,8 +81,9 @@ discard block |
||
| 81 | 81 | foreach ( $this->_qtips as $qtip ) { |
| 82 | 82 | $qts = $qtip->get_tips(); |
| 83 | 83 | foreach ( $qts as $qt ) { |
| 84 | - if ( ! $qt instanceof EE_Qtip ) |
|
| 85 | - continue; |
|
| 84 | + if ( ! $qt instanceof EE_Qtip ) { |
|
| 85 | + continue; |
|
| 86 | + } |
|
| 86 | 87 | $qtips[] = array( |
| 87 | 88 | 'content_id' => $qt->content_id, |
| 88 | 89 | 'options' => $qt->options, |
@@ -90,8 +91,9 @@ discard block |
||
| 90 | 91 | ); |
| 91 | 92 | } |
| 92 | 93 | } |
| 93 | - if ( !empty($qtips) ) |
|
| 94 | - wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) ); |
|
| 94 | + if ( !empty($qtips) ) { |
|
| 95 | + wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) ); |
|
| 96 | + } |
|
| 95 | 97 | |
| 96 | 98 | } else { |
| 97 | 99 | //qtips has been requested without any registration (so assuming its just directly used in the admin). |
@@ -171,16 +173,18 @@ discard block |
||
| 171 | 173 | } |
| 172 | 174 | |
| 173 | 175 | //now we attempt a class_exists one more time. |
| 174 | - if ( !class_exists( $config ) ) |
|
| 175 | - throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) ); |
|
| 176 | + if ( !class_exists( $config ) ) { |
|
| 177 | + throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) ); |
|
| 178 | + } |
|
| 176 | 179 | |
| 177 | 180 | //made it HERE? FINALLY, let's get things setup. |
| 178 | 181 | $a = new ReflectionClass($config); |
| 179 | 182 | $qtip = $a->newInstance(); |
| 180 | 183 | |
| 181 | 184 | //verify that $qtip is a valid object |
| 182 | - if ( ! $qtip instanceof EE_Qtip_Config ) |
|
| 183 | - throw new EE_Error( sprintf( esc_html__( 'The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>' ) ); |
|
| 185 | + if ( ! $qtip instanceof EE_Qtip_Config ) { |
|
| 186 | + throw new EE_Error( sprintf( esc_html__( 'The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>' ) ); |
|
| 187 | + } |
|
| 184 | 188 | |
| 185 | 189 | $this->_qtips[] = $a->newInstance(); |
| 186 | 190 | |
@@ -196,8 +200,10 @@ discard block |
||
| 196 | 200 | * @return void |
| 197 | 201 | */ |
| 198 | 202 | public function setup_qtip() { |
| 199 | - if ( empty( $this->_qtips ) ) |
|
| 200 | - return; //no qtips! |
|
| 203 | + if ( empty( $this->_qtips ) ) { |
|
| 204 | + return; |
|
| 205 | + } |
|
| 206 | + //no qtips! |
|
| 201 | 207 | |
| 202 | 208 | $content = array(); |
| 203 | 209 | |
@@ -219,8 +225,9 @@ discard block |
||
| 219 | 225 | $qts = $qtip->get_tips(); |
| 220 | 226 | $content = array(); |
| 221 | 227 | foreach ( $qts as $qt ) { |
| 222 | - if ( ! $qt instanceof EE_Qtip ) |
|
| 223 | - continue; |
|
| 228 | + if ( ! $qt instanceof EE_Qtip ) { |
|
| 229 | + continue; |
|
| 230 | + } |
|
| 224 | 231 | $content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>'; |
| 225 | 232 | } |
| 226 | 233 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | public static function instance() { |
| 34 | 34 | // check if class object is instantiated |
| 35 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EEH_Qtip_Loader )) { |
|
| 35 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EEH_Qtip_Loader)) { |
|
| 36 | 36 | self::$_instance = new self(); |
| 37 | 37 | } |
| 38 | 38 | return self::$_instance; |
@@ -48,8 +48,8 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | private function __construct() { |
| 50 | 50 | //let's just make sure this is instantiated in the right place. |
| 51 | - if ( did_action( 'wp_print_styles' ) || did_action( 'admin_head' )) { |
|
| 52 | - EE_Error::doing_it_wrong( 'EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso' ), '4.1' ); |
|
| 51 | + if (did_action('wp_print_styles') || did_action('admin_head')) { |
|
| 52 | + EE_Error::doing_it_wrong('EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso'), '4.1'); |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
@@ -61,27 +61,27 @@ discard block |
||
| 61 | 61 | * @return void |
| 62 | 62 | */ |
| 63 | 63 | public function register_and_enqueue() { |
| 64 | - $qtips_js = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.js'; |
|
| 65 | - $qtip_images_loaded = EE_THIRD_PARTY_URL . 'qtip/imagesloaded.pkg.min.js'; |
|
| 66 | - $qtip_map = EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.map'; |
|
| 67 | - $qtipcss = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.css'; |
|
| 64 | + $qtips_js = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.js'; |
|
| 65 | + $qtip_images_loaded = EE_THIRD_PARTY_URL.'qtip/imagesloaded.pkg.min.js'; |
|
| 66 | + $qtip_map = EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.map'; |
|
| 67 | + $qtipcss = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.css'; |
|
| 68 | 68 | |
| 69 | - wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE ); |
|
| 70 | - wp_register_script('qtip-images-loaded', $qtip_images_loaded, array(), '2.2.0', TRUE ); |
|
| 71 | - wp_register_script('qtip', $qtips_js, array('jquery'), '2.2.0', TRUE ); |
|
| 72 | - wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS . 'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
| 69 | + wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE); |
|
| 70 | + wp_register_script('qtip-images-loaded', $qtip_images_loaded, array(), '2.2.0', TRUE); |
|
| 71 | + wp_register_script('qtip', $qtips_js, array('jquery'), '2.2.0', TRUE); |
|
| 72 | + wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS.'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE); |
|
| 73 | 73 | |
| 74 | - wp_register_style('qtip-css', $qtipcss, array(), '2.2' ); |
|
| 74 | + wp_register_style('qtip-css', $qtipcss, array(), '2.2'); |
|
| 75 | 75 | |
| 76 | 76 | //k now let's see if there are any registered qtips. If there are, then we need to setup the localized script for ee-qtip-helper.js (and enqueue ee-qtip-helper.js of course!) |
| 77 | - if ( !empty( $this->_qtips ) ) { |
|
| 77 | + if ( ! empty($this->_qtips)) { |
|
| 78 | 78 | wp_enqueue_script('ee-qtip-helper'); |
| 79 | 79 | wp_enqueue_style('qtip-css'); |
| 80 | 80 | $qtips = array(); |
| 81 | - foreach ( $this->_qtips as $qtip ) { |
|
| 81 | + foreach ($this->_qtips as $qtip) { |
|
| 82 | 82 | $qts = $qtip->get_tips(); |
| 83 | - foreach ( $qts as $qt ) { |
|
| 84 | - if ( ! $qt instanceof EE_Qtip ) |
|
| 83 | + foreach ($qts as $qt) { |
|
| 84 | + if ( ! $qt instanceof EE_Qtip) |
|
| 85 | 85 | continue; |
| 86 | 86 | $qtips[] = array( |
| 87 | 87 | 'content_id' => $qt->content_id, |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | ); |
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | - if ( !empty($qtips) ) |
|
| 94 | - wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) ); |
|
| 93 | + if ( ! empty($qtips)) |
|
| 94 | + wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array('qtips' => $qtips)); |
|
| 95 | 95 | |
| 96 | 96 | } else { |
| 97 | 97 | //qtips has been requested without any registration (so assuming its just directly used in the admin). |
@@ -113,24 +113,24 @@ discard block |
||
| 113 | 113 | * @param string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips] |
| 114 | 114 | * @return void |
| 115 | 115 | */ |
| 116 | - public function register( $configname, $paths = array() ) { |
|
| 116 | + public function register($configname, $paths = array()) { |
|
| 117 | 117 | |
| 118 | 118 | //let's just make sure this is instantiated in the right place. |
| 119 | - if ( did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts') ) { |
|
| 120 | - EE_Error::doing_it_wrong( 'EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso' ), '4.1' ); |
|
| 119 | + if (did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts')) { |
|
| 120 | + EE_Error::doing_it_wrong('EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso'), '4.1'); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | $configname = (array) $configname; //typecast to array |
| 124 | - foreach ( $configname as $config ) { |
|
| 125 | - $this->_register( $config, $paths ); |
|
| 124 | + foreach ($configname as $config) { |
|
| 125 | + $this->_register($config, $paths); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | //hook into appropriate footer |
| 129 | 129 | $footer_action = is_admin() ? 'admin_footer' : 'wp_footer'; |
| 130 | - add_action($footer_action, array($this, 'setup_qtip'), 10 ); |
|
| 130 | + add_action($footer_action, array($this, 'setup_qtip'), 10); |
|
| 131 | 131 | |
| 132 | 132 | //make sure we "turn on" qtip js. |
| 133 | - add_filter('FHEE_load_qtip', '__return_true' ); |
|
| 133 | + add_filter('FHEE_load_qtip', '__return_true'); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
@@ -144,15 +144,15 @@ discard block |
||
| 144 | 144 | * @throws EE_Error |
| 145 | 145 | * @return void |
| 146 | 146 | */ |
| 147 | - private function _register( $config, $paths ) { |
|
| 147 | + private function _register($config, $paths) { |
|
| 148 | 148 | //before doing anything we have to make sure that EE_Qtip_Config parent is required. |
| 149 | - EE_Registry::instance()->load_lib( 'Qtip_Config', array(), TRUE ); |
|
| 149 | + EE_Registry::instance()->load_lib('Qtip_Config', array(), TRUE); |
|
| 150 | 150 | |
| 151 | - if ( !empty( $paths ) ) { |
|
| 151 | + if ( ! empty($paths)) { |
|
| 152 | 152 | $paths = (array) $paths; |
| 153 | - foreach ( $paths as $path ) { |
|
| 154 | - $path = $path . $config . '.lib.php'; |
|
| 155 | - if ( !is_readable($path ) ) { |
|
| 153 | + foreach ($paths as $path) { |
|
| 154 | + $path = $path.$config.'.lib.php'; |
|
| 155 | + if ( ! is_readable($path)) { |
|
| 156 | 156 | continue; |
| 157 | 157 | } else { |
| 158 | 158 | require_once $path; |
@@ -161,26 +161,26 @@ discard block |
||
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | //does class exist at this point? If it does then let's instantiate. If it doesn't then let's continue with other paths. |
| 164 | - if ( !class_exists($config) ) { |
|
| 165 | - $path = EE_LIBRARIES . 'qtips/' . $config . '.lib.php'; |
|
| 166 | - if ( !is_readable($path ) ) { |
|
| 167 | - throw new EE_Error( sprintf( __('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable. Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config ) ); |
|
| 164 | + if ( ! class_exists($config)) { |
|
| 165 | + $path = EE_LIBRARIES.'qtips/'.$config.'.lib.php'; |
|
| 166 | + if ( ! is_readable($path)) { |
|
| 167 | + throw new EE_Error(sprintf(__('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable. Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config)); |
|
| 168 | 168 | } else { |
| 169 | 169 | require_once $path; |
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | //now we attempt a class_exists one more time. |
| 174 | - if ( !class_exists( $config ) ) |
|
| 175 | - throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) ); |
|
| 174 | + if ( ! class_exists($config)) |
|
| 175 | + throw new EE_Error(sprintf(__('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config)); |
|
| 176 | 176 | |
| 177 | 177 | //made it HERE? FINALLY, let's get things setup. |
| 178 | 178 | $a = new ReflectionClass($config); |
| 179 | 179 | $qtip = $a->newInstance(); |
| 180 | 180 | |
| 181 | 181 | //verify that $qtip is a valid object |
| 182 | - if ( ! $qtip instanceof EE_Qtip_Config ) |
|
| 183 | - throw new EE_Error( sprintf( esc_html__( 'The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>' ) ); |
|
| 182 | + if ( ! $qtip instanceof EE_Qtip_Config) |
|
| 183 | + throw new EE_Error(sprintf(esc_html__('The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>')); |
|
| 184 | 184 | |
| 185 | 185 | $this->_qtips[] = $a->newInstance(); |
| 186 | 186 | |
@@ -196,12 +196,12 @@ discard block |
||
| 196 | 196 | * @return void |
| 197 | 197 | */ |
| 198 | 198 | public function setup_qtip() { |
| 199 | - if ( empty( $this->_qtips ) ) |
|
| 199 | + if (empty($this->_qtips)) |
|
| 200 | 200 | return; //no qtips! |
| 201 | 201 | |
| 202 | 202 | $content = array(); |
| 203 | 203 | |
| 204 | - foreach ( $this->_qtips as $qtip ) { |
|
| 204 | + foreach ($this->_qtips as $qtip) { |
|
| 205 | 205 | $content[] = $this->_generate_content_container($qtip); |
| 206 | 206 | } |
| 207 | 207 | |
@@ -218,10 +218,10 @@ discard block |
||
| 218 | 218 | private function _generate_content_container($qtip) { |
| 219 | 219 | $qts = $qtip->get_tips(); |
| 220 | 220 | $content = array(); |
| 221 | - foreach ( $qts as $qt ) { |
|
| 222 | - if ( ! $qt instanceof EE_Qtip ) |
|
| 221 | + foreach ($qts as $qt) { |
|
| 222 | + if ( ! $qt instanceof EE_Qtip) |
|
| 223 | 223 | continue; |
| 224 | - $content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>'; |
|
| 224 | + $content[] = '<div class="ee-qtip-helper-content hidden" id="'.$qt->content_id.'">'.$qt->content.'</div>'; |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | return implode('<br />', $content); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | /** |
| 132 | 132 | * For verifying that a variable is indeed an array, else throw an EE_Error |
| 133 | 133 | * @param type $variable_to_test |
| 134 | - * @param type $variable_name |
|
| 134 | + * @param string $variable_name |
|
| 135 | 135 | * @param type $allow_empty one of 'allow_empty' or 'do_not_allow_empty' |
| 136 | 136 | * @return void |
| 137 | 137 | * @throws EE_Error |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * for verifying that a variable is one of the string optiosn supplied |
| 160 | 160 | * @param mixed $variable_to_test |
| 161 | 161 | * @param mixed $variable_name the name you've given the variable. Eg, '$foo'. THis helps in producing better error messages |
| 162 | - * @param array $string_options an array of acceptable values |
|
| 162 | + * @param string[] $string_options an array of acceptable values |
|
| 163 | 163 | * @return void |
| 164 | 164 | * @throws EE_Error |
| 165 | 165 | */ |
@@ -50,14 +50,14 @@ discard block |
||
| 50 | 50 | * @return void |
| 51 | 51 | * @throws EE_Error (indirectly) |
| 52 | 52 | */ |
| 53 | - static function verify_is_array_of($variable_to_test,$name_of_variable,$class_name,$allow_null='allow_null'){ |
|
| 54 | - if(!WP_DEBUG)return; |
|
| 55 | - self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null')); |
|
| 56 | - if('allow_null' == $allow_null && is_null($variable_to_test)){ |
|
| 53 | + static function verify_is_array_of($variable_to_test, $name_of_variable, $class_name, $allow_null = 'allow_null') { |
|
| 54 | + if ( ! WP_DEBUG)return; |
|
| 55 | + self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null', 'do_not_allow_null')); |
|
| 56 | + if ('allow_null' == $allow_null && is_null($variable_to_test)) { |
|
| 57 | 57 | return; |
| 58 | 58 | } |
| 59 | 59 | self::verify_is_array($variable_to_test, $name_of_variable); |
| 60 | - foreach($variable_to_test as $key=>$array_element){ |
|
| 60 | + foreach ($variable_to_test as $key=>$array_element) { |
|
| 61 | 61 | self::verify_instanceof($array_element, $key, $class_name); |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -73,12 +73,12 @@ discard block |
||
| 73 | 73 | * @return void |
| 74 | 74 | * @throws EE_Error |
| 75 | 75 | */ |
| 76 | - static function verify_isnt_null($variable_to_test,$name_of_variable){ |
|
| 77 | - if(!WP_DEBUG)return; |
|
| 78 | - if($variable_to_test==null && $variable_to_test!=0 && $variable_to_test!=FALSE){ |
|
| 79 | - $error[]=__('Variable named %s is null.','event_espresso'); |
|
| 80 | - $error[]=__("Consider looking at the stack trace to see why it wasn't set.",'event_espresso'); |
|
| 81 | - throw new EE_Error(sprintf(implode(",",$error),$name_of_variable,$name_of_variable)); |
|
| 76 | + static function verify_isnt_null($variable_to_test, $name_of_variable) { |
|
| 77 | + if ( ! WP_DEBUG)return; |
|
| 78 | + if ($variable_to_test == null && $variable_to_test != 0 && $variable_to_test != FALSE) { |
|
| 79 | + $error[] = __('Variable named %s is null.', 'event_espresso'); |
|
| 80 | + $error[] = __("Consider looking at the stack trace to see why it wasn't set.", 'event_espresso'); |
|
| 81 | + throw new EE_Error(sprintf(implode(",", $error), $name_of_variable, $name_of_variable)); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | |
@@ -90,12 +90,12 @@ discard block |
||
| 90 | 90 | * @return void |
| 91 | 91 | * @throws EE_Error |
| 92 | 92 | */ |
| 93 | - static function verify_is_true($expression_to_test,$expression_string_representation){ |
|
| 94 | - if(!WP_DEBUG)return; |
|
| 95 | - if(!$expression_to_test){ |
|
| 96 | - $error[]=__('Template error.','event_espresso'); |
|
| 97 | - $error[]=__("%s evaluated to false, but it must be true!",'event_espresso'); |
|
| 98 | - throw new EE_Error(sprintf(implode(",",$error),$expression_string_representation)); |
|
| 93 | + static function verify_is_true($expression_to_test, $expression_string_representation) { |
|
| 94 | + if ( ! WP_DEBUG)return; |
|
| 95 | + if ( ! $expression_to_test) { |
|
| 96 | + $error[] = __('Template error.', 'event_espresso'); |
|
| 97 | + $error[] = __("%s evaluated to false, but it must be true!", 'event_espresso'); |
|
| 98 | + throw new EE_Error(sprintf(implode(",", $error), $expression_string_representation)); |
|
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | |
@@ -111,16 +111,16 @@ discard block |
||
| 111 | 111 | * @return void |
| 112 | 112 | * @throws EE_Error |
| 113 | 113 | */ |
| 114 | - static function verify_instanceof($variable_to_test,$name_of_variable,$class_name, $allow_null = 'do_not_allow_null'){ |
|
| 115 | - if(!WP_DEBUG)return; |
|
| 116 | - self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null')); |
|
| 117 | - if($allow_null == 'allow_null' && is_null($variable_to_test)){ |
|
| 114 | + static function verify_instanceof($variable_to_test, $name_of_variable, $class_name, $allow_null = 'do_not_allow_null') { |
|
| 115 | + if ( ! WP_DEBUG)return; |
|
| 116 | + self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null', 'do_not_allow_null')); |
|
| 117 | + if ($allow_null == 'allow_null' && is_null($variable_to_test)) { |
|
| 118 | 118 | return; |
| 119 | 119 | } |
| 120 | - if( $variable_to_test == NULL || ! ( $variable_to_test instanceof $class_name )){ |
|
| 121 | - $msg[]=__('Variable %s is not of the correct type.','event_espresso'); |
|
| 122 | - $msg[]=__("It should be of type %s",'event_espresso'); |
|
| 123 | - throw new EE_Error(sprintf(implode(",",$msg),$name_of_variable,$name_of_variable,$class_name)); |
|
| 120 | + if ($variable_to_test == NULL || ! ($variable_to_test instanceof $class_name)) { |
|
| 121 | + $msg[] = __('Variable %s is not of the correct type.', 'event_espresso'); |
|
| 122 | + $msg[] = __("It should be of type %s", 'event_espresso'); |
|
| 123 | + throw new EE_Error(sprintf(implode(",", $msg), $name_of_variable, $name_of_variable, $class_name)); |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | |
@@ -136,16 +136,16 @@ discard block |
||
| 136 | 136 | * @return void |
| 137 | 137 | * @throws EE_Error |
| 138 | 138 | */ |
| 139 | - static function verify_is_array($variable_to_test,$variable_name,$allow_empty='allow_empty'){ |
|
| 140 | - if(!WP_DEBUG)return; |
|
| 141 | - self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty','do_not_allow_empty')); |
|
| 142 | - if(empty($variable_to_test) && 'allow_empty'==$allow_empty){ |
|
| 139 | + static function verify_is_array($variable_to_test, $variable_name, $allow_empty = 'allow_empty') { |
|
| 140 | + if ( ! WP_DEBUG)return; |
|
| 141 | + self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty', 'do_not_allow_empty')); |
|
| 142 | + if (empty($variable_to_test) && 'allow_empty' == $allow_empty) { |
|
| 143 | 143 | return; |
| 144 | 144 | } |
| 145 | - if(!is_array($variable_to_test)){ |
|
| 146 | - $error[]=__('Variable %s should be an array, but it is not.'); |
|
| 147 | - $error[]=__("Its value is, instead '%s'",'event_espresso'); |
|
| 148 | - throw new EE_Error(sprintf(implode(",",$error),$variable_name,$variable_name,$variable_to_test)); |
|
| 145 | + if ( ! is_array($variable_to_test)) { |
|
| 146 | + $error[] = __('Variable %s should be an array, but it is not.'); |
|
| 147 | + $error[] = __("Its value is, instead '%s'", 'event_espresso'); |
|
| 148 | + throw new EE_Error(sprintf(implode(",", $error), $variable_name, $variable_name, $variable_to_test)); |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
@@ -163,12 +163,12 @@ discard block |
||
| 163 | 163 | * @return void |
| 164 | 164 | * @throws EE_Error |
| 165 | 165 | */ |
| 166 | - static function verify_argument_is_one_of($variable_to_test,$variable_name,$string_options){ |
|
| 167 | - if(!WP_DEBUG)return; |
|
| 168 | - if(!in_array($variable_to_test,$string_options)){ |
|
| 169 | - $msg[0]=__('Malconfigured template.','event_espresso'); |
|
| 170 | - $msg[1]=__("Variable named '%s' was set to '%s'. It can only be one of '%s'",'event_espresso'); |
|
| 171 | - throw new EE_Error(sprintf(implode("||",$msg),$variable_name,$variable_to_test, implode("', '",$string_options))); |
|
| 166 | + static function verify_argument_is_one_of($variable_to_test, $variable_name, $string_options) { |
|
| 167 | + if ( ! WP_DEBUG)return; |
|
| 168 | + if ( ! in_array($variable_to_test, $string_options)) { |
|
| 169 | + $msg[0] = __('Malconfigured template.', 'event_espresso'); |
|
| 170 | + $msg[1] = __("Variable named '%s' was set to '%s'. It can only be one of '%s'", 'event_espresso'); |
|
| 171 | + throw new EE_Error(sprintf(implode("||", $msg), $variable_name, $variable_to_test, implode("', '", $string_options))); |
|
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | |
@@ -1,4 +1,6 @@ discard block |
||
| 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 | /** |
| 4 | 6 | * Event Espresso |
@@ -51,7 +53,9 @@ discard block |
||
| 51 | 53 | * @throws EE_Error (indirectly) |
| 52 | 54 | */ |
| 53 | 55 | static function verify_is_array_of($variable_to_test,$name_of_variable,$class_name,$allow_null='allow_null'){ |
| 54 | - if(!WP_DEBUG)return; |
|
| 56 | + if(!WP_DEBUG) { |
|
| 57 | + return; |
|
| 58 | + } |
|
| 55 | 59 | self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null')); |
| 56 | 60 | if('allow_null' == $allow_null && is_null($variable_to_test)){ |
| 57 | 61 | return; |
@@ -74,7 +78,9 @@ discard block |
||
| 74 | 78 | * @throws EE_Error |
| 75 | 79 | */ |
| 76 | 80 | static function verify_isnt_null($variable_to_test,$name_of_variable){ |
| 77 | - if(!WP_DEBUG)return; |
|
| 81 | + if(!WP_DEBUG) { |
|
| 82 | + return; |
|
| 83 | + } |
|
| 78 | 84 | if($variable_to_test==null && $variable_to_test!=0 && $variable_to_test!=FALSE){ |
| 79 | 85 | $error[]=__('Variable named %s is null.','event_espresso'); |
| 80 | 86 | $error[]=__("Consider looking at the stack trace to see why it wasn't set.",'event_espresso'); |
@@ -91,7 +97,9 @@ discard block |
||
| 91 | 97 | * @throws EE_Error |
| 92 | 98 | */ |
| 93 | 99 | static function verify_is_true($expression_to_test,$expression_string_representation){ |
| 94 | - if(!WP_DEBUG)return; |
|
| 100 | + if(!WP_DEBUG) { |
|
| 101 | + return; |
|
| 102 | + } |
|
| 95 | 103 | if(!$expression_to_test){ |
| 96 | 104 | $error[]=__('Template error.','event_espresso'); |
| 97 | 105 | $error[]=__("%s evaluated to false, but it must be true!",'event_espresso'); |
@@ -112,7 +120,9 @@ discard block |
||
| 112 | 120 | * @throws EE_Error |
| 113 | 121 | */ |
| 114 | 122 | static function verify_instanceof($variable_to_test,$name_of_variable,$class_name, $allow_null = 'do_not_allow_null'){ |
| 115 | - if(!WP_DEBUG)return; |
|
| 123 | + if(!WP_DEBUG) { |
|
| 124 | + return; |
|
| 125 | + } |
|
| 116 | 126 | self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null')); |
| 117 | 127 | if($allow_null == 'allow_null' && is_null($variable_to_test)){ |
| 118 | 128 | return; |
@@ -137,7 +147,9 @@ discard block |
||
| 137 | 147 | * @throws EE_Error |
| 138 | 148 | */ |
| 139 | 149 | static function verify_is_array($variable_to_test,$variable_name,$allow_empty='allow_empty'){ |
| 140 | - if(!WP_DEBUG)return; |
|
| 150 | + if(!WP_DEBUG) { |
|
| 151 | + return; |
|
| 152 | + } |
|
| 141 | 153 | self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty','do_not_allow_empty')); |
| 142 | 154 | if(empty($variable_to_test) && 'allow_empty'==$allow_empty){ |
| 143 | 155 | return; |
@@ -164,7 +176,9 @@ discard block |
||
| 164 | 176 | * @throws EE_Error |
| 165 | 177 | */ |
| 166 | 178 | static function verify_argument_is_one_of($variable_to_test,$variable_name,$string_options){ |
| 167 | - if(!WP_DEBUG)return; |
|
| 179 | + if(!WP_DEBUG) { |
|
| 180 | + return; |
|
| 181 | + } |
|
| 168 | 182 | if(!in_array($variable_to_test,$string_options)){ |
| 169 | 183 | $msg[0]=__('Malconfigured template.','event_espresso'); |
| 170 | 184 | $msg[1]=__("Variable named '%s' was set to '%s'. It can only be one of '%s'",'event_espresso'); |
@@ -49,7 +49,6 @@ |
||
| 49 | 49 | * Returns whether not the remote file exists. |
| 50 | 50 | * Checking via GET because HEAD requests are blocked on some server configurations. |
| 51 | 51 | * @param string $url |
| 52 | - * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly |
|
| 53 | 52 | * @return boolean |
| 54 | 53 | */ |
| 55 | 54 | public static function remote_file_exists( $url, $args = array() ){ |
@@ -1,4 +1,6 @@ discard block |
||
| 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 | * EEH_URL helper |
| 4 | 6 | * Helper class for URL-related PHP functions |
@@ -62,7 +64,7 @@ discard block |
||
| 62 | 64 | isset($results['response']['code']) && |
| 63 | 65 | $results['response']['code'] == '200'){ |
| 64 | 66 | return true; |
| 65 | - }else{ |
|
| 67 | + } else{ |
|
| 66 | 68 | return false; |
| 67 | 69 | } |
| 68 | 70 | } |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | foreach ( $query as $query_args ) { |
| 140 | 140 | // break apart the key value pairs |
| 141 | 141 | $query_args = explode( '=', $query_args ); |
| 142 | - // and add to our results array |
|
| 142 | + // and add to our results array |
|
| 143 | 143 | $query_params[ $query_args[0] ] = $query_args[1]; |
| 144 | 144 | } |
| 145 | 145 | return $query_params; |
@@ -204,9 +204,9 @@ discard block |
||
| 204 | 204 | $server_variable = strtoupper( $server_variable ); |
| 205 | 205 | // whitelist INPUT_SERVER var |
| 206 | 206 | if ( isset( $server_variables[ $server_variable ] ) ) { |
| 207 | - $URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE ); |
|
| 208 | - if ( empty( $URL ) ) { |
|
| 209 | - // fallback sanitization if the above fails |
|
| 207 | + $URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE ); |
|
| 208 | + if ( empty( $URL ) ) { |
|
| 209 | + // fallback sanitization if the above fails |
|
| 210 | 210 | $URL = wp_sanitize_redirect( $_SERVER[ $server_variable ] ); |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | * |
| 10 | 10 | * ------------------------------------------------------------------------ |
| 11 | 11 | */ |
| 12 | -class EEH_URL{ |
|
| 12 | +class EEH_URL { |
|
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * _add_query_arg |
@@ -21,30 +21,30 @@ discard block |
||
| 21 | 21 | * @param bool $exclude_nonce If true then the nonce will be excluded from the generated url. |
| 22 | 22 | * @return string |
| 23 | 23 | */ |
| 24 | - public static function add_query_args_and_nonce( $args = array(), $url = '', $exclude_nonce = false ) { |
|
| 25 | - if ( empty( $url ) ) { |
|
| 26 | - $user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso' ); |
|
| 27 | - $dev_msg = $user_msg . "\n" . sprintf( |
|
| 28 | - __('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso' ), |
|
| 24 | + public static function add_query_args_and_nonce($args = array(), $url = '', $exclude_nonce = false) { |
|
| 25 | + if (empty($url)) { |
|
| 26 | + $user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso'); |
|
| 27 | + $dev_msg = $user_msg."\n".sprintf( |
|
| 28 | + __('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso'), |
|
| 29 | 29 | __CLASS__ |
| 30 | 30 | ); |
| 31 | - EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 31 | + EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 32 | 32 | } |
| 33 | 33 | // check that an action exists and add nonce |
| 34 | - if ( ! $exclude_nonce ) { |
|
| 35 | - if ( isset( $args['action'] ) && ! empty( $args['action'] ) ) { |
|
| 36 | - $args = array_merge( $args, array( $args['action'] . '_nonce' => wp_create_nonce( $args['action'] . '_nonce' ) ) ); |
|
| 34 | + if ( ! $exclude_nonce) { |
|
| 35 | + if (isset($args['action']) && ! empty($args['action'])) { |
|
| 36 | + $args = array_merge($args, array($args['action'].'_nonce' => wp_create_nonce($args['action'].'_nonce'))); |
|
| 37 | 37 | } else { |
| 38 | - $args = array_merge( $args, array( 'action' => 'default', 'default_nonce' => wp_create_nonce( 'default_nonce' ) ) ); |
|
| 38 | + $args = array_merge($args, array('action' => 'default', 'default_nonce' => wp_create_nonce('default_nonce'))); |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | //finally, let's always add a return address (if present) :) |
| 43 | - $args = ! empty( $_REQUEST['action'] ) && ! isset( $_REQUEST[ 'return' ] ) |
|
| 44 | - ? array_merge( $args, array( 'return' => $_REQUEST['action'] ) ) |
|
| 43 | + $args = ! empty($_REQUEST['action']) && ! isset($_REQUEST['return']) |
|
| 44 | + ? array_merge($args, array('return' => $_REQUEST['action'])) |
|
| 45 | 45 | : $args; |
| 46 | 46 | |
| 47 | - return add_query_arg( $args, $url ); |
|
| 47 | + return add_query_arg($args, $url); |
|
| 48 | 48 | |
| 49 | 49 | } |
| 50 | 50 | |
@@ -57,17 +57,17 @@ discard block |
||
| 57 | 57 | * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly |
| 58 | 58 | * @return boolean |
| 59 | 59 | */ |
| 60 | - public static function remote_file_exists( $url, $args = array() ){ |
|
| 61 | - $results = wp_remote_request($url,array_merge( array( |
|
| 60 | + public static function remote_file_exists($url, $args = array()) { |
|
| 61 | + $results = wp_remote_request($url, array_merge(array( |
|
| 62 | 62 | 'method'=>'GET', |
| 63 | 63 | 'redirection'=>1 |
| 64 | - ), $args ) ); |
|
| 65 | - if( ! $results instanceof WP_Error && |
|
| 64 | + ), $args)); |
|
| 65 | + if ( ! $results instanceof WP_Error && |
|
| 66 | 66 | isset($results['response']) && |
| 67 | 67 | isset($results['response']['code']) && |
| 68 | - $results['response']['code'] == '200'){ |
|
| 68 | + $results['response']['code'] == '200') { |
|
| 69 | 69 | return true; |
| 70 | - }else{ |
|
| 70 | + } else { |
|
| 71 | 71 | return false; |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -83,29 +83,29 @@ discard block |
||
| 83 | 83 | * @param bool $base_url_only - TRUE will only return the scheme and host with no other parameters |
| 84 | 84 | * @return string |
| 85 | 85 | */ |
| 86 | - public static function refactor_url( $url = '', $remove_query = TRUE, $base_url_only = FALSE ) { |
|
| 86 | + public static function refactor_url($url = '', $remove_query = TRUE, $base_url_only = FALSE) { |
|
| 87 | 87 | // break apart incoming URL |
| 88 | - $url_bits = parse_url( $url ); |
|
| 88 | + $url_bits = parse_url($url); |
|
| 89 | 89 | // HTTP or HTTPS ? |
| 90 | - $scheme = isset( $url_bits[ 'scheme' ] ) ? $url_bits[ 'scheme' ] . '://' : 'http://'; |
|
| 90 | + $scheme = isset($url_bits['scheme']) ? $url_bits['scheme'].'://' : 'http://'; |
|
| 91 | 91 | // domain |
| 92 | - $host = isset( $url_bits[ 'host' ] ) ? $url_bits[ 'host' ] : ''; |
|
| 92 | + $host = isset($url_bits['host']) ? $url_bits['host'] : ''; |
|
| 93 | 93 | // if only the base URL is requested, then return that now |
| 94 | - if ( $base_url_only ) { |
|
| 95 | - return $scheme . $host; |
|
| 94 | + if ($base_url_only) { |
|
| 95 | + return $scheme.$host; |
|
| 96 | 96 | } |
| 97 | - $port = isset( $url_bits[ 'port' ] ) ? ':' . $url_bits[ 'port' ] : ''; |
|
| 98 | - $user = isset( $url_bits[ 'user' ] ) ? $url_bits[ 'user' ] : ''; |
|
| 99 | - $pass = isset( $url_bits[ 'pass' ] ) ? ':' . $url_bits[ 'pass' ] : ''; |
|
| 100 | - $pass = ( $user || $pass ) ? $pass . '@' : ''; |
|
| 101 | - $path = isset( $url_bits[ 'path' ] ) ? $url_bits[ 'path' ] : ''; |
|
| 97 | + $port = isset($url_bits['port']) ? ':'.$url_bits['port'] : ''; |
|
| 98 | + $user = isset($url_bits['user']) ? $url_bits['user'] : ''; |
|
| 99 | + $pass = isset($url_bits['pass']) ? ':'.$url_bits['pass'] : ''; |
|
| 100 | + $pass = ($user || $pass) ? $pass.'@' : ''; |
|
| 101 | + $path = isset($url_bits['path']) ? $url_bits['path'] : ''; |
|
| 102 | 102 | // if the query string is not required, then return what we have so far |
| 103 | - if ( $remove_query ) { |
|
| 104 | - return $scheme . $user . $pass . $host . $port . $path; |
|
| 103 | + if ($remove_query) { |
|
| 104 | + return $scheme.$user.$pass.$host.$port.$path; |
|
| 105 | 105 | } |
| 106 | - $query = isset( $url_bits[ 'query' ] ) ? '?' . $url_bits[ 'query' ] : ''; |
|
| 107 | - $fragment = isset( $url_bits[ 'fragment' ] ) ? '#' . $url_bits[ 'fragment' ] : ''; |
|
| 108 | - return $scheme . $user . $pass . $host . $port . $path . $query . $fragment; |
|
| 106 | + $query = isset($url_bits['query']) ? '?'.$url_bits['query'] : ''; |
|
| 107 | + $fragment = isset($url_bits['fragment']) ? '#'.$url_bits['fragment'] : ''; |
|
| 108 | + return $scheme.$user.$pass.$host.$port.$path.$query.$fragment; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | |
@@ -118,29 +118,29 @@ discard block |
||
| 118 | 118 | * @param bool $as_array TRUE (default) will return query params as an array of key value pairs, FALSE will simply return the query string |
| 119 | 119 | * @return string|array |
| 120 | 120 | */ |
| 121 | - public static function get_query_string( $url = '', $as_array = TRUE ) { |
|
| 121 | + public static function get_query_string($url = '', $as_array = TRUE) { |
|
| 122 | 122 | // decode, then break apart incoming URL |
| 123 | - $url_bits = parse_url( html_entity_decode( $url ) ); |
|
| 123 | + $url_bits = parse_url(html_entity_decode($url)); |
|
| 124 | 124 | // grab query string from URL |
| 125 | - $query = isset( $url_bits[ 'query' ] ) ? $url_bits[ 'query' ] : ''; |
|
| 125 | + $query = isset($url_bits['query']) ? $url_bits['query'] : ''; |
|
| 126 | 126 | // if we don't want the query string formatted into an array of key => value pairs, then just return it as is |
| 127 | - if ( ! $as_array ) { |
|
| 127 | + if ( ! $as_array) { |
|
| 128 | 128 | return $query; |
| 129 | 129 | } |
| 130 | 130 | // if no query string exists then just return an empty array now |
| 131 | - if ( empty( $query )) { |
|
| 131 | + if (empty($query)) { |
|
| 132 | 132 | return array(); |
| 133 | 133 | } |
| 134 | 134 | // empty array to hold results |
| 135 | 135 | $query_params = array(); |
| 136 | 136 | // now break apart the query string into separate params |
| 137 | - $query = explode( '&', $query ); |
|
| 137 | + $query = explode('&', $query); |
|
| 138 | 138 | // loop thru our query params |
| 139 | - foreach ( $query as $query_args ) { |
|
| 139 | + foreach ($query as $query_args) { |
|
| 140 | 140 | // break apart the key value pairs |
| 141 | - $query_args = explode( '=', $query_args ); |
|
| 141 | + $query_args = explode('=', $query_args); |
|
| 142 | 142 | // and add to our results array |
| 143 | - $query_params[ $query_args[0] ] = $query_args[1]; |
|
| 143 | + $query_params[$query_args[0]] = $query_args[1]; |
|
| 144 | 144 | } |
| 145 | 145 | return $query_params; |
| 146 | 146 | } |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | * prevent_prefetching |
| 152 | 152 | * @return void |
| 153 | 153 | */ |
| 154 | - public static function prevent_prefetching(){ |
|
| 154 | + public static function prevent_prefetching() { |
|
| 155 | 155 | // prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process |
| 156 | 156 | remove_action('wp_head', 'adjacent_posts_rel_link_wp_head'); |
| 157 | 157 | } |
@@ -166,9 +166,9 @@ discard block |
||
| 166 | 166 | * @param string $prefix Use this to prefix the string with something. |
| 167 | 167 | * @return string |
| 168 | 168 | */ |
| 169 | - public static function generate_unique_token( $prefix = '' ) { |
|
| 170 | - $token = md5( uniqid() . mt_rand() ); |
|
| 171 | - return $prefix ? $prefix . '_' . $token : $token; |
|
| 169 | + public static function generate_unique_token($prefix = '') { |
|
| 170 | + $token = md5(uniqid().mt_rand()); |
|
| 171 | + return $prefix ? $prefix.'_'.$token : $token; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | * add_nocache_headers |
| 178 | 178 | * @return void |
| 179 | 179 | */ |
| 180 | - public static function add_nocache_headers(){ |
|
| 180 | + public static function add_nocache_headers() { |
|
| 181 | 181 | // add no cache headers |
| 182 | 182 | // add_action( 'wp_head' , array( 'EED_Single_Page_Checkout', 'nocache_headers' ), 10 ); |
| 183 | 183 | // plus a little extra for nginx |
@@ -194,20 +194,20 @@ discard block |
||
| 194 | 194 | * @param string $server_variable |
| 195 | 195 | * @return string |
| 196 | 196 | */ |
| 197 | - public static function filter_input_server_url( $server_variable = 'REQUEST_URI' ){ |
|
| 197 | + public static function filter_input_server_url($server_variable = 'REQUEST_URI') { |
|
| 198 | 198 | $URL = ''; |
| 199 | 199 | $server_variables = array( |
| 200 | 200 | 'REQUEST_URI' => 1, |
| 201 | 201 | 'HTTP_HOST' => 1, |
| 202 | 202 | 'PHP_SELF' => 1, |
| 203 | 203 | ); |
| 204 | - $server_variable = strtoupper( $server_variable ); |
|
| 204 | + $server_variable = strtoupper($server_variable); |
|
| 205 | 205 | // whitelist INPUT_SERVER var |
| 206 | - if ( isset( $server_variables[ $server_variable ] ) ) { |
|
| 207 | - $URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE ); |
|
| 208 | - if ( empty( $URL ) ) { |
|
| 206 | + if (isset($server_variables[$server_variable])) { |
|
| 207 | + $URL = filter_input(INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE); |
|
| 208 | + if (empty($URL)) { |
|
| 209 | 209 | // fallback sanitization if the above fails |
| 210 | - $URL = wp_sanitize_redirect( $_SERVER[ $server_variable ] ); |
|
| 210 | + $URL = wp_sanitize_redirect($_SERVER[$server_variable]); |
|
| 211 | 211 | } |
| 212 | 212 | } |
| 213 | 213 | return $URL; |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | * @return string |
| 221 | 221 | */ |
| 222 | 222 | public static function current_url() { |
| 223 | - if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) { |
|
| 223 | + if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) { |
|
| 224 | 224 | $url = is_ssl() ? 'https://' : 'http://'; |
| 225 | - $url .= \EEH_URL::filter_input_server_url( 'HTTP_HOST' ); |
|
| 226 | - $url .= \EEH_URL::filter_input_server_url( 'REQUEST_URI' ); |
|
| 225 | + $url .= \EEH_URL::filter_input_server_url('HTTP_HOST'); |
|
| 226 | + $url .= \EEH_URL::filter_input_server_url('REQUEST_URI'); |
|
| 227 | 227 | } else { |
| 228 | 228 | $url = 'unknown'; |
| 229 | 229 | } |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | /** |
| 26 | 26 | * |
| 27 | 27 | * @param $normalized_value |
| 28 | - * @return bool |
|
| 28 | + * @return boolean|null |
|
| 29 | 29 | */ |
| 30 | 30 | function validate($normalized_value) { |
| 31 | 31 | //errors should have been detected by the normalization strategy |
@@ -8,16 +8,16 @@ discard block |
||
| 8 | 8 | * @since 4.6 |
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | -class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
| 11 | +class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * @param null $validation_error_message |
| 15 | 15 | */ |
| 16 | - public function __construct( $validation_error_message = NULL ) { |
|
| 17 | - if( ! $validation_error_message ){ |
|
| 16 | + public function __construct($validation_error_message = NULL) { |
|
| 17 | + if ( ! $validation_error_message) { |
|
| 18 | 18 | $validation_error_message = sprintf(__("Only numeric characters, commas, periods, and spaces, please!", "event_espresso")); |
| 19 | 19 | } |
| 20 | - parent::__construct( $validation_error_message ); |
|
| 20 | + parent::__construct($validation_error_message); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | |
@@ -36,8 +36,8 @@ discard block |
||
| 36 | 36 | /** |
| 37 | 37 | * @return array |
| 38 | 38 | */ |
| 39 | - function get_jquery_validation_rule_array(){ |
|
| 40 | - return array('number'=>true, 'messages' => array( 'number' => $this->get_validation_error_message() ) ); |
|
| 39 | + function get_jquery_validation_rule_array() { |
|
| 40 | + return array('number'=>true, 'messages' => array('number' => $this->get_validation_error_message())); |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | /** |
| 28 | 28 | * Applies all teh individual item validation strategies on each item in the array |
| 29 | 29 | * @param array $normalized_value |
| 30 | - * @return boolean |
|
| 30 | + * @return boolean|null |
|
| 31 | 31 | */ |
| 32 | 32 | function validate($normalized_value) { |
| 33 | 33 | if( is_array($normalized_value)){ |
@@ -11,14 +11,14 @@ discard block |
||
| 11 | 11 | * @since 4.6 |
| 12 | 12 | * |
| 13 | 13 | */ |
| 14 | -class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
| 14 | +class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
| 15 | 15 | protected $_individual_item_validation_strategies = array(); |
| 16 | 16 | /** |
| 17 | 17 | * |
| 18 | 18 | * @param EE_Validation_Strategy_Base[] $individual_item_validation_strategies (or a single EE_Validation_Strategy_Base) |
| 19 | 19 | */ |
| 20 | 20 | public function __construct($individual_item_validation_strategies) { |
| 21 | - if( ! is_array($individual_item_validation_strategies)){ |
|
| 21 | + if ( ! is_array($individual_item_validation_strategies)) { |
|
| 22 | 22 | $individual_item_validation_strategies = array($individual_item_validation_strategies); |
| 23 | 23 | } |
| 24 | 24 | $this->_individual_item_validation_strategies = $individual_item_validation_strategies; |
@@ -30,14 +30,14 @@ discard block |
||
| 30 | 30 | * @return boolean |
| 31 | 31 | */ |
| 32 | 32 | function validate($normalized_value) { |
| 33 | - if( is_array($normalized_value)){ |
|
| 33 | + if (is_array($normalized_value)) { |
|
| 34 | 34 | $items_to_validate = $normalized_value; |
| 35 | - }else{ |
|
| 35 | + } else { |
|
| 36 | 36 | $items_to_validate = array($normalized_value); |
| 37 | 37 | } |
| 38 | - foreach($items_to_validate as $individual_item){ |
|
| 39 | - foreach($this->_individual_item_validation_strategies as $validation_strategy){ |
|
| 40 | - if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) { |
|
| 38 | + foreach ($items_to_validate as $individual_item) { |
|
| 39 | + foreach ($this->_individual_item_validation_strategies as $validation_strategy) { |
|
| 40 | + if ($validation_strategy instanceof EE_Validation_Strategy_Base) { |
|
| 41 | 41 | $validation_strategy->validate($individual_item); |
| 42 | 42 | } |
| 43 | 43 | } |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | function _construct_finalize(\EE_Form_Input_Base $form_input) { |
| 52 | 52 | parent::_construct_finalize($form_input); |
| 53 | - foreach($this->_individual_item_validation_strategies as $item_validation_strategy){ |
|
| 54 | - if ( $item_validation_strategy instanceof EE_Validation_Strategy_Base ) { |
|
| 53 | + foreach ($this->_individual_item_validation_strategies as $item_validation_strategy) { |
|
| 54 | + if ($item_validation_strategy instanceof EE_Validation_Strategy_Base) { |
|
| 55 | 55 | $item_validation_strategy->_construct_finalize($form_input); |
| 56 | 56 | } |
| 57 | 57 | } |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | function validate($normalized_value) { |
| 33 | 33 | if( is_array($normalized_value)){ |
| 34 | 34 | $items_to_validate = $normalized_value; |
| 35 | - }else{ |
|
| 35 | + } else{ |
|
| 36 | 36 | $items_to_validate = array($normalized_value); |
| 37 | 37 | } |
| 38 | 38 | foreach($items_to_validate as $individual_item){ |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | * just checks the field isn't blank |
| 27 | 27 | * |
| 28 | 28 | * @param $normalized_value |
| 29 | - * @return bool |
|
| 29 | + * @return boolean|null |
|
| 30 | 30 | * @throws \EE_Validation_Error |
| 31 | 31 | */ |
| 32 | 32 | function validate($normalized_value) { |
@@ -8,16 +8,16 @@ discard block |
||
| 8 | 8 | * @since 4.6 |
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | -class EE_URL_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
| 11 | +class EE_URL_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * @param null $validation_error_message |
| 15 | 15 | */ |
| 16 | - public function __construct( $validation_error_message = NULL ) { |
|
| 17 | - if( ! $validation_error_message ){ |
|
| 16 | + public function __construct($validation_error_message = NULL) { |
|
| 17 | + if ( ! $validation_error_message) { |
|
| 18 | 18 | $validation_error_message = __("Please enter a valid URL. Eg https://eventespresso.com", "event_espresso"); |
| 19 | 19 | } |
| 20 | - parent::__construct( $validation_error_message ); |
|
| 20 | + parent::__construct($validation_error_message); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | |
@@ -30,16 +30,16 @@ discard block |
||
| 30 | 30 | * @throws \EE_Validation_Error |
| 31 | 31 | */ |
| 32 | 32 | function validate($normalized_value) { |
| 33 | - if( $normalized_value ){ |
|
| 34 | - if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){ |
|
| 35 | - throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url'); |
|
| 36 | - }else{ |
|
| 37 | - if( ! EEH_URL::remote_file_exists( |
|
| 33 | + if ($normalized_value) { |
|
| 34 | + if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false) { |
|
| 35 | + throw new EE_Validation_Error($this->get_validation_error_message(), 'invalid_url'); |
|
| 36 | + } else { |
|
| 37 | + if ( ! EEH_URL::remote_file_exists( |
|
| 38 | 38 | $normalized_value, |
| 39 | 39 | array( |
| 40 | 40 | 'sslverify' => false, |
| 41 | - 'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block |
|
| 42 | - ))){ |
|
| 41 | + 'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block |
|
| 42 | + ))) { |
|
| 43 | 43 | throw new EE_Validation_Error(sprintf(__("That URL seems to be broken. Please enter a valid URL", "event_espresso"))); |
| 44 | 44 | } |
| 45 | 45 | } |
@@ -51,8 +51,8 @@ discard block |
||
| 51 | 51 | /** |
| 52 | 52 | * @return array |
| 53 | 53 | */ |
| 54 | - function get_jquery_validation_rule_array(){ |
|
| 55 | - return array( 'validUrl'=>true, 'messages' => array( 'validUrl' => $this->get_validation_error_message() ) ); |
|
| 54 | + function get_jquery_validation_rule_array() { |
|
| 55 | + return array('validUrl'=>true, 'messages' => array('validUrl' => $this->get_validation_error_message())); |
|
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | if( $normalized_value ){ |
| 34 | 34 | if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){ |
| 35 | 35 | throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url'); |
| 36 | - }else{ |
|
| 36 | + } else{ |
|
| 37 | 37 | if( ! EEH_URL::remote_file_exists( |
| 38 | 38 | $normalized_value, |
| 39 | 39 | array( |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * This is used to output a single |
| 48 | 48 | * @param EE_Line_Item $line_item |
| 49 | 49 | * @param array $options |
| 50 | - * @return mixed |
|
| 50 | + * @return string |
|
| 51 | 51 | */ |
| 52 | 52 | public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
| 53 | 53 | |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | * |
| 164 | 164 | * @param EE_Line_Item $line_item |
| 165 | 165 | * @param array $options |
| 166 | - * @return mixed |
|
| 166 | + * @return string |
|
| 167 | 167 | */ |
| 168 | 168 | protected function _item_row( EE_Line_Item $line_item, $options = array() ) { |
| 169 | 169 | $line_item_related_object = $line_item->get_object(); |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * |
| 230 | 230 | * @param EE_Line_Item $line_item |
| 231 | 231 | * @param array $options |
| 232 | - * @return mixed |
|
| 232 | + * @return string |
|
| 233 | 233 | */ |
| 234 | 234 | protected function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
| 235 | 235 | //for now we're not showing sub-items |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | * |
| 244 | 244 | * @param EE_Line_Item $line_item |
| 245 | 245 | * @param array $options |
| 246 | - * @return mixed |
|
| 246 | + * @return string |
|
| 247 | 247 | */ |
| 248 | 248 | protected function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
| 249 | 249 | // start of row |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | * @param EE_Line_Item $line_item |
| 267 | 267 | * @param string $text |
| 268 | 268 | * @param array $options |
| 269 | - * @return mixed |
|
| 269 | + * @return string |
|
| 270 | 270 | */ |
| 271 | 271 | protected function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
| 272 | 272 | //currently not showing subtotal row |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | * |
| 281 | 281 | * @param EE_Line_Item $line_item |
| 282 | 282 | * @param array $options |
| 283 | - * @return mixed |
|
| 283 | + * @return string |
|
| 284 | 284 | */ |
| 285 | 285 | protected function _total_row( EE_Line_Item $line_item, $options = array() ) { |
| 286 | 286 | // start of row |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | * @param array $options |
| 50 | 50 | * @return mixed |
| 51 | 51 | */ |
| 52 | - public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
|
| 52 | + public function display_line_item(EE_Line_Item $line_item, $options = array()) { |
|
| 53 | 53 | |
| 54 | 54 | $html = ''; |
| 55 | 55 | // set some default options and merge with incoming |
@@ -60,43 +60,43 @@ discard block |
||
| 60 | 60 | 'taxes_tr_css_class' => 'admin-primary-mbox-taxes-tr', |
| 61 | 61 | 'total_tr_css_class' => 'admin-primary-mbox-total-tr' |
| 62 | 62 | ); |
| 63 | - $options = array_merge( $default_options, (array)$options ); |
|
| 63 | + $options = array_merge($default_options, (array) $options); |
|
| 64 | 64 | |
| 65 | - switch( $line_item->type() ) { |
|
| 65 | + switch ($line_item->type()) { |
|
| 66 | 66 | |
| 67 | 67 | case EEM_Line_Item::type_line_item: |
| 68 | 68 | // item row |
| 69 | - $html .= $this->_item_row( $line_item, $options ); |
|
| 69 | + $html .= $this->_item_row($line_item, $options); |
|
| 70 | 70 | break; |
| 71 | 71 | |
| 72 | 72 | case EEM_Line_Item::type_sub_line_item: |
| 73 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
| 73 | + $html .= $this->_sub_item_row($line_item, $options); |
|
| 74 | 74 | break; |
| 75 | 75 | |
| 76 | 76 | case EEM_Line_Item::type_sub_total: |
| 77 | - if ( $line_item->quantity() === 0 ) { |
|
| 77 | + if ($line_item->quantity() === 0) { |
|
| 78 | 78 | return $html; |
| 79 | 79 | } |
| 80 | 80 | //loop through children |
| 81 | 81 | $child_line_items = $line_item->children(); |
| 82 | 82 | //loop through children |
| 83 | - foreach ( $child_line_items as $child_line_item ) { |
|
| 83 | + foreach ($child_line_items as $child_line_item) { |
|
| 84 | 84 | //recursively feed children back into this method |
| 85 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 85 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 86 | 86 | } |
| 87 | - $html .= $this->_sub_total_row( $line_item, $options ); |
|
| 87 | + $html .= $this->_sub_total_row($line_item, $options); |
|
| 88 | 88 | break; |
| 89 | 89 | |
| 90 | 90 | case EEM_Line_Item::type_tax: |
| 91 | - if ( $this->_show_taxes ) { |
|
| 92 | - $this->_taxes_html .= $this->_tax_row( $line_item, $options ); |
|
| 91 | + if ($this->_show_taxes) { |
|
| 92 | + $this->_taxes_html .= $this->_tax_row($line_item, $options); |
|
| 93 | 93 | } |
| 94 | 94 | break; |
| 95 | 95 | |
| 96 | 96 | case EEM_Line_Item::type_tax_sub_total: |
| 97 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 98 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax ) { |
|
| 99 | - $this->display_line_item( $child_line_item, $options ); |
|
| 97 | + foreach ($line_item->children() as $child_line_item) { |
|
| 98 | + if ($child_line_item->type() == EEM_Line_Item::type_tax) { |
|
| 99 | + $this->display_line_item($child_line_item, $options); |
|
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | break; |
@@ -108,14 +108,14 @@ discard block |
||
| 108 | 108 | $children = $line_item->children(); |
| 109 | 109 | |
| 110 | 110 | // loop thru all non-tax child line items |
| 111 | - foreach( $children as $child_line_item ) { |
|
| 112 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 111 | + foreach ($children as $child_line_item) { |
|
| 112 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | $html .= $this->_taxes_html; |
| 116 | - $html .= $this->_total_row( $line_item, $options ); |
|
| 117 | - if ( $options['use_table_wrapper'] ) { |
|
| 118 | - $html = $this->_table_header( $options ) . $html . $this->_table_footer( $options ); |
|
| 116 | + $html .= $this->_total_row($line_item, $options); |
|
| 117 | + if ($options['use_table_wrapper']) { |
|
| 118 | + $html = $this->_table_header($options).$html.$this->_table_footer($options); |
|
| 119 | 119 | } |
| 120 | 120 | break; |
| 121 | 121 | |
@@ -132,15 +132,15 @@ discard block |
||
| 132 | 132 | * @param array $options |
| 133 | 133 | * @return string |
| 134 | 134 | */ |
| 135 | - protected function _table_header( $options ) { |
|
| 136 | - $html = EEH_HTML::table( '','', $options['table_css_class'] ); |
|
| 135 | + protected function _table_header($options) { |
|
| 136 | + $html = EEH_HTML::table('', '', $options['table_css_class']); |
|
| 137 | 137 | $html .= EEH_HTML::thead(); |
| 138 | 138 | $html .= EEH_HTML::tr(); |
| 139 | - $html .= EEH_HTML::th( __( 'Name', 'event_espresso' ), '', 'jst-left' ); |
|
| 140 | - $html .= EEH_HTML::th( __( 'Type', 'event_espresso'), '', 'jst-left' ); |
|
| 141 | - $html .= EEH_HTML::th( __( 'Amount', 'event_espresso' ), '', 'jst-cntr' ); |
|
| 142 | - $html .= EEH_HTML::th( __( 'Qty', 'event_espresso' ), '', 'jst-cntr' ); |
|
| 143 | - $html .= EEH_HTML::th( __( 'Line Total', 'event_espresso'), '', 'jst-cntr' ); |
|
| 139 | + $html .= EEH_HTML::th(__('Name', 'event_espresso'), '', 'jst-left'); |
|
| 140 | + $html .= EEH_HTML::th(__('Type', 'event_espresso'), '', 'jst-left'); |
|
| 141 | + $html .= EEH_HTML::th(__('Amount', 'event_espresso'), '', 'jst-cntr'); |
|
| 142 | + $html .= EEH_HTML::th(__('Qty', 'event_espresso'), '', 'jst-cntr'); |
|
| 143 | + $html .= EEH_HTML::th(__('Line Total', 'event_espresso'), '', 'jst-cntr'); |
|
| 144 | 144 | $html .= EEH_HTML::tbody(); |
| 145 | 145 | return $html; |
| 146 | 146 | } |
@@ -152,8 +152,8 @@ discard block |
||
| 152 | 152 | * @param array $options array of options for the table. |
| 153 | 153 | * @return string |
| 154 | 154 | */ |
| 155 | - protected function _table_footer( $options ) { |
|
| 156 | - return EEH_HTML::tbodyx() . EEH_HTML::tablex(); |
|
| 155 | + protected function _table_footer($options) { |
|
| 156 | + return EEH_HTML::tbodyx().EEH_HTML::tablex(); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | |
@@ -165,12 +165,12 @@ discard block |
||
| 165 | 165 | * @param array $options |
| 166 | 166 | * @return mixed |
| 167 | 167 | */ |
| 168 | - protected function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 168 | + protected function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 169 | 169 | $line_item_related_object = $line_item->get_object(); |
| 170 | 170 | $parent_line_item_related_object = $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->get_object() : null; |
| 171 | 171 | // start of row |
| 172 | 172 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
| 173 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
| 173 | + $html = EEH_HTML::tr('', '', $row_class); |
|
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | //Name Column |
@@ -178,45 +178,45 @@ discard block |
||
| 178 | 178 | |
| 179 | 179 | //related object scope. |
| 180 | 180 | $parent_related_object_name = $parent_line_item_related_object instanceof EEI_Line_Item_Object ? $parent_line_item_related_object->name() : ''; |
| 181 | - $parent_related_object_name = empty( $parent_related_object_name ) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name; |
|
| 181 | + $parent_related_object_name = empty($parent_related_object_name) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name; |
|
| 182 | 182 | $parent_related_object_link = $parent_line_item_related_object instanceof EEI_Admin_Links ? $parent_line_item_related_object->get_admin_details_link() : ''; |
| 183 | 183 | |
| 184 | 184 | |
| 185 | 185 | $name_html = $line_item_related_object instanceof EEI_Line_Item_Object ? $line_item_related_object->name() : $line_item->name(); |
| 186 | - $name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>' : $name_html; |
|
| 186 | + $name_html = $name_link ? '<a href="'.$name_link.'">'.$name_html.'</a>' : $name_html; |
|
| 187 | 187 | $name_html .= $line_item->is_taxable() ? ' *' : ''; |
| 188 | 188 | //maybe preface with icon? |
| 189 | - $name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon() . $name_html : $name_html; |
|
| 190 | - $name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>'; |
|
| 191 | - $name_html .= sprintf( |
|
| 192 | - _x( '%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'), |
|
| 189 | + $name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon().$name_html : $name_html; |
|
| 190 | + $name_html = '<span class="ee-line-item-name linked">'.$name_html.'</span><br>'; |
|
| 191 | + $name_html .= sprintf( |
|
| 192 | + _x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'), |
|
| 193 | 193 | '<span class="ee-line-item-related-parent-object">', |
| 194 | - $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __( 'Item:', 'event_espresso' ), |
|
| 195 | - $parent_related_object_link ? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>' : $parent_related_object_name, |
|
| 194 | + $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __('Item:', 'event_espresso'), |
|
| 195 | + $parent_related_object_link ? '<a href="'.$parent_related_object_link.'">'.$parent_related_object_name.'</a>' : $parent_related_object_name, |
|
| 196 | 196 | '</span>' |
| 197 | 197 | ); |
| 198 | - $html .= EEH_HTML::td( $name_html, '', 'jst-left' ); |
|
| 198 | + $html .= EEH_HTML::td($name_html, '', 'jst-left'); |
|
| 199 | 199 | //Type Column |
| 200 | 200 | $type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n() : ''; |
| 201 | - $type_html .= $this->_get_cancellations( $line_item ); |
|
| 201 | + $type_html .= $this->_get_cancellations($line_item); |
|
| 202 | 202 | $type_html .= $line_item->OBJ_type() ? '<br />' : ''; |
| 203 | 203 | $code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : ''; |
| 204 | - $type_html .= ! empty( $code ) ? '<span class="ee-line-item-id">' . sprintf( __( 'Code: %s', 'event_espresso' ), $code ) . '</span>' : ''; |
|
| 205 | - $html .= EEH_HTML::td( $type_html, '', 'jst-left' ); |
|
| 204 | + $type_html .= ! empty($code) ? '<span class="ee-line-item-id">'.sprintf(__('Code: %s', 'event_espresso'), $code).'</span>' : ''; |
|
| 205 | + $html .= EEH_HTML::td($type_html, '', 'jst-left'); |
|
| 206 | 206 | |
| 207 | 207 | |
| 208 | 208 | //Amount Column |
| 209 | - if ( $line_item->is_percent() ) { |
|
| 210 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'jst-rght' ); |
|
| 209 | + if ($line_item->is_percent()) { |
|
| 210 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'jst-rght'); |
|
| 211 | 211 | } else { |
| 212 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'jst-rght' ); |
|
| 212 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght'); |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | //QTY column |
| 216 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'jst-rght' ); |
|
| 216 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'jst-rght'); |
|
| 217 | 217 | |
| 218 | 218 | //total column |
| 219 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
| 219 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
| 220 | 220 | |
| 221 | 221 | //finish things off and return |
| 222 | 222 | $html .= EEH_HTML::trx(); |
@@ -231,12 +231,12 @@ discard block |
||
| 231 | 231 | * @param EE_Line_Item $line_item |
| 232 | 232 | * @return string |
| 233 | 233 | */ |
| 234 | - protected function _get_cancellations( EE_Line_Item $line_item ) { |
|
| 234 | + protected function _get_cancellations(EE_Line_Item $line_item) { |
|
| 235 | 235 | $html = ''; |
| 236 | 236 | $cancellations = $line_item->get_cancellations(); |
| 237 | - $cancellation = reset( $cancellations ); |
|
| 237 | + $cancellation = reset($cancellations); |
|
| 238 | 238 | // \EEH_Debug_Tools::printr( $cancellation, '$cancellation', __FILE__, __LINE__ ); |
| 239 | - if ( $cancellation instanceof EE_Line_Item ) { |
|
| 239 | + if ($cancellation instanceof EE_Line_Item) { |
|
| 240 | 240 | $html .= ' <span class="ee-line-item-id">'; |
| 241 | 241 | $html .= sprintf( |
| 242 | 242 | _n( |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | * @param array $options |
| 262 | 262 | * @return mixed |
| 263 | 263 | */ |
| 264 | - protected function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 264 | + protected function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 265 | 265 | //for now we're not showing sub-items |
| 266 | 266 | return ''; |
| 267 | 267 | } |
@@ -275,13 +275,13 @@ discard block |
||
| 275 | 275 | * @param array $options |
| 276 | 276 | * @return mixed |
| 277 | 277 | */ |
| 278 | - protected function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 278 | + protected function _tax_row(EE_Line_Item $line_item, $options = array()) { |
|
| 279 | 279 | // start of row |
| 280 | - $html = EEH_HTML::tr( '', 'admin-primary-mbox-taxes-tr' ); |
|
| 280 | + $html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr'); |
|
| 281 | 281 | // name th |
| 282 | - $html .= EEH_HTML::th( $line_item->name() . '(' . $line_item->get_pretty( 'LIN_percent' ) . '%)', '', 'jst-rght', '', ' colspan="4"' ); |
|
| 282 | + $html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="4"'); |
|
| 283 | 283 | // total th |
| 284 | - $html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
| 284 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
| 285 | 285 | // end of row |
| 286 | 286 | $html .= EEH_HTML::trx(); |
| 287 | 287 | return $html; |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | * @param array $options |
| 299 | 299 | * @return mixed |
| 300 | 300 | */ |
| 301 | - protected function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
|
| 301 | + protected function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) { |
|
| 302 | 302 | //currently not showing subtotal row |
| 303 | 303 | return ''; |
| 304 | 304 | } |
@@ -312,15 +312,15 @@ discard block |
||
| 312 | 312 | * @param array $options |
| 313 | 313 | * @return mixed |
| 314 | 314 | */ |
| 315 | - protected function _total_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 315 | + protected function _total_row(EE_Line_Item $line_item, $options = array()) { |
|
| 316 | 316 | // start of row |
| 317 | - $html = EEH_HTML::tr( '', '', 'admin-primary-mbox-total-tr' ); |
|
| 317 | + $html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr'); |
|
| 318 | 318 | // Total th label |
| 319 | - $total_label = sprintf( __( 'Transaction Total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' ); |
|
| 320 | - $html .= EEH_HTML::th( $total_label, '', 'jst-rght', '', ' colspan="4"' ); |
|
| 319 | + $total_label = sprintf(__('Transaction Total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); |
|
| 320 | + $html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="4"'); |
|
| 321 | 321 | // total th |
| 322 | 322 | |
| 323 | - $html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
| 323 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
| 324 | 324 | // end of row |
| 325 | 325 | $html .= EEH_HTML::trx(); |
| 326 | 326 | return $html; |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | /** |
| 32 | 32 | * @param EE_Line_Item $line_item |
| 33 | 33 | * @param array $options |
| 34 | - * @return mixed |
|
| 34 | + * @return string |
|
| 35 | 35 | */ |
| 36 | 36 | public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
| 37 | 37 | |
@@ -14,17 +14,17 @@ |
||
| 14 | 14 | * ------------------------------------------------------------------------ |
| 15 | 15 | */ |
| 16 | 16 | /** |
| 17 | - * |
|
| 18 | - * Class EE_Receipt_Line_Item_Display_Strategy |
|
| 19 | - * |
|
| 20 | - * Description |
|
| 21 | - * |
|
| 22 | - * @package Event Espresso |
|
| 23 | - * @subpackage core |
|
| 24 | - * @author Brent Christensen |
|
| 25 | - * @since $VID:$ |
|
| 26 | - * |
|
| 27 | - */ |
|
| 17 | + * |
|
| 18 | + * Class EE_Receipt_Line_Item_Display_Strategy |
|
| 19 | + * |
|
| 20 | + * Description |
|
| 21 | + * |
|
| 22 | + * @package Event Espresso |
|
| 23 | + * @subpackage core |
|
| 24 | + * @author Brent Christensen |
|
| 25 | + * @since $VID:$ |
|
| 26 | + * |
|
| 27 | + */ |
|
| 28 | 28 | |
| 29 | 29 | class EE_Receipt_Line_Item_Display_Strategy implements EEI_Line_Item_Display { |
| 30 | 30 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * @param array $options |
| 34 | 34 | * @return mixed |
| 35 | 35 | */ |
| 36 | - public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
|
| 36 | + public function display_line_item(EE_Line_Item $line_item, $options = array()) { |
|
| 37 | 37 | |
| 38 | 38 | $html = ''; |
| 39 | 39 | // set some default options and merge with incoming |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | 'show_desc' => TRUE, |
| 42 | 42 | 'odd' => FALSE |
| 43 | 43 | ); |
| 44 | - $options = array_merge( $default_options, (array)$options ); |
|
| 45 | - switch( $line_item->type() ) { |
|
| 44 | + $options = array_merge($default_options, (array) $options); |
|
| 45 | + switch ($line_item->type()) { |
|
| 46 | 46 | |
| 47 | 47 | case EEM_Line_Item::type_total: |
| 48 | 48 | // loop thru children |
| 49 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 49 | + foreach ($line_item->children() as $child_line_item) { |
|
| 50 | 50 | // recursively feed children back into this method |
| 51 | 51 | // $html .= $this->display_line_item( $child_line_item, $options ); |
| 52 | 52 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | case EEM_Line_Item::type_sub_total: |
| 59 | 59 | // loop thru children |
| 60 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 60 | + foreach ($line_item->children() as $child_line_item) { |
|
| 61 | 61 | // recursively feed children back into this method |
| 62 | 62 | // $html .= $this->display_line_item( $child_line_item, $options ); |
| 63 | 63 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | case EEM_Line_Item::type_tax_sub_total: |
| 69 | 69 | // loop thru children |
| 70 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 70 | + foreach ($line_item->children() as $child_line_item) { |
|
| 71 | 71 | // recursively feed children back into this method |
| 72 | 72 | // $html .= $this->display_line_item( $child_line_item, $options ); |
| 73 | 73 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | // item row |
| 80 | 80 | // $html .= $this->_item_row( $line_item, $options ); |
| 81 | 81 | // got any kids? |
| 82 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 82 | + foreach ($line_item->children() as $child_line_item) { |
|
| 83 | 83 | // $this->display_line_item( $child_line_item, $options ); |
| 84 | 84 | } |
| 85 | 85 | break; |