Project

General

Profile

« Previous | Next » 

Revision 6e4288f1

Added by Chris Buechler almost 16 years ago

merge changes from merge request on pzanitti clone

View differences:

usr/local/www/diag_logs_filter_dynamic.php
138 138 
				<span class="log-action" nowrap><a href="#" onClick="javascript:getURL('diag_logs_filter.php?getrulenum=<?php echo $filterent['rulenum']; ?>', outputrule);">
139 139 
				<?php
140 140 
					if (strstr(strtolower($filterent['act']), "p"))
141 
						$img = "/themes/metallic/images/icons/icon_pass.gif";
141 
						$img = "/themes/{$g['theme']}/images/icons/icon_pass.gif";
142 142 
					else if(strstr(strtolower($filterent['act']), "r"))
143 
						$img = "/themes/metallic/images/icons/icon_reject.gif";
143 
						$img = "/themes/{$g['theme']}/images/icons/icon_reject.gif";
144 144 
					else
145 
						$img = "/themes/metallic/images/icons/icon_block.gif";
145 
						$img = "/themes/{$g['theme']}/images/icons/icon_block.gif";
146 146 
				?>
147 147 
				<img border="0" src="<?=$img;?>" width="11" height="11" align="absmiddle"></a></span>
148 148 
				<span class="log-time" ><?=htmlspecialchars($filterent['time']);?></span>
usr/local/www/includes/log.inc.php
161 161 
			preg_match("/.*([0-9][0-9]:[0-9][0-9]:[0-9][0-9])/", $log_row['time'], $time_regex);
162 162 
			$row_time = strtotime($time_regex[1]);
163 163 
			if (strstr(strtolower($log_row['act']), "p"))
164 
				$img = "<img border='0' src='/themes/metallic/images/icons/icon_pass.gif'>";
164 
				$img = "<img border='0' src='/themes/{$g['theme']}/images/icons/icon_pass.gif'>";
165 165 
			else if(strstr(strtolower($filterent['act']), "r"))
166 
				$img = "<img border='0' src='/themes/metallic/images/icons/icon_reject.gif'>";
166 
				$img = "<img border='0' src='/themes/{$g['theme']}/images/icons/icon_reject.gif'>";
167 167 
			else
168 
				$img = "<img border='0' src='/themes/metallic/images/icons/icon_block.gif'>";
168 
				$img = "<img border='0' src='/themes/{$g['theme']}/images/icons/icon_block.gif'>";
169 169 
			//echo "{$time_regex[1]} - $row_time > $lastsawtime<p>";
170 170 
			if($row_time > $lastsawtime) {
171 171 

  		












  

    
      usr/local/www/status_filter_reload.php
    
  





  77
  77
  
    
	result_text = result_text.replace("\n","");


  		




  78
  78
  
    
	result_text = result_text.replace("\r","");


  		




  79
  79
  
    
	if (result_text) {


  		




  80
  
  
    
		$('status').innerHTML = '<img src="/themes/metallic/images/misc/loader.gif"> ' + result_text + '...';


  		




  
  80
  
    
		$('status').innerHTML = '<img src="/themes/{$g['theme']}/images/misc/loader.gif"> ' + result_text + '...';


  		




  81
  81
  
    
	} else {


  		




  82
  
  
    
		$('status').innerHTML = '<img src="/themes/metallic/images/misc/loader.gif"> Obtaining filter status...';


  		




  
  82
  
    
		$('status').innerHTML = '<img src="/themes/{$g['theme']}/images/misc/loader.gif"> Obtaining filter status...';


  		




  83
  83
  
    
	}


  		




  84
  84
  
    
	if(result_text == "Initializing") {


  		




  85
  
  
    
		$('status').innerHTML = '<img src="/themes/metallic/images/misc/loader.gif"> Initializing...';


  		




  
  85
  
    
		$('status').innerHTML = '<img src="/themes/{$g['theme']}/images/misc/loader.gif"> Initializing...';


  		




  86
  86
  
    
	} else if(result_text == "Done") {


  		




  87
  87
  
    
		new Effect.Highlight($('status'));


  		




  88
  88
  
    
		$('status').innerHTML = 'Done.  The filter rules have been reloaded.';


  		












Also available in:  Unified diff