AesopInteractive / lasso

lasso.php

Doc Comments +4 added lines

@@ -61,6 +61,10 @@
 }
 
 
+/**
+ * @param string $option
+ * @param string $section
+ */
 function lasso_editor_get_option( $option, $section, $default = '' ) {
 
 	if ( empty( $option ) )

Spacing +18 added lines, -18 removed lines

@@ -18,27 +18,27 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
 // Set some constants
-define( 'LASSO_VERSION', '0.9.16.0' );
-define( 'LASSO_DIR', plugin_dir_path( __FILE__ ) );
-define( 'LASSO_URL', plugins_url( '', __FILE__ ) );
-define( 'LASSO_FILE', __FILE__ );
+define('LASSO_VERSION', '0.9.16.0');
+define('LASSO_DIR', plugin_dir_path(__FILE__));
+define('LASSO_URL', plugins_url('', __FILE__));
+define('LASSO_FILE', __FILE__);
 
 /**
  * Load plugin if PHP version is 5.4 or later.
  */
-if ( version_compare( PHP_VERSION, '5.4.0', '>=' ) ) {
+if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
 
-	include_once( LASSO_DIR . '/bootstrap.php' );
+	include_once(LASSO_DIR.'/bootstrap.php');
 
 } else {
 
 	add_action('admin_head', 'lasso_fail_notice');
-	function lasso_fail_notice(){
+	function lasso_fail_notice() {
 
 		printf('<div class="error"><p>Lasso requires PHP 5.4 or higher.</p></div>');
 
@@ -46,11 +46,11 @@ 
 }
 
 add_filter('register_post_type_args', 'lasso_show_in_rest', 10, 2);
-function lasso_show_in_rest($args, $post_type){
+function lasso_show_in_rest($args, $post_type) {
  
-    $allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( ) );
-	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
-	if (in_array( $post_type,$allowed_post_types)) {
+    $allowed_post_types = lasso_editor_get_option('allowed_post_types', 'lasso_editor', array( ));
+	$allowed_post_types = apply_filters('lasso_allowed_post_types', $allowed_post_types);
+	if (in_array($post_type, $allowed_post_types)) {
 		$args['show_in_rest'] = true;
 		if ($post_type != 'post' && $post_type != 'page') {
 			$args['rest_base'] = $post_type;
@@ -61,21 +61,21 @@ 
 }
 
 
-function lasso_editor_get_option( $option, $section, $default = '' ) {
+function lasso_editor_get_option($option, $section, $default = '') {
 
-	if ( empty( $option ) )
+	if (empty($option))
 		return;
 
-	if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+	if (function_exists('is_multisite') && is_multisite()) {
 
-		$options = get_site_option( $section );
+		$options = get_site_option($section);
 
 	} else {
 
-		$options = get_option( $section );
+		$options = get_option($section);
 	}
 
-	if ( isset( $options[$option] ) ) {
+	if (isset($options[$option])) {
 		return $options[$option];
 	}
 

Braces +3 added lines, -2 removed lines

@@ -63,8 +63,9 @@
 
 function lasso_editor_get_option( $option, $section, $default = '' ) {
 
-	if ( empty( $option ) )
-		return;
+	if ( empty( $option ) ) {
+			return;
+	}
 
 	if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 

public/includes/helpers.php

Doc Comments +7 added lines, -2 removed lines

@@ -13,6 +13,11 @@ 
  * @since 1.0
  */
 if( !function_exists('lasso_editor_get_option')):
+
+	/**
+	 * @param string $option
+	 * @param string $section
+	 */
 	function lasso_editor_get_option( $option, $section, $default = '' ) {
 
 		if ( empty( $option ) )
@@ -216,7 +221,7 @@ 
  *	Return an array of categories for autocomplete
  *
  *	@since 0.9.3
- *	@return array all categoiries
+ *	@return null|string all categoiries
 */
 function lasso_get_objects( $taxonomy = 'category' ) {
 
@@ -309,7 +314,7 @@ 
 *	Used internally as a callback to build a tab or content area for modal addons
 *
 *	@param $tab object
-*	@param $type string tab or content
+*	@param string $type string tab or content
 *	@uses lasso_modal_addons()
 *	@since 0.9.4
 */

Spacing +83 added lines, -83 removed lines

@@ -12,22 +12,22 @@ 
  * @return the option value
  * @since 1.0
  */
-if( !function_exists('lasso_editor_get_option')):
-	function lasso_editor_get_option( $option, $section, $default = '' ) {
+if (!function_exists('lasso_editor_get_option')):
+	function lasso_editor_get_option($option, $section, $default = '') {
 
-		if ( empty( $option ) )
+		if (empty($option))
 			return;
 
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			$options = get_site_option( $section );
+			$options = get_site_option($section);
 
 		} else {
 
-			$options = get_option( $section );
+			$options = get_option($section);
 		}
 
-		if ( isset( $options[$option] ) ) {
+		if (isset($options[$option])) {
 			return $options[$option];
 		}
 
@@ -42,9 +42,9 @@ 
  */
 function lasso_editor_galleries_exist() {
 
-	$q = new wp_query( array( 'post_type' => 'ai_galleries', 'post_status' => 'publish' ) );
+	$q = new wp_query(array('post_type' => 'ai_galleries', 'post_status' => 'publish'));
 
-	if ( $q->have_posts() )
+	if ($q->have_posts())
 		return true;
 	else
 		return false;
@@ -59,9 +59,9 @@ 
 function lasso_get_supported_theme_class() {
 
 	$name  	= wp_get_theme()->get('Name');
-	$slug  	= lasso_clean_string( $name );
+	$slug  	= lasso_clean_string($name);
 
-	switch ( $slug ) {
+	switch ($slug) {
 		case 'aesop-story-theme': // aesop
 			$out = '.aesop-entry-content';
 			break;
@@ -110,16 +110,16 @@ 
 
 	}
 
-	return apply_filters('lasso_content_class', !empty( $out ) ? $out : false);
+	return apply_filters('lasso_content_class', !empty($out) ? $out : false);
 	//return !empty( $out ) ? $out : false;
 }
 
 function lasso_get_supported_theme_title_class() {
 
 	$name  	= wp_get_theme()->get('Name');
-	$slug  	= lasso_clean_string( $name );
+	$slug  	= lasso_clean_string($name);
 
-	switch ( $slug ) {
+	switch ($slug) {
 
 		case 'aesop-story-theme': // aesop
 			$out = '.aesop-entry-title';
@@ -147,16 +147,16 @@ 
 			break;
 	}
 
-	return apply_filters('lasso_title_class', !empty( $out ) ? $out : false);
+	return apply_filters('lasso_title_class', !empty($out) ? $out : false);
 }
 
 //since 0.9.9.6
 function lasso_get_supported_theme_featured_image_class() {
 
 	$name  	= wp_get_theme()->get('Name');
-	$slug  	= lasso_clean_string( $name );
+	$slug  	= lasso_clean_string($name);
 
-	return apply_filters('lasso_featured_image_class', !empty( $out ) ? $out : false);
+	return apply_filters('lasso_featured_image_class', !empty($out) ? $out : false);
 }
 
 
@@ -167,7 +167,7 @@ 
 *	@since 0.8.7
 *	@return string of comma separated classes
 */
-function lasso_supported_no_save(){
+function lasso_supported_no_save() {
 
 	return apply_filters('lasso_dont_save', '.lasso--ignore, .sharedaddy, .us_wrapper, .meta, .edit-link, .ssba, .jp-relatedposts, .fb-comments');
 }
@@ -181,8 +181,8 @@ 
  *
  * @return array|mixed|object|string|void
  */
-function lasso_sanitize_data( $data ) {
-	return \lasso\sanatize::do_sanitize( $data );
+function lasso_sanitize_data($data) {
+	return \lasso\sanatize::do_sanitize($data);
 
 }
 
@@ -192,18 +192,18 @@ 
  *	@since 0.9.3
  *	@return string of comma delimited category slugs
 */
-function lasso_get_post_objects( $postid = '', $taxonomy = 'category') {
+function lasso_get_post_objects($postid = '', $taxonomy = 'category') {
 
-	if ( empty( $postid ) )
+	if (empty($postid))
 		$postid = get_the_ID();
 
-	$objects = 'category' == $taxonomy ? get_the_category( $postid ) : get_the_tags( $postid );
+	$objects = 'category' == $taxonomy ? get_the_category($postid) : get_the_tags($postid);
 
-	if ( empty( $objects) )
+	if (empty($objects))
 		return;
 
 	$out = '';
-	foreach( $objects as $object ) {
+	foreach ($objects as $object) {
 		//$out .= $object->slug.', ';
 		$out .= $object->name.',';
 	}
@@ -218,15 +218,15 @@ 
  *	@since 0.9.3
  *	@return array all categoiries
 */
-function lasso_get_objects( $taxonomy = 'category' ) {
+function lasso_get_objects($taxonomy = 'category') {
 
 	$objects = 'category' == $taxonomy ? get_categories(array('hide_empty' => 0)) : get_tags(array('hide_empty' => 0));
 
-	if ( empty( $objects) )
+	if (empty($objects))
 		return;
 
 	$out = "";
-	foreach( $objects as $object ) {
+	foreach ($objects as $object) {
 		$out .= $object->name.',';
 	}
 
@@ -241,11 +241,11 @@ 
  * @since 0.9.4
  */
 function lasso_post_types_names() {
-	$post_types = get_post_types( array(
+	$post_types = get_post_types(array(
 		'public' => true,
-	), 'objects' );
-	$post_types = array_combine( array_keys( $post_types ), wp_list_pluck( $post_types, 'label' ) );
-    unset( $post_types[ 'attachment' ] );
+	), 'objects');
+	$post_types = array_combine(array_keys($post_types), wp_list_pluck($post_types, 'label'));
+    unset($post_types['attachment']);
 
 	/**
 	 * Set which post types are allowed
@@ -254,14 +254,14 @@ 
 	 *
 	 * @param array $allowed_post_types Array of names (not labels) of allowed post types. Must be registered.
 	 */
-	$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( 'post', 'page') );
-	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
+	$allowed_post_types = lasso_editor_get_option('allowed_post_types', 'lasso_editor', array('post', 'page'));
+	$allowed_post_types = apply_filters('lasso_allowed_post_types', $allowed_post_types);
 	if (!current_user_can('edit_pages')) {
-		$allowed_post_types = array_diff($allowed_post_types,array('page'));
+		$allowed_post_types = array_diff($allowed_post_types, array('page'));
 	}
-	foreach( $post_types as $name => $label ) {
-		if ( ! in_array( $name, $allowed_post_types ) ) {
-			unset( $post_types[ $name ] );
+	foreach ($post_types as $name => $label) {
+		if (!in_array($name, $allowed_post_types)) {
+			unset($post_types[$name]);
 		}
 	}
 	return $post_types;
@@ -269,10 +269,10 @@ 
 
 
 function lasso_post_types() {
-	$post_types = get_post_types( array(
+	$post_types = get_post_types(array(
 		'public' => true,
-	), 'names' );
-    unset( $post_types[ 'attachment' ] );
+	), 'names');
+    unset($post_types['attachment']);
 
 	/**
 	 * Set which post types are allowed
@@ -281,11 +281,11 @@ 
 	 *
 	 * @param array $allowed_post_types Array of names (not labels) of allowed post types. Must be registered.
 	 */
-	$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( 'post') );
-	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
-	foreach( $post_types as $name => $label ) {
-		if ( ! in_array( $name, $allowed_post_types ) ) {
-			unset( $post_types[ $name ] );
+	$allowed_post_types = lasso_editor_get_option('allowed_post_types', 'lasso_editor', array('post'));
+	$allowed_post_types = apply_filters('lasso_allowed_post_types', $allowed_post_types);
+	foreach ($post_types as $name => $label) {
+		if (!in_array($name, $allowed_post_types)) {
+			unset($post_types[$name]);
 		}
 	}
 	return $post_types;
@@ -295,7 +295,7 @@ 
 	global $wp_post_types;
 	$post_types = lasso_post_types();
 	$rest_base = array();
-	foreach ( $post_types as $post_type) {
+	foreach ($post_types as $post_type) {
 		$rest_base[$post_type] = $wp_post_types[$post_type]->rest_base;
 	}
     
@@ -313,22 +313,22 @@ 
 *	@uses lasso_modal_addons()
 *	@since 0.9.4
 */
-function lasso_modal_addons_content( $tab = '', $type ){
+function lasso_modal_addons_content($tab = '', $type) {
 
-	$name = lasso_clean_string( $tab['name'] );
+	$name = lasso_clean_string($tab['name']);
 
-	if ( 'tab' == $type ) {
+	if ('tab' == $type) {
 
-		$out = sprintf( '<li data-addon-name="%s">%s</li>', $name, $tab['name'] );
+		$out = sprintf('<li data-addon-name="%s">%s</li>', $name, $tab['name']);
 
-	} else if ( 'content' == $type ){
+	} else if ('content' == $type) {
 
-		$content = isset( $tab['content'] ) && is_callable( $tab['content'] ) ? call_user_func( $tab['content'] ) : false;
-		$options = isset( $tab['options'] ) && is_callable( $tab['options'] ) ? call_user_func( $tab['options'] ) : false;
+		$content = isset($tab['content']) && is_callable($tab['content']) ? call_user_func($tab['content']) : false;
+		$options = isset($tab['options']) && is_callable($tab['options']) ? call_user_func($tab['options']) : false;
 
-		$out = sprintf( '<div class="lasso--modal__content not-visible" data-addon-content="%s">
+		$out = sprintf('<div class="lasso--modal__content not-visible" data-addon-content="%s">
 			%s%s
-			</div>', $name, $content, lasso_option_form( $name, $options ) );
+			</div>', $name, $content, lasso_option_form($name, $options));
 
 	}
 
@@ -343,12 +343,12 @@ 
 *
 * @return void|string
 */
-function lasso_clean_string( $string = '' ) {
+function lasso_clean_string($string = '') {
 
-	if ( empty( $string ) )
+	if (empty($string))
 		return;
 
-	return sanitize_text_field( strtolower( preg_replace('/[\s_]/', '-', $string ) ) );
+	return sanitize_text_field(strtolower(preg_replace('/[\s_]/', '-', $string)));
 }
 
 /**
@@ -361,13 +361,13 @@ 
  *
  * @return void|string
  */
-function lasso_unclean_string( $string = '' ) {
+function lasso_unclean_string($string = '') {
 
-	if ( empty( $string ) ) {
+	if (empty($string)) {
 		return;
 	}
 
-	return sanitize_text_field( strtolower( str_replace( '-', '_', $string ) ) );
+	return sanitize_text_field(strtolower(str_replace('-', '_', $string)));
 }
 
 
@@ -382,39 +382,39 @@ 
  * @param unknown $postid int the id of the post object to check against
  * @since 0.9.9.7 added filter 'lasso_user_can_filter'
  */
-if ( !function_exists( 'lasso_user_can' ) ):
-	function lasso_user_can( $action = '', $postid = 0 ) {
+if (!function_exists('lasso_user_can')):
+	function lasso_user_can($action = '', $postid = 0) {
         $result = false;
-		if ( empty( $action ) )
+		if (empty($action))
 			$action = 'edit_posts';
 
-		if ( empty( $postid ) && $action != 'edit_posts' && $action != 'publish_posts' && $action != 'delete_posts')
+		if (empty($postid) && $action != 'edit_posts' && $action != 'publish_posts' && $action != 'delete_posts')
 			$postid = get_the_ID();
 
-		if ( is_user_logged_in() && current_user_can( $action, $postid ) ) {
+		if (is_user_logged_in() && current_user_can($action, $postid)) {
 			// check against post types:
-			$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( 'post', 'page') );
+			$allowed_post_types = lasso_editor_get_option('allowed_post_types', 'lasso_editor', array('post', 'page'));
 			
 			if (!current_user_can('edit_pages')) {
-				$allowed_post_types = array_diff($allowed_post_types,array('page'));
+				$allowed_post_types = array_diff($allowed_post_types, array('page'));
 			}
 			
             if (!empty($allowed_post_types) && !empty($postid)) {
-				$type = get_post_type( $postid );
-                $allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
+				$type = get_post_type($postid);
+                $allowed_post_types = apply_filters('lasso_allowed_post_types', $allowed_post_types);
 				
-                if ( in_array( $type, $allowed_post_types ) ) {
-				   $result =  true;
+                if (in_array($type, $allowed_post_types)) {
+				   $result = true;
 			    }
             } else {
                 //we are not checking against a post, return true
-				$result =  true;
+				$result = true;
         	}
 		} else {
 			$result = false;
 		}
 		
-		return apply_filters( 'lasso_user_can_filter', $result,  $action, $postid);
+		return apply_filters('lasso_user_can_filter', $result, $action, $postid);
 	}
 endif;
 
@@ -423,25 +423,25 @@ 
 *
 *	@since 0.9.5
 */
-if ( !function_exists('lasso_editor_empty_results') ):
+if (!function_exists('lasso_editor_empty_results')):
 
-	function lasso_editor_empty_results( $type = 'posts' ){
+	function lasso_editor_empty_results($type = 'posts') {
 
-		if ( 'posts' == $type ) {
+		if ('posts' == $type) {
 
-			$string = apply_filters('lasso_empty_state_message', __('No posts to show', 'lasso') );
+			$string = apply_filters('lasso_empty_state_message', __('No posts to show', 'lasso'));
 			$icon = 'lasso-icon-file-text2';
 			$button = false;
 
-		} elseif ( 'revision' == $type ) {
+		} elseif ('revision' == $type) {
 
-			$string = apply_filters('lasso_empty_state_message', __('No revisions found', 'lasso') );
+			$string = apply_filters('lasso_empty_state_message', __('No revisions found', 'lasso'));
 			$icon = 'lasso-icon-history';
-			$button = sprintf('<a href="#" class="lasso--btn-secondary" id="lasso--close-modal">%s</a>', __('Close','lasso') );
+			$button = sprintf('<a href="#" class="lasso--btn-secondary" id="lasso--close-modal">%s</a>', __('Close', 'lasso'));
 
 		}
 
-		return sprintf('<div id="lasso--empty-state" class="lasso--empty-state"><i class="lasso--empty-state-icon lasso-icon %s"></i><p>%s</p>%s</div>', $icon, $string, $button );
+		return sprintf('<div id="lasso--empty-state" class="lasso--empty-state"><i class="lasso--empty-state-icon lasso-icon %s"></i><p>%s</p>%s</div>', $icon, $string, $button);
 	}
 
 endif;

Braces +27 added lines, -19 removed lines

@@ -15,8 +15,9 @@ 
 if( !function_exists('lasso_editor_get_option')):
 	function lasso_editor_get_option( $option, $section, $default = '' ) {
 
-		if ( empty( $option ) )
-			return;
+		if ( empty( $option ) ) {
+					return;
+		}
 
 		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 
@@ -44,11 +45,12 @@ 
 
 	$q = new wp_query( array( 'post_type' => 'ai_galleries', 'post_status' => 'publish' ) );
 
-	if ( $q->have_posts() )
-		return true;
-	else
-		return false;
-}
+	if ( $q->have_posts() ) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Return a CSS class of an automatically supported theme
@@ -194,13 +196,15 @@ 
 */
 function lasso_get_post_objects( $postid = '', $taxonomy = 'category') {
 
-	if ( empty( $postid ) )
-		$postid = get_the_ID();
+	if ( empty( $postid ) ) {
+			$postid = get_the_ID();
+	}
 
 	$objects = 'category' == $taxonomy ? get_the_category( $postid ) : get_the_tags( $postid );
 
-	if ( empty( $objects) )
-		return;
+	if ( empty( $objects) ) {
+			return;
+	}
 
 	$out = '';
 	foreach( $objects as $object ) {
@@ -222,8 +226,9 @@ 
 
 	$objects = 'category' == $taxonomy ? get_categories(array('hide_empty' => 0)) : get_tags(array('hide_empty' => 0));
 
-	if ( empty( $objects) )
-		return;
+	if ( empty( $objects) ) {
+			return;
+	}
 
 	$out = "";
 	foreach( $objects as $object ) {
@@ -345,8 +350,9 @@ 
 */
 function lasso_clean_string( $string = '' ) {
 
-	if ( empty( $string ) )
-		return;
+	if ( empty( $string ) ) {
+			return;
+	}
 
 	return sanitize_text_field( strtolower( preg_replace('/[\s_]/', '-', $string ) ) );
 }
@@ -385,11 +391,13 @@ 
 if ( !function_exists( 'lasso_user_can' ) ):
 	function lasso_user_can( $action = '', $postid = 0 ) {
         $result = false;
-		if ( empty( $action ) )
-			$action = 'edit_posts';
+		if ( empty( $action ) ) {
+					$action = 'edit_posts';
+		}
 
-		if ( empty( $postid ) && $action != 'edit_posts' && $action != 'publish_posts' && $action != 'delete_posts')
-			$postid = get_the_ID();
+		if ( empty( $postid ) && $action != 'edit_posts' && $action != 'publish_posts' && $action != 'delete_posts') {
+					$postid = get_the_ID();
+		}
 
 		if ( is_user_logged_in() && current_user_can( $action, $postid ) ) {
 			// check against post types: