Stop ini_set warnings on import by adding @ to the calls in the template file...

Stop ini_set warnings on import by adding @ to the calls in the template file (all sites will need to be synched for this to take effect), and closedir after reading all the sites

platform/provision_drupal.module

@@ -527,10 +527,11 @@ function provision_drupal_find_sites() {
   if ($dir = opendir("./sites")) {
     while (FALSE !== ($subdir = readdir($dir))) {
       $file = "./sites/$subdir/settings.php";
-      if (file_exists("$file")) {
+      if (file_exists("$file") && ($subdir != 'default')) {
         $sites[$subdir] = $file;
       }
     }
+    closedir($dir);
   } else {
     provision_log("error", t("Cannot find sites directory"));
     $sites = FALSE;
@@ -567,8 +568,6 @@ function provision_drupal_provision_import($url, &$data) {
       $data['sites'][$site] = $info;
     }
   }
-  //Just make sure our ini settings and the like aren't wiped out.
-  include(conf_path() ."/settings.php");
 }
 
 function _provision_drupal_import_site($url) {

platform/provision_drupal_settings.tpl.php

@@ -11,17 +11,17 @@
   * settings are used there. Settings defined here should not be
   * duplicated there so as to avoid conflict issues.
   */
-  ini_set('arg_separator.output',     '&');
-  ini_set('magic_quotes_runtime',     0);
-  ini_set('magic_quotes_sybase',      0);
-  ini_set('session.cache_expire',     200000);
-  ini_set('session.cache_limiter',    'none');
-  ini_set('session.cookie_lifetime',  0);
-  ini_set('session.gc_maxlifetime',   200000);
-  ini_set('session.save_handler',     'user');
-  ini_set('session.use_only_cookies', 1);
-  ini_set('session.use_trans_sid',    0);
-  ini_set('url_rewriter.tags',        '');
+  @ini_set('arg_separator.output',     '&');
+  @ini_set('magic_quotes_runtime',     0);
+  @ini_set('magic_quotes_sybase',      0);
+  @ini_set('session.cache_expire',     200000);
+  @ini_set('session.cache_limiter',    'none');
+  @ini_set('session.cookie_lifetime',  0);
+  @ini_set('session.gc_maxlifetime',   200000);
+  @ini_set('session.save_handler',     'user');
+  @ini_set('session.use_only_cookies', 1);
+  @ini_set('session.use_trans_sid',    0);
+  @ini_set('url_rewriter.tags',        '');
 
   global $conf;
   $conf['file_directory_path'] = conf_path() . '/files';
@@ -42,7 +42,7 @@
     // Per RFC 2109, cookie domains must contain at least one dot other than the
     // first. For hosts such as 'localhost', we don't set a cookie domain.
     if (count(explode('.', $domain)) > 2) {
-      ini_set('session.cookie_domain', $domain);
+      @ini_set('session.cookie_domain', $domain);
     }
   }