Completed
Pull Request — develop (#1572)
by Zack
19:45
created
includes/fields/class-gravityview-field-website.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -31,16 +31,16 @@  discard block
 block discarded – undo
31 31
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
32 32
 
33 33
 		// It makes no sense to use this as the link.
34
-		unset( $field_options['show_as_link'] );
34
+		unset( $field_options[ 'show_as_link' ] );
35 35
 
36
-		if( 'edit' === $context ) {
36
+		if ( 'edit' === $context ) {
37 37
 			return $field_options;
38 38
 		}
39 39
 
40 40
 		/**
41 41
 		 * @since 1.8
42 42
 		 */
43
-		$field_options['anchor_text'] = array(
43
+		$field_options[ 'anchor_text' ] = array(
44 44
 			'type' => 'text',
45 45
 			'label' => __( 'Link Text:', 'gravityview' ),
46 46
 			'desc' => __( 'Define custom link text. Leave blank to display the URL', 'gravityview' ),
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 			'priority' => 1000,
50 50
 		);
51 51
 
52
-		$field_options['truncatelink'] = array(
52
+		$field_options[ 'truncatelink' ] = array(
53 53
 			'type' => 'checkbox',
54 54
 			'value' => true,
55 55
 			'label' => __( 'Shorten Link Display', 'gravityview' ),
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 		 * Set default to opening in new links for back-compatibility with Version 1.5.1
65 65
 		 * @link https://github.com/gravityview/GravityView/commit/e12e76e2d032754227728d41e65103042d4f75ec
66 66
 		 */
67
-		$field_options['new_window']['value'] = true;
68
-		$field_options['new_window']['priority'] = 2000;
67
+		$field_options[ 'new_window' ][ 'value' ] = true;
68
+		$field_options[ 'new_window' ][ 'priority' ] = 2000;
69 69
 
70 70
 		return $field_options;
71 71
 	}
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-admin.php 2 patches
Indentation   +139 added lines, -139 removed lines patch added patch discarded remove patch
@@ -10,42 +10,42 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 if ( ! defined( 'WPINC' ) ) {
13
-    die;
13
+	die;
14 14
 }
15 15
 
16 16
 
17 17
 class GravityView_Edit_Entry_Admin {
18 18
 
19
-    protected $loader;
19
+	protected $loader;
20 20
 
21
-    function __construct( GravityView_Edit_Entry $loader ) {
22
-        $this->loader = $loader;
23
-    }
21
+	function __construct( GravityView_Edit_Entry $loader ) {
22
+		$this->loader = $loader;
23
+	}
24 24
 
25
-    function load() {
25
+	function load() {
26 26
 
27
-        if( !is_admin() ) {
28
-            return;
29
-        }
27
+		if( !is_admin() ) {
28
+			return;
29
+		}
30 30
 
31
-        // Add Edit Link as a default field, outside those set in the Gravity Form form
32
-        add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
31
+		// Add Edit Link as a default field, outside those set in the Gravity Form form
32
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
33 33
 
34
-        // For the Edit Entry Link, you don't want visible to all users.
35
-        add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
34
+		// For the Edit Entry Link, you don't want visible to all users.
35
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
36 36
 
37
-        // Modify the field options based on the name of the field type
38
-        add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
37
+		// Modify the field options based on the name of the field type
38
+		add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
39 39
 
40
-        // add tooltips
41
-        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
40
+		// add tooltips
41
+		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
42 42
 
43
-        // custom fields' options for zone EDIT
44
-        add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 );
43
+		// custom fields' options for zone EDIT
44
+		add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 );
45 45
 
46
-        // Add Edit Entry settings to View Settings
47
-        add_action( 'gravityview/metaboxes/edit_entry', array( $this, 'view_settings_metabox' ) );
48
-    }
46
+		// Add Edit Entry settings to View Settings
47
+		add_action( 'gravityview/metaboxes/edit_entry', array( $this, 'view_settings_metabox' ) );
48
+	}
49 49
 
50 50
 	/**
51 51
 	 * Render Edit Entry View metabox settings
@@ -69,101 +69,101 @@  discard block
 block discarded – undo
69 69
 		GravityView_Render_Settings::render_setting_row( 'edit_redirect_url', $current_settings );
70 70
 	}
71 71
 
72
-    /**
73
-     * Add Edit Link as a default field, outside those set in the Gravity Form form
74
-     * @param array $entry_default_fields Existing fields
75
-     * @param  string|array $form form_ID or form object
76
-     * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
77
-     */
78
-    function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
79
-
80
-        if( $zone !== 'edit' ) {
81
-
82
-            $entry_default_fields['edit_link'] = array(
83
-                'label' => __('Link to Edit Entry', 'gravityview'),
84
-                'type' => 'edit_link',
85
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
86
-                'icon' => 'dashicons-welcome-write-blog',
87
-            );
88
-
89
-        }
90
-
91
-        return $entry_default_fields;
92
-    }
93
-
94
-    /**
95
-     * Change wording for the Edit context to read Entry Creator
96
-     *
97
-     * @param  array 	   $visibility_caps        Array of capabilities to display in field dropdown.
98
-     * @param  string      $field_type  Type of field options to render (`field` or `widget`)
99
-     * @param  string      $template_id Table slug
100
-     * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
101
-     * @param  string      $context     What context are we in? Example: `single` or `directory`
102
-     * @param  string      $input_type  (textarea, list, select, etc.)
103
-     * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
104
-     */
105
-    function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
106
-
107
-        $caps = $visibility_caps;
108
-
109
-        // If we're configuring fields in the edit context, we want a limited selection
110
-        if( $context === 'edit' ) {
111
-
112
-            // Remove other built-in caps.
113
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
114
-
115
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
116
-        }
117
-
118
-        return $caps;
119
-    }
120
-
121
-    /**
122
-     * Add "Edit Link Text" setting to the edit_link field settings
123
-     *
124
-     * @param array  $field_options
125
-     * @param string $template_id
126
-     * @param string $field_id
127
-     * @param string $context
128
-     * @param string $input_type
129
-     *
130
-     * @return array $field_options, with "Edit Link Text" field option
131
-     */
132
-    function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
133
-
134
-        // Always a link, never a filter
135
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
136
-
137
-        // Edit Entry link should only appear to visitors capable of editing entries
138
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
139
-
140
-        $add_option['edit_link'] = array(
141
-            'type' => 'text',
142
-            'label' => __( 'Edit Link Text', 'gravityview' ),
143
-            'desc' => NULL,
144
-            'value' => __('Edit Entry', 'gravityview'),
145
-            'merge_tags' => true,
146
-        );
147
-
148
-        return array_merge( $add_option, $field_options );
149
-    }
150
-
151
-    /**
152
-     * Add tooltips
153
-     * @param  array $tooltips Existing tooltips
154
-     * @return array           Modified tooltips
155
-     */
156
-    function tooltips( $tooltips ) {
157
-
158
-        $return = $tooltips;
159
-
160
-        $return['allow_edit_cap'] = array(
161
-            'title' => __('Limiting Edit Access', 'gravityview'),
162
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
163
-        );
164
-
165
-        return $return;
166
-    }
72
+	/**
73
+	 * Add Edit Link as a default field, outside those set in the Gravity Form form
74
+	 * @param array $entry_default_fields Existing fields
75
+	 * @param  string|array $form form_ID or form object
76
+	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
77
+	 */
78
+	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
79
+
80
+		if( $zone !== 'edit' ) {
81
+
82
+			$entry_default_fields['edit_link'] = array(
83
+				'label' => __('Link to Edit Entry', 'gravityview'),
84
+				'type' => 'edit_link',
85
+				'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
86
+				'icon' => 'dashicons-welcome-write-blog',
87
+			);
88
+
89
+		}
90
+
91
+		return $entry_default_fields;
92
+	}
93
+
94
+	/**
95
+	 * Change wording for the Edit context to read Entry Creator
96
+	 *
97
+	 * @param  array 	   $visibility_caps        Array of capabilities to display in field dropdown.
98
+	 * @param  string      $field_type  Type of field options to render (`field` or `widget`)
99
+	 * @param  string      $template_id Table slug
100
+	 * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
101
+	 * @param  string      $context     What context are we in? Example: `single` or `directory`
102
+	 * @param  string      $input_type  (textarea, list, select, etc.)
103
+	 * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
104
+	 */
105
+	function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
106
+
107
+		$caps = $visibility_caps;
108
+
109
+		// If we're configuring fields in the edit context, we want a limited selection
110
+		if( $context === 'edit' ) {
111
+
112
+			// Remove other built-in caps.
113
+			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
114
+
115
+			$caps['read'] = _x('Entry Creator','User capability', 'gravityview');
116
+		}
117
+
118
+		return $caps;
119
+	}
120
+
121
+	/**
122
+	 * Add "Edit Link Text" setting to the edit_link field settings
123
+	 *
124
+	 * @param array  $field_options
125
+	 * @param string $template_id
126
+	 * @param string $field_id
127
+	 * @param string $context
128
+	 * @param string $input_type
129
+	 *
130
+	 * @return array $field_options, with "Edit Link Text" field option
131
+	 */
132
+	function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
133
+
134
+		// Always a link, never a filter
135
+		unset( $field_options['show_as_link'], $field_options['search_filter'] );
136
+
137
+		// Edit Entry link should only appear to visitors capable of editing entries
138
+		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
139
+
140
+		$add_option['edit_link'] = array(
141
+			'type' => 'text',
142
+			'label' => __( 'Edit Link Text', 'gravityview' ),
143
+			'desc' => NULL,
144
+			'value' => __('Edit Entry', 'gravityview'),
145
+			'merge_tags' => true,
146
+		);
147
+
148
+		return array_merge( $add_option, $field_options );
149
+	}
150
+
151
+	/**
152
+	 * Add tooltips
153
+	 * @param  array $tooltips Existing tooltips
154
+	 * @return array           Modified tooltips
155
+	 */
156
+	function tooltips( $tooltips ) {
157
+
158
+		$return = $tooltips;
159
+
160
+		$return['allow_edit_cap'] = array(
161
+			'title' => __('Limiting Edit Access', 'gravityview'),
162
+			'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
163
+		);
164
+
165
+		return $return;
166
+	}
167 167
 
