Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0690ed9 authored by Pierre-Alain Bandinelli's avatar Pierre-Alain Bandinelli
Browse files

Improving data path function as identified in #7

parent 173e4565
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -162,16 +162,17 @@ class OC_RainLoop_Helper
			function __get_custom_data_full_path()
			{
				$sData = __DIR__.'/../../data/';
				$ocData = "";
				if (class_exists('OC_Config'))
				{
					$sData = rtrim(trim(OC_Config::getValue('datadirectory', '')), '\\/').'/';
					$ocData = rtrim(trim(OC_Config::getValue('datadirectory', '')), '\\/').'/';
				}
				else if (class_exists('OC'))
				{
					$sData = rtrim(trim(OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/').'/';
					$ocData = rtrim(trim(OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/').'/';
				}

				return @is_dir($sData) ? $sData.'rainloop-storage' : '';
				return @is_dir($ocData) ? $ocData.'rainloop-storage' : $sData.'rainloop-storage'; #Reverting to standard defined path if OC config returns a non existing path for data folder
			}
		}
	}