diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php index c17e2bc4d92d9..91063db14a368 100644 --- a/administrator/components/com_admin/models/sysinfo.php +++ b/administrator/components/com_admin/models/sysinfo.php @@ -313,7 +313,7 @@ public function &getInfo() 'sapi_name' => php_sapi_name(), 'version' => $version->getLongVersion(), 'platform' => $platform->getLongVersion(), - 'useragent' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "", + 'useragent' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '', ); return $this->info; diff --git a/administrator/components/com_admin/postinstall/languageaccess340.php b/administrator/components/com_admin/postinstall/languageaccess340.php index 3d483e99507b4..2bc6f31c54bbb 100644 --- a/administrator/components/com_admin/postinstall/languageaccess340.php +++ b/administrator/components/com_admin/postinstall/languageaccess340.php @@ -28,7 +28,7 @@ function admin_postinstall_languageaccess340_condition() $query = $db->getQuery(true) ->select($db->quoteName('access')) ->from($db->quoteName('#__languages')) - ->where($db->quoteName('access') . " = " . $db->quote('0')); + ->where($db->quoteName('access') . ' = ' . $db->quote('0')); $db->setQuery($query); $db->execute(); $numRows = $db->getNumRows(); diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 3601a7e8e378d..582537898b8c0 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -1929,7 +1929,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_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql'; if (is_file($fileName1)) { @@ -1953,7 +1953,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_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql'; if (is_file($fileName2)) { diff --git a/administrator/components/com_admin/views/sysinfo/view.json.php b/administrator/components/com_admin/views/sysinfo/view.json.php index f13a8f766bf25..cd6a077637d2f 100644 --- a/administrator/components/com_admin/views/sysinfo/view.json.php +++ b/administrator/components/com_admin/views/sysinfo/view.json.php @@ -34,7 +34,7 @@ public function display($tpl = null) } header('MIME-Version: 1.0'); - header('Content-Disposition: attachment; filename="systeminfo-' . date("c") . '.json"'); + header('Content-Disposition: attachment; filename="systeminfo-' . date('c') . '.json"'); header('Content-Transfer-Encoding: binary'); $data = $this->getLayoutData(); diff --git a/administrator/components/com_admin/views/sysinfo/view.text.php b/administrator/components/com_admin/views/sysinfo/view.text.php index bab9fcdc3baae..039b1e2484ba7 100644 --- a/administrator/components/com_admin/views/sysinfo/view.text.php +++ b/administrator/components/com_admin/views/sysinfo/view.text.php @@ -35,7 +35,7 @@ public function display($tpl = null) header('Content-Type: text/plain; charset=utf-8'); header('Content-Description: File Transfer'); - header('Content-Disposition: attachment; filename="systeminfo-' . date("c") . '.txt"'); + header('Content-Disposition: attachment; filename="systeminfo-' . date('c') . '.txt"'); header('Cache-Control: must-revalidate'); $data = $this->getLayoutData(); @@ -117,9 +117,9 @@ protected function renderSection($sectionName, $sectionData, $level = 0) $margin = ($level > 0) ? str_repeat("\t", $level) : null; - $lines[] = $margin . "============="; + $lines[] = $margin . '============='; $lines[] = $margin . $sectionName; - $lines[] = $margin . "============="; + $lines[] = $margin . '============='; $level++; foreach ($sectionData as $name => $value) @@ -131,7 +131,7 @@ protected function renderSection($sectionName, $sectionData, $level = 0) continue; } - $lines[] = ""; + $lines[] = ''; $lines[] = $this->renderSection($name, $value, $level); } else diff --git a/administrator/components/com_banners/tables/banner.php b/administrator/components/com_banners/tables/banner.php index a05cf2add8b99..dad1d16ae76d5 100644 --- a/administrator/components/com_banners/tables/banner.php +++ b/administrator/components/com_banners/tables/banner.php @@ -74,7 +74,7 @@ public function check() if (trim(str_replace('-', '', $this->alias)) == '') { - $this->alias = JFactory::getDate()->format("Y-m-d-H-i-s"); + $this->alias = JFactory::getDate()->format('Y-m-d-H-i-s'); } // Check the publish down date is not earlier than publish up. diff --git a/administrator/components/com_banners/views/clients/tmpl/default.php b/administrator/components/com_banners/views/clients/tmpl/default.php index 66516e6f49877..bca94547a82ca 100644 --- a/administrator/components/com_banners/views/clients/tmpl/default.php +++ b/administrator/components/com_banners/views/clients/tmpl/default.php @@ -127,19 +127,19 @@ contact; ?> - " href="id . '&filter[published]=1'); ?>"> + count_published; ?> - " href="id . '&filter[published]=0'); ?>"> + count_unpublished; ?> - " href="id . '&filter[published]=2'); ?>"> + count_archived; ?> - " href="id . '&filter[published]=-2'); ?>"> + count_trashed; ?> diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/administrator/components/com_banners/views/tracks/tmpl/default.php index 365f89608a61e..a1003eeb6cba5 100644 --- a/administrator/components/com_banners/views/tracks/tmpl/default.php +++ b/administrator/components/com_banners/views/tracks/tmpl/default.php @@ -96,10 +96,10 @@ 'modalWidth' => '40', 'footer' => '' - . JText::_("COM_BANNERS_CANCEL") . '' + . JText::_('COM_BANNERS_CANCEL') . '' . '', + . JText::_('COM_BANNERS_TRACKS_EXPORT') . '', ) ); ?> diff --git a/administrator/components/com_cache/layouts/joomla/searchtools/default.php b/administrator/components/com_cache/layouts/joomla/searchtools/default.php index d92bb88c07384..05aaf6ed6a12f 100644 --- a/administrator/components/com_cache/layouts/joomla/searchtools/default.php +++ b/administrator/components/com_cache/layouts/joomla/searchtools/default.php @@ -16,7 +16,7 @@ if ($data['view'] instanceof CacheViewCache) { - JFactory::getDocument()->addStyleDeclaration(" + JFactory::getDocument()->addStyleDeclaration(' /* Fixed filter field in search bar */ .js-stools .js-stools-client_id { float: left; @@ -31,7 +31,7 @@ .js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container { padding: 3px 0; } - "); + '); // Client id filter doesn't have to activate the filter bar unset($data['view']->activeFilters['client_id']); diff --git a/administrator/components/com_categories/models/fields/modal/category.php b/administrator/components/com_categories/models/fields/modal/category.php index fa5b311d3a779..fac1cfe936935 100644 --- a/administrator/components/com_categories/models/fields/modal/category.php +++ b/administrator/components/com_categories/models/fields/modal/category.php @@ -194,7 +194,7 @@ function jSelectCategory_" . $this->id . "(id, title, object) { 'width' => '800px', 'bodyHeight' => '70', 'modalWidth' => '80', - 'footer' => '', + 'footer' => '', ) ); } @@ -217,13 +217,13 @@ function jSelectCategory_" . $this->id . "(id, title, object) { 'modalWidth' => '80', 'footer' => '' + . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '' . '' + . JText::_('JSAVE') . '' . '', + . JText::_('JAPPLY') . '', ) ); } @@ -246,13 +246,13 @@ function jSelectCategory_" . $this->id . "(id, title, object) { 'modalWidth' => '80', 'footer' => '' + . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '' . '' + . JText::_('JSAVE') . '' . '', + . JText::_('JAPPLY') . '', ) ); } diff --git a/administrator/components/com_categories/views/categories/tmpl/default.php b/administrator/components/com_categories/views/categories/tmpl/default.php index 4d530dd7cfc05..1c20157630420 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default.php +++ b/administrator/components/com_categories/views/categories/tmpl/default.php @@ -137,18 +137,18 @@ // Get the parents of item for sorting if ($item->level > 1) { - $parentsStr = ""; + $parentsStr = ''; $_currentParentId = $item->parent_id; - $parentsStr = " " . $_currentParentId; + $parentsStr = ' ' . $_currentParentId; for ($i2 = 0; $i2 < $item->level; $i2++) { foreach ($this->ordering as $k => $v) { - $v = implode("-", $v); - $v = "-" . $v . "-"; - if (strpos($v, "-" . $_currentParentId . "-") !== false) + $v = implode('-', $v); + $v = '-' . $v . '-'; + if (strpos($v, '-' . $_currentParentId . '-') !== false) { - $parentsStr .= " " . $k; + $parentsStr .= ' ' . $k; $_currentParentId = $k; break; } @@ -157,7 +157,7 @@ } else { - $parentsStr = ""; + $parentsStr = ''; } ?> @@ -220,25 +220,25 @@ items[0]) && property_exists($this->items[0], 'count_published')) : ?> - " title="" href="id . '&filter[published]=1' . '&filter[level]=' . (int) $item->level); ?>"> + count_published; ?> items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?> - " title="" href="id . '&filter[published]=0' . '&filter[level]=' . (int) $item->level); ?>"> + count_unpublished; ?> items[0]) && property_exists($this->items[0], 'count_archived')) : ?> - " title="" href="id . '&filter[published]=2' . '&filter[level]=' . (int) $item->level); ?>"> + count_archived; ?> items[0]) && property_exists($this->items[0], 'count_trashed')) : ?> - " title="" href="id . '&filter[published]=-2' . '&filter[level]=' . (int) $item->level); ?>"> + count_trashed; ?> diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php index 9d62c3814ee3a..d4e5135527c51 100644 --- a/administrator/components/com_categories/views/categories/tmpl/modal.php +++ b/administrator/components/com_categories/views/categories/tmpl/modal.php @@ -97,12 +97,12 @@ } else { - $lang = ""; + $lang = ''; } } elseif (!JLanguageMultilang::isEnabled()) { - $lang = ""; + $lang = ''; } ?> diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php index 10eeb20451bc1..f7694c80fb0f4 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit.php +++ b/administrator/components/com_categories/views/category/tmpl/edit.php @@ -29,7 +29,7 @@ if (task == "category.cancel" || document.formvalidator.isValid(document.getElementById("item-form"))) { jQuery("#permissions-sliders select").attr("disabled", "disabled"); - ' . $this->form->getField("description")->save() . ' + ' . $this->form->getField('description')->save() . ' Joomla.submitform(task, document.getElementById("item-form")); // @deprecated 4.0 The following js is not needed since __DEPLOY_VERSION__. diff --git a/administrator/components/com_config/view/application/json.php b/administrator/components/com_config/view/application/json.php index 404b3cb6e6802..c113e6dd34638 100644 --- a/administrator/components/com_config/view/application/json.php +++ b/administrator/components/com_config/view/application/json.php @@ -45,20 +45,20 @@ public function render() // Required data $requiredData = array( - "sitename" => null, - "offline" => null, - "access" => null, - "list_limit" => null, - "MetaDesc" => null, - "MetaKeys" => null, - "MetaRights" => null, - "sef" => null, - "sitename_pagetitles" => null, - "debug" => null, - "debug_lang" => null, - "error_reporting" => null, - "mailfrom" => null, - "fromname" => null + 'sitename' => null, + 'offline' => null, + 'access' => null, + 'list_limit' => null, + 'MetaDesc' => null, + 'MetaKeys' => null, + 'MetaRights' => null, + 'sef' => null, + 'sitename_pagetitles' => null, + 'debug' => null, + 'debug_lang' => null, + 'error_reporting' => null, + 'mailfrom' => null, + 'fromname' => null ); $this->data = array_intersect_key($this->data, $requiredData); diff --git a/administrator/components/com_config/view/component/tmpl/default.php b/administrator/components/com_config/view/component/tmpl/default.php index 279499e53fc5f..13aa2633bf4f0 100644 --- a/administrator/components/com_config/view/component/tmpl/default.php +++ b/administrator/components/com_config/view/component/tmpl/default.php @@ -104,12 +104,12 @@ input; ?>
> - +
label; ?>
-
controls"> +
input; ?>
diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php index f58f287f0cf39..aa5688eae1609 100644 --- a/administrator/components/com_contact/models/fields/modal/contact.php +++ b/administrator/components/com_contact/models/fields/modal/contact.php @@ -183,7 +183,7 @@ function jSelectContact_" . $this->id . "(id, title, object) { 'width' => '800px', 'bodyHeight' => '70', 'modalWidth' => '80', - 'footer' => '', + 'footer' => '', ) ); } @@ -207,15 +207,15 @@ function jSelectContact_" . $this->id . "(id, title, object) { 'footer' => '' + . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '' . '' + . JText::_('JSAVE') . '' . '', + . JText::_('JAPPLY') . '', ) ); } @@ -239,15 +239,15 @@ function jSelectContact_" . $this->id . "(id, title, object) { 'footer' => '' + . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '' . '' + . JText::_('JSAVE') . '' . '', + . JText::_('JAPPLY') . '', ) ); } diff --git a/administrator/components/com_contact/tables/contact.php b/administrator/components/com_contact/tables/contact.php index 59760e373d6e3..196a5901e699d 100644 --- a/administrator/components/com_contact/tables/contact.php +++ b/administrator/components/com_contact/tables/contact.php @@ -182,10 +182,10 @@ public function check() if (!empty($this->metakey)) { // Array of characters to remove. - $badCharacters = array("\n", "\r", "\"", "<", ">"); + $badCharacters = array("\n", "\r", "\"", '<', '>'); // Remove bad characters. - $afterClean = StringHelper::str_ireplace($badCharacters, "", $this->metakey); + $afterClean = StringHelper::str_ireplace($badCharacters, '', $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $afterClean); @@ -201,15 +201,15 @@ public function check() } // Put array back together delimited by ", " - $this->metakey = implode(", ", $cleanKeys); + $this->metakey = implode(', ', $cleanKeys); } // Clean up description -- eliminate quotes and <> brackets if (!empty($this->metadesc)) { // Only process if not empty - $badCharacters = array("\"", "<", ">"); - $this->metadesc = StringHelper::str_ireplace($badCharacters, "", $this->metadesc); + $badCharacters = array("\"", '<', '>'); + $this->metadesc = StringHelper::str_ireplace($badCharacters, '', $this->metadesc); } return true; @@ -232,7 +232,7 @@ public function generateAlias() if (trim(str_replace('-', '', $this->alias)) == '') { - $this->alias = JFactory::getDate()->format("Y-m-d-H-i-s"); + $this->alias = JFactory::getDate()->format('Y-m-d-H-i-s'); } return $this->alias; diff --git a/administrator/components/com_contact/views/contact/tmpl/edit.php b/administrator/components/com_contact/views/contact/tmpl/edit.php index 567cf8f3135d1..138187d122587 100644 --- a/administrator/components/com_contact/views/contact/tmpl/edit.php +++ b/administrator/components/com_contact/views/contact/tmpl/edit.php @@ -27,7 +27,7 @@ { if (task == "contact.cancel" || document.formvalidator.isValid(document.getElementById("contact-form"))) { - ' . $this->form->getField("misc")->save() . ' + ' . $this->form->getField('misc')->save() . ' Joomla.submitform(task, document.getElementById("contact-form")); // @deprecated 4.0 The following js is not needed since __DEPLOY_VERSION__. diff --git a/administrator/components/com_contact/views/contacts/tmpl/modal.php b/administrator/components/com_contact/views/contacts/tmpl/modal.php index 60cb5b8528250..2b9e39907227e 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/modal.php +++ b/administrator/components/com_contact/views/contacts/tmpl/modal.php @@ -95,12 +95,12 @@ $lang = substr($item->language, 0, 3); } else { - $lang = ""; + $lang = ''; } } elseif (!JLanguageMultilang::isEnabled()) { - $lang = ""; + $lang = ''; } ?> @@ -111,7 +111,7 @@ escape($item->name); ?>
- escape($item->category_title); ?> + escape($item->category_title); ?>
diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php index 8c4712078c4a2..1038d5b8a1581 100644 --- a/administrator/components/com_content/models/fields/modal/article.php +++ b/administrator/components/com_content/models/fields/modal/article.php @@ -186,7 +186,7 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag 'width' => '800px', 'bodyHeight' => '70', 'modalWidth' => '80', - 'footer' => '', + 'footer' => '', ) ); } @@ -209,13 +209,13 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag 'modalWidth' => '80', 'footer' => '' + . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '' . '' + . JText::_('JSAVE') . '' . '', + . JText::_('JAPPLY') . '', ) ); } @@ -238,13 +238,13 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag 'modalWidth' => '80', 'footer' => '' + . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '' . '' + . JText::_('JSAVE') . '' . '', + . JText::_('JAPPLY') . '', ) ); } diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php index 6678b3eccfc34..eb0f9b8af6d26 100644 --- a/administrator/components/com_content/views/articles/tmpl/default.php +++ b/administrator/components/com_content/views/articles/tmpl/default.php @@ -187,7 +187,7 @@ escape($item->alias)); ?>
- escape($item->category_title); ?> + escape($item->category_title); ?>
diff --git a/administrator/components/com_content/views/articles/tmpl/modal.php b/administrator/components/com_content/views/articles/tmpl/modal.php index 3bf547948025b..f1ab164a786de 100644 --- a/administrator/components/com_content/views/articles/tmpl/modal.php +++ b/administrator/components/com_content/views/articles/tmpl/modal.php @@ -98,12 +98,12 @@ $lang = substr($item->language, 0, 3); } else { - $lang = ""; + $lang = ''; } } elseif (!JLanguageMultilang::isEnabled()) { - $lang = ""; + $lang = ''; } ?> @@ -114,7 +114,7 @@ escape($item->title); ?>
- escape($item->category_title); ?> + escape($item->category_title); ?>
diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php index c2a00304b3014..e506f0b9878ff 100644 --- a/administrator/components/com_content/views/featured/tmpl/default.php +++ b/administrator/components/com_content/views/featured/tmpl/default.php @@ -181,7 +181,7 @@ escape($item->alias)); ?>
- escape($item->category_title); ?> + escape($item->category_title); ?>
diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php index 675857755662a..9e7b875dec211 100644 --- a/administrator/components/com_fields/helpers/fields.php +++ b/administrator/components/com_fields/helpers/fields.php @@ -302,7 +302,7 @@ public static function prepareForm($context, JForm $form, $data) * Setting the onchange event to reload the page when the category * has changed */ - $form->setFieldAttribute('catid', 'onchange', "categoryHasChanged(this);"); + $form->setFieldAttribute('catid', 'onchange', 'categoryHasChanged(this);'); JFactory::getDocument()->addScriptDeclaration( "function categoryHasChanged(element){ var cat = jQuery(element); diff --git a/administrator/components/com_fields/models/fields/type.php b/administrator/components/com_fields/models/fields/type.php index 979fc1c3acdb9..bc65c40ecefb5 100644 --- a/administrator/components/com_fields/models/fields/type.php +++ b/administrator/components/com_fields/models/fields/type.php @@ -39,7 +39,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null) { $return = parent::setup($element, $value, $group); - $this->onchange = "typeHasChanged(this);"; + $this->onchange = 'typeHasChanged(this);'; return $return; } diff --git a/administrator/components/com_finder/helpers/indexer/parser/html.php b/administrator/components/com_finder/helpers/indexer/parser/html.php index a6e646b56fea3..8d0a734d778ec 100644 --- a/administrator/components/com_finder/helpers/indexer/parser/html.php +++ b/administrator/components/com_finder/helpers/indexer/parser/html.php @@ -33,7 +33,7 @@ class FinderIndexerParserHtml extends FinderIndexerParser public function parse($input) { // Strip invalid UTF-8 characters. - $input = iconv("utf-8", "utf-8//IGNORE", $input); + $input = iconv('utf-8', 'utf-8//IGNORE', $input); // Remove anything between and tags. Do this first // because there might be