From 8272a44f66230151fdf5752f94d8d48b6ae3138c Mon Sep 17 00:00:00 2001
From: Milton Zurita <mzurita85@hotmail.com>
Date: Fri, 16 Sep 2016 03:38:50 -0500
Subject: [PATCH] Fixed: CRM-19303

Instead of assuming the default folder exists, it checks, if not it will search nearby directories for the files.
---
 CRM/Utils/System/Base.php       |  2 +-
 CRM/Utils/System/DrupalBase.php | 79 +++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
index b3f8dcb443..b053e547fd 100644
--- a/CRM/Utils/System/Base.php
+++ b/CRM/Utils/System/Base.php
@@ -582,7 +582,7 @@ abstract class CRM_Utils_System_Base {
         $filesURL = $baseURL . "sites/$siteName/files/civicrm/";
       }
       else {
-        $filesURL = $baseURL . "sites/default/files/civicrm/";
+        $filesURL = $config->userSystem->checkMultisite($civicrm_root, $baseURL);
       }
     }
     elseif ($config->userFramework == 'UnitTests') {
diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
index 3129073181..fa10d9564a 100644
--- a/CRM/Utils/System/DrupalBase.php
+++ b/CRM/Utils/System/DrupalBase.php
@@ -568,4 +568,83 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
     return $siteName;
   }
 
+  /**
+  * @var $basepath String cached basepath to prevent having to parse it repeatedly.
+  **/
+  protected $basepath;
+
+  /**
+  * @var $filesUrl String holds resolved path.
+  **/
+  protected $filesUrl;
+
+  /**
+  *  checkBasePath - Returns root directory with respect to $civicrm_root
+  *
+  * @param $root String
+  * @param $seek String
+  **/
+  public function checkBasePath($root, $seek = "/sites/")
+  {
+    if(!isset($this->basepath)) {
+      $this->basepath = substr($root, 0, stripos($root, $seek)+1);
+    }
+
+    return $this->basepath;
+  }
+
+  /**
+  * check if files exist in path.  Just a simple helper function for viewing
+  * existence of sites.
+  *
+  * @param $basepath string
+  * @param $basepath string
+  **/
+  private function checkFilesExists($basepath, $folder) {
+    return file_exists("{$basepath}sites/$folder/files/civicrm/");
+  }
+
+  /**
+  * Returns the concatenated url for existing path.
+  *
+  * @param $baseUrl string
+  * @param $folder string
+  **/
+  private function getUrl($baseUrl, $folder) {
+    return "{$baseUrl}sites/$folder/files/civicrm/";
+  }
+
+  /**
+  * Returns the location of /sites/SITENAME/files/civicrm depending
+  * on system configuration.
+  *
+  * @fixed CRM-19303
+  * @param $root string
+  * @param $baseUrl string
+  * @param $default string
+  **/
+  public function checkMultisite($root, $baseUrl, $default = "default") {
+    if(isset($this->filesUrl)) return $this->filesUrl;
+
+    $basepath = $this->checkBasePath($root);
+    $correct = null;
+    if($this->checkFilesExists($root, $default)) {
+      $correct = $default;
+    }
+    else {
+      //Check for any other directories if default doesn't exist.
+      $folders = scandir($basepath.'sites/');
+      foreach($folders as $folder) {
+        //Ignore hidden directories/files...
+        if(strpos($folder,'.') === 0 || $folder == 'all') continue;
+        //Check if it is a directory
+        if(!is_dir($basepath.'sites/'.$folder)) continue;
+
+        //Check if files path exists...
+        if($this->checkFilesExists($basepath, $folder)) {
+          $correct = $folder;
+          break;
+        }
+      }
+  }
 }
-- 
2.25.1