AesopInteractive / lasso

public/includes/helpers.php

Doc Comments +3 added lines, -3 removed lines

@@ -6,8 +6,8 @@ 
  * If we're on multsite we'll grab the site option which is stored in the main blogs site option tables, otherwise
  * we'll grab the option which is stored on the single blogs option tables
  *
- * @param unknown $option  string name of the option
- * @param unknown $section string name of the section
+ * @param string $option  string name of the option
+ * @param string $section string name of the section
  * @param unknown $default string/int default option value
  * @return the option value
  * @since 1.0
@@ -274,7 +274,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 +63 added lines, -63 removed lines

@@ -12,21 +12,21 @@ 
  * @return the option value
  * @since 1.0
  */
-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];
 	}
 
@@ -40,9 +40,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;
@@ -57,9 +57,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;
@@ -108,16 +108,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';
@@ -148,16 +148,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);
 }
 
 
@@ -168,7 +168,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, .twitter-tweet, .meta');
 }
@@ -182,8 +182,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);
 
 }
 
@@ -193,18 +193,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.', ';
 	}
 
@@ -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 = array();
-	foreach( $objects as $object ) {
+	foreach ($objects as $object) {
 		$out[] = $object->slug;
 	}
 
@@ -242,11 +242,11 @@ 
  */
 function lasso_post_types() {
 
-	$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
@@ -255,10 +255,10 @@ 
 	 *
 	 * @param array $allowed_post_types Array of names (not labels) of allowed post types. Must be registered.
 	 */
-	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', array( 'post', 'page' ) );
-	foreach( $post_types as $name => $label ) {
-		if ( ! in_array( $name, $allowed_post_types ) ) {
-			unset( $post_types[ $name ] );
+	$allowed_post_types = apply_filters('lasso_allowed_post_types', array('post', 'page'));
+	foreach ($post_types as $name => $label) {
+		if (!in_array($name, $allowed_post_types)) {
+			unset($post_types[$name]);
 		}
 
 	}
@@ -278,22 +278,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));
 
 	}
 
@@ -308,12 +308,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)));
 }
 
 /**
@@ -326,13 +326,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)));
 }
 
 
@@ -347,16 +347,16 @@ 
  * @param unknown $postid int the id of the post object to check against
  * @since 1.0
  */
