Completed
Branch BUG-9715-shortcode-resources (aae731)
by
unknown
93:10 queued 83:21
created
core/libraries/form_sections/inputs/EE_Submit_Input.input.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,15 +8,15 @@
 block discarded – undo
8 8
  *
9 9
  * This input has a default validation strategy of plaintext (which can be removed after construction)
10 10
  */
11
-class EE_Submit_Input extends EE_Form_Input_Base{
11
+class EE_Submit_Input extends EE_Form_Input_Base {
12 12
 
13 13
 	/**
14 14
 	 * @param array $options
15 15
 	 */
16
-	function __construct($options = array()){
16
+	function __construct($options = array()) {
17 17
 		$this->_set_display_strategy(new EE_Submit_Input_Display_Strategy());
18 18
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
19
-		$this->_add_validation_strategy( new EE_Plaintext_Validation_Strategy() );
19
+		$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
20 20
 		parent::__construct($options);
21 21
 	}
22 22
 }
23 23
\ No newline at end of file
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Yes_No_Input.input.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,14 +6,14 @@
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Yes_No_Input extends EE_Select_Input{
9
+class EE_Yes_No_Input extends EE_Select_Input {
10 10
 
11 11
 	/**
12 12
 	 * @param array $options
13 13
 	 */
14
-	function __construct( $options = array()){
15
-		$select_options = array(true=>  __("Yes", "event_espresso"),false=>  __("No", "event_espresso"));
14
+	function __construct($options = array()) {
15
+		$select_options = array(true=>  __("Yes", "event_espresso"), false=>  __("No", "event_espresso"));
16 16
 
17
-		parent::__construct($select_options,$options);
17
+		parent::__construct($select_options, $options);
18 18
 	}
19 19
 }
Please login to merge, or discard this patch.
libraries/form_sections/strategies/EE_Form_Input_Strategy_Base.strategy.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,14 +3,14 @@  discard block
 block discarded – undo
3 3
  * base class for all strategies which operate on form inputs. Generally, they
4 4
  * all need to know about the form input they are operating on.
5 5
  */
6
-abstract class EE_Form_Input_Strategy_Base{
6
+abstract class EE_Form_Input_Strategy_Base {
7 7
 	/**
8 8
 	 * Form Input to display
9 9
 	 * @var EE_Form_Input_Base
10 10
 	 */
11 11
 	protected $_input;
12 12
 	
13
-	function __construct(){
13
+	function __construct() {
14 14
 		
15 15
 	}
16 16
 
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 * The form input on which this strategy is to perform
19 19
 	 * @param EE_Form_Input_Base $form_input
20 20
 	 */
21
-	function _construct_finalize(EE_Form_Input_Base $form_input){
21
+	function _construct_finalize(EE_Form_Input_Base $form_input) {
22 22
 		$this->_input = $form_input;
23 23
 	}
24 24
 }
25 25
\ No newline at end of file
Please login to merge, or discard this patch.
strategies/display/EE_Admin_File_Uploader_Display_Strategy.strategy.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 		$results = wp_remote_head( $src );
71 71
 		if( is_array( $results) && ! $results instanceof WP_Error){
72 72
 			return strpos($results['headers']['content-type'], "image" ) !== FALSE;
73
-		}else{
73
+		} else{
74 74
 			return FALSE;
75 75
 		}
76 76
 	}
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * @since                4.6
9 9
  *
10 10
  */
11
-class EE_Admin_File_Uploader_Display_Strategy extends EE_Display_Strategy_Base{
11
+class EE_Admin_File_Uploader_Display_Strategy extends EE_Display_Strategy_Base {
12 12
 
13 13
 	/**
14 14
 	 * return EE_Admin_File_Uploader_Display_Strategy
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
29 29
 	 * Besides that, no special consideration should be required to make the media uploader appear, besides having
30 30
 	 * this input displayed.
31 31
 	 */
32
-	static function enqueue_scripts(){
32
+	static function enqueue_scripts() {
33 33
 		wp_enqueue_media();
34 34
 		wp_enqueue_script('media-upload');
35
-		wp_enqueue_script('ee-payments',EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
35
+		wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
36 36
 	}
37 37
 
38 38
 
@@ -42,18 +42,18 @@  discard block
 block discarded – undo
42 42
 	 * @return string of html to display the field
43 43
 	 */
44 44
 
45
-	function display(){
45
+	function display() {
46 46
 		// the actual input
47 47
 		$input = '<input type="text" size="34" ';
48
-		$input .= 'name="' . $this->_input->html_name() . '" ';
49
-		$input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" ' : 'class="large-text ee_media_url" ';
50
-		$input .= 'value="' . $this->_input->raw_value_in_form() . '">';
48
+		$input .= 'name="'.$this->_input->html_name().'" ';
49
+		$input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url '.$this->_input->html_class().'" ' : 'class="large-text ee_media_url" ';
50
+		$input .= 'value="'.$this->_input->raw_value_in_form().'">';
51 51
 		// image uploader
52
-		$uploader = EEH_HTML::link( '#', '<img src="' . admin_url( 'images/media-button-image.gif' ) . '" >', __( 'click to add an image', 'event_espresso' ), '', 'ee_media_upload' );
52
+		$uploader = EEH_HTML::link('#', '<img src="'.admin_url('images/media-button-image.gif').'" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
53 53
 		//only attempt to show the image if it at least exists
54
-		$image = $this->src_exists( $this->_input->raw_value() ) ? EEH_HTML::br(2) . EEH_HTML::img( $this->_input->raw_value(), __( 'logo', 'event_espresso' ), '', 'ee_media_image' ) : '';
54
+		$image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2).EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
55 55
 		// html string
56
-		return EEH_HTML::div( $input . EEH_HTML::nbsp() . $uploader . $image, '', 'ee_media_uploader_area' );
56
+		return EEH_HTML::div($input.EEH_HTML::nbsp().$uploader.$image, '', 'ee_media_uploader_area');
57 57
 	}
58 58
 
59 59
 
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
64 64
 	 * @param string $src
65 65
 	 * @return boolean
66 66
 	 */
67
-	protected function src_exists( $src ){
68
-		$results = wp_remote_head( $src );
69
-		if( is_array( $results) && ! $results instanceof WP_Error){
70
-			return strpos($results['headers']['content-type'], "image" ) !== FALSE;
71
-		}else{
67
+	protected function src_exists($src) {
68
+		$results = wp_remote_head($src);
69
+		if (is_array($results) && ! $results instanceof WP_Error) {
70
+			return strpos($results['headers']['content-type'], "image") !== FALSE;
71
+		} else {
72 72
 			return FALSE;
73 73
 		}
74 74
 	}
Please login to merge, or discard this patch.
form_sections/strategies/display/EE_Display_Strategy_Base.strategy.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * @since               	4.6
9 9
  *
10 10
  */
11
-abstract class EE_Display_Strategy_Base extends EE_Form_Input_Strategy_Base{
11
+abstract class EE_Display_Strategy_Base extends EE_Form_Input_Strategy_Base {
12 12
 	/**
13 13
 	 * returns HTML and javascript related to the displaying of this input
14 14
 	 * @return string
@@ -24,10 +24,10 @@  discard block
 block discarded – undo
24 24
 	 * @param string $chars - exact string of characters to remove
25 25
 	 * @return string
26 26
 	 */
27
-	protected function _remove_chars( $string = '', $chars = '-' ) {
28
-		$char_length = strlen( $chars ) * -1;
27
+	protected function _remove_chars($string = '', $chars = '-') {
28
+		$char_length = strlen($chars) * -1;
29 29
 		// if last three characters of string is  " - ", then remove it
30
-		return substr( $string, $char_length ) == $chars ? substr( $string, 0, $char_length ) : $string;
30
+		return substr($string, $char_length) == $chars ? substr($string, 0, $char_length) : $string;
31 31
 	}
32 32
 
33 33
 
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 	 * @param string $chars - exact string of characters to be added to end of string
40 40
 	 * @return string
41 41
 	 */
42
-	protected function _append_chars( $string = '', $chars = '-' ) {
43
-		return  $this->_remove_chars( $string, $chars ) . $chars;
42
+	protected function _append_chars($string = '', $chars = '-') {
43
+		return  $this->_remove_chars($string, $chars).$chars;
44 44
 	}
45 45
 
46 46
 
Please login to merge, or discard this patch.
form_sections/strategies/display/EE_Hidden_Display_Strategy.strategy.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,12 +25,12 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base{
28
+class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base {
29 29
 	/**
30 30
 	 * 
31 31
 	 * @return string of html to display the HIDDEN field
32 32
 	 */
33
-	function display(){
33
+	function display() {
34 34
 		$input = $this->_input;		
35 35
 		return "<input type='hidden' id='{$input->html_id()}' name='{$input->html_name()}' class='{$input->html_class()}' style='{$input->html_style()}' value='{$input->raw_value_in_form()}'/>";
36 36
 	}
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
Please login to merge, or discard this patch.
strategies/display/EE_Radio_Button_Display_Strategy.strategy.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3 3
  *
4 4
  * Class EE_Radio_Button_Display_Strategy
@@ -11,43 +11,43 @@  discard block
 block discarded – undo
11 11
  * @since 				$VID:$
12 12
  *
13 13
  */
14
-class EE_Radio_Button_Display_Strategy extends EE_Display_Strategy_Base{
14
+class EE_Radio_Button_Display_Strategy extends EE_Display_Strategy_Base {
15 15
 
16 16
 	/**
17 17
 	 *
18 18
 	 * @throws EE_Error
19 19
 	 * @return string of html to display the field
20 20
 	 */
21
-	function display(){
22
-		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base ){
23
-			throw new EE_Error(sprintf(__('Can not use Radio Button Display Strategy with an input that doesn\'t have options', 'event_espresso' )));
21
+	function display() {
22
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
23
+			throw new EE_Error(sprintf(__('Can not use Radio Button Display Strategy with an input that doesn\'t have options', 'event_espresso')));
24 24
 		}
25 25
 
26 26
 		$this->_input->set_label_sizes();
27 27
 		$label_size_class = $this->_input->get_label_size_class();
28 28
 		$html = '';
29
-		foreach( $this->_input->options() as $value => $display_text ){
30
-			$value = $this->_input->get_normalization_strategy()->unnormalize( $value );
29
+		foreach ($this->_input->options() as $value => $display_text) {
30
+			$value = $this->_input->get_normalization_strategy()->unnormalize($value);
31 31
 
32
-			$html_id = $this->_append_chars( $this->_input->html_id(), '-' ) . sanitize_key( $value );
33
-			$html .= EEH_HTML::nl( 0, 'radio' );
34
-			$html .= '<label for="' . $html_id . '"';
35
-			$html .= ' id="' . $html_id . '-lbl"';
36
-			$html .= ' class="ee-radio-label-after' . $label_size_class . '">';
37
-			$html .= EEH_HTML::nl( 1, 'radio' );
38
-			$html .= '<input id="' . $html_id . '"';
39
-			$html .= ' name="' . $this->_input->html_name() . '"';
40
-			$html .= ' class="' . $this->_input->html_class() . '"';
41
-			$html .= ' style="' . $this->_input->html_style() . '"';
32
+			$html_id = $this->_append_chars($this->_input->html_id(), '-').sanitize_key($value);
33
+			$html .= EEH_HTML::nl(0, 'radio');
34
+			$html .= '<label for="'.$html_id.'"';
35
+			$html .= ' id="'.$html_id.'-lbl"';
36
+			$html .= ' class="ee-radio-label-after'.$label_size_class.'">';
37
+			$html .= EEH_HTML::nl(1, 'radio');
38
+			$html .= '<input id="'.$html_id.'"';
39
+			$html .= ' name="'.$this->_input->html_name().'"';
40
+			$html .= ' class="'.$this->_input->html_class().'"';
41
+			$html .= ' style="'.$this->_input->html_style().'"';
42 42
 			$html .= ' type="radio"';
43
-			$html .= ' value="' . esc_attr( $value ) . '"';
43
+			$html .= ' value="'.esc_attr($value).'"';
44 44
 			$html .= $this->_input->raw_value() === $value ? ' checked="checked"' : '';
45 45
 			$html .= '>&nbsp;';
46 46
 			$html .= $display_text;
47
-			$html .= EEH_HTML::nl( -1, 'radio' ) . '</label>';
47
+			$html .= EEH_HTML::nl( -1, 'radio' ).'</label>';
48 48
 
49 49
 		}
50
-		$html .= EEH_HTML::div( '', '', 'clear-float' );
50
+		$html .= EEH_HTML::div('', '', 'clear-float');
51 51
 		$html .= EEH_HTML::divx();
52 52
 		return $html;
53 53
 	}
Please login to merge, or discard this patch.
strategies/display/EE_Select_Multiple_Display_Strategy.strategy.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
@@ -53,7 +54,7 @@  discard block
 block discarded – undo
53 54
 		EEH_HTML::indent( 1, 'select' );
54 55
 		if( EEH_Array::is_multi_dimensional_array( $this->_input->options() )){
55 56
 			throw new EE_Error(sprintf(__("Select multiple display strategy does not allow for nested arrays of options.", "event_espresso")));
56
-		}else{
57
+		} else{
57 58
 			$html.=$this->_display_options( $this->_input->options() );
58 59
 		}
59 60
 
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Select_Multiple_Display_Strategy extends EE_Select_Display_Strategy{
28
+class EE_Select_Multiple_Display_Strategy extends EE_Select_Display_Strategy {
29 29
 
30 30
 	/**
31 31
 	 *
@@ -34,29 +34,29 @@  discard block
 block discarded – undo
34 34
 	 */
35 35
 	public function display() {
36 36
 
37
-		if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){
37
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
38 38
 			throw new EE_Error(sprintf(__('Cannot use Select Multiple Display Strategy with an input that doesn\'t have options', "event_espresso")));
39 39
 		}
40 40
 
41
-		$html = EEH_HTML::nl( 0, 'select' );
41
+		$html = EEH_HTML::nl(0, 'select');
42 42
 		$html .= '<select multiple';
43
-		$html .= ' id="' . $this->_input->html_id() . '"';
44
-		$html .= ' name="' . $this->_input->html_name() . '[]"';
45
-		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
46
-		$html .= ' class="' . $class . '"';
43
+		$html .= ' id="'.$this->_input->html_id().'"';
44
+		$html .= ' name="'.$this->_input->html_name().'[]"';
45
+		$class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
46
+		$html .= ' class="'.$class.'"';
47 47
 		// add html5 required
48 48
 		$html .= $this->_input->required() ? ' required' : '';
49
-		$html .= ' style="' . $this->_input->html_style() . '"';
49
+		$html .= ' style="'.$this->_input->html_style().'"';
50 50
 		$html .= '>';
51 51
 
52
-		EEH_HTML::indent( 1, 'select' );
53
-		if( EEH_Array::is_multi_dimensional_array( $this->_input->options() )){
52
+		EEH_HTML::indent(1, 'select');
53
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
54 54
 			throw new EE_Error(sprintf(__("Select multiple display strategy does not allow for nested arrays of options.", "event_espresso")));
55
-		}else{
56
-			$html.=$this->_display_options( $this->_input->options() );
55
+		} else {
56
+			$html .= $this->_display_options($this->_input->options());
57 57
 		}
58 58
 
59
-		$html.= EEH_HTML::nl( -1, 'select' ) . "</select>";
59
+		$html .= EEH_HTML::nl( -1, 'select' )."</select>";
60 60
 		return $html;
61 61
 	}
62 62
 
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
67 67
 	 * @param string|int $value unnormalized value option (string)
68 68
 	 * @return boolean
69 69
 	 */
70
-	protected function _check_if_option_selected( $value ){
70
+	protected function _check_if_option_selected($value) {
71 71
 		$selected_options = $this->_input->raw_value();
72
-		if ( empty( $selected_options )){
72
+		if (empty($selected_options)) {
73 73
 			return FALSE;
74 74
 		}
75
-		return in_array( $value, $selected_options ) ? TRUE : FALSE;
75
+		return in_array($value, $selected_options) ? TRUE : FALSE;
76 76
 	}
77 77
 
78 78
 
Please login to merge, or discard this patch.
strategies/display/EE_Submit_Input_Display_Strategy.strategy.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2
-class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base{
2
+class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base {
3 3
 	/**
4 4
 	 *
5 5
 	 * @return string of html to display the input
6 6
 	 */
7
-	function display(){
7
+	function display() {
8 8
 		$html = '<input type="submit" ';
9
-		$html .= 'value="' . $this->_input->raw_value_in_form() . '" ';
10
-		$html .= 'id="' . $this->_input->html_id() . '-submit" ';
11
-		$html .= 'class="' . $this->_input->html_class() . ' ' . $this->_input->button_css_attributes() . '" ';
12
-		$html .= 'style="' . $this->_input->html_style() . '" ';
9
+		$html .= 'value="'.$this->_input->raw_value_in_form().'" ';
10
+		$html .= 'id="'.$this->_input->html_id().'-submit" ';
11
+		$html .= 'class="'.$this->_input->html_class().' '.$this->_input->button_css_attributes().'" ';
12
+		$html .= 'style="'.$this->_input->html_style().'" ';
13 13
 		$html .= $this->_input->other_html_attributes();
14 14
 		$html .= '/>';
15 15
 		return $html;
Please login to merge, or discard this patch.