diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c48cf4ecc7385..2434a62ddbf49 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,5 +3,3 @@ Pull Request for Issue # . #### Summary of Changes #### Testing Instructions - -#### Documentation Changes Required diff --git a/.gitignore b/.gitignore index f7d136459ad47..fa5ff5c4f07a6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,13 +15,19 @@ /configuration.php /.htaccess /web.config -/.php_cs.cache # Test Related Files # /phpunit.xml - -# Node modules # -node_modules/ +/tests/system/webdriver/tests/logs/ +/tests/system/servers/configdef.php +codecept.phar +tests/codeception/_output/* +tests/codeception/vendor/* +tests/codeception/testingsite* +tests/codeception/tests/acceptance.suite.yml +tests/codeception/tests/acceptance/*Tester.php +tests/codeception/tests/functional/*Tester.php +tests/codeception/tests/unit/*Tester.php # phpDocumentor Logs # phpdoc-* diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 597141e11be68..0000000000000 --- a/.php_cs +++ /dev/null @@ -1,65 +0,0 @@ -in(array(__DIR__ . '/libraries')) - ->files() - ->depth(0); - -$mainFinder = Symfony\CS\Finder\DefaultFinder::create() - ->in( - array( - __DIR__ . '/libraries/cms', - __DIR__ . '/libraries/joomla', - __DIR__ . '/libraries/legacy', - ) - ) - ->append($topFilesFinder); - -return Symfony\CS\Config\Config::create() - ->setUsingLinter(false) - ->setUsingCache(true) - ->level(Symfony\CS\FixerInterface::NONE_LEVEL) - ->fixers( - array( - // psr-1 - 'encoding', - // psr-2 - 'elseif', - 'eof_ending', - 'function_call_space', - 'line_after_namespace', - 'linefeed', - 'lowercase_constants', - 'lowercase_keywords', - 'method_argument_space', - 'multiple_use', - 'parenthesis', - 'single_line_after_imports', - 'trailing_spaces', - 'visibility', - // symfony - 'array_element_no_space_before_comma', - 'array_element_white_space_after_comma', - 'duplicate_semicolon', - 'empty_return', - 'extra_empty_lines', - 'function_typehint_space', - 'include', - 'join_function', - 'list_commas', - 'multiline_array_trailing_comma', - 'no_blank_lines_after_class_opening', - 'phpdoc_trim', - 'return', - 'single_array_no_trailing_comma', - 'single_blank_line_before_namespace', - 'spaces_cast', - 'unneeded_control_parentheses', - 'unused_use', - 'whitespacy_lines', - // contrib - 'concat_with_spaces', - 'long_array_syntax', - ) - ) - ->finder($mainFinder); diff --git a/.travis.yml b/.travis.yml index bddbca6679011..c3e08c640bd94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,4 +67,4 @@ script: branches: except: - - 2.5.x + - 2.5.x \ No newline at end of file diff --git a/README.md b/README.md index 561e26ab5b99c..27e40e5019733 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Ready to install Joomla? * Check the [minimum requirements](https://www.joomla.org/about-joomla/technical-requirements.html). * How do you [install Joomla](https://docs.joomla.org/J3.x:Installing_Joomla)? * You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Installing_Joomla_locally). -When ready, it can be moved to an on-line hosting account of your choice. +When ready, it can be moved to an online hosting account of your choice. Updates are free! --------------------- diff --git a/README.txt b/README.txt index 3b2b348276b67..7a384bd2c390e 100644 --- a/README.txt +++ b/README.txt @@ -38,7 +38,7 @@ * Check the minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html * How do you install Joomla - hhttps://docs.joomla.org/J3.x:Installing_Joomla * You could start your Joomla! experience building your site on a local test server. - When ready it can be moved to an on-line hosting account of your choice. + When ready it can be moved to an online hosting account of your choice. See the tutorial: https://docs.joomla.org/Installing_Joomla_locally 9- Updates are free! diff --git a/administrator/components/com_admin/models/help.php b/administrator/components/com_admin/models/help.php index ca4295dc35466..f18f7f2a155c3 100644 --- a/administrator/components/com_admin/models/help.php +++ b/administrator/components/com_admin/models/help.php @@ -198,7 +198,7 @@ public function &getLatestVersionCheck() { if (!$this->latest_version_check) { - $override = 'https://help.joomla.org/proxy/index.php?keyref=Help{major}{minor}:' + $override = 'https://help.joomla.org/proxy/index.php?option=com_help&keyref=Help{major}{minor}:' . 'Joomla_Version_{major}_{minor}_{maintenance}/{langcode}&lang={langcode}'; $this->latest_version_check = JHelp::createUrl('JVERSION', false, $override); } diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index a66ac4149395c..1c398c5491440 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -250,8 +250,8 @@ protected function updateManifestCaches() array('library', 'fof', '', 0), array('library', 'phpass', '', 0), - // Modules - // - Site + // Modules site + // Site array('module', 'mod_articles_archive', '', 0), array('module', 'mod_articles_latest', '', 0), array('module', 'mod_articles_popular', '', 0), @@ -277,7 +277,7 @@ protected function updateManifestCaches() array('module', 'mod_tags_popular', '', 0), array('module', 'mod_tags_similar', '', 0), - // - Administrator + // Administrator array('module', 'mod_custom', '', 1), array('module', 'mod_feed', '', 1), array('module', 'mod_latest', '', 1), @@ -1548,10 +1548,10 @@ public function deleteUnexistingFiles() * Needed for updates post-3.4 * If com_weblinks doesn't exist then assume we can delete the weblinks package manifest (included in the update packages) */ - if (!JFile::exists(JPATH_ROOT . '/administrator/components/com_weblinks/weblinks.php') - && JFile::exists(JPATH_ROOT . '/administrator/manifests/packages/pkg_weblinks.xml')) + if (!JFile::exists(JPATH_ADMINISTRATOR . '/components/com_weblinks/weblinks.php') + && JFile::exists(JPATH_MANIFESTS . '/packages/pkg_weblinks.xml')) { - JFile::delete(JPATH_ROOT . '/administrator/manifests/packages/pkg_weblinks.xml'); + JFile::delete(JPATH_MANIFESTS . '/packages/pkg_weblinks.xml'); } } @@ -1568,9 +1568,9 @@ protected function clearRadCache() { jimport('joomla.filesystem.file'); - if (JFile::exists(JPATH_ROOT . '/cache/fof/cache.php')) + if (JFile::exists(JPATH_CACHE . '/fof/cache.php')) { - JFile::delete(JPATH_ROOT . '/cache/fof/cache.php'); + JFile::delete(JPATH_CACHE . '/fof/cache.php'); } } @@ -1744,7 +1744,7 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false) } // Step 1: Drop indexes later to be added again with column lengths limitations at step 2 - $fileName1 = JPATH_ROOT . "/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql"; + $fileName1 = JPATH_ADMINISTRATOR . "/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql"; if (is_file($fileName1)) { @@ -1768,7 +1768,7 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false) } // Step 2: Perform the index modifications and conversions - $fileName2 = JPATH_ROOT . "/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql"; + $fileName2 = JPATH_ADMINISTRATOR . "/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql"; if (is_file($fileName2)) { @@ -1814,14 +1814,8 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false) */ private function cleanJoomlaCache() { - JModelLegacy::addIncludePath(JPATH_ROOT . '/administrator/components/com_cache/models'); + JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_cache/models'); $model = JModelLegacy::getInstance('cache', 'CacheModel'); - - // Clean frontend cache - $model->clean(); - - // Clean admin cache - $model->setState('client_id', 1); $model->clean(); } } diff --git a/administrator/components/com_admin/views/profile/tmpl/edit.php b/administrator/components/com_admin/views/profile/tmpl/edit.php index 0e9d8f8f4b785..7e7c15d950dc3 100644 --- a/administrator/components/com_admin/views/profile/tmpl/edit.php +++ b/administrator/components/com_admin/views/profile/tmpl/edit.php @@ -55,7 +55,7 @@ continue; } ?> - name, JText::_($fieldset->label)); ?> + name, JText::_($fieldset->label, true)); ?> form->getFieldset($fieldset->name) as $field) : ?> hidden) : ?>
diff --git a/administrator/components/com_banners/models/banner.php b/administrator/components/com_banners/models/banner.php index 866885bfafbc9..16e3b8e6cbe87 100644 --- a/administrator/components/com_banners/models/banner.php +++ b/administrator/components/com_banners/models/banner.php @@ -473,27 +473,6 @@ protected function prepareTable($table) $table->version++; } - /** - * Allows preprocessing of the JForm object. - * - * @param JForm $form The form object - * @param array $data The data to be merged into the form object - * @param string $group The plugin group to be executed - * - * @return void - * - * @since 3.6.1 - */ - protected function preprocessForm(JForm $form, $data, $group = 'content') - { - if ($this->canCreateCategory()) - { - $form->setFieldAttribute('catid', 'allowAdd', 'true'); - } - - parent::preprocessForm($form, $data, $group); - } - /** * Method to save the form data. * @@ -519,7 +498,7 @@ public function save($data) } // Save New Category - if ($catid == 0 && $this->canCreateCategory()) + if ($catid == 0) { $table = array(); $table['title'] = $data['catid']; @@ -558,16 +537,4 @@ public function save($data) return parent::save($data); } - - /** - * Is the user allowed to create an on the fly category? - * - * @return bool - * - * @since 3.6.1 - */ - private function canCreateCategory() - { - return JFactory::getUser()->authorise('core.create', 'com_banners'); - } } diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml index c7aad291da185..8a8dac3b9e32a 100644 --- a/administrator/components/com_banners/models/forms/banner.xml +++ b/administrator/components/com_banners/models/forms/banner.xml @@ -39,6 +39,7 @@ extension="com_banners" required="true" addfieldpath="/administrator/components/com_categories/models/fields" + allowAdd="true" default="" /> @@ -92,7 +93,7 @@ description="COM_BANNERS_FIELD_DESCRIPTION_DESC" filter="JComponentHelper::filterText" buttons="true" - hide="readmore,pagebreak,module" + hide="readmore,pagebreak" /> getModel('cache'); + $data = $model->getCache()->getAll(); $allCleared = true; - $clients = array(1, 0); - foreach ($clients as $client) + foreach ($data as $cache) { - $mCache = $model->getCache($client); - $clientStr = JText::_($client ? 'JADMINISTRATOR' : 'JSITE') .' > '; - - foreach ($mCache->getAll() as $cache) + if ((int) $model->clean($cache->group) !== 1) { - if ((int) $mCache->clean($cache->group) !== 1) - { - $app->enqueueMessage(JText::sprintf('COM_CACHE_EXPIRED_ITEMS_DELETE_ERROR', $clientStr . $cache->group), 'error'); - $allCleared = false; - } + $app->enqueueMessage(JText::sprintf('COM_CACHE_EXPIRED_ITEMS_DELETE_ERROR', $cache->group), 'error'); + $allCleared = false; } } diff --git a/administrator/components/com_cache/models/cache.php b/administrator/components/com_cache/models/cache.php index fd8b6b2e76ef7..534c386ffe933 100644 --- a/administrator/components/com_cache/models/cache.php +++ b/administrator/components/com_cache/models/cache.php @@ -165,20 +165,15 @@ public function getData() * * @return object */ - public function getCache($client_id = null) + public function getCache() { $conf = JFactory::getConfig(); - if (is_null($client_id)) - { - $client_id = $this->getState('client_id'); - } - $options = array( 'defaultgroup' => '', 'storage' => $conf->get('cache_handler', ''), 'caching' => true, - 'cachebase' => (int) $client_id === 1 ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache') + 'cachebase' => ($this->getState('client_id') === 1) ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache') ); $cache = JCache::getInstance('', $options); diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php index ec29ffc3f914d..e4589f6704bbd 100644 --- a/administrator/components/com_categories/helpers/categories.php +++ b/administrator/components/com_categories/helpers/categories.php @@ -148,7 +148,7 @@ public static function createCategory($data) JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/models'); JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables'); - $categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel', array('ignore_request' => true)); + $categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel'); $categoryModel->save($data); $catid = $categoryModel->getState('category.id'); diff --git a/administrator/components/com_categories/models/categories.php b/administrator/components/com_categories/models/categories.php index 6a2045ad33e2c..ec1246bd62d79 100644 --- a/administrator/components/com_categories/models/categories.php +++ b/administrator/components/com_categories/models/categories.php @@ -294,7 +294,7 @@ protected function getListQuery() uc.name, ag.title, ua.name' - ); + ); return $query; } @@ -360,7 +360,7 @@ public function getItems() /** * Method to load the countItems method from the extensions - * + * * @param stdClass[] &$items The category items * @param string $extension The category extension * @@ -387,12 +387,12 @@ public function countItems(&$items, $extension) { require_once $file; - $prefix = ucfirst($eName); + $prefix = ucfirst(str_replace('com_', '', $component)); $cName = $prefix . 'Helper'; if (class_exists($cName) && is_callable(array($cName, 'countItems'))) { - $cName::countItems($items, $section); + call_user_func(array($cName, 'countItems'), $items, $section); } } } diff --git a/administrator/components/com_categories/models/category.php b/administrator/components/com_categories/models/category.php index fb63bb8bb2f13..44d3d4c4df45b 100644 --- a/administrator/components/com_categories/models/category.php +++ b/administrator/components/com_categories/models/category.php @@ -69,12 +69,15 @@ public function __construct($config = array()) */ protected function canDelete($record) { - if (empty($record->id) || $record->published != -2) + if (!empty($record->id)) { - return false; - } + if ($record->published != -2) + { + return; + } - return JFactory::getUser()->authorise('core.delete', $record->extension . '.category.' . (int) $record->id); + return JFactory::getUser()->authorise('core.delete', $record->extension . '.category.' . (int) $record->id); + } } /** @@ -335,10 +338,7 @@ protected function loadFormData() ) ); $data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null))); - $data->set( - 'access', - $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access'))) - ); + $data->set('access', $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access')))); } } diff --git a/administrator/components/com_categories/models/fields/categoryedit.php b/administrator/components/com_categories/models/fields/categoryedit.php index f1db512ea4448..ad352f6d0083e 100644 --- a/administrator/components/com_categories/models/fields/categoryedit.php +++ b/administrator/components/com_categories/models/fields/categoryedit.php @@ -23,7 +23,7 @@ class JFormFieldCategoryEdit extends JFormFieldList /** * To allow creation of new categories. * - * @var integer + * @var int * @since 3.6 */ protected $allowAdd; @@ -251,8 +251,8 @@ protected function getOptions() { foreach ($options as $i => $option) { - /* - * To take save or create in a category you need to have create rights for that category unless the item is already in that category. + /* To take save or create in a category you need to have create rights for that category + * unless the item is already in that category. * Unset the option if the user isn't authorised for it. In this field assets are always categories. */ if ($user->authorise('core.create', $extension . '.category.' . $option->value) != true && $option->level != 0) @@ -264,8 +264,7 @@ protected function getOptions() // If you have an existing category id things are more complex. else { - /* - * If you are only allowed to edit in this category but not edit.state, you should not get any + /* If you are only allowed to edit in this category but not edit.state, you should not get any * option to change the category parent for a category or the category for a content item, * but you should be able to save in that category. */ @@ -286,10 +285,8 @@ protected function getOptions() unset($options[$i]); } - /* - * However, if you can edit.state you can also move this to another category for which you have - * create permission and you should also still be able to save in the current category. - */ + // However, if you can edit.state you can also move this to another category for which you have + // create permission and you should also still be able to save in the current category. if (($user->authorise('core.create', $extension . '.category.' . $option->value) != true) && ($option->value != $oldCat && !isset($oldParent))) { @@ -365,10 +362,7 @@ protected function getInput() $attr .= $this->autofocus ? ' autofocus' : ''; // To avoid user's confusion, readonly="true" should imply disabled="true". - if ((string) $this->readonly == '1' - || (string) $this->readonly == 'true' - || (string) $this->disabled == '1' - || (string) $this->disabled == 'true') + if ((string) $this->readonly == '1' || (string) $this->readonly == 'true' || (string) $this->disabled == '1'|| (string) $this->disabled == 'true') { $attr .= ' disabled="disabled"'; } diff --git a/administrator/components/com_categories/models/fields/categoryparent.php b/administrator/components/com_categories/models/fields/categoryparent.php index bbb4954f7e81a..438a663a931a5 100644 --- a/administrator/components/com_categories/models/fields/categoryparent.php +++ b/administrator/components/com_categories/models/fields/categoryparent.php @@ -133,8 +133,8 @@ protected function getOptions() { foreach ($options as $i => $option) { - /* - * To take save or create in a category you need to have create rights for that category unless the item is already in that category. + /* To take save or create in a category you need to have create rights for that category + * unless the item is already in that category. * Unset the option if the user isn't authorised for it. In this field assets are always categories. */ if ($user->authorise('core.create', $extension . '.category.' . $option->value) != true) @@ -148,8 +148,7 @@ protected function getOptions() { foreach ($options as $i => $option) { - /* - * If you are only allowed to edit in this category but not edit.state, you should not get any + /* If you are only allowed to edit in this category but not edit.state, you should not get any * option to change the category parent for a category or the category for a content item, * but you should be able to save in that category. */ @@ -161,10 +160,8 @@ protected function getOptions() unset($options[$i]); } } - /* - * However, if you can edit.state you can also move this to another category for which you have - * create permission and you should also still be able to save in the current category. - */ + // However, if you can edit.state you can also move this to another category for which you have + // create permission and you should also still be able to save in the current category. elseif (($user->authorise('core.create', $extension . '.category.' . $option->value) != true) && $option->value != $oldCat ) diff --git a/administrator/components/com_categories/views/category/tmpl/edit_associations.php b/administrator/components/com_categories/views/category/tmpl/edit_associations.php index b8751b02e7143..ecb71eb489e61 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit_associations.php +++ b/administrator/components/com_categories/views/category/tmpl/edit_associations.php @@ -9,4 +9,11 @@ defined('_JEXEC') or die; -echo JLayoutHelper::render('joomla.edit.associations', $this); +if ($this->item->id != 0 && $this->item->language != '*') +{ + echo JLayoutHelper::render('joomla.edit.associations', $this); +} +else +{ + echo '
' . JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE') . '
'; +} diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php index 6ca4f8ca972fe..4439dae47bd27 100644 --- a/administrator/components/com_categories/views/category/view.html.php +++ b/administrator/components/com_categories/views/category/view.html.php @@ -142,9 +142,7 @@ protected function addToolbar() // Else if the component section string exits, let's use it elseif ($lang->hasKey($component_section_key = $component . ($section ? "_$section" : ''))) { - $title = JText::sprintf('COM_CATEGORIES_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') - . '_TITLE', $this->escape(JText::_($component_section_key)) - ); + $title = JText::sprintf('COM_CATEGORIES_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') . '_TITLE', $this->escape(JText::_($component_section_key))); } // Else use the base title else @@ -206,19 +204,13 @@ protected function addToolbar() JToolbarHelper::divider(); - // Compute the ref_key - $ref_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') . '_HELP_KEY'; - - // Check if thr computed ref_key does exist in the component - if (!$lang->hasKey($ref_key)) + // Compute the ref_key if it does exist in the component + if (!$lang->hasKey($ref_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') . '_HELP_KEY')) { - $ref_key = 'JHELP_COMPONENTS_' - . strtoupper(substr($component, 4) . ($section ? "_$section" : '')) - . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT'); + $ref_key = 'JHELP_COMPONENTS_' . strtoupper(substr($component, 4) . ($section ? "_$section" : '')) . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT'); } - /* - * Get help for the category/section view for the component by + /* Get help for the category/section view for the component by * -remotely searching in a language defined dedicated URL: *component*_HELP_URL * -locally searching in a component help file if helpURL param exists in the component and is set to '' * -remotely searching in a component URL if helpURL param exists in the component and is NOT set to '' diff --git a/administrator/components/com_checkin/models/checkin.php b/administrator/components/com_checkin/models/checkin.php index c9a08970919d8..323bdb90e2e33 100644 --- a/administrator/components/com_checkin/models/checkin.php +++ b/administrator/components/com_checkin/models/checkin.php @@ -238,7 +238,6 @@ public function getItems() // Pagination $limit = (int) $this->getState('list.limit'); - if ($limit !== 0) { $this->items = array_slice($results, $this->getState('list.start'), $limit); diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php index 5f6649b1d6278..41057f18f49e3 100644 --- a/administrator/components/com_config/model/application.php +++ b/administrator/components/com_config/model/application.php @@ -127,16 +127,7 @@ public function save($data) $host = JUri::getInstance()->getHost(); $options = new \Joomla\Registry\Registry; $options->set('userAgent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0'); - - // Do not check for valid server certificate here, leave this to the user, moreover disable using a proxy if any is configured. - $options->set('transport.curl', - array( - CURLOPT_SSL_VERIFYPEER => false, - CURLOPT_SSL_VERIFYHOST => false, - CURLOPT_PROXY => null, - CURLOPT_PROXYUSERPWD => null, - ) - ); + $options->set('transport.curl', array(CURLOPT_SSL_VERIFYPEER => false)); $response = JHttpFactory::getHttp($options)->get('https://' . $host . JUri::root(true) . '/', array('Host' => $host), 10); // If available in HTTPS check also the status code. diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php index 34c1e264d952a..8b55524bcbafd 100644 --- a/administrator/components/com_contact/helpers/contact.php +++ b/administrator/components/com_contact/helpers/contact.php @@ -43,7 +43,7 @@ public static function addSubmenu($vName) /** * Adds Count Items for Category Manager. * - * @param stdClass[] &$items The contact category objects + * @param stdClass[] &$items The banner category objects * * @return stdClass[] * diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php index 9783c5b62e140..a53da18198dcb 100644 --- a/administrator/components/com_contact/models/contact.php +++ b/administrator/components/com_contact/models/contact.php @@ -396,7 +396,7 @@ public function save($data) } // Save New Category - if ($catid == 0 && $this->canCreateCategory()) + if ($catid == 0) { $table = array(); $table['title'] = $data['catid']; @@ -512,28 +512,9 @@ protected function getReorderConditions($table) * @param string $group Group name. * * @return void - * - * @since 3.0.3 */ protected function preprocessForm(JForm $form, $data, $group = 'content') { - // Determine correct permissions to check. - if ($this->getState('contact.id')) - { - // Existing record. Can only edit in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.edit'); - } - else - { - // New record. Can only create in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.create'); - } - - if ($this->canCreateCategory()) - { - $form->setFieldAttribute('catid', 'allowAdd', 'true'); - } - // Association content items $assoc = JLanguageAssociations::isEnabled(); @@ -652,16 +633,4 @@ protected function generateNewTitle($category_id, $alias, $name) return array($name, $alias); } - - /** - * Is the user allowed to create an on the fly category? - * - * @return bool - * - * @since 3.6.1 - */ - private function canCreateCategory() - { - return JFactory::getUser()->authorise('core.create', 'com_contact'); - } } diff --git a/administrator/components/com_contact/models/forms/contact.xml b/administrator/components/com_contact/models/forms/contact.xml index 3aa3bd386037f..f21b7307d01d0 100644 --- a/administrator/components/com_contact/models/forms/contact.xml +++ b/administrator/components/com_contact/models/forms/contact.xml @@ -75,6 +75,7 @@ description="JFIELD_CATEGORY_DESC" extension="com_contact" required="true" + allowAdd="true" default="" /> diff --git a/administrator/components/com_contact/views/contact/tmpl/edit_associations.php b/administrator/components/com_contact/views/contact/tmpl/edit_associations.php index a01793eee3932..70d2b1db61b28 100644 --- a/administrator/components/com_contact/views/contact/tmpl/edit_associations.php +++ b/administrator/components/com_contact/views/contact/tmpl/edit_associations.php @@ -9,4 +9,11 @@ defined('_JEXEC') or die; -echo JLayoutHelper::render('joomla.edit.associations', $this); +if ($this->item->id != 0 && $this->item->language != '*') +{ + echo JLayoutHelper::render('joomla.edit.associations', $this); +} +else +{ + echo '
' . JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE') . '
'; +} diff --git a/administrator/components/com_content/controllers/article.php b/administrator/components/com_content/controllers/article.php index 077c82c63160d..c633d649a11b5 100644 --- a/administrator/components/com_content/controllers/article.php +++ b/administrator/components/com_content/controllers/article.php @@ -86,12 +86,6 @@ protected function allowEdit($data = array(), $key = 'id') $user = JFactory::getUser(); $userId = $user->get('id'); - // If we get a deny at the component level, we cannot override here. - if (!parent::allowEdit($data, $key)) - { - return false; - } - // Check general edit permission first. if ($user->authorise('core.edit', 'com_content.article.' . $recordId)) { @@ -104,7 +98,6 @@ protected function allowEdit($data = array(), $key = 'id') { // Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; - if (empty($ownerId) && $recordId) { // Need to do a lookup from the model. @@ -118,14 +111,15 @@ protected function allowEdit($data = array(), $key = 'id') $ownerId = $record->created_by; } - // If the owner matches 'me' then permission is granted. + // If the owner matches 'me' then do the test. if ($ownerId == $userId) { return true; } } - return false; + // Since there is no asset tracking, revert to the component permissions. + return parent::allowEdit($data, $key); } /** diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php index e062ed0d586c2..01656c6429418 100644 --- a/administrator/components/com_content/models/article.php +++ b/administrator/components/com_content/models/article.php @@ -241,7 +241,7 @@ protected function prepareTable($table) // Reorder the articles within the category so the new article is first if (empty($table->id)) { - $table->reorder('catid = ' . (int) $table->catid . ' AND state >= 0'); + $table->ordering = $table->getNextOrder('catid = ' . (int) $table->catid . ' AND state >= 0'); } } @@ -504,8 +504,8 @@ public function save($data) $catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_content'); } - // Save New Categoryg - if ($catid == 0 && $this->canCreateCategory()) + // Save New Category + if ($catid == 0) { $table = array(); $table['title'] = $data['catid']; @@ -672,10 +672,12 @@ public function featured($pks, $value = 0) // Featuring. $tuples = array(); + $ordering = $table->getNextOrder(); foreach ($new_featured as $pk) { - $tuples[] = $pk . ', 0'; + $tuples[] = $pk . ', ' . $ordering; + $ordering++; } if (count($tuples)) @@ -698,8 +700,6 @@ public function featured($pks, $value = 0) return false; } - $table->reorder(); - $this->cleanCache(); return true; @@ -723,7 +723,9 @@ protected function getReorderConditions($table) } /** - * Allows preprocessing of the JForm object. + * Auto-populate the model state. + * + * Note. Calling getState in this method will result in recursion. * * @param JForm $form The form object * @param array $data The data to be merged into the form object @@ -735,12 +737,8 @@ protected function getReorderConditions($table) */ protected function preprocessForm(JForm $form, $data, $group = 'content') { - if ($this->canCreateCategory()) - { - $form->setFieldAttribute('catid', 'allowAdd', 'true'); - } - // Association content items + $app = JFactory::getApplication(); $assoc = JLanguageAssociations::isEnabled(); if ($assoc) @@ -811,16 +809,4 @@ public function hit() { return; } - - /** - * Is the user allowed to create an on the fly category? - * - * @return bool - * - * @since 3.6.1 - */ - private function canCreateCategory() - { - return JFactory::getUser()->authorise('core.create', 'com_content'); - } } diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml index 796fb16005472..e3d3df72a2914 100644 --- a/administrator/components/com_content/models/forms/article.xml +++ b/administrator/components/com_content/models/forms/article.xml @@ -47,6 +47,7 @@ label="JCATEGORY" description="JFIELD_CATEGORY_DESC" required="true" + allowAdd="true" default="" >
diff --git a/administrator/components/com_content/views/article/tmpl/edit_associations.php b/administrator/components/com_content/views/article/tmpl/edit_associations.php index e65a294fdea1c..5da88c15516b0 100644 --- a/administrator/components/com_content/views/article/tmpl/edit_associations.php +++ b/administrator/components/com_content/views/article/tmpl/edit_associations.php @@ -9,4 +9,11 @@ defined('_JEXEC') or die; -echo JLayoutHelper::render('joomla.edit.associations', $this); +if ($this->item->id != 0 && $this->item->language != '*') +{ + echo JLayoutHelper::render('joomla.edit.associations', $this); +} +else +{ + echo '
' . JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE') . '
'; +} diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php index f18da818c0fcd..e35a8033d4591 100644 --- a/administrator/components/com_contenthistory/helpers/contenthistory.php +++ b/administrator/components/com_contenthistory/helpers/contenthistory.php @@ -260,7 +260,7 @@ public static function loadLanguageFiles($typeAlias) $lang->load($component, JPATH_ADMINISTRATOR, null, false, true) || $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true); - // Force loading of back-end global language file + // Force loading of backend global language file $lang->load('joomla', JPath::clean(JPATH_ADMINISTRATOR), null, false, true); } } diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php index a7bf2103fbdd1..47f6bfb05898b 100644 --- a/administrator/components/com_finder/helpers/language.php +++ b/administrator/components/com_finder/helpers/language.php @@ -95,7 +95,7 @@ public static function loadComponentLanguage() } /** - * Method to load Smart Search plug-in language files. + * Method to load Smart Search plugin language files. * * @return void * @@ -113,7 +113,7 @@ public static function loadPluginLanguage() $loaded = true; - // Get array of all the enabled Smart Search plug-in names. + // Get array of all the enabled Smart Search plugin names. $db = JFactory::getDbo(); $query = $db->getQuery(true) ->select('name') @@ -133,7 +133,7 @@ public static function loadPluginLanguage() $lang = JFactory::getLanguage(); $lang->load('plg_content_finder', JPATH_ADMINISTRATOR); - // Load language file for each plug-in. + // Load language file for each plugin. foreach ($plugins as $plugin) { $lang->load($plugin->name, JPATH_ADMINISTRATOR); diff --git a/administrator/components/com_finder/models/index.php b/administrator/components/com_finder/models/index.php index 152ae7e1524ee..608d2b99f3cdd 100644 --- a/administrator/components/com_finder/models/index.php +++ b/administrator/components/com_finder/models/index.php @@ -240,9 +240,9 @@ protected function getListQuery() } /** - * Method to get the state of the Smart Search plug-ins. + * Method to get the state of the Smart Search plugins. * - * @return array Array of relevant plug-ins and whether they are enabled or not. + * @return array Array of relevant plugins and whether they are enabled or not. * * @since 2.5 */ diff --git a/administrator/components/com_finder/views/index/view.html.php b/administrator/components/com_finder/views/index/view.html.php index 70f8182690f12..b0448c7437c18 100644 --- a/administrator/components/com_finder/views/index/view.html.php +++ b/administrator/components/com_finder/views/index/view.html.php @@ -71,7 +71,7 @@ class FinderViewIndex extends JViewLegacy */ public function display($tpl = null) { - // Load plug-in language files. + // Load plugin language files. FinderHelperLanguage::loadPluginLanguage(); $this->items = $this->get('Items'); diff --git a/administrator/components/com_finder/views/maps/view.html.php b/administrator/components/com_finder/views/maps/view.html.php index e3bf2fe3e7a50..4e2c1cb305e8d 100644 --- a/administrator/components/com_finder/views/maps/view.html.php +++ b/administrator/components/com_finder/views/maps/view.html.php @@ -64,7 +64,7 @@ class FinderViewMaps extends JViewLegacy */ public function display($tpl = null) { - // Load plug-in language files. + // Load plugin language files. FinderHelperLanguage::loadPluginLanguage(); // Load the view data. diff --git a/administrator/components/com_installer/models/install.php b/administrator/components/com_installer/models/install.php index 515deb1ef0589..8412cb9b576ff 100644 --- a/administrator/components/com_installer/models/install.php +++ b/administrator/components/com_installer/models/install.php @@ -193,7 +193,7 @@ public function install() } else { - // Package installed sucessfully. + // Package installed successfully. $msg = JText::sprintf('COM_INSTALLER_INSTALL_SUCCESS', JText::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type']))); $result = true; $msgType = 'message'; diff --git a/administrator/components/com_installer/models/languages.php b/administrator/components/com_installer/models/languages.php index d28ce4e84efc8..3cd4661cfc8ca 100644 --- a/administrator/components/com_installer/models/languages.php +++ b/administrator/components/com_installer/models/languages.php @@ -30,7 +30,7 @@ class InstallerModelLanguages extends JModelList private $updateSiteId = 0; /** - * Constructor override, defines a whitelist of column filters. + * Constructor override, defines a white list of column filters. * * @param array $config An optional associative array of configuration settings. * diff --git a/administrator/components/com_installer/models/manage.php b/administrator/components/com_installer/models/manage.php index b4490328e0760..f5bb8238daa04 100644 --- a/administrator/components/com_installer/models/manage.php +++ b/administrator/components/com_installer/models/manage.php @@ -243,7 +243,7 @@ public function remove($eid = array()) continue; } - // Package uninstalled sucessfully + // Package uninstalled successfully $msgs[] = JText::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype); $result = true; diff --git a/administrator/components/com_installer/models/updatesites.php b/administrator/components/com_installer/models/updatesites.php index a53d55c9f406f..9532dbb683880 100644 --- a/administrator/components/com_installer/models/updatesites.php +++ b/administrator/components/com_installer/models/updatesites.php @@ -361,7 +361,7 @@ public function rebuild() } else { - $app->enqueueMessage(JText::_('COM_INSTALLER_MSG_UPDATESITES_REBUILD_MESSAGE'), 'message'); + $app->enqueueMessage(JText::_('COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING'), 'warning'); } } diff --git a/administrator/components/com_joomlaupdate/controllers/update.php b/administrator/components/com_joomlaupdate/controllers/update.php index c271d4a8b38f8..7e18a68bf49ac 100644 --- a/administrator/components/com_joomlaupdate/controllers/update.php +++ b/administrator/components/com_joomlaupdate/controllers/update.php @@ -25,8 +25,6 @@ class JoomlaupdateControllerUpdate extends JControllerLegacy */ public function download() { - JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); - $options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}'; $options['text_file'] = 'joomla_update.php'; JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror')); @@ -45,7 +43,7 @@ public function download() if ($file) { JFactory::getApplication()->setUserState('com_joomlaupdate.file', $file); - $url = 'index.php?option=com_joomlaupdate&task=update.install&' . JFactory::getSession()->getFormToken() . '=1'; + $url = 'index.php?option=com_joomlaupdate&task=update.install'; JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $file), JLog::INFO, 'Update'); } else @@ -67,8 +65,6 @@ public function download() */ public function install() { - JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN')); - $options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}'; $options['text_file'] = 'joomla_update.php'; JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror')); @@ -94,8 +90,6 @@ public function install() */ public function finalise() { - JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN')); - $options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}'; $options['text_file'] = 'joomla_update.php'; JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror')); @@ -107,7 +101,7 @@ public function finalise() $model->finaliseUpgrade(); - $url = 'index.php?option=com_joomlaupdate&task=update.cleanup&' . JFactory::getSession()->getFormToken() . '=1'; + $url = 'index.php?option=com_joomlaupdate&task=update.cleanup'; $this->setRedirect($url); } @@ -120,8 +114,6 @@ public function finalise() */ public function cleanup() { - JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN')); - $options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}'; $options['text_file'] = 'joomla_update.php'; JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror')); @@ -281,7 +273,7 @@ public function confirm() JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $tempFile), JLog::INFO, 'Update'); // Redirect to the actual update page - $url = 'index.php?option=com_joomlaupdate&task=update.install&' . JFactory::getSession()->getFormToken() . '=1'; + $url = 'index.php?option=com_joomlaupdate&task=update.install'; $this->setRedirect($url); } diff --git a/administrator/components/com_joomlaupdate/joomlaupdate.xml b/administrator/components/com_joomlaupdate/joomlaupdate.xml index 85c467c9eaf35..71604e6a54547 100644 --- a/administrator/components/com_joomlaupdate/joomlaupdate.xml +++ b/administrator/components/com_joomlaupdate/joomlaupdate.xml @@ -7,7 +7,7 @@ GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org - 3.6.2 + 3.6.0 COM_JOOMLAUPDATE_XML_DESCRIPTION js diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php index e74f946daa241..4f9af0181bdf3 100644 --- a/administrator/components/com_joomlaupdate/models/default.php +++ b/administrator/components/com_joomlaupdate/models/default.php @@ -228,13 +228,13 @@ public function purge() if ($db->execute()) { - $this->_message = JText::_('COM_JOOMLAUPDATE_CHECKED_UPDATES'); + $this->_message = JText::_('JLIB_INSTALLER_PURGED_UPDATES'); return true; } else { - $this->_message = JText::_('COM_JOOMLAUPDATE_FAILED_TO_CHECK_UPDATES'); + $this->_message = JText::_('JLIB_INSTALLER_FAILED_TO_PURGE_UPDATES'); return false; } @@ -389,7 +389,7 @@ public function createRestorationFile($basename = null) $ftp_host = $app->input->get('ftp_host', ''); $ftp_port = $app->input->get('ftp_port', '21'); $ftp_user = $app->input->get('ftp_user', ''); - $ftp_pass = addcslashes($app->input->get('ftp_pass', '', 'raw'), "'\\"); + $ftp_pass = $app->input->get('ftp_pass', '', 'raw'); $ftp_root = $app->input->get('ftp_root', ''); // Is the tempdir really writable? @@ -415,7 +415,7 @@ public function createRestorationFile($basename = null) if (!$writable) { $FTPOptions = JClientHelper::getCredentials('ftp'); - $ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']); + $ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], null, $FTPOptions['user'], $FTPOptions['pass']); $dest = JPath::clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $tempdir . '/admintools'), '/'); if (!@mkdir($tempdir . '/admintools')) @@ -450,7 +450,7 @@ public function createRestorationFile($basename = null) if (!is_writable($tempdir)) { $FTPOptions = JClientHelper::getCredentials('ftp'); - $ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']); + $ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], null, $FTPOptions['user'], $FTPOptions['pass']); $dest = JPath::clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $tempdir . '/admintools'), '/'); if (!@mkdir($tempdir . '/admintools')) diff --git a/administrator/components/com_joomlaupdate/restore.php b/administrator/components/com_joomlaupdate/restore.php index 1b5256508c05f..ae58f2d727161 100644 --- a/administrator/components/com_joomlaupdate/restore.php +++ b/administrator/components/com_joomlaupdate/restore.php @@ -6205,8 +6205,8 @@ class AKText extends AKAbstractObject 'RESTACLEANUP' => 'Restoration and Clean Up', 'BTN_RUNINSTALLER' => 'Run the Installer', 'BTN_CLEANUP' => 'Clean Up', - 'BTN_SITEFE' => 'Visit your site\'s front-end', - 'BTN_SITEBE' => 'Visit your site\'s back-end', + 'BTN_SITEFE' => 'Visit your site\'s frontend', + 'BTN_SITEBE' => 'Visit your site\'s backend', 'WARNINGS' => 'Extraction Warnings', 'ERROR_OCCURED' => 'An error occurred', 'STEALTH_MODE' => 'Stealth mode', diff --git a/administrator/components/com_joomlaupdate/views/default/view.html.php b/administrator/components/com_joomlaupdate/views/default/view.html.php index fae9731285134..a498dccad8224 100644 --- a/administrator/components/com_joomlaupdate/views/default/view.html.php +++ b/administrator/components/com_joomlaupdate/views/default/view.html.php @@ -72,7 +72,7 @@ public function display($tpl = null) // Set the toolbar information. JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install'); - JToolbarHelper::custom('update.purge', 'loop', 'loop', 'COM_JOOMLAUPDATE_TOOLBAR_CHECK', false); + JToolbarHelper::custom('update.purge', 'purge', 'purge', 'JTOOLBAR_PURGE_CACHE', false); // Add toolbar buttons. $user = JFactory::getUser(); diff --git a/administrator/components/com_joomlaupdate/views/update/tmpl/default.php b/administrator/components/com_joomlaupdate/views/update/tmpl/default.php index 5b5676e6d10b5..b0f45c0a6d26e 100644 --- a/administrator/components/com_joomlaupdate/views/update/tmpl/default.php +++ b/administrator/components/com_joomlaupdate/views/update/tmpl/default.php @@ -20,7 +20,7 @@ $password = JFactory::getApplication()->getUserState('com_joomlaupdate.password', null); $filesize = JFactory::getApplication()->getUserState('com_joomlaupdate.filesize', null); $ajaxUrl = JUri::base() . 'components/com_joomlaupdate/restore.php'; -$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise&' . JFactory::getSession()->getFormToken() . '=1'; +$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise'; JFactory::getDocument()->addScriptDeclaration( " diff --git a/administrator/components/com_media/models/manager.php b/administrator/components/com_media/models/manager.php index e2b9598374f0e..15e8e9f37521d 100644 --- a/administrator/components/com_media/models/manager.php +++ b/administrator/components/com_media/models/manager.php @@ -106,7 +106,7 @@ public function getFolderList($base = null) $author = $input->get('author', 0, 'integer'); - // Create the drop-down folder select list + // Create the dropdown folder select list $attribs = 'size="1" onchange="ImageManager.setFolder(this.options[this.selectedIndex].value, ' . $asset . ', ' . $author . ')" '; $list = JHtml::_('select.genericlist', $options, 'folderlist', $attribs, 'value', 'text', $base); diff --git a/administrator/components/com_menus/controllers/menu.php b/administrator/components/com_menus/controllers/menu.php index 068fd78652c19..8ef083144995f 100644 --- a/administrator/components/com_menus/controllers/menu.php +++ b/administrator/components/com_menus/controllers/menu.php @@ -63,7 +63,7 @@ public function save($key = null, $urlVar = null) return false; } - // Prevent using 'menu' or 'main' as menutype as this is reserved for back-end menus + // Prevent using 'menu' or 'main' as menutype as this is reserved for backend menus if (strtolower($data['menutype']) == 'menu' || strtolower($data['menutype']) == 'main') { $msg = JText::_('COM_MENUS_ERROR_MENUTYPE'); diff --git a/administrator/components/com_menus/models/fields/menuparent.php b/administrator/components/com_menus/models/fields/menuparent.php index 13a94eefce7f1..6f247e912c7ae 100644 --- a/administrator/components/com_menus/models/fields/menuparent.php +++ b/administrator/components/com_menus/models/fields/menuparent.php @@ -43,7 +43,6 @@ protected function getOptions() ->from('#__menu AS a') ->join('LEFT', $db->quoteName('#__menu') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt'); - // Filter by menu type. if ($menuType = $this->form->getValue('menutype')) { $query->where('a.menutype = ' . $db->quote($menuType)); @@ -53,14 +52,6 @@ protected function getOptions() $query->where('a.menutype != ' . $db->quote('')); } - // Filter by client id. - $clientId = $this->getAttribute('clientid'); - - if (!is_null($clientId)) - { - $query->where($db->quoteName('a.client_id') . ' = ' . (int) $clientId); - } - // Prevent parenting to children of this item. if ($id = $this->form->getValue('id')) { diff --git a/administrator/components/com_menus/models/forms/item.xml b/administrator/components/com_menus/models/forms/item.xml index 70c5104e7bb1a..bb4b79469af69 100644 --- a/administrator/components/com_menus/models/forms/item.xml +++ b/administrator/components/com_menus/models/forms/item.xml @@ -3,14 +3,13 @@
+ readonly="true"/> diff --git a/administrator/components/com_menus/models/items.php b/administrator/components/com_menus/models/items.php index b5d23ea1b65be..8eb7a25852bb0 100644 --- a/administrator/components/com_menus/models/items.php +++ b/administrator/components/com_menus/models/items.php @@ -253,7 +253,7 @@ protected function getListQuery() $query->select('COUNT(asso2.id)>1 as association') ->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_menus.item')) ->join('LEFT', '#__associations AS asso2 ON asso2.key = asso.key') - ->group('a.id, e.enabled, l.title, l.image, u.name, c.element, ag.title, e.name, mt.title'); + ->group('a.id, e.enabled, l.title, l.image, u.name, c.element, ag.title, e.name'); } // Join over the extensions diff --git a/administrator/components/com_menus/views/item/tmpl/edit.php b/administrator/components/com_menus/views/item/tmpl/edit.php index 3a3ac8ee0ac0c..f6d868d55880b 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit.php +++ b/administrator/components/com_menus/views/item/tmpl/edit.php @@ -118,7 +118,6 @@ fields = array( - 'id', 'menutype', 'parent_id', 'menuordering', @@ -126,7 +125,8 @@ 'home', 'access', 'language', - 'note', + 'note' + ); if ($this->item->type != 'component') diff --git a/administrator/components/com_menus/views/item/tmpl/edit_associations.php b/administrator/components/com_menus/views/item/tmpl/edit_associations.php index 2d249134c3e99..e4c34d88ab9eb 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit_associations.php +++ b/administrator/components/com_menus/views/item/tmpl/edit_associations.php @@ -9,4 +9,11 @@ defined('_JEXEC') or die; -echo JLayoutHelper::render('joomla.edit.associations', $this); +if ($this->item->id != 0 && $this->item->language != '*') +{ + echo JLayoutHelper::render('joomla.edit.associations', $this); +} +else +{ + echo '
' . JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE') . '
'; +} diff --git a/administrator/components/com_modules/views/modules/tmpl/modal.php b/administrator/components/com_modules/views/modules/tmpl/modal.php index 41e89f39f5f78..6027d681841b9 100644 --- a/administrator/components/com_modules/views/modules/tmpl/modal.php +++ b/administrator/components/com_modules/views/modules/tmpl/modal.php @@ -28,11 +28,15 @@ JFactory::getDocument()->addScriptDeclaration(' moduleIns = function(type, name) { - window.parent.jInsertEditorText("{loadmodule " + type + "," + name + "}", "' . $editor . '"); + var extraVal ,fieldExtra = jQuery("#extra_class"); + extraVal = (fieldExtra.length && fieldExtra.val().length) ? "," + fieldExtra.val() : ""; + window.parent.jInsertEditorText("{loadmodule " + type + "," + name + extraVal + "}", "' . $editor . '"); window.parent.jModalClose(); }; modulePosIns = function(position) { - window.parent.jInsertEditorText("{loadposition " + position + "}", "' . $editor . '"); + var extraVal ,fieldExtra = jQuery("#extra_class"); + extraVal = (fieldExtra.length && fieldExtra.val().length) ? "," + fieldExtra.val() : ""; + window.parent.jInsertEditorText("{loadposition " + position + extraVal + "}", "' . $editor . '"); window.parent.jModalClose(); };'); ?> @@ -40,6 +44,19 @@
+
+
+
+ +
+
+ +
+
+
+ $this)); ?>
diff --git a/administrator/components/com_newsfeeds/config.xml b/administrator/components/com_newsfeeds/config.xml index 90247d4bf6e90..3091aff7bc7e0 100644 --- a/administrator/components/com_newsfeeds/config.xml +++ b/administrator/components/com_newsfeeds/config.xml @@ -102,7 +102,7 @@ @@ -113,7 +113,7 @@ diff --git a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml index 49444229a3684..9667e3f405376 100644 --- a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml +++ b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml @@ -54,6 +54,7 @@ description="COM_NEWSFEEDS_FIELD_CATEGORY_DESC" extension="com_newsfeeds" required="true" + allowAdd="true" default="" /> diff --git a/administrator/components/com_newsfeeds/models/newsfeed.php b/administrator/components/com_newsfeeds/models/newsfeed.php index b7da83fda3f4e..728a90dfe9e3b 100644 --- a/administrator/components/com_newsfeeds/models/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/newsfeed.php @@ -314,7 +314,7 @@ public function save($data) } // Save New Category - if ($catid == 0 && $this->canCreateCategory()) + if ($catid == 0) { $table = array(); $table['title'] = $data['catid']; @@ -503,14 +503,9 @@ protected function getReorderConditions($table) */ protected function preprocessForm(JForm $form, $data, $group = 'content') { - if ($this->canCreateCategory()) - { - $form->setFieldAttribute('catid', 'allowAdd', 'true'); - } - // Association newsfeeds items + $app = JFactory::getApplication(); $assoc = JLanguageAssociations::isEnabled(); - if ($assoc) { $languages = JLanguageHelper::getLanguages('lang_code'); @@ -573,16 +568,4 @@ protected function generateNewTitle($category_id, $alias, $name) return array($name, $alias); } - - /** - * Is the user allowed to create an on the fly category? - * - * @return bool - * - * @since 3.6.1 - */ - private function canCreateCategory() - { - return JFactory::getUser()->authorise('core.create', 'com_newsfeeds'); - } } diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php index 0a8f9093adf80..e3f83b3034df3 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php @@ -9,4 +9,11 @@ defined('_JEXEC') or die; -echo JLayoutHelper::render('joomla.edit.associations', $this); +if ($this->item->id != 0 && $this->item->language != '*') +{ + echo JLayoutHelper::render('joomla.edit.associations', $this); +} +else +{ + echo '
' . JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE') . '
'; +} diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php index 5606f5475d074..9b51e06571682 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php @@ -13,7 +13,7 @@ { if (!isset($fieldset->repeat) || isset($fieldset->repeat) && $fieldset->repeat == false) { - $label = !empty($fieldset->label) ? JText::_($fieldset->label) : JText::_('COM_PLUGINS_' . $fieldset->name . '_FIELDSET_LABEL', true); + $label = !empty($fieldset->label) ? JText::_($fieldset->label, true) : JText::_('COM_PLUGINS_' . $fieldset->name . '_FIELDSET_LABEL', true); $optionsname = 'options-' . $fieldset->name; echo JHtml::_('bootstrap.addTab', 'myTab', $optionsname, $label); diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php index 1f5ec09d6d9b2..ec4966f74f8ae 100644 --- a/administrator/components/com_postinstall/models/messages.php +++ b/administrator/components/com_postinstall/models/messages.php @@ -174,7 +174,7 @@ protected function onProcessList(&$resultArray) } /** - * Get the drop-down options for the list of component with post-installation messages + * Get the dropdown options for the list of component with post-installation messages * * @since 3.4 * @@ -236,7 +236,7 @@ public function getComponentOptions() * language_extension The extension name which holds the language keys used above. * For example, com_foobar, mod_something, plg_system_whatever, tpl_mytemplate * - * language_client_id Should we load the front-end (0) or back-end (1) language keys? + * language_client_id Should we load the frontend (0) or backend (1) language keys? * * version_introduced Which was the version of your extension where this message appeared for the first time? * Example: 3.2.1 diff --git a/administrator/components/com_redirect/models/fields/redirect.php b/administrator/components/com_redirect/models/fields/redirect.php index 2752d4d7f690f..47a2296046e68 100644 --- a/administrator/components/com_redirect/models/fields/redirect.php +++ b/administrator/components/com_redirect/models/fields/redirect.php @@ -12,7 +12,7 @@ JFormHelper::loadFieldClass('list'); /** - * A drop down containing all valid HTTP 1.1 response codes. + * A dropdown containing all valid HTTP 1.1 response codes. * * @package Joomla.Administrator * @subpackage com_redirect diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml index b9e4da017754f..0344ac0f113e4 100644 --- a/administrator/components/com_tags/config.xml +++ b/administrator/components/com_tags/config.xml @@ -121,8 +121,8 @@ type="radio" class="btn-group btn-group-yesno" default="1" - description="COM_TAGS_TAG_LIST_SHOW_HEADINGS_DESC" - label="COM_TAGS_TAG_LIST_SHOW_HEADINGS_LABEL" + description="JGLOBAL_SHOW_HEADINGS_DESC" + label="JGLOBAL_SHOW_HEADINGS_LABEL" > @@ -132,8 +132,8 @@ name="tag_list_show_date" type="list" default="0" - description="COM_TAGS_TAG_LIST_SHOW_DATE_LABEL" - label="COM_TAGS_TAG_LIST_SHOW_DATE_DESC" + label="JGLOBAL_SHOW_DATE_LABEL" + description="JGLOBAL_SHOW_DATE_DESC" > diff --git a/administrator/components/com_tags/models/forms/tag.xml b/administrator/components/com_tags/models/forms/tag.xml index 6689984a8aa3f..ad5e49ea2386f 100644 --- a/administrator/components/com_tags/models/forms/tag.xml +++ b/administrator/components/com_tags/models/forms/tag.xml @@ -156,7 +156,7 @@ name="created_user_id" type="user" label="JGLOBAL_FIELD_CREATED_BY_LABEL" - description="JGLOBAL_FIELD_CREATED_BY_DESC" + desc="JGLOBAL_FIELD_CREATED_BY_DESC" /> @@ -195,7 +194,6 @@ label="JGLOBAL_FIELD_MODIFIED_LABEL" format="%Y-%m-%d %H:%M:%S" filter="user_utc" - description="COM_TAGS_FIELD_MODIFIED_DESC" readonly="true" /> @@ -264,7 +262,7 @@ label="COM_TAGS_FLOAT_LABEL" description="COM_TAGS_FLOAT_DESC" > - + @@ -309,7 +307,7 @@ label="COM_TAGS_FLOAT_LABEL" description="COM_TAGS_FLOAT_DESC" > - + diff --git a/administrator/components/com_templates/models/template.php b/administrator/components/com_templates/models/template.php index 94650451fb30c..57cfa998b0319 100644 --- a/administrator/components/com_templates/models/template.php +++ b/administrator/components/com_templates/models/template.php @@ -706,7 +706,7 @@ public function createTemplateOverride($overridePath, $htmlPath) { $return = false; - if (empty($overridePath) || empty($htmlPath)) + if (empty($htmlPath) || empty($htmlPath)) { return $return; } diff --git a/administrator/components/com_templates/views/styles/tmpl/default.php b/administrator/components/com_templates/views/styles/tmpl/default.php index 271ef2f015220..6872368f4ccc8 100644 --- a/administrator/components/com_templates/views/styles/tmpl/default.php +++ b/administrator/components/com_templates/views/styles/tmpl/default.php @@ -82,7 +82,7 @@ preview && $item->client_id == '0') : ?> - + client_id == '1') : ?> diff --git a/administrator/components/com_templates/views/template/view.html.php b/administrator/components/com_templates/views/template/view.html.php index 38a02092354cf..637723aa0343b 100644 --- a/administrator/components/com_templates/views/template/view.html.php +++ b/administrator/components/com_templates/views/template/view.html.php @@ -180,7 +180,7 @@ protected function addToolbar() $explodeArray = explode('.', $this->fileName); $ext = end($explodeArray); - JToolbarHelper::title(JText::sprintf('COM_TEMPLATES_MANAGER_VIEW_TEMPLATE', ucfirst($this->template->name)), 'eye thememanager'); + JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_VIEW_TEMPLATE'), 'eye thememanager'); // Only show file edit buttons for global SuperUser if ($isSuperUser) diff --git a/administrator/components/com_templates/views/templates/tmpl/default.php b/administrator/components/com_templates/views/templates/tmpl/default.php index eda140525885d..1de575e197695 100644 --- a/administrator/components/com_templates/views/templates/tmpl/default.php +++ b/administrator/components/com_templates/views/templates/tmpl/default.php @@ -71,7 +71,7 @@ name)); ?>
preview && $item->client_id == '0') : ?> - + client_id == '1') : ?> diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php index 31e796c557303..4cd8e18400177 100644 --- a/administrator/components/com_users/views/users/tmpl/default.php +++ b/administrator/components/com_users/views/users/tmpl/default.php @@ -148,7 +148,7 @@ escape($item->email)); ?> - lastvisitDate != $this->db->getNullDate()):?> + lastvisitDate != '0000-00-00 00:00:00'):?> lastvisitDate, 'Y-m-d H:i:s'); ?> diff --git a/administrator/components/com_users/views/users/view.html.php b/administrator/components/com_users/views/users/view.html.php index 16b598668d098..0ceaaab375246 100644 --- a/administrator/components/com_users/views/users/view.html.php +++ b/administrator/components/com_users/views/users/view.html.php @@ -39,7 +39,7 @@ class UsersViewUsers extends JViewLegacy * @since 1.6 */ protected $state; - + /** * A JForm instance with filter fields. * @@ -87,7 +87,6 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); $this->canDo = JHelperContent::getActions('com_users'); - $this->db = JFactory::getDbo(); UsersHelper::addSubmenu('users'); diff --git a/administrator/help/helpsites.xml b/administrator/help/helpsites.xml index 2dad52d066d0f..70e6964388da0 100644 --- a/administrator/help/helpsites.xml +++ b/administrator/help/helpsites.xml @@ -1,7 +1,7 @@ - English (GB) - Joomla help wiki + English (GB) - Joomla help wiki Franais (FR) - Aide de Joomla! diff --git a/administrator/includes/toolbar.php b/administrator/includes/toolbar.php index a90ab4b75c272..9b27e2a4b35da 100644 --- a/administrator/includes/toolbar.php +++ b/administrator/includes/toolbar.php @@ -174,7 +174,7 @@ public static function link($url, $text, $name = 'link') /** * Writes a media_manager button. * - * @param string $directory The sub-directory to upload the media to. + * @param string $directory The subdirectory to upload the media to. * @param string $alt An override for the alt text. * * @return void diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 1e8e48ca5fa7f..d7692818c3812 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -31,9 +31,9 @@ COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND="The asset for global configuration could COM_CONFIG_ERROR_SSL_NOT_AVAILABLE="HTTPS has not been enabled as it is not available on this server." COM_CONFIG_ERROR_REMOVING_SUPER_ADMIN="You can't remove your own Super User permissions." COM_CONFIG_ERROR_WRITE_FAILED="Could not write to the configuration file" -COM_CONFIG_FIELD_CACHE_HANDLER_DESC="Choose the cache handler. Native caching mechanism is file-based. Please make sure the cache folders are writable." +COM_CONFIG_FIELD_CACHE_HANDLER_DESC="Choose cache handler to enable caching. Native caching mechanism is file-based. Please make sure the cache folders are writable." COM_CONFIG_FIELD_CACHE_HANDLER_LABEL="Cache Handler" -COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_LABEL="Platform Specific Caching" +COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_LABEL="Platform specific caching" COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_DESC="Enable or disable platform specific caching. Enable when HTML output on mobile differs from other devices. (Default disabled.)" COM_CONFIG_FIELD_CACHE_LABEL="Cache" COM_CONFIG_FIELD_CACHE_DESC="Enable or disable caching and set caching level. Conservative level: smaller system cache, Progressive level (default): faster, bigger system cache, includes module renderers cache. Not appropriate for extremely large sites." @@ -47,9 +47,9 @@ COM_CONFIG_FIELD_DATABASE_HOST_DESC="The hostname for your database entered duri COM_CONFIG_FIELD_DATABASE_HOST_LABEL="Host" COM_CONFIG_FIELD_DATABASE_NAME_DESC="The name for your database entered during the installation process. Do not edit this field unless absolutely necessary (eg the transfer of the database to a new hosting provider)." COM_CONFIG_FIELD_DATABASE_NAME_LABEL="Database Name" -COM_CONFIG_FIELD_DATABASE_PREFIX_DESC="The prefix used for your database tables, created during the installation process. Do not edit field unless absolutely necessary (eg the transfer of the database to a new hosting provider)." +COM_CONFIG_FIELD_DATABASE_PREFIX_DESC="The prefix used for your database tables entered during the installation process. Do not edit field unless absolutely necessary (eg the transfer of the database to a new hosting provider)." COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL="Database Tables Prefix" -COM_CONFIG_FIELD_DATABASE_TYPE_DESC="The type of database in use, selected during the installation process. Do not edit this field unless you migrating to a different type of database, perhaps due to changing your hosting provider." +COM_CONFIG_FIELD_DATABASE_TYPE_DESC="The type of database in use entered during the installation process. Do not edit this field unless you are having to migrate to a different type of database, perhaps due to changing your hosting provider." COM_CONFIG_FIELD_DATABASE_TYPE_LABEL="Database Type" COM_CONFIG_FIELD_DATABASE_USERNAME_DESC="The username for access to your database entered during the installation process. Do not edit this field unless absolutely necessary (eg the transfer of the database to a new hosting provider)." COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL="Database Username" @@ -67,15 +67,15 @@ COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_DESC="Select the number of content items to COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL="Default Feed Limit" COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_DESC="Sets the default length of lists in the Control Panel for all users." COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL="Default List Limit" -COM_CONFIG_FIELD_ERROR_REPORTING_DESC="Select the level of reporting. See the Help Screen for full details." +COM_CONFIG_FIELD_ERROR_REPORTING_DESC="Select the appropriate level of reporting from the dropdown list. See the Help Screen for full details." COM_CONFIG_FIELD_ERROR_REPORTING_LABEL="Error Reporting" COM_CONFIG_FIELD_FEED_EMAIL_DESC="The RSS and Atom news feeds include the author's email address. Select Author Email Address to use each author's email address (from the User Manager) in the news feed. Select Site Email Address to include the site 'Mail from' email address for each article." COM_CONFIG_FIELD_FEED_EMAIL_LABEL="Feed Email Address" -COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST="Default Blacklist" -COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST="Custom Blacklist" +COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST="Default Black List" +COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST="Custom Black List" COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML" COM_CONFIG_FIELD_FILTERS_NO_FILTER="No Filtering" -COM_CONFIG_FIELD_FILTERS_WHITE_LIST="Whitelist" +COM_CONFIG_FIELD_FILTERS_WHITE_LIST="White List" COM_CONFIG_FRONTEDITING_DESC="Select if you want mouse-over edit icons for modules and menu items (support may depend on your template)." COM_CONFIG_FRONTEDITING_LABEL="Mouse-over Edit Icons for" COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus" @@ -83,7 +83,7 @@ COM_CONFIG_FRONTEDITING_MENUSANDMODULES_ADMIN_TOO="Modules & Menus (administrato COM_CONFIG_FRONTEDITING_MODULES="Modules" COM_CONFIG_FIELD_FORCE_SSL_DESC="Force site access in the selected areas to occur only with HTTPS (encrypted HTTP connections with the https:// protocol prefix). Note, you must have HTTPS enabled on your server to utilise this option." COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS" -COM_CONFIG_FIELD_FTP_ENABLE_DESC="Enable the built in FTP (File Transfer Protocol) functionality which is needed, in some server environments, instead of the normal upload functionality of Joomla." +COM_CONFIG_FIELD_FTP_ENABLE_DESC="Enable the built in FTP (File Transfer Protocol) functionality which is needed in some server environments to be used instead of the normal upload functionality of Joomla." COM_CONFIG_FIELD_FTP_ENABLE_LABEL="Enable FTP" COM_CONFIG_FIELD_FTP_HOST_DESC="Enter the name of the host of your FTP server." COM_CONFIG_FIELD_FTP_HOST_LABEL="FTP Host" @@ -99,10 +99,10 @@ COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC="Compress buffered output if supported." COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL="Gzip Page Compression" COM_CONFIG_FIELD_HELP_SERVER_DESC="Select the name of the help server from which your system will collect the help screen displays." COM_CONFIG_FIELD_HELP_SERVER_LABEL="Help Server" -COM_CONFIG_FIELD_LOG_PATH_DESC="Please specify a folder to store log files." +COM_CONFIG_FIELD_LOG_PATH_DESC="For logging of Joomla. Please specify a folder." COM_CONFIG_FIELD_LOG_PATH_LABEL="Path to Log Folder" COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC="The email address that will be used to send site email." -COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From Email" +COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From email" COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC="Text displayed in the header "From:" field when sending a site email. Usually the site name." COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL="From Name" COM_CONFIG_FIELD_MAIL_MAILONLINE_DESC="Select Yes to turn on mail sending, select No to turn off mail sending. Warning: It is advised to put the site offline when disabling the mail function!" @@ -189,7 +189,7 @@ COM_CONFIG_FIELD_SITE_OFFLINE_DESC="Select whether access to the Site Frontend i COM_CONFIG_FIELD_SITE_OFFLINE_LABEL="Site Offline" COM_CONFIG_FIELD_SITENAME_PAGETITLES_DESC="Begin or end all Page Titles with the site name (for example, My Site Name - My Article Name)." COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL="Include Site Name in Page Titles" -COM_CONFIG_FIELD_TEMP_PATH_DESC="Please specify a writable folder to store temporary files." +COM_CONFIG_FIELD_TEMP_PATH_DESC="Please select a writable Temp folder." COM_CONFIG_FIELD_TEMP_PATH_LABEL="Path to Temp Folder" COM_CONFIG_FIELD_UNICODESLUGS_DESC="Choose between transliteration and unicode aliases. Transliteration is default." COM_CONFIG_FIELD_UNICODESLUGS_LABEL="Unicode Aliases" @@ -245,6 +245,6 @@ COM_CONFIG_SYSTEM="System" COM_CONFIG_SYSTEM_SETTINGS="System Settings" COM_CONFIG_TEXT_FILTER_SETTINGS="Text Filter Settings" COM_CONFIG_TEXT_FILTERS="Text Filters" -COM_CONFIG_TEXT_FILTERS_DESC="These text filter settings will be applied to all text editor fields in the selected groups.
These filtering options give more control over the HTML your content providers submit. You can be as strict or as liberal as you require to suit your site's needs. The filtering is opt-in and the default settings provide good protection against markup commonly associated with website attacks." +COM_CONFIG_TEXT_FILTERS_DESC="These text filter settings will be applied to all text editor fields submitted by users in the selected groups.
These filtering options give more control over the HTML your content providers submit. You can be as strict or as liberal as you require to suit your site needs. The filtering is opt-in and the default settings provide good protection against markup commonly associated with website attacks." COM_CONFIG_XML_DESCRIPTION="Configuration Manager" JLIB_RULES_SETTING_NOTES="If you change the setting, it will apply to this and all child groups, components and content. Note that:
Inherited means that the permissions from the parent group will be used.
Denied means that no matter what the parent group's setting is, the group being edited can't take this action.
Allowed means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
Not Set is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items." diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini index d45e9313d2d58..bd655620942dd 100644 --- a/administrator/language/en-GB/en-GB.com_contact.ini +++ b/administrator/language/en-GB/en-GB.com_contact.ini @@ -38,11 +38,11 @@ COM_CONTACT_FIELD_CATEGORY_DESC="Select a contact category to display." COM_CONTACT_FIELD_CATEGORY_LABEL="Select a Category" COM_CONTACT_FIELD_CONFIG_ALLOW_VCARD_DESC="Allow vCard to be displayed." COM_CONTACT_FIELD_CONFIG_ALLOW_VCARD_LABEL="Allow vCard" -COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC="Email addresses not allowed to submit contact form. Separate multiple email addresses with a semi-colon." +COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC="Email addresses not allowed to submit contact form. Separate multiple email addresses with a semicolon." COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL="Banned Email" -COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC="Subjects not allowed in contact form. Separate multiple subjects with a semi-colon." +COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC="Subjects not allowed in contact form. Separate multiple subjects with a semicolon." COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL="Banned Subject" -COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC="Text not allowed in contact form body. Separate multiple words with a semi-colon." +COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC="Text not allowed in contact form body. Separate multiple words with a semicolon." COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL="Banned Text" COM_CONTACT_FIELD_CONFIG_CATEGORIES_DESC="These settings apply for Contact Categories Options unless they are changed for a specific menu item." COM_CONTACT_FIELD_CONFIG_CATEGORY_DESC="These settings apply for Contact Category Options unless they are changed for a specific menu item." diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini index 74839a3eb692e..8492e16d0769b 100644 --- a/administrator/language/en-GB/en-GB.com_content.ini +++ b/administrator/language/en-GB/en-GB.com_content.ini @@ -57,7 +57,7 @@ COM_CONTENT_FIELD_FULL_LABEL="Full Article Image" COM_CONTENT_FIELD_FULLTEXT="Full text" COM_CONTENT_FIELD_HITS_DESC="Number of hits for this article." COM_CONTENT_FIELD_IMAGE_DESC="The image to be displayed." -COM_CONTENT_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images." +COM_CONTENT_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images. Replaced with caption text if it is present." COM_CONTENT_FIELD_IMAGE_ALT_LABEL="Alt Text" COM_CONTENT_FIELD_IMAGE_CAPTION_DESC="Caption attached to the image." COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL="Caption" @@ -103,7 +103,7 @@ COM_CONTENT_FIELD_XREFERENCE_DESC="An optional reference used to link to externa COM_CONTENT_FIELD_XREFERENCE_LABEL="External Reference" COM_CONTENT_FIELDSET_PUBLISHING="Publishing" COM_CONTENT_FIELDSET_RULES="Permissions" -COM_CONTENT_FIELDSET_URLS_AND_IMAGES="Images and Links" +COM_CONTENT_FIELDSET_URLS_AND_IMAGES="Images and links" COM_CONTENT_FILTER_SEARCH_DESC="Search in title and alias. Prefix with ID: or AUTHOR: to search for an article ID or article author." COM_CONTENT_FILTER_SEARCH_LABEL="Search Articles" COM_CONTENT_FLOAT_DESC="Controls placement of the image." @@ -171,7 +171,7 @@ COM_CONTENT_TOGGLE_TO_FEATURE="Toggle to change article state to 'Featured'" COM_CONTENT_TOGGLE_TO_UNFEATURE="Toggle to change article state to 'Unfeatured'" COM_CONTENT_UNFEATURED="Unfeatured Article" COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL="URL Target Window" -COM_CONTENT_URL_FIELD_BROWSERNAV_DESC="Target browser window when the link is selected." +COM_CONTENT_URL_FIELD_BROWSERNAV_DESC="Target browser window when the menu item is selected." COM_CONTENT_URL_FIELD_A_BROWSERNAV_LABEL="URL A Target Window" COM_CONTENT_URL_FIELD_B_BROWSERNAV_LABEL="URL B Target Window" COM_CONTENT_URL_FIELD_C_BROWSERNAV_LABEL="URL C Target Window" diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini index e297fa7e1d0f5..97c706f181fab 100644 --- a/administrator/language/en-GB/en-GB.com_finder.ini +++ b/administrator/language/en-GB/en-GB.com_finder.ini @@ -61,7 +61,7 @@ COM_FINDER_CONFIG_SHOW_FEED_LABEL="Show Feed" COM_FINDER_CONFIG_SHOW_FEED_TEXT_DESC="Show the associated text with the feed, otherwise just the title is shown in the feed." COM_FINDER_CONFIG_SHOW_FEED_TEXT_LABEL="Show Feed Text" COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_DESC="Whether to suggest alternative search terms when a search produces no results." -COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_LABEL="Did You Mean" +COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_LABEL="Did you mean" COM_FINDER_CONFIG_SHOW_URL_DESC="Show the associated URL that for the item." COM_FINDER_CONFIG_SHOW_URL_DESCRIPTION="Show the associated URL for the item." COM_FINDER_CONFIG_SHOW_URL_LABEL="Result URL" diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini index 172136a154197..dfa94c7a1192a 100644 --- a/administrator/language/en-GB/en-GB.com_installer.ini +++ b/administrator/language/en-GB/en-GB.com_installer.ini @@ -145,7 +145,6 @@ COM_INSTALLER_MSG_UPDATESITES_DELETE_CANNOT_DELETE="%s update site cannot be del COM_INSTALLER_MSG_UPDATESITES_N_DELETE_UPDATESITES_DELETED="%s update sites have been deleted." COM_INSTALLER_MSG_UPDATESITES_N_DELETE_UPDATESITES_DELETED_1="1 update site has been deleted." COM_INSTALLER_MSG_UPDATESITES_REBUILD_EXTENSION_PLUGIN_NOT_ENABLED="The Joomla Extension Plugin is disabled. This plugin must be enabled to rebuild the update sites." -COM_INSTALLER_MSG_UPDATESITES_REBUILD_MESSAGE="Update sites have been rebuilt. No extension with an update site has been discovered." COM_INSTALLER_MSG_UPDATESITES_REBUILD_NOT_PERMITTED="Rebuilding update sites is not permitted." COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING="Update sites have been rebuilt. No extension with updates sites discovered." COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS="Update sites have been rebuilt from manifest files." diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini index 50e84881f50fb..cf6dc7c9ac82b 100644 --- a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini +++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini @@ -3,7 +3,6 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_JOOMLAUPDATE_CHECKED_UPDATES="Checked for updates." COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_DESC="This is a custom XML update source URL, used only when the "Update Source" option is set to "Custom URL"." COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_LABEL="Custom URL" COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC="Configure where Joomla gets its update information from." @@ -16,8 +15,6 @@ COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_LABEL="Update Channel" COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="Joomla Next" COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING="Testing" COM_JOOMLAUPDATE_CONFIGURATION="Joomla Update: Options" -COM_JOOMLAUPDATE_FAILED_TO_CHECK_UPDATES="Failed to check for updates." -COM_JOOMLAUPDATE_TOOLBAR_CHECK="Check for Updates" COM_JOOMLAUPDATE_OVERVIEW="Joomla Update" COM_JOOMLAUPDATE_UPDATE_LOG_CLEANUP="Cleaning up after installation." COM_JOOMLAUPDATE_UPDATE_LOG_COMPLETE="Update to version %s is complete." diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini index e8372fbc83d88..6f05e9feedc16 100644 --- a/administrator/language/en-GB/en-GB.com_languages.ini +++ b/administrator/language/en-GB/en-GB.com_languages.ini @@ -11,15 +11,15 @@ COM_LANGUAGES_ERROR_LANG_TAG="
The Language Tag should contain 2 or 3 lower COM_LANGUAGES_ERROR_LANGUAGE_METAFILE_MISSING="Could not load %s language meta XML file from %s." COM_LANGUAGES_ERR_PUBLISH="Select a language to publish." COM_LANGUAGES_FIELD_DESCRIPTION_DESC="Enter a description for the language." -COM_LANGUAGES_FIELD_IMAGE_DESC="Name of the image file for this language when using the "Use image flags" Language Switcher basic option. Example: if 'en' is chosen, then the image will be en.gif. Images and CSS for this module are in media/mod_languages/." -COM_LANGUAGES_FIELD_IMAGE_LABEL="Image" +COM_LANGUAGES_FIELD_IMAGE_DESC="Prefix of the image file for this language when using the "Use image flags" Language Switcher basic option. Example: if 'en' is chosen, then the image will be en.gif. Images and CSS for this module are in media/mod_languages/." +COM_LANGUAGES_FIELD_IMAGE_LABEL="Image Prefix" COM_LANGUAGES_FIELD_LANG_TAG_DESC="Enter the language tag – example: en-GB for English (UK). This should be the exact prefix used for the language installed or to be installed." COM_LANGUAGES_FIELD_LANG_TAG_LABEL="Language Tag" COM_LANGUAGES_INSTALL="Install Languages" COM_LANGUAGES_INSTALLED_FILTER_SEARCH_DESC="Search in title and language tag." COM_LANGUAGES_INSTALLED_FILTER_SEARCH_LABEL="Search Installed Languages" COM_LANGUAGES_OVERRIDE_ERROR_RESERVED_WORDS="YES, NO, NULL, FALSE, ON, OFF, NONE, TRUE are reserved words and can't be used as language constants." -COM_LANGUAGES_OVERRIDE_FIELD_BOTH_LABEL="For Both Locations" +COM_LANGUAGES_OVERRIDE_FIELD_BOTH_LABEL="For both locations" COM_LANGUAGES_OVERRIDE_FIELD_BOTH_DESC="If this box is checked the override will be stored for both administrator (Backend) and site (Frontend). This is essential for creating language overrides for some plugins because their language files, while stored in backend, are also used in frontend (example: plg_content_vote).
Please note that the two overrides will be completely independent from each other after storing them." COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_LABEL="Location" COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_DESC="Indicates whether the override is created for the site (Frontend) or Administrator (Backend) client." @@ -28,7 +28,7 @@ COM_LANGUAGES_OVERRIDE_FIELD_FILE_DESC="Language overrides are stored in a speci COM_LANGUAGES_OVERRIDE_FIELD_LANGUAGE_LABEL="Language" COM_LANGUAGES_OVERRIDE_FIELD_LANGUAGE_DESC="Language for which the constant is overridden." COM_LANGUAGES_OVERRIDE_FIELD_KEY_LABEL="Language Constant" -COM_LANGUAGES_OVERRIDE_FIELD_KEY_DESC="The language constant of the string you want to override." +COM_LANGUAGES_OVERRIDE_FIELD_KEY_DESC="The language constant of the string you want to override.
All text on your site is identified by a specific language constant which you have to use for creating an override of the text.
If you don't know the corresponding constant you can search for text you want to change on the right. By selecting the desired result the correct constant will automatically be inserted into the form." COM_LANGUAGES_OVERRIDE_FIELD_OVERRIDE_LABEL="Text" COM_LANGUAGES_OVERRIDE_FIELD_OVERRIDE_DESC="Enter the text that you want to be displayed instead of the original one.
Please note that there may be placeholders (eg %s, %d or %1$s) in the text which could be important (they will be replaced by other texts before displaying), so you should leave them in there." COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_LABEL="Search Text" @@ -70,9 +70,9 @@ COM_LANGUAGES_HEADING_LANGUAGE_DESC="Language descending" COM_LANGUAGES_HEADING_LANG_CODE="URL Language Code" COM_LANGUAGES_HEADING_LANG_CODE_ASC="URL Language Code ascending" COM_LANGUAGES_HEADING_LANG_CODE_DESC="URL Language Code descending" -COM_LANGUAGES_HEADING_LANG_IMAGE="Image" -COM_LANGUAGES_HEADING_LANG_IMAGE_ASC="Image ascending" -COM_LANGUAGES_HEADING_LANG_IMAGE_DESC="Image descending" +COM_LANGUAGES_HEADING_LANG_IMAGE="Image Prefix" +COM_LANGUAGES_HEADING_LANG_IMAGE_ASC="Image Prefix ascending" +COM_LANGUAGES_HEADING_LANG_IMAGE_DESC="Image Prefix descending" COM_LANGUAGES_HEADING_LANG_TAG="Language Tag" COM_LANGUAGES_HEADING_LANG_TAG_ASC="Language Tag ascending" COM_LANGUAGES_HEADING_LANG_TAG_DESC="Language Tag descending" diff --git a/administrator/language/en-GB/en-GB.com_modules.sys.ini b/administrator/language/en-GB/en-GB.com_modules.sys.ini index 5d8ca27a4317d..108ccf04c7a5e 100644 --- a/administrator/language/en-GB/en-GB.com_modules.sys.ini +++ b/administrator/language/en-GB/en-GB.com_modules.sys.ini @@ -6,5 +6,5 @@ COM_MODULES="Modules" COM_MODULES_GENERAL="General" COM_MODULES_REDIRECT_EDIT_DESC="Select if module editing should be opened in the site or administration interface." -COM_MODULES_REDIRECT_EDIT_LABEL="Edit Module" +COM_MODULES_REDIRECT_EDIT_LABEL="Edit module" COM_MODULES_XML_DESCRIPTION="Component for module management on the Backend." diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.ini index de1e6a3c1abb0..f09ab787c07f5 100644 --- a/administrator/language/en-GB/en-GB.com_newsfeeds.ini +++ b/administrator/language/en-GB/en-GB.com_newsfeeds.ini @@ -87,9 +87,7 @@ COM_NEWSFEEDS_FIELDSET_MORE_OPTIONS_LABEL="Feed Display Options" COM_NEWSFEEDS_FILTER_SEARCH_DESC="Search in news feed title and alias. Prefix with ID: to search for a news feed ID." COM_NEWSFEEDS_FILTER_SEARCH_LABEL="Search News Feeds" COM_NEWSFEEDS_FLOAT_DESC="Controls placement of the image." -COM_NEWSFEEDS_FLOAT_FIRST_LABEL="First Image Float" COM_NEWSFEEDS_FLOAT_LABEL="Image Float" -COM_NEWSFEEDS_FLOAT_SECOND_LABEL="Second Image Float" COM_NEWSFEEDS_HEADING_ASSOCIATION="Association" COM_NEWSFEEDS_ITEM_ASSOCIATIONS_FIELDSET_LABEL="News Feed Item Association" COM_NEWSFEEDS_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilingual only! This choice will only display if the Language Filter parameter 'Item Associations' is set to 'Yes'. Choose a news feed item for the target language. This association will let the Language Switcher module redirect to the associated news feed item in another language. If used, make sure to display the Language switcher module on the concerned pages. A news feed item set to language 'All' can't be associated." diff --git a/administrator/language/en-GB/en-GB.com_search.ini b/administrator/language/en-GB/en-GB.com_search.ini index e6e2fa125ed13..8e694c7eac871 100644 --- a/administrator/language/en-GB/en-GB.com_search.ini +++ b/administrator/language/en-GB/en-GB.com_search.ini @@ -4,9 +4,9 @@ ; Note : All ini files need to be saved as UTF-8 COM_SEARCH="Search" -COM_SEARCH_ALL_WORDS="All Words" +COM_SEARCH_ALL_WORDS="All words" COM_SEARCH_ALPHABETICAL="Alphabetical" -COM_SEARCH_ANY_WORDS="Any Words" +COM_SEARCH_ANY_WORDS="Any words" COM_SEARCH_CONFIG_FIELD_CREATED_DATE_DESC="Show created date." COM_SEARCH_CONFIG_FIELD_CREATED_DATE_LABEL="Created Date" COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_DESC="Record the search phrases submitted by visitors." @@ -39,8 +39,8 @@ COM_SEARCH_NEWEST_FIRST="Newest First" COM_SEARCH_NO_RESULTS="Off" COM_SEARCH_OLDEST_FIRST="Oldest First" COM_SEARCH_ORDERING_DESC="Defines what ordering results are listed in." -COM_SEARCH_ORDERING_LABEL="Results Ordering" -COM_SEARCH_SAVED_SEARCH_OPTIONS="Default Search Options" +COM_SEARCH_ORDERING_LABEL="Results ordering" +COM_SEARCH_SAVED_SEARCH_OPTIONS="Saved search options" COM_SEARCH_SEARCH_IN_PHRASE="Search in phrases." COM_SEARCH_SHOW_SEARCH_RESULTS="Show Search Results" COM_SEARCH_XML_DESCRIPTION="Component for search functions." diff --git a/administrator/language/en-GB/en-GB.com_tags.ini b/administrator/language/en-GB/en-GB.com_tags.ini index c95aef1862edd..7439624563974 100644 --- a/administrator/language/en-GB/en-GB.com_tags.ini +++ b/administrator/language/en-GB/en-GB.com_tags.ini @@ -46,7 +46,6 @@ COM_TAGS_FIELD_CONFIG_TAGDESCRIPTION_DESC="Configure com_tags." COM_TAGS_FIELD_CONFIG_TAGDESCRIPTION_LABEL="Tags" COM_TAGS_FIELD_CONTENT_TYPE_DESC="Only tagged items of these types will be displayed." COM_TAGS_FIELD_CONTENT_TYPE_LABEL="Content types" -COM_TAGS_FIELD_CREATED_DATE_DESC="The date and time that the tag was created." COM_TAGS_FIELD_FULL_DESC="Select or upload an image that will be displayed in the single tag view." COM_TAGS_FIELD_FULL_LABEL="Full Image" COM_TAGS_FIELD_HITS_DESC="Number of hits for this tag." @@ -62,7 +61,6 @@ COM_TAGS_FIELD_ITEM_BODY_DESC="Show the body for each item." COM_TAGS_FIELD_LANGUAGE_DESC="Assign a language to this tag." COM_TAGS_FIELD_LANGUAGE_FILTER_DESC="Optionally filter the list of tags based on language." COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL="Language Filter" -COM_TAGS_FIELD_MODIFIED_DESC="The date and time that the tag was last modified." COM_TAGS_FIELD_NOTE_DESC="An optional note to display in the tag list." COM_TAGS_FIELD_NOTE_LABEL="Note" COM_TAGS_FIELD_NUMBER_ITEMS_LIST_DESC="Default number of tagged items to list on a page." @@ -163,10 +161,6 @@ COM_TAGS_TAG_LIST_ITEM_DESCRIPTION_DESC="Shows the body text for the individual COM_TAGS_TAG_LIST_ITEM_HITS_DESC="Shows the number of hits for each individual item." COM_TAGS_TAG_LIST_MEDIA_DESC="Select or upload the tag image (full image)." COM_TAGS_TAG_LIST_MEDIA_LABEL="Image" -COM_TAGS_TAG_LIST_SHOW_DATE_DESC="Show Date" -COM_TAGS_TAG_LIST_SHOW_DATE_LABEL="Show or hide a date column in the compact list layout. Select Hide to hide the date, or select which date you wish to show." -COM_TAGS_TAG_LIST_SHOW_HEADINGS_DESC="Show or hide the headings in the compact list layout." -COM_TAGS_TAG_LIST_SHOW_HEADINGS_LABEL="Table Headings" COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_DESC="Shows the image for each item." COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL="Item Image" COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC="Whether to show or hide the description for each item in the list. The length may be limited using the Maximum Characters option." diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini index 8d3fbb94e3545..121d42fdd3be7 100644 --- a/administrator/language/en-GB/en-GB.com_templates.ini +++ b/administrator/language/en-GB/en-GB.com_templates.ini @@ -170,7 +170,7 @@ COM_TEMPLATES_MANAGER_STYLES_SITE="Templates: Styles (Site)" COM_TEMPLATES_MANAGER_TEMPLATES="Templates" COM_TEMPLATES_MANAGER_TEMPLATES_ADMIN="Templates: Templates (Administrator)" COM_TEMPLATES_MANAGER_TEMPLATES_SITE="Templates: Templates (Site)" -COM_TEMPLATES_MANAGER_VIEW_TEMPLATE="Templates: Customise (%s)" +COM_TEMPLATES_MANAGER_VIEW_TEMPLATE="Templates: Customise" COM_TEMPLATES_MENU_CHANGED_1="1 menu item has been assigned or unassigned to this style." COM_TEMPLATES_MENU_CHANGED_MORE="%d menu items have been assigned or unassigned to this style." COM_TEMPLATES_MENUS_ASSIGNMENT="Menu Assignment" diff --git a/administrator/language/en-GB/en-GB.com_wrapper.ini b/administrator/language/en-GB/en-GB.com_wrapper.ini index 034c0e8358a68..e96db3eb0b0de 100644 --- a/administrator/language/en-GB/en-GB.com_wrapper.ini +++ b/administrator/language/en-GB/en-GB.com_wrapper.ini @@ -7,12 +7,12 @@ COM_WRAPPER="Wrapper" COM_WRAPPER_FIELD_ADD_DESC="By default, http:// will be added unless it detects http:// or https:// in the URL you provide. This allows you to switch off this functionality." COM_WRAPPER_FIELD_ADD_LABEL="Auto Add" COM_WRAPPER_FIELD_FRAME_DESC="Show frame border which wrap the iframe." -COM_WRAPPER_FIELD_FRAME_LABEL="Frame Border" +COM_WRAPPER_FIELD_FRAME_LABEL="Frame border" COM_WRAPPER_FIELD_HEIGHT_DESC="Height of the iframe window in pixels." COM_WRAPPER_FIELD_HEIGHT_LABEL="Height" COM_WRAPPER_FIELD_HEIGHTAUTO_DESC="If height is set to auto, the height will automatically be set to the size of the external page. This will only work for pages on your own domain. If you see a JavaScript error, make sure this parameter is disabled. This will break XHTML compatibility for this page." COM_WRAPPER_FIELD_HEIGHTAUTO_LABEL="Auto Height" -COM_WRAPPER_FIELD_LABEL_SCROLLBARSPARAMS="Scroll Bar Parameters" +COM_WRAPPER_FIELD_LABEL_SCROLLBARSPARAMS="Scroll bars parameters" COM_WRAPPER_FIELD_SCROLLBARS_DESC="Show or hide the horizontal & vertical scrollbars. If you choose 'Auto', make sure the Auto advanced parameter is set." COM_WRAPPER_FIELD_SCROLLBARS_LABEL="Scroll Bars" COM_WRAPPER_FIELD_URL_DESC="URL to site/file you wish to display within the iframe." diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index eef32fb4dc09f..e31cefd1b409b 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -187,7 +187,7 @@ JFIELD_BASIS_LOGIN_DESCRIPTION_SHOW_LABEL="Login Description" JFIELD_BASIS_LOGOUT_DESCRIPTION_DESC="Text for logout page." JFIELD_BASIS_LOGOUT_DESCRIPTION_LABEL="Logout Description Text" JFIELD_BASIS_LOGOUT_DESCRIPTION_SHOW_DESC="Show or hide logout description." -JFIELD_BASIS_LOGOUT_DESCRIPTION_SHOW_LABEL="Logout Description" +JFIELD_BASIS_LOGOUT_DESCRIPTION_SHOW_LABEL="Logout Text" JFIELD_CATEGORY_DESC="The category that this item is assigned to. You may select an existing category or enter a new category by typing the name in the field and pressing enter." JFIELD_ENABLED_DESC="The enabled status of this item." JFIELD_KEY_REFERENCE_DESC="Used to store information referring to an external resource." @@ -373,7 +373,7 @@ JGLOBAL_FILTER_GROUPS_DESC="This sets the user groups that you want filters appl JGLOBAL_FILTER_GROUPS_LABEL="Filter Groups" JGLOBAL_FILTER_TAGS_DESC="2. List additional tags, separating each tag name with a space or comma. For example: p,div,span." JGLOBAL_FILTER_TAGS_LABEL="Filter Tags2" -JGLOBAL_FILTER_TYPE_DESC="1. Blacklist allows all tags and attributes except for those in the blacklist.
-- Tags for the Default Blacklist include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'
-- Attributes for the Default Blacklist include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc'
-- You can blacklist additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.
-- Custom Blacklist allows you to override the Default Blacklist. Add the tags and attributes to be blacklisted in the Filter Tags and Filter Attributes fields.

Whitelist allows only the tags listed in the Filter Tags and Filter Attributes fields.

No HTML removes all HTML tags from the content when it is saved.

Please note that these settings work regardless of the editor that you are using.
Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database." +JGLOBAL_FILTER_TYPE_DESC="1. Black List allows all tags and attributes except for those in the black list.
-- Tags for the Default Black List include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'
-- Attributes for the Default Black List include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc'
-- You can black list additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.
-- Custom Black List allows you to override the Default Black List. Add the tags and attributes to be black listed in the Filter Tags and Filter Attributes fields.

White List allows only the tags listed in the Filter Tags and Filter Attributes fields.

No HTML removes all HTML tags from the content when it is saved.

Please note that these settings work regardless of the editor that you are using.
Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database." JGLOBAL_FILTER_TYPE_LABEL="Filter Type1" JGLOBAL_FULL_TEXT="Full Text" JGLOBAL_GT=">" @@ -498,7 +498,7 @@ JGLOBAL_SHOW_CREATE_DATE_LABEL="Show Create Date" JGLOBAL_SHOW_DATE_DESC="Whether to show a date column in the list of articles. Select Hide to hide the date, or select which date you wish to show." JGLOBAL_SHOW_DATE_LABEL="Show Date" JGLOBAL_SHOW_EMAIL_ICON_DESC="Show or hide the email icon. This allows you to email an article." -JGLOBAL_SHOW_EMAIL_ICON_LABEL="Show Email" +JGLOBAL_SHOW_EMAIL_ICON_LABEL="Show Email Icon" JGLOBAL_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no items or subcategories." JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL="Empty Categories" JGLOBAL_SHOW_FEATURED_ARTICLES_DESC="Select to show, hide or only display featured articles." @@ -520,8 +520,8 @@ JGLOBAL_SHOW_NAVIGATION_DESC="If set to Show, shows a navigation link (Next, Pre JGLOBAL_SHOW_NAVIGATION_LABEL="Show Navigation" JGLOBAL_SHOW_PARENT_CATEGORY_DESC="If set to Show, the title of the article’s parent category will show." JGLOBAL_SHOW_PARENT_CATEGORY_LABEL="Show Parent" -JGLOBAL_SHOW_PRINT_ICON_DESC="Show or hide the Item Print link." -JGLOBAL_SHOW_PRINT_ICON_LABEL="Show Print" +JGLOBAL_SHOW_PRINT_ICON_DESC="Show or hide the Item Print button." +JGLOBAL_SHOW_PRINT_ICON_LABEL="Show Print Icon" JGLOBAL_SHOW_PUBLISH_DATE_DESC="If set to Show, the date and time an Article was published will be displayed. This is a global setting but can be changed at the Category, Menu and Article levels." JGLOBAL_SHOW_PUBLISH_DATE_LABEL="Show Publish Date" JGLOBAL_SHOW_READMORE_DESC="If set to Show, the Read more ...Link will show if Main text has been provided for the Article." diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini index 1ba6cd81db5e7..aff62efa91afd 100644 --- a/administrator/language/en-GB/en-GB.lib_joomla.ini +++ b/administrator/language/en-GB/en-GB.lib_joomla.ini @@ -176,7 +176,7 @@ JLIB_DATABASE_ERROR_INVALID_LOCATION="%s: :setLocation - Invalid location." JLIB_DATABASE_ERROR_INVALID_NODE_RECURSION="%s: :move Failed - Can't move the node to be a child of itself." JLIB_DATABASE_ERROR_INVALID_PARENT_ID="Invalid parent ID." JLIB_DATABASE_ERROR_LANGUAGE_NO_TITLE="The language should have a title." -JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_IMAGE="A content language already exists with this Image." +JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_IMAGE="A content language already exists with this Image Prefix." JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_LANG_CODE="A content language already exists with this Language Tag." JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_SEF="A content language already exists with this URL Language Code." JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s" @@ -636,7 +636,7 @@ JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the follow JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data." JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail can't be sent." -JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been disabled by an administrator." +JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been temporarily disabled on this site, please try again later." JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid email Sender: %s, JMail: :setSender(%s)." JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file." diff --git a/administrator/language/en-GB/en-GB.mod_status.ini b/administrator/language/en-GB/en-GB.mod_status.ini index e6615ddfc812b..a672c613bbf96 100644 --- a/administrator/language/en-GB/en-GB.mod_status.ini +++ b/administrator/language/en-GB/en-GB.mod_status.ini @@ -8,7 +8,7 @@ MOD_STATUS_BACKEND_USERS_0="Administrators" MOD_STATUS_BACKEND_USERS_1="Administrator" MOD_STATUS_BACKEND_USERS_MORE="Administrators" MOD_STATUS_FIELD_SHOW_VIEWSITE_LABEL="Show View Site" -MOD_STATUS_FIELD_SHOW_VIEWSITE_DESC="Show a link to the website homepage." +MOD_STATUS_FIELD_SHOW_VIEWSITE_DESC="Show a link to the website home page." MOD_STATUS_FIELD_LINK_VIEWADMIN_LABEL="Show Admin" MOD_STATUS_FIELD_SHOW_VIEWADMIN_LABEL="Show View Administrator" MOD_STATUS_FIELD_SHOW_VIEWADMIN_DESC="Show a link to open a new Administrator window." @@ -21,9 +21,6 @@ MOD_STATUS_FIELD_SHOW_MESSAGES_LABEL="Show Messages" MOD_STATUS_LOG_OUT="Log out" MOD_STATUS_MESSAGES_0="%d Messages" MOD_STATUS_MESSAGES_1="%d Message" -MOD_STATUS_MESSAGES_LABEL_0="Messages" -MOD_STATUS_MESSAGES_LABEL_1="Message" -MOD_STATUS_MESSAGES_LABEL_MORE="Messages" MOD_STATUS_MESSAGES_MORE="%d Messages" MOD_STATUS_USERS_0="Visitors" MOD_STATUS_USERS_1="Visitor" diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini index bc45dc0ec3997..fe797151c5b34 100644 --- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini +++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini @@ -15,9 +15,9 @@ PLG_RECAPTCHA_VERSION_1="1.0" PLG_RECAPTCHA_VERSION_2="2.0" PLG_RECAPTCHA_VERSION_V1="1.0" PLG_RECAPTCHA_VERSION_V2="2.0" -PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site Key" +PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site key" PLG_RECAPTCHA_PUBLIC_KEY_DESC="Used in the JavaScript code that is served to your users. See the plugin description for instructions on getting a site key." -PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret Key" +PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret key" PLG_RECAPTCHA_PRIVATE_KEY_DESC="Used in the communication between your server and the reCAPTCHA server. Be sure to keep it a secret. See the plugin description for instructions on getting a secret key." PLG_RECAPTCHA_THEME_LABEL="Theme" PLG_RECAPTCHA_THEME_DESC="Defines which theme to use for reCAPTCHA." diff --git a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini index 2ac4f0327bb12..89f4c1ac13442 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini @@ -22,9 +22,9 @@ PLG_CODEMIRROR_FIELD_FONT_SIZE_LABEL="Font Size (px)" PLG_CODEMIRROR_FIELD_FULLSCREEN_DESC="Select the function key to use to toggle fullscreen mode." PLG_CODEMIRROR_FIELD_FULLSCREEN_LABEL="Toggle Fullscreen" PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_DESC="Select any modifier keys to use with the fullscreen toggle key." -PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_LABEL="Use Modifiers" +PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_LABEL="Use modifiers" PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_DESC="The background colour to use for highlighting matching tags. Will be displayed at 50% opacity." -PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL="Matching Tag Colour" +PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL="Matching tag colour" PLG_CODEMIRROR_FIELD_LINE_HEIGHT_DESC="The height of one line of text. This is in ems, meaning that 1.0 is equal to the font size and 2.0 is equal to 2x the font size." PLG_CODEMIRROR_FIELD_LINE_HEIGHT_LABEL="Line Height (em)" PLG_CODEMIRROR_FIELD_LINENUMBERS_DESC="Display line numbers." diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini index c739b6c188cfc..a2f3c480215d0 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini @@ -6,7 +6,7 @@ PLG_EDITORS_TINYMCE="Editor - TinyMCE" PLG_TINY_BUTTON_TOGGLE_EDITOR="Toggle editor" PLG_TINY_CONFIG_TEXTFILTER_ACL_DESC="If on, the text filter from the Joomla Global Configuration for every user group is applied.
If off, the filters as defined here are used for all user groups." -PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL="Use Joomla Text Filter" +PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL="Use Joomla text filter" PLG_TINY_ERR_CUSTOMCSSFILENOTPRESENT="The file name %s was entered in the TinyMCE Custom CSS field. This file could not be found in the default template folder. No styles are available." PLG_TINY_ERR_EDITORCSSFILENOTPRESENT="Could not find the file 'editor.css' in the template or templates/system folder. No styles are available." PLG_TINY_ERR_UNSUPPORTEDBROWSER="Drag and drop image upload is not available for your browser. Please consider using a fully HTML5 compatible browser" @@ -33,13 +33,13 @@ PLG_TINY_FIELD_CUSTOMPLUGIN_LABEL="Custom Plugin" PLG_TINY_FIELD_CUSTOM_CSS_DESC="Optional CSS file that will override the standard editor.css file. Enter a file name to point to a file in the CSS folder of the default template (for example, templates/beez3/css/). Or enter a full URL path to the custom CSS file. If you enter a value in this field, this file will be used instead of the editor.css file." PLG_TINY_FIELD_CUSTOM_CSS_LABEL="Custom CSS Classes" PLG_TINY_FIELD_CUSTOM_PATH_DESC="Provide a directory where the images are to be uploaded to. If nothing is provided the images will be uploaded to /images." -PLG_TINY_FIELD_CUSTOM_PATH_LABEL="Images Directory" +PLG_TINY_FIELD_CUSTOM_PATH_LABEL="Images directory" PLG_TINY_FIELD_DATE_DESC="Show or hide the Insert Date button." PLG_TINY_FIELD_DATE_LABEL="Insert Date" PLG_TINY_FIELD_DIRECTION_DESC="Choose default text direction." PLG_TINY_FIELD_DIRECTION_LABEL="Text Direction" PLG_TINY_FIELD_DRAG_DROP_DESC="Enable drag and drop for uploading images" -PLG_TINY_FIELD_DRAG_DROP_LABEL="Images Drag & Drop" +PLG_TINY_FIELD_DRAG_DROP_LABEL="Images drag&drop" PLG_TINY_FIELD_ELEMENTS_DESC="Allows the addition of specific valid elements to the existing rule set." PLG_TINY_FIELD_ELEMENTS_LABEL="Extended Valid Elements" PLG_TINY_FIELD_ENCODING_DESC="Controls how HTML entities are encoded. Recommended setting is 'raw'. 'named' = used named entity encoding (for example, '<'). 'numeric' = use numeric HTML encoding (for example, '%03c'). raw = Do not encode HTML entities. Note that searching content may not work properly if setting is not 'raw'." @@ -83,7 +83,7 @@ PLG_TINY_FIELD_PRINT_LABEL="Print/Preview" PLG_TINY_FIELD_PROHIBITED_DESC="Elements that will be cleaned from the text. Do not leave empty - if you do not want to prohibit anything enter dummy text eg cms." PLG_TINY_FIELD_PROHIBITED_LABEL="Prohibited Elements" PLG_TINY_FIELD_RESIZE_HORIZONTAL_DESC="Enable/disable the horizontal resizing." -PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL="Horizontal Resizing" +PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL="Horizontal resizing" PLG_TINY_FIELD_RESIZING_DESC="Enable/disable the resizing of the editor area (vertically and also horizontally if 'Horizontal Resizing' is enabled)." PLG_TINY_FIELD_RESIZING_LABEL="Resizing" PLG_TINY_FIELD_RTL_DESC="Select whether to display the RTL button." diff --git a/administrator/language/en-GB/en-GB.plg_search_content.ini b/administrator/language/en-GB/en-GB.plg_search_content.ini index 6b0070441d20b..786665b3fd976 100644 --- a/administrator/language/en-GB/en-GB.plg_search_content.ini +++ b/administrator/language/en-GB/en-GB.plg_search_content.ini @@ -4,7 +4,7 @@ ; Note : All ini files need to be saved as UTF-8 PLG_SEARCH_CONTENT="Search - Content" -PLG_SEARCH_CONTENT_FIELD_ARCHIVED_DESC="Enables searching of Archived Articles." +PLG_SEARCH_CONTENT_FIELD_ARCHIVED_DESC="Enables searching of Archived Articles?" PLG_SEARCH_CONTENT_FIELD_ARCHIVED_LABEL="Archived Articles" PLG_SEARCH_CONTENT_FIELD_CONTENT_DESC="Enables searching of all Articles." PLG_SEARCH_CONTENT_FIELD_CONTENT_LABEL="Articles" diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini index 1da18b546dbf8..37e9f780ddd33 100644 --- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini +++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini @@ -6,16 +6,16 @@ PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification" PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_LBL="Super User Emails" PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_DESC="A comma separated list of the email addresses which will receive the update notification emails. The addresses in the list MUST belong to existing users of your site who have the Super User privilege. If none of the listed emails belongs to Super Users, or if it's left blank, all Super Users of this site will receive the update notification email." -PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL="Email Language" +PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL="Email language" PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="If you choose Auto (default), the update notification email to Super Users will be in the site language at the time the plugin is triggered. By selecting a language here you are forcing the update notification emails to be sent in this specific language." PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto" ; You can use the following merge codes: ; [NEWVERSION] New Joomla! version, e.g. 1.2.3 ; [CURVERSION] Currently installed Joomla! version, e.g. 1.2.0 ; [SITENAME] Site name, as set in Global Configuration. -; [URL] URL of the site's front-end page. +; [URL] URL of the site's frontend page. ; [LINK] Update URL (link to com_joomlaupdate, will request login if the Super User isn't already logged in). ; \n Newline character. Use it to start a new line in the email. PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT="Joomla! Update available for [SITENAME] – [URL]" -PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org. It is sent automatically by your own site,\n[SITENAME] - [URL] \n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available for download.\n\nJoomla! version currently installed: [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact.\nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please click the following link. (If the URL is not a link, simply copy & paste it to your browser).\n\nUpdate link: [LINK]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what Joomla! is and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]" +PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org. It is sent automatically by your own site,\n[SITENAME]\n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available for download.\n\nJoomla! version currently installed: [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact.\nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please click the following link. (If the URL is not a link, simply copy & paste it to your browser).\n\nUpdate link: [LINK]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what Joomla! is and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]" PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY." diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index afe5716c16178..b83d257911e7c 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -1,8 +1,8 @@ English (en-GB) - 3.6.3 - August 2016 + 3.6.1 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 7f26c90a9d76a..64ed05413d877 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,8 +2,8 @@ English (United Kingdom) en-GB - 3.6.3 - August 2016 + 3.6.1 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index f09347b6cfe92..8cb44c5af22ef 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2005 - 2016 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.6.3-dev - August 2016 + 3.6.1-dev + July 2016 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 55b99dedadb69..a44fdc7bf0979 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,8 +2,8 @@ English (en-GB) Language Pack en-GB - 3.6.3.1 - August 2016 + 3.6.1.1 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_latest/mod_latest.xml b/administrator/modules/mod_latest/mod_latest.xml index 3ae826324e519..e41cd43c21452 100644 --- a/administrator/modules/mod_latest/mod_latest.xml +++ b/administrator/modules/mod_latest/mod_latest.xml @@ -79,6 +79,15 @@ label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL" description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" /> + + + + + +

client_id == 0) : ?> - + diff --git a/administrator/modules/mod_login/helper.php b/administrator/modules/mod_login/helper.php index 8191d4922087a..3bac8a84318e8 100644 --- a/administrator/modules/mod_login/helper.php +++ b/administrator/modules/mod_login/helper.php @@ -77,13 +77,11 @@ public static function getReturnUri() * on user view * * @return array - * - * @deprecated 4.0 Use JAuthenticationHelper::getTwoFactorMethods() instead. */ public static function getTwoFactorMethods() { - JLog::add(__METHOD__ . ' is deprecated, use JAuthenticationHelper::getTwoFactorMethods() instead.', JLog::WARNING, 'deprecated'); + JLoader::register('UsersHelper', JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php'); - return JAuthenticationHelper::getTwoFactorMethods(); + return UsersHelper::getTwoFactorMethods(); } } diff --git a/administrator/modules/mod_login/mod_login.php b/administrator/modules/mod_login/mod_login.php index a972336b4ff38..0577d589bbdaf 100644 --- a/administrator/modules/mod_login/mod_login.php +++ b/administrator/modules/mod_login/mod_login.php @@ -13,7 +13,7 @@ JLoader::register('ModLoginHelper', __DIR__ . '/helper.php'); $langs = ModLoginHelper::getLanguageList(); -$twofactormethods = JAuthenticationHelper::getTwoFactorMethods(); +$twofactormethods = ModLoginHelper::getTwoFactorMethods(); $return = ModLoginHelper::getReturnUri(); require JModuleHelper::getLayoutPath('mod_login', $params->get('layout', 'default')); diff --git a/administrator/modules/mod_login/mod_login.xml b/administrator/modules/mod_login/mod_login.xml index 4ed549e79a62f..5b2ad77da2ed5 100644 --- a/administrator/modules/mod_login/mod_login.xml +++ b/administrator/modules/mod_login/mod_login.xml @@ -47,6 +47,15 @@ label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL" description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" /> + + +
diff --git a/administrator/modules/mod_menu/mod_menu.xml b/administrator/modules/mod_menu/mod_menu.xml index 982ec2de78ff7..391cc99acd50a 100644 --- a/administrator/modules/mod_menu/mod_menu.xml +++ b/administrator/modules/mod_menu/mod_menu.xml @@ -66,6 +66,15 @@ description="MOD_MENU_FIELD_FORUMURL_DESC" /> + + + diff --git a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml index 3258571e75fe5..983040b12745a 100644 --- a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml +++ b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml @@ -43,6 +43,15 @@ description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" /> + + + diff --git a/administrator/modules/mod_multilangstatus/tmpl/default.php b/administrator/modules/mod_multilangstatus/tmpl/default.php index 8fb2c0fbad1cd..d70114267c19e 100644 --- a/administrator/modules/mod_multilangstatus/tmpl/default.php +++ b/administrator/modules/mod_multilangstatus/tmpl/default.php @@ -23,13 +23,13 @@ ?>
- -
+ + + setQuery($query); $unread = (int) $db->loadResult(); -// Get the number of back-end logged in users. +// Get the number of backend logged in users. $query->clear() ->select('COUNT(session_id)') ->from('#__session') diff --git a/administrator/modules/mod_status/mod_status.xml b/administrator/modules/mod_status/mod_status.xml index f37c212fb951c..d4fc9c8417cca 100644 --- a/administrator/modules/mod_status/mod_status.xml +++ b/administrator/modules/mod_status/mod_status.xml @@ -85,6 +85,15 @@ label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL" description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" /> + + + diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index 101e3c6acfb81..b426168fcab24 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -24,8 +24,8 @@ . '' . '' . JText::_('JGLOBAL_VIEW_SITE') . '' - . '' - . '
'; + . '' + . '
'; } // Print the link to open a new Administrator window. @@ -35,27 +35,25 @@ . '' . '' . JText::_('MOD_STATUS_FIELD_LINK_VIEWADMIN_LABEL') . '' - . '' - . ''; + . '' + . '
'; } // Print the frontend logged in users. if ($params->get('show_loggedin_users', 1)) { $output[] = '
' - . '' . $online_num . '' + . '' . $online_num . ' ' . JText::plural('MOD_STATUS_USERS', $online_num) - . '' . '
'; } -// Print the back-end logged in users. +// Print the backend logged in users. if ($params->get('show_loggedin_users_admin', 1)) { $output[] = '
' - . '' . $count . '' + . '' . $count . ' ' . JText::plural('MOD_STATUS_BACKEND_USERS', $count) - . '' . '
'; } @@ -63,12 +61,13 @@ if ($params->get('show_messages', 1)) { $active = $unread ? ' badge-warning' : ''; - $output[] = '
' + $output[] = '
' . ($hideLinks ? '' : '') + . '' . '' . $unread . '' - . JText::plural('MOD_STATUS_MESSAGES_LABEL', $unread) . ($hideLinks ? '' : '') - . '' + . '
' . '
'; } diff --git a/administrator/modules/mod_submenu/mod_submenu.xml b/administrator/modules/mod_submenu/mod_submenu.xml index 5f4a88eb52d4c..50a14ac61777b 100644 --- a/administrator/modules/mod_submenu/mod_submenu.xml +++ b/administrator/modules/mod_submenu/mod_submenu.xml @@ -33,6 +33,15 @@ label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL" description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" /> + + + diff --git a/administrator/modules/mod_title/mod_title.xml b/administrator/modules/mod_title/mod_title.xml index d0013a6f244db..54245917a7bef 100644 --- a/administrator/modules/mod_title/mod_title.xml +++ b/administrator/modules/mod_title/mod_title.xml @@ -33,6 +33,15 @@ label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL" description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" /> + + + diff --git a/administrator/modules/mod_toolbar/mod_toolbar.xml b/administrator/modules/mod_toolbar/mod_toolbar.xml index ed7ce50fbbc51..948d5474cc070 100644 --- a/administrator/modules/mod_toolbar/mod_toolbar.xml +++ b/administrator/modules/mod_toolbar/mod_toolbar.xml @@ -33,6 +33,15 @@ label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL" description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" /> + + + diff --git a/administrator/modules/mod_version/mod_version.xml b/administrator/modules/mod_version/mod_version.xml index 6ef8e0017e041..5cb752a55074b 100644 --- a/administrator/modules/mod_version/mod_version.xml +++ b/administrator/modules/mod_version/mod_version.xml @@ -60,6 +60,15 @@ label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL" description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" /> + + + diff --git a/administrator/templates/hathor/css/colour_blue_rtl.css b/administrator/templates/hathor/css/colour_blue_rtl.css index 8cb5eeaaf6ebe..4d2d1a37b682b 100644 --- a/administrator/templates/hathor/css/colour_blue_rtl.css +++ b/administrator/templates/hathor/css/colour_blue_rtl.css @@ -264,7 +264,7 @@ table.aclsummary-table th.col4, table.aclsummary-table td.col5, table.aclsummary-table th.col5, table.aclsummary-table td.col6, -table.aclsummary-table th.col6, +table.aclsummary-table th.col6 table.aclmodify-table td.col2, table.aclmodify-table th.col2 { border-right: 1px solid #738498; diff --git a/administrator/templates/hathor/css/colour_brown_rtl.css b/administrator/templates/hathor/css/colour_brown_rtl.css index 47f33dc026076..400509fa9ff4b 100644 --- a/administrator/templates/hathor/css/colour_brown_rtl.css +++ b/administrator/templates/hathor/css/colour_brown_rtl.css @@ -225,7 +225,7 @@ table.aclsummary-table th.col4, table.aclsummary-table td.col5, table.aclsummary-table th.col5, table.aclsummary-table td.col6, -table.aclsummary-table th.col6, +table.aclsummary-table th.col6 table.aclmodify-table td.col2, table.aclmodify-table th.col2 { border-right: 1px solid #cbcbcb; diff --git a/administrator/templates/hathor/css/colour_standard_rtl.css b/administrator/templates/hathor/css/colour_standard_rtl.css index d4b57ca85ca7f..c5408b897ab99 100644 --- a/administrator/templates/hathor/css/colour_standard_rtl.css +++ b/administrator/templates/hathor/css/colour_standard_rtl.css @@ -262,7 +262,7 @@ table.aclsummary-table th.col4, table.aclsummary-table td.col5, table.aclsummary-table th.col5, table.aclsummary-table td.col6, -table.aclsummary-table th.col6, +table.aclsummary-table th.col6 table.aclmodify-table td.col2, table.aclmodify-table th.col2 { border-right: 1px solid #c7c8b2; diff --git a/administrator/templates/hathor/html/com_users/users/default.php b/administrator/templates/hathor/html/com_users/users/default.php index 56a3c144a4080..16587f5bf4674 100644 --- a/administrator/templates/hathor/html/com_users/users/default.php +++ b/administrator/templates/hathor/html/com_users/users/default.php @@ -190,7 +190,7 @@ escape($item->email); ?> - lastvisitDate != $this->db->getNullDate()) : ?> + lastvisitDate != '0000-00-00 00:00:00') : ?> lastvisitDate, 'Y-m-d H:i:s'); ?> diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css index b0cc5ceffddbf..b528a695f8fc7 100644 --- a/administrator/templates/isis/css/template-rtl.css +++ b/administrator/templates/isis/css/template-rtl.css @@ -7567,24 +7567,12 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] { #status { background: #ebebeb; border-top: 1px solid #d4d4d4; - padding: 4px 10px; + padding: 2px 10px 4px 10px; -webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6); -moz-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6); box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6); color: #626262; } -#status .btn-group { - margin: 0; -} -#status .btn-group.separator:after { - content: ' '; - display: block; - float: left; - background: #ADADAD; - margin: 0 10px; - height: 15px; - width: 1px; -} #status .btn-toolbar, #status p { margin: 0px; @@ -7596,9 +7584,6 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] { #status a { color: #626262; } -#status .badge { - margin-right: .25em; -} #status.status-top { background: #1a3867; -webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3); @@ -8807,7 +8792,7 @@ body { margin-left: 0; margin-right: 180px; } -.dl-horizontal dt, +.dl-horizontal dt .profile> ul { margin: 9px 25px 0 0; } @@ -9071,24 +9056,8 @@ input[type="url"] { margin-left: 10px; } } -#status { - padding: 4px 10px; -} -#status .btn-group { - margin: 0; -} -#status .btn-group.separator:after { - content: ' '; - display: block; - float: left; - background: #ADADAD; - margin: 0 10px; - height: 15px; - width: 1px; -} #status .badge { - margin-left: .25em; - margin-right: 0; + margin-left: 0; } .dropdown-menu > li > a { text-align: right; diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css index 9adb231084d78..c06e848a9f308 100644 --- a/administrator/templates/isis/css/template.css +++ b/administrator/templates/isis/css/template.css @@ -7567,24 +7567,12 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] { #status { background: #ebebeb; border-top: 1px solid #d4d4d4; - padding: 4px 10px; + padding: 2px 10px 4px 10px; -webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6); -moz-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6); box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6); color: #626262; } -#status .btn-group { - margin: 0; -} -#status .btn-group.separator:after { - content: ' '; - display: block; - float: left; - background: #ADADAD; - margin: 0 10px; - height: 15px; - width: 1px; -} #status .btn-toolbar, #status p { margin: 0px; @@ -7596,9 +7584,6 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] { #status a { color: #626262; } -#status .badge { - margin-right: .25em; -} #status.status-top { background: #1a3867; -webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3); diff --git a/administrator/templates/isis/less/template-rtl.less b/administrator/templates/isis/less/template-rtl.less index 0635e2d69df4e..dc3bd9dd0e2ef 100644 --- a/administrator/templates/isis/less/template-rtl.less +++ b/administrator/templates/isis/less/template-rtl.less @@ -91,25 +91,8 @@ } /* Status module */ -#status { - padding: 4px 10px; - - .btn-group { - margin: 0; - } - .btn-group.separator:after { - content: ' '; - display: block; - float: left; - background: #ADADAD; - margin: 0 10px; - height: 15px; - width: 1px; - } - .badge { - margin-left: .25em; - margin-right: 0; - } +#status .badge { + margin-left: 0; } /* Menus */ diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less index 8c43e667b02c3..430c17b2dc90d 100644 --- a/administrator/templates/isis/less/template.less +++ b/administrator/templates/isis/less/template.less @@ -566,22 +566,10 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"], html[dir=rtl] .quick-icon #status { background: #ebebeb; border-top: 1px solid #d4d4d4; - padding: 4px 10px; + padding: 2px 10px 4px 10px; .box-shadow(~"0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6)"); color: #626262; - .btn-group { - margin: 0; - } - .btn-group.separator:after { - content: ' '; - display: block; - float: left; - background: #ADADAD; - margin: 0 10px; - height: 15px; - width: 1px; - } .btn-toolbar, p { margin: 0px; } @@ -591,9 +579,6 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"], html[dir=rtl] .quick-icon a { color: #626262; } - .badge { - margin-right: .25em; - } } /* Status Module in top position */ #status.status-top { @@ -1204,7 +1189,7 @@ input.input-large-text { .chzn-color.chzn-single[rel="value_hide"] { .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight); } -/* Widen the drop downs for the Permissions Field */ +/* Widen the dropdowns for the Permissions Field */ #permissions-sliders .input-small { width: 120px; } diff --git a/build.xml b/build.xml index 8cbd45ca6efb3..68b6ec2fbac8a 100644 --- a/build.xml +++ b/build.xml @@ -88,7 +88,7 @@ - + diff --git a/build/build.php b/build/build.php index 177c75530da15..f5e25df954940 100644 --- a/build/build.php +++ b/build/build.php @@ -24,7 +24,15 @@ // Set path to git binary (e.g., /usr/local/git/bin/git or /usr/bin/git) ob_start(); passthru('which git', $systemGit); -$systemGit = trim(ob_get_clean()); +$systemGit = ob_get_clean(); +$gitPath = '/usr/bin/git'; + +// Sanity check - Make sure $gitPath is the same path the system recognizes +if (substr($systemGit, 0, -1) != $gitPath) +{ + echo '$gitPath does not match path to local git executable, please set $gitPath to: ' . substr($systemGit, 0, -1) . "\n"; + exit; +} // Make sure file and folder permissions are set correctly umask(022); @@ -55,7 +63,7 @@ echo "Copy the files from the git repository.\n"; chdir($repo); -system($systemGit . ' archive ' . $fullVersion . ' | tar -x -C ' . $fullpath); +system($gitPath . ' archive ' . $fullVersion . ' | tar -x -C ' . $fullpath); chdir($tmp); system('mkdir diffdocs'); @@ -101,7 +109,6 @@ $doNotPackage = array( '.github', '.gitignore', - '.php_cs', '.travis.yml', 'README.md', 'build', @@ -137,7 +144,7 @@ // Here we get a list of all files that have changed between the two tags ($previousTag and $fullVersion) and save in diffdocs $previousTag = $version . '.' . $num; - $command = $systemGit . ' diff tags/' . $previousTag . ' tags/' . $fullVersion . ' --name-status > diffdocs/' . $version . '.' . $num; + $command = $gitPath . ' diff tags/' . $previousTag . ' tags/' . $fullVersion . ' --name-status > diffdocs/' . $version . '.' . $num; system($command); @@ -162,33 +169,15 @@ continue; } - // Act on the file based on the action - switch (substr($file, 0, 1)) + // Don't add deleted files to the list + if (substr($file, 0, 1) != 'D') { - // This is a new case with git 2.9 to handle renamed files - case 'R': - // Explode the file on the tab character; key 0 is the action (rename), key 1 is the old filename, and key 2 is the new filename - $renamedFileData = explode("\t", $file); - - // Add the new file for packaging - $filesArray[$renamedFileData[2]] = true; - - // And flag the old file as deleted - $deletedFiles[] = $renamedFileData[1]; - - break; - - // Deleted files - case 'D': - $deletedFiles[] = $fileName; - - break; - - // Regular additions and modifications - default: - $filesArray[$fileName] = true; - - break; + $filesArray[$fileName] = true; + } + else + { + // Add deleted files to the deleted files list + $deletedFiles[] = $fileName; } } diff --git a/build/travis/unit-tests.sh b/build/travis/unit-tests.sh index 1564b08baa7ae..499987c2615d8 100644 --- a/build/travis/unit-tests.sh +++ b/build/travis/unit-tests.sh @@ -29,4 +29,4 @@ if [[ $INSTALL_APCU == "yes" && $TRAVIS_PHP_VERSION = 5.* ]]; then printf "\n" | if [[ $INSTALL_APCU == "yes" && $TRAVIS_PHP_VERSION = 7.* ]]; then printf "\n" | pecl install apcu-beta && phpenv config-add "$BASE/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" && $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-add "$BASE/build/travis/phpenv/redis.ini"; fi -if [[ $INSTALL_REDIS == "yes" && $TRAVIS_PHP_VERSION = hhvm ]]; then cat "$BASE/build/travis/phpenv/redis.ini" >> /etc/hhvm/php.ini; fi +if [[ $INSTALL_REDIS == "yes" && $TRAVIS_PHP_VERSION = hhvm ]]; then cat "$BASE/build/travis/phpenv/redis.ini" >> /etc/hhvm/php.ini; fi \ No newline at end of file diff --git a/cli/finder_indexer.php b/cli/finder_indexer.php index 28dfba8212bdb..bc05c9a705f7a 100644 --- a/cli/finder_indexer.php +++ b/cli/finder_indexer.php @@ -286,7 +286,7 @@ private function putFilters() $query ->select('t.id') ->from($db->qn('#__finder_taxonomy') . ' AS t') - ->leftJoin($db->qn('#__finder_taxonomy') . ' AS p ON p.id = t.parent_id') + ->leftjoin($db->qn('#__finder_taxonomy') . ' AS p ON p.id = t.parent_id') ->where($db->qn('t.title') . ' = ' . $db->q($element['title'])) ->where($db->qn('p.title') . ' = ' . $db->q($element['parent'])); $taxonomy = $db->setQuery($query)->loadResult(); @@ -355,7 +355,7 @@ private function getFilters() $query ->select('t.title, p.title AS parent') ->from($db->qn('#__finder_taxonomy') . ' AS t') - ->leftJoin($db->qn('#__finder_taxonomy') . ' AS p ON p.id = t.parent_id') + ->leftjoin($db->qn('#__finder_taxonomy') . ' AS p ON p.id = t.parent_id') ->where($db->qn('t.id') . ' IN (' . $filter->data . ')'); $taxonomies = $db->setQuery($query)->loadObjectList(); diff --git a/components/com_config/controller/config/display.php b/components/com_config/controller/config/display.php index 64f9fbb7c0978..05ce1d580a6e9 100644 --- a/components/com_config/controller/config/display.php +++ b/components/com_config/controller/config/display.php @@ -35,15 +35,15 @@ public function execute() $viewFormat = $document->getType(); $layoutName = $this->input->getWord('layout', 'default'); - // Access back-end com_config + // Access backend com_config JLoader::registerPrefix(ucfirst($viewName), JPATH_ADMINISTRATOR . '/components/com_config'); $displayClass = new ConfigControllerApplicationDisplay; - // Set back-end required params + // Set backend required params $document->setType('json'); $app->input->set('view', 'application'); - // Execute back-end controller + // Execute backend controller $serviceData = json_decode($displayClass->execute(), true); // Reset params back after requesting from service diff --git a/components/com_config/controller/config/save.php b/components/com_config/controller/config/save.php index 470fa06c3e5be..47689a6b4446c 100644 --- a/components/com_config/controller/config/save.php +++ b/components/com_config/controller/config/save.php @@ -74,17 +74,17 @@ public function execute() // Attempt to save the configuration. $data = $return; - // Access back-end com_config + // Access backend com_config JLoader::registerPrefix('Config', JPATH_ADMINISTRATOR . '/components/com_config'); $saveClass = new ConfigControllerApplicationSave; // Get a document object $document = JFactory::getDocument(); - // Set back-end required params + // Set backend required params $document->setType('json'); - // Execute back-end controller + // Execute backend controller $return = $saveClass->execute(); // Reset params back after requesting from service diff --git a/components/com_config/controller/modules/cancel.php b/components/com_config/controller/modules/cancel.php index f72f782b53878..4bf7520ab386a 100644 --- a/components/com_config/controller/modules/cancel.php +++ b/components/com_config/controller/modules/cancel.php @@ -52,7 +52,7 @@ public function execute() $id = $this->input->getInt('id'); - // Access back-end com_module + // Access backend com_module JLoader::register('ModulesControllerModule', JPATH_ADMINISTRATOR . '/components/com_modules/controllers/module.php'); JLoader::register('ModulesViewModule', JPATH_ADMINISTRATOR . '/components/com_modules/views/module/view.json.php'); JLoader::register('ModulesModelModule', JPATH_ADMINISTRATOR . '/components/com_modules/models/module.php'); diff --git a/components/com_config/controller/modules/display.php b/components/com_config/controller/modules/display.php index 3ac7459bb71b9..3152897fd8929 100644 --- a/components/com_config/controller/modules/display.php +++ b/components/com_config/controller/modules/display.php @@ -55,7 +55,7 @@ public function execute() $redirect = JUri::base(); } - // Access back-end com_module + // Access backend com_module JLoader::register('ModulesController', JPATH_ADMINISTRATOR . '/components/com_modules/controller.php'); JLoader::register('ModulesViewModule', JPATH_ADMINISTRATOR . '/components/com_modules/views/module/view.json.php'); JLoader::register('ModulesModelModule', JPATH_ADMINISTRATOR . '/components/com_modules/models/module.php'); @@ -65,7 +65,7 @@ public function execute() // Get the parameters of the module with Id $document->setType('json'); - // Execute back-end controller + // Execute backend controller if (!($serviceData = json_decode($displayClass->display(), true))) { $app->redirect($redirect); diff --git a/components/com_config/controller/modules/save.php b/components/com_config/controller/modules/save.php index d3af38184b9f9..763937da7ee60 100644 --- a/components/com_config/controller/modules/save.php +++ b/components/com_config/controller/modules/save.php @@ -59,7 +59,7 @@ public function execute() $redirect = '&return=' . $returnUri; } - // Access back-end com_modules to be done + // Access backend com_modules to be done JLoader::register('ModulesControllerModule', JPATH_ADMINISTRATOR . '/components/com_modules/controllers/module.php'); JLoader::register('ModulesModelModule', JPATH_ADMINISTRATOR . '/components/com_modules/models/module.php'); @@ -68,10 +68,10 @@ public function execute() // Get a document object $document = JFactory::getDocument(); - // Set back-end required params + // Set backend required params $document->setType('json'); - // Execute back-end controller + // Execute backend controller $return = $controllerClass->save(); // Reset params back after requesting from service diff --git a/components/com_config/controller/templates/display.php b/components/com_config/controller/templates/display.php index dd4bf9b9932d5..ddd610247d2d2 100644 --- a/components/com_config/controller/templates/display.php +++ b/components/com_config/controller/templates/display.php @@ -35,18 +35,18 @@ public function execute() $viewFormat = $document->getType(); $layoutName = $this->input->getWord('layout', 'default'); - // Access back-end com_config + // Access backend com_config JLoader::register('TemplatesController', JPATH_ADMINISTRATOR . '/components/com_templates/controller.php'); JLoader::register('TemplatesViewStyle', JPATH_ADMINISTRATOR . '/components/com_templates/views/style/view.json.php'); JLoader::register('TemplatesModelStyle', JPATH_ADMINISTRATOR . '/components/com_templates/models/style.php'); $displayClass = new TemplatesController; - // Set back-end required params + // Set backend required params $document->setType('json'); $this->input->set('id', $app->getTemplate('template')->id); - // Execute back-end controller + // Execute backend controller $serviceData = json_decode($displayClass->display(), true); // Reset params back after requesting from service diff --git a/components/com_config/controller/templates/save.php b/components/com_config/controller/templates/save.php index df81af1334cc1..ee7e02dcc35b3 100644 --- a/components/com_config/controller/templates/save.php +++ b/components/com_config/controller/templates/save.php @@ -44,7 +44,7 @@ public function execute() $app = JFactory::getApplication(); - // Access back-end com_templates + // Access backend com_templates JLoader::register('TemplatesControllerStyle', JPATH_ADMINISTRATOR . '/components/com_templates/controllers/style.php'); JLoader::register('TemplatesModelStyle', JPATH_ADMINISTRATOR . '/components/com_templates/models/style.php'); JLoader::register('TemplatesTableStyle', JPATH_ADMINISTRATOR . '/components/com_templates/tables/style.php'); @@ -53,11 +53,11 @@ public function execute() // Get a document object $document = JFactory::getDocument(); - // Set back-end required params + // Set backend required params $document->setType('json'); $this->input->set('id', $app->getTemplate('template')->id); - // Execute back-end controller + // Execute backend controller $return = $controllerClass->save(); // Reset params back after requesting from service diff --git a/components/com_contact/helpers/association.php b/components/com_contact/helpers/association.php index 2f2be6c3956ae..fecb1810ab0a7 100644 --- a/components/com_contact/helpers/association.php +++ b/components/com_contact/helpers/association.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; JLoader::register('ContactHelper', JPATH_ADMINISTRATOR . '/components/com_contact/helpers/contact.php'); -JLoader::register('ContactHelperRoute', JPATH_SITE . '/components/com_contact/helpers/route.php'); JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php'); /** @@ -30,11 +29,15 @@ abstract class ContactHelperAssociation extends CategoryHelperAssociation * * @since 3.0 */ + public static function getAssociations($id = 0, $view = null) { - $jinput = JFactory::getApplication()->input; - $view = is_null($view) ? $jinput->get('view') : $view; - $id = empty($id) ? $jinput->getInt('id') : $id; + jimport('helper.route', JPATH_COMPONENT_SITE); + + $app = JFactory::getApplication(); + $jinput = $app->input; + $view = is_null($view) ? $jinput->get('view') : $view; + $id = empty($id) ? $jinput->getInt('id') : $id; if ($view == 'contact') { diff --git a/components/com_contact/models/rules/contactemail.php b/components/com_contact/models/rules/contactemail.php index e5f3e4c9cc8c8..991681b9ac9ed 100644 --- a/components/com_contact/models/rules/contactemail.php +++ b/components/com_contact/models/rules/contactemail.php @@ -14,14 +14,14 @@ JFormHelper::loadRuleClass('email'); /** - * JFormRule for com_contact to make sure the E-Mail adress is not blocked. + * JFormRule for com_contact to make sure the email address is not blocked. * * @since 1.6 */ class JFormRuleContactEmail extends JFormRuleEmail { /** - * Method to test for banned e-mail addresses + * Method to test for banned email addresses * * @param SimpleXMLElement $element The SimpleXMLElement object representing the tag for the form field object. * @param mixed $value The form field value to validate. diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php index 38e0aa70e94d1..3265ce230fca4 100644 --- a/components/com_contact/views/contact/tmpl/default.php +++ b/components/com_contact/views/contact/tmpl/default.php @@ -171,7 +171,7 @@ params->get('presentation_style') == 'tabs') : ?> - + params->get('presentation_style') == 'plain'):?> ' . JText::_('COM_CONTACT_PROFILE') . ''; ?> diff --git a/components/com_content/helpers/association.php b/components/com_content/helpers/association.php index 278cdbeb5e8b5..806e5db6090e3 100644 --- a/components/com_content/helpers/association.php +++ b/components/com_content/helpers/association.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php'); -JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php'); JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php'); /** @@ -30,11 +29,15 @@ abstract class ContentHelperAssociation extends CategoryHelperAssociation * * @since 3.0 */ + public static function getAssociations($id = 0, $view = null) { - $jinput = JFactory::getApplication()->input; - $view = is_null($view) ? $jinput->get('view') : $view; - $id = empty($id) ? $jinput->getInt('id') : $id; + jimport('helper.route', JPATH_COMPONENT_SITE); + + $app = JFactory::getApplication(); + $jinput = $app->input; + $view = is_null($view) ? $jinput->get('view') : $view; + $id = empty($id) ? $jinput->getInt('id') : $id; if ($view == 'article') { diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php index 15d0fa8f61967..d2819941f4f76 100644 --- a/components/com_content/models/articles.php +++ b/components/com_content/models/articles.php @@ -233,7 +233,7 @@ protected function getListQuery() $query->where('a.featured = 1'); } } - elseif ($orderby_sec == 'front' || $this->getState('list.ordering') == 'fp.ordering') + elseif ($orderby_sec == 'front') { $query->join('LEFT', '#__content_frontpage AS fp ON fp.content_id = a.id'); } diff --git a/components/com_content/views/archive/tmpl/default_items.php b/components/com_content/views/archive/tmpl/default_items.php index 5ffaaedddd253..3b901f91097ec 100644 --- a/components/com_content/views/archive/tmpl/default_items.php +++ b/components/com_content/views/archive/tmpl/default_items.php @@ -18,7 +18,7 @@ params->get('info_block_position', 0); ?>