| @@ -28,7 +28,7 @@ discard block | ||
| 28 | 28 | * @since 1.15 | 
| 29 | 29 | * @param bool|false $mixed | 
| 30 | 30 | * | 
| 31 | - * @return bool | |
| 31 | + * @return boolean|null | |
| 32 | 32 | */ | 
| 33 | 33 |  	private function _exit( $mixed = NULL ) { | 
| 34 | 34 | |
| @@ -200,7 +200,7 @@ discard block | ||
| 200 | 200 | * Import Gravity Form XML or JSON | 
| 201 | 201 | * | 
| 202 | 202 | * @param string $xml_or_json_path Path to form XML or JSON file | 
| 203 | - * @return int|bool Imported form ID or false | |
| 203 | + * @return false|string Imported form ID or false | |
| 204 | 204 | */ | 
| 205 | 205 |  	function import_form( $xml_or_json_path = '' ) { | 
| 206 | 206 | |
| @@ -136,7 +136,7 @@ discard block | ||
| 136 | 136 | |
| 137 | 137 | // template areas | 
| 138 | 138 | $template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' ); | 
| 139 | - $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' ); | |
| 139 | + $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' ); | |
| 140 | 140 | |
| 141 | 141 | // widget areas | 
| 142 | 142 | $default_widget_areas = GravityView_Plugin::get_default_widget_areas(); | 
| @@ -328,40 +328,40 @@ discard block | ||
| 328 | 328 | // load file | 
| 329 | 329 | $xmlstr = file_get_contents( $form_file ); | 
| 330 | 330 | |
| 331 | - $options = array( | |
| 332 | -            "page" => array("unserialize_as_array" => true), | |
| 333 | -            "form"=> array("unserialize_as_array" => true), | |
| 334 | -            "field"=> array("unserialize_as_array" => true), | |
| 335 | -            "rule"=> array("unserialize_as_array" => true), | |
| 336 | -            "choice"=> array("unserialize_as_array" => true), | |
| 337 | -            "input"=> array("unserialize_as_array" => true), | |
| 338 | -            "routing_item"=> array("unserialize_as_array" => true), | |
| 339 | -            "creditCard"=> array("unserialize_as_array" => true), | |
| 340 | -            "routin"=> array("unserialize_as_array" => true), | |
| 341 | -            "confirmation" => array("unserialize_as_array" => true), | |
| 342 | -            "notification" => array("unserialize_as_array" => true) | |
| 343 | - ); | |
| 331 | + $options = array( | |
| 332 | +			"page" => array("unserialize_as_array" => true), | |
| 333 | +			"form"=> array("unserialize_as_array" => true), | |
| 334 | +			"field"=> array("unserialize_as_array" => true), | |
| 335 | +			"rule"=> array("unserialize_as_array" => true), | |
| 336 | +			"choice"=> array("unserialize_as_array" => true), | |
| 337 | +			"input"=> array("unserialize_as_array" => true), | |
| 338 | +			"routing_item"=> array("unserialize_as_array" => true), | |
| 339 | +			"creditCard"=> array("unserialize_as_array" => true), | |
| 340 | +			"routin"=> array("unserialize_as_array" => true), | |
| 341 | +			"confirmation" => array("unserialize_as_array" => true), | |
| 342 | +			"notification" => array("unserialize_as_array" => true) | |
| 343 | + ); | |
| 344 | 344 | |
| 345 | 345 | $xml = new RGXML($options); | 
| 346 | - $forms = $xml->unserialize($xmlstr); | |
| 346 | + $forms = $xml->unserialize($xmlstr); | |
| 347 | 347 | |
| 348 | -        if( !$forms ) { | |
| 349 | - do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file ); | |
| 350 | - return false; | |
| 351 | - } | |
| 348 | +		if( !$forms ) { | |
| 349 | + do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file ); | |
| 350 | + return false; | |
| 351 | + } | |
| 352 | 352 | |
| 353 | -        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) { | |
| 354 | - $form = $forms[0]; | |
| 355 | - } | |
| 353 | +		if( !empty( $forms[0] ) && is_array( $forms[0] ) ) { | |
| 354 | + $form = $forms[0]; | |
| 355 | + } | |
| 356 | 356 | |
| 357 | -        if( empty( $form ) ) { | |
| 358 | - do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms ); | |
| 359 | - return false; | |
| 360 | - } | |
| 357 | +		if( empty( $form ) ) { | |
| 358 | + do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms ); | |
| 359 | + return false; | |
| 360 | + } | |
| 361 | 361 | |
| 362 | - do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form ); | |
| 362 | + do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form ); | |
| 363 | 363 | |
| 364 | - return $form; | |
| 364 | + return $form; | |
| 365 | 365 | |
| 366 | 366 | } | 
| 367 | 367 | |
| @@ -195,7 +195,7 @@ | ||
| 195 | 195 | * | 
| 196 | 196 | * @since 1.6 | 
| 197 | 197 | * | 
| 198 | - * @param int $new_view_id The ID of the newly created View | |
| 198 | + * @param int $new_id The ID of the newly created View | |
| 199 | 199 | * @param WP_Post $post The View that was just cloned | 
| 200 | 200 | * | 
| 201 | 201 | * @return void | 
| @@ -116,7 +116,7 @@ | ||
| 116 | 116 | |
| 117 | 117 | /** | 
| 118 | 118 | * @since 1.12 | 
| 119 | - * @return bool | |
| 119 | + * @return boolean|null | |
| 120 | 120 | */ | 
| 121 | 121 |  	private function add_fallback_shortcode() { | 
| 122 | 122 | |
| @@ -204,7 +204,7 @@ | ||
| 204 | 204 | self::$notices['wp_version'] = array( | 
| 205 | 205 | 'class' => 'error', | 
| 206 | 206 | 'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>' ), | 
| 207 | - 'cap' => 'update_core', | |
| 207 | + 'cap' => 'update_core', | |
| 208 | 208 | 'dismiss' => 'wp_version', | 
| 209 | 209 | ); | 
| 210 | 210 | |
| @@ -221,7 +221,6 @@ discard block | ||
| 221 | 221 | * | 
| 222 | 222 | * @since 1.15 | 
| 223 | 223 | * | 
| 224 | - * @param string|null $content Content inside shortcode, if defined | |
| 225 | 224 | * | 
| 226 | 225 | * @return string|boolean If URL is fetched, the URL to the entry link. If not found, returns false. | 
| 227 | 226 | */ | 
| @@ -316,7 +315,7 @@ discard block | ||
| 316 | 315 | * | 
| 317 | 316 | * @since 1.15 | 
| 318 | 317 | * | 
| 319 | - * @param string $href URL | |
| 318 | + * @param string|null $url | |
| 320 | 319 | */ | 
| 321 | 320 |  	private function maybe_add_field_values_query_args( $url ) { | 
| 322 | 321 | |
| @@ -278,7 +278,7 @@ | ||
| 278 | 278 | |
| 279 | 279 | /** | 
| 280 | 280 | * Add a notice to be displayed in the admin. | 
| 281 | - * @param array $notice Array with `class` and `message` keys. The message is not escaped. | |
| 281 | + * @param string $notice Array with `class` and `message` keys. The message is not escaped. | |
| 282 | 282 | */ | 
| 283 | 283 |  	public static function add_notice( $notice = array() ) { | 
| 284 | 284 | |
| @@ -244,13 +244,13 @@ | ||
| 244 | 244 | $this->_remote_update_url, | 
| 245 | 245 | $this->_path, | 
| 246 | 246 | array( | 
| 247 | - 'version' => $this->_version, // current version number | |
| 248 | - 'license' => $license['license'], | |
| 249 | - 'item_id' => $this->_item_id, // The ID of the download on _remote_update_url | |
| 250 | - 'item_name' => $this->_title, // name of this plugin | |
| 251 | - 'author' => strip_tags( $this->_author ) // author of this plugin | |
| 252 | - ) | |
| 253 | - ); | |
| 247 | + 'version' => $this->_version, // current version number | |
| 248 | + 'license' => $license['license'], | |
| 249 | + 'item_id' => $this->_item_id, // The ID of the download on _remote_update_url | |
| 250 | + 'item_name' => $this->_title, // name of this plugin | |
| 251 | + 'author' => strip_tags( $this->_author ) // author of this plugin | |
| 252 | + ) | |
| 253 | + ); | |
| 254 | 254 | } | 
| 255 | 255 | |
| 256 | 256 | /** | 
| @@ -135,7 +135,7 @@ | ||
| 135 | 135 | * @param bool $url_encode Whether to URL-encode output | 
| 136 | 136 | * @param bool $esc_html Whether to apply `esc_html()` to output | 
| 137 | 137 | * | 
| 138 | - * @return mixed | |
| 138 | + * @return string | |
| 139 | 139 | */ | 
| 140 | 140 |  	public static function replace_gv_merge_tags(  $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { | 
| 141 | 141 | |
| @@ -53,7 +53,7 @@ discard block | ||
| 53 | 53 | $gv_modifiers = array( | 
| 54 | 54 | 'maxwords:(\d+)' => 'modifier_maxwords', /** @see modifier_maxwords */ | 
| 55 | 55 | 'wpautop' => 'modifier_wpautop', /** @see modifier_wpautop */ | 
| 56 | - 'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */ | |
| 56 | + 'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */ | |
| 57 | 57 | ); | 
| 58 | 58 | |
| 59 | 59 | $return = $value; | 
| @@ -253,7 +253,7 @@ discard block | ||
| 253 | 253 | |
| 254 | 254 | $atts = array( | 
| 255 | 255 | 'format' => self::get_format_from_modifiers( $exploded, false ), | 
| 256 | -		    'human' => in_array( 'human', $exploded ), // {date_created:human} | |
| 256 | +			'human' => in_array( 'human', $exploded ), // {date_created:human} | |
| 257 | 257 |  			'diff' => in_array( 'diff', $exploded ), // {date_created:diff} | 
| 258 | 258 |  			'raw' => in_array( 'raw', $exploded ), // {date_created:raw} | 
| 259 | 259 |  			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp} | 
| @@ -67,7 +67,6 @@ | ||
| 67 | 67 | * | 
| 68 | 68 | * @since 1.15 | 
| 69 | 69 | * | 
| 70 | - * @param array $allcaps An array of all the user's capabilities. | |
| 71 | 70 | * @param array $caps Actual capabilities for meta capability. | 
| 72 | 71 | * @param array $args Optional parameters passed to has_cap(), typically object ID. | 
| 73 | 72 | * @param WP_User|null $user The user object, in WordPress 3.7.0 or higher | 
| @@ -56,7 +56,7 @@ discard block | ||
| 56 | 56 | add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) ); | 
| 57 | 57 | add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 ); | 
| 58 | 58 | add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 ); | 
| 59 | - add_action( 'admin_init', array( $this, 'add_caps') ); | |
| 59 | + add_action( 'admin_init', array( $this, 'add_caps') ); | |
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | 62 | |
| @@ -360,7 +360,6 @@ discard block | ||
| 360 | 360 | * Add Gravity Forms and GravityView's "full access" caps when any other caps are checked against. | 
| 361 | 361 | * | 
| 362 | 362 | * @since 1.15 | 
| 363 | - | |
| 364 | 363 | * @param array $caps_to_check | 
| 365 | 364 | * | 
| 366 | 365 | * @return array | 
| @@ -37,6 +37,9 @@ discard block | ||
| 37 | 37 | public $active_areas; | 
| 38 | 38 | |
| 39 | 39 | |
| 40 | + /** | |
| 41 | + * @param string $id | |
| 42 | + */ | |
| 40 | 43 |  	function __construct( $id, $settings = array(), $field_options = array(), $areas = array() ) { | 
| 41 | 44 | |
| 42 | 45 |  		if ( empty( $id ) ) { | 
| @@ -144,6 +147,9 @@ discard block | ||
| 144 | 147 | return $areas; | 
| 145 | 148 | } | 
| 146 | 149 | |
| 150 | + /** | |
| 151 | + * @param string $context | |
| 152 | + */ | |
| 147 | 153 |  	public function get_active_areas( $context ) { | 
| 148 | 154 |  		if ( isset( $this->active_areas[ $context ] ) ) { | 
| 149 | 155 | return $this->active_areas[ $context ]; | 
| @@ -156,8 +162,8 @@ discard block | ||
| 156 | 162 | /** | 
| 157 | 163 | * Assign template specific field options | 
| 158 | 164 | * | 
| 159 | - * @param array $options (default: array()) | |
| 160 | - * @param string $template (default: '') | |
| 165 | + * @param array $field_options (default: array()) | |
| 166 | + * @param string $template_id (default: '') | |
| 161 | 167 | * @param string $field_id key for the field | 
| 162 | 168 | * @param string|array $context Context for the field; `directory` or `single` for example. | 
| 163 | 169 | * | 
| @@ -211,6 +211,7 @@ | ||
| 211 | 211 | * @var $view_id | 
| 212 | 212 | * | 
| 213 | 213 | * @see render_handler | 
| 214 | + * @param string $url | |
| 214 | 215 | */ | 
| 215 | 216 |  	private function set_vars( $matches, $attr, $url, $rawattr ) { | 
| 216 | 217 | |