168 168
 	/**
169 169
 	 * Add "Edit Link Text" setting to the edit_link field settings
@@ -179,28 +179,28 @@  discard block
 block discarded – undo
179 179
 	 */
180 180
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
181 181
 
182
-        // We only want to modify the settings for the edit context
183
-        if( 'edit' !== $context ) {
184
-            return $field_options;
185
-        }
186
-
187
-        //  Entry field is only for logged in users
188
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
189
-
190
-        $add_options = array(
191
-            'allow_edit_cap' => array(
192
-                'type' => 'select',
193
-                'label' => __( 'Make field editable to:', 'gravityview' ),
194
-                'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
195
-                'tooltip' => 'allow_edit_cap',
196
-                'class' => 'widefat',
197
-                'value' => 'read', // Default: entry creator
198
-                'group' => 'visibility',
199
-            ),
200
-        );
201
-
202
-        return array_merge( $field_options, $add_options );
203
-    }
182
+		// We only want to modify the settings for the edit context
183
+		if( 'edit' !== $context ) {
184
+			return $field_options;
185
+		}
186
+
187
+		//  Entry field is only for logged in users
188
+		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
189
+
190
+		$add_options = array(
191
+			'allow_edit_cap' => array(
192
+				'type' => 'select',
193
+				'label' => __( 'Make field editable to:', 'gravityview' ),
194
+				'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
195
+				'tooltip' => 'allow_edit_cap',
196
+				'class' => 'widefat',
197
+				'value' => 'read', // Default: entry creator
198
+				'group' => 'visibility',
199
+			),
200
+		);
201
+
202
+		return array_merge( $field_options, $add_options );
203
+	}
204 204
 
