Strip out no longer used find_duplicates().

install/lib/install.lib.php

@@ -30,7 +30,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*
 	This function returns a string that describes the installed
-	linux distribution. e.g. debian40 for Debian Linux 4.0
+	Linux distribution. e.g. debian40 for Debian GNU/Linux 4.0
 */
 
 
@@ -183,7 +183,7 @@ function get_distname() {
  		swriteln("Operating System: Gentoo $distver or compatible\n");
 		
 	} else {
-		die('unrecognized linux distribution');
+		die('unrecognized Linux distribution');
 	}
 	
 	return array('name' => $distname, 'version' => $distver, 'id' => $distid, 'baseid' => $distbaseid);
@@ -355,61 +355,6 @@ function no_comments($file, $comment = '#'){
 	}
 }
 
-function find_includes($file){
-  global $httpd_root;
-  clearstatcache();
-  if(is_file($file) && filesize($file) > 0){
-    $includes[] = $file;
-    $inhalt = unix_nl(no_comments($file));
-    $lines = explode("\n", $inhalt);
-    if(!empty($lines)){
-      foreach($lines as $line){
-        if(stristr($line, 'include ')){
-          $include_file = str_replace("\n", '', trim(shell_exec("echo \"$line\" | awk '{print \$2}'")));
-          if(substr($include_file,0,1) != '/'){
-            $include_file = $httpd_root.'/'.$include_file;
-          }
-          if(is_file($include_file)){
-            if($further_includes = find_includes($include_file)){
-              $includes = array_merge($includes, $further_includes);
-            }
-          } else {
-            if(strstr($include_file, '*')){
-              $more_files = explode("\n", shell_exec("ls -l $include_file | awk '{print \$9}'"));
-              if(!empty($more_files)){
-                foreach($more_files as $more_file){
-                  if(is_file($more_file)){
-                    if($further_includes = find_includes($more_file)){
-                      $includes = array_merge($includes, $further_includes);
-                    }
-                  }
-                }
-              }
-              unset($more_files);
-              $more_files = explode("\n", shell_exec("ls -l $include_file | awk '{print \$10}'"));
-              if(!empty($more_files)){
-                foreach($more_files as $more_file){
-                  if(is_file($more_file)){
-                    if($further_includes = find_includes($more_file)){
-                      $includes = array_merge($includes, $further_includes);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if(is_array($includes)){
-    $includes = array_unique($includes);
-    return $includes;
-  } else {
-    return false;
-  }
-}
-
 function comment_out($file, $string){
 	$inhalt = no_comments($file);
 	$gesamt_inhalt = rf($file);

server/lib/classes/file.inc.php

@@ -158,52 +158,6 @@ class file{
       return $ret_val;
     }
     
-    function find_includes($file){
-      ob_start();
-      $httpd_root = system('httpd -V | awk -F"\"" \'$1==" -D HTTPD_ROOT="{print $2}\'');
-      ob_end_clean();
-      clearstatcache();
-      if(is_file($file) && filesize($file) > 0){
-        $includes[] = $file;
-        $inhalt = $this->unix_nl($this->no_comments($file));
-        $lines = explode("\n", $inhalt);
-        if(!empty($lines)){
-          foreach($lines as $line){
-            if(stristr($line, "include ")){
-              $include_file = str_replace("\n", "", trim(shell_exec("echo \"$line\" | awk '{print \$2}'")));
-              if(substr($include_file,0,1) != "/"){
-                $include_file = $httpd_root."/".$include_file;
-              }
-              if(is_file($include_file)){
-                if($further_includes = $this->find_includes($include_file)){
-                  $includes = array_merge($includes, $further_includes);
-                }
-              } else {
-                if(strstr($include_file, "*")){
-                  $more_files = explode("\n", shell_exec("ls -l $include_file | awk '{print \$9}'"));
-                  if(!empty($more_files)){
-                    foreach($more_files as $more_file){
-                      if(is_file($more_file)){
-                        if($further_includes = $this->find_includes($more_file)){
-                          $includes = array_merge($includes, $further_includes);
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      if(is_array($includes)){
-        $includes = array_unique($includes);
-        return $includes;
-      } else {
-        return false;
-      }
-    }
-    
     function edit_dist($var, $val){
       global $$var;
       $files = array("/root/ispconfig/dist.inc.php");
@@ -316,4 +270,4 @@ class file{
     }
 
 }
-?>
\ No newline at end of file
+?>