update 5/11

classes/class.crx.libs/radioamator/abstractDxClusterSpot.php

@@ -112,7 +112,6 @@ class abstractDxClusterSpot{
 			$this->user_us_states_dx_selected		= 	$params['user_us_states_dx_selected'];		
 		//////////////////////////////////////////
 		
-		
 		//old system  :
 		if(isset($params['display_spot_after_timestamp']))
 			$this->display_spot_after_timestamp		=	$params['display_spot_after_timestamp'];	
@@ -120,7 +119,11 @@ class abstractDxClusterSpot{
 		//New filter date : 
 		if(isset($params['use_date_filter']))				$this->display_spot_after_timestamp_v2	=	$params['use_date_filter'];			
 		if(isset($params['display_only_not_contacted_dx']))	$this->display_only_not_contacted_dx	=	$params['display_only_not_contacted_dx'];			
-		if(isset($params['spots_comment_filter']))			$this->display_spots_comment_filter		=	$params['spots_comment_filter'];	
+		
+		if(isset($params['spots_comment_filter']))			$this->display_spots_comment_filter				=	$params['spots_comment_filter'];	
+		if(isset($params['spots_comment_filter_in_out']))	$this->display_spots_comment_filter_in_out		=	$params['spots_comment_filter_in_out'];	
+		
+		
 		if(isset($params['band_part_filter']))				$this->display_band_part_filter			=	$params['band_part_filter'];
 			
 		if(isset($params['continent_dxspot_filtering_selected']))	$this->display_continent_dxspot_filtering_selected		=	$params['continent_dxspot_filtering_selected'];

classes/class.crx.libs/radioamator/dxClusterSpotHam.php

@@ -45,6 +45,8 @@ extends abstractDxClusterSpot{
 
 	var $display_spots_comment_filter			=	0;
 
+	//var $display_spots_comment_filter_in_out	=	'IN'; //default include comment filter word.
+	
 	var $display_only_not_contacted_dx			=	0;
 
 	var $display_use_dxnodes_filter				=	0;
@@ -761,6 +763,9 @@ extends abstractDxClusterSpot{
 					$r	=	$this->c_db->returnLine();
 					$val=$r['c1'];
 					$col=NULL;
+					
+					$style=' style="color: #000000;"';
+
 					if($val>0 && $val <4){		$col='#F2FFF2';	}
 					
 					if($val>=4 && $val <=5){	$col='#CCFFCC';	}
@@ -769,9 +774,9 @@ extends abstractDxClusterSpot{
 					
 					if($val>10){				$col='#80FF80';	}
 					
-					if($val==0){				$col='';	}
+					if($val==0){				$col='';$style='';	}
 					
-					$html.='<td bgcolor="'.$col.'">'.$val.'</td>';	
+					$html.='<td bgcolor="'.$col.'""'.$style.'">'.$val.'</td>';	
 							
 				}
 				
@@ -1205,8 +1210,23 @@ extends abstractDxClusterSpot{
 			if($bands<0){
 				$join_this_filter="";
 			}
-			$sql_set_filter_columns_settings .= $join_this_filter." ( `comment` LIKE '%".$this->display_spots_comment_filter."%' )";	
+		
+			$like_cmt='LIKE';
+			
+			if($this->display_spots_comment_filter_in_out <> 'IN'){
+				
+				$like_cmt='NOT LIKE';	
+			
+			}
+			
+			//var_dump($this->display_spots_comment_filter_in_out);die();
+			
+			//$like_cmt='NOT LIKE';
+			
+			$sql_set_filter_columns_settings .= $join_this_filter." ( `comment` ".$like_cmt."'%".$this->display_spots_comment_filter."%' )";	
+			
 		}
+		
 		///////////////////////////////////////////////
 		//13022015:add dxcc contacted filter's  :
 		//$this->display_only_not_contacted_dx=1;
@@ -1422,6 +1442,9 @@ extends abstractDxClusterSpot{
 			
 		$this->_dsql=$final_querie_get_dxcluster_spots;
 
+		//var_dump($this->_dsql);die();
+		
+		
 		if($exec_final_sql){
 			
 			$this->c_db ->  query	=	$final_querie_get_dxcluster_spots;
@@ -1443,7 +1466,6 @@ extends abstractDxClusterSpot{
 				."\n".$var."\n\n sql_set_filter:".$sql_set_filter);
 		}
 
-
 		//notuse?	$var=$this->_final_querie_get_dxcluster_spots;
 
 		if(isset($spots) && is_array($spots)){