Skip to content

Commit

Permalink
Preparing for Joomla 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@drmenzelit
drmenzelit committed Apr 6, 2016
2 parents 2a8f4f4 + 81ea485 commit b7c592f
Show file tree
Hide file tree
Showing 4,373 changed files with 33,412 additions and 19,039 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 2 additions & 3 deletions CONTRIBUTING.md → .github/CONTRIBUTING.md
View file
Expand Up @@ -21,6 +21,5 @@ There are other branches available which serve specific purposes.
| ------ | ------- |
| staging | Current codebase. |
| master | Each commit made to staging gets tested if it passes unit tests and codestyle rules. It is then merged into master. This is done automatically. |
| 2.5.x | Branch for the Joomla 2.5.x series. Currently in maintenance mode with EOL end of 2014. No new features are accepted here. |
| 3.2.x | Branch for the Joomla 3.2.x series. Currently in security mode with EOL Oct 2014. Only security issues are fixed. |
| 3.4-dev | Branch for the next minor Joomla version. New backward compatible features go into this branch. Commits to staging will be applied to this branch as well. |
| 2.5.x | Branch for the Joomla 2.5.x series. Support for this version has ended, no patches are accepted here. |
| 3.6.x | Branch for the next minor Joomla version. New backward compatible features go into this branch. Commits to staging will be applied to this branch as well. |
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE.md
View file
@@ -0,0 +1,18 @@
#### Steps to reproduce the issue



#### Expected result



#### Actual result



#### System information (as much as possible)



#### Additional comments

5 changes: 5 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
@@ -0,0 +1,5 @@
Pull Request for Issue # .

#### Summary of Changes

#### Testing Instructions
5 changes: 5 additions & 0 deletions .gitignore
View file
Expand Up @@ -90,6 +90,9 @@ Desktop.ini
/libraries/vendor/paragonie/random_compat/.gitignore
/libraries/vendor/paragonie/random_compat/.scrutinizer.yml
/libraries/vendor/paragonie/random_compat/.travis.yml
/libraries/vendor/paragonie/random_compat/dist
/libraries/vendor/paragonie/random_compat/other
/libraries/vendor/paragonie/random_compat/CHANGELOG.md
/libraries/vendor/paragonie/random_compat/ERRATA.md
/libraries/vendor/paragonie/random_compat/README.md
/libraries/vendor/paragonie/random_compat/SECURITY.md
Expand All @@ -106,6 +109,8 @@ Desktop.ini
/libraries/vendor/phpmailer/phpmailer/composer.json
/libraries/vendor/phpmailer/phpmailer/README.md
/libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
/libraries/vendor/phpmailer/phpmailer/extras/README.md
/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
/libraries/vendor/psr/log/Psr/Log/Test
/libraries/vendor/psr/log/.gitignore
/libraries/vendor/psr/log/composer.json
Expand Down
22 changes: 13 additions & 9 deletions .travis.yml
View file
Expand Up @@ -6,6 +6,7 @@ language: php
env:
global:
- RUN_PHPCS="no"
- INSTALL_MEMCACHE="yes"
- INSTALL_MEMCACHED="yes"
- INSTALL_REDIS="yes"

Expand All @@ -16,13 +17,14 @@ matrix:
- php: 5.4
env: INSTALL_APC="yes"
- php: 5.5
env: INSTALL_APCU_STABLE="yes"
env: INSTALL_APCU="yes"
- php: 5.6
env: RUN_PHPCS="yes" INSTALL_APCU_STABLE="yes"
env: RUN_PHPCS="yes" INSTALL_APCU="yes"
- php: 7.0
env: INSTALL_APCU_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved

services:
- memcache
- memcached
- redis-server

Expand All @@ -37,15 +39,17 @@ before_script:
# Set up Apache
# - ./build/travis/php-apache.sh
# Enable additional PHP extensions
- if [ "$INSTALL_MEMCACHED" == "yes" ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
- if [ "$INSTALL_APC" == "yes" ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
- if [ "$INSTALL_APCU_STABLE" == "yes" ]; then printf "\n" | pecl install apcu; fi
- if [ "$INSTALL_APCU_BETA" == "yes" ]; then printf "\n" | pecl install apcu-beta; fi
- if [ "$INSTALL_REDIS" == "yes" ]; then phpenv config-add build/travis/phpenv/redis.ini; fi
- if [[ $INSTALL_MEMCACHE == "yes" ]]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
- if [[ $INSTALL_MEMCACHED == "yes" ]]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
- if [[ $INSTALL_APC == "yes" ]]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
- if [[ $INSTALL_APCU == "yes" && $TRAVIS_PHP_VERSION = 5.* ]]; then printf "\n" | pecl install apcu-4.0.10 && phpenv config-add build/travis/phpenv/apcu-$TRAVIS_PHP_VERSION.ini; fi
- if [[ $INSTALL_APCU == "yes" && $TRAVIS_PHP_VERSION = 7.* ]]; then printf "\n" | pecl install apcu-beta && phpenv config-add build/travis/phpenv/apcu-$TRAVIS_PHP_VERSION.ini; fi
- if [[ $INSTALL_APCU_BC_BETA == "yes" ]]; then printf "\n" | pecl install apcu_bc-beta; fi
- if [[ $INSTALL_REDIS == "yes" ]]; then phpenv config-add build/travis/phpenv/redis.ini; fi

script:
- libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml
- if [ "$RUN_PHPCS" == "yes" ]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
- if [[ $RUN_PHPCS == "yes" ]]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi

branches:
except:
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Expand Up @@ -3,7 +3,7 @@ Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cm

Build Status
---------------------
Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.png)](https://travis-ci.org/joomla/joomla-cms)
Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms)
Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/)

