Completed
Branch RELEASE (416965)
by
unknown
12:45 queued 13s
created
caffeinated/modules/recaptcha/ReCaptcha/RequestParameters.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,11 +80,11 @@
 block discarded – undo
80 80
     {
81 81
         $params = array('secret' => $this->secret, 'response' => $this->response);
82 82
 
83
-        if (!is_null($this->remoteIp)) {
83
+        if ( ! is_null($this->remoteIp)) {
84 84
             $params['remoteip'] = $this->remoteIp;
85 85
         }
86 86
 
87
-        if (!is_null($this->version)) {
87
+        if ( ! is_null($this->version)) {
88 88
             $params['version'] = $this->version;
89 89
         }
90 90
 
Please login to merge, or discard this patch.
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -31,73 +31,73 @@
 block discarded – undo
31 31
  */
32 32
 class RequestParameters
33 33
 {
34
-    /**
35
-     * Site secret.
36
-     * @var string
37
-     */
38
-    private $secret;
34
+	/**
35
+	 * Site secret.
36
+	 * @var string
37
+	 */
38
+	private $secret;
39 39
 
40
-    /**
41
-     * Form response.
42
-     * @var string
43
-     */
44
-    private $response;
40
+	/**
41
+	 * Form response.
42
+	 * @var string
43
+	 */
44
+	private $response;
45 45
 
46
-    /**
47
-     * Remote user's IP address.
48
-     * @var string
49
-     */
50
-    private $remoteIp;
46
+	/**
47
+	 * Remote user's IP address.
48
+	 * @var string
49
+	 */
50
+	private $remoteIp;
51 51
 
52
-    /**
53
-     * Client version.
54
-     * @var string
55
-     */
56
-    private $version;
52
+	/**
53
+	 * Client version.
54
+	 * @var string
55
+	 */
56
+	private $version;
57 57
 
58
-    /**
59
-     * Initialise parameters.
60
-     *
61
-     * @param string $secret Site secret.
62
-     * @param string $response Value from g-captcha-response form field.
63
-     * @param string $remoteIp User's IP address.
64
-     * @param string $version Version of this client library.
65
-     */
66
-    public function __construct($secret, $response, $remoteIp = null, $version = null)
67
-    {
68
-        $this->secret = $secret;
69
-        $this->response = $response;
70
-        $this->remoteIp = $remoteIp;
71
-        $this->version = $version;
72
-    }
58
+	/**
59
+	 * Initialise parameters.
60
+	 *
61
+	 * @param string $secret Site secret.
62
+	 * @param string $response Value from g-captcha-response form field.
63
+	 * @param string $remoteIp User's IP address.
64
+	 * @param string $version Version of this client library.
65
+	 */
66
+	public function __construct($secret, $response, $remoteIp = null, $version = null)
67
+	{
68
+		$this->secret = $secret;
69
+		$this->response = $response;
70
+		$this->remoteIp = $remoteIp;
71
+		$this->version = $version;
72
+	}
73 73
 
74
-    /**
75
-     * Array representation.
76
-     *
77
-     * @return array Array formatted parameters.
78
-     */
79
-    public function toArray()
80
-    {
81
-        $params = array('secret' => $this->secret, 'response' => $this->response);
74
+	/**
75
+	 * Array representation.
76
+	 *
77
+	 * @return array Array formatted parameters.
78
+	 */
79
+	public function toArray()
80
+	{
81
+		$params = array('secret' => $this->secret, 'response' => $this->response);
82 82
 
83
-        if (!is_null($this->remoteIp)) {
84
-            $params['remoteip'] = $this->remoteIp;
85
-        }
83
+		if (!is_null($this->remoteIp)) {
84
+			$params['remoteip'] = $this->remoteIp;
85
+		}
86 86
 
87
-        if (!is_null($this->version)) {
88
-            $params['version'] = $this->version;
89
-        }
87
+		if (!is_null($this->version)) {
88
+			$params['version'] = $this->version;
89
+		}
90 90
 
91
-        return $params;
92
-    }
91
+		return $params;
92
+	}
93 93
 
94
-    /**
95
-     * Query string representation for HTTP request.
96
-     *
97
-     * @return string Query string formatted parameters.
98
-     */
99
-    public function toQueryString()
100
-    {
101
-        return http_build_query($this->toArray(), '', '&');
102
-    }
94
+	/**
95
+	 * Query string representation for HTTP request.
96
+	 *
97
+	 * @return string Query string formatted parameters.
98
+	 */
99
+	public function toQueryString()
100
+	{
101
+		return http_build_query($this->toArray(), '', '&');
102
+	}
103 103
 }
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/archive-espresso_events.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,11 +16,11 @@
 block discarded – undo
16 16
 
17 17
 	<section id="primary" class="content-area">
18 18
 		<div id="content" class="site-content" role="main">
19
-			<?php espresso_get_template_part( 'loop', 'espresso_events' ); ?>			
19
+			<?php espresso_get_template_part('loop', 'espresso_events'); ?>			
20 20
 		</div><!-- #content -->
21 21
 	</section><!-- #primary -->
22 22
 
23 23
 <?php
24
-get_sidebar( 'content' );
24
+get_sidebar('content');
25 25
 get_sidebar();
26 26
 get_footer();
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/archive-espresso_venues.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@
 block discarded – undo
18 18
 
19 19
 	<section id="primary" class="content-area">
20 20
 		<div id="content" class="site-content" role="main">
21
-			<?php espresso_get_template_part( 'loop', 'espresso_venues' ); ?>			
21
+			<?php espresso_get_template_part('loop', 'espresso_venues'); ?>			
22 22
 		</div><!-- #content -->
23 23
 	</section><!-- #primary -->
24 24
 
25 25
 <?php
26
-get_sidebar( 'content' );
26
+get_sidebar('content');
27 27
 get_sidebar();
28 28
 get_footer();
29 29
\ No newline at end of file
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-tickets.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
3 3
 global $post;
4
-if ( espresso_display_ticket_selector( $post->ID ) && ( is_single() || ( is_archive() && espresso_display_ticket_selector_in_event_list() ))) :
4
+if (espresso_display_ticket_selector($post->ID) && (is_single() || (is_archive() && espresso_display_ticket_selector_in_event_list()))) :
5 5
 ?>
6 6
 <div class="event-tickets" style="clear: both;">
7
-	<?php espresso_ticket_selector( $post ); ?>
7
+	<?php espresso_ticket_selector($post); ?>
8 8
 </div>
9 9
 <!-- .event-tickets -->
10
-<?php elseif ( ! is_single() ) : ?>
11
-<?php espresso_view_details_btn( $post ); ?>
10
+<?php elseif ( ! is_single()) : ?>
11
+<?php espresso_view_details_btn($post); ?>
12 12
 <?php endif; ?>
13 13
\ No newline at end of file
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/loop-espresso_venues.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,8 +32,10 @@
 block discarded – undo
32 32
 	do_action( 'AHEE__archive_espresso_venues_template__after_loop' ); 
33 33
 
34 34
 
35
-else :
35
+else {
36
+	:
36 37
 	// If no content, include the "No posts found" template.
37 38
 	espresso_get_template_part( 'content', 'none' );
39
+}
38 40
 	
39 41
 endif;
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,30 +10,30 @@
 block discarded – undo
10 10
  * @ version		4+
11 11
  */
12 12
 
13
-if ( have_posts() ) : ?>
13
+if (have_posts()) : ?>
14 14
 
15 15
 	<header class="page-header">
16 16
 		<h1 class="page-title">
17
-			<?php echo esc_html__( 'Event Venues', 'event_espresso' ); ?>
17
+			<?php echo esc_html__('Event Venues', 'event_espresso'); ?>
18 18
 		</h1>
19 19
 	</header><!-- .page-header -->
20 20
 	
21 21
 <?php 
22 22
 	// allow other stuff
23
-	do_action( 'AHEE__archive_espresso_venues_template__before_loop' ); 
23
+	do_action('AHEE__archive_espresso_venues_template__before_loop'); 
24 24
 	// Start the Loop.
25
-	while ( have_posts() ) : the_post();
25
+	while (have_posts()) : the_post();
26 26
 		// Include the post TYPE-specific template for the content.
27
-		espresso_get_template_part( 'content', 'espresso_venues' );
27
+		espresso_get_template_part('content', 'espresso_venues');
28 28
 	endwhile;
29 29
 	// Previous/next page navigation.
30 30
 	espresso_pagination();
31 31
 	// allow moar other stuff
32
-	do_action( 'AHEE__archive_espresso_venues_template__after_loop' ); 
32
+	do_action('AHEE__archive_espresso_venues_template__after_loop'); 
33 33
 
34 34
 
35 35
 else :
36 36
 	// If no content, include the "No posts found" template.
37
-	espresso_get_template_part( 'content', 'none' );
37
+	espresso_get_template_part('content', 'none');
38 38
 	
39 39
 endif;
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/single-espresso_venues.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@  discard block
 block discarded – undo
18 18
 				<div id="espresso-venue-details-dv" class="" >				
19 19
 			<?php
20 20
 				// Start the Loop.
21
-				while ( have_posts() ) : the_post();
21
+				while (have_posts()) : the_post();
22 22
 					//  Include the post TYPE-specific template for the content.
23
-					espresso_get_template_part( 'content', 'espresso_venues' );
23
+					espresso_get_template_part('content', 'espresso_venues');
24 24
 					// If comments are open or we have at least one comment, load up the comment template.
25
-					if ( comments_open() || get_comments_number() ) {
25
+					if (comments_open() || get_comments_number()) {
26 26
 						comments_template();
27 27
 					}
28 28
 				endwhile;
@@ -34,6 +34,6 @@  discard block
 block discarded – undo
34 34
 	</div><!-- #primary -->
35 35
 
36 36
 <?php
37
-get_sidebar( 'content' );
37
+get_sidebar('content');
38 38
 get_sidebar();
39 39
 get_footer();
40 40
\ No newline at end of file
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-datetimes.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
3 3
 
4
-if ( is_single() || ( is_archive() && espresso_display_datetimes_in_event_list() ) ) :
4
+if (is_single() || (is_archive() && espresso_display_datetimes_in_event_list())) :
5 5
 global $post;
6
-do_action( 'AHEE_event_details_before_event_date', $post );
6
+do_action('AHEE_event_details_before_event_date', $post);
7 7
 ?>
8 8
 	<div class="event-datetimes">
9
-		<?php espresso_list_of_event_dates( $post->ID );?>
9
+		<?php espresso_list_of_event_dates($post->ID); ?>
10 10
 	</div>
11 11
 	<!-- .event-datetimes -->
12 12
 <?php
13
-do_action( 'AHEE_event_details_after_event_date', $post );
13
+do_action('AHEE_event_details_after_event_date', $post);
14 14
 endif;
15 15
 ?>
16 16
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Serialized_Text_Field.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     public function __construct($table_column, $nicename, $nullable, $default_value = null)
20 20
     {
21 21
         parent::__construct($table_column, $nicename, $nullable, $default_value);
22
-        $this->setSchemaType(array('object','string'));
22
+        $this->setSchemaType(array('object', 'string'));
23 23
     }
24 24
 
25 25
 
Please login to merge, or discard this patch.
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -8,73 +8,73 @@
 block discarded – undo
8 8
  */
9 9
 class EE_Serialized_Text_Field extends EE_Text_Field_Base
10 10
 {
11
-    /**
12
-     * @param string $table_column
13
-     * @param string $nicename
14
-     * @param bool   $nullable
15
-     * @param null   $default_value
16
-     */
17
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
18
-    {
19
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
20
-        $this->setSchemaType(array('object','string'));
21
-    }
11
+	/**
12
+	 * @param string $table_column
13
+	 * @param string $nicename
14
+	 * @param bool   $nullable
15
+	 * @param null   $default_value
16
+	 */
17
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
18
+	{
19
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
20
+		$this->setSchemaType(array('object','string'));
21
+	}
22 22
 
23 23
 
24
-    /**
25
-     * Value SHOULD be an array, and we want to now convert it to a serialized string
26
-     *
27
-     * @param array $value_of_field_on_model_object
28
-     * @return string
29
-     */
30
-    public function prepare_for_use_in_db($value_of_field_on_model_object)
31
-    {
32
-        return maybe_serialize($value_of_field_on_model_object);
33
-    }
24
+	/**
25
+	 * Value SHOULD be an array, and we want to now convert it to a serialized string
26
+	 *
27
+	 * @param array $value_of_field_on_model_object
28
+	 * @return string
29
+	 */
30
+	public function prepare_for_use_in_db($value_of_field_on_model_object)
31
+	{
32
+		return maybe_serialize($value_of_field_on_model_object);
33
+	}
34 34
 
35
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
36
-    {
37
-        $value_inputted_for_field_on_model_object = EEH_Array::maybe_unserialize($value_inputted_for_field_on_model_object);
38
-        if (is_string($value_inputted_for_field_on_model_object)) {
39
-            return parent::prepare_for_set($value_inputted_for_field_on_model_object);
40
-        }
41
-        if (is_array($value_inputted_for_field_on_model_object)) {
42
-            return array_map(array($this, 'prepare_for_set'), $value_inputted_for_field_on_model_object);
43
-        }
44
-        // so they passed NULL or an INT or something wack
45
-        return $value_inputted_for_field_on_model_object;
46
-    }
35
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
36
+	{
37
+		$value_inputted_for_field_on_model_object = EEH_Array::maybe_unserialize($value_inputted_for_field_on_model_object);
38
+		if (is_string($value_inputted_for_field_on_model_object)) {
39
+			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
40
+		}
41
+		if (is_array($value_inputted_for_field_on_model_object)) {
42
+			return array_map(array($this, 'prepare_for_set'), $value_inputted_for_field_on_model_object);
43
+		}
44
+		// so they passed NULL or an INT or something wack
45
+		return $value_inputted_for_field_on_model_object;
46
+	}
47 47
 
48
-    /**
49
-     * Value provided should definetely be a serialized string. We should unserialize into an array
50
-     *
51
-     * @param string $value_found_in_db_for_model_object
52
-     * @return array
53
-     */
54
-    public function prepare_for_set_from_db($value_found_in_db_for_model_object)
55
-    {
56
-        return EEH_Array::maybe_unserialize($value_found_in_db_for_model_object);
57
-    }
48
+	/**
49
+	 * Value provided should definetely be a serialized string. We should unserialize into an array
50
+	 *
51
+	 * @param string $value_found_in_db_for_model_object
52
+	 * @return array
53
+	 */
54
+	public function prepare_for_set_from_db($value_found_in_db_for_model_object)
55
+	{
56
+		return EEH_Array::maybe_unserialize($value_found_in_db_for_model_object);
57
+	}
58 58
 
59
-    /**
60
-     * Gets a string representation of the array
61
-     *
62
-     * @param mixed       $value_on_field_to_be_outputted
63
-     * @param string|null $schema , possible values are ',', others can be added
64
-     * @return string
65
-     */
66
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
67
-    {
68
-        switch ($schema) {
69
-            case 'print_r':
70
-                $pretty_value = print_r($value_on_field_to_be_outputted, true);
71
-                break;
72
-            case 'as_table':
73
-                $pretty_value = EEH_Template::layout_array_as_table($value_on_field_to_be_outputted);
74
-                break;
75
-            default:
76
-                $pretty_value = implode(", ", $value_on_field_to_be_outputted);
77
-        }
78
-        return $pretty_value;
79
-    }
59
+	/**
60
+	 * Gets a string representation of the array
61
+	 *
62
+	 * @param mixed       $value_on_field_to_be_outputted
63
+	 * @param string|null $schema , possible values are ',', others can be added
64
+	 * @return string
65
+	 */
66
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
67
+	{
68
+		switch ($schema) {
69
+			case 'print_r':
70
+				$pretty_value = print_r($value_on_field_to_be_outputted, true);
71
+				break;
72
+			case 'as_table':
73
+				$pretty_value = EEH_Template::layout_array_as_table($value_on_field_to_be_outputted);
74
+				break;
75
+			default:
76
+				$pretty_value = implode(", ", $value_on_field_to_be_outputted);
77
+		}
78
+		return $pretty_value;
79
+	}
80 80
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_DB_Only_Float_Field.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -3,16 +3,16 @@
 block discarded – undo
3 3
 
4 4
 class EE_DB_Only_Float_Field extends EE_DB_Only_Field_Base
5 5
 {
6
-    /**
7
-     * @param string $table_column
8
-     * @param string $nicename
9
-     * @param bool   $nullable
10
-     * @param null   $default_value
11
-     */
12
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
13
-    {
14
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
15
-        $this->setSchemaType('number');
16
-    }
6
+	/**
7
+	 * @param string $table_column
8
+	 * @param string $nicename
9
+	 * @param bool   $nullable
10
+	 * @param null   $default_value
11
+	 */
12
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
13
+	{
14
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
15
+		$this->setSchemaType('number');
16
+	}
17 17
 
18 18
 }
Please login to merge, or discard this patch.