205 205
 
206 206
 } // end class
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
     function load() {
26 26
 
27
-        if( !is_admin() ) {
27
+        if ( ! is_admin() ) {
28 28
             return;
29 29
         }
30 30
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
         add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
39 39
 
40 40
         // add tooltips
41
-        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
41
+        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
42 42
 
43 43
         // custom fields' options for zone EDIT
44 44
         add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 );
@@ -77,12 +77,12 @@  discard block
 block discarded – undo
77 77
      */
78 78
     function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
79 79
 
80
-        if( $zone !== 'edit' ) {
80
+        if ( $zone !== 'edit' ) {
81 81
 
82
-            $entry_default_fields['edit_link'] = array(
83
-                'label' => __('Link to Edit Entry', 'gravityview'),
82
+            $entry_default_fields[ 'edit_link' ] = array(
83
+                'label' => __( 'Link to Edit Entry', 'gravityview' ),
84 84
                 'type' => 'edit_link',
85
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
85
+                'desc'	=> __( 'A link to edit the entry. Visible based on View settings.', 'gravityview' ),
86 86
                 'icon' => 'dashicons-welcome-write-blog',
87 87
             );
88 88
 
@@ -107,12 +107,12 @@  discard block
 block discarded – undo
107 107
         $caps = $visibility_caps;
108 108
 
109 109
         // If we're configuring fields in the edit context, we want a limited selection
110
-        if( $context === 'edit' ) {
110
+        if ( $context === 'edit' ) {
111 111
 
112 112
             // Remove other built-in caps.
113
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
113
+            unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
114 114
 
115
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
115
+            $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
116 116
         }
117 117
 
118 118
         return $caps;
@@ -132,16 +132,16 @@  discard block
 block discarded – undo
132 132
     function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
133 133
 
134 134
         // Always a link, never a filter
135
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
135
+        unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
136 136
 
137 137
         // Edit Entry link should only appear to visitors capable of editing entries
138
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
138
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
139 139
 
140
-        $add_option['edit_link'] = array(
140
+        $add_option[ 'edit_link' ] = array(
141 141
             'type' => 'text',
142 142
             'label' => __( 'Edit Link Text', 'gravityview' ),
143 143
             'desc' => NULL,
144
-            'value' => __('Edit Entry', 'gravityview'),
144
+            'value' => __( 'Edit Entry', 'gravityview' ),
145 145
             'merge_tags' => true,
146 146
         );
147 147
 
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
 
158 158
         $return = $tooltips;
159 159
 
160
-        $return['allow_edit_cap'] = array(
161
-            'title' => __('Limiting Edit Access', 'gravityview'),
162
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
160
+        $return[ 'allow_edit_cap' ] = array(
161
+            'title' => __( 'Limiting Edit Access', 'gravityview' ),
162
+            'value' => __( 'Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview' ),
163 163
         );
164 164
 
165 165
         return $return;
@@ -180,12 +180,12 @@  discard block
 block discarded – undo
180 180
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
181 181
 
182 182
         // We only want to modify the settings for the edit context
183
-        if( 'edit' !== $context ) {
183
+        if ( 'edit' !== $context ) {
184 184
             return $field_options;
185 185
         }
186 186
 
187 187
         //  Entry field is only for logged in users
188
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
188
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
189 189
 
190 190
         $add_options = array(
191 191
             'allow_edit_cap' => array(
Please login to merge, or discard this patch.