-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) {
 
-		if ( empty( $action ) )
+		if (empty($action))
 			$action = 'edit_posts';
 
-		if ( empty( $postid ) )
+		if (empty($postid))
 			$postid = get_the_ID();
 
-		if ( is_user_logged_in() && current_user_can( $action, $postid ) ) {
+		if (is_user_logged_in() && current_user_can($action, $postid)) {
 
 			return true;
 
@@ -374,25 +374,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;

admin/includes/menus/settings.php

Spacing +53 added lines, -53 removed lines

@@ -9,9 +9,9 @@ 
 
 	function __construct() {
 
-		add_action( 'admin_menu',     array( $this, 'menu' ) );
-		add_action( 'network_admin_menu',   array( $this, 'menu' ) );
-		add_action( 'wp_ajax_lasso-editor-settings', array( $this, 'process_settings' ) );
+		add_action('admin_menu', array($this, 'menu'));
+		add_action('network_admin_menu', array($this, 'menu'));
+		add_action('wp_ajax_lasso-editor-settings', array($this, 'process_settings'));
 
 	}
 
@@ -23,7 +23,7 @@ 
 	function menu() {
 
 		// CHANGED Removed condition.
-		add_submenu_page( 'lasso-editor', __( 'Settings', 'lasso' ), __( 'Settings', 'lasso' ), 'manage_options', 'lasso-editor-settings', array( $this, 'settings' ) );
+		add_submenu_page('lasso-editor', __('Settings', 'lasso'), __('Settings', 'lasso'), 'manage_options', 'lasso-editor-settings', array($this, 'settings'));
 
 	}
 
@@ -45,22 +45,22 @@ 
 	function process_settings() {
 
 		// bail out if current user isn't and administrator and they are not logged in
-		if ( !current_user_can( 'manage_options' ) || !is_user_logged_in() )
+		if (!current_user_can('manage_options') || !is_user_logged_in())
 			return;
 
-		if ( isset( $_POST['action'] ) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer( 'nonce', 'lasso_editor_settings' ) ) {
+		if (isset($_POST['action']) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer('nonce', 'lasso_editor_settings')) {
 
-			$options = isset( $_POST['lasso_editor'] ) ? $_POST['lasso_editor'] : false;
+			$options = isset($_POST['lasso_editor']) ? $_POST['lasso_editor'] : false;
 
-			$options = array_map( 'sanitize_text_field', $options );
+			$options = array_map('sanitize_text_field', $options);
 
-			if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+			if (function_exists('is_multisite') && is_multisite()) {
 
-				update_site_option( 'lasso_editor', $options );
+				update_site_option('lasso_editor', $options);
 
 			} else {
 
-				update_option( 'lasso_editor', $options );
+				update_option('lasso_editor', $options);
 			}
 
 			wp_send_json_success();
@@ -82,111 +82,111 @@ 
 	 */
 	function lasso_editor_settings_form() {
 
-		if ( !is_user_logged_in() )
+		if (!is_user_logged_in())
 			return;
 
-		$article_object   = lasso_editor_get_option( 'article_class', 'lasso_editor' );
-		$featImgClass    = lasso_editor_get_option( 'featimg_class', 'lasso_editor' );
-		$titleClass    = lasso_editor_get_option( 'title_class', 'lasso_editor' );
+		$article_object = lasso_editor_get_option('article_class', 'lasso_editor');
+		$featImgClass = lasso_editor_get_option('featimg_class', 'lasso_editor');
+		$titleClass = lasso_editor_get_option('title_class', 'lasso_editor');
 
-		$post_new_disabled   = lasso_editor_get_option( 'post_adding_disabled', 'lasso_editor' );
-		$save_to_post_disabled  = lasso_editor_get_option( 'post_save_disabled', 'lasso_editor' );
-		$post_settings_disabled = lasso_editor_get_option( 'post_settings_disabled', 'lasso_editor' );
-		$shortcodify_disabled  = lasso_editor_get_option( 'shortcodify_disabled', 'lasso_editor' );
+		$post_new_disabled = lasso_editor_get_option('post_adding_disabled', 'lasso_editor');
+		$save_to_post_disabled  = lasso_editor_get_option('post_save_disabled', 'lasso_editor');
+		$post_settings_disabled = lasso_editor_get_option('post_settings_disabled', 'lasso_editor');
+		$shortcodify_disabled  = lasso_editor_get_option('shortcodify_disabled', 'lasso_editor');
 
-		$toolbar_headings      = lasso_editor_get_option( 'toolbar_headings', 'lasso_editor' );
-		$objectsNoSave  	= lasso_editor_get_option('dont_save', 'lasso_editor');
+		$toolbar_headings      = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+		$objectsNoSave = lasso_editor_get_option('dont_save', 'lasso_editor');
 
 ?>
 		<div class="wrap">
 
-	    	<h2><?php _e( 'Editus Settings', 'lasso' );?></h2>
+	    	<h2><?php _e('Editus Settings', 'lasso'); ?></h2>
 
 			<form id="lasso-editor-settings-form" class="lasso--form-settings" method="post" enctype="multipart/form-data">
 
-				<?php do_action('lasso_settings_before');?>
+				<?php do_action('lasso_settings_before'); ?>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<label><?php _e( 'Article Class', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class (including the preceding dot) of container that holds the post. This should be the first parent container class that holds the_content.', 'lasso' );?></span>
-						<input type="text" name="lasso_editor[article_class]" id="lasso_editor[article_class]" value="<?php echo esc_attr( $article_object );?>" placeholder=".entry-content">
+						<label><?php _e('Article Class', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class (including the preceding dot) of container that holds the post. This should be the first parent container class that holds the_content.', 'lasso'); ?></span>
+						<input type="text" name="lasso_editor[article_class]" id="lasso_editor[article_class]" value="<?php echo esc_attr($article_object); ?>" placeholder=".entry-content">
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<label><?php _e( 'Featured Image Class', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class that uses a featured image as a background image. This currently only supports themes that have the featured image set as background image.', 'lasso' );?></span>
-						<input type="text" name="lasso_editor[featimg_class]" id="lasso_editor[featimg_class]" value="<?php echo esc_attr( $featImgClass );?>" placeholder=".entry-content">
+						<label><?php _e('Featured Image Class', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class that uses a featured image as a background image. This currently only supports themes that have the featured image set as background image.', 'lasso'); ?></span>
+						<input type="text" name="lasso_editor[featimg_class]" id="lasso_editor[featimg_class]" value="<?php echo esc_attr($featImgClass); ?>" placeholder=".entry-content">
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<label><?php _e( 'Article Title Class', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class for the post title. This will enable you to update the title of the post by clicking and typing.', 'lasso' );?></span>
-						<input type="text" name="lasso_editor[title_class]" id="lasso_editor[title_class]" value="<?php echo esc_attr( $titleClass );?>" placeholder=".entry-content">
+						<label><?php _e('Article Title Class', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class for the post title. This will enable you to update the title of the post by clicking and typing.', 'lasso'); ?></span>
+						<input type="text" name="lasso_editor[title_class]" id="lasso_editor[title_class]" value="<?php echo esc_attr($titleClass); ?>" placeholder=".entry-content">
 					</div>
 				</div>
 
 				<!-- Advanced -->
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<label><?php _e( 'Ignored Items to Save', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'If your post container holds additional markup, list the css class names (comma separated, including the dot) of those items. When you enter the editor, Editus will remove (NOT delete) these items so that it does not save them as HTML.', 'lasso' );?></span>
-						<textarea name="lasso_editor[dont_save]" id="lasso_editor[dont_save]" placeholder=".classname, .another-class"><?php echo esc_attr( $objectsNoSave );?></textarea>
+						<label><?php _e('Ignored Items to Save', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('If your post container holds additional markup, list the css class names (comma separated, including the dot) of those items. When you enter the editor, Editus will remove (NOT delete) these items so that it does not save them as HTML.', 'lasso'); ?></span>
+						<textarea name="lasso_editor[dont_save]" id="lasso_editor[dont_save]" placeholder=".classname, .another-class"><?php echo esc_attr($objectsNoSave); ?></textarea>
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings]" id="lasso_editor[toolbar_headings]" <?php echo checked( $toolbar_headings, 'on' );?> >
-						<label for="lasso_editor[toolbar_headings]"><?php _e( 'Enable Toolbar Headings', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'By default the H2 and H3 options for headings are in the insert HTML area. You may prefer those headings to act just like the underline, and strikethrough, so toggling this will add them to the toolbar.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings]" id="lasso_editor[toolbar_headings]" <?php echo checked($toolbar_headings, 'on'); ?> >
+						<label for="lasso_editor[toolbar_headings]"><?php _e('Enable Toolbar Headings', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('By default the H2 and H3 options for headings are in the insert HTML area. You may prefer those headings to act just like the underline, and strikethrough, so toggling this will add them to the toolbar.', 'lasso'); ?></span>
 
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_save_disabled]" id="lasso_editor[post_save_disabled]" <?php echo checked( $save_to_post_disabled, 'on' );?> >
-						<label for="lasso_editor[post_save_disabled]"><?php _e( 'Disable Post Saving', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'By default the editor will update the database with the post or page it is being used on. Check this box to disable this. If you check this box, it is assumed that you will be using the provided filters to save your own content.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_save_disabled]" id="lasso_editor[post_save_disabled]" <?php echo checked($save_to_post_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_save_disabled]"><?php _e('Disable Post Saving', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('By default the editor will update the database with the post or page it is being used on. Check this box to disable this. If you check this box, it is assumed that you will be using the provided filters to save your own content.', 'lasso'); ?></span>
 
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_settings_disabled]" id="lasso_editor[post_settings_disabled]" <?php echo checked( $post_settings_disabled, 'on' );?> >
-						<label for="lasso_editor[post_settings_disabled]"> <?php _e( 'Disable Post Settings', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this to disable users from being able to edit post settings from the front-end.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_settings_disabled]" id="lasso_editor[post_settings_disabled]" <?php echo checked($post_settings_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_settings_disabled]"> <?php _e('Disable Post Settings', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this to disable users from being able to edit post settings from the front-end.', 'lasso'); ?></span>
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_adding_disabled]" id="lasso_editor[post_adding_disabled]" <?php echo checked( $post_new_disabled, 'on' );?> >
-						<label for="lasso_editor[post_adding_disabled]"><?php _e( 'Disable Post Adding', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this box to disable users from being able to add new posts from the front-end.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_adding_disabled]" id="lasso_editor[post_adding_disabled]" <?php echo checked($post_new_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_adding_disabled]"><?php _e('Disable Post Adding', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this box to disable users from being able to add new posts from the front-end.', 'lasso'); ?></span>
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap last">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[shortcodify_disabled]" id="lasso_editor[shortcodify_disabled]" <?php echo checked( $shortcodify_disabled, 'on' );?> >
-						<label for="lasso_editor[shortcodify_disabled]"><?php _e( 'Disable Aesop Component Conversion', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this box to disable the conversion process used on Aesop Story Engine components.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[shortcodify_disabled]" id="lasso_editor[shortcodify_disabled]" <?php echo checked($shortcodify_disabled, 'on'); ?> >
+						<label for="lasso_editor[shortcodify_disabled]"><?php _e('Disable Aesop Component Conversion', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this box to disable the conversion process used on Aesop Story Engine components.', 'lasso'); ?></span>
 					</div>
 				</div>
 
-				<?php do_action('lasso_settings_after');?>
+				<?php do_action('lasso_settings_after'); ?>
 
 				<div class="lasso-editor-settings--submit">
 				    <input type="hidden" name="action" value="lasso-editor-settings" />
-				    <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Save Settings', 'lasso' );?>" />
-					<?php wp_nonce_field( 'nonce', 'lasso_editor_settings' ); ?>
+				    <input type="submit" class="button-primary" value="<?php esc_attr_e('Save Settings', 'lasso'); ?>" />
+					<?php wp_nonce_field('nonce', 'lasso_editor_settings'); ?>
 				</div>
 			</form>
 

public/includes/assets.php

Spacing +60 added lines, -60 removed lines

@@ -10,15 +10,15 @@ 
 
 class assets {
 
-	public function __construct(){
+	public function __construct() {
 
-		add_action('wp_enqueue_scripts', array($this,'scripts'));
+		add_action('wp_enqueue_scripts', array($this, 'scripts'));
 	}
 
-	public function scripts(){
+	public function scripts() {
 
 	
-		if ( lasso_user_can('edit_posts') ) {
+		if (lasso_user_can('edit_posts')) {
 
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
 
@@ -33,81 +33,81 @@ 
 			// url for json api
 			$home_url = function_exists('json_get_url_prefix') ? json_get_url_prefix() : false;
 
-			$article_object 	= lasso_editor_get_option('article_class','lasso_editor');
+			$article_object 	= lasso_editor_get_option('article_class', 'lasso_editor');
 
-			$article_object 	= empty( $article_object ) && lasso_get_supported_theme_class() ? lasso_get_supported_theme_class() : $article_object;
+			$article_object 	= empty($article_object) && lasso_get_supported_theme_class() ? lasso_get_supported_theme_class() : $article_object;
 
-			$featImgClass 		= lasso_editor_get_option('featimg_class','lasso_editor');
-			if (empty( $featImgClass )) {
+			$featImgClass = lasso_editor_get_option('featimg_class', 'lasso_editor');
+			if (empty($featImgClass)) {
 				$featImgClass = lasso_get_supported_theme_featured_image_class();
 			}
-			$titleClass 		= lasso_editor_get_option('title_class','lasso_editor');
-			if (empty( $titleClass )) {
+			$titleClass = lasso_editor_get_option('title_class', 'lasso_editor');
+			if (empty($titleClass)) {
 				$titleClass = lasso_get_supported_theme_title_class();
 			}
-			$toolbar_headings  	= lasso_editor_get_option('toolbar_headings', 'lasso_editor');
-			$objectsNoSave  	= lasso_editor_get_option('dont_save', 'lasso_editor');
+			$toolbar_headings = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+			$objectsNoSave = lasso_editor_get_option('dont_save', 'lasso_editor');
 
 			// post id reference
-			$postid 			= get_the_ID();
+			$postid = get_the_ID();
 
 			$strings = array(
-				'save' 				=> __('Save','lasso'),
-				'saving' 			=> __('Saving...','lasso'),
-				'saved'				=> __('Saved!','lasso'),
-				'adding' 			=> __('Adding...','lasso'),
-				'added'				=> __('Added!','lasso'),
-				'loading' 			=> __('Loading...','lasso'),
-				'loadMore'			=> __('Load More','lasso'),
-				'noPostsFound'		=> __('No more posts found','lasso'),
-				'galleryCreated' 	=> __('Gallery Created!','lasso'),
-				'galleryUpdated' 	=> __('Gallery Updated!','lasso'),
-				'justWrite'			=> __('Just write...','lasso'),
-				'chooseImage'		=> __('Choose an image','lasso'),
-				'updateImage'		=> __('Update Image','lasso'),
-				'insertImage'		=> __('Insert Image','lasso'),
-				'selectImage'		=> __('Select Image','lasso'),
-				'removeFeatImg'     => __('Remove featured image?','lasso'),
-				'updateSelectedImg' => __('Update Selected Image','lasso'),
-				'chooseImages'		=> __('Choose images','lasso'),
-				'editImage'			=> __('Edit Image','lasso'),
-				'addImages'			=> __('Add Images','lasso'),
-				'addNewGallery'		=> __('Add New Gallery','lasso'),
-				'selectGallery'		=> __('Select Lasso Gallery Image','lasso'),
-				'useSelectedImages' => __('Use Selected Images','lasso'),
-				'publishPost'		=> __('Publish Post?','lasso'),
-				'publishYes'		=> __('Yes, publish it!','lasso'),
-				'deletePost'		=> __('Trash Post?','lasso'),
-				'deleteYes'			=> __('Yes, trash it!','lasso'),
-				'warning'			=> __('Oh snap!','laso'),
-				'cancelText'		=> __('O.K. got it!','lasso'),
-				'missingClass'		=> __('It looks like we are either missing the Article CSS class, or it is configured incorrectly. Editus will not function correctly without this CSS class.','lasso'),
+				'save' 				=> __('Save', 'lasso'),
+				'saving' 			=> __('Saving...', 'lasso'),
+				'saved'				=> __('Saved!', 'lasso'),
+				'adding' 			=> __('Adding...', 'lasso'),
+				'added'				=> __('Added!', 'lasso'),
+				'loading' 			=> __('Loading...', 'lasso'),
+				'loadMore'			=> __('Load More', 'lasso'),
+				'noPostsFound'		=> __('No more posts found', 'lasso'),
+				'galleryCreated' 	=> __('Gallery Created!', 'lasso'),
+				'galleryUpdated' 	=> __('Gallery Updated!', 'lasso'),
+				'justWrite'			=> __('Just write...', 'lasso'),
+				'chooseImage'		=> __('Choose an image', 'lasso'),
+				'updateImage'		=> __('Update Image', 'lasso'),
+				'insertImage'		=> __('Insert Image', 'lasso'),
+				'selectImage'		=> __('Select Image', 'lasso'),
+				'removeFeatImg'     => __('Remove featured image?', 'lasso'),
+				'updateSelectedImg' => __('Update Selected Image', 'lasso'),
+				'chooseImages'		=> __('Choose images', 'lasso'),
+				'editImage'			=> __('Edit Image', 'lasso'),
+				'addImages'			=> __('Add Images', 'lasso'),
+				'addNewGallery'		=> __('Add New Gallery', 'lasso'),
+				'selectGallery'		=> __('Select Lasso Gallery Image', 'lasso'),
+				'useSelectedImages' => __('Use Selected Images', 'lasso'),
+				'publishPost'		=> __('Publish Post?', 'lasso'),
+				'publishYes'		=> __('Yes, publish it!', 'lasso'),
+				'deletePost'		=> __('Trash Post?', 'lasso'),
+				'deleteYes'			=> __('Yes, trash it!', 'lasso'),
+				'warning'			=> __('Oh snap!', 'laso'),
+				'cancelText'		=> __('O.K. got it!', 'lasso'),
+				'missingClass'		=> __('It looks like we are either missing the Article CSS class, or it is configured incorrectly. Editus will not function correctly without this CSS class.', 'lasso'),
 				'missingConfirm'	=> __('Update Settings', 'lasso'),
-				'helperText'		=> __('one more letter','lasso'),
+				'helperText'		=> __('one more letter', 'lasso'),
 				'editingBackup'  	=> __('You are currently editing a backup copy of this post.')
 			);
 
-			$api_url = trailingslashit( home_url() ) . 'lasso-internal-api';
+			$api_url = trailingslashit(home_url()).'lasso-internal-api';
 
 			$gallery_class = new gallery();
 			$gallery_nonce_action = $gallery_class->nonce_action;
-			$gallery_nonce = wp_create_nonce( $gallery_nonce_action );
+			$gallery_nonce = wp_create_nonce($gallery_nonce_action);
 
 			// localized objects
 			$objects = array(
-				'ajaxurl' 			=> esc_url( $api_url ),
+				'ajaxurl' 			=> esc_url($api_url),
 				'editor' 			=> 'lasso--content', // ID of editable content (without #) DONT CHANGE
 				'article_object'	=> $article_object,
 				'featImgClass'		=> $featImgClass,
 				'titleClass'		=> $titleClass,
 				'strings'			=> $strings,
-				'settingsLink'		=> function_exists('is_multisite') && is_multisite() ? network_admin_url( 'settings.php?page=lasso-editor' ) : admin_url( 'admin.php?page=lasso-editor-settings' ),
-				'post_status'		=> get_post_status( $postid ),
+				'settingsLink'		=> function_exists('is_multisite') && is_multisite() ? network_admin_url('settings.php?page=lasso-editor') : admin_url('admin.php?page=lasso-editor-settings'),
+				'post_status'		=> get_post_status($postid),
 				'postid'			=> $postid,
 				'permalink'			=> get_permalink(),
 				'edit_others_pages'	=> current_user_can('edit_others_pages') ? 'true' : 'false',
 				'edit_others_posts'	=> current_user_can('edit_others_posts') ? 'true' : 'false',
-				'userCanEdit'		=> current_user_can('edit_post', $postid ),
+				'userCanEdit'		=> current_user_can('edit_post', $postid),
 				'can_publish_posts'	=> current_user_can('publish_posts'),
 				'can_publish_pages'	=> current_user_can('publish_pages'),
 				'author'			=> is_user_logged_in() ? get_current_user_ID() : false,
@@ -139,22 +139,22 @@ 
 				'postTags'    		=> lasso_get_objects('tag'),
 				'noResultsDiv'		=> lasso_editor_empty_results(),
 				'noRevisionsDiv'	=> lasso_editor_empty_results('revision'),
-				'mapTileProvider'   => function_exists('aesop_map_tile_provider') ? aesop_map_tile_provider( $postid ) : false,
-				'mapLocations'		=> get_post_meta( $postid, 'ase_map_component_locations' ),
-				'mapStart'			=> get_post_meta( $postid, 'ase_map_component_start_point', true ),
-				'mapZoom'			=> get_post_meta( $postid, 'ase_map_component_zoom', true ),
+				'mapTileProvider'   => function_exists('aesop_map_tile_provider') ? aesop_map_tile_provider($postid) : false,
+				'mapLocations'		=> get_post_meta($postid, 'ase_map_component_locations'),
+				'mapStart'			=> get_post_meta($postid, 'ase_map_component_start_point', true),
+				'mapZoom'			=> get_post_meta($postid, 'ase_map_component_zoom', true),
 				'revisionModal' 	=> lasso_editor_revision_modal()
 			);
 
 
 			// wp api client
-			wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
-				$settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) );
-				wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings );
+			wp_enqueue_script('wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array('jquery', 'underscore', 'backbone'), LASSO_VERSION, true);
+				$settings = array('root' => home_url($home_url), 'nonce' => wp_create_nonce('wp_json'));
+				wp_localize_script('wp-api-js', 'WP_API_Settings', $settings);
 
-				$postfix = ( defined( 'SCRIPT_DEBUG' ) && true === SCRIPT_DEBUG ) ? '' : '.min';
-				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true);
-				wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
+				$postfix = (defined('SCRIPT_DEBUG') && true === SCRIPT_DEBUG) ? '' : '.min';
+				wp_enqueue_script('lasso', LASSO_URL."/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true);
+				wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects));
 
 
 		}

lasso.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- *
- *
- * @package   Editus
- * @author    Nick Haskins <nick@aesopinteractive.com>
- * @link      http://edituswp.com
- * @copyright 2015 Aesopinteractive LLC
- *
- * Plugin Name:       Editus
- * Plugin URI:        http://edituswp.com
- * Description:       Front-end editor and story builder.
- * Version:           0.9.9.6
- * Author:            Aesopinteractive LLC
- * Author URI:        http://aesopinteractive.com
- * Text Domain:       lasso
- * Domain Path:       /languages
- */
+	 *
+	 *
+	 * @package   Editus
+	 * @author    Nick Haskins <nick@aesopinteractive.com>
+	 * @link      http://edituswp.com
+	 * @copyright 2015 Aesopinteractive LLC
+	 *
+	 * Plugin Name:       Editus
+	 * Plugin URI:        http://edituswp.com
+	 * Description:       Front-end editor and story builder.
+	 * Version:           0.9.9.6
+	 * Author:            Aesopinteractive LLC
+	 * Author URI:        http://aesopinteractive.com
+	 * Text Domain:       lasso
+	 * Domain Path:       /languages
+	 */
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {

Spacing +8 added lines, -8 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.9.6' );
-define( 'LASSO_DIR', plugin_dir_path( __FILE__ ) );
-define( 'LASSO_URL', plugins_url( '', __FILE__ ) );
-define( 'LASSO_FILE', __FILE__ );
+define('LASSO_VERSION', '0.9.9.6');
+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>');