Project

General

Profile

« Previous | Next » 

Revision 7468a29f

Added by Jim Pingle almost 13 years ago

Fix secondary auth source to reference the zone like everything else in this section does, which is where the gui stores the value.

View differences:

etc/inc/captiveportal.inc
1153 1153 
		($config['captiveportal'][$cpzone]['auth_method'] == "radius"))) {
1154 1154 
		$radiusip = $config['captiveportal'][$cpzone]['radiusip'];
1155 1155 
		$radiusip2 = ($config['captiveportal'][$cpzone]['radiusip2']) ? $config['captiveportal'][$cpzone]['radiusip2'] : null;
1156 
		$radiusip3 = ($config['captiveportal']['radiusip3']) ? $config['captiveportal']['radiusip3'] : null;
1157 
		$radiusip4 = ($config['captiveportal']['radiusip4']) ? $config['captiveportal']['radiusip4'] : null;
1156 
		$radiusip3 = ($config['captiveportal'][$cpzone]['radiusip3']) ? $config['captiveportal'][$cpzone]['radiusip3'] : null;
1157 
		$radiusip4 = ($config['captiveportal'][$cpzone]['radiusip4']) ? $config['captiveportal'][$cpzone]['radiusip4'] : null;
1158 1158 

  		




  1159
  1159
  
    
		if ($config['captiveportal'][$cpzone]['radiusport'])


  		




  1160
  1160
  
    
			$radiusport = $config['captiveportal'][$cpzone]['radiusport'];


  		




  ......




  1168
  1168
  
    
			$radiusport2 = $config['captiveportal'][$cpzone]['radiusport2'];


  		




  1169
  1169
  
    
		else


  		




  1170
  1170
  
    
			$radiusport2 = 1812;


  		




  1171
  
  
    
		if ($config['captiveportal']['radiusport3'])


  		




  1172
  
  
    
			$radiusport3 = $config['captiveportal']['radiusport3'];


  		




  
  1171
  
    
		if ($config['captiveportal'][$cpzone]['radiusport3'])


  		




  
  1172
  
    
			$radiusport3 = $config['captiveportal'][$cpzone]['radiusport3'];


  		




  1173
  1173
  
    
		else


  		




  1174
  1174
  
    
			$radiusport3 = 1812;


  		




  1175
  
  
    
		if ($config['captiveportal']['radiusport4'])


  		




  1176
  
  
    
			$radiusport4 = $config['captiveportal']['radiusport4'];


  		




  
  1175
  
    
		if ($config['captiveportal'][$cpzone]['radiusport4'])


  		




  
  1176
  
    
			$radiusport4 = $config['captiveportal'][$cpzone]['radiusport4'];


  		




  1177
  1177
  
    
		else


  		




  1178
  1178
  
    
			$radiusport4 = 1812;


  		




  1179
  1179
  
    

  		




  1180
  1180
  
    
		$radiuskey = $config['captiveportal'][$cpzone]['radiuskey'];


  		




  1181
  1181
  
    
		$radiuskey2 = ($config['captiveportal'][$cpzone]['radiuskey2']) ? $config['captiveportal'][$cpzone]['radiuskey2'] : null;


  		




  1182
  
  
    
		$radiuskey3 = ($config['captiveportal']['radiuskey3']) ? $config['captiveportal']['radiuskey3'] : null;


  		




  1183
  
  
    
		$radiuskey4 = ($config['captiveportal']['radiuskey4']) ? $config['captiveportal']['radiuskey4'] : null;


  		




  
  1182
  
    
		$radiuskey3 = ($config['captiveportal'][$cpzone]['radiuskey3']) ? $config['captiveportal'][$cpzone]['radiuskey3'] : null;


  		




  
  1183
  
    
		$radiuskey4 = ($config['captiveportal'][$cpzone]['radiuskey4']) ? $config['captiveportal'][$cpzone]['radiuskey4'] : null;


  		




  1184
  1184
  
    

  		




  1185
  1185
  
    
		$cprdsrvlck = lock("captiveportalradius{$cpzone}", LOCK_EX);


  		




  1186
  1186
  
    
		$fd = @fopen("{$g['vardb_path']}/captiveportal_radius_{$cpzone}.db", "w");


  		












Also available in:  Unified diff