Merge branch 'develop'

codesnippetspro · May 9, 2015 · bc1241b · bc1241b
2 parents 7abd623 + b01b4af
commit bc1241b
Show file tree

Hide file tree

Showing 15 changed files with 294 additions and 184 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.1.0
+* Added additional setting descriptions
+* Added settings for code and description editor height
+* Updated CodeMirror to version 5.2
+* Fixed not escaping the request URL when using query arg functions
+* Improved efficiency of settings component
+
 ## 2.0.3
 * Updated German translation by [Joerg Knoerchen](http://www.sensorgrafie.de/)
 

diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 # Code Snippets [![Build Status](https://travis-ci.org/sheabunge/code-snippets.png?branch=develop)](https://travis-ci.org/sheabunge/code-snippets)
 
 * __Requires at least:__ [WordPress 3.3](http://wordpress.org/download/) or later
-* __Tested up to:__ WordPress 4.1.1
-* __Stable version:__ [2.0.3](http://downloads.wordpress.org/plugin/code-snippets.latest-stable.zip)
+* __Tested up to:__ WordPress 4.2.2
+* __Stable version:__ [2.1.0](http://downloads.wordpress.org/plugin/code-snippets.latest-stable.zip)
 * __License:__ [MIT](license.txt)
 
 An easy, clean and simple way to add code snippets to your site.

diff --git a/code-snippets.php b/code-snippets.php
@@ -7,7 +7,7 @@
  * contribute to the localization, please see http://code-snippets.bungeshea.com
  *
  * @package   Code_Snippets
- * @version   2.0.3
+ * @version   2.1.0
  * @author    Shea Bunge <http://bungeshea.com/>
  * @copyright Copyright (c) 2012-2014, Shea Bunge
  * @link      http://code-snippets.bungeshea.com
@@ -20,7 +20,7 @@
 Description: An easy, clean and simple way to add code snippets to your site. No need to edit to your theme's functions.php file again!
 Author:      Shea Bunge
 Author URI:  http://bungeshea.com
-Version:     2.0.3
+Version:     2.1.0
 License:     MIT
 License URI: license.txt
 Text Domain: code-snippets
@@ -42,7 +42,7 @@
  * @since 2.0
  * @var string A PHP-standardized version number string
  */
-define( 'CODE_SNIPPETS_VERSION', '2.0.2' );
+define( 'CODE_SNIPPETS_VERSION', '2.1.0' );
 
 /**
  * The full path to the main file of this plugin

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
 	},
 	"require": {
 		"php": ">=5.2.7",
-		"codemirror": "5.0"
+		"codemirror": "5.2"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "3.7.*"
@@ -32,9 +32,9 @@
 			"type": "package",
 			"package": {
 				"name": "codemirror",
-				"version": "5.0",
+				"version": "5.2",
 				"dist": {
-					"url": "http://codemirror.net/codemirror-5.0.zip",
+					"url": "http://codemirror.net/codemirror-5.2.zip",
 					"type": "zip"
 				}
 			}

diff --git a/includes/admin.php b/includes/admin.php
@@ -197,7 +197,7 @@ function code_snippets_survey_message() {
 		<?php _e( 'Take the survey now', 'code-snippets' ); ?>
 	</a>
 
-	<a href="<?php echo wp_nonce_url( add_query_arg( $key, true ), $key ); ?>">Dismiss</a>
+	<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( $key, true ), $key ) ); ?>">Dismiss</a>
 
 	</p></div>
 

diff --git a/includes/edit/admin.php b/includes/edit/admin.php
@@ -142,5 +142,11 @@
 	?>;
 	var editor = CodeMirror.fromTextArea(document.getElementById('snippet_code'), atts);
 
+	jQuery('.CodeMirror').resizable({
+		resize: function() {
+			editor.setSize( jQuery(this).width(), jQuery(this).height() );
+		}
+	});
+
 })();
 </script>
diff --git a/includes/edit/edit.php b/includes/edit/edit.php
@@ -152,7 +152,7 @@ function code_snippets_load_single_menu() {
 	/* Delete the snippet if the button was clicked */
 	elseif ( isset( $_POST['snippet_id'], $_POST['delete_snippet'] ) ) {
 		delete_snippet( $_POST['snippet_id'] );
-		wp_redirect( add_query_arg( 'delete', true, $this->manage_url ) );
+		wp_redirect( add_query_arg( 'delete', true, code_snippets_get_menu_url( 'manage' ) ) );
 	}
 
 	/* Export the snippet if the button was clicked */
@@ -169,7 +169,8 @@ function code_snippets_load_single_menu() {
  * @param object $snippet The snippet being used for this page
  */
 function code_snippets_description_editor_box( $snippet ) {
-
+	$settings = code_snippets_get_settings();
+	$settings = $settings['description_editor']
 	?>
 
 	<label for="snippet_description">
@@ -185,9 +186,9 @@ function code_snippets_description_editor_box( $snippet ) {
 		'description',
 		apply_filters( 'code_snippets/admin/description_editor_settings', array(
 			'textarea_name' => 'snippet_description',
-			'textarea_rows' => 10,
-			'teeny' => true,
-			'media_buttons' => false,
+			'textarea_rows' => $settings['rows'],
+			'teeny' => ! $settings['use_full_mce'],
+			'media_buttons' => $settings['media_buttons'],
 		) )
 	);
 }
@@ -241,7 +242,7 @@ function code_snippets_enqueue_codemirror() {
 
 	/* CodeMirror */
 
-	$codemirror_version = '5.0';
+	$codemirror_version = '5.2';
 	$codemirror_url     = plugins_url( 'vendor/codemirror/', CODE_SNIPPETS_FILE );
 
 	wp_enqueue_style(
@@ -367,4 +368,6 @@ function code_snippets_enqueue_codemirror() {
 		$tagit_version
 	);
 
+	/* Needed for resizable editor functionality */
+	wp_enqueue_script( 'jquery-ui-resizable' );
 }
diff --git a/includes/import/import.php b/includes/import/import.php
@@ -103,11 +103,8 @@ function code_snippets_load_import_menu() {
 		$result = import_snippets( $_FILES['code_snippets_import_file']['tmp_name'], $network );
 
 		/* Send the amount of imported snippets to the page */
-		if ( false === $result ) {
-			wp_redirect( add_query_arg( 'error', true ) );
-		} else {
-			wp_redirect( add_query_arg( 'imported', $result ) );
-		}
+		$query_args = ( false === $result ) ? array( 'error' => true ) : array( 'imported' => $result );
+		wp_redirect( esc_url_raw( $query_args ) );
 	}
 
 	/* Load the screen help tabs */

diff --git a/includes/manage/class-list-table.php b/includes/manage/class-list-table.php
@@ -112,19 +112,19 @@ function column_name( $snippet ) {
 			$actions['deactivate'] = sprintf(
 				'<a href="%2$s">%1$s</a>',
 				$screen->is_network ? __( 'Network Deactivate', 'code-snippets' ) : __( 'Deactivate', 'code-snippets' ),
-				add_query_arg( array(
+				esc_url( add_query_arg( array(
 					'action' => 'deactivate',
 					'id' =>	$snippet->id
-				) )
+				) ) )
 			);
 		} else {
 			$actions['activate'] = sprintf(
 				'<a href="%2$s">%1$s</a>',
 				$screen->is_network ? __( 'Network Activate', 'code-snippets' ) : __( 'Activate', 'code-snippets' ),
-				add_query_arg( array(
+				esc_url( add_query_arg( array(
 					'action' => 'activate',
 					'id' =>	$snippet->id
-				) )
+				) ) )
 			);
 		}
 
@@ -137,19 +137,19 @@ function column_name( $snippet ) {
 		$actions['export'] = sprintf(
 			'<a href="%2$s">%1$s</a>',
 			__( 'Export', 'code-snippets' ),
-			add_query_arg( array(
+			esc_url( add_query_arg( array(
 				'action' => 'export',
 				'id' =>	$snippet->id
-			) )
+			) ) )
 		);
 
 		$actions['delete'] = sprintf(
 			'<a href="%2$s" class="delete" onclick="%3$s">%1$s</a>',
 			__( 'Delete', 'code-snippets' ),
-			add_query_arg( array(
+			esc_url( add_query_arg( array(
 				'action' => 'delete',
 				'id' =>	$snippet->id
-			) ),
+			) ) ),
 			esc_js( sprintf(
 				'return confirm("%s");',
 				__("You are about to permanently delete the selected item.
@@ -202,7 +202,7 @@ function column_tags( $snippet ) {
 
     		foreach ( $snippet->tags as $tag ) {
     			$out[] = sprintf( '<a href="%s">%s</a>',
-    				add_query_arg( 'tag', esc_attr( $tag ) ),
+    				esc_url( add_query_arg( 'tag', esc_attr( $tag ) ) ),
     				esc_html( $tag )
     			);
     		}
@@ -314,7 +314,7 @@ function get_views() {
 			}
 
 			$status_links[$type] = sprintf( '<a href="%s"%s>%s</a>',
-				add_query_arg( 'status', $type ),
+				esc_url( add_query_arg( 'status', $type ) ),
 				( $type === $status ) ? ' class="current"' : '',
 				sprintf( $text, number_format_i18n( $count ) )
 			);
@@ -479,7 +479,7 @@ function process_bulk_actions() {
 			if ( ! in_array( $action, array( 'export', 'export-php' ) ) ) {
 				wp_redirect( apply_filters(
 					"code_snippets/{$action}_redirect",
-					add_query_arg( $action, true )
+					esc_url_raw( add_query_arg( $action, true ) )
 				) );
 			}
 
@@ -499,14 +499,14 @@ function process_bulk_actions() {
 				foreach ( $ids as $id ) {
 					activate_snippet( $id, $network );
 				}
-				wp_redirect( add_query_arg( 'activate-multi', true ) );
+				wp_redirect( esc_url_raw( add_query_arg( 'activate-multi', true ) ) );
 				break;
 
 			case 'deactivate-selected':
 				foreach ( $ids as $id ) {
 					deactivate_snippet( $id, $network );
 				}
-				wp_redirect( add_query_arg( 'deactivate-multi', true ) );
+				wp_redirect( esc_url_raw( add_query_arg( 'deactivate-multi', true ) ) );
 				break;
 
 			case 'export-selected':
@@ -521,7 +521,7 @@ function process_bulk_actions() {
 				foreach( $ids as $id ) {
 					delete_snippet( $id, $network );
 				}
-				wp_redirect( add_query_arg( 'delete-multi', true ) );
+				wp_redirect( esc_url_raw( add_query_arg( 'delete-multi', true ) ) );
 				break;
 
 			case 'clear-recent-list':
@@ -568,13 +568,8 @@ function prepare_items() {
 
 		/* Filter snippets by tag */
 		if ( isset( $_POST['tag'] ) ) {
-
-			if ( ! empty( $_POST['tag'] ) ) {
-				wp_redirect( add_query_arg( 'tag', $_POST['tag'] ) );
-			}
-			else {
-				wp_redirect( remove_query_arg( 'tag' ) );
-			}
+			$location = empty( $_POST['tag'] ) ? remove_query_arg( 'tag' ) : add_query_arg( 'tag', $_POST['tag'] );
+			wp_redirect( esc_url_raw( $location ) );
 		}
 
 		if ( ! empty( $_GET['tag'] ) ) {
@@ -777,7 +772,7 @@ public function search_notice() {
 
 			printf (
 				'&nbsp;<a class="button clear-filters" href="%s">' . __( 'Clear Filters', 'code-snippets' ) . '</a>',
-				remove_query_arg( array( 's', 'tag' ) )
+				esc_url( remove_query_arg( array( 's', 'tag' ) ) )
 			);
 		}
 	}