Operator added to the widget

core.php

@@ -7,12 +7,15 @@ function request( $request ) {
 		if ( !isset( $_GET['qmt'] ) )
 			return $request;
 
+		$operator = strtoupper( $_GET['qmt_operator'] );
+
 		foreach ( $_GET['qmt'] as $taxonomy => $terms ) {
+
 			$request['tax_query'][] = array(
 				'taxonomy' => $taxonomy,
 				'terms' => $terms,
 				'field' => 'term_id',
-				'operator' => 'IN'
+				'operator' => $operator
 			);
 		}
 
@@ -230,7 +233,7 @@ function qmt_get_query( $taxname = '' ) {
 	global $wp_query;
 
 	$qmt_query = array();
-
+	
 	if ( !is_null( $wp_query->tax_query ) ) {
 		foreach ( $wp_query->tax_query->queries as &$tax_query ) {
 			$terms = _qmt_get_term_slugs( $tax_query );

templates/checkboxes.html

@@ -1,5 +1,6 @@
 <form method="get" action="{{base-url}}" class="taxonomy-drilldown-checkboxes">
-	{{#taxonomy}}
+	<input type="hidden" name="qmt_operator" value="{{operator}}"  />
+	{{#taxonomy}} 
 	<div id="terms-{{taxonomy}}">
 		<h4>{{title}}</h4>
 		<ul>

templates/lists.html

@@ -1,4 +1,4 @@
-<div class="taxonomy-drilldown-lists">
+<div class="taxonomy-drilldown-lists"> 
 	{{#taxonomy}}
 	<div id="terms-{{taxonomy}}">
 		<h4>

walkers.php

@@ -169,7 +169,13 @@ function specific_data( $term, $depth ) {
 class QMT_Checkboxes_Walker extends QMT_Walker {
 
 	protected function set_selected_terms() {
-		$this->selected_terms = explode( ',', qmt_get_query( $this->taxonomy ) );
+
+		$terms = qmt_get_query( $this->taxonomy );
+		if ( strpos( $terms, '+'  ) > 0 )
+			$this->selected_terms = explode( '+', $terms );
+		else
+			$this->selected_terms = explode( ',', $terms );
+
 	}
 
 	function specific_data( $term, $depth ) {

widget.html

@@ -2,6 +2,9 @@
 
 <p>{{{mode-input}}}</p>
 
+<p>{{{operator-input}}}</p>
+
+
 <p>{{{taxonomies-label}}}</p>
 
 <ul class="qmt-taxonomies">

widget.php

@@ -6,6 +6,7 @@ class Taxonomy_Drill_Down_Widget extends scbWidget {
 		'title' => '',
 		'mode' => 'lists',
 		'taxonomies' => array(),
+		'operator' => ''
 	);
 
 	static function init( $file ) {
@@ -77,13 +78,25 @@ function form( $instance ) {
 					'dropdowns' =>  __( 'dropdowns', 'query-multiple-taxonomies' ),
 				),
 				'text'   => false,
-				'desc'   => __( 'Mode:', 'query-multiple-taxonomies' ),
+				'desc'   => __( 'Mode1:', 'query-multiple-taxonomies' ),
+				'extra' => array( 'class' => 'widefat' )
+			), $instance ),
+			'operator-input' => $this->input( array(
+				'type'   => 'select',
+				'name'   => 'operator',
+				'values' => array(
+					'AND' =>      __( 'And', 'query-multiple-taxonomies' ),
+					'IN' => __( 'Or', 'query-multiple-taxonomies' )
+				),
+				'text'   => false,
+				'desc'   => __( 'Operator:', 'query-multiple-taxonomies' ),
 				'extra' => array( 'class' => 'widefat' )
 			), $instance ),
 
 			'taxonomies-label' => __( 'Taxonomies:', 'query-multiple-taxonomies' )
 		);
 
+
 		$selected_taxonomies = $instance['taxonomies'];
 
 		// Start with the selected taxonomies
@@ -119,7 +132,7 @@ function form( $instance ) {
 
 	function content( $instance ) {
 		extract( $instance );
-
+ 
 		$taxonomies = array_filter( $taxonomies, array( __CLASS__, 'test_tax' ) );
 
 		$query = qmt_get_query();
@@ -132,7 +145,7 @@ function content( $instance ) {
 		} else {
 			echo call_user_func( array( __CLASS__, "generate_$mode" ), $taxonomies, array(
 				'reset-text' => __( 'Reset', 'query-multiple-taxonomies' ),
-				'reset-url' => QMT_URL::get(),
+				'reset-url' => QMT_URL::get(),'operator'=>$operator
 			) );
 		}
 	}
@@ -204,6 +217,7 @@ private function generate_dropdowns( $taxonomies, $data ) {
 	}
 
 	private function generate_checkboxes( $taxonomies, $data ) {
+
 		$data = array_merge( $data, array(
 			'base-url' => QMT_URL::get_base(),
 			'submit-text' => __( 'Submit', 'query-multiple-taxonomies' ),