Completed
Pull Request — master (#605)
by Zack
05:22
created
includes/lib/class-gamajo-template-loader.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -76,15 +76,15 @@  discard block
 block discarded – undo
76 76
 	 *
77 77
 	 * @return string
78 78
 	 */
79
-	public function get_template_part( $slug, $name = null, $load = true ) {
79
+	public function get_template_part($slug, $name = null, $load = true) {
80 80
 		// Execute code for this part
81
-		do_action( 'get_template_part_' . $slug, $slug, $name );
81
+		do_action('get_template_part_'.$slug, $slug, $name);
82 82
 
83 83
 		// Get files names of templates, for given slug and name.
84
-		$templates = $this->get_template_file_names( $slug, $name );
84
+		$templates = $this->get_template_file_names($slug, $name);
85 85
 
86 86
 		// Return the part that is found
87
-		return $this->locate_template( $templates, $load, false );
87
+		return $this->locate_template($templates, $load, false);
88 88
 	}
89 89
 
90 90
 	/**
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 	 *
98 98
 	 * @return array
99 99
 	 */
100
-	protected function get_template_file_names( $slug, $name ) {
100
+	protected function get_template_file_names($slug, $name) {
101 101
 		$templates = array();
102
-		if ( isset( $name ) ) {
103
-			$templates[] = $slug . '-' . $name . '.php';
102
+		if (isset($name)) {
103
+			$templates[] = $slug.'-'.$name.'.php';
104 104
 		}
105
-		$templates[] = $slug . '.php';
105
+		$templates[] = $slug.'.php';
106 106
 
107 107
 		/**
108 108
 		 * Allow template choices to be filtered.
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		 * @param string $slug Template slug.
117 117
 		 * @param string $name Template name.
118 118
 		 */
119
-		return apply_filters( $this->filter_prefix . '_get_template_part', $templates, $slug, $name );
119
+		return apply_filters($this->filter_prefix.'_get_template_part', $templates, $slug, $name);
120 120
 	}
121 121
 
122 122
 	/**
@@ -137,30 +137,30 @@  discard block
 block discarded – undo
137 137
 	 *
138 138
 	 * @return string The template filename if one is located.
139 139
 	 */
140
-	public function locate_template( $template_names, $load = false, $require_once = true ) {
140
+	public function locate_template($template_names, $load = false, $require_once = true) {
141 141
 		// No file found yet
142 142
 		$located = false;
143 143
 
144 144
 		// Remove empty entries
145
-		$template_names = array_filter( (array) $template_names );
145
+		$template_names = array_filter((array)$template_names);
146 146
 		$template_paths = $this->get_template_paths();
147 147
 
148 148
 		// Try to find a template file
149
-		foreach ( $template_names as $template_name ) {
149
+		foreach ($template_names as $template_name) {
150 150
 			// Trim off any slashes from the template name
151
-			$template_name = ltrim( $template_name, '/' );
151
+			$template_name = ltrim($template_name, '/');
152 152
 
153 153
 			// Try locating this template file by looping through the template paths
154
-			foreach ( $template_paths as $template_path ) {
155
-				if ( file_exists( $template_path . $template_name ) ) {
156
-					$located = $template_path . $template_name;
154
+			foreach ($template_paths as $template_path) {
155
+				if (file_exists($template_path.$template_name)) {
156
+					$located = $template_path.$template_name;
157 157
 					break 2;
158 158
 				}
159 159
 			}
160 160
 		}
161 161
 
162
-		if ( $load && $located ) {
163
-			load_template( $located, $require_once );
162
+		if ($load && $located) {
163
+			load_template($located, $require_once);
164 164
 		}
165 165
 
166 166
 		return $located;
@@ -178,16 +178,16 @@  discard block
 block discarded – undo
178 178
 	 * @return mixed|void
179 179
 	 */
180 180
 	protected function get_template_paths() {
181
-		$theme_directory = trailingslashit( $this->theme_template_directory );
181
+		$theme_directory = trailingslashit($this->theme_template_directory);
182 182
 
183 183
 		$file_paths = array(
184
-			10  => trailingslashit( get_template_directory() ) . $theme_directory,
184
+			10  => trailingslashit(get_template_directory()).$theme_directory,
185 185
 			100 => $this->get_templates_dir()
186 186
 		);
187 187
 
188 188
 		// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
189
-		if ( is_child_theme() ) {
190
-			$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
189
+		if (is_child_theme()) {
190
+			$file_paths[1] = trailingslashit(get_stylesheet_directory()).$theme_directory;
191 191
 		}
192 192
 
193 193
 		/**
@@ -197,12 +197,12 @@  discard block
 block discarded – undo
197 197
 		 *
198 198
 		 * @param array $var Default is directory in child theme at index 1, parent theme at 10, and plugin at 100.
199 199
 		 */
200
-		$file_paths = apply_filters( $this->filter_prefix . '_template_paths', $file_paths );
200
+		$file_paths = apply_filters($this->filter_prefix.'_template_paths', $file_paths);
201 201
 
202 202
 		// sort the file paths based on priority
203
-		ksort( $file_paths, SORT_NUMERIC );
203
+		ksort($file_paths, SORT_NUMERIC);
204 204
 
205
-		return array_map( 'trailingslashit', $file_paths );
205
+		return array_map('trailingslashit', $file_paths);
206 206
 	}
207 207
 
208 208
 	/**
@@ -215,6 +215,6 @@  discard block
 block discarded – undo
215 215
 	 * @return string
216 216
 	 */
217 217
 	protected function get_templates_dir() {
218
-		return trailingslashit( $this->plugin_directory ) . $this->plugin_template_directory;
218
+		return trailingslashit($this->plugin_directory).$this->plugin_template_directory;
219 219
 	}
220 220
 }
Please login to merge, or discard this patch.
includes/load-plugin-and-theme-hooks.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,12 +14,12 @@
 block discarded – undo
14 14
 
15 15
 
16 16
 /** @define "GRAVITYVIEW_DIR" "../" */
17
-$include_path = GRAVITYVIEW_DIR . 'includes/plugin-and-theme-hooks/';
17
+$include_path = GRAVITYVIEW_DIR.'includes/plugin-and-theme-hooks/';
18 18
 
19 19
 // Abstract class
20
-require $include_path . 'abstract-gravityview-plugin-and-theme-hooks.php';
20
+require $include_path.'abstract-gravityview-plugin-and-theme-hooks.php';
21 21
 
22 22
 // Load all plugin and theme files automatically
23
-foreach ( glob( $include_path . 'class-gravityview-{plugin,theme}-hooks-*.php', GLOB_BRACE ) as $gv_hooks_filename ) {
23
+foreach (glob($include_path.'class-gravityview-{plugin,theme}-hooks-*.php', GLOB_BRACE) as $gv_hooks_filename) {
24 24
 	include $gv_hooks_filename;
25 25
 }
26 26
\ No newline at end of file
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-yoast-seo.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -56,16 +56,16 @@  discard block
 block discarded – undo
56 56
 
57 57
 		parent::add_hooks();
58 58
 
59
-		if( gravityview_is_admin_page() ) {
59
+		if (gravityview_is_admin_page()) {
60 60
 
61 61
 				// Make Yoast metabox go down to the bottom please.
62
-			add_filter( 'wpseo_metabox_prio', array( $this, '__return_low' ) );
62
+			add_filter('wpseo_metabox_prio', array($this, '__return_low'));
63 63
 
64 64
 			// Prevent the SEO from being checked. Eesh.
65
-			add_filter( 'wpseo_use_page_analysis', '__return_false' );
65
+			add_filter('wpseo_use_page_analysis', '__return_false');
66 66
 
67 67
 			// WordPress SEO Plugin
68
-			add_filter( 'option_wpseo_titles', array( $this, 'hide_wordpress_seo_metabox' ) );
68
+			add_filter('option_wpseo_titles', array($this, 'hide_wordpress_seo_metabox'));
69 69
 		}
70 70
 	}
71 71
 
@@ -79,11 +79,11 @@  discard block
 block discarded – undo
79 79
 	 * @param  array       $options WP SEO options array
80 80
 	 * @return array               Modified array if on post-new.php
81 81
 	 */
82
-	function hide_wordpress_seo_metabox( $options = array() ) {
82
+	function hide_wordpress_seo_metabox($options = array()) {
83 83
 		global $pagenow;
84 84
 
85 85
 		// New View page
86
-		if( $pagenow === 'post-new.php' ) {
86
+		if ($pagenow === 'post-new.php') {
87 87
 			$options['hideeditbox-gravityview'] = true;
88 88
 		}
89 89
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 * @param string $existing Existing priority. Default: `high`
100 100
 	 * @return string Returns 'low'
101 101
 	 */
102
-	function __return_low( $existing = 'high' ) {
102
+	function __return_low($existing = 'high') {
103 103
 		return 'low';
104 104
 	}
105 105
 }
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-woothemes.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
 		parent::add_hooks();
67 67
 
68
-		add_action( 'admin_menu', array( $this, 'remove_meta_box' ), 11 );
68
+		add_action('admin_menu', array($this, 'remove_meta_box'), 11);
69 69
 	}
70 70
 
71 71
 	/**
@@ -75,11 +75,11 @@  discard block
 block discarded – undo
75 75
 	function remove_meta_box() {
76 76
 		global $pagenow;
77 77
 
78
-		$gv_page = gravityview_is_admin_page( '', 'single' );
78
+		$gv_page = gravityview_is_admin_page('', 'single');
79 79
 
80 80
 		// New View or Edit View page
81
-		if( $gv_page && $pagenow === 'post-new.php' ) {
82
-			remove_meta_box( 'woothemes-settings', 'gravityview', 'normal' );
81
+		if ($gv_page && $pagenow === 'post-new.php') {
82
+			remove_meta_box('woothemes-settings', 'gravityview', 'normal');
83 83
 		}
84 84
 	}
85 85
 
Please login to merge, or discard this patch.
includes/presets/business-data/class-gravityview-preset-business-data.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,15 +21,15 @@
 block discarded – undo
21 21
 		$settings = array(
22 22
 			'slug'          => 'table',
23 23
 			'type'          => 'preset',
24
-			'label'         => __( 'Business Data', 'gravityview' ),
25
-			'description'   => __( 'Display business information in a table.', 'gravityview' ),
26
-			'logo'          => plugins_url( 'includes/presets/business-data/logo-business-data.png', GRAVITYVIEW_FILE ),
24
+			'label'         => __('Business Data', 'gravityview'),
25
+			'description'   => __('Display business information in a table.', 'gravityview'),
26
+			'logo'          => plugins_url('includes/presets/business-data/logo-business-data.png', GRAVITYVIEW_FILE),
27 27
 			'preview'       => 'http://demo.gravityview.co/blog/view/business-table/',
28
-			'preset_form'   => GRAVITYVIEW_DIR . 'includes/presets/business-data/form-business-data.xml',
29
-			'preset_fields' => GRAVITYVIEW_DIR . 'includes/presets/business-data/fields-business-data.xml'
28
+			'preset_form'   => GRAVITYVIEW_DIR.'includes/presets/business-data/form-business-data.xml',
29
+			'preset_fields' => GRAVITYVIEW_DIR.'includes/presets/business-data/fields-business-data.xml'
30 30
 		);
31 31
 
32
-		parent::__construct( $id, $settings );
32
+		parent::__construct($id, $settings);
33 33
 	}
34 34
 }
35 35
 
Please login to merge, or discard this patch.
presets/business-listings/class-gravityview-preset-business-listings.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,15 +21,15 @@
 block discarded – undo
21 21
 		$settings = array(
22 22
 			'slug'          => 'list',
23 23
 			'type'          => 'preset',
24
-			'label'         => __( 'Business Listings', 'gravityview' ),
25
-			'description'   => __( 'Display business profiles.', 'gravityview' ),
26
-			'logo'          => plugins_url( 'includes/presets/business-listings/logo-business-listings.png', GRAVITYVIEW_FILE ),
24
+			'label'         => __('Business Listings', 'gravityview'),
25
+			'description'   => __('Display business profiles.', 'gravityview'),
26
+			'logo'          => plugins_url('includes/presets/business-listings/logo-business-listings.png', GRAVITYVIEW_FILE),
27 27
 			'preview'       => 'http://demo.gravityview.co/blog/view/business-listings/',
28
-			'preset_form'   => GRAVITYVIEW_DIR . 'includes/presets/business-listings/form-business-listings.xml',
29
-			'preset_fields' => GRAVITYVIEW_DIR . 'includes/presets/business-listings/fields-business-listings.xml'
28
+			'preset_form'   => GRAVITYVIEW_DIR.'includes/presets/business-listings/form-business-listings.xml',
29
+			'preset_fields' => GRAVITYVIEW_DIR.'includes/presets/business-listings/fields-business-listings.xml'
30 30
 		);
31 31
 
32
-		parent::__construct( $id, $settings );
32
+		parent::__construct($id, $settings);
33 33
 
34 34
 	}
35 35
 }
Please login to merge, or discard this patch.
includes/presets/default-edit/class-gravityview-default-template-edit.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -18,18 +18,18 @@  discard block
 block discarded – undo
18 18
  */
19 19
 class GravityView_Default_Template_Edit extends GravityView_Template {
20 20
 
21
-	function __construct( $id = 'default_table_edit', $settings = array(), $field_options = array(), $areas = array() ) {
21
+	function __construct($id = 'default_table_edit', $settings = array(), $field_options = array(), $areas = array()) {
22 22
 
23 23
 		$edit_settings = array(
24 24
 			'slug' => 'edit',
25 25
 			'type' => 'internal',
26
-			'label' =>  __( 'Edit Table', 'gravityview' ),
26
+			'label' =>  __('Edit Table', 'gravityview'),
27 27
 			'description' => __('Display items in a table view.', 'gravityview'),
28 28
 			'logo' => plugins_url('includes/presets/default-table/logo-default-table.png', GRAVITYVIEW_FILE),
29 29
 			'css_source' => plugins_url('templates/css/table-view.css', GRAVITYVIEW_FILE),
30 30
 		);
31 31
 
32
-		$settings = wp_parse_args( $settings, $edit_settings );
32
+		$settings = wp_parse_args($settings, $edit_settings);
33 33
 
34 34
 		/**
35 35
 		 * @see  GravityView_Admin_Views::get_default_field_options() for Generic Field Options
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
42 42
 				'1-1' => array(
43 43
 					array(
44 44
 						'areaid' => 'edit-fields',
45
-						'title' => __('Visible Edit Fields', 'gravityview' )
45
+						'title' => __('Visible Edit Fields', 'gravityview')
46 46
 					)
47 47
 				)
48 48
 			)
49 49
 		);
50 50
 
51 51
 
52
-		parent::__construct( $id, $settings, $field_options, $areas );
52
+		parent::__construct($id, $settings, $field_options, $areas);
53 53
 
54 54
 	}
55 55
 
Please login to merge, or discard this patch.
includes/presets/default-list/class-gravityview-default-template-list.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -6,23 +6,23 @@  discard block
 block discarded – undo
6 6
  */
7 7
 class GravityView_Default_Template_List extends GravityView_Template {
8 8
 
9
-	function __construct( $id = 'default_list', $settings = array(), $field_options = array(), $areas = array() ) {
9
+	function __construct($id = 'default_list', $settings = array(), $field_options = array(), $areas = array()) {
10 10
 
11 11
 		$list_settings = array(
12 12
 			'slug'        => 'list',
13 13
 			'type'        => 'custom',
14
-			'label'       => __( 'List (default)', 'gravityview' ),
15
-			'description' => __( 'Display items in a listing view.', 'gravityview' ),
16
-			'logo'        => plugins_url( 'includes/presets/default-list/logo-default-list.png', GRAVITYVIEW_FILE ),
17
-			'css_source'  => plugins_url( 'templates/css/list-view.css', GRAVITYVIEW_FILE ),
14
+			'label'       => __('List (default)', 'gravityview'),
15
+			'description' => __('Display items in a listing view.', 'gravityview'),
16
+			'logo'        => plugins_url('includes/presets/default-list/logo-default-list.png', GRAVITYVIEW_FILE),
17
+			'css_source'  => plugins_url('templates/css/list-view.css', GRAVITYVIEW_FILE),
18 18
 		);
19 19
 
20
-		$settings = wp_parse_args( $settings, $list_settings );
20
+		$settings = wp_parse_args($settings, $list_settings);
21 21
 
22 22
 		$field_options = array(
23 23
 			'show_as_link' => array(
24 24
 				'type'    => 'checkbox',
25
-				'label'   => __( 'Link to single entry', 'gravityview' ),
25
+				'label'   => __('Link to single entry', 'gravityview'),
26 26
 				'value'   => false,
27 27
 				'context' => 'directory'
28 28
 			),
@@ -33,27 +33,27 @@  discard block
 block discarded – undo
33 33
 				'1-1' => array(
34 34
 					array(
35 35
 						'areaid'   => 'list-title',
36
-						'title'    => __( 'Listing Title', 'gravityview' ),
36
+						'title'    => __('Listing Title', 'gravityview'),
37 37
 						'subtitle' => ''
38 38
 					),
39 39
 					array(
40 40
 						'areaid'   => 'list-subtitle',
41
-						'title'    => __( 'Subheading', 'gravityview' ),
42
-						'subtitle' => __( 'Data placed here will be bold.', 'gravityview' ),
41
+						'title'    => __('Subheading', 'gravityview'),
42
+						'subtitle' => __('Data placed here will be bold.', 'gravityview'),
43 43
 					),
44 44
 				),
45 45
 				'1-3' => array(
46 46
 					array(
47 47
 						'areaid'   => 'list-image',
48
-						'title'    => __( 'Image', 'gravityview' ),
49
-						'subtitle' => __( 'Leave empty to remove.', 'gravityview' ),
48
+						'title'    => __('Image', 'gravityview'),
49
+						'subtitle' => __('Leave empty to remove.', 'gravityview'),
50 50
 					)
51 51
 				),
52 52
 				'2-3' => array(
53 53
 					array(
54 54
 						'areaid'   => 'list-description',
55
-						'title'    => __( 'Other Fields', 'gravityview' ),
56
-						'subtitle' => __( 'Below the subheading, a good place for description and other data.', 'gravityview' ),
55
+						'title'    => __('Other Fields', 'gravityview'),
56
+						'subtitle' => __('Below the subheading, a good place for description and other data.', 'gravityview'),
57 57
 					)
58 58
 				)
59 59
 			),
@@ -61,21 +61,21 @@  discard block
 block discarded – undo
61 61
 				'1-2' => array(
62 62
 					array(
63 63
 						'areaid'   => 'list-footer-left',
64
-						'title'    => __( 'Footer Left', 'gravityview' ),
64
+						'title'    => __('Footer Left', 'gravityview'),
65 65
 						'subtitle' => ''
66 66
 					)
67 67
 				),
68 68
 				'2-2' => array(
69 69
 					array(
70 70
 						'areaid'   => 'list-footer-right',
71
-						'title'    => __( 'Footer Right', 'gravityview' ),
71
+						'title'    => __('Footer Right', 'gravityview'),
72 72
 						'subtitle' => ''
73 73
 					)
74 74
 				)
75 75
 			)
76 76
 		);
77 77
 
78
-		parent::__construct( $id, $settings, $field_options, $areas );
78
+		parent::__construct($id, $settings, $field_options, $areas);
79 79
 
80 80
 	}
81 81
 }
Please login to merge, or discard this patch.
includes/presets/default-table/class-gravityview-default-template-table.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -6,18 +6,18 @@  discard block
 block discarded – undo
6 6
  */
7 7
 class GravityView_Default_Template_Table extends GravityView_Template {
8 8
 
9
-	function __construct( $id = 'default_table', $settings = array(), $field_options = array(), $areas = array() ) {
9
+	function __construct($id = 'default_table', $settings = array(), $field_options = array(), $areas = array()) {
10 10
 
11 11
 		$table_settings = array(
12 12
 			'slug'        => 'table',
13 13
 			'type'        => 'custom',
14
-			'label'       => __( 'Table (default)', 'gravityview' ),
15
-			'description' => __( 'Display items in a table view.', 'gravityview' ),
16
-			'logo'        => plugins_url( 'includes/presets/default-table/logo-default-table.png', GRAVITYVIEW_FILE ),
17
-			'css_source'  => plugins_url( 'templates/css/table-view.css', GRAVITYVIEW_FILE ),
14
+			'label'       => __('Table (default)', 'gravityview'),
15
+			'description' => __('Display items in a table view.', 'gravityview'),
16
+			'logo'        => plugins_url('includes/presets/default-table/logo-default-table.png', GRAVITYVIEW_FILE),
17
+			'css_source'  => plugins_url('templates/css/table-view.css', GRAVITYVIEW_FILE),
18 18
 		);
19 19
 
20
-		$settings = wp_parse_args( $settings, $table_settings );
20
+		$settings = wp_parse_args($settings, $table_settings);
21 21
 
22 22
 		/**
23 23
 		 * @see  GravityView_Admin_Views::get_default_field_options() for Generic Field Options
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 		$field_options = array(
27 27
 			'show_as_link' => array(
28 28
 				'type'    => 'checkbox',
29
-				'label'   => __( 'Link to single entry', 'gravityview' ),
29
+				'label'   => __('Link to single entry', 'gravityview'),
30 30
 				'value'   => false,
31 31
 				'context' => 'directory'
32 32
 			),
@@ -37,15 +37,15 @@  discard block
 block discarded – undo
37 37
 				'1-1' => array(
38 38
 					array(
39 39
 						'areaid'   => 'table-columns',
40
-						'title'    => __( 'Visible Table Columns', 'gravityview' ),
41
-						'subtitle' => __( 'Each field will be displayed as a column in the table.', 'gravityview' ),
40
+						'title'    => __('Visible Table Columns', 'gravityview'),
41
+						'subtitle' => __('Each field will be displayed as a column in the table.', 'gravityview'),
42 42
 					)
43 43
 				)
44 44
 			)
45 45
 		);
46 46
 
47 47
 
48
-		parent::__construct( $id, $settings, $field_options, $areas );
48
+		parent::__construct($id, $settings, $field_options, $areas);
49 49
 
50 50
 	}
51 51
 }
Please login to merge, or discard this patch.