adding an exception for web view

joomla · Mar 3, 2016 · 4bde079 · 4bde079
1 parent 7ccf27d
commit 4bde079
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php
@@ -183,7 +183,7 @@ protected function cleanPrivateData($dataArray, $dataType = 'other')
 
 			if (in_array($section, $privateSettings, true))
 			{
-				if(strstr($values, JPATH_ROOT))
+				if(is_string($values) && strstr($values, JPATH_ROOT))
 				{
 					$dataArray[$section] = 'xxxxxx';
 				}
@@ -333,13 +333,14 @@ public function phpinfoEnabled()
 	/**
 	 * Method to get filter data from the model
 	 *
-	 * @param   string  $dataType  Type of data to get safely
+	 * @param   string $dataType Type of data to get safely
+	 * @param bool $public
 	 *
 	 * @return  array
 	 *
 	 * @since   3.5
 	 */
-	public function getSafeData($dataType)
+	public function getSafeData($dataType, $public = true)
 	{
 		if (isset($this->safeData[$dataType]))
 		{
@@ -353,7 +354,7 @@ public function getSafeData($dataType)
 			return array();
 		}
 
-		$data = $this->$methodName();
+		$data = $this->$methodName($public);
 
 		$this->safeData[$dataType] = $this->cleanPrivateData($data, $dataType);
 
@@ -492,11 +493,12 @@ public function getExtensions()
 	/**
 	 * Method to get the directory states
 	 *
+	 * @param $public - if true no information is going to be removed
 	 * @return  array States of directories
 	 *
 	 * @since   1.6
 	 */
-	public function getDirectory()
+	public function getDirectory($public)
 	{
 		if (!empty($this->directories))
 		{
@@ -605,8 +607,16 @@ public function getDirectory()
 			$this->addDirectory('administrator/cache', JPATH_CACHE, 'COM_ADMIN_CACHE_DIRECTORY');
 		}
 
-		$this->addDirectory('log', $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY');
-		$this->addDirectory('tmp', $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY');
+		if($public)
+		{
+			$this->addDirectory('log', $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY');
+			$this->addDirectory('tmp', $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY');
+		}
+		else
+		{
+			$this->addDirectory($registry->get('log_path', JPATH_ROOT . '/log'), $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY');
+			$this->addDirectory($registry->get('tmp_path', JPATH_ROOT . '/tmp'), $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY');
+		}
 
 		return $this->directories;
 	}

diff --git a/administrator/components/com_admin/views/sysinfo/view.json.php b/administrator/components/com_admin/views/sysinfo/view.json.php
@@ -59,7 +59,7 @@ protected function getLayoutData()
 			'info'        => $model->getSafeData('info'),
 			'phpSettings' => $model->getSafeData('phpSettings'),
 			'config'      => $model->getSafeData('config'),
-			'directories' => $model->getSafeData('directory'),
+			'directories' => $model->getSafeData('directory', true),
 			'phpInfo'     => $model->getSafeData('phpInfoArray'),
 			'extensions'  => $model->getSafeData('extensions')
 		);

diff --git a/administrator/components/com_admin/views/sysinfo/view.text.php b/administrator/components/com_admin/views/sysinfo/view.text.php
@@ -86,7 +86,7 @@ protected function getLayoutData()
 			),
 			'directories' => array(
 				'title' => JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS', true),
-				'data'  => $model->getSafeData('directory')
+				'data'  => $model->getSafeData('directory', true)
 			),
 			'phpInfo' => array(
 				'title' => JText::_('COM_ADMIN_PHP_INFORMATION', true),