Project

General

Profile

« Previous | Next » 

Revision 174861fd

Added by Scott Ullrich over 20 years ago

Cleanup return_dir_as_array to not return . or .. and make the new firewall plugin system active.

View differences:

etc/inc/pfsense-utils.inc
41 41 
 * return_dir_as_array($dir): returns $dir contents as an array
42 42 
 */
43 43 
function return_dir_as_array($dir) {
44 
    $dir_array = array();
44 45 
    if (is_dir($dir)) {
45 
	$dir_array = array();
46 46 
	if ($dh = opendir($dir)) {
47 47 
	    while (($file = readdir($dh)) !== false) {
48 
		array_push($dir_array, $file);
49 
		//echo "filename: $file : filetype: " . filetype($dir . $file) . "\n";
48 
		$canadd = 0;
49 
		if($file == ".") $canadd = 1;
50 
		if($file == "..") $canadd = 1;
51 
		if($canadd == 0)
52 
		    array_push($dir_array, $file);
50 53 
	    }
51 54 
	    closedir($dh);
52 55 
	}
......
59 62 
 */
60 63 
function return_filename_as_string($filename) {
61 64 
    $tmp = "";
62 
    $fd = popen($filename, "r");
65 
    $fd = fopen($filename, "r");
63 66 
    while(!feof($fd)) {
64 67 
	$tmp .= fread($fd,49);
65 68 
    }

Also available in: Unified diff