Project

General

Profile

« Previous | Next » 

Revision 3605b6b8

Added by Scott Ullrich over 19 years ago

Core dumps are bad, mmmkay?

View differences:

etc/inc/pfsense-utils.inc
1799 1799
function convert_friendly_interface_to_friendly_descr($interface) {
1800 1800
	global $config;
1801 1801
	/* attempt to resolve interface to friendly descr */
1802
	if($config['interfaces'][$interface]['descr'])
1802
	if($config['interfaces'][$interface]['descr']) 
1803 1803
		return $config['interfaces'][$interface]['descr'];
1804
	/* is the person confused, calling the wrong function?  double check. */
1805
	if(convert_real_interface_to_friendly_descr($interface) <> $interface)
1806
		return convert_real_interface_to_friendly_descr($interface);
1804
	$tmp = convert_real_interface_to_friendly_descr($interface);
1807 1805
	/* could not resolve, return back what was passed */
1808 1806
	return $interface;
1809 1807
}
1810 1808

  
1811 1809
function convert_real_interface_to_friendly_descr($interface) {
1812 1810
	global $config;
1811
	if($interface == $config['interfaces']['wan']['if'])
1812
		return "wan";
1813
	if($interface == $config['interfaces']['lan']['if'])
1814
		return "lan";
1813 1815
	/* attempt to resolve interface to friendly descr */
1814 1816
	$friendly_int = convert_real_interface_to_friendly_interface_name($interface);
1815 1817
	if($config['interfaces'][$friendly_int]['descr'])
1816 1818
		return $config['interfaces'][$friendly_int]['descr'];
1817
	/* is the person confused, calling the wrong function?  double check. */
1818
	if(convert_friendly_interface_to_friendly_descr($interface) <> $interface)
1819
		return convert_friendly_interface_to_friendly_descr($interface);
1820 1819
	/* could not resolve, return back what was passed */
1821 1820
	return $interface;
1822 1821
}

Also available in: Unified diff