Fixed: FS#1310 - mailfilter not removed from database

tbrehm

2010-09-16 e3ba932c63d6a8429b52f8de0e3a11709f405d80

 install/lib/install.lib.php

@@ -30,7 +30,7 @@

/*
   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 @@
       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);
@@ -353,61 +353,6 @@
   } else {
      return '';
   }
}

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){