What is this?
Expand Down Expand Up @@ -79,13 +79,13 @@ Do you want to improve Joomla?
--------------------
* How do you [request a feature](https://docs.joomla.org/How_do_you_request_a_feature%3F)?
* How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues)?
* Get Involved: Joomla! is community developed software. [Join the community](http://volunteers.joomla.org/).
* Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org/).
* Documentation for [Developers](https://docs.joomla.org/Developers).
* Documentation for [Web designers](https://docs.joomla.org/Web_designers).

Copyright
---------------------
* Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
* Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
* [Special Thanks](https://docs.joomla.org/Joomla!_Credits_and_Thanks)
* Distributed under the GNU General Public License version 2 or later
* See [License details](https://docs.joomla.org/Joomla_Licenses)
4 changes: 2 additions & 2 deletions README.txt
View file
Expand Up @@ -60,12 +60,12 @@
12- Do you want to improve Joomla?
* How do you request a feature? https://docs.joomla.org/How_do_you_request_a_feature%3F
* How do you report a bug? https://docs.joomla.org/Filing_bugs_and_issues
* Get Involved: Joomla! is a community developed software. Join the community at http://volunteers.joomla.org/
* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org/
* Are you a Developer? https://docs.joomla.org/Developers
* Are you a Web designer? https://docs.joomla.org/Web_designers

Copyright:
* Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
* Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
* Special Thanks: https://docs.joomla.org/Joomla!_Credits_and_Thanks
* Distributed under the GNU General Public License version 2 or later
* See Licenses details at https://docs.joomla.org/Joomla_Licenses
2 changes: 1 addition & 1 deletion administrator/components/com_admin/admin.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/admin.xml
View file
Expand Up @@ -3,7 +3,7 @@
<name>com_admin</name>
<author>Joomla! Project</author>
<creationDate>April 2006</creationDate>
<copyright>(C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/controller.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/controllers/profile.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/helpers/html/directory.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/helpers/html/phpsetting.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/helpers/html/system.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/models/help.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/models/profile.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
33 changes: 26 additions & 7 deletions administrator/components/com_admin/models/sysinfo.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down Expand Up @@ -72,6 +72,7 @@ class AdminModelSysInfo extends JModelLegacy
'Cookie',
'DOCUMENT_ROOT',
'extension_dir',
'error_log',
'Host',
'HTTP_COOKIE',
'HTTP_HOST',
Expand Down Expand Up @@ -99,7 +100,9 @@ class AdminModelSysInfo extends JModelLegacy
'Server Root',
'session.name',
'session.save_path',
'upload_tmp_dir',
'User/Group',
'open_basedir'
),
'other' => array(
'db',
Expand All @@ -122,7 +125,8 @@ class AdminModelSysInfo extends JModelLegacy
'session_memcached_server_host',
'sitename',
'smtphost',
'tmp_path'
'tmp_path',
'open_basedir'
)
);

Expand Down Expand Up @@ -201,6 +205,10 @@ protected function cleanSectionPrivateData($sectionValues)
{
if (!is_array($sectionValues))
{
if (strstr($sectionValues, JPATH_ROOT))
{
$sectionValues = 'xxxxxx';
}
return strlen($sectionValues) ? 'xxxxxx' : '';
}

Expand Down Expand Up @@ -325,12 +333,13 @@ public function phpinfoEnabled()
* Method to get filter data from the model
*
* @param string $dataType Type of data to get safely
* @param bool $public If true no sensitive information will be removed
*
* @return array
*
* @since 3.5
*/
public function getSafeData($dataType)
public function getSafeData($dataType, $public = true)
{
if (isset($this->safeData[$dataType]))
{
Expand All @@ -344,7 +353,7 @@ public function getSafeData($dataType)
return array();
}

$data = $this->$methodName();
$data = $this->$methodName($public);

$this->safeData[$dataType] = $this->cleanPrivateData($data, $dataType);

Expand Down Expand Up @@ -483,11 +492,13 @@ public function getExtensions()
/**
* Method to get the directory states
*
* @param bool $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 = false)
{
if (!empty($this->directories))
{
Expand Down Expand Up @@ -596,8 +607,16 @@ public function getDirectory()
$this->addDirectory('administrator/cache', JPATH_CACHE, 'COM_ADMIN_CACHE_DIRECTORY');
}

$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');
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;
}
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/eaccelerator.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for eAccelerator compatibility.
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/htaccess.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for notifying users of a change
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/languageaccess340.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for the checks if the installation is
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/phpversion.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for the checking minimum PHP version support
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/statscollection.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for the checking minimum PHP version support
Expand Down

0 comments on commit b7c592f

Please sign in to comment.