Эх сурвалжийг харах

Upgrade: Converted Advanced > Upgrade to use Git instead of SVN (untested).
Misc: Added provisions elsewhere to account for .git/* files, as currently done with .svn/* files.

reliberate 10 жил өмнө
parent
commit
54bb2248e8
1 өөрчлөгдсөн 5 нэмэгдсэн , 4 устгасан
  1. 5 4
      filelist.php

+ 5 - 4
filelist.php

@@ -55,12 +55,13 @@ else {
 		$htmlfilelist = '';
 		$dirlist = opendir($dir);
 		$dir_array = array();
-		while (false !== ($file = readdir($dirlist))) { 
+		while (false !== ($file = readdir($dirlist))) {
 			if ($file != "." AND $file != ".."){
 				$newpath = $dir.'/'.$file;
 				$level = explode('/',$newpath);
-				if (substr($newpath, -4) == ".svn") {
-					//ignore .svn dir and subdir
+				if (substr($newpath, -4) == ".svn" ||
+					substr($newpath, -4) == ".git") {
+					//ignore .svn and .git dir and subdir
 				}
 				elseif (substr($newpath, -3) == ".db") {
 					//ignore .db files
@@ -243,7 +244,7 @@ if ($_SESSION["app"]["edit"]["dir"] == "grammar") {
 	echo recur_dir($_SESSION['switch']['grammar']['dir']);
 }
 if ($_SESSION["app"]["edit"]["dir"] == "provision") {
-	
+
 	switch (PHP_OS) {
 	case "Linux":
 		if (file_exists('/etc/fusionpbx/resources/templates/provision')) {