Completed
Branch FET-8365-add-indexes (4b9253)
by
unknown
527:08 queued 512:28
created
core/db_models/fields/EE_Primary_Key_Int_Field.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Primary_Key_Field_Base.php');
3
-class EE_Primary_Key_Int_Field extends EE_Primary_Key_Field_Base{
4
-	function get_wpdb_data_type(){
2
+require_once(EE_MODELS.'fields/EE_Primary_Key_Field_Base.php');
3
+class EE_Primary_Key_Int_Field extends EE_Primary_Key_Field_Base {
4
+	function get_wpdb_data_type() {
5 5
 		return '%d';
6 6
 	}
7 7
 	public function __construct($table_column, $nicename) {
8 8
 		parent::__construct($table_column, $nicename, 0);
9 9
 	}
10 10
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
11
-		if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){
11
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
12 12
 			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
13 13
 		}
14 14
 		return absint($value_inputted_for_field_on_model_object);
Please login to merge, or discard this patch.
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -4,6 +4,10 @@
 block discarded – undo
4 4
 	function get_wpdb_data_type(){
5 5
 		return '%s';
6 6
 	}
7
+
8
+	/**
9
+	 * @param string $table_column
10
+	 */
7 11
 	public function __construct($table_column, $nicename) {
8 12
 		parent::__construct($table_column, $nicename, NULL);
9 13
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Serialized_Text_Field.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
7 7
  * However, when inserting into the DB, it should be serialized.
8 8
  * Upon retrieval from the DB, it should be unserialized back into an array.
9 9
  */
10
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
11
-class EE_Serialized_Text_Field extends EE_Text_Field_Base{
10
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
11
+class EE_Serialized_Text_Field extends EE_Text_Field_Base {
12 12
 	/**
13 13
 	 * Value SHOULD be an array, and we want to now convert it to a serialized string
14 14
 	 * @param array $value_of_field_on_model_object
@@ -18,11 +18,11 @@  discard block
 block discarded – undo
18 18
 		return maybe_serialize($value_of_field_on_model_object);
19 19
 	}
20 20
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
21
-		if(is_string($value_inputted_for_field_on_model_object)){
21
+		if (is_string($value_inputted_for_field_on_model_object)) {
22 22
 			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
23
-		}elseif(is_array($value_inputted_for_field_on_model_object)){
24
-			return array_map(array($this,'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
-		}else{//so they passed NULL or an INT or something wack
23
+		}elseif (is_array($value_inputted_for_field_on_model_object)) {
24
+			return array_map(array($this, 'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
+		} else {//so they passed NULL or an INT or something wack
26 26
 			return $value_inputted_for_field_on_model_object;
27 27
 		}
28 28
 	}
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		//it's possible that this still has serialized data if its the session.  WP has a bug, http://core.trac.wordpress.org/ticket/26118 that doesnt' unserialize this automatically.
37 37
 		$token = 'C';
38 38
 		$data = is_string($data) ? trim($data) : $data;
39
-		if ( is_string($data) && strlen($data) > 1 && $data[0] == $token  && preg_match( "/^{$token}:[0-9]+:/s", $data ) ) {
39
+		if (is_string($data) && strlen($data) > 1 && $data[0] == $token && preg_match("/^{$token}:[0-9]+:/s", $data)) {
40 40
 			return unserialize($data);
41 41
 		} else {
42 42
 			return $data;
@@ -50,16 +50,16 @@  discard block
 block discarded – undo
50 50
 	 * @return string
51 51
 	 */
52 52
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
53
-		switch($schema){
53
+		switch ($schema) {
54 54
 			case 'print_r':
55
-				$pretty_value = print_r($value_on_field_to_be_outputted,true);
55
+				$pretty_value = print_r($value_on_field_to_be_outputted, true);
56 56
 				break;
57 57
 			case 'as_table':
58 58
 				EE_Registry::instance()->load_helper('Template');
59 59
 				$pretty_value = EEH_Template::layout_array_as_table($value_on_field_to_be_outputted);
60 60
 				break;
61 61
 			default:
62
-				$pretty_value = implode(", ",$value_on_field_to_be_outputted);
62
+				$pretty_value = implode(", ", $value_on_field_to_be_outputted);
63 63
 		}
64 64
 		return $pretty_value;
65 65
 	}
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@
 block discarded – undo
20 20
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
21 21
 		if(is_string($value_inputted_for_field_on_model_object)){
22 22
 			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
23
-		}elseif(is_array($value_inputted_for_field_on_model_object)){
23
+		} elseif(is_array($value_inputted_for_field_on_model_object)){
24 24
 			return array_map(array($this,'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
-		}else{//so they passed NULL or an INT or something wack
25
+		} else{//so they passed NULL or an INT or something wack
26 26
 			return $value_inputted_for_field_on_model_object;
27 27
 		}
28 28
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Simple_HTML_Field.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
3 3
 /**
4
- * Only allows a select, small number of html tags: a,abbr,acronym,b,blockquote,cite,code,del,em,i,q,strike,strong,ol,ul,li
5
- * If you want more use EE_Post_Content_Field, or if you want to allow ALL, use EE_Full_HTML_Field.
6
- * If you want NONE, use EE_Plain_Text_Field.
7
- */
4
+	 * Only allows a select, small number of html tags: a,abbr,acronym,b,blockquote,cite,code,del,em,i,q,strike,strong,ol,ul,li
5
+	 * If you want more use EE_Post_Content_Field, or if you want to allow ALL, use EE_Full_HTML_Field.
6
+	 * If you want NONE, use EE_Plain_Text_Field.
7
+	 */
8 8
 class EE_Simple_HTML_Field extends EE_Text_Field_Base{
9 9
 	/**
10 10
 	 * removes all tags when setting
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3 3
 /**
4 4
  * Only allows a select, small number of html tags: a,abbr,acronym,b,blockquote,cite,code,del,em,i,q,strike,strong,ol,ul,li
5 5
  * If you want more use EE_Post_Content_Field, or if you want to allow ALL, use EE_Full_HTML_Field.
6 6
  * If you want NONE, use EE_Plain_Text_Field.
7 7
  */
8
-class EE_Simple_HTML_Field extends EE_Text_Field_Base{
8
+class EE_Simple_HTML_Field extends EE_Text_Field_Base {
9 9
 	/**
10 10
 	 * removes all tags when setting
11 11
 	 * @param string $value_inputted_for_field_on_model_object
@@ -13,10 +13,10 @@  discard block
 block discarded – undo
13 13
 	 */
14 14
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
15 15
 		global $allowedtags;
16
-		$allowedtags['ol']=array();
17
-		$allowedtags['ul']=array();
18
-		$allowedtags['li']=array();
19
-		$value_with_select_tags =  wp_kses("$value_inputted_for_field_on_model_object",$allowedtags);
16
+		$allowedtags['ol'] = array();
17
+		$allowedtags['ul'] = array();
18
+		$allowedtags['li'] = array();
19
+		$value_with_select_tags = wp_kses("$value_inputted_for_field_on_model_object", $allowedtags);
20 20
 		return parent::prepare_for_set($value_with_select_tags);
21 21
 	}
22 22
 
Please login to merge, or discard this patch.
core/db_models/fields/EE_Slug_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
3
-class EE_Slug_Field extends EE_Text_Field_Base{
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3
+class EE_Slug_Field extends EE_Text_Field_Base {
4 4
 	/**
5 5
 	 * ensures string is usable in URLs
6 6
 	 * @param string $value_inputted_for_field_on_model_object
Please login to merge, or discard this patch.
core/db_models/fields/EE_Text_Field_Base.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
4
- */
3
+	 * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
4
+	 */
5 5
 abstract class EE_Text_Field_Base extends EE_Model_Field_Base{
6 6
 	function get_wpdb_data_type(){
7 7
 		return '%s';
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,13 +2,13 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
4 4
  */
5
-abstract class EE_Text_Field_Base extends EE_Model_Field_Base{
6
-	function get_wpdb_data_type(){
5
+abstract class EE_Text_Field_Base extends EE_Model_Field_Base {
6
+	function get_wpdb_data_type() {
7 7
 		return '%s';
8 8
 	}
9 9
 
10
-	function prepare_for_get( $value_of_field_on_model_object ) {
11
-		return is_string($value_of_field_on_model_object) ? stripslashes( $value_of_field_on_model_object ) : $value_of_field_on_model_object;
10
+	function prepare_for_get($value_of_field_on_model_object) {
11
+		return is_string($value_of_field_on_model_object) ? stripslashes($value_of_field_on_model_object) : $value_of_field_on_model_object;
12 12
 	}
13 13
 	
14 14
 	/**
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 * @return string
19 19
 	 */
20 20
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
21
-		if($schema=='form_input'){
21
+		if ($schema == 'form_input') {
22 22
 			$value_on_field_to_be_outputted = htmlentities($value_on_field_to_be_outputted, ENT_QUOTES, 'UTF-8');
23 23
 		}
24 24
 		return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
@@ -30,6 +30,6 @@  discard block
 block discarded – undo
30 30
 	 * @return string
31 31
 	 */
32 32
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
33
-		return stripslashes(html_entity_decode(parent::prepare_for_set($value_inputted_for_field_on_model_object),ENT_QUOTES,'UTF-8'));
33
+		return stripslashes(html_entity_decode(parent::prepare_for_set($value_inputted_for_field_on_model_object), ENT_QUOTES, 'UTF-8'));
34 34
 	}
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Trashed_Flag_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Boolean_Field.php');
3
-class EE_Trashed_Flag_Field extends EE_Boolean_Field{
2
+require_once(EE_MODELS.'fields/EE_Boolean_Field.php');
3
+class EE_Trashed_Flag_Field extends EE_Boolean_Field {
4 4
 	//note: some client code simply checks if a field IS an EE_Trashed_Flag_Field
5 5
 	//...otherwise, these fields are mostly the same as boolean fields
6 6
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_WP_Post_Type_Field.php.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * For CPT models who have a post type field
4
- */
3
+	 * For CPT models who have a post type field
4
+	 */
5 5
 class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field{
6 6
 	/**
7 7
 	 * 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,13 +2,13 @@
 block discarded – undo
2 2
 /**
3 3
  * For CPT models who have a post type field
4 4
  */
5
-class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field{
5
+class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field {
6 6
 	/**
7 7
 	 * 
8 8
 	 * @param string $post_type the exact string to be used for the post type
9 9
 	 * of all these post type model objects/rows
10 10
 	 */
11
-	function __construct($post_type){
11
+	function __construct($post_type) {
12 12
 		parent::__construct('post_type', __("Post Type", 'event_espresso'), false, $post_type);
13 13
 	}
14 14
 }
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_WP_User_Field.php 3 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -1,30 +1,30 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2 2
 /**
3
- * Event Espresso
4
- *
5
- * Event Registration and Management Plugin for WordPress
6
- *
7
- * @ package			Event Espresso
8
- * @ author 			Event Espresso
9
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
10
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
11
- * @ link					http://www.eventespresso.com
12
- * @ version		 	4.0
13
- *
14
- * ------------------------------------------------------------------------
15
- *
16
- * EE_WP_User_Field
17
- *
18
- * @package			Event Espresso
19
- * @subpackage 	/core/db_models/fields
20
- * @author				Mike Nelson
21
- *
22
- * Child of EE_Foreign_key_Int_Field, except dynamically gets the default value
23
- * from get_current_user_id(), and no need to specify which models this field points to
24
- * because it always points to WP_User model
25
- *
26
- * ------------------------------------------------------------------------
27
- */
3
+	 * Event Espresso
4
+	 *
5
+	 * Event Registration and Management Plugin for WordPress
6
+	 *
7
+	 * @ package			Event Espresso
8
+	 * @ author 			Event Espresso
9
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
10
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
11
+	 * @ link					http://www.eventespresso.com
12
+	 * @ version		 	4.0
13
+	 *
14
+	 * ------------------------------------------------------------------------
15
+	 *
16
+	 * EE_WP_User_Field
17
+	 *
18
+	 * @package			Event Espresso
19
+	 * @subpackage 	/core/db_models/fields
20
+	 * @author				Mike Nelson
21
+	 *
22
+	 * Child of EE_Foreign_key_Int_Field, except dynamically gets the default value
23
+	 * from get_current_user_id(), and no need to specify which models this field points to
24
+	 * because it always points to WP_User model
25
+	 *
26
+	 * ------------------------------------------------------------------------
27
+	 */
28 28
 class EE_WP_User_Field extends EE_Foreign_Key_Int_Field{
29 29
 	/**
30 30
 	 * No need to provide a default or the model pointed to- the default is
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_WP_User_Field extends EE_Foreign_Key_Int_Field{
28
+class EE_WP_User_Field extends EE_Foreign_Key_Int_Field {
29 29
 	/**
30 30
 	 * No need to provide a default or the model pointed to- the default is
31 31
 	 * always get_current_user_id() and the model pointed to is always WP_User
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 	 * @param string $nicename should eb internationalized with __('blah','event_espresso')
34 34
 	 * @param boolean $nullable
35 35
 	 */
36
-	function __construct($table_column, $nicename, $nullable){
37
-		parent::__construct($table_column, $nicename, $nullable, null, 'WP_User' );
36
+	function __construct($table_column, $nicename, $nullable) {
37
+		parent::__construct($table_column, $nicename, $nullable, null, 'WP_User');
38 38
 	}
39 39
 
40 40
 	/**
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
 	 * constructing the model field because that's done before $current_user is set
43 43
 	 * @return mixed
44 44
 	 */
45
-	function get_default_value(){
46
-		if( did_action( 'init' ) ) {
45
+	function get_default_value() {
46
+		if (did_action('init')) {
47 47
 			return get_current_user_id();
48
-		}else{
49
-			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __( 'You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso' ), '4.6.20' );
48
+		} else {
49
+			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __('You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso'), '4.6.20');
50 50
 			return 1;
51 51
 		}
52 52
 	}
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@  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')) {
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
core/db_models/helpers/EE_Index.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -4,18 +4,18 @@  discard block
 block discarded – undo
4 4
  * Parent class for indicating indexes on models. As of writing this, it is only used
5 5
  * when deleting model objects that have no primary key, but clearly this can be expanded
6 6
  */
7
-class EE_Index{
7
+class EE_Index {
8 8
 	protected $_name;
9 9
 	protected $_field_names;
10 10
 	protected $_model_name;
11
-	public function __construct($fields){
11
+	public function __construct($fields) {
12 12
 		$this->_field_names = $fields;
13 13
 	}
14
-	public function _construct_finalize($name,$model_name){
14
+	public function _construct_finalize($name, $model_name) {
15 15
 		$this->_name = $name;
16 16
 		$this->_model_name = $model_name;
17 17
 	}
18
-	public function field_names(){
18
+	public function field_names() {
19 19
 		return $this->_field_names;
20 20
 	}
21 21
 	/**
@@ -23,19 +23,19 @@  discard block
 block discarded – undo
23 23
 	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
24 24
 	 * @return EEM_Base
25 25
 	 */
26
-	protected function _get_model($model_name){
27
-		$modelInstance=call_user_func("EEM_".$model_name."::instance");
26
+	protected function _get_model($model_name) {
27
+		$modelInstance = call_user_func("EEM_".$model_name."::instance");
28 28
 		return $modelInstance;
29 29
 	}
30 30
 	/**
31 31
 	 * Gets all the fields for this index
32 32
 	 * @return EE_Model_Field_Base[]
33 33
 	 */
34
-	public function fields(){
34
+	public function fields() {
35 35
 		$fields = array();
36 36
 		$model = $this->_get_model($this->_model_name);
37
-		foreach($model->field_settings() as $field_name => $field_obj){
38
-			if(in_array($field_name,$this->field_names())){
37
+		foreach ($model->field_settings() as $field_name => $field_obj) {
38
+			if (in_array($field_name, $this->field_names())) {
39 39
 				$fields[$field_name] = $field_obj;
40 40
 			}
41 41
 		}
Please login to merge, or discard this patch.